From 17b583422095aff6bb91bd8ddff5faeb41c8edb2 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期六, 02 十二月 2023 09:06:24 +0800
Subject: [PATCH] 更新电气管理通讯逻辑
---
springboot-vue3/src/main/java/com/example/springboot/component/S7control.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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 b6afa91..8db324e 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
@@ -10,6 +10,7 @@
import com.github.xingshuangs.iot.protocol.s7.service.MultiAddressWrite;
import com.github.xingshuangs.iot.protocol.s7.service.S7PLC;
import com.google.common.primitives.Bytes;
+import org.apache.ibatis.jdbc.Null;
public class S7control {
@@ -238,11 +239,25 @@
for (String address : addressList) {
byte[] bytes = s7PLC.readByte(address, 14);
-
- if (bytes != null) {
- String str = new String(bytes, StandardCharsets.US_ASCII);
+// System.out.println(bytes.toString());
+ if (bytes != null) {
+ String str = new String(bytes, StandardCharsets.UTF_8);
+// System.out.println(str);
+// if(str == null ){
+// str = "";
+// }
result.add(str);
}
+// if ( bytes.toString().contains("@")) {
+// String str = "";
+//
+// result.add(str);
+// }else{
+//
+// String str = new String(bytes, StandardCharsets.US_ASCII);
+// result.add(str);
+// }
+// System.out.println(bytes.toString());
}
return result;
@@ -266,7 +281,7 @@
}
public void outmesid(String data, String addr) {
- System.out.println("outmesid: " + data);
+// System.out.println("outmesid: " + data);
List<Byte> glassidlist = new ArrayList<>();
String[] parts = addr.split("-");
if (parts.length == 2) {
--
Gitblit v1.8.0