Commit f4a262dcae788b7d1e94386d8f3861e53e2a9f3f
1 parent
1688f49b0f
Exists in
master
and in
6 other branches
update code
Showing 9 changed files with 199 additions and 110 deletions
- platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java
- platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java
- platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/SaveMessageService.java
- platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java
- platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java
- platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java
- platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/ChanAmsMsgGenerateWorker.java
- platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java
- platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java
platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java
View file @
f4a262d
| ... | ... | @@ -22,68 +22,68 @@ |
| 22 | 22 | // |
| 23 | 23 | @Autowired |
| 24 | 24 | private IMsgGenerateService msgGenerateService; |
| 25 | -// | |
| 26 | -// /** | |
| 27 | -// * 生成孕妇ams消息 | |
| 28 | -// * @param hospitalId | |
| 29 | -// * @return | |
| 30 | -// */ | |
| 31 | -// @RequestMapping(method = RequestMethod.GET, value = "/generatePatAmsMsg") | |
| 32 | -// @ResponseBody | |
| 33 | -// public String generatePatAmsMsg(@RequestParam(required = false) String hospitalId) | |
| 34 | -// { | |
| 35 | -// | |
| 36 | -// logger.info("The request hospital id is {} ", hospitalId); | |
| 37 | -// msgGenerateService.generatePatAmsMsg(hospitalId); | |
| 38 | -// return ""; | |
| 39 | -// } | |
| 40 | -// | |
| 41 | -// | |
| 42 | -// /** | |
| 43 | -// * 生成儿童ams消息 | |
| 44 | -// * @param hospitalId | |
| 45 | -// * @return | |
| 46 | -// */ | |
| 47 | -// @RequestMapping(method = RequestMethod.GET, value = "/generateBabyAmsMsg") | |
| 48 | -// @ResponseBody | |
| 49 | -// public String generateBabyAmsMsg(@RequestParam(required = false) String hospitalId) | |
| 50 | -// { | |
| 51 | -// | |
| 52 | -// logger.info("The request hospital id is {} ", hospitalId); | |
| 53 | -// msgGenerateService.generateBabyAmsMsg(hospitalId); | |
| 54 | -// return ""; | |
| 55 | -// } | |
| 56 | -// | |
| 57 | -// | |
| 58 | -// /** | |
| 59 | -// * 生成产妇ams消息 | |
| 60 | -// * @param hospitalId | |
| 61 | -// * @return | |
| 62 | -// */ | |
| 63 | -// @RequestMapping(method = RequestMethod.GET, value = "/generateChanAmsMsg") | |
| 64 | -// @ResponseBody | |
| 65 | -// public String generateChanAmsMsg(@RequestParam(required = false) String hospitalId) | |
| 66 | -// { | |
| 67 | -// | |
| 68 | -// logger.info("The request hospital id is {} ", hospitalId); | |
| 69 | -// msgGenerateService.generateChanAmsMsg(hospitalId); | |
| 70 | -// return ""; | |
| 71 | -// } | |
| 72 | -// | |
| 73 | -// /** | |
| 74 | -// * 生成模板推送消息 | |
| 75 | -// * @param hospitalId | |
| 76 | -// * @return | |
| 77 | -// */ | |
| 78 | -// @RequestMapping(method = RequestMethod.GET, value = "/generateTemplateMsg") | |
| 79 | -// @ResponseBody | |
| 80 | -// public String generateTemplateMsg(@RequestParam(required = false) String hospitalId) | |
| 81 | -// { | |
| 82 | -// | |
| 83 | -// logger.info("The request hospital id is {} ", hospitalId); | |
| 84 | -// msgGenerateService.generateTemplateMsg(hospitalId); | |
| 85 | -// return ""; | |
| 86 | -// } | |
| 25 | + | |
| 26 | + /** | |
| 27 | + * 生成孕妇ams消息 | |
| 28 | + * @param hospitalId | |
| 29 | + * @return | |
| 30 | + */ | |
| 31 | + @RequestMapping(method = RequestMethod.GET, value = "/generatePatAmsMsg") | |
| 32 | + @ResponseBody | |
| 33 | + public String generatePatAmsMsg(@RequestParam(required = false) String hospitalId) | |
| 34 | + { | |
| 35 | + | |
| 36 | + logger.info("The request hospital id is {} ", hospitalId); | |
| 37 | + msgGenerateService.generatePatAmsMsg(hospitalId); | |
| 38 | + return ""; | |
| 39 | + } | |
| 40 | + | |
| 41 | + | |
| 42 | + /** | |
| 43 | + * 生成儿童ams消息 | |
| 44 | + * @param hospitalId | |
| 45 | + * @return | |
| 46 | + */ | |
| 47 | + @RequestMapping(method = RequestMethod.GET, value = "/generateBabyAmsMsg") | |
| 48 | + @ResponseBody | |
| 49 | + public String generateBabyAmsMsg(@RequestParam(required = false) String hospitalId) | |
| 50 | + { | |
| 51 | + | |
| 52 | + logger.info("The request hospital id is {} ", hospitalId); | |
| 53 | + msgGenerateService.generateBabyAmsMsg(hospitalId); | |
| 54 | + return ""; | |
| 55 | + } | |
| 56 | + | |
| 57 | + | |
| 58 | + /** | |
| 59 | + * 生成产妇ams消息 | |
| 60 | + * @param hospitalId | |
| 61 | + * @return | |
| 62 | + */ | |
| 63 | + @RequestMapping(method = RequestMethod.GET, value = "/generateChanAmsMsg") | |
| 64 | + @ResponseBody | |
| 65 | + public String generateChanAmsMsg(@RequestParam(required = false) String hospitalId) | |
| 66 | + { | |
| 67 | + | |
| 68 | + logger.info("The request hospital id is {} ", hospitalId); | |
| 69 | + msgGenerateService.generateChanAmsMsg(hospitalId); | |
| 70 | + return ""; | |
| 71 | + } | |
| 72 | + | |
| 73 | + /** | |
| 74 | + * 生成模板推送消息 | |
| 75 | + * @param hospitalId | |
| 76 | + * @return | |
| 77 | + */ | |
| 78 | + @RequestMapping(method = RequestMethod.GET, value = "/generateTemplateMsg") | |
| 79 | + @ResponseBody | |
| 80 | + public String generateTemplateMsg(@RequestParam(required = false) String hospitalId) | |
| 81 | + { | |
| 82 | + | |
| 83 | + logger.info("The request hospital id is {} ", hospitalId); | |
| 84 | + msgGenerateService.generateTemplateMsg(hospitalId); | |
| 85 | + return ""; | |
| 86 | + } | |
| 87 | 87 | |
| 88 | 88 | } |
platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java
View file @
f4a262d
| ... | ... | @@ -154,7 +154,7 @@ |
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | public static void main(String[] args) { |
| 157 | - Map<String,List<MessageContent>> list = getMessageTemplateMap("206", | |
| 157 | + Map<String,List<MessageContent>> list = getMessageTemplateMap("2100001435", | |
| 158 | 158 | AmsServiceTypeEnum.CHILD_GUIDE); |
| 159 | 159 | List<MessageContent> msgs = list.get("年龄≥35岁"); |
| 160 | 160 | System.out.println(msgs); |
platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/SaveMessageService.java
View file @
f4a262d
| ... | ... | @@ -18,6 +18,8 @@ |
| 18 | 18 | import org.slf4j.LoggerFactory; |
| 19 | 19 | |
| 20 | 20 | import java.util.*; |
| 21 | +import java.util.concurrent.ExecutorService; | |
| 22 | +import java.util.concurrent.Executors; | |
| 21 | 23 | |
| 22 | 24 | /** |
| 23 | 25 | * Created by Administrator on 2016/7/5. |
| ... | ... | @@ -26,6 +28,8 @@ |
| 26 | 28 | |
| 27 | 29 | private static final Logger resultLog = LoggerFactory.getLogger("GEN-RESULT"); |
| 28 | 30 | |
| 31 | + | |
| 32 | + | |
| 29 | 33 | /** |
| 30 | 34 | * 保存推送消息到消息中心 |
| 31 | 35 | * @param list |
| ... | ... | @@ -34,7 +38,7 @@ |
| 34 | 38 | public static boolean saveMsgCenter(MessageListRequest list) |
| 35 | 39 | { |
| 36 | 40 | String json = JsonUtil.obj2JsonString(list); |
| 37 | - resultLog.info(json); | |
| 41 | + //resultLog.info(json); | |
| 38 | 42 | String result = HttpClientUtil.doPostSSL(ConfigInterface.MSG_BASE_URL+"/biz-push-web/push",json); |
| 39 | 43 | if (StringUtils.isNotEmpty(result)) |
| 40 | 44 | { |
| 41 | 45 | |
| ... | ... | @@ -78,7 +82,10 @@ |
| 78 | 82 | |
| 79 | 83 | public static void main(String[] areg) |
| 80 | 84 | { |
| 85 | + long start = System.currentTimeMillis(); | |
| 81 | 86 | isExistMsg("59964f0ee4b04389242278f2","5993db2af0f0ac844d75bf83"); |
| 87 | + long end = System.currentTimeMillis(); | |
| 88 | + System.out.println(end - start); | |
| 82 | 89 | } |
| 83 | 90 | } |
platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java
View file @
f4a262d
| ... | ... | @@ -31,7 +31,7 @@ |
| 31 | 31 | private static final Logger logger = LoggerFactory.getLogger(MsgGenerateServiceImpl.class); |
| 32 | 32 | |
| 33 | 33 | |
| 34 | - private static ExecutorService pool = Executors.newFixedThreadPool(10); | |
| 34 | + private static ExecutorService pool = Executors.newFixedThreadPool(20); | |
| 35 | 35 | |
| 36 | 36 | @Autowired |
| 37 | 37 | private IBaseService baseService; |
| ... | ... | @@ -64,7 +64,7 @@ |
| 64 | 64 | logger.info("The generatePatAmsMsg configs hospital size is {}",configModels.size()); |
| 65 | 65 | if (CollectionUtils.isNotEmpty(configModels)) |
| 66 | 66 | { |
| 67 | - int batchSize = 5; | |
| 67 | + int batchSize = 3; | |
| 68 | 68 | int end = 0; |
| 69 | 69 | for (int i = 0; i < configModels.size(); i += batchSize) { |
| 70 | 70 | end = (end + batchSize); |
| ... | ... | @@ -73,7 +73,7 @@ |
| 73 | 73 | } |
| 74 | 74 | YunAmsMsgGenerateWorker checkPointCountWorker = new YunAmsMsgGenerateWorker(configModels.subList(i,end), |
| 75 | 75 | baseService,yunBookbuildingService,week,highRiskService); |
| 76 | - pool.submit(checkPointCountWorker); | |
| 76 | + pool.execute(checkPointCountWorker); | |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | } |
| ... | ... | @@ -90,7 +90,7 @@ |
| 90 | 90 | logger.info("The generateBabyAmsMsg configs hospital size is {}",configModels.size()); |
| 91 | 91 | if (CollectionUtils.isNotEmpty(configModels)) |
| 92 | 92 | { |
| 93 | - int batchSize = 5; | |
| 93 | + int batchSize = 3; | |
| 94 | 94 | int end = 0; |
| 95 | 95 | for (int i = 0; i < configModels.size(); i += batchSize) { |
| 96 | 96 | end = (end + batchSize); |
| ... | ... | @@ -99,7 +99,7 @@ |
| 99 | 99 | } |
| 100 | 100 | BabyAmsMsgGenerateWorker checkPointCountWorker = new BabyAmsMsgGenerateWorker(configModels.subList(i,end), |
| 101 | 101 | baseService,babyBookbuildingService); |
| 102 | - pool.submit(checkPointCountWorker); | |
| 102 | + pool.execute(checkPointCountWorker); | |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | } |
| ... | ... | @@ -116,7 +116,7 @@ |
| 116 | 116 | logger.info("The generateChanAmsMsg configs hospital size is {}",configModels.size()); |
| 117 | 117 | if (CollectionUtils.isNotEmpty(configModels)) |
| 118 | 118 | { |
| 119 | - int batchSize = 5; | |
| 119 | + int batchSize = 3; | |
| 120 | 120 | int end = 0; |
| 121 | 121 | for (int i = 0; i < configModels.size(); i += batchSize) { |
| 122 | 122 | end = (end + batchSize); |
| ... | ... | @@ -125,7 +125,7 @@ |
| 125 | 125 | } |
| 126 | 126 | ChanAmsMsgGenerateWorker checkPointCountWorker = new ChanAmsMsgGenerateWorker(configModels.subList(i,end), |
| 127 | 127 | baseService,yunBookbuildingService); |
| 128 | - pool.submit(checkPointCountWorker); | |
| 128 | + pool.execute(checkPointCountWorker); | |
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | } |
| ... | ... | @@ -142,7 +142,7 @@ |
| 142 | 142 | logger.info("The generateChanAmsMsg configs hospital size is {}",configModels.size()); |
| 143 | 143 | if (CollectionUtils.isNotEmpty(configModels)) |
| 144 | 144 | { |
| 145 | - int batchSize = 5; | |
| 145 | + int batchSize = 3; | |
| 146 | 146 | int end = 0; |
| 147 | 147 | for (int i = 0; i < configModels.size(); i += batchSize) { |
| 148 | 148 | end = (end + batchSize); |
| 149 | 149 | |
| 150 | 150 | |
| 151 | 151 | |
| ... | ... | @@ -151,17 +151,41 @@ |
| 151 | 151 | } |
| 152 | 152 | TempleteMsgGenerateWorker worker = new TempleteMsgGenerateWorker(configModels.subList(i,end), |
| 153 | 153 | baseService,yunBookbuildingService,smsTemplateService,babyBookbuildingService,postReviewService); |
| 154 | - pool.submit(worker); | |
| 154 | + pool.execute(worker); | |
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | } |
| 158 | 158 | } |
| 159 | 159 | |
| 160 | + /** | |
| 161 | + * 总的方法调用 | |
| 162 | + */ | |
| 160 | 163 | public void generaterAllMsg() { |
| 161 | - generateTemplateMsg(null); | |
| 162 | - generateChanAmsMsg(null); | |
| 163 | - generateBabyAmsMsg(null); | |
| 164 | + logger.info("generater all msg starting."); | |
| 165 | + new Thread(new Runnable() { | |
| 166 | + @Override | |
| 167 | + public void run() { | |
| 168 | + generateTemplateMsg(null); | |
| 169 | + } | |
| 170 | + }).start(); | |
| 171 | + | |
| 172 | + | |
| 173 | + new Thread(new Runnable() { | |
| 174 | + @Override | |
| 175 | + public void run() { | |
| 176 | + generateChanAmsMsg(null); | |
| 177 | + } | |
| 178 | + }).start(); | |
| 179 | + | |
| 180 | + new Thread(new Runnable() { | |
| 181 | + @Override | |
| 182 | + public void run() { | |
| 183 | + generateBabyAmsMsg(null); | |
| 184 | + } | |
| 185 | + }).start(); | |
| 186 | + | |
| 164 | 187 | generatePatAmsMsg(null); |
| 188 | + logger.info("generater all msg ending."); | |
| 165 | 189 | } |
| 166 | 190 | } |
platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java
View file @
f4a262d
| ... | ... | @@ -18,6 +18,8 @@ |
| 18 | 18 | import java.util.Date; |
| 19 | 19 | import java.util.List; |
| 20 | 20 | import java.util.Map; |
| 21 | +import java.util.concurrent.ExecutorService; | |
| 22 | +import java.util.concurrent.Executors; | |
| 21 | 23 | |
| 22 | 24 | /** |
| 23 | 25 | * Created by Administrator on 2017-07-19. |
| 24 | 26 | |
| ... | ... | @@ -25,8 +27,9 @@ |
| 25 | 27 | public class HelperUtils { |
| 26 | 28 | |
| 27 | 29 | private static final Logger logger = LoggerFactory.getLogger(HelperUtils.class); |
| 28 | - private static final Logger resultLog = LoggerFactory.getLogger("GEN-RESULT"); | |
| 29 | 30 | |
| 31 | + private static ExecutorService pool = Executors.newFixedThreadPool(5); | |
| 32 | + | |
| 30 | 33 | public static int getWeekNum(List<String> guideTimes,String week) |
| 31 | 34 | { |
| 32 | 35 | int weekNum = 0; |
| ... | ... | @@ -249,7 +252,7 @@ |
| 249 | 252 | weekStr = "孕" + week + "周"; |
| 250 | 253 | if (day > 0) |
| 251 | 254 | { |
| 252 | - weekStr += day + "天"; | |
| 255 | + weekStr += "+" +day + "天"; | |
| 253 | 256 | } |
| 254 | 257 | return weekStr; |
| 255 | 258 | } |
| ... | ... | @@ -267,7 +270,7 @@ |
| 267 | 270 | if (list != null && list.getMessages() != null) |
| 268 | 271 | { |
| 269 | 272 | List<MessageRequest> msgs = list.getMessages(); |
| 270 | - int batchSize = 100; | |
| 273 | + int batchSize = 50; | |
| 271 | 274 | int end = 0; |
| 272 | 275 | for (int i = 0; i < msgs.size(); i += batchSize) { |
| 273 | 276 | end = (end + batchSize); |
| ... | ... | @@ -275,11 +278,16 @@ |
| 275 | 278 | end = msgs.size(); |
| 276 | 279 | } |
| 277 | 280 | logger.info("start:" + i + ",end:" + end); |
| 278 | - List<MessageRequest> tempList = msgs.subList(i, end); | |
| 279 | - MessageListRequest sentList = new MessageListRequest(); | |
| 280 | - sentList.setMessages(tempList); | |
| 281 | - sentList.setTypeId(ProjectTypeEnums.YNXT.getId()); | |
| 282 | - SaveMessageService.saveMsgCenter(sentList); | |
| 281 | + final List<MessageRequest> tempList = msgs.subList(i, end); | |
| 282 | + pool.execute(new Runnable() { | |
| 283 | + @Override | |
| 284 | + public void run() { | |
| 285 | + MessageListRequest sentList = new MessageListRequest(); | |
| 286 | + sentList.setMessages(tempList); | |
| 287 | + sentList.setTypeId(ProjectTypeEnums.YNXT.getId()); | |
| 288 | + SaveMessageService.saveMsgCenter(sentList); | |
| 289 | + } | |
| 290 | + }); | |
| 283 | 291 | } |
| 284 | 292 | } |
| 285 | 293 | } |
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java
View file @
f4a262d
| ... | ... | @@ -78,6 +78,14 @@ |
| 78 | 78 | .getMessageTemplateMap(String.valueOf(hospitalId), |
| 79 | 79 | AmsServiceTypeEnum.CHILD_GUIDE); |
| 80 | 80 | |
| 81 | + if (amsSmses == null || amsSmses.size() == 0) | |
| 82 | + { | |
| 83 | + continue; | |
| 84 | + } | |
| 85 | + | |
| 86 | + logger.info("The BabyAmsMsgGenerate hospital id is "+hospitalId); | |
| 87 | + | |
| 88 | + | |
| 81 | 89 | BabyModelQuery babyQuery = new BabyModelQuery(); |
| 82 | 90 | babyQuery.setYn(YnEnums.YES.getId()); |
| 83 | 91 | babyQuery.setHospitalId(hospitalId); |
| ... | ... | @@ -144,7 +152,6 @@ |
| 144 | 152 | list.setMessages(messages); |
| 145 | 153 | HelperUtils.sendMsg(list); |
| 146 | 154 | } |
| 147 | - | |
| 148 | 155 | } |
| 149 | 156 | } |
| 150 | 157 | } |
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/ChanAmsMsgGenerateWorker.java
View file @
f4a262d
| ... | ... | @@ -78,7 +78,12 @@ |
| 78 | 78 | Map<String, List<MessageContent>> amsSmses = AmsMessageService |
| 79 | 79 | .getMessageTemplateMap(String.valueOf(hospitalId), |
| 80 | 80 | AmsServiceTypeEnum.CHAN_GUIDE); |
| 81 | + if (amsSmses == null || amsSmses.size() == 0) | |
| 82 | + { | |
| 83 | + continue; | |
| 84 | + } | |
| 81 | 85 | |
| 86 | + logger.info("The ChanAmsMsgGenerate hospital id is "+hospitalId); | |
| 82 | 87 | |
| 83 | 88 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 84 | 89 | patientsQuery.setYn(YnEnums.YES.getId()); |
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java
View file @
f4a262d
| ... | ... | @@ -91,7 +91,7 @@ |
| 91 | 91 | } |
| 92 | 92 | try { |
| 93 | 93 | |
| 94 | - int batchSize = 5; | |
| 94 | + int batchSize = 3; | |
| 95 | 95 | int end = 0; |
| 96 | 96 | for (int i = 0; i < templates.size(); i += batchSize) { |
| 97 | 97 | end = (end + batchSize); |
| ... | ... | @@ -143,7 +143,7 @@ |
| 143 | 143 | } |
| 144 | 144 | catch (Exception e) |
| 145 | 145 | { |
| 146 | - ExceptionUtils.catchException(e,"genernate templete error. ["+template.toString()+"]"); | |
| 146 | + logger.error("genernate templete error. [" + template.toString() + "]", e); | |
| 147 | 147 | continue; |
| 148 | 148 | } |
| 149 | 149 | } |
| ... | ... | @@ -153,7 +153,7 @@ |
| 153 | 153 | } |
| 154 | 154 | catch (Exception e) |
| 155 | 155 | { |
| 156 | - ExceptionUtils.catchException(e,"genernate config error.["+config.toString()+"]"); | |
| 156 | + logger.error("genernate config error.["+config.toString()+"]",e); | |
| 157 | 157 | continue; |
| 158 | 158 | } |
| 159 | 159 | } |
| ... | ... | @@ -165,7 +165,8 @@ |
| 165 | 165 | * @param template |
| 166 | 166 | * @param config |
| 167 | 167 | */ |
| 168 | - private void generateChildTempMsg(SmsTemplateModel template, SmsConfigModel config) { | |
| 168 | + private void generateChildTempMsg(SmsTemplateModel template, SmsConfigModel config) | |
| 169 | + { | |
| 169 | 170 | |
| 170 | 171 | //模板属于的医院id |
| 171 | 172 | String tempHid = template.getHospitalId(); |
| 172 | 173 | |
| ... | ... | @@ -190,13 +191,13 @@ |
| 190 | 191 | babyModelQuery.setSmsBuildTypeList(buildType); |
| 191 | 192 | babyModelQuery = HelperUtils.getServiceBabyQuery(serviceType, serviceStatus, babyModelQuery); |
| 192 | 193 | |
| 193 | - //发送短信集合 | |
| 194 | - MessageListRequest list = new MessageListRequest(); | |
| 195 | - List<MessageRequest> messages = new ArrayList<>(); | |
| 196 | - | |
| 197 | 194 | //儿保预约提醒 |
| 198 | 195 | if (smsType == SmsServiceEnums.EBYYTX.getId()) |
| 199 | 196 | { |
| 197 | + //发送短信集合 | |
| 198 | + MessageListRequest list = new MessageListRequest(); | |
| 199 | + List<MessageRequest> messages = new ArrayList<>(); | |
| 200 | + | |
| 200 | 201 | Date yuYueDate = DateUtils.addDay(new Date(), sendTimeType); |
| 201 | 202 | yuYueDate = DateUtils.formatDate(yuYueDate,DateUtils.Y_M_D); |
| 202 | 203 | List<BabyCheckModel> checkModels = babyBookbuildingService.queryBabyYuYueRecord(yuYueDate, tempHid); |
| ... | ... | @@ -232,6 +233,9 @@ |
| 232 | 233 | } |
| 233 | 234 | } |
| 234 | 235 | } |
| 236 | + | |
| 237 | + list.setMessages(messages); | |
| 238 | + HelperUtils.sendMsg(list); | |
| 235 | 239 | } |
| 236 | 240 | //儿保程序提醒 |
| 237 | 241 | else if (smsType == SmsServiceEnums.EBCXTX.getId()) |
| 238 | 242 | |
| ... | ... | @@ -247,12 +251,18 @@ |
| 247 | 251 | Integer sendDateType = template.getSendDateType(); |
| 248 | 252 | if (sendDateType == SendDateEnums.SLRQ.getId()) |
| 249 | 253 | { |
| 254 | + | |
| 250 | 255 | //时间类型 |
| 251 | 256 | Integer specialDateType = template.getSpecialDateType(); |
| 252 | 257 | |
| 253 | 258 | //儿童天数 |
| 254 | 259 | if (specialDateType == SpecialDateEnums.ETTS.getId()) |
| 255 | 260 | { |
| 261 | + | |
| 262 | + //发送短信集合 | |
| 263 | + MessageListRequest list = new MessageListRequest(); | |
| 264 | + List<MessageRequest> messages = new ArrayList<>(); | |
| 265 | + | |
| 256 | 266 | Integer start = template.getStart(); |
| 257 | 267 | Integer end = template.getEnd(); |
| 258 | 268 | |
| 259 | 269 | |
| ... | ... | @@ -303,10 +313,18 @@ |
| 303 | 313 | } |
| 304 | 314 | } |
| 305 | 315 | } |
| 316 | + | |
| 317 | + list.setMessages(messages); | |
| 318 | + HelperUtils.sendMsg(list); | |
| 306 | 319 | } |
| 307 | 320 | //儿童月龄 |
| 308 | 321 | else if (specialDateType == SpecialDateEnums.ETYL.getId()) |
| 309 | 322 | { |
| 323 | + | |
| 324 | + //发送短信集合 | |
| 325 | + MessageListRequest list = new MessageListRequest(); | |
| 326 | + List<MessageRequest> messages = new ArrayList<>(); | |
| 327 | + | |
| 310 | 328 | Integer start = template.getStart(); |
| 311 | 329 | Integer end = template.getEnd(); |
| 312 | 330 | |
| 313 | 331 | |
| 314 | 332 | |
| ... | ... | @@ -355,14 +373,16 @@ |
| 355 | 373 | } |
| 356 | 374 | } |
| 357 | 375 | } |
| 376 | + | |
| 377 | + list.setMessages(messages); | |
| 378 | + HelperUtils.sendMsg(list); | |
| 358 | 379 | } |
| 359 | 380 | } |
| 360 | 381 | } |
| 361 | 382 | } |
| 362 | 383 | |
| 363 | - list.setMessages(messages); | |
| 364 | - HelperUtils.sendMsg(list); | |
| 365 | 384 | |
| 385 | + | |
| 366 | 386 | } |
| 367 | 387 | |
| 368 | 388 | |
| 369 | 389 | |
| ... | ... | @@ -432,13 +452,13 @@ |
| 432 | 452 | |
| 433 | 453 | HelperUtils.getServicePatientQuery(serviceType, serviceStatus, patientsQuery); |
| 434 | 454 | |
| 435 | - //发送短信集合 | |
| 436 | - MessageListRequest list = new MessageListRequest(); | |
| 437 | - List<MessageRequest> messages = new ArrayList<>(); | |
| 438 | - | |
| 439 | 455 | //孕妇预约短信 |
| 440 | 456 | if (smsType == SmsServiceEnums.CJYYTX.getId()) |
| 441 | 457 | { |
| 458 | + //发送短信集合 | |
| 459 | + MessageListRequest list = new MessageListRequest(); | |
| 460 | + List<MessageRequest> messages = new ArrayList<>(); | |
| 461 | + | |
| 442 | 462 | Date yuYueDate = DateUtils.addDay(new Date(),sendTimeType); |
| 443 | 463 | //得到孕妇的id |
| 444 | 464 | Set<String> idset = baseService.getYuYuePatient(sendTimeType, tempHid); |
| 445 | 465 | |
| ... | ... | @@ -468,10 +488,17 @@ |
| 468 | 488 | } |
| 469 | 489 | } |
| 470 | 490 | } |
| 491 | + | |
| 492 | + list.setMessages(messages); | |
| 493 | + HelperUtils.sendMsg(list); | |
| 471 | 494 | } |
| 472 | 495 | //产检程序提醒 |
| 473 | 496 | else if (smsType == SmsServiceEnums.CJCXTX.getId()) |
| 474 | 497 | { |
| 498 | + //发送短信集合 | |
| 499 | + MessageListRequest list = new MessageListRequest(); | |
| 500 | + List<MessageRequest> messages = new ArrayList<>(); | |
| 501 | + | |
| 475 | 502 | //发送频次 |
| 476 | 503 | Integer sendFreq = template.getSendFrequency(); |
| 477 | 504 | |
| 478 | 505 | |
| ... | ... | @@ -534,10 +561,9 @@ |
| 534 | 561 | } |
| 535 | 562 | } |
| 536 | 563 | } |
| 564 | + list.setMessages(messages); | |
| 565 | + HelperUtils.sendMsg(list); | |
| 537 | 566 | } |
| 538 | - | |
| 539 | - list.setMessages(messages); | |
| 540 | - HelperUtils.sendMsg(list); | |
| 541 | 567 | } |
| 542 | 568 | |
| 543 | 569 | |
| 544 | 570 | |
| ... | ... | @@ -577,13 +603,13 @@ |
| 577 | 603 | |
| 578 | 604 | HelperUtils.getServicePatientQuery(serviceType, serviceStatus, patientsQuery); |
| 579 | 605 | |
| 580 | - //发送短信集合 | |
| 581 | - MessageListRequest list = new MessageListRequest(); | |
| 582 | - List<MessageRequest> messages = new ArrayList<>(); | |
| 583 | - | |
| 584 | 606 | //产妇预约短信 |
| 585 | 607 | if (smsType == SmsServiceEnums.CHFCYUTX.getId()) |
| 586 | 608 | { |
| 609 | + //发送短信集合 | |
| 610 | + MessageListRequest list = new MessageListRequest(); | |
| 611 | + List<MessageRequest> messages = new ArrayList<>(); | |
| 612 | + | |
| 587 | 613 | //把时间格式成yyyy_MM_dd |
| 588 | 614 | Date actualSendDate = DateUtils.formatDate(DateUtils.addDay(new Date(), sendTimeType), DateUtils.Y_M_D); |
| 589 | 615 | |
| 590 | 616 | |
| ... | ... | @@ -618,10 +644,18 @@ |
| 618 | 644 | } |
| 619 | 645 | } |
| 620 | 646 | } |
| 647 | + | |
| 648 | + list.setMessages(messages); | |
| 649 | + HelperUtils.sendMsg(list); | |
| 621 | 650 | } |
| 622 | 651 | //产后复查程序提醒 |
| 623 | 652 | else if (smsType == SmsServiceEnums.CHFCCXTX.getId()) |
| 624 | 653 | { |
| 654 | + | |
| 655 | + //发送短信集合 | |
| 656 | + MessageListRequest list = new MessageListRequest(); | |
| 657 | + List<MessageRequest> messages = new ArrayList<>(); | |
| 658 | + | |
| 625 | 659 | //发送频次 |
| 626 | 660 | Integer sendFreq = template.getSendFrequency(); |
| 627 | 661 | |
| 628 | 662 | |
| ... | ... | @@ -685,9 +719,10 @@ |
| 685 | 719 | } |
| 686 | 720 | } |
| 687 | 721 | |
| 722 | + list.setMessages(messages); | |
| 723 | + HelperUtils.sendMsg(list); | |
| 688 | 724 | } |
| 689 | - list.setMessages(messages); | |
| 690 | - HelperUtils.sendMsg(list); | |
| 725 | + | |
| 691 | 726 | } |
| 692 | 727 | |
| 693 | 728 |
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java
View file @
f4a262d
| ... | ... | @@ -113,13 +113,16 @@ |
| 113 | 113 | continue; |
| 114 | 114 | } |
| 115 | 115 | |
| 116 | - | |
| 117 | - | |
| 118 | 116 | // 查询模板短信 从ams平台配置的短信通过医院ID |
| 119 | 117 | Map<String, List<MessageContent>> amsSmses = AmsMessageService |
| 120 | 118 | .getMessageTemplateMap(hospitalId, |
| 121 | 119 | AmsServiceTypeEnum.YUN_GUIDE); |
| 120 | + if (amsSmses == null || amsSmses.size() == 0) | |
| 121 | + { | |
| 122 | + continue; | |
| 123 | + } | |
| 122 | 124 | |
| 125 | + logger.info("The YunAmsMsgGenerate hospital id is "+hospitalId); | |
| 123 | 126 | |
| 124 | 127 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 125 | 128 | patientsQuery.setYn(YnEnums.YES.getId()); |