jiangjiazhi / regional-platform

Commit 8e9a451b9d5fe64e16fe23067879693d4a515fa2

Authored by jiangjiazhi over 9 years ago

Exists in master and in 8 other branches

增加是否通知

Showing 4 changed files with 74 additions and 11 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/Roles.java
platform-biz-service/src/main/java/com/lyms/platform/permission/model/RolesQuery.java
platform-biz-service/src/main/resources/mainOrm/Roles.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java

...	...	@@ -17,6 +17,24 @@
17	17	private String shortCode;
18	18	private String hospitalid;
19	19	private Integer permissiontype;
	20	+ private Integer orgId;
	21	+ private String orgName;
	22	+
	23	+ public String getOrgName() {
	24	+ return orgName;
	25	+ }
	26	+
	27	+ public void setOrgName(String orgName) {
	28	+ this.orgName = orgName;
	29	+ }
	30	+
	31	+ public Integer getOrgId() {
	32	+ return orgId;
	33	+ }
	34	+
	35	+ public void setOrgId(Integer orgId) {
	36	+ this.orgId = orgId;
	37	+ }
20	38
21	39	private List<Permissions> permissions;
22	40

...	...	@@ -4,6 +4,7 @@
4	4	import com.lyms.platform.common.dao.BaseQuery;
5	5
6	6	import java.util.Date;
	7	+import java.util.List;
