From 1313906bb1eb983d3beece810035e7fc28d6a92f Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 20 五月 2025 16:57:11 +0800
Subject: [PATCH] 新增充电桩
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java | 80 ++++++++++++++++++++++++++--------------
1 files changed, 52 insertions(+), 28 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 7725211..c63c585 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,15 +1,17 @@
package com.zy.acs.manager.core.service;
import com.alibaba.fastjson.JSON;
-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.enums.error.AgvErrorType;
import com.zy.acs.common.utils.GsonUtils;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.framework.common.Cools;
-import com.zy.acs.manager.common.domain.WebsocketDto;
+import com.zy.acs.framework.common.DateUtils;
+import com.zy.acs.manager.core.constant.MapDataConstant;
import com.zy.acs.manager.core.domain.BackpackDto;
-import com.zy.acs.manager.manager.entity.Agv;
+import com.zy.acs.manager.core.domain.VehicleFaultDto;
import com.zy.acs.manager.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.entity.Code;
import com.zy.acs.manager.manager.service.*;
@@ -61,15 +63,15 @@
IMessageBody msgBody = protocol.getMessageBody();
assert msgBody != null;
- Agv agv = agvService.selectByUuid(protocol.getAgvNo());
- if (null == agv) {
+ Long agvId = agvService.getAgvId(protocol.getAgvNo());
+ if (null == agvId) {
log.warn("Agv [{}] 灏氭湭閴存潈 锛侊紒锛�", protocol.getAgvNo());
return;
}
- AgvDetail detail = agvDetailService.selectByAgvId(agv.getId());
+ AgvDetail detail = agvDetailService.selectByAgvId(agvId);
if (null == detail) {
detail = new AgvDetail();
- detail.setAgvId(agv.getId());
+ detail.setAgvId(agvId);
if (!agvDetailService.save(detail)) {
log.error("Agv [{}] 璇︽儏鏇存柊澶辫触 锛侊紒锛�", protocol.getAgvNo());
return;
@@ -82,17 +84,16 @@
AGV_12_UP agv_12_up = (AGV_12_UP) msgBody;
// 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()));
- });
+ mapService.unlockPath(protocol.getAgvNo(), agv_12_up.getQrCode());
+// threadPoolRegulator.getInstance().execute(() -> {
+//
+// });
// finish jam
- threadPoolRegulator.getInstance().execute(() -> jamService.checkIfFinish(agv.getId(), agv_12_up.getQrCode()));
+ threadPoolRegulator.getInstance().execute(() -> jamService.checkIfFinish(agvId, 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));
}
@@ -100,9 +101,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));
}
@@ -124,10 +125,25 @@
// 鏁呴殰鏁版嵁鍖�
if (msgBody instanceof AGV_04_UP) {
AGV_04_UP agv_04_up = (AGV_04_UP) msgBody;
+ AgvErrorType errorType = AgvErrorType.query(agv_04_up.getHexFaultId());
log.info("Agv [{}] 鏁呴殰鏁版嵁鍖� ===>> {}", protocol.getAgvNo(), JSON.toJSONString(agv_04_up));
-// faultProcessor.execute(new VehicleFaultDto());
+
+ // save
+ faultProcessor.execute(new VehicleFaultDto<>(protocol.getAgvNo(), protocol.getTimestamp(), agv_04_up));
+
+ // detail
+ String errorMSg = errorType != null ? errorType.getMsg() : agv_04_up.getHexFaultId();
+ detail.setError(errorMSg);
+ detail.setErrorTime(new Date());
}
+ // 鏁呴殰澶嶄綅
+ if (!Cools.isEmpty(detail.realError())) {
+ assert detail.getErrorTime() != null;
+ if (DateUtils.diffToSeconds(detail.getErrorTime(), new Date()) > 20) {
+ detail.setError(MapDataConstant.EMPTY_OF_ERROR);
+ }
+ }
if (!agvDetailService.updateById(detail)) {
log.error("Agv [{}] 璇︽儏鏇存柊澶辫触 锛侊紒锛�", protocol.getAgvNo());
}
@@ -136,7 +152,9 @@
// 鏈夌爜瀹炴椂鏁版嵁鍖�
private void sync(AGV_12_UP mesBody, AgvDetail detail) {
- Code code = codeService.selectByData(mesBody.getQrCode());
+ detail.setStatus(mesBody.getStatus());
+
+ Code code = codeService.getCacheByData(mesBody.getQrCode());
if (null != code) {
detail.setCode(code.getId());
detail.setLastCode(null);
@@ -147,8 +165,6 @@
} else {
log.error("Agv [{}] 鏇存柊瀹氫綅鏁版嵁澶辫触 锛侊紒锛佷笂浼犳潯鐮侊細{}", agvService.getById(detail.getAgvId()).getUuid(), mesBody.getQrCode());
}
-
- detail.setStatus(mesBody.getStatus());
// 鍦伴潰鐮佸亸绉�
detail.setCodeOffsert(JSON.toJSONString(Cools
@@ -184,14 +200,22 @@
// 鏃犵爜瀹炴椂鏁版嵁鍖�
private void sync(AGV_13_UP mesBody, AgvDetail detail) {
- Code code = codeService.selectByData(mesBody.getQrCode());
+ detail.setStatus(mesBody.getStatus());
+
+ Code code = codeService.getCacheByData(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());
}
--
Gitblit v1.9.1