mirror of
https://gitee.com/lab1024/smart-admin.git
synced 2025-09-20 20:36:40 +08:00
Compare commits
No commits in common. "master" and "v3.6.0" have entirely different histories.
36
README.md
36
README.md
@ -1,30 +1,24 @@
|
||||
### **SmartAdmin**
|
||||
|
||||
**SmartAdmin** 由 **中国·洛阳** [1024创新实验室](https://www.1024lab.net/) 基于SpringBoot2/3+Sa-Token+Mybatis-Plus 和 Vue3+Ant Design Vue+Uni-App+Uni-UI，并以 <font color="#DC143C">**「高质量代码」为核心，「简洁、高效、安全」**</font>的快速开发平台。
|
||||
**SmartAdmin** 由 **河南·洛阳** [1024创新实验室](https://www.1024lab.net/) 坚持以 <font color="#DC143C">**「高质量代码」为核心，「简洁、高效、安全」**</font>的中后台解决方案！
|
||||
|
||||
**<font color="#DC143C">国内首个满足《网络安全-三级等保》、《数据安全》</font>** 功能要求，支持登录限制、接口国产加解密、数据脱敏等一系列安全要求。
|
||||
<font color="#DC143C">**国内首个满足《网络安全》、《数据安全》、三级等保**</font>， 支持登录限制、支持接口国产加解密、支持数据加解密等一系列安全措施的开源项目。
|
||||
|
||||
**<font color="#DC143C">支持国产数据库：【达梦、金仓、南大通用、OceanBase、GaussDB 高斯、阿里PolarDB、GoldenDB】等，主流数据库：【Mysql, PostgreSQL】等</font>**
|
||||
|
||||
**<font color="#DC143C">前端提供JavaScript和TypeScript双版本，后端提供Java8+SpringBoot2.X和Java17+SpringBoot3.X 双版本</font>**。
|
||||
|
||||
同时 **<font color="#DC143C">重磅开源</font>** 开源六年来 **<font color="#DC143C">千余家企业验证过且正在使用</font>** 的代码规范: **<font color="#DC143C">《高质量代码思想》、《Vue3规范》、《Java规范》</font>** ，让大家在这浮躁的世界里感受到一股把代码写好的清流！同时又能节省大量时间，减少加班，快乐工作，保持谦逊，保持学习，**<font color="#DC143C">热爱代码，更热爱生活</font>** ！
|
||||
<font color="#DC143C">**我们开源一套漂亮的代码和一套整洁的代码规范**</font>，让大家在这浮躁的代码世界里感受到一股把代码写好的清流！同时又让开发者节省大量的时间，减少加班，快乐工作，保持谦逊，保持学习，**热爱代码，更热爱生活**
|
||||
### **技术体系**
|
||||
|
||||
- 前端：JavaScript/TypeScript + Vue3 + Vite5 + Pinia + Ant Design Vue 4.X
|
||||
- 前端：Vue3 + Vite5 + Vue-Router + Pinia + Ant Design Vue 4.X
|
||||
- 移动端：uniapp (vue3版本) + uni-ui + （同时支持APP、小程序、H5）
|
||||
- 后端：Java8/17 + SpringBoot2/3 + Sa Token + Mybatis-plus + 主流数据库/国产数据库
|
||||
- 官方文档：[https://smartadmin.vip](https://smartadmin.vip)
|
||||
- 后端：SpringBoot + Sa Token + Mybatis-plus + 多种数据库
|
||||
- 电脑在线预览：[https://preview.smartadmin.vip](https://preview.smartadmin.vip)
|
||||
- 官方文档：[https://smartadmin.vip](https://smartadmin.vip)
|
||||
- 移动端在线预览：[https://app.smartadmin.vip](https://app.smartadmin.vip/#/pages/login/login)
|
||||
### **理念与思想**
|
||||
|
||||
- 我们分享的不是徒劳无功的各种功能，而是必须有的功能，如：数据变动记录、系统说明文档、版本更新记录、意见反馈、日志、心跳、单号生成器等等。
|
||||
- 我们分享的还有经过上百家公司验证过的前端、后端、vue3等代码规范，好的规范能让我敲下的每行代码更铿锵有力！
|
||||
- 我们分享的不是徒劳无功的各种功能，而是必须有的功能，如：网络安全、数据变动记录、系统说明文档、版本更新记录、意见反馈、日志、心跳、单号生成器等等。
|
||||
- 我们分享的还有经过上百家公司验证过的前端、后端、vue3等代码规范，好的规范能让我们敲下的每行代码更铿锵有力！
|
||||
- **我们推崇高质量的代码，身为开发，代码即利剑，键盘上一套行云流水，宛如侠客，事了拂衣去，深藏身与名。**
|
||||
- **我们推崇团队的高度配合默契、互相帮助，从不加班，而不是一看到别人的代码就头皮发麻，留其 [996.ICU](https://baike.baidu.com/item/996.ICU) 加班。**
|
||||
- **我们主动思考，保持谦逊，保持学习，热爱代码，更热爱生活。**
|
||||
- **<font color="#DC143C">我们希望你，希望你能花费3分钟认真阅读下面的每一个点，让你感受从未有过的技术体验！</font>**
|
||||
|
||||
### **功能亮点图**
|
||||
|
||||
@ -53,7 +47,7 @@
|
||||
|
||||
### **功能亮点**
|
||||
|
||||
- **<font color="#DC143C">安全体系</font>**：满足国家三级等保要求，如双因子登录、密码加密、密码复杂度要求、登录错误次数锁定、登录超时退出、数据脱敏等网络安全和数据安全功能
|
||||
- **<font color="#DC143C">安全体系</font>**：满足国家三级等保要求，如密码加密、密码复杂度要求、登录错误次数锁定、登录超时退出等关键功能
|
||||
- **<font color="#DC143C">接口加解密</font>**：支持请求参数和返回内容进行加解密操作，支持国产加密算法和其他国外加密算法
|
||||
- **表格自定义列**：支持用户自定义列，并能将用户自定义列持久化到数据库
|
||||
- **数据变更记录**：支持基于git diff插件的数据变更记录，查看数据变化更直观方便
|
||||
@ -62,7 +56,7 @@
|
||||
- **日志、监控**：服务器心跳日志、登录日志、操作日志（IP、浏览器、操作系统等设备信息）
|
||||
- **系统功能**：员工、部门、角色、权限、菜单、水印、文件管理、系统参数、数据字典、单号生成 等
|
||||
- **代码生成**： 基于每个表的配置、在线预览代码、下载 等
|
||||
- **以上只是一些举例，更多灿若繁星的惊喜和细节，等待着你的发现！**：[SmartAdmin 业内独有功能亮点](https://smartadmin.vip)
|
||||
- **以上只是一些举例，更多灿若繁星的惊喜和细节，等待着你的发现！**：[SmartAdmin 业内独有功能亮点](https://smartadmin.vip/views/v3/base/FunctionFeature.html)
|
||||
|
||||
|
||||
### **代码亮点**
|
||||
@ -80,4 +74,12 @@
|
||||
- **【后端-四层架构】：** 四层架构（controller, service, manager, dao），为什么要有四层
|
||||
- **【后端-多环境】：** maven多环境：开发、测试、预发布、生产 环境配置
|
||||
- **【后端-系统钩子】：** smart-reload，为系统预留钩子，动态加载，在不重启程序前提下执行一些代码
|
||||
- 以上只是沧海一粟，更多的细节等待你的发现！[去查看](https://smartadmin.vip)
|
||||
- 以上只是沧海一粟，更多的细节等待你的发现！[去查看](https://smartadmin.vip/views/v3/base/CodeFeature.html)
|
||||
|
||||
|
||||
|
||||
|
||||
### **特别鸣谢**
|
||||
|
||||
**特别感谢 Gitee 提供的开源代码平台**
|
||||
|
||||
|
||||
@ -1,420 +0,0 @@
|
||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>net.lab1024</groupId>
|
||||
<artifactId>sa-parent</artifactId>
|
||||
<version>3.0.0</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<name>sa-parent</name>
|
||||
<description>SmartAdmin project</description>
|
||||
|
||||
<modules>
|
||||
<module>sa-base</module>
|
||||
<module>sa-admin</module>
|
||||
</modules>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
<java.version>17</java.version>
|
||||
<springboot.version>3.5.4</springboot.version>
|
||||
<spring-security-crypto.version>6.5.1</spring-security-crypto.version>
|
||||
<mybatis-plus.version>3.5.12</mybatis-plus.version>
|
||||
<p6spy.version>3.9.1</p6spy.version>
|
||||
<springdoc-openapi.version>2.8.9</springdoc-openapi.version>
|
||||
<knife4j.version>4.6.0</knife4j.version>
|
||||
<fastjson.version>2.0.57</fastjson.version>
|
||||
<druid.version>1.2.25</druid.version>
|
||||
<google-linkedhashmap.version>1.4.2</google-linkedhashmap.version>
|
||||
<google-guava.version>20.0</google-guava.version>
|
||||
<reflections.version>0.10.2</reflections.version>
|
||||
<commons-io.version>2.19.0</commons-io.version>
|
||||
<commons-lang3.version>3.18.0</commons-lang3.version>
|
||||
<commons-collections4.version>4.5.0</commons-collections4.version>
|
||||
<commons-compress.version>1.27.1</commons-compress.version>
|
||||
<commons-codec.version>1.18.0</commons-codec.version>
|
||||
<commons-text.version>1.13.1</commons-text.version>
|
||||
<fast-excel.version>1.2.0</fast-excel.version>
|
||||
<poi.version>5.4.1</poi.version>
|
||||
<awssdk-s3.version>2.31.78</awssdk-s3.version>
|
||||
<mysql-connector-j.version>9.3.0</mysql-connector-j.version>
|
||||
<hutool.version>5.8.39</hutool.version>
|
||||
<velocity-engine-core.version>2.4.1</velocity-engine-core.version>
|
||||
<velocity-tools.version>3.1</velocity-tools.version>
|
||||
<sa-token.version>1.44.0</sa-token.version>
|
||||
<ip2region.version>2.7.0</ip2region.version>
|
||||
<bcprov.version>1.80</bcprov.version>
|
||||
<smartdb.version>1.2.0</smartdb.version>
|
||||
<redisson.version>3.50.0</redisson.version>
|
||||
<snakeyaml.version>2.4</snakeyaml.version>
|
||||
<freemarker.version>2.3.34</freemarker.version>
|
||||
<jsoup.version>1.21.1</jsoup.version>
|
||||
<tika.version>3.1.0</tika.version>
|
||||
<httpcomponents.version>5.5</httpcomponents.version>
|
||||
</properties>
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
|
||||
<!--SpringBoot BOM begin-->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-dependencies</artifactId>
|
||||
<version>${springboot.version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
<!--SpringBoot BOM end-->
|
||||
<!--mybatis-plus BOM begin-->
|
||||
<dependency>
|
||||
<groupId>com.baomidou</groupId>
|
||||
<artifactId>mybatis-plus-bom</artifactId>
|
||||
<version>${mybatis-plus.version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
<!--mybatis-plus BOM end-->
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.security</groupId>
|
||||
<artifactId>spring-security-crypto</artifactId>
|
||||
<version>${spring-security-crypto.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.mysql</groupId>
|
||||
<artifactId>mysql-connector-j</artifactId>
|
||||
<version>${mysql-connector-j.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>p6spy</groupId>
|
||||
<artifactId>p6spy</artifactId>
|
||||
<version>${p6spy.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.github.xingfudeshi</groupId>
|
||||
<artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
|
||||
<version>${knife4j.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>fastjson</artifactId>
|
||||
<version>${fastjson.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>druid-spring-boot-3-starter</artifactId>
|
||||
<version>${druid.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.googlecode.concurrentlinkedhashmap</groupId>
|
||||
<artifactId>concurrentlinkedhashmap-lru</artifactId>
|
||||
<version>${google-linkedhashmap.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
<version>${google-guava.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.reflections</groupId>
|
||||
<artifactId>reflections</artifactId>
|
||||
<version>${reflections.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<artifactId>guava</artifactId>
|
||||
<groupId>com.google.guava</groupId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>commons-io</groupId>
|
||||
<artifactId>commons-io</artifactId>
|
||||
<version>${commons-io.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-lang3</artifactId>
|
||||
<version>${commons-lang3.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-collections4</artifactId>
|
||||
<version>${commons-collections4.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-compress</artifactId>
|
||||
<version>${commons-compress.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<artifactId>commons-codec</artifactId>
|
||||
<groupId>commons-codec</groupId>
|
||||
<version>${commons-codec.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>software.amazon.awssdk</groupId>
|
||||
<artifactId>s3</artifactId>
|
||||
<version>${awssdk-s3.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<artifactId>commons-logging</artifactId>
|
||||
<groupId>commons-logging</groupId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-text</artifactId>
|
||||
<version>${commons-text.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-all</artifactId>
|
||||
<version>${hutool.version}</version>
|
||||
</dependency>
|
||||
<!--velocity begin-->
|
||||
<dependency>
|
||||
<groupId>org.apache.velocity</groupId>
|
||||
<artifactId>velocity-engine-core</artifactId>
|
||||
<version>${velocity-engine-core.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.velocity.tools</groupId>
|
||||
<artifactId>velocity-tools-generic</artifactId>
|
||||
<version>${velocity-tools.version}</version>
|
||||
</dependency>
|
||||
<!--velocity end-->
|
||||
|
||||
<!-- Sa-Token 权限认证，在线文档：https://sa-token.cc -->
|
||||
<dependency>
|
||||
<groupId>cn.dev33</groupId>
|
||||
<artifactId>sa-token-spring-boot3-starter</artifactId>
|
||||
<version>${sa-token.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Sa-Token 整合 Redis （使用 jackson 序列化方式） -->
|
||||
<dependency>
|
||||
<groupId>cn.dev33</groupId>
|
||||
<artifactId>sa-token-redis-jackson</artifactId>
|
||||
<version>${sa-token.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- sa-token end -->
|
||||
|
||||
<!--ip 地址-->
|
||||
<dependency>
|
||||
<groupId>org.lionsoul</groupId>
|
||||
<artifactId>ip2region</artifactId>
|
||||
<version>${ip2region.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.bouncycastle</groupId>
|
||||
<artifactId>bcprov-jdk18on</artifactId>
|
||||
<version>${bcprov.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>cn.idev.excel</groupId>
|
||||
<artifactId>fastexcel</artifactId>
|
||||
<version>${fast-excel.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<artifactId>logback-classic</artifactId>
|
||||
<groupId>ch.qos.logback</groupId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.bouncycastle</groupId>
|
||||
<artifactId>bcprov-jdk15on</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.poi</groupId>
|
||||
<artifactId>poi</artifactId>
|
||||
<version>${poi.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.poi</groupId>
|
||||
<artifactId>poi-scratchpad</artifactId>
|
||||
<version>${poi.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.poi</groupId>
|
||||
<artifactId>poi-ooxml-full</artifactId>
|
||||
<version>${poi.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>net.1024lab</groupId>
|
||||
<artifactId>smartdb</artifactId>
|
||||
<version>${smartdb.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- redisson -->
|
||||
<dependency>
|
||||
<groupId>org.redisson</groupId>
|
||||
<artifactId>redisson-spring-boot-starter</artifactId>
|
||||
<version>${redisson.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-actuator</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.redisson</groupId>
|
||||
<artifactId>redisson-spring-data-32</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<artifactId>objenesis</artifactId>
|
||||
<groupId>org.objenesis</groupId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.redisson</groupId>
|
||||
<artifactId>redisson-spring-data-27</artifactId>
|
||||
<version>${redisson.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.yaml</groupId>
|
||||
<artifactId>snakeyaml</artifactId>
|
||||
<version>${snakeyaml.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.jsoup</groupId>
|
||||
<artifactId>jsoup</artifactId>
|
||||
<version>${jsoup.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.freemarker</groupId>
|
||||
<artifactId>freemarker</artifactId>
|
||||
<version>${freemarker.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.tika</groupId>
|
||||
<artifactId>tika-core</artifactId>
|
||||
<version>${tika.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.httpcomponents.client5</groupId>
|
||||
<artifactId>httpclient5</artifactId>
|
||||
<version>${httpcomponents.version}</version>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
</dependencyManagement>
|
||||
|
||||
<build>
|
||||
<finalName>${project.name}-${profiles.active}-${project.version}</finalName>
|
||||
<resources>
|
||||
<resource>
|
||||
<filtering>false</filtering>
|
||||
<directory>src/main/resources</directory>
|
||||
<excludes>
|
||||
<exclude>dev/*</exclude>
|
||||
<exclude>test/*</exclude>
|
||||
<exclude>pre/*</exclude>
|
||||
<exclude>prod/*</exclude>
|
||||
</excludes>
|
||||
</resource>
|
||||
|
||||
<resource>
|
||||
<directory>src/main/resources/${profiles.active}</directory>
|
||||
<filtering>true</filtering>
|
||||
<includes>
|
||||
<include>*.yaml</include>
|
||||
</includes>
|
||||
</resource>
|
||||
|
||||
<resource>
|
||||
<directory>src/main/resources/${profiles.active}</directory>
|
||||
<filtering>false</filtering>
|
||||
<includes>
|
||||
<include>*.*</include>
|
||||
</includes>
|
||||
</resource>
|
||||
</resources>
|
||||
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.13.0</version>
|
||||
<configuration>
|
||||
<compilerArgument>-parameters</compilerArgument>
|
||||
<source>17</source>
|
||||
<target>17</target>
|
||||
<encoding>UTF-8</encoding>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<version>${springboot.version}</version>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
<profiles>
|
||||
<!--开发环境-->
|
||||
<profile>
|
||||
<id>dev</id>
|
||||
<properties>
|
||||
<profiles.active>dev</profiles.active>
|
||||
</properties>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
</activation>
|
||||
</profile>
|
||||
<!--测试环境-->
|
||||
<profile>
|
||||
<id>test</id>
|
||||
<properties>
|
||||
<profiles.active>test</profiles.active>
|
||||
</properties>
|
||||
</profile>
|
||||
<!--预发布环境-->
|
||||
<profile>
|
||||
<id>pre</id>
|
||||
<properties>
|
||||
<profiles.active>pre</profiles.active>
|
||||
</properties>
|
||||
</profile>
|
||||
<!--生产环境-->
|
||||
<profile>
|
||||
<id>prod</id>
|
||||
<properties>
|
||||
<profiles.active>prod</profiles.active>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
</project>
|
||||
@ -1,41 +0,0 @@
|
||||
package net.lab1024.sa.admin.config;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
import net.lab1024.sa.admin.interceptor.AdminInterceptor;
|
||||
import net.lab1024.sa.base.config.SwaggerConfig;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
|
||||
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
||||
|
||||
/**
|
||||
* web相关配置
|
||||
*
|
||||
* @Author 1024创新实验室-主任: 卓大
|
||||
* @Date 2021-09-02 20:21:10
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Configuration
|
||||
public class MvcConfig implements WebMvcConfigurer {
|
||||
|
||||
@Resource
|
||||
private AdminInterceptor adminInterceptor;
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public void addInterceptors(InterceptorRegistry registry) {
|
||||
registry.addInterceptor(adminInterceptor)
|
||||
.excludePathPatterns(SwaggerConfig.SWAGGER_WHITELIST)
|
||||
.addPathPatterns("/**");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addResourceHandlers(ResourceHandlerRegistry registry) {
|
||||
registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
|
||||
registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,68 +0,0 @@
|
||||
package net.lab1024.sa.admin.constant;
|
||||
|
||||
import net.lab1024.sa.base.constant.CacheKeyConst;
|
||||
|
||||
/**
|
||||
* 缓存 key
|
||||
*
|
||||
* @Author 1024创新实验室-主任:卓大
|
||||
* @Date 2022-01-07 18:59:22
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
public class AdminCacheConst extends CacheKeyConst {
|
||||
|
||||
public static class Department {
|
||||
|
||||
/**
|
||||
* 部门列表
|
||||
*/
|
||||
public static final String DEPARTMENT_LIST_CACHE = "department_list_cache";
|
||||
|
||||
/**
|
||||
* 部门树
|
||||
*/
|
||||
public static final String DEPARTMENT_TREE_CACHE = "department_tree_cache";
|
||||
|
||||
/**
|
||||
* 某个部门以及下级的id列表
|
||||
*/
|
||||
public static final String DEPARTMENT_SELF_CHILDREN_CACHE = "department_self_children_cache";
|
||||
|
||||
/**
|
||||
* 部门路径 缓存
|
||||
*/
|
||||
public static final String DEPARTMENT_PATH_CACHE = "department_path_cache";
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 分类相关缓存
|
||||
*/
|
||||
public static class Category {
|
||||
|
||||
public static final String CATEGORY_ENTITY = "category_cache";
|
||||
|
||||
public static final String CATEGORY_SUB = "category_sub_cache";
|
||||
|
||||
public static final String CATEGORY_TREE = "category_tree_cache";
|
||||
}
|
||||
|
||||
/**
|
||||
* 登录相关
|
||||
*/
|
||||
public static class Login {
|
||||
|
||||
/**
|
||||
* 请求用户信息
|
||||
*/
|
||||
public static final String REQUEST_EMPLOYEE = "login_request_employee";
|
||||
|
||||
/**
|
||||
* 请求用户信息权限
|
||||
*/
|
||||
public static final String USER_PERMISSION = "login_user_permission";
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,141 +0,0 @@
|
||||
package net.lab1024.sa.admin.interceptor;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaIgnore;
|
||||
import cn.dev33.satoken.exception.SaTokenException;
|
||||
import cn.dev33.satoken.stp.StpUtil;
|
||||
import cn.dev33.satoken.strategy.SaAnnotationStrategy;
|
||||
import jakarta.annotation.Resource;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import net.lab1024.sa.admin.module.system.login.domain.RequestEmployee;
|
||||
import net.lab1024.sa.admin.module.system.login.service.LoginService;
|
||||
import net.lab1024.sa.base.common.annoation.NoNeedLogin;
|
||||
import net.lab1024.sa.base.common.code.SystemErrorCode;
|
||||
import net.lab1024.sa.base.common.code.UserErrorCode;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.util.SmartRequestUtil;
|
||||
import net.lab1024.sa.base.common.util.SmartResponseUtil;
|
||||
import org.springframework.http.HttpMethod;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.method.HandlerMethod;
|
||||
import org.springframework.web.servlet.HandlerInterceptor;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
/**
|
||||
* admin 拦截器
|
||||
*
|
||||
* @Author 1024创新实验室-主任:卓大
|
||||
* @Date 2023/7/26 20:20:33
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>，Since 2012
|
||||
*/
|
||||
|
||||
@Component
|
||||
@Slf4j
|
||||
public class AdminInterceptor implements HandlerInterceptor {
|
||||
|
||||
@Resource
|
||||
private LoginService loginService;
|
||||
|
||||
@Override
|
||||
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
|
||||
|
||||
// OPTIONS请求直接return
|
||||
if (HttpMethod.OPTIONS.toString().equals(request.getMethod())) {
|
||||
response.setStatus(HttpStatus.NO_CONTENT.value());
|
||||
return false;
|
||||
}
|
||||
|
||||
boolean isHandler = handler instanceof HandlerMethod;
|
||||
if (!isHandler) {
|
||||
return true;
|
||||
}
|
||||
|
||||
try {
|
||||
// --------------- 第一步： 根据token 获取用户 ---------------
|
||||
|
||||
String tokenValue = StpUtil.getTokenValue();
|
||||
String loginId = (String) StpUtil.getLoginIdByToken(tokenValue);
|
||||
RequestEmployee requestEmployee = loginService.getLoginEmployee(loginId, request);
|
||||
|
||||
// --------------- 第二步： 校验 登录 ---------------
|
||||
|
||||
Method method = ((HandlerMethod) handler).getMethod();
|
||||
NoNeedLogin noNeedLogin = ((HandlerMethod) handler).getMethodAnnotation(NoNeedLogin.class);
|
||||
if (noNeedLogin != null) {
|
||||
updateActiveTimeout(requestEmployee);
|
||||
SmartRequestUtil.setRequestUser(requestEmployee);
|
||||
return true;
|
||||
}
|
||||
|
||||
if (requestEmployee == null) {
|
||||
SmartResponseUtil.write(response, ResponseDTO.error(UserErrorCode.LOGIN_STATE_INVALID));
|
||||
return false;
|
||||
}
|
||||
|
||||
// 更新活跃
|
||||
updateActiveTimeout(requestEmployee);
|
||||
|
||||
|
||||
// --------------- 第三步： 校验 权限 ---------------
|
||||
|
||||
SmartRequestUtil.setRequestUser(requestEmployee);
|
||||
if (SaAnnotationStrategy.instance.isAnnotationPresent.apply(method, SaIgnore.class)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// 如果是超级管理员的话，不需要校验权限
|
||||
if (requestEmployee.getAdministratorFlag()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
SaAnnotationStrategy.instance.checkMethodAnnotation.accept(method);
|
||||
|
||||
} catch (SaTokenException e) {
|
||||
/*
|
||||
* sa-token 异常状态码
|
||||
* 具体请看： https://sa-token.cc/doc.html#/fun/exception-code
|
||||
*/
|
||||
int code = e.getCode();
|
||||
if (code == 11041 || code == 11051) {
|
||||
SmartResponseUtil.write(response, ResponseDTO.error(UserErrorCode.NO_PERMISSION));
|
||||
} else if (code == 11016) {
|
||||
SmartResponseUtil.write(response, ResponseDTO.error(UserErrorCode.LOGIN_ACTIVE_TIMEOUT));
|
||||
} else if (code >= 11011 && code <= 11015) {
|
||||
SmartResponseUtil.write(response, ResponseDTO.error(UserErrorCode.LOGIN_STATE_INVALID));
|
||||
} else {
|
||||
SmartResponseUtil.write(response, ResponseDTO.error(UserErrorCode.PARAM_ERROR));
|
||||
}
|
||||
return false;
|
||||
} catch (Throwable e) {
|
||||
SmartResponseUtil.write(response, ResponseDTO.error(SystemErrorCode.SYSTEM_ERROR));
|
||||
log.error(e.getMessage(), e);
|
||||
return false;
|
||||
}
|
||||
|
||||
// 通过验证
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 更新活跃时间
|
||||
*/
|
||||
private void updateActiveTimeout(RequestEmployee requestEmployee) {
|
||||
if (requestEmployee == null) {
|
||||
return;
|
||||
}
|
||||
StpUtil.updateLastActiveToNow();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
|
||||
// 清除上下文
|
||||
SmartRequestUtil.remove();
|
||||
}
|
||||
}
|
||||
@ -1,69 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.category.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.annotation.Resource;
|
||||
import jakarta.validation.Valid;
|
||||
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
|
||||
import net.lab1024.sa.admin.module.business.category.domain.form.CategoryAddForm;
|
||||
import net.lab1024.sa.admin.module.business.category.domain.form.CategoryTreeQueryForm;
|
||||
import net.lab1024.sa.admin.module.business.category.domain.form.CategoryUpdateForm;
|
||||
import net.lab1024.sa.admin.module.business.category.domain.vo.CategoryTreeVO;
|
||||
import net.lab1024.sa.admin.module.business.category.domain.vo.CategoryVO;
|
||||
import net.lab1024.sa.admin.module.business.category.service.CategoryService;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 类目
|
||||
*
|
||||
* @Author 1024创新实验室: 胡克
|
||||
* @Date 2021/08/05 21:26:58
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@RestController
|
||||
@Tag(name = AdminSwaggerTagConst.Business.MANAGER_CATEGORY)
|
||||
public class CategoryController {
|
||||
|
||||
@Resource
|
||||
private CategoryService categoryService;
|
||||
|
||||
@Operation(summary = "添加类目 @author 胡克")
|
||||
@PostMapping("/category/add")
|
||||
@SaCheckPermission("category:add")
|
||||
public ResponseDTO<String> add(@RequestBody @Valid CategoryAddForm addForm) {
|
||||
return categoryService.add(addForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "更新类目 @author 胡克")
|
||||
@PostMapping("/category/update")
|
||||
@SaCheckPermission("category:update")
|
||||
public ResponseDTO<String> update(@RequestBody @Valid CategoryUpdateForm updateForm) {
|
||||
return categoryService.update(updateForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "查询类目详情 @author 胡克")
|
||||
@GetMapping("/category/{categoryId}")
|
||||
public ResponseDTO<CategoryVO> queryDetail(@PathVariable Long categoryId) {
|
||||
return categoryService.queryDetail(categoryId);
|
||||
}
|
||||
|
||||
@Operation(summary = "查询类目层级树 @author 胡克")
|
||||
@PostMapping("/category/tree")
|
||||
@SaCheckPermission("category:tree")
|
||||
public ResponseDTO<List<CategoryTreeVO>> queryTree(@RequestBody @Valid CategoryTreeQueryForm queryForm) {
|
||||
return categoryService.queryTree(queryForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "删除类目 @author 胡克")
|
||||
@GetMapping("/category/delete/{categoryId}")
|
||||
@SaCheckPermission("category:delete")
|
||||
public ResponseDTO<String> delete(@PathVariable Long categoryId) {
|
||||
return categoryService.delete(categoryId);
|
||||
}
|
||||
}
|
||||
@ -1,43 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.category.domain.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
import net.lab1024.sa.admin.module.business.category.constant.CategoryTypeEnum;
|
||||
import net.lab1024.sa.base.common.swagger.SchemaEnum;
|
||||
import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
/**
|
||||
* 类目 基础属性 DTO 类
|
||||
*
|
||||
* @author 胡克
|
||||
* @date 2021/1/20 16:17
|
||||
*/
|
||||
@Data
|
||||
public class CategoryBaseDTO {
|
||||
|
||||
@Schema(description = "类目名称", required = true)
|
||||
@NotBlank(message = "类目名称不能为空")
|
||||
@Length(max = 20, message = "类目名称最多20字符")
|
||||
private String categoryName;
|
||||
|
||||
@SchemaEnum(desc = "分类类型", value = CategoryTypeEnum.class)
|
||||
@CheckEnum(value = CategoryTypeEnum.class, required = true, message = "分类错误")
|
||||
private Integer categoryType;
|
||||
|
||||
@Schema(description = "父级类目id|可选")
|
||||
private Long parentId;
|
||||
|
||||
@Schema(description = "排序|可选")
|
||||
private Integer sort;
|
||||
|
||||
@Schema(description = "备注|可选")
|
||||
@Length(max = 200, message = "备注最多200字符")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "禁用状态")
|
||||
@NotNull(message = "禁用状态不能为空")
|
||||
private Boolean disabledFlag;
|
||||
}
|
||||
@ -1,47 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.category.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
import net.lab1024.sa.admin.module.business.category.constant.CategoryTypeEnum;
|
||||
import net.lab1024.sa.base.common.swagger.SchemaEnum;
|
||||
import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
/**
|
||||
* 类目 添加
|
||||
*
|
||||
* @Author 1024创新实验室: 胡克
|
||||
* @Date 2021/08/05 21:26:58
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class CategoryAddForm {
|
||||
|
||||
@Schema(description = "类目名称", required = true)
|
||||
@NotBlank(message = "类目名称不能为空")
|
||||
@Length(max = 20, message = "类目名称最多20字符")
|
||||
private String categoryName;
|
||||
|
||||
@SchemaEnum(desc = "分类类型", value = CategoryTypeEnum.class)
|
||||
@CheckEnum(value = CategoryTypeEnum.class, required = true, message = "分类错误")
|
||||
private Integer categoryType;
|
||||
|
||||
@Schema(description = "父级类目id|可选")
|
||||
private Long parentId;
|
||||
|
||||
@Schema(description = "排序|可选")
|
||||
private Integer sort;
|
||||
|
||||
@Schema(description = "备注|可选")
|
||||
@Length(max = 200, message = "备注最多200字符")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "禁用状态")
|
||||
@NotNull(message = "禁用状态不能为空")
|
||||
private Boolean disabledFlag;
|
||||
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.category.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 类目 更新
|
||||
*
|
||||
* @Author 1024创新实验室: 胡克
|
||||
* @Date 2021/08/05 21:26:58
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class CategoryUpdateForm extends CategoryAddForm {
|
||||
|
||||
@Schema(description = "类目id")
|
||||
@NotNull(message = "类目id不能为空")
|
||||
private Long categoryId;
|
||||
}
|
||||
@ -1,43 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.category.domain.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 类目 层级树 vo
|
||||
*
|
||||
* @Author 1024创新实验室: 胡克
|
||||
* @Date 2021/08/05 21:26:58
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class CategoryTreeVO implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Schema(description = "类目id")
|
||||
private Long categoryId;
|
||||
|
||||
@Schema(description = "类目名称")
|
||||
private String categoryName;
|
||||
|
||||
@Schema(description = "类目层级全称")
|
||||
private String categoryFullName;
|
||||
|
||||
@Schema(description = "父级id")
|
||||
private Long parentId;
|
||||
|
||||
@Schema(description = "类目id")
|
||||
private Long value;
|
||||
|
||||
@Schema(description = "类目名称")
|
||||
private String label;
|
||||
|
||||
@Schema(description = "子类")
|
||||
private List<CategoryTreeVO> children;
|
||||
}
|
||||
@ -1,113 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.category.manager;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import jakarta.annotation.Resource;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import net.lab1024.sa.admin.constant.AdminCacheConst;
|
||||
import net.lab1024.sa.admin.module.business.category.dao.CategoryDao;
|
||||
import net.lab1024.sa.admin.module.business.category.domain.entity.CategoryEntity;
|
||||
import net.lab1024.sa.admin.module.business.category.domain.vo.CategoryTreeVO;
|
||||
import net.lab1024.sa.base.common.constant.StringConst;
|
||||
import net.lab1024.sa.base.common.util.SmartBeanUtil;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.springframework.cache.annotation.CacheEvict;
|
||||
import org.springframework.cache.annotation.Cacheable;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 类目 查询 缓存
|
||||
*
|
||||
* @Author 1024创新实验室: 胡克
|
||||
* @Date 2021/08/05 21:26:58
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class CategoryCacheManager {
|
||||
|
||||
|
||||
@Resource
|
||||
private CategoryDao categoryDao;
|
||||
|
||||
|
||||
/**
|
||||
* 根据类目id 移除缓存
|
||||
*/
|
||||
@CacheEvict(value = {AdminCacheConst.Category.CATEGORY_ENTITY, AdminCacheConst.Category.CATEGORY_SUB, AdminCacheConst.Category.CATEGORY_TREE}, allEntries = true)
|
||||
public void removeCache() {
|
||||
log.info("clear CATEGORY ,CATEGORY_SUB ,CATEGORY_TREE");
|
||||
}
|
||||
|
||||
/**
|
||||
* 查詢类目
|
||||
*
|
||||
*/
|
||||
@Cacheable(AdminCacheConst.Category.CATEGORY_ENTITY)
|
||||
public CategoryEntity queryCategory(Long categoryId) {
|
||||
return categoryDao.selectById(categoryId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询类目 子级
|
||||
*
|
||||
*/
|
||||
@Cacheable(AdminCacheConst.Category.CATEGORY_SUB)
|
||||
public List<CategoryEntity> querySubCategory(Long categoryId) {
|
||||
return categoryDao.queryByParentId(Lists.newArrayList(categoryId), false);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 查询类目 层级树
|
||||
* 优先查询缓存
|
||||
*/
|
||||
@Cacheable(AdminCacheConst.Category.CATEGORY_TREE)
|
||||
public List<CategoryTreeVO> queryCategoryTree(Long parentId, Integer categoryType) {
|
||||
List<CategoryEntity> allCategoryEntityList = categoryDao.queryByType(categoryType, false);
|
||||
|
||||
List<CategoryEntity> categoryEntityList = allCategoryEntityList.stream().filter(e -> e.getParentId().equals(parentId)).collect(Collectors.toList());
|
||||
List<CategoryTreeVO> treeList = SmartBeanUtil.copyList(categoryEntityList, CategoryTreeVO.class);
|
||||
treeList.forEach(e -> {
|
||||
e.setLabel(e.getCategoryName());
|
||||
e.setValue(e.getCategoryId());
|
||||
e.setCategoryFullName(e.getCategoryName());
|
||||
});
|
||||
// 递归设置子类
|
||||
this.queryAndSetSubCategory(treeList, allCategoryEntityList);
|
||||
return treeList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 递归查询设置类目子类
|
||||
* 从缓存查询子类
|
||||
*
|
||||
*/
|
||||
private void queryAndSetSubCategory(List<CategoryTreeVO> treeList, List<CategoryEntity> allCategoryEntityList) {
|
||||
if (CollectionUtils.isEmpty(treeList)) {
|
||||
return;
|
||||
}
|
||||
List<Long> parentIdList = treeList.stream().map(CategoryTreeVO::getValue).collect(Collectors.toList());
|
||||
List<CategoryEntity> categoryEntityList = allCategoryEntityList.stream().filter(e -> parentIdList.contains(e.getParentId())).collect(Collectors.toList());
|
||||
Map<Long, List<CategoryEntity>> categorySubMap = categoryEntityList.stream().collect(Collectors.groupingBy(CategoryEntity::getParentId));
|
||||
treeList.forEach(e -> {
|
||||
List<CategoryEntity> childrenEntityList = categorySubMap.getOrDefault(e.getValue(), Lists.newArrayList());
|
||||
List<CategoryTreeVO> childrenVOList = SmartBeanUtil.copyList(childrenEntityList, CategoryTreeVO.class);
|
||||
childrenVOList.forEach(item -> {
|
||||
item.setLabel(item.getCategoryName());
|
||||
item.setValue(item.getCategoryId());
|
||||
item.setCategoryFullName(e.getCategoryFullName() + StringConst.SEPARATOR_SLASH + item.getCategoryName());
|
||||
});
|
||||
// 递归查询
|
||||
this.queryAndSetSubCategory(childrenVOList, allCategoryEntityList);
|
||||
e.setChildren(childrenVOList);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -1,188 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.category.service;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Maps;
|
||||
import jakarta.annotation.Resource;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import net.lab1024.sa.admin.module.business.category.domain.dto.CategorySimpleDTO;
|
||||
import net.lab1024.sa.admin.module.business.category.domain.entity.CategoryEntity;
|
||||
import net.lab1024.sa.admin.module.business.category.manager.CategoryCacheManager;
|
||||
import net.lab1024.sa.base.common.constant.StringConst;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 类目 查询 业务类
|
||||
*
|
||||
* @Author 1024创新实验室: 胡克
|
||||
* @Date 2021/08/05 21:26:58
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class CategoryQueryService {
|
||||
|
||||
private static final Long DEFAULT_CATEGORY_PARENT_ID = 0L;
|
||||
|
||||
@Resource
|
||||
private CategoryCacheManager categoryCacheManager;
|
||||
|
||||
/**
|
||||
* 根据 id 查询未删除的类目
|
||||
*
|
||||
* @param categoryId
|
||||
* @return 可能 null
|
||||
*/
|
||||
public Optional<CategoryEntity> queryCategory(Long categoryId) {
|
||||
if (null == categoryId) {
|
||||
return Optional.empty();
|
||||
}
|
||||
CategoryEntity entity = categoryCacheManager.queryCategory(categoryId);
|
||||
if (null == entity || entity.getDeletedFlag()) {
|
||||
return Optional.empty();
|
||||
}
|
||||
return Optional.of(entity);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 根据 类目id集合 查询未删除的类目集合
|
||||
*/
|
||||
public Map<Long, CategoryEntity> queryCategoryList(List<Long> categoryIdList) {
|
||||
if (CollectionUtils.isEmpty(categoryIdList)) {
|
||||
return Collections.emptyMap();
|
||||
}
|
||||
categoryIdList = categoryIdList.stream().distinct().collect(Collectors.toList());
|
||||
Map<Long, CategoryEntity> categoryEntityMap = Maps.newHashMap();
|
||||
for (Long categoryId : categoryIdList) {
|
||||
CategoryEntity categoryEntity = categoryCacheManager.queryCategory(categoryId);
|
||||
if (categoryEntity != null) {
|
||||
categoryEntityMap.put(categoryId, categoryEntity);
|
||||
}
|
||||
}
|
||||
return categoryEntityMap;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 根据类目id 递归查询该id的所有子类id 递归查询
|
||||
* 同时存入缓存
|
||||
* 注意：查询出来的集合 不包含传递的父类参数
|
||||
*/
|
||||
public List<Long> queryCategorySubId(List<Long> categoryIdList) {
|
||||
if (CollectionUtils.isEmpty(categoryIdList)) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
//所有子类
|
||||
List<CategoryEntity> categoryEntityList = Lists.newArrayList();
|
||||
categoryIdList.forEach(e -> {
|
||||
categoryEntityList.addAll(categoryCacheManager.querySubCategory(e));
|
||||
});
|
||||
Map<Long, List<CategoryEntity>> subTypeMap = categoryEntityList.stream().collect(Collectors.groupingBy(CategoryEntity::getCategoryId));
|
||||
// 递归查询子类
|
||||
categoryIdList = subTypeMap.values().stream().flatMap(Collection::stream).map(CategoryEntity::getCategoryId).distinct().collect(Collectors.toList());
|
||||
if (CollectionUtils.isEmpty(categoryIdList)) {
|
||||
return Lists.newArrayList();
|
||||
}
|
||||
categoryIdList.addAll(this.queryCategorySubId(categoryIdList));
|
||||
return categoryIdList;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 处理类目名称
|
||||
*/
|
||||
public List<String> queryCategoryName(List<Long> categoryIdList) {
|
||||
if (CollectionUtils.isEmpty(categoryIdList)) {
|
||||
return null;
|
||||
}
|
||||
Map<Long, CategoryEntity> categoryMap = this.queryCategoryList(categoryIdList);
|
||||
List<String> categoryNameList = Lists.newArrayList();
|
||||
categoryIdList.forEach(e -> {
|
||||
CategoryEntity categoryEntity = categoryMap.get(e);
|
||||
if (categoryEntity != null) {
|
||||
categoryNameList.add(categoryMap.get(e).getCategoryName());
|
||||
}
|
||||
});
|
||||
return categoryNameList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据类目id 查询类目名称
|
||||
*/
|
||||
public String queryCategoryName(Long categoryId) {
|
||||
CategoryEntity categoryEntity = categoryCacheManager.queryCategory(categoryId);
|
||||
if (null == categoryEntity || categoryEntity.getDeletedFlag()) {
|
||||
return null;
|
||||
}
|
||||
return categoryEntity.getCategoryName();
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据类目id 查询类目详情 包含类目全称 如：医考/医师资格/临床执业
|
||||
*/
|
||||
public CategorySimpleDTO queryCategoryInfo(Long categoryId) {
|
||||
CategoryEntity categoryEntity = categoryCacheManager.queryCategory(categoryId);
|
||||
if (null == categoryEntity || categoryEntity.getDeletedFlag()) {
|
||||
return null;
|
||||
}
|
||||
String fullName = this.queryFullName(categoryId);
|
||||
// 返回DTO
|
||||
CategorySimpleDTO categoryDTO = new CategorySimpleDTO();
|
||||
categoryDTO.setCategoryId(categoryId);
|
||||
categoryDTO.setCategoryName(categoryEntity.getCategoryName());
|
||||
categoryDTO.setCategoryFullName(fullName);
|
||||
categoryDTO.setParentId(categoryEntity.getParentId());
|
||||
return categoryDTO;
|
||||
}
|
||||
|
||||
/**
|
||||
* 递归查询分类和所有父级类目
|
||||
* ps:特别注意返回的集合中 包含自己
|
||||
*/
|
||||
public List<CategoryEntity> queryCategoryAndParent(Long categoryId) {
|
||||
List<CategoryEntity> parentCategoryList = Lists.newArrayList();
|
||||
CategoryEntity categoryEntity = categoryCacheManager.queryCategory(categoryId);
|
||||
if (null == categoryEntity || categoryEntity.getDeletedFlag()) {
|
||||
return parentCategoryList;
|
||||
}
|
||||
|
||||
// 父级始终放在第一位
|
||||
parentCategoryList.add(0, categoryEntity);
|
||||
Long parentId = categoryEntity.getParentId();
|
||||
if (Objects.equals(DEFAULT_CATEGORY_PARENT_ID, parentId)) {
|
||||
return parentCategoryList;
|
||||
}
|
||||
parentCategoryList.addAll(0, this.queryCategoryAndParent(parentId));
|
||||
return parentCategoryList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询 分类全称 如：医考/医师资格/临床执业
|
||||
*/
|
||||
public String queryFullName(Long categoryId) {
|
||||
List<CategoryEntity> parentCategoryList = this.queryCategoryAndParent(categoryId);
|
||||
// 拼接父级类目名称 斜杠分隔返回
|
||||
List<String> nameList = parentCategoryList.stream().map(CategoryEntity::getCategoryName).collect(Collectors.toList());
|
||||
return StrUtil.join(StringConst.SEPARATOR_SLASH, nameList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询 分类全称 如：医考/医师资格/临床执业
|
||||
*/
|
||||
public Map<Long, String> queryFullName(List<Long> categoryIdList) {
|
||||
if (CollectionUtils.isEmpty(categoryIdList)) {
|
||||
return Maps.newHashMap();
|
||||
}
|
||||
// 循环内查询的缓存 还ok
|
||||
return categoryIdList.stream().collect(Collectors.toMap(Function.identity(), this::queryFullName));
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,206 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.category.service;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import jakarta.annotation.Resource;
|
||||
import net.lab1024.sa.admin.module.business.category.dao.CategoryDao;
|
||||
import net.lab1024.sa.admin.module.business.category.domain.entity.CategoryEntity;
|
||||
import net.lab1024.sa.admin.module.business.category.domain.form.CategoryAddForm;
|
||||
import net.lab1024.sa.admin.module.business.category.domain.form.CategoryTreeQueryForm;
|
||||
import net.lab1024.sa.admin.module.business.category.domain.form.CategoryUpdateForm;
|
||||
import net.lab1024.sa.admin.module.business.category.domain.vo.CategoryTreeVO;
|
||||
import net.lab1024.sa.admin.module.business.category.domain.vo.CategoryVO;
|
||||
import net.lab1024.sa.admin.module.business.category.manager.CategoryCacheManager;
|
||||
import net.lab1024.sa.base.common.code.UserErrorCode;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.util.SmartBeanUtil;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.lang3.math.NumberUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.Optional;
|
||||
|
||||
/**
|
||||
* 类目
|
||||
*
|
||||
* @Author 1024创新实验室: 胡克
|
||||
* @Date 2021/08/05 21:26:58
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Service
|
||||
public class CategoryService {
|
||||
|
||||
@Resource
|
||||
private CategoryDao categoryDao;
|
||||
|
||||
@Resource
|
||||
private CategoryQueryService categoryQueryService;
|
||||
|
||||
@Resource
|
||||
private CategoryCacheManager categoryCacheManager;
|
||||
|
||||
/**
|
||||
* 添加类目
|
||||
*/
|
||||
public ResponseDTO<String> add(CategoryAddForm addForm) {
|
||||
// 校验类目
|
||||
CategoryEntity categoryEntity = SmartBeanUtil.copy(addForm, CategoryEntity.class);
|
||||
ResponseDTO<String> res = this.checkCategory(categoryEntity, false);
|
||||
if (!res.getOk()) {
|
||||
return res;
|
||||
}
|
||||
// 没有父类则使用默认父类
|
||||
Long parentId = null == addForm.getParentId() ? NumberUtils.LONG_ZERO : addForm.getParentId();
|
||||
categoryEntity.setParentId(parentId);
|
||||
categoryEntity.setSort(null == addForm.getSort() ? 0 : addForm.getSort());
|
||||
categoryEntity.setDeletedFlag(false);
|
||||
|
||||
// 保存数据
|
||||
categoryDao.insert(categoryEntity);
|
||||
|
||||
// 更新缓存
|
||||
categoryCacheManager.removeCache();
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新类目
|
||||
* 不能更新父级类目
|
||||
*
|
||||
*/
|
||||
public ResponseDTO<String> update(CategoryUpdateForm updateForm) {
|
||||
// 校验类目
|
||||
Long categoryId = updateForm.getCategoryId();
|
||||
Optional<CategoryEntity> optional = categoryQueryService.queryCategory(categoryId);
|
||||
if (!optional.isPresent()) {
|
||||
return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
|
||||
}
|
||||
CategoryEntity categoryEntity = SmartBeanUtil.copy(updateForm, CategoryEntity.class);
|
||||
|
||||
/*
|
||||
不更新类目类型
|
||||
不更新父类id
|
||||
*/
|
||||
Integer categoryType = optional.get().getCategoryType();
|
||||
categoryEntity.setCategoryType(categoryType);
|
||||
categoryEntity.setParentId(optional.get().getParentId());
|
||||
|
||||
ResponseDTO<String> responseDTO = this.checkCategory(categoryEntity, true);
|
||||
if (!responseDTO.getOk()) {
|
||||
return responseDTO;
|
||||
}
|
||||
categoryDao.updateById(categoryEntity);
|
||||
|
||||
// 更新缓存
|
||||
categoryCacheManager.removeCache();
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增/更新 类目时的 校验
|
||||
*
|
||||
*/
|
||||
private ResponseDTO<String> checkCategory(CategoryEntity categoryEntity, boolean isUpdate) {
|
||||
// 校验父级是否存在
|
||||
Long parentId = categoryEntity.getParentId();
|
||||
Integer categoryType = categoryEntity.getCategoryType();
|
||||
if (null != parentId) {
|
||||
if (Objects.equals(categoryEntity.getCategoryId(), parentId)) {
|
||||
return ResponseDTO.userErrorParam("父级类目怎么和自己相同了");
|
||||
}
|
||||
if (!Objects.equals(parentId, NumberUtils.LONG_ZERO)) {
|
||||
Optional<CategoryEntity> optional = categoryQueryService.queryCategory(parentId);
|
||||
if (!optional.isPresent()) {
|
||||
return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST, "父级类目不存在~");
|
||||
}
|
||||
|
||||
CategoryEntity parent = optional.get();
|
||||
if (!Objects.equals(categoryType, parent.getCategoryType())) {
|
||||
return ResponseDTO.userErrorParam("与父级类目类型不一致");
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
// 如果没有父类 使用默认父类
|
||||
parentId = NumberUtils.LONG_ZERO;
|
||||
}
|
||||
|
||||
// 校验同父类下 名称是否重复
|
||||
CategoryEntity queryEntity = new CategoryEntity();
|
||||
queryEntity.setParentId(parentId);
|
||||
queryEntity.setCategoryType(categoryType);
|
||||
queryEntity.setCategoryName(categoryEntity.getCategoryName());
|
||||
queryEntity.setDeletedFlag(false);
|
||||
queryEntity = categoryDao.selectOne(queryEntity);
|
||||
if (null != queryEntity) {
|
||||
if (isUpdate) {
|
||||
if (!Objects.equals(queryEntity.getCategoryId(), categoryEntity.getCategoryId())) {
|
||||
return ResponseDTO.userErrorParam("同级下已存在相同类目~");
|
||||
}
|
||||
} else {
|
||||
return ResponseDTO.userErrorParam("同级下已存在相同类目~");
|
||||
}
|
||||
}
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询 类目详情
|
||||
*
|
||||
*/
|
||||
public ResponseDTO<CategoryVO> queryDetail(Long categoryId) {
|
||||
Optional<CategoryEntity> optional = categoryQueryService.queryCategory(categoryId);
|
||||
if (!optional.isPresent()) {
|
||||
return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
|
||||
}
|
||||
CategoryVO adminVO = SmartBeanUtil.copy(optional.get(), CategoryVO.class);
|
||||
return ResponseDTO.ok(adminVO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据父级id 查询所有子类 返回层级树
|
||||
* 如果父类id 为空 返回所有类目层级
|
||||
*
|
||||
*/
|
||||
public ResponseDTO<List<CategoryTreeVO>> queryTree(CategoryTreeQueryForm queryForm) {
|
||||
if (null == queryForm.getParentId()) {
|
||||
if (null == queryForm.getCategoryType()) {
|
||||
return ResponseDTO.userErrorParam("类目类型不能为空");
|
||||
}
|
||||
queryForm.setParentId(NumberUtils.LONG_ZERO);
|
||||
}
|
||||
List<CategoryTreeVO> treeList = categoryCacheManager.queryCategoryTree(queryForm.getParentId(), queryForm.getCategoryType());
|
||||
return ResponseDTO.ok(treeList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除类目
|
||||
* 如果有未删除的子类 则无法删除
|
||||
*
|
||||
*/
|
||||
public ResponseDTO<String> delete(Long categoryId) {
|
||||
Optional<CategoryEntity> optional = categoryQueryService.queryCategory(categoryId);
|
||||
if (!optional.isPresent()) {
|
||||
return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
|
||||
}
|
||||
|
||||
List<Long> categorySubId = categoryQueryService.queryCategorySubId(Lists.newArrayList(categoryId));
|
||||
if (CollectionUtils.isNotEmpty(categorySubId)) {
|
||||
return ResponseDTO.userErrorParam("请先删除子级类目");
|
||||
}
|
||||
|
||||
// 更新数据
|
||||
CategoryEntity categoryEntity = new CategoryEntity();
|
||||
categoryEntity.setCategoryId(categoryId);
|
||||
categoryEntity.setDeletedFlag(true);
|
||||
categoryDao.updateById(categoryEntity);
|
||||
|
||||
// 更新缓存
|
||||
categoryCacheManager.removeCache();
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,94 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.goods.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.annotation.Resource;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.validation.Valid;
|
||||
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
|
||||
import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsAddForm;
|
||||
import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsQueryForm;
|
||||
import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsUpdateForm;
|
||||
import net.lab1024.sa.admin.module.business.goods.domain.vo.GoodsExcelVO;
|
||||
import net.lab1024.sa.admin.module.business.goods.domain.vo.GoodsVO;
|
||||
import net.lab1024.sa.admin.module.business.goods.service.GoodsService;
|
||||
import net.lab1024.sa.base.common.domain.PageResult;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.domain.ValidateList;
|
||||
import net.lab1024.sa.base.common.util.SmartExcelUtil;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 商品业务
|
||||
*
|
||||
* @Author 1024创新实验室: 胡克
|
||||
* @Date 2021-10-25 20:26:54
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@RestController
|
||||
@Tag(name = AdminSwaggerTagConst.Business.MANAGER_GOODS)
|
||||
public class GoodsController {
|
||||
|
||||
@Resource
|
||||
private GoodsService goodsService;
|
||||
|
||||
@Operation(summary = "分页查询 @author 胡克")
|
||||
@PostMapping("/goods/query")
|
||||
@SaCheckPermission("goods:query")
|
||||
public ResponseDTO<PageResult<GoodsVO>> query(@RequestBody @Valid GoodsQueryForm queryForm) {
|
||||
return goodsService.query(queryForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "添加商品 @author 胡克")
|
||||
@PostMapping("/goods/add")
|
||||
@SaCheckPermission("goods:add")
|
||||
public ResponseDTO<String> add(@RequestBody @Valid GoodsAddForm addForm) {
|
||||
return goodsService.add(addForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "更新商品 @author 胡克")
|
||||
@PostMapping("/goods/update")
|
||||
@SaCheckPermission("goods:update")
|
||||
public ResponseDTO<String> update(@RequestBody @Valid GoodsUpdateForm updateForm) {
|
||||
return goodsService.update(updateForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "删除 @author 卓大")
|
||||
@GetMapping("/goods/delete/{goodsId}")
|
||||
@SaCheckPermission("goods:delete")
|
||||
public ResponseDTO<String> delete(@PathVariable Long goodsId) {
|
||||
return goodsService.delete(goodsId);
|
||||
}
|
||||
|
||||
@Operation(summary = "批量 @author 卓大")
|
||||
@PostMapping("/goods/batchDelete")
|
||||
@SaCheckPermission("goods:batchDelete")
|
||||
public ResponseDTO<String> batchDelete(@RequestBody @Valid ValidateList<Long> idList) {
|
||||
return goodsService.batchDelete(idList);
|
||||
}
|
||||
|
||||
// --------------- 导出和导入 -------------------
|
||||
|
||||
@Operation(summary = "导入 @author 卓大")
|
||||
@PostMapping("/goods/importGoods")
|
||||
@SaCheckPermission("goods:importGoods")
|
||||
public ResponseDTO<String> importGoods(@RequestParam MultipartFile file) {
|
||||
return goodsService.importGoods(file);
|
||||
}
|
||||
|
||||
@Operation(summary = "导出 @author 卓大")
|
||||
@GetMapping("/goods/exportGoods")
|
||||
@SaCheckPermission("goods:exportGoods")
|
||||
public void exportGoods(HttpServletResponse response) throws IOException {
|
||||
List<GoodsExcelVO> goodsList = goodsService.getAllGoods();
|
||||
SmartExcelUtil.exportExcel(response,"商品列表.xlsx","商品",GoodsExcelVO.class, goodsList);
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,37 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.goods.dao;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import net.lab1024.sa.admin.module.business.goods.domain.entity.GoodsEntity;
|
||||
import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsQueryForm;
|
||||
import net.lab1024.sa.admin.module.business.goods.domain.vo.GoodsVO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 商品
|
||||
*
|
||||
* @Author 1024创新实验室: 胡克
|
||||
* @Date 2021-10-25 20:26:54
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Mapper
|
||||
public interface GoodsDao extends BaseMapper<GoodsEntity> {
|
||||
|
||||
/**
|
||||
* 分页 查询商品
|
||||
*
|
||||
*/
|
||||
List<GoodsVO> query(Page page, @Param("query") GoodsQueryForm query);
|
||||
|
||||
/**
|
||||
* 批量更新删除状态
|
||||
*/
|
||||
|
||||
void batchUpdateDeleted(@Param("goodsIdList")List<Long> goodsIdList,@Param("deletedFlag")Boolean deletedFlag);
|
||||
}
|
||||
@ -1,56 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.goods.domain.form;
|
||||
|
||||
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.DecimalMin;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
import net.lab1024.sa.admin.module.business.goods.constant.GoodsStatusEnum;
|
||||
import net.lab1024.sa.base.common.json.deserializer.DictDataDeserializer;
|
||||
import net.lab1024.sa.base.common.swagger.SchemaEnum;
|
||||
import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 商品 添加表单
|
||||
*
|
||||
* @Author 1024创新实验室: 胡克
|
||||
* @Date 2021-10-25 20:26:54
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class GoodsAddForm {
|
||||
|
||||
@Schema(description = "商品分类")
|
||||
@NotNull(message = "商品分类不能为空")
|
||||
private Long categoryId;
|
||||
|
||||
@Schema(description = "商品名称")
|
||||
@NotBlank(message = "商品名称不能为空")
|
||||
private String goodsName;
|
||||
|
||||
@SchemaEnum(GoodsStatusEnum.class)
|
||||
@CheckEnum(message = "商品状态错误", value = GoodsStatusEnum.class, required = true)
|
||||
private Integer goodsStatus;
|
||||
|
||||
@Schema(description = "产地")
|
||||
@NotBlank(message = "产地 不能为空 ")
|
||||
@JsonDeserialize(using = DictDataDeserializer.class)
|
||||
private String place;
|
||||
|
||||
@Schema(description = "商品价格")
|
||||
@NotNull(message = "商品价格不能为空")
|
||||
@DecimalMin(value = "0", message = "商品价格最低0")
|
||||
private BigDecimal price;
|
||||
|
||||
@Schema(description = "上架状态")
|
||||
@NotNull(message = "上架状态不能为空")
|
||||
private Boolean shelvesFlag;
|
||||
|
||||
@Schema(description = "备注|可选")
|
||||
private String remark;
|
||||
}
|
||||
@ -1,45 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.goods.domain.form;
|
||||
|
||||
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import net.lab1024.sa.admin.module.business.goods.constant.GoodsStatusEnum;
|
||||
import net.lab1024.sa.base.common.domain.PageParam;
|
||||
import net.lab1024.sa.base.common.json.deserializer.DictDataDeserializer;
|
||||
import net.lab1024.sa.base.common.swagger.SchemaEnum;
|
||||
import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
/**
|
||||
* 商品 分页查询
|
||||
*
|
||||
* @Author 1024创新实验室: 胡克
|
||||
* @Date 2021-10-25 20:26:54
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class GoodsQueryForm extends PageParam {
|
||||
|
||||
@Schema(description = "商品分类")
|
||||
private Integer categoryId;
|
||||
|
||||
@Schema(description = "搜索词")
|
||||
@Length(max = 30, message = "搜索词最多30字符")
|
||||
private String searchWord;
|
||||
|
||||
@SchemaEnum(GoodsStatusEnum.class)
|
||||
@CheckEnum(message = "商品状态错误", value = GoodsStatusEnum.class, required = false)
|
||||
private Integer goodsStatus;
|
||||
|
||||
@Schema(description = "产地")
|
||||
@JsonDeserialize(using = DictDataDeserializer.class)
|
||||
private String place;
|
||||
|
||||
@Schema(description = "上架状态")
|
||||
private Boolean shelvesFlag;
|
||||
|
||||
@Schema(hidden = true)
|
||||
private Boolean deletedFlag;
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.goods.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 商品 更新表单
|
||||
*
|
||||
* @Author 1024创新实验室: 胡克
|
||||
* @Date 2021-10-25 20:26:54
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class GoodsUpdateForm extends GoodsAddForm {
|
||||
|
||||
@Schema(description = "商品id")
|
||||
@NotNull(message = "商品id不能为空")
|
||||
private Long goodsId;
|
||||
}
|
||||
@ -1,44 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.goods.domain.vo;
|
||||
|
||||
|
||||
import cn.idev.excel.annotation.ExcelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* excel商品
|
||||
*
|
||||
* @Author 1024创新实验室: 胡克
|
||||
* @Date 2021-10-25 20:26:54
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class GoodsExcelVO {
|
||||
|
||||
@ExcelProperty("商品分类")
|
||||
private String categoryName;
|
||||
|
||||
@ExcelProperty("商品名称")
|
||||
private String goodsName;
|
||||
|
||||
@ExcelProperty("商品状态错误")
|
||||
private String goodsStatus;
|
||||
|
||||
@ExcelProperty("产地")
|
||||
private String place;
|
||||
|
||||
@ExcelProperty("商品价格")
|
||||
private BigDecimal price;
|
||||
|
||||
@ExcelProperty("备注")
|
||||
private String remark;
|
||||
}
|
||||
@ -1,53 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.goods.domain.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import net.lab1024.sa.admin.module.business.goods.constant.GoodsStatusEnum;
|
||||
import net.lab1024.sa.base.common.swagger.SchemaEnum;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 商品
|
||||
*
|
||||
* @Author 1024创新实验室: 胡克
|
||||
* @Date 2021-10-25 20:26:54
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class GoodsVO {
|
||||
|
||||
@Schema(description = "商品分类")
|
||||
private Long categoryId;
|
||||
|
||||
@Schema(description = "商品名称")
|
||||
private String goodsName;
|
||||
|
||||
@SchemaEnum(GoodsStatusEnum.class)
|
||||
private Integer goodsStatus;
|
||||
|
||||
@Schema(description = "产地")
|
||||
private String place;
|
||||
|
||||
@Schema(description = "商品价格")
|
||||
private BigDecimal price;
|
||||
|
||||
@Schema(description = "上架状态")
|
||||
private Boolean shelvesFlag;
|
||||
|
||||
@Schema(description = "备注|可选")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "商品id")
|
||||
private Long goodsId;
|
||||
|
||||
@Schema(description = "商品分类")
|
||||
private String categoryName;
|
||||
|
||||
private LocalDateTime updateTime;
|
||||
|
||||
private LocalDateTime createTime;
|
||||
}
|
||||
@ -1,211 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.goods.service;
|
||||
|
||||
import cn.idev.excel.FastExcel;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import jakarta.annotation.Resource;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import net.lab1024.sa.admin.module.business.category.constant.CategoryTypeEnum;
|
||||
import net.lab1024.sa.admin.module.business.category.domain.entity.CategoryEntity;
|
||||
import net.lab1024.sa.admin.module.business.category.service.CategoryQueryService;
|
||||
import net.lab1024.sa.admin.module.business.goods.constant.GoodsStatusEnum;
|
||||
import net.lab1024.sa.admin.module.business.goods.dao.GoodsDao;
|
||||
import net.lab1024.sa.admin.module.business.goods.domain.entity.GoodsEntity;
|
||||
import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsAddForm;
|
||||
import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsImportForm;
|
||||
import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsQueryForm;
|
||||
import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsUpdateForm;
|
||||
import net.lab1024.sa.admin.module.business.goods.domain.vo.GoodsExcelVO;
|
||||
import net.lab1024.sa.admin.module.business.goods.domain.vo.GoodsVO;
|
||||
import net.lab1024.sa.base.common.code.UserErrorCode;
|
||||
import net.lab1024.sa.base.common.domain.PageResult;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.exception.BusinessException;
|
||||
import net.lab1024.sa.base.common.util.SmartBeanUtil;
|
||||
import net.lab1024.sa.base.common.util.SmartEnumUtil;
|
||||
import net.lab1024.sa.base.common.util.SmartPageUtil;
|
||||
import net.lab1024.sa.base.module.support.datatracer.constant.DataTracerTypeEnum;
|
||||
import net.lab1024.sa.base.module.support.datatracer.service.DataTracerService;
|
||||
import net.lab1024.sa.base.module.support.dict.service.DictService;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 商品
|
||||
*
|
||||
* @Author 1024创新实验室: 胡克
|
||||
* @Date 2021-10-25 20:26:54
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class GoodsService {
|
||||
|
||||
@Resource
|
||||
private GoodsDao goodsDao;
|
||||
|
||||
@Resource
|
||||
private CategoryQueryService categoryQueryService;
|
||||
|
||||
@Resource
|
||||
private DataTracerService dataTracerService;
|
||||
|
||||
@Resource
|
||||
private DictService dictService;
|
||||
|
||||
/**
|
||||
* 添加商品
|
||||
*/
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public ResponseDTO<String> add(GoodsAddForm addForm) {
|
||||
// 商品校验
|
||||
ResponseDTO<String> res = this.checkGoods(addForm);
|
||||
if (!res.getOk()) {
|
||||
return res;
|
||||
}
|
||||
GoodsEntity goodsEntity = SmartBeanUtil.copy(addForm, GoodsEntity.class);
|
||||
goodsEntity.setDeletedFlag(Boolean.FALSE);
|
||||
goodsDao.insert(goodsEntity);
|
||||
dataTracerService.insert(goodsEntity.getGoodsId(), DataTracerTypeEnum.GOODS);
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新商品
|
||||
*/
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public ResponseDTO<String> update(GoodsUpdateForm updateForm) {
|
||||
// 商品校验
|
||||
ResponseDTO<String> res = this.checkGoods(updateForm);
|
||||
if (!res.getOk()) {
|
||||
return res;
|
||||
}
|
||||
GoodsEntity originEntity = goodsDao.selectById(updateForm.getGoodsId());
|
||||
GoodsEntity goodsEntity = SmartBeanUtil.copy(updateForm, GoodsEntity.class);
|
||||
goodsDao.updateById(goodsEntity);
|
||||
dataTracerService.update(updateForm.getGoodsId(), DataTracerTypeEnum.GOODS, originEntity, goodsEntity);
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加/更新 商品校验
|
||||
*/
|
||||
private ResponseDTO<String> checkGoods(GoodsAddForm addForm) {
|
||||
// 校验类目id
|
||||
Long categoryId = addForm.getCategoryId();
|
||||
Optional<CategoryEntity> optional = categoryQueryService.queryCategory(categoryId);
|
||||
if (!optional.isPresent() || !CategoryTypeEnum.GOODS.equalsValue(optional.get().getCategoryType())) {
|
||||
return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST, "商品类目不存在~");
|
||||
}
|
||||
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*/
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public ResponseDTO<String> delete(Long goodsId) {
|
||||
GoodsEntity goodsEntity = goodsDao.selectById(goodsId);
|
||||
if (goodsEntity == null) {
|
||||
return ResponseDTO.userErrorParam("商品不存在");
|
||||
}
|
||||
|
||||
if (!goodsEntity.getGoodsStatus().equals(GoodsStatusEnum.SELL_OUT.getValue())) {
|
||||
return ResponseDTO.userErrorParam("只有售罄的商品才可以删除");
|
||||
}
|
||||
|
||||
batchDelete(Collections.singletonList(goodsId));
|
||||
dataTracerService.batchDelete(Collections.singletonList(goodsId), DataTracerTypeEnum.GOODS);
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*/
|
||||
public ResponseDTO<String> batchDelete(List<Long> goodsIdList) {
|
||||
if (CollectionUtils.isEmpty(goodsIdList)) {
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
goodsDao.batchUpdateDeleted(goodsIdList, Boolean.TRUE);
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 分页查询
|
||||
*/
|
||||
public ResponseDTO<PageResult<GoodsVO>> query(GoodsQueryForm queryForm) {
|
||||
queryForm.setDeletedFlag(false);
|
||||
Page<?> page = SmartPageUtil.convert2PageQuery(queryForm);
|
||||
List<GoodsVO> list = goodsDao.query(page, queryForm);
|
||||
PageResult<GoodsVO> pageResult = SmartPageUtil.convert2PageResult(page, list);
|
||||
if (pageResult.getEmptyFlag()) {
|
||||
return ResponseDTO.ok(pageResult);
|
||||
}
|
||||
// 查询分类名称
|
||||
List<Long> categoryIdList = list.stream().map(GoodsVO::getCategoryId).distinct().collect(Collectors.toList());
|
||||
Map<Long, CategoryEntity> categoryMap = categoryQueryService.queryCategoryList(categoryIdList);
|
||||
list.forEach(e -> {
|
||||
CategoryEntity categoryEntity = categoryMap.get(e.getCategoryId());
|
||||
if (categoryEntity != null) {
|
||||
e.setCategoryName(categoryEntity.getCategoryName());
|
||||
}
|
||||
});
|
||||
return ResponseDTO.ok(pageResult);
|
||||
}
|
||||
|
||||
/**
|
||||
* 商品导入
|
||||
*
|
||||
* @param file 上传文件
|
||||
* @return 结果
|
||||
*/
|
||||
public ResponseDTO<String> importGoods(MultipartFile file) {
|
||||
List<GoodsImportForm> dataList;
|
||||
try {
|
||||
dataList = FastExcel.read(file.getInputStream()).head(GoodsImportForm.class)
|
||||
.sheet()
|
||||
.doReadSync();
|
||||
} catch (IOException e) {
|
||||
log.error(e.getMessage(), e);
|
||||
throw new BusinessException("数据格式存在问题，无法读取");
|
||||
}
|
||||
|
||||
if (CollectionUtils.isEmpty(dataList)) {
|
||||
return ResponseDTO.userErrorParam("数据为空");
|
||||
}
|
||||
|
||||
return ResponseDTO.okMsg("成功导入" + dataList.size() + "条，具体数据为：" + JSON.toJSONString(dataList));
|
||||
}
|
||||
|
||||
/**
|
||||
* 商品导出
|
||||
*/
|
||||
public List<GoodsExcelVO> getAllGoods() {
|
||||
List<GoodsEntity> goodsEntityList = goodsDao.selectList(null);
|
||||
String dictCode = "GOODS_PLACE";
|
||||
return goodsEntityList.stream()
|
||||
.map(e ->
|
||||
GoodsExcelVO.builder()
|
||||
.goodsStatus(SmartEnumUtil.getEnumDescByValue(e.getGoodsStatus(), GoodsStatusEnum.class))
|
||||
.categoryName(categoryQueryService.queryCategoryName(e.getCategoryId()))
|
||||
.place(Arrays.stream(e.getPlace().split(",")).map(code -> dictService.getDictDataLabel(dictCode, code)).collect(Collectors.joining(",")))
|
||||
.price(e.getPrice())
|
||||
.goodsName(e.getGoodsName())
|
||||
.remark(e.getRemark())
|
||||
.build()
|
||||
)
|
||||
.collect(Collectors.toList());
|
||||
|
||||
}
|
||||
}
|
||||
@ -1,82 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.bank.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.annotation.Resource;
|
||||
import jakarta.validation.Valid;
|
||||
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
|
||||
import net.lab1024.sa.admin.module.business.oa.bank.service.BankService;
|
||||
import net.lab1024.sa.admin.module.business.oa.bank.domain.BankCreateForm;
|
||||
import net.lab1024.sa.admin.module.business.oa.bank.domain.BankQueryForm;
|
||||
import net.lab1024.sa.admin.module.business.oa.bank.domain.BankUpdateForm;
|
||||
import net.lab1024.sa.admin.module.business.oa.bank.domain.BankVO;
|
||||
import net.lab1024.sa.base.common.domain.PageResult;
|
||||
import net.lab1024.sa.base.common.domain.RequestUser;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.util.SmartRequestUtil;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* OA办公-OA银行信息
|
||||
*
|
||||
* @Author 1024创新实验室:善逸
|
||||
* @Date 2022/6/23 21:59:22
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@RestController
|
||||
@Tag(name = AdminSwaggerTagConst.Business.OA_BANK)
|
||||
public class BankController {
|
||||
|
||||
@Resource
|
||||
private BankService bankService;
|
||||
|
||||
@Operation(summary = "分页查询银行信息 @author 善逸")
|
||||
@PostMapping("/oa/bank/page/query")
|
||||
@SaCheckPermission("oa:bank:query")
|
||||
public ResponseDTO<PageResult<BankVO>> queryByPage(@RequestBody @Valid BankQueryForm queryForm) {
|
||||
return bankService.queryByPage(queryForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "根据企业ID查询银行信息列表 @author 善逸")
|
||||
@GetMapping("/oa/bank/query/list/{enterpriseId}")
|
||||
@SaCheckPermission("oa:bank:query")
|
||||
public ResponseDTO<List<BankVO>> queryList(@PathVariable Long enterpriseId) {
|
||||
return bankService.queryList(enterpriseId);
|
||||
}
|
||||
|
||||
@Operation(summary = "查询银行信息详情 @author 善逸")
|
||||
@GetMapping("/oa/bank/get/{bankId}")
|
||||
@SaCheckPermission("oa:bank:query")
|
||||
public ResponseDTO<BankVO> getDetail(@PathVariable Long bankId) {
|
||||
return bankService.getDetail(bankId);
|
||||
}
|
||||
|
||||
@Operation(summary = "新建银行信息 @author 善逸")
|
||||
@PostMapping("/oa/bank/create")
|
||||
@SaCheckPermission("oa:bank:add")
|
||||
public ResponseDTO<String> createBank(@RequestBody @Valid BankCreateForm createVO) {
|
||||
RequestUser requestUser = SmartRequestUtil.getRequestUser();
|
||||
createVO.setCreateUserId(requestUser.getUserId());
|
||||
createVO.setCreateUserName(requestUser.getUserName());
|
||||
return bankService.createBank(createVO);
|
||||
}
|
||||
|
||||
@Operation(summary = "编辑银行信息 @author 善逸")
|
||||
@PostMapping("/oa/bank/update")
|
||||
@SaCheckPermission("oa:bank:update")
|
||||
public ResponseDTO<String> updateBank(@RequestBody @Valid BankUpdateForm updateVO) {
|
||||
return bankService.updateBank(updateVO);
|
||||
}
|
||||
|
||||
@Operation(summary = "删除银行信息 @author 善逸")
|
||||
@GetMapping("/oa/bank/delete/{bankId}")
|
||||
@SaCheckPermission("oa:bank:delete")
|
||||
public ResponseDTO<String> deleteBank(@PathVariable Long bankId) {
|
||||
return bankService.deleteBank(bankId);
|
||||
}
|
||||
}
|
||||
@ -1,57 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.bank.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
/**
|
||||
* OA办公-银行信息新建
|
||||
*
|
||||
* @Author 1024创新实验室:善逸
|
||||
* @Date 2022/6/23 21:59:22
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class BankCreateForm {
|
||||
|
||||
@Schema(description = "开户银行")
|
||||
@NotBlank(message = "开户银行不能为空")
|
||||
@Length(max = 200, message = "开户银行最多200字符")
|
||||
private String bankName;
|
||||
|
||||
@Schema(description = "账户名称")
|
||||
@NotBlank(message = "账户名称不能为空")
|
||||
@Length(max = 200, message = "账户名称最多200字符")
|
||||
private String accountName;
|
||||
|
||||
@Schema(description = "账号")
|
||||
@NotBlank(message = "账号不能为空")
|
||||
@Length(max = 200, message = "账号最多200字符")
|
||||
private String accountNumber;
|
||||
|
||||
@Schema(description = "备注")
|
||||
@Length(max = 500, message = "备注最多500字符")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "是否对公")
|
||||
@NotNull(message = "是否对公不能为空")
|
||||
private Boolean businessFlag;
|
||||
|
||||
@Schema(description = "企业")
|
||||
@NotNull(message = "企业不能为空")
|
||||
private Long enterpriseId;
|
||||
|
||||
@Schema(description = "禁用状态")
|
||||
@NotNull(message = "禁用状态不能为空")
|
||||
private Boolean disabledFlag;
|
||||
|
||||
@Schema(hidden = true)
|
||||
private Long createUserId;
|
||||
|
||||
@Schema(hidden = true)
|
||||
private String createUserName;
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.bank.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* OA办公-银行信息更新
|
||||
*
|
||||
* @Author 1024创新实验室:善逸
|
||||
* @Date 2022/6/23 21:59:22
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class BankUpdateForm extends BankCreateForm {
|
||||
|
||||
@Schema(description = "银行信息ID")
|
||||
@NotNull(message = "银行信息ID不能为空")
|
||||
private Long bankId;
|
||||
}
|
||||
@ -1,146 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.bank.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import jakarta.annotation.Resource;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import net.lab1024.sa.admin.module.business.oa.bank.dao.BankDao;
|
||||
import net.lab1024.sa.admin.module.business.oa.bank.domain.*;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.dao.EnterpriseDao;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.entity.EnterpriseEntity;
|
||||
import net.lab1024.sa.base.common.domain.PageResult;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.util.SmartBeanUtil;
|
||||
import net.lab1024.sa.base.common.util.SmartPageUtil;
|
||||
import net.lab1024.sa.base.module.support.datatracer.constant.DataTracerConst;
|
||||
import net.lab1024.sa.base.module.support.datatracer.constant.DataTracerTypeEnum;
|
||||
import net.lab1024.sa.base.module.support.datatracer.service.DataTracerService;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* OA办公-OA银行信息
|
||||
*
|
||||
* @Author 1024创新实验室:善逸
|
||||
* @Date 2022/6/23 21:59:22
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class BankService {
|
||||
|
||||
@Resource
|
||||
private BankDao bankDao;
|
||||
|
||||
@Resource
|
||||
private EnterpriseDao enterpriseDao;
|
||||
|
||||
@Resource
|
||||
private DataTracerService dataTracerService;
|
||||
|
||||
/**
|
||||
* 分页查询银行信息
|
||||
*/
|
||||
public ResponseDTO<PageResult<BankVO>> queryByPage(BankQueryForm queryForm) {
|
||||
queryForm.setDeletedFlag(Boolean.FALSE);
|
||||
Page<?> page = SmartPageUtil.convert2PageQuery(queryForm);
|
||||
List<BankVO> bankList = bankDao.queryPage(page, queryForm);
|
||||
PageResult<BankVO> pageResult = SmartPageUtil.convert2PageResult(page, bankList);
|
||||
return ResponseDTO.ok(pageResult);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据企业ID查询不分页的银行列表
|
||||
*/
|
||||
public ResponseDTO<List<BankVO>> queryList(Long enterpriseId) {
|
||||
BankQueryForm queryForm = new BankQueryForm();
|
||||
queryForm.setEnterpriseId(enterpriseId);
|
||||
queryForm.setDeletedFlag(Boolean.FALSE);
|
||||
List<BankVO> bankList = bankDao.queryPage(null, queryForm);
|
||||
return ResponseDTO.ok(bankList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询银行信息详情
|
||||
*/
|
||||
public ResponseDTO<BankVO> getDetail(Long bankId) {
|
||||
// 校验银行信息是否存在
|
||||
BankVO bankVO = bankDao.getDetail(bankId, Boolean.FALSE);
|
||||
if (Objects.isNull(bankVO)) {
|
||||
return ResponseDTO.userErrorParam("银行信息不存在");
|
||||
}
|
||||
return ResponseDTO.ok(bankVO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新建银行信息
|
||||
*/
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public ResponseDTO<String> createBank(BankCreateForm createVO) {
|
||||
Long enterpriseId = createVO.getEnterpriseId();
|
||||
// 校验企业是否存在
|
||||
EnterpriseEntity enterpriseDetail = enterpriseDao.selectById(enterpriseId);
|
||||
if (Objects.isNull(enterpriseDetail) || enterpriseDetail.getDeletedFlag()) {
|
||||
return ResponseDTO.userErrorParam("企业不存在");
|
||||
}
|
||||
// 验证银行信息账号是否重复
|
||||
BankEntity validateBank = bankDao.queryByAccountNumber(enterpriseId, createVO.getAccountNumber(), null, Boolean.FALSE);
|
||||
if (Objects.nonNull(validateBank)) {
|
||||
return ResponseDTO.userErrorParam("银行信息账号重复");
|
||||
}
|
||||
// 数据插入
|
||||
BankEntity insertBank = SmartBeanUtil.copy(createVO, BankEntity.class);
|
||||
bankDao.insert(insertBank);
|
||||
dataTracerService.addTrace(enterpriseId, DataTracerTypeEnum.OA_ENTERPRISE, "新增银行:" + DataTracerConst.HTML_BR + dataTracerService.getChangeContent(insertBank));
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑银行信息
|
||||
*/
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public ResponseDTO<String> updateBank(BankUpdateForm updateVO) {
|
||||
Long enterpriseId = updateVO.getEnterpriseId();
|
||||
// 校验企业是否存在
|
||||
EnterpriseEntity enterpriseDetail = enterpriseDao.selectById(enterpriseId);
|
||||
if (Objects.isNull(enterpriseDetail) || enterpriseDetail.getDeletedFlag()) {
|
||||
return ResponseDTO.userErrorParam("企业不存在");
|
||||
}
|
||||
Long bankId = updateVO.getBankId();
|
||||
// 校验银行信息是否存在
|
||||
BankEntity bankDetail = bankDao.selectById(bankId);
|
||||
if (Objects.isNull(bankDetail) || bankDetail.getDeletedFlag()) {
|
||||
return ResponseDTO.userErrorParam("银行信息不存在");
|
||||
}
|
||||
// 验证银行信息账号是否重复
|
||||
BankEntity validateBank = bankDao.queryByAccountNumber(updateVO.getEnterpriseId(), updateVO.getAccountNumber(), bankId, Boolean.FALSE);
|
||||
if (Objects.nonNull(validateBank)) {
|
||||
return ResponseDTO.userErrorParam("银行信息账号重复");
|
||||
}
|
||||
// 数据编辑
|
||||
BankEntity updateBank = SmartBeanUtil.copy(updateVO, BankEntity.class);
|
||||
bankDao.updateById(updateBank);
|
||||
dataTracerService.addTrace(enterpriseId, DataTracerTypeEnum.OA_ENTERPRISE, "更新银行:" + DataTracerConst.HTML_BR + dataTracerService.getChangeContent(bankDetail, updateBank));
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 删除银行信息
|
||||
*/
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public ResponseDTO<String> deleteBank(Long bankId) {
|
||||
// 校验银行信息是否存在
|
||||
BankEntity bankDetail = bankDao.selectById(bankId);
|
||||
if (Objects.isNull(bankDetail) || bankDetail.getDeletedFlag()) {
|
||||
return ResponseDTO.userErrorParam("银行信息不存在");
|
||||
}
|
||||
bankDao.deleteBank(bankId, Boolean.TRUE);
|
||||
dataTracerService.addTrace(bankDetail.getEnterpriseId(), DataTracerTypeEnum.OA_ENTERPRISE, "删除银行:" + DataTracerConst.HTML_BR + dataTracerService.getChangeContent(bankDetail));
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
}
|
||||
@ -1,138 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.enterprise.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.annotation.Resource;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.service.EnterpriseService;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.form.*;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseEmployeeVO;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseExcelVO;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseListVO;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO;
|
||||
import net.lab1024.sa.admin.util.AdminRequestUtil;
|
||||
import net.lab1024.sa.base.common.domain.PageResult;
|
||||
import net.lab1024.sa.base.common.domain.RequestUser;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.util.*;
|
||||
import net.lab1024.sa.base.module.support.operatelog.annotation.OperateLog;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 企业
|
||||
*
|
||||
* @Author 1024创新实验室: 开云
|
||||
* @Date 2022/7/28 20:37:15
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
@Tag(name = AdminSwaggerTagConst.Business.OA_ENTERPRISE)
|
||||
@OperateLog
|
||||
public class EnterpriseController {
|
||||
|
||||
@Resource
|
||||
private EnterpriseService enterpriseService;
|
||||
|
||||
@Operation(summary = "分页查询企业模块 @author 开云")
|
||||
@PostMapping("/oa/enterprise/page/query")
|
||||
@SaCheckPermission("oa:enterprise:query")
|
||||
public ResponseDTO<PageResult<EnterpriseVO>> queryByPage(@RequestBody @Valid EnterpriseQueryForm queryForm) {
|
||||
return enterpriseService.queryByPage(queryForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "导出企业信息 @author 卓大")
|
||||
@PostMapping("/oa/enterprise/exportExcel")
|
||||
public void exportExcel(@RequestBody @Valid EnterpriseQueryForm queryForm, HttpServletResponse response) throws IOException {
|
||||
List<EnterpriseExcelVO> data = enterpriseService.getExcelExportData(queryForm);
|
||||
if (CollectionUtils.isEmpty(data)) {
|
||||
SmartResponseUtil.write(response, ResponseDTO.userErrorParam("暂无数据"));
|
||||
return;
|
||||
}
|
||||
|
||||
String watermark = AdminRequestUtil.getRequestUser().getActualName();
|
||||
watermark += SmartLocalDateUtil.format(LocalDateTime.now(), SmartDateFormatterEnum.YMD_HMS);
|
||||
|
||||
SmartExcelUtil.exportExcelWithWatermark(response,"企业基本信息.xlsx","企业信息",EnterpriseExcelVO.class,data,watermark);
|
||||
|
||||
}
|
||||
|
||||
@Operation(summary = "查询企业详情 @author 开云")
|
||||
@GetMapping("/oa/enterprise/get/{enterpriseId}")
|
||||
@SaCheckPermission("oa:enterprise:detail")
|
||||
public ResponseDTO<EnterpriseVO> getDetail(@PathVariable Long enterpriseId) {
|
||||
return ResponseDTO.ok(enterpriseService.getDetail(enterpriseId));
|
||||
}
|
||||
|
||||
@Operation(summary = "新建企业 @author 开云")
|
||||
@PostMapping("/oa/enterprise/create")
|
||||
@SaCheckPermission("oa:enterprise:add")
|
||||
public ResponseDTO<String> createEnterprise(@RequestBody @Valid EnterpriseCreateForm createVO) {
|
||||
RequestUser requestUser = SmartRequestUtil.getRequestUser();
|
||||
createVO.setCreateUserId(requestUser.getUserId());
|
||||
createVO.setCreateUserName(requestUser.getUserName());
|
||||
return enterpriseService.createEnterprise(createVO);
|
||||
}
|
||||
|
||||
@Operation(summary = "编辑企业 @author 开云")
|
||||
@PostMapping("/oa/enterprise/update")
|
||||
@SaCheckPermission("oa:enterprise:update")
|
||||
public ResponseDTO<String> updateEnterprise(@RequestBody @Valid EnterpriseUpdateForm updateVO) {
|
||||
return enterpriseService.updateEnterprise(updateVO);
|
||||
}
|
||||
|
||||
@Operation(summary = "删除企业 @author 开云")
|
||||
@GetMapping("/oa/enterprise/delete/{enterpriseId}")
|
||||
@SaCheckPermission("oa:enterprise:delete")
|
||||
public ResponseDTO<String> deleteEnterprise(@PathVariable Long enterpriseId) {
|
||||
return enterpriseService.deleteEnterprise(enterpriseId);
|
||||
}
|
||||
|
||||
@Operation(summary = "按照类型查询企业 @author 开云")
|
||||
@GetMapping("/oa/enterprise/query/list")
|
||||
@SaCheckPermission("oa:enterprise:query")
|
||||
public ResponseDTO<List<EnterpriseListVO>> queryList(@RequestParam(value = "type", required = false) Integer type) {
|
||||
return enterpriseService.queryList(type);
|
||||
}
|
||||
|
||||
|
||||
@Operation(summary = "企业添加员工 @author 罗伊")
|
||||
@PostMapping("/oa/enterprise/employee/add")
|
||||
@SaCheckPermission("oa:enterprise:addEmployee")
|
||||
public ResponseDTO<String> addEmployee(@RequestBody @Valid EnterpriseEmployeeForm enterpriseEmployeeForm) {
|
||||
return enterpriseService.addEmployee(enterpriseEmployeeForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "查询企业全部员工 @author 罗伊")
|
||||
@PostMapping("/oa/enterprise/employee/list")
|
||||
@SaCheckPermission("oa:enterprise:queryEmployee")
|
||||
public ResponseDTO<List<EnterpriseEmployeeVO>> employeeList(@RequestBody @Valid List<Long> enterpriseIdList) {
|
||||
return ResponseDTO.ok(enterpriseService.employeeList(enterpriseIdList));
|
||||
}
|
||||
|
||||
@Operation(summary = "分页查询企业员工 @author 卓大")
|
||||
@PostMapping("/oa/enterprise/employee/queryPage")
|
||||
@SaCheckPermission("oa:enterprise:queryEmployee")
|
||||
public ResponseDTO<PageResult<EnterpriseEmployeeVO>> queryPageEmployeeList(@RequestBody @Valid EnterpriseEmployeeQueryForm queryForm) {
|
||||
return ResponseDTO.ok(enterpriseService.queryPageEmployeeList(queryForm));
|
||||
}
|
||||
|
||||
|
||||
@Operation(summary = "企业删除员工 @author 罗伊")
|
||||
@PostMapping("/oa/enterprise/employee/delete")
|
||||
@SaCheckPermission("oa:enterprise:deleteEmployee")
|
||||
public ResponseDTO<String> deleteEmployee(@RequestBody @Valid EnterpriseEmployeeForm enterpriseEmployeeForm) {
|
||||
return enterpriseService.deleteEmployee(enterpriseEmployeeForm);
|
||||
}
|
||||
}
|
||||
@ -1,64 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.enterprise.dao;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.entity.EnterpriseEntity;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.form.EnterpriseQueryForm;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseExcelVO;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseListVO;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 企业
|
||||
*
|
||||
* @Author 1024创新实验室: 开云
|
||||
* @Date 2022/7/28 20:37:15
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Mapper
|
||||
public interface EnterpriseDao extends BaseMapper<EnterpriseEntity> {
|
||||
|
||||
/**
|
||||
* 根据企业名称查询
|
||||
*
|
||||
*/
|
||||
EnterpriseEntity queryByEnterpriseName(@Param("enterpriseName") String enterpriseName, @Param("excludeEnterpriseId") Long excludeEnterpriseId, @Param("deletedFlag") Boolean deletedFlag);
|
||||
|
||||
/**
|
||||
* 删除企业
|
||||
*/
|
||||
void deleteEnterprise(@Param("enterpriseId") Long enterpriseId, @Param("deletedFlag") Boolean deletedFlag);
|
||||
|
||||
/**
|
||||
* 企业分页查询
|
||||
*
|
||||
*/
|
||||
List<EnterpriseVO> queryPage(Page page, @Param("queryForm") EnterpriseQueryForm queryForm);
|
||||
|
||||
/**
|
||||
* 查询导出的数据
|
||||
*
|
||||
*/
|
||||
List<EnterpriseExcelVO> selectExcelExportData(@Param("queryForm") EnterpriseQueryForm queryForm);
|
||||
|
||||
/**
|
||||
* 查询企业详情
|
||||
*
|
||||
*/
|
||||
EnterpriseVO getDetail(@Param("enterpriseId") Long enterpriseId, @Param("deletedFlag") Boolean deletedFlag);
|
||||
|
||||
/**
|
||||
* 查询列表
|
||||
*
|
||||
*/
|
||||
List<EnterpriseListVO> queryList(@Param("type") Integer type, @Param("disabledFlag") Boolean disabledFlag, @Param("deletedFlag") Boolean deletedFlag);
|
||||
|
||||
|
||||
}
|
||||
@ -1,69 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.enterprise.dao;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.entity.EnterpriseEmployeeEntity;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.form.EnterpriseEmployeeQueryForm;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseEmployeeVO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 企业员工
|
||||
*
|
||||
* @Author 1024创新实验室: 罗伊
|
||||
* @Date 2022/7/28 20:37:15
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Mapper
|
||||
public interface EnterpriseEmployeeDao extends BaseMapper<EnterpriseEmployeeEntity> {
|
||||
|
||||
|
||||
/**
|
||||
* 根据员工查询
|
||||
*/
|
||||
List<EnterpriseEmployeeVO> selectByEmployeeIdList(@Param("employeeIdList")Collection<Long> employeeIdList);
|
||||
|
||||
/**
|
||||
* 查询员工关联的企业
|
||||
*/
|
||||
List<Long> selectEnterpriseIdByEmployeeId(@Param("employeeId")Long employeeId);
|
||||
/**
|
||||
* 根据企业查询
|
||||
*/
|
||||
List<EnterpriseEmployeeVO> selectByEnterpriseIdList(@Param("enterpriseIdList")Collection<Long> enterpriseIdList);
|
||||
/**
|
||||
* 根据企业查询
|
||||
*/
|
||||
List<EnterpriseEmployeeEntity> selectByEnterpriseId(@Param("enterpriseId")Long enterpriseId);
|
||||
|
||||
/**
|
||||
* 查询企业下的所有员工id
|
||||
*/
|
||||
List<Long> selectEmployeeIdByEnterpriseIdList(@Param("enterpriseIdList")Collection<Long> enterpriseIdList);
|
||||
/**
|
||||
* 根据员工删除
|
||||
*/
|
||||
void deleteByEnterpriseAndEmployeeIdList(@Param("enterpriseId")Long enterpriseId, @Param("employeeIdList")Collection<Long> employeeIdList);
|
||||
|
||||
/**
|
||||
* 根据员工查询
|
||||
*/
|
||||
List<EnterpriseEmployeeEntity> selectByEnterpriseAndEmployeeIdList(@Param("enterpriseId")Long enterpriseId, @Param("employeeIdList")Collection<Long> employeeIdList);
|
||||
|
||||
/**
|
||||
* 删除某员工关联的所有企业
|
||||
*/
|
||||
void deleteByEmployeeId(@Param("employeeId")Long employeeId);
|
||||
|
||||
/**
|
||||
* 分页查询企业员工
|
||||
*/
|
||||
List<EnterpriseEmployeeVO> queryPageEmployeeList(Page<?> page,@Param("queryForm") EnterpriseEmployeeQueryForm queryForm);
|
||||
}
|
||||
@ -1,100 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.enterprise.domain.form;
|
||||
|
||||
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import jakarta.validation.constraints.Pattern;
|
||||
import lombok.Data;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.constant.EnterpriseTypeEnum;
|
||||
import net.lab1024.sa.base.common.json.deserializer.FileKeyVoDeserializer;
|
||||
import net.lab1024.sa.base.common.json.serializer.FileKeyVoSerializer;
|
||||
import net.lab1024.sa.base.common.swagger.SchemaEnum;
|
||||
import net.lab1024.sa.base.common.util.SmartVerificationUtil;
|
||||
import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
/**
|
||||
* OA企业模块创建
|
||||
*
|
||||
* @Author 1024创新实验室: 开云
|
||||
* @Date 2022/7/28 20:37:15
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class EnterpriseCreateForm {
|
||||
|
||||
@Schema(description = "企业名称")
|
||||
@NotBlank(message = "企业名称不能为空")
|
||||
@Length(max = 200, message = "企业名称最多200字符")
|
||||
private String enterpriseName;
|
||||
|
||||
@Schema(description = "企业logo")
|
||||
@JsonSerialize(using = FileKeyVoSerializer.class)
|
||||
@JsonDeserialize(using = FileKeyVoDeserializer.class)
|
||||
private String enterpriseLogo;
|
||||
|
||||
@Schema(description = "统一社会信用代码")
|
||||
@NotBlank(message = "统一社会信用代码不能为空")
|
||||
@Length(max = 200, message = "统一社会信用代码最多200字符")
|
||||
private String unifiedSocialCreditCode;
|
||||
|
||||
@Schema(description = "联系人")
|
||||
@NotBlank(message = "联系人不能为空")
|
||||
@Length(max = 100, message = "联系人最多100字符")
|
||||
private String contact;
|
||||
|
||||
@Schema(description = "联系人电话")
|
||||
@NotBlank(message = "联系人电话不能为空")
|
||||
@Pattern(regexp = SmartVerificationUtil.PHONE_REGEXP, message = "手机号格式不正确")
|
||||
private String contactPhone;
|
||||
|
||||
@SchemaEnum(desc = "类型", value = EnterpriseTypeEnum.class)
|
||||
@CheckEnum(message = "类型不正确", value = EnterpriseTypeEnum.class)
|
||||
private Integer type;
|
||||
|
||||
@Schema(description = "邮箱")
|
||||
@Pattern(regexp = SmartVerificationUtil.EMAIL, message = "邮箱格式不正确")
|
||||
private String email;
|
||||
|
||||
@Schema(description = "省份")
|
||||
private Integer province;
|
||||
|
||||
@Schema(description = "省份名称")
|
||||
private String provinceName;
|
||||
|
||||
@Schema(description = "城市")
|
||||
private Integer city;
|
||||
|
||||
@Schema(description = "城市名称")
|
||||
private String cityName;
|
||||
|
||||
@Schema(description = "区县")
|
||||
private Integer district;
|
||||
|
||||
@Schema(description = "区县名称")
|
||||
private String districtName;
|
||||
|
||||
@Schema(description = "详细地址")
|
||||
@Length(max = 500, message = "详细地址最多500字符")
|
||||
private String address;
|
||||
|
||||
@Schema(description = "营业执照")
|
||||
@JsonSerialize(using = FileKeyVoSerializer.class)
|
||||
@JsonDeserialize(using = FileKeyVoDeserializer.class)
|
||||
private String businessLicense;
|
||||
|
||||
@Schema(description = "禁用状态")
|
||||
@NotNull(message = "禁用状态不能为空")
|
||||
private Boolean disabledFlag;
|
||||
|
||||
@Schema(description = "创建人", hidden = true)
|
||||
private Long createUserId;
|
||||
|
||||
@Schema(description = "创建人", hidden = true)
|
||||
private String createUserName;
|
||||
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.enterprise.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 企业员工
|
||||
*
|
||||
* @Author 1024创新实验室: 罗伊
|
||||
* @Date 2022/7/28 20:37:15
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class EnterpriseEmployeeForm {
|
||||
|
||||
@Schema(description = "企业id")
|
||||
@NotNull(message = "企业id不能为空")
|
||||
private Long enterpriseId;
|
||||
|
||||
@Schema(description = "员工信息id")
|
||||
@NotEmpty(message = "员工信息id不能为空")
|
||||
private List<Long> employeeIdList;
|
||||
}
|
||||
@ -1,32 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.enterprise.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
import net.lab1024.sa.base.common.domain.PageParam;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
/**
|
||||
* 查询企业员工
|
||||
*
|
||||
* @Author 1024创新实验室: 开云
|
||||
* @Date 2021-12-20 21:06:49
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class EnterpriseEmployeeQueryForm extends PageParam {
|
||||
|
||||
@Schema(description = "搜索词")
|
||||
@Length(max = 20, message = "搜索词最多20字符")
|
||||
private String keyword;
|
||||
|
||||
@Schema(description = "公司Id")
|
||||
@NotNull(message = "公司id 不能为空")
|
||||
private Long enterpriseId;
|
||||
|
||||
@Schema(description = "删除标识", hidden = true)
|
||||
private Boolean deletedFlag;
|
||||
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.enterprise.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* OA企业模块编辑
|
||||
*
|
||||
* @Author 1024创新实验室: 开云
|
||||
* @Date 2022/7/28 20:37:15
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class EnterpriseUpdateForm extends EnterpriseCreateForm {
|
||||
|
||||
@Schema(description = "企业ID")
|
||||
@NotNull(message = "企业ID不能为空")
|
||||
private Long enterpriseId;
|
||||
}
|
||||
@ -1,48 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo;
|
||||
|
||||
import cn.idev.excel.annotation.ExcelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 企业信息
|
||||
*
|
||||
* @Author 1024创新实验室: 开云
|
||||
* @Date 2022/7/28 20:37:15
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class EnterpriseExcelVO {
|
||||
|
||||
@ExcelProperty("企业名称")
|
||||
private String enterpriseName;
|
||||
|
||||
@ExcelProperty("统一社会信用代码")
|
||||
private String unifiedSocialCreditCode;
|
||||
|
||||
@ExcelProperty("企业类型")
|
||||
private String typeName;
|
||||
|
||||
@ExcelProperty("联系人")
|
||||
private String contact;
|
||||
|
||||
@ExcelProperty("联系人电话")
|
||||
private String contactPhone;
|
||||
|
||||
@ExcelProperty("邮箱")
|
||||
private String email;
|
||||
|
||||
@ExcelProperty("省份名称")
|
||||
private String provinceName;
|
||||
|
||||
@ExcelProperty("城市名称")
|
||||
private String cityName;
|
||||
|
||||
@ExcelProperty("区县名称")
|
||||
private String districtName;
|
||||
|
||||
@ExcelProperty("详细地址")
|
||||
private String address;
|
||||
|
||||
}
|
||||
@ -1,239 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.enterprise.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.google.common.collect.Lists;
|
||||
import jakarta.annotation.Resource;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.dao.EnterpriseDao;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.dao.EnterpriseEmployeeDao;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.entity.EnterpriseEmployeeEntity;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.entity.EnterpriseEntity;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.form.*;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseEmployeeVO;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseExcelVO;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseListVO;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.manager.EnterpriseEmployeeManager;
|
||||
import net.lab1024.sa.admin.module.system.department.service.DepartmentService;
|
||||
import net.lab1024.sa.base.common.code.UserErrorCode;
|
||||
import net.lab1024.sa.base.common.domain.PageResult;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.util.SmartBeanUtil;
|
||||
import net.lab1024.sa.base.common.util.SmartPageUtil;
|
||||
import net.lab1024.sa.base.module.support.datatracer.constant.DataTracerTypeEnum;
|
||||
import net.lab1024.sa.base.module.support.datatracer.domain.form.DataTracerForm;
|
||||
import net.lab1024.sa.base.module.support.datatracer.service.DataTracerService;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 企业
|
||||
*
|
||||
* @Author 1024创新实验室: 开云
|
||||
* @Date 2022/7/28 20:37:15
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class EnterpriseService {
|
||||
|
||||
@Resource
|
||||
private EnterpriseDao enterpriseDao;
|
||||
|
||||
@Resource
|
||||
private EnterpriseEmployeeDao enterpriseEmployeeDao;
|
||||
|
||||
@Resource
|
||||
private EnterpriseEmployeeManager enterpriseEmployeeManager;
|
||||
|
||||
@Resource
|
||||
private DataTracerService dataTracerService;
|
||||
|
||||
@Resource
|
||||
private DepartmentService departmentService;
|
||||
|
||||
/**
|
||||
* 分页查询企业模块
|
||||
*
|
||||
*/
|
||||
public ResponseDTO<PageResult<EnterpriseVO>> queryByPage(EnterpriseQueryForm queryForm) {
|
||||
queryForm.setDeletedFlag(Boolean.FALSE);
|
||||
Page<?> page = SmartPageUtil.convert2PageQuery(queryForm);
|
||||
List<EnterpriseVO> enterpriseList = enterpriseDao.queryPage(page, queryForm);
|
||||
PageResult<EnterpriseVO> pageResult = SmartPageUtil.convert2PageResult(page, enterpriseList);
|
||||
return ResponseDTO.ok(pageResult);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取导出数据
|
||||
*/
|
||||
public List<EnterpriseExcelVO> getExcelExportData(EnterpriseQueryForm queryForm) {
|
||||
queryForm.setDeletedFlag(false);
|
||||
return enterpriseDao.selectExcelExportData(queryForm);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询企业详情
|
||||
*
|
||||
*/
|
||||
public EnterpriseVO getDetail(Long enterpriseId) {
|
||||
return enterpriseDao.getDetail(enterpriseId, Boolean.FALSE);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新建企业
|
||||
*
|
||||
*/
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public ResponseDTO<String> createEnterprise(EnterpriseCreateForm createVO) {
|
||||
// 验证企业名称是否重复
|
||||
EnterpriseEntity validateEnterprise = enterpriseDao.queryByEnterpriseName(createVO.getEnterpriseName(), null, Boolean.FALSE);
|
||||
if (Objects.nonNull(validateEnterprise)) {
|
||||
return ResponseDTO.userErrorParam("企业名称重复");
|
||||
}
|
||||
// 数据插入
|
||||
EnterpriseEntity insertEnterprise = SmartBeanUtil.copy(createVO, EnterpriseEntity.class);
|
||||
enterpriseDao.insert(insertEnterprise);
|
||||
dataTracerService.insert(insertEnterprise.getEnterpriseId(), DataTracerTypeEnum.OA_ENTERPRISE);
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑企业
|
||||
*
|
||||
*/
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public ResponseDTO<String> updateEnterprise(EnterpriseUpdateForm updateVO) {
|
||||
Long enterpriseId = updateVO.getEnterpriseId();
|
||||
// 校验企业是否存在
|
||||
EnterpriseEntity enterpriseDetail = enterpriseDao.selectById(enterpriseId);
|
||||
if (Objects.isNull(enterpriseDetail) || enterpriseDetail.getDeletedFlag()) {
|
||||
return ResponseDTO.userErrorParam("企业不存在");
|
||||
}
|
||||
// 验证企业名称是否重复
|
||||
EnterpriseEntity validateEnterprise = enterpriseDao.queryByEnterpriseName(updateVO.getEnterpriseName(), enterpriseId, Boolean.FALSE);
|
||||
if (Objects.nonNull(validateEnterprise)) {
|
||||
return ResponseDTO.userErrorParam("企业名称重复");
|
||||
}
|
||||
// 数据编辑
|
||||
EnterpriseEntity updateEntity = SmartBeanUtil.copy(enterpriseDetail, EnterpriseEntity.class);
|
||||
SmartBeanUtil.copyProperties(updateVO, updateEntity);
|
||||
enterpriseDao.updateById(updateEntity);
|
||||
|
||||
//变更记录
|
||||
DataTracerForm dataTracerForm = DataTracerForm.builder()
|
||||
.dataId(updateVO.getEnterpriseId())
|
||||
.type(DataTracerTypeEnum.OA_ENTERPRISE)
|
||||
.content("修改企业信息")
|
||||
.diffOld(dataTracerService.getChangeContent(enterpriseDetail))
|
||||
.diffNew(dataTracerService.getChangeContent(updateEntity))
|
||||
.build();
|
||||
|
||||
dataTracerService.addTrace(dataTracerForm);
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 删除企业
|
||||
*
|
||||
*/
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public ResponseDTO<String> deleteEnterprise(Long enterpriseId) {
|
||||
// 校验企业是否存在
|
||||
EnterpriseEntity enterpriseDetail = enterpriseDao.selectById(enterpriseId);
|
||||
if (Objects.isNull(enterpriseDetail) || enterpriseDetail.getDeletedFlag()) {
|
||||
return ResponseDTO.userErrorParam("企业不存在");
|
||||
}
|
||||
enterpriseDao.deleteEnterprise(enterpriseId, Boolean.TRUE);
|
||||
dataTracerService.delete(enterpriseId, DataTracerTypeEnum.OA_ENTERPRISE);
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 企业列表查询
|
||||
*/
|
||||
public ResponseDTO<List<EnterpriseListVO>> queryList(Integer type) {
|
||||
List<EnterpriseListVO> enterpriseList = enterpriseDao.queryList(type, Boolean.FALSE, Boolean.FALSE);
|
||||
return ResponseDTO.ok(enterpriseList);
|
||||
}
|
||||
|
||||
//----------------------------------------- 以下为员工相关--------------------------------------------
|
||||
|
||||
/**
|
||||
* 企业添加员工
|
||||
*
|
||||
*/
|
||||
public synchronized ResponseDTO<String> addEmployee(EnterpriseEmployeeForm enterpriseEmployeeForm) {
|
||||
Long enterpriseId = enterpriseEmployeeForm.getEnterpriseId();
|
||||
EnterpriseEntity enterpriseEntity = enterpriseDao.selectById(enterpriseId);
|
||||
if (enterpriseEntity == null || enterpriseEntity.getDeletedFlag()) {
|
||||
return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
|
||||
}
|
||||
//过滤掉已存在的员工
|
||||
List<Long> waitAddEmployeeIdList = enterpriseEmployeeForm.getEmployeeIdList();
|
||||
List<EnterpriseEmployeeEntity> enterpriseEmployeeEntityList = enterpriseEmployeeDao.selectByEnterpriseAndEmployeeIdList(enterpriseId, waitAddEmployeeIdList);
|
||||
if (CollectionUtils.isNotEmpty(enterpriseEmployeeEntityList)) {
|
||||
List<Long> existEmployeeIdList = enterpriseEmployeeEntityList.stream().map(EnterpriseEmployeeEntity::getEmployeeId).collect(Collectors.toList());
|
||||
waitAddEmployeeIdList = waitAddEmployeeIdList.stream().filter(e -> !existEmployeeIdList.contains(e)).collect(Collectors.toList());
|
||||
}
|
||||
if (CollectionUtils.isEmpty(waitAddEmployeeIdList)) {
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
List<EnterpriseEmployeeEntity> batchAddList = Lists.newArrayList();
|
||||
for (Long employeeId : waitAddEmployeeIdList) {
|
||||
EnterpriseEmployeeEntity enterpriseEmployeeEntity = new EnterpriseEmployeeEntity();
|
||||
enterpriseEmployeeEntity.setEnterpriseId(enterpriseId);
|
||||
enterpriseEmployeeEntity.setEmployeeId(employeeId);
|
||||
batchAddList.add(enterpriseEmployeeEntity);
|
||||
}
|
||||
enterpriseEmployeeManager.saveBatch(batchAddList);
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 企业删除员工
|
||||
*
|
||||
*/
|
||||
public synchronized ResponseDTO<String> deleteEmployee(EnterpriseEmployeeForm enterpriseEmployeeForm) {
|
||||
Long enterpriseId = enterpriseEmployeeForm.getEnterpriseId();
|
||||
EnterpriseEntity enterpriseEntity = enterpriseDao.selectById(enterpriseId);
|
||||
if (enterpriseEntity == null || enterpriseEntity.getDeletedFlag()) {
|
||||
return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
|
||||
}
|
||||
List<Long> waitDeleteEmployeeIdList = enterpriseEmployeeForm.getEmployeeIdList();
|
||||
enterpriseEmployeeDao.deleteByEnterpriseAndEmployeeIdList(enterpriseId, waitDeleteEmployeeIdList);
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 企业下员工列表
|
||||
*
|
||||
*/
|
||||
public List<EnterpriseEmployeeVO> employeeList(List<Long> enterpriseIdList) {
|
||||
if (CollectionUtils.isEmpty(enterpriseIdList)) {
|
||||
return Lists.newArrayList();
|
||||
}
|
||||
return enterpriseEmployeeDao.selectByEnterpriseIdList(enterpriseIdList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询企业员工
|
||||
*
|
||||
*/
|
||||
public PageResult<EnterpriseEmployeeVO> queryPageEmployeeList(EnterpriseEmployeeQueryForm queryForm) {
|
||||
Page<?> page = SmartPageUtil.convert2PageQuery(queryForm);
|
||||
List<EnterpriseEmployeeVO> enterpriseEmployeeVOList = enterpriseEmployeeDao.queryPageEmployeeList(page, queryForm);
|
||||
for (EnterpriseEmployeeVO enterpriseEmployeeVO : enterpriseEmployeeVOList) {
|
||||
enterpriseEmployeeVO.setDepartmentName(departmentService.getDepartmentPath(enterpriseEmployeeVO.getDepartmentId()));
|
||||
}
|
||||
return SmartPageUtil.convert2PageResult(page, enterpriseEmployeeVOList);
|
||||
}
|
||||
}
|
||||
@ -1,88 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.invoice.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.annotation.Resource;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
|
||||
import net.lab1024.sa.admin.module.business.oa.invoice.service.InvoiceService;
|
||||
import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceAddForm;
|
||||
import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceQueryForm;
|
||||
import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceUpdateForm;
|
||||
import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceVO;
|
||||
import net.lab1024.sa.base.common.domain.PageResult;
|
||||
import net.lab1024.sa.base.common.domain.RequestUser;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.util.SmartRequestUtil;
|
||||
import net.lab1024.sa.base.module.support.operatelog.annotation.OperateLog;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* OA发票信息
|
||||
*
|
||||
* @Author 1024创新实验室: 善逸
|
||||
* @Date 2022-06-23 19:32:59
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
@Tag(name = AdminSwaggerTagConst.Business.OA_INVOICE)
|
||||
public class InvoiceController {
|
||||
|
||||
@Resource
|
||||
private InvoiceService invoiceService;
|
||||
|
||||
@Operation(summary = "分页查询发票信息 @author 善逸")
|
||||
@PostMapping("/oa/invoice/page/query")
|
||||
@SaCheckPermission("oa:invoice:query")
|
||||
public ResponseDTO<PageResult<InvoiceVO>> queryByPage(@RequestBody @Valid InvoiceQueryForm queryForm) {
|
||||
return invoiceService.queryByPage(queryForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "查询发票信息详情 @author 善逸")
|
||||
@GetMapping("/oa/invoice/get/{invoiceId}")
|
||||
@SaCheckPermission("oa:invoice:query")
|
||||
public ResponseDTO<InvoiceVO> getDetail(@PathVariable Long invoiceId) {
|
||||
return invoiceService.getDetail(invoiceId);
|
||||
}
|
||||
|
||||
@Operation(summary = "新建发票信息 @author 善逸")
|
||||
@PostMapping("/oa/invoice/create")
|
||||
@SaCheckPermission("oa:invoice:add")
|
||||
public ResponseDTO<String> createInvoice(@RequestBody @Valid InvoiceAddForm createVO) {
|
||||
RequestUser requestUser = SmartRequestUtil.getRequestUser();
|
||||
createVO.setCreateUserId(requestUser.getUserId());
|
||||
createVO.setCreateUserName(requestUser.getUserName());
|
||||
return invoiceService.createInvoice(createVO);
|
||||
}
|
||||
|
||||
@OperateLog
|
||||
@Operation(summary = "编辑发票信息 @author 善逸")
|
||||
@PostMapping("/oa/invoice/update")
|
||||
@SaCheckPermission("oa:invoice:update")
|
||||
public ResponseDTO<String> updateInvoice(@RequestBody @Valid InvoiceUpdateForm updateVO) {
|
||||
return invoiceService.updateInvoice(updateVO);
|
||||
}
|
||||
|
||||
@Operation(summary = "删除发票信息 @author 善逸")
|
||||
@GetMapping("/invoice/delete/{invoiceId}")
|
||||
@SaCheckPermission("oa:invoice:delete")
|
||||
public ResponseDTO<String> deleteInvoice(@PathVariable Long invoiceId) {
|
||||
return invoiceService.deleteInvoice(invoiceId);
|
||||
}
|
||||
|
||||
@Operation(summary = "查询列表 @author lidoudou")
|
||||
@GetMapping("/oa/invoice/query/list/{enterpriseId}")
|
||||
@SaCheckPermission("oa:invoice:query")
|
||||
public ResponseDTO<List<InvoiceVO>> queryList(@PathVariable Long enterpriseId) {
|
||||
return invoiceService.queryList(enterpriseId);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -1,59 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.invoice.dao;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceEntity;
|
||||
import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceQueryForm;
|
||||
import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceVO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* OA发票信息
|
||||
*
|
||||
* @Author 1024创新实验室: 善逸
|
||||
* @Date 2022-06-23 19:32:59
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Mapper
|
||||
public interface InvoiceDao extends BaseMapper<InvoiceEntity> {
|
||||
|
||||
/**
|
||||
* 根据账号查询
|
||||
* @param enterpriseId
|
||||
* @param accountNumber
|
||||
* @param excludeInvoiceId
|
||||
* @param deletedFlag
|
||||
* @return
|
||||
*/
|
||||
InvoiceEntity queryByAccountNumber(@Param("enterpriseId") Long enterpriseId, @Param("accountNumber") String accountNumber, @Param("excludeInvoiceId") Long excludeInvoiceId, @Param("deletedFlag") Boolean deletedFlag);
|
||||
|
||||
/**
|
||||
* 删除发票信息
|
||||
*
|
||||
* @param invoiceId
|
||||
* @param deletedFlag
|
||||
*/
|
||||
void deleteInvoice(@Param("invoiceId") Long invoiceId, @Param("deletedFlag") Boolean deletedFlag);
|
||||
|
||||
/**
|
||||
* 发票信息分页查询
|
||||
*
|
||||
* @param page
|
||||
* @param queryForm
|
||||
* @return
|
||||
*/
|
||||
List<InvoiceVO> queryPage(Page page, @Param("queryForm") InvoiceQueryForm queryForm);
|
||||
|
||||
/**
|
||||
* 查询发票信息详情
|
||||
* @param invoiceId
|
||||
* @param deletedFlag
|
||||
* @return
|
||||
*/
|
||||
InvoiceVO getDetail(@Param("invoiceId") Long invoiceId, @Param("deletedFlag") Boolean deletedFlag);
|
||||
}
|
||||
@ -1,58 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.invoice.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
/**
|
||||
* OA发票信息新建
|
||||
*
|
||||
* @Author 1024创新实验室: 善逸
|
||||
* @Date 2022-06-23 19:32:59
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class InvoiceAddForm {
|
||||
|
||||
@Schema(description = "开票抬头")
|
||||
@NotBlank(message = "开票抬头不能为空")
|
||||
@Length(max = 200, message = "开票抬头最多200字符")
|
||||
private String invoiceHeads;
|
||||
|
||||
@Schema(description = "纳税人识别号")
|
||||
@NotBlank(message = "纳税人识别号不能为空")
|
||||
@Length(max = 200, message = "纳税人识别号最多200字符")
|
||||
private String taxpayerIdentificationNumber;
|
||||
|
||||
@Schema(description = "银行账户")
|
||||
@NotBlank(message = "银行账户不能为空")
|
||||
@Length(max = 200, message = "银行账户最多200字符")
|
||||
private String accountNumber;
|
||||
|
||||
@Schema(description = "开户行")
|
||||
@NotBlank(message = "开户行不能为空")
|
||||
@Length(max = 200, message = "开户行最多200字符")
|
||||
private String bankName;
|
||||
|
||||
@Schema(description = "启用状态")
|
||||
@NotNull(message = "启用状态不能为空")
|
||||
private Boolean disabledFlag;
|
||||
|
||||
@Schema(description = "备注")
|
||||
@Length(max = 500, message = "备注最多500字符")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "企业")
|
||||
@NotNull(message = "企业不能为空")
|
||||
private Long enterpriseId;
|
||||
|
||||
@Schema(description = "创建人", hidden = true)
|
||||
private Long createUserId;
|
||||
|
||||
@Schema(description = "创建人名称", hidden = true)
|
||||
private String createUserName;
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.invoice.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* OA发票信息编辑
|
||||
*
|
||||
* @Author 1024创新实验室: 善逸
|
||||
* @Date 2022-06-23 19:32:59
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class InvoiceUpdateForm extends InvoiceAddForm {
|
||||
|
||||
@Schema(description = "发票信息ID")
|
||||
@NotNull(message = "发票信息ID不能为空")
|
||||
private Long invoiceId;
|
||||
}
|
||||
@ -1,144 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.invoice.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import jakarta.annotation.Resource;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.service.EnterpriseService;
|
||||
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO;
|
||||
import net.lab1024.sa.admin.module.business.oa.invoice.dao.InvoiceDao;
|
||||
import net.lab1024.sa.admin.module.business.oa.invoice.domain.*;
|
||||
import net.lab1024.sa.base.common.domain.PageResult;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.util.SmartBeanUtil;
|
||||
import net.lab1024.sa.base.common.util.SmartPageUtil;
|
||||
import net.lab1024.sa.base.module.support.datatracer.constant.DataTracerConst;
|
||||
import net.lab1024.sa.base.module.support.datatracer.constant.DataTracerTypeEnum;
|
||||
import net.lab1024.sa.base.module.support.datatracer.service.DataTracerService;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* OA发票信息
|
||||
*
|
||||
* @Author 1024创新实验室: 善逸
|
||||
* @Date 2022-06-23 19:32:59
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class InvoiceService {
|
||||
|
||||
@Resource
|
||||
private InvoiceDao invoiceDao;
|
||||
|
||||
@Resource
|
||||
private EnterpriseService enterpriseService;
|
||||
|
||||
@Resource
|
||||
private DataTracerService dataTracerService;
|
||||
|
||||
/**
|
||||
* 分页查询发票信息
|
||||
*/
|
||||
public ResponseDTO<PageResult<InvoiceVO>> queryByPage(InvoiceQueryForm queryForm) {
|
||||
queryForm.setDeletedFlag(Boolean.FALSE);
|
||||
Page<?> page = SmartPageUtil.convert2PageQuery(queryForm);
|
||||
List<InvoiceVO> invoiceList = invoiceDao.queryPage(page, queryForm);
|
||||
PageResult<InvoiceVO> pageResult = SmartPageUtil.convert2PageResult(page, invoiceList);
|
||||
return ResponseDTO.ok(pageResult);
|
||||
}
|
||||
|
||||
public ResponseDTO<List<InvoiceVO>> queryList(Long enterpriseId) {
|
||||
InvoiceQueryForm queryForm = new InvoiceQueryForm();
|
||||
queryForm.setDeletedFlag(Boolean.FALSE);
|
||||
queryForm.setDisabledFlag(Boolean.FALSE);
|
||||
queryForm.setEnterpriseId(enterpriseId);
|
||||
List<InvoiceVO> invoiceList = invoiceDao.queryPage(null, queryForm);
|
||||
return ResponseDTO.ok(invoiceList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询发票信息详情
|
||||
*/
|
||||
public ResponseDTO<InvoiceVO> getDetail(Long invoiceId) {
|
||||
// 校验发票信息是否存在
|
||||
InvoiceVO invoiceVO = invoiceDao.getDetail(invoiceId, Boolean.FALSE);
|
||||
if (Objects.isNull(invoiceVO)) {
|
||||
return ResponseDTO.userErrorParam("发票信息不存在");
|
||||
}
|
||||
return ResponseDTO.ok(invoiceVO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新建发票信息
|
||||
*/
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public ResponseDTO<String> createInvoice(InvoiceAddForm createVO) {
|
||||
Long enterpriseId = createVO.getEnterpriseId();
|
||||
// 校验企业是否存在
|
||||
EnterpriseVO enterpriseVO = enterpriseService.getDetail(enterpriseId);
|
||||
if (Objects.isNull(enterpriseVO)) {
|
||||
return ResponseDTO.userErrorParam("企业不存在");
|
||||
}
|
||||
// 验证发票信息账号是否重复
|
||||
InvoiceEntity validateInvoice = invoiceDao.queryByAccountNumber(enterpriseId, createVO.getAccountNumber(), null, Boolean.FALSE);
|
||||
if (Objects.nonNull(validateInvoice)) {
|
||||
return ResponseDTO.userErrorParam("发票信息账号重复");
|
||||
}
|
||||
// 数据插入
|
||||
InvoiceEntity insertInvoice = SmartBeanUtil.copy(createVO, InvoiceEntity.class);
|
||||
invoiceDao.insert(insertInvoice);
|
||||
dataTracerService.addTrace(enterpriseId, DataTracerTypeEnum.OA_ENTERPRISE, "新增发票：" + DataTracerConst.HTML_BR + dataTracerService.getChangeContent(insertInvoice));
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑发票信息
|
||||
*/
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public ResponseDTO<String> updateInvoice(InvoiceUpdateForm updateVO) {
|
||||
Long enterpriseId = updateVO.getEnterpriseId();
|
||||
// 校验企业是否存在
|
||||
EnterpriseVO enterpriseVO = enterpriseService.getDetail(enterpriseId);
|
||||
if (Objects.isNull(enterpriseVO)) {
|
||||
return ResponseDTO.userErrorParam("企业不存在");
|
||||
}
|
||||
Long invoiceId = updateVO.getInvoiceId();
|
||||
// 校验发票信息是否存在
|
||||
InvoiceEntity invoiceDetail = invoiceDao.selectById(invoiceId);
|
||||
if (Objects.isNull(invoiceDetail) || invoiceDetail.getDeletedFlag()) {
|
||||
return ResponseDTO.userErrorParam("发票信息不存在");
|
||||
}
|
||||
// 验证发票信息账号是否重复
|
||||
InvoiceEntity validateInvoice = invoiceDao.queryByAccountNumber(updateVO.getEnterpriseId(), updateVO.getAccountNumber(), invoiceId, Boolean.FALSE);
|
||||
if (Objects.nonNull(validateInvoice)) {
|
||||
return ResponseDTO.userErrorParam("发票信息账号重复");
|
||||
}
|
||||
// 数据编辑
|
||||
InvoiceEntity updateInvoice = SmartBeanUtil.copy(updateVO, InvoiceEntity.class);
|
||||
invoiceDao.updateById(updateInvoice);
|
||||
dataTracerService.addTrace(enterpriseId, DataTracerTypeEnum.OA_ENTERPRISE, "更新发票：" + DataTracerConst.HTML_BR + dataTracerService.getChangeContent(invoiceDetail, updateInvoice));
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 删除发票信息
|
||||
*/
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public ResponseDTO<String> deleteInvoice(Long invoiceId) {
|
||||
// 校验发票信息是否存在
|
||||
InvoiceEntity invoiceDetail = invoiceDao.selectById(invoiceId);
|
||||
if (Objects.isNull(invoiceDetail) || invoiceDetail.getDeletedFlag()) {
|
||||
return ResponseDTO.userErrorParam("发票信息不存在");
|
||||
}
|
||||
invoiceDao.deleteInvoice(invoiceId, Boolean.TRUE);
|
||||
dataTracerService.addTrace(invoiceDetail.getEnterpriseId(), DataTracerTypeEnum.OA_ENTERPRISE, "删除发票：" + DataTracerConst.HTML_BR + dataTracerService.getChangeContent(invoiceDetail));
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
}
|
||||
@ -1,140 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.notice.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import cn.hutool.extra.servlet.JakartaServletUtil;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.annotation.Resource;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.validation.Valid;
|
||||
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.domain.form.*;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.*;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.service.NoticeEmployeeService;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.service.NoticeService;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.service.NoticeTypeService;
|
||||
import net.lab1024.sa.base.common.domain.PageResult;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.util.SmartRequestUtil;
|
||||
import net.lab1024.sa.base.module.support.operatelog.annotation.OperateLog;
|
||||
import net.lab1024.sa.base.module.support.repeatsubmit.annoation.RepeatSubmit;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 公告、通知、新闻等等
|
||||
*
|
||||
* @Author 1024创新实验室-主任: 卓大
|
||||
* @Date 2022-08-12 21:40:39
|
||||
* @Wechat 卓大1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Tag(name = AdminSwaggerTagConst.Business.OA_NOTICE)
|
||||
@RestController
|
||||
@OperateLog
|
||||
public class NoticeController {
|
||||
|
||||
@Resource
|
||||
private NoticeService noticeService;
|
||||
|
||||
@Resource
|
||||
private NoticeTypeService noticeTypeService;
|
||||
|
||||
@Resource
|
||||
private NoticeEmployeeService noticeEmployeeService;
|
||||
|
||||
// --------------------- 通知公告类型 -------------------------
|
||||
|
||||
@Operation(summary = "通知公告类型-获取全部 @author 卓大")
|
||||
@GetMapping("/oa/noticeType/getAll")
|
||||
public ResponseDTO<List<NoticeTypeVO>> getAll() {
|
||||
return ResponseDTO.ok(noticeTypeService.getAll());
|
||||
}
|
||||
|
||||
@Operation(summary = "通知公告类型-添加 @author 卓大")
|
||||
@GetMapping("/oa/noticeType/add/{name}")
|
||||
public ResponseDTO<String> add(@PathVariable String name) {
|
||||
return noticeTypeService.add(name);
|
||||
}
|
||||
|
||||
@Operation(summary = "通知公告类型-修改 @author 卓大")
|
||||
@GetMapping("/oa/noticeType/update/{noticeTypeId}/{name}")
|
||||
public ResponseDTO<String> update(@PathVariable Long noticeTypeId, @PathVariable String name) {
|
||||
return noticeTypeService.update(noticeTypeId, name);
|
||||
}
|
||||
|
||||
@Operation(summary = "通知公告类型-删除 @author 卓大")
|
||||
@GetMapping("/oa/noticeType/delete/{noticeTypeId}")
|
||||
public ResponseDTO<String> deleteNoticeType(@PathVariable Long noticeTypeId) {
|
||||
return noticeTypeService.delete(noticeTypeId);
|
||||
}
|
||||
|
||||
// --------------------- 【管理】通知公告-------------------------
|
||||
|
||||
|
||||
@Operation(summary = "【管理】通知公告-分页查询 @author 卓大")
|
||||
@PostMapping("/oa/notice/query")
|
||||
@SaCheckPermission("oa:notice:query")
|
||||
public ResponseDTO<PageResult<NoticeVO>> query(@RequestBody @Valid NoticeQueryForm queryForm) {
|
||||
return ResponseDTO.ok(noticeService.query(queryForm));
|
||||
}
|
||||
|
||||
@Operation(summary = "【管理】通知公告-添加 @author 卓大")
|
||||
@PostMapping("/oa/notice/add")
|
||||
@RepeatSubmit
|
||||
@SaCheckPermission("oa:notice:add")
|
||||
public ResponseDTO<String> add(@RequestBody @Valid NoticeAddForm addForm) {
|
||||
addForm.setCreateUserId(SmartRequestUtil.getRequestUserId());
|
||||
return noticeService.add(addForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "【管理】通知公告-更新 @author 卓大")
|
||||
@PostMapping("/oa/notice/update")
|
||||
@RepeatSubmit
|
||||
@SaCheckPermission("oa:notice:update")
|
||||
public ResponseDTO<String> update(@RequestBody @Valid NoticeUpdateForm updateForm) {
|
||||
return noticeService.update(updateForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "【管理】通知公告-更新详情 @author 卓大")
|
||||
@GetMapping("/oa/notice/getUpdateVO/{noticeId}")
|
||||
@SaCheckPermission("oa:notice:update")
|
||||
public ResponseDTO<NoticeUpdateFormVO> getUpdateFormVO(@PathVariable Long noticeId) {
|
||||
return ResponseDTO.ok(noticeService.getUpdateFormVO(noticeId));
|
||||
}
|
||||
|
||||
@Operation(summary = "【管理】通知公告-删除 @author 卓大")
|
||||
@GetMapping("/oa/notice/delete/{noticeId}")
|
||||
@SaCheckPermission("oa:notice:delete")
|
||||
public ResponseDTO<String> delete(@PathVariable Long noticeId) {
|
||||
return noticeService.delete(noticeId);
|
||||
}
|
||||
|
||||
// --------------------- 【员工】查看 通知公告 -------------------------
|
||||
|
||||
|
||||
@Operation(summary = "【员工】通知公告-查看详情 @author 卓大")
|
||||
@GetMapping("/oa/notice/employee/view/{noticeId}")
|
||||
public ResponseDTO<NoticeDetailVO> view(@PathVariable Long noticeId, HttpServletRequest request) {
|
||||
return noticeEmployeeService.view(
|
||||
SmartRequestUtil.getRequestUserId(),
|
||||
noticeId,
|
||||
JakartaServletUtil.getClientIP(request),
|
||||
request.getHeader("User-Agent")
|
||||
);
|
||||
}
|
||||
|
||||
@Operation(summary = "【员工】通知公告-查询全部 @author 卓大")
|
||||
@PostMapping("/oa/notice/employee/query")
|
||||
public ResponseDTO<PageResult<NoticeEmployeeVO>> queryEmployeeNotice(@RequestBody @Valid NoticeEmployeeQueryForm noticeEmployeeQueryForm) {
|
||||
return noticeEmployeeService.queryList(SmartRequestUtil.getRequestUserId(), noticeEmployeeQueryForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "【员工】通知公告-查询 查看记录 @author 卓大")
|
||||
@PostMapping("/oa/notice/employee/queryViewRecord")
|
||||
public ResponseDTO<PageResult<NoticeViewRecordVO>> queryViewRecord(@RequestBody @Valid NoticeViewRecordQueryForm noticeViewRecordQueryForm) {
|
||||
return ResponseDTO.ok(noticeEmployeeService.queryViewRecord(noticeViewRecordQueryForm));
|
||||
}
|
||||
}
|
||||
@ -1,78 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.notice.domain.form;
|
||||
|
||||
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.Valid;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
import net.lab1024.sa.base.common.json.deserializer.FileKeyVoDeserializer;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 通知公告 添加表单
|
||||
*
|
||||
* @Author 1024创新实验室-主任: 卓大
|
||||
* @Date 2022-08-12 21:40:39
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class NoticeAddForm {
|
||||
|
||||
@Schema(description = "标题")
|
||||
@NotBlank(message = "标题不能为空")
|
||||
@Length(max = 200, message = "标题最多200字符")
|
||||
private String title;
|
||||
|
||||
@Schema(description = "分类")
|
||||
@NotNull(message = "分类不能为空")
|
||||
private Long noticeTypeId;
|
||||
|
||||
@Schema(description = "是否全部可见")
|
||||
@NotNull(message = "是否全部可见不能为空")
|
||||
private Boolean allVisibleFlag;
|
||||
|
||||
@Schema(description = "是否定时发布")
|
||||
@NotNull(message = "是否定时发布不能为空")
|
||||
private Boolean scheduledPublishFlag;
|
||||
|
||||
@Schema(description = "发布时间")
|
||||
@NotNull(message = "发布时间不能为空")
|
||||
private LocalDateTime publishTime;
|
||||
|
||||
@Schema(description = "纯文本内容")
|
||||
@NotNull(message = "文本内容不能为空")
|
||||
private String contentText;
|
||||
|
||||
@Schema(description = "html内容")
|
||||
@NotNull(message = "html内容不能为空")
|
||||
private String contentHtml;
|
||||
|
||||
@Schema(description = "附件,多个英文逗号分隔|可选")
|
||||
@Length(max = 1000, message = "最多1000字符")
|
||||
@JsonDeserialize(using = FileKeyVoDeserializer.class)
|
||||
private String attachment;
|
||||
|
||||
@Schema(description = "作者")
|
||||
@NotBlank(message = "作者不能为空")
|
||||
private String author;
|
||||
|
||||
@Schema(description = "来源")
|
||||
@NotBlank(message = "标题不能为空")
|
||||
private String source;
|
||||
|
||||
@Schema(description = "文号")
|
||||
private String documentNumber;
|
||||
|
||||
@Schema(hidden = true)
|
||||
private Long createUserId;
|
||||
|
||||
@Schema(description = "可见范围设置|可选")
|
||||
@Valid
|
||||
private List<NoticeVisibleRangeForm> visibleRangeList;
|
||||
}
|
||||
@ -1,23 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.notice.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 通知公告 更新表单
|
||||
*
|
||||
* @Author 1024创新实验室-主任: 卓大
|
||||
* @Date 2022-08-12 21:40:39
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class NoticeUpdateForm extends NoticeAddForm {
|
||||
|
||||
@Schema(description = "id")
|
||||
@NotNull(message = "通知id不能为空")
|
||||
private Long noticeId;
|
||||
|
||||
}
|
||||
@ -1,31 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.notice.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
import net.lab1024.sa.base.common.domain.PageParam;
|
||||
|
||||
/**
|
||||
* 通知公告 阅读记录查询
|
||||
*
|
||||
* @Author 1024创新实验室-主任: 卓大
|
||||
* @Date 2022-08-12 21:40:39
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class NoticeViewRecordQueryForm extends PageParam {
|
||||
|
||||
@Schema(description = "通知公告id")
|
||||
@NotNull(message = "通知公告id不能为空")
|
||||
private Long noticeId;
|
||||
|
||||
@Schema(description = "部门id")
|
||||
private Long departmentId;
|
||||
|
||||
@Schema(description = "关键字")
|
||||
private String keywords;
|
||||
|
||||
|
||||
}
|
||||
@ -1,33 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.notice.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.constant.NoticeVisibleRangeDataTypeEnum;
|
||||
import net.lab1024.sa.base.common.swagger.SchemaEnum;
|
||||
import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
|
||||
|
||||
/**
|
||||
* 通知公告 可见范围数据
|
||||
*
|
||||
* @Author 1024创新实验室-主任: 卓大
|
||||
* @Date 2022-08-12 21:40:39
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class NoticeVisibleRangeForm {
|
||||
|
||||
@SchemaEnum(NoticeVisibleRangeDataTypeEnum.class)
|
||||
@CheckEnum(value = NoticeVisibleRangeDataTypeEnum.class, required = true, message = "数据类型错误")
|
||||
private Integer dataType;
|
||||
|
||||
@Schema(description = "员工/部门id")
|
||||
@NotNull(message = "员工/部门id不能为空")
|
||||
private Long dataId;
|
||||
}
|
||||
@ -1,84 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.notice.domain.vo;
|
||||
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
import net.lab1024.sa.base.common.json.serializer.FileKeyVoSerializer;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 通知公告 详情
|
||||
*
|
||||
* @Author 1024创新实验室-主任: 卓大
|
||||
* @Date 2022-08-12 21:40:39
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class NoticeDetailVO {
|
||||
|
||||
@Schema(description = "id")
|
||||
private Long noticeId;
|
||||
|
||||
@Schema(description = "标题")
|
||||
private String title;
|
||||
|
||||
@Schema(description = "分类")
|
||||
private Long noticeTypeId;
|
||||
|
||||
@Schema(description = "分类名称")
|
||||
private Long noticeTypeName;
|
||||
|
||||
@Schema(description = "是否全部可见")
|
||||
@NotNull(message = "是否全部可见不能为空")
|
||||
private Boolean allVisibleFlag;
|
||||
|
||||
@Schema(description = "是否定时发布")
|
||||
@NotNull(message = "是否定时发布不能为空")
|
||||
private Boolean scheduledPublishFlag;
|
||||
|
||||
@Schema(description = "纯文本内容")
|
||||
private String contentText;
|
||||
|
||||
@Schema(description = "html内容")
|
||||
private String contentHtml;
|
||||
|
||||
@Schema(description = "附件")
|
||||
@JsonSerialize(using = FileKeyVoSerializer.class)
|
||||
private String attachment;
|
||||
|
||||
@Schema(description = "发布时间")
|
||||
@NotNull(message = "发布时间不能为空")
|
||||
private LocalDateTime publishTime;
|
||||
|
||||
@Schema(description = "作者")
|
||||
@NotBlank(message = "作者不能为空")
|
||||
private String author;
|
||||
|
||||
@Schema(description = "来源")
|
||||
@NotBlank(message = "标题不能为空")
|
||||
private String source;
|
||||
|
||||
@Schema(description = "文号")
|
||||
private String documentNumber;
|
||||
|
||||
@Schema(description = "页面浏览量")
|
||||
private Integer pageViewCount;
|
||||
|
||||
@Schema(description = "用户浏览量")
|
||||
private Integer userViewCount;
|
||||
|
||||
@Schema(description = "创建人名称")
|
||||
private Long createUserName;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
@Schema(description = "更新时间")
|
||||
private LocalDateTime updateTime;
|
||||
|
||||
}
|
||||
@ -1,72 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.notice.domain.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
|
||||
/**
|
||||
* 新闻、公告 VO
|
||||
*
|
||||
* @Author 1024创新实验室-主任: 卓大
|
||||
* @Date 2022-08-12 21:40:39
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class NoticeVO {
|
||||
|
||||
@Schema(description = "id")
|
||||
private Long noticeId;
|
||||
|
||||
@Schema(description = "标题")
|
||||
private String title;
|
||||
|
||||
@Schema(description = "分类")
|
||||
private Long noticeTypeId;
|
||||
|
||||
@Schema(description = "分类名称")
|
||||
private String noticeTypeName;
|
||||
|
||||
@Schema(description = "是否全部可见")
|
||||
private Boolean allVisibleFlag;
|
||||
|
||||
@Schema(description = "是否定时发布")
|
||||
private Boolean scheduledPublishFlag;
|
||||
|
||||
@Schema(description = "发布状态")
|
||||
private Boolean publishFlag;
|
||||
|
||||
@Schema(description = "发布时间")
|
||||
private LocalDateTime publishTime;
|
||||
|
||||
@Schema(description = "作者")
|
||||
private String author;
|
||||
|
||||
@Schema(description = "来源")
|
||||
private String source;
|
||||
|
||||
@Schema(description = "文号")
|
||||
private String documentNumber;
|
||||
|
||||
@Schema(description = "页面浏览量")
|
||||
private Integer pageViewCount;
|
||||
|
||||
@Schema(description = "用户浏览量")
|
||||
private Integer userViewCount;
|
||||
|
||||
@Schema(description = "删除标识")
|
||||
private Boolean deletedFlag;
|
||||
|
||||
@Schema(description = "创建人名称")
|
||||
private String createUserName;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
@Schema(description = "更新时间")
|
||||
private LocalDateTime updateTime;
|
||||
|
||||
}
|
||||
@ -1,62 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.notice.manager;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.dao.NoticeDao;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.domain.entity.NoticeEntity;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeVisibleRangeForm;
|
||||
import net.lab1024.sa.base.module.support.datatracer.constant.DataTracerTypeEnum;
|
||||
import net.lab1024.sa.base.module.support.datatracer.service.DataTracerService;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 通知、公告 manager
|
||||
*
|
||||
* @Author 1024创新实验室-主任: 卓大
|
||||
* @Date 2022-08-12 21:40:39
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Service
|
||||
public class NoticeManager {
|
||||
|
||||
@Resource
|
||||
private NoticeDao noticeDao;
|
||||
|
||||
@Resource
|
||||
private DataTracerService dataTracerService;
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*/
|
||||
@Transactional(rollbackFor = Throwable.class)
|
||||
public void save(NoticeEntity noticeEntity, List<NoticeVisibleRangeForm> visibleRangeFormList) {
|
||||
noticeDao.insert(noticeEntity);
|
||||
Long noticeId = noticeEntity.getNoticeId();
|
||||
// 保存可见范围
|
||||
if (CollectionUtils.isNotEmpty(visibleRangeFormList)) {
|
||||
noticeDao.insertVisibleRange(noticeId, visibleRangeFormList);
|
||||
}
|
||||
dataTracerService.insert(noticeId, DataTracerTypeEnum.OA_NOTICE);
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新
|
||||
*
|
||||
*/
|
||||
@Transactional(rollbackFor = Throwable.class)
|
||||
public void update(NoticeEntity old, NoticeEntity noticeEntity, List<NoticeVisibleRangeForm> visibleRangeList) {
|
||||
noticeDao.updateById(noticeEntity);
|
||||
Long noticeId = noticeEntity.getNoticeId();
|
||||
// 保存可见范围
|
||||
if (CollectionUtils.isNotEmpty(visibleRangeList)) {
|
||||
noticeDao.deleteVisibleRange(noticeId);
|
||||
noticeDao.insertVisibleRange(noticeId, visibleRangeList);
|
||||
}
|
||||
dataTracerService.update(noticeId, DataTracerTypeEnum.OA_NOTICE, old, noticeEntity);
|
||||
}
|
||||
}
|
||||
@ -1,155 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.notice.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.google.common.collect.Lists;
|
||||
import jakarta.annotation.Resource;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.constant.NoticeVisibleRangeDataTypeEnum;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.dao.NoticeDao;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeEmployeeQueryForm;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeViewRecordQueryForm;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.*;
|
||||
import net.lab1024.sa.admin.module.system.department.service.DepartmentService;
|
||||
import net.lab1024.sa.admin.module.system.employee.domain.entity.EmployeeEntity;
|
||||
import net.lab1024.sa.admin.module.system.employee.service.EmployeeService;
|
||||
import net.lab1024.sa.base.common.domain.PageResult;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.util.SmartBeanUtil;
|
||||
import net.lab1024.sa.base.common.util.SmartPageUtil;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
|
||||
/**
|
||||
* 员工查看 通知。公告
|
||||
*
|
||||
* @Author 1024创新实验室-主任: 卓大
|
||||
* @Date 2022-08-12 21:40:39
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Service
|
||||
public class NoticeEmployeeService {
|
||||
|
||||
@Resource
|
||||
private NoticeDao noticeDao;
|
||||
|
||||
@Resource
|
||||
private NoticeService noticeService;
|
||||
|
||||
@Resource
|
||||
private DepartmentService departmentService;
|
||||
|
||||
@Resource
|
||||
private EmployeeService employeeService;
|
||||
|
||||
/**
|
||||
* 查询我的 通知、公告清单
|
||||
*/
|
||||
public ResponseDTO<PageResult<NoticeEmployeeVO>> queryList(Long requestEmployeeId, NoticeEmployeeQueryForm noticeEmployeeQueryForm) {
|
||||
Page<?> page = SmartPageUtil.convert2PageQuery(noticeEmployeeQueryForm);
|
||||
|
||||
List<Long> employeeDepartmentIdList = Lists.newArrayList();
|
||||
EmployeeEntity employeeEntity = employeeService.getById(requestEmployeeId);
|
||||
// 如果不是管理员 则获取请求人的 部门及其子部门
|
||||
if (!employeeEntity.getAdministratorFlag() && employeeEntity.getDepartmentId() != null) {
|
||||
employeeDepartmentIdList = departmentService.selfAndChildrenIdList(employeeEntity.getDepartmentId());
|
||||
}
|
||||
|
||||
List<NoticeEmployeeVO> noticeList = null;
|
||||
//只查询未读的
|
||||
if (noticeEmployeeQueryForm.getNotViewFlag() != null && noticeEmployeeQueryForm.getNotViewFlag()) {
|
||||
noticeList = noticeDao.queryEmployeeNotViewNotice(page,
|
||||
requestEmployeeId,
|
||||
noticeEmployeeQueryForm,
|
||||
employeeDepartmentIdList,
|
||||
false,
|
||||
employeeEntity.getAdministratorFlag(),
|
||||
NoticeVisibleRangeDataTypeEnum.DEPARTMENT.getValue(),
|
||||
NoticeVisibleRangeDataTypeEnum.EMPLOYEE.getValue());
|
||||
} else {
|
||||
// 查询全部
|
||||
noticeList = noticeDao.queryEmployeeNotice(page,
|
||||
requestEmployeeId,
|
||||
noticeEmployeeQueryForm,
|
||||
employeeDepartmentIdList,
|
||||
false,
|
||||
employeeEntity.getAdministratorFlag(),
|
||||
NoticeVisibleRangeDataTypeEnum.DEPARTMENT.getValue(),
|
||||
NoticeVisibleRangeDataTypeEnum.EMPLOYEE.getValue());
|
||||
}
|
||||
// 设置发布日期
|
||||
noticeList.forEach(notice -> notice.setPublishDate(notice.getPublishTime().toLocalDate()));
|
||||
|
||||
return ResponseDTO.ok(SmartPageUtil.convert2PageResult(page, noticeList));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 查询我的 待查看的 通知、公告清单
|
||||
*/
|
||||
public ResponseDTO<NoticeDetailVO> view(Long requestEmployeeId, Long noticeId, String ip, String userAgent) {
|
||||
NoticeUpdateFormVO updateFormVO = noticeService.getUpdateFormVO(noticeId);
|
||||
if (updateFormVO == null || Boolean.TRUE.equals(updateFormVO.getDeletedFlag())) {
|
||||
return ResponseDTO.userErrorParam("通知公告不存在");
|
||||
}
|
||||
|
||||
EmployeeEntity employeeEntity = employeeService.getById(requestEmployeeId);
|
||||
if (!updateFormVO.getAllVisibleFlag() && !checkVisibleRange(updateFormVO.getVisibleRangeList(), requestEmployeeId, employeeEntity.getDepartmentId())) {
|
||||
return ResponseDTO.userErrorParam("对不起，您没有权限查看内容");
|
||||
}
|
||||
|
||||
NoticeDetailVO noticeDetailVO = SmartBeanUtil.copy(updateFormVO, NoticeDetailVO.class);
|
||||
long viewCount = noticeDao.viewRecordCount(noticeId, requestEmployeeId);
|
||||
if (viewCount == 0) {
|
||||
noticeDao.insertViewRecord(noticeId, requestEmployeeId, ip, userAgent, 1);
|
||||
// 该员工对于这个通知是第一次查看 页面浏览量+1 用户浏览量+1
|
||||
noticeDao.updateViewCount(noticeId, 1, 1);
|
||||
noticeDetailVO.setPageViewCount(noticeDetailVO.getPageViewCount() + 1);
|
||||
noticeDetailVO.setUserViewCount(noticeDetailVO.getUserViewCount() + 1);
|
||||
} else {
|
||||
noticeDao.updateViewRecord(noticeId, requestEmployeeId, ip, userAgent);
|
||||
// 该员工对于这个通知不是第一次查看 页面浏览量+1 用户浏览量+0
|
||||
noticeDao.updateViewCount(noticeId, 1, 0);
|
||||
noticeDetailVO.setPageViewCount(noticeDetailVO.getPageViewCount() + 1);
|
||||
}
|
||||
|
||||
return ResponseDTO.ok(noticeDetailVO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验是否有查看权限的范围
|
||||
*
|
||||
*/
|
||||
public boolean checkVisibleRange(List<NoticeVisibleRangeVO> visibleRangeList, Long employeeId, Long departmentId) {
|
||||
// 员工范围
|
||||
boolean anyMatch = visibleRangeList.stream().anyMatch(e -> NoticeVisibleRangeDataTypeEnum.EMPLOYEE.equalsValue(e.getDataType()) && Objects.equals(e.getDataId(), employeeId));
|
||||
if (anyMatch) {
|
||||
return true;
|
||||
}
|
||||
|
||||
//部门范围
|
||||
List<Long> visibleDepartmentIdList = visibleRangeList.stream().filter(e -> NoticeVisibleRangeDataTypeEnum.DEPARTMENT.equalsValue(e.getDataType()))
|
||||
.map(NoticeVisibleRangeVO::getDataId).collect(Collectors.toList());
|
||||
|
||||
for (Long visibleDepartmentId : visibleDepartmentIdList) {
|
||||
List<Long> departmentIdList = departmentService.selfAndChildrenIdList(visibleDepartmentId);
|
||||
if (departmentIdList.contains(departmentId)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询 查看记录
|
||||
*/
|
||||
public PageResult<NoticeViewRecordVO> queryViewRecord(NoticeViewRecordQueryForm noticeViewRecordQueryForm) {
|
||||
Page<?> page = SmartPageUtil.convert2PageQuery(noticeViewRecordQueryForm);
|
||||
List<NoticeViewRecordVO> noticeViewRecordList = noticeDao.queryNoticeViewRecordList(page, noticeViewRecordQueryForm);
|
||||
return SmartPageUtil.convert2PageResult(page, noticeViewRecordList);
|
||||
}
|
||||
}
|
||||
@ -1,240 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.notice.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.google.common.collect.Maps;
|
||||
import jakarta.annotation.Resource;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.constant.NoticeVisibleRangeDataTypeEnum;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.dao.NoticeDao;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.domain.entity.NoticeEntity;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeAddForm;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeQueryForm;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeUpdateForm;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeVisibleRangeForm;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeTypeVO;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeUpdateFormVO;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeVO;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeVisibleRangeVO;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.manager.NoticeManager;
|
||||
import net.lab1024.sa.admin.module.system.department.dao.DepartmentDao;
|
||||
import net.lab1024.sa.admin.module.system.department.domain.entity.DepartmentEntity;
|
||||
import net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentVO;
|
||||
import net.lab1024.sa.admin.module.system.department.service.DepartmentService;
|
||||
import net.lab1024.sa.admin.module.system.employee.dao.EmployeeDao;
|
||||
import net.lab1024.sa.admin.module.system.employee.domain.entity.EmployeeEntity;
|
||||
import net.lab1024.sa.base.common.constant.StringConst;
|
||||
import net.lab1024.sa.base.common.domain.PageResult;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.util.SmartBeanUtil;
|
||||
import net.lab1024.sa.base.common.util.SmartPageUtil;
|
||||
import net.lab1024.sa.base.module.support.datatracer.constant.DataTracerTypeEnum;
|
||||
import net.lab1024.sa.base.module.support.datatracer.service.DataTracerService;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 通知。公告 后台管理业务
|
||||
*
|
||||
* @Author 1024创新实验室-主任: 卓大
|
||||
* @Date 2022-08-12 21:40:39
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Service
|
||||
public class NoticeService {
|
||||
|
||||
@Resource
|
||||
private NoticeDao noticeDao;
|
||||
|
||||
@Resource
|
||||
private NoticeManager noticeManager;
|
||||
|
||||
@Resource
|
||||
private EmployeeDao employeeDao;
|
||||
|
||||
@Resource
|
||||
private DepartmentDao departmentDao;
|
||||
|
||||
@Resource
|
||||
private DepartmentService departmentService;
|
||||
|
||||
@Resource
|
||||
private NoticeTypeService noticeTypeService;
|
||||
|
||||
@Resource
|
||||
private DataTracerService dataTracerService;
|
||||
|
||||
/**
|
||||
* 查询 通知、公告
|
||||
*
|
||||
*/
|
||||
public PageResult<NoticeVO> query(NoticeQueryForm queryForm) {
|
||||
Page<?> page = SmartPageUtil.convert2PageQuery(queryForm);
|
||||
List<NoticeVO> list = noticeDao.query(page, queryForm);
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
list.forEach(e -> e.setPublishFlag(e.getPublishTime().isBefore(now)));
|
||||
return SmartPageUtil.convert2PageResult(page, list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*/
|
||||
public ResponseDTO<String> add(NoticeAddForm addForm) {
|
||||
// 校验并获取可见范围
|
||||
ResponseDTO<String> validate = this.checkAndBuildVisibleRange(addForm);
|
||||
if (!validate.getOk()) {
|
||||
return ResponseDTO.error(validate);
|
||||
}
|
||||
|
||||
// build 资讯
|
||||
NoticeEntity noticeEntity = SmartBeanUtil.copy(addForm, NoticeEntity.class);
|
||||
// 发布时间：不是定时发布时 默认为 当前
|
||||
if (!addForm.getScheduledPublishFlag()) {
|
||||
noticeEntity.setPublishTime(LocalDateTime.now());
|
||||
}
|
||||
// 保存数据
|
||||
noticeManager.save(noticeEntity, addForm.getVisibleRangeList());
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并返回可见范围
|
||||
*
|
||||
*/
|
||||
private ResponseDTO<String> checkAndBuildVisibleRange(NoticeAddForm form) {
|
||||
// 校验资讯分类
|
||||
NoticeTypeVO noticeType = noticeTypeService.getByNoticeTypeId(form.getNoticeTypeId());
|
||||
if (noticeType == null) {
|
||||
return ResponseDTO.userErrorParam("分类不存在");
|
||||
}
|
||||
|
||||
if (form.getAllVisibleFlag()) {
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/*
|
||||
* 校验可见范围
|
||||
* 非全部可见时 校验选择的员工|部门
|
||||
*/
|
||||
List<NoticeVisibleRangeForm> visibleRangeUpdateList = form.getVisibleRangeList();
|
||||
if (CollectionUtils.isEmpty(visibleRangeUpdateList)) {
|
||||
return ResponseDTO.userErrorParam("未设置可见范围");
|
||||
}
|
||||
|
||||
// 校验可见范围-> 员工
|
||||
List<Long> employeeIdList = visibleRangeUpdateList.stream()
|
||||
.filter(e -> NoticeVisibleRangeDataTypeEnum.EMPLOYEE.equalsValue(e.getDataType()))
|
||||
.map(NoticeVisibleRangeForm::getDataId)
|
||||
.distinct().collect(Collectors.toList());
|
||||
if (CollectionUtils.isNotEmpty(employeeIdList)) {
|
||||
employeeIdList = employeeIdList.stream().distinct().collect(Collectors.toList());
|
||||
List<Long> dbEmployeeIdList = employeeDao.selectBatchIds(employeeIdList).stream().map(EmployeeEntity::getEmployeeId).collect(Collectors.toList());
|
||||
Collection<Long> subtract = CollectionUtils.subtract(employeeIdList, dbEmployeeIdList);
|
||||
if (!subtract.isEmpty()) {
|
||||
return ResponseDTO.userErrorParam("员工id不存在：" + subtract);
|
||||
}
|
||||
}
|
||||
|
||||
// 校验可见范围-> 部门
|
||||
List<Long> deptIdList = visibleRangeUpdateList.stream()
|
||||
.filter(e -> NoticeVisibleRangeDataTypeEnum.DEPARTMENT.equalsValue(e.getDataType()))
|
||||
.map(NoticeVisibleRangeForm::getDataId)
|
||||
.distinct().collect(Collectors.toList());
|
||||
if (CollectionUtils.isNotEmpty(deptIdList)) {
|
||||
deptIdList = deptIdList.stream().distinct().collect(Collectors.toList());
|
||||
List<Long> dbDeptIdList = departmentDao.selectBatchIds(deptIdList).stream().map(DepartmentEntity::getDepartmentId).collect(Collectors.toList());
|
||||
Collection<Long> subtract = CollectionUtils.subtract(deptIdList, dbDeptIdList);
|
||||
if (!subtract.isEmpty()) {
|
||||
return ResponseDTO.userErrorParam("部门id不存在：" + subtract);
|
||||
}
|
||||
}
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 更新
|
||||
*
|
||||
*/
|
||||
public ResponseDTO<String> update(NoticeUpdateForm updateForm) {
|
||||
|
||||
NoticeEntity oldNoticeEntity = noticeDao.selectById(updateForm.getNoticeId());
|
||||
if (oldNoticeEntity == null) {
|
||||
return ResponseDTO.userErrorParam("通知不存在");
|
||||
}
|
||||
|
||||
// 校验并获取可见范围
|
||||
ResponseDTO<String> res = this.checkAndBuildVisibleRange(updateForm);
|
||||
if (!res.getOk()) {
|
||||
return ResponseDTO.error(res);
|
||||
}
|
||||
|
||||
// 更新
|
||||
NoticeEntity noticeEntity = SmartBeanUtil.copy(updateForm, NoticeEntity.class);
|
||||
noticeManager.update(oldNoticeEntity, noticeEntity, updateForm.getVisibleRangeList());
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*
|
||||
*/
|
||||
public ResponseDTO<String> delete(Long noticeId) {
|
||||
NoticeEntity noticeEntity = noticeDao.selectById(noticeId);
|
||||
if (null == noticeEntity || noticeEntity.getDeletedFlag()) {
|
||||
return ResponseDTO.userErrorParam("通知公告不存在");
|
||||
}
|
||||
// 更新删除状态
|
||||
noticeDao.updateDeletedFlag(noticeId);
|
||||
dataTracerService.delete(noticeId, DataTracerTypeEnum.OA_NOTICE);
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取更新表单用的详情
|
||||
*/
|
||||
public NoticeUpdateFormVO getUpdateFormVO(Long noticeId) {
|
||||
NoticeEntity noticeEntity = noticeDao.selectById(noticeId);
|
||||
if (null == noticeEntity) {
|
||||
return null;
|
||||
}
|
||||
|
||||
NoticeUpdateFormVO updateFormVO = SmartBeanUtil.copy(noticeEntity, NoticeUpdateFormVO.class);
|
||||
NoticeTypeVO noticeType = noticeTypeService.getByNoticeTypeId(noticeEntity.getNoticeTypeId());
|
||||
updateFormVO.setNoticeTypeName(noticeType.getNoticeTypeName());
|
||||
updateFormVO.setPublishFlag(updateFormVO.getPublishTime() != null && updateFormVO.getPublishTime().isBefore(LocalDateTime.now()));
|
||||
|
||||
if (!updateFormVO.getAllVisibleFlag()) {
|
||||
List<NoticeVisibleRangeVO> noticeVisibleRangeList = noticeDao.queryVisibleRange(noticeId);
|
||||
List<Long> employeeIdList = noticeVisibleRangeList.stream().filter(e -> NoticeVisibleRangeDataTypeEnum.EMPLOYEE.getValue().equals(e.getDataType()))
|
||||
.map(NoticeVisibleRangeVO::getDataId)
|
||||
.collect(Collectors.toList());
|
||||
|
||||
Map<Long, EmployeeEntity> employeeMap = null;
|
||||
if (CollectionUtils.isNotEmpty(employeeIdList)) {
|
||||
employeeMap = employeeDao.selectBatchIds(employeeIdList).stream().collect(Collectors.toMap(EmployeeEntity::getEmployeeId, Function.identity()));
|
||||
} else {
|
||||
employeeMap = Maps.newHashMap();
|
||||
}
|
||||
for (NoticeVisibleRangeVO noticeVisibleRange : noticeVisibleRangeList) {
|
||||
if (noticeVisibleRange.getDataType().equals(NoticeVisibleRangeDataTypeEnum.EMPLOYEE.getValue())) {
|
||||
EmployeeEntity employeeEntity = employeeMap.get(noticeVisibleRange.getDataId());
|
||||
noticeVisibleRange.setDataName(employeeEntity == null ? StringConst.EMPTY : employeeEntity.getActualName());
|
||||
} else {
|
||||
DepartmentVO departmentVO = departmentService.getDepartmentById(noticeVisibleRange.getDataId());
|
||||
noticeVisibleRange.setDataName(departmentVO == null ? StringConst.EMPTY : departmentVO.getDepartmentName());
|
||||
}
|
||||
}
|
||||
updateFormVO.setVisibleRangeList(noticeVisibleRangeList);
|
||||
}
|
||||
return updateFormVO;
|
||||
}
|
||||
}
|
||||
@ -1,87 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.business.oa.notice.service;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import jakarta.annotation.Resource;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.dao.NoticeTypeDao;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.domain.entity.NoticeTypeEntity;
|
||||
import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeTypeVO;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.util.SmartBeanUtil;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 通知。公告 类型
|
||||
*
|
||||
* @Author 1024创新实验室-主任: 卓大
|
||||
* @Date 2022-08-12 21:40:39
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Service
|
||||
public class NoticeTypeService {
|
||||
|
||||
@Resource
|
||||
private NoticeTypeDao noticeTypeDao;
|
||||
|
||||
/**
|
||||
* 查询全部
|
||||
* @return
|
||||
*/
|
||||
public List<NoticeTypeVO> getAll() {
|
||||
return SmartBeanUtil.copyList(noticeTypeDao.selectList(null), NoticeTypeVO.class);
|
||||
}
|
||||
|
||||
public NoticeTypeVO getByNoticeTypeId(Long noticceTypeId) {
|
||||
return SmartBeanUtil.copy(noticeTypeDao.selectById(noticceTypeId), NoticeTypeVO.class);
|
||||
}
|
||||
|
||||
public synchronized ResponseDTO<String> add(String name) {
|
||||
if (StrUtil.isBlank(name)) {
|
||||
return ResponseDTO.userErrorParam("类型名称不能为空");
|
||||
}
|
||||
|
||||
List<NoticeTypeEntity> noticeTypeEntityList = noticeTypeDao.selectList(null);
|
||||
if (!CollectionUtils.isEmpty(noticeTypeEntityList)) {
|
||||
boolean exist = noticeTypeEntityList.stream().map(NoticeTypeEntity::getNoticeTypeName).collect(Collectors.toSet()).contains(name);
|
||||
if (exist) {
|
||||
return ResponseDTO.userErrorParam("类型名称已经存在");
|
||||
}
|
||||
}
|
||||
noticeTypeDao.insert(NoticeTypeEntity.builder().noticeTypeName(name).build());
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
public synchronized ResponseDTO<String> update(Long noticeTypeId, String name) {
|
||||
if (StrUtil.isBlank(name)) {
|
||||
return ResponseDTO.userErrorParam("类型名称不能为空");
|
||||
}
|
||||
|
||||
NoticeTypeEntity noticeTypeEntity = noticeTypeDao.selectById(noticeTypeId);
|
||||
if (noticeTypeEntity == null) {
|
||||
return ResponseDTO.userErrorParam("类型名称不存在");
|
||||
}
|
||||
|
||||
List<NoticeTypeEntity> noticeTypeEntityList = noticeTypeDao.selectList(null);
|
||||
if (!CollectionUtils.isEmpty(noticeTypeEntityList)) {
|
||||
Optional<NoticeTypeEntity> optionalNoticeTypeEntity = noticeTypeEntityList.stream().filter(e -> e.getNoticeTypeName().equals(name)).findFirst();
|
||||
if (optionalNoticeTypeEntity.isPresent() && !optionalNoticeTypeEntity.get().getNoticeTypeId().equals(noticeTypeId)) {
|
||||
return ResponseDTO.userErrorParam("类型名称已经存在");
|
||||
}
|
||||
}
|
||||
noticeTypeEntity.setNoticeTypeName(name);
|
||||
noticeTypeDao.updateById(noticeTypeEntity);
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
public synchronized ResponseDTO<String> delete(Long noticeTypeId) {
|
||||
noticeTypeDao.deleteById(noticeTypeId);
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,186 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.datascope;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.google.common.collect.Maps;
|
||||
import jakarta.annotation.Resource;
|
||||
import net.lab1024.sa.admin.module.system.datascope.domain.DataScopeSqlConfig;
|
||||
import net.lab1024.sa.admin.module.system.datascope.service.DataScopeSqlConfigService;
|
||||
import net.lab1024.sa.base.common.domain.DataScopePlugin;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.ibatis.mapping.*;
|
||||
import org.apache.ibatis.plugin.Intercepts;
|
||||
import org.apache.ibatis.plugin.Invocation;
|
||||
import org.apache.ibatis.plugin.Plugin;
|
||||
import org.apache.ibatis.plugin.Signature;
|
||||
import org.apache.ibatis.session.ResultHandler;
|
||||
import org.apache.ibatis.session.RowBounds;
|
||||
import org.springframework.context.ApplicationContext;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Properties;
|
||||
|
||||
/**
|
||||
* mybaits sql 拦截
|
||||
*
|
||||
* @Author 1024创新实验室: 罗伊
|
||||
* @Date 2022-03-18 20:59:17
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Intercepts({@Signature(type = org.apache.ibatis.executor.Executor.class, method = "query", args = {MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class})})
|
||||
@Component
|
||||
public class MyBatisPlugin extends DataScopePlugin {
|
||||
|
||||
@Resource
|
||||
private ApplicationContext applicationContext;
|
||||
|
||||
@Override
|
||||
public Object intercept(Invocation invocation) throws Throwable {
|
||||
|
||||
MappedStatement mappedStatement = (MappedStatement) invocation.getArgs()[0];
|
||||
Object parameter = invocation.getArgs()[1];
|
||||
|
||||
BoundSql boundSql = mappedStatement.getBoundSql(parameter);
|
||||
String originalSql = boundSql.getSql().trim();
|
||||
String id = mappedStatement.getId();
|
||||
List<String> methodStrList = StrUtil.split(id, ".");
|
||||
String path = methodStrList.get(methodStrList.size() - 2) + "." + methodStrList.get(methodStrList.size() - 1);
|
||||
DataScopeSqlConfigService dataScopeSqlConfigService = this.dataScopeSqlConfigService();
|
||||
if (dataScopeSqlConfigService == null) {
|
||||
return invocation.proceed();
|
||||
}
|
||||
DataScopeSqlConfig sqlConfigDTO = dataScopeSqlConfigService.getSqlConfig(path);
|
||||
if (sqlConfigDTO != null) {
|
||||
Map<String, Object> paramMap = this.getParamList(sqlConfigDTO.getParamName(), parameter);
|
||||
BoundSql newBoundSql = copyFromBoundSql(mappedStatement, boundSql, this.joinSql(originalSql, paramMap, sqlConfigDTO));
|
||||
ParameterMap map = mappedStatement.getParameterMap();
|
||||
MappedStatement newMs = copyFromMappedStatement(mappedStatement, new BoundSqlSqlSource(newBoundSql), map);
|
||||
invocation.getArgs()[0] = newMs;
|
||||
}
|
||||
|
||||
Object obj = invocation.proceed();
|
||||
return obj;
|
||||
}
|
||||
|
||||
|
||||
private Map<String, Object> getParamList(String paramName, Object parameter) {
|
||||
Map<String, Object> paramMap = Maps.newHashMap();
|
||||
if (StringUtils.isEmpty(paramName)) {
|
||||
return paramMap;
|
||||
}
|
||||
if (parameter == null) {
|
||||
return paramMap;
|
||||
}
|
||||
if (parameter instanceof Map) {
|
||||
String[] paramNameArray = paramName.split(",");
|
||||
Map<?, ?> parameterMap = (Map) parameter;
|
||||
for (String param : paramNameArray) {
|
||||
if(parameterMap.containsKey(param)){
|
||||
paramMap.put(param, parameterMap.get(param));
|
||||
}
|
||||
}
|
||||
}
|
||||
return paramMap;
|
||||
}
|
||||
|
||||
private String joinSql(String sql, Map<String, Object> paramMap, DataScopeSqlConfig sqlConfigDTO) {
|
||||
if (null == sqlConfigDTO) {
|
||||
return sql;
|
||||
}
|
||||
String appendSql = this.dataScopeSqlConfigService().getJoinSql(paramMap, sqlConfigDTO);
|
||||
if (StringUtils.isEmpty(appendSql)) {
|
||||
return sql;
|
||||
}
|
||||
Integer appendSqlWhereIndex = sqlConfigDTO.getWhereIndex();
|
||||
String where = "where";
|
||||
String order = "order by";
|
||||
String group = "group by";
|
||||
int whereIndex = StringUtils.ordinalIndexOf(sql.toLowerCase(), where, appendSqlWhereIndex + 1);
|
||||
int orderIndex = sql.toLowerCase().indexOf(order);
|
||||
int groupIndex = sql.toLowerCase().indexOf(group);
|
||||
if (whereIndex > -1) {
|
||||
String subSql = sql.substring(0, whereIndex + where.length() + 1);
|
||||
subSql = subSql + " " + appendSql + " AND " + sql.substring(whereIndex + where.length() + 1);
|
||||
return subSql;
|
||||
}
|
||||
|
||||
if (groupIndex > -1) {
|
||||
String subSql = sql.substring(0, groupIndex);
|
||||
subSql = subSql + " where " + appendSql + " " + sql.substring(groupIndex);
|
||||
return subSql;
|
||||
}
|
||||
if (orderIndex > -1) {
|
||||
String subSql = sql.substring(0, orderIndex);
|
||||
subSql = subSql + " where " + appendSql + " " + sql.substring(orderIndex);
|
||||
return subSql;
|
||||
}
|
||||
sql += " where " + appendSql;
|
||||
return sql;
|
||||
}
|
||||
|
||||
public DataScopeSqlConfigService dataScopeSqlConfigService() {
|
||||
return (DataScopeSqlConfigService) applicationContext.getBean("dataScopeSqlConfigService");
|
||||
}
|
||||
|
||||
public class BoundSqlSqlSource implements SqlSource {
|
||||
|
||||
BoundSql boundSql;
|
||||
|
||||
public BoundSqlSqlSource(BoundSql boundSql) {
|
||||
this.boundSql = boundSql;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BoundSql getBoundSql(Object parameterObject) {
|
||||
return boundSql;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 复制MappedStatement对象
|
||||
*/
|
||||
private MappedStatement copyFromMappedStatement(MappedStatement ms, SqlSource newSqlSource, ParameterMap parameterMap) {
|
||||
|
||||
MappedStatement.Builder builder = new MappedStatement.Builder(ms.getConfiguration(), ms.getId(), newSqlSource, ms.getSqlCommandType());
|
||||
builder.resource(ms.getResource());
|
||||
builder.fetchSize(ms.getFetchSize());
|
||||
builder.statementType(ms.getStatementType());
|
||||
builder.keyGenerator(ms.getKeyGenerator());
|
||||
builder.timeout(ms.getTimeout());
|
||||
builder.parameterMap(parameterMap);
|
||||
builder.resultMaps(ms.getResultMaps());
|
||||
builder.resultSetType(ms.getResultSetType());
|
||||
builder.cache(ms.getCache());
|
||||
builder.flushCacheRequired(ms.isFlushCacheRequired());
|
||||
builder.useCache(ms.isUseCache());
|
||||
return builder.build();
|
||||
}
|
||||
|
||||
/**
|
||||
* 复制BoundSql对象
|
||||
*/
|
||||
private BoundSql copyFromBoundSql(MappedStatement ms, BoundSql boundSql, String sql) {
|
||||
BoundSql newBoundSql = new BoundSql(ms.getConfiguration(), sql, boundSql.getParameterMappings(), boundSql.getParameterObject());
|
||||
for (ParameterMapping mapping : boundSql.getParameterMappings()) {
|
||||
String prop = mapping.getProperty();
|
||||
if (boundSql.hasAdditionalParameter(prop)) {
|
||||
newBoundSql.setAdditionalParameter(prop, boundSql.getAdditionalParameter(prop));
|
||||
}
|
||||
}
|
||||
return newBoundSql;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object plugin(Object arg0) {
|
||||
return Plugin.wrap(arg0, this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setProperties(Properties arg0) {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,149 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.datascope.service;
|
||||
|
||||
import jakarta.annotation.PostConstruct;
|
||||
import jakarta.annotation.Resource;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import net.lab1024.sa.admin.AdminApplication;
|
||||
import net.lab1024.sa.admin.module.system.datascope.DataScope;
|
||||
import net.lab1024.sa.admin.module.system.datascope.constant.DataScopeTypeEnum;
|
||||
import net.lab1024.sa.admin.module.system.datascope.constant.DataScopeViewTypeEnum;
|
||||
import net.lab1024.sa.admin.module.system.datascope.constant.DataScopeWhereInTypeEnum;
|
||||
import net.lab1024.sa.admin.module.system.datascope.domain.DataScopeSqlConfig;
|
||||
import net.lab1024.sa.admin.module.system.datascope.strategy.AbstractDataScopeStrategy;
|
||||
import net.lab1024.sa.base.common.util.SmartRequestUtil;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.reflections.Reflections;
|
||||
import org.reflections.scanners.MethodAnnotationsScanner;
|
||||
import org.reflections.util.ClasspathHelper;
|
||||
import org.reflections.util.ConfigurationBuilder;
|
||||
import org.springframework.context.ApplicationContext;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
/**
|
||||
* sql配置
|
||||
*
|
||||
* @Author 1024创新实验室: 罗伊
|
||||
* @Date 2020/11/28 20:59:17
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Slf4j
|
||||
@Service
|
||||
public class DataScopeSqlConfigService {
|
||||
|
||||
/**
|
||||
* 注解joinsql 参数
|
||||
*/
|
||||
private static final String EMPLOYEE_PARAM = "#employeeIds";
|
||||
|
||||
private static final String DEPARTMENT_PARAM = "#departmentIds";
|
||||
|
||||
/**
|
||||
* 用于拼接查看本人数据范围的 SQL
|
||||
*/
|
||||
private static final String CREATE_USER_ID_EQUALS = "create_user_id = ";
|
||||
|
||||
private final ConcurrentHashMap<String, DataScopeSqlConfig> dataScopeMethodMap = new ConcurrentHashMap<>();
|
||||
|
||||
@Resource
|
||||
private DataScopeViewService dataScopeViewService;
|
||||
|
||||
@Resource
|
||||
private ApplicationContext applicationContext;
|
||||
|
||||
|
||||
@PostConstruct
|
||||
private void initDataScopeMethodMap() {
|
||||
this.refreshDataScopeMethodMap();
|
||||
}
|
||||
|
||||
/**
|
||||
* 刷新 所有添加数据范围注解的接口方法配置<class.method,DataScopeSqlConfigDTO></>
|
||||
*/
|
||||
private Map<String, DataScopeSqlConfig> refreshDataScopeMethodMap() {
|
||||
Reflections reflections = new Reflections(new ConfigurationBuilder().setUrls(ClasspathHelper.forPackage(AdminApplication.COMPONENT_SCAN)).setScanners(new MethodAnnotationsScanner()));
|
||||
Set<Method> methods = reflections.getMethodsAnnotatedWith(DataScope.class);
|
||||
for (Method method : methods) {
|
||||
DataScope dataScopeAnnotation = method.getAnnotation(DataScope.class);
|
||||
if (dataScopeAnnotation != null) {
|
||||
DataScopeSqlConfig configDTO = new DataScopeSqlConfig();
|
||||
configDTO.setDataScopeType(dataScopeAnnotation.dataScopeType());
|
||||
configDTO.setJoinSql(dataScopeAnnotation.joinSql());
|
||||
configDTO.setWhereIndex(dataScopeAnnotation.whereIndex());
|
||||
configDTO.setDataScopeWhereInType(dataScopeAnnotation.whereInType());
|
||||
configDTO.setParamName(dataScopeAnnotation.paramName());
|
||||
configDTO.setJoinSqlImplClazz(dataScopeAnnotation.joinSqlImplClazz());
|
||||
dataScopeMethodMap.put(method.getDeclaringClass().getSimpleName() + "." + method.getName(), configDTO);
|
||||
}
|
||||
}
|
||||
return dataScopeMethodMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据调用的方法获取，此方法的配置信息
|
||||
*/
|
||||
public DataScopeSqlConfig getSqlConfig(String method) {
|
||||
return this.dataScopeMethodMap.get(method);
|
||||
}
|
||||
|
||||
/**
|
||||
* 组装需要拼接的sql
|
||||
*/
|
||||
public String getJoinSql(Map<String, Object> paramMap, DataScopeSqlConfig sqlConfigDTO) {
|
||||
Long employeeId = SmartRequestUtil.getRequestUserId();
|
||||
if (employeeId == null) {
|
||||
return "";
|
||||
}
|
||||
|
||||
DataScopeTypeEnum dataScopeTypeEnum = sqlConfigDTO.getDataScopeType();
|
||||
DataScopeViewTypeEnum viewTypeEnum = dataScopeViewService.getEmployeeDataScopeViewType(dataScopeTypeEnum, employeeId);
|
||||
|
||||
// 数据权限设置为仅本人可见时 直接返回 create_user_id = employeeId
|
||||
if (DataScopeViewTypeEnum.ME == viewTypeEnum) {
|
||||
return CREATE_USER_ID_EQUALS + employeeId;
|
||||
}
|
||||
|
||||
String joinSql = sqlConfigDTO.getJoinSql();
|
||||
|
||||
if (DataScopeWhereInTypeEnum.CUSTOM_STRATEGY == sqlConfigDTO.getDataScopeWhereInType()) {
|
||||
Class<?> strategyClass = sqlConfigDTO.getJoinSqlImplClazz();
|
||||
if (strategyClass == null) {
|
||||
log.warn("data scope custom strategy class is null");
|
||||
return "";
|
||||
}
|
||||
AbstractDataScopeStrategy powerStrategy = (AbstractDataScopeStrategy) applicationContext.getBean(sqlConfigDTO.getJoinSqlImplClazz());
|
||||
if (powerStrategy == null) {
|
||||
log.warn("data scope custom strategy class：{} ,bean is null", sqlConfigDTO.getJoinSqlImplClazz());
|
||||
return "";
|
||||
}
|
||||
return powerStrategy.getCondition(viewTypeEnum, paramMap, sqlConfigDTO);
|
||||
}
|
||||
if (DataScopeWhereInTypeEnum.EMPLOYEE == sqlConfigDTO.getDataScopeWhereInType()) {
|
||||
List<Long> canViewEmployeeIds = dataScopeViewService.getCanViewEmployeeId(viewTypeEnum, employeeId);
|
||||
if (CollectionUtils.isEmpty(canViewEmployeeIds)) {
|
||||
return "";
|
||||
}
|
||||
String employeeIds = StringUtils.join(canViewEmployeeIds, ",");
|
||||
String sql = joinSql.replaceAll(EMPLOYEE_PARAM, employeeIds);
|
||||
return sql;
|
||||
}
|
||||
if (DataScopeWhereInTypeEnum.DEPARTMENT == sqlConfigDTO.getDataScopeWhereInType()) {
|
||||
List<Long> canViewDepartmentIds = dataScopeViewService.getCanViewDepartmentId(viewTypeEnum, employeeId);
|
||||
if (CollectionUtils.isEmpty(canViewDepartmentIds)) {
|
||||
return "";
|
||||
}
|
||||
String departmentIds = StringUtils.join(canViewDepartmentIds, ",");
|
||||
String sql = joinSql.replaceAll(DEPARTMENT_PARAM, departmentIds);
|
||||
return sql;
|
||||
}
|
||||
return "";
|
||||
}
|
||||
}
|
||||
@ -1,146 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.datascope.service;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import jakarta.annotation.Resource;
|
||||
import net.lab1024.sa.admin.module.system.datascope.constant.DataScopeTypeEnum;
|
||||
import net.lab1024.sa.admin.module.system.datascope.constant.DataScopeViewTypeEnum;
|
||||
import net.lab1024.sa.admin.module.system.department.service.DepartmentService;
|
||||
import net.lab1024.sa.admin.module.system.employee.dao.EmployeeDao;
|
||||
import net.lab1024.sa.admin.module.system.employee.domain.entity.EmployeeEntity;
|
||||
import net.lab1024.sa.admin.module.system.role.dao.RoleDataScopeDao;
|
||||
import net.lab1024.sa.admin.module.system.role.dao.RoleEmployeeDao;
|
||||
import net.lab1024.sa.admin.module.system.role.domain.entity.RoleDataScopeEntity;
|
||||
import net.lab1024.sa.base.common.util.SmartEnumUtil;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 数据范围
|
||||
*
|
||||
* @Author 1024创新实验室: 罗伊
|
||||
* @Date 2020/11/28 20:59:17
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Service
|
||||
public class DataScopeViewService {
|
||||
|
||||
@Resource
|
||||
private RoleEmployeeDao roleEmployeeDao;
|
||||
|
||||
@Resource
|
||||
private RoleDataScopeDao roleDataScopeDao;
|
||||
|
||||
@Resource
|
||||
private EmployeeDao employeeDao;
|
||||
|
||||
@Resource
|
||||
private DepartmentService departmentService;
|
||||
|
||||
/**
|
||||
* 获取某人可以查看的所有人员数据
|
||||
*/
|
||||
public List<Long> getCanViewEmployeeId(DataScopeViewTypeEnum viewType, Long employeeId) {
|
||||
if (DataScopeViewTypeEnum.ME == viewType) {
|
||||
return this.getMeEmployeeIdList(employeeId);
|
||||
}
|
||||
if (DataScopeViewTypeEnum.DEPARTMENT == viewType) {
|
||||
return this.getDepartmentEmployeeIdList(employeeId);
|
||||
}
|
||||
if (DataScopeViewTypeEnum.DEPARTMENT_AND_SUB == viewType) {
|
||||
return this.getDepartmentAndSubEmployeeIdList(employeeId);
|
||||
}
|
||||
// 可以查看所有员工数据
|
||||
return Lists.newArrayList();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取某人可以查看的所有部门数据
|
||||
*/
|
||||
public List<Long> getCanViewDepartmentId(DataScopeViewTypeEnum viewType, Long employeeId) {
|
||||
if (DataScopeViewTypeEnum.ME == viewType) {
|
||||
// 数据可见范围类型为本人时 不可以查看任何部门数据
|
||||
return Lists.newArrayList(0L);
|
||||
}
|
||||
if (DataScopeViewTypeEnum.DEPARTMENT == viewType) {
|
||||
return this.getMeDepartmentIdList(employeeId);
|
||||
}
|
||||
if (DataScopeViewTypeEnum.DEPARTMENT_AND_SUB == viewType) {
|
||||
return this.getDepartmentAndSubIdList(employeeId);
|
||||
}
|
||||
// 可以查看所有部门数据
|
||||
return Lists.newArrayList();
|
||||
}
|
||||
|
||||
public List<Long> getMeDepartmentIdList(Long employeeId) {
|
||||
EmployeeEntity employeeEntity = employeeDao.selectById(employeeId);
|
||||
return Lists.newArrayList(employeeEntity.getDepartmentId());
|
||||
}
|
||||
|
||||
public List<Long> getDepartmentAndSubIdList(Long employeeId) {
|
||||
EmployeeEntity employeeEntity = employeeDao.selectById(employeeId);
|
||||
return departmentService.selfAndChildrenIdList(employeeEntity.getDepartmentId());
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据员工id 获取各数据范围最大的可见范围 map<dataScopeType,viewType></>
|
||||
*/
|
||||
public DataScopeViewTypeEnum getEmployeeDataScopeViewType(DataScopeTypeEnum dataScopeTypeEnum, Long employeeId) {
|
||||
EmployeeEntity employeeEntity = employeeDao.selectById(employeeId);
|
||||
if (employeeEntity == null || employeeEntity.getEmployeeId() == null) {
|
||||
return DataScopeViewTypeEnum.ME;
|
||||
}
|
||||
|
||||
// 如果是超级管理员 则可查看全部
|
||||
if (employeeEntity.getAdministratorFlag()) {
|
||||
return DataScopeViewTypeEnum.ALL;
|
||||
}
|
||||
|
||||
List<Long> roleIdList = roleEmployeeDao.selectRoleIdByEmployeeId(employeeId);
|
||||
//未设置角色 默认本人
|
||||
if (CollectionUtils.isEmpty(roleIdList)) {
|
||||
return DataScopeViewTypeEnum.ME;
|
||||
}
|
||||
//未设置角色数据范围 默认本人
|
||||
List<RoleDataScopeEntity> dataScopeRoleList = roleDataScopeDao.listByRoleIdList(roleIdList);
|
||||
if (CollectionUtils.isEmpty(dataScopeRoleList)) {
|
||||
return DataScopeViewTypeEnum.ME;
|
||||
}
|
||||
Map<Integer, List<RoleDataScopeEntity>> listMap = dataScopeRoleList.stream().collect(Collectors.groupingBy(RoleDataScopeEntity::getDataScopeType));
|
||||
List<RoleDataScopeEntity> viewLevelList = listMap.getOrDefault(dataScopeTypeEnum.getValue(), Lists.newArrayList());
|
||||
if (CollectionUtils.isEmpty(viewLevelList)) {
|
||||
return DataScopeViewTypeEnum.ME;
|
||||
}
|
||||
RoleDataScopeEntity maxLevel = viewLevelList.stream().max(Comparator.comparing(e -> SmartEnumUtil.getEnumByValue(e.getViewType(), DataScopeViewTypeEnum.class).getLevel())).get();
|
||||
return SmartEnumUtil.getEnumByValue(maxLevel.getViewType(), DataScopeViewTypeEnum.class);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取本人相关 可查看员工id
|
||||
*/
|
||||
private List<Long> getMeEmployeeIdList(Long employeeId) {
|
||||
return Lists.newArrayList(employeeId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取本部门相关 可查看员工id
|
||||
*/
|
||||
private List<Long> getDepartmentEmployeeIdList(Long employeeId) {
|
||||
EmployeeEntity employeeEntity = employeeDao.selectById(employeeId);
|
||||
return employeeDao.getEmployeeIdByDepartmentId(employeeEntity.getDepartmentId(), false);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取本部门及下属子部门相关 可查看员工id
|
||||
*/
|
||||
private List<Long> getDepartmentAndSubEmployeeIdList(Long employeeId) {
|
||||
List<Long> allDepartmentIds = getDepartmentAndSubIdList(employeeId);
|
||||
return employeeDao.getEmployeeIdByDepartmentIdList(allDepartmentIds, false);
|
||||
}
|
||||
}
|
||||
@ -1,68 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.department.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.annotation.Resource;
|
||||
import jakarta.validation.Valid;
|
||||
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
|
||||
import net.lab1024.sa.admin.module.system.department.domain.form.DepartmentAddForm;
|
||||
import net.lab1024.sa.admin.module.system.department.domain.form.DepartmentUpdateForm;
|
||||
import net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentTreeVO;
|
||||
import net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentVO;
|
||||
import net.lab1024.sa.admin.module.system.department.service.DepartmentService;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 部门
|
||||
*
|
||||
* @Author 1024创新实验室-主任: 卓大
|
||||
* @Date 2022-01-12 20:37:48
|
||||
* @Wechat 卓大1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@RestController
|
||||
@Tag(name = AdminSwaggerTagConst.System.SYSTEM_DEPARTMENT)
|
||||
public class DepartmentController {
|
||||
|
||||
@Resource
|
||||
private DepartmentService departmentService;
|
||||
|
||||
@Operation(summary = "查询部门树形列表 @author 卓大")
|
||||
@GetMapping("/department/treeList")
|
||||
public ResponseDTO<List<DepartmentTreeVO>> departmentTree() {
|
||||
return departmentService.departmentTree();
|
||||
}
|
||||
|
||||
@Operation(summary = "添加部门 @author 卓大")
|
||||
@PostMapping("/department/add")
|
||||
@SaCheckPermission("system:department:add")
|
||||
public ResponseDTO<String> addDepartment(@Valid @RequestBody DepartmentAddForm createDTO) {
|
||||
return departmentService.addDepartment(createDTO);
|
||||
}
|
||||
|
||||
@Operation(summary = "更新部门 @author 卓大")
|
||||
@PostMapping("/department/update")
|
||||
@SaCheckPermission("system:department:update")
|
||||
public ResponseDTO<String> updateDepartment(@Valid @RequestBody DepartmentUpdateForm updateDTO) {
|
||||
return departmentService.updateDepartment(updateDTO);
|
||||
}
|
||||
|
||||
@Operation(summary = "删除部门 @author 卓大")
|
||||
@GetMapping("/department/delete/{departmentId}")
|
||||
@SaCheckPermission("system:department:delete")
|
||||
public ResponseDTO<String> deleteDepartment(@PathVariable Long departmentId) {
|
||||
return departmentService.deleteDepartment(departmentId);
|
||||
}
|
||||
|
||||
@Operation(summary = "查询部门列表 @author 卓大")
|
||||
@GetMapping("/department/listAll")
|
||||
public ResponseDTO<List<DepartmentVO>> listAll() {
|
||||
return ResponseDTO.ok(departmentService.listAll());
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,35 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.department.dao;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import net.lab1024.sa.admin.module.system.department.domain.entity.DepartmentEntity;
|
||||
import net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentVO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 部门
|
||||
*
|
||||
* @Author 1024创新实验室-主任: 卓大
|
||||
* @Date 2022-01-12 20:37:48
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Mapper
|
||||
public interface DepartmentDao extends BaseMapper<DepartmentEntity> {
|
||||
|
||||
/**
|
||||
* 根据部门id，查询此部门直接子部门的数量
|
||||
*
|
||||
*/
|
||||
Integer countSubDepartment(@Param("departmentId") Long departmentId);
|
||||
|
||||
/**
|
||||
* 获取全部部门列表
|
||||
*/
|
||||
List<DepartmentVO> listAll();
|
||||
|
||||
DepartmentVO selectDepartmentVO(@Param("departmentId")Long departmentId);
|
||||
}
|
||||
@ -1,65 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.department.domain.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.FieldStrategy;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 部门实体类
|
||||
*
|
||||
* @Author 1024创新实验室-主任: 卓大
|
||||
* @Date 2022-01-12 20:37:48
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
@TableName(value = "t_department")
|
||||
public class DepartmentEntity {
|
||||
|
||||
/**
|
||||
* 主键id
|
||||
*/
|
||||
@TableId(type = IdType.AUTO)
|
||||
private Long departmentId;
|
||||
|
||||
/**
|
||||
* 部门名称
|
||||
*/
|
||||
private String departmentName;
|
||||
|
||||
/**
|
||||
* 负责人员工 id
|
||||
*/
|
||||
@TableField(updateStrategy = FieldStrategy.NEVER)
|
||||
private Long managerId;
|
||||
|
||||
/**
|
||||
* 部门父级id
|
||||
*/
|
||||
private Long parentId;
|
||||
|
||||
/**
|
||||
* 排序
|
||||
*/
|
||||
private Integer sort;
|
||||
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
private LocalDateTime updateTime;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
private LocalDateTime createTime;
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -1,35 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.department.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
/**
|
||||
* 部门 添加表单
|
||||
*
|
||||
* @Author 1024创新实验室-主任: 卓大
|
||||
* @Date 2022-01-12 20:37:48
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class DepartmentAddForm {
|
||||
|
||||
@Schema(description = "部门名称")
|
||||
@Length(min = 1, max = 50, message = "请输入正确的部门名称(1-50个字符)")
|
||||
@NotNull(message = "请输入正确的部门名称(1-50个字符)")
|
||||
private String departmentName;
|
||||
|
||||
@Schema(description = "排序")
|
||||
@NotNull(message = "排序值")
|
||||
private Integer sort;
|
||||
|
||||
@Schema(description = "部门负责人id")
|
||||
private Long managerId;
|
||||
|
||||
@Schema(description = "上级部门id (可选)")
|
||||
private Long parentId;
|
||||
|
||||
}
|
||||
@ -1,23 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.department.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 部门 更新表单
|
||||
*
|
||||
* @Author 1024创新实验室-主任: 卓大
|
||||
* @Date 2022-01-12 20:37:48
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class DepartmentUpdateForm extends DepartmentAddForm {
|
||||
|
||||
@Schema(description = "部门id")
|
||||
@NotNull(message = "部门id不能为空")
|
||||
private Long departmentId;
|
||||
|
||||
}
|
||||
@ -1,226 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.department.manager;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Maps;
|
||||
import jakarta.annotation.Resource;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import net.lab1024.sa.admin.constant.AdminCacheConst;
|
||||
import net.lab1024.sa.admin.module.system.department.dao.DepartmentDao;
|
||||
import net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentTreeVO;
|
||||
import net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentVO;
|
||||
import net.lab1024.sa.base.common.util.SmartBeanUtil;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.lang3.math.NumberUtils;
|
||||
import org.springframework.cache.annotation.CacheEvict;
|
||||
import org.springframework.cache.annotation.Cacheable;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 部门 缓存相关
|
||||
*
|
||||
* @Author 1024创新实验室-主任: 卓大
|
||||
* @Date 2022-01-12 20:37:48
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Slf4j
|
||||
@Service
|
||||
public class DepartmentCacheManager {
|
||||
|
||||
@Resource
|
||||
private DepartmentDao departmentDao;
|
||||
|
||||
private void logClearInfo(String cache) {
|
||||
log.info("clear " + cache);
|
||||
}
|
||||
|
||||
@CacheEvict(value = {AdminCacheConst.Department.DEPARTMENT_LIST_CACHE, AdminCacheConst.Department.DEPARTMENT_SELF_CHILDREN_CACHE, AdminCacheConst.Department.DEPARTMENT_TREE_CACHE, AdminCacheConst.Department.DEPARTMENT_PATH_CACHE,}, allEntries = true)
|
||||
public void clearCache() {
|
||||
logClearInfo(AdminCacheConst.Department.DEPARTMENT_LIST_CACHE);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 部门列表
|
||||
*/
|
||||
@Cacheable(AdminCacheConst.Department.DEPARTMENT_LIST_CACHE)
|
||||
public List<DepartmentVO> getDepartmentList() {
|
||||
return departmentDao.listAll();
|
||||
}
|
||||
|
||||
/**
|
||||
* 缓存部门树结构
|
||||
*/
|
||||
@Cacheable(AdminCacheConst.Department.DEPARTMENT_TREE_CACHE)
|
||||
public List<DepartmentTreeVO> getDepartmentTree() {
|
||||
List<DepartmentVO> departmentVOList = departmentDao.listAll();
|
||||
return this.buildTree(departmentVOList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 缓存某个部门的下级id列表
|
||||
*/
|
||||
@Cacheable(AdminCacheConst.Department.DEPARTMENT_SELF_CHILDREN_CACHE)
|
||||
public List<Long> getDepartmentSelfAndChildren(Long departmentId) {
|
||||
List<DepartmentVO> departmentVOList = departmentDao.listAll();
|
||||
return this.selfAndChildrenIdList(departmentId, departmentVOList);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 部门的路径名称
|
||||
*/
|
||||
@Cacheable(AdminCacheConst.Department.DEPARTMENT_PATH_CACHE)
|
||||
public Map<Long, String> getDepartmentPathMap() {
|
||||
List<DepartmentVO> departmentVOList = departmentDao.listAll();
|
||||
Map<Long, DepartmentVO> departmentMap = departmentVOList.stream().collect(Collectors.toMap(DepartmentVO::getDepartmentId, Function.identity()));
|
||||
|
||||
Map<Long, String> pathNameMap = Maps.newHashMap();
|
||||
for (DepartmentVO departmentVO : departmentVOList) {
|
||||
String pathName = this.buildDepartmentPath(departmentVO, departmentMap);
|
||||
pathNameMap.put(departmentVO.getDepartmentId(), pathName);
|
||||
}
|
||||
|
||||
return pathNameMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建父级考点路径
|
||||
*/
|
||||
private String buildDepartmentPath(DepartmentVO departmentVO, Map<Long, DepartmentVO> departmentMap) {
|
||||
if (Objects.equals(departmentVO.getParentId(), NumberUtils.LONG_ZERO)) {
|
||||
return departmentVO.getDepartmentName();
|
||||
}
|
||||
//父节点
|
||||
DepartmentVO parentDepartment = departmentMap.get(departmentVO.getParentId());
|
||||
if (parentDepartment == null) {
|
||||
return departmentVO.getDepartmentName();
|
||||
}
|
||||
String pathName = buildDepartmentPath(parentDepartment, departmentMap);
|
||||
return pathName + "/" + departmentVO.getDepartmentName();
|
||||
|
||||
}
|
||||
// ---------------------- 构造树的一些方法 ------------------------------
|
||||
|
||||
/**
|
||||
* 构建部门树结构
|
||||
*/
|
||||
public List<DepartmentTreeVO> buildTree(List<DepartmentVO> voList) {
|
||||
if (CollectionUtils.isEmpty(voList)) {
|
||||
return Lists.newArrayList();
|
||||
}
|
||||
List<DepartmentVO> rootList = voList.stream().filter(e -> e.getParentId() == null || Objects.equals(e.getParentId(), NumberUtils.LONG_ZERO)).collect(Collectors.toList());
|
||||
if (CollectionUtils.isEmpty(rootList)) {
|
||||
return Lists.newArrayList();
|
||||
}
|
||||
List<DepartmentTreeVO> treeVOList = SmartBeanUtil.copyList(rootList, DepartmentTreeVO.class);
|
||||
this.recursiveBuildTree(treeVOList, voList);
|
||||
return treeVOList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建所有根节点的下级树形结构
|
||||
* 返回值为层序遍历结果
|
||||
* [由于departmentDao中listAll给出数据根据Sort降序 所以同一层中Sort值较大的优先遍历]
|
||||
*/
|
||||
private List<Long> recursiveBuildTree(List<DepartmentTreeVO> nodeList, List<DepartmentVO> allDepartmentList) {
|
||||
int nodeSize = nodeList.size();
|
||||
List<Long> childIdList = new ArrayList<>();
|
||||
for (int i = 0; i < nodeSize; i++) {
|
||||
int preIndex = i - 1;
|
||||
int nextIndex = i + 1;
|
||||
DepartmentTreeVO node = nodeList.get(i);
|
||||
if (preIndex > -1) {
|
||||
node.setPreId(nodeList.get(preIndex).getDepartmentId());
|
||||
}
|
||||
if (nextIndex < nodeSize) {
|
||||
node.setNextId(nodeList.get(nextIndex).getDepartmentId());
|
||||
}
|
||||
|
||||
List<DepartmentTreeVO> children = getChildren(node.getDepartmentId(), allDepartmentList);
|
||||
|
||||
List<Long> tempChildIdList = new ArrayList<>();
|
||||
if (CollectionUtils.isNotEmpty(children)) {
|
||||
node.setChildren(children);
|
||||
tempChildIdList = this.recursiveBuildTree(children, allDepartmentList);
|
||||
}
|
||||
|
||||
if (CollectionUtils.isEmpty(node.getSelfAndAllChildrenIdList())) {
|
||||
node.setSelfAndAllChildrenIdList(
|
||||
new ArrayList<>()
|
||||
);
|
||||
}
|
||||
node.getSelfAndAllChildrenIdList().add(node.getDepartmentId());
|
||||
|
||||
if (CollectionUtils.isNotEmpty(tempChildIdList)) {
|
||||
node.getSelfAndAllChildrenIdList().addAll(tempChildIdList);
|
||||
childIdList.addAll(tempChildIdList);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// 保证本层遍历顺序
|
||||
for (int i = nodeSize - 1; i >= 0; i--) {
|
||||
childIdList.add(0, nodeList.get(i).getDepartmentId());
|
||||
}
|
||||
|
||||
return childIdList;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取子元素
|
||||
*/
|
||||
private List<DepartmentTreeVO> getChildren(Long departmentId, List<DepartmentVO> voList) {
|
||||
List<DepartmentVO> childrenEntityList = voList.stream().filter(e -> departmentId.equals(e.getParentId())).collect(Collectors.toList());
|
||||
if (CollectionUtils.isEmpty(childrenEntityList)) {
|
||||
return Lists.newArrayList();
|
||||
}
|
||||
return SmartBeanUtil.copyList(childrenEntityList, DepartmentTreeVO.class);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 通过部门id,获取当前以及下属部门
|
||||
*/
|
||||
public List<Long> selfAndChildrenIdList(Long departmentId, List<DepartmentVO> voList) {
|
||||
List<Long> selfAndChildrenIdList = Lists.newArrayList();
|
||||
if (CollectionUtils.isEmpty(voList)) {
|
||||
return selfAndChildrenIdList;
|
||||
}
|
||||
selfAndChildrenIdList.add(departmentId);
|
||||
List<DepartmentTreeVO> children = this.getChildren(departmentId, voList);
|
||||
if (CollectionUtils.isEmpty(children)) {
|
||||
return selfAndChildrenIdList;
|
||||
}
|
||||
List<Long> childrenIdList = children.stream().map(DepartmentTreeVO::getDepartmentId).collect(Collectors.toList());
|
||||
selfAndChildrenIdList.addAll(childrenIdList);
|
||||
for (Long childId : childrenIdList) {
|
||||
this.selfAndChildrenRecursion(selfAndChildrenIdList, childId, voList);
|
||||
}
|
||||
return selfAndChildrenIdList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 递归查询
|
||||
*/
|
||||
public void selfAndChildrenRecursion(List<Long> selfAndChildrenIdList, Long departmentId, List<DepartmentVO> voList) {
|
||||
List<DepartmentTreeVO> children = this.getChildren(departmentId, voList);
|
||||
if (CollectionUtils.isEmpty(children)) {
|
||||
return;
|
||||
}
|
||||
List<Long> childrenIdList = children.stream().map(DepartmentTreeVO::getDepartmentId).collect(Collectors.toList());
|
||||
selfAndChildrenIdList.addAll(childrenIdList);
|
||||
for (Long childId : childrenIdList) {
|
||||
this.selfAndChildrenRecursion(selfAndChildrenIdList, childId, voList);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,147 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.department.service;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
import net.lab1024.sa.admin.module.system.department.dao.DepartmentDao;
|
||||
import net.lab1024.sa.admin.module.system.department.domain.entity.DepartmentEntity;
|
||||
import net.lab1024.sa.admin.module.system.department.domain.form.DepartmentAddForm;
|
||||
import net.lab1024.sa.admin.module.system.department.domain.form.DepartmentUpdateForm;
|
||||
import net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentTreeVO;
|
||||
import net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentVO;
|
||||
import net.lab1024.sa.admin.module.system.department.manager.DepartmentCacheManager;
|
||||
import net.lab1024.sa.admin.module.system.employee.dao.EmployeeDao;
|
||||
import net.lab1024.sa.base.common.code.UserErrorCode;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.util.SmartBeanUtil;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 部门 service
|
||||
*
|
||||
* @Author 1024创新实验室-主任: 卓大
|
||||
* @Date 2022-01-12 20:37:48
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Service
|
||||
public class DepartmentService {
|
||||
|
||||
@Resource
|
||||
private DepartmentDao departmentDao;
|
||||
|
||||
@Resource
|
||||
private EmployeeDao employeeDao;
|
||||
|
||||
@Resource
|
||||
private DepartmentCacheManager departmentCacheManager;
|
||||
|
||||
// ---------------------------- 增加、修改、删除 ----------------------------
|
||||
|
||||
/**
|
||||
* 新增添加部门
|
||||
*/
|
||||
|
||||
public ResponseDTO<String> addDepartment(DepartmentAddForm departmentAddForm) {
|
||||
DepartmentEntity departmentEntity = SmartBeanUtil.copy(departmentAddForm, DepartmentEntity.class);
|
||||
departmentDao.insert(departmentEntity);
|
||||
this.clearCache();
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 更新部门信息
|
||||
*/
|
||||
public ResponseDTO<String> updateDepartment(DepartmentUpdateForm updateDTO) {
|
||||
if (updateDTO.getParentId() == null) {
|
||||
return ResponseDTO.userErrorParam("父级部门id不能为空");
|
||||
}
|
||||
DepartmentEntity entity = departmentDao.selectById(updateDTO.getDepartmentId());
|
||||
if (entity == null) {
|
||||
return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
|
||||
}
|
||||
DepartmentEntity departmentEntity = SmartBeanUtil.copy(updateDTO, DepartmentEntity.class);
|
||||
departmentEntity.setSort(updateDTO.getSort());
|
||||
departmentDao.updateById(departmentEntity);
|
||||
this.clearCache();
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据id删除部门
|
||||
* 1、需要判断当前部门是否有子部门,有子部门则不允许删除
|
||||
* 2、需要判断当前部门是否有员工，有员工则不能删除
|
||||
*/
|
||||
public ResponseDTO<String> deleteDepartment(Long departmentId) {
|
||||
DepartmentEntity departmentEntity = departmentDao.selectById(departmentId);
|
||||
if (null == departmentEntity) {
|
||||
return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
|
||||
}
|
||||
// 是否有子级部门
|
||||
int subDepartmentNum = departmentDao.countSubDepartment(departmentId);
|
||||
if (subDepartmentNum > 0) {
|
||||
return ResponseDTO.userErrorParam("请先删除子级部门");
|
||||
}
|
||||
|
||||
// 是否有未删除员工
|
||||
int employeeNum = employeeDao.countByDepartmentId(departmentId, Boolean.FALSE);
|
||||
if (employeeNum > 0) {
|
||||
return ResponseDTO.userErrorParam("请先删除部门员工");
|
||||
}
|
||||
departmentDao.deleteById(departmentId);
|
||||
// 清除缓存
|
||||
this.clearCache();
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 清除自身以及下级的id列表缓存
|
||||
*/
|
||||
private void clearCache() {
|
||||
departmentCacheManager.clearCache();
|
||||
}
|
||||
|
||||
// ---------------------------- 查询 ----------------------------
|
||||
|
||||
/**
|
||||
* 获取部门树形结构
|
||||
*/
|
||||
public ResponseDTO<List<DepartmentTreeVO>> departmentTree() {
|
||||
List<DepartmentTreeVO> treeVOList = departmentCacheManager.getDepartmentTree();
|
||||
return ResponseDTO.ok(treeVOList);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 自身以及所有下级的部门id列表
|
||||
*/
|
||||
public List<Long> selfAndChildrenIdList(Long departmentId) {
|
||||
return departmentCacheManager.getDepartmentSelfAndChildren(departmentId);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取所有部门
|
||||
*/
|
||||
public List<DepartmentVO> listAll() {
|
||||
return departmentCacheManager.getDepartmentList();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取部门
|
||||
*/
|
||||
public DepartmentVO getDepartmentById(Long departmentId) {
|
||||
return departmentDao.selectDepartmentVO(departmentId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取部门路径：/公司/研发部/产品组
|
||||
*/
|
||||
public String getDepartmentPath(Long departmentId) {
|
||||
return departmentCacheManager.getDepartmentPathMap().get(departmentId);
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,129 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.employee.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.annotation.Resource;
|
||||
import jakarta.validation.Valid;
|
||||
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
|
||||
import net.lab1024.sa.admin.module.system.employee.domain.form.*;
|
||||
import net.lab1024.sa.admin.module.system.employee.domain.vo.EmployeeVO;
|
||||
import net.lab1024.sa.admin.module.system.employee.service.EmployeeService;
|
||||
import net.lab1024.sa.base.common.domain.PageResult;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.util.SmartRequestUtil;
|
||||
import net.lab1024.sa.base.module.support.apiencrypt.annotation.ApiDecrypt;
|
||||
import net.lab1024.sa.base.module.support.securityprotect.service.Level3ProtectConfigService;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 员工
|
||||
*
|
||||
* @Author 1024创新实验室-主任: 卓大
|
||||
* @Date 2021-12-09 22:57:49
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@RestController
|
||||
@Tag(name = AdminSwaggerTagConst.System.SYSTEM_EMPLOYEE)
|
||||
public class EmployeeController {
|
||||
|
||||
@Resource
|
||||
private EmployeeService employeeService;
|
||||
|
||||
@Resource
|
||||
private Level3ProtectConfigService level3ProtectConfigService;
|
||||
|
||||
@PostMapping("/employee/query")
|
||||
@Operation(summary = "员工管理查询 @author 卓大")
|
||||
public ResponseDTO<PageResult<EmployeeVO>> query(@Valid @RequestBody EmployeeQueryForm query) {
|
||||
return employeeService.queryEmployee(query);
|
||||
}
|
||||
|
||||
@Operation(summary = "添加员工(返回添加员工的密码) @author 卓大")
|
||||
@PostMapping("/employee/add")
|
||||
@SaCheckPermission("system:employee:add")
|
||||
public ResponseDTO<String> addEmployee(@Valid @RequestBody EmployeeAddForm employeeAddForm) {
|
||||
return employeeService.addEmployee(employeeAddForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "更新员工 @author 卓大")
|
||||
@PostMapping("/employee/update")
|
||||
@SaCheckPermission("system:employee:update")
|
||||
public ResponseDTO<String> updateEmployee(@Valid @RequestBody EmployeeUpdateForm employeeUpdateForm) {
|
||||
return employeeService.updateEmployee(employeeUpdateForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "更新员工个人中心信息 @author 善逸")
|
||||
@PostMapping("/employee/update/center")
|
||||
public ResponseDTO<String> updateCenter(@Valid @RequestBody EmployeeUpdateCenterForm updateCenterForm) {
|
||||
updateCenterForm.setEmployeeId(SmartRequestUtil.getRequestUserId());
|
||||
return employeeService.updateCenter(updateCenterForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "更新登录人头像 @author 善逸")
|
||||
@PostMapping("/employee/update/avatar")
|
||||
public ResponseDTO<String> updateAvatar(@Valid @RequestBody EmployeeUpdateAvatarForm employeeUpdateAvatarForm) {
|
||||
employeeUpdateAvatarForm.setEmployeeId(SmartRequestUtil.getRequestUserId());
|
||||
return employeeService.updateAvatar(employeeUpdateAvatarForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "更新员工禁用/启用状态 @author 卓大")
|
||||
@GetMapping("/employee/update/disabled/{employeeId}")
|
||||
@SaCheckPermission("system:employee:disabled")
|
||||
public ResponseDTO<String> updateDisableFlag(@PathVariable Long employeeId) {
|
||||
return employeeService.updateDisableFlag(employeeId);
|
||||
}
|
||||
|
||||
@Operation(summary = "批量删除员工 @author 卓大")
|
||||
@PostMapping("/employee/update/batch/delete")
|
||||
@SaCheckPermission("system:employee:delete")
|
||||
public ResponseDTO<String> batchUpdateDeleteFlag(@RequestBody List<Long> employeeIdList) {
|
||||
return employeeService.batchUpdateDeleteFlag(employeeIdList);
|
||||
}
|
||||
|
||||
@Operation(summary = "批量调整员工部门 @author 卓大")
|
||||
@PostMapping("/employee/update/batch/department")
|
||||
@SaCheckPermission("system:employee:department:update")
|
||||
public ResponseDTO<String> batchUpdateDepartment(@Valid @RequestBody EmployeeBatchUpdateDepartmentForm batchUpdateDepartmentForm) {
|
||||
return employeeService.batchUpdateDepartment(batchUpdateDepartmentForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "修改密码 @author 卓大")
|
||||
@PostMapping("/employee/update/password")
|
||||
@ApiDecrypt
|
||||
public ResponseDTO<String> updatePassword(@Valid @RequestBody EmployeeUpdatePasswordForm updatePasswordForm) {
|
||||
updatePasswordForm.setEmployeeId(SmartRequestUtil.getRequestUserId());
|
||||
return employeeService.updatePassword(SmartRequestUtil.getRequestUser(), updatePasswordForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "获取密码复杂度 @author 卓大")
|
||||
@GetMapping("/employee/getPasswordComplexityEnabled")
|
||||
@ApiDecrypt
|
||||
public ResponseDTO<Boolean> getPasswordComplexityEnabled() {
|
||||
return ResponseDTO.ok(level3ProtectConfigService.isPasswordComplexityEnabled());
|
||||
}
|
||||
|
||||
@Operation(summary = "重置员工密码 @author 卓大")
|
||||
@GetMapping("/employee/update/password/reset/{employeeId}")
|
||||
@SaCheckPermission("system:employee:password:reset")
|
||||
public ResponseDTO<String> resetPassword(@PathVariable Long employeeId) {
|
||||
return employeeService.resetPassword(employeeId);
|
||||
}
|
||||
|
||||
@Operation(summary = "查询员工-根据部门id @author 卓大")
|
||||
@GetMapping("/employee/getAllEmployeeByDepartmentId/{departmentId}")
|
||||
public ResponseDTO<List<EmployeeVO>> getAllEmployeeByDepartmentId(@PathVariable Long departmentId) {
|
||||
return employeeService.getAllEmployeeByDepartmentId(departmentId);
|
||||
}
|
||||
|
||||
@Operation(summary = "查询所有员工 @author 卓大")
|
||||
@GetMapping("/employee/queryAll")
|
||||
public ResponseDTO<List<EmployeeVO>> queryAllEmployee(@RequestParam(value = "disabledFlag", required = false) Boolean disabledFlag) {
|
||||
return employeeService.queryAllEmployee(disabledFlag);
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,102 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.employee.domain.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 员工 实体表
|
||||
*
|
||||
* @Author 1024创新实验室-主任: 卓大
|
||||
* @Date 2021-12-09 22:57:49
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
@TableName("t_employee")
|
||||
public class EmployeeEntity {
|
||||
|
||||
@TableId(type = IdType.AUTO)
|
||||
private Long employeeId;
|
||||
|
||||
/**
|
||||
* 唯一id
|
||||
*/
|
||||
private String employeeUid;
|
||||
|
||||
|
||||
/**
|
||||
* 登录账号
|
||||
*/
|
||||
private String loginName;
|
||||
|
||||
/**
|
||||
* 登录密码
|
||||
*/
|
||||
private String loginPwd;
|
||||
|
||||
/**
|
||||
* 员工名称
|
||||
*/
|
||||
private String actualName;
|
||||
|
||||
/**
|
||||
* 头像
|
||||
*/
|
||||
private String avatar;
|
||||
|
||||
/**
|
||||
* 性别
|
||||
*/
|
||||
private Integer gender;
|
||||
|
||||
/**
|
||||
* 手机号码
|
||||
*/
|
||||
private String phone;
|
||||
|
||||
/**
|
||||
* 邮箱
|
||||
*/
|
||||
private String email;
|
||||
|
||||
/**
|
||||
* 部门id
|
||||
*/
|
||||
private Long departmentId;
|
||||
|
||||
/**
|
||||
* 职务级别ID
|
||||
*/
|
||||
private Long positionId;
|
||||
|
||||
/**
|
||||
* 是否为超级管理员: 0 不是，1是
|
||||
*/
|
||||
private Boolean administratorFlag;
|
||||
|
||||
/**
|
||||
* 是否被禁用 0否1是
|
||||
*/
|
||||
private Boolean disabledFlag;
|
||||
|
||||
/**
|
||||
* 是否删除0否 1是
|
||||
*/
|
||||
private Boolean deletedFlag;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
private LocalDateTime updateTime;
|
||||
|
||||
private LocalDateTime createTime;
|
||||
|
||||
|
||||
}
|
||||
@ -1,69 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.employee.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import jakarta.validation.constraints.Pattern;
|
||||
import lombok.Data;
|
||||
import net.lab1024.sa.base.common.enumeration.GenderEnum;
|
||||
import net.lab1024.sa.base.common.swagger.SchemaEnum;
|
||||
import net.lab1024.sa.base.common.util.SmartVerificationUtil;
|
||||
import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 添加员工
|
||||
*
|
||||
* @Author 1024创新实验室: 开云
|
||||
* @Date 2021-12-20 21:06:49
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class EmployeeAddForm {
|
||||
|
||||
@Schema(description = "姓名")
|
||||
@NotNull(message = "姓名不能为空")
|
||||
@Length(max = 30, message = "姓名最多30字符")
|
||||
private String actualName;
|
||||
|
||||
@Schema(description = "登录账号")
|
||||
@NotNull(message = "登录账号不能为空")
|
||||
@Length(max = 30, message = "登录账号最多30字符")
|
||||
private String loginName;
|
||||
|
||||
@SchemaEnum(GenderEnum.class)
|
||||
@CheckEnum(value = GenderEnum.class, message = "性别错误")
|
||||
private Integer gender;
|
||||
|
||||
@Schema(description = "部门id")
|
||||
@NotNull(message = "部门id不能为空")
|
||||
private Long departmentId;
|
||||
|
||||
@Schema(description = "是否启用")
|
||||
@NotNull(message = "是否被禁用不能为空")
|
||||
private Boolean disabledFlag;
|
||||
|
||||
@Schema(description = "手机号")
|
||||
@NotNull(message = "手机号不能为空")
|
||||
@Pattern(regexp = SmartVerificationUtil.PHONE_REGEXP, message = "手机号格式不正确")
|
||||
private String phone;
|
||||
|
||||
@Schema(description = "邮箱账号")
|
||||
@NotNull(message = "邮箱账号不能为空")
|
||||
@Pattern(regexp = SmartVerificationUtil.EMAIL, message = "邮箱账号格式不正确")
|
||||
private String email;
|
||||
|
||||
@Schema(description = "职务级别ID")
|
||||
private Long positionId;
|
||||
|
||||
@Schema(description = "角色列表")
|
||||
private List<Long> roleIdList;
|
||||
|
||||
@Schema(description = "备注")
|
||||
@Length(max = 200, message = "备注最多200字符")
|
||||
private String remark;
|
||||
|
||||
}
|
||||
@ -1,31 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.employee.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import jakarta.validation.constraints.Size;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 员工更新部门
|
||||
*
|
||||
* @Author 1024创新实验室: 开云
|
||||
* @Date 2021-12-20 21:06:49
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class EmployeeBatchUpdateDepartmentForm {
|
||||
|
||||
@Schema(description = "员工id")
|
||||
@NotEmpty(message = "员工id不能为空")
|
||||
@Size(max = 99, message = "一次最多调整99个员工")
|
||||
private List<Long> employeeIdList;
|
||||
|
||||
@Schema(description = "部门ID")
|
||||
@NotNull(message = "部门ID不能为空")
|
||||
private Long departmentId;
|
||||
}
|
||||
@ -1,40 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.employee.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.Size;
|
||||
import lombok.Data;
|
||||
import net.lab1024.sa.base.common.domain.PageParam;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 员工列表
|
||||
*
|
||||
* @Author 1024创新实验室: 开云
|
||||
* @Date 2021-12-20 21:06:49
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class EmployeeQueryForm extends PageParam {
|
||||
|
||||
@Schema(description = "搜索词")
|
||||
@Length(max = 20, message = "搜索词最多20字符")
|
||||
private String keyword;
|
||||
|
||||
@Schema(description = "部门id")
|
||||
private Long departmentId;
|
||||
|
||||
@Schema(description = "是否禁用")
|
||||
private Boolean disabledFlag;
|
||||
|
||||
@Schema(description = "员工id集合")
|
||||
@Size(max = 99, message = "最多查询99个员工")
|
||||
private List<Long> employeeIdList;
|
||||
|
||||
@Schema(description = "删除标识", hidden = true)
|
||||
private Boolean deletedFlag;
|
||||
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.employee.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 修改登录人头像
|
||||
*
|
||||
* @Author 1024创新实验室: 善逸
|
||||
* @Date 2024年6月30日00:26:35
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class EmployeeUpdateAvatarForm {
|
||||
|
||||
@Schema(hidden = true)
|
||||
private Long employeeId;
|
||||
|
||||
@Schema(description = "头像")
|
||||
@NotBlank(message = "头像不能为空哦")
|
||||
private String avatar;
|
||||
}
|
||||
@ -1,56 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.employee.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import jakarta.validation.constraints.Pattern;
|
||||
import lombok.Data;
|
||||
import net.lab1024.sa.base.common.enumeration.GenderEnum;
|
||||
import net.lab1024.sa.base.common.swagger.SchemaEnum;
|
||||
import net.lab1024.sa.base.common.util.SmartVerificationUtil;
|
||||
import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
/**
|
||||
* 更新员工个人中心信息
|
||||
*
|
||||
* @Author 1024创新实验室: 开云
|
||||
* @Date 2021-12-20 21:06:49
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class EmployeeUpdateCenterForm {
|
||||
|
||||
@Schema(hidden = true)
|
||||
private Long employeeId;
|
||||
|
||||
@Schema(description = "姓名")
|
||||
@NotNull(message = "姓名不能为空")
|
||||
@Length(max = 30, message = "姓名最多30字符")
|
||||
private String actualName;
|
||||
|
||||
@SchemaEnum(GenderEnum.class)
|
||||
@CheckEnum(value = GenderEnum.class, message = "性别错误")
|
||||
private Integer gender;
|
||||
|
||||
@Schema(description = "手机号")
|
||||
@NotNull(message = "手机号不能为空")
|
||||
@Pattern(regexp = SmartVerificationUtil.PHONE_REGEXP, message = "手机号格式不正确")
|
||||
private String phone;
|
||||
|
||||
@Schema(description = "邮箱账号")
|
||||
@NotNull(message = "邮箱账号不能为空")
|
||||
@Pattern(regexp = SmartVerificationUtil.EMAIL, message = "邮箱账号格式不正确")
|
||||
private String email;
|
||||
|
||||
@Schema(description = "职务级别ID")
|
||||
private Long positionId;
|
||||
|
||||
@Schema(description = "头像")
|
||||
private String avatar;
|
||||
|
||||
@Schema(description = "备注")
|
||||
@Length(max = 200, message = "备注最多200字符")
|
||||
private String remark;
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.employee.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 更新员工
|
||||
*
|
||||
* @Author 1024创新实验室: 开云
|
||||
* @Date 2021-12-20 21:06:49
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class EmployeeUpdateForm extends EmployeeAddForm {
|
||||
|
||||
@Schema(description = "员工id")
|
||||
@NotNull(message = "员工id不能为空")
|
||||
private Long employeeId;
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.employee.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 修改密码所需参数
|
||||
*
|
||||
* @Author 1024创新实验室: 开云
|
||||
* @Date 2021-12-20 21:06:49
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class EmployeeUpdatePasswordForm {
|
||||
|
||||
@Schema(hidden = true)
|
||||
private Long employeeId;
|
||||
|
||||
@Schema(description = "原密码")
|
||||
@NotBlank(message = "原密码不能为空哦")
|
||||
private String oldPassword;
|
||||
|
||||
@Schema(description = "新密码")
|
||||
@NotBlank(message = "新密码不能为空哦")
|
||||
private String newPassword;
|
||||
}
|
||||
@ -1,30 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.employee.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import jakarta.validation.constraints.Size;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 员工更新角色
|
||||
*
|
||||
* @Author 1024创新实验室: 罗伊
|
||||
* @Date 2021-12-20 20:55:13
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class EmployeeUpdateRoleForm {
|
||||
|
||||
@Schema(description = "员工id")
|
||||
@NotNull(message = "员工id不能为空")
|
||||
private Long employeeId;
|
||||
|
||||
@Schema(description = "角色ids")
|
||||
@Size(max = 99, message = "角色最多99")
|
||||
private List<Long> roleIdList;
|
||||
|
||||
}
|
||||
@ -1,86 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.employee.manager;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import jakarta.annotation.Resource;
|
||||
import net.lab1024.sa.admin.module.system.employee.dao.EmployeeDao;
|
||||
import net.lab1024.sa.admin.module.system.employee.domain.entity.EmployeeEntity;
|
||||
import net.lab1024.sa.admin.module.system.role.dao.RoleEmployeeDao;
|
||||
import net.lab1024.sa.admin.module.system.role.domain.entity.RoleEmployeeEntity;
|
||||
import net.lab1024.sa.admin.module.system.role.service.RoleEmployeeService;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 员工 manager
|
||||
*
|
||||
* @Author 1024创新实验室: 胡克
|
||||
* @Date 2021-12-29 21:52:46
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Service
|
||||
public class EmployeeManager extends ServiceImpl<EmployeeDao, EmployeeEntity> {
|
||||
|
||||
@Resource
|
||||
private EmployeeDao employeeDao;
|
||||
|
||||
@Resource
|
||||
private RoleEmployeeService roleEmployeeService;
|
||||
|
||||
@Resource
|
||||
private RoleEmployeeDao roleEmployeeDao;
|
||||
|
||||
/**
|
||||
* 保存员工
|
||||
*
|
||||
*/
|
||||
@Transactional(rollbackFor = Throwable.class)
|
||||
public void saveEmployee(EmployeeEntity employee, List<Long> roleIdList) {
|
||||
// 保存员工 获得id
|
||||
employeeDao.insert(employee);
|
||||
|
||||
if (CollectionUtils.isNotEmpty(roleIdList)) {
|
||||
List<RoleEmployeeEntity> roleEmployeeList = roleIdList.stream().map(e -> new RoleEmployeeEntity(e, employee.getEmployeeId())).collect(Collectors.toList());
|
||||
roleEmployeeService.batchInsert(roleEmployeeList);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新员工
|
||||
*
|
||||
*/
|
||||
@Transactional(rollbackFor = Throwable.class)
|
||||
public void updateEmployee(EmployeeEntity employee, List<Long> roleIdList) {
|
||||
// 保存员工 获得id
|
||||
employeeDao.updateById(employee);
|
||||
|
||||
// 若为空，则删除所有角色
|
||||
if (CollectionUtils.isEmpty(roleIdList)) {
|
||||
roleEmployeeDao.deleteByEmployeeId(employee.getEmployeeId());
|
||||
return;
|
||||
}
|
||||
|
||||
List<RoleEmployeeEntity> roleEmployeeList = roleIdList.stream().map(e -> new RoleEmployeeEntity(e, employee.getEmployeeId())).collect(Collectors.toList());
|
||||
this.updateEmployeeRole(employee.getEmployeeId(), roleEmployeeList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新员工角色
|
||||
*/
|
||||
@Transactional(rollbackFor = Throwable.class)
|
||||
public void updateEmployeeRole(Long employeeId, List<RoleEmployeeEntity> roleEmployeeList) {
|
||||
|
||||
roleEmployeeDao.deleteByEmployeeId(employeeId);
|
||||
|
||||
if (CollectionUtils.isNotEmpty(roleEmployeeList)) {
|
||||
roleEmployeeService.batchInsert(roleEmployeeList);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,447 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.employee.service;
|
||||
|
||||
import cn.dev33.satoken.stp.StpUtil;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.google.common.collect.Lists;
|
||||
import jakarta.annotation.Resource;
|
||||
import net.lab1024.sa.admin.module.system.department.dao.DepartmentDao;
|
||||
import net.lab1024.sa.admin.module.system.department.domain.entity.DepartmentEntity;
|
||||
import net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentVO;
|
||||
import net.lab1024.sa.admin.module.system.department.service.DepartmentService;
|
||||
import net.lab1024.sa.admin.module.system.employee.dao.EmployeeDao;
|
||||
import net.lab1024.sa.admin.module.system.employee.domain.entity.EmployeeEntity;
|
||||
import net.lab1024.sa.admin.module.system.employee.domain.form.*;
|
||||
import net.lab1024.sa.admin.module.system.employee.domain.vo.EmployeeVO;
|
||||
import net.lab1024.sa.admin.module.system.employee.manager.EmployeeManager;
|
||||
import net.lab1024.sa.admin.module.system.login.service.LoginService;
|
||||
import net.lab1024.sa.admin.module.system.position.dao.PositionDao;
|
||||
import net.lab1024.sa.admin.module.system.position.domain.entity.PositionEntity;
|
||||
import net.lab1024.sa.admin.module.system.role.dao.RoleEmployeeDao;
|
||||
import net.lab1024.sa.admin.module.system.role.domain.vo.RoleEmployeeVO;
|
||||
import net.lab1024.sa.base.common.code.UserErrorCode;
|
||||
import net.lab1024.sa.base.common.constant.StringConst;
|
||||
import net.lab1024.sa.base.common.domain.PageResult;
|
||||
import net.lab1024.sa.base.common.domain.RequestUser;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.enumeration.UserTypeEnum;
|
||||
import net.lab1024.sa.base.common.util.SmartBeanUtil;
|
||||
import net.lab1024.sa.base.common.util.SmartPageUtil;
|
||||
import net.lab1024.sa.base.module.support.securityprotect.service.SecurityPasswordService;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.springframework.context.annotation.Lazy;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 员工 service
|
||||
*
|
||||
* @Author 1024创新实验室-主任: 卓大
|
||||
* @Date 2021-12-29 21:52:46
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Service
|
||||
public class EmployeeService {
|
||||
|
||||
@Resource
|
||||
private EmployeeDao employeeDao;
|
||||
|
||||
@Resource
|
||||
private DepartmentDao departmentDao;
|
||||
|
||||
@Resource
|
||||
private EmployeeManager employeeManager;
|
||||
|
||||
@Resource
|
||||
private RoleEmployeeDao roleEmployeeDao;
|
||||
|
||||
@Resource
|
||||
private DepartmentService departmentService;
|
||||
|
||||
@Resource
|
||||
private SecurityPasswordService securityPasswordService;
|
||||
|
||||
@Resource
|
||||
@Lazy
|
||||
private LoginService loginService;
|
||||
|
||||
@Resource
|
||||
private PositionDao positionDao;
|
||||
|
||||
public EmployeeEntity getById(Long employeeId) {
|
||||
return employeeDao.selectById(employeeId);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 查询员工列表
|
||||
*/
|
||||
public ResponseDTO<PageResult<EmployeeVO>> queryEmployee(EmployeeQueryForm employeeQueryForm) {
|
||||
employeeQueryForm.setDeletedFlag(false);
|
||||
Page pageParam = SmartPageUtil.convert2PageQuery(employeeQueryForm);
|
||||
|
||||
List<Long> departmentIdList = new ArrayList<>();
|
||||
if (employeeQueryForm.getDepartmentId() != null) {
|
||||
departmentIdList.addAll(departmentService.selfAndChildrenIdList(employeeQueryForm.getDepartmentId()));
|
||||
}
|
||||
|
||||
List<EmployeeVO> employeeList = employeeDao.queryEmployee(pageParam, employeeQueryForm, departmentIdList);
|
||||
if (CollectionUtils.isEmpty(employeeList)) {
|
||||
PageResult<EmployeeVO> pageResult = SmartPageUtil.convert2PageResult(pageParam, employeeList);
|
||||
return ResponseDTO.ok(pageResult);
|
||||
}
|
||||
|
||||
// 查询员工角色
|
||||
List<Long> employeeIdList = employeeList.stream().map(EmployeeVO::getEmployeeId).collect(Collectors.toList());
|
||||
List<RoleEmployeeVO> roleEmployeeEntityList = employeeIdList.isEmpty() ? Collections.emptyList() : roleEmployeeDao.selectRoleByEmployeeIdList(employeeIdList);
|
||||
Map<Long, List<Long>> employeeRoleIdListMap = roleEmployeeEntityList.stream().collect(Collectors.groupingBy(RoleEmployeeVO::getEmployeeId, Collectors.mapping(RoleEmployeeVO::getRoleId, Collectors.toList())));
|
||||
Map<Long, List<String>> employeeRoleNameListMap = roleEmployeeEntityList.stream().collect(Collectors.groupingBy(RoleEmployeeVO::getEmployeeId, Collectors.mapping(RoleEmployeeVO::getRoleName, Collectors.toList())));
|
||||
|
||||
// 查询员工职位
|
||||
List<Long> positionIdList = employeeList.stream().map(EmployeeVO::getPositionId).filter(Objects::nonNull).collect(Collectors.toList());
|
||||
List<PositionEntity> positionEntityList = positionIdList.isEmpty() ? Collections.emptyList() : positionDao.selectBatchIds(positionIdList);
|
||||
Map<Long, String> positionNameMap = positionEntityList.stream().collect(Collectors.toMap(PositionEntity::getPositionId, PositionEntity::getPositionName));
|
||||
|
||||
employeeList.forEach(e -> {
|
||||
e.setRoleIdList(employeeRoleIdListMap.getOrDefault(e.getEmployeeId(), Lists.newArrayList()));
|
||||
e.setRoleNameList(employeeRoleNameListMap.getOrDefault(e.getEmployeeId(), Lists.newArrayList()));
|
||||
e.setDepartmentName(departmentService.getDepartmentPath(e.getDepartmentId()));
|
||||
e.setPositionName(positionNameMap.get(e.getPositionId()));
|
||||
});
|
||||
PageResult<EmployeeVO> pageResult = SmartPageUtil.convert2PageResult(pageParam, employeeList);
|
||||
return ResponseDTO.ok(pageResult);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增员工
|
||||
*/
|
||||
public synchronized ResponseDTO<String> addEmployee(EmployeeAddForm employeeAddForm) {
|
||||
// 校验登录名是否重复
|
||||
EmployeeEntity employeeEntity = employeeDao.getByLoginName(employeeAddForm.getLoginName(), null);
|
||||
if (null != employeeEntity) {
|
||||
return ResponseDTO.userErrorParam("登录名重复");
|
||||
}
|
||||
// 校验电话是否存在
|
||||
employeeEntity = employeeDao.getByPhone(employeeAddForm.getPhone(), null);
|
||||
if (null != employeeEntity) {
|
||||
return ResponseDTO.userErrorParam("手机号已存在");
|
||||
}
|
||||
// 部门是否存在
|
||||
Long departmentId = employeeAddForm.getDepartmentId();
|
||||
DepartmentEntity department = departmentDao.selectById(departmentId);
|
||||
if (department == null) {
|
||||
return ResponseDTO.userErrorParam("部门不存在");
|
||||
}
|
||||
|
||||
EmployeeEntity entity = SmartBeanUtil.copy(employeeAddForm, EmployeeEntity.class);
|
||||
// 员工uid
|
||||
String employeeUid = cn.hutool.core.lang.UUID.randomUUID(true).toString(true);
|
||||
entity.setEmployeeUid(employeeUid);
|
||||
|
||||
// 设置密码 随机密码
|
||||
String randomPassword = securityPasswordService.randomPassword();
|
||||
String generateSaltPassword = this.generateSaltPassword(randomPassword, employeeUid);
|
||||
entity.setLoginPwd(SecurityPasswordService.getEncryptPwd(generateSaltPassword));
|
||||
|
||||
// 保存数据
|
||||
entity.setDeletedFlag(Boolean.FALSE);
|
||||
employeeManager.saveEmployee(entity, employeeAddForm.getRoleIdList());
|
||||
|
||||
return ResponseDTO.ok(randomPassword);
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新员工
|
||||
*/
|
||||
public synchronized ResponseDTO<String> updateEmployee(EmployeeUpdateForm employeeUpdateForm) {
|
||||
|
||||
Long employeeId = employeeUpdateForm.getEmployeeId();
|
||||
EmployeeEntity employeeEntity = employeeDao.selectById(employeeId);
|
||||
if (null == employeeEntity) {
|
||||
return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
|
||||
}
|
||||
|
||||
// 部门是否存在
|
||||
Long departmentId = employeeUpdateForm.getDepartmentId();
|
||||
DepartmentEntity departmentEntity = departmentDao.selectById(departmentId);
|
||||
if (departmentEntity == null) {
|
||||
return ResponseDTO.userErrorParam("部门不存在");
|
||||
}
|
||||
|
||||
// 检查唯一性
|
||||
ResponseDTO<String> checkResponse = checkUniqueness(employeeId, employeeUpdateForm.getLoginName(), employeeUpdateForm.getPhone(), employeeUpdateForm.getEmail());
|
||||
if (!checkResponse.getOk()) {
|
||||
return checkResponse;
|
||||
}
|
||||
|
||||
EmployeeEntity entity = SmartBeanUtil.copy(employeeUpdateForm, EmployeeEntity.class);
|
||||
// 不更新密码
|
||||
entity.setLoginPwd(null);
|
||||
|
||||
// 更新数据
|
||||
employeeManager.updateEmployee(entity, employeeUpdateForm.getRoleIdList());
|
||||
|
||||
// 清除员工缓存
|
||||
loginService.clearLoginEmployeeCache(employeeId);
|
||||
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新员工个人中心信息
|
||||
*/
|
||||
public ResponseDTO<String> updateCenter(EmployeeUpdateCenterForm updateCenterForm) {
|
||||
|
||||
Long employeeId = updateCenterForm.getEmployeeId();
|
||||
EmployeeEntity employeeEntity = employeeDao.selectById(employeeId);
|
||||
if (null == employeeEntity) {
|
||||
return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
|
||||
}
|
||||
|
||||
// 检查唯一性 登录账号不能修改则不需要检查
|
||||
ResponseDTO<String> checkResponse = checkUniqueness(employeeId, "", updateCenterForm.getPhone(), updateCenterForm.getEmail());
|
||||
if (!checkResponse.getOk()) {
|
||||
return checkResponse;
|
||||
}
|
||||
|
||||
EmployeeEntity employee = SmartBeanUtil.copy(updateCenterForm, EmployeeEntity.class);
|
||||
// 不更新密码
|
||||
employee.setLoginPwd(null);
|
||||
|
||||
// 更新数据
|
||||
employeeDao.updateById(employee);
|
||||
|
||||
// 清除员工缓存
|
||||
loginService.clearLoginEmployeeCache(employeeId);
|
||||
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查唯一性
|
||||
*/
|
||||
private ResponseDTO<String> checkUniqueness(Long employeeId, String loginName, String phone, String email) {
|
||||
EmployeeEntity existEntity = employeeDao.getByLoginName(loginName, null);
|
||||
if (null != existEntity && !Objects.equals(existEntity.getEmployeeId(), employeeId)) {
|
||||
return ResponseDTO.userErrorParam("登录名重复");
|
||||
}
|
||||
|
||||
existEntity = employeeDao.getByPhone(phone, null);
|
||||
if (null != existEntity && !Objects.equals(existEntity.getEmployeeId(), employeeId)) {
|
||||
return ResponseDTO.userErrorParam("手机号已存在");
|
||||
}
|
||||
|
||||
existEntity = employeeDao.getByEmail(email, null);
|
||||
if (null != existEntity && !Objects.equals(existEntity.getEmployeeId(), employeeId)) {
|
||||
return ResponseDTO.userErrorParam("邮箱账号已存在");
|
||||
}
|
||||
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新登录人头像
|
||||
*/
|
||||
public ResponseDTO<String> updateAvatar(EmployeeUpdateAvatarForm employeeUpdateAvatarForm) {
|
||||
Long employeeId = employeeUpdateAvatarForm.getEmployeeId();
|
||||
EmployeeEntity employeeEntity = employeeDao.selectById(employeeId);
|
||||
if (employeeEntity == null) {
|
||||
return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
|
||||
}
|
||||
// 更新头像
|
||||
EmployeeEntity updateEntity = new EmployeeEntity();
|
||||
updateEntity.setEmployeeId(employeeId);
|
||||
updateEntity.setAvatar(employeeUpdateAvatarForm.getAvatar());
|
||||
employeeDao.updateById(updateEntity);
|
||||
|
||||
// 清除员工缓存
|
||||
loginService.clearLoginEmployeeCache(employeeId);
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新禁用/启用状态
|
||||
*/
|
||||
public ResponseDTO<String> updateDisableFlag(Long employeeId) {
|
||||
if (null == employeeId) {
|
||||
return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
|
||||
}
|
||||
EmployeeEntity employeeEntity = employeeDao.selectById(employeeId);
|
||||
if (null == employeeEntity) {
|
||||
return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
|
||||
}
|
||||
employeeDao.updateDisableFlag(employeeId, !employeeEntity.getDisabledFlag());
|
||||
|
||||
if (employeeEntity.getDisabledFlag()) {
|
||||
// 强制退出登录
|
||||
StpUtil.logout(UserTypeEnum.ADMIN_EMPLOYEE.getValue() + StringConst.COLON + employeeId);
|
||||
}
|
||||
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除员工
|
||||
*/
|
||||
public ResponseDTO<String> batchUpdateDeleteFlag(List<Long> employeeIdList) {
|
||||
if (CollectionUtils.isEmpty(employeeIdList)) {
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
List<EmployeeEntity> employeeEntityList = employeeManager.listByIds(employeeIdList);
|
||||
if (CollectionUtils.isEmpty(employeeEntityList)) {
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
// 更新删除
|
||||
List<EmployeeEntity> deleteList = employeeIdList.stream().map(e -> {
|
||||
EmployeeEntity updateEmployee = new EmployeeEntity();
|
||||
updateEmployee.setEmployeeId(e);
|
||||
updateEmployee.setDeletedFlag(true);
|
||||
return updateEmployee;
|
||||
}).collect(Collectors.toList());
|
||||
employeeManager.updateBatchById(deleteList);
|
||||
|
||||
for (Long employeeId : employeeIdList) {
|
||||
// 强制退出登录
|
||||
StpUtil.logout(UserTypeEnum.ADMIN_EMPLOYEE.getValue() + StringConst.COLON + employeeId);
|
||||
}
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 批量更新部门
|
||||
*/
|
||||
public ResponseDTO<String> batchUpdateDepartment(EmployeeBatchUpdateDepartmentForm batchUpdateDepartmentForm) {
|
||||
List<Long> employeeIdList = batchUpdateDepartmentForm.getEmployeeIdList();
|
||||
List<EmployeeEntity> employeeEntityList = employeeDao.selectBatchIds(employeeIdList);
|
||||
if (employeeIdList.size() != employeeEntityList.size()) {
|
||||
return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
|
||||
}
|
||||
// 更新
|
||||
List<EmployeeEntity> updateList = employeeIdList.stream().map(e -> {
|
||||
EmployeeEntity updateEmployee = new EmployeeEntity();
|
||||
updateEmployee.setEmployeeId(e);
|
||||
updateEmployee.setDepartmentId(batchUpdateDepartmentForm.getDepartmentId());
|
||||
return updateEmployee;
|
||||
}).collect(Collectors.toList());
|
||||
employeeManager.updateBatchById(updateList);
|
||||
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 更新密码
|
||||
*/
|
||||
@Transactional(rollbackFor = Throwable.class)
|
||||
public ResponseDTO<String> updatePassword(RequestUser requestUser, EmployeeUpdatePasswordForm updatePasswordForm) {
|
||||
Long employeeId = updatePasswordForm.getEmployeeId();
|
||||
EmployeeEntity employeeEntity = employeeDao.selectById(employeeId);
|
||||
if (employeeEntity == null) {
|
||||
return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
|
||||
}
|
||||
|
||||
// 校验原始密码
|
||||
if (!SecurityPasswordService.matchesPwd(this.generateSaltPassword(updatePasswordForm.getOldPassword(), employeeEntity.getEmployeeUid()), employeeEntity.getLoginPwd())) {
|
||||
return ResponseDTO.userErrorParam("原密码有误，请重新输入");
|
||||
}
|
||||
|
||||
// 新旧密码相同
|
||||
if (Objects.equals(updatePasswordForm.getOldPassword(), updatePasswordForm.getNewPassword())) {
|
||||
return ResponseDTO.userErrorParam("新密码与原始密码相同，请重新输入");
|
||||
}
|
||||
|
||||
// 校验密码复杂度
|
||||
ResponseDTO<String> validatePassComplexity = securityPasswordService.validatePasswordComplexity(updatePasswordForm.getNewPassword());
|
||||
if (!validatePassComplexity.getOk()) {
|
||||
return validatePassComplexity;
|
||||
}
|
||||
|
||||
// 根据三级等保规则，校验密码是否重复
|
||||
ResponseDTO<String> passwordRepeatTimes = securityPasswordService.validatePasswordRepeatTimes(requestUser, this.generateSaltPassword(updatePasswordForm.getNewPassword(), employeeEntity.getEmployeeUid()));
|
||||
if (!passwordRepeatTimes.getOk()) {
|
||||
return ResponseDTO.error(passwordRepeatTimes);
|
||||
}
|
||||
|
||||
// 更新密码
|
||||
String newEncryptPassword = SecurityPasswordService.getEncryptPwd(this.generateSaltPassword(updatePasswordForm.getNewPassword(), employeeEntity.getEmployeeUid()));
|
||||
EmployeeEntity updateEntity = new EmployeeEntity();
|
||||
updateEntity.setEmployeeId(employeeId);
|
||||
updateEntity.setLoginPwd(newEncryptPassword);
|
||||
employeeDao.updateById(updateEntity);
|
||||
|
||||
// 保存修改密码密码记录
|
||||
securityPasswordService.saveUserChangePasswordLog(requestUser, newEncryptPassword, employeeEntity.getLoginPwd());
|
||||
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取某个部门的员工信息
|
||||
*/
|
||||
public ResponseDTO<List<EmployeeVO>> getAllEmployeeByDepartmentId(Long departmentId) {
|
||||
List<EmployeeEntity> employeeEntityList = employeeDao.selectByDepartmentId(departmentId, Boolean.FALSE);
|
||||
|
||||
if (CollectionUtils.isEmpty(employeeEntityList)) {
|
||||
return ResponseDTO.ok(Collections.emptyList());
|
||||
}
|
||||
|
||||
DepartmentVO department = departmentService.getDepartmentById(departmentId);
|
||||
|
||||
List<EmployeeVO> voList = employeeEntityList.stream().map(e -> {
|
||||
EmployeeVO employeeVO = SmartBeanUtil.copy(e, EmployeeVO.class);
|
||||
if (department != null) {
|
||||
employeeVO.setDepartmentName(department.getDepartmentName());
|
||||
}
|
||||
return employeeVO;
|
||||
}).collect(Collectors.toList());
|
||||
return ResponseDTO.ok(voList);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 重置密码
|
||||
*/
|
||||
public ResponseDTO<String> resetPassword(Long employeeId) {
|
||||
EmployeeEntity employeeEntity = employeeDao.selectById(employeeId);
|
||||
if (employeeEntity == null) {
|
||||
return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
|
||||
}
|
||||
|
||||
String password = securityPasswordService.randomPassword();
|
||||
String saltPassword = this.generateSaltPassword(password, employeeEntity.getEmployeeUid());
|
||||
employeeDao.updatePassword(employeeId, SecurityPasswordService.getEncryptPwd(saltPassword));
|
||||
return ResponseDTO.ok(password);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 查询全部员工
|
||||
*/
|
||||
public ResponseDTO<List<EmployeeVO>> queryAllEmployee(Boolean disabledFlag) {
|
||||
List<EmployeeVO> employeeList = employeeDao.selectEmployeeByDisabledAndDeleted(disabledFlag, Boolean.FALSE);
|
||||
return ResponseDTO.ok(employeeList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据登录名获取员工
|
||||
*/
|
||||
public EmployeeEntity getByLoginName(String loginName) {
|
||||
return employeeDao.getByLoginName(loginName, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* 生成加盐密码
|
||||
* 格式为：[password]_[uid大写]_[uid小写]
|
||||
*/
|
||||
public String generateSaltPassword(String password, String employeeUid) {
|
||||
return password + StringConst.UNDERLINE +
|
||||
employeeUid.toUpperCase() +
|
||||
StringConst.UNDERLINE +
|
||||
employeeUid.toLowerCase();
|
||||
}
|
||||
}
|
||||
@ -1,89 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.login.controller;
|
||||
|
||||
import cn.dev33.satoken.stp.StpUtil;
|
||||
import cn.hutool.extra.servlet.JakartaServletUtil;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.annotation.Resource;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.validation.Valid;
|
||||
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
|
||||
import net.lab1024.sa.admin.module.system.login.domain.LoginForm;
|
||||
import net.lab1024.sa.admin.module.system.login.domain.LoginResultVO;
|
||||
import net.lab1024.sa.admin.module.system.login.service.LoginService;
|
||||
import net.lab1024.sa.admin.util.AdminRequestUtil;
|
||||
import net.lab1024.sa.base.common.annoation.NoNeedLogin;
|
||||
import net.lab1024.sa.base.common.constant.RequestHeaderConst;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.util.SmartRequestUtil;
|
||||
import net.lab1024.sa.base.module.support.captcha.domain.CaptchaVO;
|
||||
import net.lab1024.sa.base.module.support.securityprotect.service.Level3ProtectConfigService;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
/**
|
||||
* 员工登录
|
||||
*
|
||||
* @Author 1024创新实验室-主任:卓大
|
||||
* @Date 2021-12-15 21:05:46
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@RestController
|
||||
@Tag(name = AdminSwaggerTagConst.System.SYSTEM_LOGIN)
|
||||
public class LoginController {
|
||||
|
||||
@Resource
|
||||
private LoginService loginService;
|
||||
|
||||
@Resource
|
||||
private Level3ProtectConfigService level3ProtectConfigService;
|
||||
|
||||
@NoNeedLogin
|
||||
@PostMapping("/login")
|
||||
@Operation(summary = "登录 @author 卓大")
|
||||
public ResponseDTO<LoginResultVO> login(@Valid @RequestBody LoginForm loginForm, HttpServletRequest request) {
|
||||
String ip = JakartaServletUtil.getClientIP(request);
|
||||
String userAgent = JakartaServletUtil.getHeaderIgnoreCase(request, RequestHeaderConst.USER_AGENT);
|
||||
return loginService.login(loginForm, ip, userAgent);
|
||||
}
|
||||
|
||||
@GetMapping("/login/getLoginInfo")
|
||||
@Operation(summary = "获取登录结果信息 @author 卓大")
|
||||
public ResponseDTO<LoginResultVO> getLoginInfo() {
|
||||
String tokenValue = StpUtil.getTokenValue();
|
||||
LoginResultVO loginResult = loginService.getLoginResult(AdminRequestUtil.getRequestUser(), tokenValue);
|
||||
loginResult.setToken(tokenValue);
|
||||
return ResponseDTO.ok(loginResult);
|
||||
}
|
||||
|
||||
@Operation(summary = "退出登录 @author 卓大")
|
||||
@GetMapping("/login/logout")
|
||||
public ResponseDTO<String> logout() {
|
||||
return loginService.logout(SmartRequestUtil.getRequestUser());
|
||||
}
|
||||
|
||||
@Operation(summary = "获取验证码 @author 卓大")
|
||||
@GetMapping("/login/getCaptcha")
|
||||
@NoNeedLogin
|
||||
public ResponseDTO<CaptchaVO> getCaptcha() {
|
||||
return loginService.getCaptcha();
|
||||
}
|
||||
|
||||
@NoNeedLogin
|
||||
@GetMapping("/login/sendEmailCode/{loginName}")
|
||||
@Operation(summary = "获取邮箱登录验证码 @author 卓大")
|
||||
public ResponseDTO<String> sendEmailCode(@PathVariable String loginName) {
|
||||
return loginService.sendEmailCode(loginName);
|
||||
}
|
||||
|
||||
|
||||
@NoNeedLogin
|
||||
@GetMapping("/login/getTwoFactorLoginFlag")
|
||||
@Operation(summary = "获取双因子登录标识 @author 卓大")
|
||||
public ResponseDTO<Boolean> getTwoFactorLoginFlag() {
|
||||
// 双因子登录
|
||||
boolean twoFactorLoginEnabled = level3ProtectConfigService.isTwoFactorLoginEnabled();
|
||||
return ResponseDTO.ok(twoFactorLoginEnabled);
|
||||
}
|
||||
}
|
||||
@ -1,39 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.login.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import lombok.Data;
|
||||
import net.lab1024.sa.base.common.swagger.SchemaEnum;
|
||||
import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
|
||||
import net.lab1024.sa.base.constant.LoginDeviceEnum;
|
||||
import net.lab1024.sa.base.module.support.captcha.domain.CaptchaForm;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
/**
|
||||
* 员工登录
|
||||
*
|
||||
* @Author 1024创新实验室: 开云
|
||||
* @Date 2021-12-19 11:49:45
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class LoginForm extends CaptchaForm {
|
||||
|
||||
@Schema(description = "登录账号")
|
||||
@NotBlank(message = "登录账号不能为空")
|
||||
@Length(max = 30, message = "登录账号最多30字符")
|
||||
private String loginName;
|
||||
|
||||
@Schema(description = "密码")
|
||||
@NotBlank(message = "密码不能为空")
|
||||
private String password;
|
||||
|
||||
@SchemaEnum(desc = "登录终端", value = LoginDeviceEnum.class)
|
||||
@CheckEnum(value = LoginDeviceEnum.class, required = true, message = "此终端不允许登录")
|
||||
private Integer loginDevice;
|
||||
|
||||
@Schema(description = "邮箱验证码")
|
||||
private String emailCode;
|
||||
}
|
||||
@ -1,173 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.login.manager;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import net.lab1024.sa.admin.constant.AdminCacheConst;
|
||||
import net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentVO;
|
||||
import net.lab1024.sa.admin.module.system.department.service.DepartmentService;
|
||||
import net.lab1024.sa.admin.module.system.employee.domain.entity.EmployeeEntity;
|
||||
import net.lab1024.sa.admin.module.system.employee.service.EmployeeService;
|
||||
import net.lab1024.sa.admin.module.system.login.domain.RequestEmployee;
|
||||
import net.lab1024.sa.admin.module.system.menu.domain.vo.MenuVO;
|
||||
import net.lab1024.sa.admin.module.system.role.domain.vo.RoleVO;
|
||||
import net.lab1024.sa.admin.module.system.role.service.RoleEmployeeService;
|
||||
import net.lab1024.sa.admin.module.system.role.service.RoleMenuService;
|
||||
import net.lab1024.sa.base.common.constant.StringConst;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.domain.UserPermission;
|
||||
import net.lab1024.sa.base.common.enumeration.UserTypeEnum;
|
||||
import net.lab1024.sa.base.common.util.SmartBeanUtil;
|
||||
import net.lab1024.sa.base.module.support.file.service.IFileStorageService;
|
||||
import org.apache.commons.lang3.BooleanUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.cache.annotation.CacheEvict;
|
||||
import org.springframework.cache.annotation.CachePut;
|
||||
import org.springframework.cache.annotation.Cacheable;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 登录Manager
|
||||
*
|
||||
* @Author 1024创新实验室: 卓大
|
||||
* @Date 2025-05-03 22:56:34
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Slf4j
|
||||
@Service
|
||||
public class LoginManager {
|
||||
|
||||
@Resource
|
||||
private DepartmentService departmentService;
|
||||
|
||||
@Resource
|
||||
private IFileStorageService fileStorageService;
|
||||
|
||||
@Resource
|
||||
private EmployeeService employeeService;
|
||||
|
||||
@Resource
|
||||
private RoleEmployeeService roleEmployeeService;
|
||||
|
||||
@Resource
|
||||
private RoleMenuService roleMenuService;
|
||||
|
||||
|
||||
/**
|
||||
* 获取请求用户信息
|
||||
*/
|
||||
@Cacheable(AdminCacheConst.Login.REQUEST_EMPLOYEE)
|
||||
public RequestEmployee getRequestEmployee(Long requestEmployeeId ) {
|
||||
if (requestEmployeeId == null) {
|
||||
return null;
|
||||
}
|
||||
// 员工基本信息
|
||||
EmployeeEntity employeeEntity = employeeService.getById(requestEmployeeId);
|
||||
if (employeeEntity == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return this.loadLoginInfo(employeeEntity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取登录的用户信息
|
||||
*/
|
||||
@CachePut(value = AdminCacheConst.Login.REQUEST_EMPLOYEE, key = "#employeeEntity.employeeId")
|
||||
public RequestEmployee loadLoginInfo(EmployeeEntity employeeEntity) {
|
||||
// 基础信息
|
||||
RequestEmployee requestEmployee = SmartBeanUtil.copy(employeeEntity, RequestEmployee.class);
|
||||
requestEmployee.setUserType(UserTypeEnum.ADMIN_EMPLOYEE);
|
||||
|
||||
// 部门信息
|
||||
DepartmentVO department = departmentService.getDepartmentById(employeeEntity.getDepartmentId());
|
||||
requestEmployee.setDepartmentName(null == department ? StringConst.EMPTY : department.getDepartmentName());
|
||||
|
||||
// 头像信息
|
||||
String avatar = employeeEntity.getAvatar();
|
||||
if (StringUtils.isNotBlank(avatar)) {
|
||||
ResponseDTO<String> getFileUrl = fileStorageService.getFileUrl(avatar);
|
||||
if (BooleanUtils.isTrue(getFileUrl.getOk())) {
|
||||
requestEmployee.setAvatar(getFileUrl.getData());
|
||||
}
|
||||
}
|
||||
return requestEmployee;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取用户的权限（包含 角色列表、权限列表）
|
||||
*/
|
||||
@Cacheable(AdminCacheConst.Login.USER_PERMISSION)
|
||||
public UserPermission getUserPermission(Long employeeId) {
|
||||
if(null == employeeId){
|
||||
return null;
|
||||
}
|
||||
|
||||
return this.loadUserPermission(employeeId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取用户的权限（包含 角色列表、权限列表）
|
||||
*/
|
||||
@CachePut(AdminCacheConst.Login.USER_PERMISSION)
|
||||
public UserPermission loadUserPermission(Long employeeId) {
|
||||
UserPermission userPermission = new UserPermission();
|
||||
userPermission.setPermissionList(new ArrayList<>());
|
||||
userPermission.setRoleList(new ArrayList<>());
|
||||
|
||||
// 角色列表
|
||||
List<RoleVO> roleList = roleEmployeeService.getRoleIdList(employeeId);
|
||||
userPermission.getRoleList().addAll(roleList.stream().map(RoleVO::getRoleCode).collect(Collectors.toSet()));
|
||||
|
||||
// 前端菜单和功能点清单
|
||||
EmployeeEntity employeeEntity = employeeService.getById(employeeId);
|
||||
|
||||
List<MenuVO> menuAndPointsList = roleMenuService.getMenuList(roleList.stream().map(RoleVO::getRoleId).collect(Collectors.toList()), employeeEntity.getAdministratorFlag());
|
||||
|
||||
// 权限列表
|
||||
HashSet<String> permissionSet = new HashSet<>();
|
||||
for (MenuVO menu : menuAndPointsList) {
|
||||
if (menu.getPermsType() == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
String perms = menu.getApiPerms();
|
||||
if (StringUtils.isEmpty(perms)) {
|
||||
continue;
|
||||
}
|
||||
//接口权限
|
||||
String[] split = perms.split(",");
|
||||
permissionSet.addAll(Arrays.asList(split));
|
||||
}
|
||||
userPermission.getPermissionList().addAll(permissionSet);
|
||||
|
||||
return userPermission;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 清除用户权限
|
||||
*/
|
||||
@CacheEvict(value = AdminCacheConst.Login.USER_PERMISSION)
|
||||
public void clearUserPermission(Long employeeId) {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 清除用户登录信息
|
||||
*/
|
||||
@CacheEvict(value = AdminCacheConst.Login.REQUEST_EMPLOYEE)
|
||||
public void clearUserLoginInfo(Long employeeId) {
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -1,480 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.login.service;
|
||||
|
||||
import cn.dev33.satoken.stp.StpInterface;
|
||||
import cn.dev33.satoken.stp.StpUtil;
|
||||
import cn.hutool.core.lang.UUID;
|
||||
import cn.hutool.core.util.NumberUtil;
|
||||
import cn.hutool.core.util.RandomUtil;
|
||||
import cn.hutool.extra.servlet.JakartaServletUtil;
|
||||
import jakarta.annotation.Resource;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import net.lab1024.sa.admin.module.system.employee.domain.entity.EmployeeEntity;
|
||||
import net.lab1024.sa.admin.module.system.employee.service.EmployeeService;
|
||||
import net.lab1024.sa.admin.module.system.login.domain.LoginForm;
|
||||
import net.lab1024.sa.admin.module.system.login.domain.LoginResultVO;
|
||||
import net.lab1024.sa.admin.module.system.login.domain.RequestEmployee;
|
||||
import net.lab1024.sa.admin.module.system.login.manager.LoginManager;
|
||||
import net.lab1024.sa.admin.module.system.menu.domain.vo.MenuVO;
|
||||
import net.lab1024.sa.admin.module.system.role.domain.vo.RoleVO;
|
||||
import net.lab1024.sa.admin.module.system.role.service.RoleEmployeeService;
|
||||
import net.lab1024.sa.admin.module.system.role.service.RoleMenuService;
|
||||
import net.lab1024.sa.base.common.code.UserErrorCode;
|
||||
import net.lab1024.sa.base.common.constant.RequestHeaderConst;
|
||||
import net.lab1024.sa.base.common.constant.StringConst;
|
||||
import net.lab1024.sa.base.common.domain.RequestUser;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.domain.UserPermission;
|
||||
import net.lab1024.sa.base.common.enumeration.UserTypeEnum;
|
||||
import net.lab1024.sa.base.common.util.SmartBeanUtil;
|
||||
import net.lab1024.sa.base.common.util.SmartEnumUtil;
|
||||
import net.lab1024.sa.base.common.util.SmartIpUtil;
|
||||
import net.lab1024.sa.base.common.util.SmartStringUtil;
|
||||
import net.lab1024.sa.base.constant.LoginDeviceEnum;
|
||||
import net.lab1024.sa.base.constant.RedisKeyConst;
|
||||
import net.lab1024.sa.base.module.support.apiencrypt.service.ApiEncryptService;
|
||||
import net.lab1024.sa.base.module.support.captcha.CaptchaService;
|
||||
import net.lab1024.sa.base.module.support.captcha.domain.CaptchaVO;
|
||||
import net.lab1024.sa.base.module.support.config.ConfigKeyEnum;
|
||||
import net.lab1024.sa.base.module.support.config.ConfigService;
|
||||
import net.lab1024.sa.base.module.support.loginlog.LoginLogResultEnum;
|
||||
import net.lab1024.sa.base.module.support.loginlog.LoginLogService;
|
||||
import net.lab1024.sa.base.module.support.loginlog.domain.LoginLogEntity;
|
||||
import net.lab1024.sa.base.module.support.loginlog.domain.LoginLogVO;
|
||||
import net.lab1024.sa.base.module.support.mail.MailService;
|
||||
import net.lab1024.sa.base.module.support.mail.constant.MailTemplateCodeEnum;
|
||||
import net.lab1024.sa.base.module.support.redis.RedisService;
|
||||
import net.lab1024.sa.base.module.support.securityprotect.domain.LoginFailEntity;
|
||||
import net.lab1024.sa.base.module.support.securityprotect.service.Level3ProtectConfigService;
|
||||
import net.lab1024.sa.base.module.support.securityprotect.service.SecurityLoginService;
|
||||
import net.lab1024.sa.base.module.support.securityprotect.service.SecurityPasswordService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 登录
|
||||
*
|
||||
* @Author 1024创新实验室: 卓大
|
||||
* @Date 2025-05-03 22:56:34
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Slf4j
|
||||
@Service
|
||||
public class LoginService implements StpInterface {
|
||||
|
||||
/**
|
||||
* 万能密码的 sa token loginId 前缀
|
||||
*/
|
||||
private static final String SUPER_PASSWORD_LOGIN_ID_PREFIX = "S";
|
||||
|
||||
@Resource
|
||||
private EmployeeService employeeService;
|
||||
|
||||
@Resource
|
||||
private CaptchaService captchaService;
|
||||
|
||||
@Resource
|
||||
private ConfigService configService;
|
||||
|
||||
@Resource
|
||||
private LoginLogService loginLogService;
|
||||
|
||||
@Resource
|
||||
private RoleEmployeeService roleEmployeeService;
|
||||
|
||||
@Resource
|
||||
private RoleMenuService roleMenuService;
|
||||
|
||||
@Resource
|
||||
private SecurityLoginService securityLoginService;
|
||||
|
||||
@Resource
|
||||
private SecurityPasswordService protectPasswordService;
|
||||
|
||||
@Resource
|
||||
private ApiEncryptService apiEncryptService;
|
||||
|
||||
@Resource
|
||||
private Level3ProtectConfigService level3ProtectConfigService;
|
||||
|
||||
@Resource
|
||||
private MailService mailService;
|
||||
|
||||
@Resource
|
||||
private RedisService redisService;
|
||||
|
||||
@Resource
|
||||
private LoginManager loginManager;
|
||||
|
||||
/**
|
||||
* 获取验证码
|
||||
*/
|
||||
public ResponseDTO<CaptchaVO> getCaptcha() {
|
||||
return ResponseDTO.ok(captchaService.generateCaptcha());
|
||||
}
|
||||
|
||||
/**
|
||||
* 员工登录
|
||||
*
|
||||
* @return 返回用户登录信息
|
||||
*/
|
||||
public ResponseDTO<LoginResultVO> login(LoginForm loginForm, String ip, String userAgent) {
|
||||
|
||||
LoginDeviceEnum loginDeviceEnum = SmartEnumUtil.getEnumByValue(loginForm.getLoginDevice(), LoginDeviceEnum.class);
|
||||
if (loginDeviceEnum == null) {
|
||||
return ResponseDTO.userErrorParam("登录设备暂不支持！");
|
||||
}
|
||||
|
||||
// 校验 图形验证码
|
||||
ResponseDTO<String> checkCaptcha = captchaService.checkCaptcha(loginForm);
|
||||
if (!checkCaptcha.getOk()) {
|
||||
return ResponseDTO.error(UserErrorCode.PARAM_ERROR, checkCaptcha.getMsg());
|
||||
}
|
||||
|
||||
// 验证登录名
|
||||
EmployeeEntity employeeEntity = employeeService.getByLoginName(loginForm.getLoginName());
|
||||
if (null == employeeEntity) {
|
||||
return ResponseDTO.userErrorParam("登录名或密码错误！");
|
||||
}
|
||||
|
||||
// 验证账号状态
|
||||
if (employeeEntity.getDeletedFlag()) {
|
||||
saveLoginLog(employeeEntity, ip, userAgent, "账号已删除", LoginLogResultEnum.LOGIN_FAIL, loginDeviceEnum);
|
||||
return ResponseDTO.userErrorParam("您的账号已被删除,请联系工作人员！");
|
||||
}
|
||||
|
||||
if (employeeEntity.getDisabledFlag()) {
|
||||
saveLoginLog(employeeEntity, ip, userAgent, "账号已禁用", LoginLogResultEnum.LOGIN_FAIL, loginDeviceEnum);
|
||||
return ResponseDTO.userErrorParam("您的账号已被禁用,请联系工作人员！");
|
||||
}
|
||||
|
||||
// 解密前端加密的密码
|
||||
String requestPassword = apiEncryptService.decrypt(loginForm.getPassword());
|
||||
|
||||
// 验证密码 是否为万能密码
|
||||
String superPassword = configService.getConfigValue(ConfigKeyEnum.SUPER_PASSWORD);
|
||||
boolean superPasswordFlag = superPassword.equals(requestPassword);
|
||||
|
||||
// 校验双因子登录
|
||||
ResponseDTO<String> validateEmailCode = validateEmailCode(loginForm, employeeEntity, superPasswordFlag);
|
||||
if (!validateEmailCode.getOk()) {
|
||||
return ResponseDTO.error(validateEmailCode);
|
||||
}
|
||||
|
||||
// 万能密码特殊操作
|
||||
if (superPasswordFlag) {
|
||||
|
||||
// 对于万能密码：受限制sa token 要求loginId唯一，万能密码只能插入一段uuid
|
||||
String saTokenLoginId = SUPER_PASSWORD_LOGIN_ID_PREFIX + StringConst.COLON + UUID.randomUUID().toString().replace("-", "") + StringConst.COLON + employeeEntity.getEmployeeId();
|
||||
// 万能密码登录只能登录30分钟
|
||||
StpUtil.login(saTokenLoginId, 1800);
|
||||
|
||||
} else {
|
||||
|
||||
// 按照等保登录要求，进行登录失败次数校验
|
||||
ResponseDTO<LoginFailEntity> loginFailEntityResponseDTO = securityLoginService.checkLogin(employeeEntity.getEmployeeId(), UserTypeEnum.ADMIN_EMPLOYEE);
|
||||
if (!loginFailEntityResponseDTO.getOk()) {
|
||||
return ResponseDTO.error(loginFailEntityResponseDTO);
|
||||
}
|
||||
|
||||
// 密码错误
|
||||
if (!SecurityPasswordService.matchesPwd(employeeService.generateSaltPassword(requestPassword, employeeEntity.getEmployeeUid()), employeeEntity.getLoginPwd())) {
|
||||
// 记录登录失败
|
||||
saveLoginLog(employeeEntity, ip, userAgent, "密码错误", LoginLogResultEnum.LOGIN_FAIL, loginDeviceEnum);
|
||||
// 记录等级保护次数
|
||||
String msg = securityLoginService.recordLoginFail(employeeEntity.getEmployeeId(), UserTypeEnum.ADMIN_EMPLOYEE, employeeEntity.getLoginName(), loginFailEntityResponseDTO.getData());
|
||||
return msg == null ? ResponseDTO.userErrorParam("登录名或密码错误！") : ResponseDTO.error(UserErrorCode.LOGIN_FAIL_WILL_LOCK, msg);
|
||||
}
|
||||
|
||||
String saTokenLoginId = UserTypeEnum.ADMIN_EMPLOYEE.getValue() + StringConst.COLON + employeeEntity.getEmployeeId();
|
||||
|
||||
// 登录
|
||||
StpUtil.login(saTokenLoginId, String.valueOf(loginDeviceEnum.getDesc()));
|
||||
|
||||
// 移除邮箱验证码
|
||||
deleteEmailCode(employeeEntity.getEmployeeId());
|
||||
}
|
||||
|
||||
// 获取员工信息
|
||||
RequestEmployee requestEmployee = loginManager.loadLoginInfo(employeeEntity);
|
||||
|
||||
// 移除登录失败
|
||||
securityLoginService.removeLoginFail(employeeEntity.getEmployeeId(), UserTypeEnum.ADMIN_EMPLOYEE);
|
||||
|
||||
// 获取登录结果信息
|
||||
String token = StpUtil.getTokenValue();
|
||||
LoginResultVO loginResultVO = getLoginResult(requestEmployee, token);
|
||||
|
||||
//保存登录记录
|
||||
saveLoginLog(employeeEntity, ip, userAgent, superPasswordFlag ? "万能密码登录" : StringConst.EMPTY, LoginLogResultEnum.LOGIN_SUCCESS, loginDeviceEnum);
|
||||
|
||||
// 设置 token
|
||||
loginResultVO.setToken(token);
|
||||
|
||||
// 更新用户权限
|
||||
loginManager.loadUserPermission(employeeEntity.getEmployeeId());
|
||||
|
||||
return ResponseDTO.ok(loginResultVO);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取登录结果信息
|
||||
*/
|
||||
public LoginResultVO getLoginResult(RequestEmployee requestEmployee, String token) {
|
||||
|
||||
// 基础信息
|
||||
LoginResultVO loginResultVO = SmartBeanUtil.copy(requestEmployee, LoginResultVO.class);
|
||||
|
||||
// 前端菜单和功能点清单
|
||||
List<RoleVO> roleList = roleEmployeeService.getRoleIdList(requestEmployee.getEmployeeId());
|
||||
List<MenuVO> menuAndPointsList = roleMenuService.getMenuList(roleList.stream().map(RoleVO::getRoleId).collect(Collectors.toList()), requestEmployee.getAdministratorFlag());
|
||||
loginResultVO.setMenuList(menuAndPointsList);
|
||||
|
||||
// 上次登录信息
|
||||
LoginLogVO loginLogVO = loginLogService.queryLastByUserId(requestEmployee.getEmployeeId(), UserTypeEnum.ADMIN_EMPLOYEE, LoginLogResultEnum.LOGIN_SUCCESS);
|
||||
if (loginLogVO != null) {
|
||||
loginResultVO.setLastLoginIp(loginLogVO.getLoginIp());
|
||||
loginResultVO.setLastLoginIpRegion(loginLogVO.getLoginIpRegion());
|
||||
loginResultVO.setLastLoginTime(loginLogVO.getCreateTime());
|
||||
loginResultVO.setLastLoginUserAgent(loginLogVO.getUserAgent());
|
||||
}
|
||||
|
||||
// 是否需要强制修改密码
|
||||
boolean needChangePasswordFlag = protectPasswordService.checkNeedChangePassword(requestEmployee.getUserType().getValue(), requestEmployee.getUserId());
|
||||
loginResultVO.setNeedUpdatePwdFlag(needChangePasswordFlag);
|
||||
|
||||
// 万能密码登录，则不需要设置强制修改密码
|
||||
String loginIdByToken = (String) StpUtil.getLoginIdByToken(token);
|
||||
if (loginIdByToken != null && loginIdByToken.startsWith(SUPER_PASSWORD_LOGIN_ID_PREFIX)) {
|
||||
loginResultVO.setNeedUpdatePwdFlag(false);
|
||||
}
|
||||
|
||||
return loginResultVO;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 根据登录token 获取员请求工信息
|
||||
*/
|
||||
public RequestEmployee getLoginEmployee(String loginId, HttpServletRequest request) {
|
||||
if (loginId == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
Long requestEmployeeId = getEmployeeIdByLoginId(loginId);
|
||||
if (requestEmployeeId == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
RequestEmployee requestEmployee = loginManager.getRequestEmployee(requestEmployeeId);
|
||||
|
||||
// 更新请求ip和user agent
|
||||
requestEmployee.setUserAgent(JakartaServletUtil.getHeaderIgnoreCase(request, RequestHeaderConst.USER_AGENT));
|
||||
requestEmployee.setIp(JakartaServletUtil.getClientIP(request));
|
||||
|
||||
return requestEmployee;
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据 loginId 获取 员工id
|
||||
*/
|
||||
Long getEmployeeIdByLoginId(String loginId) {
|
||||
|
||||
if (loginId == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
// 如果是 万能密码 登录的用户
|
||||
String employeeIdStr = null;
|
||||
if (loginId.startsWith(SUPER_PASSWORD_LOGIN_ID_PREFIX)) {
|
||||
employeeIdStr = loginId.split(StringConst.COLON)[2];
|
||||
} else {
|
||||
employeeIdStr = loginId.substring(2);
|
||||
}
|
||||
|
||||
return Long.parseLong(employeeIdStr);
|
||||
} catch (Exception e) {
|
||||
log.error("loginId parse error , loginId : {}", loginId, e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 退出登录
|
||||
*/
|
||||
public ResponseDTO<String> logout(RequestUser requestUser) {
|
||||
|
||||
// sa token 登出
|
||||
StpUtil.logout();
|
||||
|
||||
// 清除用户登录信息缓存和权限信息
|
||||
this.clearLoginEmployeeCache(requestUser.getUserId());
|
||||
|
||||
//保存登出日志
|
||||
LoginLogEntity loginEntity = LoginLogEntity.builder()
|
||||
.userId(requestUser.getUserId())
|
||||
.userType(requestUser.getUserType().getValue())
|
||||
.userName(requestUser.getUserName())
|
||||
.userAgent(requestUser.getUserAgent())
|
||||
.loginIp(requestUser.getIp())
|
||||
.loginIpRegion(SmartIpUtil.getRegion(requestUser.getIp()))
|
||||
.loginResult(LoginLogResultEnum.LOGIN_OUT.getValue())
|
||||
.createTime(LocalDateTime.now())
|
||||
.build();
|
||||
loginLogService.log(loginEntity);
|
||||
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存登录日志
|
||||
*/
|
||||
private void saveLoginLog(EmployeeEntity employeeEntity, String ip, String userAgent, String remark, LoginLogResultEnum result, LoginDeviceEnum loginDeviceEnum) {
|
||||
LoginLogEntity loginEntity = LoginLogEntity.builder()
|
||||
.userId(employeeEntity.getEmployeeId())
|
||||
.userType(UserTypeEnum.ADMIN_EMPLOYEE.getValue())
|
||||
.userName(employeeEntity.getActualName())
|
||||
.userAgent(userAgent)
|
||||
.loginIp(ip)
|
||||
.loginIpRegion(SmartIpUtil.getRegion(ip))
|
||||
.remark(remark)
|
||||
.loginDevice(loginDeviceEnum.getDesc())
|
||||
.loginResult(result.getValue())
|
||||
.createTime(LocalDateTime.now())
|
||||
.build();
|
||||
loginLogService.log(loginEntity);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public List<String> getPermissionList(Object loginId, String loginType) {
|
||||
Long employeeId = this.getEmployeeIdByLoginId((String) loginId);
|
||||
if (employeeId == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
UserPermission userPermission = loginManager.getUserPermission(employeeId);
|
||||
return userPermission.getPermissionList();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getRoleList(Object loginId, String loginType) {
|
||||
Long employeeId = this.getEmployeeIdByLoginId((String) loginId);
|
||||
if (employeeId == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
UserPermission userPermission = loginManager.getUserPermission(employeeId);
|
||||
return userPermission.getRoleList();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 发送 邮箱 验证码
|
||||
*/
|
||||
public ResponseDTO<String> sendEmailCode(String loginName) {
|
||||
|
||||
// 开启双因子登录
|
||||
if (!level3ProtectConfigService.isTwoFactorLoginEnabled()) {
|
||||
return ResponseDTO.userErrorParam("无需使用邮箱验证码");
|
||||
}
|
||||
|
||||
// 验证登录名
|
||||
EmployeeEntity employeeEntity = employeeService.getByLoginName(loginName);
|
||||
if (null == employeeEntity) {
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
// 验证账号状态
|
||||
if (employeeEntity.getDeletedFlag()) {
|
||||
return ResponseDTO.userErrorParam("您的账号已被删除,请联系工作人员！");
|
||||
}
|
||||
|
||||
if (employeeEntity.getDisabledFlag()) {
|
||||
return ResponseDTO.userErrorParam("您的账号已被禁用,请联系工作人员！");
|
||||
}
|
||||
|
||||
String mail = employeeEntity.getEmail();
|
||||
if (SmartStringUtil.isBlank(mail)) {
|
||||
return ResponseDTO.userErrorParam("您暂未配置邮箱地址，请联系管理员配置邮箱");
|
||||
}
|
||||
|
||||
// 校验验证码发送时间，60秒内不能重复发生
|
||||
String redisVerificationCodeKey = redisService.generateRedisKey(RedisKeyConst.Support.LOGIN_VERIFICATION_CODE, UserTypeEnum.ADMIN_EMPLOYEE.getValue() + RedisKeyConst.SEPARATOR + employeeEntity.getEmployeeId());
|
||||
String emailCode = redisService.get(redisVerificationCodeKey);
|
||||
long sendCodeTimeMills = -1;
|
||||
if (!SmartStringUtil.isEmpty(emailCode)) {
|
||||
sendCodeTimeMills = NumberUtil.parseLong(emailCode.split(StringConst.UNDERLINE)[1]);
|
||||
}
|
||||
|
||||
if (System.currentTimeMillis() - sendCodeTimeMills < 60 * 1000) {
|
||||
return ResponseDTO.userErrorParam("邮箱验证码已发送，一分钟内请勿重复发送");
|
||||
}
|
||||
|
||||
//生成验证码
|
||||
long currentTimeMillis = System.currentTimeMillis();
|
||||
String verificationCode = RandomUtil.randomNumbers(4);
|
||||
redisService.set(redisVerificationCodeKey, verificationCode + StringConst.UNDERLINE + currentTimeMillis, 300);
|
||||
|
||||
// 发送邮件验证码
|
||||
HashMap<String, Object> mailParams = new HashMap<>();
|
||||
mailParams.put("code", verificationCode);
|
||||
return mailService.sendMail(MailTemplateCodeEnum.LOGIN_VERIFICATION_CODE, mailParams, Collections.singletonList(employeeEntity.getEmail()));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 校验邮箱验证码
|
||||
*/
|
||||
private ResponseDTO<String> validateEmailCode(LoginForm loginForm, EmployeeEntity employeeEntity, boolean superPasswordFlag) {
|
||||
// 万能密码则不校验
|
||||
if (superPasswordFlag) {
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
// 未开启双因子登录
|
||||
if (!level3ProtectConfigService.isTwoFactorLoginEnabled()) {
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
if (SmartStringUtil.isEmpty(loginForm.getEmailCode())) {
|
||||
return ResponseDTO.userErrorParam("请输入邮箱验证码");
|
||||
}
|
||||
|
||||
// 校验验证码
|
||||
String redisVerificationCodeKey = redisService.generateRedisKey(RedisKeyConst.Support.LOGIN_VERIFICATION_CODE, UserTypeEnum.ADMIN_EMPLOYEE.getValue() + RedisKeyConst.SEPARATOR + employeeEntity.getEmployeeId());
|
||||
String emailCode = redisService.get(redisVerificationCodeKey);
|
||||
if (SmartStringUtil.isEmpty(emailCode)) {
|
||||
return ResponseDTO.userErrorParam("邮箱验证码已失效，请重新发送");
|
||||
}
|
||||
|
||||
if (!emailCode.split(StringConst.UNDERLINE)[0].equals(loginForm.getEmailCode().trim())) {
|
||||
return ResponseDTO.userErrorParam("邮箱验证码错误，请重新填写");
|
||||
}
|
||||
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 移除邮箱验证码
|
||||
*/
|
||||
private void deleteEmailCode(Long employeeId) {
|
||||
String redisVerificationCodeKey = redisService.generateRedisKey(RedisKeyConst.Support.LOGIN_VERIFICATION_CODE, UserTypeEnum.ADMIN_EMPLOYEE.getValue() + RedisKeyConst.SEPARATOR + employeeId);
|
||||
redisService.delete(redisVerificationCodeKey);
|
||||
}
|
||||
|
||||
public void clearLoginEmployeeCache(Long employeeId) {
|
||||
loginManager.clearUserPermission(employeeId);
|
||||
loginManager.clearUserLoginInfo(employeeId);
|
||||
}
|
||||
}
|
||||
@ -1,83 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.menu.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.annotation.Resource;
|
||||
import jakarta.validation.Valid;
|
||||
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
|
||||
import net.lab1024.sa.admin.module.system.menu.domain.form.MenuAddForm;
|
||||
import net.lab1024.sa.admin.module.system.menu.domain.form.MenuUpdateForm;
|
||||
import net.lab1024.sa.admin.module.system.menu.domain.vo.MenuTreeVO;
|
||||
import net.lab1024.sa.admin.module.system.menu.domain.vo.MenuVO;
|
||||
import net.lab1024.sa.admin.module.system.menu.service.MenuService;
|
||||
import net.lab1024.sa.base.common.domain.RequestUrlVO;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.util.SmartRequestUtil;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 菜单
|
||||
*
|
||||
* @Author 1024创新实验室: 善逸
|
||||
* @Date 2022-03-06 22:04:37
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@RestController
|
||||
@Tag(name = AdminSwaggerTagConst.System.SYSTEM_MENU)
|
||||
public class MenuController {
|
||||
|
||||
@Resource
|
||||
private MenuService menuService;
|
||||
|
||||
@Operation(summary = "添加菜单 @author 卓大")
|
||||
@PostMapping("/menu/add")
|
||||
@SaCheckPermission("system:menu:add")
|
||||
public ResponseDTO<String> addMenu(@RequestBody @Valid MenuAddForm menuAddForm) {
|
||||
menuAddForm.setCreateUserId(SmartRequestUtil.getRequestUserId());
|
||||
return menuService.addMenu(menuAddForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "更新菜单 @author 卓大")
|
||||
@PostMapping("/menu/update")
|
||||
@SaCheckPermission("system:menu:update")
|
||||
public ResponseDTO<String> updateMenu(@RequestBody @Valid MenuUpdateForm menuUpdateForm) {
|
||||
menuUpdateForm.setUpdateUserId(SmartRequestUtil.getRequestUserId());
|
||||
return menuService.updateMenu(menuUpdateForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "批量删除菜单 @author 卓大")
|
||||
@GetMapping("/menu/batchDelete")
|
||||
@SaCheckPermission("system:menu:batchDelete")
|
||||
public ResponseDTO<String> batchDeleteMenu(@RequestParam("menuIdList") List<Long> menuIdList) {
|
||||
return menuService.batchDeleteMenu(menuIdList, SmartRequestUtil.getRequestUserId());
|
||||
}
|
||||
|
||||
@Operation(summary = "查询菜单列表 @author 卓大")
|
||||
@GetMapping("/menu/query")
|
||||
public ResponseDTO<List<MenuVO>> queryMenuList() {
|
||||
return ResponseDTO.ok(menuService.queryMenuList(null));
|
||||
}
|
||||
|
||||
@Operation(summary = "查询菜单详情 @author 卓大")
|
||||
@GetMapping("/menu/detail/{menuId}")
|
||||
public ResponseDTO<MenuVO> getMenuDetail(@PathVariable Long menuId) {
|
||||
return menuService.getMenuDetail(menuId);
|
||||
}
|
||||
|
||||
@Operation(summary = "查询菜单树 @author 卓大")
|
||||
@GetMapping("/menu/tree")
|
||||
public ResponseDTO<List<MenuTreeVO>> queryMenuTree(@RequestParam("onlyMenu") Boolean onlyMenu) {
|
||||
return menuService.queryMenuTree(onlyMenu);
|
||||
}
|
||||
|
||||
@Operation(summary = "获取所有请求路径 @author 卓大")
|
||||
@GetMapping("/menu/auth/url")
|
||||
public ResponseDTO<List<RequestUrlVO>> getAuthUrl() {
|
||||
return menuService.getAuthUrl();
|
||||
}
|
||||
}
|
||||
@ -1,96 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.menu.dao;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.stereotype.Component;
|
||||
import net.lab1024.sa.admin.module.system.menu.domain.entity.MenuEntity;
|
||||
import net.lab1024.sa.admin.module.system.menu.domain.vo.MenuVO;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 菜单 dao
|
||||
*
|
||||
* @Author 1024创新实验室: 善逸
|
||||
* @Date 2022-03-06 22:04:37
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Mapper
|
||||
public interface MenuDao extends BaseMapper<MenuEntity> {
|
||||
|
||||
/**
|
||||
* 根据名称查询同一级下的菜单
|
||||
*
|
||||
* @param menuName 菜单名
|
||||
* @param parentId 父级id
|
||||
* @param deletedFlag 是否删除
|
||||
*/
|
||||
MenuEntity getByMenuName(@Param("menuName") String menuName, @Param("parentId") Long parentId, @Param("deletedFlag") Boolean deletedFlag);
|
||||
|
||||
/**
|
||||
* 根据前端权限字符串查询菜单
|
||||
*
|
||||
* @param webPerms 前端权限字符串
|
||||
* @param deletedFlag 是否删除
|
||||
*/
|
||||
MenuEntity getByWebPerms(@Param("webPerms") String webPerms, @Param("deletedFlag") Boolean deletedFlag);
|
||||
|
||||
/**
|
||||
* 根据菜单ID删除菜单（逻辑删除）
|
||||
*
|
||||
* @param menuIdList 菜单id集合
|
||||
* @param updateUserId 操作人id
|
||||
* @param deletedFlag 是否删除
|
||||
*/
|
||||
void deleteByMenuIdList(@Param("menuIdList") List<Long> menuIdList, @Param("updateUserId") Long updateUserId, @Param("deletedFlag") Boolean deletedFlag);
|
||||
|
||||
/**
|
||||
* 查询菜单列表
|
||||
*
|
||||
* @param deletedFlag 是否删除
|
||||
* @param disabledFlag 是否禁用
|
||||
* @param menuTypeList 菜单类型集合
|
||||
*/
|
||||
List<MenuVO> queryMenuList(@Param("deletedFlag") Boolean deletedFlag, @Param("disabledFlag") Boolean disabledFlag, @Param("menuTypeList") List<Integer> menuTypeList);
|
||||
|
||||
|
||||
/**
|
||||
* 根据菜单ID 查询功能点列表
|
||||
*
|
||||
* @param menuId 菜单id
|
||||
* @param menuType 菜单类型
|
||||
* @param deletedFlag 删除标记
|
||||
*/
|
||||
List<MenuEntity> getPointListByMenuId(@Param("menuId") Long menuId, @Param("menuType") Integer menuType, @Param("deletedFlag") Boolean deletedFlag);
|
||||
|
||||
/**
|
||||
* 根据员工ID查询菜单列表
|
||||
*
|
||||
* @param deletedFlag 是否删除
|
||||
* @param disabledFlag 禁用标识
|
||||
* @param employeeId 员工id
|
||||
*/
|
||||
List<MenuVO> queryMenuByEmployeeId(@Param("deletedFlag") Boolean deletedFlag,
|
||||
@Param("disabledFlag") Boolean disabledFlag,
|
||||
@Param("employeeId") Long employeeId);
|
||||
|
||||
/**
|
||||
* 根据菜单类型查询
|
||||
*
|
||||
* @param menuType 菜单类型
|
||||
* @param deletedFlag 删除
|
||||
* @param disabledFlag 禁用
|
||||
*/
|
||||
List<MenuEntity> queryMenuByType(@Param("menuType") Integer menuType,
|
||||
@Param("deletedFlag") Boolean deletedFlag,
|
||||
@Param("disabledFlag") Boolean disabledFlag);
|
||||
|
||||
/**
|
||||
* 查询孩子id
|
||||
*
|
||||
*/
|
||||
List<Long> selectMenuIdByParentIdList(@Param("menuIdList") List<Long> menuIdList);
|
||||
}
|
||||
@ -1,81 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.menu.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
import net.lab1024.sa.admin.module.system.menu.constant.MenuPermsTypeEnum;
|
||||
import net.lab1024.sa.admin.module.system.menu.constant.MenuTypeEnum;
|
||||
import net.lab1024.sa.base.common.swagger.SchemaEnum;
|
||||
import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
/**
|
||||
* 菜单基础
|
||||
*
|
||||
* @Author 1024创新实验室: 善逸
|
||||
* @Date 2022-03-06 22:04:37
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class MenuBaseForm {
|
||||
|
||||
@Schema(description = "菜单名称")
|
||||
@NotBlank(message = "菜单名称不能为空")
|
||||
@Length(max = 30, message = "菜单名称最多30个字符")
|
||||
private String menuName;
|
||||
|
||||
@SchemaEnum(value = MenuTypeEnum.class, desc = "类型")
|
||||
@CheckEnum(value = MenuTypeEnum.class, message = "类型错误")
|
||||
private Integer menuType;
|
||||
|
||||
@Schema(description = "父菜单ID 无上级可传0")
|
||||
@NotNull(message = "父菜单ID不能为空")
|
||||
private Long parentId;
|
||||
|
||||
@Schema(description = "显示顺序")
|
||||
private Integer sort;
|
||||
|
||||
@Schema(description = "路由地址")
|
||||
private String path;
|
||||
|
||||
@Schema(description = "组件路径")
|
||||
private String component;
|
||||
|
||||
@Schema(description = "是否为外链")
|
||||
@NotNull(message = "是否为外链不能为空")
|
||||
private Boolean frameFlag;
|
||||
|
||||
@Schema(description = "外链地址")
|
||||
private String frameUrl;
|
||||
|
||||
@Schema(description = "是否缓存")
|
||||
@NotNull(message = "是否缓存不能为空")
|
||||
private Boolean cacheFlag;
|
||||
|
||||
@Schema(description = "显示状态")
|
||||
@NotNull(message = "显示状态不能为空")
|
||||
private Boolean visibleFlag;
|
||||
|
||||
@Schema(description = "禁用状态")
|
||||
@NotNull(message = "禁用状态不能为空")
|
||||
private Boolean disabledFlag;
|
||||
|
||||
@SchemaEnum(value = MenuPermsTypeEnum.class, desc = "权限类型 ")
|
||||
@CheckEnum(value = MenuPermsTypeEnum.class, message = "权限类型")
|
||||
private Integer permsType;
|
||||
|
||||
@Schema(description = "前端权限字符串")
|
||||
private String webPerms;
|
||||
|
||||
@Schema(description = "后端端权限字符串")
|
||||
private String apiPerms;
|
||||
|
||||
@Schema(description = "菜单图标")
|
||||
private String icon;
|
||||
|
||||
@Schema(description = "功能点关联菜单ID")
|
||||
private Long contextMenuId;
|
||||
}
|
||||
@ -1,43 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.menu.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 菜单功能点操作Form
|
||||
*
|
||||
* @Author 1024创新实验室: 善逸
|
||||
* @Date 2022-03-06 22:04:37
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class MenuPointsOperateForm {
|
||||
|
||||
@Schema(description = "菜单ID")
|
||||
private Long menuId;
|
||||
|
||||
@Schema(description = "功能点名称")
|
||||
@NotBlank(message = "功能点不能为空")
|
||||
@Length(max = 30, message = "功能点最多30个字符")
|
||||
private String menuName;
|
||||
|
||||
@Schema(description = "禁用状态")
|
||||
@NotNull(message = "禁用状态不能为空")
|
||||
private Boolean disabledFlag;
|
||||
|
||||
@Schema(description = "后端接口权限集合")
|
||||
private List<String> apiPermsList;
|
||||
|
||||
@Schema(description = "权限字符串")
|
||||
private String webPerms;
|
||||
|
||||
@Schema(description = "功能点关联菜单ID")
|
||||
private Long contextMenuId;
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.menu.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 菜单 更新Form
|
||||
*
|
||||
* @Author 1024创新实验室: 善逸
|
||||
* @Date 2022-03-06 22:04:37
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class MenuUpdateForm extends MenuBaseForm {
|
||||
|
||||
@Schema(description = "菜单ID")
|
||||
@NotNull(message = "菜单ID不能为空")
|
||||
private Long menuId;
|
||||
|
||||
@Schema(hidden = true)
|
||||
private Long updateUserId;
|
||||
}
|
||||
@ -1,237 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.menu.service;
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import com.google.common.collect.Lists;
|
||||
import jakarta.annotation.Resource;
|
||||
import net.lab1024.sa.admin.module.system.menu.constant.MenuTypeEnum;
|
||||
import net.lab1024.sa.admin.module.system.menu.dao.MenuDao;
|
||||
import net.lab1024.sa.admin.module.system.menu.domain.entity.MenuEntity;
|
||||
import net.lab1024.sa.admin.module.system.menu.domain.form.MenuAddForm;
|
||||
import net.lab1024.sa.admin.module.system.menu.domain.form.MenuBaseForm;
|
||||
import net.lab1024.sa.admin.module.system.menu.domain.form.MenuUpdateForm;
|
||||
import net.lab1024.sa.admin.module.system.menu.domain.vo.MenuTreeVO;
|
||||
import net.lab1024.sa.admin.module.system.menu.domain.vo.MenuVO;
|
||||
import net.lab1024.sa.base.common.code.SystemErrorCode;
|
||||
import net.lab1024.sa.base.common.domain.RequestUrlVO;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.util.SmartBeanUtil;
|
||||
import net.lab1024.sa.base.common.util.SmartStringUtil;
|
||||
import org.apache.commons.lang3.math.NumberUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 菜单
|
||||
*
|
||||
* @Author 1024创新实验室: 善逸
|
||||
* @Date 2022-03-08 22:15:09
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Service
|
||||
public class MenuService {
|
||||
|
||||
@Resource
|
||||
private MenuDao menuDao;
|
||||
|
||||
@Resource
|
||||
private List<RequestUrlVO> authUrl;
|
||||
|
||||
/**
|
||||
* 添加菜单
|
||||
*
|
||||
*/
|
||||
public synchronized ResponseDTO<String> addMenu(MenuAddForm menuAddForm) {
|
||||
// 校验菜单名称
|
||||
if (this.validateMenuName(menuAddForm)) {
|
||||
return ResponseDTO.userErrorParam("菜单名称已存在");
|
||||
}
|
||||
// 校验前端权限字符串
|
||||
if (this.validateWebPerms(menuAddForm)) {
|
||||
return ResponseDTO.userErrorParam("前端权限字符串已存在");
|
||||
}
|
||||
MenuEntity menuEntity = SmartBeanUtil.copy(menuAddForm, MenuEntity.class);
|
||||
menuDao.insert(menuEntity);
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新菜单
|
||||
*
|
||||
*/
|
||||
public synchronized ResponseDTO<String> updateMenu(MenuUpdateForm menuUpdateForm) {
|
||||
//校验菜单是否存在
|
||||
MenuEntity selectMenu = menuDao.selectById(menuUpdateForm.getMenuId());
|
||||
if (selectMenu == null) {
|
||||
return ResponseDTO.userErrorParam("菜单不存在");
|
||||
}
|
||||
if (selectMenu.getDeletedFlag()) {
|
||||
return ResponseDTO.userErrorParam("菜单已被删除");
|
||||
}
|
||||
//校验菜单名称
|
||||
if (this.validateMenuName(menuUpdateForm)) {
|
||||
return ResponseDTO.userErrorParam("菜单名称已存在");
|
||||
}
|
||||
// 校验前端权限字符串
|
||||
if (this.validateWebPerms(menuUpdateForm)) {
|
||||
return ResponseDTO.userErrorParam("前端权限字符串已存在");
|
||||
}
|
||||
if (menuUpdateForm.getMenuId().equals(menuUpdateForm.getParentId())) {
|
||||
return ResponseDTO.userErrorParam("上级菜单不能为自己");
|
||||
}
|
||||
MenuEntity menuEntity = SmartBeanUtil.copy(menuUpdateForm, MenuEntity.class);
|
||||
menuDao.updateById(menuEntity);
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 批量删除菜单
|
||||
*
|
||||
*/
|
||||
public synchronized ResponseDTO<String> batchDeleteMenu(List<Long> menuIdList, Long employeeId) {
|
||||
if (CollectionUtils.isEmpty(menuIdList)) {
|
||||
return ResponseDTO.userErrorParam("所选菜单不能为空");
|
||||
}
|
||||
menuDao.deleteByMenuIdList(menuIdList, employeeId, Boolean.TRUE);
|
||||
//孩子节点也需要删除
|
||||
this.recursiveDeleteChildren(menuIdList, employeeId);
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
private void recursiveDeleteChildren(List<Long> menuIdList, Long employeeId) {
|
||||
List<Long> childrenMenuIdList = menuDao.selectMenuIdByParentIdList(menuIdList);
|
||||
if (CollectionUtil.isEmpty(childrenMenuIdList)) {
|
||||
return;
|
||||
}
|
||||
menuDao.deleteByMenuIdList(childrenMenuIdList, employeeId, Boolean.TRUE);
|
||||
recursiveDeleteChildren(childrenMenuIdList, employeeId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验菜单名称
|
||||
*
|
||||
*/
|
||||
public <T extends MenuBaseForm> Boolean validateMenuName(T menuDTO) {
|
||||
MenuEntity menu = menuDao.getByMenuName(menuDTO.getMenuName(), menuDTO.getParentId(), Boolean.FALSE);
|
||||
if (menuDTO instanceof MenuAddForm) {
|
||||
return menu != null;
|
||||
}
|
||||
if (menuDTO instanceof MenuUpdateForm) {
|
||||
Long menuId = ((MenuUpdateForm) menuDTO).getMenuId();
|
||||
return menu != null && menu.getMenuId().longValue() != menuId.longValue();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验前端权限字符串
|
||||
*
|
||||
* @return true 重复 false 未重复
|
||||
*/
|
||||
public <T extends MenuBaseForm> Boolean validateWebPerms(T menuDTO) {
|
||||
if(SmartStringUtil.isEmpty(menuDTO.getWebPerms())){
|
||||
return false;
|
||||
}
|
||||
|
||||
MenuEntity menu = menuDao.getByWebPerms(menuDTO.getWebPerms(), Boolean.FALSE);
|
||||
if (menuDTO instanceof MenuAddForm) {
|
||||
return menu != null;
|
||||
}
|
||||
if (menuDTO instanceof MenuUpdateForm) {
|
||||
Long menuId = ((MenuUpdateForm) menuDTO).getMenuId();
|
||||
return menu != null && menu.getMenuId().longValue() != menuId.longValue();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询菜单列表
|
||||
*
|
||||
*/
|
||||
public List<MenuVO> queryMenuList(Boolean disabledFlag) {
|
||||
List<MenuVO> menuVOList = menuDao.queryMenuList(Boolean.FALSE, disabledFlag, null);
|
||||
//根据ParentId进行分组
|
||||
Map<Long, List<MenuVO>> parentMap = menuVOList.stream().collect(Collectors.groupingBy(MenuVO::getParentId, Collectors.toList()));
|
||||
return this.filterNoParentMenu(parentMap, NumberUtils.LONG_ZERO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 过滤没有上级菜单的菜单列表
|
||||
*
|
||||
*/
|
||||
private List<MenuVO> filterNoParentMenu(Map<Long, List<MenuVO>> parentMap, Long parentId) {
|
||||
// 获取本级菜单树List
|
||||
List<MenuVO> res = parentMap.getOrDefault(parentId, Lists.newArrayList());
|
||||
List<MenuVO> childMenu = Lists.newArrayList();
|
||||
// 循环遍历下级菜单
|
||||
res.forEach(e -> {
|
||||
List<MenuVO> menuList = this.filterNoParentMenu(parentMap, e.getMenuId());
|
||||
childMenu.addAll(menuList);
|
||||
});
|
||||
res.addAll(childMenu);
|
||||
return res;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询菜单树
|
||||
*
|
||||
* @param onlyMenu 不查询功能点
|
||||
*/
|
||||
public ResponseDTO<List<MenuTreeVO>> queryMenuTree(Boolean onlyMenu) {
|
||||
List<Integer> menuTypeList = Lists.newArrayList();
|
||||
if (onlyMenu) {
|
||||
menuTypeList = Lists.newArrayList(MenuTypeEnum.CATALOG.getValue(), MenuTypeEnum.MENU.getValue());
|
||||
}
|
||||
List<MenuVO> menuVOList = menuDao.queryMenuList(Boolean.FALSE, null, menuTypeList);
|
||||
//根据ParentId进行分组
|
||||
Map<Long, List<MenuVO>> parentMap = menuVOList.stream().collect(Collectors.groupingBy(MenuVO::getParentId, Collectors.toList()));
|
||||
List<MenuTreeVO> menuTreeVOList = this.buildMenuTree(parentMap, NumberUtils.LONG_ZERO);
|
||||
return ResponseDTO.ok(menuTreeVOList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建菜单树
|
||||
*
|
||||
*/
|
||||
List<MenuTreeVO> buildMenuTree(Map<Long, List<MenuVO>> parentMap, Long parentId) {
|
||||
// 获取本级菜单树List
|
||||
List<MenuTreeVO> res = parentMap.getOrDefault(parentId, Lists.newArrayList()).stream()
|
||||
.map(e -> SmartBeanUtil.copy(e, MenuTreeVO.class)).collect(Collectors.toList());
|
||||
// 循环遍历下级菜单
|
||||
res.forEach(e -> {
|
||||
e.setChildren(this.buildMenuTree(parentMap, e.getMenuId()));
|
||||
});
|
||||
return res;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询菜单详情
|
||||
*
|
||||
*/
|
||||
public ResponseDTO<MenuVO> getMenuDetail(Long menuId) {
|
||||
//校验菜单是否存在
|
||||
MenuEntity selectMenu = menuDao.selectById(menuId);
|
||||
if (selectMenu == null) {
|
||||
return ResponseDTO.error(SystemErrorCode.SYSTEM_ERROR, "菜单不存在");
|
||||
}
|
||||
if (selectMenu.getDeletedFlag()) {
|
||||
return ResponseDTO.error(SystemErrorCode.SYSTEM_ERROR, "菜单已被删除");
|
||||
}
|
||||
MenuVO menuVO = SmartBeanUtil.copy(selectMenu, MenuVO.class);
|
||||
return ResponseDTO.ok(menuVO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取系统所有请求路径
|
||||
*/
|
||||
public ResponseDTO<List<RequestUrlVO>> getAuthUrl() {
|
||||
return ResponseDTO.ok(authUrl);
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,54 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.message;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.validation.Valid;
|
||||
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
|
||||
import net.lab1024.sa.base.common.domain.PageResult;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.domain.ValidateList;
|
||||
import net.lab1024.sa.base.module.support.message.domain.MessageQueryForm;
|
||||
import net.lab1024.sa.base.module.support.message.domain.MessageSendForm;
|
||||
import net.lab1024.sa.base.module.support.message.domain.MessageVO;
|
||||
import net.lab1024.sa.base.module.support.message.service.MessageService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
|
||||
/**
|
||||
* 后管 消息路由
|
||||
*
|
||||
* @author: 卓大
|
||||
* @date: 2025/04/09 20:55
|
||||
*/
|
||||
@Tag(name = AdminSwaggerTagConst.System.SYSTEM_MESSAGE)
|
||||
@RestController
|
||||
public class AdminMessageController {
|
||||
|
||||
@Autowired
|
||||
private MessageService messageService;
|
||||
|
||||
@Operation(summary = "通知消息-新建 @author 卓大")
|
||||
@PostMapping("/message/sendMessages")
|
||||
@SaCheckPermission("system:message:send")
|
||||
public ResponseDTO<String> sendMessages(@RequestBody @Valid ValidateList<MessageSendForm> messageList) {
|
||||
messageService.sendMessage(messageList);
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "通知消息-分页查询 @author 卓大")
|
||||
@PostMapping("/message/query")
|
||||
@SaCheckPermission("system:message:query")
|
||||
public ResponseDTO<PageResult<MessageVO>> query(@RequestBody @Valid MessageQueryForm queryForm) {
|
||||
return ResponseDTO.ok(messageService.query(queryForm));
|
||||
}
|
||||
|
||||
@Operation(summary = "通知消息-删除 @author 卓大")
|
||||
@GetMapping("/message/delete/{messageId}")
|
||||
@SaCheckPermission("system:message:delete")
|
||||
public ResponseDTO<String> delete(@PathVariable Long messageId) {
|
||||
return messageService.delete(messageId);
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,71 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.position.controller;
|
||||
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.annotation.Resource;
|
||||
import jakarta.validation.Valid;
|
||||
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
|
||||
import net.lab1024.sa.admin.module.system.position.domain.form.PositionAddForm;
|
||||
import net.lab1024.sa.admin.module.system.position.domain.form.PositionQueryForm;
|
||||
import net.lab1024.sa.admin.module.system.position.domain.form.PositionUpdateForm;
|
||||
import net.lab1024.sa.admin.module.system.position.domain.vo.PositionVO;
|
||||
import net.lab1024.sa.admin.module.system.position.service.PositionService;
|
||||
import net.lab1024.sa.base.common.domain.PageResult;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.domain.ValidateList;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 职务表 Controller
|
||||
*
|
||||
* @Author kaiyun
|
||||
* @Date 2024-06-23 23:31:38
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
|
||||
@RestController
|
||||
@Tag(name = AdminSwaggerTagConst.System.SYSTEM_POSITION)
|
||||
public class PositionController {
|
||||
|
||||
@Resource
|
||||
private PositionService positionService;
|
||||
|
||||
@Operation(summary = "分页查询 @author kaiyun")
|
||||
@PostMapping("/position/queryPage")
|
||||
public ResponseDTO<PageResult<PositionVO>> queryPage(@RequestBody @Valid PositionQueryForm queryForm) {
|
||||
return ResponseDTO.ok(positionService.queryPage(queryForm));
|
||||
}
|
||||
|
||||
@Operation(summary = "添加 @author kaiyun")
|
||||
@PostMapping("/position/add")
|
||||
public ResponseDTO<String> add(@RequestBody @Valid PositionAddForm addForm) {
|
||||
return positionService.add(addForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "更新 @author kaiyun")
|
||||
@PostMapping("/position/update")
|
||||
public ResponseDTO<String> update(@RequestBody @Valid PositionUpdateForm updateForm) {
|
||||
return positionService.update(updateForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "批量删除 @author kaiyun")
|
||||
@PostMapping("/position/batchDelete")
|
||||
public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
|
||||
return positionService.batchDelete(idList);
|
||||
}
|
||||
|
||||
@Operation(summary = "单个删除 @author kaiyun")
|
||||
@GetMapping("/position/delete/{positionId}")
|
||||
public ResponseDTO<String> batchDelete(@PathVariable Long positionId) {
|
||||
return positionService.delete(positionId);
|
||||
}
|
||||
|
||||
|
||||
@Operation(summary = "不分页查询 @author kaiyun")
|
||||
@GetMapping("/position/queryList")
|
||||
public ResponseDTO<List<PositionVO>> queryList() {
|
||||
return ResponseDTO.ok(positionService.queryList());
|
||||
}
|
||||
}
|
||||
@ -1,40 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.position.dao;
|
||||
|
||||
import java.util.List;
|
||||
import net.lab1024.sa.admin.module.system.position.domain.entity.PositionEntity;
|
||||
import net.lab1024.sa.admin.module.system.position.domain.form.PositionQueryForm;
|
||||
import net.lab1024.sa.admin.module.system.position.domain.vo.PositionVO;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* 职务表 Dao
|
||||
*
|
||||
* @Author kaiyun
|
||||
* @Date 2024-06-23 23:31:38
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
|
||||
@Mapper
|
||||
public interface PositionDao extends BaseMapper<PositionEntity> {
|
||||
|
||||
/**
|
||||
* 分页 查询
|
||||
*
|
||||
* @param page
|
||||
* @param queryForm
|
||||
* @return
|
||||
*/
|
||||
List<PositionVO> queryPage(Page page, @Param("queryForm") PositionQueryForm queryForm);
|
||||
|
||||
|
||||
/**
|
||||
* 查询
|
||||
* @param deletedFlag
|
||||
* @return
|
||||
*/
|
||||
List<PositionVO> queryList(@Param("deletedFlag") Boolean deletedFlag);
|
||||
}
|
||||
@ -1,33 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.position.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 职务表 新建表单
|
||||
*
|
||||
* @Author kaiyun
|
||||
* @Date 2024-06-23 23:31:38
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class PositionAddForm {
|
||||
|
||||
@Schema(description = "职务名称", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@NotBlank(message = "职务名称 不能为空")
|
||||
private String positionName;
|
||||
|
||||
@Schema(description = "职级")
|
||||
private String positionLevel;
|
||||
|
||||
@Schema(description = "排序")
|
||||
@NotNull(message = "排序不能为空")
|
||||
private Integer sort;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.position.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 职务表 更新表单
|
||||
*
|
||||
* @Author kaiyun
|
||||
* @Date 2024-06-23 23:31:38
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class PositionUpdateForm extends PositionAddForm {
|
||||
|
||||
@Schema(description = "职务ID", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@NotNull(message = "职务ID 不能为空")
|
||||
private Long positionId;
|
||||
|
||||
}
|
||||
@ -1,105 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.position.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import jakarta.annotation.Resource;
|
||||
import net.lab1024.sa.admin.module.system.position.dao.PositionDao;
|
||||
import net.lab1024.sa.admin.module.system.position.domain.entity.PositionEntity;
|
||||
import net.lab1024.sa.admin.module.system.position.domain.form.PositionAddForm;
|
||||
import net.lab1024.sa.admin.module.system.position.domain.form.PositionQueryForm;
|
||||
import net.lab1024.sa.admin.module.system.position.domain.form.PositionUpdateForm;
|
||||
import net.lab1024.sa.admin.module.system.position.domain.vo.PositionVO;
|
||||
import net.lab1024.sa.base.common.domain.PageResult;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.util.SmartBeanUtil;
|
||||
import net.lab1024.sa.base.common.util.SmartPageUtil;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 职务表 Service
|
||||
*
|
||||
* @Author kaiyun
|
||||
* @Date 2024-06-23 23:31:38
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
|
||||
@Service
|
||||
public class PositionService {
|
||||
|
||||
@Resource
|
||||
private PositionDao positionDao;
|
||||
|
||||
/**
|
||||
* 分页查询
|
||||
*
|
||||
* @param queryForm
|
||||
* @return
|
||||
*/
|
||||
public PageResult<PositionVO> queryPage(PositionQueryForm queryForm) {
|
||||
queryForm.setDeletedFlag(Boolean.FALSE);
|
||||
Page<?> page = SmartPageUtil.convert2PageQuery(queryForm);
|
||||
List<PositionVO> list = positionDao.queryPage(page, queryForm);
|
||||
PageResult<PositionVO> pageResult = SmartPageUtil.convert2PageResult(page, list);
|
||||
return pageResult;
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*/
|
||||
public ResponseDTO<String> add(PositionAddForm addForm) {
|
||||
PositionEntity positionEntity = SmartBeanUtil.copy(addForm, PositionEntity.class);
|
||||
positionDao.insert(positionEntity);
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新
|
||||
*
|
||||
* @param updateForm
|
||||
* @return
|
||||
*/
|
||||
public ResponseDTO<String> update(PositionUpdateForm updateForm) {
|
||||
PositionEntity positionEntity = SmartBeanUtil.copy(updateForm, PositionEntity.class);
|
||||
positionDao.updateById(positionEntity);
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param idList
|
||||
* @return
|
||||
*/
|
||||
public ResponseDTO<String> batchDelete(List<Long> idList) {
|
||||
if (CollectionUtils.isEmpty(idList)){
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
positionDao.deleteBatchIds(idList);
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 单个删除
|
||||
*/
|
||||
public ResponseDTO<String> delete(Long positionId) {
|
||||
if (null == positionId){
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
positionDao.deleteById(positionId);
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public List<PositionVO> queryList() {
|
||||
List<PositionVO> list = positionDao.queryList(Boolean.FALSE);
|
||||
return list;
|
||||
}
|
||||
}
|
||||
@ -1,67 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.role.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.annotation.Resource;
|
||||
import jakarta.validation.Valid;
|
||||
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
|
||||
import net.lab1024.sa.admin.module.system.role.domain.form.RoleAddForm;
|
||||
import net.lab1024.sa.admin.module.system.role.domain.form.RoleUpdateForm;
|
||||
import net.lab1024.sa.admin.module.system.role.domain.vo.RoleVO;
|
||||
import net.lab1024.sa.admin.module.system.role.service.RoleService;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 角色
|
||||
*
|
||||
* @Author 1024创新实验室: 胡克
|
||||
* @Date 2021-12-14 19:40:28
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@RestController
|
||||
@Tag(name = AdminSwaggerTagConst.System.SYSTEM_ROLE)
|
||||
public class RoleController {
|
||||
|
||||
@Resource
|
||||
private RoleService roleService;
|
||||
|
||||
@Operation(summary = "添加角色 @author 卓大")
|
||||
@PostMapping("/role/add")
|
||||
@SaCheckPermission("system:role:add")
|
||||
public ResponseDTO<String> addRole(@Valid @RequestBody RoleAddForm roleAddForm) {
|
||||
return roleService.addRole(roleAddForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "删除角色 @author 卓大")
|
||||
@GetMapping("/role/delete/{roleId}")
|
||||
@SaCheckPermission("system:role:delete")
|
||||
public ResponseDTO<String> deleteRole(@PathVariable Long roleId) {
|
||||
return roleService.deleteRole(roleId);
|
||||
}
|
||||
|
||||
@Operation(summary = "更新角色 @author 卓大")
|
||||
@PostMapping("/role/update")
|
||||
@SaCheckPermission("system:role:update")
|
||||
public ResponseDTO<String> updateRole(@Valid @RequestBody RoleUpdateForm roleUpdateDTO) {
|
||||
return roleService.updateRole(roleUpdateDTO);
|
||||
}
|
||||
|
||||
@Operation(summary = "获取角色数据 @author 卓大")
|
||||
@GetMapping("/role/get/{roleId}")
|
||||
public ResponseDTO<RoleVO> getRole(@PathVariable("roleId") Long roleId) {
|
||||
return roleService.getRoleById(roleId);
|
||||
}
|
||||
|
||||
@Operation(summary = "获取所有角色 @author 卓大")
|
||||
@GetMapping("/role/getAll")
|
||||
public ResponseDTO<List<RoleVO>> getAllRole() {
|
||||
return roleService.getAllRole();
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,47 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.role.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.annotation.Resource;
|
||||
import jakarta.validation.Valid;
|
||||
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
|
||||
import net.lab1024.sa.admin.module.system.role.domain.form.RoleDataScopeUpdateForm;
|
||||
import net.lab1024.sa.admin.module.system.role.domain.vo.RoleDataScopeVO;
|
||||
import net.lab1024.sa.admin.module.system.role.service.RoleDataScopeService;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 角色的数据权限配置
|
||||
*
|
||||
* @Author 1024创新实验室-主任: 卓大
|
||||
* @Date 2022-02-26 22:09:59
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@RestController
|
||||
@Tag(name = AdminSwaggerTagConst.System.SYSTEM_ROLE_DATA_SCOPE)
|
||||
public class RoleDataScopeController {
|
||||
|
||||
@Resource
|
||||
private RoleDataScopeService roleDataScopeService;
|
||||
|
||||
@Operation(summary = "获取某角色所设置的数据范围 @author 卓大")
|
||||
@GetMapping("/role/dataScope/getRoleDataScopeList/{roleId}")
|
||||
public ResponseDTO<List<RoleDataScopeVO>> dataScopeListByRole(@PathVariable Long roleId) {
|
||||
return roleDataScopeService.getRoleDataScopeList(roleId);
|
||||
}
|
||||
|
||||
@Operation(summary = "批量设置某角色数据范围 @author 卓大")
|
||||
@PostMapping("/role/dataScope/updateRoleDataScopeList")
|
||||
@SaCheckPermission("system:role:dataScope:update")
|
||||
public ResponseDTO<String> updateRoleDataScopeList(@RequestBody @Valid RoleDataScopeUpdateForm roleDataScopeUpdateForm) {
|
||||
return roleDataScopeService.updateRoleDataScopeList(roleDataScopeUpdateForm);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -1,74 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.role.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.annotation.Resource;
|
||||
import jakarta.validation.Valid;
|
||||
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
|
||||
import net.lab1024.sa.admin.module.system.employee.domain.vo.EmployeeVO;
|
||||
import net.lab1024.sa.admin.module.system.role.domain.form.RoleEmployeeQueryForm;
|
||||
import net.lab1024.sa.admin.module.system.role.domain.form.RoleEmployeeUpdateForm;
|
||||
import net.lab1024.sa.admin.module.system.role.domain.vo.RoleSelectedVO;
|
||||
import net.lab1024.sa.admin.module.system.role.service.RoleEmployeeService;
|
||||
import net.lab1024.sa.base.common.domain.PageResult;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 角色的员工
|
||||
*
|
||||
* @Author 1024创新实验室-主任: 卓大
|
||||
* @Date 2022-02-26 22:09:59
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@RestController
|
||||
@Tag(name = AdminSwaggerTagConst.System.SYSTEM_ROLE_EMPLOYEE)
|
||||
public class RoleEmployeeController {
|
||||
|
||||
@Resource
|
||||
private RoleEmployeeService roleEmployeeService;
|
||||
|
||||
@Operation(summary = "查询某个角色下的员工列表 @author 卓大")
|
||||
@PostMapping("/role/employee/queryEmployee")
|
||||
public ResponseDTO<PageResult<EmployeeVO>> queryEmployee(@Valid @RequestBody RoleEmployeeQueryForm roleEmployeeQueryForm) {
|
||||
return roleEmployeeService.queryEmployee(roleEmployeeQueryForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "获取某个角色下的所有员工列表(无分页) @author 卓大")
|
||||
@GetMapping("/role/employee/getAllEmployeeByRoleId/{roleId}")
|
||||
public ResponseDTO<List<EmployeeVO>> listAllEmployeeRoleId(@PathVariable Long roleId) {
|
||||
return ResponseDTO.ok(roleEmployeeService.getAllEmployeeByRoleId(roleId));
|
||||
}
|
||||
|
||||
@Operation(summary = "从角色成员列表中移除员工 @author 卓大")
|
||||
@GetMapping("/role/employee/removeEmployee")
|
||||
@SaCheckPermission("system:role:employee:delete")
|
||||
public ResponseDTO<String> removeEmployee(Long employeeId, Long roleId) {
|
||||
return roleEmployeeService.removeRoleEmployee(employeeId, roleId);
|
||||
}
|
||||
|
||||
@Operation(summary = "从角色成员列表中批量移除员工 @author 卓大")
|
||||
@PostMapping("/role/employee/batchRemoveRoleEmployee")
|
||||
@SaCheckPermission("system:role:employee:batch:delete")
|
||||
public ResponseDTO<String> batchRemoveEmployee(@Valid @RequestBody RoleEmployeeUpdateForm updateForm) {
|
||||
return roleEmployeeService.batchRemoveRoleEmployee(updateForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "角色成员列表中批量添加员工 @author 卓大")
|
||||
@PostMapping("/role/employee/batchAddRoleEmployee")
|
||||
@SaCheckPermission("system:role:employee:add")
|
||||
public ResponseDTO<String> addEmployeeList(@Valid @RequestBody RoleEmployeeUpdateForm addForm) {
|
||||
return roleEmployeeService.batchAddRoleEmployee(addForm);
|
||||
}
|
||||
|
||||
@Operation(summary = "获取员工所有选中的角色和所有角色 @author 卓大")
|
||||
@GetMapping("/role/employee/getRoles/{employeeId}")
|
||||
public ResponseDTO<List<RoleSelectedVO>> getRoleByEmployeeId(@PathVariable Long employeeId) {
|
||||
return ResponseDTO.ok(roleEmployeeService.getRoleInfoListByEmployeeId(employeeId));
|
||||
}
|
||||
}
|
||||
@ -1,43 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.role.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.annotation.Resource;
|
||||
import jakarta.validation.Valid;
|
||||
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
|
||||
import net.lab1024.sa.admin.module.system.role.domain.form.RoleMenuUpdateForm;
|
||||
import net.lab1024.sa.admin.module.system.role.domain.vo.RoleMenuTreeVO;
|
||||
import net.lab1024.sa.admin.module.system.role.service.RoleMenuService;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
/**
|
||||
* 角色的菜单
|
||||
*
|
||||
* @Author 1024创新实验室-主任: 卓大
|
||||
* @Date 2022-02-26 21:34:01
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@RestController
|
||||
@Tag(name = AdminSwaggerTagConst.System.SYSTEM_ROLE_MENU)
|
||||
public class RoleMenuController {
|
||||
|
||||
@Resource
|
||||
private RoleMenuService roleMenuService;
|
||||
|
||||
@Operation(summary = "更新角色权限 @author 卓大")
|
||||
@PostMapping("/role/menu/updateRoleMenu")
|
||||
@SaCheckPermission("system:role:menu:update")
|
||||
public ResponseDTO<String> updateRoleMenu(@Valid @RequestBody RoleMenuUpdateForm updateDTO) {
|
||||
return roleMenuService.updateRoleMenu(updateDTO);
|
||||
}
|
||||
|
||||
@Operation(summary = "获取角色关联菜单权限 @author 卓大")
|
||||
@GetMapping("/role/menu/getRoleSelectedMenu/{roleId}")
|
||||
public ResponseDTO<RoleMenuTreeVO> getRoleSelectedMenu(@PathVariable Long roleId) {
|
||||
return roleMenuService.getRoleSelectedMenu(roleId);
|
||||
}
|
||||
}
|
||||
@ -1,41 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.role.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
/**
|
||||
* 角色 添加表单
|
||||
*
|
||||
* @Author 1024创新实验室: 胡克
|
||||
* @Date 2022-02-26 19:09:42
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class RoleAddForm {
|
||||
|
||||
/**
|
||||
* 角色名称
|
||||
*/
|
||||
@Schema(description = "角色名称")
|
||||
@NotNull(message = "角色名称不能为空")
|
||||
@Length(min = 1, max = 20, message = "角色名称(1-20)个字符")
|
||||
private String roleName;
|
||||
|
||||
@Schema(description = "角色编码")
|
||||
@NotNull(message = "角色编码 不能为空")
|
||||
@Length(min = 1, max = 20, message = "角色编码(1-20)个字符")
|
||||
private String roleCode;
|
||||
|
||||
/**
|
||||
* 角色描述
|
||||
*/
|
||||
@Schema(description = "角色描述")
|
||||
@Length(max = 255, message = "角色描述最多255个字符")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@ -1,43 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.role.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.Valid;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 角色的数据范围更新
|
||||
*
|
||||
* @Author 1024创新实验室: 罗伊
|
||||
* @Date 2022-04-08 21:53:04
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class RoleDataScopeUpdateForm {
|
||||
|
||||
@Schema(description = "角色id")
|
||||
@NotNull(message = "角色id不能为空")
|
||||
private Long roleId;
|
||||
|
||||
@Schema(description = "设置信息")
|
||||
@Valid
|
||||
private List<RoleUpdateDataScopeListFormItem> dataScopeItemList;
|
||||
|
||||
|
||||
@Data
|
||||
public static class RoleUpdateDataScopeListFormItem {
|
||||
|
||||
@Schema(description = "数据范围类型")
|
||||
@NotNull(message = "数据范围类型不能为空")
|
||||
private Integer dataScopeType;
|
||||
|
||||
@Schema(description = "可见范围")
|
||||
@NotNull(message = "可见范围不能为空")
|
||||
private Integer viewType;
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,30 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.role.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* 角色的员工更新
|
||||
*
|
||||
* @Author 1024创新实验室: 善逸
|
||||
* @Date 2022-04-08 21:53:04
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class RoleEmployeeUpdateForm {
|
||||
|
||||
@Schema(description = "角色id")
|
||||
@NotNull(message = "角色id不能为空")
|
||||
protected Long roleId;
|
||||
|
||||
@Schema(description = "员工id集合")
|
||||
@NotEmpty(message = "员工id不能为空")
|
||||
protected Set<Long> employeeIdList;
|
||||
|
||||
}
|
||||
@ -1,35 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.role.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 角色的菜单更新
|
||||
*
|
||||
* @Author 1024创新实验室: 善逸
|
||||
* @Date 2022-04-08 21:53:04
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class RoleMenuUpdateForm {
|
||||
|
||||
/**
|
||||
* 角色id
|
||||
*/
|
||||
@Schema(description = "角色id")
|
||||
@NotNull(message = "角色id不能为空")
|
||||
private Long roleId;
|
||||
|
||||
/**
|
||||
* 菜单ID 集合
|
||||
*/
|
||||
@Schema(description = "菜单ID集合")
|
||||
@NotNull(message = "菜单ID不能为空")
|
||||
private List<Long> menuIdList;
|
||||
|
||||
}
|
||||
@ -1,27 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.role.domain.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 角色更新修改
|
||||
*
|
||||
* @Author 1024创新实验室: 胡克
|
||||
* @Date 2022-02-26 19:09:42
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class RoleUpdateForm extends RoleAddForm {
|
||||
|
||||
/**
|
||||
* 角色id
|
||||
*/
|
||||
@Schema(description = "角色id")
|
||||
@NotNull(message = "角色id不能为空")
|
||||
protected Long roleId;
|
||||
|
||||
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.role.domain.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 角色
|
||||
*
|
||||
* @Author 1024创新实验室: 善逸
|
||||
* @Date 2022-04-08 21:53:04
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Data
|
||||
public class RoleVO {
|
||||
|
||||
@Schema(description = "角色ID")
|
||||
private Long roleId;
|
||||
|
||||
@Schema(description = "角色名称")
|
||||
private String roleName;
|
||||
|
||||
@Schema(description = "角色编码")
|
||||
private String roleCode;
|
||||
|
||||
@Schema(description = "角色备注")
|
||||
private String remark;
|
||||
}
|
||||
@ -1,38 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.role.manager;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import jakarta.annotation.Resource;
|
||||
import net.lab1024.sa.admin.module.system.role.dao.RoleMenuDao;
|
||||
import net.lab1024.sa.admin.module.system.role.domain.entity.RoleMenuEntity;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 角色-菜单 manager
|
||||
*
|
||||
* @Author 1024创新实验室: 善逸
|
||||
* @Date 2022-04-09 19:05:49
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Service
|
||||
public class RoleMenuManager extends ServiceImpl<RoleMenuDao, RoleMenuEntity> {
|
||||
|
||||
@Resource
|
||||
private RoleMenuDao roleMenuDao;
|
||||
|
||||
/**
|
||||
* 更新角色权限
|
||||
*
|
||||
*/
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void updateRoleMenu(Long roleId, List<RoleMenuEntity> roleMenuEntityList) {
|
||||
// 根据角色ID删除菜单权限
|
||||
roleMenuDao.deleteByRoleId(roleId);
|
||||
// 批量添加菜单权限
|
||||
saveBatch(roleMenuEntityList);
|
||||
}
|
||||
}
|
||||
@ -1,63 +0,0 @@
|
||||
package net.lab1024.sa.admin.module.system.role.service;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import jakarta.annotation.Resource;
|
||||
import net.lab1024.sa.admin.module.system.role.domain.entity.RoleDataScopeEntity;
|
||||
import net.lab1024.sa.admin.module.system.role.domain.form.RoleDataScopeUpdateForm;
|
||||
import net.lab1024.sa.admin.module.system.role.domain.vo.RoleDataScopeVO;
|
||||
import net.lab1024.sa.admin.module.system.role.manager.RoleDataScopeManager;
|
||||
import net.lab1024.sa.base.common.code.UserErrorCode;
|
||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||
import net.lab1024.sa.base.common.util.SmartBeanUtil;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 角色-数据范围
|
||||
*
|
||||
* @Author 1024创新实验室: 善逸
|
||||
* @Date 2021-10-22 23:17:47
|
||||
* @Wechat zhuoda1024
|
||||
* @Email lab1024@163.com
|
||||
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
|
||||
*/
|
||||
@Service
|
||||
public class RoleDataScopeService {
|
||||
|
||||
@Resource
|
||||
private RoleDataScopeManager roleDataScopeManager;
|
||||
|
||||
|
||||
/**
|
||||
* 获取某个角色的数据范围设置信息
|
||||
*
|
||||
*/
|
||||
public ResponseDTO<List<RoleDataScopeVO>> getRoleDataScopeList(Long roleId) {
|
||||
List<RoleDataScopeEntity> roleDataScopeEntityList = roleDataScopeManager.getBaseMapper().listByRoleId(roleId);
|
||||
if (CollectionUtils.isEmpty(roleDataScopeEntityList)) {
|
||||
return ResponseDTO.ok(Lists.newArrayList());
|
||||
}
|
||||
List<RoleDataScopeVO> roleDataScopeList = SmartBeanUtil.copyList(roleDataScopeEntityList, RoleDataScopeVO.class);
|
||||
return ResponseDTO.ok(roleDataScopeList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量设置某个角色的数据范围设置信息
|
||||
*
|
||||
*/
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public ResponseDTO<String> updateRoleDataScopeList(RoleDataScopeUpdateForm roleDataScopeUpdateForm) {
|
||||
List<RoleDataScopeUpdateForm.RoleUpdateDataScopeListFormItem> batchSetList = roleDataScopeUpdateForm.getDataScopeItemList();
|
||||
if (CollectionUtils.isEmpty(batchSetList)) {
|
||||
return ResponseDTO.error(UserErrorCode.PARAM_ERROR, "缺少配置信息");
|
||||
}
|
||||
List<RoleDataScopeEntity> roleDataScopeEntityList = SmartBeanUtil.copyList(batchSetList, RoleDataScopeEntity.class);
|
||||
roleDataScopeEntityList.forEach(e -> e.setRoleId(roleDataScopeUpdateForm.getRoleId()));
|
||||
roleDataScopeManager.getBaseMapper().deleteByRoleId(roleDataScopeUpdateForm.getRoleId());
|
||||
roleDataScopeManager.saveBatch(roleDataScopeEntityList);
|
||||
return ResponseDTO.ok();
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user