From 1ce8d710e067e77a7a1e298b44eb244c1344ddb9 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 13 Jun 2022 14:42:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=B8=8B=E8=BD=BD=E8=AE=B0=E5=BD=95=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0taskId=20=E4=BB=BB=E5=8A=A1ID=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/BasicDownloadStatusEntity.java      |  8 ++++++++
 .../admin/req/basic/BasicDownloadRequest.java |  1 +
 .../glxp/api/admin/thread/DlBasicService.java | 13 +++++++++----
 .../mybatis/mapper/basic/BasicDownloadDao.xml | 19 ++++++++++++-------
 4 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicDownloadStatusEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicDownloadStatusEntity.java
index d683589a..f64b5923 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicDownloadStatusEntity.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicDownloadStatusEntity.java
@@ -7,7 +7,15 @@ import java.util.Date;
 @Data
 public class BasicDownloadStatusEntity {
 
+    /**
+     * 记录ID
+     */
     private String id;
+
+    /**
+     * 任务ID
+     */
+    private String taskId;
     private String idDatas;
     private Integer status;
     private Integer type;
diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicDownloadRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicDownloadRequest.java
index dddbfe31..1944984e 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicDownloadRequest.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicDownloadRequest.java
@@ -6,6 +6,7 @@ import lombok.Data;
 @Data
 public class BasicDownloadRequest extends ListPageRequest {
     private String id;
+    private String taskId; //任务ID
     private Integer status;
     private Integer type;
     private String idDatas;
diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java
index b4077d5f..9a701429 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java
@@ -36,6 +36,7 @@ import com.glxp.api.admin.service.info.SystemParamConfigService;
 import com.glxp.api.admin.service.inout.OrderService;
 import com.glxp.api.admin.service.inventory.InvWarehouseService;
 import com.glxp.api.admin.service.thrsys.ThrInvWarehouseService;
+import com.glxp.api.admin.util.CustomUtil;
 import com.glxp.api.admin.util.RedisUtil;
 import com.glxp.api.common.res.BaseResponse;
 import org.apache.ibatis.session.ExecutorType;
@@ -103,7 +104,8 @@ public class DlBasicService {
 
                         //构造下载记录
                         BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity();
-                        basicDownloadStatusEntity.setId(syncDataResponse.getTaskId());
+                        basicDownloadStatusEntity.setId(CustomUtil.getId());
+                        basicDownloadStatusEntity.setTaskId(syncDataResponse.getTaskId());
                         basicDownloadStatusEntity.setStartTime(new Date());
                         basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_BASIC_DATA);
                         basicDownloadStatusEntity.setStatus(0); //下载中
@@ -313,7 +315,8 @@ public class DlBasicService {
 
                         //构造下载记录
                         BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity();
-                        basicDownloadStatusEntity.setId(syncDataResponse.getTaskId());
+                        basicDownloadStatusEntity.setId(CustomUtil.getId());
+                        basicDownloadStatusEntity.setTaskId(syncDataResponse.getTaskId());
                         basicDownloadStatusEntity.setStartTime(new Date());
                         basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_BUS_TYPE);
                         basicDownloadStatusEntity.setStatus(0); //下载中
@@ -419,7 +422,8 @@ public class DlBasicService {
                         SpsSyncOrderResponse syncDataResponse = response.getData();
 
                         BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity();
-                        basicDownloadStatusEntity.setId(syncDataResponse.getTaskId());
+                        basicDownloadStatusEntity.setId(CustomUtil.getId());
+                        basicDownloadStatusEntity.setTaskId(syncDataResponse.getTaskId());
                         basicDownloadStatusEntity.setStartTime(new Date());
                         basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_SCAN_ORDER);
                         basicDownloadStatusEntity.setStatus(0); //下载中
@@ -525,7 +529,8 @@ public class DlBasicService {
                         SpSyncUdiResponse spSyncUdiResponse = response.getData();
 
                         BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity();
-                        basicDownloadStatusEntity.setId(spSyncUdiResponse.getTaskId());
+                        basicDownloadStatusEntity.setId(CustomUtil.getId());
+                        basicDownloadStatusEntity.setTaskId(spSyncUdiResponse.getTaskId());
                         basicDownloadStatusEntity.setStartTime(new Date());
                         basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_DI_PRODUCTS);
                         basicDownloadStatusEntity.setStatus(0); //下载中
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml
index a976fdb3..99246e82 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml
@@ -5,21 +5,25 @@
 
     <select id="filterDownloadStatus" parameterType="com.glxp.api.admin.req.basic.BasicDownloadRequest"
             resultType="com.glxp.api.admin.entity.basic.BasicDownloadStatusEntity">
-        select * from basic_download_status
+        select *
+        from basic_download_status
         <where>
-            <if test="id != '' and id!=null">
+            <if test="id != '' and id != null">
                 and id = #{id}
             </if>
-            <if test="status!=null">
+            <if test="taskId != null and taskId != ''">
+                and taskId = #{taskId}
+            </if>
+            <if test="status != null">
                 and status = #{status}
             </if>
-            <if test="type!=null">
+            <if test="type != null">
                 and `type` = #{type}
             </if>
-            <if test="idDatas != '' and idDatas!=null">
+            <if test="idDatas != '' and idDatas != null">
                 and idDatas = #{idDatas}
             </if>
-            <if test="scheduleType!=null">
+            <if test="scheduleType != null">
                 and scheduleType = #{scheduleType}
             </if>
         </where>
@@ -30,9 +34,10 @@
     <insert id="insertDownloadStatus" keyProperty="id"
             parameterType="com.glxp.api.admin.entity.basic.BasicDownloadStatusEntity">
         replace
-        INTO basic_download_status(id,idDatas,status,type,updateTime,scheduleType,startTime,endTime,remark)
+        INTO basic_download_status(id,taskId,idDatas,status,type,updateTime,scheduleType,startTime,endTime,remark)
         values(
         #{id},
+        #{taskId},
         #{idDatas},
         #{status},
         #{type},