From 06168f70aa1eb3c79edef3dc94fc2c1ba206b069 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期二, 16 七月 2024 18:12:39 +0800
Subject: [PATCH] 修改参数采集
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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 25ac8d1..7386efc 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
@@ -509,7 +509,7 @@
//濡傛灉220宸ヤ綅锛岃繘琛屾姤宸�
if("M1OP220".equals(device)) {
- RestfulService.getWorkReportResultFeedback(moduleCode, "M1OP220", format.format(new Date()));
+ getWorkReportResultFeedback(moduleCode, "M1OP220", format.format(new Date()));
}
//涓婁紶鍒板伐鍘俶es
@@ -526,7 +526,7 @@
parentVO.setProductNum(moduleCode);
//娣诲姞鍩虹鏁版嵁
- List<ChildVO> basicList = getCollectParamBasicData(device);
+ List<ChildVO> basicList = getCollectParamBasicData(device,moduleCode);
mesList.addAll(basicList);
parentVO.setCheckList(mesList);
@@ -770,7 +770,7 @@
}
//娣诲姞鍩虹鏁版嵁
- List<ChildVO> basicList = getCollectParamBasicData(device);
+ List<ChildVO> basicList = getCollectParamBasicData(device,cellCodeList.get(i));
mesChildList.addAll(basicList);
parentVO.setCheckList(mesChildList);//鍙傛暟
@@ -943,10 +943,12 @@
/**
* 鑾峰彇閲囬泦鍙傛暟鍩虹鏁版嵁
* @param stationCode
+ * @param sfcCode
* @return list
*/
- public static List<ChildVO> getCollectParamBasicData(String stationCode) {
+ public static List<ChildVO> getCollectParamBasicData(String stationCode,String sfcCode) {
List<ChildVO> basicList = new ArrayList<>();
+ List<DaParamCollection> collectionList = new ArrayList<>();
try {
//鏌ヨ鍙傛暟閰嶇疆琛�
List<DaCollectionParamConf> list = collectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
@@ -963,7 +965,18 @@
childVO.setCheckResult("1");
childVO.setCheckTime(format.format(new Date()));
basicList.add(childVO);
+
+ DaParamCollection daParamCollection = new DaParamCollection();
+ daParamCollection.setSfcCode(sfcCode);//妯＄粍鐮�
+ daParamCollection.setParamCode(conf.getCollectParameterId());//鍙傛暟缂栫爜
+ daParamCollection.setParamName(conf.getCollectParameterName());//鍙傛暟鍚嶇О
+
+ daParamCollection.setParamValue(conf.getParamCentral());//鍙傛暟鍊�
+ daParamCollection.setLocationCode(stationCode);//宸ヤ綅
+ daParamCollection.setCollectionTime(new Date());//閲囬泦鏃堕棿
+ collectionList.add(daParamCollection);//灏佽鍙傛暟閲囬泦list
}
+ daParamCollectionService.insertBatch(collectionList);
}
return basicList;
}catch (Exception e) {
--
Gitblit v1.9.3