Commit 173ad020aa10c91fb1c1e7f95f268562c5213861
1 parent
721f57ccec
Exists in
master
and in
3 other branches
两癌和民生工程
Showing 6 changed files with 115 additions and 88 deletions
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
View file @
173ad02
... | ... | @@ -645,22 +645,27 @@ |
645 | 645 | } |
646 | 646 | |
647 | 647 | public BaseResponse doSyncCancerScreen() { |
648 | - //查询条件 | |
649 | - CancerScreeningQuery query = new CancerScreeningQuery(); | |
650 | - query.setYn(YnEnums.YES.getId()); | |
651 | - query.setIsSync(1); | |
652 | - List <CancerScreeningModel> modelList = cancerScreenService.queryCancerScreList(query); | |
653 | - if (CollectionUtils.isNotEmpty(modelList)) { | |
654 | - for (CancerScreeningModel model : modelList) | |
655 | - { | |
656 | - model.setIsSync(2); | |
657 | - String json = JsonUtil.obj2Str1(model); | |
658 | - System.out.println(json); | |
659 | - String syncRsult = HttpClientUtil.doPostSSL(AREA_URL + "/cancerScr/syncCancerScreen", json); | |
660 | - cancerScreenService.updateOneCancerScreen(model, model.getId()); | |
661 | - System.out.println("doSyncCancerScreen=" + syncRsult); | |
648 | + new Thread(new Runnable() { | |
649 | + @Override | |
650 | + public void run() { | |
651 | + //查询条件 | |
652 | + CancerScreeningQuery query = new CancerScreeningQuery(); | |
653 | + query.setYn(YnEnums.YES.getId()); | |
654 | + query.setIsSync(1); | |
655 | + List <CancerScreeningModel> modelList = cancerScreenService.queryCancerScreList(query); | |
656 | + if (CollectionUtils.isNotEmpty(modelList)) { | |
657 | + System.out.println("doSyncCancerScreen=" + modelList.size()); | |
658 | + for (CancerScreeningModel model : modelList) | |
659 | + { | |
660 | + model.setIsSync(2); | |
661 | + String json = JsonUtil.obj2Str1(model); | |
662 | + String syncRsult = HttpClientUtil.doPostSSL(AREA_URL + "/cancerScr/syncCancerScreen", json); | |
663 | + cancerScreenService.updateOneCancerScreen(model, model.getId()); | |
664 | + System.out.println("doSyncCancerScreen=" + syncRsult); | |
665 | + } | |
666 | + } | |
662 | 667 | } |
663 | - } | |
668 | + }).start(); | |
664 | 669 | return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); |
665 | 670 | } |
666 | 671 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java
View file @
173ad02
... | ... | @@ -862,8 +862,8 @@ |
862 | 862 | String mother_now_address=null; |
863 | 863 | if(StringUtils.isNotEmpty(patients.getProvinceRegisterId()) && StringUtils.isNotEmpty(patients.getCityRegisterId()) && |
864 | 864 | StringUtils.isNotEmpty(patients.getAreaRegisterId()) && StringUtils.isNotEmpty(patients.getStreetRegisterId()) && |
865 | - StringUtils.isNotEmpty(patients.getVillageRegister()) && StringUtils.isNotEmpty(patients.getAddressRegister())){ | |
866 | - mother_now_address= CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getVillageRegister()+patients.getAddressRegister(), basicConfigService); | |
865 | + StringUtils.isNotEmpty(patients.getAddressRegister())){ | |
866 | + mother_now_address= CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService); | |
867 | 867 | } |
868 | 868 | map.put("mother_now_address", mother_now_address); |
869 | 869 | //母亲户籍地址标识,母亲户籍地址区划编码(居委会/村)取 县/区 级的编码 |
... | ... | @@ -938,8 +938,8 @@ |
938 | 938 | String father_now_address=null; |
939 | 939 | if(StringUtils.isNotEmpty(patients.getHprovinceId()) && StringUtils.isNotEmpty(patients.getHcityId()) && |
940 | 940 | StringUtils.isNotEmpty(patients.getHareaId()) && StringUtils.isNotEmpty(patients.getHstreetId()) && |
941 | - StringUtils.isNotEmpty(patients.getHvillage()) && StringUtils.isNotEmpty(patients.getHaddress())){ | |
942 | - father_now_address= CommonsHelper.getResidence(patients.getHprovinceId(), patients.getHcityId(), patients.getHareaId(), patients.getHstreetId(), patients.getHvillage()+patients.getHaddress(), basicConfigService); | |
941 | + StringUtils.isNotEmpty(patients.getHaddress())){ | |
942 | + father_now_address= CommonsHelper.getResidence(patients.getHprovinceId(), patients.getHcityId(), patients.getHareaId(), patients.getHstreetId(), patients.getHaddress(), basicConfigService); | |
943 | 943 | } |
944 | 944 | map.put("father_now_address", father_now_address); |
945 | 945 | //丈夫户籍地址标识,丈夫户籍地址区划编码(区县)取 县/区 级的编码 |
... | ... | @@ -1305,8 +1305,8 @@ |
1305 | 1305 | String mother_now_address=null; |
1306 | 1306 | if(StringUtils.isNotEmpty(patients.getProvinceRegisterId()) && StringUtils.isNotEmpty(patients.getCityRegisterId()) && |
1307 | 1307 | StringUtils.isNotEmpty(patients.getAreaRegisterId()) && StringUtils.isNotEmpty(patients.getStreetRegisterId()) && |
1308 | - StringUtils.isNotEmpty(patients.getVillageRegister()) && StringUtils.isNotEmpty(patients.getAddressRegister())){ | |
1309 | - mother_now_address= CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getVillageRegister()+patients.getAddressRegister(), basicConfigService); | |
1308 | + StringUtils.isNotEmpty(patients.getAddressRegister())){ | |
1309 | + mother_now_address= CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService); | |
1310 | 1310 | } |
1311 | 1311 | map.put("mother_now_address", mother_now_address); |
1312 | 1312 | //母亲户籍地址标识,母亲户籍地址区划编码(居委会/村)取 县/区 级的编码 |
... | ... | @@ -1381,8 +1381,8 @@ |
1381 | 1381 | String father_now_address=null; |
1382 | 1382 | if(StringUtils.isNotEmpty(patients.getHprovinceId()) && StringUtils.isNotEmpty(patients.getHcityId()) && |
1383 | 1383 | StringUtils.isNotEmpty(patients.getHareaId()) && StringUtils.isNotEmpty(patients.getHstreetId()) && |
1384 | - StringUtils.isNotEmpty(patients.getHvillage()) && StringUtils.isNotEmpty(patients.getHaddress())){ | |
1385 | - father_now_address= CommonsHelper.getResidence(patients.getHprovinceId(), patients.getHcityId(), patients.getHareaId(), patients.getHstreetId(), patients.getHvillage()+patients.getHaddress(), basicConfigService); | |
1384 | + StringUtils.isNotEmpty(patients.getHaddress())){ | |
1385 | + father_now_address= CommonsHelper.getResidence(patients.getHprovinceId(), patients.getHcityId(), patients.getHareaId(), patients.getHstreetId(), patients.getHaddress(), basicConfigService); | |
1386 | 1386 | } |
1387 | 1387 | map.put("father_now_address", father_now_address); |
1388 | 1388 | //丈夫户籍地址标识,丈夫户籍地址区划编码(区县)取 县/区 级的编码 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
View file @
173ad02
... | ... | @@ -3297,24 +3297,28 @@ |
3297 | 3297 | } |
3298 | 3298 | |
3299 | 3299 | public BaseResponse doSyncPremaritalCheckup() { |
3300 | - //查询条件 | |
3301 | - PremaritalCheckupQuery query = new PremaritalCheckupQuery(); | |
3302 | - query.setIsSync(1); | |
3303 | - List<PremaritalCheckup> modelList = premaritalCheckupService.queryPremaritalCheckup(query); | |
3304 | - if (CollectionUtils.isNotEmpty(modelList)) { | |
3305 | - for (PremaritalCheckup model : modelList) | |
3306 | - { | |
3307 | - model.setIsSync(2); | |
3308 | - String json = JsonUtil.obj2Str1(model); | |
3309 | - System.out.println(json); | |
3310 | - String syncRsult = HttpClientUtil.doPostSSL(AREA_URL + "/syncPremaritalCheckup", json); | |
3311 | - if(syncRsult != null) | |
3312 | - { | |
3313 | - premaritalCheckupService.updatePremaritalCheckup(model, model.getId()); | |
3314 | - System.out.println("doSyncPremaritalCheckup=" + syncRsult); | |
3300 | + new Thread(new Runnable() { | |
3301 | + @Override | |
3302 | + public void run() { | |
3303 | + PremaritalCheckupQuery query = new PremaritalCheckupQuery(); | |
3304 | + query.setIsSync(1); | |
3305 | + List<PremaritalCheckup> modelList = premaritalCheckupService.queryPremaritalCheckup(query); | |
3306 | + if (CollectionUtils.isNotEmpty(modelList)) { | |
3307 | + System.out.println("doSyncPremaritalCheckup size " + modelList.size()); | |
3308 | + for (PremaritalCheckup model : modelList) | |
3309 | + { | |
3310 | + model.setIsSync(2); | |
3311 | + String json = JsonUtil.obj2Str1(model); | |
3312 | + String syncRsult = HttpClientUtil.doPostSSL(AREA_URL + "/syncPremaritalCheckup", json); | |
3313 | + if(syncRsult != null) | |
3314 | + { | |
3315 | + premaritalCheckupService.updatePremaritalCheckup(model, model.getId()); | |
3316 | + System.out.println("doSyncPremaritalCheckup=" + syncRsult); | |
3317 | + } | |
3318 | + } | |
3315 | 3319 | } |
3316 | 3320 | } |
3317 | - } | |
3321 | + }).start(); | |
3318 | 3322 | return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); |
3319 | 3323 | } |
3320 | 3324 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
View file @
173ad02
... | ... | @@ -1252,24 +1252,30 @@ |
1252 | 1252 | |
1253 | 1253 | public BaseResponse doSyncResidentsArchive() { |
1254 | 1254 | |
1255 | - ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); | |
1256 | - archiveQuery.setIsSync(1); | |
1257 | - List<ResidentsArchiveModel> archiveModelList = residentsArchiveService.queryResident(archiveQuery); | |
1258 | - if (CollectionUtils.isNotEmpty(archiveModelList)) | |
1259 | - { | |
1260 | - for (ResidentsArchiveModel model : archiveModelList) | |
1261 | - { | |
1262 | - model.setIsSync(2); | |
1263 | - String json = JsonUtil.obj2Str1(model); | |
1264 | - System.out.println(json); | |
1265 | - String syncRsult = HttpClientUtil.doPostSSL(AREA_URL+"/syncResidentsArchive",json); | |
1266 | - if(syncRsult != null) | |
1255 | + new Thread(new Runnable() { | |
1256 | + @Override | |
1257 | + public void run() { | |
1258 | + ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); | |
1259 | + archiveQuery.setIsSync(1); | |
1260 | + List<ResidentsArchiveModel> archiveModelList = residentsArchiveService.queryResident(archiveQuery); | |
1261 | + if (CollectionUtils.isNotEmpty(archiveModelList)) | |
1267 | 1262 | { |
1268 | - residentsArchiveService.updateResident(model,model.getId()); | |
1269 | - System.out.println("doSyncResidentsArchive=" + syncRsult); | |
1263 | + System.out.println("doSyncResidentsArchive=" + archiveModelList.size()); | |
1264 | + for (ResidentsArchiveModel model : archiveModelList) | |
1265 | + { | |
1266 | + model.setIsSync(2); | |
1267 | + String json = JsonUtil.obj2Str1(model); | |
1268 | + String syncRsult = HttpClientUtil.doPostSSL(AREA_URL+"/syncResidentsArchive",json); | |
1269 | + if(syncRsult != null) | |
1270 | + { | |
1271 | + residentsArchiveService.updateResident(model,model.getId()); | |
1272 | + System.out.println("doSyncResidentsArchive=" + syncRsult); | |
1273 | + } | |
1274 | + } | |
1270 | 1275 | } |
1271 | 1276 | } |
1272 | - } | |
1277 | + }).start(); | |
1278 | + | |
1273 | 1279 | return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); |
1274 | 1280 | } |
1275 | 1281 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
View file @
173ad02
... | ... | @@ -832,27 +832,33 @@ |
832 | 832 | |
833 | 833 | @Override |
834 | 834 | public BaseResponse doSyncCervicalCancer() { |
835 | - List<CervicalCancerModel> cervicalCancerModels = mongoTemplate.find(Query.query(Criteria.where("isSync").is(1)), CervicalCancerModel.class); | |
836 | - if (CollectionUtils.isNotEmpty(cervicalCancerModels)) | |
837 | - { | |
838 | - for (CervicalCancerModel model : cervicalCancerModels) | |
839 | - { | |
840 | - model.setIsSync(2); | |
841 | - String json = JsonUtil.obj2Str1(model); | |
842 | - System.out.println(json); | |
843 | - String syncRsult = HttpClientUtil.doPostSSL(AREA_URL+"/cervicalCancer/syncCervicalCancer",json); | |
844 | - if(syncRsult != null) | |
835 | + new Thread(new Runnable() { | |
836 | + @Override | |
837 | + public void run() { | |
838 | + List<CervicalCancerModel> cervicalCancerModels = mongoTemplate.find(Query.query(Criteria.where("isSync").is(1)), CervicalCancerModel.class); | |
839 | + if (CollectionUtils.isNotEmpty(cervicalCancerModels)) | |
845 | 840 | { |
846 | - Query query = Query.query(Criteria.where("id").is(model.getId())); | |
847 | - Update update = MongoConvertHelper | |
848 | - .convertToNativeUpdate(ReflectionUtils.getUpdateField(model)); | |
849 | - mongoTemplate.updateFirst(query, update, CervicalCancerModel.class); | |
841 | + System.out.println("doSyncCervicalCancer=" + cervicalCancerModels.size()); | |
842 | + for (CervicalCancerModel model : cervicalCancerModels) | |
843 | + { | |
844 | + model.setIsSync(2); | |
845 | + String json = JsonUtil.obj2Str1(model); | |
846 | + String syncRsult = HttpClientUtil.doPostSSL(AREA_URL+"/cervicalCancer/syncCervicalCancer",json); | |
847 | + if(syncRsult != null) | |
848 | + { | |
849 | + Query query = Query.query(Criteria.where("id").is(model.getId())); | |
850 | + Update update = MongoConvertHelper | |
851 | + .convertToNativeUpdate(ReflectionUtils.getUpdateField(model)); | |
852 | + mongoTemplate.updateFirst(query, update, CervicalCancerModel.class); | |
850 | 853 | |
851 | - System.out.println("doSyncCervicalCancer=" + syncRsult); | |
852 | - } | |
854 | + System.out.println("doSyncCervicalCancer=" + syncRsult); | |
855 | + } | |
853 | 856 | |
857 | + } | |
858 | + } | |
854 | 859 | } |
855 | - } | |
860 | + }).start(); | |
861 | + | |
856 | 862 | return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); |
857 | 863 | } |
858 | 864 | public static final String AREA_URL = PropertiesUtils.getPropertyValue("area_url"); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
View file @
173ad02
... | ... | @@ -1299,26 +1299,32 @@ |
1299 | 1299 | |
1300 | 1300 | @Override |
1301 | 1301 | public BaseResponse doSyncPreEugenicsBase() { |
1302 | - List<PreEugenicsBaseModel> preEugenicsBaseModels = mongoTemplate.find(Query.query(Criteria.where("isSync").is(1)), PreEugenicsBaseModel.class); | |
1303 | - if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(preEugenicsBaseModels)) | |
1304 | - { | |
1305 | - for (PreEugenicsBaseModel model : preEugenicsBaseModels) | |
1306 | - { | |
1307 | - model.setIsSync(2); | |
1308 | - String json = JsonUtil.obj2Str1(model); | |
1309 | - System.out.println(json); | |
1310 | - String syncRsult = HttpClientUtil.doPostSSL(AREA_URL+"/preEugenicsBase/syncPreEugenicsBase",json); | |
1311 | - | |
1312 | - if(syncRsult != null) | |
1302 | + new Thread(new Runnable() { | |
1303 | + @Override | |
1304 | + public void run() { | |
1305 | + List<PreEugenicsBaseModel> preEugenicsBaseModels = mongoTemplate.find(Query.query(Criteria.where("isSync").is(1)), PreEugenicsBaseModel.class); | |
1306 | + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(preEugenicsBaseModels)) | |
1313 | 1307 | { |
1314 | - Query query = Query.query(Criteria.where("id").is(model.getId())); | |
1315 | - Update update = MongoConvertHelper | |
1316 | - .convertToNativeUpdate(ReflectionUtils.getUpdateField(model)); | |
1317 | - mongoTemplate.updateFirst(query, update, PreEugenicsBaseModel.class); | |
1308 | + System.out.println("doSyncPreEugenicsBase=" + preEugenicsBaseModels.size()); | |
1309 | + for (PreEugenicsBaseModel model : preEugenicsBaseModels) | |
1310 | + { | |
1311 | + model.setIsSync(2); | |
1312 | + String json = JsonUtil.obj2Str1(model); | |
1313 | + String syncRsult = HttpClientUtil.doPostSSL(AREA_URL+"/preEugenicsBase/syncPreEugenicsBase",json); | |
1314 | + | |
1315 | + if(syncRsult != null) | |
1316 | + { | |
1317 | + Query query = Query.query(Criteria.where("id").is(model.getId())); | |
1318 | + Update update = MongoConvertHelper | |
1319 | + .convertToNativeUpdate(ReflectionUtils.getUpdateField(model)); | |
1320 | + mongoTemplate.updateFirst(query, update, PreEugenicsBaseModel.class); | |
1321 | + System.out.println("doSyncPreEugenicsBase=" + syncRsult); | |
1322 | + } | |
1323 | + } | |
1318 | 1324 | } |
1319 | - System.out.println("doSyncPreEugenicsBase=" + syncRsult); | |
1320 | 1325 | } |
1321 | - } | |
1326 | + }).start(); | |
1327 | + | |
1322 | 1328 | return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); |
1323 | 1329 | } |
1324 | 1330 |