From 344a6d6c8c0f27f883615eb01d99ecc019aa7b25 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 17 七月 2023 09:28:55 +0800
Subject: [PATCH] 完善AGV相关接口功能
---
src/main/java/com/zy/asrs/controller/AgvLocMastController.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
index 2d4f07c..e287d77 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
@@ -10,10 +10,10 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.AgvLocMast;
+import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.param.LocMastInitParam;
-import com.zy.asrs.service.AgvLockMastService;
+import com.zy.asrs.service.AgvLocMastService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -27,12 +27,13 @@
import java.util.Map;
@RestController
+@RequestMapping("/agv")
public class AgvLocMastController extends BaseController {
@Autowired
- private AgvLockMastService agvLockMastService;
+ private AgvLocMastService agvLockMastService;
- @RequestMapping(value = "/agvLocMast/list/auth")
+ @RequestMapping(value = "/locMast/list/auth")
@ManagerAuth
public R list(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@@ -46,7 +47,7 @@
return R.ok(agvLockMastService.selectPage(new Page<>(curr, limit), wrapper.eq("status",0)));
}
- @RequestMapping(value = "/avgLocMast/add/auth")
+ @RequestMapping(value = "/locMast/add/auth")
@ManagerAuth(memo = "搴撲綅娣诲姞")
public R add(AgvLocMast agvLocMast) {
agvLocMast.setModiUser(getUserId());
@@ -57,7 +58,7 @@
return R.ok();
}
- @RequestMapping(value = "/agvLocMast/update/auth")
+ @RequestMapping(value = "/locMast/update/auth")
@ManagerAuth(memo = "搴撲綅淇敼")
@Transactional
public R update(LocMast locMast){
@@ -65,7 +66,7 @@
return R.ok();
}
- @RequestMapping(value = "/agvLocMast/delete/auth")
+ @RequestMapping(value = "/locMast/delete/auth")
@ManagerAuth(memo = "搴撲綅鍒犻櫎")
public R delete(@RequestParam String param){
List<AgvLocMast> list = JSONArray.parseArray(param, AgvLocMast.class);
@@ -78,7 +79,7 @@
return R.ok();
}
- @RequestMapping(value = "/agvLocMast/export/auth")
+ @RequestMapping(value = "/locMast/export/auth")
@ManagerAuth(memo = "搴撲綅瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
@@ -89,7 +90,7 @@
return R.ok(exportSupport(list, fields));
}
- @RequestMapping(value = "/agvLocMast/check/column/auth")
+ @RequestMapping(value = "/locMast/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<AgvLocMast> wrapper = new EntityWrapper<AgvLocMast>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
@@ -99,13 +100,17 @@
return R.ok();
}
- @RequestMapping(value = "/AgvLocMast/init/auth")
+ @RequestMapping(value = "/locMast/init/auth")
@ManagerAuth(memo = "鍒濆鍖栧簱浣�")
-// @Transactional
public R init(LocMastInitParam param) {
- //to do
+ //娓呯┖鍘熸湁搴撲綅
+ agvLockMastService.clearLoc();
+ //鍒濆鍖栦竴妤肩珯鐐�
+ agvLockMastService.initLocFloor1();
+ //鍒濆鍖栦笁妤肩珯鐐�
+ agvLockMastService.initLocFloor3();
- return null;
+ return R.ok();
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
--
Gitblit v1.9.1