From b3dea8a1ece4ad8e212b8cb2a0afee9886aac705 Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 13 Jun 2022 14:41:40 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4pom=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BC=96=E8=AF=91jdk=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=202.=E4=B8=8B=E8=BD=BD=E8=AE=B0=E5=BD=95=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB=E5=A2=9E=E5=8A=A0taskId=20=E4=BB=BB=E5=8A=A1ID?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api-admin/pom.xml | 13 ++----------- .../basic/SpsSyncUploadController.java | 11 +++++++---- .../basic/BasicDownloadStatusEntity.java | 8 ++++++++ .../admin/req/basic/BasicDownloadRequest.java | 1 + .../mybatis/mapper/basic/BasicDownloadDao.xml | 19 ++++++++++++------- pom.xml | 2 +- 6 files changed, 31 insertions(+), 23 deletions(-) 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 @@