From ad71edbf0f9d2cf2bc46cd2ba1e0239f80949e68 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 21 十二月 2023 15:12:56 +0800
Subject: [PATCH] 增加清除id调用终止出片任务
---
springboot-vue3/src/main/java/com/example/springboot/component/S7control.java | 107 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 67 insertions(+), 40 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 2c883f0..a5f3e44 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
@@ -157,10 +157,17 @@
* @return 缁撴灉
*/
public List<Short> ReadWord(List<String> address) {
- if (s7PLC==null)
- return null;
- return s7PLC.readInt16(address);
+ if (s7PLC == null)
+ return null;
+
+ try {
+ return s7PLC.readInt16(address);
+ } catch (Exception e) {
+ System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
+ return null;
+ }
}
+
@@ -184,12 +191,19 @@
* @return 缁撴灉
*/
public List<Short> ReadWord(String address, int count) {
- if (s7PLC==null)
- return null;
+ if (s7PLC == null)
+ return null;
List<String> addresslist = GetAddressList(address, count, 16);
- return s7PLC.readInt16(addresslist);
+ try {
+ return s7PLC.readInt16(addresslist);
+ } catch (Exception e) {
+ System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
+
+ return null;
+ }
}
+
/**
* 鎸夋寚瀹氱殑鍦板潃 璇诲彇byte缁撴灉闆�
*
@@ -237,38 +251,27 @@
//璇诲彇String
- public List<String> readStrings(List<String> addressList) {
- if (s7PLC == null) {
- return null;
- }
-
- List<String> result = new ArrayList<>();
-
- for (String address : addressList) {
+public List<String> readStrings(List<String> addressList) {
+ if (s7PLC == null) {
+ return null;
+ }
+ List<String> result = new ArrayList<>();
+ for (String address : addressList) {
+ try {
byte[] bytes = s7PLC.readByte(address, 14);
-// System.out.println(bytes.toString());
- if (bytes != null) {
- String str = new String(bytes, StandardCharsets.UTF_8);
-// System.out.println(str);
-// if(str == null ){
-// str = "";
-// }
+ if (bytes != null) {
+ String str = new String(bytes, StandardCharsets.UTF_8);
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());
+ } catch (Exception e) {
+ System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
+ result.add(null);
}
-
- return result;
}
+
+ return result;
+}
+
//涓嶈繛缁湴鍧�鍐欏叆Word
public void WriteWord(List<String> address, List<Short> datas) {
@@ -304,7 +307,7 @@
S7control.getinstance().WriteByte(addr, bytes);
}
-
+//璇诲彇涓嶈繛缁瓀ord
public List<Short> readWords(List<String> addresses) {
if (s7PLC == null) {
return null;
@@ -328,11 +331,29 @@
}
//璇诲彇鏃堕棿
- public Long readtime(String address) {
- if (s7PLC==null)
- return null;
+public Long readtime(String address) {
+ if (s7PLC == null)
+ return null;
+ try {
return s7PLC.readTime(address);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
}
+}
+
+
+ public void writetime(String address, long datas) {
+ if (s7PLC == null)
+ return;
+
+
+ s7PLC.writeTime(address, datas); // 灏嗘暟鎹啓鍏ュ崟涓湴鍧�
+ }
+
+
+
+
private int extractAddressNumber(String address) {
String numberStr = address.replaceAll("\\D+", ""); // 浣跨敤姝ｅ垯琛ㄨ揪寮忔彁鍙栨暟瀛楅儴鍒�
@@ -348,11 +369,17 @@
* @return Boolean缁撴灉
*/
public List<Boolean> ReadBits(String address, int count) {
- if (s7PLC==null)
+ if (s7PLC == null)
return null;
List<String> addresslist = GetAddressList(address, count, 1);
- return s7PLC.readBoolean(addresslist);
- }
+ try {
+ return s7PLC.readBoolean(addresslist);
+ } catch (Exception e) {
+ System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
+ return null;
+ }
+
+ };
--
Gitblit v1.8.0