jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c8013f275058702f6cfac553c02b66a4d1480b79

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

孕妇学校

Showing 3 changed files with 30 additions and 9 deletions

platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java View file @ c8013f2
... ... @@ -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(false);//未发送过推送
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/utils/HelperUtils.java View file @ c8013f2
... ... @@ -62,6 +62,21 @@
62 62 Integer serviceType
63 63 )
64 64 {
  65 + return getMessageRequest( data, phone, serviceObj, msgType, hospitalId, tempId, pid, keyWord1, keyWord2,
  66 + remark, wxTempId, serviceType,SmsTimeTypeEnums.NO_ONTIME.getId());
  67 + }
  68 +
  69 +
  70 +
  71 + public static MsgRequest getMessageRequest(String data,String phone,Integer serviceObj,
  72 + Integer msgType,String hospitalId,
  73 + String tempId,String pid,
  74 + String keyWord1,String keyWord2,
  75 + String remark,String wxTempId,
  76 + Integer serviceType,
  77 + Integer timeType
  78 + )
  79 + {
65 80 MsgRequest request = new MsgRequest();
66 81  
67 82 //1 推送服务， 2 推送和短信服务，3短信服务
68 83  
... ... @@ -75,12 +90,19 @@
75 90 //服务对象 1孕妇 2儿童 3产妇
76 91 request.setObjType(serviceObj);
77 92 request.setPhone(phone);
78   - //计划发送时间
79   - request.setPlanTime(DateUtils.getDateStr(new Date(), DateUtils.Y_M_D)+ " " + ConfigInterface.SEND_TIME +":00");
  93 + if (SmsTimeTypeEnums.NO_ONTIME.getId() == timeType)
  94 + {
  95 + //计划发送时间
  96 + request.setPlanTime(DateUtils.getDateStr(new Date(), DateUtils.Y_M_D)+ " " + ConfigInterface.SEND_TIME +":00");
  97 + }
  98 + else
  99 + {
  100 + request.setPlanTime(DateUtils.getDateStr(new Date(),DateUtils.Y_M_D_H_M_S));
  101 + }
80 102  
81 103 request.setSubTypeId(msgType);
82 104 request.setStatus(MsgStatusEnums.NO_SEND.getId());
83   - request.setTimeType(SmsTimeTypeEnums.NO_ONTIME.getId());
  105 + request.setTimeType(timeType);
84 106 request.setHospitalId(hospitalId);
85 107 request.setPatientId(pid);
86 108 request.setTempId(tempId);
... ... @@ -93,7 +115,6 @@
93 115 request.setRemark(remark);
94 116 return request;
95 117 }
96   -
97 118  
98 119 /**
99 120 * 判断模板对应的服务是否启动
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/CourseMsgGenerateWorker.java View file @ c8013f2
... ... @@ -123,7 +123,7 @@
123 123 PatientsQuery patientsQuery = new PatientsQuery();
124 124 patientsQuery.setYn(YnEnums.YES.getId());
125 125 patientsQuery.setHospitalId(course.getHospitalId());
126   - patientsQuery.setLimit(1000);
  126 + patientsQuery.setLimit(2);
127 127 int count = 1;
128 128 while (true)
129 129 {
... ... @@ -160,7 +160,7 @@
160 160 ServiceObjEnums.YUNOBJ.getId(), SmsServiceEnums.YFXXKCTX.getId(),
161 161 course.getHospitalId(), course.getId(), pat.getId(), course.getCourseName(),
162 162 course.getCourseSpeaker(), courseTime,
163   - WxTempleteIdEnums.YUN_XUE_KE_CHEN_TX.getId(),service);
  163 + WxTempleteIdEnums.YUN_XUE_KE_CHEN_TX.getId(),service,SmsTimeTypeEnums.ONTIME.getId());
164 164  
165 165 messages.add(request);
166 166 }
... ... @@ -191,7 +191,7 @@
191 191 PatientsQuery patientsQuery = new PatientsQuery();
192 192 patientsQuery.setYn(YnEnums.YES.getId());
193 193 patientsQuery.setHospitalId(course.getHospitalId());
194   - patientsQuery.setLimit(1000);
  194 + patientsQuery.setLimit(2);
195 195 int count = 1;
196 196 while (true)
197 197 {
... ... @@ -223,7 +223,7 @@
223 223 ServiceObjEnums.YUNOBJ.getId(), SmsServiceEnums.YFXXKCTX.getId(),
224 224 course.getHospitalId(), course.getId(), pat.getId(), course.getCourseName(),
225 225 course.getCourseSpeaker(), courseTime,
226   - WxTempleteIdEnums.YUN_XUE_KE_CHEN_TX.getId(),service);
  226 + WxTempleteIdEnums.YUN_XUE_KE_CHEN_TX.getId(),service,SmsTimeTypeEnums.ONTIME.getId());
227 227  
228 228 messages.add(request);
229 229 }