diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncDataSetEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncDataSetEntity.java index e6202b4a..894d08b2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncDataSetEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncDataSetEntity.java @@ -28,4 +28,8 @@ public class SyncDataSetEntity { private String syncIp; private boolean sysUser; private boolean entrustAction; + + + private Integer orderSyncTime; + private Integer orderSyncDlTime; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicEntrustRecRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicEntrustRecRequest.java index 34a75295..92f4722a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicEntrustRecRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicEntrustRecRequest.java @@ -15,6 +15,6 @@ public class BasicEntrustRecRequest extends ListPageRequest { private String userId; private Date updateTime; private String curInv; - + private Date lastUpdateTime; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/info/SyncDataSetResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/info/SyncDataSetResponse.java index 550d57ad..5db6223c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/info/SyncDataSetResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/info/SyncDataSetResponse.java @@ -30,6 +30,7 @@ public class SyncDataSetResponse { private Integer orderSyncTime; + private Integer orderSyncDlTime; private String orderSyncStart; private String basicSyncStart; private boolean entrustAction; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/HeartTask.java index 349c1c99..88964077 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartTask.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/HeartTask.java @@ -57,7 +57,7 @@ public class HeartTask implements SchedulingConfigurer { //查询数据同步设置 SyncDataSetEntity syncDataSetEntity = syncDataSetDao.selectSet(); if (syncDataSetEntity.isDownstreamEnable()) { - //定时上传最近更新数据至上游轮询时间 + //定时上传最近更新基础数据至上游轮询时间 long timeInterval1 = syncDataSetEntity.getSyncTime() * 60 * 1000L; long curTime1 = System.currentTimeMillis(); Long lastTime1 = (Long) redisUtil.get("SPS_SYNC_UPLOAD_DATA"); @@ -68,11 +68,23 @@ public class HeartTask implements SchedulingConfigurer { if (curTime1 - lastTime1 > timeInterval1) { heartService.uploadAllBus(null); heartService.uploadAllData(null); - heartService.uploadAllOrder(null); heartService.uploadScheduleList(); redisUtil.set("SPS_SYNC_UPLOAD_DATA", curTime1); } + //定时上传最近更新单据数据至上游轮询时间 + long timeInterval2 = syncDataSetEntity.getOrderSyncTime() * 60 * 1000L; + long curTime2 = System.currentTimeMillis(); + Long lastTime2 = (Long) redisUtil.get("SPS_SYNC_UPLOAD_ORDER"); + if (lastTime2 == null) { + lastTime2 = System.currentTimeMillis(); + redisUtil.set("SPS_SYNC_UPLOAD_ORDER", lastTime2); + } + if (curTime2 - lastTime2 > timeInterval2) { + heartService.uploadAllOrder(null); + redisUtil.set("SPS_SYNC_UPLOAD_ORDER", curTime2); + } + //定时下载上游最近更新数据轮询时间 long timeInterval = syncDataSetEntity.getSyncDownloadTime() * 60 * 1000; @@ -86,6 +98,20 @@ public class HeartTask implements SchedulingConfigurer { dlUploadService.dlBasicUdiInfo(); redisUtil.set("SPS_SYNC_DOWNLOAD_DATA", curTime); } + + + + long timeInterval3 = syncDataSetEntity.getSyncDownloadTime() * 60 * 1000; + long curTime3 = System.currentTimeMillis(); + Long lastTime3 = (Long) redisUtil.get("SPS_SYNC_DOWNLOAD_ORDER"); + if (lastTime3 == null) { + lastTime3 = System.currentTimeMillis(); + redisUtil.set("SPS_SYNC_DOWNLOAD_ORDER", lastTime3); + } + if (curTime3 - lastTime3 > timeInterval3) { + dlUploadService.dlBasicUdiInfo(); + redisUtil.set("SPS_SYNC_DOWNLOAD_ORDER", curTime3); + } } } diff --git a/api-admin/src/main/resources/mybatis/mapper/info/SyncDataSetDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/SyncDataSetDao.xml index 02fce1a8..82eb4608 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/SyncDataSetDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/info/SyncDataSetDao.xml @@ -16,7 +16,7 @@ INTO sync_data_set(id,typeBus, typeScan, typeThird, basicProducts, basicCorp, basicInv, basicThirdProducts, basicThirdCorp, basicThirdInv , basicThirdBusOrder, orderScanFinish, dbDiProducts,downstreamEnable,syncTime, syncDownloadTime, - orderUnReceive,orderUnCheck,busTypes,syncIp,sysUser,entrustAction) + orderUnReceive,orderUnCheck,busTypes,syncIp,sysUser,entrustAction,orderSyncTime,orderSyncDlTime) values ( #{id}, #{typeBus}, @@ -30,8 +30,18 @@ #{basicThirdInv}, #{basicThirdBusOrder}, #{orderScanFinish}, - #{dbDiProducts},#{downstreamEnable},#{syncTime},#{syncDownloadTime}, - #{orderUnReceive},#{orderUnCheck},#{busTypes},#{syncIp},#{sysUser},#{entrustAction} + #{dbDiProducts}, + #{downstreamEnable}, + #{syncTime}, + #{syncDownloadTime}, + #{orderUnReceive}, + #{orderUnCheck}, + #{busTypes}, + #{syncIp}, + #{sysUser}, + #{entrustAction}, + #{orderSyncTime}, + #{orderSyncDlTime} )