From 211cd083bc9fc1871779802650dfe0e607d8ca77 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 10 五月 2024 08:25:12 +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 | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 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 c65d8a6..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
@@ -273,21 +273,18 @@
return result;
}
+
//璇诲彇瀛楃涓�
public String readString(String address) {
if (s7PLC == null) {
return null;
}
try {
- byte[] bytes = s7PLC.readByte(address, 14);
- if (bytes != null) {
- return new String(bytes, StandardCharsets.UTF_8);
- }
+ return s7PLC.readString(address);
} catch (Exception e) {
System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
return null;
}
- return null;
}
@@ -346,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