风险防控-巡查任务。

models/risk_management.py

@@ -36,4 +36,46 @@ class GovdataArea(Base):
     parent_code = Column(String(20),  nullable=True, comment='父级区划编码')
     parent_id = Column(Integer, nullable=True, comment='父级ID')
     status = Column(String(2),  nullable=True, comment='状态')
-    create_time = Column(String(255),  nullable=True, comment='创建时间')
+    create_time = Column(String(255),  nullable=True, comment='创建时间')
+
+
+class RiskManagementInspectionTask(Base):
+    __tablename__ = 'risk_management_inspection_task'
+
+    id = Column(BigInteger, primary_key=True, autoincrement=True, comment='ID')
+    task_number = Column(String(50),  comment='任务编号')
+    inspection_business = Column(String(255), nullable=True, comment='巡查业务，城市隐患巡查、森林防火巡查、重点危化企业巡查、重点水库水位巡查')
+    start_time = Column(DateTime, nullable=True, comment='巡查开始时间')
+    end_time = Column(DateTime, nullable=True, comment='巡查结束时间')
+    inspection_cycle = Column(String(50), nullable=True, comment='巡查周期，每年、每月、每周、每日、一次')
+    corn_expression = Column(String(100), nullable=True, comment='corn表达式')
+    inspection_range = Column(String(50), nullable=True, comment='巡查范围，市级、区县级、镇街级、村居级')
+    task_status = Column(String(20), nullable=True, comment='任务状态，未开始、进行中、未完成、已完结')
+    del_flag = Column(String(1), default='0', comment='删除标志（0代表存在 2代表删除）')
+    create_dept = Column(BigInteger, default=None, comment='创建部门')
+    create_by = Column(BigInteger, default=None, comment='创建者')
+    create_time = Column(DateTime, default=datetime.now, comment='创建时间')
+    update_by = Column(BigInteger, default=None, comment='更新者')
+    update_time = Column(DateTime, default=datetime.now, onupdate=datetime.now, comment='更新时间')
+    remark = Column(String(500), default=None, comment='备注')
+
+
+class RiskManagementRiskTask(Base):
+    __tablename__ = 'risk_management_risk_task'
+
+    id = Column(BigInteger, primary_key=True, autoincrement=True, comment='ID')
+    task_number = Column(String(50), nullable=True, comment='任务编号')
+    risk_type = Column(String(255), nullable=True, comment='风险源类型，风险源排查、隐患源排查、危险源排查')
+    start_time = Column(DateTime, nullable=True, comment='排查开始时间')
+    end_time = Column(DateTime, nullable=True, comment='排查结束时间')
+    task_cycle = Column(String(50), nullable=True, comment='排查周期，每年、每月、每周、每日、一次')
+    corn_expression = Column(String(100), nullable=True, comment='corn表达式')
+    task_range = Column(String(50), nullable=True, comment='巡查范围，市级、区县级、镇街级、村居级')
+    task_status = Column(String(20), nullable=True, comment='任务状态，未开始、进行中、未完成、已完结')
+    del_flag = Column(String(1), default='0', comment='删除标志（0代表存在 2代表删除）')
+    create_dept = Column(BigInteger, default=None, comment='创建部门')
+    create_by = Column(BigInteger, default=None, comment='创建者')
+    create_time = Column(DateTime, default=datetime.now, comment='创建时间')
+    update_by = Column(BigInteger, default=None, comment='更新者')
+    update_time = Column(DateTime, default=datetime.now, onupdate=datetime.now, comment='更新时间')
+    remark = Column(String(500), default=None, comment='备注')

routers/api/riskManagement/__init__.py

@@ -18,6 +18,7 @@ import traceback
 
 router = APIRouter()
 
