From 8e6a6ee229b8a14ec3cac6b428921cbde8dcf53d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 15 十一月 2024 09:24:25 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java | 107 ++++++++++++++++++++++-------------------------------
1 files changed, 44 insertions(+), 63 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java
index 1371a0a..f3c07bb 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java
@@ -1,12 +1,13 @@
package com.zy.acs.manager.core.service;
import com.alibaba.fastjson.JSON;
-import com.zy.acs.framework.common.Cools;
-import com.zy.acs.common.constant.RedisConstant;
import com.zy.acs.common.domain.AgvProtocol;
import com.zy.acs.common.domain.protocol.*;
+import com.zy.acs.common.enums.AgvStatusType;
+import com.zy.acs.common.utils.GsonUtils;
import com.zy.acs.common.utils.RedisSupport;
-import com.zy.acs.manager.common.domain.WebsocketDto;
+import com.zy.acs.framework.common.Cools;
+import com.zy.acs.manager.core.domain.BackpackDto;
import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.entity.Code;
@@ -16,7 +17,9 @@
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
/**
* Created by vincent on 2023/6/16
@@ -79,16 +82,14 @@
// unlock path
threadPoolRegulator.getInstance().execute(() -> {
-// avoidWaveCalculator.syncWaveBySingleVeh(protocol.getAgvNo(), agv_12_up.getQrCode());
mapService.unlockPath(protocol.getAgvNo(), agv_12_up.getQrCode());
-// mapService.unlockPath(protocol.getAgvNo(), Utils.singletonList(agv_12_up.getQrCode()));
});
// finish jam
threadPoolRegulator.getInstance().execute(() -> jamService.checkIfFinish(agv.getId(), agv_12_up.getQrCode()));
- websocketService.agvInfoBroadcastOnPos(new WebsocketDto<AGV_12_UP>("agv", agv.getUuid(), agv_12_up));
+// websocketService.agvInfoBroadcastOnPos(new WebsocketDto<AGV_12_UP>("agv", agv.getUuid(), agv_12_up));
this.sync(agv_12_up, detail);
- redis.setObject(RedisConstant.DIGITAL_AGV_FLAG, agv.getUuid(), agv_12_up);
+// redis.setObject(RedisConstant.DIGITAL_AGV_FLAG, agv.getUuid(), agv_12_up);
if (PRINT_LOG) {
log.info("Agv [{}] 鏈夌爜瀹炴椂鏁版嵁鍖� ===>> {}", protocol.getAgvNo(), JSON.toJSONString(agv_12_up));
}
@@ -96,9 +97,9 @@
// 鏃犵爜瀹炴椂鏁版嵁鍖�
if (msgBody instanceof AGV_13_UP) {
AGV_13_UP agv_13_up = (AGV_13_UP) msgBody;
- websocketService.agvInfoBroadcastWithOutPos(new WebsocketDto<AGV_13_UP>("agv", agv.getUuid(), agv_13_up));
+// websocketService.agvInfoBroadcastWithOutPos(new WebsocketDto<AGV_13_UP>("agv", agv.getUuid(), agv_13_up));
this.sync(agv_13_up, detail);
-// redis.setObject(RedisConstant.DIGITAL_AGV_FLAG, agv.getUuid(), agv_13_up); // todo
+// redis.setObject(RedisConstant.DIGITAL_AGV_FLAG, agv.getUuid(), agv_13_up);
if (PRINT_LOG) {
log.info("Agv [{}] 鏃犵爜瀹炴椂鏁版嵁鍖� ===>> {}", protocol.getAgvNo(), JSON.toJSONString(agv_13_up));
}
@@ -132,6 +133,8 @@
// 鏈夌爜瀹炴椂鏁版嵁鍖�
private void sync(AGV_12_UP mesBody, AgvDetail detail) {
+ detail.setStatus(mesBody.getStatus());
+
Code code = codeService.selectByData(mesBody.getQrCode());
if (null != code) {
detail.setCode(code.getId());
@@ -143,8 +146,6 @@
} else {
log.error("Agv [{}] 鏇存柊瀹氫綅鏁版嵁澶辫触 锛侊紒锛佷笂浼犳潯鐮侊細{}", agvService.getById(detail.getAgvId()).getUuid(), mesBody.getQrCode());
}
-
- detail.setStatus(mesBody.getStatus());
// 鍦伴潰鐮佸亸绉�
detail.setCodeOffsert(JSON.toJSONString(Cools
@@ -166,42 +167,36 @@
detail.setSensorSts((long) mesBody.getSensorStatusFlags());
- int tempQua = 0;
- if (mesBody.isTempLoc1()) {
- tempQua ++;
- }
- if (mesBody.isTempLoc2()) {
- tempQua ++;
- }
- if (mesBody.isTempLoc3()) {
- tempQua ++;
- }
- if (mesBody.isTempLoc4()) {
- tempQua ++;
- }
- if (mesBody.isTempLoc5()) {
- tempQua ++;
- }
- if (mesBody.isTempLoc6()) {
- tempQua ++;
- }
- if (mesBody.isTempLoc7()) {
- tempQua ++;
- }
- detail.setTempQua(tempQua);
+ List<BackpackDto> backpackDtoList = new ArrayList<>();
+ backpackDtoList.add(new BackpackDto(1, mesBody.isTempLoc1()));
+ backpackDtoList.add(new BackpackDto(2, mesBody.isTempLoc2()));
+ backpackDtoList.add(new BackpackDto(3, mesBody.isTempLoc3()));
+ backpackDtoList.add(new BackpackDto(4, mesBody.isTempLoc4()));
+ backpackDtoList.add(new BackpackDto(5, mesBody.isTempLoc5()));
+ backpackDtoList.add(new BackpackDto(6, mesBody.isTempLoc6()));
+ backpackDtoList.add(new BackpackDto(7, mesBody.isTempLoc7()));
+ detail.setBackpack(GsonUtils.toJson(backpackDtoList));
}
// 鏃犵爜瀹炴椂鏁版嵁鍖�
private void sync(AGV_13_UP mesBody, AgvDetail detail) {
+ detail.setStatus(mesBody.getStatus());
+
Code code = codeService.selectByData(mesBody.getQrCode());
if (null != code) {
- detail.setCode(null);
- detail.setLastCode(code.getId());
- detail.setPos(0);
-// if (!agvDetailService.updateUnPosCode(detail.getId(), code.getId())) {
-// log.error("Agv [{}] 鏇存柊瀹氫綅鏁版嵁澶辫触 锛侊紒锛�", agvService.getById(detail.getAgvId()).getUuid());
-// }
+
+ if (!detail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
+ detail.setCode(null);
+ detail.setLastCode(code.getId());
+ detail.setPos(0);
+ } else {
+ detail.setCode(code.getId());
+ detail.setLastCode(null);
+ detail.setPos(1);
+ }
+
+
} else {
log.error("Agv [{}] 鏇存柊瀹氫綅鏁版嵁澶辫触 锛侊紒锛佷笂浼犳潯鐮侊細{}", agvService.getById(detail.getAgvId()).getUuid(), mesBody.getQrCode());
}
@@ -218,29 +213,15 @@
detail.setSensorSts((long) mesBody.getSensorStatusFlags());
- int tempQua = 0;
- if (mesBody.isTempLoc1()) {
- tempQua ++;
- }
- if (mesBody.isTempLoc2()) {
- tempQua ++;
- }
- if (mesBody.isTempLoc3()) {
- tempQua ++;
- }
- if (mesBody.isTempLoc4()) {
- tempQua ++;
- }
- if (mesBody.isTempLoc5()) {
- tempQua ++;
- }
- if (mesBody.isTempLoc6()) {
- tempQua ++;
- }
- if (mesBody.isTempLoc7()) {
- tempQua ++;
- }
- detail.setTempQua(tempQua);
+ List<BackpackDto> backpackDtoList = new ArrayList<>();
+ backpackDtoList.add(new BackpackDto(1, mesBody.isTempLoc1()));
+ backpackDtoList.add(new BackpackDto(2, mesBody.isTempLoc2()));
+ backpackDtoList.add(new BackpackDto(3, mesBody.isTempLoc3()));
+ backpackDtoList.add(new BackpackDto(4, mesBody.isTempLoc4()));
+ backpackDtoList.add(new BackpackDto(5, mesBody.isTempLoc5()));
+ backpackDtoList.add(new BackpackDto(6, mesBody.isTempLoc6()));
+ backpackDtoList.add(new BackpackDto(7, mesBody.isTempLoc7()));
+ detail.setBackpack(GsonUtils.toJson(backpackDtoList));
}
--
Gitblit v1.9.1