821优化

models/yjya_base.py

@@ -90,7 +90,7 @@ class EmergencyTrainingSession(Base):
     end_time = Column(DateTime, comment='培训结束时间')
     training_location = Column(String(255), comment='培训地点')
     training_content = Column(Text, nullable=False, comment='培训内容')
-    drill_lon = Column(Numeric(9, 6), comment='培训经度')
-    drill_lat = Column(Numeric(9, 6), comment='培训纬度')
+    training_lon = Column(Numeric(9, 6), comment='培训经度')
+    training_lat = Column(Numeric(9, 6), comment='培训纬度')
     plan_number = Column(String(50), nullable=False,comment='预案编号')
     del_flag = Column(String(1), default='0', comment='删除标志（0代表存在 2代表删除）')

routers/api/emergencyPlans/__init__.py

@@ -30,14 +30,14 @@ class PlanCreateForm(BaseModel):
     fileList : List[File] = []
 
 class DrillCreateForm(BaseModel):
-    planNumber : str
+    planId : str
     drillName : str
-    organizingUnit : str
-    plannedAnnual : int
-    plannedTime: str
-    drillLocation : str
-    drillLon : float
-    drillLat : float
+    drillUnit : str
+    year : int
+    drillTime: str
+    drillAddress : str
+    lon : float
+    lat : float
     drillProject : List[File] = []
     drillVideo : List[File] = []
     drillPicture : List[File] = []
@@ -49,7 +49,7 @@ async def get_emergency_plan_list(
     publishDate: datetime = Query(None, description='发布日期'),
     planName: str = Query(None, description='预案名称'),
     page: int = Query(1, gt=0, description='页码'),
-    pageSize: int = Query(10, gt=0, description='每页条目数量'),
+    pageSize: int = Query(5, gt=0, description='每页条目数量'),
     db: Session = Depends(get_db)
 ):
     try:
@@ -290,7 +290,7 @@ async def create_emergency_plan(
 async def get_emergency_drill_list(
     planNum: str = Query(None, description='预案编号'),
     page: int = Query(1, gt=0, description='页码'),
-    pageSize: int = Query(10, gt=0, description='每页条目数量'),
+    pageSize: int = Query(5, gt=0, description='每页条目数量'),
     db: Session = Depends(get_db)
 ):
     try:
@@ -314,23 +314,23 @@ async def get_emergency_drill_list(
         for drill in emergency_drill:
             project_query = db.query(EmergencyFile)
             project_query = project_query.filter(EmergencyFile.del_flag != '2')
-            project_query = project_query.filter(EmergencyFile.from_scenario == 'emergencyPlans_plan')
-            project_query = project_query.filter(EmergencyFile.foreign_key == emergency_plan.plan_id)
+            project_query = project_query.filter(EmergencyFile.from_scenario == 'emergencyPlans_drill_project')
+            project_query = project_query.filter(EmergencyFile.foreign_key == drill.drill_id)
             projects = project_query.all()
 
             video_query = db.query(EmergencyFile)
             video_query = video_query.filter(EmergencyFile.del_flag != '2')
-            video_query = video_query.filter(EmergencyFile.from_scenario == 'emergencyPlans_plan')
-            video_query = video_query.filter(EmergencyFile.foreign_key == emergency_plan.plan_id)
+            video_query = video_query.filter(EmergencyFile.from_scenario == 'emergencyPlans_drill_video')
+            video_query = video_query.filter(EmergencyFile.foreign_key == drill.drill_id)
             videos = video_query.all()
 
             picture_query = db.query(EmergencyFile)
             picture_query = picture_query.filter(EmergencyFile.del_flag != '2')
-            picture_query = picture_query.filter(EmergencyFile.from_scenario == 'emergencyPlans_plan')
-            picture_query = picture_query.filter(EmergencyFile.foreign_key == emergency_plan.plan_id)
+            picture_query = picture_query.filter(EmergencyFile.from_scenario == 'emergencyPlans_drill_pic')
+            picture_query = picture_query.filter(EmergencyFile.foreign_key == drill.drill_id)
             pictures = picture_query.all()
 
-            {
+            emergency_drill = {
                 "drillId": drill.drill_id,
                 "drillName": drill.drill_name,
                 "drillUnit": drill.organizing_unit,
@@ -341,19 +341,19 @@ async def get_emergency_drill_list(
                     "fileName":file.file_name,
                     "fileNameDesc":file.file_name_desc,
                     "fileUrl":"/api/file/download/%s"%file.file_name
-                } for file in projects ],
+                    } for file in projects ],
                 "drillVideo":[{
                     "fileName":file.file_name,
                     "fileNameDesc":file.file_name_desc,
                     "fileUrl":"/api/file/download/%s"%file.file_name
-                } for file in videos ],
+                    } for file in videos ],
                 "drillPicture":[{
                     "fileName":file.file_name,
                     "fileNameDesc":file.file_name_desc,
                     "fileUrl":"/api/file/download/%s"%file.file_name
-                } for file in pictures ]
-            }
-
+                    } for file in pictures ]
+                }
+            emergency_drill_list.append(emergency_drill)
 
 
 
