From 5c4c78563bc55ac7a18e029a211f4a6be14b047a Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期二, 18 三月 2025 14:23:03 +0800
Subject: [PATCH] 修改
---
billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java | 172 +++++++++++++++++++++++++++++----------------------------
1 files changed, 88 insertions(+), 84 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 6b332b3..1a65524 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
@@ -99,12 +99,14 @@
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);
@@ -112,6 +114,10 @@
//涓嬬嚎宸ヤ綅
Constants.OFFLINE.add(Constants.C060);
Constants.OFFLINE.add(Constants.OP310);
+
+
+
+
OPCUaSubscription OPCUaSubscription = new OPCUaSubscription(miloService,
daParamCollectionService,
@@ -131,90 +137,88 @@
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");
-// //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.OP005.WorkOrderRequest");//璇锋眰宸ュ崟
+ lists.add("PLC2.OP010.RecordData");
+ 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_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");
-
-
-
+// //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