7	8
8	9
9	10	public class RolesQuery extends BaseQuery {
...	...	@@ -18,6 +19,23 @@
18	19	private Date created;
19	20	private String remarks;
20	21	private String shortCode;
	22	+ private List<Integer> orgIds;
	23	+
	24	+ public List<Integer> getOrgIds() {
	25	+ return orgIds;
	26	+ }
	27	+
	28	+ public void setOrgIds(List<Integer> orgIds) {
	29	+ this.orgIds = orgIds;
	30	+ }
	31	+
	32	+ public String getShortCode() {
	33	+ return shortCode;
	34	+ }
	35	+
	36	+ public void setShortCode(String shortCode) {
	37	+ this.shortCode = shortCode;
	38	+ }
21	39
22	40	private String keyword;
23	41

...	...	@@ -14,12 +14,13 @@
14	14	<result column="created" property="created" jdbcType="TIMESTAMP"/>
15	15	<result column="remarks" property="remarks" jdbcType="VARCHAR"/>
16	16	<result column="shortCode" property="shortCode" jdbcType="VARCHAR"/>
	17	+ <result column="orgid" property="orgId" jdbcType="INTEGER"/>
17	18	</resultMap>
18	19
19	20
20	21	<insert id="addRoles" parameterType="com.lyms.platform.permission.model.Roles">
21	22	<selectKey order="AFTER" keyProperty="id" resultType="java.lang.Integer"> SELECT LAST_INSERT_ID() </selectKey>
22		-insert into roles (type,name,publish_id,publish_name,yn,enable,modified,created,remarks,shortCode) values (#{type},#{name},#{publishId},#{publishName},#{yn},#{enable},#{modified},#{created},#{remarks},#{shortCode})
	23	+insert into roles (type,name,publish_id,publish_name,yn,enable,modified,created,remarks,shortCode,orgid) values (#{type},#{name},#{publishId},#{publishName},#{yn},#{enable},#{modified},#{created},#{remarks},#{shortCode},#{orgid})
23	24	</insert>
24	25
25	26
...	...	@@ -120,6 +121,12 @@
120	121	</if>
121	122	<if test="shortCode != null and shortCode != ''">
122	123	and shortCode = #{shortCode,jdbcType=VARCHAR}
	124	+ </if>
	125	+ <if test="orgIds !=null and orgIds.size() >0">
	126	+ and orgId in
	127	+ <foreach collection="orgIds" index="index" item="item" open="(" separator="," close=")">
	128	+ #{item}
	129	+ </foreach>
123	130	</if>
124	131	<if test="keyword != null and keyword != ''">
125	132	and name like CONCAT(#{keyword}, '%')

...	...	@@ -13,6 +13,7 @@
13	13	import com.lyms.platform.permission.model.*;
14	14	import com.lyms.platform.permission.service.*;
15	15	import org.apache.commons.collections.CollectionUtils;
	16	+import org.apache.commons.lang.ArrayUtils;
16	17	import org.apache.commons.lang.StringUtils;
17	18	import org.slf4j.Logger;
18	19	import org.slf4j.LoggerFactory;
...	...	@@ -24,6 +25,7 @@
24	25	import javax.servlet.http.HttpServletRequest;
25	26	import javax.servlet.http.HttpServletResponse;
26	27	import java.util.ArrayList;
	28	+import java.util.Arrays;
27	29	import java.util.Date;
28	30	import java.util.List;
29	31
30	32
...	...	@@ -45,8 +47,9 @@
45	47	private PermissionsService permissionsService;
46	48	@Autowired
47	49	private UserRoleMapsService userRoleMapsService;
	50	+ @Autowired
	51	+ private OrganizationService organizationService;
48	52
49		-
50	53	/**
51	54	* 管理员角色权限配置
52	55	*/
...	...	@@ -137,7 +140,8 @@
137	140	@RequestParam(value = "name") String name,
138	141	@RequestParam(value = "enable", required = false) Integer enable,
139	142	@RequestParam(value = "remarks", required = false) String remarks,
140		- @RequestParam(value = "shortCode", required = false) String shortCode) {
	143	+ @RequestParam(value = "shortCode", required = false) String shortCode,
	144	+ @RequestParam(value = "orgId") Integer orgId) {
141	145
142	146	//获取登录用户
143	147	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
...	...	@@ -161,6 +165,7 @@
161	165	roles.setName(name);
162	166	roles.setEnable(enable);
163	167	roles.setRemarks(remarks);
	168	+ roles.setOrgId(orgId);
164	169	roles.setShortcode(shortCode);
165	170	roles.setYn(YnEnums.YES.getId());
166	171	roles.setPublishId(users.getId());
167	172
...	...	@@ -241,13 +246,13 @@
241	246	return;
242	247	}
243	248	//如果是禁用，再判断状态是否一样
244		- if ("2".equals(enable+"")&&!enable.equals(roles.getEnable())){
	249	+ if ("2".equals(enable + "") && !enable.equals(roles.getEnable())) {
245	250	//如果有数据不能删除
246	251	UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery();
247	252	userRoleMapsQuery.setRoleId(id);
248	253	userRoleMapsQuery.setYn(YnEnums.YES.getId());
249	254	Integer count = userRoleMapsService.queryUserRoleMapsCount(userRoleMapsQuery);
250		- if(count > 0) {
	255	+ if (count > 0) {
251	256	ResultUtils.buildParameterErrorResultAndWrite(response, "该角色下有用户数据，不能禁用");
252	257	return;
253	258	}
...	...	@@ -290,7 +295,7 @@
290	295	userRoleMapsQuery.setRoleId(id);
291	296	userRoleMapsQuery.setYn(YnEnums.YES.getId());
292	297	Integer count = userRoleMapsService.queryUserRoleMapsCount(userRoleMapsQuery);
293		- if(count > 0) {
	298	+ if (count > 0) {
294	299	ResultUtils.buildParameterErrorResultAndWrite(response, "该角色下有用户数据，不能删除");
295	300	return;
296	301	}
297	302
...	...	@@ -344,13 +349,13 @@
344	349	UserRoleMapsQuery roleMapsQuery = new UserRoleMapsQuery();
345	350	roleMapsQuery.setYn(YnEnums.YES.getId());
346	351	roleMapsQuery.setRoleId(roles.getId());
347		- if(0 < userRoleMapsService.queryUserRoleMapsCount(roleMapsQuery)) {
	352	+ if (0 < userRoleMapsService.queryUserRoleMapsCount(roleMapsQuery)) {
348	353	ResultUtils.buildParameterErrorResultAndWrite(response, "角色下有用户信息，不能禁用！");
349	354	return;
350	355	}
351	356
352	357	//修改字段
353		- if(null != flag && (1 == flag \|\| 2 == flag)) {
	358	+ if (null != flag && (1 == flag \|\| 2 == flag)) {
354	359	roles.setEnable(flag);
355	360	roles.setModified(new Date());
356	361	rolesService.updateRoles(roles);
...	...	@@ -369,7 +374,7 @@
369	374	@RequestParam(value = "keyword", required = false) String keyword,
370	375	@RequestParam(value = "page", required = false) Integer page,
371	376	@RequestParam(value = "limit", required = false) Integer limit,
372		- @RequestParam(value = "orgId", required = false) Integer orgId,
	377	+ @RequestParam(value = "orgIds", required = false) String orgIds,
373	378	@RequestParam(value = "enable", required = false) Integer enable) {
374	379
375	380	limit = limit == null ? 10 : limit;
...	...	@@ -384,7 +389,14 @@
384	389	rolesQuery.setPage(page);
385	390	rolesQuery.setLimit(limit);
386	391	rolesQuery.setEnable(enable);
387		-
	392	+ List list =new ArrayList();
	393	+ if(StringUtils.isNotEmpty(orgIds)){
	394	+ String[] as =orgIds.split(",");
	395	+ for(String a :as){
	396	+ list.add(Integer.valueOf(a));
	397	+ }
	398	+ }
	399	+ rolesQuery.setOrgIds(list);
388	400	List<Roles> roles = rolesService.queryRoles(rolesQuery);
389	401	if (CollectionUtils.isNotEmpty(roles)) {
390	402
...	...	@@ -405,6 +417,14 @@
405	417	}
406	418	*/
407	419	roles1.setPermissions(permissionses);
	420	+ String name = "";
	421	+ if (null != roles1.getOrgId()) {
	422	+ Organization o = organizationService.getOrganization(roles1.getOrgId());
	423	+ if(null!=o){
	424	+ name = o.getName();
	425	+ }
	426	+ }
	427	+ roles1.setOrgName(name);
408	428	}
409	429	}
410	430
...	...	@@ -460,7 +480,7 @@
460	480	if (permissions.getYn().equals(YnEnums.NO.getId())) continue;
461	481	permissionses.add(permissions);
462	482	}*/
463		- permissionses= permissionsService.queryPermissionByRoleIds1(roles1.getId());
	483	+ permissionses = permissionsService.queryPermissionByRoleIds1(roles1.getId());
464	484
465	485	roles1.setPermissions(permissionses);
466	486	}