From 442fce2fa9c6d8d4fe7b1f2a22d66c03b07975e5 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 14 五月 2024 17:07:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index f57a54b..3435ed6 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -2,26 +2,21 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.entity.AgvLocDetl;
import com.zy.asrs.entity.AgvLocMast;
import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.param.AgvMobileStartPakin;
-import com.zy.asrs.entity.param.AgvMobileStartParam;
-import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.entity.param.PickParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import io.swagger.models.auth.In;
import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.HashMap;
@@ -63,10 +58,10 @@
// 鍐嶆鎷ｆ枡
@RequestMapping("/pick/again/auth")
-// @ManagerAuth(memo = "缁勬墭")
+ @ManagerAuth(memo = "鍐嶆鎷ｆ枡")
public R pickAgain(@RequestBody PickParam pickParams){
agvMobileService.pickAgain(pickParams, 1l);
- return R.ok("缁勬墭鎴愬姛");
+ return R.ok("鎷ｆ枡鎴愬姛");
}
/*
@@ -369,6 +364,7 @@
@PostMapping("/agv/v1/locMove")
@Transactional
+ @ManagerAuth(memo = "璋冩嫧鍗曚换鍔′笅鍙�")
public R agvLocMove(@RequestBody HashMap<String,Object> params){
String fl = String.valueOf(params.get("floor"));
short floor =(short)Integer.parseInt(fl.substring(0, 1));
@@ -390,6 +386,14 @@
return R.ok();
}
+ @PostMapping("/hand/control/locMove")
+ @Transactional
+ @ManagerAuth(memo = "鎵嬪姩搴撲綅杞Щ")
+ public R handControlLocMove(@RequestBody LocMoveParam param){
+ agvMobileService.handControlLocMove(param, getUserId());
+ return R.ok();
+ }
+
public static void main(String[] args) {
List<AgvLocDetl> agvLocDetls1 = new ArrayList<>();
List<AgvLocDetl> agvLocDetls2 = new ArrayList<>();
--
Gitblit v1.9.1