用户，部门去jpa

2022-11-29 20:00:13 +08:00
parent 2aa9f8e495
commit e63551f75a
10 changed files with 672 additions and 0 deletions
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/dto/UserDeptRelation.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/dto/UserDeptRelation.java
@@ -0,0 +1,13 @@
+package org.nl.modules.system.service.dto;
+
+import lombok.Data;
+
+/*
+ * @author ZZQ
+ * @Date 2022/11/29 6:28 下午
+ */
+@Data
+public class UserDeptRelation {
+    private Long user_id;
+    private Long dept_id;
+}
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/dto/UserDetail.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/dto/UserDetail.java
@@ -0,0 +1,88 @@
+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.nl.modules.system.service.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.nl.modules.common.base.BaseEntity;
+import org.nl.modules.system.domain.Dept;
+import org.nl.modules.system.domain.Role;
+
+import javax.persistence.Column;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Zheng Jie
+ * @date 2018-11-22
+ */
+@Getter
+@Setter
+public class UserDetail extends BaseEntity  implements Serializable {
+
+
+    private Long user_id;
+
+    private List<Dept> dept;
+
+    private List<Role> role;
+
+    @ApiModelProperty(value = "用户名称")
+    private String username;
+
+    @NotBlank
+    @ApiModelProperty(value = "用户昵称")
+    private String nickName;
+
+    @ApiModelProperty(value = "邮箱")
+    private String email;
+
+    @ApiModelProperty(value = "电话号码")
+    private String phone;
+
+    @ApiModelProperty(value = "用户性别")
+    private String gender;
+
+    @ApiModelProperty(value = "头像真实名称",hidden = true)
+    private String avatar_name;
+
+    @ApiModelProperty(value = "头像存储的路径", hidden = true)
+    private String avatar_path;
+
+    @ApiModelProperty(value = "密码")
+    private String password;
+
+    @ApiModelProperty(value = "是否为admin账号", hidden = true)
+    private Boolean isAdmin = false;
+
+    @Column(name = "pwd_reset_time")
+    @ApiModelProperty(value = "最后修改密码的时间", hidden = true)
+    private Date pwd_reset_time;
+    @Column(name = "pwd_reset_time")
+    @ApiModelProperty(value = "最后修改密码的时间", hidden = true)
+    private Long pwd_reset_user_id;
+
+    private String extperson_id;
+
+    private String extuser_id;
+
+    private Boolean is_used;
+
+
+}
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/tools/MapOf.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/tools/MapOf.java
@@ -0,0 +1,20 @@
+package org.nl.modules.tools;
+
+
+import java.io.Serializable;
+import java.util.HashMap;
+
+/*
+ * @author ZZQ
+ * @Date 2022/11/29 2:55 下午
+ */
+public class MapOf implements Serializable {
+
+    public static <K> HashMap of(K... key){
+        HashMap map = new HashMap<>();
+        for (int i = 0; i < (key.length & ~1); i=i+2) {
+            map.put(key[i],key[i+1]);
+        }
+        return map;
+    }
+}
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/sso/wql/SYS_DEPT.wql
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/sso/wql/SYS_DEPT.wql
@@ -0,0 +1,77 @@
+[交易说明]
+	交易名：	部门模块
+	所属模块：
+	功能简述：
+	版权所有：
+	表引用：
+	版本经历：
+
+[数据库]
+	--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
+
+[IO定义]
+	#################################################
+	##			表字段对应输入参数
+	#################################################
+	输入.flag					        TYPEAS s_string
+	输入.name					        TYPEAS s_string
+	输入.code					        TYPEAS s_string
+	输入.pid                              TYPEAS s_string
+	输入.pidIsNull                       TYPEAS s_string
+	输入.is_used                         TYPEAS s_string
+	输入.startTime                       TYPEAS s_string
+	输入.endTime                         TYPEAS s_string
+
+
+
+[临时表]
+	--这边列出来的临时表就会在运行期动态创建
+
+[临时变量]
+	--所有中间过程变量均可在此处定义
+
+[业务过程]
+
+	##########################################
+	#			1、输入输出检查				 #
+	##########################################
+
+
+	##########################################
+	#			2、主过程前处理				 #
+	##########################################
+
+
+	##########################################
+	#			3、业务主过程			 	 #
+	##########################################
+
+	IF 输入.flag = "1"
+		PAGEQUERY
+			SELECT
+                *
+            FROM
+                sys_dept
+            WHERE 1=1
+                OPTION 输入.pid <> ""
+                    pid = 输入.id
+                ENDOPTION
+                OPTION 输入.name <> ""
+                    name = 输入.name
+                ENDOPTION
+                OPTION 输入.code <> ""
+                    code = 输入.code
+                ENDOPTION
+                OPTION 输入.pidIsNull <> ""
+                    pid is null
+                ENDOPTION
+                OPTION 输入.startTime <> ""
+                    sys_user.create_time >= 输入.startTime
+                ENDOPTION
+                OPTION 输入.endTime <> ""
+                    sys_user.create_time <= 输入.endTime
+                ENDOPTION
+                order by dept_sort asc
+			ENDSELECT
+		ENDPAGEQUERY
+	ENDIF
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/sso/wql/SYS_MENU.wql
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/sso/wql/SYS_MENU.wql
@@ -0,0 +1,71 @@
+[交易说明]
+	交易名：	获取用户权限
+	所属模块：
+	功能简述：
+	版权所有：
+	表引用：
+	版本经历：
+
+[数据库]
+	--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
+
+[IO定义]
+	#################################################
+	##			表字段对应输入参数
+	#################################################
+	输入.flag 	           		             TYPEAS s_string
+	输入.user_id 	           		         TYPEAS s_string
+
+[临时表]
+	--这边列出来的临时表就会在运行期动态创建
+
+[临时变量]
+	--所有中间过程变量均可在此处定义
+
+[业务过程]
+
+	##########################################
+	#			1、输入输出检查				 #
+	##########################################
+
+
+	##########################################
+	#			2、主过程前处理				 #
+	##########################################
+
+
+	##########################################
+	#			3、业务主过程			 	 #
+	##########################################
+    IF 输入.flag = "1"
+    QUERY
+        SELECT DISTINCT
+            permission
+        FROM
+            sys_menu
+        WHERE
+            menu_id IN
+        (
+            SELECT
+                menu_id
+            FROM
+                sys_roles_menus
+            WHERE
+                role_id IN
+            (
+                SELECT
+                    role_id
+                FROM
+                    sys_users_roles
+                WHERE
+                    1=1
+                    OPTION 输入.user_id <> ""
+                        user_id = 输入.user_id
+                    ENDOPTION
+            )
+        )
+        AND permission IS NOT NULL
+        AND permission != ''
+        ENDSELECT
+        ENDQUERY
+    ENDIF
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/sso/wql/SYS_USER.wql
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/sso/wql/SYS_USER.wql
@@ -0,0 +1,82 @@
+[交易说明]
+	交易名：	用户模块
+	所属模块：
+	功能简述：
+	版权所有：
+	表引用：
+	版本经历：
+
+[数据库]
+	--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
+
+[IO定义]
+	#################################################
+	##			表字段对应输入参数
+	#################################################
+	输入.flag					        TYPEAS s_string
+	输入.deptIds					        TYPEAS s_string
+	输入.deptId					        TYPEAS s_string
+	输入.id                              TYPEAS s_string
+	输入.blurry                          TYPEAS s_string
+	输入.is_used                         TYPEAS s_string
+	输入.startTime                       TYPEAS s_string
+	输入.endTime                         TYPEAS s_string
+
+
+
+[临时表]
+	--这边列出来的临时表就会在运行期动态创建
+
+[临时变量]
+	--所有中间过程变量均可在此处定义
+
+[业务过程]
+
+	##########################################
+	#			1、输入输出检查				 #
+	##########################################
+
+
+	##########################################
+	#			2、主过程前处理				 #
+	##########################################
+
+
+	##########################################
+	#			3、业务主过程			 	 #
+	##########################################
+
+	IF 输入.flag = "1"
+		PAGEQUERY
+			SELECT
+                sys_user.*,GROUP_CONCAT(DISTINCT dept_id),GROUP_CONCAT(DISTINCT role_id)
+            FROM
+                sys_user
+            left join sys_user_dept on sys_user.user_id = sys_user_dept.user_id
+            left join sys_users_roles on sys_users_roles.user_id = sys_user.user_id
+            WHERE 1=1
+                OPTION 输入.id <> ""
+                    sys_user.id = 输入.id
+                ENDOPTION
+                OPTION 输入.deptIds <> ""
+                    sys_user.dept_id in 输入.deptIds
+                ENDOPTION
+                OPTION 输入.blurry <> ""
+                    (email like 输入.blurry or username like 输入.blurry or nickName like 输入.blurry)
+                ENDOPTION
+                OPTION 输入.is_used <> ""
+                    sys_user.is_used = 输入.enabled
+                ENDOPTION
+                OPTION 输入.deptId <> ""
+                    sys_user.dept_id = 输入.deptId
+                ENDOPTION
+                OPTION 输入.startTime <> ""
+                    sys_user.create_time >= 输入.startTime
+                ENDOPTION
+                OPTION 输入.endTime <> ""
+                    sys_user.create_time <= 输入.endTime
+                ENDOPTION
+                GROUP BY sys_user.user_id
+			ENDSELECT
+		ENDPAGEQUERY
+	ENDIF