From ae81dbb1364e69cc8c73462795a64cbc6316c1fc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 17 十月 2024 10:03:50 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
index 7512db7..299d4e2 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
@@ -17,8 +17,9 @@
import com.zy.acs.manager.core.service.floyd.FloydNavigateService;
import com.zy.acs.manager.manager.controller.param.MapDataParam;
import com.zy.acs.manager.manager.controller.param.MapParam;
-import com.zy.acs.manager.manager.entity.*;
+import com.zy.acs.manager.manager.controller.result.MapAgvVo;
import com.zy.acs.manager.manager.entity.Map;
+import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.AgvStsType;
import com.zy.acs.manager.manager.mapper.MapMapper;
import com.zy.acs.manager.manager.service.*;
@@ -58,6 +59,8 @@
private MapMapper mapMapper;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private LocService locService;
@PreAuthorize("hasAuthority('manager:loc:list')")
@PostMapping("/data/fetch")
@@ -69,6 +72,7 @@
MapItem mapItem = new MapItem();
mapItem.setType(MapItemType.POINT.toString());
mapItem.setNo(code.getData());
+ mapItem.setUuid(code.getUuid());
mapItem.setPositionX(code.getX());
mapItem.setPositionY(code.getY());
mapCodeItems.add(mapItem);
@@ -112,6 +116,26 @@
return R.ok("Save Success");
}
+ @PostMapping("/shelf/group")
+ public R shelfGroup(@RequestParam(required = false) Integer row, @RequestParam(required = false) Integer bay) {
+ if (null == row || null == bay) {
+ return R.error();
+ }
+ List<Loc> locList = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getRow, row).eq(Loc::getBay, bay).orderByAsc(Loc::getLev));
+ return R.ok().add(locList);
+ }
+
+ @PostMapping("/agv/info")
+ public R agvInfo(@RequestParam(required = false) String agvNo) {
+ if (Cools.isEmpty(agvNo)) {
+ return R.error();
+ }
+ Agv agv = agvService.selectByUuid(agvNo);
+ AgvDetail agvDetail = agvDetailService.selectByAgvNo(agvNo);
+ MapAgvVo vo = new MapAgvVo();
+ vo.setAgvNo(agv.getUuid());
+ return R.ok().add(vo);
+ }
--
Gitblit v1.9.1