From 369ec4511bcad9ed96b20f6daeff821877ea4417 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 7 Apr 2020 09:18:12 +0800 Subject: [PATCH] update --- .../com/lyms/platform/pojo/SmsTemplateModel.java | 11 +++++ .../com/lyms/platform/msg/utils/HelperUtils.java | 51 ++++++++++++++++++---- .../msg/worker/TempleteMsgGenerateWorker.java | 24 +++++----- .../operate/web/facade/SmsTemplateFacade.java | 1 + .../operate/web/request/SmsTemplateRequest.java | 11 +++++ 5 files changed, 77 insertions(+), 21 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SmsTemplateModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SmsTemplateModel.java index 086d110..125458d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SmsTemplateModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SmsTemplateModel.java @@ -69,6 +69,17 @@ public class SmsTemplateModel extends BaseModel { //健康类型 0健康 1高危 private Integer healthType; + //发送时间 具体发送小时时间 + private String sendTime; + + public String getSendTime() { + return sendTime; + } + + public void setSendTime(String sendTime) { + this.sendTime = sendTime; + } + public Integer getHealthType() { return healthType; } 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 8a4676b..afa433e 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 @@ -67,6 +67,17 @@ public class HelperUtils { } + public static MsgRequest getMessageRequest1(String sendTime,String data,String phone,Integer serviceObj, + Integer msgType,String hospitalId, + String tempId,String pid, + String keyWord1,String keyWord2, + String remark,String wxTempId, + Integer serviceType + ) + { + return getMessageRequest(sendTime, data, phone, serviceObj, msgType, hospitalId, tempId, pid, keyWord1, keyWord2, + remark, wxTempId, serviceType,SmsTimeTypeEnums.NO_ONTIME.getId()); + } public static MsgRequest getMessageRequest(String data,String phone,Integer serviceObj, Integer msgType,String hospitalId, @@ -77,6 +88,26 @@ public class HelperUtils { Integer timeType ) { + return getMessageRequest(ConfigInterface.SEND_TIME, data, phone, serviceObj, + msgType, hospitalId, + tempId, pid, + keyWord1, keyWord2, + remark, wxTempId, + serviceType, + timeType); + } + + + + public static MsgRequest getMessageRequest(String sendTime,String data,String phone,Integer serviceObj, + Integer msgType,String hospitalId, + String tempId,String pid, + String keyWord1,String keyWord2, + String remark,String wxTempId, + Integer serviceType, + Integer timeType + ) + { MsgRequest request = new MsgRequest(); //1 推送服务， 2 推送和短信服务，3短信服务 @@ -90,18 +121,20 @@ public class HelperUtils { //服务对象 1孕妇 2儿童 3产妇 request.setObjType(serviceObj); request.setPhone(phone); + if (SmsTimeTypeEnums.NO_ONTIME.getId() == timeType) { - if (msgType != null && (msgType == 6 || msgType == 7)) - { - //计划发送时间 - request.setPlanTime(DateUtils.getDateStr(new Date(), DateUtils.Y_M_D)+ " 07:00:00"); - } - else - { +// if (msgType != null && (msgType == 6 || msgType == 7)) +// { +// //计划发送时间 +// request.setPlanTime(DateUtils.getDateStr(new Date(), DateUtils.Y_M_D)+ " 07:00:00"); +// } +// else +// { //计划发送时间 - request.setPlanTime(DateUtils.getDateStr(new Date(), DateUtils.Y_M_D)+ " " + ConfigInterface.SEND_TIME +":00"); - } + String sendStr = sendTime == null ? DateUtils.getDateStr(new Date(), DateUtils.Y_M_D)+ " " + sendTime +":00" : (DateUtils.getDateStr(new Date(), DateUtils.Y_M_D)+ " " + sendTime +":00"); + request.setPlanTime(sendStr); +// } } else 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 690b280..8f4597f 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 @@ -627,7 +627,7 @@ public class TempleteMsgGenerateWorker implements Runnable { String itemName = "儿童保健"; String nextCheckTime = DateUtils.getDateStr(orderDate, DateUtils.Y_M_D); - MsgRequest request = HelperUtils.getMessageRequest(messageContent, model.getMphone(), + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, model.getMphone(), ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(), model.getHospitalId(), template.getId(), model.getId(), itemName, nextCheckTime, "", WxTempleteIdEnums.ER_TONG_TI_XING.getId(), service); @@ -720,7 +720,7 @@ public class TempleteMsgGenerateWorker implements Runnable { //疫苗接种人 String vaccinePerson = model.getName(); - MsgRequest request = HelperUtils.getMessageRequest(messageContent, model.getMphone(), + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, model.getMphone(), ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(), model.getHospitalId(), template.getId(), model.getId(), vaccineName, vaccinePerson, vaccineTime, WxTempleteIdEnums.ER_TONG_YI_MIAO_TIXING.getId(), service); @@ -770,7 +770,7 @@ public class TempleteMsgGenerateWorker implements Runnable { String itemName = "儿童保健"; String nextCheckTime = HelperUtils.getKeyword(start, end, "月龄"); - MsgRequest request = HelperUtils.getMessageRequest(messageContent, model.getMphone(), + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, model.getMphone(), ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(), model.getHospitalId(), template.getId(), model.getId(), itemName, nextCheckTime, "", WxTempleteIdEnums.ER_TONG_TI_XING.getId(), service); @@ -820,7 +820,7 @@ public class TempleteMsgGenerateWorker implements Runnable { String itemName = "儿童保健"; String nextCheckTime = HelperUtils.getKeyword(start, end, "天"); - MsgRequest request = HelperUtils.getMessageRequest(messageContent, model.getMphone(), + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, model.getMphone(), ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(), model.getHospitalId(), template.getId(), model.getId(), itemName, nextCheckTime, serDoc, WxTempleteIdEnums.ER_TONG_TI_XING.getId(), service); @@ -870,7 +870,7 @@ public class TempleteMsgGenerateWorker implements Runnable { String itemName = "儿童保健"; String nextCheckTime = DateUtils.getDateStr(yuYueDate, DateUtils.Y_M_D); - MsgRequest request = HelperUtils.getMessageRequest(messageContent, model.getMphone(), + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, model.getMphone(), ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(), model.getHospitalId(), template.getId(), model.getId(), itemName, nextCheckTime, serDoc, WxTempleteIdEnums.ER_TONG_TI_XING.getId(), service); @@ -1373,7 +1373,7 @@ public class TempleteMsgGenerateWorker implements Runnable { } String messagePrefix = baseService.getSmsPrefix(config, p.getBookbuildingDoctor(), ServiceObjEnums.YUNOBJ.getId()); String messageContent = "【" + messagePrefix + "】" + template.getContent(); - MsgRequest request = HelperUtils.getMessageRequest(messageContent, p.getPhone(), + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, p.getPhone(), ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(), p.getHospitalId(), template.getId(), p.getId(), //checkName, checkTimeStr, serDoct, @@ -1401,7 +1401,7 @@ public class TempleteMsgGenerateWorker implements Runnable { } String messagePrefix = baseService.getSmsPrefix(config, p.getBuildDoctor(), ServiceObjEnums.BABYOBJ.getId()); String messageContent = "【" + messagePrefix + "】" + template.getContent(); - MsgRequest request = HelperUtils.getMessageRequest(messageContent, p.getMphone(), + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, p.getMphone(), ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(), p.getHospitalId(), template.getId(), p.getId(), //checkName, checkTimeStr, serDoct, @@ -1481,7 +1481,7 @@ public class TempleteMsgGenerateWorker implements Runnable { String serDoct = baseService.getServiceDoctorId(pat.getId(),false); - MsgRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(), + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, pat.getPhone(), ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(), pat.getHospitalId(), template.getId(), pat.getId(), checkName, checkTimeStr, serDoct, WxTempleteIdEnums.CHAN_JIAN_TI_XING.getId(), service); @@ -1551,7 +1551,7 @@ public class TempleteMsgGenerateWorker implements Runnable { messageContent = HelperUtils.replaceName(pat.getUsername(), messageContent); - MsgRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(), + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, pat.getPhone(), ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(), pat.getHospitalId(), template.getId(), pat.getId(), checkName, checkWeekName, serDoct, WxTempleteIdEnums.CHAN_JIAN_TI_XING.getId(), service); @@ -1588,7 +1588,7 @@ public class TempleteMsgGenerateWorker implements Runnable { String checkTimeStr = DateUtils.getDateStr(yuYueDate, DateUtils.Y_M_D); String checkName = "产前检查"; - MsgRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(), + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, pat.getPhone(), ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(), pat.getHospitalId(), template.getId(), pat.getId(), checkName, checkTimeStr, serDoct, WxTempleteIdEnums.CHAN_JIAN_TI_XING.getId(), service); @@ -1699,7 +1699,7 @@ public class TempleteMsgGenerateWorker implements Runnable { String messageContent = "【" + messagePrefix + "】" + template.getContent(); String title = "产后复查"; messageContent = HelperUtils.replaceEL(pat.getUsername(), actualSendDate, messageContent); - MsgRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(), + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, pat.getPhone(), ServiceObjEnums.CHANOBJ.getId(), template.getSmsType(), pat.getHospitalId(), template.getId(), pat.getId(), title, DateUtils.getDateStr(actualSendDate, DateUtils.Y_M_D), "", WxTempleteIdEnums.CHAN_HOU_FU_CHA.getId(), service); @@ -1811,7 +1811,7 @@ public class TempleteMsgGenerateWorker implements Runnable { String days = "产后" + HelperUtils.getKeyword(start, end, "天"); String title = "产后复查"; - MsgRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(), + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, pat.getPhone(), ServiceObjEnums.CHANOBJ.getId(), template.getSmsType(), pat.getHospitalId(), template.getId(), pat.getId(), title, days, "", WxTempleteIdEnums.CHAN_HOU_FU_CHA.getId(), service); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java index ccba4e3..698ea7f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java @@ -124,6 +124,7 @@ public class SmsTemplateFacade { model.setStatus(request.getStatus()); model.setTemplateType(request.getTemplateType()); model.setHealthType(request.getHealthType()); + model.setSendTime(request.getSendTime()); return model; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsTemplateRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsTemplateRequest.java index 23590e9..71276d8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsTemplateRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsTemplateRequest.java @@ -70,6 +70,17 @@ public class SmsTemplateRequest extends BaseQuery { //健康类型 0健康 1高危 private Integer healthType; + //发送时间 具体发送小时时间 + private Integer sendTime; + + public Integer getSendTime() { + return sendTime; + } + + public void setSendTime(Integer sendTime) { + this.sendTime = sendTime; + } + public Integer getHealthType() { return healthType; } -- 1.8.3.1