haotian/kangda_robot_backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改一些bug

Browse Source
This commit is contained in:
haotian 2025-09-25 16:54:49 +08:00
parent b0186dfbb2
commit 0cee737d4c
7 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-fastapi-backend/.env.dev
View File

@ -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-------------------

2
ruoyi-fastapi-backend/004测试compreface方法.py
View File

@ -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",
# },
# )

4
ruoyi-fastapi-backend/config/env.py
View File

@ -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

4
ruoyi-fastapi-backend/module_admin/controller/config_controller.py
View File

@ -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))

17
ruoyi-fastapi-backend/module_admin/controller/robot_role_pairing_controller.py
View File

@ -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))

2
ruoyi-fastapi-backend/module_admin/service/user_service.py
View File

@ -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:

1
ruoyi-fastapi-backend/utils/compreface_util.py
View File

@ -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.