From 6f5c384b7f838f35e3da4db129a57c76cd54d508 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 04 十一月 2024 10:51:51 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 71 +++++++++++++++++++++++++----------
1 files changed, 51 insertions(+), 20 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 1ca13bb..c0137c7 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
@@ -19,11 +19,13 @@
import com.zy.acs.manager.manager.controller.param.MapDataParam;
import com.zy.acs.manager.manager.controller.param.MapParam;
import com.zy.acs.manager.manager.controller.result.MapAgvVo;
-import com.zy.acs.manager.manager.entity.Map;
+import com.zy.acs.manager.manager.controller.result.MapPointVo;
+import com.zy.acs.manager.manager.controller.result.MapRouteVo;
+import com.zy.acs.manager.manager.entity.NavMap;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.AgvStsType;
import com.zy.acs.manager.manager.enums.TaskStsType;
-import com.zy.acs.manager.manager.mapper.MapMapper;
+import com.zy.acs.manager.manager.mapper.NavMapMapper;
import com.zy.acs.manager.manager.service.*;
import com.zy.acs.manager.system.controller.BaseController;
import com.zy.acs.manager.system.service.ConfigService;
@@ -59,7 +61,7 @@
@Autowired
private TaskService taskService;
@Autowired
- private MapMapper mapMapper;
+ private NavMapMapper navMapMapper;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
@@ -90,11 +92,11 @@
mapCodeItems.add(mapItem);
});
// common
- Map activeMap = mapMapper.selectActive(zoneId, floor);
+ NavMap activeNavMap = navMapMapper.selectActive(zoneId, floor);
return R.ok().add(Cools
.add("rcsStatus", configService.getVal("TaskAssignMode", Boolean.class))
.add("point", GsonUtils.toJson(mapCodeItems))
- .add("common", activeMap.getData())
+ .add("common", activeNavMap.getData())
);
}
@@ -105,25 +107,25 @@
Date now = new Date();
Long userId = getLoginUserId();
// previous
- Map previousMap = mapMapper.selectActive(param.getZoneId(), param.getFloor());
- if (null != previousMap) {
- previousMap.setActive(0);
- previousMap.setUpdateTime(now);
- previousMap.setUpdateBy(userId);
- if (0 == mapMapper.updateById(previousMap)) {
+ NavMap previousNavMap = navMapMapper.selectActive(param.getZoneId(), param.getFloor());
+ if (null != previousNavMap) {
+ previousNavMap.setActive(0);
+ previousNavMap.setUpdateTime(now);
+ previousNavMap.setUpdateBy(userId);
+ if (0 == navMapMapper.updateById(previousNavMap)) {
throw new CoolException("Save Fail");
}
}
// current
- Map map = new Map();
- map.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
- map.setZoneId(param.getZoneId());
- map.setFloor(param.getFloor());
- map.setData(GsonUtils.toJson(param.getItemList()));
- map.setActive(1);
- map.setUpdateBy(userId);
- map.setCreateBy(userId);
- if (0 == mapMapper.insert(map)) {
+ NavMap navMap = new NavMap();
+ navMap.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
+ navMap.setZoneId(param.getZoneId());
+ navMap.setFloor(param.getFloor());
+ navMap.setData(GsonUtils.toJson(param.getItemList()));
+ navMap.setActive(1);
+ navMap.setUpdateBy(userId);
+ navMap.setCreateBy(userId);
+ if (0 == navMapMapper.insert(navMap)) {
throw new CoolException("Save Fail");
}
return R.ok("Save Success");
@@ -166,6 +168,35 @@
return R.ok().add(vo);
}
+ @PostMapping("/point/info")
+ public R pointInfo(@RequestParam(required = false) String codeData) {
+ if (Cools.isEmpty(codeData)) {
+ return R.error();
+ }
+ Code code = codeService.selectByData(codeData);
+ MapPointVo vo = new MapPointVo();
+ vo.setCodeId(code.getId());
+ vo.setCodeData(code.getData());
+ vo.setStatus(code.getStatus());
+ return R.ok().add(vo);
+ }
+
+ @PostMapping("/route/list")
+ public R routeList(@RequestParam(required = false) Long zoneId) {
+ List<MapRouteVo> result = new ArrayList<>();
+ List<Route> routeList = routeService.list(new LambdaQueryWrapper<Route>().eq(Route::getStatus, 1));
+ for (Route route : routeList) {
+ MapRouteVo vo = new MapRouteVo();
+ vo.setRouteId(route.getId());
+ vo.setStartCode(route.getStartCode());
+ vo.setStartCodeStr(route.getStartCode$());
+ vo.setEndCode(route.getEndCode());
+ vo.setEndCodeStr(route.getEndCode$());
+ vo.setDirection(route.getDirection());
+ result.add(vo);
+ }
+ return R.ok().add(result);
+ }
--
Gitblit v1.9.1