From 4e83fa344f6cba81412fb354e7f32a88a8f34fde Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 09 七月 2024 09:39:11 +0800
Subject: [PATCH] -切换大模组代码更改
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 81 ++++++++++++++++++++++++++++++++--------
1 files changed, 65 insertions(+), 16 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 75f616f..93a8fff 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
@@ -4,6 +4,8 @@
import com.jcdm.main.da.collectionParamConf.service.IDaCollectionParamConfService;
import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
+import com.jcdm.main.da.testDeviceInterface.service.IDaTestDeviceInterfaceService;
+import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
import com.jcdm.main.plcserver.conf.OPCElement;
import com.jcdm.main.plcserver.sub.OPCUaSubscription;
import com.kangaroohy.milo.service.MiloService;
@@ -33,6 +35,12 @@
@Autowired
private IDaCollectionParamConfService daCollectionParamConfService;
+ @Autowired
+ private IOmProductionOrdeInfoService omProductionOrdeInfoService;
+
+ @Autowired
+ private IDaTestDeviceInterfaceService daTestDeviceInterfaceService;
+
@Override
public void run(ApplicationArguments args) throws Exception {
@@ -40,11 +48,13 @@
miloService,
daPassingStationCollectionService,
collectionParamConfService,
- daParamCollectionService);
+ daParamCollectionService,
+ omProductionOrdeInfoService,
+ daTestDeviceInterfaceService);
List<String> lists = getSubList();
- miloService.subscriptionFromOpcUa(lists,opcUaSubscription);
-
+ System.out.println("璁㈤槄鍐呭锛�"+lists);
+ miloService.subscriptionFromOpcUa(lists,50,opcUaSubscription);
}
/**
@@ -52,19 +62,58 @@
*/
public List<String> getSubList(){
List<String> lists = new ArrayList<>();
-// 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_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP230_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP240_RecordData);//璇锋眰璁板綍鏁版嵁.
+ lists.add(OPCElement.PACK_POP240_TighteningFrequency);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_PPOP241_TighteningFrequency);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_PPOP242_TighteningFrequency);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP301_TighteningFrequency);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP250_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP250_TighteningFrequency);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP260_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP260_TighteningFrequency);//璇锋眰璁板綍鏁版嵁
+// lists.add(OPCElement.PACK_OP290_RecordData);//璇锋眰璁板綍鏁版嵁
+// lists.add(OPCElement.PACK_OP290_AngleResult);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP281_RecordData);//璇锋眰璁板綍鏁版嵁
+// lists.add(OPCElement.PACK_OP300B_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP282_RecordData);//璇锋眰璁板綍鏁版嵁
+// lists.add(OPCElement.PACK_OP310B_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP284_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP310_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP310_TighteningFrequency);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP330_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP330_TighteningFrequency);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP340_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP340_TighteningFrequency);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP3601_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP3602_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP3603_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP3604_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP370_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP380_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP390_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP4101_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP4102_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP4103_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP4201_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP4202_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP4203_RecordData);//璇锋眰璁板綍鏁版嵁
+//
+ lists.add(OPCElement.PACK_POP430_RecordData);//璇锋眰璁板綍鏁版嵁
+// lists.add(OPCElement.PACK__AngleResult);//璇锋眰璁板綍鏁版嵁
+////
+ lists.add(OPCElement.PACK_POP270_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP283_RecordData);//璇锋眰璁板綍鏁版嵁
+// lists.add(OPCElement.PACK_OP320B_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP285_RecordData);//璇锋眰璁板綍鏁版嵁
+// lists.add(OPCElement.PACK_OP340B_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP286_RecordData);//璇锋眰璁板綍鏁版嵁
+// lists.add(OPCElement.PACK_OP350B_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP290_RecordData);//璇锋眰璁板綍鏁版嵁
+// lists.add(OPCElement.PACK_OP365_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP300_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP320_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_POP400_RecordData);//璇锋眰璁板綍鏁版嵁
return lists;
}
--
Gitblit v1.9.3