From 5e0888a8dc804a4df27ce033b6c3429e530a9ef9 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期三, 26 三月 2025 19:05:24 +0800
Subject: [PATCH] -
---
billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java b/billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java
index d8e94c3..7ac51fa 100644
--- a/billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java
+++ b/billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java
@@ -1,6 +1,7 @@
package com.billion.main.plcServer;
import com.billion.main.bs.service.IBsBomChildInfoService;
+import com.billion.main.bs.service.IBsLineInfoService;
import com.billion.main.constant.Constants;
import com.billion.main.da.service.IDaCollectionParamConfService;
import com.billion.main.da.service.IDaMaterialCollectionService;
@@ -22,13 +23,10 @@
public class CustomRunner implements ApplicationRunner {
@Autowired
private MiloService miloService;
-
@Autowired
public IDaParamCollectionService daParamCollectionService;
-
@Autowired
public IDaStationCollectionService daStationCollectionService;
-
@Autowired
public IOmProductionOrderInfoService omProductionOrderInfoService;
@Autowired
@@ -41,7 +39,8 @@
public IDaMaterialCollectionService daMaterialCollectionService;
@Autowired
public ISysCountService sysCountService;
-
+ @Autowired
+ public IBsLineInfoService bsLineInfoService;
@Override
public void run(ApplicationArguments args) throws Exception {
@@ -50,7 +49,6 @@
Constants.PLC1.add(Constants.C020);
Constants.PLC1.add(Constants.C030);
Constants.PLC1.add(Constants.C050);
- Constants.PLC1.add(Constants.C060);
//PLC2璁惧//鎺掓煡涓婁笅绾�
Constants.PLC2.add(Constants.OP005);
Constants.PLC2.add(Constants.OP010);
@@ -103,19 +101,25 @@
Constants.PLC3.add(Constants.OP290_2);
Constants.PLC3.add(Constants.OP295);
Constants.PLC3.add(Constants.OP300);
- Constants.PLC3.add(Constants.OP310);
//PLC4//鎺掓煡涓婁笅绾�
Constants.PLC4.add(Constants.C040);
Constants.PLC4.add(Constants.OP030);
Constants.PLC4.add(Constants.OP050);
Constants.PLC4.add(Constants.OP110);
+ Constants.PLC4.add(Constants.OP070);
+ Constants.PLC4.add(Constants.OP075);
+ Constants.PLC4.add(Constants.OP080);
Constants.PLC4.add(Constants.OP140);
//涓婄嚎宸ヤ綅
Constants.ONLINE.add(Constants.C005);
Constants.ONLINE.add(Constants.OP005);
//涓嬬嚎宸ヤ綅
- Constants.OFFLINE.add(Constants.C070);
+ Constants.OFFLINE.add(Constants.C060);
Constants.OFFLINE.add(Constants.OP310);
+
+
+
+
OPCUaSubscription OPCUaSubscription = new OPCUaSubscription(miloService,
daParamCollectionService,
@@ -125,11 +129,12 @@
bsBomChildInfoService,
daCollectionParamConfService,
daMaterialCollectionService,
- sysCountService);
+ sysCountService,
+ bsLineInfoService);
List<String> lists = getList();
System.out.println("璁㈤槄鍐呭锛�"+lists);
- miloService.subscriptionFromOpcUa(lists,OPCUaSubscription);
+ miloService.subscriptionFromOpcUa(lists,50,OPCUaSubscription);
}
@@ -143,10 +148,10 @@
lists.add("PLC1.C030.RecordData");
lists.add("PLC1.C050.RecordData");
lists.add("PLC1.C060.RecordData");
- lists.add("PLC1.C070.RecordData");
//PLC2
lists.add("PLC2.OP005.RecordData");
- lists.add("PLC2.OP010.WorkOrderRequest");//璇锋眰宸ュ崟
+ lists.add("PLC2.OP005.WorkOrderRequest");//璇锋眰宸ュ崟
+ lists.add("PLC2.OP010.RecordData");
lists.add("PLC2.OP020.RecordData");
lists.add("PLC2.OP040.RecordData");
lists.add("PLC2.OP045.RecordData");
@@ -204,11 +209,21 @@
lists.add("PLC4.OP030.RecordData");
lists.add("PLC4.OP050.RecordData");
lists.add("PLC4.OP070.RecordData");
- lists.add("PLC3.OP110.RecordData");
- lists.add("PLC3.OP140.RecordData");
+ lists.add("PLC4.OP075.RecordData");
+ lists.add("PLC4.OP080.RecordData");
+ lists.add("PLC4.OP110.RecordData");
+ lists.add("PLC4.OP140.RecordData");
-
-
+// //TEST
+// lists.add("TEST.C005.RecordData");
+// lists.add("TEST.C005.WorkOrderRequest");
+// lists.add("TEST.C060.RecordData");
+// lists.add("TEST.OP005.RecordData");
+// lists.add("TEST.OP005.WorkOrderRequest");
+// lists.add("TEST.OP010.RecordData");
+// lists.add("TEST.OP300.RecordData");
+// lists.add("TEST.P010.RecordData");
+// lists.add("TEST.P010.WorkOrderRequest");
return lists;
}
--
Gitblit v1.9.3