diff --git a/ruoyi-fastapi-backend/module_admin/controller/door_controller.py b/ruoyi-fastapi-backend/module_admin/controller/door_controller.py index ea24d68..73eec49 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/door_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/door_controller.py @@ -88,6 +88,8 @@ async def delete_system_door(request: Request, ids: str, query_db: AsyncSession return ResponseUtil.success(msg=delete_door_result.message) +# 视频流地址 + # @doorController.get( # '/{id}', response_model=DoorModel, dependencies=[Depends(CheckUserInterfaceAuth('system:door:query'))] diff --git a/ruoyi-fastapi-backend/module_admin/controller/identification_statistics_controller.py b/ruoyi-fastapi-backend/module_admin/controller/identification_statistics_controller.py new file mode 100644 index 0000000..b6ea3b9 --- /dev/null +++ b/ruoyi-fastapi-backend/module_admin/controller/identification_statistics_controller.py @@ -0,0 +1,103 @@ +from datetime import datetime +from fastapi import APIRouter, Depends, Form, Request +from pydantic_validation_decorator import ValidateFields +from sqlalchemy.ext.asyncio import AsyncSession +from config.enums import BusinessType +from config.get_db import get_db +from module_admin.annotation.log_annotation import Log +from module_admin.aspect.interface_auth import CheckUserInterfaceAuth +from module_admin.entity.vo.user_vo import CurrentUserModel +from module_admin.service.login_service import LoginService +from module_admin.service.identification_statistics_service import Identification_statisticsService +from module_admin.entity.vo.identification_statistics_vo import DeleteIdentification_statisticsModel, Identification_statisticsModel, Identification_statisticsPageQueryModel +from utils.common_util import bytes2file_response +from utils.log_util import logger +from utils.page_util import PageResponseModel +from utils.response_util import ResponseUtil + + +identification_statisticsController = APIRouter(prefix='/system/identification_statistics', dependencies=[Depends(LoginService.get_current_user)]) + + +# @identification_statisticsController.get( +# '/list', response_model=PageResponseModel, dependencies=[Depends(CheckUserInterfaceAuth('system:identification_statistics:list'))] +# ) +# async def get_system_identification_statistics_list( +# request: Request, +# identification_statistics_page_query: Identification_statisticsPageQueryModel = Depends(Identification_statisticsPageQueryModel.as_query), +# query_db: AsyncSession = Depends(get_db), +# ): +# # 获取分页数据 +# identification_statistics_page_query_result = await Identification_statisticsService.get_identification_statistics_list_services(query_db, identification_statistics_page_query, is_page=True) +# logger.info('获取成功') + +# return ResponseUtil.success(model_content=identification_statistics_page_query_result) + + +# @identification_statisticsController.post('', dependencies=[Depends(CheckUserInterfaceAuth('system:identification_statistics:add'))]) +# @ValidateFields(validate_model='add_identification_statistics') +# @Log(title='识别统计', business_type=BusinessType.INSERT) +# async def add_system_identification_statistics( +# request: Request, +# add_identification_statistics: Identification_statisticsModel, +# query_db: AsyncSession = Depends(get_db), +# current_user: CurrentUserModel = Depends(LoginService.get_current_user), +# ): +# add_identification_statistics.create_time = datetime.now() +# add_identification_statistics.create_by = current_user.user.user_name +# add_identification_statistics_result = await Identification_statisticsService.add_identification_statistics_services(query_db, add_identification_statistics) +# logger.info(add_identification_statistics_result.message) + +# return ResponseUtil.success(msg=add_identification_statistics_result.message) + + +# @identification_statisticsController.put('', dependencies=[Depends(CheckUserInterfaceAuth('system:identification_statistics:edit'))]) +# @ValidateFields(validate_model='edit_identification_statistics') +# @Log(title='识别统计', business_type=BusinessType.UPDATE) +# async def edit_system_identification_statistics( +# request: Request, +# edit_identification_statistics: Identification_statisticsModel, +# query_db: AsyncSession = Depends(get_db), +# current_user: CurrentUserModel = Depends(LoginService.get_current_user), +# ): +# edit_identification_statistics.update_by = current_user.user.user_name +# edit_identification_statistics.update_time = datetime.now() +# edit_identification_statistics_result = await Identification_statisticsService.edit_identification_statistics_services(query_db, edit_identification_statistics) +# logger.info(edit_identification_statistics_result.message) + +# return ResponseUtil.success(msg=edit_identification_statistics_result.message) + + +# @identification_statisticsController.delete('/{ids}', dependencies=[Depends(CheckUserInterfaceAuth('system:identification_statistics:remove'))]) +# @Log(title='识别统计', business_type=BusinessType.DELETE) +# async def delete_system_identification_statistics(request: Request, ids: str, query_db: AsyncSession = Depends(get_db)): +# delete_identification_statistics = DeleteIdentification_statisticsModel(ids=ids) +# delete_identification_statistics_result = await Identification_statisticsService.delete_identification_statistics_services(query_db, delete_identification_statistics) +# logger.info(delete_identification_statistics_result.message) + +# return ResponseUtil.success(msg=delete_identification_statistics_result.message) + + +# @identification_statisticsController.get( +# '/{id}', response_model=Identification_statisticsModel, dependencies=[Depends(CheckUserInterfaceAuth('system:identification_statistics:query'))] +# ) +# async def query_detail_system_identification_statistics(request: Request, id: int, query_db: AsyncSession = Depends(get_db)): +# identification_statistics_detail_result = await Identification_statisticsService.identification_statistics_detail_services(query_db, id) +# logger.info(f'获取id为{id}的信息成功') + +# return ResponseUtil.success(data=identification_statistics_detail_result) + + +# @identification_statisticsController.post('/export', dependencies=[Depends(CheckUserInterfaceAuth('system:identification_statistics:export'))]) +# @Log(title='识别统计', business_type=BusinessType.EXPORT) +# async def export_system_identification_statistics_list( +# request: Request, +# identification_statistics_page_query: Identification_statisticsPageQueryModel = Form(), +# query_db: AsyncSession = Depends(get_db), +# ): +# # 获取全量数据 +# identification_statistics_query_result = await Identification_statisticsService.get_identification_statistics_list_services(query_db, identification_statistics_page_query, is_page=False) +# identification_statistics_export_result = await Identification_statisticsService.export_identification_statistics_list_services(identification_statistics_query_result) +# logger.info('导出成功') + +# return ResponseUtil.streaming(data=bytes2file_response(identification_statistics_export_result)) diff --git a/ruoyi-fastapi-backend/module_admin/dao/identification_statistics_dao.py b/ruoyi-fastapi-backend/module_admin/dao/identification_statistics_dao.py new file mode 100644 index 0000000..a190801 --- /dev/null +++ b/ruoyi-fastapi-backend/module_admin/dao/identification_statistics_dao.py @@ -0,0 +1,123 @@ +from datetime import datetime, time +from sqlalchemy import delete, select, update +from sqlalchemy.ext.asyncio import AsyncSession +from module_admin.entity.do.identification_statistics_do import IdentificationStatistics +from module_admin.entity.vo.identification_statistics_vo import Identification_statisticsModel, Identification_statisticsPageQueryModel +from utils.page_util import PageUtil + + +class Identification_statisticsDao: + """ + 识别统计模块数据库操作层 + """ + + @classmethod + async def get_identification_statistics_detail_by_id(cls, db: AsyncSession, id: int): + """ + 根据主键 自增获取识别统计详细信息 + + :param db: orm对象 + :param id: 主键 自增 + :return: 识别统计信息对象 + """ + identification_statistics_info = ( + ( + await db.execute( + select(IdentificationStatistics) + .where( + IdentificationStatistics.id == id + ) + ) + ) + .scalars() + .first() + ) + + return identification_statistics_info + + @classmethod + async def get_identification_statistics_detail_by_info(cls, db: AsyncSession, identification_statistics: Identification_statisticsModel): + """ + 根据识别统计参数获取识别统计信息 + + :param db: orm对象 + :param identification_statistics: 识别统计参数对象 + :return: 识别统计信息对象 + """ + identification_statistics_info = ( + ( + await db.execute( + select(IdentificationStatistics).where( + ) + ) + ) + .scalars() + .first() + ) + + return identification_statistics_info + + @classmethod + async def get_identification_statistics_list(cls, db: AsyncSession, query_object: Identification_statisticsPageQueryModel, is_page: bool = False): + """ + 根据查询参数获取识别统计列表信息 + + :param db: orm对象 + :param query_object: 查询参数对象 + :param is_page: 是否开启分页 + :return: 识别统计列表信息对象 + """ + query = ( + select(IdentificationStatistics) + .where( + IdentificationStatistics.create_time.between( + datetime.combine(datetime.strptime(query_object.begin_create_time, '%Y-%m-%d'), time(00, 00, 00)), + datetime.combine(datetime.strptime(query_object.end_create_time, '%Y-%m-%d'), time(23, 59, 59)), + ) + if query_object.begin_create_time and query_object.end_create_time + else True, + ) + .order_by(IdentificationStatistics.id) + .distinct() + ) + identification_statistics_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page) + + return identification_statistics_list + + @classmethod + async def add_identification_statistics_dao(cls, db: AsyncSession, identification_statistics: Identification_statisticsModel): + """ + 新增识别统计数据库操作 + + :param db: orm对象 + :param identification_statistics: 识别统计对象 + :return: + """ + db_identification_statistics = IdentificationStatistics(**identification_statistics.model_dump(exclude={})) + db.add(db_identification_statistics) + await db.flush() + + return db_identification_statistics + + @classmethod + async def edit_identification_statistics_dao(cls, db: AsyncSession, identification_statistics: dict): + """ + 编辑识别统计数据库操作 + + :param db: orm对象 + :param identification_statistics: 需要更新的识别统计字典 + :return: + """ + await db.execute(update(IdentificationStatistics), [identification_statistics]) + + @classmethod + async def delete_identification_statistics_dao(cls, db: AsyncSession, identification_statistics: Identification_statisticsModel): + """ + 删除识别统计数据库操作 + + :param db: orm对象 + :param identification_statistics: 识别统计对象 + :return: + """ + await db.execute(delete(IdentificationStatistics).where(IdentificationStatistics.id.in_([identification_statistics.id]))) + diff --git a/ruoyi-fastapi-backend/module_admin/entity/do/identification_statistics_do.py b/ruoyi-fastapi-backend/module_admin/entity/do/identification_statistics_do.py new file mode 100644 index 0000000..d43c5a9 --- /dev/null +++ b/ruoyi-fastapi-backend/module_admin/entity/do/identification_statistics_do.py @@ -0,0 +1,20 @@ +from sqlalchemy import String, Column, BigInteger, DateTime +from config.database import Base + + +class IdentificationStatistics(Base): + """ + 识别统计表 + """ + + __tablename__ = 'identification_statistics' + + id = Column(BigInteger, primary_key=True, autoincrement=True, nullable=False, comment='主键 自增') + employ = Column(BigInteger, nullable=True, comment='员工识别成功数') + visitor = Column(BigInteger, nullable=True, comment='访客识别成功数') + stranger = Column(BigInteger, nullable=True, comment='位置人员识别失败数') + create_time = Column(DateTime, nullable=True, comment='创建时间') + create_by = Column(String(64), nullable=True, comment='创建者') + + + diff --git a/ruoyi-fastapi-backend/module_admin/entity/vo/identification_statistics_vo.py b/ruoyi-fastapi-backend/module_admin/entity/vo/identification_statistics_vo.py new file mode 100644 index 0000000..c9d6992 --- /dev/null +++ b/ruoyi-fastapi-backend/module_admin/entity/vo/identification_statistics_vo.py @@ -0,0 +1,53 @@ +from datetime import datetime +from pydantic import BaseModel, ConfigDict, Field +from pydantic.alias_generators import to_camel +from typing import Optional +from module_admin.annotation.pydantic_annotation import as_query + + + + +class Identification_statisticsModel(BaseModel): + """ + 识别统计表对应pydantic模型 + """ + model_config = ConfigDict(alias_generator=to_camel, from_attributes=True) + + id: Optional[int] = Field(default=None, description='主键 自增') + employ: Optional[int] = Field(default=None, description='员工识别成功数') + visitor: Optional[int] = Field(default=None, description='访客识别成功数') + stranger: Optional[int] = Field(default=None, description='位置人员识别失败数') + create_time: Optional[datetime] = Field(default=None, description='创建时间') + create_by: Optional[str] = Field(default=None, description='创建者') + + + + + + +class Identification_statisticsQueryModel(Identification_statisticsModel): + """ + 识别统计不分页查询模型 + """ + begin_create_time: Optional[str] = Field(default=None, description='开始创建时间') + end_create_time: Optional[str] = Field(default=None, description='结束创建时间') + + +@as_query +class Identification_statisticsPageQueryModel(Identification_statisticsQueryModel): + """ + 识别统计分页查询模型 + """ + + page_num: int = Field(default=1, description='当前页码') + page_size: int = Field(default=10, description='每页记录数') + + +class DeleteIdentification_statisticsModel(BaseModel): + """ + 删除识别统计模型 + """ + + model_config = ConfigDict(alias_generator=to_camel) + + ids: str = Field(description='需要删除的主键 自增') diff --git a/ruoyi-fastapi-backend/module_admin/service/door_service.py b/ruoyi-fastapi-backend/module_admin/service/door_service.py index f8063ab..21cb22f 100644 --- a/ruoyi-fastapi-backend/module_admin/service/door_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/door_service.py @@ -27,6 +27,8 @@ class DoorService: :return: 门禁设备列表信息对象 """ door_list_result = await DoorDao.get_door_list(query_db, query_object, is_page) + + # 获取门禁在线状态 return door_list_result diff --git a/ruoyi-fastapi-backend/module_admin/service/identification_statistics_service.py b/ruoyi-fastapi-backend/module_admin/service/identification_statistics_service.py new file mode 100644 index 0000000..a10f59e --- /dev/null +++ b/ruoyi-fastapi-backend/module_admin/service/identification_statistics_service.py @@ -0,0 +1,131 @@ +from sqlalchemy.ext.asyncio import AsyncSession +from typing import List +from config.constant import CommonConstant +from exceptions.exception import ServiceException +from module_admin.entity.vo.common_vo import CrudResponseModel +from module_admin.dao.identification_statistics_dao import Identification_statisticsDao +from module_admin.entity.vo.identification_statistics_vo import DeleteIdentification_statisticsModel, Identification_statisticsModel, Identification_statisticsPageQueryModel +from utils.common_util import CamelCaseUtil +from utils.excel_util import ExcelUtil + + +class Identification_statisticsService: + """ + 识别统计模块服务层 + """ + + @classmethod + async def get_identification_statistics_list_services( + cls, query_db: AsyncSession, query_object: Identification_statisticsPageQueryModel, is_page: bool = False + ): + """ + 获取识别统计列表信息service + + :param query_db: orm对象 + :param query_object: 查询参数对象 + :param is_page: 是否开启分页 + :return: 识别统计列表信息对象 + """ + identification_statistics_list_result = await Identification_statisticsDao.get_identification_statistics_list(query_db, query_object, is_page) + + return identification_statistics_list_result + + + @classmethod + async def add_identification_statistics_services(cls, query_db: AsyncSession, page_object: Identification_statisticsModel): + """ + 新增识别统计信息service + + :param query_db: orm对象 + :param page_object: 新增识别统计对象 + :return: 新增识别统计校验结果 + """ + try: + await Identification_statisticsDao.add_identification_statistics_dao(query_db, page_object) + await query_db.commit() + return CrudResponseModel(is_success=True, message='新增成功') + except Exception as e: + await query_db.rollback() + raise e + + @classmethod + async def edit_identification_statistics_services(cls, query_db: AsyncSession, page_object: Identification_statisticsModel): + """ + 编辑识别统计信息service + + :param query_db: orm对象 + :param page_object: 编辑识别统计对象 + :return: 编辑识别统计校验结果 + """ + edit_identification_statistics = page_object.model_dump(exclude_unset=True, exclude={'create_time', 'create_by'}) + identification_statistics_info = await cls.identification_statistics_detail_services(query_db, page_object.id) + if identification_statistics_info.id: + try: + await Identification_statisticsDao.edit_identification_statistics_dao(query_db, edit_identification_statistics) + await query_db.commit() + return CrudResponseModel(is_success=True, message='更新成功') + except Exception as e: + await query_db.rollback() + raise e + else: + raise ServiceException(message='识别统计不存在') + + @classmethod + async def delete_identification_statistics_services(cls, query_db: AsyncSession, page_object: DeleteIdentification_statisticsModel): + """ + 删除识别统计信息service + + :param query_db: orm对象 + :param page_object: 删除识别统计对象 + :return: 删除识别统计校验结果 + """ + if page_object.ids: + id_list = page_object.ids.split(',') + try: + for id in id_list: + await Identification_statisticsDao.delete_identification_statistics_dao(query_db, Identification_statisticsModel(id=id)) + await query_db.commit() + return CrudResponseModel(is_success=True, message='删除成功') + except Exception as e: + await query_db.rollback() + raise e + else: + raise ServiceException(message='传入主键 自增为空') + + @classmethod + async def identification_statistics_detail_services(cls, query_db: AsyncSession, id: int): + """ + 获取识别统计详细信息service + + :param query_db: orm对象 + :param id: 主键 自增 + :return: 主键 自增对应的信息 + """ + identification_statistics = await Identification_statisticsDao.get_identification_statistics_detail_by_id(query_db, id=id) + if identification_statistics: + result = Identification_statisticsModel(**CamelCaseUtil.transform_result(identification_statistics)) + else: + result = Identification_statisticsModel(**dict()) + + return result + + @staticmethod + async def export_identification_statistics_list_services(identification_statistics_list: List): + """ + 导出识别统计信息service + + :param identification_statistics_list: 识别统计信息列表 + :return: 识别统计信息对应excel的二进制数据 + """ + # 创建一个映射字典，将英文键映射到中文键 + mapping_dict = { + 'id': '主键 自增', + 'employ': '员工识别成功数', + 'visitor': '访客识别成功数', + 'stranger': '位置人员识别失败数', + 'createTime': '创建时间', + 'createBy': '创建者', + } + binary_data = ExcelUtil.export_list2excel(identification_statistics_list, mapping_dict) + + return binary_data