refactor(字段命名): 统一将created_at和updated_at重命名为created_time和updated_time

重构字段命名以保持一致性,将时间相关字段从created_at/updated_at统一改为created_time/updated_time
同时调整相关查询参数、服务层映射和模板文件中的字段命名
优化权限过滤逻辑,提取为独立的Permission类
This commit is contained in:
zhangtao
2025-11-24 01:53:01 +08:00
parent c0d32a7eec
commit e32bc0660e
42 changed files with 1435 additions and 1380 deletions
@@ -27,7 +27,7 @@ class JobQueryParam:
# 时间范围查询
if start_time and end_time:
self.created_at = ("between", (start_time, end_time))
self.created_time = ("between", (start_time, end_time))
class JobLogQueryParam:
@@ -187,8 +187,8 @@ class JobService:
'status': '任务状态',
'message': '日志信息',
'description': '备注',
'created_at': '创建时间',
'updated_at': '更新时间',
'created_time': '创建时间',
'updated_time': '更新时间',
'created_id': '创建者ID',
'creator': '创建者',
}
@@ -12,7 +12,7 @@ class ApplicationQueryParam:
self,
name: Optional[str] = Query(None, description="应用名称"),
status: Optional[bool] = Query(None, description="是否启用"),
creator: Optional[int] = Query(None, description="创建人"),
created_id: Optional[int] = Query(None, description="创建人"),
start_time: Optional[DateTimeStr] = Query(None, description="开始时间", example="2025-01-01 00:00:00"),
end_time: Optional[DateTimeStr] = Query(None, description="结束时间", example="2025-12-31 23:59:59"),
) -> None:
@@ -22,10 +22,10 @@ class ApplicationQueryParam:
# 精确查询字段
self.status = status
self.created_id = creator
self.created_id = created_id
# 时间范围查询
if start_time and end_time:
self.created_at = ("between", (start_time, end_time))
self.created_time = ("between", (start_time, end_time))
@@ -13,7 +13,7 @@ class DemoQueryParam:
self,
name: Optional[str] = Query(None, description="名称"),
status: Optional[bool] = Query(None, description="是否启用"),
creator: Optional[int] = Query(None, description="创建人"),
created_id: Optional[int] = Query(None, description="创建人"),
start_time: Optional[DateTimeStr] = Query(None, description="开始时间", example="2025-01-01 00:00:00"),
end_time: Optional[DateTimeStr] = Query(None, description="结束时间", example="2025-12-31 23:59:59"),
) -> None:
@@ -22,11 +22,11 @@ class DemoQueryParam:
self.name = ("like", name)
# 精确查询字段
self.created_id = creator
self.created_id = created_id
self.status = status
# 时间范围查询
if start_time and end_time:
self.created_at = ("between", (start_time, end_time))
self.created_time = ("between", (start_time, end_time))
@@ -179,9 +179,9 @@ class DemoService:
'name': '名称',
'status': '状态',
'description': '备注',
'created_at': '创建时间',
'updated_at': '更新时间',
'creator': '创建者',
'created_time': '创建时间',
'updated_time': '更新时间',
'created_id': '创建者',
}
# 复制数据并转换状态
@@ -190,11 +190,11 @@ class DemoService:
# 处理状态
item['status'] = '正常' if item.get('status') else '停用'
# 处理创建者
creator_info = item.get('creator')
creator_info = item.get('created_id')
if isinstance(creator_info, dict):
item['creator'] = creator_info.get('name', '未知')
item['created_id'] = creator_info.get('name', '未知')
else:
item['creator'] = '未知'
item['created_id'] = '未知'
return ExcelUtil.export_list2excel(list_data=data, mapping_dict=mapping_dict)
@@ -81,7 +81,7 @@ class GenTableCRUD(CRUDBase[GenTableModel, GenTableSchema, GenTableSchema]):
返回:
- Sequence[GenTableModel]: 业务表列表信息
"""
return await self.list(search=search.__dict__, order_by=[{"created_at": "desc"}], preload=preload)
return await self.list(search=search.__dict__, order_by=[{"created_time": "desc"}], preload=preload)
async def add_gen_table(self, add_model: GenTableSchema) -> GenTableModel:
"""
@@ -21,7 +21,7 @@ class {{ class_name }}Model(CreatorMixin):
__loader_options__ = ["creator"]
{% for column in columns %}
{% if column.column_name not in ['id', 'created_id', 'description', 'created_at', 'updated_at'] %}
{% if column.column_name not in ['id', 'created_id', 'description', 'created_time', 'updated_time'] %}
{{ column.column_name }}: Mapped[Optional[{{ column.python_type }}]] = mapped_column({{ column.column_type|get_sqlalchemy_type }}, {% if column.pk %}primary_key=True, {% endif %}{% if column.increment %}autoincrement=True, {% endif %}{% if column.required or column.pk %}nullable=False{% else %}nullable=True{% endif %}, comment='{{ column.column_comment }}')
{% endif %}
{% endfor %}
@@ -42,4 +42,4 @@ class {{ class_name }}QueryParam:
# 时间范围查询
if start_time and end_time:
self.created_at = ("between", (start_time, end_time))
self.created_time = ("between", (start_time, end_time))
@@ -14,7 +14,7 @@ class {{ class_name }}CreateSchema(BaseModel):
{{ function_name }}新增模型
"""
{% for column in columns %}
{% if column.column_name not in ['id', 'created_id', 'created_at', 'updated_at'] %}
{% if column.column_name not in ['id', 'created_id', 'created_time', 'updated_time'] %}
{{ column.column_name }}: Optional[{{ column.python_type }}] = Field(default=None, description='{{ column.column_comment }}')
{% endif %}
{% endfor %}
@@ -5,10 +5,10 @@
{% set b_false = 0 if db_type == 'mysql' else false %}
{% set order_col = '`order`' if db_type == 'mysql' else '"order"' %}
{# 公共字段列表(按实际库字段) #}
{# name, type, order, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_at, updated_at #}
{# name, type, order, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_time, updated_time #}
{% if db_type == 'mysql' %}
-- 父菜单(类型=2:菜单)
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_at, updated_at)
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_time, updated_time)
VALUES (
'{{ function_name }}',
2,
@@ -36,21 +36,21 @@ VALUES (
SELECT @parentId := LAST_INSERT_ID();
-- 按钮权限(类型=3:按钮/权限)
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_at, updated_at)
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_time, updated_time)
VALUES ('{{ function_name }}查询', 3, 1, {{ b_true }}, '{{ permission_prefix }}:query', NULL, NULL, NULL, NULL, NULL, {{ b_false }}, {{ b_true }}, {{ b_false }}, '{{ function_name }}查询', NULL, {{ b_false }}, @parentId, NULL, NOW(), NOW());
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_at, updated_at)
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_time, updated_time)
VALUES ('{{ function_name }}新增', 3, 2, {{ b_true }}, '{{ permission_prefix }}:create', NULL, NULL, NULL, NULL, NULL, {{ b_false }}, {{ b_true }}, {{ b_false }}, '{{ function_name }}新增', NULL, {{ b_false }}, @parentId, NULL, NOW(), NOW());
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_at, updated_at)
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_time, updated_time)
VALUES ('{{ function_name }}修改', 3, 3, {{ b_true }}, '{{ permission_prefix }}:update', NULL, NULL, NULL, NULL, NULL, {{ b_false }}, {{ b_true }}, {{ b_false }}, '{{ function_name }}修改', NULL, {{ b_false }}, @parentId, NULL, NOW(), NOW());
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_at, updated_at)
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_time, updated_time)
VALUES ('{{ function_name }}删除', 3, 4, {{ b_true }}, '{{ permission_prefix }}:delete', NULL, NULL, NULL, NULL, NULL, {{ b_false }}, {{ b_true }}, {{ b_false }}, '{{ function_name }}删除', NULL, {{ b_false }}, @parentId, NULL, NOW(), NOW());
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_at, updated_at)
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_time, updated_time)
VALUES ('{{ function_name }}导出', 3, 5, {{ b_true }}, '{{ permission_prefix }}:export', NULL, NULL, NULL, NULL, NULL, {{ b_false }}, {{ b_true }}, {{ b_false }}, '{{ function_name }}导出', NULL, {{ b_false }}, @parentId, NULL, NOW(), NOW());
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_at, updated_at)
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_time, updated_time)
VALUES ('{{ function_name }}导入', 3, 6, {{ b_true }}, '{{ permission_prefix }}:import', NULL, NULL, NULL, NULL, NULL, {{ b_false }}, {{ b_true }}, {{ b_false }}, '{{ function_name }}导入', NULL, {{ b_false }}, @parentId, NULL, NOW(), NOW());
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_at, updated_at)
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_time, updated_time)
VALUES ('{{ function_name }}批量状态修改', 3, 7, {{ b_true }}, '{{ permission_prefix }}:patch', NULL, NULL, NULL, NULL, NULL, {{ b_false }}, {{ b_true }}, {{ b_false }}, '{{ function_name }}批量状态修改', NULL, {{ b_false }}, @parentId, NULL, NOW(), NOW());
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_at, updated_at)
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_time, updated_time)
VALUES ('{{ function_name }}下载导入模板', 3, 8, {{ b_true }}, '{{ permission_prefix }}:download', NULL, NULL, NULL, NULL, NULL, {{ b_false }}, {{ b_true }}, {{ b_false }}, '{{ function_name }}下载导入模板', NULL, {{ b_false }}, @parentId, NULL, NOW(), NOW());
{% elif db_type == 'postgres' %}
@@ -63,7 +63,7 @@ BEGIN
INSERT INTO public.system_menu (
name, type, {{ order_col }}, status, permission, icon, route_name, route_path,
component_path, redirect, hidden, keep_alive, always_show, title,
params, affix, parent_id, description, created_at, updated_at
params, affix, parent_id, description, created_time, updated_time
)
VALUES (
'{{ function_name }}',
@@ -92,7 +92,7 @@ BEGIN
INSERT INTO public.system_menu (
name, type, {{ order_col }}, status, permission, icon, route_name, route_path,
component_path, redirect, hidden, keep_alive, always_show, title,
params, affix, parent_id, description, created_at, updated_at
params, affix, parent_id, description, created_time, updated_time
) VALUES
('{{ function_name }}查询', 3, 1, {{ b_true }}, '{{ permission_prefix }}:query', NULL, NULL, NULL, NULL, NULL, {{ b_false }}, {{ b_true }}, {{ b_false }}, '{{ function_name }}查询', NULL, {{ b_false }}, parent_id, NULL, NOW(), NOW()),
('{{ function_name }}新增', 3, 2, {{ b_true }}, '{{ permission_prefix }}:create', NULL, NULL, NULL, NULL, NULL, {{ b_false }}, {{ b_true }}, {{ b_false }}, '{{ function_name }}新增', NULL, {{ b_false }}, parent_id, NULL, NOW(), NOW()),
@@ -109,23 +109,23 @@ END $$;
{% else %}
-- 未识别的数据库类型,默认按 MySQL 处理
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_at, updated_at)
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_time, updated_time)
VALUES ('{{ function_name }}', 2, 1, {{ b_true }}, '{{ permission_prefix }}:query', NULL, '{{ business_name|snake_to_camel }}', '/{{ module_name }}/{{ business_name }}', '{{ module_name }}/{{ business_name }}/index', NULL, {{ b_false }}, {{ b_true }}, {{ b_false }}, '{{ function_name }}', NULL, {{ b_false }}, {{ parent_menu_id }}, '{{ function_name }}菜单', now(), now());
SELECT @parentId := LAST_INSERT_ID();
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_at, updated_at)
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_time, updated_time)
VALUES ('{{ function_name }}查询', 3, 1, {{ b_true }}, '{{ permission_prefix }}:query', NULL, NULL, NULL, NULL, NULL, {{ b_false }}, {{ b_true }}, {{ b_false }}, '{{ function_name }}查询', NULL, {{ b_false }}, @parentId, NULL, NOW(), NOW());
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_at, updated_at)
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_time, updated_time)
VALUES ('{{ function_name }}新增', 3, 2, {{ b_true }}, '{{ permission_prefix }}:create', NULL, NULL, NULL, NULL, NULL, {{ b_false }}, {{ b_true }}, {{ b_false }}, '{{ function_name }}新增', NULL, {{ b_false }}, @parentId, NULL, NOW(), NOW());
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_at, updated_at)
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_time, updated_time)
VALUES ('{{ function_name }}修改', 3, 3, {{ b_true }}, '{{ permission_prefix }}:update', NULL, NULL, NULL, NULL, NULL, {{ b_false }}, {{ b_true }}, {{ b_false }}, '{{ function_name }}修改', NULL, {{ b_false }}, @parentId, NULL, NOW(), NOW());
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_at, updated_at)
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_time, updated_time)
VALUES ('{{ function_name }}删除', 3, 4, {{ b_true }}, '{{ permission_prefix }}:delete', NULL, NULL, NULL, NULL, NULL, {{ b_false }}, {{ b_true }}, {{ b_false }}, '{{ function_name }}删除', NULL, {{ b_false }}, @parentId, NULL, NOW(), NOW());
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_at, updated_at)
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_time, updated_time)
VALUES ('{{ function_name }}导出', 3, 5, {{ b_true }}, '{{ permission_prefix }}:export', NULL, NULL, NULL, NULL, NULL, {{ b_false }}, {{ b_true }}, {{ b_false }}, '{{ function_name }}导出', NULL, {{ b_false }}, @parentId, NULL, NOW(), NOW());
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_at, updated_at)
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_time, updated_time)
VALUES ('{{ function_name }}导入', 3, 6, {{ b_true }}, '{{ permission_prefix }}:import', NULL, NULL, NULL, NULL, NULL, {{ b_false }}, {{ b_true }}, {{ b_false }}, '{{ function_name }}导入', NULL, {{ b_false }}, @parentId, NULL, NOW(), NOW());
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_at, updated_at)
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_time, updated_time)
VALUES ('{{ function_name }}批量状态修改', 3, 7, {{ b_true }}, '{{ permission_prefix }}:patch', NULL, NULL, NULL, NULL, NULL, {{ b_false }}, {{ b_true }}, {{ b_false }}, '{{ function_name }}批量状态修改', NULL, {{ b_false }}, @parentId, NULL, NOW(), NOW());
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_at, updated_at)
INSERT INTO `system_menu` (name, type, {{ order_col }}, status, permission, icon, route_name, route_path, component_path, redirect, hidden, keep_alive, always_show, title, params, affix, parent_id, description, created_time, updated_time)
VALUES ('{{ function_name }}下载导入模板', 3, 8, {{ b_true }}, '{{ permission_prefix }}:download', NULL, NULL, NULL, NULL, NULL, {{ b_false }}, {{ b_true }}, {{ b_false }}, '{{ function_name }}下载导入模板', NULL, {{ b_false }}, @parentId, NULL, NOW(), NOW());
{% endif %}
@@ -27,6 +27,6 @@ class CustomerQueryParam:
# 时间范围查询
if start_time and end_time:
self.created_at = ("between", (start_time, end_time))
self.created_time = ("between", (start_time, end_time))
@@ -182,8 +182,8 @@ class CustomerService:
'name': '名称',
'status': '状态',
'description': '备注',
'created_at': '创建时间',
'updated_at': '更新时间',
'created_time': '创建时间',
'updated_time': '更新时间',
'creator': '创建者',
'code': '编码',
}
@@ -26,6 +26,6 @@ class DeptQueryParam:
# 时间范围查询
if start_time and end_time:
self.created_at = ("between", (start_time, end_time))
self.created_time = ("between", (start_time, end_time))
@@ -28,7 +28,7 @@ class DictTypeQueryParam:
# 时间范围查询
if start_time and end_time:
self.created_at = ("between", (start_time, end_time))
self.created_time = ("between", (start_time, end_time))
class DictDataQueryParam:
@@ -52,4 +52,4 @@ class DictDataQueryParam:
# 时间范围查询
if start_time and end_time:
self.created_at = ("between", (start_time, end_time))
self.created_time = ("between", (start_time, end_time))
@@ -218,8 +218,8 @@ class DictTypeService:
'dict_type': '字典类型',
'status': '状态',
'description': '备注',
'created_at': '创建时间',
'updated_at': '更新时间',
'created_time': '创建时间',
'updated_time': '更新时间',
'created_id': '创建者ID',
'creator': '创建者',
}
@@ -491,8 +491,8 @@ class DictDataService:
'is_default': '是否默认',
'status': '状态',
'description': '备注',
'created_at': '创建时间',
'updated_at': '更新时间',
'created_time': '创建时间',
'updated_time': '更新时间',
'created_id': '创建者ID',
'creator': '创建者',
}
@@ -36,7 +36,7 @@ async def get_obj_list_controller(
返回:
- JSONResponse: 包含分页日志详情的 JSON 响应模型
"""
order_by = [{"created_at": "desc"}]
order_by = [{"created_time": "desc"}]
if page.order_by:
order_by = page.order_by
result_dict_list = await OperationLogService.get_log_list_service(search=search, auth=auth, order_by=order_by)
@@ -16,7 +16,7 @@ class OperationLogQueryParam:
request_method: Optional[str] = Query(None, description="请求方法"),
request_ip: Optional[str] = Query(None, description="请求IP"),
response_code: Optional[int] = Query(None, description="响应状态码"),
creator: Optional[int] = Query(None, description="创建人"),
created_id: Optional[int] = Query(None, description="创建人"),
start_time: Optional[DateTimeStr] = Query(None, description="开始时间", example="2025-01-01 00:00:00"),
end_time: Optional[DateTimeStr] = Query(None, description="结束时间", example="2025-12-31 23:59:59"),
) -> None:
@@ -25,7 +25,7 @@ class OperationLogQueryParam:
self.request_path = ("like", f"%{request_path}%") if request_path else None
# 精确查询字段
self.created_id = creator
self.created_id = created_id
self.request_method = request_method
self.request_ip = request_ip
self.response_code = response_code
@@ -33,4 +33,4 @@ class OperationLogQueryParam:
# 时间范围查询
if start_time and end_time:
self.created_at = ("between", (start_time, end_time))
self.created_time = ("between", (start_time, end_time))
@@ -110,8 +110,8 @@ class OperationLogService:
'response_code': '相应状态',
'process_time': '处理时间',
'description': '备注',
'created_at': '创建时间',
'updated_at': '更新时间',
'created_time': '创建时间',
'updated_time': '更新时间',
'created_id': '创建者ID',
'creator': '创建者',
}
@@ -33,5 +33,5 @@ class MenuQueryParam:
# 时间范围查询
if start_time and end_time:
self.created_at = ("between", (start_time, end_time))
self.created_time = ("between", (start_time, end_time))
@@ -14,7 +14,7 @@ class NoticeQueryParam:
notice_title: Optional[str] = Query(None, description="公告标题"),
notice_type: Optional[str] = Query(None, description="公告类型"),
status: Optional[bool] = Query(None, description="是否可用"),
creator: Optional[int] = Query(None, description="创建人"),
created_id: Optional[int] = Query(None, description="创建人"),
start_time: Optional[DateTimeStr] = Query(None, description="开始时间", example="2025-01-01 00:00:00"),
end_time: Optional[DateTimeStr] = Query(None, description="结束时间", example="2025-12-31 23:59:59"),
) -> None:
@@ -23,12 +23,12 @@ class NoticeQueryParam:
self.notice_title = ("like", notice_title)
# 精确查询字段
self.created_id = creator
self.created_id = created_id
self.status = status
self.notice_type = notice_type
# 时间范围查询
if start_time and end_time:
self.created_at = ("between", (start_time, end_time))
self.created_time = ("between", (start_time, end_time))
@@ -161,8 +161,8 @@ class NoticeService:
'notice_content': '公告内容',
'status': '状态',
'description': '备注',
'created_at': '创建时间',
'updated_at': '更新时间',
'created_time': '创建时间',
'updated_time': '更新时间',
'created_id': '创建者ID',
'creator': '创建者',
}
@@ -27,6 +27,6 @@ class ParamsQueryParam:
# 时间范围查询
if start_time and end_time:
self.created_at = ("between", (start_time, end_time))
self.created_time = ("between", (start_time, end_time))
@@ -230,8 +230,8 @@ class ParamsService:
'config_value': '参数键值',
'config_type': '系统内置((True:是 False:否))',
'description': '备注',
'created_at': '创建时间',
'updated_at': '更新时间',
'created_time': '创建时间',
'updated_time': '更新时间',
'created_id': '创建者ID',
'creator': '创建者',
}
@@ -13,7 +13,7 @@ class PositionQueryParam:
self,
name: Optional[str] = Query(None, description="岗位名称"),
status: Optional[bool] = Query(None, description="是否可用"),
creator: Optional[int] = Query(None, description="创建人"),
created_id: Optional[int] = Query(None, description="创建人"),
start_time: Optional[DateTimeStr] = Query(None, description="开始时间", example="2025-01-01 00:00:00"),
end_time: Optional[DateTimeStr] = Query(None, description="结束时间", example="2025-12-31 23:59:59"),
) -> None:
@@ -22,9 +22,9 @@ class PositionQueryParam:
self.name = ("like", name)
# 精确查询字段
self.created_id = creator
self.created_id = created_id
self.status = status
# 时间范围查询
if start_time and end_time:
self.created_at = ("between", (start_time, end_time))
self.created_time = ("between", (start_time, end_time))
@@ -141,8 +141,8 @@ class PositionService:
'order': '显示顺序',
'status': '状态',
'description': '备注',
'created_at': '创建时间',
'updated_at': '更新时间',
'created_time': '创建时间',
'updated_time': '更新时间',
'created_id': '创建者ID',
'creator': '创建者',
}
@@ -13,7 +13,7 @@ class RoleQueryParam:
self,
name: Optional[str] = Query(None, description="角色名称"),
status: Optional[bool] = Query(None, description="是否可用"),
creator: Optional[int] = Query(None, description="创建人"),
created_id: Optional[int] = Query(None, description="创建人"),
start_time: Optional[DateTimeStr] = Query(None, description="开始时间", example="2025-01-01 00:00:00"),
end_time: Optional[DateTimeStr] = Query(None, description="结束时间", example="2025-12-31 23:59:59"),
) -> None:
@@ -22,9 +22,9 @@ class RoleQueryParam:
self.name = ("like", name)
# 精确查询字段
self.created_id = creator
self.created_id = created_id
self.status = status
# 时间范围查询
if start_time and end_time:
self.created_at = ("between", (start_time, end_time))
self.created_time = ("between", (start_time, end_time))
@@ -62,7 +62,7 @@ class RoleOptionsOut(RoleCreateSchema):
model_config = ConfigDict(from_attributes=True)
id: int = Field(..., description="主键ID")
created_at: DateTimeStr = Field(..., description="创建时间")
updated_at: DateTimeStr = Field(..., description="更新时间")
created_time: DateTimeStr = Field(..., description="创建时间")
updated_time: DateTimeStr = Field(..., description="更新时间")
menus: List[MenuOutSchema] = Field(default_factory=list, description='角色菜单列表')
depts: List[DeptOutSchema] = Field(default_factory=list, description='角色部门列表')
@@ -171,8 +171,8 @@ class RoleService:
'data_scope': '数据权限',
'status': '状态',
'description': '备注',
'created_at': '创建时间',
'updated_at': '更新时间',
'created_time': '创建时间',
'updated_time': '更新时间',
'created_id': '创建者ID',
'creator': '创建者',
}
@@ -13,7 +13,6 @@ class TenantQueryParam:
self,
name: Optional[str] = Query(None, description="租户名称"),
status: Optional[bool] = Query(None, description="状态用(True:启用 False:禁用)"),
creator: Optional[int] = Query(None, description="创建人"),
start_time: Optional[DateTimeStr] = Query(None, description="开始时间", example="2025-01-01 00:00:00"),
end_time: Optional[DateTimeStr] = Query(None, description="结束时间", example="2025-12-31 23:59:59"),
) -> None:
@@ -22,11 +21,10 @@ class TenantQueryParam:
self.name = ("like", name)
# 精确查询字段
self.created_id = creator
self.status = status
# 时间范围查询
if start_time and end_time:
self.created_at = ("between", (start_time, end_time))
self.created_time = ("between", (start_time, end_time))
@@ -182,9 +182,9 @@ class TenantService:
'name': '名称',
'status': '状态',
'description': '备注',
'created_at': '创建时间',
'updated_at': '更新时间',
'creator': '创建者',
'created_time': '创建时间',
'updated_time': '更新时间',
'created_id': '创建者',
}
# 复制数据并转换状态
@@ -193,11 +193,11 @@ class TenantService:
# 处理状态
item['status'] = '正常' if item.get('status') else '停用'
# 处理创建者
creator_info = item.get('creator')
creator_info = item.get('created_id')
if isinstance(creator_info, dict):
item['creator'] = creator_info.get('name', '未知')
item['created_id'] = creator_info.get('name', '未知')
else:
item['creator'] = '未知'
item['created_id'] = '未知'
return ExcelUtil.export_list2excel(list_data=data, mapping_dict=mapping_dict)
@@ -19,7 +19,7 @@ class UserQueryParam:
status: Optional[bool] = Query(None, description="是否可用"),
start_time: Optional[DateTimeStr] = Query(None, description="开始时间", example="2025-01-01 00:00:00"),
end_time: Optional[DateTimeStr] = Query(None, description="结束时间", example="2025-12-31 23:59:59"),
creator: Optional[int] = Query(None, description="创建人"),
created_id: Optional[int] = Query(None, description="创建人"),
) -> None:
# 模糊查询字段
@@ -30,9 +30,9 @@ class UserQueryParam:
# 精确查询字段
self.dept_id = dept_id
self.created_id = creator
self.created_id = created_id
self.status = status
# 时间范围查询
if start_time and end_time:
self.created_at = ("between", (start_time, end_time))
self.created_time = ("between", (start_time, end_time))
@@ -618,8 +618,8 @@ class UserService:
'is_superuser': '是否超级管理员',
'last_login': '最后登录时间',
'description': '备注',
'created_at': '创建时间',
'updated_at': '更新时间',
'created_time': '创建时间',
'updated_time': '更新时间',
'creator': '创建者',
}