From 68f0c8f92fb7c82dc447b9aaed2d23760c546f25 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 17 五月 2024 20:22:20 +0800
Subject: [PATCH] -

---
 jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java |   52 ++++++++++++++++++++++++++++++++++------------------
 1 files changed, 34 insertions(+), 18 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 c9c9d3d..52d205c 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,7 @@
 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;
@@ -37,6 +38,9 @@
     @Autowired
     private IOmProductionOrdeInfoService omProductionOrdeInfoService;
 
+    @Autowired
+    private IDaTestDeviceInterfaceService daTestDeviceInterfaceService;
+
     @Override
     public void run(ApplicationArguments args) throws Exception {
 
@@ -45,11 +49,12 @@
                 daPassingStationCollectionService,
                 collectionParamConfService,
                 daParamCollectionService,
-                omProductionOrdeInfoService);
+                omProductionOrdeInfoService,
+                daTestDeviceInterfaceService);
 
         List<String> lists = getSubList();
-        miloService.subscriptionFromOpcUa(lists,opcUaSubscription);
-
+        System.out.println("璁㈤槄鍐呭锛�"+lists);
+        miloService.subscriptionFromOpcUa(lists,50,opcUaSubscription);
     }
 
     /**
@@ -60,43 +65,54 @@
         lists.add(OPCElement.PACK_OP230_RecordData);//璇锋眰璁板綍鏁版嵁
         lists.add(OPCElement.PACK_OP240_RecordData);//璇锋眰璁板綍鏁版嵁.
         lists.add(OPCElement.PACK_OP240_AngleResult);//璇锋眰璁板綍鏁版嵁
-        lists.add(OPCElement.PACK_OP2502_RecordData);//璇锋眰璁板綍鏁版嵁.
+        lists.add(OPCElement.PACK_OP2501_AngleResult);//璇锋眰璁板綍鏁版嵁
         lists.add(OPCElement.PACK_OP2502_AngleResult);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP2503_AngleResult);//璇锋眰璁板綍鏁版嵁
         lists.add(OPCElement.PACK_OP260_RecordData);//璇锋眰璁板綍鏁版嵁
         lists.add(OPCElement.PACK_OP260_AngleResult);//璇锋眰璁板綍鏁版嵁
         lists.add(OPCElement.PACK_OP270_RecordData);//璇锋眰璁板綍鏁版嵁
         lists.add(OPCElement.PACK_OP270_AngleResult);//璇锋眰璁板綍鏁版嵁
         lists.add(OPCElement.PACK_OP290_RecordData);//璇锋眰璁板綍鏁版嵁
         lists.add(OPCElement.PACK_OP290_AngleResult);//璇锋眰璁板綍鏁版嵁
-        lists.add(OPCElement.PACK_OP300_RecordData);//璇锋眰璁板綍鏁版嵁
-        lists.add(OPCElement.PACK_OP300_AngleResult);//璇锋眰璁板綍鏁版嵁
-        lists.add(OPCElement.PACK_OP310_RecordData);//璇锋眰璁板綍鏁版嵁
-        lists.add(OPCElement.PACK_OP310_AngleResult);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP300A_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP300B_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP310A_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP310B_RecordData);//璇锋眰璁板綍鏁版嵁
         lists.add(OPCElement.PACK_OP330_RecordData);//璇锋眰璁板綍鏁版嵁
-        lists.add(OPCElement.PACK_OP330_AngleResult);//璇锋眰璁板綍鏁版嵁
         lists.add(OPCElement.PACK_OP380_RecordData);//璇锋眰璁板綍鏁版嵁
         lists.add(OPCElement.PACK_OP380_AngleResult);//璇锋眰璁板綍鏁版嵁
         lists.add(OPCElement.PACK_OP400_RecordData);//璇锋眰璁板綍鏁版嵁
         lists.add(OPCElement.PACK_OP400_AngleResult);//璇锋眰璁板綍鏁版嵁
         lists.add(OPCElement.PACK_OP410_RecordData);//璇锋眰璁板綍鏁版嵁
         lists.add(OPCElement.PACK_OP410_AngleResult);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP4301_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP4302_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP4303_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP4304_RecordData);//璇锋眰璁板綍鏁版嵁
         lists.add(OPCElement.PACK_OP440_RecordData);//璇锋眰璁板綍鏁版嵁
-        lists.add(OPCElement.PACK_OP440_AngleResult);//璇锋眰璁板綍鏁版嵁
         lists.add(OPCElement.PACK_OP450_RecordData);//璇锋眰璁板綍鏁版嵁
         lists.add(OPCElement.PACK_OP450_AngleResult);//璇锋眰璁板綍鏁版嵁
         lists.add(OPCElement.PACK_OP460_RecordData);//璇锋眰璁板綍鏁版嵁
         lists.add(OPCElement.PACK_OP460_AngleResult);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP4801_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP4802_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP4803_RecordData);//璇锋眰璁板綍鏁版嵁
+
         lists.add(OPCElement.PACK_OP500_RecordData);//璇锋眰璁板綍鏁版嵁
         lists.add(OPCElement.PACK_OP500_AngleResult);//璇锋眰璁板綍鏁版嵁
 //
-//        lists.add(OPCElement.PACK_OP280_RecordData);//璇锋眰璁板綍鏁版嵁
-//        lists.add(OPCElement.PACK_OP320_RecordData);//璇锋眰璁板綍鏁版嵁
-//        lists.add(OPCElement.PACK_OP340_RecordData);//璇锋眰璁板綍鏁版嵁
-//        lists.add(OPCElement.PACK_OP350_RecordData);//璇锋眰璁板綍鏁版嵁
-//        lists.add(OPCElement.PACK_OP360_RecordData);//璇锋眰璁板綍鏁版嵁
-//        lists.add(OPCElement.PACK_OP370_RecordData);//璇锋眰璁板綍鏁版嵁
-//        lists.add(OPCElement.PACK_OP390_RecordData);//璇锋眰璁板綍鏁版嵁
-//        lists.add(OPCElement.PACK_OP470_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP280_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP320A_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP320B_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP340A_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP340B_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP350A_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP350B_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP360_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP365_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP370_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP390_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP470_RecordData);//璇锋眰璁板綍鏁版嵁
 
         return lists;
     }

--
Gitblit v1.9.3