diff --git a/api-admin/pom.xml b/api-admin/pom.xml
index 9c5fce2..c3832af 100644
--- a/api-admin/pom.xml
+++ b/api-admin/pom.xml
@@ -319,9 +319,8 @@
maven-compiler-plugin
- 1.8
- 1.8
- true
+ 11
+ 11
@@ -368,14 +367,6 @@
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
- 9
- 9
-
-
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java
index 10d50c9..bf8ee12 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java
+++ b/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);
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BasicDownloadStatusEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BasicDownloadStatusEntity.java
index 32f69bd..2b5b809 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BasicDownloadStatusEntity.java
+++ b/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;
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicDownloadRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicDownloadRequest.java
index c47cbab..c2a4e82 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicDownloadRequest.java
+++ b/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;
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 95f40d0..7f64286 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 @@