From 1f00bb49de11d2a3d4f11e467db0722832d707d3 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 11 Sep 2023 10:32:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=90=8C=E6=AD=A5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AF=B9=E5=BA=94=E5=90=8C=E6=AD=A5=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=B7=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sync/SpsSyncExportStatusController.java   | 11 ++++-
 .../com/glxp/api/dao/sync/BasicExportDao.java |  2 +
 .../api/service/sync/BasicExportService.java  |  8 ++++
 .../sync/impl/BasicExportServiceImpl.java     |  5 ++
 .../mybatis/mapper/sync/BasicExportDao.xml    | 47 +++++++++++--------
 5 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java
index 08df61ee..0c546a1f 100644
--- a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java
+++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java
@@ -231,7 +231,16 @@ public class SpsSyncExportStatusController {
     @PostMapping("/spssync/basic/schedule/updateLastTime")
     @Log(title = "定时任务", businessType = BusinessType.UPDATE)
     public BaseResponse updateLastTime(@RequestBody BasicExportStatusTimeEntity basicExportStatusTimeEntity) {
-        basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDateTime(new Date()));
+
+        if (basicExportStatusTimeEntity.getKey().equals("AutoDownloadOrder")) {
+            BasicExportStatusEntity basicExportStatusEntity = basicExportService.findLast("AutoUploadOrder");
+            if (basicExportStatusEntity != null) {
+                basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDateTime(basicExportStatusEntity.getStartTime()));
+            } else {
+                basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDateTime(new Date()));
+            }
+        } else
+            basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDateTime(new Date()));
         boolean b = basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity);
         if (b)
             return ResultVOUtils.success("更新成功！");
diff --git a/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java b/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java
index 4cb3a2de..d4703e85 100644
--- a/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java
+++ b/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java
@@ -23,4 +23,6 @@ public interface BasicExportDao extends BaseMapper<BasicExportStatusEntity> {
     boolean updateExportStatus(BasicExportStatusEntity warehouseEntity);
 
     void deleteByDate(@Param("date") String date);
+
+    BasicExportStatusEntity findLast(@Param("idDatas") String idDatas);
 }
diff --git a/src/main/java/com/glxp/api/service/sync/BasicExportService.java b/src/main/java/com/glxp/api/service/sync/BasicExportService.java
index 6d43f5a9..9c7342aa 100644
--- a/src/main/java/com/glxp/api/service/sync/BasicExportService.java
+++ b/src/main/java/com/glxp/api/service/sync/BasicExportService.java
@@ -22,4 +22,12 @@ public interface BasicExportService extends IService<BasicExportStatusEntity> {
     boolean deleteByTime();
 
     boolean updateExportStatus(BasicExportStatusEntity warehouseEntity);
+
+    /**
+     * 获取最后一次同步记录时间
+     *
+     * @param idDatas
+     * @return
+     */
+    BasicExportStatusEntity findLast(String idDatas);
 }
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 632eaa16..500c23c5 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
@@ -64,4 +64,9 @@ public class BasicExportServiceImpl extends ServiceImpl<BasicExportDao,BasicExpo
     public boolean updateExportStatus(BasicExportStatusEntity basicExportStatusEntity) {
         return basicExportDao.updateExportStatus(basicExportStatusEntity);
     }
+
+    @Override
+    public BasicExportStatusEntity findLast(String idDatas) {
+        return null;
+    }
 }
diff --git a/src/main/resources/mybatis/mapper/sync/BasicExportDao.xml b/src/main/resources/mybatis/mapper/sync/BasicExportDao.xml
index addfbbcf..b5ac157a 100644
--- a/src/main/resources/mybatis/mapper/sync/BasicExportDao.xml
+++ b/src/main/resources/mybatis/mapper/sync/BasicExportDao.xml
@@ -32,16 +32,13 @@
         </where>
 
         <choose>
-            <when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')">
-                order by ${orderBy}   ${sort}
+            <when test="(orderBy != null) and (sort == 'desc' or sort == 'asc')">
+                order by ${orderBy} ${sort}
             </when>
             <otherwise>
                 ORDER BY updateTime DESC
             </otherwise>
         </choose>
-
-
-
     </select>
 
 
@@ -51,23 +48,23 @@
                 INTO basic_export_status(id, idDatas, status, `type`, updateTime, scheduleType, startTime, endTime,
                                          remark, receiveStatus
 
-        <if test="cacheFilePath!=null and cacheFilePath!= ''">
-            ,cacheFilePath
+        <if test="cacheFilePath != null and cacheFilePath != ''">
+            , cacheFilePath
         </if>
 
         )
-        values (#{id},
-                #{idDatas},
-                #{status},
-                #{type},
-                #{updateTime},
-                #{scheduleType},
-                #{startTime},
-                #{endTime},
-                #{remark},
-                #{receiveStatus}
-        <if test="cacheFilePath!=null and cacheFilePath!= ''">
-            ,#{cacheFilePath}
+                values (#{id},
+                        #{idDatas},
+                        #{status},
+                        #{type},
+                        #{updateTime},
+                        #{scheduleType},
+                        #{startTime},
+                        #{endTime},
+                        #{remark},
+                        #{receiveStatus}
+        <if test="cacheFilePath != null and cacheFilePath != ''">
+            , #{cacheFilePath}
         </if>
         )
     </insert>
@@ -120,6 +117,16 @@
     </delete>
 
     <delete id="deleteByDate">
-        delete from basic_export_status where date_format(#{date}, '%Y-%m-%d') >= date_format(startTime, '%Y-%m-%d')
+        delete
+        from basic_export_status
+        where date_format(#{date}, '%Y-%m-%d') >= date_format(startTime, '%Y-%m-%d')
     </delete>
+    <select id="findLast"
+            resultType="com.glxp.api.entity.sync.BasicExportStatusEntity">
+        select *
+        from basic_export_status
+        where idDatas = #{idDatas}
+        order by updateTime desc
+        limit 1
+    </select>
 </mapper>