+####巡查人员####
 
 @router.get('/inspection/user/list')
 async def get_inspection_user_list(
@@ -132,7 +133,7 @@ async def get_inspection_user(
 
 
 @router.post('/inspection/user/create')
-async def create_emergency_plan(
+async def create_inspection_user(
     db: Session = Depends(get_db),
     body = Depends(remove_xss_json),
     user_id = Depends(valid_access_token)
@@ -169,7 +170,7 @@ async def create_emergency_plan(
 
 
 @router.put('/inspection/user/update')
-async def update_emergency_plan(
+async def update_inspection_user(
     db: Session = Depends(get_db),
     body = Depends(remove_xss_json),
     user_id = Depends(valid_access_token)
@@ -182,8 +183,8 @@ async def update_emergency_plan(
         user = query.first()
 
         if not user:
-            detail = "预案不存在"
-            raise HTTPException(status_code=404, detail="预案不存在")
+            detail = "用户不存在"
+            raise HTTPException(status_code=404, detail="用户不存在")
 
         if 'user_id' in body:
             user.user_id = body['user_id']
@@ -224,7 +225,7 @@ async def update_emergency_plan(
         raise HTTPException(status_code=500, detail=str(e))
 
 @router.delete('/inspection/user/delete')
-async def delete_emergency_plans(
+async def delete_inspection_users(
         userIds: list,
         db: Session = Depends(get_db),
     body = Depends(remove_xss_json),
@@ -258,7 +259,7 @@ async def delete_emergency_plans(
         raise HTTPException(status_code=500, detail=str(e))
 
 @router.delete('/inspection/user/delete/{userId}')
-async def delete_emergency_plan(
+async def delete_inspection_user(
         userId: str,
         db: Session = Depends(get_db),
     body = Depends(remove_xss_json),
@@ -337,6 +338,307 @@ def read_all_areas(db: Session = Depends(get_db)):
         "code": 200,
         "msg": "成功",
         "data": data
-}
+        }
+
+####巡查任务####
+
+@router.get('/inspection/task/list')
+async def get_inspection_task_list(
+    business: str = Query(None, description='巡查业务'),
+    cycle :str = Query(None, description='巡查周期'),
+    page: int = Query(1, gt=0, description='页码'),
+    pageSize: int = Query(10, gt=0, description='每页条目数量'),
+    db: Session = Depends(get_db),
+    user_id = Depends(valid_access_token)
+):
+    try:
+        # 构建查询
+        query = db.query(RiskManagementInspectionTask)
+        query = query.filter(RiskManagementInspectionTask.del_flag != '2')
+        # 应用查询条件
+        if business:
+            query = query.filter(RiskManagementInspectionTask.inspection_business == business)
+        if cycle:
+            query = query.filter(RiskManagementInspectionTask.inspection_cycle == cycle)
+
+        # 计算总条目数
+        total_items = query.count()
 
+        # 排序
+
+        query = query.order_by(RiskManagementInspectionTask.create_time.desc())
+        # 执行分页查询
+        InspectionTasks = query.offset((page - 1) * pageSize).limit(pageSize).all()
 
+        # 将查询结果转换为列表形式的字典
+        InspectionTasks_list = []
+        for task in InspectionTasks:
+            if task.task_status=='3':
+                task_status = '3' #'已完结'
+            else:
+                if datetime.now()<task.start_time:
+                    task_status = '0' #'未开始'
+                elif task.start_time<=datetime.now()<=task.end_time:
+                    task_status = '1' #'进行中'
+                else:
+                    task_status = '2' #'未完成'
+            task_info = {
+                "id": task.id,
+                "task_number": task.task_number,
+                "business": task.inspection_business,
+                "task_time": '%s-%s'%(task.start_time.strftime('%Y/%m/%d'),task.end_time.strftime('%Y/%m/%d')),
+                "cycle": task.inspection_cycle,
+                "inspection_range": task.inspection_range,
+                "task_status": task_status,
+                "create_time": task.create_time.strftime('%Y-%m-%d')
+            }
+            InspectionTasks_list.append(task_info)
+        # 返回结果
+        return {
+            "code": 200,
+            "msg": "成功",
+            "data": InspectionTasks_list,
+            "total": total_items,
+            "page": page,
+            "pageSize": pageSize,
+            "totalPages": (total_items + pageSize - 1) // pageSize
+        }
+    except Exception as e:
+        # 处理异常
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.get('/inspection/task/{id}')
+async def get_inspection_task(
+    id: str ,
+    db: Session = Depends(get_db),
+    user_id = Depends(valid_access_token)
+):
+    try:
+        # 构建查询
+        query = db.query(RiskManagementInspectionTask)
+        query = query.filter(RiskManagementInspectionTask.del_flag != '2')
+        # 应用查询条件
+        if id:
+            query = query.filter(RiskManagementInspectionTask.id == id)
+
+        # 执行查询
+        task = query.first()
+        if not task:
+            detail = "巡查任务不存在"
+            raise HTTPException(status_code=404, detail="用户不存在")
+        # 将查询结果转换为列表形式的字典
+        if task.task_status == '3':
+            task_status = '3'  # '已完结'
+        else:
+            if datetime.now() < task.start_time:
+                task_status = '0'  # '未开始'
+            elif task.start_time <= datetime.now() <= task.end_time:
+                task_status = '1'  # '进行中'
+            else:
+                task_status = '2'  # '未完成'
+        inspection_task_result = {
+                "id": task.id,
+                "task_number": task.task_number,
+                "business": task.inspection_business,
+                "task_time": '%s-%s'%(task.start_time.strftime('%Y/%m/%d'),task.end_time.strftime('%Y/%m/%d')),
+                "cycle": task.inspection_cycle,
+                "inspection_range": task.inspection_range,
+                "task_status": task_status,
+                "create_time": task.create_time.strftime('%Y-%m-%d')
+            }
+
+        # 返回结果
+        return {
+            "code": 200,
+            "msg": "成功",
+            "data": inspection_task_result
+        }
+    except Exception as e:
+        # 处理异常
+        if str(e)=='':
+            e = detail
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+
+
+@router.post('/inspection/task/create')
+async def create_inspection_task(
+    db: Session = Depends(get_db),
+    body = Depends(remove_xss_json),
+    user_id = Depends(valid_access_token)
+):
+    try:
+        cycle = body['cycle']
+        # 0每年、1每月、2每周、3每日、4一次
+        corn_query = body['corn_query']
+        if cycle=='0':
+            corn=f'0 0 {corn_query} *'
+        elif cycle=='1':
+            corn=f'0 0 {corn_query} * *'
+        elif cycle == '2':
+            corn = f'0 0 * * {corn_query}'
+        elif cycle == '3':
+            corn = f'0 0 * * *'
+        else:
+            corn=''
+        # 创建新的预案记录
+        new_task = RiskManagementInspectionTask(
+            inspection_business=body['business'],
+            start_time = body['start_time'],
+            end_time = body['end_time'],
+            inspection_cycle = cycle,
+            corn_expression = corn,
+            inspection_range = body['inspection_range'],
+            task_status = '-1',
+            create_by = user_id
+        )
+        # 添加到数据库会话并提交
+        db.add(new_task)
+        db.commit()
+        db.refresh(new_task)  # 可选，如果需要刷新实例状态
+        new_task.task_number = f'YJXC{str(new_task.id).zfill(10)}'
+        db.commit()
+        # 返回创建成功的响应
+        return {
+            "code": 200,
+            "msg": "成功",
+            "data": None
+        }
+    except Exception as e:
+        # 处理异常
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.put('/inspection/task/update')
+async def update_inspection_task(
+    db: Session = Depends(get_db),
+    body = Depends(remove_xss_json),
+    user_id = Depends(valid_access_token)
+):
+    try:
+        # 提取请求数据
+        query = db.query(RiskManagementInspectionTask)
+        query = query.filter(RiskManagementInspectionTask.id == body['id'])
+        query = query.filter(RiskManagementInspectionTask.del_flag != '2')
+        task = query.first()
+
+        if not task:
+            detail = "任务不存在"
+            raise HTTPException(status_code=404, detail="任务不存在")
+
+        if 'cycle' in body:
+            cycle = body['cycle']
+            # 0每年、1每月、2每周、3每日、4一次
+            corn_query = body['corn_query']
+            if cycle == '0':
+                corn = f'0 0 {corn_query} *'
+            elif cycle == '1':
+                corn = f'0 0 {corn_query} * *'
+            elif cycle == '2':
+                corn = f'0 0 * * {corn_query}'
+            elif cycle == '3':
+                corn = f'0 0 * * *'
+            else:
+                corn = ''
+            task.inspection_cycle = cycle
+            task.corn_expression = corn
+        if 'business' in body:
+            task.inspection_business = body['business']
+        if 'start_time' in body:
+            task.start_time = body['start_time']
+        if 'end_time' in body:
+            task.end_time = body['end_time']
+        if 'inspection_range' in body:
+            task.inspection_range = body['inspection_range']
+        if 'task_status' in body:
+            task.task_status = body['task_status']
+
+        if user_id:
+            task.update_by = user_id
+
+        # 更新到数据库会话并提交
+        db.commit()
+        db.refresh(task)  # 可选，如果需要刷新实例状态
+
+        # 返回创建成功的响应
+        return {
+            "code": 200,
+            "msg": "成功",
+            "data": None
+        }
+    except Exception as e:
+        # 处理异常
+        if str(e)=='':
+            e = detail
+        raise HTTPException(status_code=500, detail=str(e))
+
+@router.delete('/inspection/task/delete')
+async def delete_inspection_tasks(
+        taskIds: list,
+        db: Session = Depends(get_db),
+    body = Depends(remove_xss_json),
+    user_id = Depends(valid_access_token)
+):
+    try:
+        # 提取请求数据
+        query = db.query(RiskManagementInspectionTask)
+        query = query.filter(RiskManagementInspectionTask.del_flag != '2')
+        query = query.filter(RiskManagementInspectionTask.id.in_(taskIds))
+        tasks = query.all()
+        if not tasks:
+            detail = "任务不存在"
+            raise HTTPException(status_code=404, detail="任务不存在")
+        for task in tasks:
+            task.del_flag = '2'
+            task.update_by=user_id
+        # 更新到数据库会话并提交
+        db.commit()
+
+        # 返回创建成功的响应
+        return {
+            "code": 200,
+            "msg": "删除成功",
+            "data": None
+        }
+    except Exception as e:
+        # 处理异常
+        if str(e) == '':
+            e = detail
+        raise HTTPException(status_code=500, detail=str(e))
+
+@router.delete('/inspection/task/delete/{userId}')
+async def delete_inspection_task(
+        userId: str,
+        db: Session = Depends(get_db),
+    body = Depends(remove_xss_json),
+    user_id = Depends(valid_access_token)
+):
+    try:
+        # 提取请求数据
+        query = db.query(RiskManagementInspectionTask)
+        query = query.filter(RiskManagementInspectionTask.del_flag != '2')
+        query = query.filter(RiskManagementInspectionTask.id==userId)
+        task = query.first()
+        if not task:
+            detail = "用户不存在"
+            raise HTTPException(status_code=404, detail="用户不存在")
+
+        task.del_flag = '2'
+        task.update_by = user_id
+        # 更新到数据库会话并提交
+        db.commit()
+        db.refresh(task)  # 可选，如果需要刷新实例状态
+
+        # 返回创建成功的响应
+        return {
+            "code": 200,
+            "msg": "删除成功",
+            "data": None
+        }
+    except Exception as e:
+        # 处理异常
+        if str(e) == '':
+            e = detail
+        raise HTTPException(status_code=500, detail=str(e))