From 857a92a183e31655477786812ec26d6bda9395ac Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 20 十二月 2023 15:05:57 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/MessageHandler.java | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/MessageHandler.java b/springboot-vue3/src/main/java/com/example/springboot/component/MessageHandler.java
index c380a42..efcf9b6 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/MessageHandler.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/MessageHandler.java
@@ -66,7 +66,7 @@
}
}
- //鍐欏叆Word
+ //涓嶈繛缁湴鍧� 鍐欏叆Word
public void WriteWordToPLC(JSONArray messageArray, List<String> addresses, int index) {
try {
if (messageArray.getJSONArray(index).size() > 0) {
@@ -95,6 +95,48 @@
}
}
+
+
+
+
+
+
+ public void WriteWordsToPLC(JSONArray jsonArray, String address,int index) {
+ if (jsonArray.getJSONArray(index).size() > 0) {
+ Object value = jsonArray.getJSONArray(index).get(0);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ short sValue = Short.parseShort(cleanedValue.trim());
+ S7control.getinstance().WriteWord(address, Arrays.asList(sValue));
+ System.out.println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + address);
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ }
+
+
+ public void Writetime(JSONArray jsonArray, String address,int index) {
+ if (jsonArray.getJSONArray(index).size() > 0) {
+ Object value = jsonArray.getJSONArray(index).get(0);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ long cleanedValue = Long.parseLong(value.toString().replaceAll("[^0-9-]", ""));
+
+ S7control.getinstance().writetime(address, cleanedValue);
+ System.out.println("messageValue锛�" + Arrays.asList(cleanedValue) + " written to PLC at address " + address);
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ }
+
+
//鍐欏叆String
public void writeStringToPLC(JSONArray messageArray, String addresses, int index) {
try {
--
Gitblit v1.8.0