From 11a56c28f3ce3519639180ffe2a70f2c641bc17d Mon Sep 17 00:00:00 2001 From: x_z Date: Sun, 18 Dec 2022 19:48:31 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0UDI=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AF=B7=E6=B1=82=E7=AB=8B=E5=8D=B3=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E6=8E=A5=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/SpsSyncDownloadController.java | 17 +++++++++++++++++ .../basic/SpsSyncDownloadService.java | 13 +++++++++---- .../sale/admin/req/thrsys/PostDownloadInfo.java | 16 ++++++++++++++++ 3 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/PostDownloadInfo.java diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java index a9b0628..795d061 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java @@ -6,6 +6,7 @@ import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.entity.basic.BasicExportStatusEntity; import com.glxp.sale.admin.entity.inout.OrderEntity; import com.glxp.sale.admin.req.basic.SpsSyncDataRequest; +import com.glxp.sale.admin.req.thrsys.PostDownloadInfo; import com.glxp.sale.admin.req.thrsys.PostThirdSysUploadInfo; import com.glxp.sale.admin.res.basic.SpSyncUdiResponse; import com.glxp.sale.admin.res.basic.SpsSyncBusResponse; @@ -197,5 +198,21 @@ public class SpsSyncDownloadController { return orderService.updateUploadInfo(postThirdSysUploadInfo); } + /** + * 立即创建同步任务 + * + * @param postDownloadInfo + * @param bindingResult + * @return + */ + @AuthRuleAnnotation("") + @PostMapping("/sps/sync/data/downloadNow") + public BaseResponse downloadNow(@RequestBody PostDownloadInfo postDownloadInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + return spsSyncDownloadService.downloadNow(postDownloadInfo); + } + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java index ecce866..15c54f5 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java @@ -2,7 +2,6 @@ package com.glxp.sale.admin.controller.basic; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.db.sql.Order; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.dao.basic.UdiInfoDao; import com.glxp.sale.admin.entity.auth.AuthAdmin; @@ -28,12 +27,10 @@ import com.glxp.sale.admin.req.inout.OrderFilterRequest; import com.glxp.sale.admin.req.inventory.FilterInvUserRequest; import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest; import com.glxp.sale.admin.req.purchase.FilterPoductRequest; -import com.glxp.sale.admin.req.purchase.FilterSupCertRequest; import com.glxp.sale.admin.req.purchase.FilterSupCompanyRequest; import com.glxp.sale.admin.req.purchase.FilterSupManufacturerRequest; import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest; import com.glxp.sale.admin.req.thrsys.*; -import com.glxp.sale.admin.res.auth.AuthAdminRoleResponse; import com.glxp.sale.admin.res.basic.SpSyncUdiResponse; import com.glxp.sale.admin.res.basic.SpsSyncBusResponse; import com.glxp.sale.admin.res.basic.SpsSyncDataResponse; @@ -58,7 +55,6 @@ import com.glxp.sale.admin.util.BeanUtils; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.GetMapping; import javax.annotation.Resource; import java.util.ArrayList; @@ -584,4 +580,13 @@ public class SpsSyncDownloadService { } + /** + * 根据UDI管理系统的请求,创建同步任务 + * + * @param postDownloadInfo + * @return + */ + public BaseResponse downloadNow(PostDownloadInfo postDownloadInfo) { + return null; + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/PostDownloadInfo.java b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/PostDownloadInfo.java new file mode 100644 index 0000000..89cf57d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/PostDownloadInfo.java @@ -0,0 +1,16 @@ +package com.glxp.sale.admin.req.thrsys; + +import lombok.Data; + +/** + * 下载任务信息 + */ +@Data +public class PostDownloadInfo { + + /** + * 下载类型 + */ + private Integer type; + +}