Commit aad6dd49de824bc41678f45b7c931bfe61b547e9
1 parent
5b09dd10c2
Exists in
master
and in
6 other branches
大同初诊打印
Showing 3 changed files with 14 additions and 14 deletions
platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/SaveMessageService.java
View file @
aad6dd4
| ... | ... | @@ -29,6 +29,7 @@ |
| 29 | 29 | { |
| 30 | 30 | String json = JsonUtil.obj2JsonString(list); |
| 31 | 31 | String result = HttpClientUtil.doPostSSL(ConfigInterface.MSG_BASE_URL+"/biz-push-web/push",json); |
| 32 | + System.out.println(result); | |
| 32 | 33 | if (StringUtils.isNotEmpty(result)) |
| 33 | 34 | { |
| 34 | 35 | Map<String,String> map = JsonUtil.str2Obj(result, Map.class); |
platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java
View file @
aad6dd4
| ... | ... | @@ -359,24 +359,23 @@ |
| 359 | 359 | { |
| 360 | 360 | List<MsgRequest> msgs = list.getMessages(); |
| 361 | 361 | logger.info("generater size " + msgs.size()); |
| 362 | - int batchSize = 50; | |
| 362 | + int batchSize = 10; | |
| 363 | 363 | int end = 0; |
| 364 | 364 | for (int i = 0; i < msgs.size(); i += batchSize) { |
| 365 | 365 | end = (end + batchSize); |
| 366 | 366 | if (end > msgs.size()) { |
| 367 | 367 | end = msgs.size(); |
| 368 | 368 | } |
| 369 | - | |
| 370 | - final List<MsgRequest> tempList = msgs.subList(i, end); | |
| 371 | - pool.execute(new Runnable() { | |
| 372 | - @Override | |
| 373 | - public void run() { | |
| 374 | - MsgListRequest sentList = new MsgListRequest(); | |
| 375 | - sentList.setMessages(tempList); | |
| 376 | - sentList.setTypeId(ProjectTypeEnums.YNXT.getId()); | |
| 377 | - SaveMessageService.saveMsgCenter(sentList); | |
| 378 | - } | |
| 379 | - }); | |
| 369 | + try { | |
| 370 | + Thread.sleep(5000); | |
| 371 | + } catch (InterruptedException e) { | |
| 372 | + e.printStackTrace(); | |
| 373 | + } | |
| 374 | + List<MsgRequest> tempList = msgs.subList(i, end); | |
| 375 | + MsgListRequest sentList = new MsgListRequest(); | |
| 376 | + sentList.setMessages(tempList); | |
| 377 | + sentList.setTypeId(ProjectTypeEnums.YNXT.getId()); | |
| 378 | + SaveMessageService.saveMsgCenter(sentList); | |
| 380 | 379 | } |
| 381 | 380 | } |
| 382 | 381 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
aad6dd4
| ... | ... | @@ -395,7 +395,7 @@ |
| 395 | 395 | map.put("age", DateUtil.getAge(data.getBirth())); |
| 396 | 396 | map.put("birth", DateUtil.getyyyy_MM_dd(data.getBirth())); |
| 397 | 397 | map.put("register", CommonsHelper.getResidence(data.getProvinceId(), data.getCityId(), |
| 398 | - data.getAreaId(), data.getStreetId(), data.getAddress(), basicConfigService)); | |
| 398 | + null, null, null, basicConfigService)); | |
| 399 | 399 | // map.put("register", CommonsHelper.getResidence(data.getProvinceRegisterId(), data.getCityRegisterId(), |
| 400 | 400 | // data.getAreaRegisterId(), data.getStreetRegisterId(), data.getAddressRegister(), basicConfigService)); |
| 401 | 401 | // map.put("postRest", CommonsHelper.getResidence(data.getProvincePostRestId(), data.getCityPostRestId(), |
| ... | ... | @@ -412,7 +412,7 @@ |
| 412 | 412 | map.put("husbandName", data.getHusbandName()); |
| 413 | 413 | map.put("husbandAge", DateUtil.getAge(data.getHusbandBirth())); |
| 414 | 414 | map.put("hregister", CommonsHelper.getResidence(data.getHprovinceRegisterId(), data.getHcityRegisterId(), |
| 415 | - data.getHareaRegisterId(), data.getHstreetRegisterId(), data.getHaddressRegister(), | |
| 415 | + null, null, null, | |
| 416 | 416 | basicConfigService)); |
| 417 | 417 | map.put("hprofessionType", getBasicConfig(data.getHprofessionTypeId())); |
| 418 | 418 | map.put("hmarriageAge",data.getHmarriageAge() == null ? "" : data.getHmarriageAge()); |