Bladeren bron

250314-2代码。

baoyubo 2 maanden geleden
bovenliggende
commit
31c14cfe33
2 gewijzigde bestanden met toevoegingen van 25 en 22 verwijderingen
  1. 23 20
      routers/api/eventManagement/event.py
  2. 2 2
      routers/api/videoResource/tag/__init__.py

+ 23 - 20
routers/api/eventManagement/event.py

@@ -1,4 +1,4 @@
-from fastapi import APIRouter, Request, Depends, HTTPException, Query, BackgroundTasks
+from fastapi import APIRouter, Request, Depends, HTTPException, Query, BackgroundTasks,status
 from sqlalchemy.exc import IntegrityError
 from fastapi.responses import HTMLResponse, FileResponse
 from fastapi.responses import JSONResponse
@@ -211,28 +211,31 @@ async def post_edit_event(
     body = Depends(remove_xss_json), 
     db: Session = Depends(get_db),
     user_id = Depends(valid_access_token)):
+    try:
+        eventId = body['eventId']
+        del body['eventId']
+        body['recorded_by'] = user_id
 
-    eventId = body['eventId']
-    del body['eventId']
-    body['recorded_by'] = user_id
-
-    # 未上报时清空伤亡人数
-    if body['casualties'] == '0':
-        body['deaths'] = None
-        body['injuries'] = None
-        body['missing'] = None
-
-    if 'deaths' in body or 'injuries' in body or 'missing' in body:
-        body['casualties'] = '1'
-        
-    db.query(EventBase).filter(EventBase.event_code == eventId).update(body)
-    db.commit()
+        # 未上报时清空伤亡人数
+        if body['casualties'] == '0':
+            body['deaths'] = None
+            body['injuries'] = None
+            body['missing'] = None
 
-    return {
-        "code": 200,
-        "msg": "保存事件成功"
-    }
+        if 'deaths' in body or 'injuries' in body or 'missing' in body:
+            body['casualties'] = '1'
+        # print(body)
+        db.query(EventBase).filter(EventBase.event_code == eventId).update(body)
+        db.commit()
 
+        return {
+            "code": 200,
+            "msg": "保存事件成功"
+        }
+    except Exception as e:
+        # 处理异常
+        traceback.print_exc()
+        raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e))
 @router.post("/uploadEventCasualties")
 async def uploadEventCasualties(
     request: Request, 

+ 2 - 2
routers/api/videoResource/tag/__init__.py

@@ -126,12 +126,12 @@ async def create_dict_data(
     try:
         # 创建一个新的 SysDictData 实例
         dict_label = body['dict_label']
-        dict_info = dict_label_get_dict_data_info(db, 'dict_type', dict_label)
+        dict_info = dict_label_get_dict_data_info(db, 'video_type', dict_label)
         if dict_info is None:
             new_dict_data = SysDictData(
                 dict_label=dict_label,
                 dict_value=new_guid(),
-                dict_type='dict_type',
+                dict_type='video_type',
                 list_class='default',
                 create_by=user_id
             )