jiangjiazhi / regional-platform

Commit 9fec4836afbaae0de54d68ced440fcc499e6d19c

Authored by hanshaofeng almost 9 years ago

Exists in master and in 8 other branches

nio server

Showing 9 changed files with 113 additions and 71 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/DataPermissionService.java
platform-biz-patient-service/src/main/resources/database.properties
platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
platform-dal/src/main/java/com/lyms/platform/beans/AddressBean.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/NioClient.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/facade/AccessPermissionFacade.java

...	...	@@ -10,6 +10,7 @@
10	10	import com.lyms.platform.biz.service.*;
11	11	import com.lyms.platform.common.dao.operator.MongoCondition;
12	12	import com.lyms.platform.common.dao.operator.MongoOper;
	13	+import com.lyms.platform.common.dao.operator.MongoQuery;
13	14	import com.lyms.platform.common.enums.YnEnums;
14	15	import com.lyms.platform.common.pojo.SyncDataModel;
15	16	import com.lyms.platform.common.utils.*;
16	17
17	18
18	19
...	...	@@ -27,76 +28,29 @@
27	28	import org.springframework.context.support.ClassPathXmlApplicationContext;
28	29
29	30	import org.springframework.data.mongodb.core.MongoTemplate;
	31	+import org.springframework.data.mongodb.core.query.Query;
30	32
31	33	public class BasicConfigServiceTest {
32	34	public static void main(String[] args) throws Exception {
33	35	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
34	36	ApplicationContext applicationContext = new ClassPathXmlApplicationContext("classpath:/spring/applicationContext_biz_patient1.xml");
35		-
36		-
37		- // PuerperaService basicConfigService = (PuerperaService) applicationContext.getBean(PuerperaService.class);
38		- /* PuerperaModel obj = new PuerperaModel();
39		- obj.setAddress("成都市高新区天府2街");
40		- obj.setAge(111);
41		- obj.setDueDate(new Date());
42		- obj.setIsVisit(1);
43		- obj.setName("小王2");
44		- obj.setPhone("13996289315");
45		- obj.setYn(1);
46		- obj.setCardNo("50022319951267164465");
47		- basicConfigService.addPuerpera(obj);
48		-
49		- PuerperaModel obj1 = new PuerperaModel();
50		- obj1.setAddress("成都市高新区天府4街");
51		- obj1.setAge(11);
52		- obj1.setDueDate(sdf.parse("2016-1-12"));
53		- obj1.setIsVisit(0);
54		- obj1.setName("小王3");
55		- obj1.setPhone("15197164164");
56		- obj1.setYn(1);
57		- obj1.setCommunityId("dqweqwdadadaddad");
58		- obj1.setCardNo("50022319951267164466");
59		- basicConfigService.addPuerpera(obj1);*/
60		-
61		- // PuerperaModelQuery puerperaQuery = new PuerperaModelQuery();
62		-
63		- ;
64		-// puerperaQuery.setKeyword("小王");
65		-// puerperaQuery.setDueDateStart(sdf.parse("2016-1-12"));
66		-// puerperaQuery.setDueDateEnd(sdf.parse("2016-3-16"));
67		- // puerperaQuery.setId("5719caf624fd57791341b7cb");
68		- // System.out.println(basicConfigService.queryPuerpera(puerperaQuery));
69		- /*
70		- * for(int i = 6;i<7;i++){ BasicConfig obj = new BasicConfig(); obj.setCode("xc123456"+i); obj.setName("哮喘123456"+i); obj.setYn(1);
71		- * obj.setParentId("56ea134c24fdaafbabbb0025"); basicConfigService.addBasicConfig(obj); }
72		- */
73		- /*
74		- * BasicConfig obj = new BasicConfig(); obj.setCode("111"); obj.setId("111");
75		- */
76		- /*
77		- * System.out.println(JSON.parse("{\"名称\":111}")); MongoTemplate mongoTemplate =applicationContext.getBean(MongoTemplate.class); //
78		- * mongoTemplate.save(JSON.parse("{\"名称\":111}"),"aa"); System.out.println(mongoTemplate.find(null, Map.class));
79		- */
80		- /* System.out.println("----------------------------------------------------");
81		- Criteria cri = Criteria.where("dueDate").gte(sdf.parse("2016-1-12")).lte(sdf.parse("2016-3-16"));
82		- Query query = new Query(cri);
83		- List<PuerperaModel> users = applicationContext.getBean(MongoTemplate.class).find(query, PuerperaModel.class);
84		- for (PuerperaModel users2 : users) {
85		- System.out.println(users2.toString());
86		- }*/
87		-// addDataPermission(applicationContext);
88		-// addVisit(applicationContext);
89		-// addaw(applicationContext, "0-83月龄身长、高标准差数值表（男、女）.csv", 1);
90		-// addaw(applicationContext, "0-83月龄体重标准差数值表（男、女）.csv", 0);
91		-// addZhenduan(applicationContext);
92		-
93		-// addHealthConfig(applicationContext);
94		-// saveHospitalMsgConfig(applicationContext);
95		-// saveHospitalMsgTemplate(applicationContext);
96	37	// queryRisk(applicationContext);
97		- saveQhdBabyCheckModel(applicationContext);
	38	+ dataptest(applicationContext);
98	39	}
99	40
	41	+ public static void dataptest(ApplicationContext applicationContext) {
	42	+ MongoTemplate mongoTemplate
	43	+ =(MongoTemplate)applicationContext.getBean("mongoTemplate");
	44	+ mongoTemplate.getDb().authenticate("platform", "platform123".toCharArray());
	45	+ try {
	46	+ List<DataPermissionsModel> list = mongoTemplate.find(new Query(),DataPermissionsModel.class);
	47	+ for (DataPermissionsModel model:list) {
	48	+ System.out.println(JsonUtil.obj2Str(model));
	49	+ }
	50	+ } catch (Exception e) {
	51	+ e.printStackTrace();
	52	+ }
	53	+ }
100	54
101	55	public static void saveQhdBabyCheckModel(ApplicationContext applicationContext) {
102	56	MongoTemplate mongoTemplate

...	...	@@ -43,5 +43,6 @@
43	43	updatePermission(obj);
44	44	}
45	45	}
	46	+
