From ebd2f4397a92c6a5096de1b86d59154363344720 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 13 五月 2025 08:48:15 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 44 insertions(+), 7 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 560bc73..1691277 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
@@ -1,10 +1,15 @@
package com.zy.acs.manager.core.scheduler;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.acs.common.utils.GsonUtils;
+import com.zy.acs.framework.common.Cools;
+import com.zy.acs.manager.core.cache.CoreCache;
import com.zy.acs.manager.core.domain.BackpackDto;
+import com.zy.acs.manager.core.domain.CodeStepDto;
import com.zy.acs.manager.core.domain.MapWsAgvVo;
import com.zy.acs.manager.core.domain.MapWsVo;
+import com.zy.acs.manager.core.domain.type.JobType;
import com.zy.acs.manager.core.service.MapService;
import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.entity.AgvDetail;
@@ -28,14 +33,11 @@
import java.util.concurrent.Executors;
import java.util.stream.Collectors;
-/**
- * Created by vincent on 10/14/2024
- */
@Slf4j
@Component
public class MapDataWsScheduler {
- public static final int WEBSOCKET_BROADCAST_INTERVAL = 600;
+ public static final int WEBSOCKET_BROADCAST_INTERVAL = 300;
private ExecutorService singleThreadExecutor;
@@ -79,21 +81,28 @@
, agvList.stream().map(Agv::getUuid).collect(Collectors.toSet()));
for (Agv agv : agvList) {
- AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
AgvModel agvModel = agvModelService.getByAgvId(agv.getId());
+ AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
if (null == agvDetail) { continue; }
Long recentCode = agvDetail.getRecentCode();
if (null == recentCode) { continue; }
- Code code = codeService.getById(recentCode);
+ Code code = codeService.getCacheById(recentCode);
if (null == code) { continue; }
+
+ JobType jobType = this.getJobType(agv.getId(), code.getData());
MapWsAgvVo vo = new MapWsAgvVo();
vo.setAgvModel(agvModel.getType());
vo.setAgvNo(agv.getUuid());
vo.setCode(code.getData());
vo.setDirection(agvDetail.getAgvAngle());
- vo.setBackpack(GsonUtils.fromJsonToList(agvDetail.getBackpack(), BackpackDto.class));
+ vo.setBackpack(this.getBackpack(agv.getId(), agvDetail.getBackpack()));
+ if (null != jobType && null != jobType.increase) {
+ vo.setBackpack(vo.getBackpack() + (jobType.increase ? 1 : -1));
+ }
+ vo.setSlots(agvModel.getBackpack());
vo.setBattery(agvDetail.getSoc());
+ vo.setJobType(null == jobType ? null : jobType.breif);
vo.setError(agvDetail.realError());
vo.setDynamicRoute(codeDataListMap.get(agv.getUuid()));
@@ -104,9 +113,37 @@
return agvVos;
}
+ private JobType getJobType(Long agvId, String currCodeData) {
+ if (null == agvId || Cools.isEmpty(currCodeData)) {
+ return null;
+ }
+ CodeStepDto codeStepDto = CoreCache.AGV_MOCK_STEP_CACHE.get(agvId);
+ if (null == codeStepDto) {
+ return null;
+ }
+ if (!codeStepDto.getCodeData().equals(currCodeData)) {
+ return null;
+ }
+ return codeStepDto.getJobType();
+ }
+
@PreDestroy
public void destroy() {
this.singleThreadExecutor.shutdownNow();
}
+ private Integer getBackpack(Long agvId, String backpackJson) {
+ if (null == agvId || Cools.isEmpty(backpackJson)) {
+ return 0;
+ }
+ List<BackpackDto> backpackDtoList = JSON.parseArray(backpackJson, BackpackDto.class);
+ int jsonCount = (int) backpackDtoList.stream().filter(BackpackDto::getLoaded).count();
+
+ Integer cacheCount = CoreCache.AGV_BACKPACK_USED_CACHE.get(agvId);
+ if (null == cacheCount) {
+ return jsonCount;
+ }
+ return Math.max(jsonCount, cacheCount);
+ }
+
}
--
Gitblit v1.9.1