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 d8bfbba..5492bec 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 @@ -29,6 +29,7 @@ public class SaveMessageService { { String json = JsonUtil.obj2JsonString(list); String result = HttpClientUtil.doPostSSL(ConfigInterface.MSG_BASE_URL+"/biz-push-web/push",json); + System.out.println(result); if (StringUtils.isNotEmpty(result)) { Map map = JsonUtil.str2Obj(result, Map.class); diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java index afa433e..e135461 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java @@ -359,24 +359,23 @@ public class HelperUtils { { List msgs = list.getMessages(); logger.info("generater size " + msgs.size()); - int batchSize = 50; + int batchSize = 10; int end = 0; for (int i = 0; i < msgs.size(); i += batchSize) { end = (end + batchSize); if (end > msgs.size()) { end = msgs.size(); } - - final List tempList = msgs.subList(i, end); - pool.execute(new Runnable() { - @Override - public void run() { - MsgListRequest sentList = new MsgListRequest(); - sentList.setMessages(tempList); - sentList.setTypeId(ProjectTypeEnums.YNXT.getId()); - SaveMessageService.saveMsgCenter(sentList); - } - }); + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + List tempList = msgs.subList(i, end); + MsgListRequest sentList = new MsgListRequest(); + sentList.setMessages(tempList); + sentList.setTypeId(ProjectTypeEnums.YNXT.getId()); + SaveMessageService.saveMsgCenter(sentList); } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 471145b..d8be394 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -395,7 +395,7 @@ public class ViewFacade { map.put("age", DateUtil.getAge(data.getBirth())); map.put("birth", DateUtil.getyyyy_MM_dd(data.getBirth())); map.put("register", CommonsHelper.getResidence(data.getProvinceId(), data.getCityId(), - data.getAreaId(), data.getStreetId(), data.getAddress(), basicConfigService)); + null, null, null, basicConfigService)); // map.put("register", CommonsHelper.getResidence(data.getProvinceRegisterId(), data.getCityRegisterId(), // data.getAreaRegisterId(), data.getStreetRegisterId(), data.getAddressRegister(), basicConfigService)); // map.put("postRest", CommonsHelper.getResidence(data.getProvincePostRestId(), data.getCityPostRestId(), @@ -412,7 +412,7 @@ public class ViewFacade { map.put("husbandName", data.getHusbandName()); map.put("husbandAge", DateUtil.getAge(data.getHusbandBirth())); map.put("hregister", CommonsHelper.getResidence(data.getHprovinceRegisterId(), data.getHcityRegisterId(), - data.getHareaRegisterId(), data.getHstreetRegisterId(), data.getHaddressRegister(), + null, null, null, basicConfigService)); map.put("hprofessionType", getBasicConfig(data.getHprofessionTypeId())); map.put("hmarriageAge",data.getHmarriageAge() == null ? "" : data.getHmarriageAge());