From 748a9c37b746ec25bee8f71e369596961052ebef Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期一, 27 二月 2023 12:09:21 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |    6 +++---
 src/main/resources/application.yml                      |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 7de00ee..2c5e152 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -112,7 +112,7 @@
      * 璇诲彇鐘舵�� ====> 鏁村潡plc
      */
     private void read() throws InterruptedException {
-        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 128);
+        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNos.size()*4));
         if (result.IsSuccess) {
             for (int i = 0; i < staNos.size(); i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -127,11 +127,11 @@
             }
         }
         Thread.sleep(200);
-        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.0", (short) 128);
+        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.100", (short) (staNos.size()));
         if (result1.IsSuccess) {
             for (int i = 0; i < staNos.size(); i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-                boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*4+2, 1);
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i, 1);
                 StaProtocol staProtocol = station.get(siteId);
                 staProtocol.setAutoing(status[0]);  // 鑷姩
                 staProtocol.setLoading(status[1]);  // 鏈夌墿
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3c15ddc..4ffa159 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://192.168.4.15:1433;databasename=szfzasrs
+    url: jdbc:sqlserver://localhost:1433;databasename=szfzasrs
     username: sa
 #    password: Zoneyung@zy56$
     password: sa@123
@@ -57,7 +57,7 @@
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 192.168.4.250
+    ip: 10.10.10.110
     port: 102
     rack: 0
     slot: 0
@@ -116,7 +116,7 @@
   # 杈撻�佺嚎
   devp[0]:
     id: 1
-    ip: 192.168.4.250
+    ip: 10.10.10.100
     port: 102
     rack: 0
     slot: 0

--
Gitblit v1.9.1