jiangjiazhi / regional-platform

Commit 728c9efab5b2f64091f8ebae2efec040b3560a6e

Authored by rui.zhang over 9 years ago

Exists in master and in 8 other branches

platform permission

参考值查询

Showing 6 changed files with 159 additions and 101 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/param/ReferConfigQuery.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ReferConfigService.java
platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java

...	...	@@ -38,36 +38,36 @@
38	38	condition.and("name", keyword, MongoOper.LIKE);
39	39	}
40	40	}
41		- if (null != referVal) {
42		- if(1 == referVal) {
43		- condition.andCondition(new MongoCondition("charRefer", null, MongoOper.NE).orCondition(new MongoCondition("charRefer", "", MongoOper.NE)));
44		- } else if(2 == referVal) {
45		- condition.orCondition(new MongoCondition[] {new MongoCondition("charRefer", null, MongoOper.IS), new MongoCondition("charRefer", "", MongoOper.IS)});
46		- }
47		- }
48		- if (null != emergencyVal) {
49		- if(1 == emergencyVal) {
50		- condition.andCondition(new MongoCondition("emergencyChar", null, MongoOper.NE).orCondition(new MongoCondition("emergencyChar", "", MongoOper.NE)));
51		-
52		- } else if(2 == emergencyVal) {
53		- condition.orCondition(new MongoCondition[]{new MongoCondition("emergencyChar", null, MongoOper.IS), new MongoCondition("emergencyChar", "", MongoOper.IS)});
54		- }
55		- }
56		-
57	41	// if (null != referVal) {
58	42	// if(1 == referVal) {
59		-// condition.and("charRefer", null, MongoOper.NE);
	43	+// condition.andCondition(new MongoCondition("charRefer", null, MongoOper.NE).orCondition(new MongoCondition("charRefer", "", MongoOper.NE)));
60	44	// } else if(2 == referVal) {
61		-// condition.and("charRefer", null, MongoOper.IS);
	45	+// condition.orCondition(new MongoCondition[] {new MongoCondition("charRefer", null, MongoOper.IS), new MongoCondition("charRefer", "", MongoOper.IS)});
62	46	// }
63	47	// }
64	48	// if (null != emergencyVal) {
65	49	// if(1 == emergencyVal) {
66		-// condition.and("emergencyChar", null, MongoOper.NE);
	50	+// condition.andCondition(new MongoCondition("emergencyChar", null, MongoOper.NE).orCondition(new MongoCondition("emergencyChar", "", MongoOper.NE)));
	51	+//
67	52	// } else if(2 == emergencyVal) {
68		-// condition.and("emergencyChar", null, MongoOper.IS);
	53	+// condition.orCondition(new MongoCondition[]{new MongoCondition("emergencyChar", null, MongoOper.IS), new MongoCondition("emergencyChar", "", MongoOper.IS)});
69	54	// }
70	55	// }
	56	+
	57	+ if (null != referVal) {
	58	+ if(1 == referVal) {
	59	+ condition.and("charRefer", null, MongoOper.NE);
	60	+ } else if(2 == referVal) {
	61	+ condition.and("charRefer", null, MongoOper.IS);
	62	+ }
	63	+ }
	64	+ if (null != emergencyVal) {
	65	+ if(1 == emergencyVal) {
	66	+ condition.and("emergencyChar", null, MongoOper.NE);
	67	+ } else if(2 == emergencyVal) {
	68	+ condition.and("emergencyChar", null, MongoOper.IS);
	69	+ }
	70	+ }
