From c4769a2a93c4f6355d409dc03265563b66d577cb Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 18 Sep 2023 09:30:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/config/HdSchemaExecutor.java |  2 +-
 .../api/service/sync/SpsSyncDownloadService.java   | 14 +++++++-------
 .../service/sync/impl/BasicExportServiceImpl.java  |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/glxp/api/config/HdSchemaExecutor.java b/src/main/java/com/glxp/api/config/HdSchemaExecutor.java
index e9682f11..93f893bc 100644
--- a/src/main/java/com/glxp/api/config/HdSchemaExecutor.java
+++ b/src/main/java/com/glxp/api/config/HdSchemaExecutor.java
@@ -49,7 +49,7 @@ public class HdSchemaExecutor implements ApplicationRunner {
         String sql = IoUtil.readUtf8(inputStream);
         try {
             //判断版本表是否存在
-            int count = hdCommonDao.selectTableExist("hd_version");
+            int count = hdCommonDao.selectTableExist("sys_db_version");
             if (count == 0) {
                 hdCommonDao.updateSql(sql);
             }
diff --git a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java
index 49a6d1b0..84d7f2d5 100644
--- a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java
+++ b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java
@@ -11,6 +11,7 @@ import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.*;
 import com.glxp.api.controller.sync.SpsSyncWebSocket;
+import com.glxp.api.constant.Constant;
 import com.glxp.api.dao.basic.BasicProductsDao;
 import com.glxp.api.entity.basic.*;
 import com.glxp.api.entity.inout.*;
@@ -37,12 +38,10 @@ import com.glxp.api.service.inv.DeviceInspectTaskDetailService;
 import com.glxp.api.service.inv.DeviceInspectTaskService;
 import com.glxp.api.service.purchase.*;
 import com.glxp.api.service.thrsys.IThrBusTypeOriginService;
-import com.glxp.api.util.CustomUtil;
-import com.glxp.api.util.DateUtil;
-import com.glxp.api.util.JsonUtils;
-import com.glxp.api.util.RedisUtil;
+import com.glxp.api.util.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -101,6 +100,7 @@ public class SpsSyncDownloadService {
         log.info("创建单据同步任务");
         //自动创建要求被下载已完成单据任务.
 //        1.判断是否同步任务已存在
+        Date curTime = new Date();
         BasicExportStatusEntity basicExportStatusEntity1 = basicExportService.getOne(Wrappers.lambdaQuery(BasicExportStatusEntity.class)
                 .eq(BasicExportStatusEntity::getType, NEW_ALL_ORDER)
                 .orderByDesc(BasicExportStatusEntity::getStartTime)
@@ -108,8 +108,8 @@ public class SpsSyncDownloadService {
         );
 
         //首次任务or上次任务结束
-        if (basicExportStatusEntity1 == null || BasicExportStatusEnum.COMPLETED.getCode().equals(basicExportStatusEntity1.getStatus())) {
-
+        if (basicExportStatusEntity1 == null || IntUtil.value(BasicExportStatusEnum.COMPLETED.getCode()) == IntUtil.value(basicExportStatusEntity1.getStatus())) {
+            log.info("no2:" + basicExportStatusEntity1.getStatus() + "---" + BasicExportStatusEnum.COMPLETED.getCode());
             SpsSyncDataRequest spsSyncDataRequest = getRequest(ConstantStatus.SYNC_DOWNLOAD_SCAN_ORDER);
             if (lastUpdateTime != null)
                 spsSyncDataRequest.setLastUpdateTime(DateUtil.formatDateTime(lastUpdateTime));
@@ -124,7 +124,7 @@ public class SpsSyncDownloadService {
                 orderStatusEntity.setType(NEW_ALL_ORDER);
                 orderStatusEntity.setUpdateTime(new Date());
                 orderStatusEntity.setStatus(BasicExportStatusEnum.WAIT_SYNC.getCode());
-                orderStatusEntity.setStartTime(new Date());
+                orderStatusEntity.setStartTime(curTime);
                 orderStatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL);
 
                 if (lastUpdateTime != null) {
diff --git a/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java
index 500c23c5..92c62f70 100644
--- a/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java
@@ -16,7 +16,7 @@ import java.util.List;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class BasicExportServiceImpl extends ServiceImpl<BasicExportDao,BasicExportStatusEntity> implements BasicExportService {
+public class BasicExportServiceImpl extends ServiceImpl<BasicExportDao, BasicExportStatusEntity> implements BasicExportService {
 
     @Resource
     BasicExportDao basicExportDao;
@@ -67,6 +67,6 @@ public class BasicExportServiceImpl extends ServiceImpl<BasicExportDao,BasicExpo
 
     @Override
     public BasicExportStatusEntity findLast(String idDatas) {
-        return null;
+        return basicExportDao.findLast(idDatas);
     }
 }