From 595725c5c47aa8400a3b7d30ec274087487faae8 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 25 Aug 2017 10:33:00 +0800 Subject: [PATCH] update code --- .../lyms/platform/common/utils/HttpClientUtil.java | 1 - .../msg/controller/MsgGenerateController.java | 8 ++--- .../platform/msg/remote/SaveMessageService.java | 40 +--------------------- .../msg/service/impl/MsgGenerateServiceImpl.java | 8 ++--- .../src/main/resources/database.properties | 36 +++++++++---------- 5 files changed, 27 insertions(+), 66 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java index 5443353..c9c4c45 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java @@ -112,7 +112,6 @@ public class HttpClientUtil { if(response != null){ int statusCode = response.getStatusLine().getStatusCode(); - System.out.println("return code = "+ statusCode); if (statusCode != HttpStatus.SC_OK) { return null; } diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java index 65db1c6..feeccee 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java @@ -18,10 +18,10 @@ import org.springframework.web.bind.annotation.ResponseBody; @RequestMapping("/msg") public class MsgGenerateController extends BaseController { -// private static final Logger logger = LoggerFactory.getLogger(MsgGenerateController.class); -//// -// @Autowired -// private IMsgGenerateService msgGenerateService; + private static final Logger logger = LoggerFactory.getLogger(MsgGenerateController.class); +// + @Autowired + private IMsgGenerateService msgGenerateService; // // /** // * 生成孕妇ams消息 diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/SaveMessageService.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/SaveMessageService.java index 8edf9fa..866dfe6 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/SaveMessageService.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/SaveMessageService.java @@ -78,44 +78,6 @@ public class SaveMessageService { public static void main(String[] areg) { -// MessageListRequest list = new MessageListRequest(); -// -// -// List messages = new ArrayList<>(); -// -// -// MessageRequest request = new MessageRequest(); -// //平台ID -// request.setTypeId(ProjectTypeEnums.YNXT.getId()); -// //服务对象 1孕妇 2儿童 3产妇 -// request.setObjType(1); -// request.setPhone("154568526845"); -// //计划发送时间 -// request.setPlanTime(DateUtils.getDateStr(new Date(), DateUtils.Y_M_D) + " " + ConfigInterface.SEND_TIME +":00"); -// -// request.setSubTypeId(1); -// request.setStatus(MsgStatusEnums.NO_SEND.getId()); -// request.setTimeType(SmsTimeTypeEnums.NO_ONTIME.getId()); -// request.setHospitalId("1"); -// request.setPatientId("2"); -// request.setTempId("2"); -// request.setWxTempId("bbb"); -// request.setCreated(DateUtils.getDateStr(new Date(), DateUtils.Y_M_D_H_M_S)); -// -// request.setFirst("aaa"); -// request.setKeyword1("bbb"); -// request.setKeyword2("cc"); -// request.setRemark("ddd"); -// -// -// messages.add(request); -// -// list.setMessages(messages); -// list.setTypeId(ProjectTypeEnums.YNXT.getId()); -// -// saveMsgCenter( list); - - - isExistMsg("2","2"); + isExistMsg("59964f0ee4b04389242278f2","5993db2af0f0ac844d75bf83"); } } 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 4524e9b..bdf16b2 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 @@ -61,7 +61,7 @@ public class MsgGenerateServiceImpl implements IMsgGenerateService { public void generatePatAmsMsg(String generateHospitalId) { String week = DateUtils.getWeekOfDate(new Date()); List configModels = baseService.getHospitalConfigsByWeek(generateHospitalId); - logger.info("The configs hospital size is {}",configModels.size()); + logger.info("The generatePatAmsMsg configs hospital size is {}",configModels.size()); if (CollectionUtils.isNotEmpty(configModels)) { int batchSize = 5; @@ -87,7 +87,7 @@ public class MsgGenerateServiceImpl implements IMsgGenerateService { @Override public void generateBabyAmsMsg(String generateHospitalId) { List configModels = baseService.getHospitalConfigsByWeek(generateHospitalId); - logger.info("The configs hospital size is {}",configModels.size()); + logger.info("The generateBabyAmsMsg configs hospital size is {}",configModels.size()); if (CollectionUtils.isNotEmpty(configModels)) { int batchSize = 5; @@ -113,7 +113,7 @@ public class MsgGenerateServiceImpl implements IMsgGenerateService { @Override public void generateChanAmsMsg(String generateHospitalId) { List configModels = baseService.getHospitalConfigsByWeek(generateHospitalId); - logger.info("The configs hospital size is {}",configModels.size()); + logger.info("The generateChanAmsMsg configs hospital size is {}",configModels.size()); if (CollectionUtils.isNotEmpty(configModels)) { int batchSize = 5; @@ -139,7 +139,7 @@ public class MsgGenerateServiceImpl implements IMsgGenerateService { public void generateTemplateMsg(String generateHospitalId) { List configModels = baseService.getHospitalConfigs(generateHospitalId); - logger.info("The configs hospital size is {}",configModels.size()); + logger.info("The generateChanAmsMsg configs hospital size is {}",configModels.size()); if (CollectionUtils.isNotEmpty(configModels)) { int batchSize = 5; diff --git a/platform-msg-generate/src/main/resources/database.properties b/platform-msg-generate/src/main/resources/database.properties index d5a78f5..e65ac05 100644 --- a/platform-msg-generate/src/main/resources/database.properties +++ b/platform-msg-generate/src/main/resources/database.properties @@ -1,27 +1,27 @@ maindata.driver=com.mysql.jdbc.Driver -#maindata.jdbcurl=jdbc:mysql://119.90.43.68:3307/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 -#maindata.username=platform -#maindata.password=platform123 -# -# -#mongo.db.host=119.90.43.68 -#mongo.db.port=27019 -#mongo.db.dbname=platform -#mongo.db.username=platform -#mongo.db.password=platform123 +maindata.jdbcurl=jdbc:mysql://119.90.43.68:3307/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 +maindata.username=platform +maindata.password=platform123 +mongo.db.host=119.90.43.68 +mongo.db.port=27019 +mongo.db.dbname=platform +mongo.db.username=platform +mongo.db.password=platform123 -maindata.jdbcurl=${mysql.jdbcurl} -maindata.username=${mysql.db.name} -maindata.password=${mysql.db.password} -mongo.db.host=${mongo.db.host} -mongo.db.port=${mongo.db.port} -mongo.db.dbname=${mongo.db.dbname} -mongo.db.username=${mongo.db.username} -mongo.db.password=${mongo.db.password} +#maindata.jdbcurl=${mysql.jdbcurl} +#maindata.username=${mysql.db.name} +#maindata.password=${mysql.db.password} +# +# +#mongo.db.host=${mongo.db.host} +#mongo.db.port=${mongo.db.port} +#mongo.db.dbname=${mongo.db.dbname} +#mongo.db.username=${mongo.db.username} +#mongo.db.password=${mongo.db.password} mongo.connectionsPerHost=8 mongo.threadsAllowedToBlockForConnectionMultiplier=4 -- 1.8.3.1