commit：同步2.0版本

2026-01-18 02:56:30 +08:00 · 2021-10-21 14:07:36 +08:00
parent e4a296695e
commit 8431b3bf62
179 changed files with 2677 additions and 8491 deletions
--- a/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/pom.xml
+++ b/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/pom.xml
@@ -19,6 +19,11 @@
            <artifactId>common-core</artifactId>
            <version>1.0.0</version>
        </dependency>
+        <dependency>
+            <groupId>com.orange.demo</groupId>
+            <artifactId>common-datafilter</artifactId>
+            <version>1.0.0</version>
+        </dependency>
        <!-- 通用业务依赖 -->
        <dependency>
            <groupId>com.orange.demo</groupId>
--- a/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysUserDto.java
+++ b/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysUserDto.java
@@ -50,6 +50,13 @@ public class SysUserDto {
    @NotBlank(message = "数据验证失败，用户显示名称不能为空！")
    private String showName;

+    /**
+     * 用户部门Id。
+     */
+    @ApiModelProperty(value = "用户部门Id", required = true)
+    @NotNull(message = "数据验证失败，用户部门Id不能为空！")
+    private Long deptId;
+
    /**
     * 用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)。
     */
--- a/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/vo/SysUserVo.java
+++ b/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/vo/SysUserVo.java
@@ -9,12 +9,12 @@ import java.util.Map;
 import java.util.List;

 /**
- * SysUserVO对象。
+ * SysUserVO视图对象。
 *
 * @author Jerry
 * @date 2020-08-08
 */
-@ApiModel("SysUserVO实体对象")
+@ApiModel("SysUserVO视图对象")
@Data
 public class SysUserVo {

@@ -36,6 +36,12 @@ public class SysUserVo {
    @ApiModelProperty(value = "用户显示名称")
    private String showName;

+    /**
+     * 用户部门Id。
+     */
+    @ApiModelProperty(value = "用户部门Id")
+    private Long deptId;
+
    /**
     * 用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)。
     */
@@ -84,6 +90,18 @@ public class SysUserVo {
    @ApiModelProperty(value = "多对多用户角色数据集合")
    private List<Map<String, Object>> sysUserRoleList;

+    /**
+     * 多对多用户数据权限数据集合。
+     */
+    @ApiModelProperty(value = "多对多用户数据权限数据集合")
+    private List<Map<String, Object>> sysDataPermUserList;
+
+    /**
+     * deptId 字典关联数据。
+     */
+    @ApiModelProperty(value = "deptId 字典关联数据")
+    private Map<String, Object> deptIdDictMap;
+
    /**
     * userType 常量字典关联数据。
     */
--- a/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/upms-api.iml
+++ b/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/upms-api.iml
@@ -64,26 +64,40 @@
    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.6" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.6" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.1.5" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.10.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.14.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-core:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: javax.persistence:persistence-api:1.0" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-base:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-weekend:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-extra:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.1.5" level="project" />
    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" level="project" />
    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3" level="project" />
    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.5" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.5" level="project" />
    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
+    <orderEntry type="module" module-name="common-datafilter" />
+    <orderEntry type="module" module-name="common-redis" />
+    <orderEntry type="library" name="Maven: org.redisson:redisson:3.15.4" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.63.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.63.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.63.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.63.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver-dns:4.1.63.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec-dns:4.1.63.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.cache:cache-api:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.16.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex.rxjava3:rxjava:3.0.12" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.marshalling:jboss-marshalling-river:2.0.11.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.marshalling:jboss-marshalling:2.0.11.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.4" level="project" />
+    <orderEntry type="library" name="Maven: org.jodd:jodd-bean:5.1.6" level="project" />
+    <orderEntry type="library" name="Maven: org.jodd:jodd-core:5.1.6" level="project" />
    <orderEntry type="module" module-name="application-common" />
    <orderEntry type="module" module-name="common-swagger" />
    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-micro-spring-boot-starter:2.0.8" level="project" />
@@ -151,11 +165,7 @@
    <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-cluster-server-default:1.8.0" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-cluster-common-default:1.8.0" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.63.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.63.Final" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.63.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.63.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.63.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.63.Final" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-cluster-client-default:1.8.0" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-sentinel-datasource:2.2.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-datasource-nacos:1.8.0" level="project" />
@@ -218,7 +228,7 @@
    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-javanica:1.5.18" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
    <orderEntry type="library" name="Maven: io.reactivex:rxjava-reactive-streams:1.2.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.0.Final" level="project" />
    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />