From 59365e74fcda73ce10cfab475de43f171bb99a2a Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 03 七月 2025 10:10:38 +0800
Subject: [PATCH] 队列拆分
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java | 126 ------------------------------------------
1 files changed, 0 insertions(+), 126 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 c63c585..56cfc33 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
@@ -98,52 +98,7 @@
log.info("Agv [{}] 鏈夌爜瀹炴椂鏁版嵁鍖� ===>> {}", protocol.getAgvNo(), JSON.toJSONString(agv_12_up));
}
}
- // 鏃犵爜瀹炴椂鏁版嵁鍖�
- 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));
- this.sync(agv_13_up, detail);
-// redis.setObject(RedisConstant.DIGITAL_AGV_FLAG, agv.getUuid(), agv_13_up);
- if (PRINT_LOG) {
- log.info("Agv [{}] 鏃犵爜瀹炴椂鏁版嵁鍖� ===>> {}", protocol.getAgvNo(), JSON.toJSONString(agv_13_up));
- }
- }
- // 蹇冭烦鍖�
- if (msgBody instanceof AGV_03_UP) {
- AGV_03_UP agv_03_up = (AGV_03_UP) msgBody;
- this.sync(agv_03_up, detail);
- if (PRINT_LOG) {
- log.info("Agv [{}] 蹇冭烦鍖� ===>> {}", protocol.getAgvNo(), JSON.toJSONString(agv_03_up));
- }
- }
- // 鐧婚檰鍖�
- if (msgBody instanceof AGV_F0_UP) {
- AGV_F0_UP agv_f0_up = (AGV_F0_UP) msgBody;
- this.sync(agv_f0_up, detail);
- log.info("Agv [{}] 鐧婚檰鍖� ===>> {}", protocol.getAgvNo(), JSON.toJSONString(agv_f0_up));
- }
- // 鏁呴殰鏁版嵁鍖�
- 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));
- // 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());
}
@@ -198,87 +153,6 @@
}
- // 鏃犵爜瀹炴椂鏁版嵁鍖�
- private void sync(AGV_13_UP mesBody, AgvDetail detail) {
- detail.setStatus(mesBody.getStatus());
- Code code = codeService.getCacheByData(mesBody.getQrCode());
- if (null != code) {
-
- 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());
- }
-
- detail.setStraightVal((double) mesBody.getStraightDirectionPosition());
-
- detail.setAgvAngle((double) mesBody.getAGVCurrentAngle());
-
- detail.setGyroAngle((double) mesBody.getGyroAngle());
-
- detail.setEncoderAngle((double) mesBody.getEncoderAngle());
-
- detail.setHigh(mesBody.getCurrentAltitude());
-
- detail.setSensorSts((long) mesBody.getSensorStatusFlags());
-
- 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_03_UP mesBody, AgvDetail detail) {
-
- detail.setVol(mesBody.getVoltage());
- detail.setSoc(mesBody.getSoc());
- detail.setSoh(mesBody.getSoh());
- detail.setBatteryFail(mesBody.getBatterFailSign());
-
- detail.setTempe(JSON.toJSONString(Cools
- .add("batteryTempe", mesBody.getBatteryTempe())
- .add("envirTempe", mesBody.getEnvirTempe())
- .add("leftMotorTempe", mesBody.getLeftMotorTempe())
- .add("rightMotorTempe", mesBody.getRightMotorTempe())
- .add("raiseMotorTempe", mesBody.getRaiseMotorTempe())
- .add("telescopicMotorTempe", mesBody.getTelescopicMotorTempe())
- .add("rotatingMotorTempe", mesBody.getRotatingMotorTempe())
- ));
-
- detail.setMotorFail(JSON.toJSONString(Cools
- .add("leftMotorFailSign", mesBody.getLeftMotorFailSign())
- .add("rightMotorFailSign", mesBody.getRightMotorFailSign())
- .add("raiseMotorFailSign", mesBody.getRaiseMotorFailSign())
- .add("telescopicMotorFailSign", mesBody.getTelescopicMotorFailSign())
- .add("rotatingMotorFailSign", mesBody.getRotatingMotorFailSign())
- ));
-
- detail.setFailSign(String.valueOf(mesBody.getFailSign()));
-
- detail.setBootTime(mesBody.getBootTime());
-
- }
-
- // 鐧婚檰鍖�
- private void sync(AGV_F0_UP mesBody, AgvDetail detail) {
-
- }
}
--
Gitblit v1.9.1