记录菜单、字典、预案最后操作者

routers/api/emergencyPlans/__init__.py

@@ -279,7 +279,8 @@ async def create_emergency_plan(
             # plan_type_desc=plan_type_desc,
             publish_date=publish_date,
             organizing_unit=organizing_unit,
-            document_number=document_number
+            document_number=document_number,
+            create_by = user_id
         )
 
         # 添加到数据库会话并提交
@@ -340,6 +341,9 @@ async def update_emergency_plan(
             for file in form_data.fileList:
                 create_file_fun(file=file,from_scenario='emergencyPlans_plan',foreign_key=plan.plan_id,db=db)
 
+        if user_id:
+            plan.create_by = user_id
+
         # 更新到数据库会话并提交
         db.commit()
         db.refresh(plan)  # 可选，如果需要刷新实例状态
@@ -374,7 +378,7 @@ async def delete_emergency_plans(
             raise HTTPException(status_code=404, detail="预案不存在")
         for plan in plans:
             plan.del_flag = '2'
-
+            plan.create_by=user_id
         # 更新到数据库会话并提交
         db.commit()
 
@@ -408,7 +412,7 @@ async def delete_emergency_plan(
             raise HTTPException(status_code=404, detail="预案不存在")
 
         plan.del_flag = '2'
-
+        plan.create_by = user_id
         # 更新到数据库会话并提交
         db.commit()
         db.refresh(plan)  # 可选，如果需要刷新实例状态
@@ -564,7 +568,8 @@ async def create_emergency_drill(
             planned_time = planned_time,
             drill_location = drill_location,
             drill_lon = drill_lon,
-            drill_lat = drill_lat
+            drill_lat = drill_lat,
+            create_by = user_id
         )
 
         # 添加到数据库会话并提交
@@ -644,6 +649,9 @@ async def update_emergency_drill(
             delete_file_fun(from_scenario='emergencyPlans_drill_pic', foreign_key=drill.drill_id, db=db)
             for file in form_data.drillPicture:
                 create_file_fun(file=file, from_scenario='emergencyPlans_drill_pic', foreign_key=drill.drill_id,db=db)
+
+        if user_id:
+            drill.create_by = user_id
         # 提交所有更新
         db.commit()
 
@@ -677,7 +685,7 @@ async def delete_emergency_drill(
 
         for drill in drills:
             drill.del_flag = '2'
-
+            drill.create_by=user_id
         # 更新到数据库会话并提交
         db.commit()
 
@@ -710,7 +718,7 @@ async def delete_emergency_drill(
             raise HTTPException(status_code=404, detail="演练不存在")
 
         drill.del_flag = '2'
-
+        drill.create_by = user_id
         # 更新到数据库会话并提交
         db.commit()
         db.refresh(drill)  # 可选，如果需要刷新实例状态
@@ -924,7 +932,8 @@ async def update_emergency_training(
         # 判断预案编号是否存在，存在即更新
         if form_data.lat:
             training.training_lat = form_data.lat
-
+        if user_id:
+            training.create_by = user_id
         # 提交
         db.commit()
 
@@ -957,7 +966,7 @@ async def delete_emergency_training(
 
         for training in trainings:
             training.del_flag = '2'
-
+            training.create_by = user_id
         # 更新到数据库会话并提交
         db.commit()
 
@@ -990,7 +999,7 @@ async def delete_emergency_training(
             raise HTTPException(status_code=404, detail="培训不存在")
 
         training.del_flag = '2'
-
+        training.create_by = user_id
         # 更新到数据库会话并提交
         db.commit()
         db.refresh(training)  # 可选，如果需要刷新实例状态

routers/prod_api/system/dic/__init__.py

@@ -158,7 +158,7 @@ async def create_dict_type(
     form_data: DictTypeCreateForm,
     db: Session = Depends(get_db),
     body = Depends(remove_xss_json),
-    user: AuthUser = Depends(get_auth_user)
+    user_id = Depends(valid_access_token)
 ):
     try:
         # 从请求数据创建一个新的 SysDictType 实例
@@ -198,7 +198,7 @@ async def updata_dict_type(
     form_data: DictTypeUpdataForm,
     db: Session = Depends(get_db),
     body = Depends(remove_xss_json),
-    user: AuthUser = Depends(get_auth_user)
+    user_id = Depends(valid_access_token)
 ):
     try:
         # 从请求数据创建一个新的 SysDictType 实例
@@ -234,7 +234,7 @@ async def delete_dict_type(
     dictId: int,
     db: Session = Depends(get_db),
     body = Depends(remove_xss_json),
-    user: AuthUser = Depends(get_auth_user)
+    user_id = Depends(valid_access_token)
 ):
     try:
         # 从数据库中获取要删除的 OneShareApiEntity 实例
@@ -268,7 +268,7 @@ async def get_dict_data_by_type(
     pageSize: int = Query(10, gt=0),
     db: Session = Depends(get_db),
     body = Depends(remove_xss_json),
-    user: AuthUser = Depends(get_auth_user)
+    user_id = Depends(valid_access_token)
 ):
     try:
         # 根据 dict_type 查询字典数据
@@ -331,7 +331,7 @@ async def create_dict_data(
     form_data: DictDataCreateForm,
     db: Session = Depends(get_db),
     body = Depends(remove_xss_json),
-    user: AuthUser = Depends(get_auth_user)
+    user_id = Depends(valid_access_token)
 ):
     try:
         # 创建一个新的 SysDictData 实例
@@ -366,7 +366,7 @@ async def get_dict_data_by_type(
     dict_type: str,
     db: Session = Depends(get_db),
     body = Depends(remove_xss_json),
-    user: AuthUser = Depends(get_auth_user)
+    user_id = Depends(valid_access_token)
 ):
     try:
         # 根据 dict_type 查询字典数据
@@ -420,7 +420,7 @@ async def updata_dict_type(
     form_data: DictDataUpdataForm,
     db: Session = Depends(get_db),
     body = Depends(remove_xss_json),
-    user: AuthUser = Depends(get_auth_user)
+    user_id = Depends(valid_access_token)
 ):
     try:
         # 从请求数据创建一个新的 SysDictType 实例
@@ -474,7 +474,7 @@ async def delete_dict_data(
     dictCode: str,
     db: Session = Depends(get_db),
     body = Depends(remove_xss_json),
-    user: AuthUser = Depends(get_auth_user)
+    user_id = Depends(valid_access_token)
 ):
     try:
         # 从数据库中获取要删除的 OneShareApiEntity 实例

routers/prod_api/system/menu/__init__.py

@@ -224,7 +224,7 @@ async def get_list(
     status: str =  Query(None, max_length=100),
     db: Session = Depends(get_db),
     body = Depends(remove_xss_json),
-    user: AuthUser = Depends(get_auth_user)
+    user_id = Depends(valid_access_token)
 ):
     query = db.query(SysMenu)
     query = query.filter(SysMenu.del_flag != '2')
@@ -291,7 +291,7 @@ async def get_list(
     menuid: str = Query(None, max_length=100),
     db: Session = Depends(get_db),
     body = Depends(remove_xss_json),
-    user: AuthUser = Depends(get_auth_user)
+    user_id = Depends(valid_access_token)
 ):
     query = db.query(SysMenu)
     query = query.filter(SysMenu.del_flag != '2')
@@ -366,7 +366,8 @@ async def create(
                             icon = form_data.icon,
                             component= form_data.component,
                             perms=form_data.perms,
-                            query_param=form_data.queryParam
+                            query_param=form_data.queryParam,
+                            create_by = user_id
                            )
         db.add(new_menu)
         db.commit()
@@ -441,6 +442,8 @@ async def update(
             menu.status=form_data.status
         if form_data.visible:
             menu.visible=form_data.visible
+        if user_id:
+            menu.create_by = user_id
         # for field, value in menu_data.items():
         #     if field != 'menu_id' and field in menu_to_update.__dict__:
         #         setattr(menu_to_update, field, value)
@@ -473,7 +476,7 @@ async def delete(
         if not menu_to_delete:
             detail = "菜单不存在"
             raise HTTPException(status_code=404, detail="菜单不存在")
-
+        menu_to_delete.create_by = user_id
         menu_to_delete.del_flag='2'
         # db.delete(menu_to_delete)
         db.commit()