From c49dc2f40279bcc360948cea68dec69cf213b85f Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 25 十二月 2023 15:33:34 +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 | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 b79e914..1598c96 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
@@ -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:
- StorageCageService.UpdateTask(0, 0, paramlist.get(i));
+ StorageCageService.UpdateTask(2, 0, paramlist.get(i));
break;
case 2:
case 3:
case 4:
case 5:
- StorageCageService.UpdateTask(1, 0, paramlist.get(i));
+ StorageCageService.UpdateTask(3, 0, paramlist.get(i));
break;
default:
// 澶勭悊绱㈠紩鍊间笉鍦ㄨ寖鍥村唴鐨勬儏鍐�
@@ -207,7 +215,8 @@
}
}
}
-
+ }
+ }
// 妫�鏌ュ竷灏斿�煎垪琛ㄦ槸鍚︿负绌�
if (!sValue.isEmpty()) {
@@ -256,7 +265,7 @@
}
}
}
-
+// 缁堟杩涚墖浠诲姟
boolean Value1 = sValue.get(0);
boolean Value2 = sValue.get(1);
@@ -265,7 +274,7 @@
}
if (Value2) {
- StorageCageService.EndTask(0);
+ StorageCageService.EndTask(1);
}
// 妫�鏌ュ竷灏斿�煎垪琛ㄦ槸鍚︿负绌�
--
Gitblit v1.8.0