jiangjiazhi / regional-platform

Commit efabfa43830c538d7d261f525c5b0822b46a3512

Authored by liquanyu over 8 years ago

Exists in master and in 6 other branches

update code

Showing 6 changed files with 107 additions and 13 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java
platform-msg-generate/src/main/java/com/lyms/platform/msg/service/IMsgGenerateService.java
platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/ChanAmsMsgGenerateWorker.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java

...	...	@@ -17,7 +17,9 @@
17	17	ER_TONG_TI_XING("9BUY6THL261MmbVRb9iPZANQwJ5yKNzkE1VGCLPuI94","儿童月龄提醒"), //儿保预约提醒
18	18	JIAN_KANG_ZHI_DAO("98i1P6zh3slBxEKLftweaESnnem4w6SDmzvJIBWRXNE","孕期健康指导提醒"),
19	19
20		- GAO_WEI_ZHI_DAO("n6fSC1wYc3jOfGmuI1Vtbut6TlaBPlt5482SqJ8CE4o","高危提醒");
	20	+ GAO_WEI_ZHI_DAO("n6fSC1wYc3jOfGmuI1Vtbut6TlaBPlt5482SqJ8CE4o","高危提醒"),
	21	+
	22	+ ER_JIAN_KANG_ZHI_DAO("","儿童健康指导");
21	23	private WxTempleteIdEnums(String id, String name){
22	24	this.name=name;
23	25	this.id =id;

...	...	@@ -23,5 +23,11 @@
23	23	* @param hospitalId
24	24	*/
25	25	void generateTemplateMsg(String hospitalId);
	26	+
	27	+ /**
	28	+ * 生成产妇ams推送消息
	29	+ * @param generateHospitalId
	30	+ */
	31	+ void generateChanAmsMsg(String generateHospitalId);
26	32	}

...	...	@@ -5,6 +5,7 @@
5	5	import com.lyms.platform.msg.service.IMsgGenerateService;
6	6	import com.lyms.platform.msg.utils.DateUtils;
7	7	import com.lyms.platform.msg.worker.BabyAmsMsgGenerateWorker;
	8	+import com.lyms.platform.msg.worker.ChanAmsMsgGenerateWorker;
8	9	import com.lyms.platform.msg.worker.TempleteMsgGenerateWorker;
9	10	import com.lyms.platform.msg.worker.YunAmsMsgGenerateWorker;
10	11	import com.lyms.platform.permission.service.OrganizationService;
...	...	@@ -81,7 +82,6 @@
81	82	*/
82	83	@Override
83	84	public void generateBabyAmsMsg(String generateHospitalId) {
84		- String week = DateUtils.getWeekOfDate(new Date());
85	85	List<SmsConfigModel> configModels = baseService.getHospitalConfigsByWeek(generateHospitalId);
86	86	logger.info("The configs hospital size is {}",configModels.size());
87	87	if (CollectionUtils.isNotEmpty(configModels))
...	...	@@ -94,7 +94,33 @@
94	94	end = configModels.size();
95	95	}
96	96	BabyAmsMsgGenerateWorker checkPointCountWorker = new BabyAmsMsgGenerateWorker(configModels.subList(i,end),
97		- baseService,babyBookbuildingService,week);
	97	+ baseService,babyBookbuildingService);
	98	+ pool.submit(checkPointCountWorker);
	99	+ }
	100	+
	101	+ }
	102	+ }
	103	+
	104	+
	105	+ /**
	106	+ * 生成产妇的ams消息
	107	+ * @param generateHospitalId
	108	+ */
	109	+ @Override
	110	+ public void generateChanAmsMsg(String generateHospitalId) {
	111	+ List<SmsConfigModel> configModels = baseService.getHospitalConfigsByWeek(generateHospitalId);
	112	+ logger.info("The configs hospital size is {}",configModels.size());
	113	+ if (CollectionUtils.isNotEmpty(configModels))
	114	+ {
	115	+ int batchSize = 5;
	116	+ int end = 0;
	117	+ for (int i = 0; i < configModels.size(); i += batchSize) {
	118	+ end = (end + batchSize);
	119	+ if (end > configModels.size()) {
	120	+ end = configModels.size();
	121	+ }
	122	+ ChanAmsMsgGenerateWorker checkPointCountWorker = new ChanAmsMsgGenerateWorker(configModels.subList(i,end),
	123	+ baseService,yunBookbuildingService);
98	124	pool.submit(checkPointCountWorker);
99	125	}
100	126

...	...	@@ -44,17 +44,14 @@
44	44
45	45	private BabyBookbuildingService babyBookbuildingService;
46	46
47		- private String week;
48	47
49	48
50	49	public BabyAmsMsgGenerateWorker(List<SmsConfigModel> configs, IBaseService baseService,
51		- BabyBookbuildingService babyBookbuildingService,
52		- String week)
	50	+ BabyBookbuildingService babyBookbuildingService)
53	51	{
54	52	this.configs = configs;
55	53	this.baseService = baseService;
56	54	this.babyBookbuildingService = babyBookbuildingService;
57		- this.week = week;
58	55	}
59	56
60	57	@Override
61	58
62	59
...	...	@@ -145,18 +142,14 @@
145	142	{
146	143	continue;
147	144	}
148		-// String messageContent = "【"+messagePrefix+"】" + message.getContent();
149		-// MessageRequest request = getMessageRequest( messageContent,baby.getMphone(),ServiceObjEnums.BABYOBJ.getId(), SmsServiceEnums.YBZD.getId(),
150		-// baby.getHospitalId(),message.getId(),baby.getId());
151	145
152		-
153		- String weekDay = "";
	146	+ String weekDay = DateUtil.getWeek(baby.getBirth(), new Date())+"周";
154	147	String title = "儿童健康指导";//SmsServiceEnums.getSmsServiceById(SmsServiceEnums.YBZD.getId());
155	148
156	149	String messageContent = "【"+messagePrefix+"】" + message.getContent();
157	150	MessageRequest request = HelperUtils.getMessageRequest(title, baby.getMphone(),
158	151	ServiceObjEnums.BABYOBJ.getId(), SmsServiceEnums.YBZD.getId(),
159		- baby.getHospitalId(), message.getId(), baby.getId(), weekDay, "", messageContent, WxTempleteIdEnums.CHAN_JIAN_TI_XING.getId());
	152	+ baby.getHospitalId(), message.getId(), baby.getId(), weekDay, "", messageContent, WxTempleteIdEnums.ER_JIAN_KANG_ZHI_DAO.getId());