46	47	}

1	1	mongo.db.host=119.90.57.26
2	2	mongo.db.port=10001
3		-mongo.db.dbname=sync-platform-data
	3	+mongo.db.dbname=platform
4	4	mongo.db.username=platform
5	5	mongo.db.password=platform123

...	...	@@ -22,5 +22,10 @@
22	22	List<Organization> queryHospital();
23	23
24	24	List<Organization> queryHospitals(OrganizationQuery organizationQuery);
	25	+
	26	+ /**
	27	+ * 维护用户机构权限为最新状态，机构新增、修改、删除时执行；用户新增、修改、删除时执行
	28	+ */
	29	+ public void rebuildDataPermissions(Integer userId);
25	30	}

1	1	package com.lyms.platform.permission.service.impl;
2	2
	3	+import com.lyms.platform.beans.AddressBean;
3	4	import com.lyms.platform.biz.dal.ISyncDataDao;
	5	+import com.lyms.platform.biz.service.DataPermissionService;
4	6	import com.lyms.platform.common.enums.OrganizationTypeEnum;
5	7	import com.lyms.platform.common.exception.BusinessException;
	8	+import com.lyms.platform.common.utils.JsonUtil;
6	9	import com.lyms.platform.permission.DataAccessLayerService;
7	10	import com.lyms.platform.permission.dao.master.MasterOrganizationMapper;
8	11	import com.lyms.platform.permission.dao.slave.OrganizationMapper;
9	12	import com.lyms.platform.permission.model.Organization;
10	13	import com.lyms.platform.permission.model.OrganizationQuery;
11	14	import com.lyms.platform.permission.service.OrganizationService;
	15	+import com.lyms.platform.pojo.DataPermissionsModel;
	16	+import com.lyms.platform.query.DataPermissionsModelQuery;
12	17	import org.apache.commons.collections.CollectionUtils;
	18	+import org.apache.commons.lang.StringUtils;
13	19	import org.springframework.beans.factory.annotation.Autowired;
14	20	import org.springframework.stereotype.Service;
15	21
16	22
...	...	@@ -25,9 +31,11 @@
25	31	@Autowired
26	32	private ISyncDataDao iSyncDataDao;
27	33
	34	+ @Autowired
	35	+ private DataPermissionService dataPermissionService;
	36	+
