diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java index b9aca40..bbff85e 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java @@ -165,20 +165,14 @@ public class HttpRequest { while(keys.hasNext()){ String key = keys.next(); String value = headers.get(key); - System.out.println(key+"====="+value); connection.setRequestProperty(key,value); } } -// connection.setRequestProperty("Authorization", "healthbaby2015"); // 建立实际的连接 connection.connect(); // 获取所有响应头字段 Map> map = connection.getHeaderFields(); - // 遍历所有的响应头字段 -// for (String key : map.keySet()) { -// System.out.println(key + "--->" + map.get(key)); -// } - System.out.println("--->" + map); + // 定义 BufferedReader输入流来读取URL的响应 in = new BufferedReader(new InputStreamReader( connection.getInputStream(),"utf-8")); diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java index 74f0c05..dfcaf32 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java @@ -40,9 +40,6 @@ public class SmsServiceImpl implements SmsService{ public static final String SEND_TIME= PropertiesUtils.getPropertyValue("send_time"); - - private List allMsgs = new ArrayList<>(); - @Autowired private SmsConfigService smsConfigService; @@ -350,16 +347,15 @@ public class SmsServiceImpl implements SmsService{ list.setMessages(messages); sendSms(list); + for (MessageRequest msg :messages) + { + System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"孕妇ams短信======="+msg.getPhone()+ "content="+ msg.getContent()); + } } } } - for (MessageRequest msg :allMsgs) - { - System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"孕妇ams短信=======" + msg.getContent()); - } - allMsgs.clear(); } @@ -525,17 +521,16 @@ public class SmsServiceImpl implements SmsService{ } list.setMessages(messages); sendSms(list); + + for (MessageRequest msg :messages) + { + System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"儿童ams短信===="+msg.getPhone()+ "content=" + msg.getContent()); + } } } } - for (MessageRequest msg :allMsgs) - { - System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"儿童ams短信=======" + msg.getContent()); - } - - allMsgs.clear(); } @@ -657,16 +652,14 @@ public class SmsServiceImpl implements SmsService{ } list.setMessages(messages); sendSms(list); + for (MessageRequest msg :messages) + { + System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"产妇ams短信===="+msg.getPhone()+ "content="+ msg.getContent()); + } } } } - for (MessageRequest msg :allMsgs) - { - System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"产妇ams短信=======" + msg.getContent()); - } - allMsgs.clear(); - } /** @@ -1842,6 +1835,10 @@ public class SmsServiceImpl implements SmsService{ } list.setMessages(messages); sendSms(list); + for (MessageRequest msg :messages) + { + System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"模板短信======"+msg.getPhone()+"content=" + msg.getContent()); + } } } } @@ -1853,12 +1850,6 @@ public class SmsServiceImpl implements SmsService{ } } } - for (MessageRequest msg :allMsgs) - { - System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"模板短信=======" + msg.getContent()); - } - - allMsgs.clear(); } @@ -2423,10 +2414,25 @@ public class SmsServiceImpl implements SmsService{ if (list != null && list.getMessages() != null) { List msgs = list.getMessages(); - allMsgs.addAll(msgs); + int batchSize = 200; + int end = 0; + for (int i = 0; i < msgs.size(); i += batchSize) { + end = (end + batchSize); + if (end > msgs.size()) { + end = msgs.size(); + } + System.out.println("start:" + i + ",end:" + end); + List tempList = msgs.subList(i, end); + MessageListRequest sentList = new MessageListRequest(); + sentList.setMessages(tempList); + sentList.setTypeId(ProjectTypeEnums.YNXT.getId()); + SaveMessageService.saveSmsCenter(sentList); + } } - SaveMessageService.saveSmsCenter(list); + + + } } diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java b/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java index cfb9a50..ce1ce2c 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java @@ -183,12 +183,12 @@ public class AmsMessageService { public static void main(String[] args) { - Map> list = getMessageTemplateMap("1000000006", + Map> list = getMessageTemplateMap("204", AmsServiceTypeEnum.CHILD_GUIDE); // List msgs = list.get("肺结核"); - - System.out.println(list); +// +// System.out.println(list); // for (int i = 0;i< 100 ;i++) // { diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java b/platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java index 2b5e978..031e604 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java @@ -28,6 +28,7 @@ public class SaveMessageService { // String result = HttpRequest.sendPost("http://192.168.5.13:8080/v1/saveCreatedSMS",json,"YMer2016"); if (StringUtils.isNotEmpty(result)) { + System.out.println("result=="+result); Map map = JsonUtil.str2Obj(result, Map.class); if ("0".equals(map.get("errorcode"))) { @@ -78,14 +79,14 @@ public class SaveMessageService { // MessageListRequest list = new MessageListRequest(); // List messages = new ArrayList<>(); // MessageRequest request = new MessageRequest(); -// request.setTypeId(1); +// request.setTypeId(5); // request.setStatus(0); -// request.setContent("cccccccccccccccccc"); +// request.setContent("四川省妇幼"); // request.setObjType(1); -// request.setPhone("18382670000"); +// request.setPhone("18382670036"); // request.setPlanTime("2015-01-06 15:22:12"); // request.setServiceType(1); -// request.setExt1("196"); +// request.setExt1("221"); // request.setExt2("10"); // request.setExt3("10"); // request.setSubTypeId(6); @@ -105,12 +106,11 @@ public class SaveMessageService { // request1.setExt2("10"); // request1.setExt3("10"); // messages.add(request1); -// -// list.setTypeId(1); +//// +// list.setTypeId(5); // list.setMessages(messages); // saveSmsCenter(list); - deleteDueSms("15265444440,"); } } diff --git a/platform-data-api/src/main/resources/config.properties b/platform-data-api/src/main/resources/config.properties index 6cf4896..d00dc37 100644 --- a/platform-data-api/src/main/resources/config.properties +++ b/platform-data-api/src/main/resources/config.properties @@ -1,4 +1,5 @@ #短信中心url +#center_base_url=http://sms.healthbaby.com.cn/v1/ center_base_url=http://sms.api.stage.platform.healthbaby.com.cn/v1/ #区域平台访问短信中心的token