From de6a34c248036d65a3d6797c83e051acdeb78bf7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 21 十月 2024 15:18:33 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java | 24 ++++++++++--------------
1 files changed, 10 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..ab38279 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
@@ -5,6 +5,7 @@
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.core.service.astart.MapDataDispatcher;
import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.entity.Code;
@@ -31,6 +32,8 @@
private AgvDetailService agvDetailService;
@Autowired
private CodeService codeService;
+ @Autowired
+ private MapDataDispatcher mapDataDispatcher;
@Scheduled(cron = "0/1 * * * * ? ")
public void broadcast() {
@@ -42,7 +45,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 +59,15 @@
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());
+
+ vo.setDynamicRoute(mapDataDispatcher.queryCodeListFromDynamicNode(null, agv.getUuid()));
+
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