diff --git a/README.en.md b/README.en.md
deleted file mode 100644
index f00a0eb35deb1d1d3b8a9a213b7f437938c6f3d2..0000000000000000000000000000000000000000
--- a/README.en.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# Dash-FastAPI
-
-#### Description
-基于Dash+FastAPI开发的一个通用中后台管理系统
-
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### Instructions
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### Contribution
-
-1. Fork the repository
-2. Create Feat_xxx branch
-3. Commit your code
-4. Create Pull Request
-
-
-#### Gitee Feature
-
-1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2. Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4. The most valuable open source project [GVP](https://gitee.com/gvp)
-5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
diff --git a/README.md b/README.md
index 98783591bb4f81e1daf07f22dcf0cbbdc5d09c4b..a47b72c78e072f5f02ed92f4f8475d1aced85073 100644
--- a/README.md
+++ b/README.md
@@ -1,37 +1,127 @@
-# Dash-FastAPI
+
+ 
+
+Dash-FastAPI-Admin v1.0.0
+基于Dash+FastAPI前后端分离的纯Python快速开发框架
+
+ 
+ 
+ 
+
-#### 介绍
-基于Dash+FastAPI开发的一个通用中后台管理系统
+## 平台简介
-#### 软件架构
-软件架构说明
+Dash-FastAPI-Admin是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。
+* 前端采用Dash、feffery-antd-components、feffery-utils-components。
+* 后端采用FastAPI、sqlalchemy、MySQL、Redis、OAuth2 & Jwt。
+* 权限认证使用OAuth2 & Jwt，支持多终端认证系统。
+* 支持加载动态权限菜单，多方式轻松权限控制。
+* 特别鸣谢：[RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue) ，[feffery-antd-components](https://github.com/CNFeffery/feffery-antd-components)，[feffery-utils-components](https://github.com/CNFeffery/feffery-utils-components)。
-#### 安装教程
+## 内置功能
-1. xxxx
-2. xxxx
-3. xxxx
+1. 用户管理：用户是系统操作者，该功能主要完成系统用户配置。
+2. 角色管理：角色菜单权限分配。
+3. 菜单管理：配置系统菜单，操作权限，按钮权限标识等。
+4. 部门管理：配置系统组织机构（公司、部门、小组）。
+5. 岗位管理：配置系统用户所属担任职务。
+6. 字典管理：对系统中经常使用的一些较为固定的数据进行维护。
+7. 参数管理：对系统动态配置常用参数。
+8. 通知公告：系统通知公告信息发布维护。
+9. 操作日志：系统正常操作日志记录和查询；系统异常信息日志记录和查询。
+10. 登录日志：系统登录日志记录查询包含登录异常。
+11. 在线用户：当前系统中活跃用户状态监控。
+12. 定时任务：在线（添加、修改、删除）任务调度包含执行结果日志。
+13. 服务监控：监视当前系统CPU、内存、磁盘、堆栈等相关信息。
+14. 缓存监控：对系统的缓存信息查询，命令统计等。
+15. 系统接口：根据业务代码自动生成相关的api接口文档。
-#### 使用说明
+## 演示图
-1. xxxx
-2. xxxx
-3. xxxx
+
+
+  |
+  |
+
+
+  |
+  |
+
+
+  |
+  |
+
+
+  |
+  |
+
+
+  |
+  |
+
+
+  |
+  |
+
+
+  |
+  |
+
+
+  |
+  |
+
+
+  |
+
+
-#### 参与贡献
+## 项目运行相关
-1. Fork 本仓库
-2. 新建 Feat_xxx 分支
-3. 提交代码
-4. 新建 Pull Request
+```bash
+# 克隆项目
+git clone https://gitee.com/insistence2022/dash-fastapi-admin.git
+# 进入项目根目录
+cd Dash-FastAPI-Admin
-#### 特技
+# 安装项目依赖环境
+pip3 install -r requirements.txt
+```
-1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
-3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
-4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目
-5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
+### 前端
+```bash
+# 进入前端目录
+cd dash-fastapi-frontend
+
+# 运行前端
+python3 wsgi.py
+```
+
+### 后端
+```bash
+# 进入后端目录
+cd dash-fastapi-backend
+
+# 配置环境
+1.在config/env.py的DataBaseConfig类中配置数据库环境
+2.在config/env.py的RedisConfig类中配置redis环境
+
+# 运行sql文件
+1.新建数据库dash-fastapi(默认，可修改)
+2.使用命令或数据库连接工具运行sql文件夹下的dash-fastapi.sql
+
+# 运行后端
+python3 app.py
+```
+
+### 访问
+```bash
+# 默认账号密码
+账号：admin
+密码：admin123
+
+# 浏览器访问
+地址：http://127.0.0.1:8088
+```
\ No newline at end of file
diff --git a/dash-fastapi-backend/app.py b/dash-fastapi-backend/app.py
index 9ceb84f482fc457a268d6bb11e16cef350c489d9..da016c5c401aead81e7ce801c83b636509ddd426 100644
--- a/dash-fastapi-backend/app.py
+++ b/dash-fastapi-backend/app.py
@@ -1,25 +1,40 @@
from fastapi import FastAPI, Request
import uvicorn
-import aioredis
-from fastapi.responses import JSONResponse
-from fastapi.encoders import jsonable_encoder
from fastapi.exceptions import HTTPException
from fastapi.middleware.cors import CORSMiddleware
from module_admin.controller.login_controller import loginController
+from module_admin.controller.captcha_controller import captchaController
from module_admin.controller.user_controller import userController
from module_admin.controller.menu_controller import menuController
from module_admin.controller.dept_controller import deptController
from module_admin.controller.role_controller import roleController
from module_admin.controller.post_controler import postController
-from config.env import RedisConfig
-from module_admin.utils.response_util import response_401, AuthException
-
-
-app = FastAPI()
+from module_admin.controller.dict_controller import dictController
+from module_admin.controller.config_controller import configController
+from module_admin.controller.notice_controller import noticeController
+from module_admin.controller.log_controller import logController
+from module_admin.controller.online_controller import onlineController
+from module_admin.controller.job_controller import jobController
+from module_admin.controller.server_controller import serverController
+from module_admin.controller.cache_controller import cacheController
+from module_admin.controller.common_controller import commonController
+from config.get_redis import RedisUtil
+from config.get_db import init_create_table
+from config.get_scheduler import SchedulerUtil
+from utils.response_util import *
+from utils.log_util import logger
+from utils.common_util import worship
+
+app = FastAPI(
+ title='Dash-FastAPI',
+ description='Dash-FastAPI接口文档',
+ version='1.0.0',
+)
# 前端页面url
origins = [
"http://localhost:8088",
+ "http://127.0.0.1:8088",
]
# 后台api允许跨域
@@ -32,29 +47,24 @@ app.add_middleware(
)
-async def create_redis_pool() -> aioredis.Redis:
- redis = await aioredis.from_url(
- url=f"redis://{RedisConfig.HOST}",
- port=RedisConfig.PORT,
- username=RedisConfig.USERNAME,
- password=RedisConfig.PASSWORD,
- db=RedisConfig.DB,
- encoding="utf-8",
- decode_responses=True
- )
- return redis
-
-
@app.on_event("startup")
async def startup_event():
- app.state.redis = await create_redis_pool()
+ logger.info("Dash-FastAPI开始启动")
+ worship()
+ await init_create_table()
+ app.state.redis = await RedisUtil.create_redis_pool()
+ await RedisUtil.init_sys_dict(app.state.redis)
+ await RedisUtil.init_sys_config(app.state.redis)
+ await SchedulerUtil.init_system_scheduler()
+ logger.info("Dash-FastAPI启动成功")
@app.on_event("shutdown")
async def shutdown_event():
- await app.state.redis.close()
-
-
+ await RedisUtil.close_redis_pool(app)
+ await SchedulerUtil.close_system_scheduler()
+
+
# 自定义token检验异常
@app.exception_handler(AuthException)
async def auth_exception_handler(request: Request, exc: AuthException):
@@ -69,13 +79,22 @@ async def http_exception_handler(request: Request, exc: HTTPException):
)
-app.include_router(loginController, prefix="/login", tags=['login'])
-app.include_router(userController, prefix="/system", tags=['system/user'])
-app.include_router(menuController, prefix="/system", tags=['system/menu'])
-app.include_router(deptController, prefix="/system", tags=['system/dept'])
-app.include_router(roleController, prefix="/system", tags=['system/role'])
-app.include_router(postController, prefix="/system", tags=['system/post'])
-
+app.include_router(loginController, prefix="/login", tags=['登录模块'])
+app.include_router(captchaController, prefix="/captcha", tags=['验证码模块'])
+app.include_router(userController, prefix="/system", tags=['系统管理-用户管理'])
+app.include_router(menuController, prefix="/system", tags=['系统管理-菜单管理'])
+app.include_router(deptController, prefix="/system", tags=['系统管理-部门管理'])
+app.include_router(roleController, prefix="/system", tags=['系统管理-角色管理'])
+app.include_router(postController, prefix="/system", tags=['系统管理-岗位管理'])
+app.include_router(dictController, prefix="/system", tags=['系统管理-字典管理'])
+app.include_router(configController, prefix="/system", tags=['系统管理-参数管理'])
+app.include_router(noticeController, prefix="/system", tags=['系统管理-通知公告管理'])
+app.include_router(logController, prefix="/system", tags=['系统管理-日志管理'])
+app.include_router(onlineController, prefix="/monitor", tags=['系统监控-在线用户'])
+app.include_router(jobController, prefix="/monitor", tags=['系统监控-定时任务'])
+app.include_router(serverController, prefix="/monitor", tags=['系统监控-服务监控'])
+app.include_router(cacheController, prefix="/monitor", tags=['系统监控-缓存监控'])
+app.include_router(commonController, prefix="/common", tags=['通用模块'])
if __name__ == '__main__':
uvicorn.run(app='app:app', host="127.0.0.1", port=9099, reload=True)
diff --git a/dash-fastapi-backend/assets/font/Arial.ttf b/dash-fastapi-backend/assets/font/Arial.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..9512aea86467504e94d97ddd6396955e1e6786f7
Binary files /dev/null and b/dash-fastapi-backend/assets/font/Arial.ttf differ
diff --git a/dash-fastapi-backend/caches/avatar/admin_avatar.jpeg b/dash-fastapi-backend/caches/avatar/admin_avatar.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..58c3e92376f97cd5da3a16e1380210a365fc6c61
Binary files /dev/null and b/dash-fastapi-backend/caches/avatar/admin_avatar.jpeg differ
diff --git a/dash-fastapi-backend/caches/avatar/ry_avatar.jpeg b/dash-fastapi-backend/caches/avatar/ry_avatar.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..7a683af3b9fceb35b19a74c94ce5da212b2b89e9
Binary files /dev/null and b/dash-fastapi-backend/caches/avatar/ry_avatar.jpeg differ
diff --git a/dash-fastapi-backend/config/env.py b/dash-fastapi-backend/config/env.py
index d6021630d26243abab17656a8f189ffcd557f167..ab9ddc2dfc2aed73498b728dc93ac4bec11b652f 100644
--- a/dash-fastapi-backend/config/env.py
+++ b/dash-fastapi-backend/config/env.py
@@ -1,3 +1,6 @@
+import os
+
+
class JwtConfig:
"""
Jwt配置
@@ -5,6 +8,7 @@ class JwtConfig:
SECRET_KEY = "b01c66dc2c58dc6a0aabfe2144256be36226de378bf87f72c0c795dda67f4d55"
ALGORITHM = "HS256"
ACCESS_TOKEN_EXPIRE_MINUTES = 1440
+ REDIS_TOKEN_EXPIRE_MINUTES = 30
class DataBaseConfig:
@@ -27,3 +31,11 @@ class RedisConfig:
USERNAME = ''
PASSWORD = ''
DB = 2
+
+
+class CachePathConfig:
+ """
+ 缓存目录配置
+ """
+ PATH = os.path.join(os.path.abspath(os.getcwd()), 'caches')
+ PATHSTR = 'caches'
diff --git a/dash-fastapi-backend/config/get_db.py b/dash-fastapi-backend/config/get_db.py
index 391cf7f0bcfaba9710de8551c10f5f18770d4a2f..6d3a9cf40ff2f03fc33c327063fdaeb784825071 100644
--- a/dash-fastapi-backend/config/get_db.py
+++ b/dash-fastapi-backend/config/get_db.py
@@ -1,4 +1,5 @@
from config.database import *
+from utils.log_util import logger
def get_db_pro():
@@ -13,4 +14,14 @@ def get_db_pro():
current_db.close()
+async def init_create_table():
+ """
+ 应用启动时初始化数据库连接
+ :return:
+ """
+ logger.info("初始化数据库连接...")
+ Base.metadata.create_all(bind=engine)
+ logger.info("数据库连接成功")
+
+
get_db = get_db_pro
diff --git a/dash-fastapi-backend/config/get_redis.py b/dash-fastapi-backend/config/get_redis.py
new file mode 100644
index 0000000000000000000000000000000000000000..c7bc8ec6dfdca02c4670df43e2c4e55699ad8cb0
--- /dev/null
+++ b/dash-fastapi-backend/config/get_redis.py
@@ -0,0 +1,65 @@
+import aioredis
+from module_admin.service.dict_service import DictDataService
+from module_admin.service.config_service import ConfigService
+from config.env import RedisConfig
+from config.database import SessionLocal
+from utils.log_util import logger
+
+
+class RedisUtil:
+ """
+ Redis相关方法
+ """
+
+ @classmethod
+ async def create_redis_pool(cls) -> aioredis.Redis:
+ """
+ 应用启动时初始化redis连接
+ :return: Redis连接对象
+ """
+ logger.info("开始连接redis...")
+ redis = await aioredis.from_url(
+ url=f"redis://{RedisConfig.HOST}",
+ port=RedisConfig.PORT,
+ username=RedisConfig.USERNAME,
+ password=RedisConfig.PASSWORD,
+ db=RedisConfig.DB,
+ encoding="utf-8",
+ decode_responses=True
+ )
+ logger.info("redis连接成功")
+ return redis
+
+ @classmethod
+ async def close_redis_pool(cls, app):
+ """
+ 应用关闭时关闭redis连接
+ :param app: fastapi对象
+ :return:
+ """
+ await app.state.redis.close()
+ logger.info("关闭redis连接成功")
+
+ @classmethod
+ async def init_sys_dict(cls, redis):
+ """
+ 应用启动时缓存字典表
+ :param redis: redis对象
+ :return:
+ """
+ session = SessionLocal()
+ await DictDataService.init_cache_sys_dict_services(session, redis)
+
+ session.close()
+
+ @classmethod
+ async def init_sys_config(cls, redis):
+ """
+ 应用启动时缓存参数配置表
+ :param redis: redis对象
+ :return:
+ """
+ session = SessionLocal()
+ await ConfigService.init_cache_sys_config_services(session, redis)
+
+ session.close()
diff --git a/dash-fastapi-backend/config/get_scheduler.py b/dash-fastapi-backend/config/get_scheduler.py
new file mode 100644
index 0000000000000000000000000000000000000000..8ecad29f0957ce7efedf00da70cf7a2d05364a07
--- /dev/null
+++ b/dash-fastapi-backend/config/get_scheduler.py
@@ -0,0 +1,194 @@
+from apscheduler.schedulers.background import BackgroundScheduler
+from apscheduler.jobstores.sqlalchemy import SQLAlchemyJobStore
+from apscheduler.jobstores.memory import MemoryJobStore
+from apscheduler.jobstores.redis import RedisJobStore
+from apscheduler.executors.pool import ThreadPoolExecutor, ProcessPoolExecutor
+from apscheduler.triggers.cron import CronTrigger
+from apscheduler.events import EVENT_ALL
+import json
+from datetime import datetime, timedelta
+from config.database import engine, SQLALCHEMY_DATABASE_URL, SessionLocal
+from config.env import RedisConfig
+from module_admin.service.job_log_service import JobLogService, JobLogModel
+from module_admin.dao.job_dao import Session, JobDao
+from utils.log_util import logger
+import module_task
+
+
+# 重写Cron定时
+class MyCronTrigger(CronTrigger):
+ @classmethod
+ def from_crontab(cls, expr, timezone=None):
+ values = expr.split()
+ if len(values) != 7:
+ raise ValueError('Wrong number of fields; got {}, expected 7'.format(len(values)))
+
+ return cls(second=values[0], minute=values[1], hour=values[2], day=values[3], month=values[4],
+ day_of_week=values[5], year=values[6], timezone=timezone)
+
+
+job_stores = {
+ 'default': MemoryJobStore(),
+ 'sqlalchemy': SQLAlchemyJobStore(url=SQLALCHEMY_DATABASE_URL, engine=engine),
+ 'redis': RedisJobStore(
+ **dict(
+ host=RedisConfig.HOST,
+ port=RedisConfig.PORT,
+ username=RedisConfig.USERNAME,
+ password=RedisConfig.PASSWORD,
+ db=RedisConfig.DB
+ )
+ )
+}
+executors = {
+ 'default': ThreadPoolExecutor(20),
+ 'processpool': ProcessPoolExecutor(5)
+}
+job_defaults = {
+ 'coalesce': False,
+ 'max_instance': 1
+}
+scheduler = BackgroundScheduler()
+scheduler.configure(jobstores=job_stores, executors=executors, job_defaults=job_defaults)
+
+
+class SchedulerUtil:
+ """
+ 定时任务相关方法
+ """
+
+ @classmethod
+ async def init_system_scheduler(cls, result_db: Session = SessionLocal()):
+ """
+ 应用启动时初始化定时任务
+ :return:
+ """
+ logger.info("开始启动定时任务...")
+ scheduler.start()
+ job_list = JobDao.get_job_list_for_scheduler(result_db)
+ for item in job_list:
+ query_job = cls.get_scheduler_job(job_id=str(item.job_id))
+ if query_job:
+ cls.remove_scheduler_job(job_id=str(item.job_id))
+ cls.add_scheduler_job(item)
+ result_db.close()
+ scheduler.add_listener(cls.scheduler_event_listener, EVENT_ALL)
+ logger.info("系统初始定时任务加载成功")
+
+ @classmethod
+ async def close_system_scheduler(cls):
+ """
+ 应用关闭时关闭定时任务
+ :return:
+ """
+ scheduler.shutdown()
+ logger.info("关闭定时任务成功")
+
+ @classmethod
+ def get_scheduler_job(cls, job_id):
+ """
+ 根据任务id获取任务对象
+ :param job_id: 任务id
+ :return: 任务对象
+ """
+ query_job = scheduler.get_job(job_id=str(job_id))
+
+ return query_job
+
+ @classmethod
+ def add_scheduler_job(cls, job_info):
+ """
+ 根据输入的任务对象信息添加任务
+ :param job_info: 任务对象信息
+ :return:
+ """
+ scheduler.add_job(
+ func=eval(job_info.invoke_target),
+ trigger=MyCronTrigger.from_crontab(job_info.cron_expression),
+ args=job_info.job_args.split(',') if job_info.job_args else None,
+ kwargs=json.loads(job_info.job_kwargs) if job_info.job_kwargs else None,
+ id=str(job_info.job_id),
+ name=job_info.job_name,
+ misfire_grace_time=1000000000000 if job_info.misfire_policy == '3' else None,
+ coalesce=True if job_info.misfire_policy == '2' else False,
+ max_instances=3 if job_info.concurrent == '0' else 1,
+ jobstore=job_info.job_group,
+ executor=job_info.job_executor
+ )
+
+ @classmethod
+ def execute_scheduler_job_once(cls, job_info):
+ """
+ 根据输入的任务对象执行一次任务
+ :param job_info: 任务对象信息
+ :return:
+ """
+ scheduler.add_job(
+ func=eval(job_info.invoke_target),
+ trigger='date',
+ run_date=datetime.now() + timedelta(seconds=1),
+ args=job_info.job_args.split(',') if job_info.job_args else None,
+ kwargs=json.loads(job_info.job_kwargs) if job_info.job_kwargs else None,
+ id=str(job_info.job_id),
+ name=job_info.job_name,
+ misfire_grace_time=1000000000000 if job_info.misfire_policy == '3' else None,
+ coalesce=True if job_info.misfire_policy == '2' else False,
+ max_instances=3 if job_info.concurrent == '0' else 1,
+ jobstore=job_info.job_group,
+ executor=job_info.job_executor
+ )
+
+ @classmethod
+ def remove_scheduler_job(cls, job_id):
+ """
+ 根据任务id移除任务
+ :param job_id: 任务id
+ :return:
+ """
+ scheduler.remove_job(job_id=str(job_id))
+
+ @classmethod
+ def scheduler_event_listener(cls, event):
+ # 获取事件类型和任务ID
+ event_type = event.__class__.__name__
+ # 获取任务执行异常信息
+ status = '0'
+ exception_info = ''
+ if event_type == 'JobExecutionEvent' and event.exception:
+ exception_info = str(event.exception)
+ status = '1'
+ job_id = event.job_id
+ query_job = cls.get_scheduler_job(job_id=job_id)
+ if query_job:
+ query_job_info = query_job.__getstate__()
+ # 获取任务名称
+ job_name = query_job_info.get('name')
+ # 获取任务组名
+ job_group = query_job._jobstore_alias
+ # 获取任务执行器
+ job_executor = query_job_info.get('executor')
+ # 获取调用目标字符串
+ invoke_target = query_job_info.get('func')
+ # 获取调用函数位置参数
+ job_args = ','.join(query_job_info.get('args'))
+ # 获取调用函数关键字参数
+ job_kwargs = json.dumps(query_job_info.get('kwargs'))
+ # 获取任务触发器
+ job_trigger = str(query_job_info.get('trigger'))
+ # 构造日志消息
+ job_message = f"事件类型: {event_type}, 任务ID: {job_id}, 任务名称: {job_name}, 执行于{datetime.now().strftime('%Y-%m-%d %H:%M:%S')}"
+ job_log = dict(
+ job_name=job_name,
+ job_group=job_group,
+ job_executor=job_executor,
+ invoke_target=invoke_target,
+ job_args=job_args,
+ job_kwargs=job_kwargs,
+ job_trigger=job_trigger,
+ job_message=job_message,
+ status=status,
+ exception_info=exception_info
+ )
+ session = SessionLocal()
+ JobLogService.add_job_log_services(session, JobLogModel(**job_log))
+ session.close()
diff --git a/dash-fastapi-backend/module_admin/annotation/log_annotation.py b/dash-fastapi-backend/module_admin/annotation/log_annotation.py
new file mode 100644
index 0000000000000000000000000000000000000000..37dc894045c9df84b5c67c316e09b4b767565879
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/annotation/log_annotation.py
@@ -0,0 +1,164 @@
+from functools import wraps
+from fastapi import Request
+from fastapi.responses import JSONResponse, ORJSONResponse, UJSONResponse
+import inspect
+import os
+import json
+import time
+from datetime import datetime
+import requests
+from user_agents import parse
+from typing import Optional
+from module_admin.service.login_service import get_current_user
+from module_admin.service.log_service import OperationLogService, LoginLogService
+from module_admin.entity.vo.log_vo import OperLogModel, LogininforModel
+
+
+def log_decorator(title: str, business_type: int, log_type: Optional[str] = 'operation'):
+ """
+ 日志装饰器
+ :param log_type: 日志类型（login表示登录日志，为空表示为操作日志）
+ :param title: 当前日志装饰器装饰的模块标题
+ :param business_type: 业务类型（0其它 1新增 2修改 3删除 4授权 5导出 6导入 7强退 8生成代码 9清空数据）
+ :return:
+ """
+ def decorator(func):
+ @wraps(func)
+ async def wrapper(*args, **kwargs):
+ start_time = time.time()
+ # 获取被装饰函数的文件路径
+ file_path = inspect.getfile(func)
+ # 获取项目根路径
+ project_root = os.getcwd()
+ # 处理文件路径，去除项目根路径部分
+ relative_path = os.path.relpath(file_path, start=project_root)[0:-2].replace('\\', '.')
+ # 获取当前被装饰函数所在路径
+ func_path = f'{relative_path}{func.__name__}()'
+ # 获取上下文信息
+ request: Request = kwargs.get('request')
+ token = request.headers.get('Authorization')
+ query_db = kwargs.get('query_db')
+ request_method = request.method
+ operator_type = 0
+ user_agent = request.headers.get('User-Agent')
+ if "Windows" in user_agent or "Macintosh" in user_agent or "Linux" in user_agent:
+ operator_type = 1
+ if "Mobile" in user_agent or "Android" in user_agent or "iPhone" in user_agent:
+ operator_type = 2
+ # 获取请求的url
+ oper_url = request.url.path
+ # 获取请求的ip及ip归属区域
+ oper_ip = request.headers.get('remote_addr')
+ oper_location = '内网IP'
+ try:
+ if oper_ip != '127.0.0.1' and oper_ip != 'localhost':
+ ip_result = requests.get(f'https://qifu-api.baidubce.com/ip/geo/v1/district?ip={oper_ip}')
+ if ip_result.status_code == 200:
+ prov = ip_result.json().get('data').get('prov')
+ city = ip_result.json().get('data').get('city')
+ if prov or city:
+ oper_location = f'{prov}-{city}'
+ else:
+ oper_location = '未知'
+ else:
+ oper_location = '未知'
+ except Exception as e:
+ oper_location = '未知'
+ print(e)
+ finally:
+ # 根据不同的请求类型使用不同的方法获取请求参数
+ content_type = request.headers.get("Content-Type")
+ if content_type and ("multipart/form-data" in content_type or 'application/x-www-form-urlencoded' in content_type):
+ payload = await request.form()
+ oper_param = "\n".join([f"{key}: {value}" for key, value in payload.items()])
+ else:
+ payload = await request.body()
+ oper_param = json.dumps(json.loads(str(payload, 'utf-8')), ensure_ascii=False)
+ # 日志表请求参数字段长度最大为2000，因此在此处判断长度
+ if len(oper_param) > 2000:
+ oper_param = '请求参数过长'
+
+ # 获取操作时间
+ oper_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+ # 此处在登录之前向原始函数传递一些登录信息，用于监测在线用户的相关信息
+ login_log = {}
+ if log_type == 'login':
+ user_agent_info = parse(user_agent)
+ browser = f'{user_agent_info.browser.family} {user_agent_info.browser.version[0]}'
+ system_os = f'{user_agent_info.os.family} {user_agent_info.os.version[0]}'
+ login_log = dict(
+ ipaddr=oper_ip,
+ login_location=oper_location,
+ browser=browser,
+ os=system_os,
+ login_time=oper_time
+ )
+ kwargs['form_data'].login_info = login_log
+ # 调用原始函数
+ result = await func(*args, **kwargs)
+ # 获取请求耗时
+ cost_time = float(time.time() - start_time) * 100
+ # 判断请求是否来自api文档
+ request_from_swagger = request.headers.get('referer').endswith('docs') if request.headers.get('referer') else False
+ request_from_redoc = request.headers.get('referer').endswith('redoc') if request.headers.get('referer') else False
+ # 根据响应结果的类型使用不同的方法获取响应结果参数
+ if isinstance(result, JSONResponse) or isinstance(result, ORJSONResponse) or isinstance(result, UJSONResponse):
+ result_dict = json.loads(str(result.body, 'utf-8'))
+ else:
+ if request_from_swagger or request_from_redoc:
+ result_dict = {}
+ else:
+ if result.status_code == 200:
+ result_dict = {'code': result.status_code, 'message': '获取成功'}
+ else:
+ result_dict = {'code': result.status_code, 'message': '获取失败'}
+ json_result = json.dumps(dict(code=result_dict.get('code'), message=result_dict.get('message')), ensure_ascii=False)
+ # 根据响应结果获取响应状态及异常信息
+ status = 1
+ error_msg = ''
+ if result_dict.get('code') == 200:
+ status = 0
+ else:
+ error_msg = result_dict.get('message')
+ # 根据日志类型向对应的日志表插入数据
+ if log_type == 'login':
+ # 登录请求来自于api文档时不记录登录日志，其余情况则记录
+ if request_from_swagger or request_from_redoc:
+ pass
+ else:
+ user = kwargs.get('form_data')
+ user_name = user.username
+ login_log['user_name'] = user_name
+ login_log['status'] = str(status)
+ login_log['msg'] = result_dict.get('message')
+
+ LoginLogService.add_login_log_services(query_db, LogininforModel(**login_log))
+ else:
+ current_user = await get_current_user(request, token, query_db)
+ oper_name = current_user.user.user_name
+ dept_name = current_user.dept.dept_name
+ operation_log = dict(
+ title=title,
+ business_type=business_type,
+ method=func_path,
+ request_method=request_method,
+ operator_type=operator_type,
+ oper_name=oper_name,
+ dept_name=dept_name,
+ oper_url=oper_url,
+ oper_ip=oper_ip,
+ oper_location=oper_location,
+ oper_param=oper_param,
+ json_result=json_result,
+ status=status,
+ error_msg=error_msg,
+ oper_time=oper_time,
+ cost_time=cost_time
+ )
+ OperationLogService.add_operation_log_services(query_db, OperLogModel(**operation_log))
+
+ return result
+
+ return wrapper
+
+ return decorator
diff --git a/dash-fastapi-backend/module_admin/aspect/interface_auth.py b/dash-fastapi-backend/module_admin/aspect/interface_auth.py
new file mode 100644
index 0000000000000000000000000000000000000000..ebaaf14e2766aedf9f52c8a46e5484666a1ff08c
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/aspect/interface_auth.py
@@ -0,0 +1,19 @@
+from fastapi import Depends
+from module_admin.entity.vo.user_vo import CurrentUserInfoServiceResponse
+from module_admin.service.login_service import get_current_user
+from utils.response_util import AuthException
+
+
+class CheckUserInterfaceAuth:
+ """
+ 校验当前用户是否具有相应的接口权限
+ """
+ def __init__(self, perm_str: str = 'common'):
+ self.perm_str = perm_str
+
+ def __call__(self, current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
+ user_auth_list = [item.perms for item in current_user.menu]
+ user_auth_list.append('common')
+ if self.perm_str in user_auth_list:
+ return True
+ raise AuthException(data="", message="该用户无此接口权限")
diff --git a/dash-fastapi-backend/module_admin/controller/cache_controller.py b/dash-fastapi-backend/module_admin/controller/cache_controller.py
new file mode 100644
index 0000000000000000000000000000000000000000..e18696b2af8d4993671dcd0b132fd01350884b87
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/controller/cache_controller.py
@@ -0,0 +1,22 @@
+from fastapi import APIRouter
+from fastapi import Depends
+from module_admin.service.login_service import get_current_user
+from module_admin.service.cache_service import *
+from utils.response_util import *
+from utils.log_util import *
+from module_admin.aspect.interface_auth import CheckUserInterfaceAuth
+
+
+cacheController = APIRouter(prefix='/cache', dependencies=[Depends(get_current_user)])
+
+
+@cacheController.post("/statisticalInfo", response_model=CacheMonitorModel, dependencies=[Depends(CheckUserInterfaceAuth('monitor:cache:list'))])
+async def get_monitor_cache_info(request: Request):
+ try:
+ # 获取全量数据
+ cache_info_query_result = await CacheService.get_cache_monitor_statistical_info_services(request)
+ logger.info('获取成功')
+ return response_200(data=cache_info_query_result, message="获取成功")
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
diff --git a/dash-fastapi-backend/module_admin/controller/captcha_controller.py b/dash-fastapi-backend/module_admin/controller/captcha_controller.py
new file mode 100644
index 0000000000000000000000000000000000000000..d6a28840228cce907ebe43161b79f62bc1532a9e
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/controller/captcha_controller.py
@@ -0,0 +1,24 @@
+import uuid
+from fastapi import APIRouter, Request
+from module_admin.service.captcha_service import *
+from utils.response_util import *
+from utils.log_util import *
+from datetime import timedelta
+
+
+captchaController = APIRouter()
+
+
+@captchaController.post("/captchaImage")
+async def get_captcha_image(request: Request):
+ try:
+ session_id = str(uuid.uuid4())
+ captcha_result = CaptchaService.create_captcha_image_service()
+ image = captcha_result[0]
+ computed_result = captcha_result[1]
+ await request.app.state.redis.set(f'captcha_codes:{session_id}', computed_result, ex=timedelta(minutes=2))
+ logger.info(f'编号为{session_id}的会话获取图片验证码成功')
+ return response_200(data={'image': image, 'session_id': session_id}, message='获取验证码成功')
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
diff --git a/dash-fastapi-backend/module_admin/controller/common_controller.py b/dash-fastapi-backend/module_admin/controller/common_controller.py
new file mode 100644
index 0000000000000000000000000000000000000000..7844e0c3a6edc3814f49f09fefcb1d84518fe147
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/controller/common_controller.py
@@ -0,0 +1,85 @@
+from fastapi import APIRouter, Request
+from fastapi import Depends, File, Form
+from config.env import CachePathConfig
+from module_admin.service.login_service import get_current_user
+from module_admin.service.common_service import *
+from module_admin.service.config_service import ConfigService
+from utils.response_util import *
+from utils.log_util import *
+from module_admin.aspect.interface_auth import CheckUserInterfaceAuth
+
+
+commonController = APIRouter()
+
+
+@commonController.post("/upload", dependencies=[Depends(get_current_user), Depends(CheckUserInterfaceAuth('common'))])
+async def common_upload(request: Request, uploadId: str = Form(), file: UploadFile = File(...)):
+ try:
+ try:
+ os.makedirs(os.path.join(CachePathConfig.PATH, uploadId))
+ except FileExistsError:
+ pass
+ CommonService.upload_service(CachePathConfig.PATH, uploadId, file)
+ logger.info('上传成功')
+ return response_200(data={'filename': file.filename}, message="上传成功")
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@commonController.post("/uploadForEditor", dependencies=[Depends(get_current_user), Depends(CheckUserInterfaceAuth('common'))])
+async def editor_upload(request: Request, uploadId: str = Form(), file: UploadFile = File(...)):
+ try:
+ try:
+ os.makedirs(os.path.join(CachePathConfig.PATH, uploadId))
+ except FileExistsError:
+ pass
+ CommonService.upload_service(CachePathConfig.PATH, uploadId, file)
+ logger.info('上传成功')
+ return JSONResponse(
+ status_code=status.HTTP_200_OK,
+ content=jsonable_encoder(
+ {
+ 'errno': 0,
+ 'data': {
+ 'url': f'{request.base_url}common/{CachePathConfig.PATHSTR}?taskId={uploadId}&filename={file.filename}'
+ },
+ }
+ )
+ )
+ except Exception as e:
+ logger.exception(e)
+ return JSONResponse(
+ status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+ content=jsonable_encoder(
+ {
+ 'errno': 1,
+ 'message': str(e),
+ }
+ )
+ )
+
+
+@commonController.get(f"/{CachePathConfig.PATHSTR}")
+def common_download(request: Request, taskId: str, filename: str):
+ try:
+ def generate_file():
+ with open(os.path.join(CachePathConfig.PATH, taskId, filename), 'rb') as response_file:
+ yield from response_file
+ logger.info('获取成功')
+ return streaming_response_200(data=generate_file())
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@commonController.get("/config/query/{config_key}")
+async def query_system_config(request: Request, config_key: str):
+ try:
+ # 获取全量数据
+ config_query_result = await ConfigService.query_config_list_from_cache_services(request.app.state.redis, config_key)
+ logger.info('获取成功')
+ return response_200(data=config_query_result, message="获取成功")
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
diff --git a/dash-fastapi-backend/module_admin/controller/config_controller.py b/dash-fastapi-backend/module_admin/controller/config_controller.py
new file mode 100644
index 0000000000000000000000000000000000000000..a8286e6217d76d1de602311330b51b0698c5eced
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/controller/config_controller.py
@@ -0,0 +1,123 @@
+from fastapi import APIRouter
+from fastapi import Depends
+from config.get_db import get_db
+from module_admin.service.login_service import get_current_user, CurrentUserInfoServiceResponse
+from module_admin.service.config_service import *
+from module_admin.entity.vo.config_vo import *
+from utils.response_util import *
+from utils.log_util import *
+from utils.page_util import get_page_obj
+from utils.common_util import bytes2file_response
+from module_admin.aspect.interface_auth import CheckUserInterfaceAuth
+from module_admin.annotation.log_annotation import log_decorator
+
+
+configController = APIRouter(dependencies=[Depends(get_current_user)])
+
+
+@configController.post("/config/get", response_model=ConfigPageObjectResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:config:list'))])
+async def get_system_config_list(request: Request, config_page_query: ConfigPageObject, query_db: Session = Depends(get_db)):
+ try:
+ config_query = ConfigQueryModel(**config_page_query.dict())
+ # 获取全量数据
+ config_query_result = ConfigService.get_config_list_services(query_db, config_query)
+ # 分页操作
+ config_page_query_result = get_page_obj(config_query_result, config_page_query.page_num, config_page_query.page_size)
+ logger.info('获取成功')
+ return response_200(data=config_page_query_result, message="获取成功")
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@configController.post("/config/add", response_model=CrudConfigResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:config:add'))])
+@log_decorator(title='参数管理', business_type=1)
+async def add_system_config(request: Request, add_config: ConfigModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
+ try:
+ add_config.create_by = current_user.user.user_name
+ add_config.update_by = current_user.user.user_name
+ add_config_result = await ConfigService.add_config_services(request, query_db, add_config)
+ if add_config_result.is_success:
+ logger.info(add_config_result.message)
+ return response_200(data=add_config_result, message=add_config_result.message)
+ else:
+ logger.warning(add_config_result.message)
+ return response_400(data="", message=add_config_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@configController.patch("/config/edit", response_model=CrudConfigResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:config:edit'))])
+@log_decorator(title='参数管理', business_type=2)
+async def edit_system_config(request: Request, edit_config: ConfigModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
+ try:
+ edit_config.update_by = current_user.user.user_name
+ edit_config.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+ edit_config_result = await ConfigService.edit_config_services(request, query_db, edit_config)
+ if edit_config_result.is_success:
+ logger.info(edit_config_result.message)
+ return response_200(data=edit_config_result, message=edit_config_result.message)
+ else:
+ logger.warning(edit_config_result.message)
+ return response_400(data="", message=edit_config_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@configController.post("/config/delete", response_model=CrudConfigResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:config:remove'))])
+@log_decorator(title='参数管理', business_type=3)
+async def delete_system_config(request: Request, delete_config: DeleteConfigModel, query_db: Session = Depends(get_db)):
+ try:
+ delete_config_result = await ConfigService.delete_config_services(request, query_db, delete_config)
+ if delete_config_result.is_success:
+ logger.info(delete_config_result.message)
+ return response_200(data=delete_config_result, message=delete_config_result.message)
+ else:
+ logger.warning(delete_config_result.message)
+ return response_400(data="", message=delete_config_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@configController.get("/config/{config_id}", response_model=ConfigModel, dependencies=[Depends(CheckUserInterfaceAuth('system:config:query'))])
+async def query_detail_system_config(request: Request, config_id: int, query_db: Session = Depends(get_db)):
+ try:
+ detail_config_result = ConfigService.detail_config_services(query_db, config_id)
+ logger.info(f'获取config_id为{config_id}的信息成功')
+ return response_200(data=detail_config_result, message='获取成功')
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@configController.post("/config/export", dependencies=[Depends(CheckUserInterfaceAuth('system:config:export'))])
+@log_decorator(title='参数管理', business_type=5)
+async def export_system_config_list(request: Request, config_query: ConfigQueryModel, query_db: Session = Depends(get_db)):
+ try:
+ # 获取全量数据
+ config_query_result = ConfigService.get_config_list_services(query_db, config_query)
+ config_export_result = ConfigService.export_config_list_services(config_query_result)
+ logger.info('导出成功')
+ return streaming_response_200(data=bytes2file_response(config_export_result))
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@configController.post("/config/refresh", response_model=CrudConfigResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:config:edit'))])
+@log_decorator(title='参数管理', business_type=2)
+async def refresh_system_config(request: Request, query_db: Session = Depends(get_db)):
+ try:
+ refresh_config_result = await ConfigService.refresh_sys_config_services(request, query_db)
+ if refresh_config_result.is_success:
+ logger.info(refresh_config_result.message)
+ return response_200(data=refresh_config_result, message=refresh_config_result.message)
+ else:
+ logger.warning(refresh_config_result.message)
+ return response_400(data="", message=refresh_config_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
diff --git a/dash-fastapi-backend/module_admin/controller/dept_controller.py b/dash-fastapi-backend/module_admin/controller/dept_controller.py
index 69c87a50bfe941e77953c8d21d616e06ff7605e5..4103a9b3deccc167a6835014c48028535e4c46a1 100644
--- a/dash-fastapi-backend/module_admin/controller/dept_controller.py
+++ b/dash-fastapi-backend/module_admin/controller/dept_controller.py
@@ -1,74 +1,77 @@
from fastapi import APIRouter, Request
-from fastapi import Depends, Header
+from fastapi import Depends
from config.get_db import get_db
-from module_admin.service.login_service import get_current_user
+from module_admin.service.login_service import get_current_user, CurrentUserInfoServiceResponse
from module_admin.service.dept_service import *
-from module_admin.entity.vo.dept_schema import *
-from module_admin.mapper.dept_crud import *
-from module_admin.utils.response_tool import *
-from module_admin.utils.log_tool import *
+from module_admin.entity.vo.dept_vo import *
+from module_admin.dao.dept_dao import *
+from utils.response_util import *
+from utils.log_util import *
+from module_admin.aspect.interface_auth import CheckUserInterfaceAuth
+from module_admin.annotation.log_annotation import log_decorator
deptController = APIRouter(dependencies=[Depends(get_current_user)])
-@deptController.post("/dept/tree", response_model=DeptTree)
-async def get_system_dept_tree(dept_query: DeptModel, query_db: Session = Depends(get_db)):
+@deptController.post("/dept/tree", response_model=DeptTree, dependencies=[Depends(CheckUserInterfaceAuth('common'))])
+async def get_system_dept_tree(request: Request, dept_query: DeptModel, query_db: Session = Depends(get_db)):
try:
- dept_query_result = get_dept_tree_services(query_db, dept_query)
+ dept_query_result = DeptService.get_dept_tree_services(query_db, dept_query)
logger.info('获取成功')
return response_200(data=dept_query_result, message="获取成功")
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@deptController.post("/dept/forEditOption", response_model=DeptTree)
-async def get_system_dept_tree_for_edit_option(dept_query: DeptModel, query_db: Session = Depends(get_db)):
+@deptController.post("/dept/forEditOption", response_model=DeptTree, dependencies=[Depends(CheckUserInterfaceAuth('common'))])
+async def get_system_dept_tree_for_edit_option(request: Request, dept_query: DeptModel, query_db: Session = Depends(get_db)):
try:
- dept_query_result = get_dept_tree_for_edit_option_services(query_db, dept_query)
+ dept_query_result = DeptService.get_dept_tree_for_edit_option_services(query_db, dept_query)
logger.info('获取成功')
return response_200(data=dept_query_result, message="获取成功")
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@deptController.post("/dept/get", response_model=DeptResponse)
-async def get_system_dept_list(dept_query: DeptModel, query_db: Session = Depends(get_db)):
+@deptController.post("/dept/get", response_model=DeptResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:dept:list'))])
+async def get_system_dept_list(request: Request, dept_query: DeptModel, query_db: Session = Depends(get_db)):
try:
- dept_query_result = get_dept_list_services(query_db, dept_query)
+ dept_query_result = DeptService.get_dept_list_services(query_db, dept_query)
logger.info('获取成功')
return response_200(data=dept_query_result, message="获取成功")
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@deptController.post("/dept/add", response_model=CrudDeptResponse)
-async def add_system_dept(request: Request, add_dept: DeptModel, token: Optional[str] = Header(...), query_db: Session = Depends(get_db)):
+@deptController.post("/dept/add", response_model=CrudDeptResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:dept:add'))])
+@log_decorator(title='部门管理', business_type=1)
+async def add_system_dept(request: Request, add_dept: DeptModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
try:
- current_user = await get_current_user(request, token, query_db)
add_dept.create_by = current_user.user.user_name
add_dept.update_by = current_user.user.user_name
- add_dept_result = add_dept_services(query_db, add_dept)
- logger.info(add_dept_result.message)
+ add_dept_result = DeptService.add_dept_services(query_db, add_dept)
if add_dept_result.is_success:
+ logger.info(add_dept_result.message)
return response_200(data=add_dept_result, message=add_dept_result.message)
else:
+ logger.warning(add_dept_result.message)
return response_400(data="", message=add_dept_result.message)
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@deptController.patch("/dept/edit", response_model=CrudDeptResponse)
-async def edit_system_dept(request: Request, edit_dept: DeptModel, token: Optional[str] = Header(...), query_db: Session = Depends(get_db)):
+@deptController.patch("/dept/edit", response_model=CrudDeptResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:dept:edit'))])
+@log_decorator(title='部门管理', business_type=2)
+async def edit_system_dept(request: Request, edit_dept: DeptModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
try:
- current_user = await get_current_user(request, token, query_db)
edit_dept.update_by = current_user.user.user_name
edit_dept.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
- edit_dept_result = edit_dept_services(query_db, edit_dept)
+ edit_dept_result = DeptService.edit_dept_services(query_db, edit_dept)
if edit_dept_result.is_success:
logger.info(edit_dept_result.message)
return response_200(data=edit_dept_result, message=edit_dept_result.message)
@@ -77,16 +80,16 @@ async def edit_system_dept(request: Request, edit_dept: DeptModel, token: Option
return response_400(data="", message=edit_dept_result.message)
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@deptController.post("/dept/delete", response_model=CrudDeptResponse)
-async def delete_system_dept(request: Request, delete_dept: DeleteDeptModel, token: Optional[str] = Header(...), query_db: Session = Depends(get_db)):
+@deptController.post("/dept/delete", response_model=CrudDeptResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:dept:remove'))])
+@log_decorator(title='部门管理', business_type=3)
+async def delete_system_dept(request: Request, delete_dept: DeleteDeptModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
try:
- current_user = await get_current_user(request, token, query_db)
delete_dept.update_by = current_user.user.user_name
delete_dept.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
- delete_dept_result = delete_dept_services(query_db, delete_dept)
+ delete_dept_result = DeptService.delete_dept_services(query_db, delete_dept)
if delete_dept_result.is_success:
logger.info(delete_dept_result.message)
return response_200(data=delete_dept_result, message=delete_dept_result.message)
@@ -95,15 +98,15 @@ async def delete_system_dept(request: Request, delete_dept: DeleteDeptModel, tok
return response_400(data="", message=delete_dept_result.message)
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@deptController.get("/dept/{dept_id}", response_model=DeptModel)
-async def query_detail_system_dept(dept_id: int, query_db: Session = Depends(get_db)):
+@deptController.get("/dept/{dept_id}", response_model=DeptModel, dependencies=[Depends(CheckUserInterfaceAuth('system:dept:query'))])
+async def query_detail_system_dept(request: Request, dept_id: int, query_db: Session = Depends(get_db)):
try:
- detail_dept_result = detail_dept_services(query_db, dept_id)
+ detail_dept_result = DeptService.detail_dept_services(query_db, dept_id)
logger.info(f'获取dept_id为{dept_id}的信息成功')
return response_200(data=detail_dept_result, message='获取成功')
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
diff --git a/dash-fastapi-backend/module_admin/controller/dict_controller.py b/dash-fastapi-backend/module_admin/controller/dict_controller.py
new file mode 100644
index 0000000000000000000000000000000000000000..dcb090626fcdbb24f0ed694728b2a5ec2fb45041
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/controller/dict_controller.py
@@ -0,0 +1,238 @@
+from fastapi import APIRouter
+from fastapi import Depends
+from config.get_db import get_db
+from module_admin.service.login_service import get_current_user, CurrentUserInfoServiceResponse
+from module_admin.service.dict_service import *
+from module_admin.entity.vo.dict_vo import *
+from utils.response_util import *
+from utils.log_util import *
+from utils.page_util import get_page_obj
+from utils.common_util import bytes2file_response
+from module_admin.aspect.interface_auth import CheckUserInterfaceAuth
+from module_admin.annotation.log_annotation import log_decorator
+
+
+dictController = APIRouter(dependencies=[Depends(get_current_user)])
+
+
+@dictController.post("/dictType/get", response_model=DictTypePageObjectResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:dict:list'))])
+async def get_system_dict_type_list(request: Request, dict_type_page_query: DictTypePageObject, query_db: Session = Depends(get_db)):
+ try:
+ dict_type_query = DictTypeQueryModel(**dict_type_page_query.dict())
+ # 获取全量数据
+ dict_type_query_result = DictTypeService.get_dict_type_list_services(query_db, dict_type_query)
+ # 分页操作
+ dict_type_page_query_result = get_page_obj(dict_type_query_result, dict_type_page_query.page_num, dict_type_page_query.page_size)
+ logger.info('获取成功')
+ return response_200(data=dict_type_page_query_result, message="获取成功")
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@dictController.post("/dictType/all", dependencies=[Depends(CheckUserInterfaceAuth('system:dict:list'))])
+async def get_system_all_dict_type(request: Request, dict_type_query: DictTypeQueryModel, query_db: Session = Depends(get_db)):
+ try:
+ dict_type_query_result = DictTypeService.get_all_dict_type_services(query_db)
+ logger.info('获取成功')
+ return response_200(data=dict_type_query_result, message="获取成功")
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@dictController.post("/dictType/add", response_model=CrudDictResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:dict:add'))])
+@log_decorator(title='字典管理', business_type=1)
+async def add_system_dict_type(request: Request, add_dict_type: DictTypeModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
+ try:
+ add_dict_type.create_by = current_user.user.user_name
+ add_dict_type.update_by = current_user.user.user_name
+ add_dict_type_result = await DictTypeService.add_dict_type_services(request, query_db, add_dict_type)
+ if add_dict_type_result.is_success:
+ logger.info(add_dict_type_result.message)
+ return response_200(data=add_dict_type_result, message=add_dict_type_result.message)
+ else:
+ logger.warning(add_dict_type_result.message)
+ return response_400(data="", message=add_dict_type_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@dictController.patch("/dictType/edit", response_model=CrudDictResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:dict:edit'))])
+@log_decorator(title='字典管理', business_type=2)
+async def edit_system_dict_type(request: Request, edit_dict_type: DictTypeModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
+ try:
+ edit_dict_type.update_by = current_user.user.user_name
+ edit_dict_type.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+ edit_dict_type_result = await DictTypeService.edit_dict_type_services(request, query_db, edit_dict_type)
+ if edit_dict_type_result.is_success:
+ logger.info(edit_dict_type_result.message)
+ return response_200(data=edit_dict_type_result, message=edit_dict_type_result.message)
+ else:
+ logger.warning(edit_dict_type_result.message)
+ return response_400(data="", message=edit_dict_type_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@dictController.post("/dictType/delete", response_model=CrudDictResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:dict:remove'))])
+@log_decorator(title='字典管理', business_type=3)
+async def delete_system_dict_type(request: Request, delete_dict_type: DeleteDictTypeModel, query_db: Session = Depends(get_db)):
+ try:
+ delete_dict_type_result = await DictTypeService.delete_dict_type_services(request, query_db, delete_dict_type)
+ if delete_dict_type_result.is_success:
+ logger.info(delete_dict_type_result.message)
+ return response_200(data=delete_dict_type_result, message=delete_dict_type_result.message)
+ else:
+ logger.warning(delete_dict_type_result.message)
+ return response_400(data="", message=delete_dict_type_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@dictController.get("/dictType/{dict_id}", response_model=DictTypeModel, dependencies=[Depends(CheckUserInterfaceAuth('system:dict:query'))])
+async def query_detail_system_dict_type(request: Request, dict_id: int, query_db: Session = Depends(get_db)):
+ try:
+ detail_dict_type_result = DictTypeService.detail_dict_type_services(query_db, dict_id)
+ logger.info(f'获取dict_id为{dict_id}的信息成功')
+ return response_200(data=detail_dict_type_result, message='获取成功')
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@dictController.post("/dictType/export", dependencies=[Depends(CheckUserInterfaceAuth('system:dict:export'))])
+@log_decorator(title='字典管理', business_type=5)
+async def export_system_dict_type_list(request: Request, dict_type_query: DictTypeQueryModel, query_db: Session = Depends(get_db)):
+ try:
+ # 获取全量数据
+ dict_type_query_result = DictTypeService.get_dict_type_list_services(query_db, dict_type_query)
+ dict_type_export_result = DictTypeService.export_dict_type_list_services(dict_type_query_result)
+ logger.info('导出成功')
+ return streaming_response_200(data=bytes2file_response(dict_type_export_result))
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@dictController.post("/dictType/refresh", response_model=CrudDictResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:dict:edit'))])
+@log_decorator(title='字典管理', business_type=2)
+async def refresh_system_dict(request: Request, query_db: Session = Depends(get_db)):
+ try:
+ refresh_dict_result = await DictTypeService.refresh_sys_dict_services(request, query_db)
+ if refresh_dict_result.is_success:
+ logger.info(refresh_dict_result.message)
+ return response_200(data=refresh_dict_result, message=refresh_dict_result.message)
+ else:
+ logger.warning(refresh_dict_result.message)
+ return response_400(data="", message=refresh_dict_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@dictController.post("/dictData/get", response_model=DictDataPageObjectResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:dict:list'))])
+async def get_system_dict_data_list(request: Request, dict_data_page_query: DictDataPageObject, query_db: Session = Depends(get_db)):
+ try:
+ dict_data_query = DictDataModel(**dict_data_page_query.dict())
+ # 获取全量数据
+ dict_data_query_result = DictDataService.get_dict_data_list_services(query_db, dict_data_query)
+ # 分页操作
+ dict_data_page_query_result = get_page_obj(dict_data_query_result, dict_data_page_query.page_num, dict_data_page_query.page_size)
+ logger.info('获取成功')
+ return response_200(data=dict_data_page_query_result, message="获取成功")
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@dictController.get("/dictData/query/{dict_type}", dependencies=[Depends(CheckUserInterfaceAuth('system:dict:list'))])
+async def query_system_dict_data_list(request: Request, dict_type: str, query_db: Session = Depends(get_db)):
+ try:
+ # 获取全量数据
+ dict_data_query_result = await DictDataService.query_dict_data_list_from_cache_services(request.app.state.redis, dict_type)
+ logger.info('获取成功')
+ return response_200(data=dict_data_query_result, message="获取成功")
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@dictController.post("/dictData/add", response_model=CrudDictResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:dict:add'))])
+@log_decorator(title='字典管理', business_type=1)
+async def add_system_dict_data(request: Request, add_dict_data: DictDataModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
+ try:
+ add_dict_data.create_by = current_user.user.user_name
+ add_dict_data.update_by = current_user.user.user_name
+ add_dict_data_result = await DictDataService.add_dict_data_services(request, query_db, add_dict_data)
+ if add_dict_data_result.is_success:
+ logger.info(add_dict_data_result.message)
+ return response_200(data=add_dict_data_result, message=add_dict_data_result.message)
+ else:
+ logger.warning(add_dict_data_result.message)
+ return response_400(data="", message=add_dict_data_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@dictController.patch("/dictData/edit", response_model=CrudDictResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:dict:edit'))])
+@log_decorator(title='字典管理', business_type=2)
+async def edit_system_dict_data(request: Request, edit_dict_data: DictDataModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
+ try:
+ edit_dict_data.update_by = current_user.user.user_name
+ edit_dict_data.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+ edit_dict_data_result = await DictDataService.edit_dict_data_services(request, query_db, edit_dict_data)
+ if edit_dict_data_result.is_success:
+ logger.info(edit_dict_data_result.message)
+ return response_200(data=edit_dict_data_result, message=edit_dict_data_result.message)
+ else:
+ logger.warning(edit_dict_data_result.message)
+ return response_400(data="", message=edit_dict_data_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@dictController.post("/dictData/delete", response_model=CrudDictResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:dict:remove'))])
+@log_decorator(title='字典管理', business_type=3)
+async def delete_system_dict_data(request: Request, delete_dict_data: DeleteDictDataModel, query_db: Session = Depends(get_db)):
+ try:
+ delete_dict_data_result = await DictDataService.delete_dict_data_services(request, query_db, delete_dict_data)
+ if delete_dict_data_result.is_success:
+ logger.info(delete_dict_data_result.message)
+ return response_200(data=delete_dict_data_result, message=delete_dict_data_result.message)
+ else:
+ logger.warning(delete_dict_data_result.message)
+ return response_400(data="", message=delete_dict_data_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@dictController.get("/dictData/{dict_code}", response_model=DictDataModel, dependencies=[Depends(CheckUserInterfaceAuth('system:dict:query'))])
+async def query_detail_system_dict_data(request: Request, dict_code: int, query_db: Session = Depends(get_db)):
+ try:
+ detail_dict_data_result = DictDataService.detail_dict_data_services(query_db, dict_code)
+ logger.info(f'获取dict_code为{dict_code}的信息成功')
+ return response_200(data=detail_dict_data_result, message='获取成功')
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@dictController.post("/dictData/export", dependencies=[Depends(CheckUserInterfaceAuth('system:dict:export'))])
+@log_decorator(title='字典管理', business_type=5)
+async def export_system_dict_data_list(request: Request, dict_data_query: DictDataModel, query_db: Session = Depends(get_db)):
+ try:
+ # 获取全量数据
+ dict_data_query_result = DictDataService.get_dict_data_list_services(query_db, dict_data_query)
+ dict_data_export_result = DictDataService.export_dict_data_list_services(dict_data_query_result)
+ logger.info('导出成功')
+ return streaming_response_200(data=bytes2file_response(dict_data_export_result))
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
diff --git a/dash-fastapi-backend/module_admin/controller/job_controller.py b/dash-fastapi-backend/module_admin/controller/job_controller.py
new file mode 100644
index 0000000000000000000000000000000000000000..adf7ec54c0c27057b2c0ece672cbe9d09c33ebb2
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/controller/job_controller.py
@@ -0,0 +1,196 @@
+from fastapi import APIRouter
+from fastapi import Depends
+from config.get_db import get_db
+from module_admin.service.login_service import get_current_user, CurrentUserInfoServiceResponse
+from module_admin.service.job_service import *
+from module_admin.service.job_log_service import *
+from module_admin.entity.vo.job_vo import *
+from utils.response_util import *
+from utils.log_util import *
+from utils.page_util import get_page_obj
+from utils.common_util import bytes2file_response
+from module_admin.aspect.interface_auth import CheckUserInterfaceAuth
+from module_admin.annotation.log_annotation import log_decorator
+
+
+jobController = APIRouter(dependencies=[Depends(get_current_user)])
+
+
+@jobController.post("/job/get", response_model=JobPageObjectResponse, dependencies=[Depends(CheckUserInterfaceAuth('monitor:job:list'))])
+async def get_system_job_list(request: Request, job_page_query: JobPageObject, query_db: Session = Depends(get_db)):
+ try:
+ job_query = JobModel(**job_page_query.dict())
+ # 获取全量数据
+ job_query_result = JobService.get_job_list_services(query_db, job_query)
+ # 分页操作
+ notice_page_query_result = get_page_obj(job_query_result, job_page_query.page_num, job_page_query.page_size)
+ logger.info('获取成功')
+ return response_200(data=notice_page_query_result, message="获取成功")
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@jobController.post("/job/add", response_model=CrudJobResponse, dependencies=[Depends(CheckUserInterfaceAuth('monitor:job:add'))])
+@log_decorator(title='定时任务管理', business_type=1)
+async def add_system_job(request: Request, add_job: JobModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
+ try:
+ add_job.create_by = current_user.user.user_name
+ add_job.update_by = current_user.user.user_name
+ add_job_result = JobService.add_job_services(query_db, add_job)
+ if add_job_result.is_success:
+ logger.info(add_job_result.message)
+ return response_200(data=add_job_result, message=add_job_result.message)
+ else:
+ logger.warning(add_job_result.message)
+ return response_400(data="", message=add_job_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@jobController.patch("/job/edit", response_model=CrudJobResponse, dependencies=[Depends(CheckUserInterfaceAuth('monitor:job:edit'))])
+@log_decorator(title='定时任务管理', business_type=2)
+async def edit_system_job(request: Request, edit_job: EditJobModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
+ try:
+ edit_job.update_by = current_user.user.user_name
+ edit_job.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+ edit_job_result = JobService.edit_job_services(query_db, edit_job)
+ if edit_job_result.is_success:
+ logger.info(edit_job_result.message)
+ return response_200(data=edit_job_result, message=edit_job_result.message)
+ else:
+ logger.warning(edit_job_result.message)
+ return response_400(data="", message=edit_job_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@jobController.post("/job/changeStatus", response_model=CrudJobResponse, dependencies=[Depends(CheckUserInterfaceAuth('monitor:job:changeStatus'))])
+@log_decorator(title='定时任务管理', business_type=2)
+async def execute_system_job(request: Request, execute_job: JobModel, query_db: Session = Depends(get_db)):
+ try:
+ execute_job_result = JobService.execute_job_once_services(query_db, execute_job)
+ if execute_job_result.is_success:
+ logger.info(execute_job_result.message)
+ return response_200(data=execute_job_result, message=execute_job_result.message)
+ else:
+ logger.warning(execute_job_result.message)
+ return response_400(data="", message=execute_job_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@jobController.post("/job/delete", response_model=CrudJobResponse, dependencies=[Depends(CheckUserInterfaceAuth('monitor:job:remove'))])
+@log_decorator(title='定时任务管理', business_type=3)
+async def delete_system_job(request: Request, delete_job: DeleteJobModel, query_db: Session = Depends(get_db)):
+ try:
+ delete_job_result = JobService.delete_job_services(query_db, delete_job)
+ if delete_job_result.is_success:
+ logger.info(delete_job_result.message)
+ return response_200(data=delete_job_result, message=delete_job_result.message)
+ else:
+ logger.warning(delete_job_result.message)
+ return response_400(data="", message=delete_job_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@jobController.get("/job/{job_id}", response_model=JobModel, dependencies=[Depends(CheckUserInterfaceAuth('monitor:job:query'))])
+async def query_detail_system_job(request: Request, job_id: int, query_db: Session = Depends(get_db)):
+ try:
+ detail_job_result = JobService.detail_job_services(query_db, job_id)
+ logger.info(f'获取job_id为{job_id}的信息成功')
+ return response_200(data=detail_job_result, message='获取成功')
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@jobController.post("/job/export", dependencies=[Depends(CheckUserInterfaceAuth('monitor:job:export'))])
+@log_decorator(title='定时任务管理', business_type=5)
+async def export_system_job_list(request: Request, job_query: JobModel, query_db: Session = Depends(get_db)):
+ try:
+ # 获取全量数据
+ job_query_result = JobService.get_job_list_services(query_db, job_query)
+ job_export_result = await JobService.export_job_list_services(request, job_query_result)
+ logger.info('导出成功')
+ return streaming_response_200(data=bytes2file_response(job_export_result))
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@jobController.post("/jobLog/get", response_model=JobLogPageObjectResponse, dependencies=[Depends(CheckUserInterfaceAuth('monitor:job:list'))])
+async def get_system_job_log_list(request: Request, job_log_page_query: JobLogPageObject, query_db: Session = Depends(get_db)):
+ try:
+ job_log_query = JobLogQueryModel(**job_log_page_query.dict())
+ # 获取全量数据
+ job_log_query_result = JobLogService.get_job_log_list_services(query_db, job_log_query)
+ # 分页操作
+ notice_page_query_result = get_page_obj(job_log_query_result, job_log_page_query.page_num, job_log_page_query.page_size)
+ logger.info('获取成功')
+ return response_200(data=notice_page_query_result, message="获取成功")
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@jobController.post("/jobLog/delete", response_model=CrudJobResponse, dependencies=[Depends(CheckUserInterfaceAuth('monitor:job:remove'))])
+@log_decorator(title='定时任务日志管理', business_type=3)
+async def delete_system_job_log(request: Request, delete_job_log: DeleteJobLogModel, query_db: Session = Depends(get_db)):
+ try:
+ delete_job_log_result = JobLogService.delete_job_log_services(query_db, delete_job_log)
+ if delete_job_log_result.is_success:
+ logger.info(delete_job_log_result.message)
+ return response_200(data=delete_job_log_result, message=delete_job_log_result.message)
+ else:
+ logger.warning(delete_job_log_result.message)
+ return response_400(data="", message=delete_job_log_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@jobController.post("/jobLog/clear", response_model=CrudJobResponse, dependencies=[Depends(CheckUserInterfaceAuth('monitor:job:remove'))])
+@log_decorator(title='定时任务日志管理', business_type=9)
+async def clear_system_job_log(request: Request, clear_job_log: ClearJobLogModel, query_db: Session = Depends(get_db)):
+ try:
+ clear_job_log_result = JobLogService.clear_job_log_services(query_db, clear_job_log)
+ if clear_job_log_result.is_success:
+ logger.info(clear_job_log_result.message)
+ return response_200(data=clear_job_log_result, message=clear_job_log_result.message)
+ else:
+ logger.warning(clear_job_log_result.message)
+ return response_400(data="", message=clear_job_log_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@jobController.get("/jobLog/{job_log_id}", response_model=JobLogModel, dependencies=[Depends(CheckUserInterfaceAuth('monitor:job:query'))])
+async def query_detail_system_job_log(request: Request, job_log_id: int, query_db: Session = Depends(get_db)):
+ try:
+ detail_job_log_result = JobLogService.detail_job_log_services(query_db, job_log_id)
+ logger.info(f'获取job_log_id为{job_log_id}的信息成功')
+ return response_200(data=detail_job_log_result, message='获取成功')
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@jobController.post("/jobLog/export", dependencies=[Depends(CheckUserInterfaceAuth('monitor:job:export'))])
+@log_decorator(title='定时任务日志管理', business_type=5)
+async def export_system_job_log_list(request: Request, job_log_query: JobLogQueryModel, query_db: Session = Depends(get_db)):
+ try:
+ # 获取全量数据
+ job_log_query_result = JobLogService.get_job_log_list_services(query_db, job_log_query)
+ job_log_export_result = JobLogService.export_job_log_list_services(query_db, job_log_query_result)
+ logger.info('导出成功')
+ return streaming_response_200(data=bytes2file_response(job_log_export_result))
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
diff --git a/dash-fastapi-backend/module_admin/controller/log_controller.py b/dash-fastapi-backend/module_admin/controller/log_controller.py
new file mode 100644
index 0000000000000000000000000000000000000000..3e7175c29dd1ce07989751641964376f52f9423c
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/controller/log_controller.py
@@ -0,0 +1,164 @@
+from fastapi import APIRouter
+from fastapi import Depends
+from config.get_db import get_db
+from module_admin.service.login_service import get_current_user
+from module_admin.service.log_service import *
+from module_admin.entity.vo.log_vo import *
+from utils.response_util import *
+from utils.log_util import *
+from utils.page_util import get_page_obj
+from utils.common_util import bytes2file_response
+from module_admin.aspect.interface_auth import CheckUserInterfaceAuth
+from module_admin.annotation.log_annotation import log_decorator
+
+
+logController = APIRouter(prefix='/log', dependencies=[Depends(get_current_user)])
+
+
+@logController.post("/operation/get", response_model=OperLogPageObjectResponse, dependencies=[Depends(CheckUserInterfaceAuth('monitor:operlog:list'))])
+async def get_system_operation_log_list(request: Request, operation_log_page_query: OperLogPageObject, query_db: Session = Depends(get_db)):
+ try:
+ operation_log_query = OperLogQueryModel(**operation_log_page_query.dict())
+ # 获取全量数据
+ operation_log_query_result = OperationLogService.get_operation_log_list_services(query_db, operation_log_query)
+ # 分页操作
+ operation_log_page_query_result = get_page_obj(operation_log_query_result, operation_log_page_query.page_num, operation_log_page_query.page_size)
+ logger.info('获取成功')
+ return response_200(data=operation_log_page_query_result, message="获取成功")
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@logController.post("/operation/delete", response_model=CrudLogResponse, dependencies=[Depends(CheckUserInterfaceAuth('monitor:operlog:remove'))])
+@log_decorator(title='操作日志管理', business_type=3)
+async def delete_system_operation_log(request: Request, delete_operation_log: DeleteOperLogModel, query_db: Session = Depends(get_db)):
+ try:
+ delete_operation_log_result = OperationLogService.delete_operation_log_services(query_db, delete_operation_log)
+ if delete_operation_log_result.is_success:
+ logger.info(delete_operation_log_result.message)
+ return response_200(data=delete_operation_log_result, message=delete_operation_log_result.message)
+ else:
+ logger.warning(delete_operation_log_result.message)
+ return response_400(data="", message=delete_operation_log_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@logController.post("/operation/clear", response_model=CrudLogResponse, dependencies=[Depends(CheckUserInterfaceAuth('monitor:operlog:remove'))])
+@log_decorator(title='操作日志管理', business_type=9)
+async def clear_system_operation_log(request: Request, clear_operation_log: ClearOperLogModel, query_db: Session = Depends(get_db)):
+ try:
+ clear_operation_log_result = OperationLogService.clear_operation_log_services(query_db, clear_operation_log)
+ if clear_operation_log_result.is_success:
+ logger.info(clear_operation_log_result.message)
+ return response_200(data=clear_operation_log_result, message=clear_operation_log_result.message)
+ else:
+ logger.warning(clear_operation_log_result.message)
+ return response_400(data="", message=clear_operation_log_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@logController.get("/operation/{oper_id}", response_model=OperLogModel, dependencies=[Depends(CheckUserInterfaceAuth('monitor:operlog:query'))])
+async def query_detail_system_operation_log(request: Request, oper_id: int, query_db: Session = Depends(get_db)):
+ try:
+ detail_operation_log_result = OperationLogService.detail_operation_log_services(query_db, oper_id)
+ logger.info(f'获取oper_id为{oper_id}的信息成功')
+ return response_200(data=detail_operation_log_result, message='获取成功')
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@logController.post("/operation/export", dependencies=[Depends(CheckUserInterfaceAuth('monitor:operlog:export'))])
+@log_decorator(title='操作日志管理', business_type=5)
+async def export_system_operation_log_list(request: Request, operation_log_query: OperLogQueryModel, query_db: Session = Depends(get_db)):
+ try:
+ # 获取全量数据
+ operation_log_query_result = OperationLogService.get_operation_log_list_services(query_db, operation_log_query)
+ operation_log_export_result = await OperationLogService.export_operation_log_list_services(request, operation_log_query_result)
+ logger.info('导出成功')
+ return streaming_response_200(data=bytes2file_response(operation_log_export_result))
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@logController.post("/login/get", response_model=LoginLogPageObjectResponse, dependencies=[Depends(CheckUserInterfaceAuth('monitor:logininfor:list'))])
+async def get_system_login_log_list(request: Request, login_log_page_query: LoginLogPageObject, query_db: Session = Depends(get_db)):
+ try:
+ login_log_query = LoginLogQueryModel(**login_log_page_query.dict())
+ # 获取全量数据
+ login_log_query_result = LoginLogService.get_login_log_list_services(query_db, login_log_query)
+ # 分页操作
+ login_log_page_query_result = get_page_obj(login_log_query_result, login_log_page_query.page_num, login_log_page_query.page_size)
+ logger.info('获取成功')
+ return response_200(data=login_log_page_query_result, message="获取成功")
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@logController.post("/login/delete", response_model=CrudLogResponse, dependencies=[Depends(CheckUserInterfaceAuth('monitor:logininfor:remove'))])
+@log_decorator(title='登录日志管理', business_type=3)
+async def delete_system_login_log(request: Request, delete_login_log: DeleteLoginLogModel, query_db: Session = Depends(get_db)):
+ try:
+ delete_login_log_result = LoginLogService.delete_login_log_services(query_db, delete_login_log)
+ if delete_login_log_result.is_success:
+ logger.info(delete_login_log_result.message)
+ return response_200(data=delete_login_log_result, message=delete_login_log_result.message)
+ else:
+ logger.warning(delete_login_log_result.message)
+ return response_400(data="", message=delete_login_log_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@logController.post("/login/clear", response_model=CrudLogResponse, dependencies=[Depends(CheckUserInterfaceAuth('monitor:logininfor:remove'))])
+@log_decorator(title='登录日志管理', business_type=9)
+async def clear_system_login_log(request: Request, clear_login_log: ClearLoginLogModel, query_db: Session = Depends(get_db)):
+ try:
+ clear_login_log_result = LoginLogService.clear_login_log_services(query_db, clear_login_log)
+ if clear_login_log_result.is_success:
+ logger.info(clear_login_log_result.message)
+ return response_200(data=clear_login_log_result, message=clear_login_log_result.message)
+ else:
+ logger.warning(clear_login_log_result.message)
+ return response_400(data="", message=clear_login_log_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@logController.post("/login/unlock", response_model=CrudLogResponse, dependencies=[Depends(CheckUserInterfaceAuth('monitor:logininfor:unlock'))])
+@log_decorator(title='登录日志管理', business_type=0)
+async def clear_system_login_log(request: Request, unlock_user: UnlockUser, query_db: Session = Depends(get_db)):
+ try:
+ unlock_user_result = await LoginLogService.unlock_user_services(request, unlock_user)
+ if unlock_user_result.is_success:
+ logger.info(unlock_user_result.message)
+ return response_200(data=unlock_user_result, message=unlock_user_result.message)
+ else:
+ logger.warning(unlock_user_result.message)
+ return response_400(data="", message=unlock_user_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@logController.post("/login/export", dependencies=[Depends(CheckUserInterfaceAuth('monitor:logininfor:export'))])
+@log_decorator(title='登录日志管理', business_type=5)
+async def export_system_login_log_list(request: Request, login_log_query: LoginLogQueryModel, query_db: Session = Depends(get_db)):
+ try:
+ # 获取全量数据
+ login_log_query_result = LoginLogService.get_login_log_list_services(query_db, login_log_query)
+ login_log_export_result = LoginLogService.export_login_log_list_services(login_log_query_result)
+ logger.info('导出成功')
+ return streaming_response_200(data=bytes2file_response(login_log_export_result))
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
diff --git a/dash-fastapi-backend/module_admin/controller/login_controller.py b/dash-fastapi-backend/module_admin/controller/login_controller.py
index c934add26ab599bd338415209d44131b8a70748b..3a88f9d2ae9619b676933a9a7e43a6655b3ed36e 100644
--- a/dash-fastapi-backend/module_admin/controller/login_controller.py
+++ b/dash-fastapi-backend/module_admin/controller/login_controller.py
@@ -1,11 +1,12 @@
-import uuid
from fastapi import APIRouter
from module_admin.service.login_service import *
-from module_admin.entity.vo.login_schema import *
-from module_admin.mapper.login_crud import *
+from module_admin.entity.vo.login_vo import *
+from module_admin.dao.login_dao import *
from config.env import JwtConfig
-from module_admin.utils.response_tool import *
-from module_admin.utils.log_tool import *
+from utils.response_util import *
+from utils.log_util import *
+from module_admin.aspect.interface_auth import CheckUserInterfaceAuth
+from module_admin.annotation.log_annotation import log_decorator
from datetime import timedelta
@@ -13,56 +14,104 @@ loginController = APIRouter()
@loginController.post("/loginByAccount", response_model=Token)
-async def login(request: Request, user: UserLogin, query_db: Session = Depends(get_db)):
+@log_decorator(title='用户登录', business_type=0, log_type='login')
+async def login(request: Request, form_data: CustomOAuth2PasswordRequestForm = Depends(), query_db: Session = Depends(get_db)):
+ captcha_enabled = True if await request.app.state.redis.get(f'sys_config:sys.account.captchaEnabled') == 'true' else False
+ user = UserLogin(
+ **dict(
+ user_name=form_data.username,
+ password=form_data.password,
+ captcha=form_data.captcha,
+ session_id=form_data.session_id,
+ login_info=form_data.login_info,
+ captcha_enabled=captcha_enabled
+ )
+ )
try:
- result = authenticate_user(query_db, user.user_name, user.password)
- if result == '用户不存在' or result == '密码错误' or result == '用户已停用':
- logger.warning(result)
- return response_400(data="", message=result)
+ result = await authenticate_user(request, query_db, user)
+ except LoginException as e:
+ return response_400(data="", message=e.message)
+ try:
+ access_token_expires = timedelta(minutes=JwtConfig.ACCESS_TOKEN_EXPIRE_MINUTES)
+ session_id = str(uuid.uuid4())
+ access_token = create_access_token(
+ data={
+ "user_id": str(result[0].user_id),
+ "user_name": result[0].user_name,
+ "dept_name": result[1].dept_name,
+ "session_id": session_id,
+ "login_info": user.login_info
+ },
+ expires_delta=access_token_expires
+ )
+ await request.app.state.redis.set(f'access_token:{session_id}', access_token,
+ ex=timedelta(minutes=JwtConfig.REDIS_TOKEN_EXPIRE_MINUTES))
+ # 此方法可实现同一账号同一时间只能登录一次
+ # await request.app.state.redis.set(f'{result.user_id}_access_token', access_token, ex=timedelta(minutes=30))
+ # await request.app.state.redis.set(f'{result.user_id}_session_id', session_id, ex=timedelta(minutes=30))
+ logger.info('登录成功')
+ # 判断请求是否来自于api文档，如果是返回指定格式的结果，用于修复api文档认证成功后token显示undefined的bug
+ request_from_swagger = request.headers.get('referer').endswith('docs') if request.headers.get('referer') else False
+ request_from_redoc = request.headers.get('referer').endswith('redoc') if request.headers.get('referer') else False
+ if request_from_swagger or request_from_redoc:
+ return {'access_token': access_token, 'token_type': 'Bearer'}
+ return response_200(
+ data={'access_token': access_token, 'token_type': 'Bearer'},
+ message='登录成功'
+ )
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+@loginController.post("/getSmsCode", response_model=SmsCode)
+async def get_sms_code(request: Request, user: ResetUserModel, query_db: Session = Depends(get_db)):
+ try:
+ sms_result = await get_sms_code_services(request, query_db, user)
+ if sms_result.is_success:
+ logger.info('获取成功')
+ return response_200(data=sms_result, message='获取成功')
+ else:
+ logger.warning(sms_result.message)
+ return response_400(data='', message=sms_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@loginController.post("/forgetPwd", response_model=CrudUserResponse)
+async def forget_user_pwd(request: Request, forget_user: ResetUserModel, query_db: Session = Depends(get_db)):
+ try:
+ forget_user_result = await forget_user_services(request, query_db, forget_user)
+ if forget_user_result.is_success:
+ logger.info(forget_user_result.message)
+ return response_200(data=forget_user_result, message=forget_user_result.message)
else:
- access_token_expires = timedelta(minutes=JwtConfig.ACCESS_TOKEN_EXPIRE_MINUTES)
- try:
- session_id = str(uuid.uuid4())
- access_token = create_access_token(
- data={"user_id": str(result.user_id), "session_id": session_id}, expires_delta=access_token_expires
- )
- await request.app.state.redis.set(f'{result.user_id}_access_token', access_token, ex=timedelta(minutes=30))
- await request.app.state.redis.set(f'{result.user_id}_session_id', session_id, ex=timedelta(minutes=30))
- logger.info('登录成功')
- return response_200(
- data={
- 'token': access_token,
- 'session_id': session_id,
- },
- message='登录成功'
- )
- except Exception as e:
- logger.exception(e)
- return response_500(data="", message="生成token失败")
+ logger.warning(forget_user_result.message)
+ return response_400(data="", message=forget_user_result.message)
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@loginController.post("/getLoginUserInfo", response_model=CurrentUserInfoServiceResponse, dependencies=[Depends(get_current_user)])
-async def get_login_user_info(request: Request, token: Optional[str] = Header(...), query_db: Session = Depends(get_db)):
+@loginController.post("/getLoginUserInfo", response_model=CurrentUserInfoServiceResponse, dependencies=[Depends(CheckUserInterfaceAuth('common'))])
+async def get_login_user_info(request: Request, current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
try:
- current_user = await get_current_user(request, token, query_db)
logger.info('获取成功')
return response_200(data=current_user, message="获取成功")
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@loginController.post("/logout", dependencies=[Depends(get_current_user)])
-async def logout(request: Request, token: Optional[str] = Header(...), query_db: Session = Depends(get_db)):
+@loginController.post("/logout", dependencies=[Depends(get_current_user), Depends(CheckUserInterfaceAuth('common'))])
+async def logout(request: Request, token: Optional[str] = Depends(oauth2_scheme), query_db: Session = Depends(get_db)):
try:
- current_user = await get_current_user(request, token, query_db)
- await logout_services(request, current_user)
+ payload = jwt.decode(token, JwtConfig.SECRET_KEY, algorithms=[JwtConfig.ALGORITHM])
+ session_id: str = payload.get("session_id")
+ await logout_services(request, session_id)
logger.info('退出成功')
return response_200(data="", message="退出成功")
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
diff --git a/dash-fastapi-backend/module_admin/controller/menu_controller.py b/dash-fastapi-backend/module_admin/controller/menu_controller.py
index 70e273a33524bad78224057b862497105a83bd17..51c13220c47b5099fb7f93c54f4b42023b29f21d 100644
--- a/dash-fastapi-backend/module_admin/controller/menu_controller.py
+++ b/dash-fastapi-backend/module_admin/controller/menu_controller.py
@@ -1,74 +1,77 @@
from fastapi import APIRouter, Request
-from fastapi import Depends, Header
+from fastapi import Depends
from config.get_db import get_db
from module_admin.service.login_service import get_current_user
from module_admin.service.menu_service import *
-from module_admin.entity.vo.menu_schema import *
-from module_admin.mapper.menu_crud import *
-from module_admin.utils.response_tool import *
-from module_admin.utils.log_tool import *
+from module_admin.entity.vo.menu_vo import *
+from module_admin.dao.menu_dao import *
+from utils.response_util import *
+from utils.log_util import *
+from module_admin.aspect.interface_auth import CheckUserInterfaceAuth
+from module_admin.annotation.log_annotation import log_decorator
menuController = APIRouter(dependencies=[Depends(get_current_user)])
-@menuController.post("/menu/tree", response_model=MenuTree)
-async def get_system_menu_tree(menu_query: MenuTreeModel, query_db: Session = Depends(get_db)):
+@menuController.post("/menu/tree", response_model=MenuTree, dependencies=[Depends(CheckUserInterfaceAuth('common'))])
+async def get_system_menu_tree(request: Request, menu_query: MenuTreeModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
try:
- menu_query_result = get_menu_tree_services(query_db, menu_query)
+ menu_query_result = MenuService.get_menu_tree_services(query_db, menu_query, current_user)
logger.info('获取成功')
return response_200(data=menu_query_result, message="获取成功")
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@menuController.post("/menu/forEditOption", response_model=MenuTree)
-async def get_system_menu_tree_for_edit_option(menu_query: MenuModel, query_db: Session = Depends(get_db)):
+@menuController.post("/menu/forEditOption", response_model=MenuTree, dependencies=[Depends(CheckUserInterfaceAuth('common'))])
+async def get_system_menu_tree_for_edit_option(request: Request, menu_query: MenuModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
try:
- menu_query_result = get_menu_tree_for_edit_option_services(query_db, menu_query)
+ menu_query_result = MenuService.get_menu_tree_for_edit_option_services(query_db, menu_query, current_user)
logger.info('获取成功')
return response_200(data=menu_query_result, message="获取成功")
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@menuController.post("/menu/get", response_model=MenuResponse)
-async def get_system_menu_list(menu_query: MenuModel, query_db: Session = Depends(get_db)):
+@menuController.post("/menu/get", response_model=MenuResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:menu:list'))])
+async def get_system_menu_list(request: Request, menu_query: MenuModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
try:
- menu_query_result = get_menu_list_services(query_db, menu_query)
+ menu_query_result = MenuService.get_menu_list_services(query_db, menu_query, current_user)
logger.info('获取成功')
return response_200(data=menu_query_result, message="获取成功")
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@menuController.post("/menu/add", response_model=CrudMenuResponse)
-async def add_system_menu(request: Request, add_menu: MenuModel, token: Optional[str] = Header(...), query_db: Session = Depends(get_db)):
+@menuController.post("/menu/add", response_model=CrudMenuResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:menu:add'))])
+@log_decorator(title='菜单管理', business_type=1)
+async def add_system_menu(request: Request, add_menu: MenuModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
try:
- current_user = await get_current_user(request, token, query_db)
add_menu.create_by = current_user.user.user_name
add_menu.update_by = current_user.user.user_name
- add_menu_result = add_menu_services(query_db, add_menu)
- logger.info(add_menu_result.message)
+ add_menu_result = MenuService.add_menu_services(query_db, add_menu)
if add_menu_result.is_success:
+ logger.info(add_menu_result.message)
return response_200(data=add_menu_result, message=add_menu_result.message)
else:
+ logger.warning(add_menu_result.message)
return response_400(data="", message=add_menu_result.message)
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@menuController.patch("/menu/edit", response_model=CrudMenuResponse)
-async def edit_system_menu(request: Request, edit_menu: MenuModel, token: Optional[str] = Header(...), query_db: Session = Depends(get_db)):
+@menuController.patch("/menu/edit", response_model=CrudMenuResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:menu:edit'))])
+@log_decorator(title='菜单管理', business_type=2)
+async def edit_system_menu(request: Request, edit_menu: MenuModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
try:
- current_user = await get_current_user(request, token, query_db)
edit_menu.update_by = current_user.user.user_name
edit_menu.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
- edit_menu_result = edit_menu_services(query_db, edit_menu)
+ edit_menu_result = MenuService.edit_menu_services(query_db, edit_menu)
if edit_menu_result.is_success:
logger.info(edit_menu_result.message)
return response_200(data=edit_menu_result, message=edit_menu_result.message)
@@ -77,13 +80,14 @@ async def edit_system_menu(request: Request, edit_menu: MenuModel, token: Option
return response_400(data="", message=edit_menu_result.message)
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@menuController.post("/menu/delete", response_model=CrudMenuResponse)
-async def delete_system_menu(delete_menu: DeleteMenuModel, query_db: Session = Depends(get_db)):
+@menuController.post("/menu/delete", response_model=CrudMenuResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:menu:remove'))])
+@log_decorator(title='菜单管理', business_type=3)
+async def delete_system_menu(request: Request, delete_menu: DeleteMenuModel, query_db: Session = Depends(get_db)):
try:
- delete_menu_result = delete_menu_services(query_db, delete_menu)
+ delete_menu_result = MenuService.delete_menu_services(query_db, delete_menu)
if delete_menu_result.is_success:
logger.info(delete_menu_result.message)
return response_200(data=delete_menu_result, message=delete_menu_result.message)
@@ -92,15 +96,15 @@ async def delete_system_menu(delete_menu: DeleteMenuModel, query_db: Session = D
return response_400(data="", message=delete_menu_result.message)
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@menuController.get("/menu/{menu_id}", response_model=MenuModel)
-async def query_detail_system_menu(menu_id: int, query_db: Session = Depends(get_db)):
+@menuController.get("/menu/{menu_id}", response_model=MenuModel, dependencies=[Depends(CheckUserInterfaceAuth('system:menu:query'))])
+async def query_detail_system_menu(request: Request, menu_id: int, query_db: Session = Depends(get_db)):
try:
- detail_menu_result = detail_menu_services(query_db, menu_id)
+ detail_menu_result = MenuService.detail_menu_services(query_db, menu_id)
logger.info(f'获取menu_id为{menu_id}的信息成功')
return response_200(data=detail_menu_result, message='获取成功')
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
diff --git a/dash-fastapi-backend/module_admin/controller/notice_controller.py b/dash-fastapi-backend/module_admin/controller/notice_controller.py
new file mode 100644
index 0000000000000000000000000000000000000000..cbda2de2fd2baba1e2ea0ae4113b8fed5970b363
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/controller/notice_controller.py
@@ -0,0 +1,92 @@
+from fastapi import APIRouter, Request
+from fastapi import Depends
+from config.get_db import get_db
+from module_admin.service.login_service import get_current_user, CurrentUserInfoServiceResponse
+from module_admin.service.notice_service import *
+from module_admin.entity.vo.notice_vo import *
+from utils.response_util import *
+from utils.log_util import *
+from utils.page_util import get_page_obj
+from module_admin.aspect.interface_auth import CheckUserInterfaceAuth
+from module_admin.annotation.log_annotation import log_decorator
+
+
+noticeController = APIRouter(dependencies=[Depends(get_current_user)])
+
+
+@noticeController.post("/notice/get", response_model=NoticePageObjectResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:notice:list'))])
+async def get_system_notice_list(request: Request, notice_page_query: NoticePageObject, query_db: Session = Depends(get_db)):
+ try:
+ notice_query = NoticeQueryModel(**notice_page_query.dict())
+ # 获取全量数据
+ notice_query_result = NoticeService.get_notice_list_services(query_db, notice_query)
+ # 分页操作
+ notice_page_query_result = get_page_obj(notice_query_result, notice_page_query.page_num, notice_page_query.page_size)
+ logger.info('获取成功')
+ return response_200(data=notice_page_query_result, message="获取成功")
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@noticeController.post("/notice/add", response_model=CrudNoticeResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:notice:add'))])
+@log_decorator(title='通知公告管理', business_type=1)
+async def add_system_notice(request: Request, add_notice: NoticeModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
+ try:
+ add_notice.create_by = current_user.user.user_name
+ add_notice.update_by = current_user.user.user_name
+ add_notice_result = NoticeService.add_notice_services(query_db, add_notice)
+ if add_notice_result.is_success:
+ logger.info(add_notice_result.message)
+ return response_200(data=add_notice_result, message=add_notice_result.message)
+ else:
+ logger.warning(add_notice_result.message)
+ return response_400(data="", message=add_notice_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@noticeController.patch("/notice/edit", response_model=CrudNoticeResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:notice:edit'))])
+@log_decorator(title='通知公告管理', business_type=2)
+async def edit_system_notice(request: Request, edit_notice: NoticeModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
+ try:
+ edit_notice.update_by = current_user.user.user_name
+ edit_notice.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+ edit_notice_result = NoticeService.edit_notice_services(query_db, edit_notice)
+ if edit_notice_result.is_success:
+ logger.info(edit_notice_result.message)
+ return response_200(data=edit_notice_result, message=edit_notice_result.message)
+ else:
+ logger.warning(edit_notice_result.message)
+ return response_400(data="", message=edit_notice_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@noticeController.post("/notice/delete", response_model=CrudNoticeResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:notice:remove'))])
+@log_decorator(title='通知公告管理', business_type=3)
+async def delete_system_notice(request: Request, delete_notice: DeleteNoticeModel, query_db: Session = Depends(get_db)):
+ try:
+ delete_notice_result = NoticeService.delete_notice_services(query_db, delete_notice)
+ if delete_notice_result.is_success:
+ logger.info(delete_notice_result.message)
+ return response_200(data=delete_notice_result, message=delete_notice_result.message)
+ else:
+ logger.warning(delete_notice_result.message)
+ return response_400(data="", message=delete_notice_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@noticeController.get("/notice/{notice_id}", response_model=NoticeModel, dependencies=[Depends(CheckUserInterfaceAuth('system:notice:query'))])
+async def query_detail_system_post(request: Request, notice_id: int, query_db: Session = Depends(get_db)):
+ try:
+ detail_notice_result = NoticeService.detail_notice_services(query_db, notice_id)
+ logger.info(f'获取notice_id为{notice_id}的信息成功')
+ return response_200(data=detail_notice_result, message='获取成功')
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
diff --git a/dash-fastapi-backend/module_admin/controller/online_controller.py b/dash-fastapi-backend/module_admin/controller/online_controller.py
new file mode 100644
index 0000000000000000000000000000000000000000..9390c8b0e15e12cfc88fe10047a72b41b0fe4276
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/controller/online_controller.py
@@ -0,0 +1,59 @@
+from fastapi import APIRouter
+from fastapi import Depends
+from config.get_db import get_db
+from module_admin.service.login_service import get_current_user, Session
+from module_admin.service.online_service import *
+from utils.response_util import *
+from utils.log_util import *
+from utils.page_util import get_page_obj
+from module_admin.aspect.interface_auth import CheckUserInterfaceAuth
+from module_admin.annotation.log_annotation import log_decorator
+
+
+onlineController = APIRouter(prefix='/online', dependencies=[Depends(get_current_user)])
+
+
+@onlineController.post("/get", response_model=OnlinePageObjectResponse, dependencies=[Depends(CheckUserInterfaceAuth('monitor:online:list'))])
+async def get_monitor_online_list(request: Request, online_page_query: OnlinePageObject):
+ try:
+ # 获取全量数据
+ online_query_result = await OnlineService.get_online_list_services(request, online_page_query)
+ # 分页操作
+ online_page_query_result = get_page_obj(online_query_result, online_page_query.page_num, online_page_query.page_size)
+ logger.info('获取成功')
+ return response_200(data=online_page_query_result, message="获取成功")
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@onlineController.post("/forceLogout", response_model=CrudOnlineResponse, dependencies=[Depends(CheckUserInterfaceAuth('monitor:online:forceLogout'))])
+@log_decorator(title='在线用户', business_type=7)
+async def delete_monitor_online(request: Request, delete_online: DeleteOnlineModel, query_db: Session = Depends(get_db)):
+ try:
+ delete_online_result = await OnlineService.delete_online_services(request, delete_online)
+ if delete_online_result.is_success:
+ logger.info(delete_online_result.message)
+ return response_200(data=delete_online_result, message=delete_online_result.message)
+ else:
+ logger.warning(delete_online_result.message)
+ return response_400(data="", message=delete_online_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@onlineController.post("/batchLogout", response_model=CrudOnlineResponse, dependencies=[Depends(CheckUserInterfaceAuth('monitor:online:batchLogout'))])
+@log_decorator(title='在线用户', business_type=7)
+async def delete_monitor_online(request: Request, delete_online: DeleteOnlineModel, query_db: Session = Depends(get_db)):
+ try:
+ delete_online_result = await OnlineService.delete_online_services(request, delete_online)
+ if delete_online_result.is_success:
+ logger.info(delete_online_result.message)
+ return response_200(data=delete_online_result, message=delete_online_result.message)
+ else:
+ logger.warning(delete_online_result.message)
+ return response_400(data="", message=delete_online_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
diff --git a/dash-fastapi-backend/module_admin/controller/post_controler.py b/dash-fastapi-backend/module_admin/controller/post_controler.py
index c6d9614173529a1585da466749e79a6d709188d3..e917826c67b3be0df04844c95203a14d4805a975 100644
--- a/dash-fastapi-backend/module_admin/controller/post_controler.py
+++ b/dash-fastapi-backend/module_admin/controller/post_controler.py
@@ -1,62 +1,71 @@
from fastapi import APIRouter, Request
-from fastapi import Depends, Header
+from fastapi import Depends
from config.get_db import get_db
-from module_admin.service.login_service import get_current_user
+from module_admin.service.login_service import get_current_user, CurrentUserInfoServiceResponse
from module_admin.service.post_service import *
-from module_admin.entity.vo.post_schema import *
-from module_admin.utils.response_tool import *
-from module_admin.utils.log_tool import *
+from module_admin.entity.vo.post_vo import *
+from utils.response_util import *
+from utils.log_util import *
+from utils.page_util import get_page_obj
+from utils.common_util import bytes2file_response
+from module_admin.aspect.interface_auth import CheckUserInterfaceAuth
+from module_admin.annotation.log_annotation import log_decorator
postController = APIRouter(dependencies=[Depends(get_current_user)])
-@postController.post("/post/forSelectOption", response_model=PostSelectOptionResponseModel)
-async def get_system_post_select(query_db: Session = Depends(get_db)):
+@postController.post("/post/forSelectOption", response_model=PostSelectOptionResponseModel, dependencies=[Depends(CheckUserInterfaceAuth('common'))])
+async def get_system_post_select(request: Request, query_db: Session = Depends(get_db)):
try:
- role_query_result = get_post_select_option_services(query_db)
+ role_query_result = PostService.get_post_select_option_services(query_db)
logger.info('获取成功')
return response_200(data=role_query_result, message="获取成功")
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@postController.post("/post/get", response_model=PostPageObjectResponse)
-async def get_system_post_list(post_query: PostPageObject, query_db: Session = Depends(get_db)):
+@postController.post("/post/get", response_model=PostPageObjectResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:post:list'))])
+async def get_system_post_list(request: Request, post_page_query: PostPageObject, query_db: Session = Depends(get_db)):
try:
- post_query_result = get_post_list_services(query_db, post_query)
+ post_query = PostModel(**post_page_query.dict())
+ # 获取全量数据
+ post_query_result = PostService.get_post_list_services(query_db, post_query)
+ # 分页操作
+ post_page_query_result = get_page_obj(post_query_result, post_page_query.page_num, post_page_query.page_size)
logger.info('获取成功')
- return response_200(data=post_query_result, message="获取成功")
+ return response_200(data=post_page_query_result, message="获取成功")
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@postController.post("/post/add", response_model=CrudPostResponse)
-async def add_system_post(request: Request, add_post: PostModel, token: Optional[str] = Header(...), query_db: Session = Depends(get_db)):
+@postController.post("/post/add", response_model=CrudPostResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:post:add'))])
+@log_decorator(title='岗位管理', business_type=1)
+async def add_system_post(request: Request, add_post: PostModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
try:
- current_user = await get_current_user(request, token, query_db)
add_post.create_by = current_user.user.user_name
add_post.update_by = current_user.user.user_name
- add_post_result = add_post_services(query_db, add_post)
- logger.info(add_post_result.message)
+ add_post_result = PostService.add_post_services(query_db, add_post)
if add_post_result.is_success:
+ logger.info(add_post_result.message)
return response_200(data=add_post_result, message=add_post_result.message)
else:
+ logger.warning(add_post_result.message)
return response_400(data="", message=add_post_result.message)
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@postController.patch("/post/edit", response_model=CrudPostResponse)
-async def edit_system_post(request: Request, edit_post: PostModel, token: Optional[str] = Header(...), query_db: Session = Depends(get_db)):
+@postController.patch("/post/edit", response_model=CrudPostResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:post:edit'))])
+@log_decorator(title='岗位管理', business_type=2)
+async def edit_system_post(request: Request, edit_post: PostModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
try:
- current_user = await get_current_user(request, token, query_db)
edit_post.update_by = current_user.user.user_name
edit_post.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
- edit_post_result = edit_post_services(query_db, edit_post)
+ edit_post_result = PostService.edit_post_services(query_db, edit_post)
if edit_post_result.is_success:
logger.info(edit_post_result.message)
return response_200(data=edit_post_result, message=edit_post_result.message)
@@ -65,13 +74,14 @@ async def edit_system_post(request: Request, edit_post: PostModel, token: Option
return response_400(data="", message=edit_post_result.message)
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@postController.post("/post/delete", response_model=CrudPostResponse)
-async def delete_system_post(delete_post: DeletePostModel, query_db: Session = Depends(get_db)):
+@postController.post("/post/delete", response_model=CrudPostResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:post:remove'))])
+@log_decorator(title='岗位管理', business_type=3)
+async def delete_system_post(request: Request, delete_post: DeletePostModel, query_db: Session = Depends(get_db)):
try:
- delete_post_result = delete_post_services(query_db, delete_post)
+ delete_post_result = PostService.delete_post_services(query_db, delete_post)
if delete_post_result.is_success:
logger.info(delete_post_result.message)
return response_200(data=delete_post_result, message=delete_post_result.message)
@@ -80,15 +90,29 @@ async def delete_system_post(delete_post: DeletePostModel, query_db: Session = D
return response_400(data="", message=delete_post_result.message)
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@postController.get("/post/{post_id}", response_model=PostModel)
-async def query_detail_system_post(post_id: int, query_db: Session = Depends(get_db)):
+@postController.get("/post/{post_id}", response_model=PostModel, dependencies=[Depends(CheckUserInterfaceAuth('system:post:query'))])
+async def query_detail_system_post(request: Request, post_id: int, query_db: Session = Depends(get_db)):
try:
- detail_post_result = detail_post_services(query_db, post_id)
+ detail_post_result = PostService.detail_post_services(query_db, post_id)
logger.info(f'获取post_id为{post_id}的信息成功')
return response_200(data=detail_post_result, message='获取成功')
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
+
+
+@postController.post("/post/export", dependencies=[Depends(CheckUserInterfaceAuth('system:post:export'))])
+@log_decorator(title='岗位管理', business_type=5)
+async def export_system_post_list(request: Request, post_query: PostModel, query_db: Session = Depends(get_db)):
+ try:
+ # 获取全量数据
+ post_query_result = PostService.get_post_list_services(query_db, post_query)
+ post_export_result = PostService.export_post_list_services(post_query_result)
+ logger.info('导出成功')
+ return streaming_response_200(data=bytes2file_response(post_export_result))
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
diff --git a/dash-fastapi-backend/module_admin/controller/role_controller.py b/dash-fastapi-backend/module_admin/controller/role_controller.py
index 7d53d83c423d5b369fb8e4108aa80beba97013ba..348ab9d526c1d18913e5f27d56dd6c1f90b87607 100644
--- a/dash-fastapi-backend/module_admin/controller/role_controller.py
+++ b/dash-fastapi-backend/module_admin/controller/role_controller.py
@@ -1,62 +1,70 @@
from fastapi import APIRouter, Request
-from fastapi import Depends, Header
+from fastapi import Depends
from config.get_db import get_db
-from module_admin.service.login_service import get_current_user
+from module_admin.service.login_service import get_current_user, CurrentUserInfoServiceResponse
from module_admin.service.role_service import *
-from module_admin.entity.vo.role_schema import *
-from module_admin.utils.response_tool import *
-from module_admin.utils.log_tool import *
+from module_admin.entity.vo.role_vo import *
+from utils.response_util import *
+from utils.log_util import *
+from utils.page_util import get_page_obj
+from utils.common_util import bytes2file_response
+from module_admin.aspect.interface_auth import CheckUserInterfaceAuth
+from module_admin.annotation.log_annotation import log_decorator
roleController = APIRouter(dependencies=[Depends(get_current_user)])
-@roleController.post("/role/forSelectOption", response_model=RoleSelectOptionResponseModel)
-async def get_system_role_select(query_db: Session = Depends(get_db)):
+@roleController.post("/role/forSelectOption", response_model=RoleSelectOptionResponseModel, dependencies=[Depends(CheckUserInterfaceAuth('common'))])
+async def get_system_role_select(request: Request, query_db: Session = Depends(get_db)):
try:
- role_query_result = get_role_select_option_services(query_db)
+ role_query_result = RoleService.get_role_select_option_services(query_db)
logger.info('获取成功')
return response_200(data=role_query_result, message="获取成功")
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@roleController.post("/role/get", response_model=RolePageObjectResponse)
-async def get_system_role_list(role_query: RolePageObject, query_db: Session = Depends(get_db)):
+@roleController.post("/role/get", response_model=RolePageObjectResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:role:list'))])
+async def get_system_role_list(request: Request, role_page_query: RolePageObject, query_db: Session = Depends(get_db)):
try:
- role_query_result = get_role_list_services(query_db, role_query)
+ role_query = RoleQueryModel(**role_page_query.dict())
+ role_query_result = RoleService.get_role_list_services(query_db, role_query)
+ # 分页操作
+ role_page_query_result = get_page_obj(role_query_result, role_page_query.page_num, role_page_query.page_size)
logger.info('获取成功')
- return response_200(data=role_query_result, message="获取成功")
+ return response_200(data=role_page_query_result, message="获取成功")
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@roleController.post("/role/add", response_model=CrudRoleResponse)
-async def add_system_role(request: Request, add_role: AddRoleModel, token: Optional[str] = Header(...), query_db: Session = Depends(get_db)):
+@roleController.post("/role/add", response_model=CrudRoleResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:role:add'))])
+@log_decorator(title='角色管理', business_type=1)
+async def add_system_role(request: Request, add_role: AddRoleModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
try:
- current_user = await get_current_user(request, token, query_db)
add_role.create_by = current_user.user.user_name
add_role.update_by = current_user.user.user_name
- add_role_result = add_role_services(query_db, add_role)
- logger.info(add_role_result.message)
+ add_role_result = RoleService.add_role_services(query_db, add_role)
if add_role_result.is_success:
+ logger.info(add_role_result.message)
return response_200(data=add_role_result, message=add_role_result.message)
else:
+ logger.warning(add_role_result.message)
return response_400(data="", message=add_role_result.message)
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@roleController.patch("/role/edit", response_model=CrudRoleResponse)
-async def edit_system_role(request: Request, edit_role: AddRoleModel, token: Optional[str] = Header(...), query_db: Session = Depends(get_db)):
+@roleController.patch("/role/edit", response_model=CrudRoleResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:role:edit'))])
+@log_decorator(title='角色管理', business_type=2)
+async def edit_system_role(request: Request, edit_role: AddRoleModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
try:
- current_user = await get_current_user(request, token, query_db)
edit_role.update_by = current_user.user.user_name
edit_role.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
- edit_role_result = edit_role_services(query_db, edit_role)
+ edit_role_result = RoleService.edit_role_services(query_db, edit_role)
if edit_role_result.is_success:
logger.info(edit_role_result.message)
return response_200(data=edit_role_result, message=edit_role_result.message)
@@ -65,16 +73,16 @@ async def edit_system_role(request: Request, edit_role: AddRoleModel, token: Opt
return response_400(data="", message=edit_role_result.message)
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@roleController.post("/role/delete", response_model=CrudRoleResponse)
-async def delete_system_role(request: Request, delete_role: DeleteRoleModel, token: Optional[str] = Header(...), query_db: Session = Depends(get_db)):
+@roleController.post("/role/delete", response_model=CrudRoleResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:role:remove'))])
+@log_decorator(title='角色管理', business_type=3)
+async def delete_system_role(request: Request, delete_role: DeleteRoleModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
try:
- current_user = await get_current_user(request, token, query_db)
delete_role.update_by = current_user.user.user_name
delete_role.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
- delete_role_result = delete_role_services(query_db, delete_role)
+ delete_role_result = RoleService.delete_role_services(query_db, delete_role)
if delete_role_result.is_success:
logger.info(delete_role_result.message)
return response_200(data=delete_role_result, message=delete_role_result.message)
@@ -83,15 +91,29 @@ async def delete_system_role(request: Request, delete_role: DeleteRoleModel, tok
return response_400(data="", message=delete_role_result.message)
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@roleController.get("/role/{role_id}", response_model=RoleDetailModel)
-async def query_detail_system_role(role_id: int, query_db: Session = Depends(get_db)):
+@roleController.get("/role/{role_id}", response_model=RoleDetailModel, dependencies=[Depends(CheckUserInterfaceAuth('system:role:query'))])
+async def query_detail_system_role(request: Request, role_id: int, query_db: Session = Depends(get_db)):
try:
- delete_role_result = detail_role_services(query_db, role_id)
+ delete_role_result = RoleService.detail_role_services(query_db, role_id)
logger.info(f'获取role_id为{role_id}的信息成功')
return response_200(data=delete_role_result, message='获取成功')
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
+
+
+@roleController.post("/role/export", dependencies=[Depends(CheckUserInterfaceAuth('system:role:export'))])
+@log_decorator(title='角色管理', business_type=5)
+async def export_system_role_list(request: Request, role_query: RoleQueryModel, query_db: Session = Depends(get_db)):
+ try:
+ # 获取全量数据
+ role_query_result = RoleService.get_role_list_services(query_db, role_query)
+ role_export_result = RoleService.export_role_list_services(role_query_result)
+ logger.info('导出成功')
+ return streaming_response_200(data=bytes2file_response(role_export_result))
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
diff --git a/dash-fastapi-backend/module_admin/controller/server_controller.py b/dash-fastapi-backend/module_admin/controller/server_controller.py
new file mode 100644
index 0000000000000000000000000000000000000000..0119f9fb44e00fed9248b5303e1bbba2fc255810
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/controller/server_controller.py
@@ -0,0 +1,22 @@
+from fastapi import APIRouter, Request
+from fastapi import Depends
+from module_admin.service.login_service import get_current_user
+from module_admin.service.server_service import *
+from utils.response_util import *
+from utils.log_util import *
+from module_admin.aspect.interface_auth import CheckUserInterfaceAuth
+
+
+serverController = APIRouter(prefix='/server', dependencies=[Depends(get_current_user)])
+
+
+@serverController.post("/statisticalInfo", response_model=ServerMonitorModel, dependencies=[Depends(CheckUserInterfaceAuth('monitor:server:list'))])
+async def get_monitor_server_info(request: Request):
+ try:
+ # 获取全量数据
+ server_info_query_result = ServerService.get_server_monitor_info()
+ logger.info('获取成功')
+ return response_200(data=server_info_query_result, message="获取成功")
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
diff --git a/dash-fastapi-backend/module_admin/controller/user_controller.py b/dash-fastapi-backend/module_admin/controller/user_controller.py
index dbaf2545293b55cb220e51ae1e3889a442121be5..65e251c42ccdaf79a8bfdf0a0ffdcece4d193d64 100644
--- a/dash-fastapi-backend/module_admin/controller/user_controller.py
+++ b/dash-fastapi-backend/module_admin/controller/user_controller.py
@@ -1,53 +1,64 @@
from fastapi import APIRouter, Request
-from fastapi import Depends, Header
+from fastapi import Depends
+import base64
from config.get_db import get_db
-from module_admin.service.login_service import get_current_user, get_password_hash
+from config.env import CachePathConfig
+from module_admin.service.login_service import get_current_user
from module_admin.service.user_service import *
-from module_admin.entity.vo.user_schema import *
-from module_admin.mapper.user_crud import *
-from module_admin.utils.response_tool import *
-from module_admin.utils.log_tool import *
+from module_admin.entity.vo.user_vo import *
+from module_admin.dao.user_dao import *
+from utils.page_util import get_page_obj
+from utils.response_util import *
+from utils.log_util import *
+from utils.common_util import bytes2file_response
+from module_admin.aspect.interface_auth import CheckUserInterfaceAuth
+from module_admin.annotation.log_annotation import log_decorator
userController = APIRouter(dependencies=[Depends(get_current_user)])
-@userController.post("/user/get", response_model=UserPageObjectResponse)
-async def get_system_user_list(user_query: UserPageObject, query_db: Session = Depends(get_db)):
+@userController.post("/user/get", response_model=UserPageObjectResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:user:list'))])
+async def get_system_user_list(request: Request, user_page_query: UserPageObject, query_db: Session = Depends(get_db)):
try:
- user_query_result = get_user_list_services(query_db, user_query)
+ user_query = UserQueryModel(**user_page_query.dict())
+ # 获取全量数据
+ user_query_result = UserService.get_user_list_services(query_db, user_query)
+ # 分页操作
+ user_page_query_result = get_page_obj(user_query_result, user_page_query.page_num, user_page_query.page_size)
logger.info('获取成功')
- return response_200(data=user_query_result, message="获取成功")
+ return response_200(data=user_page_query_result, message="获取成功")
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@userController.post("/user/add", response_model=CrudUserResponse)
-async def add_system_user(request: Request, add_user: AddUserModel, token: Optional[str] = Header(...), query_db: Session = Depends(get_db)):
+@userController.post("/user/add", response_model=CrudUserResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:user:add'))])
+@log_decorator(title='用户管理', business_type=1)
+async def add_system_user(request: Request, add_user: AddUserModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
try:
- current_user = await get_current_user(request, token, query_db)
- add_user.password = get_password_hash(add_user.password)
+ add_user.password = PwdUtil.get_password_hash(add_user.password)
add_user.create_by = current_user.user.user_name
add_user.update_by = current_user.user.user_name
- add_user_result = add_user_services(query_db, add_user)
- logger.info(add_user_result.message)
+ add_user_result = UserService.add_user_services(query_db, add_user)
if add_user_result.is_success:
+ logger.info(add_user_result.message)
return response_200(data=add_user_result, message=add_user_result.message)
else:
+ logger.warning(add_user_result.message)
return response_400(data="", message=add_user_result.message)
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@userController.patch("/user/edit", response_model=CrudUserResponse)
-async def edit_system_user(request: Request, edit_user: AddUserModel, token: Optional[str] = Header(...), query_db: Session = Depends(get_db)):
+@userController.patch("/user/edit", response_model=CrudUserResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:user:edit'))])
+@log_decorator(title='用户管理', business_type=2)
+async def edit_system_user(request: Request, edit_user: AddUserModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
try:
- current_user = await get_current_user(request, token, query_db)
edit_user.update_by = current_user.user.user_name
edit_user.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
- edit_user_result = edit_user_services(query_db, edit_user)
+ edit_user_result = UserService.edit_user_services(query_db, edit_user)
if edit_user_result.is_success:
logger.info(edit_user_result.message)
return response_200(data=edit_user_result, message=edit_user_result.message)
@@ -56,16 +67,16 @@ async def edit_system_user(request: Request, edit_user: AddUserModel, token: Opt
return response_400(data="", message=edit_user_result.message)
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@userController.post("/user/delete", response_model=CrudUserResponse)
-async def delete_system_user(request: Request, delete_user: DeleteUserModel, token: Optional[str] = Header(...), query_db: Session = Depends(get_db)):
+@userController.post("/user/delete", response_model=CrudUserResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:user:remove'))])
+@log_decorator(title='用户管理', business_type=3)
+async def delete_system_user(request: Request, delete_user: DeleteUserModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
try:
- current_user = await get_current_user(request, token, query_db)
delete_user.update_by = current_user.user.user_name
delete_user.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
- delete_user_result = delete_user_services(query_db, delete_user)
+ delete_user_result = UserService.delete_user_services(query_db, delete_user)
if delete_user_result.is_success:
logger.info(delete_user_result.message)
return response_200(data=delete_user_result, message=delete_user_result.message)
@@ -74,15 +85,102 @@ async def delete_system_user(request: Request, delete_user: DeleteUserModel, tok
return response_400(data="", message=delete_user_result.message)
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
-@userController.get("/user/{user_id}", response_model=UserDetailModel)
-async def query_detail_system_user(user_id: int, query_db: Session = Depends(get_db)):
+@userController.get("/user/{user_id}", response_model=UserDetailModel, dependencies=[Depends(CheckUserInterfaceAuth('system:user:query'))])
+async def query_detail_system_user(request: Request, user_id: int, query_db: Session = Depends(get_db)):
try:
- delete_user_result = detail_user_services(query_db, user_id)
+ delete_user_result = UserService.detail_user_services(query_db, user_id)
logger.info(f'获取user_id为{user_id}的信息成功')
return response_200(data=delete_user_result, message='获取成功')
except Exception as e:
logger.exception(e)
- return response_500(data="", message="接口异常")
+ return response_500(data="", message=str(e))
+
+
+@userController.patch("/user/profile/changeAvatar", response_model=CrudUserResponse, dependencies=[Depends(CheckUserInterfaceAuth('common'))])
+@log_decorator(title='个人信息', business_type=2)
+async def change_system_user_profile_avatar(request: Request, edit_user: AddUserModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
+ try:
+ avatar = edit_user.avatar
+ # 去除 base64 字符串中的头部信息（data:image/jpeg;base64, 等等）
+ base64_string = avatar.split(',', 1)[1]
+ # 解码 base64 字符串
+ file_data = base64.b64decode(base64_string)
+ dir_path = os.path.join(CachePathConfig.PATH, 'avatar')
+ try:
+ os.makedirs(dir_path)
+ except FileExistsError:
+ pass
+ filepath = os.path.join(dir_path, f'{current_user.user.user_name}_avatar.jpeg')
+ with open(filepath, 'wb') as f:
+ f.write(file_data)
+ edit_user.user_id = current_user.user.user_id
+ edit_user.avatar = f'{request.base_url}common/{CachePathConfig.PATHSTR}?taskId=avatar&filename={current_user.user.user_name}_avatar.jpeg'
+ edit_user.update_by = current_user.user.user_name
+ edit_user.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+ edit_user_result = UserService.edit_user_services(query_db, edit_user)
+ if edit_user_result.is_success:
+ logger.info(edit_user_result.message)
+ return response_200(data=edit_user_result, message=edit_user_result.message)
+ else:
+ logger.warning(edit_user_result.message)
+ return response_400(data="", message=edit_user_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@userController.patch("/user/profile/changeInfo", response_model=CrudUserResponse, dependencies=[Depends(CheckUserInterfaceAuth('common'))])
+@log_decorator(title='个人信息', business_type=2)
+async def change_system_user_profile_info(request: Request, edit_user: AddUserModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
+ try:
+ edit_user.user_id = current_user.user.user_id
+ edit_user.update_by = current_user.user.user_name
+ edit_user.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+ edit_user_result = UserService.edit_user_services(query_db, edit_user)
+ if edit_user_result.is_success:
+ logger.info(edit_user_result.message)
+ return response_200(data=edit_user_result, message=edit_user_result.message)
+ else:
+ logger.warning(edit_user_result.message)
+ return response_400(data="", message=edit_user_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@userController.patch("/user/profile/resetPwd", response_model=CrudUserResponse, dependencies=[Depends(CheckUserInterfaceAuth('common'))])
+@log_decorator(title='个人信息', business_type=2)
+async def reset_system_user_password(request: Request, reset_user: ResetUserModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
+ try:
+ if not reset_user.user_id and reset_user.old_password:
+ reset_user.user_id = current_user.user.user_id
+ reset_user.password = PwdUtil.get_password_hash(reset_user.password)
+ reset_user.update_by = current_user.user.user_name
+ reset_user.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+ reset_user_result = UserService.reset_user_services(query_db, reset_user)
+ if reset_user_result.is_success:
+ logger.info(reset_user_result.message)
+ return response_200(data=reset_user_result, message=reset_user_result.message)
+ else:
+ logger.warning(reset_user_result.message)
+ return response_400(data="", message=reset_user_result.message)
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
+
+
+@userController.post("/user/export", dependencies=[Depends(CheckUserInterfaceAuth('system:user:export'))])
+@log_decorator(title='用户管理', business_type=5)
+async def export_system_user_list(request: Request, user_query: UserQueryModel, query_db: Session = Depends(get_db)):
+ try:
+ # 获取全量数据
+ user_query_result = UserService.get_user_list_services(query_db, user_query)
+ user_export_result = UserService.export_user_list_services(user_query_result)
+ logger.info('导出成功')
+ return streaming_response_200(data=bytes2file_response(user_export_result))
+ except Exception as e:
+ logger.exception(e)
+ return response_500(data="", message=str(e))
diff --git a/dash-fastapi-backend/module_admin/dao/config_dao.py b/dash-fastapi-backend/module_admin/dao/config_dao.py
new file mode 100644
index 0000000000000000000000000000000000000000..a7fb473c973a48c23950f69279020b62f5f5b19c
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/dao/config_dao.py
@@ -0,0 +1,110 @@
+from sqlalchemy.orm import Session
+from module_admin.entity.do.config_do import SysConfig
+from module_admin.entity.vo.config_vo import ConfigModel, ConfigQueryModel
+from utils.time_format_util import list_format_datetime
+from datetime import datetime, time
+
+
+class ConfigDao:
+ """
+ 参数配置管理模块数据库操作层
+ """
+
+ @classmethod
+ def get_config_detail_by_id(cls, db: Session, config_id: int):
+ """
+ 根据参数配置id获取参数配置详细信息
+ :param db: orm对象
+ :param config_id: 参数配置id
+ :return: 参数配置信息对象
+ """
+ config_info = db.query(SysConfig) \
+ .filter(SysConfig.config_id == config_id) \
+ .first()
+
+ return config_info
+
+ @classmethod
+ def get_config_detail_by_info(cls, db: Session, config: ConfigModel):
+ """
+ 根据参数配置参数获取参数配置信息
+ :param db: orm对象
+ :param config: 参数配置参数对象
+ :return: 参数配置信息对象
+ """
+ config_info = db.query(SysConfig) \
+ .filter(SysConfig.config_key == config.config_key if config.config_key else True,
+ SysConfig.config_value == config.config_value if config.config_value else True) \
+ .first()
+
+ return config_info
+
+ @classmethod
+ def get_all_config(cls, db: Session):
+ """
+ 获取所有的参数配置信息
+ :param db: orm对象
+ :return: 参数配置信息列表对象
+ """
+ config_info = db.query(SysConfig).all()
+
+ return list_format_datetime(config_info)
+
+ @classmethod
+ def get_config_list(cls, db: Session, query_object: ConfigQueryModel):
+ """
+ 根据查询参数获取参数配置列表信息
+ :param db: orm对象
+ :param query_object: 查询参数对象
+ :return: 参数配置列表信息对象
+ """
+ config_list = db.query(SysConfig) \
+ .filter(SysConfig.config_name.like(f'%{query_object.config_name}%') if query_object.config_name else True,
+ SysConfig.config_key.like(f'%{query_object.config_key}%') if query_object.config_key else True,
+ SysConfig.config_type == query_object.config_type if query_object.config_type else True,
+ SysConfig.create_time.between(
+ datetime.combine(datetime.strptime(query_object.create_time_start, '%Y-%m-%d'), time(00, 00, 00)),
+ datetime.combine(datetime.strptime(query_object.create_time_end, '%Y-%m-%d'), time(23, 59, 59)))
+ if query_object.create_time_start and query_object.create_time_end else True
+ ) \
+ .distinct().all()
+
+ return list_format_datetime(config_list)
+
+ @classmethod
+ def add_config_dao(cls, db: Session, config: ConfigModel):
+ """
+ 新增参数配置数据库操作
+ :param db: orm对象
+ :param config: 参数配置对象
+ :return:
+ """
+ db_config = SysConfig(**config.dict())
+ db.add(db_config)
+ db.flush()
+
+ return db_config
+
+ @classmethod
+ def edit_config_dao(cls, db: Session, config: dict):
+ """
+ 编辑参数配置数据库操作
+ :param db: orm对象
+ :param config: 需要更新的参数配置字典
+ :return:
+ """
+ db.query(SysConfig) \
+ .filter(SysConfig.config_id == config.get('config_id')) \
+ .update(config)
+
+ @classmethod
+ def delete_config_dao(cls, db: Session, config: ConfigModel):
+ """
+ 删除参数配置数据库操作
+ :param db: orm对象
+ :param config: 参数配置对象
+ :return:
+ """
+ db.query(SysConfig) \
+ .filter(SysConfig.config_id == config.config_id) \
+ .delete()
diff --git a/dash-fastapi-backend/module_admin/dao/dept_dao.py b/dash-fastapi-backend/module_admin/dao/dept_dao.py
index e2ce754ceffda28a427e655f010686749aa85e8c..e08f85922ee4185da1a0ddcd16855452c111df34 100644
--- a/dash-fastapi-backend/module_admin/dao/dept_dao.py
+++ b/dash-fastapi-backend/module_admin/dao/dept_dao.py
@@ -1,175 +1,226 @@
from sqlalchemy.orm import Session
-from module_admin.entity.do.dept_entity import SysDept
-from module_admin.entity.vo.dept_schema import DeptModel, DeptResponse, CrudDeptResponse
-from module_admin.utils.time_format_tool import list_format_datetime
+from module_admin.entity.do.dept_do import SysDept
+from module_admin.entity.vo.dept_vo import DeptModel, DeptResponse, CrudDeptResponse
+from utils.time_format_util import list_format_datetime
-def get_dept_by_id(db: Session, dept_id: int):
- dept_info = db.query(SysDept) \
- .filter(SysDept.dept_id == dept_id,
- SysDept.status == 0,
- SysDept.del_flag == 0) \
- .first()
-
- return dept_info
-
-
-def get_dept_by_id_for_list(db: Session, dept_id: int):
- dept_info = db.query(SysDept) \
- .filter(SysDept.dept_id == dept_id,
- SysDept.del_flag == 0) \
- .first()
-
- return dept_info
-
-
-def get_dept_detail_by_id(db: Session, dept_id: int):
- dept_info = db.query(SysDept) \
- .filter(SysDept.dept_id == dept_id,
- SysDept.del_flag == 0) \
- .first()
-
- return dept_info
-
-
-def get_dept_info_for_edit_option(db: Session, dept_info: DeptModel):
- dept_result = db.query(SysDept) \
- .filter(SysDept.dept_id != dept_info.dept_id, SysDept.parent_id != dept_info.dept_id,
- SysDept.del_flag == 0, SysDept.status == 0) \
- .all()
-
- return list_format_datetime(dept_result)
-
-
-def get_children_dept(db: Session, dept_id: int):
- dept_result = db.query(SysDept) \
- .filter(SysDept.parent_id == dept_id,
- SysDept.del_flag == 0) \
- .all()
-
- return list_format_datetime(dept_result)
-
-
-def get_dept_all_ancestors(db: Session):
- ancestors = db.query(SysDept.ancestors)\
- .filter(SysDept.del_flag == 0)\
- .all()
-
- return ancestors
-
-
-def get_dept_list_for_tree(db: Session, dept_info: DeptModel):
- if dept_info.dept_name:
- dept_query_all = db.query(SysDept) \
- .filter(SysDept.status == 0,
- SysDept.del_flag == 0,
- SysDept.dept_name.like(f'%{dept_info.dept_name}%') if dept_info.dept_name else True) \
- .order_by(SysDept.order_num) \
- .distinct().all()
-
- dept = []
- if dept_query_all:
- for dept_query in dept_query_all:
- ancestor_info = dept_query.ancestors.split(',')
- ancestor_info.append(dept_query.dept_id)
- for ancestor in ancestor_info:
- dept_item = get_dept_by_id(db, int(ancestor))
- if dept_item:
- dept.append(dept_item)
- # 去重
- dept_result = list(set(dept))
- else:
- dept_result = db.query(SysDept) \
- .filter(SysDept.status == 0, SysDept.del_flag == 0) \
- .order_by(SysDept.order_num) \
- .distinct().all()
-
- return list_format_datetime(dept_result)
-
-
-def get_dept_list(db: Session, page_object: DeptModel):
- """
- 根据查询参数获取部门列表信息
- :param db: orm对象
- :param page_object: 不分页查询参数对象
- :return: 部门列表信息对象
- """
- if page_object.dept_name or page_object.status:
- dept_query_all = db.query(SysDept) \
- .filter(SysDept.del_flag == 0,
- SysDept.status == page_object.status if page_object.status else True,
- SysDept.dept_name.like(f'%{page_object.dept_name}%') if page_object.dept_name else True) \
- .order_by(SysDept.order_num)\
- .distinct().all()
-
- dept = []
- if dept_query_all:
- for dept_query in dept_query_all:
- ancestor_info = dept_query.ancestors.split(',')
- ancestor_info.append(dept_query.dept_id)
- for ancestor in ancestor_info:
- dept_item = get_dept_by_id_for_list(db, int(ancestor))
- if dept_item:
- dept.append(dept_item)
- # 去重
- dept_result = list(set(dept))
- else:
- dept_result = db.query(SysDept) \
- .filter(SysDept.del_flag == 0) \
- .order_by(SysDept.order_num) \
- .distinct().all()
-
- result = dict(
- rows=list_format_datetime(dept_result),
- )
-
- return DeptResponse(**result)
-
-
-def add_dept_crud(db: Session, dept: DeptModel):
+class DeptDao:
"""
- 新增部门数据库操作
- :param db: orm对象
- :param dept: 部门对象
- :return: 新增校验结果
+ 部门管理模块数据库操作层
"""
- db_dept = SysDept(**dept.dict())
- db.add(db_dept)
- db.commit() # 提交保存到数据库中
- db.refresh(db_dept) # 刷新
- result = dict(is_success=True, message='新增成功')
-
- return CrudDeptResponse(**result)
-
-def edit_dept_crud(db: Session, dept: dict):
- """
- 编辑部门数据库操作
- :param db: orm对象
- :param dept: 需要更新的部门字典
- :return: 编辑校验结果
- """
- is_dept_id = db.query(SysDept).filter(SysDept.dept_id == dept.get('dept_id')).all()
- if not is_dept_id:
- result = dict(is_success=False, message='部门不存在')
- else:
+ @classmethod
+ def get_dept_by_id(cls, db: Session, dept_id: int):
+ """
+ 根据部门id获取在用部门信息
+ :param db: orm对象
+ :param dept_id: 部门id
+ :return: 在用部门信息对象
+ """
+ dept_info = db.query(SysDept) \
+ .filter(SysDept.dept_id == dept_id,
+ SysDept.status == 0,
+ SysDept.del_flag == 0) \
+ .first()
+
+ return dept_info
+
+ @classmethod
+ def get_dept_by_id_for_list(cls, db: Session, dept_id: int):
+ """
+ 用于获取部门列表的工具方法
+ :param db: orm对象
+ :param dept_id: 部门id
+ :return: 部门id对应的信息对象
+ """
+ dept_info = db.query(SysDept) \
+ .filter(SysDept.dept_id == dept_id,
+ SysDept.del_flag == 0) \
+ .first()
+
+ return dept_info
+
+ @classmethod
+ def get_dept_detail_by_id(cls, db: Session, dept_id: int):
+ """
+ 根据部门id获取部门详细信息
+ :param db: orm对象
+ :param dept_id: 部门id
+ :return: 部门信息对象
+ """
+ dept_info = db.query(SysDept) \
+ .filter(SysDept.dept_id == dept_id,
+ SysDept.del_flag == 0) \
+ .first()
+
+ return dept_info
+
+ @classmethod
+ def get_dept_detail_by_info(cls, db: Session, dept: DeptModel):
+ """
+ 根据部门参数获取部门信息
+ :param db: orm对象
+ :param dept: 部门参数对象
+ :return: 部门信息对象
+ """
+ dept_info = db.query(SysDept) \
+ .filter(SysDept.parent_id == dept.parent_id if dept.parent_id else True,
+ SysDept.dept_name == dept.dept_name if dept.dept_name else True) \
+ .first()
+
+ return dept_info
+
+ @classmethod
+ def get_dept_info_for_edit_option(cls, db: Session, dept_info: DeptModel):
+ """
+ 获取部门编辑对应的在用部门列表信息
+ :param db: orm对象
+ :param dept_info: 部门对象
+ :return: 部门列表信息
+ """
+ dept_result = db.query(SysDept) \
+ .filter(SysDept.dept_id != dept_info.dept_id, SysDept.parent_id != dept_info.dept_id,
+ SysDept.del_flag == 0, SysDept.status == 0) \
+ .all()
+
+ return list_format_datetime(dept_result)
+
+ @classmethod
+ def get_children_dept(cls, db: Session, dept_id: int):
+ """
+ 根据部门id查询当前部门的子部门列表信息
+ :param db: orm对象
+ :param dept_id: 部门id
+ :return: 子部门信息列表
+ """
+ dept_result = db.query(SysDept) \
+ .filter(SysDept.parent_id == dept_id,
+ SysDept.del_flag == 0) \
+ .all()
+
+ return list_format_datetime(dept_result)
+
+ @classmethod
+ def get_dept_all_ancestors(cls, db: Session):
+ """
+ 获取所有部门的ancestors信息
+ :param db: orm对象
+ :return: ancestors信息列表
+ """
+ ancestors = db.query(SysDept.ancestors)\
+ .filter(SysDept.del_flag == 0)\
+ .all()
+
+ return ancestors
+
+ @classmethod
+ def get_dept_list_for_tree(cls, db: Session, dept_info: DeptModel):
+ """
+ 获取所有在用部门列表信息
+ :param db: orm对象
+ :param dept_info: 部门对象
+ :return: 在用部门列表信息
+ """
+ if dept_info.dept_name:
+ dept_query_all = db.query(SysDept) \
+ .filter(SysDept.status == 0,
+ SysDept.del_flag == 0,
+ SysDept.dept_name.like(f'%{dept_info.dept_name}%') if dept_info.dept_name else True) \
+ .order_by(SysDept.order_num) \
+ .distinct().all()
+
+ dept = []
+ if dept_query_all:
+ for dept_query in dept_query_all:
+ ancestor_info = dept_query.ancestors.split(',')
+ ancestor_info.append(dept_query.dept_id)
+ for ancestor in ancestor_info:
+ dept_item = cls.get_dept_by_id(db, int(ancestor))
+ if dept_item:
+ dept.append(dept_item)
+ # 去重
+ dept_result = list(set(dept))
+ else:
+ dept_result = db.query(SysDept) \
+ .filter(SysDept.status == 0, SysDept.del_flag == 0) \
+ .order_by(SysDept.order_num) \
+ .distinct().all()
+
+ return list_format_datetime(dept_result)
+
+ @classmethod
+ def get_dept_list(cls, db: Session, page_object: DeptModel):
+ """
+ 根据查询参数获取部门列表信息
+ :param db: orm对象
+ :param page_object: 不分页查询参数对象
+ :return: 部门列表信息对象
+ """
+ if page_object.dept_name or page_object.status:
+ dept_query_all = db.query(SysDept) \
+ .filter(SysDept.del_flag == 0,
+ SysDept.status == page_object.status if page_object.status else True,
+ SysDept.dept_name.like(f'%{page_object.dept_name}%') if page_object.dept_name else True) \
+ .order_by(SysDept.order_num)\
+ .distinct().all()
+
+ dept = []
+ if dept_query_all:
+ for dept_query in dept_query_all:
+ ancestor_info = dept_query.ancestors.split(',')
+ ancestor_info.append(dept_query.dept_id)
+ for ancestor in ancestor_info:
+ dept_item = cls.get_dept_by_id_for_list(db, int(ancestor))
+ if dept_item:
+ dept.append(dept_item)
+ # 去重
+ dept_result = list(set(dept))
+ else:
+ dept_result = db.query(SysDept) \
+ .filter(SysDept.del_flag == 0) \
+ .order_by(SysDept.order_num) \
+ .distinct().all()
+
+ result = dict(
+ rows=list_format_datetime(dept_result),
+ )
+
+ return DeptResponse(**result)
+
+ @classmethod
+ def add_dept_dao(cls, db: Session, dept: DeptModel):
+ """
+ 新增部门数据库操作
+ :param db: orm对象
+ :param dept: 部门对象
+ :return: 新增校验结果
+ """
+ db_dept = SysDept(**dept.dict())
+ db.add(db_dept)
+ db.refresh(db_dept) # 刷新
+
+ return db_dept
+
+ @classmethod
+ def edit_dept_dao(cls, db: Session, dept: dict):
+ """
+ 编辑部门数据库操作
+ :param db: orm对象
+ :param dept: 需要更新的部门字典
+ :return: 编辑校验结果
+ """
db.query(SysDept) \
.filter(SysDept.dept_id == dept.get('dept_id')) \
.update(dept)
- db.commit() # 提交保存到数据库中
- result = dict(is_success=True, message='更新成功')
- return CrudDeptResponse(**result)
-
-
-def delete_dept_crud(db: Session, dept: DeptModel):
- """
- 删除部门数据库操作
- :param db: orm对象
- :param dept: 部门对象
- :return:
- """
- db.query(SysDept) \
- .filter(SysDept.dept_id == dept.dept_id) \
- .update({SysDept.del_flag: '2', SysDept.update_by: dept.update_by, SysDept.update_time: dept.update_time})
- db.commit() # 提交保存到数据库中
+ @classmethod
+ def delete_dept_dao(cls, db: Session, dept: DeptModel):
+ """
+ 删除部门数据库操作
+ :param db: orm对象
+ :param dept: 部门对象
+ :return:
+ """
+ db.query(SysDept) \
+ .filter(SysDept.dept_id == dept.dept_id) \
+ .update({SysDept.del_flag: '2', SysDept.update_by: dept.update_by, SysDept.update_time: dept.update_time})
diff --git a/dash-fastapi-backend/module_admin/dao/dict_dao.py b/dash-fastapi-backend/module_admin/dao/dict_dao.py
new file mode 100644
index 0000000000000000000000000000000000000000..30312fd9dad7fa09ef858a208500d09f0472ccd8
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/dao/dict_dao.py
@@ -0,0 +1,219 @@
+from sqlalchemy import and_
+from sqlalchemy.orm import Session
+from module_admin.entity.do.dict_do import SysDictType, SysDictData
+from module_admin.entity.vo.dict_vo import DictTypeModel, DictTypeQueryModel, DictDataModel
+from utils.time_format_util import list_format_datetime
+from datetime import datetime, time
+
+
+class DictTypeDao:
+ """
+ 字典类型管理模块数据库操作层
+ """
+
+ @classmethod
+ def get_dict_type_detail_by_id(cls, db: Session, dict_id: int):
+ """
+ 根据字典类型id获取字典类型详细信息
+ :param db: orm对象
+ :param dict_id: 字典类型id
+ :return: 字典类型信息对象
+ """
+ dict_type_info = db.query(SysDictType) \
+ .filter(SysDictType.dict_id == dict_id) \
+ .first()
+
+ return dict_type_info
+
+ @classmethod
+ def get_dict_type_detail_by_info(cls, db: Session, dict_type: DictTypeModel):
+ """
+ 根据字典类型参数获取字典类型信息
+ :param db: orm对象
+ :param dict_type: 字典类型参数对象
+ :return: 字典类型信息对象
+ """
+ dict_type_info = db.query(SysDictType) \
+ .filter(SysDictType.dict_type == dict_type.dict_type if dict_type.dict_type else True,
+ SysDictType.dict_name == dict_type.dict_name if dict_type.dict_name else True) \
+ .first()
+
+ return dict_type_info
+
+ @classmethod
+ def get_all_dict_type(cls, db: Session):
+ """
+ 获取所有的字典类型信息
+ :param db: orm对象
+ :return: 字典类型信息列表对象
+ """
+ dict_type_info = db.query(SysDictType).all()
+
+ return list_format_datetime(dict_type_info)
+
+ @classmethod
+ def get_dict_type_list(cls, db: Session, query_object: DictTypeQueryModel):
+ """
+ 根据查询参数获取字典类型列表信息
+ :param db: orm对象
+ :param query_object: 查询参数对象
+ :return: 字典类型列表信息对象
+ """
+ dict_type_list = db.query(SysDictType) \
+ .filter(SysDictType.dict_name.like(f'%{query_object.dict_name}%') if query_object.dict_name else True,
+ SysDictType.dict_type.like(f'%{query_object.dict_type}%') if query_object.dict_type else True,
+ SysDictType.status == query_object.status if query_object.status else True,
+ SysDictType.create_time.between(
+ datetime.combine(datetime.strptime(query_object.create_time_start, '%Y-%m-%d'), time(00, 00, 00)),
+ datetime.combine(datetime.strptime(query_object.create_time_end, '%Y-%m-%d'), time(23, 59, 59)))
+ if query_object.create_time_start and query_object.create_time_end else True
+ ) \
+ .distinct().all()
+
+ return list_format_datetime(dict_type_list)
+
+ @classmethod
+ def add_dict_type_dao(cls, db: Session, dict_type: DictTypeModel):
+ """
+ 新增字典类型数据库操作
+ :param db: orm对象
+ :param dict_type: 字典类型对象
+ :return:
+ """
+ db_dict_type = SysDictType(**dict_type.dict())
+ db.add(db_dict_type)
+ db.flush()
+
+ return db_dict_type
+
+ @classmethod
+ def edit_dict_type_dao(cls, db: Session, dict_type: dict):
+ """
+ 编辑字典类型数据库操作
+ :param db: orm对象
+ :param dict_type: 需要更新的字典类型字典
+ :return:
+ """
+ db.query(SysDictType) \
+ .filter(SysDictType.dict_id == dict_type.get('dict_id')) \
+ .update(dict_type)
+
+ @classmethod
+ def delete_dict_type_dao(cls, db: Session, dict_type: DictTypeModel):
+ """
+ 删除字典类型数据库操作
+ :param db: orm对象
+ :param dict_type: 字典类型对象
+ :return:
+ """
+ db.query(SysDictType) \
+ .filter(SysDictType.dict_id == dict_type.dict_id) \
+ .delete()
+
+
+class DictDataDao:
+ """
+ 字典数据管理模块数据库操作层
+ """
+
+ @classmethod
+ def get_dict_data_detail_by_id(cls, db: Session, dict_code: int):
+ """
+ 根据字典数据id获取字典数据详细信息
+ :param db: orm对象
+ :param dict_code: 字典数据id
+ :return: 字典数据信息对象
+ """
+ dict_data_info = db.query(SysDictData) \
+ .filter(SysDictData.dict_code == dict_code) \
+ .first()
+
+ return dict_data_info
+
+ @classmethod
+ def get_dict_data_detail_by_info(cls, db: Session, dict_data: DictDataModel):
+ """
+ 根据字典数据参数获取字典数据信息
+ :param db: orm对象
+ :param dict_data: 字典数据参数对象
+ :return: 字典数据信息对象
+ """
+ dict_data_info = db.query(SysDictData) \
+ .filter(SysDictData.dict_type == dict_data.dict_type if dict_data.dict_type else True,
+ SysDictData.dict_label == dict_data.dict_label if dict_data.dict_label else True,
+ SysDictData.dict_value == dict_data.dict_value if dict_data.dict_value else True) \
+ .first()
+
+ return dict_data_info
+
+ @classmethod
+ def get_dict_data_list(cls, db: Session, query_object: DictDataModel):
+ """
+ 根据查询参数获取字典数据列表信息
+ :param db: orm对象
+ :param query_object: 查询参数对象
+ :return: 字典数据列表信息对象
+ """
+ dict_data_list = db.query(SysDictData) \
+ .filter(SysDictData.dict_type == query_object.dict_type if query_object.dict_type else True,
+ SysDictData.dict_label.like(f'%{query_object.dict_label}%') if query_object.dict_label else True,
+ SysDictData.status == query_object.status if query_object.status else True
+ ) \
+ .order_by(SysDictData.dict_sort) \
+ .distinct().all()
+
+ return list_format_datetime(dict_data_list)
+
+ @classmethod
+ def query_dict_data_list(cls, db: Session, dict_type: str):
+ """
+ 根据查询参数获取字典数据列表信息
+ :param db: orm对象
+ :param dict_type: 字典类型
+ :return: 字典数据列表信息对象
+ """
+ dict_data_list = db.query(SysDictData).select_from(SysDictType) \
+ .filter(SysDictType.dict_type == dict_type if dict_type else True, SysDictType.status == 0) \
+ .outerjoin(SysDictData, and_(SysDictType.dict_type == SysDictData.dict_type, SysDictData.status == 0)) \
+ .order_by(SysDictData.dict_sort) \
+ .distinct().all()
+
+ return list_format_datetime(dict_data_list)
+
+ @classmethod
+ def add_dict_data_dao(cls, db: Session, dict_data: DictDataModel):
+ """
+ 新增字典数据数据库操作
+ :param db: orm对象
+ :param dict_data: 字典数据对象
+ :return:
+ """
+ db_data_type = SysDictData(**dict_data.dict())
+ db.add(db_data_type)
+ db.flush()
+
+ return db_data_type
+
+ @classmethod
+ def edit_dict_data_dao(cls, db: Session, dict_data: dict):
+ """
+ 编辑字典数据数据库操作
+ :param db: orm对象
+ :param dict_data: 需要更新的字典数据字典
+ :return:
+ """
+ db.query(SysDictData) \
+ .filter(SysDictData.dict_code == dict_data.get('dict_code')) \
+ .update(dict_data)
+
+ @classmethod
+ def delete_dict_data_dao(cls, db: Session, dict_data: DictDataModel):
+ """
+ 删除字典数据数据库操作
+ :param db: orm对象
+ :param dict_data: 字典数据对象
+ :return:
+ """
+ db.query(SysDictData) \
+ .filter(SysDictData.dict_code == dict_data.dict_code) \
+ .delete()
diff --git a/dash-fastapi-backend/module_admin/dao/job_dao.py b/dash-fastapi-backend/module_admin/dao/job_dao.py
new file mode 100644
index 0000000000000000000000000000000000000000..ca318c8c0eb942f591a14a608ba1cffbc8a62c2f
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/dao/job_dao.py
@@ -0,0 +1,109 @@
+from sqlalchemy.orm import Session
+from module_admin.entity.do.job_do import SysJob
+from module_admin.entity.vo.job_vo import JobModel
+from utils.time_format_util import list_format_datetime, object_format_datetime
+
+
+class JobDao:
+ """
+ 定时任务管理模块数据库操作层
+ """
+
+ @classmethod
+ def get_job_detail_by_id(cls, db: Session, job_id: int):
+ """
+ 根据定时任务id获取定时任务详细信息
+ :param db: orm对象
+ :param job_id: 定时任务id
+ :return: 定时任务信息对象
+ """
+ job_info = db.query(SysJob) \
+ .filter(SysJob.job_id == job_id) \
+ .first()
+
+ return object_format_datetime(job_info)
+
+ @classmethod
+ def get_job_detail_by_info(cls, db: Session, job: JobModel):
+ """
+ 根据定时任务参数获取定时任务信息
+ :param db: orm对象
+ :param job: 定时任务参数对象
+ :return: 定时任务信息对象
+ """
+ job_info = db.query(SysJob) \
+ .filter(SysJob.job_name == job.job_name if job.job_name else True,
+ SysJob.job_group == job.job_group if job.job_group else True,
+ SysJob.invoke_target == job.invoke_target if job.invoke_target else True,
+ SysJob.cron_expression == job.cron_expression if job.cron_expression else True) \
+ .first()
+
+ return job_info
+
+ @classmethod
+ def get_job_list(cls, db: Session, query_object: JobModel):
+ """
+ 根据查询参数获取定时任务列表信息
+ :param db: orm对象
+ :param query_object: 查询参数对象
+ :return: 定时任务列表信息对象
+ """
+ job_list = db.query(SysJob) \
+ .filter(SysJob.job_name.like(f'%{query_object.job_name}%') if query_object.job_name else True,
+ SysJob.job_group == query_object.job_group if query_object.job_group else True,
+ SysJob.status == query_object.status if query_object.status else True
+ ) \
+ .distinct().all()
+
+ return list_format_datetime(job_list)
+
+ @classmethod
+ def get_job_list_for_scheduler(cls, db: Session):
+ """
+ 获取定时任务列表信息
+ :param db: orm对象
+ :return: 定时任务列表信息对象
+ """
+ job_list = db.query(SysJob) \
+ .filter(SysJob.status == 0) \
+ .distinct().all()
+
+ return list_format_datetime(job_list)
+
+ @classmethod
+ def add_job_dao(cls, db: Session, job: JobModel):
+ """
+ 新增定时任务数据库操作
+ :param db: orm对象
+ :param job: 定时任务对象
+ :return:
+ """
+ db_job = SysJob(**job.dict())
+ db.add(db_job)
+ db.flush()
+
+ return db_job
+
+ @classmethod
+ def edit_job_dao(cls, db: Session, job: dict):
+ """
+ 编辑定时任务数据库操作
+ :param db: orm对象
+ :param job: 需要更新的定时任务字典
+ :return:
+ """
+ db.query(SysJob) \
+ .filter(SysJob.job_id == job.get('job_id')) \
+ .update(job)
+
+ @classmethod
+ def delete_job_dao(cls, db: Session, job: JobModel):
+ """
+ 删除定时任务数据库操作
+ :param db: orm对象
+ :param job: 定时任务对象
+ :return:
+ """
+ db.query(SysJob) \
+ .filter(SysJob.job_id == job.job_id) \
+ .delete()
diff --git a/dash-fastapi-backend/module_admin/dao/job_log_dao.py b/dash-fastapi-backend/module_admin/dao/job_log_dao.py
new file mode 100644
index 0000000000000000000000000000000000000000..b3cd75c830f72448039639f1e240c9e060c27ef1
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/dao/job_log_dao.py
@@ -0,0 +1,82 @@
+from sqlalchemy.orm import Session
+from module_admin.entity.do.job_do import SysJobLog
+from module_admin.entity.vo.job_vo import JobLogModel, JobLogQueryModel
+from utils.time_format_util import list_format_datetime, object_format_datetime
+from datetime import datetime, time
+
+
+class JobLogDao:
+ """
+ 定时任务日志管理模块数据库操作层
+ """
+
+ @classmethod
+ def get_job_log_detail_by_id(cls, db: Session, job_log_id: int):
+ """
+ 根据定时任务日志id获取定时任务日志详细信息
+ :param db: orm对象
+ :param job_log_id: 定时任务日志id
+ :return: 定时任务日志信息对象
+ """
+ job_log_info = db.query(SysJobLog) \
+ .filter(SysJobLog.job_log_id == job_log_id) \
+ .first()
+
+ return object_format_datetime(job_log_info)
+
+ @classmethod
+ def get_job_log_list(cls, db: Session, query_object: JobLogQueryModel):
+ """
+ 根据查询参数获取定时任务日志列表信息
+ :param db: orm对象
+ :param query_object: 查询参数对象
+ :return: 定时任务日志列表信息对象
+ """
+ job_log_list = db.query(SysJobLog) \
+ .filter(SysJobLog.job_name.like(f'%{query_object.job_name}%') if query_object.job_name else True,
+ SysJobLog.job_group == query_object.job_group if query_object.job_group else True,
+ SysJobLog.status == query_object.status if query_object.status else True,
+ SysJobLog.create_time.between(
+ datetime.combine(datetime.strptime(query_object.create_time_start, '%Y-%m-%d'), time(00, 00, 00)),
+ datetime.combine(datetime.strptime(query_object.create_time_end, '%Y-%m-%d'), time(23, 59, 59)))
+ if query_object.create_time_start and query_object.create_time_end else True
+ ) \
+ .distinct().all()
+
+ return list_format_datetime(job_log_list)
+
+ @classmethod
+ def add_job_log_dao(cls, db: Session, job_log: JobLogModel):
+ """
+ 新增定时任务日志数据库操作
+ :param db: orm对象
+ :param job_log: 定时任务日志对象
+ :return:
+ """
+ db_job_log = SysJobLog(**job_log.dict())
+ db.add(db_job_log)
+ db.flush()
+
+ return db_job_log
+
+ @classmethod
+ def delete_job_log_dao(cls, db: Session, job_log: JobLogModel):
+ """
+ 删除定时任务日志数据库操作
+ :param db: orm对象
+ :param job_log: 定时任务日志对象
+ :return:
+ """
+ db.query(SysJobLog) \
+ .filter(SysJobLog.job_log_id == job_log.job_log_id) \
+ .delete()
+
+ @classmethod
+ def clear_job_log_dao(cls, db: Session):
+ """
+ 清除定时任务日志数据库操作
+ :param db: orm对象
+ :return:
+ """
+ db.query(SysJobLog) \
+ .delete()
diff --git a/dash-fastapi-backend/module_admin/dao/log_dao.py b/dash-fastapi-backend/module_admin/dao/log_dao.py
new file mode 100644
index 0000000000000000000000000000000000000000..92d347d7640bd52cceb4a775e07b6c40c1c97463
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/dao/log_dao.py
@@ -0,0 +1,146 @@
+from sqlalchemy.orm import Session
+from module_admin.entity.do.log_do import SysOperLog, SysLogininfor
+from module_admin.entity.vo.log_vo import OperLogModel, LogininforModel, OperLogQueryModel, LoginLogQueryModel
+from utils.time_format_util import object_format_datetime, list_format_datetime
+from datetime import datetime, time
+
+
+class OperationLogDao:
+ """
+ 操作日志管理模块数据库操作层
+ """
+
+ @classmethod
+ def get_operation_log_detail_by_id(cls, db: Session, oper_id: int):
+ """
+ 根据操作日志id获取操作日志详细信息
+ :param db: orm对象
+ :param oper_id: 操作日志id
+ :return: 操作日志信息对象
+ """
+ operation_log_info = db.query(SysOperLog) \
+ .filter(SysOperLog.oper_id == oper_id) \
+ .first()
+
+ return object_format_datetime(operation_log_info)
+
+ @classmethod
+ def get_operation_log_list(cls, db: Session, query_object: OperLogQueryModel):
+ """
+ 根据查询参数获取操作日志列表信息
+ :param db: orm对象
+ :param query_object: 查询参数对象
+ :return: 操作日志列表信息对象
+ """
+ operation_log_list = db.query(SysOperLog) \
+ .filter(SysOperLog.title.like(f'%{query_object.title}%') if query_object.title else True,
+ SysOperLog.oper_name.like(f'%{query_object.oper_name}%') if query_object.oper_name else True,
+ SysOperLog.business_type == query_object.business_type if query_object.business_type else True,
+ SysOperLog.status == query_object.status if query_object.status else True,
+ SysOperLog.oper_time.between(
+ datetime.combine(datetime.strptime(query_object.oper_time_start, '%Y-%m-%d'), time(00, 00, 00)),
+ datetime.combine(datetime.strptime(query_object.oper_time_end, '%Y-%m-%d'), time(23, 59, 59)))
+ if query_object.oper_time_start and query_object.oper_time_end else True
+ )\
+ .distinct().all()
+
+ return list_format_datetime(operation_log_list)
+
+ @classmethod
+ def add_operation_log_dao(cls, db: Session, operation_log: OperLogModel):
+ """
+ 新增操作日志数据库操作
+ :param db: orm对象
+ :param operation_log: 操作日志对象
+ :return: 新增校验结果
+ """
+ db_operation_log = SysOperLog(**operation_log.dict())
+ db.add(db_operation_log)
+ db.flush()
+
+ return db_operation_log
+
+ @classmethod
+ def delete_operation_log_dao(cls, db: Session, operation_log: OperLogModel):
+ """
+ 删除操作日志数据库操作
+ :param db: orm对象
+ :param operation_log: 操作日志对象
+ :return:
+ """
+ db.query(SysOperLog) \
+ .filter(SysOperLog.oper_id == operation_log.oper_id) \
+ .delete()
+
+ @classmethod
+ def clear_operation_log_dao(cls, db: Session):
+ """
+ 清除操作日志数据库操作
+ :param db: orm对象
+ :return:
+ """
+ db.query(SysOperLog) \
+ .delete()
+
+
+class LoginLogDao:
+ """
+ 登录日志管理模块数据库操作层
+ """
+
+ @classmethod
+ def get_login_log_list(cls, db: Session, query_object: LoginLogQueryModel):
+ """
+ 根据查询参数获取登录日志列表信息
+ :param db: orm对象
+ :param query_object: 查询参数对象
+ :return: 登录日志列表信息对象
+ """
+ login_log_list = db.query(SysLogininfor) \
+ .filter(SysLogininfor.ipaddr.like(f'%{query_object.ipaddr}%') if query_object.ipaddr else True,
+ SysLogininfor.user_name.like(f'%{query_object.user_name}%') if query_object.user_name else True,
+ SysLogininfor.status == query_object.status if query_object.status else True,
+ SysLogininfor.login_time.between(
+ datetime.combine(datetime.strptime(query_object.login_time_start, '%Y-%m-%d'), time(00, 00, 00)),
+ datetime.combine(datetime.strptime(query_object.login_time_end, '%Y-%m-%d'), time(23, 59, 59)))
+ if query_object.login_time_start and query_object.login_time_end else True
+ )\
+ .distinct().all()
+
+ return list_format_datetime(login_log_list)
+
+ @classmethod
+ def add_login_log_dao(cls, db: Session, login_log: LogininforModel):
+ """
+ 新增登录日志数据库操作
+ :param db: orm对象
+ :param login_log: 登录日志对象
+ :return: 新增校验结果
+ """
+ db_login_log = SysLogininfor(**login_log.dict())
+ db.add(db_login_log)
+ db.flush()
+
+ return db_login_log
+
+ @classmethod
+ def delete_login_log_dao(cls, db: Session, login_log: LogininforModel):
+ """
+ 删除登录日志数据库操作
+ :param db: orm对象
+ :param login_log: 登录日志对象
+ :return:
+ """
+ db.query(SysLogininfor) \
+ .filter(SysLogininfor.info_id == login_log.info_id) \
+ .delete()
+
+ @classmethod
+ def clear_login_log_dao(cls, db: Session):
+ """
+ 清除登录日志数据库操作
+ :param db: orm对象
+ :return:
+ """
+ db.query(SysLogininfor) \
+ .delete()
diff --git a/dash-fastapi-backend/module_admin/dao/login_dao.py b/dash-fastapi-backend/module_admin/dao/login_dao.py
index 0e39974e8600a42c84c3c7e024fc75af88f96468..b932bc1793139f0174cd40bf89a29252acf89248 100644
--- a/dash-fastapi-backend/module_admin/dao/login_dao.py
+++ b/dash-fastapi-backend/module_admin/dao/login_dao.py
@@ -1,6 +1,7 @@
from sqlalchemy.orm import Session
-from module_admin.entity.do.user_entity import SysUser
-from module_admin.utils.time_format_tool import object_format_datetime
+from sqlalchemy import and_
+from module_admin.entity.do.user_do import SysUser
+from module_admin.entity.do.dept_do import SysDept
def login_by_account(db: Session, user_name: str):
@@ -10,9 +11,10 @@ def login_by_account(db: Session, user_name: str):
:param user_name: 用户名
:return: 用户对象
"""
- user = db.query(SysUser).\
- filter(SysUser.user_name == user_name, SysUser.del_flag == '0').\
- distinct().\
- first()
+ user = db.query(SysUser, SysDept)\
+ .filter(SysUser.user_name == user_name, SysUser.del_flag == '0') \
+ .outerjoin(SysDept, and_(SysUser.dept_id == SysDept.dept_id, SysDept.status == 0, SysDept.del_flag == 0)) \
+ .distinct() \
+ .first()
- return object_format_datetime(user)
+ return user
diff --git a/dash-fastapi-backend/module_admin/dao/menu_dao.py b/dash-fastapi-backend/module_admin/dao/menu_dao.py
index 50749e837d9d3d4be2cf147ea109f7fb0d5bfb0d..486b9d623e57f1e8e998eb6fa59ae3b716fd3fee 100644
--- a/dash-fastapi-backend/module_admin/dao/menu_dao.py
+++ b/dash-fastapi-backend/module_admin/dao/menu_dao.py
@@ -1,105 +1,188 @@
+from sqlalchemy import and_
from sqlalchemy.orm import Session
-from module_admin.entity.do.menu_entity import SysMenu
-from module_admin.entity.vo.menu_schema import MenuModel, MenuResponse, CrudMenuResponse
-from module_admin.utils.time_format_tool import list_format_datetime
+from module_admin.entity.do.menu_do import SysMenu
+from module_admin.entity.do.user_do import SysUser, SysUserRole
+from module_admin.entity.do.role_do import SysRole, SysRoleMenu
+from module_admin.entity.vo.menu_vo import MenuModel, MenuResponse
+from utils.time_format_util import list_format_datetime
-def get_menu_detail_by_id(db: Session, menu_id: int):
- menu_info = db.query(SysMenu) \
- .filter(SysMenu.menu_id == menu_id) \
- .first()
-
- return menu_info
-
-
-def get_menu_info_for_edit_option(db: Session, menu_info: MenuModel):
- menu_result = db.query(SysMenu) \
- .filter(SysMenu.menu_id != menu_info.menu_id, SysMenu.parent_id != menu_info.menu_id,
- SysMenu.status == 0) \
- .all()
-
- return list_format_datetime(menu_result)
-
-
-def get_menu_list_for_tree(db: Session, menu_info: MenuModel):
- menu_query_all = db.query(SysMenu) \
- .filter(SysMenu.status == 0,
- SysMenu.menu_name.like(f'%{menu_info.menu_name}%') if menu_info.menu_name else True) \
- .order_by(SysMenu.order_num) \
- .distinct().all()
-
- return list_format_datetime(menu_query_all)
-
-
-def get_menu_list(db: Session, page_object: MenuModel):
- """
- 根据查询参数获取菜单列表信息
- :param db: orm对象
- :param page_object: 不分页查询参数对象
- :return: 菜单列表信息对象
- """
- if page_object.menu_name or page_object.status:
- menu_query_all = db.query(SysMenu) \
- .filter(SysMenu.status == page_object.status if page_object.status else True,
- SysMenu.menu_name.like(f'%{page_object.menu_name}%') if page_object.menu_name else True) \
- .order_by(SysMenu.order_num)\
- .distinct().all()
- else:
- menu_query_all = db.query(SysMenu) \
- .order_by(SysMenu.order_num) \
- .distinct().all()
-
- result = dict(
- rows=list_format_datetime(menu_query_all),
- )
-
- return MenuResponse(**result)
-
-
-def add_menu_crud(db: Session, menu: MenuModel):
+class MenuDao:
"""
- 新增菜单数据库操作
- :param db: orm对象
- :param menu: 菜单对象
- :return: 新增校验结果
+ 菜单管理模块数据库操作层
"""
- db_menu = SysMenu(**menu.dict())
- db.add(db_menu)
- db.commit() # 提交保存到数据库中
- db.refresh(db_menu) # 刷新
- result = dict(is_success=True, message='新增成功')
- return CrudMenuResponse(**result)
-
-
-def edit_menu_crud(db: Session, menu: dict):
- """
- 编辑菜单数据库操作
- :param db: orm对象
- :param menu: 需要更新的菜单字典
- :return: 编辑校验结果
- """
- is_menu_id = db.query(SysMenu).filter(SysMenu.menu_id == menu.get('menu_id')).all()
- if not is_menu_id:
- result = dict(is_success=False, message='菜单不存在')
- else:
+ @classmethod
+ def get_menu_detail_by_id(cls, db: Session, menu_id: int):
+ """
+ 根据菜单id获取菜单详细信息
+ :param db: orm对象
+ :param menu_id: 菜单id
+ :return: 菜单信息对象
+ """
+ menu_info = db.query(SysMenu) \
+ .filter(SysMenu.menu_id == menu_id) \
+ .first()
+
+ return menu_info
+
+ @classmethod
+ def get_menu_detail_by_info(cls, db: Session, menu: MenuModel):
+ """
+ 根据菜单参数获取菜单信息
+ :param db: orm对象
+ :param menu: 菜单参数对象
+ :return: 菜单信息对象
+ """
+ menu_info = db.query(SysMenu) \
+ .filter(SysMenu.parent_id == menu.parent_id if menu.parent_id else True,
+ SysMenu.menu_name == menu.menu_name if menu.menu_name else True,
+ SysMenu.menu_type == menu.menu_type if menu.menu_type else True) \
+ .first()
+
+ return menu_info
+
+ @classmethod
+ def get_menu_info_for_edit_option(cls, db: Session, menu_info: MenuModel, user_id: int, role: list):
+ """
+ 根据角色信息获取菜单编辑对应的在用菜单列表信息
+ :param db: orm对象
+ :param menu_info: 菜单对象
+ :param user_id: 用户id
+ :param role: 用户角色列表信息
+ :return: 菜单列表信息
+ """
+ menu_result = []
+ for item in role:
+ if item.role_id == 1:
+ menu_result = db.query(SysMenu) \
+ .filter(SysMenu.menu_id != menu_info.menu_id, SysMenu.parent_id != menu_info.menu_id,
+ SysMenu.status == 0) \
+ .all()
+ else:
+ menu_result = db.query(SysMenu).select_from(SysUser) \
+ .filter(SysUser.status == 0, SysUser.del_flag == 0, SysUser.user_id == user_id) \
+ .outerjoin(SysUserRole, SysUser.user_id == SysUserRole.user_id) \
+ .outerjoin(SysRole,
+ and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == 0, SysRole.del_flag == 0)) \
+ .outerjoin(SysRoleMenu, SysRole.role_id == SysRoleMenu.role_id) \
+ .outerjoin(SysMenu, and_(SysRoleMenu.menu_id == SysMenu.menu_id,
+ SysMenu.menu_id != menu_info.menu_id, SysMenu.parent_id != menu_info.menu_id,
+ SysMenu.status == 0)) \
+ .order_by(SysMenu.order_num) \
+ .distinct().all()
+
+ return list_format_datetime(menu_result)
+
+ @classmethod
+ def get_menu_list_for_tree(cls, db: Session, menu_info: MenuModel, user_id: int, role: list):
+ """
+ 根据角色信息获取所有在用菜单列表信息
+ :param db: orm对象
+ :param menu_info: 菜单对象
+ :param user_id: 用户id
+ :param role: 用户角色列表信息
+ :return: 菜单列表信息
+ """
+ menu_query_all = []
+ for item in role:
+ if item.role_id == 1:
+ menu_query_all = db.query(SysMenu) \
+ .filter(SysMenu.status == 0,
+ SysMenu.menu_name.like(f'%{menu_info.menu_name}%') if menu_info.menu_name else True) \
+ .order_by(SysMenu.order_num) \
+ .distinct().all()
+ break
+ else:
+ menu_query_all = db.query(SysMenu).select_from(SysUser) \
+ .filter(SysUser.status == 0, SysUser.del_flag == 0, SysUser.user_id == user_id) \
+ .outerjoin(SysUserRole, SysUser.user_id == SysUserRole.user_id) \
+ .outerjoin(SysRole,
+ and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == 0, SysRole.del_flag == 0)) \
+ .outerjoin(SysRoleMenu, SysRole.role_id == SysRoleMenu.role_id) \
+ .outerjoin(SysMenu, and_(SysRoleMenu.menu_id == SysMenu.menu_id,
+ SysMenu.status == 0,
+ SysMenu.menu_name.like(
+ f'%{menu_info.menu_name}%') if menu_info.menu_name else True)) \
+ .order_by(SysMenu.order_num) \
+ .distinct().all()
+
+ return list_format_datetime(menu_query_all)
+
+ @classmethod
+ def get_menu_list(cls, db: Session, page_object: MenuModel, user_id: int, role: list):
+ """
+ 根据查询参数获取菜单列表信息
+ :param db: orm对象
+ :param page_object: 不分页查询参数对象
+ :param user_id: 用户id
+ :param role: 用户角色列表
+ :return: 菜单列表信息对象
+ """
+ menu_query_all = []
+ for item in role:
+ if item.role_id == 1:
+ menu_query_all = db.query(SysMenu) \
+ .filter(SysMenu.status == page_object.status if page_object.status else True,
+ SysMenu.menu_name.like(
+ f'%{page_object.menu_name}%') if page_object.menu_name else True) \
+ .order_by(SysMenu.order_num) \
+ .distinct().all()
+ break
+ else:
+ menu_query_all = db.query(SysMenu).select_from(SysUser) \
+ .filter(SysUser.status == 0, SysUser.del_flag == 0, SysUser.user_id == user_id) \
+ .outerjoin(SysUserRole, SysUser.user_id == SysUserRole.user_id) \
+ .outerjoin(SysRole,
+ and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == 0, SysRole.del_flag == 0)) \
+ .outerjoin(SysRoleMenu, SysRole.role_id == SysRoleMenu.role_id) \
+ .outerjoin(SysMenu, and_(SysRoleMenu.menu_id == SysMenu.menu_id,
+ SysMenu.status == page_object.status if page_object.status else True,
+ SysMenu.menu_name.like(
+ f'%{page_object.menu_name}%') if page_object.menu_name else True)) \
+ .order_by(SysMenu.order_num) \
+ .distinct().all()
+
+ result = dict(
+ rows=list_format_datetime(menu_query_all),
+ )
+
+ return MenuResponse(**result)
+
+ @classmethod
+ def add_menu_dao(cls, db: Session, menu: MenuModel):
+ """
+ 新增菜单数据库操作
+ :param db: orm对象
+ :param menu: 菜单对象
+ :return:
+ """
+ db_menu = SysMenu(**menu.dict())
+ db.add(db_menu)
+ db.flush()
+
+ return db_menu
+
+ @classmethod
+ def edit_menu_dao(cls, db: Session, menu: dict):
+ """
+ 编辑菜单数据库操作
+ :param db: orm对象
+ :param menu: 需要更新的菜单字典
+ :return:
+ """
db.query(SysMenu) \
.filter(SysMenu.menu_id == menu.get('menu_id')) \
.update(menu)
- db.commit() # 提交保存到数据库中
- result = dict(is_success=True, message='更新成功')
-
- return CrudMenuResponse(**result)
-
-def delete_menu_crud(db: Session, menu: MenuModel):
- """
- 删除菜单数据库操作
- :param db: orm对象
- :param menu: 菜单对象
- :return:
- """
- db.query(SysMenu) \
- .filter(SysMenu.menu_id == menu.menu_id) \
- .delete()
- db.commit() # 提交保存到数据库中
+ @classmethod
+ def delete_menu_dao(cls, db: Session, menu: MenuModel):
+ """
+ 删除菜单数据库操作
+ :param db: orm对象
+ :param menu: 菜单对象
+ :return:
+ """
+ db.query(SysMenu) \
+ .filter(SysMenu.menu_id == menu.menu_id) \
+ .delete()
diff --git a/dash-fastapi-backend/module_admin/dao/notice_dao.py b/dash-fastapi-backend/module_admin/dao/notice_dao.py
new file mode 100644
index 0000000000000000000000000000000000000000..b72d59f28e20b1e237a19bc72581c6da20e32621
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/dao/notice_dao.py
@@ -0,0 +1,100 @@
+from sqlalchemy.orm import Session
+from module_admin.entity.do.notice_do import SysNotice
+from module_admin.entity.vo.notice_vo import NoticeModel, NoticeQueryModel, CrudNoticeResponse
+from utils.time_format_util import list_format_datetime, object_format_datetime
+from datetime import datetime, time
+
+
+class NoticeDao:
+ """
+ 通知公告管理模块数据库操作层
+ """
+
+ @classmethod
+ def get_notice_detail_by_id(cls, db: Session, notice_id: int):
+ """
+ 根据通知公告id获取通知公告详细信息
+ :param db: orm对象
+ :param notice_id: 通知公告id
+ :return: 通知公告信息对象
+ """
+ notice_info = db.query(SysNotice) \
+ .filter(SysNotice.notice_id == notice_id) \
+ .first()
+
+ return object_format_datetime(notice_info)
+
+ @classmethod
+ def get_notice_detail_by_info(cls, db: Session, notice: NoticeModel):
+ """
+ 根据通知公告参数获取通知公告信息
+ :param db: orm对象
+ :param notice: 通知公告参数对象
+ :return: 通知公告信息对象
+ """
+ notice_info = db.query(SysNotice) \
+ .filter(SysNotice.notice_title == notice.notice_title if notice.notice_title else True,
+ SysNotice.notice_type == notice.notice_type if notice.notice_type else True,
+ SysNotice.notice_content == notice.notice_content if notice.notice_content else True) \
+ .first()
+
+ return notice_info
+
+ @classmethod
+ def get_notice_list(cls, db: Session, query_object: NoticeQueryModel):
+ """
+ 根据查询参数获取通知公告列表信息
+ :param db: orm对象
+ :param query_object: 查询参数对象
+ :return: 通知公告列表信息对象
+ """
+ notice_list = db.query(SysNotice) \
+ .filter(SysNotice.notice_title.like(f'%{query_object.notice_title}%') if query_object.notice_title else True,
+ SysNotice.update_by.like(f'%{query_object.update_by}%') if query_object.update_by else True,
+ SysNotice.notice_type == query_object.notice_type if query_object.notice_type else True,
+ SysNotice.create_time.between(
+ datetime.combine(datetime.strptime(query_object.create_time_start, '%Y-%m-%d'), time(00, 00, 00)),
+ datetime.combine(datetime.strptime(query_object.create_time_end, '%Y-%m-%d'), time(23, 59, 59)))
+ if query_object.create_time_start and query_object.create_time_end else True
+ ) \
+ .distinct().all()
+
+ return list_format_datetime(notice_list)
+
+ @classmethod
+ def add_notice_dao(cls, db: Session, notice: NoticeModel):
+ """
+ 新增通知公告数据库操作
+ :param db: orm对象
+ :param notice: 通知公告对象
+ :return:
+ """
+ db_notice = SysNotice(**notice.dict())
+ db.add(db_notice)
+ db.flush()
+
+ return db_notice
+
+ @classmethod
+ def edit_notice_dao(cls, db: Session, notice: dict):
+ """
+ 编辑通知公告数据库操作
+ :param db: orm对象
+ :param notice: 需要更新的通知公告字典
+ :return:
+ """
+ db.query(SysNotice) \
+ .filter(SysNotice.notice_id == notice.get('notice_id')) \
+ .update(notice)
+
+ @classmethod
+ def delete_notice_dao(cls, db: Session, notice: NoticeModel):
+ """
+ 删除通知公告数据库操作
+ :param db: orm对象
+ :param notice: 通知公告对象
+ :return:
+ """
+ db.query(SysNotice) \
+ .filter(SysNotice.notice_id == notice.notice_id) \
+ .delete()
diff --git a/dash-fastapi-backend/module_admin/dao/post_dao.py b/dash-fastapi-backend/module_admin/dao/post_dao.py
index 8b04c4f2731bcd91e69f2aa7b3eb8547b1400915..11fbdc1592ff5b34a472e23830846df06f3e87d9 100644
--- a/dash-fastapi-backend/module_admin/dao/post_dao.py
+++ b/dash-fastapi-backend/module_admin/dao/post_dao.py
@@ -1,116 +1,124 @@
from sqlalchemy.orm import Session
-from module_admin.entity.do.post_entity import SysPost
-from module_admin.entity.vo.post_schema import PostModel, PostPageObject, PostPageObjectResponse, CrudPostResponse
-from module_admin.utils.time_format_tool import list_format_datetime
-from module_admin.utils.page_tool import get_page_info
+from module_admin.entity.do.post_do import SysPost
+from module_admin.entity.vo.post_vo import PostModel
+from utils.time_format_util import list_format_datetime
-def get_post_by_id(db: Session, post_id: int):
- post_info = db.query(SysPost) \
- .filter(SysPost.post_id == post_id,
- SysPost.status == 0) \
- .first()
-
- return post_info
-
-
-def get_post_detail_by_id(db: Session, post_id: int):
- post_info = db.query(SysPost) \
- .filter(SysPost.post_id == post_id) \
- .first()
-
- return post_info
-
-
-def get_post_select_option_crud(db: Session):
- post_info = db.query(SysPost) \
- .filter(SysPost.status == 0) \
- .all()
-
- return post_info
-
-
-def get_post_list(db: Session, page_object: PostPageObject):
- """
- 根据查询参数获取岗位列表信息
- :param db: orm对象
- :param page_object: 分页查询参数对象
- :return: 岗位列表信息对象
+class PostDao:
"""
- count = db.query(SysPost) \
- .filter(SysPost.post_code.like(f'%{page_object.post_code}%') if page_object.post_code else True,
- SysPost.post_name.like(f'%{page_object.post_name}%') if page_object.post_name else True,
- SysPost.status == page_object.status if page_object.status else True
- )\
- .order_by(SysPost.post_sort)\
- .distinct().count()
- offset_com = (page_object.page_num - 1) * page_object.page_size
- page_info = get_page_info(offset_com, page_object.page_num, page_object.page_size, count)
- post_list = db.query(SysPost) \
- .filter(SysPost.post_code.like(f'%{page_object.post_code}%') if page_object.post_code else True,
- SysPost.post_name.like(f'%{page_object.post_name}%') if page_object.post_name else True,
- SysPost.status == page_object.status if page_object.status else True
- ) \
- .order_by(SysPost.post_sort) \
- .offset(page_info.offset) \
- .limit(page_object.page_size) \
- .distinct().all()
-
- result = dict(
- rows=list_format_datetime(post_list),
- page_num=page_info.page_num,
- page_size=page_info.page_size,
- total=page_info.total,
- has_next=page_info.has_next
- )
-
- return PostPageObjectResponse(**result)
-
-
-def add_post_crud(db: Session, post: PostModel):
+ 岗位管理模块数据库操作层
"""
- 新增岗位数据库操作
- :param db: orm对象
- :param post: 岗位对象
- :return: 新增校验结果
- """
- db_post = SysPost(**post.dict())
- db.add(db_post)
- db.commit() # 提交保存到数据库中
- db.refresh(db_post) # 刷新
- result = dict(is_success=True, message='新增成功')
-
- return CrudPostResponse(**result)
-
-def edit_post_crud(db: Session, post: dict):
- """
- 编辑岗位数据库操作
- :param db: orm对象
- :param post: 需要更新的岗位字典
- :return: 编辑校验结果
- """
- is_post_id = db.query(SysPost).filter(SysPost.post_id == post.get('post_id')).all()
- if not is_post_id:
- result = dict(is_success=False, message='岗位不存在')
- else:
+ @classmethod
+ def get_post_by_id(cls, db: Session, post_id: int):
+ """
+ 根据岗位id获取在用岗位详细信息
+ :param db: orm对象
+ :param post_id: 岗位id
+ :return: 在用岗位信息对象
+ """
+ post_info = db.query(SysPost) \
+ .filter(SysPost.post_id == post_id,
+ SysPost.status == 0) \
+ .first()
+
+ return post_info
+
+ @classmethod
+ def get_post_detail_by_id(cls, db: Session, post_id: int):
+ """
+ 根据岗位id获取岗位详细信息
+ :param db: orm对象
+ :param post_id: 岗位id
+ :return: 岗位信息对象
+ """
+ post_info = db.query(SysPost) \
+ .filter(SysPost.post_id == post_id) \
+ .first()
+
+ return post_info
+
+ @classmethod
+ def get_post_detail_by_info(cls, db: Session, post: PostModel):
+ """
+ 根据岗位参数获取岗位信息
+ :param db: orm对象
+ :param post: 岗位参数对象
+ :return: 岗位信息对象
+ """
+ post_info = db.query(SysPost) \
+ .filter(SysPost.post_name == post.post_name if post.post_name else True,
+ SysPost.post_code == post.post_code if post.post_code else True,
+ SysPost.post_sort == post.post_sort if post.post_sort else True) \
+ .first()
+
+ return post_info
+
+ @classmethod
+ def get_post_select_option_dao(cls, db: Session):
+ """
+ 获取所有在用岗位信息
+ :param db: orm对象
+ :return: 在用岗位信息列表
+ """
+ post_info = db.query(SysPost) \
+ .filter(SysPost.status == 0) \
+ .all()
+
+ return post_info
+
+ @classmethod
+ def get_post_list(cls, db: Session, query_object: PostModel):
+ """
+ 根据查询参数获取岗位列表信息
+ :param db: orm对象
+ :param query_object: 查询参数对象
+ :return: 岗位列表信息对象
+ """
+ post_list = db.query(SysPost) \
+ .filter(SysPost.post_code.like(f'%{query_object.post_code}%') if query_object.post_code else True,
+ SysPost.post_name.like(f'%{query_object.post_name}%') if query_object.post_name else True,
+ SysPost.status == query_object.status if query_object.status else True
+ ) \
+ .order_by(SysPost.post_sort) \
+ .distinct().all()
+
+ return list_format_datetime(post_list)
+
+ @classmethod
+ def add_post_dao(cls, db: Session, post: PostModel):
+ """
+ 新增岗位数据库操作
+ :param db: orm对象
+ :param post: 岗位对象
+ :return:
+ """
+ db_post = SysPost(**post.dict())
+ db.add(db_post)
+ db.flush()
+
+ return db_post
+
+ @classmethod
+ def edit_post_dao(cls, db: Session, post: dict):
+ """
+ 编辑岗位数据库操作
+ :param db: orm对象
+ :param post: 需要更新的岗位字典
+ :return:
+ """
db.query(SysPost) \
.filter(SysPost.post_id == post.get('post_id')) \
.update(post)
- db.commit() # 提交保存到数据库中
- result = dict(is_success=True, message='更新成功')
- return CrudPostResponse(**result)
-
-
-def delete_post_crud(db: Session, post: PostModel):
- """
- 删除岗位数据库操作
- :param db: orm对象
- :param post: 岗位对象
- :return:
- """
- db.query(SysPost) \
- .filter(SysPost.post_id == post.post_id) \
- .delete()
- db.commit() # 提交保存到数据库中
+ @classmethod
+ def delete_post_dao(cls, db: Session, post: PostModel):
+ """
+ 删除岗位数据库操作
+ :param db: orm对象
+ :param post: 岗位对象
+ :return:
+ """
+ db.query(SysPost) \
+ .filter(SysPost.post_id == post.post_id) \
+ .delete()
diff --git a/dash-fastapi-backend/module_admin/dao/role_dao.py b/dash-fastapi-backend/module_admin/dao/role_dao.py
index 6923dd510399d5bead4d9c3f643f38a86c213a4a..52f13f691db2e58b3973d3b949aa5f9cdcf9f5a4 100644
--- a/dash-fastapi-backend/module_admin/dao/role_dao.py
+++ b/dash-fastapi-backend/module_admin/dao/role_dao.py
@@ -1,185 +1,179 @@
from sqlalchemy import and_, desc
from sqlalchemy.orm import Session
-from module_admin.entity.do.role_entity import SysRole, SysRoleMenu
-from module_admin.entity.do.menu_entity import SysMenu
-from module_admin.entity.vo.role_schema import RoleModel, RoleMenuModel, RolePageObject, RolePageObjectResponse, CrudRoleResponse, RoleDetailModel
-from module_admin.utils.time_format_tool import list_format_datetime, object_format_datetime
-from module_admin.utils.page_tool import get_page_info
+from module_admin.entity.do.role_do import SysRole, SysRoleMenu
+from module_admin.entity.do.menu_do import SysMenu
+from module_admin.entity.vo.role_vo import RoleModel, RoleMenuModel, RoleQueryModel, RoleDetailModel
+from utils.time_format_util import list_format_datetime, object_format_datetime
from datetime import datetime, time
-def get_role_by_name(db: Session, role_name: str):
- """
- 根据角色名获取角色信息
- :param db: orm对象
- :param role_name: 角色名
- :return: 当前角色名的角色信息对象
- """
- query_role_info = db.query(SysRole) \
- .filter(SysRole.status == 0, SysRole.del_flag == 0, SysRole.role_name == role_name) \
- .order_by(desc(SysRole.create_time)).distinct().first()
-
- return query_role_info
-
-
-def get_role_by_id(db: Session, role_id: int):
- role_info = db.query(SysRole) \
- .filter(SysRole.role_id == role_id,
- SysRole.status == 0,
- SysRole.del_flag == 0) \
- .first()
-
- return role_info
-
-
-def get_role_detail_by_id(db: Session, role_id: int):
- """
- 根据role_id获取角色详细信息
- :param db: orm对象
- :param role_id: 角色id
- :return: 当前role_id的角色信息对象
- """
- query_role_basic_info = db.query(SysRole) \
- .filter(SysRole.del_flag == 0, SysRole.role_id == role_id) \
- .distinct().first()
- query_role_menu_info = db.query(SysMenu).select_from(SysRole) \
- .filter(SysRole.del_flag == 0, SysRole.role_id == role_id) \
- .outerjoin(SysRoleMenu, SysRole.role_id == SysRoleMenu.role_id) \
- .outerjoin(SysMenu, and_(SysRoleMenu.menu_id == SysMenu.menu_id, SysMenu.status == 0)) \
- .distinct().all()
- results = dict(
- role=object_format_datetime(query_role_basic_info),
- menu=list_format_datetime(query_role_menu_info),
- )
-
- return RoleDetailModel(**results)
-
-
-def get_role_select_option_crud(db: Session):
- role_info = db.query(SysRole) \
- .filter(SysRole.status == 0, SysRole.del_flag == 0) \
- .all()
-
- return role_info
-
-
-def get_role_list(db: Session, page_object: RolePageObject):
- """
- 根据查询参数获取角色列表信息
- :param db: orm对象
- :param page_object: 分页查询参数对象
- :return: 角色列表信息对象
- """
- count = db.query(SysRole) \
- .filter(SysRole.del_flag == 0,
- SysRole.role_name.like(f'%{page_object.role_name}%') if page_object.role_name else True,
- SysRole.role_key.like(f'%{page_object.role_key}%') if page_object.role_key else True,
- SysRole.status == page_object.status if page_object.status else True,
- SysRole.create_time.between(
- datetime.combine(datetime.strptime(page_object.create_time_start, '%Y-%m-%d'), time(00, 00, 00)),
- datetime.combine(datetime.strptime(page_object.create_time_end, '%Y-%m-%d'), time(23, 59, 59)))
- if page_object.create_time_start and page_object.create_time_end else True
- )\
- .order_by(SysRole.role_sort)\
- .distinct().count()
- offset_com = (page_object.page_num - 1) * page_object.page_size
- page_info = get_page_info(offset_com, page_object.page_num, page_object.page_size, count)
- role_list = db.query(SysRole) \
- .filter(SysRole.del_flag == 0,
- SysRole.role_name.like(f'%{page_object.role_name}%') if page_object.role_name else True,
- SysRole.role_key.like(f'%{page_object.role_key}%') if page_object.role_key else True,
- SysRole.status == page_object.status if page_object.status else True,
- SysRole.create_time.between(
- datetime.combine(datetime.strptime(page_object.create_time_start, '%Y-%m-%d'), time(00, 00, 00)),
- datetime.combine(datetime.strptime(page_object.create_time_end, '%Y-%m-%d'), time(23, 59, 59)))
- if page_object.create_time_start and page_object.create_time_end else True
- ) \
- .order_by(SysRole.role_sort) \
- .offset(page_info.offset) \
- .limit(page_object.page_size) \
- .distinct().all()
-
- result = dict(
- rows=list_format_datetime(role_list),
- page_num=page_info.page_num,
- page_size=page_info.page_size,
- total=page_info.total,
- has_next=page_info.has_next
- )
-
- return RolePageObjectResponse(**result)
-
-
-def add_role_crud(db: Session, role: RoleModel):
- """
- 新增角色数据库操作
- :param db: orm对象
- :param role: 角色对象
- :return: 新增校验结果
- """
- db_role = SysRole(**role.dict())
- db.add(db_role)
- db.commit() # 提交保存到数据库中
- db.refresh(db_role) # 刷新
- result = dict(is_success=True, message='新增成功')
-
- return CrudRoleResponse(**result)
-
-
-def edit_role_crud(db: Session, role: dict):
- """
- 编辑角色数据库操作
- :param db: orm对象
- :param role: 需要更新的角色字典
- :return: 编辑校验结果
- """
- is_role_id = db.query(SysRole).filter(SysRole.role_id == role.get('role_id')).all()
- if not is_role_id:
- result = dict(is_success=False, message='角色不存在')
- else:
+class RoleDao:
+ """
+ 角色管理模块数据库操作层
+ """
+
+ @classmethod
+ def get_role_by_name(cls, db: Session, role_name: str):
+ """
+ 根据角色名获取在用角色信息
+ :param db: orm对象
+ :param role_name: 角色名
+ :return: 当前角色名的角色信息对象
+ """
+ query_role_info = db.query(SysRole) \
+ .filter(SysRole.status == 0, SysRole.del_flag == 0, SysRole.role_name == role_name) \
+ .order_by(desc(SysRole.create_time)).distinct().first()
+
+ return query_role_info
+
+ @classmethod
+ def get_role_by_info(cls, db: Session, role: RoleModel):
+ """
+ 根据角色参数获取角色信息
+ :param db: orm对象
+ :param role: 角色参数
+ :return: 当前角色参数的角色信息对象
+ """
+ query_role_info = db.query(SysRole) \
+ .filter(SysRole.del_flag == 0,
+ SysRole.role_name == role.role_name if role.role_name else True,
+ SysRole.role_key == role.role_key if role.role_key else True) \
+ .order_by(desc(SysRole.create_time)).distinct().first()
+
+ return query_role_info
+
+ @classmethod
+ def get_role_by_id(cls, db: Session, role_id: int):
+ """
+ 根据角色id获取在用角色信息
+ :param db: orm对象
+ :param role_id: 角色id
+ :return: 当前角色id的角色信息对象
+ """
+ role_info = db.query(SysRole) \
+ .filter(SysRole.role_id == role_id,
+ SysRole.status == 0,
+ SysRole.del_flag == 0) \
+ .first()
+
+ return role_info
+
+ @classmethod
+ def get_role_detail_by_id(cls, db: Session, role_id: int):
+ """
+ 根据role_id获取角色详细信息
+ :param db: orm对象
+ :param role_id: 角色id
+ :return: 当前role_id的角色信息对象
+ """
+ query_role_basic_info = db.query(SysRole) \
+ .filter(SysRole.del_flag == 0, SysRole.role_id == role_id) \
+ .distinct().first()
+ query_role_menu_info = db.query(SysMenu).select_from(SysRole) \
+ .filter(SysRole.del_flag == 0, SysRole.role_id == role_id) \
+ .outerjoin(SysRoleMenu, SysRole.role_id == SysRoleMenu.role_id) \
+ .outerjoin(SysMenu, and_(SysRoleMenu.menu_id == SysMenu.menu_id, SysMenu.status == 0)) \
+ .distinct().all()
+ results = dict(
+ role=object_format_datetime(query_role_basic_info),
+ menu=list_format_datetime(query_role_menu_info),
+ )
+
+ return RoleDetailModel(**results)
+
+ @classmethod
+ def get_role_select_option_dao(cls, db: Session):
+ """
+ 获取编辑页面对应的在用角色列表信息
+ :param db: orm对象
+ :return: 角色列表信息
+ """
+ role_info = db.query(SysRole) \
+ .filter(SysRole.role_id != 1, SysRole.status == 0, SysRole.del_flag == 0) \
+ .all()
+
+ return role_info
+
+ @classmethod
+ def get_role_list(cls, db: Session, query_object: RoleQueryModel):
+ """
+ 根据查询参数获取角色列表信息
+ :param db: orm对象
+ :param query_object: 查询参数对象
+ :return: 角色列表信息对象
+ """
+ role_list = db.query(SysRole) \
+ .filter(SysRole.del_flag == 0,
+ SysRole.role_name.like(f'%{query_object.role_name}%') if query_object.role_name else True,
+ SysRole.role_key.like(f'%{query_object.role_key}%') if query_object.role_key else True,
+ SysRole.status == query_object.status if query_object.status else True,
+ SysRole.create_time.between(
+ datetime.combine(datetime.strptime(query_object.create_time_start, '%Y-%m-%d'), time(00, 00, 00)),
+ datetime.combine(datetime.strptime(query_object.create_time_end, '%Y-%m-%d'), time(23, 59, 59)))
+ if query_object.create_time_start and query_object.create_time_end else True
+ ) \
+ .order_by(SysRole.role_sort) \
+ .distinct().all()
+
+ return list_format_datetime(role_list)
+
+ @classmethod
+ def add_role_dao(cls, db: Session, role: RoleModel):
+ """
+ 新增角色数据库操作
+ :param db: orm对象
+ :param role: 角色对象
+ :return:
+ """
+ db_role = SysRole(**role.dict())
+ db.add(db_role)
+ db.flush()
+
+ return db_role
+
+ @classmethod
+ def edit_role_dao(cls, db: Session, role: dict):
+ """
+ 编辑角色数据库操作
+ :param db: orm对象
+ :param role: 需要更新的角色字典
+ :return:
+ """
db.query(SysRole) \
.filter(SysRole.role_id == role.get('role_id')) \
.update(role)
- db.commit() # 提交保存到数据库中
- result = dict(is_success=True, message='更新成功')
-
- return CrudRoleResponse(**result)
-
-def delete_role_crud(db: Session, role: RoleModel):
- """
- 删除角色数据库操作
- :param db: orm对象
- :param user: 角色对象
- :return:
- """
- db.query(SysRole) \
- .filter(SysRole.role_id == role.role_id) \
- .update({SysRole.del_flag: '2', SysRole.update_by: role.update_by, SysRole.update_time: role.update_time})
- db.commit() # 提交保存到数据库中
-
-
-def add_role_menu_crud(db: Session, role_menu: RoleMenuModel):
- """
- 新增角色菜单关联信息数据库操作
- :param db: orm对象
- :param role_menu: 用户角色菜单关联对象
- :return:
- """
- db_role_menu = SysRoleMenu(**role_menu.dict())
- db.add(db_role_menu)
- db.commit() # 提交保存到数据库中
- db.refresh(db_role_menu) # 刷新
-
-
-def delete_role_menu_crud(db: Session, role_menu: RoleMenuModel):
- """
- 删除角色菜单关联信息数据库操作
- :param db: orm对象
- :param role_menu: 角色菜单关联对象
- :return:
- """
- db.query(SysRoleMenu) \
- .filter(SysRoleMenu.role_id == role_menu.role_id) \
- .delete()
- db.commit() # 提交保存到数据库中
+ @classmethod
+ def delete_role_dao(cls, db: Session, role: RoleModel):
+ """
+ 删除角色数据库操作
+ :param db: orm对象
+ :param role: 角色对象
+ :return:
+ """
+ db.query(SysRole) \
+ .filter(SysRole.role_id == role.role_id) \
+ .update({SysRole.del_flag: '2', SysRole.update_by: role.update_by, SysRole.update_time: role.update_time})
+
+ @classmethod
+ def add_role_menu_dao(cls, db: Session, role_menu: RoleMenuModel):
+ """
+ 新增角色菜单关联信息数据库操作
+ :param db: orm对象
+ :param role_menu: 用户角色菜单关联对象
+ :return:
+ """
+ db_role_menu = SysRoleMenu(**role_menu.dict())
+ db.add(db_role_menu)
+
+ @classmethod
+ def delete_role_menu_dao(cls, db: Session, role_menu: RoleMenuModel):
+ """
+ 删除角色菜单关联信息数据库操作
+ :param db: orm对象
+ :param role_menu: 角色菜单关联对象
+ :return:
+ """
+ db.query(SysRoleMenu) \
+ .filter(SysRoleMenu.role_id == role_menu.role_id) \
+ .delete()
diff --git a/dash-fastapi-backend/module_admin/dao/user_dao.py b/dash-fastapi-backend/module_admin/dao/user_dao.py
index 81da5384a01e22cdfca80c0ab0ec6db33b48a2ec..818823fb61304cb910fe877fcbdd3a4f92a8e1d3 100644
--- a/dash-fastapi-backend/module_admin/dao/user_dao.py
+++ b/dash-fastapi-backend/module_admin/dao/user_dao.py
@@ -1,308 +1,287 @@
-from sqlalchemy import and_, desc
+from sqlalchemy import and_, or_, desc, func
from sqlalchemy.orm import Session
-from module_admin.entity.do.user_entity import SysUser, SysUserRole, SysUserPost
-from module_admin.entity.do.role_entity import SysRole, SysRoleMenu
-from module_admin.entity.do.dept_entity import SysDept
-from module_admin.entity.do.post_entity import SysPost
-from module_admin.entity.do.menu_entity import SysMenu
-from module_admin.entity.vo.user_schema import UserModel, UserRoleModel, UserPostModel, CurrentUserInfo, UserPageObject, \
- UserPageObjectResponse, CrudUserResponse
-from module_admin.utils.time_format_tool import list_format_datetime, format_datetime_dict_list
-from module_admin.utils.page_tool import get_page_info
+from module_admin.entity.do.user_do import SysUser, SysUserRole, SysUserPost
+from module_admin.entity.do.role_do import SysRole, SysRoleMenu
+from module_admin.entity.do.dept_do import SysDept
+from module_admin.entity.do.post_do import SysPost
+from module_admin.entity.do.menu_do import SysMenu
+from module_admin.entity.vo.user_vo import UserModel, UserRoleModel, UserPostModel, CurrentUserInfo, UserQueryModel
+from utils.time_format_util import list_format_datetime, format_datetime_dict_list
from datetime import datetime, time
+from typing import Union, List
-def get_user_by_name(db: Session, user_name: str):
+class UserDao:
"""
- 根据用户名获取用户信息
- :param db: orm对象
- :param user_name: 用户名
- :return: 当前用户名的用户信息对象
+ 用户管理模块数据库操作层
"""
- query_user_info = db.query(SysUser) \
- .filter(SysUser.status == 0, SysUser.del_flag == 0, SysUser.user_name == user_name) \
- .order_by(desc(SysUser.create_time)).distinct().first()
- return query_user_info
-
-
-def get_user_by_id(db: Session, user_id: int):
- """
- 根据user_id获取用户信息
- :param db: orm对象
- :param user_id: 用户id
- :return: 当前user_id的用户信息对象
- """
- query_user_basic_info = db.query(SysUser) \
- .filter(SysUser.status == 0, SysUser.del_flag == 0, SysUser.user_id == user_id) \
- .distinct().all()
- query_user_dept_info = db.query(SysDept).select_from(SysUser) \
- .filter(SysUser.status == 0, SysUser.del_flag == 0, SysUser.user_id == user_id) \
- .outerjoin(SysDept, and_(SysUser.dept_id == SysDept.dept_id, SysDept.status == 0, SysDept.del_flag == 0)) \
- .distinct().all()
- query_user_role_info = db.query(SysRole).select_from(SysUser) \
- .filter(SysUser.status == 0, SysUser.del_flag == 0, SysUser.user_id == user_id) \
- .outerjoin(SysUserRole, SysUser.user_id == SysUserRole.user_id) \
- .outerjoin(SysRole, and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == 0, SysRole.del_flag == 0)) \
- .distinct().all()
- query_user_post_info = db.query(SysPost).select_from(SysUser) \
- .filter(SysUser.status == 0, SysUser.del_flag == 0, SysUser.user_id == user_id) \
- .outerjoin(SysUserPost, SysUser.user_id == SysUserPost.user_id) \
- .outerjoin(SysPost, and_(SysUserPost.post_id == SysPost.post_id, SysPost.status == 0)) \
- .distinct().all()
- query_user_menu_info = db.query(SysMenu).select_from(SysUser) \
- .filter(SysUser.status == 0, SysUser.del_flag == 0, SysUser.user_id == user_id) \
- .outerjoin(SysUserRole, SysUser.user_id == SysUserRole.user_id) \
- .outerjoin(SysRole, and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == 0, SysRole.del_flag == 0)) \
- .outerjoin(SysRoleMenu, SysRole.role_id == SysRoleMenu.role_id) \
- .outerjoin(SysMenu, and_(SysRoleMenu.menu_id == SysMenu.menu_id, SysMenu.status == 0)) \
- .distinct().all()
- results = dict(
- user_basic_info=list_format_datetime(query_user_basic_info),
- user_dept_info=list_format_datetime(query_user_dept_info),
- user_role_info=list_format_datetime(query_user_role_info),
- user_post_info=list_format_datetime(query_user_post_info),
- user_menu_info=list_format_datetime(query_user_menu_info)
- )
-
- return CurrentUserInfo(**results)
-
-
-def get_user_detail_by_id(db: Session, user_id: int):
- """
- 根据user_id获取用户详细信息
- :param db: orm对象
- :param user_id: 用户id
- :return: 当前user_id的用户信息对象
- """
- query_user_basic_info = db.query(SysUser) \
- .filter(SysUser.del_flag == 0, SysUser.user_id == user_id) \
- .distinct().all()
- query_user_dept_info = db.query(SysDept).select_from(SysUser) \
- .filter(SysUser.del_flag == 0, SysUser.user_id == user_id) \
- .outerjoin(SysDept, and_(SysUser.dept_id == SysDept.dept_id, SysDept.status == 0, SysDept.del_flag == 0)) \
- .distinct().all()
- query_user_role_info = db.query(SysRole).select_from(SysUser) \
- .filter(SysUser.del_flag == 0, SysUser.user_id == user_id) \
- .outerjoin(SysUserRole, SysUser.user_id == SysUserRole.user_id) \
- .outerjoin(SysRole, and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == 0, SysRole.del_flag == 0)) \
- .distinct().all()
- query_user_post_info = db.query(SysPost).select_from(SysUser) \
- .filter(SysUser.del_flag == 0, SysUser.user_id == user_id) \
- .outerjoin(SysUserPost, SysUser.user_id == SysUserPost.user_id) \
- .outerjoin(SysPost, and_(SysUserPost.post_id == SysPost.post_id, SysPost.status == 0)) \
- .distinct().all()
- query_user_menu_info = db.query(SysMenu).select_from(SysUser) \
- .filter(SysUser.del_flag == 0, SysUser.user_id == user_id) \
- .outerjoin(SysUserRole, SysUser.user_id == SysUserRole.user_id) \
- .outerjoin(SysRole, and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == 0, SysRole.del_flag == 0)) \
- .outerjoin(SysRoleMenu, SysRole.role_id == SysRoleMenu.role_id) \
- .outerjoin(SysMenu, and_(SysRoleMenu.menu_id == SysMenu.menu_id, SysMenu.status == 0)) \
- .distinct().all()
- results = dict(
- user_basic_info=list_format_datetime(query_user_basic_info),
- user_dept_info=list_format_datetime(query_user_dept_info),
- user_role_info=list_format_datetime(query_user_role_info),
- user_post_info=list_format_datetime(query_user_post_info),
- user_menu_info=list_format_datetime(query_user_menu_info)
- )
-
- return CurrentUserInfo(**results)
-
-
-def get_user_list(db: Session, page_object: UserPageObject):
- """
- 根据查询参数获取用户列表信息
- :param db: orm对象
- :param page_object: 分页查询参数对象
- :return: 用户列表信息对象
- """
- count = db.query(SysUser, SysDept) \
- .filter(SysUser.del_flag == 0,
- SysUser.dept_id == page_object.dept_id if page_object.dept_id else True,
- SysUser.user_name.like(f'%{page_object.user_name}%') if page_object.user_name else True,
- SysUser.nick_name.like(f'%{page_object.nick_name}%') if page_object.nick_name else True,
- SysUser.email.like(f'%{page_object.email}%') if page_object.email else True,
- SysUser.phonenumber.like(f'%{page_object.phonenumber}%') if page_object.phonenumber else True,
- SysUser.status == page_object.status if page_object.status else True,
- SysUser.sex == page_object.sex if page_object.sex else True,
- SysUser.create_time.between(
- datetime.combine(datetime.strptime(page_object.create_time_start, '%Y-%m-%d'), time(00, 00, 00)),
- datetime.combine(datetime.strptime(page_object.create_time_end, '%Y-%m-%d'), time(23, 59, 59)))
- if page_object.create_time_start and page_object.create_time_end else True
- ) \
- .outerjoin(SysDept, and_(SysUser.dept_id == SysDept.dept_id, SysDept.status == 0, SysDept.del_flag == 0)) \
- .distinct().count()
- offset_com = (page_object.page_num - 1) * page_object.page_size
- page_info = get_page_info(offset_com, page_object.page_num, page_object.page_size, count)
- user_list = db.query(SysUser, SysDept) \
- .filter(SysUser.del_flag == 0,
- SysUser.dept_id == page_object.dept_id if page_object.dept_id else True,
- SysUser.user_name.like(f'%{page_object.user_name}%') if page_object.user_name else True,
- SysUser.nick_name.like(f'%{page_object.nick_name}%') if page_object.nick_name else True,
- SysUser.email.like(f'%{page_object.email}%') if page_object.email else True,
- SysUser.phonenumber.like(f'%{page_object.phonenumber}%') if page_object.phonenumber else True,
- SysUser.status == page_object.status if page_object.status else True,
- SysUser.sex == page_object.sex if page_object.sex else True,
- SysUser.create_time.between(
- datetime.combine(datetime.strptime(page_object.create_time_start, '%Y-%m-%d'), time(00, 00, 00)),
- datetime.combine(datetime.strptime(page_object.create_time_end, '%Y-%m-%d'), time(23, 59, 59)))
- if page_object.create_time_start and page_object.create_time_end else True
- ) \
- .outerjoin(SysDept, and_(SysUser.dept_id == SysDept.dept_id, SysDept.status == 0, SysDept.del_flag == 0)) \
- .offset(page_info.offset) \
- .limit(page_object.page_size) \
- .distinct().all()
-
- result_list = []
- if user_list:
- for item in user_list:
- obj = dict(
- user_id=item[0].user_id,
- dept_id=item[0].dept_id,
- dept_name=item[1].dept_name if item[1] else '',
- user_name=item[0].user_name,
- nick_name=item[0].nick_name,
- user_type=item[0].user_type,
- email=item[0].email,
- phonenumber=item[0].phonenumber,
- sex=item[0].sex,
- avatar=item[0].avatar,
- status=item[0].status,
- del_flag=item[0].del_flag,
- login_ip=item[0].login_ip,
- login_date=item[0].login_date,
- create_by=item[0].create_by,
- create_time=item[0].create_time,
- update_by=item[0].update_by,
- update_time=item[0].update_time,
- remark=item[0].remark
- )
- result_list.append(obj)
-
- result = dict(
- rows=format_datetime_dict_list(result_list),
- page_num=page_info.page_num,
- page_size=page_info.page_size,
- total=page_info.total,
- has_next=page_info.has_next
- )
-
- return UserPageObjectResponse(**result)
-
-
-def add_user_crud(db: Session, user: UserModel):
- """
- 新增用户数据库操作
- :param db: orm对象
- :param user: 用户对象
- :return: 新增校验结果
- """
- is_user = db.query(SysUser).filter(SysUser.user_name == user.user_name, SysUser.del_flag == 0).all()
- if is_user:
- result = dict(is_success=False, message='用户名已存在')
- else:
+ @classmethod
+ def get_user_by_name(cls, db: Session, user_name: str):
+ """
+ 根据用户名获取用户信息
+ :param db: orm对象
+ :param user_name: 用户名
+ :return: 当前用户名的用户信息对象
+ """
+ query_user_info = db.query(SysUser) \
+ .filter(SysUser.status == 0, SysUser.del_flag == 0, SysUser.user_name == user_name) \
+ .order_by(desc(SysUser.create_time)).distinct().first()
+
+ return query_user_info
+
+ @classmethod
+ def get_user_by_info(cls, db: Session, user: UserModel):
+ """
+ 根据用户参数获取用户信息
+ :param db: orm对象
+ :param user: 用户参数
+ :return: 当前用户参数的用户信息对象
+ """
+ query_user_info = db.query(SysUser) \
+ .filter(SysUser.del_flag == 0,
+ SysUser.user_name == user.user_name) \
+ .order_by(desc(SysUser.create_time)).distinct().first()
+
+ return query_user_info
+
+ @classmethod
+ def get_user_by_id(cls, db: Session, user_id: int):
+ """
+ 根据user_id获取用户信息
+ :param db: orm对象
+ :param user_id: 用户id
+ :return: 当前user_id的用户信息对象
+ """
+ query_user_basic_info = db.query(SysUser) \
+ .filter(SysUser.status == 0, SysUser.del_flag == 0, SysUser.user_id == user_id) \
+ .distinct().all()
+ query_user_dept_info = db.query(SysDept).select_from(SysUser) \
+ .filter(SysUser.status == 0, SysUser.del_flag == 0, SysUser.user_id == user_id) \
+ .outerjoin(SysDept, and_(SysUser.dept_id == SysDept.dept_id, SysDept.status == 0, SysDept.del_flag == 0)) \
+ .distinct().all()
+ query_user_role_info = db.query(SysRole).select_from(SysUser) \
+ .filter(SysUser.status == 0, SysUser.del_flag == 0, SysUser.user_id == user_id) \
+ .outerjoin(SysUserRole, SysUser.user_id == SysUserRole.user_id) \
+ .outerjoin(SysRole, and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == 0, SysRole.del_flag == 0)) \
+ .distinct().all()
+ query_user_post_info = db.query(SysPost).select_from(SysUser) \
+ .filter(SysUser.status == 0, SysUser.del_flag == 0, SysUser.user_id == user_id) \
+ .outerjoin(SysUserPost, SysUser.user_id == SysUserPost.user_id) \
+ .outerjoin(SysPost, and_(SysUserPost.post_id == SysPost.post_id, SysPost.status == 0)) \
+ .distinct().all()
+ query_user_menu_info = []
+ for item in query_user_role_info:
+ if item.role_id == 1:
+ query_user_menu_info = db.query(SysMenu) \
+ .filter(SysMenu.status == 0) \
+ .distinct().all()
+ break
+ else:
+ query_user_menu_info = db.query(SysMenu).select_from(SysUser) \
+ .filter(SysUser.status == 0, SysUser.del_flag == 0, SysUser.user_id == user_id) \
+ .outerjoin(SysUserRole, SysUser.user_id == SysUserRole.user_id) \
+ .outerjoin(SysRole, and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == 0, SysRole.del_flag == 0)) \
+ .outerjoin(SysRoleMenu, SysRole.role_id == SysRoleMenu.role_id) \
+ .outerjoin(SysMenu, and_(SysRoleMenu.menu_id == SysMenu.menu_id, SysMenu.status == 0)) \
+ .order_by(SysMenu.order_num) \
+ .distinct().all()
+ results = dict(
+ user_basic_info=list_format_datetime(query_user_basic_info),
+ user_dept_info=list_format_datetime(query_user_dept_info),
+ user_role_info=list_format_datetime(query_user_role_info),
+ user_post_info=list_format_datetime(query_user_post_info),
+ user_menu_info=list_format_datetime(query_user_menu_info)
+ )
+
+ return CurrentUserInfo(**results)
+
+ @classmethod
+ def get_user_detail_by_id(cls, db: Session, user_id: int):
+ """
+ 根据user_id获取用户详细信息
+ :param db: orm对象
+ :param user_id: 用户id
+ :return: 当前user_id的用户信息对象
+ """
+ query_user_basic_info = db.query(SysUser) \
+ .filter(SysUser.del_flag == 0, SysUser.user_id == user_id) \
+ .distinct().all()
+ query_user_dept_info = db.query(SysDept).select_from(SysUser) \
+ .filter(SysUser.del_flag == 0, SysUser.user_id == user_id) \
+ .outerjoin(SysDept, and_(SysUser.dept_id == SysDept.dept_id, SysDept.status == 0, SysDept.del_flag == 0)) \
+ .distinct().all()
+ query_user_role_info = db.query(SysRole).select_from(SysUser) \
+ .filter(SysUser.del_flag == 0, SysUser.user_id == user_id) \
+ .outerjoin(SysUserRole, SysUser.user_id == SysUserRole.user_id) \
+ .outerjoin(SysRole, and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == 0, SysRole.del_flag == 0)) \
+ .distinct().all()
+ query_user_post_info = db.query(SysPost).select_from(SysUser) \
+ .filter(SysUser.del_flag == 0, SysUser.user_id == user_id) \
+ .outerjoin(SysUserPost, SysUser.user_id == SysUserPost.user_id) \
+ .outerjoin(SysPost, and_(SysUserPost.post_id == SysPost.post_id, SysPost.status == 0)) \
+ .distinct().all()
+ query_user_menu_info = db.query(SysMenu).select_from(SysUser) \
+ .filter(SysUser.del_flag == 0, SysUser.user_id == user_id) \
+ .outerjoin(SysUserRole, SysUser.user_id == SysUserRole.user_id) \
+ .outerjoin(SysRole, and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == 0, SysRole.del_flag == 0)) \
+ .outerjoin(SysRoleMenu, SysRole.role_id == SysRoleMenu.role_id) \
+ .outerjoin(SysMenu, and_(SysRoleMenu.menu_id == SysMenu.menu_id, SysMenu.status == 0)) \
+ .distinct().all()
+ results = dict(
+ user_basic_info=list_format_datetime(query_user_basic_info),
+ user_dept_info=list_format_datetime(query_user_dept_info),
+ user_role_info=list_format_datetime(query_user_role_info),
+ user_post_info=list_format_datetime(query_user_post_info),
+ user_menu_info=list_format_datetime(query_user_menu_info)
+ )
+
+ return CurrentUserInfo(**results)
+
+ @classmethod
+ def get_user_list(cls, db: Session, query_object: UserQueryModel):
+ """
+ 根据查询参数获取用户列表信息
+ :param db: orm对象
+ :param query_object: 查询参数对象
+ :return: 用户列表信息对象
+ """
+ user_list = db.query(SysUser, SysDept) \
+ .filter(SysUser.del_flag == 0,
+ or_(SysUser.dept_id == query_object.dept_id, SysUser.dept_id.in_(
+ db.query(SysDept.dept_id).filter(func.find_in_set(query_object.dept_id, SysDept.ancestors))
+ )) if query_object.dept_id else True,
+ SysUser.user_name.like(f'%{query_object.user_name}%') if query_object.user_name else True,
+ SysUser.nick_name.like(f'%{query_object.nick_name}%') if query_object.nick_name else True,
+ SysUser.email.like(f'%{query_object.email}%') if query_object.email else True,
+ SysUser.phonenumber.like(f'%{query_object.phonenumber}%') if query_object.phonenumber else True,
+ SysUser.status == query_object.status if query_object.status else True,
+ SysUser.sex == query_object.sex if query_object.sex else True,
+ SysUser.create_time.between(
+ datetime.combine(datetime.strptime(query_object.create_time_start, '%Y-%m-%d'), time(00, 00, 00)),
+ datetime.combine(datetime.strptime(query_object.create_time_end, '%Y-%m-%d'), time(23, 59, 59)))
+ if query_object.create_time_start and query_object.create_time_end else True
+ ) \
+ .outerjoin(SysDept, and_(SysUser.dept_id == SysDept.dept_id, SysDept.status == 0, SysDept.del_flag == 0)) \
+ .distinct().all()
+
+ result_list: List[Union[dict, None]] = []
+ if user_list:
+ for item in user_list:
+ obj = dict(
+ user_id=item[0].user_id,
+ dept_id=item[0].dept_id,
+ dept_name=item[1].dept_name if item[1] else '',
+ user_name=item[0].user_name,
+ nick_name=item[0].nick_name,
+ user_type=item[0].user_type,
+ email=item[0].email,
+ phonenumber=item[0].phonenumber,
+ sex=item[0].sex,
+ avatar=item[0].avatar,
+ status=item[0].status,
+ del_flag=item[0].del_flag,
+ login_ip=item[0].login_ip,
+ login_date=item[0].login_date,
+ create_by=item[0].create_by,
+ create_time=item[0].create_time,
+ update_by=item[0].update_by,
+ update_time=item[0].update_time,
+ remark=item[0].remark
+ )
+ result_list.append(obj)
+
+ return format_datetime_dict_list(result_list)
+
+ @classmethod
+ def add_user_dao(cls, db: Session, user: UserModel):
+ """
+ 新增用户数据库操作
+ :param db: orm对象
+ :param user: 用户对象
+ :return: 新增校验结果
+ """
db_user = SysUser(**user.dict())
db.add(db_user)
- db.commit() # 提交保存到数据库中
- db.refresh(db_user) # 刷新
- result = dict(is_success=True, message='新增成功')
-
- return CrudUserResponse(**result)
-
-
-def edit_user_crud(db: Session, user: dict):
- """
- 编辑用户数据库操作
- :param db: orm对象
- :param user: 需要更新的用户字典
- :return: 编辑校验结果
- """
- is_user_id = db.query(SysUser).filter(SysUser.user_id == user.get('user_id'), SysUser.del_flag == 0).all()
- is_user_name = db.query(SysUser).filter(SysUser.user_name == user.get('user_name'), SysUser.del_flag == 0).all()
- if not is_user_id:
- result = dict(is_success=False, message='用户不存在')
- elif is_user_name:
- result = dict(is_success=False, message='用户名已存在，不允许修改')
- else:
+ db.flush()
+
+ return db_user
+
+ @classmethod
+ def edit_user_dao(cls, db: Session, user: dict):
+ """
+ 编辑用户数据库操作
+ :param db: orm对象
+ :param user: 需要更新的用户字典
+ :return: 编辑校验结果
+ """
db.query(SysUser) \
.filter(SysUser.user_id == user.get('user_id')) \
.update(user)
- db.commit() # 提交保存到数据库中
- result = dict(is_success=True, message='更新成功')
-
- return CrudUserResponse(**result)
-
-
-def delete_user_crud(db: Session, user: UserModel):
- """
- 删除用户数据库操作
- :param db: orm对象
- :param user: 用户对象
- :return:
- """
- db.query(SysUser) \
- .filter(SysUser.user_id == user.user_id) \
- .update({SysUser.del_flag: '2', SysUser.update_by: user.update_by, SysUser.update_time: user.update_time})
- db.commit() # 提交保存到数据库中
-
-
-def add_user_role_crud(db: Session, user_role: UserRoleModel):
- """
- 新增用户角色关联信息数据库操作
- :param db: orm对象
- :param user_role: 用户角色关联对象
- :return:
- """
- db_user_role = SysUserRole(**user_role.dict())
- db.add(db_user_role)
- db.commit() # 提交保存到数据库中
- db.refresh(db_user_role) # 刷新
-
-
-def delete_user_role_crud(db: Session, user_role: UserRoleModel):
- """
- 删除用户角色关联信息数据库操作
- :param db: orm对象
- :param user_role: 用户角色关联对象
- :return:
- """
- db.query(SysUserRole) \
- .filter(SysUserRole.user_id == user_role.user_id) \
- .delete()
- db.commit() # 提交保存到数据库中
-
-
-def add_user_post_crud(db: Session, user_post: UserPostModel):
- """
- 新增用户岗位关联信息数据库操作
- :param db: orm对象
- :param user_post: 用户岗位关联对象
- :return:
- """
- db_user_post = SysUserPost(**user_post.dict())
- db.add(db_user_post)
- db.commit() # 提交保存到数据库中
- db.refresh(db_user_post) # 刷新
-
-def delete_user_post_crud(db: Session, user_post: UserPostModel):
- """
- 删除用户岗位关联信息数据库操作
- :param db: orm对象
- :param user_post: 用户岗位关联对象
- :return:
- """
- db.query(SysUserPost) \
- .filter(SysUserPost.user_id == user_post.user_id) \
- .delete()
- db.commit() # 提交保存到数据库中
-
-
-def get_user_dept_info(db: Session, dept_id: int):
- dept_basic_info = db.query(SysDept) \
- .filter(SysDept.dept_id == dept_id,
- SysDept.status == 0,
- SysDept.del_flag == 0) \
- .first()
- return dept_basic_info
+ @classmethod
+ def delete_user_dao(cls, db: Session, user: UserModel):
+ """
+ 删除用户数据库操作
+ :param db: orm对象
+ :param user: 用户对象
+ :return:
+ """
+ db.query(SysUser) \
+ .filter(SysUser.user_id == user.user_id) \
+ .update({SysUser.del_flag: '2', SysUser.update_by: user.update_by, SysUser.update_time: user.update_time})
+
+ @classmethod
+ def add_user_role_dao(cls, db: Session, user_role: UserRoleModel):
+ """
+ 新增用户角色关联信息数据库操作
+ :param db: orm对象
+ :param user_role: 用户角色关联对象
+ :return:
+ """
+ db_user_role = SysUserRole(**user_role.dict())
+ db.add(db_user_role)
+
+ @classmethod
+ def delete_user_role_dao(cls, db: Session, user_role: UserRoleModel):
+ """
+ 删除用户角色关联信息数据库操作
+ :param db: orm对象
+ :param user_role: 用户角色关联对象
+ :return:
+ """
+ db.query(SysUserRole) \
+ .filter(SysUserRole.user_id == user_role.user_id) \
+ .delete()
+
+ @classmethod
+ def add_user_post_dao(cls, db: Session, user_post: UserPostModel):
+ """
+ 新增用户岗位关联信息数据库操作
+ :param db: orm对象
+ :param user_post: 用户岗位关联对象
+ :return:
+ """
+ db_user_post = SysUserPost(**user_post.dict())
+ db.add(db_user_post)
+
+ @classmethod
+ def delete_user_post_dao(cls, db: Session, user_post: UserPostModel):
+ """
+ 删除用户岗位关联信息数据库操作
+ :param db: orm对象
+ :param user_post: 用户岗位关联对象
+ :return:
+ """
+ db.query(SysUserPost) \
+ .filter(SysUserPost.user_id == user_post.user_id) \
+ .delete()
+
+ @classmethod
+ def get_user_dept_info(cls, db: Session, dept_id: int):
+ dept_basic_info = db.query(SysDept) \
+ .filter(SysDept.dept_id == dept_id,
+ SysDept.status == 0,
+ SysDept.del_flag == 0) \
+ .first()
+ return dept_basic_info
diff --git a/dash-fastapi-backend/module_admin/entity/do/config_do.py b/dash-fastapi-backend/module_admin/entity/do/config_do.py
new file mode 100644
index 0000000000000000000000000000000000000000..5fb6476005cd3f45aeed01c695e30fc8f5609fd6
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/entity/do/config_do.py
@@ -0,0 +1,21 @@
+from sqlalchemy import Column, Integer, String, DateTime
+from config.database import Base
+from datetime import datetime
+
+
+class SysConfig(Base):
+ """
+ 参数配置表
+ """
+ __tablename__ = 'sys_config'
+
+ config_id = Column(Integer, primary_key=True, autoincrement=True, comment='参数主键')
+ config_name = Column(String(100), nullable=True, default='', comment='参数名称')
+ config_key = Column(String(100), nullable=True, default='', comment='参数键名')
+ config_value = Column(String(500), nullable=True, default='', comment='参数键值')
+ config_type = Column(String(1), nullable=True, default='N', comment='系统内置（Y是 N否）')
+ create_by = Column(String(64), nullable=True, default='', comment='创建者')
+ create_time = Column(DateTime, nullable=True, default=datetime.now(), comment='创建时间')
+ update_by = Column(String(64), nullable=True, default='', comment='更新者')
+ update_time = Column(DateTime, nullable=True, default=datetime.now(), comment='更新时间')
+ remark = Column(String(500), nullable=True, default='', comment='备注')
\ No newline at end of file
diff --git a/dash-fastapi-backend/module_admin/entity/do/dept_do.py b/dash-fastapi-backend/module_admin/entity/do/dept_do.py
index 283c2fc2b7d63b00305d980abee39aee7404fa6e..05729270974100678e662fbb1d7689309677e0bc 100644
--- a/dash-fastapi-backend/module_admin/entity/do/dept_do.py
+++ b/dash-fastapi-backend/module_admin/entity/do/dept_do.py
@@ -1,5 +1,5 @@
from sqlalchemy import Column, Integer, String, DateTime
-from config.database import Base, engine
+from config.database import Base
from datetime import datetime
@@ -23,6 +23,3 @@ class SysDept(Base):
create_time = Column(DateTime, nullable=True, default=datetime.now(), comment='创建时间')
update_by = Column(String(64), nullable=True, default='', comment='更新者')
update_time = Column(DateTime, nullable=True, default=datetime.now(), comment='更新时间')
-
-
-Base.metadata.create_all(bind=engine)
\ No newline at end of file
diff --git a/dash-fastapi-backend/module_admin/entity/do/dict_do.py b/dash-fastapi-backend/module_admin/entity/do/dict_do.py
index 4e4d995f05f344d0c9eb8db16bfbd9b11cdacb21..a7d630efad527c3748133ba961f4bc9027805280 100644
--- a/dash-fastapi-backend/module_admin/entity/do/dict_do.py
+++ b/dash-fastapi-backend/module_admin/entity/do/dict_do.py
@@ -1,5 +1,5 @@
from sqlalchemy import Column, Integer, String, DateTime, UniqueConstraint
-from config.database import Base, engine
+from config.database import Base
from datetime import datetime
@@ -44,6 +44,3 @@ class SysDictData(Base):
update_by = Column(String(64), nullable=True, default='', comment='更新者')
update_time = Column(DateTime, nullable=True, default=datetime.now(), comment='更新时间')
remark = Column(String(500), nullable=True, default='', comment='备注')
-
-
-Base.metadata.create_all(bind=engine)
diff --git a/dash-fastapi-backend/module_admin/entity/do/job_do.py b/dash-fastapi-backend/module_admin/entity/do/job_do.py
new file mode 100644
index 0000000000000000000000000000000000000000..aef168faca0943a40797944c9c9b1c63e7fc8f11
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/entity/do/job_do.py
@@ -0,0 +1,47 @@
+from sqlalchemy import Column, Integer, String, DateTime
+from config.database import Base
+from datetime import datetime
+
+
+class SysJob(Base):
+ """
+ 定时任务调度表
+ """
+ __tablename__ = 'sys_job'
+
+ job_id = Column(Integer, primary_key=True, autoincrement=True, comment='任务ID')
+ job_name = Column(String(64, collation='utf8_general_ci'), nullable=False, comment='任务名称')
+ job_group = Column(String(64, collation='utf8_general_ci'), nullable=False, default='default', comment='任务组名')
+ job_executor = Column(String(64, collation='utf8_general_ci'), nullable=False, default='default', comment='任务执行器')
+ invoke_target = Column(String(500, collation='utf8_general_ci'), nullable=False, comment='调用目标字符串')
+ job_args = Column(String(255, collation='utf8_general_ci'), nullable=True, comment='位置参数')
+ job_kwargs = Column(String(255, collation='utf8_general_ci'), nullable=True, comment='关键字参数')
+ cron_expression = Column(String(255, collation='utf8_general_ci'), nullable=True, default='', comment='cron执行表达式')
+ misfire_policy = Column(String(20, collation='utf8_general_ci'), nullable=True, default='3', comment='计划执行错误策略（1立即执行 2执行一次 3放弃执行）')
+ concurrent = Column(String(1, collation='utf8_general_ci'), nullable=True, default='1', comment='是否并发执行（0允许 1禁止）')
+ status = Column(String(1, collation='utf8_general_ci'), nullable=True, default='0', comment='状态（0正常 1暂停）')
+ create_by = Column(String(64, collation='utf8_general_ci'), nullable=True, default='', comment='创建者')
+ create_time = Column(DateTime, nullable=True, default=datetime.now(), comment='创建时间')
+ update_by = Column(String(64, collation='utf8_general_ci'), nullable=True, default='', comment='更新者')
+ update_time = Column(DateTime, nullable=True, default=datetime.now(), comment='更新时间')
+ remark = Column(String(500, collation='utf8_general_ci'), nullable=True, default='', comment='备注信息')
+
+
+class SysJobLog(Base):
+ """
+ 定时任务调度日志表
+ """
+ __tablename__ = 'sys_job_log'
+
+ job_log_id = Column(Integer, primary_key=True, autoincrement=True, comment='任务日志ID')
+ job_name = Column(String(64, collation='utf8_general_ci'), nullable=False, comment='任务名称')
+ job_group = Column(String(64, collation='utf8_general_ci'), nullable=False, comment='任务组名')
+ job_executor = Column(String(64, collation='utf8_general_ci'), nullable=False, default='default', comment='任务执行器')
+ invoke_target = Column(String(500, collation='utf8_general_ci'), nullable=False, comment='调用目标字符串')
+ job_args = Column(String(255, collation='utf8_general_ci'), nullable=True, comment='位置参数')
+ job_kwargs = Column(String(255, collation='utf8_general_ci'), nullable=True, comment='关键字参数')
+ job_trigger = Column(String(255, collation='utf8_general_ci'), nullable=True, comment='任务触发器')
+ job_message = Column(String(500, collation='utf8_general_ci'), nullable=True, default='', comment='日志信息')
+ status = Column(String(1, collation='utf8_general_ci'), nullable=True, default='0', comment='执行状态（0正常 1失败）')
+ exception_info = Column(String(2000, collation='utf8_general_ci'), nullable=True, default='', comment='异常信息')
+ create_time = Column(DateTime, nullable=True, default=datetime.now(), comment='创建时间')
diff --git a/dash-fastapi-backend/module_admin/entity/do/log_do.py b/dash-fastapi-backend/module_admin/entity/do/log_do.py
index 090e408a8994f9175fb774729f5679c64b3dd6fe..19d2b187d8c579777fec80b996a29ab51ec3714a 100644
--- a/dash-fastapi-backend/module_admin/entity/do/log_do.py
+++ b/dash-fastapi-backend/module_admin/entity/do/log_do.py
@@ -1,5 +1,5 @@
from sqlalchemy import Column, Integer, String, DateTime, Text, BigInteger, Index
-from config.database import Base, engine
+from config.database import Base
from datetime import datetime
@@ -50,6 +50,3 @@ class SysOperLog(Base):
idx_sys_oper_log_bt = Index('idx_sys_oper_log_bt', business_type)
idx_sys_oper_log_s = Index('idx_sys_oper_log_s', status)
idx_sys_oper_log_ot = Index('idx_sys_oper_log_ot', oper_time)
-
-
-Base.metadata.create_all(bind=engine)
diff --git a/dash-fastapi-backend/module_admin/entity/do/menu_do.py b/dash-fastapi-backend/module_admin/entity/do/menu_do.py
index 74438b98a906adfd86fda4120b6377dea4efb6af..8f98be48e0b75542fe209893747cce903506503e 100644
--- a/dash-fastapi-backend/module_admin/entity/do/menu_do.py
+++ b/dash-fastapi-backend/module_admin/entity/do/menu_do.py
@@ -1,5 +1,5 @@
from sqlalchemy import Column, Integer, String, DateTime
-from config.database import Base, engine
+from config.database import Base
from datetime import datetime
@@ -28,6 +28,3 @@ class SysMenu(Base):
update_by = Column(String(64), nullable=True, default='', comment='更新者')
update_time = Column(DateTime, nullable=True, default=datetime.now(), comment='更新时间')
remark = Column(String(500), nullable=True, default='', comment='备注')
-
-
-Base.metadata.create_all(bind=engine)
diff --git a/dash-fastapi-backend/module_admin/entity/do/notice_do.py b/dash-fastapi-backend/module_admin/entity/do/notice_do.py
new file mode 100644
index 0000000000000000000000000000000000000000..38566584178aaa0a3105e497bc7159ea3935c839
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/entity/do/notice_do.py
@@ -0,0 +1,21 @@
+from sqlalchemy import Column, Integer, String, DateTime, LargeBinary
+from config.database import Base
+from datetime import datetime
+
+
+class SysNotice(Base):
+ """
+ 通知公告表
+ """
+ __tablename__ = 'sys_notice'
+
+ notice_id = Column(Integer, primary_key=True, autoincrement=True, comment='公告ID')
+ notice_title = Column(String(50, collation='utf8_general_ci'), nullable=False, comment='公告标题')
+ notice_type = Column(String(1, collation='utf8_general_ci'), nullable=False, comment='公告类型（1通知 2公告）')
+ notice_content = Column(LargeBinary, comment='公告内容')
+ status = Column(String(1, collation='utf8_general_ci'), default='0', comment='公告状态（0正常 1关闭）')
+ create_by = Column(String(64, collation='utf8_general_ci'), default='', comment='创建者')
+ create_time = Column(DateTime, comment='创建时间', default=datetime.now())
+ update_by = Column(String(64, collation='utf8_general_ci'), default='', comment='更新者')
+ update_time = Column(DateTime, comment='更新时间', default=datetime.now())
+ remark = Column(String(255, collation='utf8_general_ci'), comment='备注')
diff --git a/dash-fastapi-backend/module_admin/entity/do/post_do.py b/dash-fastapi-backend/module_admin/entity/do/post_do.py
index 78a491a8fa486190ec1039c8bad74c801eedcc72..c6b189b6cd9fe1d5adcf6a8e02e30979a85c3cb4 100644
--- a/dash-fastapi-backend/module_admin/entity/do/post_do.py
+++ b/dash-fastapi-backend/module_admin/entity/do/post_do.py
@@ -1,5 +1,5 @@
from sqlalchemy import Column, Integer, String, DateTime
-from config.database import Base, engine
+from config.database import Base
from datetime import datetime
@@ -19,6 +19,3 @@ class SysPost(Base):
update_by = Column(String(64), default='', comment='更新者')
update_time = Column(DateTime, nullable=True, default=datetime.now(), comment='更新时间')
remark = Column(String(500), nullable=True, default='', comment='备注')
-
-
-Base.metadata.create_all(bind=engine)
diff --git a/dash-fastapi-backend/module_admin/entity/do/role_do.py b/dash-fastapi-backend/module_admin/entity/do/role_do.py
index 68a13dace51aa443008051b482f76556a41ef4cd..db29244e11f24e330683b8e10d992b9c4318593c 100644
--- a/dash-fastapi-backend/module_admin/entity/do/role_do.py
+++ b/dash-fastapi-backend/module_admin/entity/do/role_do.py
@@ -1,5 +1,5 @@
from sqlalchemy import Column, Integer, String, DateTime
-from config.database import Base, engine
+from config.database import Base
from datetime import datetime
@@ -43,6 +43,3 @@ class SysRoleMenu(Base):
role_id = Column(Integer, primary_key=True, nullable=False, comment='角色ID')
menu_id = Column(Integer, primary_key=True, nullable=False, comment='菜单ID')
-
-
-Base.metadata.create_all(bind=engine)
diff --git a/dash-fastapi-backend/module_admin/entity/do/user_do.py b/dash-fastapi-backend/module_admin/entity/do/user_do.py
index d11ef9d181d3ce61bced8758409c427565714621..93515472f905e58d79b28ccc3f0aa9ffa24779ed 100644
--- a/dash-fastapi-backend/module_admin/entity/do/user_do.py
+++ b/dash-fastapi-backend/module_admin/entity/do/user_do.py
@@ -1,5 +1,5 @@
from sqlalchemy import Column, Integer, String, DateTime
-from config.database import Base, engine
+from config.database import Base
from datetime import datetime
@@ -48,6 +48,3 @@ class SysUserPost(Base):
user_id = Column(Integer, primary_key=True, nullable=False, comment='用户ID')
post_id = Column(Integer, primary_key=True, nullable=False, comment='岗位ID')
-
-
-Base.metadata.create_all(bind=engine)
diff --git a/dash-fastapi-backend/module_admin/entity/vo/cache_vo.py b/dash-fastapi-backend/module_admin/entity/vo/cache_vo.py
new file mode 100644
index 0000000000000000000000000000000000000000..1b2b4a1a7c21c7859f195b11beb36740d61f9952
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/entity/vo/cache_vo.py
@@ -0,0 +1,11 @@
+from pydantic import BaseModel
+from typing import Optional, List
+
+
+class CacheMonitorModel(BaseModel):
+ """
+ 缓存监控信息对应pydantic模型
+ """
+ command_stats: Optional[List]
+ db_size: Optional[int]
+ info: Optional[dict]
diff --git a/dash-fastapi-backend/module_admin/entity/vo/config_vo.py b/dash-fastapi-backend/module_admin/entity/vo/config_vo.py
new file mode 100644
index 0000000000000000000000000000000000000000..6ad9c95bec38e8aa4c6c8c226679a21cc04cf448
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/entity/vo/config_vo.py
@@ -0,0 +1,63 @@
+from pydantic import BaseModel
+from typing import Union, Optional, List
+
+
+class ConfigModel(BaseModel):
+ """
+ 参数配置表对应pydantic模型
+ """
+ config_id: Optional[int]
+ config_name: Optional[str]
+ config_key: Optional[str]
+ config_value: Optional[str]
+ config_type: Optional[str]
+ create_by: Optional[str]
+ create_time: Optional[str]
+ update_by: Optional[str]
+ update_time: Optional[str]
+ remark: Optional[str]
+
+ class Config:
+ orm_mode = True
+
+
+class ConfigQueryModel(ConfigModel):
+ """
+ 参数配置管理不分页查询模型
+ """
+ create_time_start: Optional[str]
+ create_time_end: Optional[str]
+
+
+class ConfigPageObject(ConfigQueryModel):
+ """
+ 参数配置管理分页查询模型
+ """
+ page_num: int
+ page_size: int
+
+
+class ConfigPageObjectResponse(BaseModel):
+ """
+ 参数配置管理列表分页查询返回模型
+ """
+ rows: List[Union[ConfigModel, None]] = []
+ page_num: int
+ page_size: int
+ total: int
+ has_next: bool
+
+
+class DeleteConfigModel(BaseModel):
+ """
+ 删除参数配置模型
+ """
+ config_ids: str
+
+
+class CrudConfigResponse(BaseModel):
+ """
+ 操作参数配置响应模型
+ """
+ is_success: bool
+ message: str
diff --git a/dash-fastapi-backend/module_admin/entity/vo/dept_vo.py b/dash-fastapi-backend/module_admin/entity/vo/dept_vo.py
index 2a72eb0eaca2cfe383c9b8488c5dd9d952ae57f5..a2cf22879287f8c1ab65c2ed4fec3516c5fc4c81 100644
--- a/dash-fastapi-backend/module_admin/entity/vo/dept_vo.py
+++ b/dash-fastapi-backend/module_admin/entity/vo/dept_vo.py
@@ -1,6 +1,6 @@
from pydantic import BaseModel
from typing import Union, Optional, List
-from module_admin.entity.vo.user_schema import DeptModel
+from module_admin.entity.vo.user_vo import DeptModel
class DeptPageObject(DeptModel):
diff --git a/dash-fastapi-backend/module_admin/entity/vo/dict_vo.py b/dash-fastapi-backend/module_admin/entity/vo/dict_vo.py
new file mode 100644
index 0000000000000000000000000000000000000000..6de3d7431dae20c886afa0fad9b08ab916af17cf
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/entity/vo/dict_vo.py
@@ -0,0 +1,111 @@
+from pydantic import BaseModel
+from typing import Union, Optional, List
+
+
+class DictTypeModel(BaseModel):
+ """
+ 字典类型表对应pydantic模型
+ """
+ dict_id: Optional[int]
+ dict_name: Optional[str]
+ dict_type: Optional[str]
+ status: Optional[str]
+ create_by: Optional[str]
+ create_time: Optional[str]
+ update_by: Optional[str]
+ update_time: Optional[str]
+ remark: Optional[str]
+
+ class Config:
+ orm_mode = True
+
+
+class DictDataModel(BaseModel):
+ """
+ 字典数据表对应pydantic模型
+ """
+ dict_code: Optional[int]
+ dict_sort: Optional[int]
+ dict_label: Optional[str]
+ dict_value: Optional[str]
+ dict_type: Optional[str]
+ css_class: Optional[str]
+ list_class: Optional[str]
+ is_default: Optional[str]
+ status: Optional[str]
+ create_by: Optional[str]
+ create_time: Optional[str]
+ update_by: Optional[str]
+ update_time: Optional[str]
+ remark: Optional[str]
+
+ class Config:
+ orm_mode = True
+
+
+class DictTypeQueryModel(DictTypeModel):
+ """
+ 字典类型管理不分页查询模型
+ """
+ create_time_start: Optional[str]
+ create_time_end: Optional[str]
+
+
+class DictTypePageObject(DictTypeQueryModel):
+ """
+ 字典类型管理分页查询模型
+ """
+ page_num: int
+ page_size: int
+
+
+class DictTypePageObjectResponse(BaseModel):
+ """
+ 字典类型管理列表分页查询返回模型
+ """
+ rows: List[Union[DictTypeModel, None]] = []
+ page_num: int
+ page_size: int
+ total: int
+ has_next: bool
+
+
+class DeleteDictTypeModel(BaseModel):
+ """
+ 删除字典类型模型
+ """
+ dict_ids: str
+
+
+class DictDataPageObject(DictDataModel):
+ """
+ 字典数据管理分页查询模型
+ """
+ page_num: int
+ page_size: int
+
+
+class DictDataPageObjectResponse(BaseModel):
+ """
+ 字典数据管理列表分页查询返回模型
+ """
+ rows: List[Union[DictDataModel, None]] = []
+ page_num: int
+ page_size: int
+ total: int
+ has_next: bool
+
+
+class DeleteDictDataModel(BaseModel):
+ """
+ 删除字典数据模型
+ """
+ dict_codes: str
+
+
+class CrudDictResponse(BaseModel):
+ """
+ 操作字典响应模型
+ """
+ is_success: bool
+ message: str
diff --git a/dash-fastapi-backend/module_admin/entity/vo/job_vo.py b/dash-fastapi-backend/module_admin/entity/vo/job_vo.py
new file mode 100644
index 0000000000000000000000000000000000000000..0283b1fe0cd3f8cfbd2dd36fdf86216729d4f0ed
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/entity/vo/job_vo.py
@@ -0,0 +1,130 @@
+from pydantic import BaseModel
+from typing import Union, Optional, List
+
+
+class JobModel(BaseModel):
+ """
+ 定时任务调度表对应pydantic模型
+ """
+ job_id: Optional[int]
+ job_name: Optional[str]
+ job_group: Optional[str]
+ job_executor: Optional[str]
+ invoke_target: Optional[str]
+ job_args: Optional[str]
+ job_kwargs: Optional[str]
+ cron_expression: Optional[str]
+ misfire_policy: Optional[str]
+ concurrent: Optional[str]
+ status: Optional[str]
+ create_by: Optional[str]
+ create_time: Optional[str]
+ update_by: Optional[str]
+ update_time: Optional[str]
+ remark: Optional[str]
+
+ class Config:
+ orm_mode = True
+
+
+class JobLogModel(BaseModel):
+ """
+ 定时任务调度日志表对应pydantic模型
+ """
+ job_log_id: Optional[int]
+ job_name: Optional[str]
+ job_group: Optional[str]
+ job_executor: Optional[str]
+ invoke_target: Optional[str]
+ job_args: Optional[str]
+ job_kwargs: Optional[str]
+ job_trigger: Optional[str]
+ job_message: Optional[str]
+ status: Optional[str]
+ exception_info: Optional[str]
+ create_time: Optional[str]
+
+ class Config:
+ orm_mode = True
+
+
+class JobPageObject(JobModel):
+ """
+ 定时任务管理分页查询模型
+ """
+ page_num: int
+ page_size: int
+
+
+class JobPageObjectResponse(BaseModel):
+ """
+ 定时任务管理列表分页查询返回模型
+ """
+ rows: List[Union[JobModel, None]] = []
+ page_num: int
+ page_size: int
+ total: int
+ has_next: bool
+
+
+class CrudJobResponse(BaseModel):
+ """
+ 操作定时任务及日志响应模型
+ """
+ is_success: bool
+ message: str
+
+
+class EditJobModel(JobModel):
+ """
+ 编辑定时任务模型
+ """
+ type: Optional[str]
+
+
+class DeleteJobModel(BaseModel):
+ """
+ 删除定时任务模型
+ """
+ job_ids: str
+
+
+class JobLogQueryModel(JobLogModel):
+ """
+ 定时任务日志不分页查询模型
+ """
+ create_time_start: Optional[str]
+ create_time_end: Optional[str]
+
+
+class JobLogPageObject(JobLogQueryModel):
+ """
+ 定时任务日志管理分页查询模型
+ """
+ page_num: int
+ page_size: int
+
+
+class JobLogPageObjectResponse(BaseModel):
+ """
+ 定时任务日志管理列表分页查询返回模型
+ """
+ rows: List[Union[JobLogModel, None]] = []
+ page_num: int
+ page_size: int
+ total: int
+ has_next: bool
+
+
+class DeleteJobLogModel(BaseModel):
+ """
+ 删除定时任务日志模型
+ """
+ job_log_ids: str
+
+
+class ClearJobLogModel(BaseModel):
+ """
+ 清除定时任务日志模型
+ """
+ oper_type: str
diff --git a/dash-fastapi-backend/module_admin/entity/vo/log_vo.py b/dash-fastapi-backend/module_admin/entity/vo/log_vo.py
new file mode 100644
index 0000000000000000000000000000000000000000..64a999ec1c22b7f7b50589288bb33cf2efceb8ed
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/entity/vo/log_vo.py
@@ -0,0 +1,143 @@
+from pydantic import BaseModel
+from typing import Union, Optional, List
+
+
+class OperLogModel(BaseModel):
+ """
+ 操作日志表对应pydantic模型
+ """
+ oper_id: Optional[int]
+ title: Optional[str]
+ business_type: Optional[int]
+ method: Optional[str]
+ request_method: Optional[str]
+ operator_type: Optional[int]
+ oper_name: Optional[str]
+ dept_name: Optional[str]
+ oper_url: Optional[str]
+ oper_ip: Optional[str]
+ oper_location: Optional[str]
+ oper_param: Optional[str]
+ json_result: Optional[str]
+ status: Optional[int]
+ error_msg: Optional[str]
+ oper_time: Optional[str]
+ cost_time: Optional[int]
+
+ class Config:
+ orm_mode = True
+
+
+class LogininforModel(BaseModel):
+ """
+ 登录日志表对应pydantic模型
+ """
+ info_id: Optional[int]
+ user_name: Optional[str]
+ ipaddr: Optional[str]
+ login_location: Optional[str]
+ browser: Optional[str]
+ os: Optional[str]
+ status: Optional[str]
+ msg: Optional[str]
+ login_time: Optional[str]
+
+ class Config:
+ orm_mode = True
+
+
+class OperLogQueryModel(OperLogModel):
+ """
+ 操作日志管理不分页查询模型
+ """
+ oper_time_start: Optional[str]
+ oper_time_end: Optional[str]
+
+
+class OperLogPageObject(OperLogQueryModel):
+ """
+ 操作日志管理分页查询模型
+ """
+ page_num: int
+ page_size: int
+
+
+class OperLogPageObjectResponse(BaseModel):
+ """
+ 操作日志列表分页查询返回模型
+ """
+ rows: List[Union[OperLogModel, None]] = []
+ page_num: int
+ page_size: int
+ total: int
+ has_next: bool
+
+
+class DeleteOperLogModel(BaseModel):
+ """
+ 删除操作日志模型
+ """
+ oper_ids: str
+
+
+class ClearOperLogModel(BaseModel):
+ """
+ 清除操作日志模型
+ """
+ oper_type: str
+
+
+class LoginLogQueryModel(LogininforModel):
+ """
+ 登录日志管理不分页查询模型
+ """
+ login_time_start: Optional[str]
+ login_time_end: Optional[str]
+
+
+class LoginLogPageObject(LoginLogQueryModel):
+ """
+ 登录日志管理分页查询模型
+ """
+ page_num: int
+ page_size: int
+
+
+class LoginLogPageObjectResponse(BaseModel):
+ """
+ 登录日志列表分页查询返回模型
+ """
+ rows: List[Union[LogininforModel, None]] = []
+ page_num: int
+ page_size: int
+ total: int
+ has_next: bool
+
+
+class DeleteLoginLogModel(BaseModel):
+ """
+ 删除登录日志模型
+ """
+ info_ids: str
+
+
+class ClearLoginLogModel(BaseModel):
+ """
+ 清除登录日志模型
+ """
+ oper_type: str
+
+
+class UnlockUser(BaseModel):
+ """
+ 解锁用户模型
+ """
+ user_name: str
+
+
+class CrudLogResponse(BaseModel):
+ """
+ 操作各类日志响应模型
+ """
+ is_success: bool
+ message: str
diff --git a/dash-fastapi-backend/module_admin/entity/vo/login_vo.py b/dash-fastapi-backend/module_admin/entity/vo/login_vo.py
index d7b30565b036d3c7b86d66a68cef3e946a4f81fa..528b3b2680362cc73a4f92d72608eccf1b2c2499 100644
--- a/dash-fastapi-backend/module_admin/entity/vo/login_vo.py
+++ b/dash-fastapi-backend/module_admin/entity/vo/login_vo.py
@@ -5,12 +5,19 @@ from typing import Optional
class UserLogin(BaseModel):
user_name: str
password: str
- user_request: Optional[str] = None
+ captcha: Optional[str]
+ session_id: Optional[str]
+ login_info: Optional[dict]
+ captcha_enabled: Optional[bool]
class Token(BaseModel):
- token: str
- account: str
- phone: str
- name: str
+ access_token: str
+ token_type: str
+
+class SmsCode(BaseModel):
+ is_success: Optional[bool]
+ sms_code: str
+ session_id: str
+ message: Optional[str]
diff --git a/dash-fastapi-backend/module_admin/entity/vo/notice_vo.py b/dash-fastapi-backend/module_admin/entity/vo/notice_vo.py
new file mode 100644
index 0000000000000000000000000000000000000000..7abb8c8ca0ebc071298f16c11d25af0653c38b9e
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/entity/vo/notice_vo.py
@@ -0,0 +1,63 @@
+from pydantic import BaseModel
+from typing import Union, Optional, List
+
+
+class NoticeModel(BaseModel):
+ """
+ 通知公告表对应pydantic模型
+ """
+ notice_id: Optional[int]
+ notice_title: Optional[str]
+ notice_type: Optional[str]
+ notice_content: Optional[bytes]
+ status: Optional[str]
+ create_by: Optional[str]
+ create_time: Optional[str]
+ update_by: Optional[str]
+ update_time: Optional[str]
+ remark: Optional[str]
+
+ class Config:
+ orm_mode = True
+
+
+class NoticeQueryModel(NoticeModel):
+ """
+ 通知公告管理不分页查询模型
+ """
+ create_time_start: Optional[str]
+ create_time_end: Optional[str]
+
+
+class NoticePageObject(NoticeQueryModel):
+ """
+ 通知公告管理分页查询模型
+ """
+ page_num: int
+ page_size: int
+
+
+class NoticePageObjectResponse(BaseModel):
+ """
+ 通知公告管理列表分页查询返回模型
+ """
+ rows: List[Union[NoticeModel, None]] = []
+ page_num: int
+ page_size: int
+ total: int
+ has_next: bool
+
+
+class CrudNoticeResponse(BaseModel):
+ """
+ 操作通知公告响应模型
+ """
+ is_success: bool
+ message: str
+
+
+class DeleteNoticeModel(BaseModel):
+ """
+ 删除通知公告模型
+ """
+ notice_ids: str
diff --git a/dash-fastapi-backend/module_admin/entity/vo/online_vo.py b/dash-fastapi-backend/module_admin/entity/vo/online_vo.py
new file mode 100644
index 0000000000000000000000000000000000000000..eeef4d371d5c26fe88de1b802ccc0c29bdc01d6d
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/entity/vo/online_vo.py
@@ -0,0 +1,50 @@
+from pydantic import BaseModel
+from typing import Union, Optional, List
+
+
+class OnlineModel(BaseModel):
+ """
+ 在线用户对应pydantic模型
+ """
+ session_id: Optional[str]
+ user_name: Optional[str]
+ dept_name: Optional[str]
+ ipaddr: Optional[str]
+ login_location: Optional[str]
+ browser: Optional[str]
+ os: Optional[str]
+ login_time: Optional[str]
+
+
+class OnlinePageObject(OnlineModel):
+ """
+ 在线用户分页查询模型
+ """
+ page_num: int
+ page_size: int
+
+
+class OnlinePageObjectResponse(BaseModel):
+ """
+ 在线用户列表分页查询返回模型
+ """
+ rows: List[Union[OnlineModel, None]] = []
+ page_num: int
+ page_size: int
+ total: int
+ has_next: bool
+
+
+class CrudOnlineResponse(BaseModel):
+ """
+ 操作在线用户响应模型
+ """
+ is_success: bool
+ message: str
+
+
+class DeleteOnlineModel(BaseModel):
+ """
+ 强退在线用户模型
+ """
+ session_ids: str
diff --git a/dash-fastapi-backend/module_admin/entity/vo/post_vo.py b/dash-fastapi-backend/module_admin/entity/vo/post_vo.py
index c2edd8958821fe11ea03960254bfdcbe3a0f2498..a7a7abecc7990a26c527e0779039eecf8027fb9d 100644
--- a/dash-fastapi-backend/module_admin/entity/vo/post_vo.py
+++ b/dash-fastapi-backend/module_admin/entity/vo/post_vo.py
@@ -1,14 +1,14 @@
from pydantic import BaseModel
-from typing import Union, Optional, List
-from module_admin.entity.vo.user_schema import PostModel
+from typing import Union, List
+from module_admin.entity.vo.user_vo import PostModel
class PostPageObject(PostModel):
"""
岗位管理分页查询模型
"""
- page_num: Optional[int]
- page_size: Optional[int]
+ page_num: int
+ page_size: int
class PostPageObjectResponse(BaseModel):
diff --git a/dash-fastapi-backend/module_admin/entity/vo/role_vo.py b/dash-fastapi-backend/module_admin/entity/vo/role_vo.py
index 68a7d9e078e7ebd151920c9f64596fc709e6d58e..6532c5815a41a79a478c0d3249e5e09d61bf765c 100644
--- a/dash-fastapi-backend/module_admin/entity/vo/role_vo.py
+++ b/dash-fastapi-backend/module_admin/entity/vo/role_vo.py
@@ -1,7 +1,7 @@
from pydantic import BaseModel
from typing import Union, Optional, List
-from module_admin.entity.vo.user_schema import RoleModel
-from module_admin.entity.vo.menu_schema import MenuModel
+from module_admin.entity.vo.user_vo import RoleModel
+from module_admin.entity.vo.menu_vo import MenuModel
class RoleMenuModel(BaseModel):
@@ -15,14 +15,20 @@ class RoleMenuModel(BaseModel):
orm_mode = True
-class RolePageObject(RoleModel):
+class RoleQueryModel(RoleModel):
"""
- 角色管理分页查询模型
+ 角色管理不分页查询模型
"""
create_time_start: Optional[str]
create_time_end: Optional[str]
- page_num: Optional[int]
- page_size: Optional[int]
+
+
+class RolePageObject(RoleQueryModel):
+ """
+ 角色管理分页查询模型
+ """
+ page_num: int
+ page_size: int
class RolePageObjectResponse(BaseModel):
diff --git a/dash-fastapi-backend/module_admin/entity/vo/server_vo.py b/dash-fastapi-backend/module_admin/entity/vo/server_vo.py
new file mode 100644
index 0000000000000000000000000000000000000000..36715968510aff174737cf82a97844bc62efb505
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/entity/vo/server_vo.py
@@ -0,0 +1,53 @@
+from pydantic import BaseModel
+from typing import Optional, List
+
+
+class CpuInfo(BaseModel):
+ cpu_num: Optional[int]
+ used: Optional[str]
+ sys: Optional[str]
+ free: Optional[str]
+
+
+class MemoryInfo(BaseModel):
+ total: Optional[str]
+ used: Optional[str]
+ free: Optional[str]
+ usage: Optional[str]
+
+
+class SysInfo(BaseModel):
+ computer_ip: Optional[str]
+ computer_name: Optional[str]
+ os_arch: Optional[str]
+ os_name: Optional[str]
+
+
+class PyInfo(BaseModel):
+ name: Optional[str]
+ version: Optional[str]
+ start_time: Optional[str]
+ run_time: Optional[str]
+ home: Optional[str]
+ project_dir: Optional[str]
+
+
+class SysFiles(BaseModel):
+ dir_name: Optional[str]
+ sys_type_name: Optional[str]
+ disk_name: Optional[str]
+ total: Optional[str]
+ used: Optional[str]
+ free: Optional[str]
+ usage: Optional[str]
+
+
+class ServerMonitorModel(BaseModel):
+ """
+ 服务监控对应pydantic模型
+ """
+ cpu: Optional[CpuInfo]
+ py: Optional[PyInfo]
+ mem: Optional[MemoryInfo]
+ sys: Optional[SysInfo]
+ sys_files: Optional[List[SysFiles]]
diff --git a/dash-fastapi-backend/module_admin/entity/vo/user_vo.py b/dash-fastapi-backend/module_admin/entity/vo/user_vo.py
index 7c9c7006e2535e49d116dcf7a27bd96f3cac769d..31b52c979cb39b6983bc61ce00efb5e7062169bf 100644
--- a/dash-fastapi-backend/module_admin/entity/vo/user_vo.py
+++ b/dash-fastapi-backend/module_admin/entity/vo/user_vo.py
@@ -152,39 +152,27 @@ class CurrentUserInfoServiceResponse(UserDetailModel):
menu: Union[List, None]
-class UserPageObject(UserModel):
+class UserQueryModel(UserModel):
"""
- 用户管理分页查询模型
+ 用户管理不分页查询模型
"""
create_time_start: Optional[str]
create_time_end: Optional[str]
+
+
+class UserPageObject(UserQueryModel):
+ """
+ 用户管理分页查询模型
+ """
page_num: int
page_size: int
-class UserInfoJoinDept(BaseModel):
+class UserInfoJoinDept(UserModel):
"""
数据库查询用户列表返回模型
"""
- user_id: Optional[int]
- dept_id: Optional[int]
dept_name: Optional[str]
- user_name: Optional[str]
- nick_name: Optional[str]
- user_type: Optional[str]
- email: Optional[str]
- phonenumber: Optional[str]
- sex: Optional[str]
- avatar: Optional[str]
- status: Optional[str]
- del_flag: Optional[str]
- login_ip: Optional[str]
- login_date: Optional[str]
- create_by: Optional[str]
- create_time: Optional[str]
- update_by: Optional[str]
- update_time: Optional[str]
- remark: Optional[str]
class UserPageObjectResponse(BaseModel):
@@ -207,6 +195,15 @@ class AddUserModel(UserModel):
type: Optional[str]
+class ResetUserModel(UserModel):
+ """
+ 重置用户密码模型
+ """
+ old_password: Optional[str]
+ sms_code: Optional[str]
+ session_id: Optional[str]
+
+
class DeleteUserModel(BaseModel):
"""
删除用户模型
diff --git a/dash-fastapi-backend/module_admin/service/cache_service.py b/dash-fastapi-backend/module_admin/service/cache_service.py
new file mode 100644
index 0000000000000000000000000000000000000000..08c4254f34b41327ed8e2869a82aeb7e8d6be314
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/service/cache_service.py
@@ -0,0 +1,24 @@
+from fastapi import Request
+from module_admin.entity.vo.cache_vo import *
+
+
+class CacheService:
+ """
+ 缓存监控模块服务层
+ """
+
+ @classmethod
+ async def get_cache_monitor_statistical_info_services(cls, request: Request):
+ """
+ 获取缓存监控信息service
+ :param request: Request对象
+ :return: 缓存监控信息
+ """
+ info = await request.app.state.redis.info()
+ db_size = await request.app.state.redis.dbsize()
+ command_stats_dict = await request.app.state.redis.info('commandstats')
+ command_stats = [dict(name=key.split('_')[1], value=str(value.get('calls'))) for key, value in
+ command_stats_dict.items()]
+ result = dict(command_stats=command_stats, db_size=db_size, info=info)
+
+ return CacheMonitorModel(**result)
diff --git a/dash-fastapi-backend/module_admin/service/captcha_service.py b/dash-fastapi-backend/module_admin/service/captcha_service.py
new file mode 100644
index 0000000000000000000000000000000000000000..bcad42c92886d5c44dac19a1a1a190d32c2680ff
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/service/captcha_service.py
@@ -0,0 +1,48 @@
+from PIL import Image, ImageDraw, ImageFont
+import io
+import os
+import random
+import base64
+
+
+class CaptchaService:
+ """
+ 验证码模块服务层
+ """
+
+ @classmethod
+ def create_captcha_image_service(cls):
+ # 创建空白图像
+ image = Image.new('RGB', (400, 300), color='#EAEAEA')
+
+ # 创建绘图对象
+ draw = ImageDraw.Draw(image)
+
+ # 设置字体
+ font = ImageFont.truetype(os.path.join(os.path.abspath(os.getcwd()), 'assets', 'font', 'Arial.ttf'), size=100)
+
+ # 生成两个0-9之间的随机整数
+ num1 = random.randint(0, 9)
+ num2 = random.randint(0, 9)
+ # 从运算符列表中随机选择一个
+ operational_character_list = ['+', '-', '*']
+ operational_character = random.choice(operational_character_list)
+ # 根据选择的运算符进行计算
+ if operational_character == '+':
+ result = num1 + num2
+ elif operational_character == '-':
+ result = num1 - num2
+ else:
+ result = num1 * num2
+ # 绘制文本
+ text = f"{num1} {operational_character} {num2} = ?"
+ draw.text((10, 120), text, fill='blue', font=font)
+
+ # 将图像数据保存到内存中
+ buffer = io.BytesIO()
+ image.save(buffer, format='PNG')
+
+ # 将图像数据转换为base64字符串
+ base64_string = f'data:image/png;base64,{base64.b64encode(buffer.getvalue()).decode()}'
+
+ return [base64_string, result]
diff --git a/dash-fastapi-backend/module_admin/service/common_service.py b/dash-fastapi-backend/module_admin/service/common_service.py
new file mode 100644
index 0000000000000000000000000000000000000000..790b7f3eadf1f38f751b53b4f983200a1a77eb35
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/service/common_service.py
@@ -0,0 +1,18 @@
+import os
+from fastapi import UploadFile
+
+
+class CommonService:
+ """
+ 通用模块服务层
+ """
+
+ @classmethod
+ def upload_service(cls, path: str, upload_id: str, file: UploadFile):
+
+ filepath = os.path.join(path, upload_id, f'{file.filename}')
+ with open(filepath, 'wb') as f:
+ # 流式写出大型文件，这里的10代表10MB
+ for chunk in iter(lambda: file.file.read(1024 * 1024 * 10), b''):
+ f.write(chunk)
+
diff --git a/dash-fastapi-backend/module_admin/service/config_service.py b/dash-fastapi-backend/module_admin/service/config_service.py
new file mode 100644
index 0000000000000000000000000000000000000000..1b3c48ebf34e244359d29dd843dc1c4947641a5e
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/service/config_service.py
@@ -0,0 +1,189 @@
+from fastapi import Request
+from module_admin.entity.vo.config_vo import *
+from module_admin.dao.config_dao import *
+from utils.common_util import export_list2excel
+
+
+class ConfigService:
+ """
+ 参数配置管理模块服务层
+ """
+
+ @classmethod
+ def get_config_list_services(cls, result_db: Session, query_object: ConfigQueryModel):
+ """
+ 获取参数配置列表信息service
+ :param result_db: orm对象
+ :param query_object: 查询参数对象
+ :return: 参数配置列表信息对象
+ """
+ config_list_result = ConfigDao.get_config_list(result_db, query_object)
+
+ return config_list_result
+
+ @classmethod
+ async def init_cache_sys_config_services(cls, result_db: Session, redis):
+ """
+ 应用初始化：获取所有参数配置对应的键值对信息并缓存service
+ :param result_db: orm对象
+ :param redis: redis对象
+ :return:
+ """
+ # 获取以sys_config:开头的键列表
+ keys = await redis.keys('sys_config:*')
+ # 删除匹配的键
+ if keys:
+ await redis.delete(*keys)
+ config_all = ConfigDao.get_config_list(result_db, ConfigQueryModel(**dict()))
+ for config_obj in config_all:
+ if config_obj.config_type == 'Y':
+ await redis.set(f'sys_config:{config_obj.config_key}', config_obj.config_value)
+
+ @classmethod
+ async def query_config_list_from_cache_services(cls, redis, config_key: str):
+ """
+ 从缓存获取参数键名对应值service
+ :param redis: redis对象
+ :param config_key: 参数键名
+ :return: 参数键名对应值
+ """
+ result = await redis.get(f'sys_config:{config_key}')
+
+ return result
+
+ @classmethod
+ async def add_config_services(cls, request: Request, result_db: Session, page_object: ConfigModel):
+ """
+ 新增参数配置信息service
+ :param request: Request对象
+ :param result_db: orm对象
+ :param page_object: 新增参数配置对象
+ :return: 新增参数配置校验结果
+ """
+ config = ConfigDao.get_config_detail_by_info(result_db, ConfigModel(**dict(config_key=page_object.config_key)))
+ if config:
+ result = dict(is_success=False, message='参数键名已存在')
+ else:
+ try:
+ ConfigDao.add_config_dao(result_db, page_object)
+ result_db.commit()
+ await cls.init_cache_sys_config_services(result_db, request.app.state.redis)
+ result = dict(is_success=True, message='新增成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+
+ return CrudConfigResponse(**result)
+
+ @classmethod
+ async def edit_config_services(cls, request: Request, result_db: Session, page_object: ConfigModel):
+ """
+ 编辑参数配置信息service
+ :param request: Request对象
+ :param result_db: orm对象
+ :param page_object: 编辑参数配置对象
+ :return: 编辑参数配置校验结果
+ """
+ edit_config = page_object.dict(exclude_unset=True)
+ config_info = cls.detail_config_services(result_db, edit_config.get('config_id'))
+ if config_info:
+ if config_info.config_key != page_object.config_key or config_info.config_value != page_object.config_value:
+ config = ConfigDao.get_config_detail_by_info(result_db, page_object)
+ if config:
+ result = dict(is_success=False, message='参数配置已存在')
+ return CrudConfigResponse(**result)
+ try:
+ ConfigDao.edit_config_dao(result_db, edit_config)
+ result_db.commit()
+ await cls.init_cache_sys_config_services(result_db, request.app.state.redis)
+ result = dict(is_success=True, message='更新成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='参数配置不存在')
+
+ return CrudConfigResponse(**result)
+
+ @classmethod
+ async def delete_config_services(cls, request: Request, result_db: Session, page_object: DeleteConfigModel):
+ """
+ 删除参数配置信息service
+ :param request: Request对象
+ :param result_db: orm对象
+ :param page_object: 删除参数配置对象
+ :return: 删除参数配置校验结果
+ """
+ if page_object.config_ids.split(','):
+ config_id_list = page_object.config_ids.split(',')
+ try:
+ for config_id in config_id_list:
+ config_id_dict = dict(config_id=config_id)
+ ConfigDao.delete_config_dao(result_db, ConfigModel(**config_id_dict))
+ result_db.commit()
+ await cls.init_cache_sys_config_services(result_db, request.app.state.redis)
+ result = dict(is_success=True, message='删除成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='传入字典数据id为空')
+ return CrudConfigResponse(**result)
+
+ @classmethod
+ def detail_config_services(cls, result_db: Session, config_id: int):
+ """
+ 获取参数配置详细信息service
+ :param result_db: orm对象
+ :param config_id: 参数配置id
+ :return: 参数配置id对应的信息
+ """
+ config = ConfigDao.get_config_detail_by_id(result_db, config_id=config_id)
+
+ return config
+
+ @staticmethod
+ def export_config_list_services(config_list: List):
+ """
+ 导出参数配置信息service
+ :param config_list: 参数配置信息列表
+ :return: 参数配置信息对应excel的二进制数据
+ """
+ # 创建一个映射字典，将英文键映射到中文键
+ mapping_dict = {
+ "config_id": "参数主键",
+ "config_name": "参数名称",
+ "config_key": "参数键名",
+ "config_value": "参数键值",
+ "config_type": "系统内置",
+ "create_by": "创建者",
+ "create_time": "创建时间",
+ "update_by": "更新者",
+ "update_time": "更新时间",
+ "remark": "备注",
+ }
+
+ data = [ConfigModel(**vars(row)).dict() for row in config_list]
+
+ for item in data:
+ if item.get('config_type') == 'Y':
+ item['config_type'] = '是'
+ else:
+ item['config_type'] = '否'
+ new_data = [{mapping_dict.get(key): value for key, value in item.items() if mapping_dict.get(key)} for item in data]
+ binary_data = export_list2excel(new_data)
+
+ return binary_data
+
+ @classmethod
+ async def refresh_sys_config_services(cls, request: Request, result_db: Session):
+ """
+ 刷新字典缓存信息service
+ :param request: Request对象
+ :param result_db: orm对象
+ :return: 刷新字典缓存校验结果
+ """
+ await cls.init_cache_sys_config_services(result_db, request.app.state.redis)
+ result = dict(is_success=True, message='刷新成功')
+
+ return CrudConfigResponse(**result)
diff --git a/dash-fastapi-backend/module_admin/service/dept_service.py b/dash-fastapi-backend/module_admin/service/dept_service.py
index c86ad400f567f93a5157b2274ab29f0d9739548c..d2ca651429ccdbe265dfa90ba42b173548376bda 100644
--- a/dash-fastapi-backend/module_admin/service/dept_service.py
+++ b/dash-fastapi-backend/module_admin/service/dept_service.py
@@ -1,169 +1,206 @@
-from module_admin.entity.vo.dept_schema import *
-from module_admin.mapper.dept_crud import *
-
-
-def get_dept_tree_services(result_db: Session, page_object: DeptModel):
- """
- 获取部门树信息service
- :param result_db: orm对象
- :param page_object: 查询参数对象
- :return: 部门树信息对象
- """
- dept_list_result = get_dept_list_for_tree(result_db, page_object)
- dept_tree_result = get_dept_tree(0, DeptTree(dept_tree=dept_list_result))
-
- return dept_tree_result
-
-
-def get_dept_tree_for_edit_option_services(result_db: Session, page_object: DeptModel):
- """
- 获取部门编辑部门树信息service
- :param result_db: orm对象
- :param page_object: 查询参数对象
- :return: 部门树信息对象
- """
- dept_list_result = get_dept_info_for_edit_option(result_db, page_object)
- dept_tree_result = get_dept_tree(0, DeptTree(dept_tree=dept_list_result))
-
- return dept_tree_result
-
-
-def get_dept_list_services(result_db: Session, page_object: DeptModel):
- """
- 获取部门列表信息service
- :param result_db: orm对象
- :param page_object: 分页查询参数对象
- :return: 部门列表信息对象
- """
- dept_list_result = get_dept_list(result_db, page_object)
-
- return dept_list_result
-
-
-def add_dept_services(result_db: Session, page_object: DeptModel):
- """
- 新增部门信息service
- :param result_db: orm对象
- :param page_object: 新增部门对象
- :return: 新增部门校验结果
- """
- parent_info = get_dept_by_id(result_db, page_object.parent_id)
- if parent_info:
- page_object.ancestors = f'{parent_info.ancestors},{page_object.parent_id}'
- else:
- page_object.ancestors = '0'
- add_dept_result = add_dept_crud(result_db, page_object)
-
- return add_dept_result
-
-
-def edit_dept_services(result_db: Session, page_object: DeptModel):
- """
- 编辑部门信息service
- :param result_db: orm对象
- :param page_object: 编辑部门对象
- :return: 编辑部门校验结果
- """
- parent_info = get_dept_by_id(result_db, page_object.parent_id)
- if parent_info:
- page_object.ancestors = f'{parent_info.ancestors},{page_object.parent_id}'
- else:
- page_object.ancestors = '0'
- edit_dept = page_object.dict(exclude_unset=True)
- edit_dept_result = edit_dept_crud(result_db, edit_dept)
- update_children_info(result_db, DeptModel(dept_id=page_object.dept_id,
- ancestors=page_object.ancestors,
- update_by=page_object.update_by,
- update_time=page_object.update_time
- )
- )
-
- return edit_dept_result
-
-
-def delete_dept_services(result_db: Session, page_object: DeleteDeptModel):
- """
- 删除部门信息service
- :param result_db: orm对象
- :param page_object: 删除部门对象
- :return: 删除部门校验结果
- """
- if page_object.dept_ids.split(','):
- dept_id_list = page_object.dept_ids.split(',')
- ancestors = get_dept_all_ancestors(result_db)
- for dept_id in dept_id_list:
- for ancestor in ancestors:
- if dept_id in ancestor[0]:
- result = dict(is_success=False, message='该部门下有子部门，不允许删除')
-
+from module_admin.entity.vo.dept_vo import *
+from module_admin.dao.dept_dao import *
+
+
+class DeptService:
+ """
+ 部门管理模块服务层
+ """
+
+ @classmethod
+ def get_dept_tree_services(cls, result_db: Session, page_object: DeptModel):
+ """
+ 获取部门树信息service
+ :param result_db: orm对象
+ :param page_object: 查询参数对象
+ :return: 部门树信息对象
+ """
+ dept_list_result = DeptDao.get_dept_list_for_tree(result_db, page_object)
+ dept_tree_result = cls.get_dept_tree(0, DeptTree(dept_tree=dept_list_result))
+
+ return dept_tree_result
+
+ @classmethod
+ def get_dept_tree_for_edit_option_services(cls, result_db: Session, page_object: DeptModel):
+ """
+ 获取部门编辑部门树信息service
+ :param result_db: orm对象
+ :param page_object: 查询参数对象
+ :return: 部门树信息对象
+ """
+ dept_list_result = DeptDao.get_dept_info_for_edit_option(result_db, page_object)
+ dept_tree_result = cls.get_dept_tree(0, DeptTree(dept_tree=dept_list_result))
+
+ return dept_tree_result
+
+ @classmethod
+ def get_dept_list_services(cls, result_db: Session, page_object: DeptModel):
+ """
+ 获取部门列表信息service
+ :param result_db: orm对象
+ :param page_object: 分页查询参数对象
+ :return: 部门列表信息对象
+ """
+ dept_list_result = DeptDao.get_dept_list(result_db, page_object)
+
+ return dept_list_result
+
+ @classmethod
+ def add_dept_services(cls, result_db: Session, page_object: DeptModel):
+ """
+ 新增部门信息service
+ :param result_db: orm对象
+ :param page_object: 新增部门对象
+ :return: 新增部门校验结果
+ """
+ parent_info = DeptDao.get_dept_by_id(result_db, page_object.parent_id)
+ if parent_info:
+ page_object.ancestors = f'{parent_info.ancestors},{page_object.parent_id}'
+ else:
+ page_object.ancestors = '0'
+ dept = DeptDao.get_dept_detail_by_info(result_db, DeptModel(**dict(parent_id=page_object.parent_id, dept_name=page_object.dept_name)))
+ if dept:
+ result = dict(is_success=False, message='同一部门下不允许存在同名的部门')
+ else:
+ try:
+ DeptDao.add_dept_dao(result_db, page_object)
+ result_db.commit()
+ result = dict(is_success=True, message='新增成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+
+ return CrudDeptResponse(**result)
+
+ @classmethod
+ def edit_dept_services(cls, result_db: Session, page_object: DeptModel):
+ """
+ 编辑部门信息service
+ :param result_db: orm对象
+ :param page_object: 编辑部门对象
+ :return: 编辑部门校验结果
+ """
+ parent_info = DeptDao.get_dept_by_id(result_db, page_object.parent_id)
+ if parent_info:
+ page_object.ancestors = f'{parent_info.ancestors},{page_object.parent_id}'
+ else:
+ page_object.ancestors = '0'
+ edit_dept = page_object.dict(exclude_unset=True)
+ dept_info = cls.detail_dept_services(result_db, edit_dept.get('dept_id'))
+ if dept_info:
+ if dept_info.parent_id != page_object.parent_id or dept_info.dept_name != page_object.dept_name:
+ dept = DeptDao.get_dept_detail_by_info(result_db, DeptModel(
+ **dict(parent_id=page_object.parent_id, dept_name=page_object.dept_name)))
+ if dept:
+ result = dict(is_success=False, message='同一部门下不允许存在同名的部门')
return CrudDeptResponse(**result)
-
- dept_id_dict = dict(dept_id=dept_id)
- delete_dept_crud(result_db, DeptModel(**dept_id_dict))
- result = dict(is_success=True, message='删除成功')
- else:
- result = dict(is_success=False, message='传入用户id为空')
- return CrudDeptResponse(**result)
-
-
-def detail_dept_services(result_db: Session, dept_id: int):
- """
- 获取部门详细信息service
- :param result_db: orm对象
- :param dept_id: 部门id
- :return: 部门id对应的信息
- """
- post = get_dept_detail_by_id(result_db, dept_id=dept_id)
-
- return post
-
-
-def get_dept_tree(pid: int, permission_list: DeptTree):
- """
- 工具方法：根据部门信息生成树形嵌套数据
- :param pid: 部门id
- :param permission_list: 部门列表信息
- :return: 部门树形嵌套数据
- """
- dept_list = []
- for permission in permission_list.dept_tree:
- if permission.parent_id == pid:
- children = get_dept_tree(permission.dept_id, permission_list)
- dept_list_data = {}
- if children:
- dept_list_data['title'] = permission.dept_name
- dept_list_data['key'] = str(permission.dept_id)
- dept_list_data['value'] = str(permission.dept_id)
- dept_list_data['children'] = children
- else:
- dept_list_data['title'] = permission.dept_name
- dept_list_data['key'] = str(permission.dept_id)
- dept_list_data['value'] = str(permission.dept_id)
- dept_list.append(dept_list_data)
-
- return dept_list
-
-
-def update_children_info(result_db, page_object):
- """
- 工具方法：递归更新子部门信息
- :param result_db: orm对象
- :param page_object: 编辑部门对象
- :return:
- """
- children_info = get_children_dept(result_db, page_object.dept_id)
- if children_info:
- for child in children_info:
- child.ancestors = f'{page_object.ancestors},{page_object.dept_id}'
- edit_dept_crud(result_db,
- dict(dept_id=child.dept_id,
- ancestors=child.ancestors,
- update_by=page_object.update_by,
- update_time=page_object.update_time
- )
- )
- update_children_info(result_db, DeptModel(dept_id=child.dept_id,
- ancestors=child.ancestors,
- update_by=page_object.update_by,
- update_time=page_object.update_time
- ))
+ try:
+ DeptDao.edit_dept_dao(result_db, edit_dept)
+ cls.update_children_info(result_db, DeptModel(dept_id=page_object.dept_id,
+ ancestors=page_object.ancestors,
+ update_by=page_object.update_by,
+ update_time=page_object.update_time
+ )
+ )
+ result_db.commit()
+ result = dict(is_success=True, message='更新成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='部门不存在')
+
+ return CrudDeptResponse(**result)
+
+ @classmethod
+ def delete_dept_services(cls, result_db: Session, page_object: DeleteDeptModel):
+ """
+ 删除部门信息service
+ :param result_db: orm对象
+ :param page_object: 删除部门对象
+ :return: 删除部门校验结果
+ """
+ if page_object.dept_ids.split(','):
+ dept_id_list = page_object.dept_ids.split(',')
+ ancestors = DeptDao.get_dept_all_ancestors(result_db)
+ try:
+ for dept_id in dept_id_list:
+ for ancestor in ancestors:
+ if dept_id in ancestor[0]:
+ result = dict(is_success=False, message='该部门下有子部门，不允许删除')
+
+ return CrudDeptResponse(**result)
+
+ dept_id_dict = dict(dept_id=dept_id)
+ DeptDao.delete_dept_dao(result_db, DeptModel(**dept_id_dict))
+ result_db.commit()
+ result = dict(is_success=True, message='删除成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='传入部门id为空')
+ return CrudDeptResponse(**result)
+
+ @classmethod
+ def detail_dept_services(cls, result_db: Session, dept_id: int):
+ """
+ 获取部门详细信息service
+ :param result_db: orm对象
+ :param dept_id: 部门id
+ :return: 部门id对应的信息
+ """
+ dept = DeptDao.get_dept_detail_by_id(result_db, dept_id=dept_id)
+
+ return dept
+
+ @classmethod
+ def get_dept_tree(cls, pid: int, permission_list: DeptTree):
+ """
+ 工具方法：根据部门信息生成树形嵌套数据
+ :param pid: 部门id
+ :param permission_list: 部门列表信息
+ :return: 部门树形嵌套数据
+ """
+ dept_list = []
+ for permission in permission_list.dept_tree:
+ if permission.parent_id == pid:
+ children = cls.get_dept_tree(permission.dept_id, permission_list)
+ dept_list_data = {}
+ if children:
+ dept_list_data['title'] = permission.dept_name
+ dept_list_data['key'] = str(permission.dept_id)
+ dept_list_data['value'] = str(permission.dept_id)
+ dept_list_data['children'] = children
+ else:
+ dept_list_data['title'] = permission.dept_name
+ dept_list_data['key'] = str(permission.dept_id)
+ dept_list_data['value'] = str(permission.dept_id)
+ dept_list.append(dept_list_data)
+
+ return dept_list
+
+ @classmethod
+ def update_children_info(cls, result_db, page_object):
+ """
+ 工具方法：递归更新子部门信息
+ :param result_db: orm对象
+ :param page_object: 编辑部门对象
+ :return:
+ """
+ children_info = DeptDao.get_children_dept(result_db, page_object.dept_id)
+ if children_info:
+ for child in children_info:
+ child.ancestors = f'{page_object.ancestors},{page_object.dept_id}'
+ DeptDao.edit_dept_dao(result_db,
+ dict(dept_id=child.dept_id,
+ ancestors=child.ancestors,
+ update_by=page_object.update_by,
+ update_time=page_object.update_time
+ )
+ )
+ cls.update_children_info(result_db, DeptModel(dept_id=child.dept_id,
+ ancestors=child.ancestors,
+ update_by=page_object.update_by,
+ update_time=page_object.update_time
+ ))
diff --git a/dash-fastapi-backend/module_admin/service/dict_service.py b/dash-fastapi-backend/module_admin/service/dict_service.py
new file mode 100644
index 0000000000000000000000000000000000000000..e201a04d251625064d275054750a0564cfedcf70
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/service/dict_service.py
@@ -0,0 +1,374 @@
+from fastapi import Request
+import json
+from module_admin.entity.vo.dict_vo import *
+from module_admin.dao.dict_dao import *
+from utils.common_util import export_list2excel
+
+
+class DictTypeService:
+ """
+ 字典类型管理模块服务层
+ """
+
+ @classmethod
+ def get_dict_type_list_services(cls, result_db: Session, query_object: DictTypeQueryModel):
+ """
+ 获取字典类型列表信息service
+ :param result_db: orm对象
+ :param query_object: 查询参数对象
+ :return: 字典类型列表信息对象
+ """
+ dict_type_list_result = DictTypeDao.get_dict_type_list(result_db, query_object)
+
+ return dict_type_list_result
+
+ @classmethod
+ def get_all_dict_type_services(cls, result_db: Session):
+ """
+ 获取字所有典类型列表信息service
+ :param result_db: orm对象
+ :return: 字典类型列表信息对象
+ """
+ dict_type_list_result = DictTypeDao.get_all_dict_type(result_db)
+
+ return dict_type_list_result
+
+ @classmethod
+ async def add_dict_type_services(cls, request: Request, result_db: Session, page_object: DictTypeModel):
+ """
+ 新增字典类型信息service
+ :param request: Request对象
+ :param result_db: orm对象
+ :param page_object: 新增岗位对象
+ :return: 新增字典类型校验结果
+ """
+ dict_type = DictTypeDao.get_dict_type_detail_by_info(result_db, DictTypeModel(**dict(dict_type=page_object.dict_type)))
+ if dict_type:
+ result = dict(is_success=False, message='字典类型已存在')
+ else:
+ try:
+ DictTypeDao.add_dict_type_dao(result_db, page_object)
+ result_db.commit()
+ await DictDataService.init_cache_sys_dict_services(result_db, request.app.state.redis)
+ result = dict(is_success=True, message='新增成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+
+ return CrudDictResponse(**result)
+
+ @classmethod
+ async def edit_dict_type_services(cls, request: Request, result_db: Session, page_object: DictTypeModel):
+ """
+ 编辑字典类型信息service
+ :param request: Request对象
+ :param result_db: orm对象
+ :param page_object: 编辑字典类型对象
+ :return: 编辑字典类型校验结果
+ """
+ edit_dict_type = page_object.dict(exclude_unset=True)
+ dict_type_info = cls.detail_dict_type_services(result_db, edit_dict_type.get('dict_id'))
+ if dict_type_info:
+ if dict_type_info.dict_type != page_object.dict_type or dict_type_info.dict_name != page_object.dict_name:
+ dict_type = DictTypeDao.get_dict_type_detail_by_info(result_db, DictTypeModel(
+ **dict(dict_type=page_object.dict_type)))
+ if dict_type:
+ result = dict(is_success=False, message='字典类型已存在')
+ return CrudDictResponse(**result)
+ try:
+ if dict_type_info.dict_type != page_object.dict_type:
+ query_dict_data = DictDataModel(**(dict(dict_type=dict_type_info.dict_type)))
+ dict_data_list = DictDataDao.get_dict_data_list(result_db, query_dict_data)
+ for dict_data in dict_data_list:
+ edit_dict_data = DictDataModel(**(dict(dict_code=dict_data.dict_code, dict_type=page_object.dict_type, update_by=page_object.update_by))).dict(exclude_unset=True)
+ DictDataDao.edit_dict_data_dao(result_db, edit_dict_data)
+ DictTypeDao.edit_dict_type_dao(result_db, edit_dict_type)
+ result_db.commit()
+ await DictDataService.init_cache_sys_dict_services(result_db, request.app.state.redis)
+ result = dict(is_success=True, message='更新成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='字典类型不存在')
+
+ return CrudDictResponse(**result)
+
+ @classmethod
+ async def delete_dict_type_services(cls, request: Request, result_db: Session, page_object: DeleteDictTypeModel):
+ """
+ 删除字典类型信息service
+ :param request: Request对象
+ :param result_db: orm对象
+ :param page_object: 删除字典类型对象
+ :return: 删除字典类型校验结果
+ """
+ if page_object.dict_ids.split(','):
+ dict_id_list = page_object.dict_ids.split(',')
+ try:
+ for dict_id in dict_id_list:
+ dict_id_dict = dict(dict_id=dict_id)
+ DictTypeDao.delete_dict_type_dao(result_db, DictTypeModel(**dict_id_dict))
+ result_db.commit()
+ await DictDataService.init_cache_sys_dict_services(result_db, request.app.state.redis)
+ result = dict(is_success=True, message='删除成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='传入字典类型id为空')
+ return CrudDictResponse(**result)
+
+ @classmethod
+ def detail_dict_type_services(cls, result_db: Session, dict_id: int):
+ """
+ 获取字典类型详细信息service
+ :param result_db: orm对象
+ :param dict_id: 字典类型id
+ :return: 字典类型id对应的信息
+ """
+ dict_type = DictTypeDao.get_dict_type_detail_by_id(result_db, dict_id=dict_id)
+
+ return dict_type
+
+ @staticmethod
+ def export_dict_type_list_services(dict_type_list: List):
+ """
+ 导出字典类型信息service
+ :param dict_type_list: 字典信息列表
+ :return: 字典信息对应excel的二进制数据
+ """
+ # 创建一个映射字典，将英文键映射到中文键
+ mapping_dict = {
+ "dict_id": "字典编号",
+ "dict_name": "字典名称",
+ "dict_type": "字典类型",
+ "status": "状态",
+ "create_by": "创建者",
+ "create_time": "创建时间",
+ "update_by": "更新者",
+ "update_time": "更新时间",
+ "remark": "备注",
+ }
+
+ data = [DictTypeModel(**vars(row)).dict() for row in dict_type_list]
+
+ for item in data:
+ if item.get('status') == '0':
+ item['status'] = '正常'
+ else:
+ item['status'] = '停用'
+ new_data = [{mapping_dict.get(key): value for key, value in item.items() if mapping_dict.get(key)} for item in data]
+ binary_data = export_list2excel(new_data)
+
+ return binary_data
+
+ @classmethod
+ async def refresh_sys_dict_services(cls, request: Request, result_db: Session):
+ """
+ 刷新字典缓存信息service
+ :param request: Request对象
+ :param result_db: orm对象
+ :return: 刷新字典缓存校验结果
+ """
+ await DictDataService.init_cache_sys_dict_services(result_db, request.app.state.redis)
+ result = dict(is_success=True, message='刷新成功')
+
+ return CrudDictResponse(**result)
+
+
+class DictDataService:
+ """
+ 字典数据管理模块服务层
+ """
+
+ @classmethod
+ def get_dict_data_list_services(cls, result_db: Session, query_object: DictDataModel):
+ """
+ 获取字典数据列表信息service
+ :param result_db: orm对象
+ :param query_object: 查询参数对象
+ :return: 字典数据列表信息对象
+ """
+ dict_data_list_result = DictDataDao.get_dict_data_list(result_db, query_object)
+
+ return dict_data_list_result
+
+ @classmethod
+ def query_dict_data_list_services(cls, result_db: Session, dict_type: str):
+ """
+ 获取字典数据列表信息service
+ :param result_db: orm对象
+ :param dict_type: 字典类型
+ :return: 字典数据列表信息对象
+ """
+ dict_data_list_result = DictDataDao.query_dict_data_list(result_db, dict_type)
+
+ return dict_data_list_result
+
+ @classmethod
+ async def init_cache_sys_dict_services(cls, result_db: Session, redis):
+ """
+ 应用初始化：获取所有字典类型对应的字典数据信息并缓存service
+ :param result_db: orm对象
+ :param redis: redis对象
+ :return:
+ """
+ # 获取以sys_dict:开头的键列表
+ keys = await redis.keys('sys_dict:*')
+ # 删除匹配的键
+ if keys:
+ await redis.delete(*keys)
+ dict_type_all = DictTypeDao.get_all_dict_type(result_db)
+ for dict_type_obj in [item for item in dict_type_all if item.status == '0']:
+ dict_type = dict_type_obj.dict_type
+ dict_data_list = DictDataDao.query_dict_data_list(result_db, dict_type)
+ dict_data = [DictDataModel(**vars(row)).dict() for row in dict_data_list if row]
+ await redis.set(f'sys_dict:{dict_type}', json.dumps(dict_data, ensure_ascii=False))
+
+ @classmethod
+ async def query_dict_data_list_from_cache_services(cls, redis, dict_type: str):
+ """
+ 从缓存获取字典数据列表信息service
+ :param redis: redis对象
+ :param dict_type: 字典类型
+ :return: 字典数据列表信息对象
+ """
+ result = []
+ dict_data_list_result = await redis.get(f'sys_dict:{dict_type}')
+ if dict_data_list_result:
+ result = json.loads(dict_data_list_result)
+
+ return result
+
+ @classmethod
+ async def add_dict_data_services(cls, request: Request, result_db: Session, page_object: DictDataModel):
+ """
+ 新增字典数据信息service
+ :param request: Request对象
+ :param result_db: orm对象
+ :param page_object: 新增岗位对象
+ :return: 新增字典数据校验结果
+ """
+ dict_data = DictDataDao.get_dict_data_detail_by_info(result_db, page_object)
+ if dict_data:
+ result = dict(is_success=False, message='字典数据已存在')
+ else:
+ try:
+ DictDataDao.add_dict_data_dao(result_db, page_object)
+ result_db.commit()
+ await cls.init_cache_sys_dict_services(result_db, request.app.state.redis)
+ result = dict(is_success=True, message='新增成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+
+ return CrudDictResponse(**result)
+
+ @classmethod
+ async def edit_dict_data_services(cls, request: Request, result_db: Session, page_object: DictDataModel):
+ """
+ 编辑字典数据信息service
+ :param request: Request对象
+ :param result_db: orm对象
+ :param page_object: 编辑字典数据对象
+ :return: 编辑字典数据校验结果
+ """
+ edit_data_type = page_object.dict(exclude_unset=True)
+ dict_data_info = cls.detail_dict_data_services(result_db, edit_data_type.get('dict_code'))
+ if dict_data_info:
+ if dict_data_info.dict_type != page_object.dict_type or dict_data_info.dict_label != page_object.dict_label or dict_data_info.dict_value != page_object.dict_value:
+ dict_data = DictDataDao.get_dict_data_detail_by_info(result_db, page_object)
+ if dict_data:
+ result = dict(is_success=False, message='字典数据已存在')
+ return CrudDictResponse(**result)
+ try:
+ DictDataDao.edit_dict_data_dao(result_db, edit_data_type)
+ result_db.commit()
+ await cls.init_cache_sys_dict_services(result_db, request.app.state.redis)
+ result = dict(is_success=True, message='更新成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='字典数据不存在')
+
+ return CrudDictResponse(**result)
+
+ @classmethod
+ async def delete_dict_data_services(cls, request: Request, result_db: Session, page_object: DeleteDictDataModel):
+ """
+ 删除字典数据信息service
+ :param request: Request对象
+ :param result_db: orm对象
+ :param page_object: 删除字典数据对象
+ :return: 删除字典数据校验结果
+ """
+ if page_object.dict_codes.split(','):
+ dict_code_list = page_object.dict_codes.split(',')
+ try:
+ for dict_code in dict_code_list:
+ dict_code_dict = dict(dict_code=dict_code)
+ DictDataDao.delete_dict_data_dao(result_db, DictDataModel(**dict_code_dict))
+ result_db.commit()
+ await cls.init_cache_sys_dict_services(result_db, request.app.state.redis)
+ result = dict(is_success=True, message='删除成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='传入字典数据id为空')
+ return CrudDictResponse(**result)
+
+ @classmethod
+ def detail_dict_data_services(cls, result_db: Session, dict_code: int):
+ """
+ 获取字典数据详细信息service
+ :param result_db: orm对象
+ :param dict_code: 字典数据id
+ :return: 字典数据id对应的信息
+ """
+ dict_data = DictDataDao.get_dict_data_detail_by_id(result_db, dict_code=dict_code)
+
+ return dict_data
+
+ @staticmethod
+ def export_dict_data_list_services(dict_data_list: List):
+ """
+ 导出字典数据信息service
+ :param dict_data_list: 字典数据信息列表
+ :return: 字典数据信息对应excel的二进制数据
+ """
+ # 创建一个映射字典，将英文键映射到中文键
+ mapping_dict = {
+ "dict_code": "字典编码",
+ "dict_sort": "字典标签",
+ "dict_label": "字典键值",
+ "dict_value": "字典排序",
+ "dict_type": "字典类型",
+ "css_class": "样式属性",
+ "list_class": "表格回显样式",
+ "is_default": "是否默认",
+ "status": "状态",
+ "create_by": "创建者",
+ "create_time": "创建时间",
+ "update_by": "更新者",
+ "update_time": "更新时间",
+ "remark": "备注",
+ }
+
+ data = [DictDataModel(**vars(row)).dict() for row in dict_data_list]
+
+ for item in data:
+ if item.get('status') == '0':
+ item['status'] = '正常'
+ else:
+ item['status'] = '停用'
+ if item.get('is_default') == 'Y':
+ item['is_default'] = '是'
+ else:
+ item['is_default'] = '否'
+ new_data = [{mapping_dict.get(key): value for key, value in item.items() if mapping_dict.get(key)} for item in data]
+ binary_data = export_list2excel(new_data)
+
+ return binary_data
diff --git a/dash-fastapi-backend/module_admin/service/job_log_service.py b/dash-fastapi-backend/module_admin/service/job_log_service.py
new file mode 100644
index 0000000000000000000000000000000000000000..f022559886e168f6c8d62d3bc074ac138d04da3b
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/service/job_log_service.py
@@ -0,0 +1,138 @@
+from module_admin.entity.vo.job_vo import *
+from module_admin.dao.job_log_dao import *
+from module_admin.dao.dict_dao import DictDataDao
+from utils.common_util import export_list2excel
+
+
+class JobLogService:
+ """
+ 定时任务日志管理模块服务层
+ """
+
+ @classmethod
+ def get_job_log_list_services(cls, result_db: Session, query_object: JobLogQueryModel):
+ """
+ 获取定时任务日志列表信息service
+ :param result_db: orm对象
+ :param query_object: 查询参数对象
+ :return: 定时任务日志列表信息对象
+ """
+ job_log_list_result = JobLogDao.get_job_log_list(result_db, query_object)
+
+ return job_log_list_result
+
+ @classmethod
+ def add_job_log_services(cls, result_db: Session, page_object: JobLogModel):
+ """
+ 新增定时任务日志信息service
+ :param result_db: orm对象
+ :param page_object: 新增定时任务日志对象
+ :return: 新增定时任务日志校验结果
+ """
+ try:
+ JobLogDao.add_job_log_dao(result_db, page_object)
+ result_db.commit()
+ result = dict(is_success=True, message='新增成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+
+ return CrudJobResponse(**result)
+
+ @classmethod
+ def delete_job_log_services(cls, result_db: Session, page_object: DeleteJobLogModel):
+ """
+ 删除定时任务日志信息service
+ :param result_db: orm对象
+ :param page_object: 删除定时任务日志对象
+ :return: 删除定时任务日志校验结果
+ """
+ if page_object.job_log_ids.split(','):
+ job_log_id_list = page_object.job_log_ids.split(',')
+ try:
+ for job_log_id in job_log_id_list:
+ job_log_id_dict = dict(job_log_id=job_log_id)
+ JobLogDao.delete_job_log_dao(result_db, JobLogModel(**job_log_id_dict))
+ result_db.commit()
+ result = dict(is_success=True, message='删除成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='传入定时任务日志id为空')
+ return CrudJobResponse(**result)
+
+ @classmethod
+ def detail_job_log_services(cls, result_db: Session, job_log_id: int):
+ """
+ 获取定时任务日志详细信息service
+ :param result_db: orm对象
+ :param job_log_id: 定时任务日志id
+ :return: 定时任务日志id对应的信息
+ """
+ job_log = JobLogDao.get_job_log_detail_by_id(result_db, job_log_id=job_log_id)
+
+ return job_log
+
+ @classmethod
+ def clear_job_log_services(cls, result_db: Session, page_object: ClearJobLogModel):
+ """
+ 清除定时任务日志信息service
+ :param result_db: orm对象
+ :param page_object: 清除定时任务日志对象
+ :return: 清除定时任务日志校验结果
+ """
+ if page_object.oper_type == 'clear':
+ try:
+ JobLogDao.clear_job_log_dao(result_db)
+ result_db.commit()
+ result = dict(is_success=True, message='清除成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='清除标识不合法')
+
+ return CrudJobResponse(**result)
+
+ @staticmethod
+ def export_job_log_list_services(result_db, job_log_list: List):
+ """
+ 导出定时任务日志信息service
+ :param result_db: orm对象
+ :param job_log_list: 定时任务日志信息列表
+ :return: 定时任务日志信息对应excel的二进制数据
+ """
+ # 创建一个映射字典，将英文键映射到中文键
+ mapping_dict = {
+ "job_log_id": "任务日志编码",
+ "job_name": "任务名称",
+ "job_group": "任务组名",
+ "job_executor": "任务执行器",
+ "invoke_target": "调用目标字符串",
+ "job_args": "位置参数",
+ "job_kwargs": "关键字参数",
+ "job_trigger": "任务触发器",
+ "job_message": "日志信息",
+ "status": "执行状态",
+ "exception_info": "异常信息",
+ "create_time": "创建时间",
+ }
+
+ data = [JobLogModel(**vars(row)).dict() for row in job_log_list]
+ job_group_list = DictDataDao.query_dict_data_list(result_db, dict_type='sys_job_group')
+ job_group_option = [dict(label=item.dict_label, value=item.dict_value) for item in job_group_list]
+ job_group_option_dict = {item.get('value'): item for item in job_group_option}
+
+ for item in data:
+ if item.get('status') == '0':
+ item['status'] = '正常'
+ else:
+ item['status'] = '暂停'
+ if str(item.get('job_group')) in job_group_option_dict.keys():
+ item['job_group'] = job_group_option_dict.get(str(item.get('job_group'))).get('label')
+ new_data = [{mapping_dict.get(key): value for key, value in item.items() if mapping_dict.get(key)} for item in
+ data]
+ binary_data = export_list2excel(new_data)
+
+ return binary_data
diff --git a/dash-fastapi-backend/module_admin/service/job_service.py b/dash-fastapi-backend/module_admin/service/job_service.py
new file mode 100644
index 0000000000000000000000000000000000000000..571c18fa861125c770cbbf1a0f04a10904a55049
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/service/job_service.py
@@ -0,0 +1,193 @@
+from module_admin.entity.vo.job_vo import *
+from module_admin.dao.job_dao import *
+from module_admin.service.dict_service import Request, DictDataService
+from utils.common_util import export_list2excel
+from config.get_scheduler import SchedulerUtil
+
+
+class JobService:
+ """
+ 定时任务管理模块服务层
+ """
+
+ @classmethod
+ def get_job_list_services(cls, result_db: Session, query_object: JobModel):
+ """
+ 获取定时任务列表信息service
+ :param result_db: orm对象
+ :param query_object: 查询参数对象
+ :return: 定时任务列表信息对象
+ """
+ job_list_result = JobDao.get_job_list(result_db, query_object)
+
+ return job_list_result
+
+ @classmethod
+ def add_job_services(cls, result_db: Session, page_object: JobModel):
+ """
+ 新增定时任务信息service
+ :param result_db: orm对象
+ :param page_object: 新增定时任务对象
+ :return: 新增定时任务校验结果
+ """
+ job = JobDao.get_job_detail_by_info(result_db, page_object)
+ if job:
+ result = dict(is_success=False, message='定时任务已存在')
+ else:
+ try:
+ JobDao.add_job_dao(result_db, page_object)
+ job_info = JobDao.get_job_detail_by_info(result_db, page_object)
+ if job_info.status == '0':
+ SchedulerUtil.add_scheduler_job(job_info=job_info)
+ result_db.commit()
+ result = dict(is_success=True, message='新增成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+
+ return CrudJobResponse(**result)
+
+ @classmethod
+ def edit_job_services(cls, result_db: Session, page_object: EditJobModel):
+ """
+ 编辑定时任务信息service
+ :param result_db: orm对象
+ :param page_object: 编辑定时任务对象
+ :return: 编辑定时任务校验结果
+ """
+ edit_job = page_object.dict(exclude_unset=True)
+ if page_object.type == 'status':
+ del edit_job['type']
+ job_info = cls.detail_job_services(result_db, edit_job.get('job_id'))
+ if job_info:
+ if page_object.type != 'status' and (job_info.job_name != page_object.job_name or job_info.job_group != page_object.job_group or job_info.invoke_target != page_object.invoke_target or job_info.cron_expression != page_object.cron_expression):
+ job = JobDao.get_job_detail_by_info(result_db, page_object)
+ if job:
+ result = dict(is_success=False, message='定时任务已存在')
+ return CrudJobResponse(**result)
+ try:
+ JobDao.edit_job_dao(result_db, edit_job)
+ query_job = SchedulerUtil.get_scheduler_job(job_id=edit_job.get('job_id'))
+ if query_job:
+ SchedulerUtil.remove_scheduler_job(job_id=edit_job.get('job_id'))
+ if edit_job.get('status') == '0':
+ SchedulerUtil.add_scheduler_job(job_info=job_info)
+ result_db.commit()
+ result = dict(is_success=True, message='更新成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='定时任务不存在')
+
+ return CrudJobResponse(**result)
+
+ @classmethod
+ def execute_job_once_services(cls, result_db: Session, page_object: JobModel):
+ """
+ 执行一次定时任务service
+ :param result_db: orm对象
+ :param page_object: 定时任务对象
+ :return: 执行一次定时任务结果
+ """
+ query_job = SchedulerUtil.get_scheduler_job(job_id=page_object.job_id)
+ if query_job:
+ SchedulerUtil.remove_scheduler_job(job_id=page_object.job_id)
+ job_info = cls.detail_job_services(result_db, page_object.job_id)
+ if job_info:
+ SchedulerUtil.execute_scheduler_job_once(job_info=job_info)
+ result = dict(is_success=True, message='执行成功')
+ else:
+ result = dict(is_success=False, message='定时任务不存在')
+
+ return CrudJobResponse(**result)
+
+ @classmethod
+ def delete_job_services(cls, result_db: Session, page_object: DeleteJobModel):
+ """
+ 删除定时任务信息service
+ :param result_db: orm对象
+ :param page_object: 删除定时任务对象
+ :return: 删除定时任务校验结果
+ """
+ if page_object.job_ids.split(','):
+ job_id_list = page_object.job_ids.split(',')
+ try:
+ for job_id in job_id_list:
+ job_id_dict = dict(job_id=job_id)
+ JobDao.delete_job_dao(result_db, JobModel(**job_id_dict))
+ result_db.commit()
+ result = dict(is_success=True, message='删除成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='传入定时任务id为空')
+ return CrudJobResponse(**result)
+
+ @classmethod
+ def detail_job_services(cls, result_db: Session, job_id: int):
+ """
+ 获取定时任务详细信息service
+ :param result_db: orm对象
+ :param job_id: 定时任务id
+ :return: 定时任务id对应的信息
+ """
+ job = JobDao.get_job_detail_by_id(result_db, job_id=job_id)
+
+ return job
+
+ @staticmethod
+ async def export_job_list_services(request: Request, job_list: List):
+ """
+ 导出定时任务信息service
+ :param request: Request对象
+ :param job_list: 定时任务信息列表
+ :return: 定时任务信息对应excel的二进制数据
+ """
+ # 创建一个映射字典，将英文键映射到中文键
+ mapping_dict = {
+ "job_id": "任务编码",
+ "job_name": "任务名称",
+ "job_group": "任务组名",
+ "job_executor": "任务执行器",
+ "invoke_target": "调用目标字符串",
+ "job_args": "位置参数",
+ "job_kwargs": "关键字参数",
+ "cron_expression": "cron执行表达式",
+ "misfire_policy": "计划执行错误策略",
+ "concurrent": "是否并发执行",
+ "status": "状态",
+ "create_by": "创建者",
+ "create_time": "创建时间",
+ "update_by": "更新者",
+ "update_time": "更新时间",
+ "remark": "备注",
+ }
+
+ data = [JobModel(**vars(row)).dict() for row in job_list]
+ job_group_list = await DictDataService.query_dict_data_list_from_cache_services(request.app.state.redis, dict_type='sys_job_group')
+ job_group_option = [dict(label=item.dict_label, value=item.dict_value) for item in job_group_list]
+ job_group_option_dict = {item.get('value'): item for item in job_group_option}
+
+ for item in data:
+ if item.get('status') == '0':
+ item['status'] = '正常'
+ else:
+ item['status'] = '暂停'
+ if str(item.get('job_group')) in job_group_option_dict.keys():
+ item['job_group'] = job_group_option_dict.get(str(item.get('job_group'))).get('label')
+ if item.get('misfire_policy') == '1':
+ item['misfire_policy'] = '立即执行'
+ elif item.get('misfire_policy') == '2':
+ item['misfire_policy'] = '执行一次'
+ else:
+ item['misfire_policy'] = '放弃执行'
+ if item.get('concurrent') == '0':
+ item['concurrent'] = '允许'
+ else:
+ item['concurrent'] = '禁止'
+ new_data = [{mapping_dict.get(key): value for key, value in item.items() if mapping_dict.get(key)} for item in data]
+ binary_data = export_list2excel(new_data)
+
+ return binary_data
diff --git a/dash-fastapi-backend/module_admin/service/log_service.py b/dash-fastapi-backend/module_admin/service/log_service.py
new file mode 100644
index 0000000000000000000000000000000000000000..6783c54a941eabfe0fc850f204ca048d61b688e1
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/service/log_service.py
@@ -0,0 +1,264 @@
+from module_admin.entity.vo.log_vo import *
+from module_admin.dao.log_dao import *
+from module_admin.service.dict_service import Request, DictDataService
+from utils.common_util import export_list2excel
+
+
+class OperationLogService:
+ """
+ 操作日志管理模块服务层
+ """
+
+ @classmethod
+ def get_operation_log_list_services(cls, result_db: Session, query_object: OperLogQueryModel):
+ """
+ 获取操作日志列表信息service
+ :param result_db: orm对象
+ :param query_object: 查询参数对象
+ :return: 操作日志列表信息对象
+ """
+ operation_log_list_result = OperationLogDao.get_operation_log_list(result_db, query_object)
+
+ return operation_log_list_result
+
+ @classmethod
+ def add_operation_log_services(cls, result_db: Session, page_object: OperLogModel):
+ """
+ 新增操作日志service
+ :param result_db: orm对象
+ :param page_object: 新增操作日志对象
+ :return: 新增操作日志校验结果
+ """
+ try:
+ OperationLogDao.add_operation_log_dao(result_db, page_object)
+ result_db.commit()
+ result = dict(is_success=True, message='新增成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+
+ return CrudLogResponse(**result)
+
+ @classmethod
+ def delete_operation_log_services(cls, result_db: Session, page_object: DeleteOperLogModel):
+ """
+ 删除操作日志信息service
+ :param result_db: orm对象
+ :param page_object: 删除操作日志对象
+ :return: 删除操作日志校验结果
+ """
+ if page_object.oper_ids.split(','):
+ oper_id_list = page_object.oper_ids.split(',')
+ try:
+ for oper_id in oper_id_list:
+ oper_id_dict = dict(oper_id=oper_id)
+ OperationLogDao.delete_operation_log_dao(result_db, OperLogModel(**oper_id_dict))
+ result_db.commit()
+ result = dict(is_success=True, message='删除成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='传入操作日志id为空')
+ return CrudLogResponse(**result)
+
+ @classmethod
+ def clear_operation_log_services(cls, result_db: Session, page_object: ClearOperLogModel):
+ """
+ 清除操作日志信息service
+ :param result_db: orm对象
+ :param page_object: 清除操作日志对象
+ :return: 清除操作日志校验结果
+ """
+ if page_object.oper_type == 'clear':
+ try:
+ OperationLogDao.clear_operation_log_dao(result_db)
+ result_db.commit()
+ result = dict(is_success=True, message='清除成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='清除标识不合法')
+
+ return CrudLogResponse(**result)
+
+ @classmethod
+ def detail_operation_log_services(cls, result_db: Session, oper_id: int):
+ """
+ 获取操作日志详细信息service
+ :param result_db: orm对象
+ :param oper_id: 操作日志id
+ :return: 操作日志id对应的信息
+ """
+ operation_log = OperationLogDao.get_operation_log_detail_by_id(result_db, oper_id=oper_id)
+
+ return operation_log
+
+ @classmethod
+ async def export_operation_log_list_services(cls, request: Request, operation_log_list: List):
+ """
+ 导出操作日志信息service
+ :param request: Request对象
+ :param operation_log_list: 操作日志信息列表
+ :return: 操作日志信息对应excel的二进制数据
+ """
+ # 创建一个映射字典，将英文键映射到中文键
+ mapping_dict = {
+ "oper_id": "日志编号",
+ "title": "系统模块",
+ "business_type": "操作类型",
+ "method": "方法名称",
+ "request_method": "请求方式",
+ "oper_name": "操作人员",
+ "dept_name": "部门名称",
+ "oper_url": "请求URL",
+ "oper_ip": "操作地址",
+ "oper_location": "操作地点",
+ "oper_param": "请求参数",
+ "json_result": "返回参数",
+ "status": "操作状态",
+ "error_msg": "错误消息",
+ "oper_time": "操作日期",
+ "cost_time": "消耗时间（毫秒）"
+ }
+
+ data = [OperLogModel(**vars(row)).dict() for row in operation_log_list]
+ operation_type_list = await DictDataService.query_dict_data_list_from_cache_services(request.app.state.redis, dict_type='sys_oper_type')
+ operation_type_option = [dict(label=item.get('dict_label'), value=item.get('dict_value')) for item in operation_type_list]
+ operation_type_option_dict = {item.get('value'): item for item in operation_type_option}
+
+ for item in data:
+ if item.get('status') == 0:
+ item['status'] = '成功'
+ else:
+ item['status'] = '失败'
+ if str(item.get('business_type')) in operation_type_option_dict.keys():
+ item['business_type'] = operation_type_option_dict.get(str(item.get('business_type'))).get('label')
+
+ new_data = [{mapping_dict.get(key): value for key, value in item.items() if mapping_dict.get(key)} for item in data]
+ binary_data = export_list2excel(new_data)
+
+ return binary_data
+
+
+class LoginLogService:
+ """
+ 登录日志管理模块服务层
+ """
+
+ @classmethod
+ def get_login_log_list_services(cls, result_db: Session, query_object: LoginLogQueryModel):
+ """
+ 获取登录日志列表信息service
+ :param result_db: orm对象
+ :param query_object: 查询参数对象
+ :return: 登录日志列表信息对象
+ """
+ operation_log_list_result = LoginLogDao.get_login_log_list(result_db, query_object)
+
+ return operation_log_list_result
+
+ @classmethod
+ def add_login_log_services(cls, result_db: Session, page_object: LogininforModel):
+ """
+ 新增登录日志service
+ :param result_db: orm对象
+ :param page_object: 新增登录日志对象
+ :return: 新增登录日志校验结果
+ """
+ try:
+ LoginLogDao.add_login_log_dao(result_db, page_object)
+ result_db.commit()
+ result = dict(is_success=True, message='新增成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+
+ return CrudLogResponse(**result)
+
+ @classmethod
+ def delete_login_log_services(cls, result_db: Session, page_object: DeleteLoginLogModel):
+ """
+ 删除操作日志信息service
+ :param result_db: orm对象
+ :param page_object: 删除操作日志对象
+ :return: 删除操作日志校验结果
+ """
+ if page_object.info_ids.split(','):
+ info_id_list = page_object.info_ids.split(',')
+ try:
+ for info_id in info_id_list:
+ info_id_dict = dict(info_id=info_id)
+ LoginLogDao.delete_login_log_dao(result_db, LogininforModel(**info_id_dict))
+ result_db.commit()
+ result = dict(is_success=True, message='删除成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='传入登录日志id为空')
+ return CrudLogResponse(**result)
+
+ @classmethod
+ def clear_login_log_services(cls, result_db: Session, page_object: ClearLoginLogModel):
+ """
+ 清除操作日志信息service
+ :param result_db: orm对象
+ :param page_object: 清除操作日志对象
+ :return: 清除操作日志校验结果
+ """
+ if page_object.oper_type == 'clear':
+ try:
+ LoginLogDao.clear_login_log_dao(result_db)
+ result_db.commit()
+ result = dict(is_success=True, message='清除成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='清除标识不合法')
+
+ return CrudLogResponse(**result)
+
+ @classmethod
+ async def unlock_user_services(cls, request: Request, unlock_user: UnlockUser):
+ locked_user = await request.app.state.redis.get(f"account_lock:{unlock_user.user_name}")
+ if locked_user:
+ await request.app.state.redis.delete(f"account_lock:{unlock_user.user_name}")
+ result = dict(is_success=True, message='解锁成功')
+ else:
+ result = dict(is_success=False, message='该用户未锁定')
+ return CrudLogResponse(**result)
+
+ @staticmethod
+ def export_login_log_list_services(login_log_list: List):
+ """
+ 导出登录日志信息service
+ :param login_log_list: 登录日志信息列表
+ :return: 登录日志信息对应excel的二进制数据
+ """
+ # 创建一个映射字典，将英文键映射到中文键
+ mapping_dict = {
+ "info_id": "访问编号",
+ "user_name": "用户名称",
+ "ipaddr": "登录地址",
+ "login_location": "登录地点",
+ "browser": "浏览器",
+ "os": "操作系统",
+ "status": "登录状态",
+ "msg": "操作信息",
+ "login_time": "登录日期"
+ }
+
+ data = [LogininforModel(**vars(row)).dict() for row in login_log_list]
+
+ for item in data:
+ if item.get('status') == '0':
+ item['status'] = '成功'
+ else:
+ item['status'] = '失败'
+ new_data = [{mapping_dict.get(key): value for key, value in item.items() if mapping_dict.get(key)} for item in data]
+ binary_data = export_list2excel(new_data)
+
+ return binary_data
diff --git a/dash-fastapi-backend/module_admin/service/login_service.py b/dash-fastapi-backend/module_admin/service/login_service.py
index 29deaefcd73b7019dd925f46496f28289f369b47..f6b54a0b0bb1fe283af8f159a03c22bef95e9067 100644
--- a/dash-fastapi-backend/module_admin/service/login_service.py
+++ b/dash-fastapi-backend/module_admin/service/login_service.py
@@ -1,20 +1,50 @@
-from module_admin.entity.vo.user_schema import *
-from module_admin.mapper.login_crud import *
-from module_admin.mapper.user_crud import *
+from fastapi import Request, Form
+from fastapi import Depends
+from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
from jose import JWTError, jwt
-from passlib.context import CryptContext
+import random
+import uuid
+from datetime import timedelta
+from typing import Dict
+from module_admin.entity.vo.user_vo import *
+from module_admin.entity.vo.login_vo import *
+from module_admin.dao.login_dao import *
+from module_admin.service.user_service import UserService
+from module_admin.dao.user_dao import *
from config.env import JwtConfig
-from module_admin.utils.response_tool import *
-from module_admin.utils.log_tool import *
-from datetime import datetime, timedelta
-from fastapi import Request
-from fastapi import Depends, Header
+from utils.pwd_util import *
+from utils.response_util import *
+from utils.message_util import *
from config.get_db import get_db
-pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
+oauth2_scheme = OAuth2PasswordBearer(tokenUrl="login/loginByAccount")
-async def get_current_user(request: Request = Request, token: str = Header(...), result_db: Session = Depends(get_db)):
+class CustomOAuth2PasswordRequestForm(OAuth2PasswordRequestForm):
+ """
+ 自定义OAuth2PasswordRequestForm类，增加验证码及会话编号参数
+ """
+ def __init__(
+ self,
+ grant_type: str = Form(default=None, regex="password"),
+ username: str = Form(),
+ password: str = Form(),
+ scope: str = Form(default=""),
+ client_id: Optional[str] = Form(default=None),
+ client_secret: Optional[str] = Form(default=None),
+ captcha: Optional[str] = Form(default=""),
+ session_id: Optional[str] = Form(default=""),
+ login_info: Optional[Dict[str, str]] = Form(default=None)
+ ):
+ super().__init__(grant_type=grant_type, username=username, password=password,
+ scope=scope, client_id=client_id, client_secret=client_secret)
+ self.captcha = captcha
+ self.session_id = session_id
+ self.login_info = login_info
+
+
+async def get_current_user(request: Request = Request, token: str = Depends(oauth2_scheme),
+ result_db: Session = Depends(get_db)):
"""
根据token获取当前用户信息
:param request: Request对象
@@ -23,12 +53,15 @@ async def get_current_user(request: Request = Request, token: str = Header(...),
:return: 当前用户信息对象
:raise: 令牌异常AuthException
"""
- if token[:6] != 'Bearer':
- logger.warning("用户token不合法")
- raise AuthException(data="", message="用户token不合法")
+ # if token[:6] != 'Bearer':
+ # logger.warning("用户token不合法")
+ # raise AuthException(data="", message="用户token不合法")
try:
- payload = jwt.decode(token[6:], JwtConfig.SECRET_KEY, algorithms=[JwtConfig.ALGORITHM])
+ if token.startswith('Bearer'):
+ token = token.split(' ')[1]
+ payload = jwt.decode(token, JwtConfig.SECRET_KEY, algorithms=[JwtConfig.ALGORITHM])
user_id: str = payload.get("user_id")
+ session_id: str = payload.get("session_id")
if user_id is None:
logger.warning("用户token不合法")
raise AuthException(data="", message="用户token不合法")
@@ -36,82 +69,151 @@ async def get_current_user(request: Request = Request, token: str = Header(...),
except JWTError:
logger.warning("用户token已失效，请重新登录")
raise AuthException(data="", message="用户token已失效，请重新登录")
- user = get_user_by_id(result_db, user_id=token_data.user_id)
+ user = UserDao.get_user_by_id(result_db, user_id=token_data.user_id)
if user is None:
logger.warning("用户token不合法")
raise AuthException(data="", message="用户token不合法")
- redis_token = await request.app.state.redis.get(f'{user.user_basic_info[0].user_id}_access_token')
- redis_session = await request.app.state.redis.get(f'{user.user_basic_info[0].user_id}_session_id')
- if token[6:] == redis_token:
- await request.app.state.redis.set(f'{user.user_basic_info[0].user_id}_access_token', redis_token,
- ex=timedelta(minutes=30))
- await request.app.state.redis.set(f'{user.user_basic_info[0].user_id}_session_id', redis_session,
- ex=timedelta(minutes=30))
- # user_dept_info = deal_user_dept_info(result_db, DeptInfo(dept_id=user.user_dept_info[0].dept_id,
- # dept_name=user.user_dept_info[0].dept_name,
- # ancestors=user.user_dept_info[0].ancestors))
- # user_role_info = deal_user_role_info(RoleInfo(role_info=user.user_role_info))
- user_menu_info = deal_user_menu_info(0, MenuList(menu_info=user.user_menu_info))
+ redis_token = await request.app.state.redis.get(f'access_token:{session_id}')
+ # 此方法可实现同一账号同一时间只能登录一次
+ # redis_token = await request.app.state.redis.get(f'{user.user_basic_info[0].user_id}_access_token')
+ # redis_session = await request.app.state.redis.get(f'{user.user_basic_info[0].user_id}_session_id')
+ if token == redis_token:
+ await request.app.state.redis.set(f'access_token:{session_id}', redis_token,
+ ex=timedelta(minutes=JwtConfig.REDIS_TOKEN_EXPIRE_MINUTES))
+ # await request.app.state.redis.set(f'{user.user_basic_info[0].user_id}_access_token', redis_token,
+ # ex=timedelta(minutes=30))
+ # await request.app.state.redis.set(f'{user.user_basic_info[0].user_id}_session_id', redis_session,
+ # ex=timedelta(minutes=30))
return CurrentUserInfoServiceResponse(
user=user.user_basic_info[0],
dept=user.user_dept_info[0],
role=user.user_role_info,
post=user.user_post_info,
- menu=user_menu_info
+ menu=user.user_menu_info
)
else:
logger.warning("用户token已失效，请重新登录")
raise AuthException(data="", message="用户token已失效，请重新登录")
-async def logout_services(request: Request, current_user: CurrentUserInfoServiceResponse):
+async def get_sms_code_services(request: Request, result_db: Session, user: ResetUserModel):
"""
- 退出登录services
+ 获取短信验证码service
:param request: Request对象
- :param current_user: 用户用户
- :return: 退出登录结果
+ :param result_db: orm对象
+ :param user: 用户对象
+ :return: 短信验证码对象
"""
- await request.app.state.redis.delete(f'{current_user.user.user_id}_access_token')
- await request.app.state.redis.delete(f'{current_user.user.user_id}_session_id')
+ redis_sms_result = await request.app.state.redis.get(f"sms_code:{user.session_id}")
+ if redis_sms_result:
+ return SmsCode(**dict(is_success=False, sms_code='', session_id='', message='短信验证码仍在有效期内'))
+ is_user = UserDao.get_user_by_name(result_db, user.user_name)
+ if is_user:
+ sms_code = str(random.randint(100000, 999999))
+ session_id = str(uuid.uuid4())
+ await request.app.state.redis.set(f"sms_code:{session_id}", sms_code, ex=timedelta(minutes=2))
+ # 此处模拟调用短信服务
+ message_service(sms_code)
- return True
+ return SmsCode(**dict(is_success=True, sms_code=sms_code, session_id=session_id, message='获取成功'))
+ return SmsCode(**dict(is_success=False, sms_code='', session_id='', message='用户不存在'))
-def verify_password(plain_password, hashed_password):
+
+async def forget_user_services(request: Request, result_db: Session, forget_user: ResetUserModel):
"""
- 工具方法：校验当前输入的密码与数据库存储的密码是否一致
- :param plain_password: 当前输入的密码
- :param hashed_password: 数据库存储的密码
- :return: 校验结果
+ 用户忘记密码services
+ :param request: Request对象
+ :param result_db: orm对象
+ :param forget_user: 重置用户对象
+ :return: 重置结果
"""
- return pwd_context.verify(plain_password, hashed_password)
+ redis_sms_result = await request.app.state.redis.get(f"sms_code:{forget_user.session_id}")
+ if forget_user.sms_code == redis_sms_result:
+ forget_user.password = PwdUtil.get_password_hash(forget_user.password)
+ forget_user.user_id = UserDao.get_user_by_name(result_db, forget_user.user_name).user_id
+ edit_result = UserService.reset_user_services(result_db, forget_user)
+ result = edit_result.dict()
+ elif not redis_sms_result:
+ result = dict(is_success=False, message='短信验证码已过期')
+ else:
+ await request.app.state.redis.delete(f"sms_code:{forget_user.session_id}")
+ result = dict(is_success=False, message='短信验证码不正确')
+ return CrudUserResponse(**result)
-def get_password_hash(input_password):
+
+async def logout_services(request: Request, session_id: str):
+ """
+ 退出登录services
+ :param request: Request对象
+ :param session_id: 会话编号
+ :return: 退出登录结果
+ """
+ await request.app.state.redis.delete(f'access_token:{session_id}')
+ # await request.app.state.redis.delete(f'{current_user.user.user_id}_access_token')
+ # await request.app.state.redis.delete(f'{current_user.user.user_id}_session_id')
+
+ return True
+
+
+async def check_login_captcha(request: Request, login_user: UserLogin):
"""
- 工具方法：对当前输入的密码进行加密
- :param input_password: 输入的密码
- :return: 加密成功的密码
+ 校验用户登录验证码
+ :param request: Request对象
+ :param login_user: 登录用户对象
+ :return: 校验结果
"""
- return pwd_context.hash(input_password)
+ captcha_value = await request.app.state.redis.get(f'captcha_codes:{login_user.session_id}')
+ if not captcha_value:
+ logger.warning("验证码已失效")
+ raise LoginException(data="", message="验证码已失效")
+ if login_user.captcha != str(captcha_value):
+ logger.warning("验证码错误")
+ raise LoginException(data="", message="验证码错误")
+ return True
-def authenticate_user(query_db: Session, user_name: str, input_password: str):
+async def authenticate_user(request: Request, query_db: Session, login_user: UserLogin):
"""
根据用户名密码校验用户登录
+ :param request: Request对象
:param query_db: orm对象
- :param user_name: 用户名
- :param input_password: 用户密码
+ :param login_user: 登录用户对象
:return: 校验结果
"""
- user = login_by_account(query_db, user_name)
+ account_lock = await request.app.state.redis.get(f"account_lock:{login_user.user_name}")
+ if login_user.user_name == account_lock:
+ logger.warning("账号已锁定，请稍后再试")
+ raise LoginException(data="", message="账号已锁定，请稍后再试")
+ # 判断是否开启验证码，开启则验证，否则不验证
+ if login_user.captcha_enabled:
+ await check_login_captcha(request, login_user)
+ user = login_by_account(query_db, login_user.user_name)
if not user:
- return '用户不存在'
- if not verify_password(input_password, user.password):
- return '密码错误'
- if user.status == '1':
- return '用户已停用'
+ logger.warning("用户不存在")
+ raise LoginException(data="", message="用户不存在")
+ if not PwdUtil.verify_password(login_user.password, user[0].password):
+ cache_password_error_count = await request.app.state.redis.get(f"password_error_count:{login_user.user_name}")
+ password_error_counted = 0
+ if cache_password_error_count:
+ password_error_counted = cache_password_error_count
+ password_error_count = int(password_error_counted) + 1
+ await request.app.state.redis.set(f"password_error_count:{login_user.user_name}", password_error_count,
+ ex=timedelta(minutes=10))
+ if password_error_count > 5:
+ await request.app.state.redis.delete(f"password_error_count:{login_user.user_name}")
+ await request.app.state.redis.set(f"account_lock:{login_user.user_name}", login_user.user_name,
+ ex=timedelta(minutes=10))
+ logger.warning("10分钟内密码已输错超过5次，账号已锁定，请10分钟后再试")
+ raise LoginException(data="", message="10分钟内密码已输错超过5次，账号已锁定，请10分钟后再试")
+ logger.warning("密码错误")
+ raise LoginException(data="", message="密码错误")
+ if user[0].status == '1':
+ logger.warning("用户已停用")
+ raise LoginException(data="", message="用户已停用")
+ await request.app.state.redis.delete(f"password_error_count:{login_user.user_name}")
return user
@@ -137,7 +239,7 @@ def deal_user_dept_info(db: Session, dept_info: DeptInfo):
dept_ancestors = dept_info.ancestors.split(',')
tmp_dept_list = []
for item in dept_ancestors:
- dept_obj = get_user_dept_info(db, int(item))
+ dept_obj = UserDao.get_user_dept_info(db, int(item))
if dept_obj:
tmp_dept_list.append(dept_obj.dept_name)
tmp_dept_list.append(tmp_dept_name)
diff --git a/dash-fastapi-backend/module_admin/service/menu_service.py b/dash-fastapi-backend/module_admin/service/menu_service.py
index f3465ecd6daf4a4c3d4d0bdaf894e4e4a0db1ce7..203495d32d9203470046f5381f782333330894d3 100644
--- a/dash-fastapi-backend/module_admin/service/menu_service.py
+++ b/dash-fastapi-backend/module_admin/service/menu_service.py
@@ -1,128 +1,170 @@
-from module_admin.entity.vo.menu_schema import *
-from module_admin.mapper.menu_crud import *
-
-
-def get_menu_tree_services(result_db: Session, page_object: MenuTreeModel):
- """
- 获取菜单树信息service
- :param result_db: orm对象
- :param page_object: 查询参数对象
- :return: 菜单树信息对象
- """
- menu_tree_option = []
- menu_list_result = get_menu_list_for_tree(result_db, MenuModel(**page_object.dict()))
- menu_tree_result = get_menu_tree(0, MenuTree(menu_tree=menu_list_result))
- if page_object.type != 'role':
+from module_admin.entity.vo.menu_vo import *
+from module_admin.dao.menu_dao import *
+from module_admin.entity.vo.user_vo import CurrentUserInfoServiceResponse
+
+
+class MenuService:
+ """
+ 菜单管理模块服务层
+ """
+
+ @classmethod
+ def get_menu_tree_services(cls, result_db: Session, page_object: MenuTreeModel, current_user: Optional[CurrentUserInfoServiceResponse] = None):
+ """
+ 获取菜单树信息service
+ :param result_db: orm对象
+ :param page_object: 查询参数对象
+ :param current_user: 当前用户对象
+ :return: 菜单树信息对象
+ """
+ menu_tree_option = []
+ menu_list_result = MenuDao.get_menu_list_for_tree(result_db, MenuModel(**page_object.dict()), current_user.user.user_id, current_user.role)
+ menu_tree_result = cls.get_menu_tree(0, MenuTree(menu_tree=menu_list_result))
+ if page_object.type != 'role':
+ menu_tree_option.append(dict(title='主类目', value='0', key='0', children=menu_tree_result))
+ else:
+ menu_tree_option = [menu_tree_result, menu_list_result]
+
+ return menu_tree_option
+
+ @classmethod
+ def get_menu_tree_for_edit_option_services(cls, result_db: Session, page_object: MenuModel, current_user: Optional[CurrentUserInfoServiceResponse] = None):
+ """
+ 获取菜单编辑菜单树信息service
+ :param result_db: orm对象
+ :param page_object: 查询参数对象
+ :param current_user: 当前用户
+ :return: 菜单树信息对象
+ """
+ menu_tree_option = []
+ menu_list_result = MenuDao.get_menu_info_for_edit_option(result_db, page_object, current_user.user.user_id, current_user.role)
+ menu_tree_result = cls.get_menu_tree(0, MenuTree(menu_tree=menu_list_result))
menu_tree_option.append(dict(title='主类目', value='0', key='0', children=menu_tree_result))
- else:
- menu_tree_option = [menu_tree_result, menu_list_result]
-
- return menu_tree_option
-
-
-def get_menu_tree_for_edit_option_services(result_db: Session, page_object: MenuModel):
- """
- 获取菜单编辑菜单树信息service
- :param result_db: orm对象
- :param page_object: 查询参数对象
- :return: 菜单树信息对象
- """
- menu_tree_option = []
- menu_list_result = get_menu_info_for_edit_option(result_db, page_object)
- menu_tree_result = get_menu_tree(0, MenuTree(menu_tree=menu_list_result))
- menu_tree_option.append(dict(title='主类目', value='0', key='0', children=menu_tree_result))
- return menu_tree_option
-
-
-def get_menu_list_services(result_db: Session, page_object: MenuModel):
- """
- 获取菜单列表信息service
- :param result_db: orm对象
- :param page_object: 分页查询参数对象
- :return: 菜单列表信息对象
- """
- menu_list_result = get_menu_list(result_db, page_object)
-
- return menu_list_result
-
-
-def add_menu_services(result_db: Session, page_object: MenuModel):
- """
- 新增菜单信息service
- :param result_db: orm对象
- :param page_object: 新增菜单对象
- :return: 新增菜单校验结果
- """
- add_menu_result = add_menu_crud(result_db, page_object)
-
- return add_menu_result
-
-
-def edit_menu_services(result_db: Session, page_object: MenuModel):
- """
- 编辑菜单信息service
- :param result_db: orm对象
- :param page_object: 编辑部门对象
- :return: 编辑菜单校验结果
- """
- edit_menu = page_object.dict(exclude_unset=True)
- edit_menu_result = edit_menu_crud(result_db, edit_menu)
-
- return edit_menu_result
-
-
-def delete_menu_services(result_db: Session, page_object: DeleteMenuModel):
- """
- 删除菜单信息service
- :param result_db: orm对象
- :param page_object: 删除菜单对象
- :return: 删除菜单校验结果
- """
- if page_object.menu_ids.split(','):
- menu_id_list = page_object.menu_ids.split(',')
- for menu_id in menu_id_list:
- menu_id_dict = dict(menu_id=menu_id)
- delete_menu_crud(result_db, MenuModel(**menu_id_dict))
- result = dict(is_success=True, message='删除成功')
- else:
- result = dict(is_success=False, message='传入用户id为空')
- return CrudMenuResponse(**result)
-
-
-def detail_menu_services(result_db: Session, menu_id: int):
- """
- 获取菜单详细信息service
- :param result_db: orm对象
- :param menu_id: 菜单id
- :return: 菜单id对应的信息
- """
- menu = get_menu_detail_by_id(result_db, menu_id=menu_id)
-
- return menu
-
-
-def get_menu_tree(pid: int, permission_list: MenuTree):
- """
- 工具方法：根据菜单信息生成树形嵌套数据
- :param pid: 菜单id
- :param permission_list: 菜单列表信息
- :return: 菜单树形嵌套数据
- """
- menu_list = []
- for permission in permission_list.menu_tree:
- if permission.parent_id == pid:
- children = get_menu_tree(permission.menu_id, permission_list)
- menu_list_data = {}
- if children:
- menu_list_data['title'] = permission.menu_name
- menu_list_data['key'] = str(permission.menu_id)
- menu_list_data['value'] = str(permission.menu_id)
- menu_list_data['children'] = children
- else:
- menu_list_data['title'] = permission.menu_name
- menu_list_data['key'] = str(permission.menu_id)
- menu_list_data['value'] = str(permission.menu_id)
- menu_list.append(menu_list_data)
-
- return menu_list
+ return menu_tree_option
+
+ @classmethod
+ def get_menu_list_services(cls, result_db: Session, page_object: MenuModel, current_user: Optional[CurrentUserInfoServiceResponse] = None):
+ """
+ 获取菜单列表信息service
+ :param result_db: orm对象
+ :param page_object: 分页查询参数对象
+ :param current_user: 当前用户对象
+ :return: 菜单列表信息对象
+ """
+ menu_list_result = MenuDao.get_menu_list(result_db, page_object, current_user.user.user_id, current_user.role)
+
+ return menu_list_result
+
+ @classmethod
+ def add_menu_services(cls, result_db: Session, page_object: MenuModel):
+ """
+ 新增菜单信息service
+ :param result_db: orm对象
+ :param page_object: 新增菜单对象
+ :return: 新增菜单校验结果
+ """
+ menu = MenuDao.get_menu_detail_by_info(result_db, MenuModel(
+ **dict(parent_id=page_object.parent_id, menu_name=page_object.menu_name, menu_type=page_object.menu_type)))
+ if menu:
+ result = dict(is_success=False, message='同一目录下不允许存在同名同类型的菜单')
+ else:
+ try:
+ MenuDao.add_menu_dao(result_db, page_object)
+ result_db.commit()
+ result = dict(is_success=True, message='新增成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+
+ return CrudMenuResponse(**result)
+
+ @classmethod
+ def edit_menu_services(cls, result_db: Session, page_object: MenuModel):
+ """
+ 编辑菜单信息service
+ :param result_db: orm对象
+ :param page_object: 编辑部门对象
+ :return: 编辑菜单校验结果
+ """
+ edit_menu = page_object.dict(exclude_unset=True)
+ menu_info = cls.detail_menu_services(result_db, edit_menu.get('menu_id'))
+ if menu_info:
+ if menu_info.parent_id != page_object.parent_id or menu_info.menu_name != page_object.menu_name or menu_info.menu_type != page_object.menu_type:
+ menu = MenuDao.get_menu_detail_by_info(result_db, MenuModel(
+ **dict(parent_id=page_object.parent_id, menu_name=page_object.menu_name, menu_type=page_object.menu_type)))
+ if menu:
+ result = dict(is_success=False, message='同一目录下不允许存在同名同类型的菜单')
+ return CrudMenuResponse(**result)
+ try:
+ MenuDao.edit_menu_dao(result_db, edit_menu)
+ result_db.commit()
+ result = dict(is_success=True, message='更新成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='菜单不存在')
+
+ return CrudMenuResponse(**result)
+
+ @classmethod
+ def delete_menu_services(cls, result_db: Session, page_object: DeleteMenuModel):
+ """
+ 删除菜单信息service
+ :param result_db: orm对象
+ :param page_object: 删除菜单对象
+ :return: 删除菜单校验结果
+ """
+ if page_object.menu_ids.split(','):
+ menu_id_list = page_object.menu_ids.split(',')
+ try:
+ for menu_id in menu_id_list:
+ menu_id_dict = dict(menu_id=menu_id)
+ MenuDao.delete_menu_dao(result_db, MenuModel(**menu_id_dict))
+ result_db.commit()
+ result = dict(is_success=True, message='删除成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='传入菜单id为空')
+ return CrudMenuResponse(**result)
+
+ @classmethod
+ def detail_menu_services(cls, result_db: Session, menu_id: int):
+ """
+ 获取菜单详细信息service
+ :param result_db: orm对象
+ :param menu_id: 菜单id
+ :return: 菜单id对应的信息
+ """
+ menu = MenuDao.get_menu_detail_by_id(result_db, menu_id=menu_id)
+
+ return menu
+
+ @classmethod
+ def get_menu_tree(cls, pid: int, permission_list: MenuTree):
+ """
+ 工具方法：根据菜单信息生成树形嵌套数据
+ :param pid: 菜单id
+ :param permission_list: 菜单列表信息
+ :return: 菜单树形嵌套数据
+ """
+ menu_list = []
+ for permission in permission_list.menu_tree:
+ if permission.parent_id == pid:
+ children = cls.get_menu_tree(permission.menu_id, permission_list)
+ menu_list_data = {}
+ if children:
+ menu_list_data['title'] = permission.menu_name
+ menu_list_data['key'] = str(permission.menu_id)
+ menu_list_data['value'] = str(permission.menu_id)
+ menu_list_data['children'] = children
+ else:
+ menu_list_data['title'] = permission.menu_name
+ menu_list_data['key'] = str(permission.menu_id)
+ menu_list_data['value'] = str(permission.menu_id)
+ menu_list.append(menu_list_data)
+
+ return menu_list
diff --git a/dash-fastapi-backend/module_admin/service/notice_service.py b/dash-fastapi-backend/module_admin/service/notice_service.py
new file mode 100644
index 0000000000000000000000000000000000000000..a96c9a984e5dd7654d844dbbe798f4a1b75003a6
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/service/notice_service.py
@@ -0,0 +1,105 @@
+from module_admin.entity.vo.notice_vo import *
+from module_admin.dao.notice_dao import *
+
+
+class NoticeService:
+ """
+ 通知公告管理模块服务层
+ """
+
+ @classmethod
+ def get_notice_list_services(cls, result_db: Session, query_object: NoticeQueryModel):
+ """
+ 获取通知公告列表信息service
+ :param result_db: orm对象
+ :param query_object: 查询参数对象
+ :return: 通知公告列表信息对象
+ """
+ notice_list_result = NoticeDao.get_notice_list(result_db, query_object)
+
+ return notice_list_result
+
+ @classmethod
+ def add_notice_services(cls, result_db: Session, page_object: NoticeModel):
+ """
+ 新增通知公告信息service
+ :param result_db: orm对象
+ :param page_object: 新增通知公告对象
+ :return: 新增通知公告校验结果
+ """
+ notice = NoticeDao.get_notice_detail_by_info(result_db, page_object)
+ if notice:
+ result = dict(is_success=False, message='通知公告已存在')
+ else:
+ try:
+ NoticeDao.add_notice_dao(result_db, page_object)
+ result_db.commit()
+ result = dict(is_success=True, message='新增成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+
+ return CrudNoticeResponse(**result)
+
+ @classmethod
+ def edit_notice_services(cls, result_db: Session, page_object: NoticeModel):
+ """
+ 编辑通知公告信息service
+ :param result_db: orm对象
+ :param page_object: 编辑通知公告对象
+ :return: 编辑通知公告校验结果
+ """
+ edit_notice = page_object.dict(exclude_unset=True)
+ notice_info = cls.detail_notice_services(result_db, edit_notice.get('notice_id'))
+ if notice_info:
+ if notice_info.notice_title != page_object.notice_title or notice_info.notice_type != page_object.notice_type or notice_info.notice_content != page_object.notice_content:
+ notice = NoticeDao.get_notice_detail_by_info(result_db, page_object)
+ if notice:
+ result = dict(is_success=False, message='通知公告已存在')
+ return CrudNoticeResponse(**result)
+ try:
+ NoticeDao.edit_notice_dao(result_db, edit_notice)
+ result_db.commit()
+ result = dict(is_success=True, message='更新成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='通知公告不存在')
+
+ return CrudNoticeResponse(**result)
+
+ @classmethod
+ def delete_notice_services(cls, result_db: Session, page_object: DeleteNoticeModel):
+ """
+ 删除通知公告信息service
+ :param result_db: orm对象
+ :param page_object: 删除通知公告对象
+ :return: 删除通知公告校验结果
+ """
+ if page_object.notice_ids.split(','):
+ notice_id_list = page_object.notice_ids.split(',')
+ try:
+ for notice_id in notice_id_list:
+ notice_id_dict = dict(notice_id=notice_id)
+ NoticeDao.delete_notice_dao(result_db, NoticeModel(**notice_id_dict))
+ result_db.commit()
+ result = dict(is_success=True, message='删除成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='传入通知公告id为空')
+ return CrudNoticeResponse(**result)
+
+ @classmethod
+ def detail_notice_services(cls, result_db: Session, notice_id: int):
+ """
+ 获取通知公告详细信息service
+ :param result_db: orm对象
+ :param notice_id: 通知公告id
+ :return: 通知公告id对应的信息
+ """
+ notice = NoticeDao.get_notice_detail_by_id(result_db, notice_id=notice_id)
+
+ return notice
diff --git a/dash-fastapi-backend/module_admin/service/online_service.py b/dash-fastapi-backend/module_admin/service/online_service.py
new file mode 100644
index 0000000000000000000000000000000000000000..902acdffabd5c2d5fafb333857e744d8219fdfa8
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/service/online_service.py
@@ -0,0 +1,69 @@
+from fastapi import Request
+from jose import jwt
+from config.env import JwtConfig
+from module_admin.entity.vo.online_vo import *
+
+
+class OnlineService:
+ """
+ 在线用户管理模块服务层
+ """
+
+ @classmethod
+ async def get_online_list_services(cls, request: Request, query_object: OnlinePageObject):
+ """
+ 获取在线用户表信息service
+ :param request: Request对象
+ :param query_object: 查询参数对象
+ :return: 在线用户列表信息
+ """
+ access_token_keys = await request.app.state.redis.keys('access_token*')
+ if not access_token_keys:
+ access_token_keys = []
+ access_token_values_list = [await request.app.state.redis.get(key) for key in access_token_keys]
+ online_info_list = []
+ for item in access_token_values_list:
+ payload = jwt.decode(item, JwtConfig.SECRET_KEY, algorithms=[JwtConfig.ALGORITHM])
+ online_dict = dict(
+ session_id=payload.get('session_id'),
+ user_name=payload.get('user_name'),
+ dept_name=payload.get('dept_name'),
+ ipaddr=payload.get('login_info').get('ipaddr'),
+ login_location=payload.get('login_info').get('login_location'),
+ browser=payload.get('login_info').get('browser'),
+ os=payload.get('login_info').get('os'),
+ login_time=payload.get('login_info').get('login_time')
+ )
+ if query_object.user_name and not query_object.ipaddr:
+ if query_object.user_name == payload.get('user_name'):
+ online_info_list = [online_dict]
+ break
+ elif not query_object.user_name and query_object.ipaddr:
+ if query_object.ipaddr == payload.get('ipaddr'):
+ online_info_list = [online_dict]
+ break
+ elif query_object.user_name and query_object.ipaddr:
+ if query_object.user_name == payload.get('user_name') and query_object.ipaddr == payload.get('ipaddr'):
+ online_info_list = [online_dict]
+ break
+ else:
+ online_info_list.append(online_dict)
+
+ return online_info_list
+
+ @classmethod
+ async def delete_online_services(cls, request: Request, page_object: DeleteOnlineModel):
+ """
+ 强退在线用户信息service
+ :param request: Request对象
+ :param page_object: 强退在线用户对象
+ :return: 强退在线用户校验结果
+ """
+ if page_object.session_ids.split(','):
+ session_id_list = page_object.session_ids.split(',')
+ for session_id in session_id_list:
+ await request.app.state.redis.delete(f'access_token:{session_id}')
+ result = dict(is_success=True, message='强退成功')
+ else:
+ result = dict(is_success=False, message='传入session_id为空')
+ return CrudOnlineResponse(**result)
diff --git a/dash-fastapi-backend/module_admin/service/post_service.py b/dash-fastapi-backend/module_admin/service/post_service.py
index 6151ed89c0343100667c5b4ffabb1c554209c7a9..16e954fb24f908688d0672f1232e8331fe79ec9c 100644
--- a/dash-fastapi-backend/module_admin/service/post_service.py
+++ b/dash-fastapi-backend/module_admin/service/post_service.py
@@ -1,80 +1,150 @@
-from module_admin.entity.vo.post_schema import *
-from module_admin.mapper.post_crud import *
+from module_admin.entity.vo.post_vo import *
+from module_admin.dao.post_dao import *
+from utils.common_util import export_list2excel
-def get_post_select_option_services(result_db: Session):
+class PostService:
"""
- 获取岗位列表不分页信息service
- :param result_db: orm对象
- :return: 岗位列表不分页信息对象
+ 岗位管理模块服务层
"""
- post_list_result = get_post_select_option_crud(result_db)
- return post_list_result
-
-
-def get_post_list_services(result_db: Session, page_object: PostPageObject):
- """
- 获取岗位列表信息service
- :param result_db: orm对象
- :param page_object: 分页查询参数对象
- :return: 岗位列表信息对象
- """
- post_list_result = get_post_list(result_db, page_object)
-
- return post_list_result
-
-
-def add_post_services(result_db: Session, page_object: PostModel):
- """
- 新增岗位信息service
- :param result_db: orm对象
- :param page_object: 新增岗位对象
- :return: 新增岗位校验结果
- """
- add_post_result = add_post_crud(result_db, page_object)
-
- return add_post_result
-
-
-def edit_post_services(result_db: Session, page_object: PostModel):
- """
- 编辑岗位信息service
- :param result_db: orm对象
- :param page_object: 编辑岗位对象
- :return: 编辑岗位校验结果
- """
- edit_post = page_object.dict(exclude_unset=True)
- edit_post_result = edit_post_crud(result_db, edit_post)
-
- return edit_post_result
-
-
-def delete_post_services(result_db: Session, page_object: DeletePostModel):
- """
- 删除岗位信息service
- :param result_db: orm对象
- :param page_object: 删除岗位对象
- :return: 删除岗位校验结果
- """
- if page_object.post_ids.split(','):
- post_id_list = page_object.post_ids.split(',')
- for post_id in post_id_list:
- post_id_dict = dict(post_id=post_id)
- delete_post_crud(result_db, PostModel(**post_id_dict))
- result = dict(is_success=True, message='删除成功')
- else:
- result = dict(is_success=False, message='传入用户id为空')
- return CrudPostResponse(**result)
-
-
-def detail_post_services(result_db: Session, post_id: int):
- """
- 获取岗位详细信息service
- :param result_db: orm对象
- :param post_id: 岗位id
- :return: 岗位id对应的信息
- """
- post = get_post_detail_by_id(result_db, post_id=post_id)
-
- return post
+ @classmethod
+ def get_post_select_option_services(cls, result_db: Session):
+ """
+ 获取岗位列表不分页信息service
+ :param result_db: orm对象
+ :return: 岗位列表不分页信息对象
+ """
+ post_list_result = PostDao.get_post_select_option_dao(result_db)
+
+ return post_list_result
+
+ @classmethod
+ def get_post_list_services(cls, result_db: Session, query_object: PostModel):
+ """
+ 获取岗位列表信息service
+ :param result_db: orm对象
+ :param query_object: 查询参数对象
+ :return: 岗位列表信息对象
+ """
+ post_list_result = PostDao.get_post_list(result_db, query_object)
+
+ return post_list_result
+
+ @classmethod
+ def add_post_services(cls, result_db: Session, page_object: PostModel):
+ """
+ 新增岗位信息service
+ :param result_db: orm对象
+ :param page_object: 新增岗位对象
+ :return: 新增岗位校验结果
+ """
+ post = PostDao.get_post_detail_by_info(result_db, PostModel(**dict(post_name=page_object.post_name)))
+ if post:
+ result = dict(is_success=False, message='岗位名称已存在')
+ else:
+ try:
+ PostDao.add_post_dao(result_db, page_object)
+ result_db.commit()
+ result = dict(is_success=True, message='新增成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+
+ return CrudPostResponse(**result)
+
+ @classmethod
+ def edit_post_services(cls, result_db: Session, page_object: PostModel):
+ """
+ 编辑岗位信息service
+ :param result_db: orm对象
+ :param page_object: 编辑岗位对象
+ :return: 编辑岗位校验结果
+ """
+ edit_post = page_object.dict(exclude_unset=True)
+ post_info = cls.detail_post_services(result_db, edit_post.get('post_id'))
+ if post_info:
+ if post_info.post_name != page_object.post_name:
+ post = PostDao.get_post_detail_by_info(result_db, PostModel(**dict(post_name=page_object.post_name)))
+ if post:
+ result = dict(is_success=False, message='岗位名称已存在')
+ return CrudPostResponse(**result)
+ try:
+ PostDao.edit_post_dao(result_db, edit_post)
+ result_db.commit()
+ result = dict(is_success=True, message='更新成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='岗位不存在')
+
+ return CrudPostResponse(**result)
+
+ @classmethod
+ def delete_post_services(cls, result_db: Session, page_object: DeletePostModel):
+ """
+ 删除岗位信息service
+ :param result_db: orm对象
+ :param page_object: 删除岗位对象
+ :return: 删除岗位校验结果
+ """
+ if page_object.post_ids.split(','):
+ post_id_list = page_object.post_ids.split(',')
+ try:
+ for post_id in post_id_list:
+ post_id_dict = dict(post_id=post_id)
+ PostDao.delete_post_dao(result_db, PostModel(**post_id_dict))
+ result_db.commit()
+ result = dict(is_success=True, message='删除成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='传入岗位id为空')
+ return CrudPostResponse(**result)
+
+ @classmethod
+ def detail_post_services(cls, result_db: Session, post_id: int):
+ """
+ 获取岗位详细信息service
+ :param result_db: orm对象
+ :param post_id: 岗位id
+ :return: 岗位id对应的信息
+ """
+ post = PostDao.get_post_detail_by_id(result_db, post_id=post_id)
+
+ return post
+
+ @staticmethod
+ def export_post_list_services(post_list: List):
+ """
+ 导出岗位信息service
+ :param post_list: 岗位信息列表
+ :return: 岗位信息对应excel的二进制数据
+ """
+ # 创建一个映射字典，将英文键映射到中文键
+ mapping_dict = {
+ "post_id": "岗位编号",
+ "post_code": "岗位编码",
+ "post_name": "岗位名称",
+ "post_sort": "显示顺序",
+ "status": "状态",
+ "create_by": "创建者",
+ "create_time": "创建时间",
+ "update_by": "更新者",
+ "update_time": "更新时间",
+ "remark": "备注",
+ }
+
+ data = [PostModel(**vars(row)).dict() for row in post_list]
+
+ for item in data:
+ if item.get('status') == '0':
+ item['status'] = '正常'
+ else:
+ item['status'] = '停用'
+ new_data = [{mapping_dict.get(key): value for key, value in item.items() if mapping_dict.get(key)} for item in data]
+ binary_data = export_list2excel(new_data)
+
+ return binary_data
diff --git a/dash-fastapi-backend/module_admin/service/role_service.py b/dash-fastapi-backend/module_admin/service/role_service.py
index ff0b1e9c9058085a2adba8a0a4ce0cee46e1ee91..06a98677d6d8b9d64f7d4f08a9d2e61d7648f583 100644
--- a/dash-fastapi-backend/module_admin/service/role_service.py
+++ b/dash-fastapi-backend/module_admin/service/role_service.py
@@ -1,101 +1,170 @@
-from module_admin.entity.vo.role_schema import *
-from module_admin.mapper.role_crud import *
+from module_admin.entity.vo.role_vo import *
+from module_admin.dao.role_dao import *
+from utils.common_util import export_list2excel
-def get_role_select_option_services(result_db: Session):
+class RoleService:
"""
- 获取角色列表不分页信息service
- :param result_db: orm对象
- :return: 角色列表不分页信息对象
+ 角色管理模块服务层
"""
- role_list_result = get_role_select_option_crud(result_db)
- return role_list_result
-
-
-def get_role_list_services(result_db: Session, page_object: RolePageObject):
- """
- 获取角色列表信息service
- :param result_db: orm对象
- :param page_object: 分页查询参数对象
- :return: 角色列表信息对象
- """
- role_list_result = get_role_list(result_db, page_object)
-
- return role_list_result
-
-
-def add_role_services(result_db: Session, page_object: AddRoleModel):
- """
- 新增角色信息service
- :param result_db: orm对象
- :param page_object: 新增角色对象
- :return: 新增角色校验结果
- """
- add_role = RoleModel(**page_object.dict())
- add_role_result = add_role_crud(result_db, add_role)
- if add_role_result.is_success:
- role_id = get_role_by_name(result_db, page_object.role_name).role_id
- if page_object.menu_id:
- menu_id_list = page_object.menu_id.split(',')
- for menu in menu_id_list:
- menu_dict = dict(role_id=role_id, menu_id=menu)
- add_role_menu_crud(result_db, RoleMenuModel(**menu_dict))
-
- return add_role_result
-
-
-def edit_role_services(result_db: Session, page_object: AddRoleModel):
- """
- 编辑角色信息service
- :param result_db: orm对象
- :param page_object: 编辑角色对象
- :return: 编辑角色校验结果
- """
- edit_role = page_object.dict(exclude_unset=True)
- if page_object.type != 'status':
- del edit_role['menu_id']
- if page_object.type == 'status':
- del edit_role['type']
- edit_role_result = edit_role_crud(result_db, edit_role)
- if edit_role_result.is_success and page_object.type != 'status':
- role_id_dict = dict(role_id=page_object.role_id)
- delete_role_menu_crud(result_db, RoleMenuModel(**role_id_dict))
- if page_object.menu_id:
- menu_id_list = page_object.menu_id.split(',')
- for menu in menu_id_list:
- menu_dict = dict(role_id=page_object.role_id, menu_id=menu)
- add_role_menu_crud(result_db, RoleMenuModel(**menu_dict))
-
- return edit_role_result
-
-
-def delete_role_services(result_db: Session, page_object: DeleteRoleModel):
- """
- 删除角色信息service
- :param result_db: orm对象
- :param page_object: 删除角色对象
- :return: 删除角色校验结果
- """
- if page_object.role_ids.split(','):
- role_id_list = page_object.role_ids.split(',')
- for role_id in role_id_list:
- role_id_dict = dict(role_id=role_id, update_by=page_object.update_by, update_time=page_object.update_time)
- delete_role_menu_crud(result_db, RoleMenuModel(**role_id_dict))
- delete_role_crud(result_db, RoleModel(**role_id_dict))
- result = dict(is_success=True, message='删除成功')
- else:
- result = dict(is_success=False, message='传入角色id为空')
- return CrudRoleResponse(**result)
-
-
-def detail_role_services(result_db: Session, role_id: int):
- """
- 获取角色详细信息service
- :param result_db: orm对象
- :param role_id: 角色id
- :return: 角色id对应的信息
- """
- role = get_role_detail_by_id(result_db, role_id=role_id)
-
- return role
+ @classmethod
+ def get_role_select_option_services(cls, result_db: Session):
+ """
+ 获取角色列表不分页信息service
+ :param result_db: orm对象
+ :return: 角色列表不分页信息对象
+ """
+ role_list_result = RoleDao.get_role_select_option_dao(result_db)
+
+ return role_list_result
+
+ @classmethod
+ def get_role_list_services(cls, result_db: Session, query_object: RoleQueryModel):
+ """
+ 获取角色列表信息service
+ :param result_db: orm对象
+ :param query_object: 查询参数对象
+ :return: 角色列表信息对象
+ """
+ role_list_result = RoleDao.get_role_list(result_db, query_object)
+
+ return role_list_result
+
+ @classmethod
+ def add_role_services(cls, result_db: Session, page_object: AddRoleModel):
+ """
+ 新增角色信息service
+ :param result_db: orm对象
+ :param page_object: 新增角色对象
+ :return: 新增角色校验结果
+ """
+ add_role = RoleModel(**page_object.dict())
+ role = RoleDao.get_role_by_info(result_db, RoleModel(**dict(role_name=page_object.role_name)))
+ if role:
+ result = dict(is_success=False, message='角色名称已存在')
+ else:
+ try:
+ add_result = RoleDao.add_role_dao(result_db, add_role)
+ role_id = add_result.role_id
+ if page_object.menu_id:
+ menu_id_list = page_object.menu_id.split(',')
+ for menu in menu_id_list:
+ menu_dict = dict(role_id=role_id, menu_id=menu)
+ RoleDao.add_role_menu_dao(result_db, RoleMenuModel(**menu_dict))
+ result_db.commit()
+ result = dict(is_success=True, message='新增成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+
+ return CrudRoleResponse(**result)
+
+ @classmethod
+ def edit_role_services(cls, result_db: Session, page_object: AddRoleModel):
+ """
+ 编辑角色信息service
+ :param result_db: orm对象
+ :param page_object: 编辑角色对象
+ :return: 编辑角色校验结果
+ """
+ edit_role = page_object.dict(exclude_unset=True)
+ if page_object.type != 'status':
+ del edit_role['menu_id']
+ if page_object.type == 'status':
+ del edit_role['type']
+ role_info = cls.detail_role_services(result_db, edit_role.get('role_id'))
+ if role_info:
+ if page_object.type != 'status' and role_info.role.role_name != page_object.role_name:
+ role = RoleDao.get_role_by_info(result_db, RoleModel(**dict(role_name=page_object.role_name)))
+ if role:
+ result = dict(is_success=False, message='角色名称已存在')
+ return CrudRoleResponse(**result)
+ try:
+ RoleDao.edit_role_dao(result_db, edit_role)
+ if page_object.type != 'status':
+ role_id_dict = dict(role_id=page_object.role_id)
+ RoleDao.delete_role_menu_dao(result_db, RoleMenuModel(**role_id_dict))
+ if page_object.menu_id:
+ menu_id_list = page_object.menu_id.split(',')
+ for menu in menu_id_list:
+ menu_dict = dict(role_id=page_object.role_id, menu_id=menu)
+ RoleDao.add_role_menu_dao(result_db, RoleMenuModel(**menu_dict))
+ result_db.commit()
+ result = dict(is_success=True, message='更新成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='角色不存在')
+
+ return CrudRoleResponse(**result)
+
+ @classmethod
+ def delete_role_services(cls, result_db: Session, page_object: DeleteRoleModel):
+ """
+ 删除角色信息service
+ :param result_db: orm对象
+ :param page_object: 删除角色对象
+ :return: 删除角色校验结果
+ """
+ if page_object.role_ids.split(','):
+ role_id_list = page_object.role_ids.split(',')
+ try:
+ for role_id in role_id_list:
+ role_id_dict = dict(role_id=role_id, update_by=page_object.update_by, update_time=page_object.update_time)
+ RoleDao.delete_role_menu_dao(result_db, RoleMenuModel(**role_id_dict))
+ RoleDao.delete_role_dao(result_db, RoleModel(**role_id_dict))
+ result_db.commit()
+ result = dict(is_success=True, message='删除成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='传入角色id为空')
+ return CrudRoleResponse(**result)
+
+ @classmethod
+ def detail_role_services(cls, result_db: Session, role_id: int):
+ """
+ 获取角色详细信息service
+ :param result_db: orm对象
+ :param role_id: 角色id
+ :return: 角色id对应的信息
+ """
+ role = RoleDao.get_role_detail_by_id(result_db, role_id=role_id)
+
+ return role
+
+ @staticmethod
+ def export_role_list_services(role_list: List):
+ """
+ 导出角色列表信息service
+ :param role_list: 角色信息列表
+ :return: 角色列表信息对象
+ """
+ # 创建一个映射字典，将英文键映射到中文键
+ mapping_dict = {
+ "role_id": "角色编号",
+ "role_name": "角色名称",
+ "role_key": "权限字符",
+ "role_sort": "显示顺序",
+ "status": "状态",
+ "create_by": "创建者",
+ "create_time": "创建时间",
+ "update_by": "更新者",
+ "update_time": "更新时间",
+ "remark": "备注",
+ }
+
+ data = [RoleModel(**vars(row)).dict() for row in role_list]
+
+ for item in data:
+ if item.get('status') == '0':
+ item['status'] = '正常'
+ else:
+ item['status'] = '停用'
+ new_data = [{mapping_dict.get(key): value for key, value in item.items() if mapping_dict.get(key)} for item in data]
+ binary_data = export_list2excel(new_data)
+
+ return binary_data
diff --git a/dash-fastapi-backend/module_admin/service/server_service.py b/dash-fastapi-backend/module_admin/service/server_service.py
new file mode 100644
index 0000000000000000000000000000000000000000..0c41c8eb864f152c31f2478d43cd865fd32f328c
--- /dev/null
+++ b/dash-fastapi-backend/module_admin/service/server_service.py
@@ -0,0 +1,89 @@
+import psutil
+from utils.common_util import bytes2human
+import platform
+import socket
+import os
+import time
+from module_admin.entity.vo.server_vo import *
+
+
+class ServerService:
+ """
+ 服务监控模块服务层
+ """
+
+ @staticmethod
+ def get_server_monitor_info():
+ # CPU信息
+ # 获取CPU总核心数
+ cpu_num = psutil.cpu_count(logical=True)
+ cpu_usage_percent = psutil.cpu_times_percent()
+ cpu_used = f'{cpu_usage_percent.user}%'
+ cpu_sys = f'{cpu_usage_percent.system}%'
+ cpu_free = f'{cpu_usage_percent.idle}%'
+ cpu = CpuInfo(**dict(cpu_num=cpu_num, used=cpu_used, sys=cpu_sys, free=cpu_free))
+
+ # 内存信息
+ memory_info = psutil.virtual_memory()
+ memory_total = bytes2human(memory_info.total)
+ memory_used = bytes2human(memory_info.used)
+ memory_free = bytes2human(memory_info.free)
+ memory_usage = f'{memory_info.percent}%'
+ mem = MemoryInfo(**dict(total=memory_total, used=memory_used, free=memory_free, usage=memory_usage))
+
+ # 主机信息
+ # 获取主机名
+ hostname = socket.gethostname()
+ # 获取IP
+ computer_ip = socket.gethostbyname(hostname)
+ os_name = platform.platform()
+ computer_name = platform.node()
+ os_arch = platform.machine()
+ sys = SysInfo(**dict(computer_ip=computer_ip, computer_name=computer_name, os_arch=os_arch, os_name=os_name))
+
+ # python解释器信息
+ current_pid = os.getpid()
+ current_process = psutil.Process(current_pid)
+ python_name = current_process.name()
+ python_version = platform.python_version()
+ python_home = current_process.exe()
+ start_time_stamp = current_process.create_time()
+ start_time = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(start_time_stamp))
+ current_time_stamp = time.time()
+ difference = current_time_stamp - start_time_stamp
+ # 将时间差转换为天、小时和分钟数
+ days = int(difference // (24 * 60 * 60)) # 每天的秒数
+ hours = int((difference % (24 * 60 * 60)) // (60 * 60)) # 每小时的秒数
+ minutes = int((difference % (60 * 60)) // 60) # 每分钟的秒数
+ run_time = f"{days}天{hours}小时{minutes}分钟"
+ project_dir = os.path.abspath(os.getcwd())
+ py = PyInfo(
+ **dict(
+ name=python_name,
+ version=python_version,
+ start_time=start_time,
+ run_time=run_time,
+ home=python_home,
+ project_dir=project_dir
+ )
+ )
+
+ # 磁盘信息
+ io = psutil.disk_partitions()
+ sys_files = []
+ for i in io:
+ o = psutil.disk_usage(i.device)
+ disk_data = {
+ "dir_name": i.device,
+ "sys_type_name": i.fstype,
+ "disk_name": "本地固定磁盘（" + i.mountpoint.replace('\\', '') + "）",
+ "total": bytes2human(o.total),
+ "used": bytes2human(o.used),
+ "free": bytes2human(o.free),
+ "usage": f'{psutil.disk_usage(i.device).percent}%'
+ }
+ sys_files.append(SysFiles(**disk_data))
+
+ result = dict(cpu=cpu, mem=mem, sys=sys, py=py, sys_files=sys_files)
+
+ return ServerMonitorModel(**result)
diff --git a/dash-fastapi-backend/module_admin/service/user_service.py b/dash-fastapi-backend/module_admin/service/user_service.py
index 909f5b3dc46eb4e52d9259fc94cf541099272588..f42a3bc834298697caa82a0d78f760a2d5abb7b2 100644
--- a/dash-fastapi-backend/module_admin/service/user_service.py
+++ b/dash-fastapi-backend/module_admin/service/user_service.py
@@ -1,108 +1,216 @@
-from module_admin.entity.vo.user_schema import *
-from module_admin.mapper.user_crud import *
+from module_admin.entity.vo.user_vo import *
+from module_admin.dao.user_dao import *
+from utils.pwd_util import *
+from utils.common_util import export_list2excel
-def get_user_list_services(result_db: Session, page_object: UserPageObject):
+class UserService:
"""
- 获取用户列表信息service
- :param result_db: orm对象
- :param page_object: 分页查询参数对象
- :return: 用户列表信息对象
+ 用户管理模块服务层
"""
- user_list_result = get_user_list(result_db, page_object)
- return user_list_result
+ @classmethod
+ def get_user_list_services(cls, result_db: Session, query_object: UserQueryModel):
+ """
+ 获取用户列表信息service
+ :param result_db: orm对象
+ :param query_object: 查询参数对象
+ :return: 用户列表信息对象
+ """
+ user_list_result = UserDao.get_user_list(result_db, query_object)
+ return user_list_result
-def add_user_services(result_db: Session, page_object: AddUserModel):
- """
- 新增用户信息service
- :param result_db: orm对象
- :param page_object: 新增用户对象
- :return: 新增用户校验结果
- """
- add_user = UserModel(**page_object.dict())
- add_user_result = add_user_crud(result_db, add_user)
- if add_user_result.is_success:
- user_id = get_user_by_name(result_db, page_object.user_name).user_id
- if page_object.role_id:
- role_id_list = page_object.role_id.split(',')
- for role in role_id_list:
- role_dict = dict(user_id=user_id, role_id=role)
- add_user_role_crud(result_db, UserRoleModel(**role_dict))
- if page_object.post_id:
- post_id_list = page_object.post_id.split(',')
- for post in post_id_list:
- post_dict = dict(user_id=user_id, post_id=post)
- add_user_post_crud(result_db, UserPostModel(**post_dict))
-
- return add_user_result
-
-
-def edit_user_services(result_db: Session, page_object: AddUserModel):
- """
- 编辑用户信息service
- :param result_db: orm对象
- :param page_object: 编辑用户对象
- :return: 编辑用户校验结果
- """
- edit_user = page_object.dict(exclude_unset=True)
- if page_object.type != 'status':
- del edit_user['role_id']
- del edit_user['post_id']
- if page_object.type == 'status':
- del edit_user['type']
- edit_user_result = edit_user_crud(result_db, edit_user)
- if edit_user_result.is_success and page_object.type != 'status':
- user_id_dict = dict(user_id=page_object.user_id)
- delete_user_role_crud(result_db, UserRoleModel(**user_id_dict))
- delete_user_post_crud(result_db, UserPostModel(**user_id_dict))
- if page_object.role_id:
- role_id_list = page_object.role_id.split(',')
- for role in role_id_list:
- role_dict = dict(user_id=page_object.user_id, role_id=role)
- add_user_role_crud(result_db, UserRoleModel(**role_dict))
- if page_object.post_id:
- post_id_list = page_object.post_id.split(',')
- for post in post_id_list:
- post_dict = dict(user_id=page_object.user_id, post_id=post)
- add_user_post_crud(result_db, UserPostModel(**post_dict))
-
- return edit_user_result
-
-
-def delete_user_services(result_db: Session, page_object: DeleteUserModel):
- """
- 删除用户信息service
- :param result_db: orm对象
- :param page_object: 删除用户对象
- :return: 删除用户校验结果
- """
- if page_object.user_ids.split(','):
- user_id_list = page_object.user_ids.split(',')
- for user_id in user_id_list:
- user_id_dict = dict(user_id=user_id, update_by=page_object.update_by, update_time=page_object.update_time)
- delete_user_role_crud(result_db, UserRoleModel(**user_id_dict))
- delete_user_post_crud(result_db, UserPostModel(**user_id_dict))
- delete_user_crud(result_db, UserModel(**user_id_dict))
- result = dict(is_success=True, message='删除成功')
- else:
- result = dict(is_success=False, message='传入用户id为空')
- return CrudUserResponse(**result)
-
-
-def detail_user_services(result_db: Session, user_id: int):
- """
- 获取用户详细信息service
- :param result_db: orm对象
- :param user_id: 用户id
- :return: 用户id对应的信息
- """
- user = get_user_detail_by_id(result_db, user_id=user_id)
-
- return UserDetailModel(
- user=user.user_basic_info[0],
- dept=user.user_dept_info[0],
- role=user.user_role_info,
- post=user.user_post_info
- )
+ @classmethod
+ def add_user_services(cls, result_db: Session, page_object: AddUserModel):
+ """
+ 新增用户信息service
+ :param result_db: orm对象
+ :param page_object: 新增用户对象
+ :return: 新增用户校验结果
+ """
+ add_user = UserModel(**page_object.dict())
+ user = UserDao.get_user_by_info(result_db, UserModel(**dict(user_name=page_object.user_name)))
+ if user:
+ result = dict(is_success=False, message='用户名已存在')
+ else:
+ try:
+ add_result = UserDao.add_user_dao(result_db, add_user)
+ user_id = add_result.user_id
+ if page_object.role_id:
+ role_id_list = page_object.role_id.split(',')
+ for role in role_id_list:
+ role_dict = dict(user_id=user_id, role_id=role)
+ UserDao.add_user_role_dao(result_db, UserRoleModel(**role_dict))
+ if page_object.post_id:
+ post_id_list = page_object.post_id.split(',')
+ for post in post_id_list:
+ post_dict = dict(user_id=user_id, post_id=post)
+ UserDao.add_user_post_dao(result_db, UserPostModel(**post_dict))
+ result_db.commit()
+ result = dict(is_success=True, message='新增成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+
+ return CrudUserResponse(**result)
+
+ @classmethod
+ def edit_user_services(cls, result_db: Session, page_object: AddUserModel):
+ """
+ 编辑用户信息service
+ :param result_db: orm对象
+ :param page_object: 编辑用户对象
+ :return: 编辑用户校验结果
+ """
+ edit_user = page_object.dict(exclude_unset=True)
+ if page_object.type != 'status' and page_object.type != 'avatar':
+ del edit_user['role_id']
+ del edit_user['post_id']
+ if page_object.type == 'status' or page_object.type == 'avatar':
+ del edit_user['type']
+ user_info = cls.detail_user_services(result_db, edit_user.get('user_id'))
+ if user_info:
+ if page_object.type != 'status' and page_object.type != 'avatar' and user_info.user.user_name != page_object.user_name:
+ user = UserDao.get_user_by_info(result_db, UserModel(**dict(user_name=page_object.user_name)))
+ if user:
+ result = dict(is_success=False, message='用户名已存在')
+ return CrudUserResponse(**result)
+ try:
+ UserDao.edit_user_dao(result_db, edit_user)
+ if page_object.type != 'status' and page_object.type != 'avatar':
+ user_id_dict = dict(user_id=page_object.user_id)
+ UserDao.delete_user_role_dao(result_db, UserRoleModel(**user_id_dict))
+ UserDao.delete_user_post_dao(result_db, UserPostModel(**user_id_dict))
+ if page_object.role_id:
+ role_id_list = page_object.role_id.split(',')
+ for role in role_id_list:
+ role_dict = dict(user_id=page_object.user_id, role_id=role)
+ UserDao.add_user_role_dao(result_db, UserRoleModel(**role_dict))
+ if page_object.post_id:
+ post_id_list = page_object.post_id.split(',')
+ for post in post_id_list:
+ post_dict = dict(user_id=page_object.user_id, post_id=post)
+ UserDao.add_user_post_dao(result_db, UserPostModel(**post_dict))
+ result_db.commit()
+ result = dict(is_success=True, message='更新成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='用户不存在')
+
+ return CrudUserResponse(**result)
+
+ @classmethod
+ def delete_user_services(cls, result_db: Session, page_object: DeleteUserModel):
+ """
+ 删除用户信息service
+ :param result_db: orm对象
+ :param page_object: 删除用户对象
+ :return: 删除用户校验结果
+ """
+ if page_object.user_ids.split(','):
+ user_id_list = page_object.user_ids.split(',')
+ try:
+ for user_id in user_id_list:
+ user_id_dict = dict(user_id=user_id, update_by=page_object.update_by, update_time=page_object.update_time)
+ UserDao.delete_user_role_dao(result_db, UserRoleModel(**user_id_dict))
+ UserDao.delete_user_post_dao(result_db, UserPostModel(**user_id_dict))
+ UserDao.delete_user_dao(result_db, UserModel(**user_id_dict))
+ result_db.commit()
+ result = dict(is_success=True, message='删除成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+ else:
+ result = dict(is_success=False, message='传入用户id为空')
+ return CrudUserResponse(**result)
+
+ @classmethod
+ def detail_user_services(cls, result_db: Session, user_id: int):
+ """
+ 获取用户详细信息service
+ :param result_db: orm对象
+ :param user_id: 用户id
+ :return: 用户id对应的信息
+ """
+ user = UserDao.get_user_detail_by_id(result_db, user_id=user_id)
+
+ return UserDetailModel(
+ user=user.user_basic_info[0],
+ dept=user.user_dept_info[0],
+ role=user.user_role_info,
+ post=user.user_post_info
+ )
+
+ @classmethod
+ def reset_user_services(cls, result_db: Session, page_object: ResetUserModel):
+ """
+ 重置用户密码service
+ :param result_db: orm对象
+ :param page_object: 重置用户对象
+ :return: 重置用户校验结果
+ """
+ reset_user = page_object.dict(exclude_unset=True)
+ if page_object.old_password:
+ user = UserDao.get_user_detail_by_id(result_db, user_id=page_object.user_id).user_basic_info[0]
+ if not PwdUtil.verify_password(page_object.old_password, user.password):
+ result = dict(is_success=False, message='旧密码不正确')
+ return CrudUserResponse(**result)
+ else:
+ del reset_user['old_password']
+ if page_object.sms_code and page_object.session_id:
+ del reset_user['sms_code']
+ del reset_user['session_id']
+ try:
+ UserDao.edit_user_dao(result_db, reset_user)
+ result_db.commit()
+ result = dict(is_success=True, message='重置成功')
+ except Exception as e:
+ result_db.rollback()
+ result = dict(is_success=False, message=str(e))
+
+ return CrudUserResponse(**result)
+
+ @staticmethod
+ def export_user_list_services(user_list: List):
+ """
+ 导出用户信息service
+ :param user_list: 用户信息列表
+ :return: 用户信息对应excel的二进制数据
+ """
+ # 创建一个映射字典，将英文键映射到中文键
+ mapping_dict = {
+ "user_id": "用户编号",
+ "user_name": "用户名称",
+ "nick_name": "用户昵称",
+ "dept_name": "部门",
+ "email": "邮箱地址",
+ "phonenumber": "手机号码",
+ "sex": "性别",
+ "status": "状态",
+ "create_by": "创建者",
+ "create_time": "创建时间",
+ "update_by": "更新者",
+ "update_time": "更新时间",
+ "remark": "备注",
+ }
+
+ data = user_list
+
+ for item in data:
+ if item.get('status') == '0':
+ item['status'] = '正常'
+ else:
+ item['status'] = '停用'
+ if item.get('sex') == '0':
+ item['sex'] = '男'
+ elif item.get('sex') == '1':
+ item['sex'] = '女'
+ else:
+ item['sex'] = '未知'
+ new_data = [{mapping_dict.get(key): value for key, value in item.items() if mapping_dict.get(key)} for item in data]
+ binary_data = export_list2excel(new_data)
+
+ return binary_data
diff --git a/dash-fastapi-backend/module_task/__init__.py b/dash-fastapi-backend/module_task/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..36fefe9bdc99a4966a3627472fb980bff6c96a39
--- /dev/null
+++ b/dash-fastapi-backend/module_task/__init__.py
@@ -0,0 +1 @@
+from . import scheduler_test
diff --git a/dash-fastapi-backend/module_task/scheduler_test.py b/dash-fastapi-backend/module_task/scheduler_test.py
new file mode 100644
index 0000000000000000000000000000000000000000..b22dc6fc37a56bd4c4ae2d95b47d767a7bf62a8b
--- /dev/null
+++ b/dash-fastapi-backend/module_task/scheduler_test.py
@@ -0,0 +1,7 @@
+from datetime import datetime
+
+
+def job(*args, **kwargs):
+ print(args)
+ print(kwargs)
+ print(f"{datetime.now()}执行了")
diff --git a/dash-fastapi-backend/sql/dash-fastapi.sql b/dash-fastapi-backend/sql/dash-fastapi.sql
new file mode 100644
index 0000000000000000000000000000000000000000..f6d12d489654e4799f368564a45bdefac54d00df
--- /dev/null
+++ b/dash-fastapi-backend/sql/dash-fastapi.sql
@@ -0,0 +1,720 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server : 本机mysql
+ Source Server Type : MySQL
+ Source Server Version : 80013
+ Source Host : localhost:3306
+ Source Schema : dash-fastapi
+
+ Target Server Type : MySQL
+ Target Server Version : 80013
+ File Encoding : 65001
+
+ Date: 09/03/2023 14:30:35
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for gen_table
+-- ----------------------------
+DROP TABLE IF EXISTS `gen_table`;
+CREATE TABLE `gen_table` (
+ `table_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号',
+ `table_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '表名称',
+ `table_comment` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '表描述',
+ `sub_table_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '关联子表的表名',
+ `sub_table_fk_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '子表关联的外键名',
+ `class_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '实体类名称',
+ `tpl_category` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT 'crud' COMMENT '使用的模板（crud单表操作 tree树表操作）',
+ `package_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生成包路径',
+ `module_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生成模块名',
+ `business_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生成业务名',
+ `function_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生成功能名',
+ `function_author` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生成功能作者',
+ `gen_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '0' COMMENT '生成代码方式（0zip压缩包 1自定义路径）',
+ `gen_path` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '/' COMMENT '生成路径（不填默认项目路径）',
+ `options` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '其它生成选项',
+ `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '创建者',
+ `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '更新者',
+ `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+ `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
+ PRIMARY KEY (`table_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '代码生成业务表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of gen_table
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for gen_table_column
+-- ----------------------------
+DROP TABLE IF EXISTS `gen_table_column`;
+CREATE TABLE `gen_table_column` (
+ `column_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号',
+ `table_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '归属表编号',
+ `column_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '列名称',
+ `column_comment` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '列描述',
+ `column_type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '列类型',
+ `java_type` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT 'JAVA类型',
+ `java_field` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT 'JAVA字段名',
+ `is_pk` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '是否主键（1是）',
+ `is_increment` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '是否自增（1是）',
+ `is_required` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '是否必填（1是）',
+ `is_insert` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '是否为插入字段（1是）',
+ `is_edit` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '是否编辑字段（1是）',
+ `is_list` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '是否列表字段（1是）',
+ `is_query` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '是否查询字段（1是）',
+ `query_type` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT 'EQ' COMMENT '查询方式（等于、不等于、大于、小于、范围）',
+ `html_type` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）',
+ `dict_type` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '字典类型',
+ `sort` int(11) NULL DEFAULT NULL COMMENT '排序',
+ `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '创建者',
+ `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '更新者',
+ `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+ PRIMARY KEY (`column_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 26 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '代码生成业务表字段' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of gen_table_column
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for sys_config
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_config`;
+CREATE TABLE `sys_config` (
+ `config_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '参数主键',
+ `config_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '参数名称',
+ `config_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '参数键名',
+ `config_value` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '参数键值',
+ `config_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT 'N' COMMENT '系统内置（Y是 N否）',
+ `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '创建者',
+ `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '更新者',
+ `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+ `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
+ PRIMARY KEY (`config_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 101 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '参数配置表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_config
+-- ----------------------------
+INSERT INTO `sys_config` VALUES (1, '主框架页-默认皮肤样式名称', 'sys.index.skinName', '#1890ff', 'Y', 'admin', '2023-05-23 16:13:34', 'admin', '2023-05-23 16:13:34', '蓝色 #1890ff');
+INSERT INTO `sys_config` VALUES (2, '账号自助-验证码开关', 'sys.account.captchaEnabled', 'true', 'Y', 'admin', '2023-05-23 16:13:34', 'admin', '2023-05-23 16:13:34', '是否开启验证码功能（true开启，false关闭）');
+INSERT INTO `sys_config` VALUES (3, '用户登录-黑名单列表', 'sys.login.blackIPList', '', 'Y', 'admin', '2023-05-23 16:13:34', '', NULL, '设置登录IP黑名单限制，多个匹配项以;分隔，支持匹配（*通配、网段）');
+
+-- ----------------------------
+-- Table structure for sys_dept
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_dept`;
+CREATE TABLE `sys_dept` (
+ `dept_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '部门id',
+ `parent_id` bigint(20) NULL DEFAULT 0 COMMENT '父部门id',
+ `ancestors` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '祖级列表',
+ `dept_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '部门名称',
+ `order_num` int(11) NULL DEFAULT 0 COMMENT '显示顺序',
+ `leader` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '负责人',
+ `phone` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '联系电话',
+ `email` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '邮箱',
+ `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '0' COMMENT '部门状态（0正常 1停用）',
+ `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+ `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '创建者',
+ `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '更新者',
+ `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+ PRIMARY KEY (`dept_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 201 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '部门表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_dept
+-- ----------------------------
+INSERT INTO `sys_dept` VALUES (100, 0, '0', '集团总公司', 1, '年糕', '15888888888', 'niangao@qq.com', '0', '0', 'admin', '2023-05-23 16:13:33', 'admin', '2023-08-08 15:57:58');
+INSERT INTO `sys_dept` VALUES (101, 100, '0,100', '上海分公司', 1, '年糕', '15888888888', 'niangao@qq.com', '0', '0', 'admin', '2023-05-23 16:13:33', 'admin', '2023-08-08 15:57:58');
+INSERT INTO `sys_dept` VALUES (102, 100, '0,100', '广东分公司', 2, '年糕', '15888888888', 'niangao@qq.com', '0', '0', 'admin', '2023-05-23 16:13:33', 'admin', '2023-08-08 15:57:58');
+INSERT INTO `sys_dept` VALUES (103, 101, '0,100,101', '研发部门', 1, '年糕', '15888888888', 'niangao@qq.com', '0', '0', 'admin', '2023-05-23 16:13:33', 'admin', '2023-08-08 15:57:58');
+INSERT INTO `sys_dept` VALUES (104, 101, '0,100,101', '市场部门', 2, '年糕', '15888888888', 'niangao@qq.com', '0', '0', 'admin', '2023-05-23 16:13:33', 'admin', '2023-08-08 15:57:58');
+INSERT INTO `sys_dept` VALUES (105, 101, '0,100,101', '测试部门', 3, '年糕', '15888888888', 'niangao@qq.com', '0', '0', 'admin', '2023-05-23 16:13:33', 'admin', '2023-08-08 15:57:58');
+INSERT INTO `sys_dept` VALUES (106, 101, '0,100,101', '财务部门', 4, '年糕', '15888888888', 'niangao@qq.com', '0', '0', 'admin', '2023-05-23 16:13:33', 'admin', '2023-08-08 15:57:58');
+INSERT INTO `sys_dept` VALUES (107, 101, '0,100,101', '运维部门', 5, '年糕', '15888888888', 'niangao@qq.com', '0', '0', 'admin', '2023-05-23 16:13:33', 'admin', '2023-08-08 15:57:58');
+INSERT INTO `sys_dept` VALUES (108, 102, '0,100,102', '市场部门', 1, '年糕', '15888888888', 'niangao@qq.com', '0', '0', 'admin', '2023-05-23 16:13:33', 'admin', '2023-08-08 15:57:58');
+INSERT INTO `sys_dept` VALUES (109, 102, '0,100,102', '财务部门', 2, '年糕', '15888888888', 'niangao@qq.com', '0', '0', 'admin', '2023-05-23 16:13:33', 'admin', '2023-08-08 15:57:58');
+
+-- ----------------------------
+-- Table structure for sys_dict_data
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_dict_data`;
+CREATE TABLE `sys_dict_data` (
+ `dict_code` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '字典编码',
+ `dict_sort` int(11) NULL DEFAULT 0 COMMENT '字典排序',
+ `dict_label` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '字典标签',
+ `dict_value` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '字典键值',
+ `dict_type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '字典类型',
+ `css_class` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '样式属性（其他样式扩展）',
+ `list_class` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '表格回显样式',
+ `is_default` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'N' COMMENT '是否默认（Y是 N否）',
+ `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '状态（0正常 1停用）',
+ `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
+ `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
+ `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+ `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+ PRIMARY KEY (`dict_code`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 101 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '字典数据表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_dict_data
+-- ----------------------------
+INSERT INTO `sys_dict_data` VALUES (1, 1, '男', '0', 'sys_user_sex', '', '', 'Y', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '性别男');
+INSERT INTO `sys_dict_data` VALUES (2, 2, '女', '1', 'sys_user_sex', '', '', 'N', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '性别女');
+INSERT INTO `sys_dict_data` VALUES (3, 3, '未知', '2', 'sys_user_sex', '', '', 'N', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '性别未知');
+INSERT INTO `sys_dict_data` VALUES (4, 1, '显示', '0', 'sys_show_hide', '', 'primary', 'Y', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '显示菜单');
+INSERT INTO `sys_dict_data` VALUES (5, 2, '隐藏', '1', 'sys_show_hide', '', 'danger', 'N', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '隐藏菜单');
+INSERT INTO `sys_dict_data` VALUES (6, 1, '正常', '0', 'sys_normal_disable', '{\"color\": \"blue\"}', 'primary', 'Y', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '正常状态');
+INSERT INTO `sys_dict_data` VALUES (7, 2, '停用', '1', 'sys_normal_disable', '{\"color\": \"volcano\"}', 'danger', 'N', '0', 'admin', '2023-02-11 22:23:38', 'admin', '2023-08-18 11:24:23', '停用状态');
+INSERT INTO `sys_dict_data` VALUES (8, 1, '正常', '0', 'sys_job_status', '', 'primary', 'Y', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '正常状态');
+INSERT INTO `sys_dict_data` VALUES (9, 2, '暂停', '1', 'sys_job_status', '', 'danger', 'N', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '停用状态');
+INSERT INTO `sys_dict_data` VALUES (10, 1, '默认', 'default', 'sys_job_group', '{\"color\": \"blue\"}', '', 'Y', '0', 'admin', '2023-02-11 22:23:38', 'admin', '2023-08-20 16:33:32', '默认分组');
+INSERT INTO `sys_dict_data` VALUES (11, 2, '数据库', 'sqlalchemy', 'sys_job_group', '{\"color\": \"green\"}', '', 'N', '0', 'admin', '2023-02-11 22:23:38', 'admin', '2023-08-27 22:54:40', '数据库分组');
+INSERT INTO `sys_dict_data` VALUES (12, 1, '是', 'Y', 'sys_yes_no', '', 'primary', 'Y', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '系统默认是');
+INSERT INTO `sys_dict_data` VALUES (13, 2, '否', 'N', 'sys_yes_no', '', 'danger', 'N', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '系统默认否');
+INSERT INTO `sys_dict_data` VALUES (14, 1, '通知', '1', 'sys_notice_type', '{\"color\": \"gold\"}', 'warning', 'Y', '0', 'admin', '2023-02-11 22:23:38', 'admin', '2023-08-20 16:12:53', '通知');
+INSERT INTO `sys_dict_data` VALUES (15, 2, '公告', '2', 'sys_notice_type', '{\"color\": \"green\"}', 'success', 'N', '0', 'admin', '2023-02-11 22:23:38', 'admin', '2023-08-20 16:13:03', '公告');
+INSERT INTO `sys_dict_data` VALUES (16, 1, '正常', '0', 'sys_notice_status', '', 'primary', 'Y', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '正常状态');
+INSERT INTO `sys_dict_data` VALUES (17, 2, '关闭', '1', 'sys_notice_status', '', 'danger', 'N', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '关闭状态');
+INSERT INTO `sys_dict_data` VALUES (18, 99, '其他', '0', 'sys_oper_type', '{\"color\": \"purple\"}', 'info', 'N', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '其他操作');
+INSERT INTO `sys_dict_data` VALUES (19, 1, '新增', '1', 'sys_oper_type', '{\"color\": \"green\"}', 'info', 'N', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '新增操作');
+INSERT INTO `sys_dict_data` VALUES (20, 2, '修改', '2', 'sys_oper_type', '{\"color\": \"orange\"}', 'info', 'N', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '修改操作');
+INSERT INTO `sys_dict_data` VALUES (21, 3, '删除', '3', 'sys_oper_type', '{\"color\": \"red\"}', 'danger', 'N', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '删除操作');
+INSERT INTO `sys_dict_data` VALUES (22, 4, '授权', '4', 'sys_oper_type', '{\"color\": \"lime\"}', 'primary', 'N', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '授权操作');
+INSERT INTO `sys_dict_data` VALUES (23, 5, '导出', '5', 'sys_oper_type', '{\"color\": \"geekblue\"}', 'warning', 'N', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '导出操作');
+INSERT INTO `sys_dict_data` VALUES (24, 6, '导入', '6', 'sys_oper_type', '{\"color\": \"blue\"}', 'warning', 'N', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '导入操作');
+INSERT INTO `sys_dict_data` VALUES (25, 7, '强退', '7', 'sys_oper_type', '{\"color\": \"magenta\"}', 'danger', 'N', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '强退操作');
+INSERT INTO `sys_dict_data` VALUES (26, 8, '生成代码', '8', 'sys_oper_type', '{\"color\": \"cyan\"}', 'warning', 'N', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '生成操作');
+INSERT INTO `sys_dict_data` VALUES (27, 9, '清空数据', '9', 'sys_oper_type', '{\"color\": \"volcano\"}', 'danger', 'N', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '清空操作');
+INSERT INTO `sys_dict_data` VALUES (28, 1, '成功', '0', 'sys_common_status', '', 'primary', 'N', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '正常状态');
+INSERT INTO `sys_dict_data` VALUES (29, 2, '失败', '1', 'sys_common_status', '', 'danger', 'N', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '停用状态');
+INSERT INTO `sys_dict_data` VALUES (100, 3, 'Redis', 'redis', 'sys_job_group', '{\"color\": \"gold\"}', 'default', 'N', '0', 'admin', '2023-08-27 22:52:05', 'admin', '2023-08-27 22:52:05', 'redis分组');
+
+-- ----------------------------
+-- Table structure for sys_dict_type
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_dict_type`;
+CREATE TABLE `sys_dict_type` (
+ `dict_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '字典主键',
+ `dict_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '字典名称',
+ `dict_type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '字典类型',
+ `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '状态（0正常 1停用）',
+ `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
+ `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
+ `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+ `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+ PRIMARY KEY (`dict_id`) USING BTREE,
+ UNIQUE INDEX `dict_type`(`dict_type`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 100 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '字典类型表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_dict_type
+-- ----------------------------
+INSERT INTO `sys_dict_type` VALUES (1, '用户性别', 'sys_user_sex', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '用户性别列表');
+INSERT INTO `sys_dict_type` VALUES (2, '菜单状态', 'sys_show_hide', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '菜单状态列表');
+INSERT INTO `sys_dict_type` VALUES (3, '系统开关', 'sys_normal_disable', '0', 'admin', '2023-02-11 22:23:38', 'admin', '2023-08-18 11:23:39', '系统开关列表');
+INSERT INTO `sys_dict_type` VALUES (4, '任务状态', 'sys_job_status', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '任务状态列表');
+INSERT INTO `sys_dict_type` VALUES (5, '任务分组', 'sys_job_group', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '任务分组列表');
+INSERT INTO `sys_dict_type` VALUES (6, '系统是否', 'sys_yes_no', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '系统是否列表');
+INSERT INTO `sys_dict_type` VALUES (7, '通知类型', 'sys_notice_type', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '通知类型列表');
+INSERT INTO `sys_dict_type` VALUES (8, '通知状态', 'sys_notice_status', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '通知状态列表');
+INSERT INTO `sys_dict_type` VALUES (9, '操作类型', 'sys_oper_type', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '操作类型列表');
+INSERT INTO `sys_dict_type` VALUES (10, '系统状态', 'sys_common_status', '0', 'admin', '2023-02-11 22:23:38', '', NULL, '登录状态列表');
+
+-- ----------------------------
+-- Table structure for sys_job
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_job`;
+CREATE TABLE `sys_job` (
+ `job_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '任务ID',
+ `job_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT '任务名称',
+ `job_group` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT 'default' COMMENT '任务组名',
+ `job_executor` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT 'default' COMMENT '任务执行器',
+ `invoke_target` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '调用目标字符串',
+ `job_args` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '位置参数',
+ `job_kwargs` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '关键字参数',
+ `cron_expression` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT 'cron执行表达式',
+ `misfire_policy` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '3' COMMENT '计划执行错误策略（1立即执行 2执行一次 3放弃执行）',
+ `concurrent` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '1' COMMENT '是否并发执行（0允许 1禁止）',
+ `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '0' COMMENT '状态（0正常 1暂停）',
+ `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '创建者',
+ `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '更新者',
+ `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+ `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '备注信息',
+ PRIMARY KEY (`job_id`, `job_name`, `job_group`, `job_executor`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 100 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '定时任务调度表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_job
+-- ----------------------------
+INSERT INTO `sys_job` VALUES (1, '系统默认（无参）', 'default', 'default', 'module_task.scheduler_test.job', 'test', NULL, '0/10 * * * * ?', '2', '0', '1', 'admin', '2023-05-23 16:13:34', 'admin', '2023-05-23 16:13:34', '');
+INSERT INTO `sys_job` VALUES (2, '系统默认（有参）', 'sqlalchemy', 'default', 'module_task.scheduler_test.job', 'new', '{\"test\": 111}', '0/15 * * * * ?', '1', '1', '1', 'admin', '2023-05-23 16:13:34', 'admin', '2023-05-23 16:13:34', '');
+INSERT INTO `sys_job` VALUES (3, '系统默认（多参）', 'redis', 'default', 'module_task.scheduler_test.job', NULL, NULL, '0/20 * * * * ?', '3', '1', '1', 'admin', '2023-05-23 16:13:34', '', NULL, '');
+
+-- ----------------------------
+-- Table structure for sys_job_log
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_job_log`;
+CREATE TABLE `sys_job_log` (
+ `job_log_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '任务日志ID',
+ `job_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '任务名称',
+ `job_group` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '任务组名',
+ `job_executor` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '任务执行器',
+ `invoke_target` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '调用目标字符串',
+ `job_args` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '位置参数',
+ `job_kwargs` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '关键字参数',
+ `job_trigger` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '任务触发器',
+ `job_message` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '日志信息',
+ `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '0' COMMENT '执行状态（0正常 1失败）',
+ `exception_info` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '异常信息',
+ `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+ PRIMARY KEY (`job_log_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '定时任务调度日志表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_job_log
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for sys_logininfor
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_logininfor`;
+CREATE TABLE `sys_logininfor` (
+ `info_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '访问ID',
+ `user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '用户账号',
+ `ipaddr` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '登录IP地址',
+ `login_location` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '登录地点',
+ `browser` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '浏览器类型',
+ `os` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '操作系统',
+ `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '0' COMMENT '登录状态（0成功 1失败）',
+ `msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '提示消息',
+ `login_time` datetime(0) NULL DEFAULT NULL COMMENT '访问时间',
+ PRIMARY KEY (`info_id`) USING BTREE,
+ INDEX `idx_sys_logininfor_s`(`status`) USING BTREE,
+ INDEX `idx_sys_logininfor_lt`(`login_time`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '系统访问记录' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_logininfor
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for sys_menu
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_menu`;
+CREATE TABLE `sys_menu` (
+ `menu_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '菜单ID',
+ `menu_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '菜单名称',
+ `parent_id` bigint(20) NULL DEFAULT 0 COMMENT '父菜单ID',
+ `order_num` int(11) NULL DEFAULT 0 COMMENT '显示顺序',
+ `path` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '路由地址',
+ `component` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '组件路径',
+ `query` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '路由参数',
+ `is_frame` int(11) NULL DEFAULT 1 COMMENT '是否为外链（0是 1否）',
+ `is_cache` int(11) NULL DEFAULT 0 COMMENT '是否缓存（0缓存 1不缓存）',
+ `menu_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '菜单类型（M目录 C菜单 F按钮）',
+ `visible` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '0' COMMENT '菜单状态（0显示 1隐藏）',
+ `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '0' COMMENT '菜单状态（0正常 1停用）',
+ `perms` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '权限标识',
+ `icon` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '#' COMMENT '菜单图标',
+ `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '创建者',
+ `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '更新者',
+ `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+ `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '备注',
+ PRIMARY KEY (`menu_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 2000 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '菜单权限表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_menu
+-- ----------------------------
+INSERT INTO `sys_menu` VALUES (1, '系统管理', 0, 1, '/system', NULL, '', 1, 0, 'M', '0', '0', '', 'antd-setting', 'admin', '2023-05-23 16:13:33', '', NULL, '系统管理目录');
+INSERT INTO `sys_menu` VALUES (2, '系统监控', 0, 2, '/monitor', NULL, '', 1, 0, 'M', '0', '0', '', 'antd-fund-projection-screen', 'admin', '2023-05-23 16:13:33', '', NULL, '系统监控目录');
+INSERT INTO `sys_menu` VALUES (3, '系统工具', 0, 3, '/tool', NULL, '', 1, 0, 'M', '0', '0', '', 'antd-repair', 'admin', '2023-05-23 16:13:33', '', NULL, '系统工具目录');
+INSERT INTO `sys_menu` VALUES (4, '若依官网', 0, 4, 'http://ruoyi.vip', NULL, NULL, 0, 0, 'M', '0', '0', '', 'antd-send', 'admin', '2023-05-23 16:13:33', '', NULL, '若依官网地址');
+INSERT INTO `sys_menu` VALUES (100, '用户管理', 1, 1, '/system/user', 'system.user', '', 1, 0, 'C', '0', '0', 'system:user:list', 'antd-user', 'admin', '2023-05-23 16:13:33', '', NULL, '用户管理菜单');
+INSERT INTO `sys_menu` VALUES (101, '角色管理', 1, 2, '/system/role', 'system.role', '', 1, 0, 'C', '0', '0', 'system:role:list', 'antd-team', 'admin', '2023-05-23 16:13:33', '', NULL, '角色管理菜单');
+INSERT INTO `sys_menu` VALUES (102, '菜单管理', 1, 3, '/system/menu', 'system.menu', '', 1, 0, 'C', '0', '0', 'system:menu:list', 'antd-app-store-add', 'admin', '2023-05-23 16:13:33', '', NULL, '菜单管理菜单');
+INSERT INTO `sys_menu` VALUES (103, '部门管理', 1, 4, '/system/dept', 'system.dept', '', 1, 0, 'C', '0', '0', 'system:dept:list', 'antd-cluster', 'admin', '2023-05-23 16:13:33', '', NULL, '部门管理菜单');
+INSERT INTO `sys_menu` VALUES (104, '岗位管理', 1, 5, '/system/post', 'system.post', '', 1, 0, 'C', '0', '0', 'system:post:list', 'antd-idcard', 'admin', '2023-05-23 16:13:33', 'ry', '2023-07-06 09:47:26', '岗位管理菜单');
+INSERT INTO `sys_menu` VALUES (105, '字典管理', 1, 6, '/system/dict', 'system.dict', '', 1, 0, 'C', '0', '0', 'system:dict:list', 'antd-read', 'admin', '2023-05-23 16:13:33', 'ry', '2023-07-06 16:25:44', '字典管理菜单');
+INSERT INTO `sys_menu` VALUES (106, '参数设置', 1, 7, '/system/config', 'system.config', '', 1, 0, 'C', '0', '0', 'system:config:list', 'antd-calculator', 'admin', '2023-05-23 16:13:33', '', NULL, '参数设置菜单');
+INSERT INTO `sys_menu` VALUES (107, '通知公告', 1, 8, '/system/notice', 'system.notice', '', 1, 0, 'C', '0', '0', 'system:notice:list', 'antd-notification', 'admin', '2023-05-23 16:13:33', '', NULL, '通知公告菜单');
+INSERT INTO `sys_menu` VALUES (108, '日志管理', 1, 9, '/log', '', '', 1, 0, 'M', '0', '0', '', 'antd-bug', 'admin', '2023-05-23 16:13:33', '', NULL, '日志管理菜单');
+INSERT INTO `sys_menu` VALUES (109, '在线用户', 2, 1, '/monitor/online', 'monitor.online', '', 1, 0, 'C', '0', '0', 'monitor:online:list', 'antd-desktop', 'admin', '2023-05-23 16:13:33', '', NULL, '在线用户菜单');
+INSERT INTO `sys_menu` VALUES (110, '定时任务', 2, 2, '/monitor/job', 'monitor.job', '', 1, 0, 'C', '0', '0', 'monitor:job:list', 'antd-deployment-unit', 'admin', '2023-05-23 16:13:33', '', NULL, '定时任务菜单');
+INSERT INTO `sys_menu` VALUES (111, '数据监控', 2, 3, '/monitor/druid', 'monitor.druid', '', 1, 0, 'C', '0', '0', 'monitor:druid:list', 'antd-database', 'admin', '2023-05-23 16:13:33', '', NULL, '数据监控菜单');
+INSERT INTO `sys_menu` VALUES (112, '服务监控', 2, 4, '/monitor/server', 'monitor.server', '', 1, 0, 'C', '0', '0', 'monitor:server:list', 'antd-cloud-server', 'admin', '2023-05-23 16:13:33', '', NULL, '服务监控菜单');
+INSERT INTO `sys_menu` VALUES (113, '缓存监控', 2, 5, '/monitor/cache/control', 'monitor.cache.control', '', 1, 0, 'C', '0', '0', 'monitor:cache:list', 'antd-cloud-sync', 'admin', '2023-05-23 16:13:33', 'admin', '2023-08-11 10:52:56', '缓存监控菜单');
+INSERT INTO `sys_menu` VALUES (114, '缓存列表', 2, 6, '/monitor/cache/list', 'monitor.cache.list', '', 1, 0, 'C', '0', '0', 'monitor:cache:list', 'antd-table', 'admin', '2023-05-23 16:13:33', 'admin', '2023-08-11 10:53:11', '缓存列表菜单');
+INSERT INTO `sys_menu` VALUES (115, '表单构建', 3, 1, '/tool/build', 'tool.build', '', 1, 0, 'C', '0', '0', 'tool:build:list', 'antd-build', 'admin', '2023-05-23 16:13:33', '', NULL, '表单构建菜单');
+INSERT INTO `sys_menu` VALUES (116, '代码生成', 3, 2, '/tool/gen', 'tool.gen', '', 1, 0, 'C', '0', '0', 'tool:gen:list', 'antd-console-sql', 'admin', '2023-05-23 16:13:33', '', NULL, '代码生成菜单');
+INSERT INTO `sys_menu` VALUES (117, '系统接口', 3, 3, '/tool/swagger', 'tool.swagger', '', 1, 0, 'C', '0', '0', 'tool:swagger:list', 'antd-api', 'admin', '2023-05-23 16:13:33', '', NULL, '系统接口菜单');
+INSERT INTO `sys_menu` VALUES (500, '操作日志', 108, 1, '/monitor/operlog', 'monitor.operlog', '', 1, 0, 'C', '0', '0', 'monitor:operlog:list', 'antd-clear', 'admin', '2023-05-23 16:13:33', '', NULL, '操作日志菜单');
+INSERT INTO `sys_menu` VALUES (501, '登录日志', 108, 2, '/monitor/logininfor', 'monitor.logininfor', '', 1, 0, 'C', '0', '0', 'monitor:logininfor:list', 'antd-control', 'admin', '2023-05-23 16:13:33', '', NULL, '登录日志菜单');
+INSERT INTO `sys_menu` VALUES (1000, '用户查询', 100, 1, '', '', '', 1, 0, 'F', '0', '0', 'system:user:query', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1001, '用户新增', 100, 2, '', '', '', 1, 0, 'F', '0', '0', 'system:user:add', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1002, '用户修改', 100, 3, '', '', '', 1, 0, 'F', '0', '0', 'system:user:edit', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1003, '用户删除', 100, 4, '', '', '', 1, 0, 'F', '0', '0', 'system:user:remove', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1004, '用户导出', 100, 5, '', '', '', 1, 0, 'F', '0', '0', 'system:user:export', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1005, '用户导入', 100, 6, '', '', '', 1, 0, 'F', '0', '0', 'system:user:import', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1006, '重置密码', 100, 7, '', '', '', 1, 0, 'F', '0', '0', 'system:user:resetPwd', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1007, '角色查询', 101, 1, '', '', '', 1, 0, 'F', '0', '0', 'system:role:query', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1008, '角色新增', 101, 2, '', '', '', 1, 0, 'F', '0', '0', 'system:role:add', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1009, '角色修改', 101, 3, '', '', '', 1, 0, 'F', '0', '0', 'system:role:edit', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1010, '角色删除', 101, 4, '', '', '', 1, 0, 'F', '0', '0', 'system:role:remove', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1011, '角色导出', 101, 5, '', '', '', 1, 0, 'F', '0', '0', 'system:role:export', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1012, '菜单查询', 102, 1, '', '', '', 1, 0, 'F', '0', '0', 'system:menu:query', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1013, '菜单新增', 102, 2, '', '', '', 1, 0, 'F', '0', '0', 'system:menu:add', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1014, '菜单修改', 102, 3, '', '', '', 1, 0, 'F', '0', '0', 'system:menu:edit', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1015, '菜单删除', 102, 4, '', '', '', 1, 0, 'F', '0', '0', 'system:menu:remove', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1016, '部门查询', 103, 1, '', '', '', 1, 0, 'F', '0', '0', 'system:dept:query', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1017, '部门新增', 103, 2, '', '', '', 1, 0, 'F', '0', '0', 'system:dept:add', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1018, '部门修改', 103, 3, '', '', '', 1, 0, 'F', '0', '0', 'system:dept:edit', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1019, '部门删除', 103, 4, '', '', '', 1, 0, 'F', '0', '0', 'system:dept:remove', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1020, '岗位查询', 104, 1, '', '', '', 1, 0, 'F', '0', '0', 'system:post:query', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1021, '岗位新增', 104, 2, '', '', '', 1, 0, 'F', '0', '0', 'system:post:add', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1022, '岗位修改', 104, 3, '', '', '', 1, 0, 'F', '0', '0', 'system:post:edit', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1023, '岗位删除', 104, 4, '', '', '', 1, 0, 'F', '0', '0', 'system:post:remove', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1024, '岗位导出', 104, 5, '', '', '', 1, 0, 'F', '0', '0', 'system:post:export', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1025, '字典查询', 105, 1, '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:query', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1026, '字典新增', 105, 2, '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:add', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1027, '字典修改', 105, 3, '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:edit', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1028, '字典删除', 105, 4, '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:remove', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1029, '字典导出', 105, 5, '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:export', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1030, '参数查询', 106, 1, '#', '', '', 1, 0, 'F', '0', '0', 'system:config:query', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1031, '参数新增', 106, 2, '#', '', '', 1, 0, 'F', '0', '0', 'system:config:add', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1032, '参数修改', 106, 3, '#', '', '', 1, 0, 'F', '0', '0', 'system:config:edit', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1033, '参数删除', 106, 4, '#', '', '', 1, 0, 'F', '0', '0', 'system:config:remove', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1034, '参数导出', 106, 5, '#', '', '', 1, 0, 'F', '0', '0', 'system:config:export', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1035, '公告查询', 107, 1, '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:query', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1036, '公告新增', 107, 2, '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:add', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1037, '公告修改', 107, 3, '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:edit', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1038, '公告删除', 107, 4, '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:remove', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1039, '操作查询', 500, 1, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:query', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1040, '操作删除', 500, 2, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:remove', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1041, '日志导出', 500, 3, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:export', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1042, '登录查询', 501, 1, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:query', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1043, '登录删除', 501, 2, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:remove', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1044, '日志导出', 501, 3, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:export', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1045, '账户解锁', 501, 4, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:unlock', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1046, '在线查询', 109, 1, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:query', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1047, '批量强退', 109, 2, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:batchLogout', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1048, '单条强退', 109, 3, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:forceLogout', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1049, '任务查询', 110, 1, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:query', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1050, '任务新增', 110, 2, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:add', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1051, '任务修改', 110, 3, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:edit', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1052, '任务删除', 110, 4, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:remove', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1053, '状态修改', 110, 5, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:changeStatus', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1054, '任务导出', 110, 6, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:export', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1055, '生成查询', 116, 1, '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:query', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1056, '生成修改', 116, 2, '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:edit', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1057, '生成删除', 116, 3, '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:remove', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1058, '导入代码', 116, 4, '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:import', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1059, '预览代码', 116, 5, '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:preview', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1060, '生成代码', 116, 6, '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:code', '#', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+
+-- ----------------------------
+-- Table structure for sys_notice
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_notice`;
+CREATE TABLE `sys_notice` (
+ `notice_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '公告ID',
+ `notice_title` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '公告标题',
+ `notice_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '公告类型（1通知 2公告）',
+ `notice_content` longblob NULL COMMENT '公告内容',
+ `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '0' COMMENT '公告状态（0正常 1关闭）',
+ `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '创建者',
+ `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '更新者',
+ `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+ `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
+ PRIMARY KEY (`notice_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 10 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '通知公告表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_notice
+-- ----------------------------
+INSERT INTO `sys_notice` VALUES (1, '温馨提醒：2018-07-01 若依新版本发布啦', '2', 0xE696B0E78988E69CACE58685E5AEB9, '0', 'admin', '2023-05-23 16:13:34', '', NULL, '管理员');
+INSERT INTO `sys_notice` VALUES (2, '维护通知：2018-07-01 若依系统凌晨维护', '1', 0xE7BBB4E68AA4E58685E5AEB9, '0', 'admin', '2023-05-23 16:13:34', '', NULL, '管理员');
+
+-- ----------------------------
+-- Table structure for sys_oper_log
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_oper_log`;
+CREATE TABLE `sys_oper_log` (
+ `oper_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '日志主键',
+ `title` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '模块标题',
+ `business_type` int(11) NULL DEFAULT 0 COMMENT '业务类型（0其它 1新增 2修改 3删除）',
+ `method` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '方法名称',
+ `request_method` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '请求方式',
+ `operator_type` int(11) NULL DEFAULT 0 COMMENT '操作类别（0其它 1后台用户 2手机端用户）',
+ `oper_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '操作人员',
+ `dept_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '部门名称',
+ `oper_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '请求URL',
+ `oper_ip` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '主机地址',
+ `oper_location` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '操作地点',
+ `oper_param` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '请求参数',
+ `json_result` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '返回参数',
+ `status` int(11) NULL DEFAULT 0 COMMENT '操作状态（0正常 1异常）',
+ `error_msg` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '错误消息',
+ `oper_time` datetime(0) NULL DEFAULT NULL COMMENT '操作时间',
+ `cost_time` bigint(20) NULL DEFAULT 0 COMMENT '消耗时间',
+ PRIMARY KEY (`oper_id`) USING BTREE,
+ INDEX `idx_sys_oper_log_bt`(`business_type`) USING BTREE,
+ INDEX `idx_sys_oper_log_s`(`status`) USING BTREE,
+ INDEX `idx_sys_oper_log_ot`(`oper_time`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '操作日志记录' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_oper_log
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for sys_post
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_post`;
+CREATE TABLE `sys_post` (
+ `post_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '岗位ID',
+ `post_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '岗位编码',
+ `post_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '岗位名称',
+ `post_sort` int(11) NOT NULL COMMENT '显示顺序',
+ `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '状态（0正常 1停用）',
+ `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '创建者',
+ `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '更新者',
+ `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+ `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
+ PRIMARY KEY (`post_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 10 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '岗位信息表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_post
+-- ----------------------------
+INSERT INTO `sys_post` VALUES (1, 'ceo', '董事长', 1, '0', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_post` VALUES (2, 'se', '项目经理', 2, '0', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+INSERT INTO `sys_post` VALUES (3, 'hr', '人力资源', 3, '0', 'admin', '2023-05-23 16:13:33', 'ry', '2023-06-05 15:49:31', '');
+INSERT INTO `sys_post` VALUES (4, 'user', '普通员工', 4, '0', 'admin', '2023-05-23 16:13:33', '', NULL, '');
+
+-- ----------------------------
+-- Table structure for sys_role
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_role`;
+CREATE TABLE `sys_role` (
+ `role_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '角色ID',
+ `role_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '角色名称',
+ `role_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '角色权限字符串',
+ `role_sort` int(11) NOT NULL COMMENT '显示顺序',
+ `data_scope` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '1' COMMENT '数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）',
+ `menu_check_strictly` tinyint(1) NULL DEFAULT 1 COMMENT '菜单树选择项是否关联显示',
+ `dept_check_strictly` tinyint(1) NULL DEFAULT 1 COMMENT '部门树选择项是否关联显示',
+ `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '角色状态（0正常 1停用）',
+ `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+ `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '创建者',
+ `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '更新者',
+ `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+ `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
+ PRIMARY KEY (`role_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 100 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '角色信息表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_role
+-- ----------------------------
+INSERT INTO `sys_role` VALUES (1, '超级管理员', 'admin', 1, '1', 1, 1, '0', '0', 'admin', '2023-05-23 16:13:33', '', NULL, '超级管理员');
+INSERT INTO `sys_role` VALUES (2, '普通角色', 'common', 2, '2', 1, 1, '0', '0', 'admin', '2023-05-23 16:13:33', 'admin', '2023-09-01 15:53:26', '普通角色');
+
+-- ----------------------------
+-- Table structure for sys_role_dept
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_role_dept`;
+CREATE TABLE `sys_role_dept` (
+ `role_id` bigint(20) NOT NULL COMMENT '角色ID',
+ `dept_id` bigint(20) NOT NULL COMMENT '部门ID',
+ PRIMARY KEY (`role_id`, `dept_id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '角色和部门关联表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_role_dept
+-- ----------------------------
+INSERT INTO `sys_role_dept` VALUES (2, 100);
+INSERT INTO `sys_role_dept` VALUES (2, 101);
+INSERT INTO `sys_role_dept` VALUES (2, 105);
+
+-- ----------------------------
+-- Table structure for sys_role_menu
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_role_menu`;
+CREATE TABLE `sys_role_menu` (
+ `role_id` bigint(20) NOT NULL COMMENT '角色ID',
+ `menu_id` bigint(20) NOT NULL COMMENT '菜单ID',
+ PRIMARY KEY (`role_id`, `menu_id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '角色和菜单关联表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_role_menu
+-- ----------------------------
+INSERT INTO `sys_role_menu` VALUES (2, 1);
+INSERT INTO `sys_role_menu` VALUES (2, 2);
+INSERT INTO `sys_role_menu` VALUES (2, 3);
+INSERT INTO `sys_role_menu` VALUES (2, 4);
+INSERT INTO `sys_role_menu` VALUES (2, 100);
+INSERT INTO `sys_role_menu` VALUES (2, 101);
+INSERT INTO `sys_role_menu` VALUES (2, 102);
+INSERT INTO `sys_role_menu` VALUES (2, 103);
+INSERT INTO `sys_role_menu` VALUES (2, 104);
+INSERT INTO `sys_role_menu` VALUES (2, 105);
+INSERT INTO `sys_role_menu` VALUES (2, 106);
+INSERT INTO `sys_role_menu` VALUES (2, 107);
+INSERT INTO `sys_role_menu` VALUES (2, 108);
+INSERT INTO `sys_role_menu` VALUES (2, 109);
+INSERT INTO `sys_role_menu` VALUES (2, 110);
+INSERT INTO `sys_role_menu` VALUES (2, 111);
+INSERT INTO `sys_role_menu` VALUES (2, 112);
+INSERT INTO `sys_role_menu` VALUES (2, 113);
+INSERT INTO `sys_role_menu` VALUES (2, 114);
+INSERT INTO `sys_role_menu` VALUES (2, 115);
+INSERT INTO `sys_role_menu` VALUES (2, 116);
+INSERT INTO `sys_role_menu` VALUES (2, 117);
+INSERT INTO `sys_role_menu` VALUES (2, 500);
+INSERT INTO `sys_role_menu` VALUES (2, 501);
+INSERT INTO `sys_role_menu` VALUES (2, 1000);
+INSERT INTO `sys_role_menu` VALUES (2, 1001);
+INSERT INTO `sys_role_menu` VALUES (2, 1002);
+INSERT INTO `sys_role_menu` VALUES (2, 1003);
+INSERT INTO `sys_role_menu` VALUES (2, 1004);
+INSERT INTO `sys_role_menu` VALUES (2, 1005);
+INSERT INTO `sys_role_menu` VALUES (2, 1006);
+INSERT INTO `sys_role_menu` VALUES (2, 1007);
+INSERT INTO `sys_role_menu` VALUES (2, 1008);
+INSERT INTO `sys_role_menu` VALUES (2, 1009);
+INSERT INTO `sys_role_menu` VALUES (2, 1010);
+INSERT INTO `sys_role_menu` VALUES (2, 1011);
+INSERT INTO `sys_role_menu` VALUES (2, 1012);
+INSERT INTO `sys_role_menu` VALUES (2, 1013);
+INSERT INTO `sys_role_menu` VALUES (2, 1014);
+INSERT INTO `sys_role_menu` VALUES (2, 1015);
+INSERT INTO `sys_role_menu` VALUES (2, 1016);
+INSERT INTO `sys_role_menu` VALUES (2, 1017);
+INSERT INTO `sys_role_menu` VALUES (2, 1018);
+INSERT INTO `sys_role_menu` VALUES (2, 1019);
+INSERT INTO `sys_role_menu` VALUES (2, 1020);
+INSERT INTO `sys_role_menu` VALUES (2, 1021);
+INSERT INTO `sys_role_menu` VALUES (2, 1022);
+INSERT INTO `sys_role_menu` VALUES (2, 1023);
+INSERT INTO `sys_role_menu` VALUES (2, 1024);
+INSERT INTO `sys_role_menu` VALUES (2, 1025);
+INSERT INTO `sys_role_menu` VALUES (2, 1026);
+INSERT INTO `sys_role_menu` VALUES (2, 1027);
+INSERT INTO `sys_role_menu` VALUES (2, 1028);
+INSERT INTO `sys_role_menu` VALUES (2, 1029);
+INSERT INTO `sys_role_menu` VALUES (2, 1030);
+INSERT INTO `sys_role_menu` VALUES (2, 1031);
+INSERT INTO `sys_role_menu` VALUES (2, 1032);
+INSERT INTO `sys_role_menu` VALUES (2, 1033);
+INSERT INTO `sys_role_menu` VALUES (2, 1034);
+INSERT INTO `sys_role_menu` VALUES (2, 1035);
+INSERT INTO `sys_role_menu` VALUES (2, 1036);
+INSERT INTO `sys_role_menu` VALUES (2, 1037);
+INSERT INTO `sys_role_menu` VALUES (2, 1038);
+INSERT INTO `sys_role_menu` VALUES (2, 1039);
+INSERT INTO `sys_role_menu` VALUES (2, 1040);
+INSERT INTO `sys_role_menu` VALUES (2, 1041);
+INSERT INTO `sys_role_menu` VALUES (2, 1042);
+INSERT INTO `sys_role_menu` VALUES (2, 1043);
+INSERT INTO `sys_role_menu` VALUES (2, 1044);
+INSERT INTO `sys_role_menu` VALUES (2, 1045);
+INSERT INTO `sys_role_menu` VALUES (2, 1046);
+INSERT INTO `sys_role_menu` VALUES (2, 1047);
+INSERT INTO `sys_role_menu` VALUES (2, 1048);
+INSERT INTO `sys_role_menu` VALUES (2, 1049);
+INSERT INTO `sys_role_menu` VALUES (2, 1050);
+INSERT INTO `sys_role_menu` VALUES (2, 1051);
+INSERT INTO `sys_role_menu` VALUES (2, 1052);
+INSERT INTO `sys_role_menu` VALUES (2, 1053);
+INSERT INTO `sys_role_menu` VALUES (2, 1054);
+INSERT INTO `sys_role_menu` VALUES (2, 1055);
+INSERT INTO `sys_role_menu` VALUES (2, 1056);
+INSERT INTO `sys_role_menu` VALUES (2, 1057);
+INSERT INTO `sys_role_menu` VALUES (2, 1058);
+INSERT INTO `sys_role_menu` VALUES (2, 1059);
+INSERT INTO `sys_role_menu` VALUES (2, 1060);
+
+-- ----------------------------
+-- Table structure for sys_user
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_user`;
+CREATE TABLE `sys_user` (
+ `user_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
+ `dept_id` bigint(20) NULL DEFAULT NULL COMMENT '部门ID',
+ `user_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '用户账号',
+ `nick_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '用户昵称',
+ `user_type` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '00' COMMENT '用户类型（00系统用户）',
+ `email` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '用户邮箱',
+ `phonenumber` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '手机号码',
+ `sex` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '0' COMMENT '用户性别（0男 1女 2未知）',
+ `avatar` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '头像地址',
+ `password` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '密码',
+ `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '0' COMMENT '帐号状态（0正常 1停用）',
+ `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+ `login_ip` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '最后登录IP',
+ `login_date` datetime(0) NULL DEFAULT NULL COMMENT '最后登录时间',
+ `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '创建者',
+ `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '更新者',
+ `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+ `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
+ PRIMARY KEY (`user_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 100 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '用户信息表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_user
+-- ----------------------------
+INSERT INTO `sys_user` VALUES (1, 103, 'admin', '超级管理员', '00', 'niangao@163.com', '18888888888', '1', 'http://127.0.0.1:9099/common/caches?taskId=avatar&filename=admin_avatar.jpeg', '$2b$12$dW/S5ummJs3Z5fMXqsesWuJgTimgtpK85L0zFhUAuFmHDznII/F66', '0', '0', '127.0.0.1', '2023-05-23 16:13:33', 'admin', '2023-05-23 16:13:33', 'admin', '2023-05-23 16:13:33', '管理员');
+INSERT INTO `sys_user` VALUES (2, 105, 'niangao', '年糕', '00', 'niangao@qq.com', '16688888888', '0', 'http://127.0.0.1:9099/common/caches?taskId=avatar&filename=ry_avatar.jpeg', '$2b$12$UkNwXNmyQ2RbS1BROXmCRelWLkEgKWQmVsY1S9O1/nZpUSPud1Oz2', '0', '0', '127.0.0.1', '2023-05-23 16:13:33', 'admin', '2023-05-23 16:13:33', 'admin', '2023-05-23 16:13:33', '测试员');
+
+-- ----------------------------
+-- Table structure for sys_user_post
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_user_post`;
+CREATE TABLE `sys_user_post` (
+ `user_id` bigint(20) NOT NULL COMMENT '用户ID',
+ `post_id` bigint(20) NOT NULL COMMENT '岗位ID',
+ PRIMARY KEY (`user_id`, `post_id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '用户与岗位关联表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_user_post
+-- ----------------------------
+INSERT INTO `sys_user_post` VALUES (1, 1);
+INSERT INTO `sys_user_post` VALUES (2, 1);
+
+-- ----------------------------
+-- Table structure for sys_user_role
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_user_role`;
+CREATE TABLE `sys_user_role` (
+ `user_id` bigint(20) NOT NULL COMMENT '用户ID',
+ `role_id` bigint(20) NOT NULL COMMENT '角色ID',
+ PRIMARY KEY (`user_id`, `role_id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '用户和角色关联表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_user_role
+-- ----------------------------
+INSERT INTO `sys_user_role` VALUES (1, 1);
+INSERT INTO `sys_user_role` VALUES (2, 2);
+
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/dash-fastapi-backend/utils/common_util.py b/dash-fastapi-backend/utils/common_util.py
new file mode 100644
index 0000000000000000000000000000000000000000..3715a76de207e8ca9879da8924b6acd279bb0c79
--- /dev/null
+++ b/dash-fastapi-backend/utils/common_util.py
@@ -0,0 +1,67 @@
+import pandas as pd
+import io
+
+
+def worship():
+ print("""
+////////////////////////////////////////////////////////////////////
+// _ooOoo_ //
+// o8888888o //
+// 88" . "88 //
+// (| ^_^ |) //
+// O\ = /O //
+// ____/`---'\____ //
+// .' \\| |// `. //
+// / \\||| : |||// \ //
+// / _||||| -:- |||||- \ //
+// | | \\\ - /// | | //
+// | \_| ''\---/'' | | //
+// \ .-\__ `-` ___/-. / //
+// ___`. .' /--.--\ `. . ___ //
+// ."" '< `.___\_<|>_/___.' >'"". //
+// | | : `- \`.;`\ _ /`;.`/ - ` : | | //
+// \ \ `-. \_ __\ /__ _/ .-` / / //
+// ========`-.____`-.___\_____/___.-`____.-'======== //
+// `=---=' //
+// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ //
+// 佛祖保佑 永不宕机 永无BUG //
+////////////////////////////////////////////////////////////////////
+ """)
+
+
+def bytes2human(n, format_str="%(value).1f%(symbol)s"):
+ """Used by various scripts. See:
+ http://goo.gl/zeJZl
+
+ >>> bytes2human(10000)
+ '9.8K'
+ >>> bytes2human(100001221)
+ '95.4M'
+ """
+ symbols = ('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB')
+ prefix = {}
+ for i, s in enumerate(symbols[1:]):
+ prefix[s] = 1 << (i + 1) * 10
+ for symbol in reversed(symbols[1:]):
+ if n >= prefix[symbol]:
+ value = float(n) / prefix[symbol]
+ return format_str % locals()
+ return format_str % dict(symbol=symbols[0], value=n)
+
+
+def bytes2file_response(bytes_info):
+ yield bytes_info
+
+
+def export_list2excel(list_data: list):
+ """
+ 工具方法：将需要导出的list数据转化为对应excel的二进制数据
+ :param list_data: 数据列表
+ :return: 字典信息对应excel的二进制数据
+ """
+ df = pd.DataFrame(list_data)
+ binary_data = io.BytesIO()
+ df.to_excel(binary_data, index=False, engine='openpyxl')
+ binary_data = binary_data.getvalue()
+
+ return binary_data
diff --git a/dash-fastapi-backend/module_admin/utils/log_util.py b/dash-fastapi-backend/utils/log_util.py
similarity index 100%
rename from dash-fastapi-backend/module_admin/utils/log_util.py
rename to dash-fastapi-backend/utils/log_util.py
diff --git a/dash-fastapi-backend/utils/message_util.py b/dash-fastapi-backend/utils/message_util.py
new file mode 100644
index 0000000000000000000000000000000000000000..6a21f88d0e714cd89425c011150122301f9d4e19
--- /dev/null
+++ b/dash-fastapi-backend/utils/message_util.py
@@ -0,0 +1,5 @@
+from utils.log_util import logger
+
+
+def message_service(sms_code: str):
+ logger.info(f"短信验证码为{sms_code}")
diff --git a/dash-fastapi-backend/module_admin/utils/page_util.py b/dash-fastapi-backend/utils/page_util.py
similarity index 49%
rename from dash-fastapi-backend/module_admin/utils/page_util.py
rename to dash-fastapi-backend/utils/page_util.py
index 21ef67e6cead15bdb9912285f21be196c08817a9..dd780214ee1b070e103a64c06e4461e6f0b07a6a 100644
--- a/dash-fastapi-backend/module_admin/utils/page_util.py
+++ b/dash-fastapi-backend/utils/page_util.py
@@ -1,3 +1,6 @@
+import math
+from typing import List
+
from pydantic import BaseModel
@@ -12,6 +15,17 @@ class PageModel(BaseModel):
has_next: bool
+class PageObjectResponse(BaseModel):
+ """
+ 用户管理列表分页查询返回模型
+ """
+ rows: List = []
+ page_num: int
+ page_size: int
+ total: int
+ has_next: bool
+
+
def get_page_info(offset: int, page_num: int, page_size: int, count: int):
"""
根据分页参数获取分页信息
@@ -39,3 +53,32 @@ def get_page_info(offset: int, page_num: int, page_size: int, count: int):
result = dict(offset=res_offset, page_num=res_page_num, page_size=page_size, total=count, has_next=has_next)
return PageModel(**result)
+
+
+def get_page_obj(data_list: List, page_num: int, page_size: int):
+ """
+ 输入数据列表data_list和分页信息，返回分页数据列表结果
+ :param data_list: 原始数据列表
+ :param page_num: 当前页码
+ :param page_size: 当前页面数据量
+ :return: 分页数据对象
+ """
+ # 计算起始索引和结束索引
+ start = (page_num - 1) * page_size
+ end = page_num * page_size
+
+ # 根据计算得到的起始索引和结束索引对数据列表进行切片
+ paginated_data = data_list[start:end]
+ has_next = True if math.ceil(len(data_list) / page_size) > page_num else False
+
+ result = dict(
+ rows=paginated_data,
+ page_num=page_num,
+ page_size=page_size,
+ total=len(data_list),
+ has_next=has_next
+ )
+
+ return PageObjectResponse(**result)
+
+
diff --git a/dash-fastapi-backend/utils/pwd_util.py b/dash-fastapi-backend/utils/pwd_util.py
new file mode 100644
index 0000000000000000000000000000000000000000..2e9a2f9a72f69f20e819c206ea8eb61258d5de54
--- /dev/null
+++ b/dash-fastapi-backend/utils/pwd_util.py
@@ -0,0 +1,28 @@
+from passlib.context import CryptContext
+
+pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
+
+
+class PwdUtil:
+ """
+ 密码工具类
+ """
+
+ @classmethod
+ def verify_password(cls, plain_password, hashed_password):
+ """
+ 工具方法：校验当前输入的密码与数据库存储的密码是否一致
+ :param plain_password: 当前输入的密码
+ :param hashed_password: 数据库存储的密码
+ :return: 校验结果
+ """
+ return pwd_context.verify(plain_password, hashed_password)
+
+ @classmethod
+ def get_password_hash(cls, input_password):
+ """
+ 工具方法：对当前输入的密码进行加密
+ :param input_password: 输入的密码
+ :return: 加密成功的密码
+ """
+ return pwd_context.hash(input_password)
diff --git a/dash-fastapi-backend/module_admin/utils/response_util.py b/dash-fastapi-backend/utils/response_util.py
similarity index 67%
rename from dash-fastapi-backend/module_admin/utils/response_util.py
rename to dash-fastapi-backend/utils/response_util.py
index 614061153dec2a17618c96d7b258baa3400d32dd..cf0e8ba904fe041a958d7d31c717c3ca0dc6130f 100644
--- a/dash-fastapi-backend/module_admin/utils/response_util.py
+++ b/dash-fastapi-backend/utils/response_util.py
@@ -1,11 +1,11 @@
from fastapi import status
-from fastapi.responses import JSONResponse, Response
+from fastapi.responses import JSONResponse, Response, StreamingResponse
from fastapi.encoders import jsonable_encoder
-from typing import Union
+from typing import Any
from datetime import datetime
-def response_200(*, data: Union[list, dict, str], message="获取成功") -> Response:
+def response_200(*, data: Any = None, message="获取成功") -> Response:
return JSONResponse(
status_code=status.HTTP_200_OK,
content=jsonable_encoder(
@@ -20,10 +20,10 @@ def response_200(*, data: Union[list, dict, str], message="获取成功") -> Res
)
-def response_400(*, data: str = None, message: str = "获取失败") -> Response:
+def response_400(*, data: Any = None, message: str = "获取失败") -> Response:
return JSONResponse(
status_code=status.HTTP_400_BAD_REQUEST,
- content=(
+ content=jsonable_encoder(
{
'code': 400,
'message': message,
@@ -35,10 +35,10 @@ def response_400(*, data: str = None, message: str = "获取失败") -> Response
)
-def response_401(*, data: str = None, message: str = "获取失败") -> Response:
+def response_401(*, data: Any = None, message: str = "获取失败") -> Response:
return JSONResponse(
status_code=status.HTTP_401_UNAUTHORIZED,
- content=(
+ content=jsonable_encoder(
{
'code': 401,
'message': message,
@@ -50,10 +50,10 @@ def response_401(*, data: str = None, message: str = "获取失败") -> Response
)
-def response_500(*, data: str = None, message: str = "接口异常") -> Response:
+def response_500(*, data: Any = None, message: str = "接口异常") -> Response:
return JSONResponse(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
- content=(
+ content=jsonable_encoder(
{
'code': 500,
'message': message,
@@ -63,6 +63,13 @@ def response_500(*, data: str = None, message: str = "接口异常") -> Response
}
)
)
+
+
+def streaming_response_200(*, data: Any = None):
+ return StreamingResponse(
+ status_code=status.HTTP_200_OK,
+ content=data,
+ )
class AuthException(Exception):
@@ -72,3 +79,12 @@ class AuthException(Exception):
def __init__(self, data: str = None, message: str = None):
self.data = data
self.message = message
+
+
+class LoginException(Exception):
+ """
+ 自定义登录异常LoginException
+ """
+ def __init__(self, data: str = None, message: str = None):
+ self.data = data
+ self.message = message
diff --git a/dash-fastapi-backend/module_admin/utils/time_format_util.py b/dash-fastapi-backend/utils/time_format_util.py
similarity index 100%
rename from dash-fastapi-backend/module_admin/utils/time_format_util.py
rename to dash-fastapi-backend/utils/time_format_util.py
diff --git a/dash-fastapi-frontend/api/cache.py b/dash-fastapi-frontend/api/cache.py
new file mode 100644
index 0000000000000000000000000000000000000000..2cb2d2bbd8e2d380dfc6a129c6b4bae2fdf21ce8
--- /dev/null
+++ b/dash-fastapi-frontend/api/cache.py
@@ -0,0 +1,6 @@
+from utils.request import api_request
+
+
+def get_cache_statistical_info_api():
+
+ return api_request(method='post', url='/monitor/cache/statisticalInfo', is_headers=True)
diff --git a/dash-fastapi-frontend/api/config.py b/dash-fastapi-frontend/api/config.py
new file mode 100644
index 0000000000000000000000000000000000000000..f092b8d1fe427b6da1df3633722e9f49183cbabd
--- /dev/null
+++ b/dash-fastapi-frontend/api/config.py
@@ -0,0 +1,41 @@
+from utils.request import api_request
+
+
+def get_config_list_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/config/get', is_headers=True, json=page_obj)
+
+
+def query_config_list_api(config_key: str):
+
+ return api_request(method='get', url=f'/common/config/query/{config_key}', is_headers=False)
+
+
+def add_config_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/config/add', is_headers=True, json=page_obj)
+
+
+def edit_config_api(page_obj: dict):
+
+ return api_request(method='patch', url='/system/config/edit', is_headers=True, json=page_obj)
+
+
+def delete_config_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/config/delete', is_headers=True, json=page_obj)
+
+
+def get_config_detail_api(config_id: int):
+
+ return api_request(method='get', url=f'/system/config/{config_id}', is_headers=True)
+
+
+def export_config_list_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/config/export', is_headers=True, json=page_obj, stream=True)
+
+
+def refresh_config_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/config/refresh', is_headers=True, json=page_obj)
diff --git a/dash-fastapi-frontend/api/dict.py b/dash-fastapi-frontend/api/dict.py
new file mode 100644
index 0000000000000000000000000000000000000000..92eca5f1801041847d90776fe17ee22556dbaa37
--- /dev/null
+++ b/dash-fastapi-frontend/api/dict.py
@@ -0,0 +1,76 @@
+from utils.request import api_request
+
+
+def get_dict_type_list_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/dictType/get', is_headers=True, json=page_obj)
+
+
+def get_all_dict_type_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/dictType/all', is_headers=True, json=page_obj)
+
+
+def add_dict_type_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/dictType/add', is_headers=True, json=page_obj)
+
+
+def edit_dict_type_api(page_obj: dict):
+
+ return api_request(method='patch', url='/system/dictType/edit', is_headers=True, json=page_obj)
+
+
+def delete_dict_type_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/dictType/delete', is_headers=True, json=page_obj)
+
+
+def get_dict_type_detail_api(dict_id: int):
+
+ return api_request(method='get', url=f'/system/dictType/{dict_id}', is_headers=True)
+
+
+def export_dict_type_list_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/dictType/export', is_headers=True, json=page_obj, stream=True)
+
+
+def refresh_dict_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/dictType/refresh', is_headers=True, json=page_obj)
+
+
+def get_dict_data_list_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/dictData/get', is_headers=True, json=page_obj)
+
+
+def query_dict_data_list_api(dict_type: str):
+
+ return api_request(method='get', url=f'/system/dictData/query/{dict_type}', is_headers=True)
+
+
+def add_dict_data_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/dictData/add', is_headers=True, json=page_obj)
+
+
+def edit_dict_data_api(page_obj: dict):
+
+ return api_request(method='patch', url='/system/dictData/edit', is_headers=True, json=page_obj)
+
+
+def delete_dict_data_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/dictData/delete', is_headers=True, json=page_obj)
+
+
+def get_dict_data_detail_api(dict_code: int):
+
+ return api_request(method='get', url=f'/system/dictData/{dict_code}', is_headers=True)
+
+
+def export_dict_data_list_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/dictData/export', is_headers=True, json=page_obj, stream=True)
diff --git a/dash-fastapi-frontend/api/job.py b/dash-fastapi-frontend/api/job.py
new file mode 100644
index 0000000000000000000000000000000000000000..5c125c95e641f75e511079f755a4bd789b67c08a
--- /dev/null
+++ b/dash-fastapi-frontend/api/job.py
@@ -0,0 +1,61 @@
+from utils.request import api_request
+
+
+def get_job_list_api(page_obj: dict):
+
+ return api_request(method='post', url='/monitor/job/get', is_headers=True, json=page_obj)
+
+
+def add_job_api(page_obj: dict):
+
+ return api_request(method='post', url='/monitor/job/add', is_headers=True, json=page_obj)
+
+
+def edit_job_api(page_obj: dict):
+
+ return api_request(method='patch', url='/monitor/job/edit', is_headers=True, json=page_obj)
+
+
+def execute_job_api(page_obj: dict):
+
+ return api_request(method='post', url='/monitor/job/changeStatus', is_headers=True, json=page_obj)
+
+
+def delete_job_api(page_obj: dict):
+
+ return api_request(method='post', url='/monitor/job/delete', is_headers=True, json=page_obj)
+
+
+def get_job_detail_api(job_id: int):
+
+ return api_request(method='get', url=f'/monitor/job/{job_id}', is_headers=True)
+
+
+def export_job_list_api(page_obj: dict):
+
+ return api_request(method='post', url='/monitor/job/export', is_headers=True, json=page_obj, stream=True)
+
+
+def get_job_log_list_api(page_obj: dict):
+
+ return api_request(method='post', url='/monitor/jobLog/get', is_headers=True, json=page_obj)
+
+
+def delete_job_log_api(page_obj: dict):
+
+ return api_request(method='post', url='/monitor/jobLog/delete', is_headers=True, json=page_obj)
+
+
+def clear_job_log_api(page_obj: dict):
+
+ return api_request(method='post', url='/monitor/jobLog/clear', is_headers=True, json=page_obj)
+
+
+def get_job_log_detail_api(job_log_id: int):
+
+ return api_request(method='get', url=f'/monitor/jobLog/{job_log_id}', is_headers=True)
+
+
+def export_job_log_list_api(page_obj: dict):
+
+ return api_request(method='post', url='/monitor/jobLog/export', is_headers=True, json=page_obj, stream=True)
diff --git a/dash-fastapi-frontend/api/log.py b/dash-fastapi-frontend/api/log.py
new file mode 100644
index 0000000000000000000000000000000000000000..a58704e8c668244687a2f0d80075b2adc7940b2f
--- /dev/null
+++ b/dash-fastapi-frontend/api/log.py
@@ -0,0 +1,51 @@
+from utils.request import api_request
+
+
+def get_operation_log_list_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/log/operation/get', is_headers=True, json=page_obj)
+
+
+def delete_operation_log_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/log/operation/delete', is_headers=True, json=page_obj)
+
+
+def clear_operation_log_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/log/operation/clear', is_headers=True, json=page_obj)
+
+
+def export_operation_log_list_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/log/operation/export', is_headers=True, json=page_obj, stream=True)
+
+
+def get_operation_log_detail_api(oper_id: int):
+
+ return api_request(method='get', url=f'/system/log/operation/{oper_id}', is_headers=True)
+
+
+def get_login_log_list_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/log/login/get', is_headers=True, json=page_obj)
+
+
+def delete_login_log_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/log/login/delete', is_headers=True, json=page_obj)
+
+
+def clear_login_log_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/log/login/clear', is_headers=True, json=page_obj)
+
+
+def unlock_user_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/log/login/unlock', is_headers=True, json=page_obj)
+
+
+def export_login_log_list_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/log/login/export', is_headers=True, json=page_obj, stream=True)
diff --git a/dash-fastapi-frontend/api/login.py b/dash-fastapi-frontend/api/login.py
index 0dcaf0d730ccac96da94e14799e684c117625152..fd642f28ded29062ca5977ef58b10b1fa72b1c2d 100644
--- a/dash-fastapi-frontend/api/login.py
+++ b/dash-fastapi-frontend/api/login.py
@@ -3,7 +3,12 @@ from utils.request import api_request
def login_api(page_obj: dict):
- return api_request(method='post', url='/login/loginByAccount', is_headers=False, json=page_obj)
+ return api_request(method='post', url='/login/loginByAccount', is_headers=False, data=page_obj)
+
+
+def get_captcha_image_api():
+
+ return api_request(method='post', url='/captcha/captchaImage', is_headers=False)
def get_current_user_info_api():
diff --git a/dash-fastapi-frontend/api/message.py b/dash-fastapi-frontend/api/message.py
index 72b80d924aab5cfe50e89fc59edb50501f878831..8257f7635c01f4342baf3c7c51326f598c443a72 100644
--- a/dash-fastapi-frontend/api/message.py
+++ b/dash-fastapi-frontend/api/message.py
@@ -3,4 +3,4 @@ from utils.request import api_request
def send_message_api(page_obj: dict):
- return api_request(method='post', url='/login/loginByAccount', is_headers=False, json=page_obj)
\ No newline at end of file
+ return api_request(method='post', url='/login/getSmsCode', is_headers=False, json=page_obj)
\ No newline at end of file
diff --git a/dash-fastapi-frontend/api/notice.py b/dash-fastapi-frontend/api/notice.py
new file mode 100644
index 0000000000000000000000000000000000000000..af972ed12c16c7eaae7755b58b2be7f5e7b5233f
--- /dev/null
+++ b/dash-fastapi-frontend/api/notice.py
@@ -0,0 +1,26 @@
+from utils.request import api_request
+
+
+def get_notice_list_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/notice/get', is_headers=True, json=page_obj)
+
+
+def add_notice_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/notice/add', is_headers=True, json=page_obj)
+
+
+def edit_notice_api(page_obj: dict):
+
+ return api_request(method='patch', url='/system/notice/edit', is_headers=True, json=page_obj)
+
+
+def delete_notice_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/notice/delete', is_headers=True, json=page_obj)
+
+
+def get_notice_detail_api(notice_id: int):
+
+ return api_request(method='get', url=f'/system/notice/{notice_id}', is_headers=True)
diff --git a/dash-fastapi-frontend/api/online.py b/dash-fastapi-frontend/api/online.py
new file mode 100644
index 0000000000000000000000000000000000000000..0504b36774ca4f625f9e082e30eb30f56fc01ad9
--- /dev/null
+++ b/dash-fastapi-frontend/api/online.py
@@ -0,0 +1,16 @@
+from utils.request import api_request
+
+
+def get_online_list_api(page_obj: dict):
+
+ return api_request(method='post', url='/monitor/online/get', is_headers=True, json=page_obj)
+
+
+def force_logout_online_api(page_obj: dict):
+
+ return api_request(method='post', url='/monitor/online/forceLogout', is_headers=True, json=page_obj)
+
+
+def batch_logout_online_api(page_obj: dict):
+
+ return api_request(method='post', url='/monitor/online/batchLogout', is_headers=True, json=page_obj)
diff --git a/dash-fastapi-frontend/api/post.py b/dash-fastapi-frontend/api/post.py
index 42277c7ce427d0e8b733f8ffba7fe2f1c83b9ef5..8c058512cf34ea16597a00c829ffcd2a441ef61f 100644
--- a/dash-fastapi-frontend/api/post.py
+++ b/dash-fastapi-frontend/api/post.py
@@ -29,3 +29,8 @@ def delete_post_api(page_obj: dict):
def get_post_detail_api(post_id: int):
return api_request(method='get', url=f'/system/post/{post_id}', is_headers=True)
+
+
+def export_post_list_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/post/export', is_headers=True, json=page_obj, stream=True)
diff --git a/dash-fastapi-frontend/api/role.py b/dash-fastapi-frontend/api/role.py
index 9cafd615253d3cc183109a9e7e65a62dd6b798d9..8526d2bfae1af6a565c045f29113c06f8fb3aeac 100644
--- a/dash-fastapi-frontend/api/role.py
+++ b/dash-fastapi-frontend/api/role.py
@@ -29,3 +29,8 @@ def delete_role_api(page_obj: dict):
def get_role_detail_api(role_id: int):
return api_request(method='get', url=f'/system/role/{role_id}', is_headers=True)
+
+
+def export_role_list_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/role/export', is_headers=True, json=page_obj, stream=True)
diff --git a/dash-fastapi-frontend/api/server.py b/dash-fastapi-frontend/api/server.py
new file mode 100644
index 0000000000000000000000000000000000000000..9e8e3eb83ad468d37f7d06d0900e0978a240e6d8
--- /dev/null
+++ b/dash-fastapi-frontend/api/server.py
@@ -0,0 +1,6 @@
+from utils.request import api_request
+
+
+def get_server_statistical_info_api():
+
+ return api_request(method='post', url='/monitor/server/statisticalInfo', is_headers=True)
diff --git a/dash-fastapi-frontend/api/user.py b/dash-fastapi-frontend/api/user.py
index 2edf88d837484bcc542e99abd77e7c98cc6e0ec2..e931802ab5bf4fb016b5684cebd6b4d4d2909e8e 100644
--- a/dash-fastapi-frontend/api/user.py
+++ b/dash-fastapi-frontend/api/user.py
@@ -1,9 +1,9 @@
from utils.request import api_request
-def change_password_api(page_obj: dict):
+def forget_user_pwd_api(page_obj: dict):
- return api_request(method='post', url='/login/loginByAccount', is_headers=False, json=page_obj)
+ return api_request(method='post', url='/login/forgetPwd', is_headers=False, json=page_obj)
def get_user_list_api(page_obj: dict):
@@ -29,3 +29,24 @@ def delete_user_api(page_obj: dict):
def get_user_detail_api(user_id: int):
return api_request(method='get', url=f'/system/user/{user_id}', is_headers=True)
+
+
+def change_user_avatar_api(page_obj: dict):
+
+ return api_request(method='patch', url='/system/user/profile/changeAvatar', is_headers=True, json=page_obj)
+
+
+def change_user_info_api(page_obj: dict):
+
+ return api_request(method='patch', url='/system/user/profile/changeInfo', is_headers=True, json=page_obj)
+
+
+def reset_user_password_api(page_obj: dict):
+
+ return api_request(method='patch', url='/system/user/profile/resetPwd', is_headers=True, json=page_obj)
+
+
+def export_user_list_api(page_obj: dict):
+
+ return api_request(method='post', url='/system/user/export', is_headers=True, json=page_obj, stream=True)
+
diff --git a/dash-fastapi-frontend/app.py b/dash-fastapi-frontend/app.py
index 6c5a23a7bcf838afcb6e8b2f1a326015da7b0d04..dd9d815c9b4872028ca9f1165d584d6a0d3b8966 100644
--- a/dash-fastapi-frontend/app.py
+++ b/dash-fastapi-frontend/app.py
@@ -4,9 +4,9 @@ from dash import html, dcc
from dash.dependencies import Input, Output, State
import feffery_antd_components as fac
import feffery_utils_components as fuc
-from flask import session, request, json
+from flask import session
-from server import app, logger, server
+from server import app
from config.global_config import RouterConfig
from store.store import render_store_container
@@ -15,7 +15,7 @@ import views
from callbacks import app_c
from api.login import get_current_user_info_api
-from utils.tree_tool import find_node_values, find_key_by_href
+from utils.tree_tool import find_node_values, find_key_by_href, deal_user_menu_info, get_search_panel_data
app.layout = html.Div(
[
@@ -32,6 +32,20 @@ app.layout = html.Div(
# 注入页面内容挂载点
html.Div(id='app-mount'),
+ # 注入全局配置容器
+ fac.AntdConfigProvider(id='app-config-provider'),
+
+ # 注入快捷搜索面板
+ fuc.FefferyShortcutPanel(
+ id='search-panel',
+ data=[],
+ placeholder='输入你想要搜索的菜单...',
+ panelStyles={
+ 'accentColor': '#1890ff',
+ 'zIndex': 99999
+ }
+ ),
+
# 辅助处理多输入 -> 存储接口返回token校验信息
render_store_container(),
@@ -66,38 +80,44 @@ app.layout = html.Div(
Output('redirect-container', 'children', allow_duplicate=True),
Output('global-message-container', 'children', allow_duplicate=True),
Output('api-check-token', 'data', allow_duplicate=True),
- Output('current-key-container', 'data')],
+ Output('current-key-container', 'data'),
+ Output('menu-info-store-container', 'data'),
+ Output('menu-list-store-container', 'data'),
+ Output('search-panel', 'data')],
Input('url-container', 'pathname'),
- State('url-container', 'trigger'),
+ [State('url-container', 'trigger'),
+ State('token-container', 'data')],
prevent_initial_call=True
)
-def router(pathname, trigger):
+def router(pathname, trigger, session_token):
# 检查当前会话是否已经登录
- token_result = session.get('token')
+ token_result = session.get('Authorization')
# 若已登录
- if token_result:
+ if token_result and session_token and token_result == session_token:
try:
current_user_result = get_current_user_info_api()
if current_user_result['code'] == 200:
current_user = current_user_result['data']
- user_name = current_user['user']['user_name']
- nick_name = current_user['user']['nick_name']
- phone_number = current_user['user']['phonenumber']
- menu_info = current_user['menu']
+ menu_list = current_user['menu']
+ user_menu_list = [item for item in menu_list if item.get('visible') == '0']
+ menu_info = deal_user_menu_info(0, menu_list)
+ user_menu_info = deal_user_menu_info(0, user_menu_list)
+ search_panel_data = get_search_panel_data(user_menu_list)
session['user_info'] = current_user['user']
session['dept_info'] = current_user['dept']
session['role_info'] = current_user['role']
session['post_info'] = current_user['post']
- session['menu_info'] = menu_info
- valid_href_list = find_node_values(menu_info, 'href')
- valid_href_list.append('/')
+ dynamic_valid_pathname_list = find_node_values(menu_info, 'href')
+ valid_href_list = dynamic_valid_pathname_list + RouterConfig.STATIC_VALID_PATHNAME
if pathname in valid_href_list:
current_key = find_key_by_href(menu_info, pathname)
+ if pathname == '/':
+ current_key = '首页'
+ if pathname == '/user/profile':
+ current_key = '个人资料'
if trigger == 'load':
# 根据pathname控制渲染行为
- if pathname == '/':
- current_key = '首页'
if pathname == '/login' or pathname == '/forget':
# 重定向到主页面
return [
@@ -107,40 +127,37 @@ def router(pathname, trigger):
id='router-redirect'
),
None,
- {'timestamp': time.time()}
+ {'timestamp': time.time()},
+ {'current_key': current_key},
+ {'menu_info': menu_info},
+ {'menu_list': menu_list},
+ search_panel_data
]
# 否则正常渲染主页面
return [
- views.layout.render_content(user_name, nick_name, phone_number, menu_info),
+ views.layout.render_content(user_menu_info),
None,
fuc.FefferyFancyNotification('进入主页面', type='success', autoClose=2000),
{'timestamp': time.time()},
- {'current_key': current_key}
+ {'current_key': current_key},
+ {'menu_info': menu_info},
+ {'menu_list': menu_list},
+ search_panel_data
]
- # elif trigger == 'pushstate':
else:
- if pathname == '/':
- current_key = '首页'
return [
dash.no_update,
None,
None,
{'timestamp': time.time()},
- {'current_key': current_key}
+ {'current_key': current_key},
+ {'menu_info': menu_info},
+ {'menu_list': menu_list},
+ search_panel_data
]
- # else:
- #
- # return [
- # dash.no_update,
- # dash.no_update,
- # dash.no_update,
- # {'timestamp': time.time()},
- # dash.no_update
- # ]
-
else:
# 渲染404状态页
return [
@@ -148,6 +165,9 @@ def router(pathname, trigger):
None,
None,
{'timestamp': time.time()},
+ dash.no_update,
+ dash.no_update,
+ dash.no_update,
dash.no_update
]
@@ -157,6 +177,9 @@ def router(pathname, trigger):
dash.no_update,
dash.no_update,
{'timestamp': time.time()},
+ dash.no_update,
+ dash.no_update,
+ dash.no_update,
dash.no_update
]
@@ -168,6 +191,9 @@ def router(pathname, trigger):
None,
fuc.FefferyFancyNotification('接口异常', type='error', autoClose=2000),
{'timestamp': time.time()},
+ dash.no_update,
+ dash.no_update,
+ dash.no_update,
dash.no_update
]
else:
@@ -181,6 +207,9 @@ def router(pathname, trigger):
None,
None,
{'timestamp': time.time()},
+ dash.no_update,
+ dash.no_update,
+ dash.no_update,
dash.no_update
]
@@ -190,6 +219,9 @@ def router(pathname, trigger):
None,
None,
{'timestamp': time.time()},
+ dash.no_update,
+ dash.no_update,
+ dash.no_update,
dash.no_update
]
@@ -199,6 +231,9 @@ def router(pathname, trigger):
None,
None,
{'timestamp': time.time()},
+ dash.no_update,
+ dash.no_update,
+ dash.no_update,
dash.no_update
]
@@ -211,6 +246,9 @@ def router(pathname, trigger):
),
None,
{'timestamp': time.time()},
+ dash.no_update,
+ dash.no_update,
+ dash.no_update,
dash.no_update
]
diff --git a/dash-fastapi-frontend/assets/css/cropper.min.css b/dash-fastapi-frontend/assets/css/cropper.min.css
new file mode 100644
index 0000000000000000000000000000000000000000..e97743ad00e3ee2f10eed53e9c1acb3257422531
--- /dev/null
+++ b/dash-fastapi-frontend/assets/css/cropper.min.css
@@ -0,0 +1,9 @@
+/*!
+ * Cropper.js v1.5.13
+ * https://fengyuanchen.github.io/cropperjs
+ *
+ * Copyright 2015-present Chen Fengyuan
+ * Released under the MIT license
+ *
+ * Date: 2022-11-20T05:30:43.444Z
+ */.cropper-container{direction:ltr;font-size:0;line-height:0;position:relative;-ms-touch-action:none;touch-action:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.cropper-container img{-webkit-backface-visibility:hidden;backface-visibility:hidden;display:block;height:100%;image-orientation:0deg;max-height:none!important;max-width:none!important;min-height:0!important;min-width:0!important;width:100%}.cropper-canvas,.cropper-crop-box,.cropper-drag-box,.cropper-modal,.cropper-wrap-box{bottom:0;left:0;position:absolute;right:0;top:0}.cropper-canvas,.cropper-wrap-box{overflow:hidden}.cropper-drag-box{background-color:#fff;opacity:0}.cropper-modal{background-color:#000;opacity:.5}.cropper-view-box{display:block;height:100%;outline:1px solid #39f;outline-color:rgba(51,153,255,.75);overflow:hidden;width:100%}.cropper-dashed{border:0 dashed #eee;display:block;opacity:.5;position:absolute}.cropper-dashed.dashed-h{border-bottom-width:1px;border-top-width:1px;height:33.33333%;left:0;top:33.33333%;width:100%}.cropper-dashed.dashed-v{border-left-width:1px;border-right-width:1px;height:100%;left:33.33333%;top:0;width:33.33333%}.cropper-center{display:block;height:0;left:50%;opacity:.75;position:absolute;top:50%;width:0}.cropper-center:after,.cropper-center:before{background-color:#eee;content:" ";display:block;position:absolute}.cropper-center:before{height:1px;left:-3px;top:0;width:7px}.cropper-center:after{height:7px;left:0;top:-3px;width:1px}.cropper-face,.cropper-line,.cropper-point{display:block;height:100%;opacity:.1;position:absolute;width:100%}.cropper-face{background-color:#fff;left:0;top:0}.cropper-line{background-color:#39f}.cropper-line.line-e{cursor:ew-resize;right:-3px;top:0;width:5px}.cropper-line.line-n{cursor:ns-resize;height:5px;left:0;top:-3px}.cropper-line.line-w{cursor:ew-resize;left:-3px;top:0;width:5px}.cropper-line.line-s{bottom:-3px;cursor:ns-resize;height:5px;left:0}.cropper-point{background-color:#39f;height:5px;opacity:.75;width:5px}.cropper-point.point-e{cursor:ew-resize;margin-top:-3px;right:-3px;top:50%}.cropper-point.point-n{cursor:ns-resize;left:50%;margin-left:-3px;top:-3px}.cropper-point.point-w{cursor:ew-resize;left:-3px;margin-top:-3px;top:50%}.cropper-point.point-s{bottom:-3px;cursor:s-resize;left:50%;margin-left:-3px}.cropper-point.point-ne{cursor:nesw-resize;right:-3px;top:-3px}.cropper-point.point-nw{cursor:nwse-resize;left:-3px;top:-3px}.cropper-point.point-sw{bottom:-3px;cursor:nesw-resize;left:-3px}.cropper-point.point-se{bottom:-3px;cursor:nwse-resize;height:20px;opacity:1;right:-3px;width:20px}@media (min-width:768px){.cropper-point.point-se{height:15px;width:15px}}@media (min-width:992px){.cropper-point.point-se{height:10px;width:10px}}@media (min-width:1200px){.cropper-point.point-se{height:5px;opacity:.75;width:5px}}.cropper-point.point-se:before{background-color:#39f;bottom:-50%;content:" ";display:block;height:200%;opacity:0;position:absolute;right:-50%;width:200%}.cropper-invisible{opacity:0}.cropper-bg{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAAA3NCSVQICAjb4U/gAAAABlBMVEXMzMz////TjRV2AAAACXBIWXMAAArrAAAK6wGCiw1aAAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAABFJREFUCJlj+M/AgBVhF/0PAH6/D/HkDxOGAAAAAElFTkSuQmCC")}.cropper-hide{display:block;height:0;position:absolute;width:0}.cropper-hidden{display:none!important}.cropper-move{cursor:move}.cropper-crop{cursor:crosshair}.cropper-disabled .cropper-drag-box,.cropper-disabled .cropper-face,.cropper-disabled .cropper-line,.cropper-disabled .cropper-point{cursor:not-allowed}
\ No newline at end of file
diff --git a/dash-fastapi-frontend/assets/favicon.ico b/dash-fastapi-frontend/assets/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..e26376026420542212ed58d90d0ed34f554fa4ae
Binary files /dev/null and b/dash-fastapi-frontend/assets/favicon.ico differ
diff --git a/dash-fastapi-frontend/assets/imgs/logo.png b/dash-fastapi-frontend/assets/imgs/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..e26376026420542212ed58d90d0ed34f554fa4ae
Binary files /dev/null and b/dash-fastapi-frontend/assets/imgs/logo.png differ
diff --git a/dash-fastapi-frontend/assets/js/cache_control_echarts_callbacks.js b/dash-fastapi-frontend/assets/js/cache_control_echarts_callbacks.js
new file mode 100644
index 0000000000000000000000000000000000000000..5a466cbd0ed9f3d3927e6ed6282dc558a28a32af
--- /dev/null
+++ b/dash-fastapi-frontend/assets/js/cache_control_echarts_callbacks.js
@@ -0,0 +1,75 @@
+// 在独立js脚本中定义比较长的回调函数
+window.dash_clientside = Object.assign({}, window.dash_clientside, {
+ clientside_command_stats: {
+ render_command_stats_chart: function (data) {
+
+ // 根据id初始化绑定图表
+ var commandStatsChart = echarts.init(document.getElementById('command-stats-charts-container'), "macarons");
+
+ const commandStatsOption = {
+ tooltip: {
+ trigger: "item",
+ formatter: "{a}
{b} : {c} ({d}%)",
+ },
+ series: [
+ {
+ name: "命令",
+ type: "pie",
+ roseType: "radius",
+ radius: [35, 115],
+ center: ["50%", "50%"],
+ data: data['command_stats'],
+ animationEasing: "cubicInOut",
+ animationDuration: 1000,
+ }
+ ]
+ };
+
+ // 渲染
+ commandStatsChart.setOption(commandStatsOption);
+ window.addEventListener("resize", () => {
+ commandStatsChart.resize();
+ });
+ }
+ }
+});
+
+
+window.dash_clientside = Object.assign({}, window.dash_clientside, {
+ clientside_memory: {
+ render_memory_chart: function (data) {
+
+ // 根据id初始化绑定图表
+ var memoryChart = echarts.init(document.getElementById('memory-charts-container'), "macarons");
+
+ const memoryOption = {
+ tooltip: {
+ formatter: "{b}
{a} : " + data['used_memory_human'],
+ },
+ series: [
+ {
+ name: "峰值",
+ type: "gauge",
+ min: 0,
+ max: 1000,
+ detail: {
+ formatter: data['used_memory_human'],
+ },
+ data: [
+ {
+ value: parseFloat(data['used_memory_human']),
+ name: "内存消耗",
+ }
+ ]
+ }
+ ]
+ };
+
+ // 渲染
+ memoryChart.setOption(memoryOption);
+ window.addEventListener("resize", () => {
+ memoryChart.resize();
+ });
+ }
+ }
+});
\ No newline at end of file
diff --git a/dash-fastapi-frontend/assets/js/cropper.min.js b/dash-fastapi-frontend/assets/js/cropper.min.js
new file mode 100644
index 0000000000000000000000000000000000000000..03aed4cc9e787b1f75b1cf70d7d30d6787bf5996
--- /dev/null
+++ b/dash-fastapi-frontend/assets/js/cropper.min.js
@@ -0,0 +1,10 @@
+/*!
+ * Cropper.js v1.5.13
+ * https://fengyuanchen.github.io/cropperjs
+ *
+ * Copyright 2015-present Chen Fengyuan
+ * Released under the MIT license
+ *
+ * Date: 2022-11-20T05:30:46.114Z
+ */
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).Cropper=e()}(this,function(){"use strict";function C(e,t){var i,a=Object.keys(e);return Object.getOwnPropertySymbols&&(i=Object.getOwnPropertySymbols(e),t&&(i=i.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),a.push.apply(a,i)),a}function S(a){for(var t=1;tt.length)&&(e=t.length);for(var i=0,a=new Array(e);it.width?3===i?o=t.height*e:h=t.width/e:3===i?h=t.width/e:o=t.height*e,{aspectRatio:e,naturalWidth:n,naturalHeight:a,width:o,height:h});this.canvasData=e,this.limited=1===i||2===i,this.limitCanvas(!0,!0),e.width=Math.min(Math.max(e.width,e.minWidth),e.maxWidth),e.height=Math.min(Math.max(e.height,e.minHeight),e.maxHeight),e.left=(t.width-e.width)/2,e.top=(t.height-e.height)/2,e.oldLeft=e.left,e.oldTop=e.top,this.initialCanvasData=g({},e)},limitCanvas:function(t,e){var i=this.options,a=this.containerData,n=this.canvasData,o=this.cropBoxData,h=i.viewMode,r=n.aspectRatio,s=this.cropped&&o;t&&(t=Number(i.minCanvasWidth)||0,i=Number(i.minCanvasHeight)||0,1=a.width&&(n.minLeft=Math.min(0,r),n.maxLeft=Math.max(0,r)),n.height>=a.height)&&(n.minTop=Math.min(0,t),n.maxTop=Math.max(0,t))):(n.minLeft=-n.width,n.minTop=-n.height,n.maxLeft=a.width,n.maxTop=a.height))},renderCanvas:function(t,e){var i,a,n,o,h=this.canvasData,r=this.imageData;e&&(e={width:r.naturalWidth*Math.abs(r.scaleX||1),height:r.naturalHeight*Math.abs(r.scaleY||1),degree:r.rotate||0},r=e.width,o=e.height,e=e.degree,i=90==(e=Math.abs(e)%180)?{width:o,height:r}:(a=e%90*Math.PI/180,i=Math.sin(a),n=r*(a=Math.cos(a))+o*i,r=r*i+o*a,90h.maxWidth||h.widthh.maxHeight||h.heighte.width?a.height=a.width/i:a.width=a.height*i),this.cropBoxData=a,this.limitCropBox(!0,!0),a.width=Math.min(Math.max(a.width,a.minWidth),a.maxWidth),a.height=Math.min(Math.max(a.height,a.minHeight),a.maxHeight),a.width=Math.max(a.minWidth,a.width*t),a.height=Math.max(a.minHeight,a.height*t),a.left=e.left+(e.width-a.width)/2,a.top=e.top+(e.height-a.height)/2,a.oldLeft=a.left,a.oldTop=a.top,this.initialCropBoxData=g({},a)},limitCropBox:function(t,e){var i,a,n=this.options,o=this.containerData,h=this.canvasData,r=this.cropBoxData,s=this.limited,c=n.aspectRatio;t&&(t=Number(n.minCropBoxWidth)||0,n=Number(n.minCropBoxHeight)||0,i=s?Math.min(o.width,h.width,h.width+h.left,o.width-h.left):o.width,a=s?Math.min(o.height,h.height,h.height+h.top,o.height-h.top):o.height,t=Math.min(t,o.width),n=Math.min(n,o.height),c&&(t&&n?ti.maxWidth||i.widthi.maxHeight||i.height=e.width&&i.height>=e.height?U:P),f(this.cropBox,g({width:i.width,height:i.height},x({translateX:i.left,translateY:i.top}))),this.cropped&&this.limited&&this.limitCanvas(!0,!0),this.disabled||this.output()},output:function(){this.preview(),y(this.element,_,this.getData())}},i={initPreview:function(){var t=this.element,i=this.crossOrigin,e=this.options.preview,a=i?this.crossOriginUrl:this.url,n=t.alt||"The image to preview",o=document.createElement("img");i&&(o.crossOrigin=i),o.src=a,o.alt=n,this.viewBox.appendChild(o),this.viewBoxImage=o,e&&("string"==typeof(o=e)?o=t.ownerDocument.querySelectorAll(e):e.querySelector&&(o=[e]),z(this.previews=o,function(t){var e=document.createElement("img");w(t,m,{width:t.offsetWidth,height:t.offsetHeight,html:t.innerHTML}),i&&(e.crossOrigin=i),e.src=a,e.alt=n,e.style.cssText='display:block;width:100%;height:auto;min-width:0!important;min-height:0!important;max-width:none!important;max-height:none!important;image-orientation:0deg!important;"',t.innerHTML="",t.appendChild(e)}))},resetPreview:function(){z(this.previews,function(e){var i=Dt(e,m),i=(f(e,{width:i.width,height:i.height}),e.innerHTML=i.html,e),e=m;if(o(i[e]))try{delete i[e]}catch(t){i[e]=void 0}else if(i.dataset)try{delete i.dataset[e]}catch(t){i.dataset[e]=void 0}else i.removeAttribute("data-".concat(Ct(e)))})},preview:function(){var h=this.imageData,t=this.canvasData,e=this.cropBoxData,r=e.width,s=e.height,c=h.width,d=h.height,l=e.left-t.left-h.left,p=e.top-t.top-h.top;this.cropped&&!this.disabled&&(f(this.viewBoxImage,g({width:c,height:d},x(g({translateX:-l,translateY:-p},h)))),z(this.previews,function(t){var e=Dt(t,m),i=e.width,e=e.height,a=i,n=e,o=1;r&&(n=s*(o=i/r)),s&&eMath.abs(a-1)?i:a)&&(t.restore&&(o=this.getCanvasData(),h=this.getCropBoxData()),this.render(),t.restore)&&(this.setCanvasData(z(o,function(t,e){o[e]=t*n})),this.setCropBoxData(z(h,function(t,e){h[e]=t*n}))))},dblclick:function(){var t,e;this.disabled||this.options.dragMode===J||this.setDragMode((t=this.dragBox,e=$,(t.classList?t.classList.contains(e):-1y&&(D.x=y-f);break;case k:p+D.xx&&(D.y=x-v)}}var i,a,o,n=this.options,h=this.canvasData,r=this.containerData,s=this.cropBoxData,c=this.pointers,d=this.action,l=n.aspectRatio,p=s.left,m=s.top,u=s.width,g=s.height,f=p+u,v=m+g,w=0,b=0,y=r.width,x=r.height,M=!0,C=(!l&&t.shiftKey&&(l=u&&g?u/g:1),this.limited&&(w=s.minLeft,b=s.minTop,y=w+Math.min(r.width,h.width,h.left+h.width),x=b+Math.min(r.height,h.height,h.top+h.height)),c[Object.keys(c)[0]]),D={x:C.endX-C.startX,y:C.endY-C.startY};switch(d){case P:p+=D.x,m+=D.y;break;case B:0<=D.x&&(y<=f||l&&(m<=b||x<=v))?M=!1:(e(B),(u+=D.x)<0&&(d=k,p-=u=-u),l&&(m+=(s.height-(g=u/l))/2));break;case T:D.y<=0&&(m<=b||l&&(p<=w||y<=f))?M=!1:(e(T),g-=D.y,m+=D.y,g<0&&(d=O,m-=g=-g),l&&(p+=(s.width-(u=g*l))/2));break;case k:D.x<=0&&(p<=w||l&&(m<=b||x<=v))?M=!1:(e(k),u-=D.x,p+=D.x,u<0&&(d=B,p-=u=-u),l&&(m+=(s.height-(g=u/l))/2));break;case O:0<=D.y&&(x<=v||l&&(p<=w||y<=f))?M=!1:(e(O),(g+=D.y)<0&&(d=T,m-=g=-g),l&&(p+=(s.width-(u=g*l))/2));break;case E:if(l){if(D.y<=0&&(m<=b||y<=f)){M=!1;break}e(T),g-=D.y,m+=D.y,u=g*l}else e(T),e(B),!(0<=D.x)||fMath.abs(o)&&(o=i)})}),o),t),M=!1;break;case I:D.x&&D.y?(i=Et(this.cropper),p=C.startX-i.left,m=C.startY-i.top,u=s.minWidth,g=s.minHeight,0 or