From 59f6af2be4fba052b605689582a3e6a3c2d221fa Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 24 二月 2023 15:45:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 9 ++++-----
src/main/resources/application.yml | 6 +++---
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 622cb1c..7de00ee 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -43,10 +43,9 @@
private short heartBeatVal = 1;
private int barcodeSize = 2;
public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
- add(100);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(1000);add(2000);
- add(200);add(201);add(202);add(203);add(204);add(205);add(206);add(207);add(208);add(209);
+ add(100);add(101);add(102);
+ add(200);add(201);add(202);
+ add(300);add(301);add(302);
}};
public boolean charge0;
@@ -191,7 +190,7 @@
OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB102.130", (short)1);
if (result5.IsSuccess) {
boolean[] status = siemensS7Net.getByteTransform().TransBool(result5.Content, 0, 1);
- StaProtocol staProtocol = station.get(203);
+ StaProtocol staProtocol = station.get(202);
staProtocol.setFrontErr(status[0]);
staProtocol.setBackErr(status[1]);
staProtocol.setHighErr(status[2]);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index bfdd00e..3c15ddc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -57,7 +57,7 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.30
+ ip: 192.168.4.250
port: 102
rack: 0
slot: 0
@@ -109,14 +109,14 @@
# 绌挎杞�1
ste[0]:
id: 1
- ip: 10.10.10.60
+ ip: 192.168.4.250
port: 502
rack: 0
slot: 0
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 10.10.10.50
+ ip: 192.168.4.250
port: 102
rack: 0
slot: 0
--
Gitblit v1.9.1