From 3cbdeaa5e8983ea5071ea446813ef5215b9822a0 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 25 十二月 2023 14:39:28 +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 | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 9d37a13..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
@@ -188,9 +188,17 @@
}
}
//瀹屾垚鍑虹墖
+ 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(2, 0, paramlist.get(i));
@@ -207,7 +215,8 @@
}
}
}
-
+ }
+ }
// 妫�鏌ュ竷灏斿�煎垪琛ㄦ槸鍚︿负绌�
if (!sValue.isEmpty()) {
--
Gitblit v1.8.0