From fd1c390222642abd57e0662d2328a008d0a0c845 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 18 十月 2024 15:22:37 +0800 Subject: [PATCH] # --- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 4 +++- 1 files changed, 3 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..e8b4498 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 @@ -135,13 +135,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