From 70930071a49190f414c8d8bc9c9e9795a4096739 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 23 三月 2026 16:08:27 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into jdxaj
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/FaultProcessor.java | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 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 a828a67..e453a9b 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
@@ -7,7 +7,6 @@
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;
@@ -16,6 +15,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
+import com.zy.acs.common.utils.News;
import java.util.Date;
@@ -44,35 +44,26 @@
AgvErrorType errorType = AgvErrorType.query(agv_04_up.getHexFaultId());
- Agv agv = agvService.selectByUuid(vehicle);
+ 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)) {
- log.error("{}鍙疯溅杈嗘晠闅滐紒璁板綍鏁呴殰淇℃伅澶辫触......", dto.getVehicle());
+ News.error("{}鍙疯溅杈嗘晠闅滐紒璁板綍鏁呴殰淇℃伅澶辫触......", dto.getVehicle());
}
} catch (Exception e) {
- log.error("FaultProcessor", e);
+ News.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));
-
-
- }
-
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1