From 5fbc7a423b6d51716695ff8317337fc40719e2a6 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期一, 15 七月 2024 10:39:42 +0800
Subject: [PATCH] 修改参数采集
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
index 6a0efe1..801adc5 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -524,6 +524,11 @@
parentVO.setTotalResult("1");
}
parentVO.setProductNum(moduleCode);
+
+ //娣诲姞鍩虹鏁版嵁
+ List<ChildVO> basicList = getCollectParamBasicData(device);
+ mesList.addAll(basicList);
+
parentVO.setCheckList(mesList);
log.info("鎵ц宸ュ巶MES鏂规硶start锛屽伐浣嶅彿{} 浼犲叆鏁版嵁锛歿}",device ,parentVO);
@@ -763,6 +768,11 @@
break;
}
+
+ //娣诲姞鍩虹鏁版嵁
+ List<ChildVO> basicList = getCollectParamBasicData(device);
+ mesChildList.addAll(basicList);
+
parentVO.setCheckList(mesChildList);//鍙傛暟
//CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
log.info("鎵ц宸ュ巶MES鏂规硶start锛屼紶鍏ユ暟鎹細{}",parentVO);
@@ -932,11 +942,10 @@
/**
* 鑾峰彇閲囬泦鍙傛暟鍩虹鏁版嵁
- * @param productCode
* @param stationCode
* @return list
*/
- public List<ChildVO> getCollectParamBasicData(String productCode , String stationCode) {
+ public static List<ChildVO> getCollectParamBasicData(String stationCode) {
List<ChildVO> basicList = new ArrayList<>();
try {
//鏌ヨ鍙傛暟閰嶇疆琛�
--
Gitblit v1.9.3