Commit 595725c5c47aa8400a3b7d30ec274087487faae8
1 parent
a06754edeb
Exists in
master
and in
6 other branches
update code
Showing 5 changed files with 27 additions and 66 deletions
- platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java
- platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.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/resources/database.properties
platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java
View file @
595725c
platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java
View file @
595725c
... | ... | @@ -18,10 +18,10 @@ |
18 | 18 | @RequestMapping("/msg") |
19 | 19 | public class MsgGenerateController extends BaseController { |
20 | 20 | |
21 | -// private static final Logger logger = LoggerFactory.getLogger(MsgGenerateController.class); | |
22 | -//// | |
23 | -// @Autowired | |
24 | -// private IMsgGenerateService msgGenerateService; | |
21 | + private static final Logger logger = LoggerFactory.getLogger(MsgGenerateController.class); | |
22 | +// | |
23 | + @Autowired | |
24 | + private IMsgGenerateService msgGenerateService; | |
25 | 25 | // |
26 | 26 | // /** |
27 | 27 | // * 生成孕妇ams消息 |
platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/SaveMessageService.java
View file @
595725c
... | ... | @@ -78,45 +78,7 @@ |
78 | 78 | |
79 | 79 | public static void main(String[] areg) |
80 | 80 | { |
81 | -// MessageListRequest list = new MessageListRequest(); | |
82 | -// | |
83 | -// | |
84 | -// List<MessageRequest> messages = new ArrayList<>(); | |
85 | -// | |
86 | -// | |
87 | -// MessageRequest request = new MessageRequest(); | |
88 | -// //平台ID | |
89 | -// request.setTypeId(ProjectTypeEnums.YNXT.getId()); | |
90 | -// //服务对象 1孕妇 2儿童 3产妇 | |
91 | -// request.setObjType(1); | |
92 | -// request.setPhone("154568526845"); | |
93 | -// //计划发送时间 | |
94 | -// request.setPlanTime(DateUtils.getDateStr(new Date(), DateUtils.Y_M_D) + " " + ConfigInterface.SEND_TIME +":00"); | |
95 | -// | |
96 | -// request.setSubTypeId(1); | |
97 | -// request.setStatus(MsgStatusEnums.NO_SEND.getId()); | |
98 | -// request.setTimeType(SmsTimeTypeEnums.NO_ONTIME.getId()); | |
99 | -// request.setHospitalId("1"); | |
100 | -// request.setPatientId("2"); | |
101 | -// request.setTempId("2"); | |
102 | -// request.setWxTempId("bbb"); | |
103 | -// request.setCreated(DateUtils.getDateStr(new Date(), DateUtils.Y_M_D_H_M_S)); | |
104 | -// | |
105 | -// request.setFirst("aaa"); | |
106 | -// request.setKeyword1("bbb"); | |
107 | -// request.setKeyword2("cc"); | |
108 | -// request.setRemark("ddd"); | |
109 | -// | |
110 | -// | |
111 | -// messages.add(request); | |
112 | -// | |
113 | -// list.setMessages(messages); | |
114 | -// list.setTypeId(ProjectTypeEnums.YNXT.getId()); | |
115 | -// | |
116 | -// saveMsgCenter( list); | |
117 | - | |
118 | - | |
119 | - isExistMsg("2","2"); | |
81 | + isExistMsg("59964f0ee4b04389242278f2","5993db2af0f0ac844d75bf83"); | |
120 | 82 | } |
121 | 83 | } |
platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java
View file @
595725c
... | ... | @@ -61,7 +61,7 @@ |
61 | 61 | public void generatePatAmsMsg(String generateHospitalId) { |
62 | 62 | String week = DateUtils.getWeekOfDate(new Date()); |
63 | 63 | List<SmsConfigModel> configModels = baseService.getHospitalConfigsByWeek(generateHospitalId); |
64 | - logger.info("The configs hospital size is {}",configModels.size()); | |
64 | + logger.info("The generatePatAmsMsg configs hospital size is {}",configModels.size()); | |
65 | 65 | if (CollectionUtils.isNotEmpty(configModels)) |
66 | 66 | { |
67 | 67 | int batchSize = 5; |
... | ... | @@ -87,7 +87,7 @@ |
87 | 87 | @Override |
88 | 88 | public void generateBabyAmsMsg(String generateHospitalId) { |
89 | 89 | List<SmsConfigModel> configModels = baseService.getHospitalConfigsByWeek(generateHospitalId); |
90 | - logger.info("The configs hospital size is {}",configModels.size()); | |
90 | + logger.info("The generateBabyAmsMsg configs hospital size is {}",configModels.size()); | |
91 | 91 | if (CollectionUtils.isNotEmpty(configModels)) |
92 | 92 | { |
93 | 93 | int batchSize = 5; |
... | ... | @@ -113,7 +113,7 @@ |
113 | 113 | @Override |
114 | 114 | public void generateChanAmsMsg(String generateHospitalId) { |
115 | 115 | List<SmsConfigModel> configModels = baseService.getHospitalConfigsByWeek(generateHospitalId); |
116 | - logger.info("The configs hospital size is {}",configModels.size()); | |
116 | + logger.info("The generateChanAmsMsg configs hospital size is {}",configModels.size()); | |
117 | 117 | if (CollectionUtils.isNotEmpty(configModels)) |
118 | 118 | { |
119 | 119 | int batchSize = 5; |
... | ... | @@ -139,7 +139,7 @@ |
139 | 139 | public void generateTemplateMsg(String generateHospitalId) { |
140 | 140 | List<SmsConfigModel> configModels = baseService.getHospitalConfigs(generateHospitalId); |
141 | 141 | |
142 | - logger.info("The configs hospital size is {}",configModels.size()); | |
142 | + logger.info("The generateChanAmsMsg configs hospital size is {}",configModels.size()); | |
143 | 143 | if (CollectionUtils.isNotEmpty(configModels)) |
144 | 144 | { |
145 | 145 | int batchSize = 5; |
platform-msg-generate/src/main/resources/database.properties
View file @
595725c
1 | 1 | maindata.driver=com.mysql.jdbc.Driver |
2 | -#maindata.jdbcurl=jdbc:mysql://119.90.43.68:3307/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 | |
3 | -#maindata.username=platform | |
4 | -#maindata.password=platform123 | |
5 | -# | |
6 | -# | |
7 | -#mongo.db.host=119.90.43.68 | |
8 | -#mongo.db.port=27019 | |
9 | -#mongo.db.dbname=platform | |
10 | -#mongo.db.username=platform | |
11 | -#mongo.db.password=platform123 | |
2 | +maindata.jdbcurl=jdbc:mysql://119.90.43.68:3307/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 | |
3 | +maindata.username=platform | |
4 | +maindata.password=platform123 | |
12 | 5 | |
13 | 6 | |
7 | +mongo.db.host=119.90.43.68 | |
8 | +mongo.db.port=27019 | |
9 | +mongo.db.dbname=platform | |
10 | +mongo.db.username=platform | |
11 | +mongo.db.password=platform123 | |
14 | 12 | |
15 | -maindata.jdbcurl=${mysql.jdbcurl} | |
16 | -maindata.username=${mysql.db.name} | |
17 | -maindata.password=${mysql.db.password} | |
18 | 13 | |
19 | 14 | |
20 | -mongo.db.host=${mongo.db.host} | |
21 | -mongo.db.port=${mongo.db.port} | |
22 | -mongo.db.dbname=${mongo.db.dbname} | |
23 | -mongo.db.username=${mongo.db.username} | |
24 | -mongo.db.password=${mongo.db.password} | |
15 | +#maindata.jdbcurl=${mysql.jdbcurl} | |
16 | +#maindata.username=${mysql.db.name} | |
17 | +#maindata.password=${mysql.db.password} | |
18 | +# | |
19 | +# | |
20 | +#mongo.db.host=${mongo.db.host} | |
21 | +#mongo.db.port=${mongo.db.port} | |
22 | +#mongo.db.dbname=${mongo.db.dbname} | |
23 | +#mongo.db.username=${mongo.db.username} | |
24 | +#mongo.db.password=${mongo.db.password} | |
25 | 25 | |
26 | 26 | mongo.connectionsPerHost=8 |
27 | 27 | mongo.threadsAllowedToBlockForConnectionMultiplier=4 |