From 2883c25a71cb080258f5e17430ff5ee37c0061c2 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 22 一月 2024 09:05:05 +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 | 19 +++----------------
1 files changed, 3 insertions(+), 16 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 56a0230..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
@@ -69,14 +69,14 @@
/**
* 鏍规嵁鍙傛暟鏍囪瘑 鑾峰彇鏌愪釜鍙傛暟瀹炰緥
*
- * @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());
}
}
@@ -84,20 +84,7 @@
}
- public List<String> getPlcAddressList(String codeid) {
- List<String> addressList = new ArrayList<>();
- if (plcParameterList != null) {
- for (PlcParameterInfo plcParameterInfo : plcParameterList) {
- if (plcParameterInfo.getCodeId().equals(codeid)) {
- int plcAddress = plcParameterInfo.getPlcAddress();
- if (!addressList.contains(plcAddress)) {
- addressList.add(String.valueOf(plcAddress));
- }
- }
- }
- }
- return addressList;
- }
+
--
Gitblit v1.8.0