shiyang / regional-platform

Download as
Browse Code »

Commit b5c342e4bf67a41602c2a0b62e7f9e8b4d9d9c27

Authored by liquanyu
1 parent 1fb41cd827
Exists in master and in 1 other branch nobuildprocess

短信修改

Showing 5 changed files with 46 additions and 45 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java View file @ b5c342e
... ... @@ -165,20 +165,14 @@
165 165 while(keys.hasNext()){
166 166 String key = keys.next();
167 167 String value = headers.get(key);
168   - System.out.println(key+"====="+value);
169 168 connection.setRequestProperty(key,value);
170 169 }
171 170 }
172   -// connection.setRequestProperty("Authorization", "healthbaby2015");
173 171 // 建立实际的连接
174 172 connection.connect();
175 173 // 获取所有响应头字段
176 174 Map<String, List<String>> map = connection.getHeaderFields();
177   - // 遍历所有的响应头字段
178   -// for (String key : map.keySet()) {
179   -// System.out.println(key + "--->" + map.get(key));
180   -// }
181   - System.out.println("--->" + map);
  175 +
182 176 // 定义 BufferedReader输入流来读取URL的响应
183 177 in = new BufferedReader(new InputStreamReader(
184 178 connection.getInputStream(),"utf-8"));
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java View file @ b5c342e
... ... @@ -40,9 +40,6 @@
40 40  
41 41 public static final String SEND_TIME= PropertiesUtils.getPropertyValue("send_time");
42 42  
43   -
44   - private List<MessageRequest> allMsgs = new ArrayList<>();
45   -
46 43 @Autowired
47 44 private SmsConfigService smsConfigService;
48 45  
49 46  
... ... @@ -350,16 +347,15 @@
350 347  
351 348 list.setMessages(messages);
352 349 sendSms(list);
  350 + for (MessageRequest msg :messages)
  351 + {
  352 + System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"孕妇ams短信======="+msg.getPhone()+ "content="+ msg.getContent());
  353 + }
353 354 }
354 355  
355 356 }
356 357 }
357 358  
358   - for (MessageRequest msg :allMsgs)
359   - {
360   - System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"孕妇ams短信=======" + msg.getContent());
361   - }
362   - allMsgs.clear();
363 359 }
364 360  
365 361  
366 362  
... ... @@ -525,17 +521,16 @@
525 521 }
526 522 list.setMessages(messages);
527 523 sendSms(list);
  524 +
  525 + for (MessageRequest msg :messages)
  526 + {
  527 + System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"儿童ams短信===="+msg.getPhone()+ "content=" + msg.getContent());
  528 + }
528 529 }
529 530  
530 531 }
531 532 }
532 533  
533   - for (MessageRequest msg :allMsgs)
534   - {
535   - System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"儿童ams短信=======" + msg.getContent());
536   - }
537   -
538   - allMsgs.clear();
539 534 }
540 535  
541 536  
542 537  
... ... @@ -657,16 +652,14 @@
657 652 }
658 653 list.setMessages(messages);
659 654 sendSms(list);
  655 + for (MessageRequest msg :messages)
  656 + {
  657 + System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"产妇ams短信===="+msg.getPhone()+ "content="+ msg.getContent());
  658 + }
