From 93e36c526fe445c14d5fb19f3653f8a8e55e3a6c Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期四, 09 五月 2024 15:49:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/S7control.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/S7control.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/S7control.java
index fafbd45..0b206d5 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/S7control.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/S7control.java
@@ -252,7 +252,7 @@
}
- //璇诲彇String
+ //璇诲彇StringList
public List<String> readStrings(List<String> addressList) {
if (s7PLC == null) {
return null;
@@ -272,6 +272,19 @@
}
return result;
+ }
+
+ //璇诲彇瀛楃涓�
+ public String readString(String address) {
+ if (s7PLC == null) {
+ return null;
+ }
+ try {
+ return s7PLC.readString(address);
+ } catch (Exception e) {
+ System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
+ return null;
+ }
}
@@ -314,12 +327,10 @@
if (s7PLC == null) {
return null;
}
-
List<Short> data = new ArrayList<>();
for (String address : addresses) {
try {
-
// 鍗曚釜鍦板潃
Short value = s7PLC.readInt16(address);
data.add(value);
@@ -332,6 +343,21 @@
return data;
}
+ //璇诲彇鍗曚釜word
+ public Short readWord(String address) {
+ if (s7PLC == null) {
+ return null;
+ }
+ try {
+ // 鍗曚釜鍦板潃
+ return s7PLC.readInt16(address);
+ } catch (Exception e) {
+ System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
+
+ }
+ return -1;
+ }
+
//璇诲彇鏃堕棿
public Long readtime(String address) {
if (s7PLC == null) {
--
Gitblit v1.8.0