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/service/FaultProcessor.java | 20 +++++++-------------
1 files changed, 7 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 ea4d207..00eed5b 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
@@ -1,12 +1,12 @@
package com.zy.acs.manager.core.service;
import com.zy.acs.common.domain.protocol.AGV_04_UP;
+import com.zy.acs.common.enums.error.AgvErrorType;
import com.zy.acs.common.utils.GsonUtils;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.RadixTools;
import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.manager.core.domain.VehicleFaultDto;
-import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.entity.VehFaultRec;
import com.zy.acs.manager.manager.service.AgvDetailService;
import com.zy.acs.manager.manager.service.AgvService;
@@ -41,16 +41,19 @@
AGV_04_UP agv_04_up = dto.getT();
Date errorTime = new Date(dto.getTimestamp());
- Agv agv = agvService.selectByUuid(vehicle);
+ AgvErrorType errorType = AgvErrorType.query(agv_04_up.getHexFaultId());
+
+ Long agvId = agvService.getAgvId(vehicle);
VehFaultRec vehFaultRec = new VehFaultRec();
vehFaultRec.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
- vehFaultRec.setAgvId(agv.getId());
+ 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(errorTime);
+ vehFaultRec.setHappenTime(new Date());
vehFaultRec.setProtocol(RadixTools.bytesToHexStr(agv_04_up.writeToBytes()));
if (!vehFaultRecService.save(vehFaultRec)) {
@@ -60,15 +63,6 @@
} catch (Exception e) {
log.error("FaultProcessor", e);
}
- }
-
- public static void main(String[] args) {
- short ss = 8193; // 2001
- byte[] bytes = RadixTools.shortToByte(ss);
-// byte[] reverse = Utils.reverse(bytes);
- System.out.println(RadixTools.bytesToHexStr(bytes));
-
-
}
}
--
Gitblit v1.9.1