From af6fed7d45038a8696ecaa41e8b9a509df68e63e Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 04 十二月 2023 13:37:11 +0800
Subject: [PATCH] #redis 同步set
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 916e57b..0ade878 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -75,6 +75,13 @@
add(341);add(346);
}};
+ //鍑哄叆搴撶珯鐐规娴嬫姤璀︿俊鎭�
+ public static final ArrayList<Integer> outInAlarmStaNos = new ArrayList<Integer>(){{
+ add(101);add(102);add(104);
+ add(201);add(202);add(204);
+ add(340);add(345);
+ }};
+
public boolean charge0;
public boolean charge1;
@@ -221,6 +228,28 @@
}
}
+ //鍑哄叆搴撶珯鐐规娴嬫姤璀︿俊鎭�
+ Thread.sleep(100);
+ for (Integer staNo : outInAlarmStaNos) {
+ OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB" + staNo + ".20.0", (short) 2);
+ if (result5.IsSuccess) {
+ if (staNo == 101 || staNo == 201) {
+ staNo--;
+ }else {
+ staNo++;
+ }
+ StaProtocol staProtocol = station.get(staNo);
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result5.Content, 0, 2);
+ staProtocol.setBarcodeErr(status[4]);//鎵爜澶辫触
+ staProtocol.setFrontErr(status[8]);//鍓嶈秴闄�
+ staProtocol.setBackErr(status[9]);//鍚庤秴闄�
+ staProtocol.setLeftErr(status[10]);//宸﹁秴闄�
+ staProtocol.setRightErr(status[11]);//鍙宠秴闄�
+ staProtocol.setHighErr(status[12]);//瓒呴珮
+ staProtocol.setWeightErr(status[13]);//瓒呴噸
+ }
+ }
+
if (result.IsSuccess && result1.IsSuccess) {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
@@ -266,10 +295,10 @@
int writeCount = 0;
//浠诲姟涓嬪彂鎴愬姛鏍囪瘑
boolean writeFlag = false;
- while(writeCount < 5){
+ while(writeCount < 1){
writeResult = siemensS7Net.Write("DB1000." + index*4, array); // 宸ヤ綔鍙枫�佺洰鏍囩珯
if(writeResult.IsSuccess){
- Thread.sleep(200);
+ Thread.sleep(500);
OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB1000." + index*4, (short)4);
if(readResult.IsSuccess){
short workNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 0);
@@ -309,8 +338,8 @@
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护灏濊瘯5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
log.error("鍐欏叆杈撻�佺嚎鍛戒护灏濊瘯5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
- //閲嶆柊娣诲姞鏁版嵁鍒颁换鍔￠槦鍒�
- boolean result = MessageQueue.offer(SlaveType.Devp, slave.getId(), new Task(2, staProtocol));
+// //閲嶆柊娣诲姞鏁版嵁鍒颁换鍔￠槦鍒�
+// boolean result = MessageQueue.offer(SlaveType.Devp, slave.getId(), new Task(2, staProtocol));
read();//璇诲彇1娆¤澶囩姸鎬�
return;
} else {
--
Gitblit v1.9.1