From b4278445d7b578f33c08bda340b34f6a89e501a2 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 15 十二月 2023 13:47:55 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/S7control.java | 62 +++++++++++++++++++++---------
1 files changed, 43 insertions(+), 19 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java b/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
index 8db324e..2c883f0 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
@@ -3,6 +3,7 @@
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.charset.StandardCharsets;
+import java.sql.Time;
import java.util.ArrayList;
import java.util.List;
@@ -214,22 +215,28 @@
return null;
return s7PLC.readBoolean(addresslist);
}
-
- public List<Boolean> readBits(List<String> addressList) {
- if (s7PLC == null || addressList.isEmpty()) {
- return null;
- }
-
- List<Boolean> values = new ArrayList<>();
- for (String address : addressList) {
- boolean value = s7PLC.readBoolean(address);
- values.add(value);
- }
-
- return values;
+//璇诲彇涓嶈繛缁湴鍧�bit
+public List<Boolean> readBits(List<String> addressList) {
+ if (s7PLC == null || addressList.isEmpty()) {
+ return null;
}
+ List<Boolean> values = new ArrayList<>();
+ for (String address : addressList) {
+ try {
+ boolean value = s7PLC.readBoolean(address);
+ values.add(value);
+ } catch (Exception e) {
+ // 澶勭悊寮傚父
+ System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
+ }
+ }
+ return values;
+}
+
+
+//璇诲彇String
public List<String> readStrings(List<String> addressList) {
if (s7PLC == null) {
return null;
@@ -263,7 +270,7 @@
return result;
}
-
+//涓嶈繛缁湴鍧�鍐欏叆Word
public void WriteWord(List<String> address, List<Short> datas) {
if (s7PLC == null)
return;
@@ -279,7 +286,10 @@
}
}
}
-
+
+
+
+//瀛楃涓插啓鍏�
public void outmesid(String data, String addr) {
// System.out.println("outmesid: " + data);
List<Byte> glassidlist = new ArrayList<>();
@@ -303,14 +313,25 @@
List<Short> data = new ArrayList<>();
for (String address : addresses) {
+ try {
- // 鍗曚釜鍦板潃
- Short value = s7PLC.readInt16(address);
- data.add(value);
+ // 鍗曚釜鍦板潃
+ Short value = s7PLC.readInt16(address);
+ data.add(value);
+ } catch (Exception e) {
+ System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
+
+ }
}
-
return data;
+ }
+
+//璇诲彇鏃堕棿
+ public Long readtime(String address) {
+ if (s7PLC==null)
+ return null;
+ return s7PLC.readTime(address);
}
private int extractAddressNumber(String address) {
@@ -332,6 +353,8 @@
List<String> addresslist = GetAddressList(address, count, 1);
return s7PLC.readBoolean(addresslist);
}
+
+
private List<String> GetAddressList(String address, int count, int addedbit) {
List<String> addresslist = new ArrayList<String>();
@@ -344,6 +367,7 @@
if (stringdatas.length == 2) {
dbwindex = Integer.parseInt(stringdatas[1]);
} else if (stringdatas.length == 3) {
+ dbwindex = Integer.parseInt(stringdatas[1]);
bitindex = Integer.parseInt(stringdatas[2]);
} else
return null;
--
Gitblit v1.8.0