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/domain/type/NamespaceType.java | 1 +
zy-acs-manager/src/main/java/com/zy/acs/manager/common/constant/Constants.java | 2 ++
zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/OpenController.java | 22 ----------------------
zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/conveyor/ConveyorController.java | 3 +++
4 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/constant/Constants.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/constant/Constants.java
index 289941d..d665948 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/constant/Constants.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/constant/Constants.java
@@ -8,6 +8,8 @@
public static final String UPLINK = "UPLINK";
+ public static final String DOWNLINK = "DOWNLINK";
+
public static final String HANDLE = "HANDLE";
public static final String LIMIT_ONE = "limit 1";
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/type/NamespaceType.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/type/NamespaceType.java
index e11ca5e..abcb803 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/type/NamespaceType.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/type/NamespaceType.java
@@ -8,6 +8,7 @@
RCS_TASK_REPORT("浠诲姟瀹屾垚涓婃姤", Constants.RCS),
RCS_BUS_RECEIVE("鎺ユ敹鎵规浠诲姟", Constants.UPLINK),
RCS_TASK_CANCEL("浠诲姟鍙栨秷", Constants.UPLINK),
+ RCS_STA_QUERY("绔欑偣鐘舵�佹煡璇�", Constants.DOWNLINK),
;
public String desc;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/conveyor/ConveyorController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/conveyor/ConveyorController.java
index 9091852..1907c79 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/conveyor/ConveyorController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/conveyor/ConveyorController.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.core.domain.type.NamespaceType;
import com.zy.acs.manager.core.integrate.dto.ConveyorQueryParam;
import com.zy.acs.manager.core.integrate.dto.ConveyorQueryResult;
import com.zy.acs.manager.manager.entity.Sta;
@@ -28,6 +30,7 @@
private StaService staService;
@PostMapping("/station/convey")
+ @IntegrationAuth(name = NamespaceType.RCS_STA_QUERY)
public R save(@RequestBody ConveyorQueryParam param) {
List<ConveyorQueryResult> resultList = new ArrayList<>();
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 aaab79a..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
@@ -12,7 +12,6 @@
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;
@@ -47,27 +46,6 @@
@OperationLog("generate task from open api")
@IntegrationAuth(name = NamespaceType.RCS_BUS_RECEIVE)
public R submit(@RequestBody OpenBusSubmitParam param, HttpServletRequest request) {
- IntegrationRecord integrationRecord = new IntegrationRecord(
- null, // 缂栧彿
- null, // 鍚嶇О绌洪棿
- null, // 鎺ュ彛鍦板潃
- null, // 骞冲彴瀵嗛挜
- null, // 璋冪敤鏂规爣璇�
- null, // 鏂瑰悜[闈炵┖]
- null, // 鏃堕棿鎴�
- null, // 瀹㈡埛绔疘P
- null, // 璇锋眰鍐呭
- null, // 鍝嶅簲鍐呭
- null, // 寮傚父鍐呭
- null, // 缁撴灉
- null, // 鑰楁椂
- null, // 鐘舵��
- null, // 娣诲姞鏃堕棿[闈炵┖]
- null, // 淇敼鏃堕棿[闈炵┖]
- null // 澶囨敞
- );
- request.setAttribute("integrationRecord", integrationRecord);
-
mainService.generateBusAndTask(param, null);
return R.ok("generate tasks success");
}
--
Gitblit v1.9.1