From 57716e5de367a16585a15126bccb53e972a5e649 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 17 十月 2024 14:06:43 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java | 17 +++++++++++++++--
1 files changed, 15 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..5c27759 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,12 +54,24 @@
vo.setAgvNo(agv.getUuid());
vo.setCode(code.getData());
vo.setDirection(agvDetail.getAgvAngle());
- vo.setBackpack(agvDetail.getTempQua());
- vo.setBattery(vo.getBattery());
+ vo.setBackpack(GsonUtils.fromJson(agvDetail.getBackpack(), List.class));
+ vo.setBattery(agvDetail.getSoc());
agvVos.add(vo);
}
return agvVos;
}
+ public static void main(String[] args) {
+ List<BackpackDto> backpackDtoList = new ArrayList<>();
+ backpackDtoList.add(new BackpackDto(1, true));
+ backpackDtoList.add(new BackpackDto(2, true));
+ backpackDtoList.add(new BackpackDto(3, false));
+ backpackDtoList.add(new BackpackDto(4, false));
+ backpackDtoList.add(new BackpackDto(5, false));
+ backpackDtoList.add(new BackpackDto(6, false));
+ backpackDtoList.add(new BackpackDto(7, false));
+ System.out.println(GsonUtils.toJson(backpackDtoList));
+ }
+
}
--
Gitblit v1.9.1