From d71fa493134020ecd2a1f1ad65447f888826dfa0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 22 十月 2024 13:40:51 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 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 b54eb71..d47ab68 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,6 +19,8 @@
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.controller.result.MapPointVo;
+import com.zy.acs.manager.manager.controller.result.MapRouteVo;
import com.zy.acs.manager.manager.entity.Map;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.AgvStsType;
@@ -26,6 +28,7 @@
import com.zy.acs.manager.manager.mapper.MapMapper;
import com.zy.acs.manager.manager.service.*;
import com.zy.acs.manager.system.controller.BaseController;
+import com.zy.acs.manager.system.service.ConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
@@ -63,6 +66,15 @@
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
private LocService locService;
+ @Autowired
+ private ConfigService configService;
+
+ @PreAuthorize("hasAuthority('manager:loc:update')")
+ @PostMapping("/startupOrShutdown")
+ public synchronized R startupOrShutdown() {
+ Boolean taskAssignMode = configService.getVal("TaskAssignMode", Boolean.class);
+ return configService.setVal("TaskAssignMode", !taskAssignMode) ? R.ok() : R.error();
+ }
@PreAuthorize("hasAuthority('manager:loc:list')")
@PostMapping("/data/fetch")
@@ -82,6 +94,7 @@
// common
Map activeMap = mapMapper.selectActive(zoneId, floor);
return R.ok().add(Cools
+ .add("rcsStatus", configService.getVal("TaskAssignMode", Boolean.class))
.add("point", GsonUtils.toJson(mapCodeItems))
.add("common", activeMap.getData())
);
@@ -135,13 +148,15 @@
Agv agv = agvService.selectByUuid(agvNo);
AgvDetail agvDetail = agvDetailService.selectByAgvNo(agvNo);
MapAgvVo vo = new MapAgvVo();
+ vo.setAgvId(agv.getId());
vo.setAgvNo(agv.getUuid());
+ vo.setStatus(agv.getStatus());
if (null != agvDetail) {
vo.setOnline(agvService.judgeOnline(agvDetail.getAgvId()));
vo.setAgvStatus(agvDetail.getStatusDesc());
vo.setVol(String.valueOf(agvDetail.getVol()));
vo.setSoc(String.valueOf(agvDetail.getSoc()));
- vo.setPos(String.valueOf(agvDetail.getPos()));
+ vo.setPos(agvDetail.getPos() != null && agvDetail.getPos() == 1);
vo.setCode(codeService.getById(agvDetail.getRecentCode()).getData());
vo.setDirection(agvDetail.getAgvAngle());
vo.setBackpack(GsonUtils.fromJsonToList(agvDetail.getBackpack(), BackpackDto.class));
@@ -153,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