From c620f4cbc6f5ed50758ea548855773bfed2dcd39 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 16 三月 2026 16:37:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java
index 843895c..1daa715 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java
@@ -3,11 +3,11 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.service.AgvService;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
+import com.vincent.rsf.server.manager.entity.param.AgvBindAndInTParam;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,7 +25,6 @@
private AgvService agvService;
@ApiOperation("绔欑偣缁戝畾鏌ヨ")
- @PreAuthorize("hasAuthority('manager:basStation:list')")
@PostMapping("/staBind/list")
public R getStaBindList(@RequestBody Map<String, Object> params) {
if (Objects.isNull(params)) {
@@ -35,7 +34,6 @@
}
@ApiOperation("绔欑偣鏌ヨ")
- @PreAuthorize("hasAuthority('manager:basStation:list')")
@PostMapping("/staMsg/select")
public R getStaMsgSelect(@RequestBody Map<String, Object> params) {
if (Objects.isNull(params)) {
@@ -44,7 +42,6 @@
return agvService.getStaMsgSelect(params);
}
- @PreAuthorize("hasAuthority('manager:basStation:list')")
@ApiOperation("绔欑偣缁戝畾")
@PostMapping("/AGV/staBind")
public R getAGVStaBind(@RequestBody WaitPakinParam waitPakinPda) {
@@ -54,7 +51,6 @@
return agvService.getAGVStaBind(waitPakinPda);
}
- @PreAuthorize("hasAuthority('manager:basStation:list')")
@ApiOperation("绔欑偣瑙ｇ粦")
@PostMapping("/AGV/staUnBind")
public R getAGVStaUnBind(@RequestBody Map<String, Object> params) {
@@ -64,7 +60,6 @@
return agvService.AGVStaUnBind(params);
}
- @PreAuthorize("hasAuthority('manager:basStation:list')")
@ApiOperation("AGV鍚姩鍏ュ簱")
@PostMapping("/AGV/task/start")
public R AGVInTaskStart(@RequestBody WaitPakinParam waitPakinPda) {
@@ -74,7 +69,6 @@
return agvService.AGVInTaskStart(waitPakinPda, getLoginUserId());
}
- @PreAuthorize("hasAuthority('manager:basStation:list')")
@ApiOperation("AGV缁戝畾&鍏ュ簱")
@PostMapping("/AGV/bindAndIn/start")
public R AGVBindAndInTaskStart(@RequestBody WaitPakinParam waitPakinPda) {
@@ -83,4 +77,13 @@
}
return agvService.AGVBindAndInTaskStart(waitPakinPda, getLoginUserId());
}
+
+ @ApiOperation("AGV缁戝畾&鍏ユ《")
+ @PostMapping("/AGV/bindAndIn/start/T")
+ public R AGVBindAndInTaskStartT(@RequestBody AgvBindAndInTParam param) {
+ if (Objects.isNull(param)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return agvService.AGVBindAndInTaskStartT(param, getLoginUserId());
+ }
}
--
Gitblit v1.9.1