From f5a92e88504ab10c55f7ba864456f76666d08ab8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 17 十月 2024 15:05:51 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
index 7a3095b..1f22fac 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zy.acs.common.utils.GsonUtils;
+import com.zy.acs.manager.core.domain.BackpackDto;
 import com.zy.acs.manager.core.domain.MapWsAgvVo;
 import com.zy.acs.manager.core.domain.MapWsVo;
 import com.zy.acs.manager.manager.entity.Agv;
@@ -53,8 +54,8 @@
             vo.setAgvNo(agv.getUuid());
             vo.setCode(code.getData());
             vo.setDirection(agvDetail.getAgvAngle());
-            vo.setBackpack(agvDetail.getTempQua());
-            vo.setBattery(vo.getBattery());
+            vo.setBackpack(GsonUtils.fromJsonToList(agvDetail.getBackpack(), BackpackDto.class));
+            vo.setBattery(agvDetail.getSoc());
             agvVos.add(vo);
         }
 

--
Gitblit v1.9.1