From e08b557c1e39eefd3822df52d2acc58435b21e16 Mon Sep 17 00:00:00 2001
From: zhangyong <517047165@qq.com>
Date: 星期五, 15 九月 2023 08:31:58 +0800
Subject: [PATCH] 修复string.split(".")不能分割的bug
---
springboot-vue3/src/main/java/com/example/springboot/component/S7control.java | 37 ++++++++++++++++++-------------------
springboot-vue3/src/main/java/com/example/springboot/AuthorityApplication.java | 1 -
springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java | 2 +-
3 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/AuthorityApplication.java b/springboot-vue3/src/main/java/com/example/springboot/AuthorityApplication.java
index 6976fae..2b079ae 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/AuthorityApplication.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/AuthorityApplication.java
@@ -14,7 +14,6 @@
public static void main(String[] args) {
// SpringApplication.run(AuthorityApplication.class, args);
-
SpringApplication springApplication = new SpringApplication(AuthorityApplication.class);
ConfigurableApplicationContext configurableApplicationContext = springApplication.run(args);
WebSocketServer.setApplicationContext(configurableApplicationContext);
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
index 50ab8a9..b43820c 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
@@ -21,7 +21,7 @@
// JSONObject jsonObject = new JSONObject();
// jsonObject.append("params", new short[]{1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0});
- List<Boolean> paramlist = S7control.getinstance().ReadBits("DB2.0.0 ", 26);
+ List<Boolean> paramlist = S7control.getinstance().ReadBits("DB2.0.0", 26);
// Boolean[] values = {true, true,true, true,true, true,true, true,true, true,true, true,true, true,true, true,true, true,true, true,true, true,true, true,false, true};
// List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
if (paramlist == null) {
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 dca9e9c..9b9a66e 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
@@ -18,9 +18,7 @@
private S7control() {
if (s7PLC == null)
- s7PLC = new S7PLC(plcType, ip, port);
- s7PLC.connect();
- System.out.println(ip);
+ s7PLC = new S7PLC(plcType, ip, port,0,0);
}
// 鍗曚緥妯″紡 鑾峰彇绫荤殑鍞竴瀹炰緥
@@ -49,8 +47,10 @@
* @param data word鐨勫��
*/
public void WriteWord(String address, short data) {
- if (!s7PLC.checkConnected())
+ if (s7PLC==null)
+ {
return;
+ }
s7PLC.writeInt16(address, data);
}
@@ -61,7 +61,7 @@
* @param datas word鐨勫��
*/
public void WriteWord(String address, List<Short> datas) {
- if (!s7PLC.checkConnected())
+ if (s7PLC==null)
return;
// s7PLC.write(address, data);
List<String> addresslist = GetAddressList(address, datas.size(), 16);
@@ -79,7 +79,7 @@
* @param datas word鐨勫��
*/
public void WriteWord(List<String> address, List<Short> datas) {
- if (!s7PLC.checkConnected())
+ if (s7PLC==null)
return;
// s7PLC.write(address, data);
@@ -97,7 +97,7 @@
* @param data Bit鐨勫��
*/
public void WriteBit(String address, Boolean data) {
- if (!s7PLC.checkConnected())
+ if (s7PLC==null)
return;
s7PLC.writeBoolean(address, data);
}
@@ -109,7 +109,7 @@
* @param datas bit鐨勫��
*/
public void WriteBit(List<String> address, List<Boolean> datas) {
- if (!s7PLC.checkConnected())
+ if (s7PLC==null)
return;
// s7PLC.write(address, data);
@@ -127,7 +127,7 @@
* @param datas word鐨勫��
*/
public void WriteBit(String address, List<Boolean> datas) {
- if (!s7PLC.checkConnected())
+ if (s7PLC==null)
return;
// s7PLC.write(address, data);
List<String> addresslist = GetAddressList(address, datas.size(), 1);
@@ -145,9 +145,8 @@
* @return 缁撴灉
*/
public List<Short> ReadWord(List<String> address) {
- if (!s7PLC.checkConnected())
- return null;
-
+ if (s7PLC==null)
+ return null;
return s7PLC.readInt16(address);
}
@@ -159,8 +158,8 @@
* @return 缁撴灉
*/
public List<Short> ReadWord(String address, int count) {
- if (!s7PLC.checkConnected())
- return null;
+ if (s7PLC==null)
+ return null;
List<String> addresslist = GetAddressList(address, count, 16);
return s7PLC.readInt16(addresslist);
@@ -173,8 +172,8 @@
* @return Boolean缁撴灉
*/
public List<Boolean> ReadBits(List<String> addresslist) {
- if (!s7PLC.checkConnected())
- return null;
+ if (s7PLC==null)
+ return null;
return s7PLC.readBoolean(addresslist);
}
@@ -186,16 +185,16 @@
* @return Boolean缁撴灉
*/
public List<Boolean> ReadBits(String address, int count) {
- if (!s7PLC.checkConnected())
+ if (s7PLC==null)
return null;
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<>();
+ List<String> addresslist = new ArrayList<String>();
- String[] stringdatas = address.split(".");
+ String[] stringdatas = address.trim().split("\\.");
if (stringdatas.length < 2 || !address.startsWith("DB"))
return null;
int dbwindex = 0;
--
Gitblit v1.8.0