diff --git a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java index 448a47137..8bab4ea74 100644 --- a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java +++ b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java @@ -37,6 +37,5 @@ public class BasicExportStatusEntity { private String receiveStatus; @TableField(value = "cacheFilePath") private String cacheFilePath; - private String execInfo; } 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 a54ba82e3..88157b1e7 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -281,11 +281,10 @@ public class HeartService { * @return */ public SpsSyncBasicDataResponse getBasicData(SyncDataSetEntity info, String taskId, Date now, Date syncTime) { - StringBuffer remark = new StringBuffer(); + StringBuilder remark = new StringBuilder(); SpsSyncBasicDataResponse dataResponse = null; Map syncTimeMap = new WeakHashMap<>(3); syncTimeMap.put("isNew", true); - syncTimeMap.put("oldDate", syncTime); //确认有开启物资字典同步 if (needExec(info.getBasicProducts())) { Map map; @@ -293,6 +292,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_PRODUCTS); } else { map = syncTimeMap; + now = syncTime; } List hospTypeList = basicHospTypeDao.selectList(Wrappers.lambdaQuery(BasicHospTypeEntity.class) .le((boolean) map.get("isNew"), BasicHospTypeEntity::getUpdateTime, now) @@ -348,6 +348,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_CORP); } else { map = syncTimeMap; + now = syncTime; } List corpList = corpDao.selectList(Wrappers.lambdaQuery(BasicCorpEntity.class) .le((boolean) map.get("isNew"), BasicCorpEntity::getUpdateTime, now) @@ -370,6 +371,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SUP_CERT); } else { map = syncTimeMap; + now = syncTime; } List supCertList = supCertDao.selectList(Wrappers.lambdaQuery(SupCertEntity.class) .le((boolean) map.get("isNew"), SupCertEntity::getUpdateTime, now) @@ -456,7 +458,6 @@ public class HeartService { SpsSyncOtherDataResponse dataResponse = null; Map syncTimeMap = new WeakHashMap<>(3); syncTimeMap.put("isNew", true); - syncTimeMap.put("oldDate", syncTime); //确认有开启udi码补齐同步 if (needExec(info.getUdiCodeLost())) { Map map; @@ -464,6 +465,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.IO_CODE_LOST); } else { map = syncTimeMap; + now = syncTime; } List ioCodeLostList = ioCodeLostMapper.selectList(Wrappers.lambdaQuery(IoCodeLostEntity.class) .le((boolean) map.get("isNew"), IoCodeLostEntity::getUpdateTime, now) @@ -483,6 +485,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.IO_CODE_REL); } else { map = syncTimeMap; + now = syncTime; } List ioCodeRelList = ioCodeRelMapper.selectList(Wrappers.lambdaQuery(IoCodeRelEntity.class) .le((boolean) map.get("isNew"), IoCodeRelEntity::getUpdateTime, now) @@ -554,6 +557,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_BUSSINESS_TYPE); } else { map = syncTimeMap; + now = syncTime; } List bussinessTypeEntities = bussinessTypeService.list(Wrappers.lambdaQuery(BasicBussinessTypeEntity.class) .le((boolean) map.get("isNew"), BasicBussinessTypeEntity::getUpdateTime, now) @@ -573,6 +577,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_BUSTYPE_CHANGE); } else { map = syncTimeMap; + now = syncTime; } List busTypeChangeList = busTypeChangeService.list(Wrappers.lambdaQuery(BasicBusTypeChangeEntity.class) .le((boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime, now) @@ -595,6 +600,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_BUSTYPE_ORIGIN); } else { map = syncTimeMap; + now = syncTime; } List thrBusTypeOriginEntities = thrBusTypeOriginService.list(Wrappers.lambdaQuery(ThrBusTypeOriginEntity.class) .le((boolean) map.get("isNew"), ThrBusTypeOriginEntity::getUpdateTime, now) @@ -640,7 +646,6 @@ public class HeartService { SpsSyncDataResponse dataResponse = null; Map syncTimeMap = new WeakHashMap<>(3); syncTimeMap.put("isNew", true); - syncTimeMap.put("oldDate", syncTime); StringBuffer remark = new StringBuffer(); //确认有开启部门信息同步 if (needExec(info.getBasicDept())) { @@ -649,6 +654,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.DEPT_DATA); } else { map = syncTimeMap; + now = syncTime; } List deptEntityList = deptService.list(Wrappers.lambdaQuery(DeptEntity.class) .le((boolean) map.get("isNew"), DeptEntity::getUpdateTime, now) @@ -681,6 +687,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.WAREHOUSE_DICT); } else { map = syncTimeMap; + now = syncTime; } List warehouseEntityList = warehouseService.list(Wrappers.lambdaQuery(InvWarehouseEntity.class) .le((boolean) map.get("isNew"), InvWarehouseEntity::getUpdateTime, now) @@ -739,6 +746,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.USER_DATA); } else { map = syncTimeMap; + now = syncTime; } List adminList = adminService.list(Wrappers.lambdaQuery(AuthAdmin.class) .le((boolean) map.get("isNew"), AuthAdmin::getLastModifyTime, now) @@ -791,7 +799,6 @@ public class HeartService { SpsSyncThrDataResponse dataResponse = null; Map syncTimeMap = new WeakHashMap<>(3); syncTimeMap.put("isNew", true); - syncTimeMap.put("oldDate", syncTime); StringBuffer remark = new StringBuffer(); //确认有开启第三方部门信息同步 if (needExec(info.getBasicThirdInv())) { @@ -800,6 +807,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_DEPT); } else { map = syncTimeMap; + now = syncTime; } List deptEntityList = thrDeptService.list(Wrappers.lambdaQuery(ThrDeptEntity.class) .le((boolean) map.get("isNew"), ThrDeptEntity::getUpdateTime, now) @@ -820,6 +828,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_WAREHOUSE); } else { map = syncTimeMap; + now = syncTime; } List warehouseEntityList = thrInvWarehouseService.list(Wrappers.lambdaQuery(ThrInvWarehouseEntity.class) .le((boolean) map.get("isNew"), ThrInvWarehouseEntity::getUpdateTime, now) @@ -842,6 +851,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_PRODUCTS); } else { map = syncTimeMap; + now = syncTime; } List productsEntityList = thrProductsService.list(Wrappers.lambdaQuery(ThrProductsEntity.class) .le((boolean) map.get("isNew"), ThrProductsEntity::getUpdateTime, now) @@ -864,6 +874,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_CORP); } else { map = syncTimeMap; + now = syncTime; } List corpEntities = thrCorpService.list(Wrappers.lambdaQuery(ThrCorpEntity.class) .le((boolean) map.get("isNew"), ThrCorpEntity::getUpdateTime, now) @@ -911,7 +922,6 @@ public class HeartService { SpsSyncSysSettingResponse dataResponse = null; Map syncTimeMap = new WeakHashMap<>(3); syncTimeMap.put("isNew", true); - syncTimeMap.put("oldDate", syncTime); StringBuffer remark = new StringBuffer(); if (needExec(info.getSystemConfig())) { Map map; @@ -919,6 +929,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SYSTEM_PARAM_CONFIG); } else { map = syncTimeMap; + now = syncTime; } List systemParamConfigEntities = systemParamConfigService.list(Wrappers.lambdaQuery(SystemParamConfigEntity.class) .le((boolean) map.get("isNew"), SystemParamConfigEntity::getUpdateTime, now) @@ -937,6 +948,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.ENTRUST_ACCEPT); } else { map = syncTimeMap; + now = syncTime; } List entrustReceEntities = entrustReceService.list(Wrappers.lambdaQuery(EntrustReceEntity.class) .le((boolean) map.get("isNew"), EntrustReceEntity::getUpdateTime, now) @@ -957,6 +969,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.PRINT_CONFIG); } else { map = syncTimeMap; + now = syncTime; } List systemPDFModuleEntities = systemPDFModuleService.list(Wrappers.lambdaQuery(SystemPDFModuleEntity.class) .le((boolean) map.get("isNew"), SystemPDFModuleEntity::getUpdate_time, now) @@ -1043,6 +1056,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SCAN_CHANGE); } else { map = syncTimeMap; + now = syncTime; } List basicBusTypePreEntities = iBasicBusTypePreService.list(Wrappers.lambdaQuery(BasicBusTypePreEntity.class) .le((boolean) map.get("isNew"), BasicBusTypePreEntity::getUpdateTime, now) @@ -1061,6 +1075,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BUS_TYPE_CHANGE); } else { map = syncTimeMap; + now = syncTime; } List basicBusTypeChangeEntities = iBasicBusTypeChangeService.list(Wrappers.lambdaQuery(BasicBusTypeChangeEntity.class) .le((boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime, now) diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 47315cc57..7096027c8 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -1,7 +1,5 @@ # 字段新增 (表名,字段名,字段类型,修改方式(1:新增,2:修改,3:删除) -CALL Pro_Temp_ColumnWork('basic_download_status', 'execInfo', - 'varchar(255) ', 1); CALL Pro_Temp_ColumnWork('basic_download_status', 'cacheFilePath', 'varchar(255) ', 1);