From 6224398d6ac2db27c33fb5a950cdab2b8e189814 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 10 十二月 2024 15:21:23 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 c0137c7..7087a22 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
@@ -13,6 +13,7 @@
import com.zy.acs.manager.common.domain.MapDto;
import com.zy.acs.manager.common.domain.MapRouteDto;
import com.zy.acs.manager.common.exception.BusinessException;
+import com.zy.acs.manager.core.service.PatrolService;
import com.zy.acs.manager.core.domain.BackpackDto;
import com.zy.acs.manager.core.service.MapService;
import com.zy.acs.manager.core.service.floyd.FloydNavigateService;
@@ -68,6 +69,8 @@
private LocService locService;
@Autowired
private ConfigService configService;
+ @Autowired
+ private PatrolService patrolService;
@PreAuthorize("hasAuthority('manager:loc:update')")
@PostMapping("/startupOrShutdown")
@@ -96,7 +99,7 @@
return R.ok().add(Cools
.add("rcsStatus", configService.getVal("TaskAssignMode", Boolean.class))
.add("point", GsonUtils.toJson(mapCodeItems))
- .add("common", activeNavMap.getData())
+ .add("common", null != activeNavMap ? activeNavMap.getData() : null)
);
}
@@ -157,9 +160,17 @@
vo.setVol(String.valueOf(agvDetail.getVol()));
vo.setSoc(String.valueOf(agvDetail.getSoc()));
vo.setPos(agvDetail.getPos() != null && agvDetail.getPos() == 1);
- vo.setCode(codeService.getById(agvDetail.getRecentCode()).getData());
+ Code code = codeService.getById(agvDetail.getRecentCode());
+ if (null != code) {
+ vo.setCode(code.getData());
+ }
vo.setDirection(agvDetail.getAgvAngle());
vo.setBackpack(GsonUtils.fromJsonToList(agvDetail.getBackpack(), BackpackDto.class));
+ vo.setPatrol(patrolService.isPatrolling(agvNo));
+ String error = agvDetail.realError();
+ if (!Cools.isEmpty(error)) {
+ vo.setError(error);
+ }
}
List<Task> tasks = taskService.selectInSts(agv.getId(), TaskStsType.WAITING, TaskStsType.ASSIGN, TaskStsType.PROGRESS);
if (!Cools.isEmpty(tasks)) {
--
Gitblit v1.9.1