From a5b887bad106aed4a175c97846576f020fe83bc7 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 24 一月 2024 13:31:14 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterObject.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterObject.java b/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterObject.java
index 163c45e..5e5abc9 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterObject.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterObject.java
@@ -64,22 +64,29 @@
return null;
}
+
+
/**
* 鏍规嵁鍙傛暟鏍囪瘑 鑾峰彇鏌愪釜鍙傛暟瀹炰緥
*
- * @param codeid 鍙傛暟鏍囪瘑
+ * @param codeids 鍙傛暟鏍囪瘑
* @return 鑾峰彇鏌愪釜鍙傛暟瀹炰緥
*/
public List<String> getPlcParameterValues(List<String> codeids) {
List<String> arrayList = new ArrayList();
if (plcParameterList != null) {
for (PlcParameterInfo plcParameterInfo : plcParameterList) {
- if (codeids.contains(plcParameterInfo.getCodeId().toString()))
+ if (codeids.contains(plcParameterInfo.getCodeId()))
arrayList.add(plcParameterInfo.getValue());
}
}
return arrayList;
}
+
+
+
+
+
/**
* 娣诲姞鍙傛暟瀹炰緥
--
Gitblit v1.8.0