From 50701bde0a9ebe8b4c7f0db48ba563991877fe83 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 19 十月 2024 15:19:51 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 15 ++++++++++++++-
1 files changed, 14 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..1ca13bb 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
@@ -26,6 +26,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 +64,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 +92,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 +146,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));
--
Gitblit v1.9.1