From f6e1228dda1a417774482aa4f838af14171284af Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期一, 12 一月 2026 10:13:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/ZyRgvThread.java | 37 ++++++++++++
src/main/java/com/zy/asrs/entity/BasCrnpErrLog.java | 14 ----
src/main/java/com/zy/asrs/entity/BasDualCrnpOpt.java | 2
src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java | 38 ++++++++++++
src/main/java/com/zy/asrs/entity/BasRgvErrLog.java | 14 ----
src/main/java/com/zy/core/enums/RedisKeyType.java | 3 +
src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java | 39 +++++++++++++
7 files changed, 117 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnpErrLog.java b/src/main/java/com/zy/asrs/entity/BasCrnpErrLog.java
index 512ea07..41153ce 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnpErrLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnpErrLog.java
@@ -6,25 +6,11 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasWrkStatusService;
-import com.zy.asrs.entity.BasWrkStatus;
-import com.core.common.SpringUtils;
import com.zy.asrs.service.BasWrkIotypeService;
-import com.zy.asrs.entity.BasWrkIotype;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
diff --git a/src/main/java/com/zy/asrs/entity/BasDualCrnpOpt.java b/src/main/java/com/zy/asrs/entity/BasDualCrnpOpt.java
index 0b9f642..a0be9c1 100644
--- a/src/main/java/com/zy/asrs/entity/BasDualCrnpOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasDualCrnpOpt.java
@@ -6,8 +6,6 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
import com.zy.system.entity.User;
diff --git a/src/main/java/com/zy/asrs/entity/BasRgvErrLog.java b/src/main/java/com/zy/asrs/entity/BasRgvErrLog.java
index a6315e4..12f8e9d 100644
--- a/src/main/java/com/zy/asrs/entity/BasRgvErrLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasRgvErrLog.java
@@ -6,25 +6,11 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasWrkStatusService;
-import com.zy.asrs.entity.BasWrkStatus;
-import com.core.common.SpringUtils;
import com.zy.asrs.service.BasWrkIotypeService;
-import com.zy.asrs.entity.BasWrkIotype;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
diff --git a/src/main/java/com/zy/core/enums/RedisKeyType.java b/src/main/java/com/zy/core/enums/RedisKeyType.java
index 8d000ca..4673637 100644
--- a/src/main/java/com/zy/core/enums/RedisKeyType.java
+++ b/src/main/java/com/zy/core/enums/RedisKeyType.java
@@ -24,6 +24,9 @@
LOC_MAST_MAP_LIST("loc_mast_map_list"),
DEVICE_LOG_KEY("device_log_key_"),
+ DEVICE_ERR_ACTIVE_RGV("device_err_active_rgv_"),
+ DEVICE_ERR_ACTIVE_CRN("device_err_active_crn_"),
+ DEVICE_ERR_ACTIVE_DUAL_CRN("device_err_active_dual_crn_"),
GENERATE_IN_TASK_LIMIT("generate_in_task_limit_"),
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);
diff --git a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
index 74b1bc1..b7f2248 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
@@ -30,6 +30,8 @@
import java.text.MessageFormat;
import java.util.Date;
+import com.zy.asrs.entity.BasCrnpErrLog;
+import com.zy.asrs.service.BasCrnpErrLogService;
/**
* 鍫嗗灈鏈虹嚎绋�
@@ -200,6 +202,42 @@
//鏇存柊閲囬泦鏃堕棿
crnProtocol.setDeviceDataLog(System.currentTimeMillis());
}
+
+ try {
+ BasCrnpErrLogService errLogService = SpringUtils.getBean(BasCrnpErrLogService.class);
+ if (errLogService != null) {
+ String errFlagKey = RedisKeyType.DEVICE_ERR_ACTIVE_CRN.key + crnProtocol.getCrnNo();
+ Object active = redisUtil.get(errFlagKey);
+ if (crnProtocol.getAlarm() != null && crnProtocol.getAlarm() > 0) {
+ if (active == null) {
+ BasCrnpErrLog log = new BasCrnpErrLog();
+ log.setWrkNo(crnProtocol.getTaskNo());
+ 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));
+ BasCrnpErrLog update = new BasCrnpErrLog();
+ update.setId(id);
+ update.setEndTime(new Date());
+ update.setStatus(2);
+ update.setUpdateTime(new Date());
+ errLogService.updateById(update);
+ redisUtil.del(errFlagKey);
+ }
+ }
+ }
+ } catch (Exception ignore) {}
}
@Override
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