From 2c7661d0bca739a9b403cdd420d2b91eb77470e6 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期一, 29 四月 2024 19:48:32 +0800
Subject: [PATCH] -

---
 jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java |   61 +++++++++++++++++++++++++-----
 1 files changed, 50 insertions(+), 11 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 5a6836c..c9bdf04 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.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 +34,9 @@
     @Autowired
     private IDaCollectionParamConfService daCollectionParamConfService;
 
+    @Autowired
+    private IOmProductionOrdeInfoService omProductionOrdeInfoService;
+
     @Override
     public void run(ApplicationArguments args) throws Exception {
 
@@ -40,9 +44,11 @@
                 miloService,
                 daPassingStationCollectionService,
                 collectionParamConfService,
-                daParamCollectionService);
+                daParamCollectionService,
+                omProductionOrdeInfoService);
 
         List<String> lists = getSubList();
+        System.out.println("璁㈤槄鍐呭锛�"+lists);
         miloService.subscriptionFromOpcUa(lists,opcUaSubscription);
 
     }
@@ -52,19 +58,52 @@
      */
     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_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_OP370_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP290_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP290_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_OP330A_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP330B_RecordData);//璇锋眰璁板綍鏁版嵁
+        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_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_OP500_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP500_AngleResult);//璇锋眰璁板綍鏁版嵁
+//
+        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