UDI
/
udiwms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

中继服务同步问题修改

Browse Source
fengcang
anthonyywj2 3 years ago
parent 8c69ff42f6
commit 2e5fa89395
5 changed files with 44 additions and 46 deletions
Show Stats Download Patch File Download Diff File

22
api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java
Unescape Escape View File

@ -82,6 +82,8 @@ public class DlBasicService {
@Resource @Resource
WarehouseBussinessTypeDao warehouseBussinessTypeDao; WarehouseBussinessTypeDao warehouseBussinessTypeDao;
@Resource @Resource
UdiRelevanceDao udiRelevanceDao;
@Resource
EntrustReceService entrustReceService; EntrustReceService entrustReceService;
@Resource @Resource
ThrInvWarehouseService thrInvWarehouseService; ThrInvWarehouseService thrInvWarehouseService;
@ -171,17 +173,17 @@ public class DlBasicService {
//关联表导入 //关联表导入
if (CollUtil.isNotEmpty(syncDataResponse.getUdiRelevanceEntities())) { if (CollUtil.isNotEmpty(syncDataResponse.getUdiRelevanceEntities())) {
try { List<UdiRelevanceEntity> corpList = syncDataResponse.getUdiRelevanceEntities();
List<UdiRelevanceEntity> corpList = syncDataResponse.getUdiRelevanceEntities();
UdiRelevanceDao mapper = batchSession.getMapper(UdiRelevanceDao.class);
for (UdiRelevanceEntity basicUnitMaintainEntity : corpList) { // UdiRelevanceDao mapper = batchSession.getMapper(UdiRelevanceDao.class);
basicUnitMaintainEntity.setUpdateTime(null); for (UdiRelevanceEntity basicUnitMaintainEntity : corpList) {
basicUnitMaintainEntity.setModifyTime(DateUtil.getDateTime()); basicUnitMaintainEntity.setUpdateTime(null);
mapper.insertUdiRelevance(basicUnitMaintainEntity); basicUnitMaintainEntity.setModifyTime(DateUtil.getDateTime());
} udiRelevanceDao.insertUdiRelevance(basicUnitMaintainEntity);
batchSession.commit(); // mapper.insertUdiRelevance(basicUnitMaintainEntity);
} catch (Exception e) {
} }
// batchSession.commit();
} }
//耗材字典导入 //耗材字典导入
if (CollUtil.isNotEmpty(syncDataResponse.getUdiInfoEntities())) { if (CollUtil.isNotEmpty(syncDataResponse.getUdiInfoEntities())) {

40
api-admin/src/main/java/com/glxp/api/admin/thread/DlUploadService.java
Unescape Escape View File

@ -42,30 +42,26 @@ public class DlUploadService {
//定时从上游下载数据----下载基础信息 //定时从上游下载数据----下载基础信息
public void dlBasicUdiInfo() { public void dlBasicUdiInfo() {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("dl_basic_udiinfo_status"); dlBasicService.dlAllData();
long timeInterval = Long.parseLong(systemParamConfigEntity.getParamValue()) * 60 * 1000; dlBasicService.dlAllBus();
long curTime = System.currentTimeMillis(); dlBasicService.dlAllOrder();
Long lastTime = (Long) redisUtil.get("DL_BASIC_UDIINFO_STATUS"); dlBasicService.dlScheduleStatus();
dlBasicService.dlAllUDI();
// try { // SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("dl_basic_udiinfo_status");
// logger.error("--------执行下载操作"); // long timeInterval = Long.parseLong(systemParamConfigEntity.getParamValue()) * 60 * 1000;
// Thread.sleep(15 * 1000); // long curTime = System.currentTimeMillis();
// } catch (InterruptedException e) { // Long lastTime = (Long) redisUtil.get("DL_BASIC_UDIINFO_STATUS");
// e.printStackTrace(); // if (lastTime == null) {
// logger.error("--------下载失败"); // lastTime = System.currentTimeMillis();
// redisUtil.set("DL_BASIC_UDIINFO_STATUS", lastTime);
// } else if (curTime - lastTime > timeInterval) {
// logger.info("每分钟执行一次基础信息下载");
// redisUtil.set("DL_BASIC_UDIINFO_STATUS", curTime);
//
// } // }
if (lastTime == null) {
lastTime = System.currentTimeMillis();
redisUtil.set("DL_BASIC_UDIINFO_STATUS", lastTime);
} else if (curTime - lastTime > timeInterval) {
logger.info("每分钟执行一次基础信息下载");
redisUtil.set("DL_BASIC_UDIINFO_STATUS", curTime);
dlBasicService.dlAllData();
dlBasicService.dlAllBus();
dlBasicService.dlAllOrder();
dlBasicService.dlScheduleStatus();
dlBasicService.dlAllUDI();
}
} }

2
api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java
Unescape Escape View File

@ -94,7 +94,7 @@ public class HeartService {
return ResultVOUtils.success(); return ResultVOUtils.success();
} }
public BaseResponse uploadAllBus(String syncTime) { public BaseResponse uploadAllBus(String syncTime) {
SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest(); SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest();
if (syncTime == null) { if (syncTime == null) {
BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey(ConstantStatus.SYNC_BUS_TYPE); BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey(ConstantStatus.SYNC_BUS_TYPE);

22
api-admin/src/main/java/com/glxp/api/admin/thread/HeartTask.java
Unescape Escape View File

@ -100,17 +100,17 @@ public class HeartTask implements SchedulingConfigurer {
} }
long timeInterval3 = syncDataSetEntity.getSyncDownloadTime() * 60 * 1000; // long timeInterval3 = syncDataSetEntity.getSyncDownloadTime() * 60 * 1000;
long curTime3 = System.currentTimeMillis(); // long curTime3 = System.currentTimeMillis();
Long lastTime3 = (Long) redisUtil.get("SPS_SYNC_DOWNLOAD_ORDER"); // Long lastTime3 = (Long) redisUtil.get("SPS_SYNC_DOWNLOAD_ORDER");
if (lastTime3 == null) { // if (lastTime3 == null) {
lastTime3 = System.currentTimeMillis(); // lastTime3 = System.currentTimeMillis();
redisUtil.set("SPS_SYNC_DOWNLOAD_ORDER", lastTime3); // redisUtil.set("SPS_SYNC_DOWNLOAD_ORDER", lastTime3);
} // }
if (curTime3 - lastTime3 > timeInterval3) { // if (curTime3 - lastTime3 > timeInterval3) {
dlUploadService.dlBasicUdiInfo(); // dlUploadService.dlBasicUdiInfo();
redisUtil.set("SPS_SYNC_DOWNLOAD_ORDER", curTime3); // redisUtil.set("SPS_SYNC_DOWNLOAD_ORDER", curTime3);
} // }
} }
} }

4
api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
Unescape Escape View File

@ -399,7 +399,7 @@
(id, (id,
thirdId,thirdName,uuid,isUseDy,updateTime,modifyTime, thirdId,thirdName,uuid,isUseDy,updateTime,modifyTime,
thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock
,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price,modifyTime ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price
) )
values values
( (
@ -429,7 +429,7 @@
#{lockStatus}, #{lockStatus},
#{udplatCode}, #{udplatCode},
#{isAdavence}, #{isAdavence},
#{supName},#{price},#{modifyTime} #{supName},#{price}
) )
</insert> </insert>

Write Preview
Loading…
Cancel
Save