660 659 }
661 660 }
662 661 }
663 662  
664   - for (MessageRequest msg :allMsgs)
665   - {
666   - System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"产妇ams短信=======" + msg.getContent());
667   - }
668   - allMsgs.clear();
669   -
670 663 }
671 664  
672 665 /**
... ... @@ -1842,6 +1835,10 @@
1842 1835 }
1843 1836 list.setMessages(messages);
1844 1837 sendSms(list);
  1838 + for (MessageRequest msg :messages)
  1839 + {
  1840 + System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"模板短信======"+msg.getPhone()+"content=" + msg.getContent());
  1841 + }
1845 1842 }
1846 1843 }
1847 1844 }
... ... @@ -1853,12 +1850,6 @@
1853 1850 }
1854 1851 }
1855 1852 }
1856   - for (MessageRequest msg :allMsgs)
1857   - {
1858   - System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"模板短信=======" + msg.getContent());
1859   - }
1860   -
1861   - allMsgs.clear();
1862 1853 }
1863 1854  
1864 1855  
1865 1856  
... ... @@ -2423,10 +2414,25 @@
2423 2414 if (list != null && list.getMessages() != null)
2424 2415 {
2425 2416 List<MessageRequest> msgs = list.getMessages();
2426   - allMsgs.addAll(msgs);
  2417 + int batchSize = 200;
  2418 + int end = 0;
  2419 + for (int i = 0; i < msgs.size(); i += batchSize) {
  2420 + end = (end + batchSize);
  2421 + if (end > msgs.size()) {
  2422 + end = msgs.size();
  2423 + }
  2424 + System.out.println("start:" + i + ",end:" + end);
  2425 + List<MessageRequest> tempList = msgs.subList(i, end);
  2426 + MessageListRequest sentList = new MessageListRequest();
  2427 + sentList.setMessages(tempList);
  2428 + sentList.setTypeId(ProjectTypeEnums.YNXT.getId());
  2429 + SaveMessageService.saveSmsCenter(sentList);
  2430 + }
2427 2431  
2428 2432 }
2429   - SaveMessageService.saveSmsCenter(list);
  2433 +
  2434 +
  2435 +
2430 2436 }
2431 2437 }
2432 2438  
platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java View file @ b5c342e
... ... @@ -183,12 +183,12 @@
183 183  
184 184  
185 185 public static void main(String[] args) {
186   - Map<String,List<MessageContent>> list = getMessageTemplateMap("1000000006",
  186 + Map<String,List<MessageContent>> list = getMessageTemplateMap("204",
187 187 AmsServiceTypeEnum.CHILD_GUIDE);
188 188  
189 189 // List<MessageContent> msgs = list.get("肺结核");
190   -
191   - System.out.println(list);
  190 +//
  191 +// System.out.println(list);
192 192  
193 193 // for (int i = 0;i< 100 ;i++)
194 194 // {
platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java View file @ b5c342e
... ... @@ -28,6 +28,7 @@
28 28 // String result = HttpRequest.sendPost("http://192.168.5.13:8080/v1/saveCreatedSMS",json,"YMer2016");
29 29 if (StringUtils.isNotEmpty(result))
30 30 {
  31 + System.out.println("result=="+result);
31 32 Map<String,String> map = JsonUtil.str2Obj(result, Map.class);
32 33 if ("0".equals(map.get("errorcode")))
33 34 {
34 35  
35 36  
36 37  
... ... @@ -78,14 +79,14 @@
78 79 // MessageListRequest list = new MessageListRequest();
79 80 // List<MessageRequest> messages = new ArrayList<>();
80 81 // MessageRequest request = new MessageRequest();
81   -// request.setTypeId(1);
  82 +// request.setTypeId(5);
82 83 // request.setStatus(0);
83   -// request.setContent("cccccccccccccccccc");
  84 +// request.setContent("四川省妇幼");
84 85 // request.setObjType(1);
85   -// request.setPhone("18382670000");
  86 +// request.setPhone("18382670036");
86 87 // request.setPlanTime("2015-01-06 15:22:12");
87 88 // request.setServiceType(1);
88   -// request.setExt1("196");
  89 +// request.setExt1("221");
89 90 // request.setExt2("10");
90 91 // request.setExt3("10");
91 92 // request.setSubTypeId(6);
92 93  
... ... @@ -105,13 +106,12 @@
105 106 // request1.setExt2("10");
106 107 // request1.setExt3("10");
107 108 // messages.add(request1);
108   -//
109   -// list.setTypeId(1);
  109 +////
  110 +// list.setTypeId(5);
110 111 // list.setMessages(messages);
111 112 // saveSmsCenter(list);
112 113  
113 114  
114   - deleteDueSms("15265444440,");
115 115 }
116 116 }
platform-data-api/src/main/resources/config.properties View file @ b5c342e
1 1 #短信中心url
  2 +#center_base_url=http://sms.healthbaby.com.cn/v1/
2 3 center_base_url=http://sms.api.stage.platform.healthbaby.com.cn/v1/
3 4  
4 5 #区域平台访问短信中心的token