diff --git a/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java index 2e565b770..99d832116 100644 --- a/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java +++ b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java @@ -92,7 +92,12 @@ public class SyncDataSetController { //todo 请立即同步至UDI管理系统 - spGetHttpClient.updateSynsSet(syncDataSetResponse); - return ResultVOUtils.success("设置成功"); + BaseResponse baseResponse = spGetHttpClient.updateSynsSet(syncDataSetResponse); + if (baseResponse.getCode() == 20000) { + return baseResponse; + } else { + return ResultVOUtils.error(500, "UDI管理系统设置成功，自助平台修改失败"); + } + } } diff --git a/src/main/java/com/glxp/api/entity/auth/DeptEntity.java b/src/main/java/com/glxp/api/entity/auth/DeptEntity.java index 135a1f5a6..f313bbe33 100644 --- a/src/main/java/com/glxp/api/entity/auth/DeptEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/DeptEntity.java @@ -1,5 +1,6 @@ package com.glxp.api.entity.auth; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -19,6 +20,7 @@ public class DeptEntity { private String remark; private Integer level; private String pcode; + @TableField(exist = false) private String pName; /** diff --git a/src/main/java/com/glxp/api/entity/auth/WarehouseUserEntity.java b/src/main/java/com/glxp/api/entity/auth/WarehouseUserEntity.java index fa5573b19..8a96fac45 100644 --- a/src/main/java/com/glxp/api/entity/auth/WarehouseUserEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/WarehouseUserEntity.java @@ -38,7 +38,7 @@ public class WarehouseUserEntity { @TableField("isDirector") private boolean isDirector; - @TableField("employeeName") + @TableField(exist = false) private String employeeName; @TableField("updateTime") diff --git a/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java b/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java index e32b04574..fe45690c7 100644 --- a/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java @@ -23,9 +23,9 @@ public class SyncDataSetEntity { private int dbDiProducts; //DI产品信息 private int dbDiCompany; //DI企业信息 - private int department; //部门信息 - private int warehouseDict; //仓库字典 - private int userData; //用户信息 +// private int department; //部门信息 +// private int warehouseDict; //仓库字典 +// private int userData; //用户信息 private int udiCodeLost; // UDI码补齐 private int udiCodeRel; //UDI码关联关系 diff --git a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java index e678b5b39..d76edda4b 100644 --- a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java +++ b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java @@ -211,7 +211,7 @@ public class SpGetHttpClient { public BaseResponse> getBasicStatus(String type) { Map paramMap = new HashMap<>(16); paramMap.put("type", type); - paramMap.put("status", "3"); + paramMap.put("status", "1"); String response = okHttpCli.doGet(getIpUrl() + "/spssync/basic/udiinfo/getStatus", paramMap, buildHeader()); try { BaseResponse> data = @@ -323,7 +323,7 @@ public class SpGetHttpClient { public void finishTask(String id) { BasicExportStatusRequest basicExportStatusRequest = new BasicExportStatusRequest(); basicExportStatusRequest.setId(id); - String result = okHttpCli.doPostJson(getIpUrl() + "/spssync/basic/udiinfo/finishTask" + String result = okHttpCli.doPostJson(getIpUrl() + "/spssync/udiinfo/finishTask" , JSONUtil.toJsonStr(basicExportStatusRequest), buildHeader()); } diff --git a/src/main/java/com/glxp/api/res/basic/BasicHospTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicHospTypeResponse.java index d11b90151..24a4646cc 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicHospTypeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicHospTypeResponse.java @@ -11,7 +11,7 @@ import java.util.Date; @Data public class BasicHospTypeResponse { - private Integer id; + private Long id; private String code; private String parentCode; private String name; @@ -23,4 +23,4 @@ public class BasicHospTypeResponse { private String label; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index f1a03cedc..7af006ff4 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -232,7 +232,7 @@ public class HeartService { } break; case USER_DATA: - if (needExec(info.getDepartment(), info.getWarehouseDict(), info.getUserData())) { + if (needExec(info.getBasicDept(), info.getBasicInv(), info.getSysUser())) { uploadData(exportType, taskId, x -> x.getUserData(info, taskId, now, syncTime)); } break; @@ -572,7 +572,7 @@ public class HeartService { syncTimeMap.put("oldDate", syncTime); //确认有开启部门信息同步 - if (needExec(info.getDepartment())) { + if (needExec(info.getBasicDept())) { Map map; if (syncTime == null) { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.DEPT_DATA); @@ -602,7 +602,7 @@ public class HeartService { } //确认有开启仓库字典同步 - if (needExec(info.getWarehouseDict())) { + if (needExec(info.getBasicInv())) { Map map; if (syncTime == null) { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.WAREHOUSE_DICT); @@ -656,7 +656,7 @@ public class HeartService { } //确认有开启用户信息同步 - if (needExec(info.getUserData())) { + if (needExec(info.getSysUser())) { Map map; if (syncTime == null) { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.USER_DATA); @@ -1098,7 +1098,7 @@ public class HeartService { basicDownloadStatusEntity.setUpdateTime(new Date()); basicDownloadStatusEntity.setEndTime(new Date()); basicDownloadStatusEntity.setRemark(remark.toString()); - basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); + basicDownloadStatusEntity.setStatus(BasicExportStatusEnum.SUCCESS.getCode()); basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity); @@ -1111,7 +1111,7 @@ public class HeartService { // 下载最近更新国家库数据-上级服务 @Transactional(propagation = Propagation.NESTED) public void dlAllDiProducts() { - BaseResponse> baseResponse = spGetHttp.getBasicStatus(BasicProcessStatus.NEW_ALL_DI + ""); + BaseResponse> baseResponse = spGetHttp.getBasicStatus(BasicExportTypeEnum.COUNTRY_DI_DATA.getRemark() + ""); List pageSimpleResponse = baseResponse.getData(); if (pageSimpleResponse != null) { List basicExportStatusEntities = pageSimpleResponse; @@ -1165,7 +1165,7 @@ public class HeartService { basicDownloadStatusEntity.setUpdateTime(new Date()); basicDownloadStatusEntity.setEndTime(new Date()); basicDownloadStatusEntity.setRemark(remark.toString()); - basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); + basicDownloadStatusEntity.setStatus(BasicExportStatusEnum.SUCCESS.getCode()); basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity); } } @@ -1272,8 +1272,7 @@ public class HeartService { relevanceDao.insertOrUpdateBatch(relevanceList); } if (CollectionUtil.isNotEmpty(corpList)) { - for (BasicCorpEntity basicCorpEntity : corpList) - corpDao.importBasicUnitMaintain(basicCorpEntity); + corpDao.insertOrUpdateBatch(corpList); } if (CollectionUtil.isNotEmpty(supCertList)) { supCertDao.insertOrUpdateBatch(supCertList); diff --git a/src/main/java/com/glxp/api/task/SyncHeartTask.java b/src/main/java/com/glxp/api/task/SyncHeartTask.java index 8b0a41c82..cee16ce1a 100644 --- a/src/main/java/com/glxp/api/task/SyncHeartTask.java +++ b/src/main/java/com/glxp/api/task/SyncHeartTask.java @@ -105,7 +105,7 @@ public class SyncHeartTask implements SchedulingConfigurer { //定时下载上游最近更新数据轮询时间 - long timeInterval = syncDataSetEntity.getSyncDownloadTime() * 60 * 1000; + long timeInterval = syncDataSetEntity.getSyncDownloadTime() * 6 * 1000; long curTime = System.currentTimeMillis(); Long lastTime = (Long) redisUtil.get("SPS_SYNC_DOWNLOAD_DATA"); if (lastTime == null) {