823优化

models/yjya_base.py

@@ -46,8 +46,9 @@ class EmergencyFile(Base):
     file_id = Column(String(50), nullable=False, comment='文件id')
     file_name = Column(String(255), nullable=False, comment='文件名称')
     file_name_desc = Column(String(255), nullable=False, comment='文件名称原名')
-    file_path = Column(String(255), nullable=False, comment='文件存储路径')
+    file_path = Column(String(255), comment='文件存储路径')
     file_size = Column(String(50), comment='文件大小')
+    status = Column(String(50), comment='文件状态')
     foreign_key = Column(String(50), comment='文件外键 --技术字段')
     from_scenario = Column(String(50), comment='对应标识 --技术字段')
     create_time = Column(DateTime, default=datetime.now, comment='数据创建时间')

routers/api/emergencyPlans/__init__.py

@@ -17,9 +17,9 @@ router = APIRouter()
 
 
 class File(BaseModel):
-    fileName:str
-    fileNameDesc:str
-    filePath : str = 'null'
+    status :str
+    name : str
+    url : str
 
 class PlanCreateForm(BaseModel):
     planName : str
@@ -69,11 +69,11 @@ async def get_emergency_plan_list(
             query = query.filter(EmergencyPlan.publish_date >= beginTime)
         if endTime:
             query = query.filter(EmergencyPlan.publish_date <= endTime)
-        if planName:
+        if keywords:
             query = query.filter(
                 or_(
-                    EmergencyPlan.plan_name.like(f'%{keywords%'),
-                    EmergencyPlan.plan_name.like(f'%{keywords}%')
+                    EmergencyPlan.plan_name.like(f'%{keywords}%'),
+                    EmergencyPlan.organizing_unit.like(f'%{keywords}%')
                 )
             )
             # query = query.filter(EmergencyPlan.plan_name.like(f'%{planName}%'))
@@ -148,10 +148,11 @@ async def get_emergency_plan(
                 "organizingUnit": emergency_plan.organizing_unit,
                 "document": emergency_plan.document_number,
                 "publish_date": emergency_plan.publish_date.strftime('%Y-%m-%d'),
-                "fileList":[{
-                    "fileName":file.file_name,
-                    "fileNameDesc":file.file_name_desc,
-                    "fileUrl":"/api/file/download/%s"%file.file_name
+                "fileList": [{
+                    "uid":file.file_id,
+                    "status":file.status,
+                    "name":file.file_name_desc,
+                    "url":"/api/file/download/%s"%file.file_name
                 } for file in files ]
             }
 
@@ -200,16 +201,16 @@ async def create_emergency_plan(
         new_plan.plan_number= f'YJYA{str(new_plan.id).zfill(10)}'
         db.commit()
         for file in form_data.fileList:
-            file_name = file.fileName
-            file_name_desc = file.fileNameDesc
-            file_path = file.filePath
+            file_name = file.url
+            file_name_desc = file.name
+            status = file.status
             new_file = EmergencyFile(
                 file_id = new_guid(),
                 foreign_key = new_plan.plan_id,
                 from_scenario = 'emergencyPlans_plan',
                 file_name=file_name,
                 file_name_desc = file_name_desc,
-                file_path = file_path
+                status = status
             )
             db.add(new_file)
             db.commit()
@@ -352,19 +353,22 @@ async def get_emergency_drill_list(
                 "drillTime": drill.planned_time.strftime('%Y-%m-%d %H:%M:%S'),
                 "drillAddress": drill.drill_location,
                 "drillProject":[{
-                    "fileName":file.file_name,
-                    "fileNameDesc":file.file_name_desc,
-                    "fileUrl":"/api/file/download/%s"%file.file_name
+                    "uid": file.file_id,
+                    "status": file.status,
+                    "name": file.file_name_desc,
+                    "url": "/api/file/download/%s" % file.file_name
                     } for file in projects ],
                 "drillVideo":[{
-                    "fileName":file.file_name,
-                    "fileNameDesc":file.file_name_desc,
-                    "fileUrl":"/api/file/download/%s"%file.file_name
+                    "uid": file.file_id,
+                    "status": file.status,
+                    "name": file.file_name_desc,
+                    "url": "/api/file/download/%s" % file.file_name
                     } for file in videos ],
                 "drillPicture":[{
-                    "fileName":file.file_name,
-                    "fileNameDesc":file.file_name_desc,
-                    "fileUrl":"/api/file/download/%s"%file.file_name
+                    "uid": file.file_id,
+                    "status": file.status,
+                    "name": file.file_name_desc,
+                    "url": "/api/file/download/%s" % file.file_name
                     } for file in pictures ]
                 }
             emergency_drill_list.append(emergency_drill)
@@ -423,46 +427,46 @@ async def create_emergency_drill(
         db.refresh(new_drill)  # 可选，如果需要刷新实例状态
 
         for file in form_data.drillProject:
-            file_name = file.fileName
-            file_name_desc = file.fileNameDesc
-            file_path = file.filePath
+            file_name = file.url
+            file_name_desc = file.name
+            status = file.status
             new_file = EmergencyFile(
                 file_id = new_guid(),
                 foreign_key = new_drill.drill_id,
                 from_scenario = 'emergencyPlans_drill_project',
                 file_name=file_name,
                 file_name_desc = file_name_desc,
-                file_path = file_path
+                status = status
             )
             db.add(new_file)
             db.commit()
             db.refresh(new_file)
         for file in form_data.drillVideo:
-            file_name = file.fileName
-            file_name_desc = file.fileNameDesc
-            file_path = file.filePath
+            file_name = file.url
+            file_name_desc = file.name
+            status = file.status
             new_file = EmergencyFile(
                 file_id = new_guid(),
                 foreign_key = new_drill.drill_id,
                 from_scenario = 'emergencyPlans_drill_video',
                 file_name=file_name,
-                file_name_desc = file_name_desc,
-                file_path = file_path
+                file_name_desc=file_name_desc,
+                status=status
             )
             db.add(new_file)
             db.commit()
             db.refresh(new_file)
         for file in form_data.drillPicture:
-            file_name = file.fileName
-            file_name_desc = file.fileNameDesc
-            file_path = file.filePath
+            file_name = file.url
+            file_name_desc = file.name
+            status = file.status
             new_file = EmergencyFile(
                 file_id = new_guid(),
                 foreign_key = new_drill.drill_id,
                 from_scenario = 'emergencyPlans_drill_pic',
                 file_name=file_name,
                 file_name_desc = file_name_desc,
-                file_path = file_path
+                status = status
             )
             db.add(new_file)
             db.commit()