From c8013f275058702f6cfac553c02b66a4d1480b79 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 19 Apr 2018 14:36:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=AD=A6=E6=A0=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../msg/service/impl/MsgGenerateServiceImpl.java | 2 +- .../com/lyms/platform/msg/utils/HelperUtils.java | 29 +++++++++++++++++++--- .../msg/worker/CourseMsgGenerateWorker.java | 8 +++--- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java index 62c9daa..1fe85e2 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java @@ -196,7 +196,7 @@ public class MsgGenerateServiceImpl implements IMsgGenerateService { CourseQuery query = new CourseQuery(); query.setYn(YnEnums.YES.getId()); query.setStatus(CourseStatusEnums.YFB.getId()); - query.setIsSend(false); + query.setIsSend(false);//未发送过推送 String currentDate = DateUtil.getyyyy_MM_dd(new Date()); query.setPublishTimeStart(DateUtil.parseYMD(currentDate)); query.setPublishTimeEnd(DateUtil.parseYMDHMS(currentDate + " 23:59:59")); 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 a228be6..a36f9d8 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 @@ -62,6 +62,21 @@ public class HelperUtils { Integer serviceType ) { + return getMessageRequest( 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, + String tempId,String pid, + String keyWord1,String keyWord2, + String remark,String wxTempId, + Integer serviceType, + Integer timeType + ) + { MsgRequest request = new MsgRequest(); //1 推送服务， 2 推送和短信服务，3短信服务 @@ -75,12 +90,19 @@ public class HelperUtils { //服务对象 1孕妇 2儿童 3产妇 request.setObjType(serviceObj); request.setPhone(phone); - //计划发送时间 - request.setPlanTime(DateUtils.getDateStr(new Date(), DateUtils.Y_M_D)+ " " + ConfigInterface.SEND_TIME +":00"); + if (SmsTimeTypeEnums.NO_ONTIME.getId() == timeType) + { + //计划发送时间 + request.setPlanTime(DateUtils.getDateStr(new Date(), DateUtils.Y_M_D)+ " " + ConfigInterface.SEND_TIME +":00"); + } + else + { + request.setPlanTime(DateUtils.getDateStr(new Date(),DateUtils.Y_M_D_H_M_S)); + } request.setSubTypeId(msgType); request.setStatus(MsgStatusEnums.NO_SEND.getId()); - request.setTimeType(SmsTimeTypeEnums.NO_ONTIME.getId()); + request.setTimeType(timeType); request.setHospitalId(hospitalId); request.setPatientId(pid); request.setTempId(tempId); @@ -94,7 +116,6 @@ public class HelperUtils { return request; } - /** * 判断模板对应的服务是否启动 * @param config diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/CourseMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/CourseMsgGenerateWorker.java index a2ca7b0..cf005b1 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/CourseMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/CourseMsgGenerateWorker.java @@ -123,7 +123,7 @@ public class CourseMsgGenerateWorker implements Runnable { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setHospitalId(course.getHospitalId()); - patientsQuery.setLimit(1000); + patientsQuery.setLimit(2); int count = 1; while (true) { @@ -160,7 +160,7 @@ public class CourseMsgGenerateWorker implements Runnable { ServiceObjEnums.YUNOBJ.getId(), SmsServiceEnums.YFXXKCTX.getId(), course.getHospitalId(), course.getId(), pat.getId(), course.getCourseName(), course.getCourseSpeaker(), courseTime, - WxTempleteIdEnums.YUN_XUE_KE_CHEN_TX.getId(),service); + WxTempleteIdEnums.YUN_XUE_KE_CHEN_TX.getId(),service,SmsTimeTypeEnums.ONTIME.getId()); messages.add(request); } @@ -191,7 +191,7 @@ public class CourseMsgGenerateWorker implements Runnable { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setHospitalId(course.getHospitalId()); - patientsQuery.setLimit(1000); + patientsQuery.setLimit(2); int count = 1; while (true) { @@ -223,7 +223,7 @@ public class CourseMsgGenerateWorker implements Runnable { ServiceObjEnums.YUNOBJ.getId(), SmsServiceEnums.YFXXKCTX.getId(), course.getHospitalId(), course.getId(), pat.getId(), course.getCourseName(), course.getCourseSpeaker(), courseTime, - WxTempleteIdEnums.YUN_XUE_KE_CHEN_TX.getId(),service); + WxTempleteIdEnums.YUN_XUE_KE_CHEN_TX.getId(),service,SmsTimeTypeEnums.ONTIME.getId()); messages.add(request); } -- 1.8.3.1