From 7d7a2c1b4a8f4c0ce412916cf8acba3510e3ba05 Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期一, 08 十二月 2025 17:21:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 9eb8fbc..917d3da 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -43,6 +43,7 @@
private SiemensS7Net siemensS7Net;
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
+ private boolean result = false;
public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
add(101);add(102);add(103);add(104);add(105);add(106);add(107);add(108);add(109);add(110);
add(111);add(112);add(113);add(114);add(115);add(116);add(117);add(118);add(119);add(120);
@@ -77,6 +78,8 @@
switch (slave.getId()) {
case 1:
return staNos1;
+ case 2:
+ return staNos2;
default:
throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
}
@@ -458,11 +461,11 @@
//浠诲姟涓嬪彂鎴愬姛鏍囪瘑
boolean writeFlag = false;
while(writeCount < 5){
- OperateResult writeResult1 = siemensS7Net.Write("DB101." + index*8, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- OperateResult writeResult2 = siemensS7Net.Write("DB101." + (index*8+4), staProtocol.getStaNo().shortValue()); // 鐩爣绔�
+ OperateResult writeResult2 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo().shortValue()); // 鐩爣绔�
+ OperateResult writeResult1 = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
if(writeResult1.IsSuccess && writeResult2.IsSuccess){
Thread.sleep(200);
- OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB101.0" + index*8, (short)4);
+ OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100.0" + index*6, (short)4);
if(readResult.IsSuccess){
Integer workNo = siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0);
@@ -540,7 +543,7 @@
//鏇存柊浠诲姟姝ュ簭
TaskWrkService taskWrkService = SpringUtils.getBean(TaskWrkService.class);
- TaskWrk taskWrk = taskWrkService.selectByWrkNo(staProtocol.getWorkNo());
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(staProtocol.getWorkNo());
if (taskWrk != null) {
taskWrk.setCommandStep(taskWrk.getCommandStep() + 1);//鏇存柊鎸囦护姝ュ簭
taskWrkService.updateById(taskWrk);
@@ -578,9 +581,10 @@
* 璁剧疆鍏ュ簱鏍囪
*/
@Override
- public void setPakMk(Integer siteId, boolean pakMk) {
+ public void setPakMk(Integer siteId, boolean pakMk,Integer i) {
StaProtocol staProtocol = station.get(siteId);
if (null != staProtocol) {
+ log.info("閿佸畾鍏ュ簱鏍囪锛岀珯鐐瑰彿={};pakMk={};鏃堕棿={};鏍囪={}",siteId,pakMk,new Date(),i);
staProtocol.setPakMk(pakMk);
}
}
--
Gitblit v1.9.1