From ff1aa7a9218e458dfd9255b1f87490af52afb62a Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期二, 06 一月 2026 13:39:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java | 42 ++++++++++----------
src/main/java/com/zy/core/MainProcess.java | 2
src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java | 42 ++++++++++----------
3 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index d9e922c..be87702 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -35,7 +35,7 @@
try {
mainProcessPluginApi = SpringUtils.getBean(clazz);
} catch (CoolException coolException) {
- continue;
+ Thread.sleep(300);
}
}
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 513fd34..74b1bc1 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
@@ -114,6 +114,27 @@
crnProtocol.setYDistance(0D);
crnProtocol.setXDuration(0D);
crnProtocol.setYDuration(0D);
+
+ BasCrnpService basCrnpService = null;
+ try {
+ basCrnpService = SpringUtils.getBean(BasCrnpService.class);
+ }catch (Exception e){
+
+ }
+ if (basCrnpService != null) {
+ BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", deviceConfig.getDeviceNo()));
+ if(basCrnp == null) {
+ basCrnp = new BasCrnp();
+ basCrnp.setCrnNo(deviceConfig.getDeviceNo());
+ basCrnp.setStatus(1);
+ basCrnp.setInEnable("N");
+ basCrnp.setOutEnable("N");
+ basCrnp.setMaxInTask(5);
+ basCrnp.setMaxOutTask(5);
+ basCrnp.setCreateTime(new Date());
+ basCrnpService.insert(basCrnp);
+ }
+ }
}
@Override
@@ -178,27 +199,6 @@
redisUtil.set(RedisKeyType.DEVICE_LOG_KEY.key + System.currentTimeMillis(), deviceDataLog, 60 * 60 * 24);
//鏇存柊閲囬泦鏃堕棿
crnProtocol.setDeviceDataLog(System.currentTimeMillis());
- }
-
- BasCrnpService basCrnpService = null;
- try {
- basCrnpService = SpringUtils.getBean(BasCrnpService.class);
- }catch (Exception e){
-
- }
- if (basCrnpService != null) {
- BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", deviceConfig.getDeviceNo()));
- if(basCrnp == null) {
- basCrnp = new BasCrnp();
- basCrnp.setCrnNo(deviceConfig.getDeviceNo());
- basCrnp.setStatus(1);
- basCrnp.setInEnable("N");
- basCrnp.setOutEnable("N");
- basCrnp.setMaxInTask(5);
- basCrnp.setMaxOutTask(5);
- basCrnp.setCreateTime(new Date());
- basCrnpService.insert(basCrnp);
- }
}
}
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 2af45a2..812ee32 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java
@@ -257,6 +257,27 @@
crnProtocol.setYDistance(0);
crnProtocol.setXDuration(0);
crnProtocol.setYDuration(0);
+
+ BasDualCrnpService basDualCrnpService = null;
+ try {
+ basDualCrnpService = SpringUtils.getBean(BasDualCrnpService.class);
+ }catch (Exception e){
+
+ }
+ if (basDualCrnpService != null) {
+ BasDualCrnp basDualCrnp = basDualCrnpService.selectOne(new EntityWrapper<BasDualCrnp>().eq("crn_no", deviceConfig.getDeviceNo()));
+ if(basDualCrnp == null) {
+ basDualCrnp = new BasDualCrnp();
+ basDualCrnp.setCrnNo(deviceConfig.getDeviceNo());
+ basDualCrnp.setStatus(1);
+ basDualCrnp.setInEnable("N");
+ basDualCrnp.setOutEnable("N");
+ basDualCrnp.setMaxInTask(5);
+ basDualCrnp.setMaxOutTask(5);
+ basDualCrnp.setCreateTime(new Date());
+ basDualCrnpService.insert(basDualCrnp);
+ }
+ }
}
@Override
@@ -333,27 +354,6 @@
redisUtil.set(RedisKeyType.DEVICE_LOG_KEY.key + System.currentTimeMillis(), deviceDataLog, 60 * 60 * 24);
//鏇存柊閲囬泦鏃堕棿
crnProtocol.setDeviceDataLog(System.currentTimeMillis());
- }
-
- BasDualCrnpService basDualCrnpService = null;
- try {
- basDualCrnpService = SpringUtils.getBean(BasDualCrnpService.class);
- }catch (Exception e){
-
- }
- if (basDualCrnpService != null) {
- BasDualCrnp basDualCrnp = basDualCrnpService.selectOne(new EntityWrapper<BasDualCrnp>().eq("crn_no", deviceConfig.getDeviceNo()));
- if(basDualCrnp == null) {
- basDualCrnp = new BasDualCrnp();
- basDualCrnp.setCrnNo(deviceConfig.getDeviceNo());
- basDualCrnp.setStatus(1);
- basDualCrnp.setInEnable("N");
- basDualCrnp.setOutEnable("N");
- basDualCrnp.setMaxInTask(5);
- basDualCrnp.setMaxOutTask(5);
- basDualCrnp.setCreateTime(new Date());
- basDualCrnpService.insert(basDualCrnp);
- }
}
}
--
Gitblit v1.9.1