jiangjiazhi / regional-platform

Commit 369ec4511bcad9ed96b20f6daeff821877ea4417

Authored by liquanyu about 5 years ago

Exists in master and in 6 other branches

update

Showing 5 changed files with 77 additions and 21 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/SmsTemplateModel.java
platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsTemplateRequest.java

...	...	@@ -69,6 +69,17 @@
69	69	//健康类型 0健康 1高危
70	70	private Integer healthType;
71	71
	72	+ //发送时间具体发送小时时间
	73	+ private String sendTime;
	74	+
	75	+ public String getSendTime() {
	76	+ return sendTime;
	77	+ }
	78	+
	79	+ public void setSendTime(String sendTime) {
	80	+ this.sendTime = sendTime;
	81	+ }
	82	+
72	83	public Integer getHealthType() {
73	84	return healthType;
74	85	}

...	...	@@ -67,6 +67,17 @@
67	67	}
68	68
69	69
	70	+ public static MsgRequest getMessageRequest1(String sendTime,String data,String phone,Integer serviceObj,
	71	+ Integer msgType,String hospitalId,
	72	+ String tempId,String pid,
	73	+ String keyWord1,String keyWord2,
	74	+ String remark,String wxTempId,
	75	+ Integer serviceType
	76	+ )
	77	+ {
	78	+ return getMessageRequest(sendTime, data, phone, serviceObj, msgType, hospitalId, tempId, pid, keyWord1, keyWord2,
	79	+ remark, wxTempId, serviceType,SmsTimeTypeEnums.NO_ONTIME.getId());
	80	+ }
