From b01d980a947a6cad273cb979f676b4ffcfb304a0 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 13 Apr 2023 10:49:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=8D=95=E6=8D=AE=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/sync/SpsSyncDownloadController.java | 4 ++-- src/main/java/com/glxp/api/service/inout/IoOrderService.java | 3 ++- .../com/glxp/api/service/inout/impl/IoOrderServiceImpl.java | 5 +++-- .../com/glxp/api/service/sync/SpsSyncDownloadService.java | 3 ++- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java index 59c4ba51..46e7df52 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -94,7 +94,7 @@ public class SpsSyncDownloadController { } // 接收中继服务、UDI管理系统上传单据 -// @AuthRuleAnnotation("sps/sync/order/upload") + @AuthRuleAnnotation("sps/sync/order/upload") @PostMapping("/sps/sync/order/upload") public BaseResponse save(@RequestBody @Valid SpsSyncOrderResponse syncDataResponse) { BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); @@ -221,7 +221,7 @@ public class SpsSyncDownloadController { // 接收中级服务，UDI管理系统上传业务单据 -// @AuthRuleAnnotation("/sps/sync/busOrder/upload") + @AuthRuleAnnotation("/sps/sync/busOrder/upload") @PostMapping("/sps/sync/busOrder/upload") public BaseResponse busOrderSava(@RequestBody @Valid SpsSyncBusOrderResponse spsSyncBusOrderResponse) { BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderService.java b/src/main/java/com/glxp/api/service/inout/IoOrderService.java index 7bfd59a6..a288ee0b 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderService.java @@ -7,6 +7,7 @@ import com.glxp.api.req.inout.FilterUploadOrderRequest; import com.glxp.api.req.inout.OrderEditRequest; import com.glxp.api.res.inout.IoOrderResponse; +import java.util.Date; import java.util.List; public interface IoOrderService { @@ -22,7 +23,7 @@ public interface IoOrderService { IoOrderEntity findByBillNo(String billNO); - List findByStatus(String action, Integer status); + List findByStatus(String action, Integer status, Date lastUpdateTime); int insertOrder(IoOrderEntity orderEntity); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 4c56139b..72a0bf0b 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -138,10 +138,11 @@ public class IoOrderServiceImpl implements IoOrderService { } @Override - public List findByStatus(String action, Integer status) { - return orderDao.selectList(new QueryWrapper().eq("action", action).eq("status", status)); + public List findByStatus(String action, Integer status, Date lastUpdateTime) { + return orderDao.selectList(new QueryWrapper().eq("action", action).eq("status", status).gt("updateTime", lastUpdateTime)); } + @Override public int insertOrder(IoOrderEntity orderEntity) { orderEntity.setId(null); diff --git a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java index 93aa7e6d..0e3deaab 100644 --- a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java +++ b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java @@ -15,6 +15,7 @@ import com.glxp.api.res.sync.SpsSyncOrderResponse; import com.glxp.api.res.system.SyncDataSetResponse; import com.glxp.api.service.inout.*; import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.DateUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -82,7 +83,7 @@ public class SpsSyncDownloadService { BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest); if (CollUtil.isNotEmpty(syncDataSetEntity.getBusTypes())) { for (SyncDataBustypeEntity syncDataBustypeEntity : syncDataSetEntity.getBusTypes()) { - List temps = orderService.findByStatus(syncDataBustypeEntity.getAction(), syncDataBustypeEntity.getOrderStatus()); + List temps = orderService.findByStatus(syncDataBustypeEntity.getAction(), syncDataBustypeEntity.getOrderStatus(), DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); if (CollUtil.isNotEmpty(temps)) { orderEntities.addAll(temps); }