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 | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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..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
@@ -2,8 +2,10 @@
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.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;
@@ -30,6 +32,8 @@
private AgvDetailService agvDetailService;
@Autowired
private CodeService codeService;
+ @Autowired
+ private MapDataDispatcher mapDataDispatcher;
@Scheduled(cron = "0/1 * * * * ? ")
public void broadcast() {
@@ -41,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; }
@@ -53,8 +59,11 @@
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());
+
+ vo.setDynamicRoute(mapDataDispatcher.queryCodeListFromDynamicNode(null, agv.getUuid()));
+
agvVos.add(vo);
}
--
Gitblit v1.9.1