From 8d4983ac943bd71da45a5fe351b28435aa2fd8f6 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 8 Mar 2017 17:25:02 +0800 Subject: [PATCH] update code --- .../operate/web/facade/BabyBookbuildingFacade.java | 14 +++++++------ .../operate/web/facade/CorrectDataFacade.java | 9 ++++++-- .../platform/operate/web/facade/PatientFacade.java | 13 ++++++++---- .../operate/web/facade/RiskReportFacade.java | 9 ++++++-- .../platform/operate/web/facade/ViewFacade.java | 24 ++++++++++++++++++++++ .../main/resources/spring/applicationContext.xml | 2 +- 6 files changed, 56 insertions(+), 15 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index a9ea2d6..cc83bb6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -31,7 +31,9 @@ import org.apache.commons.lang.*; import org.apache.commons.lang.math.*; import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.domain.Sort; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletResponse; @@ -114,9 +116,9 @@ public class BabyBookbuildingFacade { private OrganizationGroupsFacade groupsFacade; - - - private static ExecutorService pool = Executors.newFixedThreadPool(10); + @Autowired + @Qualifier("commonThreadPool") + private ThreadPoolTaskExecutor commonThreadPool; public BaseResponse getBabyBase(String babyId) { @@ -1635,7 +1637,7 @@ public class BabyBookbuildingFacade { organizationService, babyCheckFacade, ms,request.getIsArea(),hospitalName); - Future f = pool.submit(c); + Future f = commonThreadPool.submit(c); futures.add(f); } if (CollectionUtils.isNotEmpty(futures)) @@ -2197,7 +2199,7 @@ public class BabyBookbuildingFacade { } }; - Future f = pool.submit(c); + Future f = commonThreadPool.submit(c); futures.add(f); } for (Future f : futures) { @@ -2482,7 +2484,7 @@ public class BabyBookbuildingFacade { } }; - Future f = pool.submit(c); + Future f = commonThreadPool.submit(c); futures.add(f); } if (CollectionUtils.isNotEmpty(futures)) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CorrectDataFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CorrectDataFacade.java index 21389dc..5856544 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CorrectDataFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CorrectDataFacade.java @@ -12,6 +12,8 @@ import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -37,7 +39,10 @@ public class CorrectDataFacade { @Autowired private AntenatalExaminationService anExService; - private ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(5, 10, 1, TimeUnit.MINUTES, new LinkedBlockingQueue(5000)); + @Autowired + @Qualifier("commonThreadPool") + private ThreadPoolTaskExecutor commonThreadPool; + /** * @@ -60,7 +65,7 @@ public class CorrectDataFacade { if (end > patientses.size()) { end = patientses.size(); } - threadPoolExecutor.submit(new CorrectDataWorker(patientses.subList(i, end),postReviewService,patientsService,anExService,antExFacade,counter)); + commonThreadPool.submit(new CorrectDataWorker(patientses.subList(i, end),postReviewService,patientsService,anExService,antExFacade,counter)); } logger.info("hand hospitalId :" +hospitalId+", update count "+counter.get()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 99527bd..7f005d9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -27,6 +27,8 @@ import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; import org.springframework.util.StopWatch; @@ -82,7 +84,10 @@ public class PatientFacade { @Autowired private OrganizationGroupsFacade groupsFacade; - private ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(15, 20, 1, TimeUnit.MINUTES, new LinkedBlockingQueue(5000)); + @Autowired + @Qualifier("commonThreadPool") + private ThreadPoolTaskExecutor commonThreadPool; + /** * 修改产妇的社区 @@ -518,7 +523,7 @@ public class PatientFacade { if (end > patientses.size()) { end = patientses.size(); } - listFuture.add(threadPoolExecutor.submit(new QuanChanPatientWorker(patientses.subList(i, end), hospital, usersService, postReviewService, matDeliverService, patientsService, organizationService, basicConfigService))); + listFuture.add(commonThreadPool.submit(new QuanChanPatientWorker(patientses.subList(i, end), hospital, usersService, postReviewService, matDeliverService, patientsService, organizationService, basicConfigService))); } for (Future f : listFuture) { try { @@ -541,7 +546,7 @@ public class PatientFacade { if (end > patientses.size()) { end = patientses.size(); } - listFuture.add(threadPoolExecutor.submit(new QuanPatientWorker(patientses.subList(i, end), usersService, hospital, antExService, basicConfigService, patientsService, organizationService))); + listFuture.add(commonThreadPool.submit(new QuanPatientWorker(patientses.subList(i, end), usersService, hospital, antExService, basicConfigService, patientsService, organizationService))); } for (Future f : listFuture) { try { @@ -569,7 +574,7 @@ public class PatientFacade { if (end > patientses.size()) { end = patientses.size(); } - listFuture.add(threadPoolExecutor.submit(new WorkHR(patientses.subList(i, end), usersService, hospital, basicConfigService, antExService, patientsService, organizationService))); + listFuture.add(commonThreadPool.submit(new WorkHR(patientses.subList(i, end), usersService, hospital, basicConfigService, antExService, patientsService, organizationService))); } for (Future f : listFuture) { try { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java index d9a96e1..df198c5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java @@ -23,7 +23,9 @@ import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.domain.Sort; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; import java.text.DecimalFormat; @@ -33,7 +35,10 @@ import java.util.concurrent.*; @Component public class RiskReportFacade { - private static ExecutorService pool = Executors.newFixedThreadPool(4); + @Autowired + @Qualifier("commonThreadPool") + private ThreadPoolTaskExecutor commonThreadPool; + @Autowired private PatientsService patientsService; @@ -136,7 +141,7 @@ public class RiskReportFacade { patientsService, levelConfig, patientsQuery, allPatientCount); - Future f = pool.submit(c); + Future f = commonThreadPool.submit(c); futures.add(f); } 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 b9b9bf4..03b4a38 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 @@ -1945,8 +1945,32 @@ public class ViewFacade { return br; } + private ResidentsArchiveResult getResidentsPageResult(ResidentsArchiveModel model) { ResidentsPageResult result = new ResidentsPageResult(); + result.setUsername(model.getUsername()); + result.setSex(SexEnum.getTextById(Integer.valueOf(model.getSex()))); + result.setBirthday(DateUtil.getyyyy_MM_dd(model.getBirthday())); + result.setCountry(getBasicConfig(model.getCountryId())); + result.setNation(getBasicConfig(model.getNationId())); + result.setMarriage(FunvCommonUtil.getBaseicConfigByid(model.getMarriageId(), basicConfigService)); + result.setCertificateType(FunvCommonUtil.getBaseicConfigByid(model.getCertificateTypeId(), basicConfigService)); + result.setCertificateNum(model.getCertificateNum()); + result.setCensusType(FunvCommonUtil.getBaseicConfigByid(model.getLevelTypeId(), basicConfigService)); + result.setLevelType(FunvCommonUtil.getBaseicConfigByid(model.getLiveTypeId(), basicConfigService)); + result.setLevelType(FunvCommonUtil.getBaseicConfigByid(model.getLevelTypeId(), basicConfigService)); + result.setProfessionType(FunvCommonUtil.getBaseicConfigByid(model.getProfessionTypeId(), basicConfigService)); + result.setAge(DateUtil.getAge(model.getBirthday(),new Date())); + + +// //手机号 +// private String phone; +// //工作单位 +// private String workUnit; +// //居住地 +// private String liveAddress; +// //户籍地址 +// private String addressRegister; return null; } diff --git a/platform-operate-api/src/main/resources/spring/applicationContext.xml b/platform-operate-api/src/main/resources/spring/applicationContext.xml index e9eb1d0..eab7d01 100644 --- a/platform-operate-api/src/main/resources/spring/applicationContext.xml +++ b/platform-operate-api/src/main/resources/spring/applicationContext.xml @@ -60,7 +60,7 @@ - + -- 1.8.3.1