From 00b0ec55e1b0eef82b3a31166e8273ecea776568 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 19 十月 2024 14:34:51 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java | 18 ++++--------------
1 files changed, 4 insertions(+), 14 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 5c27759..599a81d 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
@@ -42,7 +42,9 @@
private List<MapWsAgvVo> syncAgv() {
List<MapWsAgvVo> agvVos = new ArrayList<>();
- List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, 1));
+ List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>()
+// .eq(Agv::getStatus, 1)
+ );
for (Agv agv : agvList) {
AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
if (null == agvDetail) { continue; }
@@ -54,24 +56,12 @@
vo.setAgvNo(agv.getUuid());
vo.setCode(code.getData());
vo.setDirection(agvDetail.getAgvAngle());
- vo.setBackpack(GsonUtils.fromJson(agvDetail.getBackpack(), List.class));
+ vo.setBackpack(GsonUtils.fromJsonToList(agvDetail.getBackpack(), BackpackDto.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