From 173ad020aa10c91fb1c1e7f95f268562c5213861 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sun, 28 May 2023 22:51:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=A4=E7=99=8C=E5=92=8C=E6=B0=91=E7=94=9F?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/CancerScreeningFacade.java | 35 +++++++++++-------- .../web/facade/LivelihoodProjectsFacade.java | 16 ++++----- .../web/facade/PremaritalCheckupFacade.java | 36 ++++++++++--------- .../operate/web/facade/ResidentsArchiveFacade.java | 36 +++++++++++-------- .../service/impl/CervicalCancerServiceImpl.java | 40 +++++++++++++--------- .../web/service/impl/PreEugebicsServiceImpl.java | 40 +++++++++++++--------- 6 files changed, 115 insertions(+), 88 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java index 29ba6b2..3afc725 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java @@ -645,22 +645,27 @@ public class CancerScreeningFacade { } public BaseResponse doSyncCancerScreen() { - //查询条件 - CancerScreeningQuery query = new CancerScreeningQuery(); - query.setYn(YnEnums.YES.getId()); - query.setIsSync(1); - List modelList = cancerScreenService.queryCancerScreList(query); - if (CollectionUtils.isNotEmpty(modelList)) { - for (CancerScreeningModel model : modelList) - { - model.setIsSync(2); - String json = JsonUtil.obj2Str1(model); - System.out.println(json); - String syncRsult = HttpClientUtil.doPostSSL(AREA_URL + "/cancerScr/syncCancerScreen", json); - cancerScreenService.updateOneCancerScreen(model, model.getId()); - System.out.println("doSyncCancerScreen=" + syncRsult); + new Thread(new Runnable() { + @Override + public void run() { + //查询条件 + CancerScreeningQuery query = new CancerScreeningQuery(); + query.setYn(YnEnums.YES.getId()); + query.setIsSync(1); + List modelList = cancerScreenService.queryCancerScreList(query); + if (CollectionUtils.isNotEmpty(modelList)) { + System.out.println("doSyncCancerScreen=" + modelList.size()); + for (CancerScreeningModel model : modelList) + { + model.setIsSync(2); + String json = JsonUtil.obj2Str1(model); + String syncRsult = HttpClientUtil.doPostSSL(AREA_URL + "/cancerScr/syncCancerScreen", json); + cancerScreenService.updateOneCancerScreen(model, model.getId()); + System.out.println("doSyncCancerScreen=" + syncRsult); + } + } } - } + }).start(); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java index f334162..3889271 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java @@ -862,8 +862,8 @@ public class LivelihoodProjectsFacade { String mother_now_address=null; if(StringUtils.isNotEmpty(patients.getProvinceRegisterId()) && StringUtils.isNotEmpty(patients.getCityRegisterId()) && StringUtils.isNotEmpty(patients.getAreaRegisterId()) && StringUtils.isNotEmpty(patients.getStreetRegisterId()) && - StringUtils.isNotEmpty(patients.getVillageRegister()) && StringUtils.isNotEmpty(patients.getAddressRegister())){ - mother_now_address= CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getVillageRegister()+patients.getAddressRegister(), basicConfigService); + StringUtils.isNotEmpty(patients.getAddressRegister())){ + mother_now_address= CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService); } map.put("mother_now_address", mother_now_address); //母亲户籍地址标识,母亲户籍地址区划编码（居委会/村）取 县/区 级的编码 @@ -938,8 +938,8 @@ public class LivelihoodProjectsFacade { String father_now_address=null; if(StringUtils.isNotEmpty(patients.getHprovinceId()) && StringUtils.isNotEmpty(patients.getHcityId()) && StringUtils.isNotEmpty(patients.getHareaId()) && StringUtils.isNotEmpty(patients.getHstreetId()) && - StringUtils.isNotEmpty(patients.getHvillage()) && StringUtils.isNotEmpty(patients.getHaddress())){ - father_now_address= CommonsHelper.getResidence(patients.getHprovinceId(), patients.getHcityId(), patients.getHareaId(), patients.getHstreetId(), patients.getHvillage()+patients.getHaddress(), basicConfigService); + StringUtils.isNotEmpty(patients.getHaddress())){ + father_now_address= CommonsHelper.getResidence(patients.getHprovinceId(), patients.getHcityId(), patients.getHareaId(), patients.getHstreetId(), patients.getHaddress(), basicConfigService); } map.put("father_now_address", father_now_address); //丈夫户籍地址标识,丈夫户籍地址区划编码（区县）取 县/区 级的编码 @@ -1305,8 +1305,8 @@ public class LivelihoodProjectsFacade { String mother_now_address=null; if(StringUtils.isNotEmpty(patients.getProvinceRegisterId()) && StringUtils.isNotEmpty(patients.getCityRegisterId()) && StringUtils.isNotEmpty(patients.getAreaRegisterId()) && StringUtils.isNotEmpty(patients.getStreetRegisterId()) && - StringUtils.isNotEmpty(patients.getVillageRegister()) && StringUtils.isNotEmpty(patients.getAddressRegister())){ - mother_now_address= CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getVillageRegister()+patients.getAddressRegister(), basicConfigService); + StringUtils.isNotEmpty(patients.getAddressRegister())){ + mother_now_address= CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService); } map.put("mother_now_address", mother_now_address); //母亲户籍地址标识,母亲户籍地址区划编码（居委会/村）取 县/区 级的编码 @@ -1381,8 +1381,8 @@ public class LivelihoodProjectsFacade { String father_now_address=null; if(StringUtils.isNotEmpty(patients.getHprovinceId()) && StringUtils.isNotEmpty(patients.getHcityId()) && StringUtils.isNotEmpty(patients.getHareaId()) && StringUtils.isNotEmpty(patients.getHstreetId()) && - StringUtils.isNotEmpty(patients.getHvillage()) && StringUtils.isNotEmpty(patients.getHaddress())){ - father_now_address= CommonsHelper.getResidence(patients.getHprovinceId(), patients.getHcityId(), patients.getHareaId(), patients.getHstreetId(), patients.getHvillage()+patients.getHaddress(), basicConfigService); + StringUtils.isNotEmpty(patients.getHaddress())){ + father_now_address= CommonsHelper.getResidence(patients.getHprovinceId(), patients.getHcityId(), patients.getHareaId(), patients.getHstreetId(), patients.getHaddress(), basicConfigService); } map.put("father_now_address", father_now_address); //丈夫户籍地址标识,丈夫户籍地址区划编码（区县）取 县/区 级的编码 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index 59d5ceb..f63b10d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -3297,24 +3297,28 @@ public class PremaritalCheckupFacade { } public BaseResponse doSyncPremaritalCheckup() { - //查询条件 - PremaritalCheckupQuery query = new PremaritalCheckupQuery(); - query.setIsSync(1); - List modelList = premaritalCheckupService.queryPremaritalCheckup(query); - if (CollectionUtils.isNotEmpty(modelList)) { - for (PremaritalCheckup model : modelList) - { - model.setIsSync(2); - String json = JsonUtil.obj2Str1(model); - System.out.println(json); - String syncRsult = HttpClientUtil.doPostSSL(AREA_URL + "/syncPremaritalCheckup", json); - if(syncRsult != null) - { - premaritalCheckupService.updatePremaritalCheckup(model, model.getId()); - System.out.println("doSyncPremaritalCheckup=" + syncRsult); + new Thread(new Runnable() { + @Override + public void run() { + PremaritalCheckupQuery query = new PremaritalCheckupQuery(); + query.setIsSync(1); + List modelList = premaritalCheckupService.queryPremaritalCheckup(query); + if (CollectionUtils.isNotEmpty(modelList)) { + System.out.println("doSyncPremaritalCheckup size " + modelList.size()); + for (PremaritalCheckup model : modelList) + { + model.setIsSync(2); + String json = JsonUtil.obj2Str1(model); + String syncRsult = HttpClientUtil.doPostSSL(AREA_URL + "/syncPremaritalCheckup", json); + if(syncRsult != null) + { + premaritalCheckupService.updatePremaritalCheckup(model, model.getId()); + System.out.println("doSyncPremaritalCheckup=" + syncRsult); + } + } } } - } + }).start(); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index c8c9bea..805dbd7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -1252,24 +1252,30 @@ public class ResidentsArchiveFacade { public BaseResponse doSyncResidentsArchive() { - ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); - archiveQuery.setIsSync(1); - List archiveModelList = residentsArchiveService.queryResident(archiveQuery); - if (CollectionUtils.isNotEmpty(archiveModelList)) - { - for (ResidentsArchiveModel model : archiveModelList) - { - model.setIsSync(2); - String json = JsonUtil.obj2Str1(model); - System.out.println(json); - String syncRsult = HttpClientUtil.doPostSSL(AREA_URL+"/syncResidentsArchive",json); - if(syncRsult != null) + new Thread(new Runnable() { + @Override + public void run() { + ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); + archiveQuery.setIsSync(1); + List archiveModelList = residentsArchiveService.queryResident(archiveQuery); + if (CollectionUtils.isNotEmpty(archiveModelList)) { - residentsArchiveService.updateResident(model,model.getId()); - System.out.println("doSyncResidentsArchive=" + syncRsult); + System.out.println("doSyncResidentsArchive=" + archiveModelList.size()); + for (ResidentsArchiveModel model : archiveModelList) + { + model.setIsSync(2); + String json = JsonUtil.obj2Str1(model); + String syncRsult = HttpClientUtil.doPostSSL(AREA_URL+"/syncResidentsArchive",json); + if(syncRsult != null) + { + residentsArchiveService.updateResident(model,model.getId()); + System.out.println("doSyncResidentsArchive=" + syncRsult); + } + } } } - } + }).start(); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java index 9866268..c5743fd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java @@ -832,27 +832,33 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { @Override public BaseResponse doSyncCervicalCancer() { - List cervicalCancerModels = mongoTemplate.find(Query.query(Criteria.where("isSync").is(1)), CervicalCancerModel.class); - if (CollectionUtils.isNotEmpty(cervicalCancerModels)) - { - for (CervicalCancerModel model : cervicalCancerModels) - { - model.setIsSync(2); - String json = JsonUtil.obj2Str1(model); - System.out.println(json); - String syncRsult = HttpClientUtil.doPostSSL(AREA_URL+"/cervicalCancer/syncCervicalCancer",json); - if(syncRsult != null) + new Thread(new Runnable() { + @Override + public void run() { + List cervicalCancerModels = mongoTemplate.find(Query.query(Criteria.where("isSync").is(1)), CervicalCancerModel.class); + if (CollectionUtils.isNotEmpty(cervicalCancerModels)) { - Query query = Query.query(Criteria.where("id").is(model.getId())); - Update update = MongoConvertHelper - .convertToNativeUpdate(ReflectionUtils.getUpdateField(model)); - mongoTemplate.updateFirst(query, update, CervicalCancerModel.class); + System.out.println("doSyncCervicalCancer=" + cervicalCancerModels.size()); + for (CervicalCancerModel model : cervicalCancerModels) + { + model.setIsSync(2); + String json = JsonUtil.obj2Str1(model); + String syncRsult = HttpClientUtil.doPostSSL(AREA_URL+"/cervicalCancer/syncCervicalCancer",json); + if(syncRsult != null) + { + Query query = Query.query(Criteria.where("id").is(model.getId())); + Update update = MongoConvertHelper + .convertToNativeUpdate(ReflectionUtils.getUpdateField(model)); + mongoTemplate.updateFirst(query, update, CervicalCancerModel.class); + + System.out.println("doSyncCervicalCancer=" + syncRsult); + } - System.out.println("doSyncCervicalCancer=" + syncRsult); + } } - } - } + }).start(); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } public static final String AREA_URL = PropertiesUtils.getPropertyValue("area_url"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java index 7ea7c6a..17469cf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java @@ -1299,26 +1299,32 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen @Override public BaseResponse doSyncPreEugenicsBase() { - List preEugenicsBaseModels = mongoTemplate.find(Query.query(Criteria.where("isSync").is(1)), PreEugenicsBaseModel.class); - if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(preEugenicsBaseModels)) - { - for (PreEugenicsBaseModel model : preEugenicsBaseModels) - { - model.setIsSync(2); - String json = JsonUtil.obj2Str1(model); - System.out.println(json); - String syncRsult = HttpClientUtil.doPostSSL(AREA_URL+"/preEugenicsBase/syncPreEugenicsBase",json); - - if(syncRsult != null) + new Thread(new Runnable() { + @Override + public void run() { + List preEugenicsBaseModels = mongoTemplate.find(Query.query(Criteria.where("isSync").is(1)), PreEugenicsBaseModel.class); + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(preEugenicsBaseModels)) { - Query query = Query.query(Criteria.where("id").is(model.getId())); - Update update = MongoConvertHelper - .convertToNativeUpdate(ReflectionUtils.getUpdateField(model)); - mongoTemplate.updateFirst(query, update, PreEugenicsBaseModel.class); + System.out.println("doSyncPreEugenicsBase=" + preEugenicsBaseModels.size()); + for (PreEugenicsBaseModel model : preEugenicsBaseModels) + { + model.setIsSync(2); + String json = JsonUtil.obj2Str1(model); + String syncRsult = HttpClientUtil.doPostSSL(AREA_URL+"/preEugenicsBase/syncPreEugenicsBase",json); + + if(syncRsult != null) + { + Query query = Query.query(Criteria.where("id").is(model.getId())); + Update update = MongoConvertHelper + .convertToNativeUpdate(ReflectionUtils.getUpdateField(model)); + mongoTemplate.updateFirst(query, update, PreEugenicsBaseModel.class); + System.out.println("doSyncPreEugenicsBase=" + syncRsult); + } + } } - System.out.println("doSyncPreEugenicsBase=" + syncRsult); } - } + }).start(); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } -- 1.8.3.1