From cf00f005c1e3fa4b19caf1efd61501da0331c876 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 05 十二月 2023 08:15:37 +0800
Subject: [PATCH] 修改提示框大小
---
springboot-vue3/src/main/java/com/example/springboot/component/S7control.java | 24 ++++++++++++++++++++----
1 files changed, 20 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..0b6b94b 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) {
@@ -329,6 +344,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