From ae6879a7575f79d814c70781e6efc1b6218f3732 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 14 三月 2025 14:10:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 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 69cf86b..42a8e86 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
@@ -22,13 +22,10 @@
public class CustomRunner implements ApplicationRunner {
@Autowired
private MiloService miloService;
-
@Autowired
public IDaParamCollectionService daParamCollectionService;
-
@Autowired
public IDaStationCollectionService daStationCollectionService;
-
@Autowired
public IOmProductionOrderInfoService omProductionOrderInfoService;
@Autowired
@@ -50,7 +47,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);
@@ -109,15 +105,18 @@
Constants.PLC4.add(Constants.OP030);
Constants.PLC4.add(Constants.OP050);
Constants.PLC4.add(Constants.OP110);
+ Constants.PLC4.add(Constants.OP070_1);
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);
- Constants.OFFLINE.add(Constants.P010);
+
+
+
+
OPCUaSubscription OPCUaSubscription = new OPCUaSubscription(miloService,
daParamCollectionService,
@@ -145,10 +144,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");
@@ -205,12 +204,20 @@
lists.add("PLC4.C040.RecordData");
lists.add("PLC4.OP030.RecordData");
lists.add("PLC4.OP050.RecordData");
- lists.add("PLC4.OP070.RecordData");
+ lists.add("PLC4.OP070_1.RecordData");
lists.add("PLC3.OP110.RecordData");
lists.add("PLC3.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.OP310.RecordData");
+// lists.add("TEST.P010.RecordData");
+// lists.add("TEST.P010.WorkOrderRequest");
return lists;
}
--
Gitblit v1.9.3