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/ZySiemensDualCrnThread.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java b/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java
index e5bb4d6..5f6a962 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java
@@ -35,6 +35,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.zy.asrs.entity.BasDualCrnpErrLog;
+import com.zy.asrs.service.BasDualCrnpErrLogService;
/**
* 鍙屽伐浣嶅爢鍨涙満绾跨▼
@@ -354,6 +356,43 @@
//鏇存柊閲囬泦鏃堕棿
crnProtocol.setDeviceDataLog(System.currentTimeMillis());
}
+
+ try {
+ BasDualCrnpErrLogService errLogService = SpringUtils.getBean(BasDualCrnpErrLogService.class);
+ if (errLogService != null) {
+ String errFlagKey = RedisKeyType.DEVICE_ERR_ACTIVE_DUAL_CRN.key + crnProtocol.getCrnNo();
+ Object active = redisUtil.get(errFlagKey);
+ if (crnProtocol.getAlarm() != null && crnProtocol.getAlarm() > 0) {
+ if (active == null) {
+ BasDualCrnpErrLog log = new BasDualCrnpErrLog();
+ Integer wrkNo = (crnProtocol.getTaskNo() != null && crnProtocol.getTaskNo() > 0) ? crnProtocol.getTaskNo() : crnProtocol.getTaskNoTwo();
+ log.setWrkNo(wrkNo);
+ log.setStartTime(new Date());
+ log.setCrnNo(crnProtocol.getCrnNo());
+ log.setBarcode(crnProtocol.getBarcode());
+ log.setErrCode(crnProtocol.getAlarm());
+ log.setStatus(1);
+ log.setCreateTime(new Date());
+ log.setSystemStatus(JSON.toJSONString(crnProtocol));
+ 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));
+ BasDualCrnpErrLog update = new BasDualCrnpErrLog();
+ update.setId(id);
+ update.setEndTime(new Date());
+ update.setStatus(2);
+ update.setUpdateTime(new Date());
+ errLogService.updateById(update);
+ redisUtil.del(errFlagKey);
+ }
+ }
+ }
+ } catch (Exception ignore) {}
}
@Override
--
Gitblit v1.9.1