70	81
71	82	public static MsgRequest getMessageRequest(String data,String phone,Integer serviceObj,
72	83	Integer msgType,String hospitalId,
...	...	@@ -77,6 +88,26 @@
77	88	Integer timeType
78	89	)
79	90	{
	91	+ return getMessageRequest(ConfigInterface.SEND_TIME, data, phone, serviceObj,
	92	+ msgType, hospitalId,
	93	+ tempId, pid,
	94	+ keyWord1, keyWord2,
	95	+ remark, wxTempId,
	96	+ serviceType,
	97	+ timeType);
	98	+ }
	99	+
	100	+
	101	+
	102	+ public static MsgRequest getMessageRequest(String sendTime,String data,String phone,Integer serviceObj,
	103	+ Integer msgType,String hospitalId,
	104	+ String tempId,String pid,
	105	+ String keyWord1,String keyWord2,
	106	+ String remark,String wxTempId,
	107	+ Integer serviceType,
	108	+ Integer timeType
	109	+ )
	110	+ {
80	111	MsgRequest request = new MsgRequest();
81	112
82	113	//1 推送服务， 2 推送和短信服务，3短信服务
83	114
84	115
...	...	@@ -90,18 +121,20 @@
90	121	//服务对象 1孕妇 2儿童 3产妇
91	122	request.setObjType(serviceObj);
92	123	request.setPhone(phone);
	124	+
93	125	if (SmsTimeTypeEnums.NO_ONTIME.getId() == timeType)
94	126	{
95		- if (msgType != null && (msgType == 6 \|\| msgType == 7))
96		- {
	127	+// if (msgType != null && (msgType == 6 \|\| msgType == 7))
	128	+// {
	129	+// //计划发送时间
	130	+// request.setPlanTime(DateUtils.getDateStr(new Date(), DateUtils.Y_M_D)+ " 07:00:00");
	131	+// }
	132	+// else
	133	+// {
97	134	//计划发送时间
98		- request.setPlanTime(DateUtils.getDateStr(new Date(), DateUtils.Y_M_D)+ " 07:00:00");
99		- }
100		- else
101		- {
102		- //计划发送时间
103		- request.setPlanTime(DateUtils.getDateStr(new Date(), DateUtils.Y_M_D)+ " " + ConfigInterface.SEND_TIME +":00");
104		- }
	135	+ String sendStr = sendTime == null ? DateUtils.getDateStr(new Date(), DateUtils.Y_M_D)+ " " + sendTime +":00" : (DateUtils.getDateStr(new Date(), DateUtils.Y_M_D)+ " " + sendTime +":00");
	136	+ request.setPlanTime(sendStr);
	137	+// }
105	138
106	139	}
107	140	else

...	...	@@ -627,7 +627,7 @@
627	627	String itemName = "儿童保健";
628	628	String nextCheckTime = DateUtils.getDateStr(orderDate, DateUtils.Y_M_D);
629	629
630		- MsgRequest request = HelperUtils.getMessageRequest(messageContent, model.getMphone(),
	630	+ MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, model.getMphone(),
631	631	ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(),
632	632	model.getHospitalId(), template.getId(), model.getId(), itemName, nextCheckTime, "",
633	633	WxTempleteIdEnums.ER_TONG_TI_XING.getId(), service);
...	...	@@ -720,7 +720,7 @@
720	720	//疫苗接种人
721	721	String vaccinePerson = model.getName();
722	722
723		- MsgRequest request = HelperUtils.getMessageRequest(messageContent, model.getMphone(),
	723	+ MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, model.getMphone(),
724	724	ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(),
725	725	model.getHospitalId(), template.getId(), model.getId(), vaccineName, vaccinePerson, vaccineTime,
726	726	WxTempleteIdEnums.ER_TONG_YI_MIAO_TIXING.getId(), service);
...	...	@@ -770,7 +770,7 @@
770	770	String itemName = "儿童保健";
771	771	String nextCheckTime = HelperUtils.getKeyword(start, end, "月龄");
772	772
773		- MsgRequest request = HelperUtils.getMessageRequest(messageContent, model.getMphone(),
	773	+ MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, model.getMphone(),
774	774	ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(),
775	775	model.getHospitalId(), template.getId(), model.getId(), itemName, nextCheckTime, "",
776	776	WxTempleteIdEnums.ER_TONG_TI_XING.getId(), service);
...	...	@@ -820,7 +820,7 @@
820	820	String itemName = "儿童保健";
821	821	String nextCheckTime = HelperUtils.getKeyword(start, end, "天");
822	822
823		- MsgRequest request = HelperUtils.getMessageRequest(messageContent, model.getMphone(),
	823	+ MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, model.getMphone(),
824	824	ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(),
825	825	model.getHospitalId(), template.getId(), model.getId(), itemName, nextCheckTime, serDoc,
826	826	WxTempleteIdEnums.ER_TONG_TI_XING.getId(), service);
...	...	@@ -870,7 +870,7 @@
870	870	String itemName = "儿童保健";
871	871	String nextCheckTime = DateUtils.getDateStr(yuYueDate, DateUtils.Y_M_D);
872	872
873		- MsgRequest request = HelperUtils.getMessageRequest(messageContent, model.getMphone(),
	873	+ MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, model.getMphone(),
874	874	ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(),
875	875	model.getHospitalId(), template.getId(), model.getId(), itemName, nextCheckTime, serDoc,
876	876	WxTempleteIdEnums.ER_TONG_TI_XING.getId(), service);
...	...	@@ -1373,7 +1373,7 @@
1373	1373	}
1374	1374	String messagePrefix = baseService.getSmsPrefix(config, p.getBookbuildingDoctor(), ServiceObjEnums.YUNOBJ.getId());
1375	1375	String messageContent = "【" + messagePrefix + "】" + template.getContent();
1376		- MsgRequest request = HelperUtils.getMessageRequest(messageContent, p.getPhone(),
	1376	+ MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, p.getPhone(),
1377	1377	ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(),
1378	1378	p.getHospitalId(), template.getId(), p.getId(),
1379	1379	//checkName, checkTimeStr, serDoct,
...	...	@@ -1401,7 +1401,7 @@
1401	1401	}
1402	1402	String messagePrefix = baseService.getSmsPrefix(config, p.getBuildDoctor(), ServiceObjEnums.BABYOBJ.getId());
1403	1403	String messageContent = "【" + messagePrefix + "】" + template.getContent();
1404		- MsgRequest request = HelperUtils.getMessageRequest(messageContent, p.getMphone(),
	1404	+ MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, p.getMphone(),
1405	1405	ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(),
1406	1406	p.getHospitalId(), template.getId(), p.getId(),
1407	1407	//checkName, checkTimeStr, serDoct,
...	...	@@ -1481,7 +1481,7 @@
1481	1481	String serDoct = baseService.getServiceDoctorId(pat.getId(),false);
1482	1482
1483	1483
1484		- MsgRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(),
	1484	+ MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, pat.getPhone(),
1485	1485	ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(),
1486	1486	pat.getHospitalId(), template.getId(), pat.getId(), checkName, checkTimeStr, serDoct,
1487	1487	WxTempleteIdEnums.CHAN_JIAN_TI_XING.getId(), service);
...	...	@@ -1551,7 +1551,7 @@
1551	1551
1552	1552	messageContent = HelperUtils.replaceName(pat.getUsername(), messageContent);
1553	1553
1554		- MsgRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(),
	1554	+ MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, pat.getPhone(),
