From c0f154bf627e355b2a1b5e89c41ae391b3b7e2a6 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 07 五月 2026 10:02:08 +0800
Subject: [PATCH] 修改报警记录方式
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/FaultProcessor.java | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/FaultProcessor.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/FaultProcessor.java
index 3a012b1..e794dc9 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/FaultProcessor.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/FaultProcessor.java
@@ -47,20 +47,29 @@
Long agvId = agvService.getAgvId(vehicle);
- VehFaultRec vehFaultRec = new VehFaultRec();
- vehFaultRec.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
- vehFaultRec.setAgvId(agvId);
- vehFaultRec.setFaultNo(String.valueOf(agv_04_up.getFaultId()));
- vehFaultRec.setFaultHex(agv_04_up.getHexFaultId());
- vehFaultRec.setFaultName(null != errorType ? errorType.desc : "undefined");
- vehFaultRec.setFaultLev(agv_04_up.getFaultLevel());
- vehFaultRec.setFaultData(GsonUtils.toJson(Cools.add("data1", agv_04_up.getData1()).add("data2", agv_04_up.getData2())));
- vehFaultRec.setHappenTime(new Date());
- vehFaultRec.setProtocol(RadixTools.bytesToHexStr(agv_04_up.writeToBytes()));
- vehFaultRec.setState(VehFaultRecStateType.PENDING.name());
+ VehFaultRec vehFaultRec = vehFaultRecService.getTopVehFaultRec(agvId, String.valueOf(agv_04_up.getFaultId()));
+ if (null == vehFaultRec) {
+ vehFaultRec = new VehFaultRec();
+ vehFaultRec.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
+ vehFaultRec.setAgvId(agvId);
+ vehFaultRec.setFaultNo(String.valueOf(agv_04_up.getFaultId()));
+ vehFaultRec.setFaultHex(agv_04_up.getHexFaultId());
+ vehFaultRec.setFaultName(null != errorType ? errorType.desc : "undefined");
+ vehFaultRec.setFaultLev(agv_04_up.getFaultLevel());
+ vehFaultRec.setFaultData(GsonUtils.toJson(Cools.add("data1", agv_04_up.getData1()).add("data2", agv_04_up.getData2())));
+ vehFaultRec.setHappenTime(new Date());
+ vehFaultRec.setProtocol(RadixTools.bytesToHexStr(agv_04_up.writeToBytes()));
+ vehFaultRec.setState(VehFaultRecStateType.PENDING.name());
+ vehFaultRec.setCode(agv_04_up.getQrCode());
- if (!vehFaultRecService.save(vehFaultRec)) {
- News.error("{}鍙疯溅杈嗘晠闅滐紒璁板綍鏁呴殰淇℃伅澶辫触......", dto.getVehicle());
+ if (!vehFaultRecService.save(vehFaultRec)) {
+ log.error("{}鍙疯溅杈嗘晠闅滐紒璁板綍鏁呴殰淇℃伅澶辫触......", dto.getVehicle());
+ }
+ } else {
+ vehFaultRec.setUpdateTime(new Date());
+ if (!vehFaultRecService.updateById(vehFaultRec)) {
+ log.error("{}鍙疯溅杈嗘晠闅滐紒鏇存柊鏁呴殰淇℃伅澶辫触......", dto.getVehicle());
+ }
}
} catch (Exception e) {
@@ -68,4 +77,10 @@
}
}
+ @Async
+ public void reset(Long agvId) {
+ vehFaultRecService.resetError(agvId);
+ }
+
+
}
\ No newline at end of file
--
Gitblit v1.9.1