@@ -380,14 +380,14 @@ async def create_emergency_drill(
 ):
     try:
         # 提取请求数据
-        plan_number = form_data.planNumber
+        plan_number = form_data.planId
         drill_name = form_data.drillName
-        organizing_unit = form_data.organizingUnit
-        planned_annual = form_data.plannedAnnual
-        planned_time = form_data.plannedTime
-        drill_location = form_data.drillLocation
-        drill_lon = form_data.drillLon
-        drill_lat = form_data.drillLat
+        organizing_unit = form_data.drillUnit
+        planned_annual = form_data.year
+        planned_time = form_data.drillTime
+        drill_location = form_data.drillAddress
+        drill_lon = form_data.lon
+        drill_lat = form_data.lat
 
 
         # 创建新的预案记录
@@ -471,7 +471,7 @@ async def create_emergency_drill(
 async def get_emergency_training_list(
     planNum: str = Query(None, description='预案编号'),
     page: int = Query(1, gt=0, description='页码'),
-    pageSize: int = Query(10, gt=0, description='每页条目数量'),
+    pageSize: int = Query(5, gt=0, description='每页条目数量'),
     db: Session = Depends(get_db)
 ):
     try:
@@ -522,16 +522,17 @@ async def get_emergency_training_list(
         raise HTTPException(status_code=500, detail=str(e))
 
 class TrainingCreateForm(BaseModel):
-    trainingTheme : str
-    trainingUnit : str
-    trainingMethod : str
-    participantCount: int
+    planId:str
+    theme : str
+    unitName : str
+    trainingWay : str
+    peopleNum: int
     startTime : str
     endTime : str
-    trainingContent :str
-    drillLocation : str
-    drillLon : float
-    drillLat : float
+    Content :str
+    address : str
+    lon : float
+    lat : float
 
 @router.post('/training/create')
 async def create_emergency_training(
@@ -542,22 +543,23 @@ async def create_emergency_training(
         # 创建新的预案记录
         new_training = EmergencyTrainingSession(
             training_id=new_guid(),  # 假设使用 UUID 作为预案 UID
-            training_theme=form_data.trainingTheme,
-            training_unit=form_data.trainingUnit,
-            training_method=form_data.trainingMethod,
-            participant_count=form_data.participantCount,
+            training_theme=form_data.theme,
+            training_unit=form_data.unitName,
+            training_method=form_data.trainingWay,
+            participant_count=form_data.peopleNum,
             start_time=form_data.startTime,
             end_time=form_data.endTime,
-            training_content=form_data.trainingContent,
-            drill_location=form_data.drillLocation,
-            drill_lon=form_data.drillLon,
-            drill_lat=form_data.drillLat
+            training_content=form_data.Content,
+            training_location=form_data.address,
+            training_lon=form_data.lon,
+            training_lat=form_data.lat,
+            plan_number = form_data.planId
         )
 
         # 添加到数据库会话并提交
         db.add(new_training)
         db.commit()
-        db.refresh(new_plan)  # 可选，如果需要刷新实例状态
+        db.refresh(new_training)  # 可选，如果需要刷新实例状态
 
         # 返回创建成功的响应
         return {