71	71
72	72	if(null != yn) {
73	73	condition.and("yn", yn, MongoOper.IS);

...	...	@@ -38,10 +38,23 @@
38	38	public void addRefer(ReferValue referValue) {
39	39	referValue.setYn(YnEnums.YES.getId());
40	40	referValue.setCreateDate(System.currentTimeMillis());
	41	+
	42	+ if(null == referValue.getCharRefer() \|\| 0 == referValue.getCharRefer().length()) {
	43	+ referValue.setCharRefer(null);
	44	+ }
	45	+ if(null == referValue.getEmergencyChar() \|\| 0 == referValue.getEmergencyChar().length()) {
	46	+ referValue.setEmergencyChar(null);
	47	+ }
41	48	referConfigDao.addRefer(referValue);
42	49	}
43	50
44	51	public void updateRefer(ReferValue referValue) {
	52	+ if(null == referValue.getCharRefer() \|\| 0 == referValue.getCharRefer().length()) {
	53	+ referValue.setCharRefer(null);
	54	+ }
	55	+ if(null == referValue.getEmergencyChar() \|\| 0 == referValue.getEmergencyChar().length()) {
	56	+ referValue.setEmergencyChar(null);
	57	+ }
45	58	MongoCondition mongoCondition = MongoCondition.newInstance("id",referValue.getId(), MongoOper.IS);
46	59	referValue.setModifiedDate(System.currentTimeMillis());
47	60	referConfigDao.updateRefer(mongoCondition.toMongoQuery(), referValue);

...	...	@@ -32,9 +32,18 @@
32	32	private Object province;
33	33	private Object city;
34	34	private Object area;
	35	+ private Object street;
35	36	private String foreignId;
36	37
37	38	Map<String, Departments> departmentsMap = new HashMap<>();
	39	+
	40	+ public Object getStreet() {
	41	+ return street;
	42	+ }
	43	+
	44	+ public void setStreet(Object street) {
	45	+ this.street = street;
	46	+ }
38	47
39	48	public String getStreetId() {
40	49	return streetId;

...	...	@@ -256,45 +256,20 @@
256	256	List<Object> data = new ArrayList<>();
257	257	boolean falg =StringUtils.isNotEmpty(f);
258	258	for(Organization organization : organizations) {
259		- if(null == organization.getAddress()) {
260		- organization.setAddress("");
261		- } else {
262		- organization.setAddress(", " + organization.getAddress());
263		- }
264		- if(null != organization.getStreetId()) {
265		- BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(organization.getStreetId());
266		- if(null != basicConfig) {
267		- organization.setAddress(basicConfig.getName() + organization.getAddress());
268		- }
269		- }
270		- if(null != organization.getAreaId()) {
271		- BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(organization.getAreaId());
272		- if(null != basicConfig) {
273		- organization.setAddress(basicConfig.getName() + organization.getAddress());
274		- }
275		- }
276		- if(null != organization.getCityId()) {
277		- BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(organization.getCityId());
278		- if(null != basicConfig) {
279		- organization.setAddress(basicConfig.getName() + organization.getAddress());
280		- }
281		- }
282		- if(null != organization.getProvinceId()) {
283		- BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(organization.getProvinceId());
284		- if(null != basicConfig) {
285		- organization.setAddress(basicConfig.getName() + organization.getAddress());
286		- }
287		- }
	259	+
288	260	organization.setTypeObj(OrganizationLevelEnum.getById(organization.getLevel()));
289	261	organization.setLevelObj(OrganizationTypeEnum.getById(organization.getType()));
290	262	if(null != organization.getProvinceId()) {
291	263	organization.setProvince(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getProvinceId()),falg));
292	264	}
293	265	if(null != organization.getCityId()) {
294		- organization.setCity(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getCityId()),falg));
	266	+ organization.setCity(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getCityId()), falg));
295	267	}
296	268	if(null != organization.getAreaId()) {
297		- organization.setArea(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getAreaId()),falg));
	269	+ organization.setArea(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getAreaId()), falg));
	270	+ }
	271	+ if(null != organization.getStreetId()) {
	272	+ organization.setStreet(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getStreetId()),falg));
