From e14a4372b6bd4a38e40a3a68bde32350d96071ab Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 15 一月 2026 13:11:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/ZyRgvThread.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/ZyRgvThread.java b/src/main/java/com/zy/core/thread/impl/ZyRgvThread.java
index 41c78fe..4e9d007 100644
--- a/src/main/java/com/zy/core/thread/impl/ZyRgvThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZyRgvThread.java
@@ -30,6 +30,8 @@
import java.text.MessageFormat;
import java.util.Date;
+import com.zy.asrs.entity.BasRgvErrLog;
+import com.zy.asrs.service.BasRgvErrLogService;
@Data
@Slf4j
@@ -141,6 +143,41 @@
rgvProtocol.setDeviceDataLog(System.currentTimeMillis());
}
+ try {
+ BasRgvErrLogService errLogService = SpringUtils.getBean(BasRgvErrLogService.class);
+ if (errLogService != null) {
+ String errFlagKey = RedisKeyType.DEVICE_ERR_ACTIVE_RGV.key + rgvProtocol.getRgvNo();
+ Object active = redisUtil.get(errFlagKey);
+ if (rgvProtocol.getAlarm() != null && rgvProtocol.getAlarm() > 0) {
+ if (active == null) {
+ BasRgvErrLog log = new BasRgvErrLog();
+ log.setTaskNo(rgvProtocol.getTaskNo());
+ log.setStartTime(new Date());
+ log.setRgvNo(rgvProtocol.getRgvNo());
+ log.setErrCode(rgvProtocol.getAlarm());
+ log.setStatus(1);
+ log.setCreateTime(new Date());
+ log.setSystemStatus(JSON.toJSONString(rgvProtocol));
+ errLogService.insert(log);
+ if (log.getId() != null) {
+ redisUtil.set(errFlagKey, log.getId(), 60 * 60 * 24);
+ }
+ }
+ } else {
+ if (active != null) {
+ Long id = Long.valueOf(String.valueOf(active));
+ BasRgvErrLog update = new BasRgvErrLog();
+ update.setId(id);
+ update.setEndTime(new Date());
+ update.setStatus(2);
+ update.setUpdateTime(new Date());
+ errLogService.updateById(update);
+ redisUtil.del(errFlagKey);
+ }
+ }
+ }
+ } catch (Exception ignore) {}
+
BasRgvService basRgvService = null;
try {
basRgvService = SpringUtils.getBean(BasRgvService.class);
--
Gitblit v1.9.1