diff --git a/ruoyi-fastapi-backend/module_admin/controller/door_controller.py b/ruoyi-fastapi-backend/module_admin/controller/door_controller.py new file mode 100644 index 0000000..67c8a44 --- /dev/null +++ b/ruoyi-fastapi-backend/module_admin/controller/door_controller.py @@ -0,0 +1,105 @@ +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.door_service import DoorService +from module_admin.entity.vo.door_vo import DeleteDoorModel, DoorModel, DoorPageQueryModel +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 + + +doorController = APIRouter(prefix='/system/door', dependencies=[Depends(LoginService.get_current_user)]) + + +@doorController.get( + '/list', response_model=PageResponseModel, dependencies=[Depends(CheckUserInterfaceAuth('system:door:list'))] +) +async def get_system_door_list( + request: Request, +door_page_query: DoorPageQueryModel = Depends(DoorPageQueryModel.as_query), + query_db: AsyncSession = Depends(get_db), +): + # 获取分页数据 + door_page_query_result = await DoorService.get_door_list_services(query_db, door_page_query, is_page=True) + logger.info('获取成功') + + return ResponseUtil.success(model_content=door_page_query_result) + + +@doorController.post('', dependencies=[Depends(CheckUserInterfaceAuth('system:door:add'))]) +@ValidateFields(validate_model='add_door') +@Log(title='门禁设备', business_type=BusinessType.INSERT) +async def add_system_door( + request: Request, + add_door: DoorModel, + query_db: AsyncSession = Depends(get_db), + current_user: CurrentUserModel = Depends(LoginService.get_current_user), +): + add_door.create_time = datetime.now() + add_door.create_by = current_user.user.user_name + add_door.update_time = datetime.now() + add_door.update_by = current_user.user.user_name + add_door_result = await DoorService.add_door_services(query_db, add_door) + logger.info(add_door_result.message) + + return ResponseUtil.success(msg=add_door_result.message) + + +@doorController.put('', dependencies=[Depends(CheckUserInterfaceAuth('system:door:edit'))]) +@ValidateFields(validate_model='edit_door') +@Log(title='门禁设备', business_type=BusinessType.UPDATE) +async def edit_system_door( + request: Request, + edit_door: DoorModel, + query_db: AsyncSession = Depends(get_db), + current_user: CurrentUserModel = Depends(LoginService.get_current_user), +): + edit_door.update_by = current_user.user.user_name + edit_door.update_time = datetime.now() + edit_door_result = await DoorService.edit_door_services(query_db, edit_door) + logger.info(edit_door_result.message) + + return ResponseUtil.success(msg=edit_door_result.message) + + +@doorController.delete('/{ids}', dependencies=[Depends(CheckUserInterfaceAuth('system:door:remove'))]) +@Log(title='门禁设备', business_type=BusinessType.DELETE) +async def delete_system_door(request: Request, ids: str, query_db: AsyncSession = Depends(get_db)): + delete_door = DeleteDoorModel(ids=ids) + delete_door_result = await DoorService.delete_door_services(query_db, delete_door) + logger.info(delete_door_result.message) + + return ResponseUtil.success(msg=delete_door_result.message) + + +@doorController.get( + '/{id}', response_model=DoorModel, dependencies=[Depends(CheckUserInterfaceAuth('system:door:query'))] +) +async def query_detail_system_door(request: Request, id: int, query_db: AsyncSession = Depends(get_db)): + door_detail_result = await DoorService.door_detail_services(query_db, id) + logger.info(f'获取id为{id}的信息成功') + + return ResponseUtil.success(data=door_detail_result) + + +@doorController.post('/export', dependencies=[Depends(CheckUserInterfaceAuth('system:door:export'))]) +@Log(title='门禁设备', business_type=BusinessType.EXPORT) +async def export_system_door_list( + request: Request, + door_page_query: DoorPageQueryModel = Form(), + query_db: AsyncSession = Depends(get_db), +): + # 获取全量数据 + door_query_result = await DoorService.get_door_list_services(query_db, door_page_query, is_page=False) + door_export_result = await DoorService.export_door_list_services(door_query_result) + logger.info('导出成功') + + return ResponseUtil.streaming(data=bytes2file_response(door_export_result)) diff --git a/ruoyi-fastapi-backend/module_admin/dao/door_dao.py b/ruoyi-fastapi-backend/module_admin/dao/door_dao.py new file mode 100644 index 0000000..bbd99ac --- /dev/null +++ b/ruoyi-fastapi-backend/module_admin/dao/door_dao.py @@ -0,0 +1,121 @@ +from sqlalchemy import delete, select, update +from sqlalchemy.ext.asyncio import AsyncSession +from module_admin.entity.do.door_do import Door +from module_admin.entity.vo.door_vo import DoorModel, DoorPageQueryModel +from utils.page_util import PageUtil + + +class DoorDao: + """ + 门禁设备模块数据库操作层 + """ + + @classmethod + async def get_door_detail_by_id(cls, db: AsyncSession, id: int): + """ + 根据主键自增获取门禁设备详细信息 + + :param db: orm对象 + :param id: 主键自增 + :return: 门禁设备信息对象 + """ + door_info = ( + ( + await db.execute( + select(Door) + .where( + Door.id == id + ) + ) + ) + .scalars() + .first() + ) + + return door_info + + @classmethod + async def get_door_detail_by_info(cls, db: AsyncSession, door: DoorModel): + """ + 根据门禁设备参数获取门禁设备信息 + + :param db: orm对象 + :param door: 门禁设备参数对象 + :return: 门禁设备信息对象 + """ + door_info = ( + ( + await db.execute( + select(Door).where( + ) + ) + ) + .scalars() + .first() + ) + + return door_info + + @classmethod + async def get_door_list(cls, db: AsyncSession, query_object: DoorPageQueryModel, is_page: bool = False): + """ + 根据查询参数获取门禁设备列表信息 + + :param db: orm对象 + :param query_object: 查询参数对象 + :param is_page: 是否开启分页 + :return: 门禁设备列表信息对象 + """ + query = ( + select(Door) + .where( + Door.index_code == query_object.index_code if query_object.index_code else True, + Door.name.like(f'%{query_object.name}%') if query_object.name else True, + Door.install_location.like(f'%{query_object.install_location}%') if query_object.install_location else True, + Door.status == query_object.status if query_object.status else True, + Door.permission == query_object.permission if query_object.permission else True, + ) + .order_by(Door.id) + .distinct() + ) + door_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page) + + return door_list + + @classmethod + async def add_door_dao(cls, db: AsyncSession, door: DoorModel): + """ + 新增门禁设备数据库操作 + + :param db: orm对象 + :param door: 门禁设备对象 + :return: + """ + db_door = Door(**door.model_dump(exclude={})) + db.add(db_door) + await db.flush() + + return db_door + + @classmethod + async def edit_door_dao(cls, db: AsyncSession, door: dict): + """ + 编辑门禁设备数据库操作 + + :param db: orm对象 + :param door: 需要更新的门禁设备字典 + :return: + """ + await db.execute(update(Door), [door]) + + @classmethod + async def delete_door_dao(cls, db: AsyncSession, door: DoorModel): + """ + 删除门禁设备数据库操作 + + :param db: orm对象 + :param door: 门禁设备对象 + :return: + """ + await db.execute(delete(Door).where(Door.id.in_([door.id]))) + diff --git a/ruoyi-fastapi-backend/module_admin/entity/do/door_do.py b/ruoyi-fastapi-backend/module_admin/entity/do/door_do.py new file mode 100644 index 0000000..fe4d4fd --- /dev/null +++ b/ruoyi-fastapi-backend/module_admin/entity/do/door_do.py @@ -0,0 +1,24 @@ +from sqlalchemy import Column, BigInteger, String, DateTime +from config.database import Base + + +class Door(Base): + """ + 门禁设备表 + """ + + __tablename__ = 'door' + + id = Column(BigInteger, primary_key=True, autoincrement=True, nullable=False, comment='主键自增') + indexCode = Column(String(64), nullable=True, comment='设备索引编码') + name = Column(String(32), nullable=True, comment='门禁名称') + install_location = Column(String(32), nullable=True, comment='位置名称') + status = Column(String(2), nullable=True, comment='设备状态, 0 离线, 1 正常在线') + permission = Column(String(2), nullable=True, comment='权限, 0 禁用, 1 正常调用') + create_time = Column(DateTime, nullable=True, comment='创建时间') + create_by = Column(String(64), nullable=True, comment='创建者') + update_time = Column(DateTime, nullable=True, comment='更新时间') + update_by = Column(String(64), nullable=True, comment='更新者') + + + diff --git a/ruoyi-fastapi-backend/module_admin/entity/vo/door_vo.py b/ruoyi-fastapi-backend/module_admin/entity/vo/door_vo.py new file mode 100644 index 0000000..df9f1a2 --- /dev/null +++ b/ruoyi-fastapi-backend/module_admin/entity/vo/door_vo.py @@ -0,0 +1,56 @@ +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 DoorModel(BaseModel): + """ + 门禁设备表对应pydantic模型 + """ + model_config = ConfigDict(alias_generator=to_camel, from_attributes=True) + + id: Optional[int] = Field(default=None, description='主键自增') + indexCode: Optional[str] = Field(default=None, description='设备索引编码') + name: Optional[str] = Field(default=None, description='门禁名称') + install_location: Optional[str] = Field(default=None, description='位置名称') + status: Optional[str] = Field(default=None, description='设备状态, 0 离线, 1 正常在线') + permission: Optional[str] = Field(default=None, description='权限, 0 禁用, 1 正常调用') + create_time: Optional[datetime] = Field(default=None, description='创建时间') + create_by: Optional[str] = Field(default=None, description='创建者') + update_time: Optional[datetime] = Field(default=None, description='更新时间') + update_by: Optional[str] = Field(default=None, description='更新者') + + + + + + +class DoorQueryModel(DoorModel): + """ + 门禁设备不分页查询模型 + """ + pass + + +@as_query +class DoorPageQueryModel(DoorQueryModel): + """ + 门禁设备分页查询模型 + """ + + page_num: int = Field(default=1, description='当前页码') + page_size: int = Field(default=10, description='每页记录数') + + +class DeleteDoorModel(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 new file mode 100644 index 0000000..f8063ab --- /dev/null +++ b/ruoyi-fastapi-backend/module_admin/service/door_service.py @@ -0,0 +1,135 @@ +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.door_dao import DoorDao +from module_admin.entity.vo.door_vo import DeleteDoorModel, DoorModel, DoorPageQueryModel +from utils.common_util import CamelCaseUtil +from utils.excel_util import ExcelUtil + + +class DoorService: + """ + 门禁设备模块服务层 + """ + + @classmethod + async def get_door_list_services( + cls, query_db: AsyncSession, query_object: DoorPageQueryModel, is_page: bool = False + ): + """ + 获取门禁设备列表信息service + + :param query_db: orm对象 + :param query_object: 查询参数对象 + :param is_page: 是否开启分页 + :return: 门禁设备列表信息对象 + """ + door_list_result = await DoorDao.get_door_list(query_db, query_object, is_page) + + return door_list_result + + + @classmethod + async def add_door_services(cls, query_db: AsyncSession, page_object: DoorModel): + """ + 新增门禁设备信息service + + :param query_db: orm对象 + :param page_object: 新增门禁设备对象 + :return: 新增门禁设备校验结果 + """ + try: + await DoorDao.add_door_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_door_services(cls, query_db: AsyncSession, page_object: DoorModel): + """ + 编辑门禁设备信息service + + :param query_db: orm对象 + :param page_object: 编辑门禁设备对象 + :return: 编辑门禁设备校验结果 + """ + edit_door = page_object.model_dump(exclude_unset=True, exclude={'create_time', 'create_by', }) + door_info = await cls.door_detail_services(query_db, page_object.id) + if door_info.id: + try: + await DoorDao.edit_door_dao(query_db, edit_door) + 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_door_services(cls, query_db: AsyncSession, page_object: DeleteDoorModel): + """ + 删除门禁设备信息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 DoorDao.delete_door_dao(query_db, DoorModel(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 door_detail_services(cls, query_db: AsyncSession, id: int): + """ + 获取门禁设备详细信息service + + :param query_db: orm对象 + :param id: 主键自增 + :return: 主键自增对应的信息 + """ + door = await DoorDao.get_door_detail_by_id(query_db, id=id) + if door: + result = DoorModel(**CamelCaseUtil.transform_result(door)) + else: + result = DoorModel(**dict()) + + return result + + @staticmethod + async def export_door_list_services(door_list: List): + """ + 导出门禁设备信息service + + :param door_list: 门禁设备信息列表 + :return: 门禁设备信息对应excel的二进制数据 + """ + # 创建一个映射字典,将英文键映射到中文键 + mapping_dict = { + 'id': '主键自增', + 'indexCode': '设备索引编码', + 'name': '门禁名称', + 'installLocation': '位置名称', + 'status': '设备状态, 0 离线, 1 正常在线', + 'permission': '权限, 0 禁用, 1 正常调用', + 'createTime': '创建时间', + 'createBy': '创建者', + 'updateTime': '更新时间', + 'updateBy': '更新者', + } + binary_data = ExcelUtil.export_list2excel(door_list, mapping_dict) + + return binary_data diff --git a/ruoyi-fastapi-backend/server.py b/ruoyi-fastapi-backend/server.py index e1ff211..19311cf 100644 --- a/ruoyi-fastapi-backend/server.py +++ b/ruoyi-fastapi-backend/server.py @@ -35,6 +35,7 @@ from module_admin.controller.sys_statistics_controller import sys_statisticsCont from module_admin.controller.ragflow_controller import ragflowController from module_admin.controller.robot_action_controller import robot_actionController from module_admin.controller.identification_record_controller import identification_recordController +from module_admin.controller.door_controller import doorController from sub_applications.handle import handle_sub_applications from utils.common_util import worship @@ -107,7 +108,8 @@ controller_list = [ # {'router': identify_recordController, 'tags': ['识别记录管理']}, {'router': ragflowController, 'tags': ['ragflow管理']}, {'router': robot_actionController, 'tags': ['机器人动作管理']}, - {'router': identification_recordController, 'tags': ['识别记录管理']} + {'router': identification_recordController, 'tags': ['识别记录管理']}, + {'router': doorController, 'tags': ['门禁设备管理']} ]