From 89c7f6e5bcc21b0e8f83a2bc6d680e2ffe431e6f Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 13 一月 2025 09:38:29 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 90819c2..17132b5 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
@@ -25,6 +25,7 @@
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.StatusType;
import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.manager.mapper.NavMapMapper;
import com.zy.acs.manager.manager.service.*;
@@ -160,7 +161,10 @@
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));
@@ -181,7 +185,7 @@
if (Cools.isEmpty(codeData)) {
return R.error();
}
- Code code = codeService.selectByData(codeData);
+ Code code = codeService.getCacheByData(codeData);
MapPointVo vo = new MapPointVo();
vo.setCodeId(code.getId());
vo.setCodeData(code.getData());
@@ -192,7 +196,7 @@
@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));
+ List<Route> routeList = routeService.list(new LambdaQueryWrapper<Route>().eq(Route::getStatus, StatusType.ENABLE.val));
for (Route route : routeList) {
MapRouteVo vo = new MapRouteVo();
vo.setRouteId(route.getId());
@@ -234,7 +238,7 @@
List<Code> codes = codeService.list();
List<Code> codeArr = param.getCodeArr();
for (Code code : codeArr) {
- Code one = codeService.selectByData(code.getData());
+ Code one = codeService.getCacheByData(code.getData());
if (one == null) {
if (!codeService.save(code)) {
throw new BusinessException(code.getData()+" save fail![Code]");
@@ -260,8 +264,8 @@
List<MapParam.Route> routeArr = param.getRouteArr();
for (MapParam.Route paramRoute : routeArr) {
- Code startCode = codeService.selectByData(paramRoute.getStartCode());
- Code endCode = codeService.selectByData(paramRoute.getEndCode());
+ Code startCode = codeService.getCacheByData(paramRoute.getStartCode());
+ Code endCode = codeService.getCacheByData(paramRoute.getEndCode());
Route route = routeService.findByCodeOfBoth(startCode.getId(), endCode.getId());
if (route == null) {
@@ -338,7 +342,7 @@
if (Cools.isEmpty(agvParam.getPos())) {
throw new BusinessException(agvParam.getAgvNo() + " agv not in position锛�");
}
- Code code = codeService.selectByData(agvParam.getPos());
+ Code code = codeService.getCacheByData(agvParam.getPos());
Agv agv = agvService.selectByUuid(agvParam.getAgvNo());
if (agv == null) {
agv = new Agv();
--
Gitblit v1.9.1