From d84bd33407c8969b780dd5038ed702bb5868b464 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期三, 12 十月 2022 17:46:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 2 +-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 13 +++++++++++--
2 files changed, 12 insertions(+), 3 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 9ad4f61..09096b7 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2149,6 +2149,9 @@
}
}
+ /**
+ * 灏嗙伀璀︽姤璀︿俊鍙峰啓鍏ュ埌鍫嗗灈鏈篜LC涓�
+ */
@Transactional
public void fierCrn() {
try {
@@ -2158,9 +2161,15 @@
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("fire_status", 1));
if (!Cools.isEmpty(locMast)){
- //xie xin h
+ //鎶ヨ淇″彿鍐欏叆1
+ if (!MessageQueue.offer(SlaveType.Crn, locMast.getCrnNo(), new Task(4, (short)1))) {
+ log.error("鐏 ===>> 缁欏爢鍨涙満鍙戦�佹姤璀︿俊鍙峰け璐�");
+ }
} else {
- //fu wei h
+ //鎶ヨ淇″彿娌℃湁鍚庯紝澶嶄綅鍦板潃
+ if (!MessageQueue.offer(SlaveType.Crn, locMast.getCrnNo(), new Task(4, (short)0))) {
+ log.error("鐏 ===>> 缁欏爢鍨涙満娓呴浂澶嶄綅鎶ヨ淇″彿澶辫触");
+ }
}
}
} catch (Exception e) {
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index abc0bb2..557a8fb 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -86,7 +86,7 @@
write(command);
break;
case 4:
-// siemensNet.Write("DB102.0" + staProtocol.getSiteId(), staProtocol.getStaNo());
+ siemensNet.Write("DB100.20", (short)task.getData());
break;
default:
break;
--
Gitblit v1.9.1