Browse Source

no message

libushang 9 months ago
parent
commit
40e7a3207a

+ 9 - 9
models/event_base.py

@@ -8,28 +8,28 @@ class EventBase(Base):
     __tablename__ = 'event_base'
 
     id = Column(Integer, autoincrement=True, primary_key=True)
-    event_code = Column(String(50), nullable=False, comment='事件编号')
-    event_title = Column(String(255), nullable=False, comment='事件标题')
-    event_type = Column(String(100), nullable=False, comment='事件类型')
-    event_level = Column(String(50), comment='事件等级')
+    event_code = Column(String(50), default='', server_default='', nullable=False, comment='事件编号')
+    event_title = Column(String(255), default='', server_default='', nullable=False, comment='事件标题')
+    event_type = Column(String(100), default='', server_default='', nullable=False, comment='事件类型')
+    event_level = Column(String(50), default='', server_default='', comment='事件等级')
     event_status = Column(String(50), default='active', comment='事件状态')
     event_time = Column(DateTime, comment='事发时间')
     report_time = Column(DateTime, default=datetime.now, comment='上报时间')
     deaths = Column(Integer, default=0, comment='死亡人数')
     injuries = Column(Integer, default=0, comment='受伤人数')
     missing = Column(Integer, default=0, comment='失联人数')
-    event_source = Column(String(255), comment='事件来源')
-    address = Column(String(255), comment='事发地点')
-    longitude = Column(String(20), default='', comment='经度')
+    event_source = Column(String(255), default='', server_default='', comment='事件来源')
+    address = Column(String(255), default='', server_default='', comment='事发地点')
+    longitude = Column(String(20), default='', server_default='', comment='经度')
     latitude = Column(String(20), default='', comment='纬度')
     event_description = Column(Text, comment='事件概要')
     recorded_by = Column(Integer, nullable=False, comment='记录用户ID')
     del_flag = Column(String(1), default='0', comment='删除标志(0代表存在 2代表删除)')
     contact = Column(String(50), comment='联系人')
     region_code = Column(String(50), comment='地区代码')
-    plan_id = Column(String(50), comment='匹配预案ID')
+    plan_id = Column(String(50), server_default='', comment='匹配预案ID')
     casualties = Column(String(1), default='0', comment='伤亡情况上报(0未上报 1已上报)')
-    response_level = Column(String(2), default='', comment='响应等级')
+    response_level = Column(String(2), default='', server_default='', comment='响应等级')
 
     class Config:
         orm_mode = True

+ 13 - 0
routers/api/eventManagement/event.py

@@ -624,6 +624,12 @@ async def lauch_emergency_plan(
             "msg": "事件编号不存在"
         }
     
+    if event_row.plan_id != '' and event_row.response_level != '':
+        return {
+            "code": 500,
+            "msg": "已启动预案"
+        }
+    
     plan_row = db.query(EmergencyPlan).filter(EmergencyPlan.plan_number == plan_id).first()
     if plan_row is None:
         return {
@@ -663,6 +669,13 @@ async def send_emergency_plan_task_by_yzy(
             "msg": "事件编号不存在"
         }
     
+    c1 = db.query(EventEmergencyNotify).filter(EventEmergencyNotify.event_id == eventId).count()
+    if c1 > 0:
+        return {
+            "code": 500,
+            "msg": "预案任务已下发"
+        }
+    
     event_info = get_model_dict(event_row)
     plan_id = event_info['plan_id']
     response_level = db_dict.get_dict_label(db, "response_level", event_info['response_level'])

+ 2 - 2
routers/api/taskRegistration/__init__.py

@@ -76,7 +76,7 @@ async def select_tasks(
         pageSize: int = Query(10, gt=0, le=100, description="每页大小")):
     try:
         missing_event_code = db.query(EventBase).filter(EventBase.event_code == event_code).first()
-        print(missing_event_code)
+        # print(missing_event_code)
         if not missing_event_code:
             return Response(content="事件不存在", status_code=400)
 
@@ -98,7 +98,7 @@ async def select_tasks(
         if query.processing_status:
             data_query = data_query.filter(TaskRegistration.processing_status == query.processing_status)
 
-        print(TaskRegistration,sortBy)
+        # print(TaskRegistration,sortBy)
         if sortBy:
             if hasattr(TaskRegistration, sortBy):
                 print("xx")