From 34b3f498a7c3663431073a91df35d9936decc5e0 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期一, 15 十二月 2025 08:46:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
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 0bb8c61..77683af 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
@@ -56,7 +56,7 @@
public void run() {
this.connect();
this.initCrn();
- while (true) {
+ while (!Thread.currentThread().isInterrupted()) {
try {
deviceLogCollectTime = Utils.getDeviceLogCollectTime();
int step = 1;
@@ -124,7 +124,6 @@
ZyCrnStatusEntity crnStatus = zyCrnConnectDriver.getStatus();
if (crnStatus == null) {
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
- News.error("SiemensCrn"+" - 5"+" - 璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
return;
}
@@ -188,7 +187,12 @@
crnProtocol.setDeviceDataLog(System.currentTimeMillis());
}
- BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
+ 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) {
@@ -197,6 +201,8 @@
basCrnp.setStatus(1);
basCrnp.setInEnable("N");
basCrnp.setOutEnable("N");
+ basCrnp.setMaxInTask(5);
+ basCrnp.setMaxOutTask(5);
basCrnp.setCreateTime(new Date());
basCrnpService.insert(basCrnp);
}
--
Gitblit v1.9.1