From 51eb318f6df9ebc7d1ff47522e33b2ee7cea1ba8 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期日, 09 三月 2025 16:30:44 +0800
Subject: [PATCH] 修改
---
billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java | 158 +++++++++++++++++++++++++++-------------------------
1 files changed, 82 insertions(+), 76 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..6b332b3 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);
@@ -114,7 +110,7 @@
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,
@@ -135,77 +131,87 @@
public List<String> getList(){
List<String> lists = new ArrayList<>();
- //PLC1
- lists.add("PLC1.C005.RecordData");
- lists.add("PLC1.C005.WorkOrderRequest");//璇锋眰宸ュ崟
- lists.add("PLC1.C010.RecordData");
- lists.add("PLC1.C020.RecordData");
- 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.OP020.RecordData");
- lists.add("PLC2.OP040.RecordData");
- lists.add("PLC2.OP045.RecordData");
- lists.add("PLC2.OP060.RecordData");
- lists.add("PLC2.OP070.RecordData");
- lists.add("PLC2.OP075.RecordData");
- lists.add("PLC2.OP080.RecordData");
- lists.add("PLC2.OP090.RecordData");
- lists.add("PLC2.OP095-1.RecordData");
- lists.add("PLC2.OP095-2.RecordData");
- lists.add("PLC2.OP100-1.RecordData");
- lists.add("PLC2.OP100-2.RecordData");
- lists.add("PLC2.OP120.RecordData");
- lists.add("PLC2.P010.RecordData");
- lists.add("PLC2.P010.WorkOrderRequest");//璇锋眰宸ュ崟
- //PLC3
- lists.add("PLC3.OP130.RecordData");
- lists.add("PLC3.OP145-1.RecordData");
- lists.add("PLC3.OP145-2.RecordData");
- lists.add("PLC3.OP150-1.RecordData");
- lists.add("PLC3.OP150-2.RecordData");
- lists.add("PLC3.OP160.RecordData");
- lists.add("PLC3.OP165-1.RecordData");
- lists.add("PLC3.OP165-2.RecordData");
- lists.add("PLC3.OP170-1.RecordData");
- lists.add("PLC3.OP170-2.RecordData");
- lists.add("PLC3.OP180.RecordData");
- lists.add("PLC3.OP190-1.RecordData");
- lists.add("PLC3.OP190-2.RecordData");
- lists.add("PLC3.OP200-1.RecordData");
- lists.add("PLC3.OP200-2.RecordData");
- lists.add("PLC3.OP210-1.RecordData");
- lists.add("PLC3.OP210-2.RecordData");
- lists.add("PLC3.OP220-1.RecordData");
- lists.add("PLC3.OP220-2.RecordData");
- lists.add("PLC3.OP230-1.RecordData");
- lists.add("PLC3.OP230-2.RecordData");
- lists.add("PLC3.OP240-1.RecordData");
- lists.add("PLC3.OP240-2.RecordData");
- lists.add("PLC3.OP250-1.RecordData");
- lists.add("PLC3.OP250-2.RecordData");
- lists.add("PLC3.OP260-1.RecordData");
- lists.add("PLC3.OP260-2.RecordData");
- lists.add("PLC3.OP270-1.RecordData");
- lists.add("PLC3.OP270-2.RecordData");
- lists.add("PLC3.OP275.RecordData");
- lists.add("PLC3.OP280.RecordData");
- lists.add("PLC3.OP290-1.RecordData");
- lists.add("PLC3.OP290-2.RecordData");
- lists.add("PLC3.OP295.RecordData");
- lists.add("PLC3.OP300.RecordData");
- lists.add("PLC3.OP310.RecordData");
- //PLC4
- lists.add("PLC4.C040.RecordData");
- 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");
+// //PLC1
+// lists.add("PLC1.C005.RecordData");
+// lists.add("PLC1.C005.WorkOrderRequest");//璇锋眰宸ュ崟
+// lists.add("PLC1.C010.RecordData");
+// lists.add("PLC1.C020.RecordData");
+// lists.add("PLC1.C030.RecordData");
+// lists.add("PLC1.C050.RecordData");
+// lists.add("PLC1.C060.RecordData");
+// //PLC2
+// lists.add("PLC2.OP005.RecordData");
+// lists.add("PLC2.OP010.WorkOrderRequest");//璇锋眰宸ュ崟
+// lists.add("PLC2.OP020.RecordData");
+// lists.add("PLC2.OP040.RecordData");
+// lists.add("PLC2.OP045.RecordData");
+// lists.add("PLC2.OP060.RecordData");
+// lists.add("PLC2.OP070.RecordData");
+// lists.add("PLC2.OP075.RecordData");
+// lists.add("PLC2.OP080.RecordData");
+// lists.add("PLC2.OP090.RecordData");
+// lists.add("PLC2.OP095-1.RecordData");
+// lists.add("PLC2.OP095-2.RecordData");
+// lists.add("PLC2.OP100-1.RecordData");
+// lists.add("PLC2.OP100-2.RecordData");
+// lists.add("PLC2.OP120.RecordData");
+// lists.add("PLC2.P010.RecordData");
+// lists.add("PLC2.P010.WorkOrderRequest");//璇锋眰宸ュ崟
+// //PLC3
+// lists.add("PLC3.OP130.RecordData");
+// lists.add("PLC3.OP145-1.RecordData");
+// lists.add("PLC3.OP145-2.RecordData");
+// lists.add("PLC3.OP150-1.RecordData");
+// lists.add("PLC3.OP150-2.RecordData");
+// lists.add("PLC3.OP160.RecordData");
+// lists.add("PLC3.OP165-1.RecordData");
+// lists.add("PLC3.OP165-2.RecordData");
+// lists.add("PLC3.OP170-1.RecordData");
+// lists.add("PLC3.OP170-2.RecordData");
+// lists.add("PLC3.OP180.RecordData");
+// lists.add("PLC3.OP190-1.RecordData");
+// lists.add("PLC3.OP190-2.RecordData");
+// lists.add("PLC3.OP200-1.RecordData");
+// lists.add("PLC3.OP200-2.RecordData");
+// lists.add("PLC3.OP210-1.RecordData");
+// lists.add("PLC3.OP210-2.RecordData");
+// lists.add("PLC3.OP220-1.RecordData");
+// lists.add("PLC3.OP220-2.RecordData");
+// lists.add("PLC3.OP230-1.RecordData");
+// lists.add("PLC3.OP230-2.RecordData");
+// lists.add("PLC3.OP240-1.RecordData");
+// lists.add("PLC3.OP240-2.RecordData");
+// lists.add("PLC3.OP250-1.RecordData");
+// lists.add("PLC3.OP250-2.RecordData");
+// lists.add("PLC3.OP260-1.RecordData");
+// lists.add("PLC3.OP260-2.RecordData");
+// lists.add("PLC3.OP270-1.RecordData");
+// lists.add("PLC3.OP270-2.RecordData");
+// lists.add("PLC3.OP275.RecordData");
+// lists.add("PLC3.OP280.RecordData");
+// lists.add("PLC3.OP290-1.RecordData");
+// lists.add("PLC3.OP290-2.RecordData");
+// lists.add("PLC3.OP295.RecordData");
+// lists.add("PLC3.OP300.RecordData");
+// lists.add("PLC3.OP310.RecordData");
+// //PLC4
+// lists.add("PLC4.C040.RecordData");
+// 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");
+
+ //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");
--
Gitblit v1.9.3