diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java index 0a8b581..90ca531 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java @@ -33,29 +33,21 @@ public class LisServiceImpl extends DataAccessLayerService implements LisService System.out.println("saveLis data size = "+ lisList.size()); if (CollectionUtils.isNotEmpty(lisList)) { - CountDownLatch countDownLatch = new CountDownLatch(1); - new Thread(new LisSaveTask(countDownLatch,masterLisMapper,lisList)).start(); + int batchSize = 10; + //线程数 + int threadCount = lisList.size()%batchSize == 0 ? lisList.size()/batchSize : lisList.size()/batchSize+1; + System.out.println("threadCount = "+ threadCount); + CountDownLatch countDownLatch = new CountDownLatch(threadCount); + int end = 0; + for (int i = 0; i < lisList.size(); i += batchSize) { + end = (end + batchSize); + if (end > lisList.size()) { + end = lisList.size(); + } + List models = lisList.subList(i, end); + new Thread(new LisSaveTask(countDownLatch,masterLisMapper,models)).start(); + } countDownLatch.await(); - -// int batchSize = 10; -// //线程数 -// int threadCount = lisList.size()%batchSize == 0 ? lisList.size()/batchSize : lisList.size()/batchSize+1; -// System.out.println("threadCount = "+ threadCount); -// CountDownLatch countDownLatch = new CountDownLatch(threadCount); -// int end = 0; -// for (int i = 0; i < lisList.size(); i += batchSize) { -// end = (end + batchSize); -// if (end > lisList.size()) { -// end = lisList.size(); -// } -// List models = lisList.subList(i, end); -// new Thread(new LisSaveTask(countDownLatch,masterLisMapper,models)).start(); -// System.out.println("spit end"); -// } -// countDownLatch.await(); - - System.out.println("exce end"); - } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @@ -63,34 +55,6 @@ public class LisServiceImpl extends DataAccessLayerService implements LisService { return new BaseResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); } - -// try { -// System.out.println("saveLis data size = "+ lisList.size()); -// if (CollectionUtils.isNotEmpty(lisList)) -// { -// new Thread(new Runnable() { -// @Override -// public void run() { -// for(LisReportModel model : lisList) -// { -// List dbLis = masterLisMapper.queryLisDataByModel(model); -// if (CollectionUtils.isEmpty(dbLis)) -// { -// masterLisMapper.saveLisData(model); -// } -// -// } -// } -// },"saveLisDataThread").start(); -// -// } -// return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); -// } -// catch (Exception e) -// { -// return new BaseResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); -// } - } @Override diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java index 76c8ce6..5c7e2ad 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java @@ -55,35 +55,41 @@ public class LisController extends BaseController { { for(LisReportModelRequest lisRequest : models) { - LisReportModel model = new LisReportModel(); - List items = lisRequest.getItems(); - if (CollectionUtils.isNotEmpty(items)) + try { + LisReportModel model = new LisReportModel(); + List items = lisRequest.getItems(); + if (CollectionUtils.isNotEmpty(items)) + { + model.setItemJson(JsonUtil.array2JsonString(items)); + } + + model.setStatus(lisRequest.getStatus()); + model.setId(lisRequest.getId()); + model.setVcCardNo(lisRequest.getVcCardNo()); + model.setHospitalId(lisRequest.getHospitalId()); + model.setLisId(lisRequest.getLisId()); + model.setAge(lisRequest.getAge()); + model.setName(lisRequest.getName()); + model.setBhnum(lisRequest.getBhnum()); + model.setPhone(lisRequest.getPhone()); + model.setSex(lisRequest.getSex()); + model.setTitle(lisRequest.getTitle()); + model.setType(lisRequest.getType()); + model.setChecker(lisRequest.getChecker()); + model.setApplyDept(lisRequest.getApplyDept()); + model.setApplyDoctor(lisRequest.getApplyDoctor()); + model.setApplyTime(DateUtil.parseYMDHMS(lisRequest.getApplyTime())); + model.setPublishTime(DateUtil.parseYMDHMS(lisRequest.getPublishTime())); + model.setModified(DateUtil.parseYMDHMS(lisRequest.getModified())); + model.setCreated(DateUtil.parseYMDHMS(lisRequest.getCreated())); + model.setCheckTime(DateUtil.parseYMDHMS(lisRequest.getCheckTime())); + + list.add(model); + }catch (Exception e) { - model.setItemJson(JsonUtil.array2JsonString(items)); + continue; } - model.setStatus(lisRequest.getStatus()); - model.setId(lisRequest.getId()); - model.setVcCardNo(lisRequest.getVcCardNo()); - model.setHospitalId(lisRequest.getHospitalId()); - model.setLisId(lisRequest.getLisId()); - model.setAge(lisRequest.getAge()); - model.setName(lisRequest.getName()); - model.setBhnum(lisRequest.getBhnum()); - model.setPhone(lisRequest.getPhone()); - model.setSex(lisRequest.getSex()); - model.setTitle(lisRequest.getTitle()); - model.setType(lisRequest.getType()); - model.setChecker(lisRequest.getChecker()); - model.setApplyDept(lisRequest.getApplyDept()); - model.setApplyDoctor(lisRequest.getApplyDoctor()); - model.setApplyTime(DateUtil.parseYMDHMS(lisRequest.getApplyTime())); - model.setPublishTime(DateUtil.parseYMDHMS(lisRequest.getPublishTime())); - model.setModified(DateUtil.parseYMDHMS(lisRequest.getModified())); - model.setCreated(DateUtil.parseYMDHMS(lisRequest.getCreated())); - model.setCheckTime(DateUtil.parseYMDHMS(lisRequest.getCheckTime())); - - list.add(model); } }