From 505237e928b3518483f3a49080a4e0b266bd7e7d Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期四, 11 四月 2024 14:01:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
index b847049..cbff0e6 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
@@ -30,6 +30,9 @@
@Autowired
private IDaParamCollectionService daParamCollectionService;
+ @Autowired
+ private IDaCollectionParamConfService daCollectionParamConfService;
+
@Override
public void run(ApplicationArguments args) throws Exception {
@@ -49,14 +52,20 @@
*/
public List<String> getSubList(){
List<String> lists = new ArrayList<>();
- lists.add(OPCElement.OP_OP010_RecordSN);//璇锋眰涓嬪彂SN鍙�
- lists.add(OPCElement.OP_OP230_RecordData);//璇锋眰璁板綍鏁版嵁
- lists.add(OPCElement.OP_OP240_RecordData);//璇锋眰璁板綍鏁版嵁
- lists.add(OPCElement.OP_OP240_AngleResult);//璇锋眰璁板綍鏁版嵁
- lists.add(OPCElement.OP_OP250_RecordData);//璇锋眰璁板綍鏁版嵁
- lists.add(OPCElement.OP_OP250_AngleResult);//璇锋眰璁板綍鏁版嵁
- lists.add(OPCElement.OP_OP380_RecordData);//璇锋眰璁板綍鏁版嵁
- lists.add(OPCElement.OP_OP380_AngleResult);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP010_RecordSN);//璇锋眰涓嬪彂SN鍙�
+ lists.add(OPCElement.PACK_OP230_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP240_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP240_AngleResult);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP250_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP250_AngleResult);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP380_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP380_AngleResult);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP300_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP300_AngleResult);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP270_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP270_AngleResult);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP370_Grade);//璇锋眰璁板綍鏁版嵁
+
return lists;
}
}
--
Gitblit v1.9.3