From 3032e7343418255bc0b863b97fc08ba687a342cf Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 19 Apr 2018 15:19:54 +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 --- .../src/main/java/com/lyms/platform/query/CourseQuery.java | 2 +- .../platform/msg/service/impl/MsgGenerateServiceImpl.java | 2 +- .../lyms/platform/msg/worker/CourseMsgGenerateWorker.java | 13 ++++++------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java index 334be6f..68cc0a3 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java @@ -121,7 +121,7 @@ public class CourseQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("status", status, MongoOper.IS); } - if (!isSend) { + if (isSend) { condition = condition.and("isSend", false, MongoOper.EXISTS); } 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 1fe85e2..85bacda 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(true);//未发送过推送 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/worker/CourseMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/CourseMsgGenerateWorker.java index cf005b1..330b131 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 @@ -91,13 +91,13 @@ public class CourseMsgGenerateWorker implements Runnable { //判断消息服务是否启动 //0服务不提供，1 推送服务， 2 短信服务，3推送和短信服务 - int service = baseService.isStartService(SmsServiceEnums.YBZD.getId(), serviceStr,serviceType); + int service = baseService.isStartService(SmsServiceEnums.YFXXKCTX.getId(), serviceStr,serviceType); if (service == 0) { continue; } //课程对象id 0全部/空 1孕期 2儿童 ，3产后 (儿童占时没有) - if (course.getCourseObjId() == null || course.getCourseObjId() == 1) + if (course.getCourseObjId() == null || course.getCourseObjId() == 0) { generateYun(course,config,service); generateChan(course,config,service); @@ -155,7 +155,7 @@ public class CourseMsgGenerateWorker implements Runnable { String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor(), ServiceObjEnums.YUNOBJ.getId()); String courseTime = DateUtils.getDateStr(course.getCourseTime(),DateUtils.Y_M_D_H_M)+" ("+DateUtils.getWeekOfDate(course.getCourseTime())+")"; - String messageContent = "【"+messagePrefix+"】"; + String messageContent = "【"+messagePrefix+"】有新的孕妇学校课程发布啦，点击详情进一步了解和报名啦。"; MsgRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(), ServiceObjEnums.YUNOBJ.getId(), SmsServiceEnums.YFXXKCTX.getId(), course.getHospitalId(), course.getId(), pat.getId(), course.getCourseName(), @@ -170,11 +170,10 @@ public class CourseMsgGenerateWorker implements Runnable { break; } count++; + Thread.sleep(2000); } list.setMessages(messages); HelperUtils.sendMsg(list); - Thread.sleep(5000); - course.setIsSend(1); courseService.updateCourse(course); } catch (InterruptedException e) { @@ -218,7 +217,7 @@ public class CourseMsgGenerateWorker implements Runnable { String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor(), ServiceObjEnums.YUNOBJ.getId()); String courseTime = DateUtils.getDateStr(course.getCourseTime(),DateUtils.Y_M_D_H_M)+" ("+DateUtils.getWeekOfDate(course.getCourseTime())+")"; - String messageContent = "【"+messagePrefix+"】"; + String messageContent = "【"+messagePrefix+"】有新的孕妇学校课程发布啦，点击详情进一步了解和报名啦。"; MsgRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(), ServiceObjEnums.YUNOBJ.getId(), SmsServiceEnums.YFXXKCTX.getId(), course.getHospitalId(), course.getId(), pat.getId(), course.getCourseName(), @@ -233,10 +232,10 @@ public class CourseMsgGenerateWorker implements Runnable { break; } count++; + Thread.sleep(2000); } list.setMessages(messages); HelperUtils.sendMsg(list); - Thread.sleep(5000); course.setIsSend(1); courseService.updateCourse(course); } catch (InterruptedException e) { -- 1.8.3.1