From e67b38c4ed42d78a0ab8235f1adcb7eefc011631 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 05 一月 2024 14:26:17 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java | 117 ++++++++++++++++++++++++++--------------------------------
1 files changed, 52 insertions(+), 65 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
index 92ed72d..379ec1b 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
@@ -15,20 +15,13 @@
import java.util.List;
-
-
-
-
public class PlcParameter2 extends Thread {
@Autowired
StorageCageService storageCageService;
-
-
- // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
- private Configuration config;
-
// 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
MessageHandler customS7Control = new MessageHandler();
+ // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
+ private Configuration config;
public PlcParameter2() throws IOException {
@@ -44,12 +37,12 @@
} catch (InterruptedException e) {
e.printStackTrace();
}
- storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService .class);
+ storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
// id
List<String> addressList1 = Arrays.asList(config.getProperty("Parameter2.id").split(","));
List<String> paramlist = S7control.getinstance().readStrings(addressList1);
-
+ // System.out.println(paramlist);
//鎵嬪姩鐘舵��
List<String> addresses = Arrays.asList(config.getProperty("Parameter2.state").split(","));
@@ -82,7 +75,7 @@
List<Short> data4 = S7control.getinstance().readWords(addresses4);
-
+ //System.out.println(data);
// List<Long> TIME2 = Collections.singletonList(S7control.getinstance().readtime("DB100.194"));
// System.out.println("addressList锛�" + TIME2);
@@ -104,19 +97,22 @@
// List<Short> data4 = new ArrayList<>(Arrays.asList(values4));
//
//
+// JSONObject jsonObject = new JSONObject();
+// short[] params = new short[data2.size()];
+// for (int i = 0; i < data2.size(); i++) {
+// boolean value = data2.get(i);
+// params[i] = value ? (short) 1 : (short) 0;
+// }
+////
+// short[] anniuparams = new short[anniuread.size()];
+// for (int i = 0; i < anniuread.size(); i++) {
+// boolean value = anniuread.get(i);
+// anniuparams[i] = value ? (short) 1 : (short) 0;
+// }
+ //boolean杞负0 1
+ short[] params = customS7Control.convertBooleanListToShortArray(data2);
+ short[] anniuparams = customS7Control.convertBooleanListToShortArray(anniuread);
JSONObject jsonObject = new JSONObject();
- short[] params = new short[data2.size()];
- for (int i = 0; i < data2.size(); i++) {
- boolean value = data2.get(i);
- params[i] = value ? (short) 1 : (short) 0;
- }
-//
- short[] anniuparams = new short[anniuread.size()];
- for (int i = 0; i < anniuread.size(); i++) {
- boolean value = anniuread.get(i);
- anniuparams[i] = value ? (short) 1 : (short) 0;
- }
-
jsonObject.append("params", params);
jsonObject.append("params", paramlist);
jsonObject.append("params", data);
@@ -142,16 +138,15 @@
if (webserver != null) {
-
List<String> messages = webserver.getMessages();
-
+
if (!messages.isEmpty()) {
// 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
String lastMessage = messages.get(messages.size() - 1);
// System.out.println("lastMessage锛�" + lastMessage);
JSONArray messageArray = new JSONArray(lastMessage);
//娓呴櫎ID
- // customS7Control.writeBitToPLC(messageArray, addressList0, 0);
+ // customS7Control.writeBitToPLC(messageArray, addressList0, 0);
try {
@@ -177,10 +172,6 @@
System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
-
-
-
-
} catch (NumberFormatException e) {
// 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
System.err.println("Could not parse value: " + value);
@@ -191,46 +182,44 @@
boolean containsOne = data.stream().anyMatch(number -> number == 1);
for (int i = 1; i <= 5; i++) {
boolean value = sValue.get(i);
- String id=paramlist.get(i);
+ String id = paramlist.get(i);
//鍒ゆ柇鏄惁鑷姩鐘舵��
- if(!containsOne) {
- //鍒ゆ柇id鏄惁鍖呭惈鏁板瓧
- if(id.matches(".*\\d.*")){
- //鍒ゆ柇娓呮id鏄惁true
- if (value) {
- System.out.println(id);
- switch (i) {
- case 1:
- storageCageService.UpdateTask(2, 0, paramlist.get(i));
- break;
- case 2:
- case 3:
- case 4:
- case 5:
- storageCageService.UpdateTask(3, 0, paramlist.get(i));
- break;
- default:
- // 澶勭悊绱㈠紩鍊间笉鍦ㄨ寖鍥村唴鐨勬儏鍐�
- break;
+ if (!containsOne) {
+ //鍒ゆ柇id鏄惁鍖呭惈鏁板瓧
+ if (id.matches(".*\\d.*")) {
+ //鍒ゆ柇娓呮id鏄惁true
+ if (value) {
+ System.out.println(id);
+ switch (i) {
+ case 1:
+ storageCageService.UpdateTask(2, 0, paramlist.get(i));
+ break;
+ case 2:
+ case 3:
+ case 4:
+ case 5:
+ storageCageService.UpdateTask(3, 0, paramlist.get(i));
+ break;
+ default:
+ // 澶勭悊绱㈠紩鍊间笉鍦ㄨ寖鍥村唴鐨勬儏鍐�
+ break;
+ }
+ }
}
- }
- }
- }
- }
- // 妫�鏌ュ竷灏斿�煎垪琛ㄦ槸鍚︿负绌�
- if (!sValue.isEmpty()) {
- // 璋冪敤 S7control.getinstance().WriteBit 鏂规硶灏嗗竷灏斿�煎垪琛ㄥ啓鍏ュ湴鍧�鍒楄〃
- S7control.getinstance().WriteBit(addressList0, sValue);
- System.out.println("Values " + sValue + " written to PLC at address " + addressList0);
+ }
+ // 妫�鏌ュ竷灏斿�煎垪琛ㄦ槸鍚︿负绌�
+ if (!sValue.isEmpty()) {
+
+ // 璋冪敤 S7control.getinstance().WriteBit 鏂规硶灏嗗竷灏斿�煎垪琛ㄥ啓鍏ュ湴鍧�鍒楄〃
+ S7control.getinstance().WriteBit(addressList0, sValue);
+ System.out.println("Values " + sValue + " written to PLC at address " + addressList0);
+ }
}
}
} catch (Exception e) {
System.err.println("An error occurred while writing bit to PLC: " + e.getMessage());
}
-
-
-
//鎬ュ仠
@@ -288,8 +277,6 @@
} catch (Exception e) {
System.err.println("An error occurred while writing bit to PLC: " + e.getMessage());
}
-
-
//瀛樼墖绛夊緟寤惰繜
--
Gitblit v1.8.0