298	273	}
299	274	Object obj = organization;
300	275	if(falg){

...	...	@@ -4,9 +4,15 @@
4	4	import com.lyms.platform.biz.service.BasicConfigService;
5	5	import com.lyms.platform.common.annotation.TokenRequired;
6	6	import com.lyms.platform.common.base.BaseController;
	7	+import com.lyms.platform.common.base.LoginContext;
	8	+import com.lyms.platform.common.constants.ErrorCodeConstants;
7	9	import com.lyms.platform.common.enums.YnEnums;
8	10	import com.lyms.platform.common.utils.ResultUtils;
9	11	import com.lyms.platform.common.utils.SystemConfig;
	12	+import com.lyms.platform.permission.model.Organization;
	13	+import com.lyms.platform.permission.model.Users;
	14	+import com.lyms.platform.permission.service.OrganizationService;
	15	+import com.lyms.platform.permission.service.UsersService;
10	16	import com.lyms.platform.pojo.BasicConfig;
11	17	import com.lyms.platform.query.BasicConfigQuery;
12	18	import org.apache.commons.collections.CollectionUtils;
...	...	@@ -17,6 +23,7 @@
17	23	import org.springframework.web.bind.annotation.RequestMethod;
18	24	import org.springframework.web.bind.annotation.RequestParam;
19	25
	26	+import javax.servlet.http.HttpServletRequest;
20	27	import javax.servlet.http.HttpServletResponse;
21	28	import java.util.ArrayList;
22	29	import java.util.HashMap;
23	30
24	31
...	...	@@ -31,14 +38,45 @@
31	38
32	39	@Autowired
33	40	private BasicConfigService basicConfigService;
	41	+ @Autowired
	42	+ private UsersService usersService;
	43	+ @Autowired
	44	+ private OrganizationService organizationService;
34	45
35	46	@TokenRequired
36	47	@RequestMapping(value = "/regions",method = RequestMethod.GET)
37	48	public void getRegions(@RequestParam(value = "parentId", required = false) String parentId,
38		- HttpServletResponse httpServletResponse){
39		- if ("0".equals(parentId) \|\| StringUtils.isBlank(parentId)) {
	49	+ HttpServletResponse httpServletResponse, HttpServletRequest request ){
	50	+ //获取登录用户
	51	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	52	+ Users user = usersService.getUsers(loginState.getId());
	53	+ if(null == user) {
	54	+ ResultUtils.buildResultAndWrite(httpServletResponse, ErrorCodeConstants.SYSTEM_ERROR, "not find login user!");
	55	+ return;
	56	+ }
	57	+
	58	+ if(user.getType().equals(1)) {
	59	+ if(null != user.getOrgId()) {
	60	+ ResultUtils.buildResultAndWrite(httpServletResponse, ErrorCodeConstants.SYSTEM_ERROR, "user data error!");
	61	+ return;
	62	+ }
	63	+ Organization organization = organizationService.getOrganization(user.getOrgId());
	64	+ if(null != organization.getStreetId()) {
	65	+ parentId = organization.getStreetId();
	66	+ } else if(null != organization.getAreaId()) {
	67	+ parentId = organization.getAreaId();
	68	+ } else if(null != organization.getCityId()) {
	69	+ parentId = organization.getCityId();
	70	+ } else if (null != organization.getProvinceId()) {
	71	+ parentId = organization.getProvinceId();
	72	+ }
	73	+ }
	74	+
	75	+
	76	+ if (user.getType().equals(0) && ("0".equals(parentId) \|\| StringUtils.isBlank(parentId))) {
40	77	parentId = SystemConfig.CHINA_BASIC_ID;
41	78	}
	79	+
42	80	BasicConfigQuery query = new BasicConfigQuery();
43	81	query.setYn(YnEnums.YES.getId());
44	82	query.setParentId(parentId);

...	...	@@ -402,6 +402,10 @@
402	402	}
403	403
404	404
	405	+ private Boolean isPhone(String phone) {
	406	+ return phone.matches("^(((13[0-9]{1})\|(15[0-9]{1})\|(17[0-9]{1})\|(18[0-9]{1}))+\\d{8})$");
	407	+ }
	408	+
405	409	/**
406	410	* 添加管理员信息
407	411	*/
408	412
...	...	@@ -428,11 +432,19 @@
428	432	return;
429	433	}
430	434
	435	+ if (!isPhone(phone)) {
	436	+ ResultUtils.buildParameterErrorResultAndWrite(response, "手机号格式不正确");
	437	+ return;
	438	+ }
	439	+
	440	+
431	441	if (user != null) {
432	442
433	443	//检查注册账户是否存在
434	444	UsersQuery usersQuery = new UsersQuery();
435	445	usersQuery.setPhone(phone);
	446	+ usersQuery.setType(0);
	447	+ usersQuery.setYn(YnEnums.YES.getId());
436	448	List<Users> usersList = usersService.queryUsers(usersQuery);
437	449	if (usersList.size() != 0) {
438	450	Map<String, Object> map = new HashMap<>();
439	451
440	452
441	453
442	454
443	455
444	456
...	...	@@ -460,35 +472,36 @@
460	472
461	473	//关联登录中心ID
462	474	LoginContext loginContext = LoginUtil.register(phone, token, typeId);
463		- if(!loginContext.getErrorcode().equals(0)) {
464		- ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.SYSTEM_ERROR, loginContext.getErrormsg());
465		- return;
466		- }
467		- users.setLogincenterId(loginContext.getId());
	475	+ //0 成功 4009 已注册
	476	+ if(loginContext.getErrorcode().equals(0) \|\| loginContext.getErrorcode().equals(4009)) {
	477	+ users.setLogincenterId(loginContext.getId());
	478	+ usersService.addUsers(users);
468	479
469	480
470		- usersService.addUsers(users);
	481	+ //如有角色,则对用户角色中间表新增
	482	+ UserRoleMaps userRoleMaps = new UserRoleMaps();
471	483
	484	+ String[] roleArrayIds = roleIds.split(",");
	485	+ List<Users> user1 = usersService.queryUsers(usersQuery);
	486	+ for (String id : roleArrayIds) {
	487	+ Roles roles = rolesService.getRoles(Integer.valueOf(id));
	488	+ if (roles == null \|\| roles.getYn() == YnEnums.NO.getId()) {
	489	+ continue;
	490	+ }
472	491
473		- //如有角色,则对用户角色中间表新增
474		- UserRoleMaps userRoleMaps = new UserRoleMaps();
475		-
476		- String[] roleArrayIds = roleIds.split(",");
477		- List<Users> user1 = usersService.queryUsers(usersQuery);
478		- for (String id : roleArrayIds) {
479		- Roles roles = rolesService.getRoles(Integer.valueOf(id));
480		- if (roles == null \|\| roles.getYn() == YnEnums.NO.getId()) {
481		- continue;
	492	+ if (user1.get(0).getId() != null) {
	493	+ userRoleMaps.setRoleId(Integer.valueOf(Integer.valueOf(id)));
	494	+ userRoleMaps.setUserId(user1.get(0).getId());
	495	+ userRoleMaps.setYn(YnEnums.YES.getId());
	496	+ userRoleMapsService.addUserRoleMaps(userRoleMaps);
	497	+ }
482	498	}
	499	+ ResultUtils.buildSuccessResultAndWrite(response);
483	500
484		- if (user1.get(0).getId() != null) {
485		- userRoleMaps.setRoleId(Integer.valueOf(Integer.valueOf(id)));
486		- userRoleMaps.setUserId(user1.get(0).getId());
487		- userRoleMaps.setYn(YnEnums.YES.getId());
488		- userRoleMapsService.addUserRoleMaps(userRoleMaps);
489		- }
	501	+ } else {
	502	+ ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.SYSTEM_ERROR, loginContext.getErrormsg());
	503	+ return;
490	504	}
491		- ResultUtils.buildSuccessResultAndWrite(response);
492	505	}
493	506	}
494	507
...	...	@@ -520,6 +533,12 @@
520	533	ResultUtils.buildParameterErrorResultAndWrite(response);
521	534	return;
522	535	}
	536	+
	537	+ if (!isPhone(phone)) {
	538	+ ResultUtils.buildParameterErrorResultAndWrite(response, "手机号格式不正确");
	539	+ return;
	540	+ }
	541	+
