From f32f47154c025e8b590a0a0195be903255c55024 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期三, 12 十月 2022 17:34:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 3 +++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 22 ++++++++++++++++++++++
src/main/java/com/zy/core/MainProcess.java | 2 ++
3 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index ac67afc..9ad4f61 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -35,6 +35,7 @@
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.LedThread;
+import com.zy.core.thread.SiemensCrnThread;
import com.zy.core.thread.SiemensDevpThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -2148,4 +2149,25 @@
}
}
+ @Transactional
+ public void fierCrn() {
+ try {
+ for (CrnSlave crn :slaveProperties.getCrn()) {
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("fire_status", 1));
+ if (!Cools.isEmpty(locMast)){
+ //xie xin h
+ } else {
+ //fu wei h
+ }
+ }
+ } catch (Exception e) {
+ log.error("鐏 ===>> 缁欏爢鍨涙満鍙戦�佽鎶ュけ璐�", e);
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 2060f13..52de28e 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -69,6 +69,8 @@
//鍚姩銆佸畬鎴愩�佹殏鍋滄祴璇曠郴缁熸祴璇�
mainService.packTest();
+ //鐏锛岀粰鍫嗗灈鏈哄彂閫佺伀璀﹁鎶�
+ mainService.fierCrn();
} catch (Exception e) {
e.printStackTrace();
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index d5828c2..abc0bb2 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -85,6 +85,9 @@
command.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
write(command);
break;
+ case 4:
+// siemensNet.Write("DB102.0" + staProtocol.getSiteId(), staProtocol.getStaNo());
+ break;
default:
break;
}
--
Gitblit v1.9.1