1.调整pom文件项目编译jdk版本，删除无用插件

2.下载记录实体类增加taskId 任务ID字段

api-admin/pom.xml

@@ -319,9 +319,8 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.8</source>
+                    <source>11</source>
-                    <target>1.8</target>
+                    <target>11</target>
-                    <fork>true</fork>
                     <!-- executable 可指定也可不用 -->
                     <!--<executable>C:\Program Files\Java\jdk1.8.0_191\bin\javac</executable>-->
                 </configuration>
@@ -368,14 +367,6 @@
                 </dependencies>
 
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>9</source>
-                    <target>9</target>
-                </configuration>
-            </plugin>
 
         </plugins>
     </build>

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java

@@ -19,7 +19,6 @@ import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity;
 import com.glxp.sale.admin.entity.inout.WarehouseEntity;
 import com.glxp.sale.admin.entity.inout.WarehouseUserEntity;
 import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
-import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
 import com.glxp.sale.admin.entity.thrsys.*;
 import com.glxp.sale.admin.res.basic.SpsSyncBusResponse;
 import com.glxp.sale.admin.res.basic.SpsSyncDataResponse;
@@ -32,6 +31,7 @@ import com.glxp.sale.admin.service.inventory.InvWarehouseService;
 import com.glxp.sale.admin.service.param.SystemParamConfigService;
 import com.glxp.sale.admin.thread.BasicBackUpdateProductService;
 import com.glxp.sale.admin.util.BeanUtils;
+import com.glxp.sale.admin.util.CustomUtil;
 import com.glxp.sale.common.res.BaseResponse;
 import com.glxp.sale.common.util.ResultVOUtils;
 import org.apache.ibatis.session.ExecutorType;
@@ -117,7 +117,8 @@ public class SpsSyncUploadController {
         SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED);
 
         BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity();
-        basicDownloadStatusEntity.setId(syncDataResponse.getTaskId());
+        basicDownloadStatusEntity.setId(CustomUtil.getId());
+        basicDownloadStatusEntity.setTaskId(syncDataResponse.getTaskId());
         basicDownloadStatusEntity.setStartTime(new Date());
         basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_BASIC_DATA);
         basicDownloadStatusEntity.setStatus(0);
@@ -334,7 +335,8 @@ public class SpsSyncUploadController {
         SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED);
 
         BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity();
-        basicDownloadStatusEntity.setId(syncDataResponse.getTaskId());
+        basicDownloadStatusEntity.setId(CustomUtil.getId());
+        basicDownloadStatusEntity.setTaskId(syncDataResponse.getTaskId());
         basicDownloadStatusEntity.setStartTime(new Date());
         basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_BUS_TYPE);
         basicDownloadStatusEntity.setStatus(0);
@@ -418,7 +420,8 @@ public class SpsSyncUploadController {
         SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED);
 
         BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity();
-        basicDownloadStatusEntity.setId(syncDataResponse.getTaskId());
+        basicDownloadStatusEntity.setId(CustomUtil.getId());
+        basicDownloadStatusEntity.setTaskId(syncDataResponse.getTaskId());
         basicDownloadStatusEntity.setStartTime(new Date());
         basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_SCAN_ORDER);
         basicDownloadStatusEntity.setStatus(0);

api-admin/src/main/java/com/glxp/sale/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;

api-admin/src/main/java/com/glxp/sale/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;

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

@@ -5,21 +5,25 @@
 
     <select id="filterDownloadStatus" parameterType="com.glxp.sale.admin.req.basic.BasicDownloadRequest"
             resultType="com.glxp.sale.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.sale.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},

pom.xml

@@ -23,7 +23,7 @@
     </parent>
 
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
         <!--<tomcat.version>8.5.37</tomcat.version>-->
     </properties>