From 0cee737d4c1e46ea9f43389684b70b5bfa209289 Mon Sep 17 00:00:00 2001
From: haotian <2421912570@qq.com>
Date: Thu, 25 Sep 2025 16:54:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-fastapi-backend/.env.dev                  |  4 ++--
 ruoyi-fastapi-backend/004测试compreface方法.py  |  2 +-
 ruoyi-fastapi-backend/config/env.py             |  4 ++--
 .../controller/config_controller.py             |  4 ++--
 .../controller/robot_role_pairing_controller.py | 17 +++++++++++++----
 .../module_admin/service/user_service.py        |  2 +-
 ruoyi-fastapi-backend/utils/compreface_util.py  |  1 +
 7 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/ruoyi-fastapi-backend/.env.dev b/ruoyi-fastapi-backend/.env.dev
index 7a87d0e..2b2de23 100644
--- a/ruoyi-fastapi-backend/.env.dev
+++ b/ruoyi-fastapi-backend/.env.dev
@@ -134,8 +134,8 @@ RAGFLOW_API_KEY = "ragflow-hlMjRmNzE2ODNiNTExZjA4ZTNlMDI0Mm"
 #-------------------compreface配置-------------------
 COMPREFACE_BASE_URL = "http://10.0.0.202"
 COMPERFACE_BASE_PORT = "8000"
-COMPREFACE_API_KEY = "ca1c8b20-a914-4e9e-8674-3cc3d04b3132"
-COMPREFACE_API_KEY_DETECTION = "8437c714-43cd-42f6-8b18-a2114b024e57"
+COMPREFACE_API_KEY = "a5924457-62c9-47dc-a6e7-15462c502d2c"
+COMPREFACE_API_KEY_DETECTION = "070283a2-faa3-423b-9772-2cd48ecc5362"
 COMPREFACE_FACE_FILE = "./image_face"
 COMPREFACE_SIMILARITY_THRESHOLD = 0.995
 #-------------------compreface配置end-------------------
\ No newline at end of file
diff --git a/ruoyi-fastapi-backend/004测试compreface方法.py b/ruoyi-fastapi-backend/004测试compreface方法.py
index 41c9dc0..aba0084 100644
--- a/ruoyi-fastapi-backend/004测试compreface方法.py
+++ b/ruoyi-fastapi-backend/004测试compreface方法.py
@@ -21,7 +21,7 @@ with open(image_path, "rb") as f:
 #                 "det_prob_threshold": 0.8,
 #                 "prediction_count": 1,
 #                 # 可选参数 age,gender,landmarks,calculator
-#                 "face_plugins": "age,gender,landmarks",
+#                 "face_plugins": "gender",
 #                 "status": "true",
 #             },
 #         )
