jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 3032e7343418255bc0b863b97fc08ba687a342cf

Authored by liquanyu
1 parent c8013f2750
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

孕妇学校

Showing 3 changed files with 8 additions and 9 deletions

platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java View file @ 3032e73
... ... @@ -121,7 +121,7 @@
121 121 condition = condition.and("status", status, MongoOper.IS);
122 122 }
123 123  
124   - if (!isSend) {
  124 + if (isSend) {
125 125 condition = condition.and("isSend", false, MongoOper.EXISTS);
126 126 }
127 127  
platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java View file @ 3032e73
... ... @@ -196,7 +196,7 @@
196 196 CourseQuery query = new CourseQuery();
197 197 query.setYn(YnEnums.YES.getId());
198 198 query.setStatus(CourseStatusEnums.YFB.getId());
199   - query.setIsSend(false);//未发送过推送
  199 + query.setIsSend(true);//未发送过推送
200 200 String currentDate = DateUtil.getyyyy_MM_dd(new Date());
201 201 query.setPublishTimeStart(DateUtil.parseYMD(currentDate));
202 202 query.setPublishTimeEnd(DateUtil.parseYMDHMS(currentDate + " 23:59:59"));
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/CourseMsgGenerateWorker.java View file @ 3032e73
... ... @@ -91,13 +91,13 @@
91 91  
92 92 //判断消息服务是否启动
93 93 //0服务不提供，1 推送服务， 2 短信服务，3推送和短信服务
94   - int service = baseService.isStartService(SmsServiceEnums.YBZD.getId(), serviceStr,serviceType);
  94 + int service = baseService.isStartService(SmsServiceEnums.YFXXKCTX.getId(), serviceStr,serviceType);
95 95 if (service == 0)
96 96 {
97 97 continue;
98 98 }
99 99 //课程对象id 0全部/空 1孕期 2儿童 ，3产后 (儿童占时没有)
100   - if (course.getCourseObjId() == null || course.getCourseObjId() == 1)
  100 + if (course.getCourseObjId() == null || course.getCourseObjId() == 0)
101 101 {
102 102 generateYun(course,config,service);
103 103 generateChan(course,config,service);
... ... @@ -155,7 +155,7 @@
155 155 String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor(), ServiceObjEnums.YUNOBJ.getId());
156 156 String courseTime = DateUtils.getDateStr(course.getCourseTime(),DateUtils.Y_M_D_H_M)+" ("+DateUtils.getWeekOfDate(course.getCourseTime())+")";
157 157  
158   - String messageContent = "【"+messagePrefix+"】";
  158 + String messageContent = "【"+messagePrefix+"】有新的孕妇学校课程发布啦，点击详情进一步了解和报名啦。";
159 159 MsgRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(),
160 160 ServiceObjEnums.YUNOBJ.getId(), SmsServiceEnums.YFXXKCTX.getId(),
161 161 course.getHospitalId(), course.getId(), pat.getId(), course.getCourseName(),
162 162  
... ... @@ -170,11 +170,10 @@
170 170 break;
171 171 }
172 172 count++;
  173 + Thread.sleep(2000);
173 174 }
174 175 list.setMessages(messages);
175 176 HelperUtils.sendMsg(list);
176   - Thread.sleep(5000);
177   -
178 177 course.setIsSend(1);
179 178 courseService.updateCourse(course);
180 179 } catch (InterruptedException e) {
... ... @@ -218,7 +217,7 @@
218 217 String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor(), ServiceObjEnums.YUNOBJ.getId());
219 218 String courseTime = DateUtils.getDateStr(course.getCourseTime(),DateUtils.Y_M_D_H_M)+" ("+DateUtils.getWeekOfDate(course.getCourseTime())+")";
220 219  
221   - String messageContent = "【"+messagePrefix+"】";
  220 + String messageContent = "【"+messagePrefix+"】有新的孕妇学校课程发布啦，点击详情进一步了解和报名啦。";
222 221 MsgRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(),
223 222 ServiceObjEnums.YUNOBJ.getId(), SmsServiceEnums.YFXXKCTX.getId(),
224 223 course.getHospitalId(), course.getId(), pat.getId(), course.getCourseName(),
225 224  
... ... @@ -233,10 +232,10 @@
233 232 break;
234 233 }
235 234 count++;
  235 + Thread.sleep(2000);
236 236 }
237 237 list.setMessages(messages);
238 238 HelperUtils.sendMsg(list);
239   - Thread.sleep(5000);
240 239 course.setIsSend(1);
241 240 courseService.updateCourse(course);
242 241 } catch (InterruptedException e) {