jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 7629a5055f7a163570ec2052dd0bf53d2c59c5c5

Authored by rui.zhang
1 parent ad19c99426
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

platform permission 

add return pageinfo

Showing 16 changed files with 176 additions and 68 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/UsersMapper.java View file @ 7629a50
... ... @@ -17,7 +17,10 @@
17 17 public int queryUsersCount(UsersQuery query);
18 18  
19 19 public List<Users> queryUsers(UsersQuery query);
  20 + public List<Users> queryUsers2(UsersQuery query);
20 21  
21 22 public Users getUsersByLoginCenterId(Integer id);
  23 +
  24 +
22 25 }
platform-biz-service/src/main/java/com/lyms/platform/permission/model/DepartmentsQuery.java View file @ 7629a50
1 1 package com.lyms.platform.permission.model;
2 2  
3 3  
4   -
5 4 import com.lyms.platform.common.dao.BaseQuery;
6 5  
7 6 import java.util.Date;
8 7  
9 8  
  9 +public class DepartmentsQuery extends BaseQuery {
  10 + private Integer id;
  11 + private Integer parentId;
  12 + private String name;
  13 + private Integer orgId;
  14 + private String description;
  15 + private Integer publishId;
  16 + private String publishName;
  17 + private Integer yn;
  18 + private Date modified;
  19 + private Date created;
  20 + private Integer type;
  21 + private String shortCode;
  22 + private String keyword;
10 23  
11   -public class DepartmentsQuery extends BaseQuery {private Integer id;private Integer parentId;private String name;private Integer orgId;private String description;private Integer publishId;private String publishName;private Integer yn;private Date modified;private Date created;private Integer type;private String shortCode;
  24 + public String getShortCode() {
  25 + return shortCode;
  26 + }
12 27  
13   -public Integer getId() {
14   - return id;
  28 + public void setShortCode(String shortCode) {
  29 + this.shortCode = shortCode;
15 30 }
16 31  
  32 + public String getKeyword() {
  33 + return keyword;
  34 + }
17 35  
  36 + public void setKeyword(String keyword) {
  37 + this.keyword = keyword;
  38 + }
18 39  
  40 + public Integer getId() {
  41 + return id;
  42 + }
  43 +
  44 +
19 45 public void setId(Integer id) {
20 46 this.id = id;
21 47  
22 48 }
23 49  
24   -public Integer getParentId() {
  50 + public Integer getParentId() {
25 51 return parentId;
26 52 }
27 53  
28 54  
29   -
30 55 public void setParentId(Integer parentId) {
31 56 this.parentId = parentId;
32 57  
33 58 }
34 59  
35   -public String getName() {
  60 + public String getName() {
36 61 return name;
37 62 }
38 63  
39 64  
40   -
41 65 public void setName(String name) {
42 66 this.name = name;
43 67  
44 68 }
45 69  
46   -public Integer getOrgId() {
  70 + public Integer getOrgId() {
47 71 return orgId;
48 72 }
49 73  
50 74  
51   -
52 75 public void setOrgId(Integer orgId) {
53 76 this.orgId = orgId;
54 77  
55 78 }
56 79  
57   -public String getDescription() {
  80 + public String getDescription() {
58 81 return description;
59 82 }
60 83  
61 84  
62   -
63 85 public void setDescription(String description) {
64 86 this.description = description;
65 87  
66 88 }
67 89  
68   -public Integer getPublishId() {
  90 + public Integer getPublishId() {
69 91 return publishId;
70 92 }
71 93  
72 94  
73   -
74 95 public void setPublishId(Integer publishId) {
75 96 this.publishId = publishId;
76 97  
77 98 }
78 99  
79   -public String getPublishName() {
  100 + public String getPublishName() {
80 101 return publishName;
81 102 }
82 103  
83 104  
84   -
85 105 public void setPublishName(String publishName) {
86 106 this.publishName = publishName;
87 107  
88 108 }
89 109  
90   -public Integer getYn() {
  110 + public Integer getYn() {
91 111 return yn;
92 112 }
93 113  
94 114  
95   -
96 115 public void setYn(Integer yn) {
97 116 this.yn = yn;
98 117  
99 118 }
100 119  
101   -public Date getModified() {
  120 + public Date getModified() {
102 121 return modified;
103 122 }
104 123  
105 124  
106   -
107 125 public void setModified(Date modified) {
108 126 this.modified = modified;
109 127  
110 128 }
111 129  
112   -public Date getCreated() {
  130 + public Date getCreated() {
113 131 return created;
114 132 }
115 133  
116 134  
117   -
118 135 public void setCreated(Date created) {
119 136 this.created = created;
120 137  
121 138 }
122 139  
123   -public Integer getType() {
  140 + public Integer getType() {
124 141 return type;
125 142 }
126 143  
127 144  
128   -
129 145 public void setType(Integer type) {
130 146 this.type = type;
131 147  
132 148 }
133 149  
134   -public String getShortcode() {
  150 + public String getShortcode() {
135 151 return shortCode;
136 152 }
137   -
138 153  
139 154  
140 155 public void setShortcode(String shortCode) {
platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java View file @ 7629a50
... ... @@ -23,6 +23,23 @@
23 23 private Date modified;
24 24 private Date created;
25 25 private String shortCode;
  26 + private String keyword;
  27 +
  28 + public String getShortCode() {
  29 + return shortCode;
  30 + }
  31 +
  32 + public void setShortCode(String shortCode) {
  33 + this.shortCode = shortCode;
  34 + }
  35 +
  36 + public String getKeyword() {
  37 + return keyword;
  38 + }
  39 +
  40 + public void setKeyword(String keyword) {
  41 + this.keyword = keyword;
  42 + }
26 43  
27 44 public Integer getId() {
28 45 return id;
platform-biz-service/src/main/java/com/lyms/platform/permission/model/RolesQuery.java View file @ 7629a50
1 1 package com.lyms.platform.permission.model;
2 2  
3 3  
4   -
5 4 import com.lyms.platform.common.dao.BaseQuery;
6 5  
7 6 import java.util.Date;
8 7  
9 8  
  9 +public class RolesQuery extends BaseQuery {
  10 + private Integer id;
  11 + private Integer type;
  12 + private String name;
  13 + private Integer publishId;
  14 + private String publishName;
  15 + private Integer yn;
  16 + private Integer enable;
  17 + private Date modified;
  18 + private Date created;
  19 + private String remarks;
  20 + private String shortCode;
10 21  
  22 + private String keyword;
11 23  
12   -public class RolesQuery extends BaseQuery {private Integer id;private Integer type;private String name;private Integer publishId;private String publishName;private Integer yn;private Integer enable;private Date modified;private Date created;private String remarks;private String shortCode;
  24 + public String getKeyword() {
  25 + return keyword;
  26 + }
13 27  
14   -public Integer getId() {
  28 + public void setKeyword(String keyword) {
  29 + this.keyword = keyword;
  30 + }
  31 +
  32 + public Integer getId() {
15 33 return id;
16 34 }
17 35  
18 36  
19   -
20 37 public void setId(Integer id) {
21 38 this.id = id;
22 39  
23 40 }
24 41  
25   -public Integer getType() {
  42 + public Integer getType() {
26 43 return type;
27 44 }
28 45  
29 46  
30   -
31 47 public void setType(Integer type) {
32 48 this.type = type;
33 49  
34 50 }
35 51  
36   -public String getName() {
  52 + public String getName() {
37 53 return name;
38 54 }
39 55  
40 56  
41   -
42 57 public void setName(String name) {
43 58 this.name = name;
44 59  
45 60 }
46 61  
47   -public Integer getPublishId() {
  62 + public Integer getPublishId() {
48 63 return publishId;
49 64 }
50 65  
51 66  
52   -
53 67 public void setPublishId(Integer publishId) {
54 68 this.publishId = publishId;
55 69  
56 70 }
57 71  
58   -public String getPublishName() {
  72 + public String getPublishName() {
59 73 return publishName;
60 74 }
61 75  
62 76  
63   -
64 77 public void setPublishName(String publishName) {
65 78 this.publishName = publishName;
66 79  
67 80 }
68 81  
69   -public Integer getYn() {
  82 + public Integer getYn() {
70 83 return yn;
71 84 }
72 85  
73 86  
74   -
75 87 public void setYn(Integer yn) {
76 88 this.yn = yn;
77 89  
78 90 }
79 91  
80   -public Integer getEnable() {
  92 + public Integer getEnable() {
81 93 return enable;
82 94 }
83 95  
84 96  
85   -
86 97 public void setEnable(Integer enable) {
87 98 this.enable = enable;
88 99  
89 100 }
90 101  
91   -public Date getModified() {
  102 + public Date getModified() {
92 103 return modified;
93 104 }
94 105  
95 106  
96   -
97 107 public void setModified(Date modified) {
98 108 this.modified = modified;
99 109  
100 110 }
101 111  
102   -public Date getCreated() {
  112 + public Date getCreated() {
103 113 return created;
104 114 }
105 115  
106 116  
107   -
108 117 public void setCreated(Date created) {
109 118 this.created = created;
110 119  
111 120 }
112 121  
113   -public String getRemarks() {
  122 + public String getRemarks() {
114 123 return remarks;
115 124 }
116 125  
117 126  
118   -
119 127 public void setRemarks(String remarks) {
120 128 this.remarks = remarks;
121 129  
122 130 }
123 131  
124   -public String getShortcode() {
  132 + public String getShortcode() {
125 133 return shortCode;
126 134 }
127   -
128 135  
129 136  
130 137 public void setShortcode(String shortCode) {
platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java View file @ 7629a50
... ... @@ -6,7 +6,7 @@
6 6 public class Users {
7 7 private Integer id;
8 8 private Integer logincenterId;
9   - private Integer type;
  9 + private Integer type; //0 管理员 1 用户
10 10 private Integer orgId; //机构ID
11 11 private Integer deptId; //部门ID
12 12 private Integer ksId; //科室ID
platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java View file @ 7629a50
... ... @@ -9,7 +9,7 @@
9 9 public class UsersQuery extends BaseQuery {
10 10 private Integer id;
11 11 private Integer logincenterId;
12   - private Integer type;
  12 + private Integer type; //0¹ÜÀíÔ± 1Óû§
13 13 private Integer orgId;
14 14 private Integer deptId;
15 15 private String name;
... ... @@ -25,6 +25,25 @@
25 25 private String remarks;
26 26 private Date lastLoginTime;
27 27 private Integer ksId;
  28 +
  29 + private String keyword;
  30 + private Integer roleId;
  31 +
  32 + public Integer getRoleId() {
  33 + return roleId;
  34 + }
  35 +
  36 + public void setRoleId(Integer roleId) {
  37 + this.roleId = roleId;
  38 + }
  39 +
  40 + public String getKeyword() {
  41 + return keyword;
  42 + }
  43 +
  44 + public void setKeyword(String keyword) {
  45 + this.keyword = keyword;
  46 + }
28 47  
29 48 public Integer getKsId() {
30 49 return ksId;
platform-biz-service/src/main/java/com/lyms/platform/permission/service/UsersService.java View file @ 7629a50
... ... @@ -18,6 +18,8 @@
18 18  
19 19 public List<Users> queryUsers(UsersQuery query);
20 20  
  21 + public List<Users> queryUsers2(UsersQuery query);
  22 +
21 23 public Users getUsersByLoginCenterId(Integer id);
22 24  
23 25 }
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UsersServiceImpl.java View file @ 7629a50
... ... @@ -30,6 +30,11 @@
30 30 public List<Users> queryUsers (UsersQuery query){if (query.getNeed() != null) {query.mysqlBuild(usersMapper.queryUsersCount(query));}return usersMapper.queryUsers(query);}
31 31  
32 32 @Override
  33 + public List<Users> queryUsers2(UsersQuery query) {
  34 + return usersMapper.queryUsers2(query);
  35 + }
  36 +
  37 + @Override
33 38 public Users getUsersByLoginCenterId(Integer id) {
34 39 return usersMapper.getUsersByLoginCenterId(id);
35 40 }
platform-biz-service/src/main/resources/mainOrm/Departments.xml View file @ 7629a50
... ... @@ -126,6 +126,9 @@
126 126 <if test="shortCode != null and shortCode != ''">
127 127 and shortCode = #{shortCode,jdbcType=VARCHAR}
128 128 </if>
  129 + <if test="keyword != null and keyword != ''">
  130 + and name like CONCAT(#{keyword}, '%')
  131 + </if>
129 132 </where>
130 133 </sql>
131 134  
platform-biz-service/src/main/resources/mainOrm/Organization.xml View file @ 7629a50
... ... @@ -154,6 +154,9 @@
154 154 <if test="shortCode != null and shortCode != ''">
155 155 and shortCode = #{shortCode,jdbcType=VARCHAR}
156 156 </if>
  157 + <if test="keyword != null and keyword != ''">
  158 + and name like CONCAT(#{keyword}, '%')
  159 + </if>
157 160 </where>
158 161 </sql>
159 162  
platform-biz-service/src/main/resources/mainOrm/Roles.xml View file @ 7629a50
... ... @@ -119,6 +119,9 @@
119 119 <if test="shortCode != null and shortCode != ''">
120 120 and shortCode = #{shortCode,jdbcType=VARCHAR}
121 121 </if>
  122 + <if test="keyword != null and keyword != ''">
  123 + and name like CONCAT(#{keyword}, '%')
  124 + </if>
122 125 </where>
123 126 </sql>
124 127  
platform-biz-service/src/main/resources/mainOrm/Users.xml View file @ 7629a50
... ... @@ -186,6 +186,36 @@
186 186 </select>
187 187  
188 188  
  189 + <select id="queryUsers2" resultMap="UsersResultMap" parameterType="com.lyms.platform.permission.model.UsersQuery">
  190 + select u.id id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,u.yn,enable,modified,created,remarks,last_login_time, ks_id
  191 + from users u LEFT JOIN user_role_maps ur
  192 + on u.id = ur.user_id
  193 + where 1=1
  194 + <if test="keyword != null and keyword != ''">
  195 + and name like CONCAT(#{keyword}, '%')
  196 + </if>
  197 + <if test="ksId != null and ksId != ''">
  198 + and u.ks_id = #{ksId,jdbcType=INTEGER}
  199 + </if>
  200 + <if test="orgId != null and orgId != ''">
  201 + and u.org_id = #{orgId,jdbcType=INTEGER}
  202 + </if>
  203 + <if test="deptId != null and deptId != ''">
  204 + and u.dept_id = #{deptId,jdbcType=INTEGER}
  205 + </if>
  206 + <if test="roleId != null and roleId != ''">
  207 + and ur.role_id = #{roleId,jdbcType=INTEGER}
  208 + </if>
  209 + <if test="yn != null and yn != ''">
  210 + and u.yn = #{yn,jdbcType=INTEGER}
  211 + and ur.yn = #{yn,jdbcType=INTEGER}
  212 + </if>
  213 + <if test="type != null and type != ''">
  214 + and u.type = #{type,jdbcType=INTEGER}
  215 + </if>
  216 + <include refid="orderAndLimit" />
  217 + </select>
  218 +
189 219  
190 220 <select id="queryUsersCount" resultType="int" parameterType="com.lyms.platform.permission.model.UsersQuery">
191 221 select count(1) from users
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java View file @ 7629a50
... ... @@ -177,9 +177,8 @@
177 177 departmentsQuery.setYn(YnEnums.YES.getId());
178 178 departmentsQuery.setOrgId(orgId);
179 179 departmentsQuery.setPage(page);
180   - departmentsQuery.setName(keyword);
  180 + departmentsQuery.setKeyword(keyword);
181 181 departmentsQuery.setLimit(limit);
182   - //TODO 这里查询未完成 模糊查询
183 182  
184 183 List<Departments> departmentses = departmentsService.queryDepartments(departmentsQuery);
185 184 for(Departments departments : departmentses) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java View file @ 7629a50
... ... @@ -196,7 +196,7 @@
196 196 organizationQuery.setName(keyword);
197 197 organizationQuery.setPage(page);
198 198 organizationQuery.setLimit(limit);
199   - //TODO 这里查询未完成 模糊查询
  199 + organizationQuery.setKeyword(keyword);
200 200  
201 201 List<Organization> organizations = organizationService.queryOrganization(organizationQuery);
202 202 ResultUtils.buildSuccessResultAndWrite(response, organizations);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java View file @ 7629a50
... ... @@ -309,10 +309,9 @@
309 309 rolesQuery.setSort("id desc");
310 310 rolesQuery.setYn(YnEnums.YES.getId());
311 311 rolesQuery.setType(1);
312   - rolesQuery.setName(keyword);
  312 + rolesQuery.setKeyword(keyword);
313 313 rolesQuery.setPage(page);
314 314 rolesQuery.setLimit(limit);
315   - //TODO 这里查询未完成 模糊查询
316 315  
317 316 List<Roles> roles = rolesService.queryRoles(rolesQuery);
318 317 ResultUtils.buildSuccessResultAndWrite(response, roles);
319 318  
... ... @@ -338,10 +337,9 @@
338 337 rolesQuery.setSort("id desc");
339 338 rolesQuery.setYn(YnEnums.YES.getId());
340 339 rolesQuery.setType(0);
341   - rolesQuery.setName(keyword);
  340 + rolesQuery.setKeyword(keyword);
342 341 rolesQuery.setPage(page);
343 342 rolesQuery.setLimit(limit);
344   - //TODO 这里查询未完成 模糊查询
345 343  
346 344 List<Roles> roles = rolesService.queryRoles(rolesQuery);
347 345 ResultUtils.buildSuccessResultAndWrite(response, roles);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ 7629a50
... ... @@ -64,7 +64,7 @@
64 64 @RequestParam(value = "keyword", required = false) String keyword,
65 65 @RequestParam(value = "rolesId", required = false) Integer rolesId,
66 66 @RequestParam(value = "page", required = false) Integer page,
67   - @RequestParam(value = "limit", required = false) Integer limit) {
  67 + @RequestParam(value = "limit", required = false) Integer limit) {
68 68  
69 69 limit = limit == null ? 10 : limit;
70 70 page = page == null ? 1 : page;
71 71  
72 72  
... ... @@ -73,13 +73,13 @@
73 73 usersQuery.setNeed("true");
74 74 usersQuery.setSort("id desc");
75 75 usersQuery.setYn(YnEnums.YES.getId());
76   - usersQuery.setName(keyword);
  76 + usersQuery.setKeyword(keyword);
77 77 usersQuery.setType(0);
78 78 usersQuery.setPage(page);
79 79 usersQuery.setLimit(limit);
80   - //TODO 这里查询未完成 模糊查询
  80 + usersQuery.setRoleId(rolesId);
81 81  
82   - List<Users> users = usersService.queryUsers(usersQuery);
  82 + List<Users> users = usersService.queryUsers2(usersQuery);
83 83  
84 84 //设置用户角色信息
85 85 for(Users user : users) {
86 86  
87 87  
88 88  
89 89  
90 90  
... ... @@ -105,22 +105,26 @@
105 105 @RequestParam(value = "rolesId", required = false) Integer rolesId,
106 106 @RequestParam(value = "page", required = false) Integer page,
107 107 @RequestParam(value = "limit", required = false) Integer limit,
108   - @RequestParam(value = "orgId", required = false) Integer orgId) {
  108 + @RequestParam(value = "orgId", required = false) Integer orgId,
  109 + @RequestParam(value = "ksId", required = false) Integer ksId) {
109 110  
110 111 limit = limit == null ? 10 : limit;
111 112 page = page == null ? 1 : page;
112 113  
113   - UsersQuery usersQuery = new UsersQuery();
  114 + UsersQuery usersQuery = new UsersQuery();
114 115 usersQuery.setNeed("true");
115 116 usersQuery.setSort("id desc");
116 117 usersQuery.setYn(YnEnums.YES.getId());
117   - usersQuery.setName(keyword);
  118 + usersQuery.setKsId(ksId);
  119 + usersQuery.setKeyword(keyword);
118 120 usersQuery.setType(1);
  121 + usersQuery.setOrgId(orgId);
119 122 usersQuery.setPage(page);
120 123 usersQuery.setLimit(limit);
121   - //TODO 这里查询未完成 模糊查询
  124 + usersQuery.setRoleId(rolesId);
122 125  
123   - List<Users> users = usersService.queryUsers(usersQuery);
  126 +
  127 + List<Users> users = usersService.queryUsers2(usersQuery);
124 128  
125 129 //设置用户角色信息
126 130 for(Users user : users) {