jiangjiazhi / regional-platform

Commit 02ac176821600b305b7f50089de8f8543345eb58

Authored by liquanyu almost 8 years ago

Exists in master and in 6 other branches

update code

Showing 4 changed files with 17 additions and 18 deletions

platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/DateUtils.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/utils/MessageCenterService.java

...	...	@@ -129,18 +129,18 @@
129	129	*/
130	130	public static String getDateStr(Date date,String format)
131	131	{
132		- if (date == null)
133		- {
134		- return null;
135		- }
136	132	try
137	133	{
	134	+ lock.lock();
138	135	return getDateFormat(format).format(date);
139	136	}
140	137	catch (Exception e)
141	138	{
142	139	logger.error("get date format error.");
143	140	return null;
	141	+ }
	142	+ finally {
	143	+ lock.unlock();
144	144	}
145	145	}
146	146

...	...	@@ -80,7 +80,7 @@
80	80	request.setKeyword2(keyWord2);
81	81	request.setRemark(remark);
82	82
83		- resultLog.info("msg result = "+request.toString());
	83	+// resultLog.info("msg result = "+request.toString());
84	84
85	85	return request;
86	86	}

...	...	@@ -275,18 +275,18 @@
275	275	{
276	276	continue;
277	277	}
278		-
279		- //如果有有效的预约短信就不发送儿保检查提醒
280		- if (queryBabyOrder(model.getBirth(), start, tempHid, sendTimeType, model.getId(),"天"))
	278	+ if (HelperUtils.isExistMsg(model.getId(), template.getId()))
281	279	{
282	280	continue;
283	281	}
284	282
285		- if (HelperUtils.isExistMsg(model.getId(), template.getId()))
	283	+ //如果有有效的预约短信就不发送儿保检查提醒
	284	+ if (queryBabyOrder(model.getBirth(), start, tempHid, sendTimeType, model.getId(), "天"))
286	285	{
287	286	continue;
288	287	}
289	288
	289	+
290	290	//短信前缀
291	291	String messagePrefix = baseService.getSmsPrefix(config, model.getBuildDoctor());
292	292	String messageContent = "【"+messagePrefix+"】"+template.getContent();
293	293
...	...	@@ -330,13 +330,13 @@
330	330	continue;
331	331	}
332	332
333		- //如果有有效的预约短信就不发送儿保检查提醒
334		- if (queryBabyOrder(model.getBirth(), start, tempHid, sendTimeType, model.getId(),"月"))
	333	+ if (HelperUtils.isExistMsg(model.getId(),template.getId()))
335	334	{
336	335	continue;
337	336	}
338	337
339		- if (HelperUtils.isExistMsg(model.getId(),template.getId()))
	338	+ //如果有有效的预约短信就不发送儿保检查提醒
	339	+ if (queryBabyOrder(model.getBirth(), start, tempHid, sendTimeType, model.getId(), "月"))
340	340	{
341	341	continue;
342	342	}
343	343
...	...	@@ -504,15 +504,14 @@
504	504	{
505	505	for (Patients pat : patients)
506	506	{
507		-
508		- //如果有有效的预约短信就不发送产检程序提醒
509		- boolean isOrder = baseService.queryYunIsOrder(sendTimeType, tempHid, pat.getId(), pat.getLastMenses(), start);
510		- if (isOrder)
	507	+ if (HelperUtils.isExistMsg(pat.getId(),template.getId()))
511	508	{
512	509	continue;
513	510	}
514	511
515		- if (HelperUtils.isExistMsg(pat.getId(),template.getId()))
	512	+ //如果有有效的预约短信就不发送产检程序提醒
	513	+ boolean isOrder = baseService.queryYunIsOrder(sendTimeType, tempHid, pat.getId(), pat.getLastMenses(), start);
	514	+ if (isOrder)
516	515	{
517	516	continue;
518	517	}

...	...	@@ -249,7 +249,7 @@
249	249	// map.setList(JsonUtil.toList(list, SmsObj.class));
250	250	// System.out.print(map);
251	251
252		- queryMsgList("1", null,null,
	252	+ queryMsgList("216", null,null,
253	253	null,null,
254	254	null,null,
255	255	null,null ,