diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java index 3ff2afd..8bbeb74 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java @@ -32,7 +32,7 @@ public class LymsEncodeUtil { // String key1 = "Lymsh@2020"; - String d = aesEncrypt("2020-12-30",key); + String d = aesEncrypt("2021-07-30",key); System.out.println("加密：" + d); } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java index 3b7a2cd..cb04317 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java @@ -202,6 +202,17 @@ public class ResidentsArchiveModel extends BaseModel { private FilePathModel filePath; + //1 未同步 2已经同步 + private Integer isSync; + + public Integer getIsSync() { + return isSync; + } + + public void setIsSync(Integer isSync) { + this.isSync = isSync; + } + public FilePathModel getFilePath() { return filePath; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java index 3c67b30..0014aaf 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java @@ -149,6 +149,11 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative //大于创建时间 private Date gteCreated; + //1 未同步 2已经同步 + private Integer isSync; + + + @Override public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); @@ -240,6 +245,9 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative if (yn != null) { condition = condition.and("yn", yn, MongoOper.IS); } + if (isSync != null) { + condition = condition.and("isSync", isSync, MongoOper.IS); + } if (created != null) { condition = condition.and("created", created, MongoOper.IS); } @@ -363,6 +371,14 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative //0 或者空不是 1是 private Integer hasHj; + public Integer getIsSync() { + return isSync; + } + + public void setIsSync(Integer isSync) { + this.isSync = isSync; + } + public Date getGteModified() { return gteModified; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CdGwController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CdGwController.java index a6dcc9f..a709e2e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CdGwController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CdGwController.java @@ -129,4 +129,38 @@ public class CdGwController extends BaseController { } + @ResponseBody + @RequestMapping(value = "/sync/test",method = RequestMethod.GET) + private BaseResponse test(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime, @RequestParam(required = false) String typeStr){ + System.out.printf("start = %s , end = %s , typeStr = %s", startTime, endTime, typeStr); + if ("saveYf".equals(typeStr)) { + return cdGwInterface.saveYf(startTime, endTime); + } + if ("saveChuZhen".equals(typeStr)) { + return cdGwInterface.saveChuZhen(startTime, endTime); + } + if ("saveFuZhen".equals(typeStr)) { + return cdGwInterface.saveFuZhen(startTime, endTime); + } + if ("saveFm".equals(typeStr)) { + return cdGwInterface.saveFm(startTime, endTime); + } + if ("saveChFs".equals(typeStr)) { + return cdGwInterface.saveChFs(startTime, endTime); + } + if ("saveEtDa".equals(typeStr)) { + return cdGwInterface.saveEtDa(startTime, endTime); + } + if ("saveXsrFs".equals(typeStr)) { + return cdGwInterface.saveXsrFs(startTime, endTime); + } + if ("saveEb".equals(typeStr)) { + return cdGwInterface.saveEb(startTime, endTime); + } + if ("all".equals(typeStr)) { + return cdGwInterface.testAll(startTime, endTime); + } + return new BaseResponse(); + } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java index 3ec8e79..a782f16 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java @@ -11,6 +11,7 @@ import com.lyms.platform.operate.web.request.PatientGuideSmsRequest; import com.lyms.platform.operate.web.request.ResidentsArchiveAddRequest; import com.lyms.platform.operate.web.request.ResidentsArchiveQueryRequest; import com.lyms.platform.operate.web.request.WomenGuideSmsRequest; +import com.lyms.platform.pojo.ResidentsArchiveModel; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -80,7 +81,7 @@ public class ResidentsArchiveController extends BaseController { param.setVcCardNo(vcCardNo); param.setCertificateTypeId(certificateTypeId); param.setCardNo(cardNo); - return residentsArchiveFacade.queryResidentsArchiveNewZufy(param , loginState.getId()); + return residentsArchiveFacade.queryResidentsArchiveNewZufy(param, loginState.getId()); } /** * 通过证件号,就诊卡号查询居民建档信息,优先返回本院 @@ -176,7 +177,7 @@ public class ResidentsArchiveController extends BaseController { @TokenRequired public BaseResponse queryAllResidents(@Valid ResidentsArchiveQueryRequest residentsArchiveQueryRequest,HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return residentsArchiveFacade.queryResidentsArchives(residentsArchiveQueryRequest,loginState.getId(),"true"); + return residentsArchiveFacade.queryResidentsArchives(residentsArchiveQueryRequest, loginState.getId(), "true"); } //返回证件类型Blood type @@ -234,7 +235,22 @@ public class ResidentsArchiveController extends BaseController { public BaseResponse deleteArchive(@RequestParam("id") String id, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return residentsArchiveFacade.deleteArchive(id,loginState.getId()); + return residentsArchiveFacade.deleteArchive(id, loginState.getId()); + } + + + @RequestMapping(method = RequestMethod.POST, value = "/syncResidentsArchive") + @ResponseBody + public BaseResponse syncResidentsArchive(@RequestBody ResidentsArchiveModel addRequest, + HttpServletRequest request) { + return residentsArchiveFacade.syncResidentsArchive(addRequest); + } + + @RequestMapping(method = RequestMethod.GET, value = "/doSyncResidentsArchive") + @ResponseBody + public BaseResponse doSyncResidentsArchive( + HttpServletRequest request) { + return residentsArchiveFacade.doSyncResidentsArchive(); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java index 0fd2ebc..feed4e4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java @@ -1466,6 +1466,7 @@ public class PatientSyncMysqlFacade { while (true) { antExQuery.setPage(page); + System.out.println("syncAntexToMysql" + page); List antexs = antenatalExaminationService.queryLastAntenx(antExQuery); if (CollectionUtils.isEmpty(antexs)) { @@ -1550,6 +1551,7 @@ public class PatientSyncMysqlFacade { while (true) { matDeliverQuery.setPage(page); + System.out.println("syncMatdeliverToMysql" + page); List maternalDeliverModels = matDeliverService.pageQuery(matDeliverQuery); if (CollectionUtils.isEmpty(maternalDeliverModels)) { 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 3211cc4..bc6a79d 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 @@ -458,6 +458,7 @@ public class ResidentsArchiveFacade { archiveModel.setYn(YnEnums.YES.getId()); archiveModel.setCreated(now); archiveModel.setModified(now); + archiveModel.setIsSync(1); archiveModel.setPublishId(String.valueOf(userId)); Users users = usersService.getUsers(userId); @@ -1206,4 +1207,31 @@ public class ResidentsArchiveFacade { } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + + public BaseResponse syncResidentsArchive(ResidentsArchiveModel addRequest) { + addRequest.setModified(new Date()); + residentsArchiveService.addResident(addRequest); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + 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 syncRsult = HttpClientUtil.doPostSSL(AREA_URL+"/syncResidentsArchive",JsonUtil.obj2Str(model)); + residentsArchiveService.updateResident(model,model.getId()); + System.out.println("doSyncResidentsArchive=" + syncRsult); + } + } + 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/resources/config.properties b/platform-operate-api/src/main/resources/config.properties index bb153f1..04933e6 100644 --- a/platform-operate-api/src/main/resources/config.properties +++ b/platform-operate-api/src/main/resources/config.properties @@ -46,4 +46,7 @@ hospitalId=2100002042 cert_url=https://try-cert-api.healthbaby.com.cn -lp_risk_url=http://lp-chengde-api.healthbaby.com.cn:8082 \ No newline at end of file +lp_risk_url=http://lp-chengde-api.healthbaby.com.cn:8082 + + +area_url=http://localhost:8082 \ No newline at end of file