From 50122609dfab86da64df82396a30a30455e5bd67 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 27 十二月 2023 08:31:08 +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 | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 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 8054729..e48d3c0 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
@@ -21,7 +21,7 @@
public class PlcParameter2 extends Thread {
@Autowired
- StorageCageService StorageCageService ;
+ StorageCageService storageCageService;
// 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
@@ -44,12 +44,12 @@
} catch (InterruptedException e) {
e.printStackTrace();
}
-
+ 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("addressList锛�" + paramlist);
//鎵嬪姩鐘舵��
List<String> addresses = Arrays.asList(config.getProperty("Parameter2.state").split(","));
@@ -132,7 +132,7 @@
// jsonObject.set("message", "Hello, Parameter2!");
// sendwServer.sendMessage(jsonObject.toString());
// }
-
+// HomeController controller = new HomeController();
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Parameter2");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
@@ -187,19 +187,27 @@
}
}
}
-
+//瀹屾垚鍑虹墖
+ boolean containsOne = data.stream().anyMatch(number -> number == 1);
for (int i = 1; i <= 5; i++) {
boolean value = sValue.get(i);
- if (value) {
+ String id=paramlist.get(i);
+ //鍒ゆ柇鏄惁鑷姩鐘舵��
+ if(!containsOne) {
+ //鍒ゆ柇id鏄惁鍖呭惈鏁板瓧
+ if(id.matches(".*\\d.*")){
+ //鍒ゆ柇娓呮id鏄惁true
+ if (value) {
+ System.out.println(id);
switch (i) {
case 1:
- HomeController.UpdateTask(0, 0, paramlist.get(i));
+ storageCageService.UpdateTask(2, 0, paramlist.get(i));
break;
case 2:
case 3:
case 4:
case 5:
- HomeController.UpdateTask(1, 0, paramlist.get(i));
+ storageCageService.UpdateTask(3, 0, paramlist.get(i));
break;
default:
// 澶勭悊绱㈠紩鍊间笉鍦ㄨ寖鍥村唴鐨勬儏鍐�
@@ -208,12 +216,14 @@
}
}
+ }
// 妫�鏌ュ竷灏斿�煎垪琛ㄦ槸鍚︿负绌�
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) {
@@ -256,24 +266,24 @@
}
}
}
-
+// 缁堟杩涚墖浠诲姟
boolean Value1 = sValue.get(0);
boolean Value2 = sValue.get(1);
if (Value1) {
- HomeController.EndTask(0);
+ storageCageService.EndTask(0);
}
if (Value2) {
- HomeController.EndTask(0);
+ storageCageService.EndTask(1);
}
// 妫�鏌ュ竷灏斿�煎垪琛ㄦ槸鍚︿负绌�
if (!sValue.isEmpty()) {
// 璋冪敤 S7control.getinstance().WriteBit 鏂规硶灏嗗竷灏斿�煎垪琛ㄥ啓鍏ュ湴鍧�鍒楄〃
- S7control.getinstance().WriteBit(addressList0, sValue);
- System.out.println("Values " + sValue + " written to PLC at address " + addressList0);
+ S7control.getinstance().WriteBit(niuanaddressList3, sValue);
+ System.out.println("Values " + sValue + " written to PLC at address " + niuanaddressList3);
}
}
} catch (Exception e) {
--
Gitblit v1.8.0