28	37	@Override
29		- public Integer addOrganization(Organization obj) {
30		- masterOrganizationMapper.addOrganization(obj);
	38	+ public Integer addOrganization(Organization obj) { masterOrganizationMapper.addOrganization(obj);
31	39	iSyncDataDao.addSyncData("MysqlAdd", obj, obj.getId().toString());
32	40	return obj.getId();
33	41	}
...	...	@@ -130,5 +138,33 @@
130	138	}
131	139	return results;
132	140	}
	141	+
	142	+ /**
	143	+ * 维护用户机构权限为最新状态，机构新增、修改、删除时执行；用户新增、修改、删除时执行
	144	+ */
	145	+ @Override
	146	+ public void rebuildDataPermissions(Integer userId) {
	147	+ try {
	148	+ DataPermissionsModelQuery visitQuery = new DataPermissionsModelQuery();
	149	+ visitQuery.setUserId(userId);
	150	+ List<DataPermissionsModel> list = dataPermissionService.queryPermission(visitQuery);
	151	+ for (DataPermissionsModel model : list) {
	152	+ if (StringUtils.isNotBlank(model.getAreaPermission())) {
	153	+ List<AddressBean> addressBeanList = JsonUtil.toList(model.getAreaPermission(), AddressBean.class);
	154	+ List<Integer> organizationIds = new ArrayList<>();
	155	+ for (AddressBean addressBean:addressBeanList) {
	156	+ OrganizationQuery query = new OrganizationQuery();
	157	+ query.setProvinceId(addressBean.getP());
	158	+ query.setCityId(addressBean.getC());
	159	+ query.setAreaId(addressBean.getA());
	160	+ query.setStreetId(addressBean.getS());
	161	+ }
	162	+ }
	163	+ }
	164	+ } catch (Exception e) {
	165	+ e.printStackTrace();
	166	+ }
	167	+ }
	168	+
133	169	}

	1	+package com.lyms.platform.beans;
	2	+
	3	+/**
	4	+ * Created by riecard on 2016/11/24.
	5	+ * 多个区域，省市区乡如果为0代表全部
	6	+ {"p":"1","c":"2","a":"3","s":"4"}
	7	+ */
	8	+public class AddressBean {
	9	+
	10	+
	11	+ private String p;
	12	+ private String c;
	13	+ private String a;
	14	+ private String s;
	15	+
	16	+ public String getP() {
	17	+ return p;
	18	+ }
	19	+
	20	+ public void setP(String p) {
	21	+ this.p = p;
	22	+ }
	23	+
	24	+ public String getC() {
	25	+ return c;
	26	+ }
	27	+
	28	+ public void setC(String c) {
	29	+ this.c = c;
	30	+ }
	31	+
	32	+ public String getA() {
	33	+ return a;
	34	+ }
	35	+
	36	+ public void setA(String a) {
	37	+ this.a = a;
	38	+ }
	39	+
	40	+ public String getS() {
	41	+ return s;
	42	+ }
	43	+
	44	+ public void setS(String s) {
	45	+ this.s = s;
	46	+ }
	47	+}

...	...	@@ -48,12 +48,6 @@
48	48	{
49	49	String line = scan.nextLine();
50	50	if("".equals(line)) continue; //不允许发空消息
51		- if("".equals(name)) {
52		- name = line;
53		- line = name+USER_CONTENT_SPILIT;
54		- } else {
55		- line = name+USER_CONTENT_SPILIT+line;
56		- }
57	51	sc.write(charset.encode(line));//sc既能写也能读，这边是写
58	52	}
59	53	}

...	...	@@ -238,6 +238,8 @@
238	238	List<Organization> organizations = new ArrayList<>();
239	239	PageInfo pageInfo = new PageInfo(0,0,0,1);
240	240	if (CollectionUtils.isNotEmpty(areaId)) {
	241	+ // 一定要加上自己的机构权限
	242	+ areaId.add(users.getOrgId());
241	243	OrganizationQuery organizationQuery = new OrganizationQuery();
242	244	if(null != page && limit != page) {
243	245	organizationQuery.setNeed("true");

1	1	package com.lyms.platform.operate.web.facade;
2	2
	3	+import com.lyms.platform.beans.AddressBean;
3	4	import com.lyms.platform.biz.service.DataPermissionService;
4	5	import com.lyms.platform.common.constants.ErrorCodeConstants;
5	6	import com.lyms.platform.common.enums.PermissionTypeEnums;
6	7	import com.lyms.platform.common.result.BaseResponse;
7	8	import com.lyms.platform.common.utils.Assert;
	9	+import com.lyms.platform.common.utils.JsonUtil;
8	10	import com.lyms.platform.operate.web.request.AccessPermissionAddRequest;
9	11	import com.lyms.platform.permission.model.Organization;
10	12	import com.lyms.platform.permission.model.Roles;
...	...	@@ -105,5 +107,6 @@
105	107	dataPermissionsModelQuery.setUserId(userId);
106	108	return dataPermissionService.queryPermission(dataPermissionsModelQuery);
107	109	}
	110	+
108	111	}