添加访客类型实体类和操作类
This commit is contained in:
parent
6eef93f8c7
commit
516b04a6c7
@ -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.visitor_type_service import Visitor_typeService
|
||||
# from module_admin.entity.vo.visitor_type_vo import DeleteVisitor_typeModel, Visitor_typeModel, Visitor_typePageQueryModel
|
||||
# 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
|
||||
#
|
||||
#
|
||||
# visitor_typeController = APIRouter(prefix='/system/visitor_type', dependencies=[Depends(LoginService.get_current_user)])
|
||||
#
|
||||
#
|
||||
# @visitor_typeController.get(
|
||||
# '/list', response_model=PageResponseModel, dependencies=[Depends(CheckUserInterfaceAuth('system:visitor_type:list'))]
|
||||
# )
|
||||
# async def get_system_visitor_type_list(
|
||||
# request: Request,
|
||||
# visitor_type_page_query: Visitor_typePageQueryModel = Depends(Visitor_typePageQueryModel.as_query),
|
||||
# query_db: AsyncSession = Depends(get_db),
|
||||
# ):
|
||||
# # 获取分页数据
|
||||
# visitor_type_page_query_result = await Visitor_typeService.get_visitor_type_list_services(query_db, visitor_type_page_query, is_page=True)
|
||||
# logger.info('获取成功')
|
||||
#
|
||||
# return ResponseUtil.success(model_content=visitor_type_page_query_result)
|
||||
#
|
||||
#
|
||||
# @visitor_typeController.post('', dependencies=[Depends(CheckUserInterfaceAuth('system:visitor_type:add'))])
|
||||
# @ValidateFields(validate_model='add_visitor_type')
|
||||
# @Log(title='访客类型', business_type=BusinessType.INSERT)
|
||||
# async def add_system_visitor_type(
|
||||
# request: Request,
|
||||
# add_visitor_type: Visitor_typeModel,
|
||||
# query_db: AsyncSession = Depends(get_db),
|
||||
# current_user: CurrentUserModel = Depends(LoginService.get_current_user),
|
||||
# ):
|
||||
# add_visitor_type.create_time = datetime.now()
|
||||
# add_visitor_type.create_by = current_user.user.user_name
|
||||
# add_visitor_type.update_time = datetime.now()
|
||||
# add_visitor_type.update_by = current_user.user.user_name
|
||||
# add_visitor_type_result = await Visitor_typeService.add_visitor_type_services(query_db, add_visitor_type)
|
||||
# logger.info(add_visitor_type_result.message)
|
||||
#
|
||||
# return ResponseUtil.success(msg=add_visitor_type_result.message)
|
||||
#
|
||||
#
|
||||
# @visitor_typeController.put('', dependencies=[Depends(CheckUserInterfaceAuth('system:visitor_type:edit'))])
|
||||
# @ValidateFields(validate_model='edit_visitor_type')
|
||||
# @Log(title='访客类型', business_type=BusinessType.UPDATE)
|
||||
# async def edit_system_visitor_type(
|
||||
# request: Request,
|
||||
# edit_visitor_type: Visitor_typeModel,
|
||||
# query_db: AsyncSession = Depends(get_db),
|
||||
# current_user: CurrentUserModel = Depends(LoginService.get_current_user),
|
||||
# ):
|
||||
# edit_visitor_type.update_by = current_user.user.user_name
|
||||
# edit_visitor_type.update_time = datetime.now()
|
||||
# edit_visitor_type_result = await Visitor_typeService.edit_visitor_type_services(query_db, edit_visitor_type)
|
||||
# logger.info(edit_visitor_type_result.message)
|
||||
#
|
||||
# return ResponseUtil.success(msg=edit_visitor_type_result.message)
|
||||
#
|
||||
#
|
||||
# @visitor_typeController.delete('/{type_ids}', dependencies=[Depends(CheckUserInterfaceAuth('system:visitor_type:remove'))])
|
||||
# @Log(title='访客类型', business_type=BusinessType.DELETE)
|
||||
# async def delete_system_visitor_type(request: Request, type_ids: str, query_db: AsyncSession = Depends(get_db)):
|
||||
# delete_visitor_type = DeleteVisitor_typeModel(typeIds=type_ids)
|
||||
# delete_visitor_type_result = await Visitor_typeService.delete_visitor_type_services(query_db, delete_visitor_type)
|
||||
# logger.info(delete_visitor_type_result.message)
|
||||
#
|
||||
# return ResponseUtil.success(msg=delete_visitor_type_result.message)
|
||||
#
|
||||
#
|
||||
# @visitor_typeController.get(
|
||||
# '/{type_id}', response_model=Visitor_typeModel, dependencies=[Depends(CheckUserInterfaceAuth('system:visitor_type:query'))]
|
||||
# )
|
||||
# async def query_detail_system_visitor_type(request: Request, type_id: int, query_db: AsyncSession = Depends(get_db)):
|
||||
# visitor_type_detail_result = await Visitor_typeService.visitor_type_detail_services(query_db, type_id)
|
||||
# logger.info(f'获取type_id为{type_id}的信息成功')
|
||||
#
|
||||
# return ResponseUtil.success(data=visitor_type_detail_result)
|
||||
#
|
||||
#
|
||||
# @visitor_typeController.post('/export', dependencies=[Depends(CheckUserInterfaceAuth('system:visitor_type:export'))])
|
||||
# @Log(title='访客类型', business_type=BusinessType.EXPORT)
|
||||
# async def export_system_visitor_type_list(
|
||||
# request: Request,
|
||||
# visitor_type_page_query: Visitor_typePageQueryModel = Form(),
|
||||
# query_db: AsyncSession = Depends(get_db),
|
||||
# ):
|
||||
# # 获取全量数据
|
||||
# visitor_type_query_result = await Visitor_typeService.get_visitor_type_list_services(query_db, visitor_type_page_query, is_page=False)
|
||||
# visitor_type_export_result = await Visitor_typeService.export_visitor_type_list_services(visitor_type_query_result)
|
||||
# logger.info('导出成功')
|
||||
#
|
||||
# return ResponseUtil.streaming(data=bytes2file_response(visitor_type_export_result))
|
||||
118
ruoyi-fastapi-backend/module_admin/dao/visitor_type_dao.py
Normal file
118
ruoyi-fastapi-backend/module_admin/dao/visitor_type_dao.py
Normal file
@ -0,0 +1,118 @@
|
||||
from sqlalchemy import delete, select, update
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from module_admin.entity.do.visitor_type_do import VisitorType
|
||||
from module_admin.entity.vo.visitor_type_vo import Visitor_typeModel, Visitor_typePageQueryModel
|
||||
from utils.page_util import PageUtil
|
||||
|
||||
|
||||
class Visitor_typeDao:
|
||||
"""
|
||||
访客类型模块数据库操作层
|
||||
"""
|
||||
|
||||
@classmethod
|
||||
async def get_visitor_type_detail_by_id(cls, db: AsyncSession, type_id: int):
|
||||
"""
|
||||
根据访客类型ID获取访客类型详细信息
|
||||
|
||||
:param db: orm对象
|
||||
:param type_id: 访客类型ID
|
||||
:return: 访客类型信息对象
|
||||
"""
|
||||
visitor_type_info = (
|
||||
(
|
||||
await db.execute(
|
||||
select(VisitorType)
|
||||
.where(
|
||||
VisitorType.type_id == type_id
|
||||
)
|
||||
)
|
||||
)
|
||||
.scalars()
|
||||
.first()
|
||||
)
|
||||
|
||||
return visitor_type_info
|
||||
|
||||
@classmethod
|
||||
async def get_visitor_type_detail_by_info(cls, db: AsyncSession, visitor_type: Visitor_typeModel):
|
||||
"""
|
||||
根据访客类型参数获取访客类型信息
|
||||
|
||||
:param db: orm对象
|
||||
:param visitor_type: 访客类型参数对象
|
||||
:return: 访客类型信息对象
|
||||
"""
|
||||
visitor_type_info = (
|
||||
(
|
||||
await db.execute(
|
||||
select(VisitorType).where(
|
||||
)
|
||||
)
|
||||
)
|
||||
.scalars()
|
||||
.first()
|
||||
)
|
||||
|
||||
return visitor_type_info
|
||||
|
||||
@classmethod
|
||||
async def get_visitor_type_list(cls, db: AsyncSession, query_object: Visitor_typePageQueryModel, is_page: bool = False):
|
||||
"""
|
||||
根据查询参数获取访客类型列表信息
|
||||
|
||||
:param db: orm对象
|
||||
:param query_object: 查询参数对象
|
||||
:param is_page: 是否开启分页
|
||||
:return: 访客类型列表信息对象
|
||||
"""
|
||||
query = (
|
||||
select(VisitorType)
|
||||
.where(
|
||||
VisitorType.name.like(f'%{query_object.name}%') if query_object.name else True,
|
||||
VisitorType.value == query_object.value if query_object.value else True,
|
||||
)
|
||||
.order_by(VisitorType.type_id)
|
||||
.distinct()
|
||||
)
|
||||
visitor_type_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page)
|
||||
|
||||
return visitor_type_list
|
||||
|
||||
@classmethod
|
||||
async def add_visitor_type_dao(cls, db: AsyncSession, visitor_type: Visitor_typeModel):
|
||||
"""
|
||||
新增访客类型数据库操作
|
||||
|
||||
:param db: orm对象
|
||||
:param visitor_type: 访客类型对象
|
||||
:return:
|
||||
"""
|
||||
db_visitor_type = VisitorType(**visitor_type.model_dump(exclude={}))
|
||||
db.add(db_visitor_type)
|
||||
await db.flush()
|
||||
|
||||
return db_visitor_type
|
||||
|
||||
@classmethod
|
||||
async def edit_visitor_type_dao(cls, db: AsyncSession, visitor_type: dict):
|
||||
"""
|
||||
编辑访客类型数据库操作
|
||||
|
||||
:param db: orm对象
|
||||
:param visitor_type: 需要更新的访客类型字典
|
||||
:return:
|
||||
"""
|
||||
await db.execute(update(VisitorType), [visitor_type])
|
||||
|
||||
@classmethod
|
||||
async def delete_visitor_type_dao(cls, db: AsyncSession, visitor_type: Visitor_typeModel):
|
||||
"""
|
||||
删除访客类型数据库操作
|
||||
|
||||
:param db: orm对象
|
||||
:param visitor_type: 访客类型对象
|
||||
:return:
|
||||
"""
|
||||
await db.execute(delete(VisitorType).where(VisitorType.type_id.in_([visitor_type.type_id])))
|
||||
|
||||
@ -0,0 +1,21 @@
|
||||
from sqlalchemy import BigInteger, DateTime, String, Column
|
||||
from config.database import Base
|
||||
|
||||
|
||||
class VisitorType(Base):
|
||||
"""
|
||||
访客类型表
|
||||
"""
|
||||
|
||||
__tablename__ = 'visitor_type'
|
||||
|
||||
type_id = Column(BigInteger, primary_key=True, autoincrement=True, nullable=False, comment='访客类型ID')
|
||||
name = Column(String(64), nullable=True, comment='类型名称')
|
||||
value = Column(String(2), nullable=False, comment='类型值')
|
||||
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='修改者')
|
||||
|
||||
|
||||
|
||||
@ -0,0 +1,60 @@
|
||||
from datetime import datetime
|
||||
from pydantic import BaseModel, ConfigDict, Field
|
||||
from pydantic.alias_generators import to_camel
|
||||
from pydantic_validation_decorator import NotBlank
|
||||
from typing import Optional
|
||||
from module_admin.annotation.pydantic_annotation import as_query
|
||||
|
||||
|
||||
|
||||
|
||||
class Visitor_typeModel(BaseModel):
|
||||
"""
|
||||
访客类型表对应pydantic模型
|
||||
"""
|
||||
model_config = ConfigDict(alias_generator=to_camel, from_attributes=True)
|
||||
|
||||
type_id: Optional[int] = Field(default=None, description='访客类型ID')
|
||||
name: Optional[str] = Field(default=None, description='类型名称')
|
||||
value: Optional[str] = Field(default=None, description='类型值')
|
||||
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='修改者')
|
||||
|
||||
@NotBlank(field_name='value', message='类型值不能为空')
|
||||
def get_value(self):
|
||||
return self.value
|
||||
|
||||
|
||||
def validate_fields(self):
|
||||
self.get_value()
|
||||
|
||||
|
||||
|
||||
|
||||
class Visitor_typeQueryModel(Visitor_typeModel):
|
||||
"""
|
||||
访客类型不分页查询模型
|
||||
"""
|
||||
pass
|
||||
|
||||
|
||||
@as_query
|
||||
class Visitor_typePageQueryModel(Visitor_typeQueryModel):
|
||||
"""
|
||||
访客类型分页查询模型
|
||||
"""
|
||||
|
||||
page_num: int = Field(default=1, description='当前页码')
|
||||
page_size: int = Field(default=10, description='每页记录数')
|
||||
|
||||
|
||||
class DeleteVisitor_typeModel(BaseModel):
|
||||
"""
|
||||
删除访客类型模型
|
||||
"""
|
||||
|
||||
model_config = ConfigDict(alias_generator=to_camel)
|
||||
|
||||
type_ids: str = Field(description='需要删除的访客类型ID')
|
||||
@ -0,0 +1,132 @@
|
||||
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.visitor_type_dao import Visitor_typeDao
|
||||
from module_admin.entity.vo.visitor_type_vo import DeleteVisitor_typeModel, Visitor_typeModel, Visitor_typePageQueryModel
|
||||
from utils.common_util import CamelCaseUtil
|
||||
from utils.excel_util import ExcelUtil
|
||||
|
||||
|
||||
class Visitor_typeService:
|
||||
"""
|
||||
访客类型模块服务层
|
||||
"""
|
||||
|
||||
@classmethod
|
||||
async def get_visitor_type_list_services(
|
||||
cls, query_db: AsyncSession, query_object: Visitor_typePageQueryModel, is_page: bool = False
|
||||
):
|
||||
"""
|
||||
获取访客类型列表信息service
|
||||
|
||||
:param query_db: orm对象
|
||||
:param query_object: 查询参数对象
|
||||
:param is_page: 是否开启分页
|
||||
:return: 访客类型列表信息对象
|
||||
"""
|
||||
visitor_type_list_result = await Visitor_typeDao.get_visitor_type_list(query_db, query_object, is_page)
|
||||
|
||||
return visitor_type_list_result
|
||||
|
||||
|
||||
@classmethod
|
||||
async def add_visitor_type_services(cls, query_db: AsyncSession, page_object: Visitor_typeModel):
|
||||
"""
|
||||
新增访客类型信息service
|
||||
|
||||
:param query_db: orm对象
|
||||
:param page_object: 新增访客类型对象
|
||||
:return: 新增访客类型校验结果
|
||||
"""
|
||||
try:
|
||||
await Visitor_typeDao.add_visitor_type_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_visitor_type_services(cls, query_db: AsyncSession, page_object: Visitor_typeModel):
|
||||
"""
|
||||
编辑访客类型信息service
|
||||
|
||||
:param query_db: orm对象
|
||||
:param page_object: 编辑访客类型对象
|
||||
:return: 编辑访客类型校验结果
|
||||
"""
|
||||
edit_visitor_type = page_object.model_dump(exclude_unset=True, exclude={'create_time', 'create_by', })
|
||||
visitor_type_info = await cls.visitor_type_detail_services(query_db, page_object.type_id)
|
||||
if visitor_type_info.type_id:
|
||||
try:
|
||||
await Visitor_typeDao.edit_visitor_type_dao(query_db, edit_visitor_type)
|
||||
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_visitor_type_services(cls, query_db: AsyncSession, page_object: DeleteVisitor_typeModel):
|
||||
"""
|
||||
删除访客类型信息service
|
||||
|
||||
:param query_db: orm对象
|
||||
:param page_object: 删除访客类型对象
|
||||
:return: 删除访客类型校验结果
|
||||
"""
|
||||
if page_object.type_ids:
|
||||
type_id_list = page_object.type_ids.split(',')
|
||||
try:
|
||||
for type_id in type_id_list:
|
||||
await Visitor_typeDao.delete_visitor_type_dao(query_db, Visitor_typeModel(typeId=type_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='传入访客类型ID为空')
|
||||
|
||||
@classmethod
|
||||
async def visitor_type_detail_services(cls, query_db: AsyncSession, type_id: int):
|
||||
"""
|
||||
获取访客类型详细信息service
|
||||
|
||||
:param query_db: orm对象
|
||||
:param type_id: 访客类型ID
|
||||
:return: 访客类型ID对应的信息
|
||||
"""
|
||||
visitor_type = await Visitor_typeDao.get_visitor_type_detail_by_id(query_db, type_id=type_id)
|
||||
if visitor_type:
|
||||
result = Visitor_typeModel(**CamelCaseUtil.transform_result(visitor_type))
|
||||
else:
|
||||
result = Visitor_typeModel(**dict())
|
||||
|
||||
return result
|
||||
|
||||
@staticmethod
|
||||
async def export_visitor_type_list_services(visitor_type_list: List):
|
||||
"""
|
||||
导出访客类型信息service
|
||||
|
||||
:param visitor_type_list: 访客类型信息列表
|
||||
:return: 访客类型信息对应excel的二进制数据
|
||||
"""
|
||||
# 创建一个映射字典，将英文键映射到中文键
|
||||
mapping_dict = {
|
||||
'typeId': '访客类型ID',
|
||||
'name': '类型名称',
|
||||
'value': '类型值',
|
||||
'createTime': '创建时间',
|
||||
'createBy': '创建者',
|
||||
'updateTime': '修改时间',
|
||||
'updateBy': '修改者',
|
||||
}
|
||||
binary_data = ExcelUtil.export_list2excel(visitor_type_list, mapping_dict)
|
||||
|
||||
return binary_data
|
||||
Loading…
Reference in New Issue
Block a user