1555	1555	ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(),
1556	1556	pat.getHospitalId(), template.getId(), pat.getId(), checkName, checkWeekName, serDoct,
1557	1557	WxTempleteIdEnums.CHAN_JIAN_TI_XING.getId(), service);
...	...	@@ -1588,7 +1588,7 @@
1588	1588	String checkTimeStr = DateUtils.getDateStr(yuYueDate, DateUtils.Y_M_D);
1589	1589	String checkName = "产前检查";
1590	1590
1591		- MsgRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(),
	1591	+ MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, pat.getPhone(),
1592	1592	ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(),
1593	1593	pat.getHospitalId(), template.getId(), pat.getId(), checkName, checkTimeStr, serDoct,
1594	1594	WxTempleteIdEnums.CHAN_JIAN_TI_XING.getId(), service);
...	...	@@ -1699,7 +1699,7 @@
1699	1699	String messageContent = "【" + messagePrefix + "】" + template.getContent();
1700	1700	String title = "产后复查";
1701	1701	messageContent = HelperUtils.replaceEL(pat.getUsername(), actualSendDate, messageContent);
1702		- MsgRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(),
	1702	+ MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, pat.getPhone(),
1703	1703	ServiceObjEnums.CHANOBJ.getId(), template.getSmsType(),
1704	1704	pat.getHospitalId(), template.getId(), pat.getId(), title, DateUtils.getDateStr(actualSendDate, DateUtils.Y_M_D), "",
1705	1705	WxTempleteIdEnums.CHAN_HOU_FU_CHA.getId(), service);
...	...	@@ -1811,7 +1811,7 @@
1811	1811	String days = "产后" + HelperUtils.getKeyword(start, end, "天");
1812	1812
1813	1813	String title = "产后复查";
1814		- MsgRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(),
	1814	+ MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, pat.getPhone(),
1815	1815	ServiceObjEnums.CHANOBJ.getId(), template.getSmsType(),
1816	1816	pat.getHospitalId(), template.getId(), pat.getId(), title, days, "",
1817	1817	WxTempleteIdEnums.CHAN_HOU_FU_CHA.getId(), service);

...	...	@@ -124,6 +124,7 @@
124	124	model.setStatus(request.getStatus());
125	125	model.setTemplateType(request.getTemplateType());
126	126	model.setHealthType(request.getHealthType());
	127	+ model.setSendTime(request.getSendTime());
127	128
128	129	return model;
129	130	}

...	...	@@ -70,6 +70,17 @@
70	70	//健康类型 0健康 1高危
71	71	private Integer healthType;
72	72
	73	+ //发送时间具体发送小时时间
	74	+ private Integer sendTime;
	75	+
	76	+ public Integer getSendTime() {
	77	+ return sendTime;
	78	+ }
	79	+
	80	+ public void setSendTime(Integer sendTime) {
	81	+ this.sendTime = sendTime;
	82	+ }
	83	+
73	84	public Integer getHealthType() {
74	85	return healthType;
75	86	}