中继服务同步问题修改

api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java

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

api-admin/src/main/java/com/glxp/api/admin/thread/DlUploadService.java

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

api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java

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

api-admin/src/main/java/com/glxp/api/admin/thread/HeartTask.java

@@ -100,17 +100,17 @@ public class HeartTask implements SchedulingConfigurer {
             }
 
 
-            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);
-            }
+//            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);
+//            }
         }
 
     }

api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -399,7 +399,7 @@
         (id,
         thirdId,thirdName,uuid,isUseDy,updateTime,modifyTime,
         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
             (
@@ -429,7 +429,7 @@
         #{lockStatus},
         #{udplatCode},
         #{isAdavence},
-        #{supName},#{price},#{modifyTime}
+        #{supName},#{price}
         )
     </insert>