From f7543a1cc6c89ea03c0d6a0591526baf10d7934b Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 05 二月 2026 16:37:23 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/OpenController.java | 29 +++++++----------------------
1 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/OpenController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/OpenController.java
index b3bf360..78408a8 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/OpenController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/OpenController.java
@@ -2,15 +2,16 @@
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
+import com.zy.acs.manager.common.annotation.IntegrationAuth;
import com.zy.acs.manager.common.annotation.OperationLog;
import com.zy.acs.manager.common.constant.Constants;
import com.zy.acs.manager.common.domain.TaskBoolDto;
+import com.zy.acs.manager.core.domain.type.NamespaceType;
import com.zy.acs.manager.core.integrate.dto.OpenBusCancelParam;
import com.zy.acs.manager.core.integrate.dto.OpenBusCancelResult;
import com.zy.acs.manager.core.integrate.dto.OpenBusSubmitParam;
import com.zy.acs.manager.core.service.MainService;
import com.zy.acs.manager.manager.entity.Bus;
-import com.zy.acs.manager.manager.entity.IntegrationRecord;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.manager.service.BusService;
@@ -22,6 +23,8 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
/**
* Created by vincent on 2023/6/12
@@ -41,33 +44,15 @@
@PostMapping("/bus/submit")
@OperationLog("generate task from open api")
- public R submit(@RequestBody OpenBusSubmitParam param) {
- IntegrationRecord integrationRecord = new IntegrationRecord(
- null, // 缂栧彿
- null, // 鍚嶇О绌洪棿
- null, // 鎺ュ彛鍦板潃
- null, // 骞冲彴瀵嗛挜
- null, // 璋冪敤鏂规爣璇�
- null, // 鏂瑰悜[闈炵┖]
- null, // 鏃堕棿鎴�
- null, // 瀹㈡埛绔疘P
- null, // 璇锋眰鍐呭
- null, // 鍝嶅簲鍐呭
- null, // 寮傚父鍐呭
- null, // 缁撴灉
- null, // 鑰楁椂
- null, // 鐘舵��
- null, // 娣诲姞鏃堕棿[闈炵┖]
- null, // 淇敼鏃堕棿[闈炵┖]
- null // 澶囨敞
- );
-
+ @IntegrationAuth(name = NamespaceType.RCS_BUS_RECEIVE)
+ public R submit(@RequestBody OpenBusSubmitParam param, HttpServletRequest request) {
mainService.generateBusAndTask(param, null);
return R.ok("generate tasks success");
}
@PostMapping("/task/cancel")
@OperationLog("cancel task from open api")
+ @IntegrationAuth(name = NamespaceType.RCS_TASK_CANCEL)
public R cancel(@RequestBody OpenBusCancelParam param) {
if (Cools.isEmpty(param.getBatchNo())) {
return R.error("batchNo is empty");
--
Gitblit v1.9.1