160	153
161	154	messages.add(request);
162	155	break;

	1	+package com.lyms.platform.msg.worker;
	2	+
	3	+import com.lyms.platform.beans.MessageListRequest;
	4	+import com.lyms.platform.beans.MessageRequest;
	5	+import com.lyms.platform.biz.service.HighRiskService;
	6	+import com.lyms.platform.biz.service.YunBookbuildingService;
	7	+import com.lyms.platform.common.enums.*;
	8	+import com.lyms.platform.common.utils.DateUtil;
	9	+import com.lyms.platform.common.utils.JsonUtil;
	10	+import com.lyms.platform.common.utils.StringUtils;
	11	+import com.lyms.platform.msg.model.MessageContent;
	12	+import com.lyms.platform.msg.remote.AmsMessageService;
	13	+import com.lyms.platform.msg.remote.SaveMessageService;
	14	+import com.lyms.platform.msg.service.IBaseService;
	15	+import com.lyms.platform.msg.utils.DateUtils;
	16	+import com.lyms.platform.msg.utils.HelperUtils;
	17	+import com.lyms.platform.pojo.HighRiskSmsModel;
	18	+import com.lyms.platform.pojo.Patients;
	19	+import com.lyms.platform.pojo.SmsConfigModel;
	20	+import com.lyms.platform.query.HighRiskSmsQuery;
	21	+import com.lyms.platform.query.PatientsQuery;
	22	+import org.apache.commons.collections.CollectionUtils;
	23	+import org.slf4j.Logger;
	24	+import org.slf4j.LoggerFactory;
	25	+
	26	+import java.util.ArrayList;
	27	+import java.util.Date;
	28	+import java.util.List;
	29	+import java.util.Map;
	30	+
	31	+/**
	32	+ * Created by lqy on 2017-07-18.
	33	+ */
	34	+public class ChanAmsMsgGenerateWorker implements Runnable {
	35	+
	36	+
	37	+ private static final Logger logger = LoggerFactory.getLogger(ChanAmsMsgGenerateWorker.class);
	38	+
	39	+
	40	+
	41	+ private List<SmsConfigModel> configs;
	42	+
	43	+ private IBaseService baseService;
	44	+
	45	+ private YunBookbuildingService yunBookbuildingService;
	46	+
	47	+ public ChanAmsMsgGenerateWorker(List<SmsConfigModel> configs, IBaseService baseService,
	48	+ YunBookbuildingService yunBookbuildingService)
	49	+ {
	50	+ this.configs = configs;
	51	+ this.baseService = baseService;
	52	+ this.yunBookbuildingService = yunBookbuildingService;
	53	+
	54	+ }
	55	+
	56	+ @Override
	57	+ public void run() {
	58	+ if (CollectionUtils.isNotEmpty(configs))
	59	+ {
	60	+ for(SmsConfigModel config : configs) {
	61	+
	62	+
	63	+ }
	64	+ }
	65	+ }
	66	+}

...	...	@@ -255,6 +255,7 @@
255	255	public BaseResponse queryRegionAllPatients(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request){
256	256	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
257	257	patientsQueryRequest.setFmHospital(patientsQueryRequest.gethId());
	258	+ patientsQueryRequest.sethId(null);
258	259	return patientFacade.queryHighRisk(patientsQueryRequest, null, 3,loginState.getId(),"true",Boolean.TRUE);
259	260	}
260	261