From 7d5cf89b2a717598dbd02b1f33d3749b0c585be2 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 31 五月 2023 15:35:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 14 ++++++++++++++
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 5 +++++
2 files changed, 19 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 9f7c280..3735667 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2193,6 +2193,12 @@
devpThread.startSignal[i][0] = newSingle;
}
}
+ try{
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
+ messageQueueOffer2(i,(short)((int)locMast.getFireStatus()),SlaveType.Devp, devp.getId());
+ }catch (Exception e){
+ log.error("鐏 ===>> 缁欒緭閫佺嚎鍙戦�佽鎶ュけ璐�,閫氶亾鍙凤細", i+1);
+ }
}
}
@@ -2213,6 +2219,14 @@
return MessageQueue.offer(devp, id, new Task(3, staProtocol));
}
+ public boolean messageQueueOffer2(int i ,short newSingle,SlaveType devp,Integer id){
+ //澶嶄綅PLC淇″彿锛屽�熺敤杈撻�佺珯鐐瑰疄浣撶被
+ StaProtocol staProtocol = new StaProtocol();
+ staProtocol.setSiteId(i*2);//瀵勫瓨鍣ㄥ湴鍧�
+ staProtocol.setStaNo(newSingle);//淇敼PLC瀵勫瓨鍣ㄥ湴鍧�鍊�,8==>0
+ return MessageQueue.offer(devp, id, new Task(5, staProtocol));
+ }
+
/**
* 灏嗙伀璀︽姤璀︿俊鍙峰啓鍏ュ埌鍫嗗灈鏈篜LC涓�
*/
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 6213f93..21d278d 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -84,6 +84,11 @@
case 4:
write103((String)task.getData());
break;
+ // 鍐欐暟鎹� 103绔欑偣鍐欏叆PACK鐮�
+ case 5:
+ StaProtocol staProtocol2 = (StaProtocol)task.getData();
+ siemensS7Net.Write("DB102.0" + staProtocol2.getSiteId(), staProtocol2.getStaNo()==1);
+ break;
//澶嶄綅娴嬭瘯淇″彿
case 3:
StaProtocol staProtocol = (StaProtocol)task.getData();
--
Gitblit v1.9.1