523	542	if(deptId == null && ksId == null) {
524	543	ResultUtils.buildParameterErrorResultAndWrite(response, "deptId or ksId required");
525	544	return;
526	545
...	...	@@ -529,7 +548,9 @@
529	548
530	549	//检查注册账户是否存在
531	550	UsersQuery usersQuery = new UsersQuery();
	551	+ usersQuery.setType(1);
532	552	usersQuery.setPhone(phone);
	553	+ usersQuery.setYn(YnEnums.YES.getId());
533	554	List<Users> usersList = usersService.queryUsers(usersQuery);
534	555	if (usersList.size() != 0) {
535	556	Map<String, Object> map = new HashMap<>();
536	557
537	558
538	559
539	560
540	561
...	...	@@ -560,34 +581,34 @@
560	581
561	582	//关联登录中心ID
562	583	LoginContext loginContext = LoginUtil.register(phone, token, typeId);
563		- if(!loginContext.getErrorcode().equals(0)) {
564		- ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.SYSTEM_ERROR, loginContext.getErrormsg());
565		- return;
566		- }
567		- users.setLogincenterId(loginContext.getId());
	584	+ //0 成功 4009 已注册
	585	+ if(loginContext.getErrorcode().equals(0) \|\| loginContext.getErrorcode().equals(4009)) {
	586	+ users.setLogincenterId(loginContext.getId());
	587	+ usersService.addUsers(users);
568	588
569		- usersService.addUsers(users);
	589	+ //如有角色,则对用户角色中间表新增
	590	+ UserRoleMaps userRoleMaps = new UserRoleMaps();
570	591
	592	+ String[] roleArrayIds = roleIds.split(",");
	593	+ List<Users> user1 = usersService.queryUsers(usersQuery);
	594	+ for (String id : roleArrayIds) {
	595	+ Roles roles = rolesService.getRoles(Integer.valueOf(id));
	596	+ if (roles == null \|\| roles.getYn() == YnEnums.NO.getId()) {
	597	+ continue;
	598	+ }
571	599
572		- //如有角色,则对用户角色中间表新增
573		- UserRoleMaps userRoleMaps = new UserRoleMaps();
574		-
575		- String[] roleArrayIds = roleIds.split(",");
576		- List<Users> user1 = usersService.queryUsers(usersQuery);
577		- for (String id : roleArrayIds) {
578		- Roles roles = rolesService.getRoles(Integer.valueOf(id));
579		- if (roles == null \|\| roles.getYn() == YnEnums.NO.getId()) {
580		- continue;
	600	+ if (user1.get(0).getId() != null) {
	601	+ userRoleMaps.setRoleId(Integer.valueOf(Integer.valueOf(id)));
	602	+ userRoleMaps.setUserId(user1.get(0).getId());
	603	+ userRoleMaps.setYn(YnEnums.YES.getId());
	604	+ userRoleMapsService.addUserRoleMaps(userRoleMaps);
	605	+ }
581	606	}
582		-
583		- if (user1.get(0).getId() != null) {
584		- userRoleMaps.setRoleId(Integer.valueOf(Integer.valueOf(id)));
585		- userRoleMaps.setUserId(user1.get(0).getId());
586		- userRoleMaps.setYn(YnEnums.YES.getId());
587		- userRoleMapsService.addUserRoleMaps(userRoleMaps);
588		- }
	607	+ ResultUtils.buildSuccessResultAndWrite(response);
	608	+ } else {
	609	+ ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.SYSTEM_ERROR, loginContext.getErrormsg());
	610	+ return;
589	611	}
590		- ResultUtils.buildSuccessResultAndWrite(response);
591	612	}
592	613	}
593	614
594	615
...	...	@@ -737,12 +758,14 @@
737	758
738	759
739	760	LoginContext loginContext = LoginUtil.register(phone, token, typeId);
740		- if(!loginContext.getErrorcode().equals(0)) {
	761	+ //0 成功 4009 已注册
	762	+ if(loginContext.getErrorcode().equals(0) \|\| loginContext.getErrorcode().equals(4009)) {
	763	+ users.setPhone(phone);
	764	+ users.setLogincenterId(loginContext.getId());
	765	+ } else {
741	766	ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.SYSTEM_ERROR, loginContext.getErrormsg());
742	767	return;
743	768	}
744		- users.setPhone(phone);
745		- users.setLogincenterId(loginContext.getId());
746	769	}
747	770
748	771	users.setName(name);