diff --git a/ruoyi-fastapi-backend/config/env.py b/ruoyi-fastapi-backend/config/env.py
index 8c802a4..e13921a 100644
--- a/ruoyi-fastapi-backend/config/env.py
+++ b/ruoyi-fastapi-backend/config/env.py
@@ -155,8 +155,8 @@ class ComprefaceSettings:
     """
     COMPREFACE_BASE_URL = "http://10.0.0.202"
     COMPERFACE_BASE_PORT = "8000"
-    COMPREFACE_API_KEY = "ca1c8b20-a914-4e9e-8674-3cc3d04b3132"
-    COMPREFACE_API_KEY_DETECTION = "8437c714-43cd-42f6-8b18-a2114b024e57"
+    COMPREFACE_API_KEY = "a5924457-62c9-47dc-a6e7-15462c502d2c"
+    COMPREFACE_API_KEY_DETECTION = "070283a2-faa3-423b-9772-2cd48ecc5362"
     COMPREFACE_FACE_FILE = "./image_face"
     COMPREFACE_SIMILARITY_THRESHOLD = 0.995
     
diff --git a/ruoyi-fastapi-backend/module_admin/controller/config_controller.py b/ruoyi-fastapi-backend/module_admin/controller/config_controller.py
index 747dff2..9b0184e 100644
--- a/ruoyi-fastapi-backend/module_admin/controller/config_controller.py
+++ b/ruoyi-fastapi-backend/module_admin/controller/config_controller.py
@@ -10,7 +10,7 @@ from module_admin.entity.vo.config_vo import ConfigModel, ConfigPageQueryModel,
 from module_admin.entity.vo.user_vo import CurrentUserModel
 from module_admin.service.config_service import ConfigService
 from module_admin.service.login_service import LoginService
-from utils.common_util import bytes2file_response
+from utils.common_util import bytes2file_response, export_list2excel
 from utils.log_util import logger
 from utils.page_util import PageResponseModel
 from utils.response_util import ResponseUtil
@@ -120,4 +120,4 @@ async def export_system_config_list(
     config_export_result = await ConfigService.export_config_list_services(config_query_result)
     logger.info('导出成功')
 
-    return ResponseUtil.streaming(data=bytes2file_response(config_export_result))
+    return ResponseUtil.streaming(data=export_list2excel(config_export_result))
diff --git a/ruoyi-fastapi-backend/module_admin/controller/robot_role_pairing_controller.py b/ruoyi-fastapi-backend/module_admin/controller/robot_role_pairing_controller.py
index afadb26..18a0670 100644
--- a/ruoyi-fastapi-backend/module_admin/controller/robot_role_pairing_controller.py
+++ b/ruoyi-fastapi-backend/module_admin/controller/robot_role_pairing_controller.py
@@ -1,4 +1,4 @@
-from fastapi import APIRouter, Depends, Form, Request
+from fastapi import APIRouter, Depends, Form, Request, Response
 from pydantic_validation_decorator import ValidateFields
 from sqlalchemy.ext.asyncio import AsyncSession
 from config.enums import BusinessType
@@ -11,14 +11,16 @@ from module_admin.service.login_service import LoginService
 from module_admin.service.robot_role_pairing_service import PairingService
 from module_admin.entity.vo.robot_role_pairing_vo import DeletePairingModel, PairingModel, PairingPageQueryModel, \
     ChangeRobotRoleModel
-from utils.common_util import bytes2file_response
+from utils.common_util import bytes2file_response, export_list2excel
 from utils.log_util import logger
 from utils.page_util import PageResponseModel
 from utils.response_util import ResponseUtil
 from datetime import datetime
 
 
-pairingController = APIRouter(prefix='/system/robot_role', dependencies=[Depends(LoginService.get_current_user)])
+pairingController = APIRouter(prefix='/system/robot_role'
+                            #   , dependencies=[Depends(LoginService.get_current_user)]
+                              )
 
 
 # 获取机器人角色
@@ -142,5 +144,12 @@ async def change_robot_role(
 #     pairing_query_result = await PairingService.get_pairing_list_services(query_db, pairing_page_query, is_page=False)
 #     pairing_export_result = await PairingService.export_pairing_list_services(pairing_query_result)
 #     logger.info('导出成功')
-#
+
+#     # return Response(
+#     #     content=pairing_export_result,
+#     #     media_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+#     #     headers={
+#     #         "Content-Disposition": "attachment; filename=export.xlsx"
+#     #     }
+#     # )
 #     return ResponseUtil.streaming(data=bytes2file_response(pairing_export_result))
diff --git a/ruoyi-fastapi-backend/module_admin/service/user_service.py b/ruoyi-fastapi-backend/module_admin/service/user_service.py
index 60f77c6..f269d3f 100644
--- a/ruoyi-fastapi-backend/module_admin/service/user_service.py
+++ b/ruoyi-fastapi-backend/module_admin/service/user_service.py
@@ -494,7 +494,7 @@ class UserService:
         }
 
         for item in user_list:
-            item['deptName'] = item.get('dept').get('deptName')
+            # item['deptName'] = item.get('dept').get('deptName')
             if item.get('status') == '0':
                 item['status'] = '正常'
             else:
diff --git a/ruoyi-fastapi-backend/utils/compreface_util.py b/ruoyi-fastapi-backend/utils/compreface_util.py
index e604cc6..67634f9 100644
--- a/ruoyi-fastapi-backend/utils/compreface_util.py
+++ b/ruoyi-fastapi-backend/utils/compreface_util.py
@@ -68,6 +68,7 @@ class ComprefaceUtil:
 
         client_url: str = RECOGNIZE_API
         url: str = ComprefaceConfig.COMPREFACE_BASE_URL + ':' + ComprefaceConfig.COMPERFACE_BASE_PORT + client_url+"?"
+        # url: str = "http://10.0.0.202:8000/api/v1/recognition/recognize?face_plugins=landmarks&face_plugins=gender&face_plugins=age&face_plugins=pose"
         
         for key in options.keys():
             # Checks fields with necessary rules.