From 02ac176821600b305b7f50089de8f8543345eb58 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 26 Jul 2017 16:06:36 +0800 Subject: [PATCH] update code --- .../com/lyms/platform/msg/utils/DateUtils.java | 8 ++++---- .../com/lyms/platform/msg/utils/HelperUtils.java | 2 +- .../msg/worker/TempleteMsgGenerateWorker.java | 23 +++++++++++----------- .../operate/web/utils/MessageCenterService.java | 2 +- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/DateUtils.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/DateUtils.java index 2584bf4..0fee687 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/DateUtils.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/DateUtils.java @@ -129,12 +129,9 @@ public class DateUtils { */ public static String getDateStr(Date date,String format) { - if (date == null) - { - return null; - } try { + lock.lock(); return getDateFormat(format).format(date); } catch (Exception e) @@ -142,6 +139,9 @@ public class DateUtils { logger.error("get date format error."); return null; } + finally { + lock.unlock(); + } } diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java index 6838ed6..efb10df 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java @@ -80,7 +80,7 @@ public class HelperUtils { request.setKeyword2(keyWord2); request.setRemark(remark); - resultLog.info("msg result = "+request.toString()); +// resultLog.info("msg result = "+request.toString()); return request; } diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java index 5955830..871a858 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java @@ -275,18 +275,18 @@ public class TempleteMsgGenerateWorker implements Runnable { { continue; } - - //如果有有效的预约短信就不发送 儿保检查提醒 - if (queryBabyOrder(model.getBirth(), start, tempHid, sendTimeType, model.getId(),"天")) + if (HelperUtils.isExistMsg(model.getId(), template.getId())) { continue; } - if (HelperUtils.isExistMsg(model.getId(), template.getId())) + //如果有有效的预约短信就不发送 儿保检查提醒 + if (queryBabyOrder(model.getBirth(), start, tempHid, sendTimeType, model.getId(), "天")) { continue; } + //短信前缀 String messagePrefix = baseService.getSmsPrefix(config, model.getBuildDoctor()); String messageContent = "【"+messagePrefix+"】"+template.getContent(); @@ -330,13 +330,13 @@ public class TempleteMsgGenerateWorker implements Runnable { continue; } - //如果有有效的预约短信就不发送 儿保检查提醒 - if (queryBabyOrder(model.getBirth(), start, tempHid, sendTimeType, model.getId(),"月")) + if (HelperUtils.isExistMsg(model.getId(),template.getId())) { continue; } - if (HelperUtils.isExistMsg(model.getId(),template.getId())) + //如果有有效的预约短信就不发送 儿保检查提醒 + if (queryBabyOrder(model.getBirth(), start, tempHid, sendTimeType, model.getId(), "月")) { continue; } @@ -504,15 +504,14 @@ public class TempleteMsgGenerateWorker implements Runnable { { for (Patients pat : patients) { - - //如果有有效的预约短信就不发送产检程序提醒 - boolean isOrder = baseService.queryYunIsOrder(sendTimeType, tempHid, pat.getId(), pat.getLastMenses(), start); - if (isOrder) + if (HelperUtils.isExistMsg(pat.getId(),template.getId())) { continue; } - if (HelperUtils.isExistMsg(pat.getId(),template.getId())) + //如果有有效的预约短信就不发送产检程序提醒 + boolean isOrder = baseService.queryYunIsOrder(sendTimeType, tempHid, pat.getId(), pat.getLastMenses(), start); + if (isOrder) { continue; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java index d55ce1b..0f6f99a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java @@ -249,7 +249,7 @@ public class MessageCenterService { // map.setList(JsonUtil.toList(list, SmsObj.class)); // System.out.print(map); - queryMsgList("1", null,null, + queryMsgList("216", null,null, null,null, null,null, null,null , -- 1.8.3.1