From e7a9d55133fc1ce4b7651767e6b4c4d41bbe32a0 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期三, 24 四月 2024 13:37:42 +0800
Subject: [PATCH] 修改数据采集

---
 guns-vip-main/pom.xml                                                              |   45 -----------
 guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/init/CustomRunner.java     |   74 +++++++++---------
 guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/InitCallback.java |   74 +++++++++---------
 3 files changed, 74 insertions(+), 119 deletions(-)

diff --git a/guns-vip-main/pom.xml b/guns-vip-main/pom.xml
index cff8f13..af153d6 100644
--- a/guns-vip-main/pom.xml
+++ b/guns-vip-main/pom.xml
@@ -22,51 +22,6 @@
             <artifactId>log4j</artifactId>
             <version>1.2.17</version>
         </dependency>
-        <!--utgard start-->
-        <!--utgard start-->
-        <dependency>
-            <groupId>org.openscada.external</groupId>
-            <artifactId>org.openscada.external.jcifs</artifactId>
-            <version>1.2.25</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcprov-jdk15on</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.openscada.jinterop</groupId>
-            <artifactId>org.openscada.jinterop.core</artifactId>
-            <version>2.1.8</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openscada.jinterop</groupId>
-            <artifactId>org.openscada.jinterop.deps</artifactId>
-            <version>1.5.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcprov-jdk15on</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.openscada.utgard</groupId>
-            <artifactId>org.openscada.opc.dcom</artifactId>
-            <version>1.5.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openscada.utgard</groupId>
-            <artifactId>org.openscada.opc.lib</artifactId>
-            <version>1.5.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.61</version>
-        </dependency>
-        <!--utgard end-->
 
         <!-- guns-vip鍩虹妗嗘灦 -->
         <dependency>
diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/InitCallback.java b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/InitCallback.java
index 2a7d9ef..685fa49 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/InitCallback.java
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/InitCallback.java
@@ -407,7 +407,7 @@
                 //PLC鍑虹珯
                 else if (identifier.equals(OPCElement.OP010_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     OP010Callback.handleFinsh();
-                    OP010Callback.handleMaterial();
+                    //OP010Callback.handleMaterial();
                 }
 
                 //OP020
@@ -424,7 +424,7 @@
                 else if (identifier.equals(OPCElement.OP020_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     OP020Callback.handleFinsh();
                     OP020Callback.handleInfo();
-                    OP020Callback.handleMaterial();
+                    //OP020Callback.handleMaterial();
 
                 }
 
@@ -442,7 +442,7 @@
                 else if (identifier.equals(OPCElement.OP030_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     OP030Callback.handleFinsh();
                     OP030Callback.handleInfo();
-                    OP030Callback.handleMaterial();
+                    //OP030Callback.handleMaterial();
 
                 }
 
@@ -460,7 +460,7 @@
                 else if (identifier.equals(OPCElement.OP040_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     OP040Callback.handleFinsh();
                     OP040Callback.handleInfo();
-                    OP040Callback.handleMaterial();
+                    //OP040Callback.handleMaterial();
 
                 }
 
@@ -478,7 +478,7 @@
                 else if (identifier.equals(OPCElement.OP050_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     OP050Callback.handleFinsh();
                     OP050Callback.handleInfo();
-                    OP050Callback.handleMaterial();
+                    //OP050Callback.handleMaterial();
                 }
 
                 //OP070
@@ -495,7 +495,7 @@
                 else if (identifier.equals(OPCElement.OP070_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     OP070Callback.handleFinsh();
                     OP070Callback.handleMaterial();
-                    OP070Callback.handleInfo();
+                    //OP070Callback.handleInfo();
                 }
 
                 //OP080
@@ -517,7 +517,7 @@
                 else if (identifier.equals(OPCElement.OP080_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     OP080Callback.handleFinsh();
                     OP080Callback.handleInfo();
-                    OP080Callback.handleMaterial();
+                    //OP080Callback.handleMaterial();
 
                 }
 
@@ -535,7 +535,7 @@
                 else if (identifier.equals(OPCElement.OP090_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     OP090Callback.handleFinsh();
                     OP090Callback.handleInfo();
-                    OP090Callback.handleMaterial();
+                    //OP090Callback.handleMaterial();
 
 
                 }
@@ -554,7 +554,7 @@
                 else if (identifier.equals(OPCElement.OP100_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     OP100Callback.handleFinsh();
                     OP100Callback.handleInfo();
-                    OP100Callback.handleMaterial();
+                    //OP100Callback.handleMaterial();
 
 
                 }
@@ -573,7 +573,7 @@
                 else if (identifier.equals(OPCElement.OP110_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     OP110Callback.handleFinsh();
                     OP110Callback.handleInfo();
-                    OP110Callback.handleMaterial();
+                    //OP110Callback.handleMaterial();
 
                 }
 
@@ -591,7 +591,7 @@
                 else if (identifier.equals(OPCElement.OP120_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     OP120Callback.handleFinsh();
                     OP120Callback.handleInfo();
-                    OP120Callback.handleMaterial();
+                    //OP120Callback.handleMaterial();
 
                 }
 
@@ -626,7 +626,7 @@
                 else if (identifier.equals(OPCElement.OP130_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     OP130Callback.handleFinsh();
                     OP130Callback.handleInfo();
-                    OP130Callback.handleMaterial();
+                    //OP130Callback.handleMaterial();
 
                 }
 
@@ -644,7 +644,7 @@
                 else if (identifier.equals(OPCElement.OP130B_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     OP130BCallback.handleFinsh();
                     OP130BCallback.handleInfo();
-                    OP130BCallback.handleMaterial();
+                    //OP130BCallback.handleMaterial();
 
                 }
 
@@ -662,7 +662,7 @@
                 else if (identifier.equals(OPCElement.OP140_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     OP140Callback.handleFinsh();
                     OP140Callback.handleInfo();
-                    OP140Callback.handleMaterial();
+                    //OP140Callback.handleMaterial();
 
                 }
 
@@ -680,7 +680,7 @@
                 else if (identifier.equals(OPCElement.OP150_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     OP150Callback.handleFinsh();
                     OP150Callback.handleMaterial();
-                    OP150Callback.handleInfo();
+                    //OP150Callback.handleInfo();
                 }
 
                 //OP160
@@ -696,7 +696,7 @@
                 //PLC鍑虹珯
                 else if (identifier.equals(OPCElement.OP160_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     OP160Callback.handleFinsh();
-                    OP160Callback.handleMaterial();
+                    //OP160Callback.handleMaterial();
                     OP160Callback.handleInfo();
                 }
 
@@ -713,7 +713,7 @@
                 //PLC鍑虹珯
                 else if (identifier.equals(OPCElement.OP170_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     OP170Callback.handleFinsh();
-                    OP170Callback.handleMaterial();
+                    //OP170Callback.handleMaterial();
                     //OP170Callback.handleInfo();
                 }
 
@@ -735,7 +735,7 @@
                 //PLC鍑虹珯
                 else if (identifier.equals(OPCElement.BOP010_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     BOP010Callback.handleFinsh();
-                    BOP010Callback.handleMaterial();
+                    //BOP010Callback.handleMaterial();
                     //BOP010Callback.handleInfo();
                 }
 
@@ -754,7 +754,7 @@
                 else if (identifier.equals(OPCElement.BOP020_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     BOP020Callback.handleFinsh();
                     BOP020Callback.handleInfo();
-                    BOP020Callback.handleMaterial();
+                    //BOP020Callback.handleMaterial();
                 }
 
 
@@ -772,7 +772,7 @@
                 else if (identifier.equals(OPCElement.BOP030_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     BOP030Callback.handleFinsh();
                     BOP030Callback.handleInfo();
-                    BOP030Callback.handleMaterial();
+                    //BOP030Callback.handleMaterial();
 
                 }
 
@@ -807,7 +807,7 @@
                 else if (identifier.equals(OPCElement.BOP040_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     BOP040Callback.handleFinsh();
                     BOP040Callback.handleInfo();
-                    BOP040Callback.handleMaterial();
+                    //BOP040Callback.handleMaterial();
 
                 }
 
@@ -847,7 +847,7 @@
                 //PLC鍑虹珯
                 else if (identifier.equals(OPCElement.COP010_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     COP010Callback.handleFinsh();
-                    COP010Callback.handleMaterial();
+                    //COP010Callback.handleMaterial();
                     //COP010Callback.handleInfo();
                 }
 
@@ -866,7 +866,7 @@
                 else if (identifier.equals(OPCElement.COP020_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     COP020Callback.handleFinsh();
                     COP020Callback.handleInfo();
-                    COP020Callback.handleMaterial();
+                    //COP020Callback.handleMaterial();
 
                 }
 
@@ -885,7 +885,7 @@
                 else if (identifier.equals(OPCElement.COP030_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     COP030Callback.handleFinsh();
                     COP030Callback.handleInfo();
-                    COP030Callback.handleMaterial();
+                    //COP030Callback.handleMaterial();
 
                 }
 
@@ -927,7 +927,7 @@
                 else if (identifier.equals(OPCElement.DOP020_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     DOP020Callback.handleFinsh();
                     DOP020Callback.handleInfo();
-                    DOP020Callback.handleMaterial();
+                    //DOP020Callback.handleMaterial();
 
                 }
 
@@ -945,7 +945,7 @@
                 else if (identifier.equals(OPCElement.EOP010_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     EOP010Callback.handleFinsh();
                     EOP010Callback.handleInfo();
-                    EOP010Callback.handleMaterial();
+                    //EOP010Callback.handleMaterial();
 
                 }
                 //EOP020
@@ -962,7 +962,7 @@
                 else if (identifier.equals(OPCElement.EOP020_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     EOP020Callback.handleFinsh();
                     EOP020Callback.handleInfo();
-                    EOP020Callback.handleMaterial();
+                    //EOP020Callback.handleMaterial();
 
                 }
 
@@ -980,7 +980,7 @@
                 else if (identifier.equals(OPCElement.EOP030_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     EOP030Callback.handleFinsh();
                     EOP030Callback.handleInfo();
-                    EOP030Callback.handleMaterial();
+                    //EOP030Callback.handleMaterial();
 
                 }
 
@@ -998,7 +998,7 @@
                 else if (identifier.equals(OPCElement.EOP040_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     EOP040Callback.handleFinsh();
                     EOP040Callback.handleInfo();
-                    EOP040Callback.handleMaterial();
+                    //EOP040Callback.handleMaterial();
 
                 }
 
@@ -1016,7 +1016,7 @@
                 else if (identifier.equals(OPCElement.EOP050_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     EOP050Callback.handleFinsh();
                     EOP050Callback.handleInfo();
-                    EOP050Callback.handleMaterial();
+                    //EOP050Callback.handleMaterial();
 
                 }
 
@@ -1034,7 +1034,7 @@
                 else if (identifier.equals(OPCElement.EOP060_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     EOP060Callback.handleFinsh();
                     EOP060Callback.handleInfo();
-                    EOP060Callback.handleMaterial();
+                    //EOP060Callback.handleMaterial();
 
                 }
 
@@ -1052,7 +1052,7 @@
                 else if (identifier.equals(OPCElement.EOP070_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     EOP070Callback.handleFinsh();
                     EOP070Callback.handleInfo();
-                    EOP070Callback.handleMaterial();
+                    //EOP070Callback.handleMaterial();
 
                 }
 
@@ -1070,7 +1070,7 @@
                 else if (identifier.equals(OPCElement.EOP080_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     EOP080Callback.handleFinsh();
                     EOP080Callback.handleInfo();
-                    EOP080Callback.handleMaterial();
+                    //EOP080Callback.handleMaterial();
 
                 }
 
@@ -1088,7 +1088,7 @@
                 else if (identifier.equals(OPCElement.EOP090_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     EOP090Callback.handleFinsh();
                     EOP090Callback.handleInfo();
-                    EOP090Callback.handleMaterial();
+                    //EOP090Callback.handleMaterial();
 
                 }
 
@@ -1106,10 +1106,10 @@
                 else if (identifier.equals(OPCElement.EOP090B_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                     EOP090BCallback.handleFinsh();
                     EOP090BCallback.handleMaterial();
-                    EOP090BCallback.handleInfo();
+                    //EOP090BCallback.handleInfo();
                 }
 
-                else if (identifier.contains("STATE") && null != value) {
+               /* else if (identifier.contains("STATE") && null != value) {
                     EquipmentInfoParam equipmentInfoParam = new EquipmentInfoParam();
                     equipmentInfoParam.setSpareField1(identifier);
                     List<EquipmentInfoResult> lists = equipmentInfoService.findListBySpec(equipmentInfoParam);
@@ -1171,7 +1171,7 @@
                     if (identifier.contains("BOP030")){
                         StateCallback.handleOilStateBOP030("BOP030");
                     }
-                }
+                }*/
 
                 else {
                     System.out.println("鍊兼病鏈夊彉");
diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/init/CustomRunner.java b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/init/CustomRunner.java
index a871695..3f623e8 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/init/CustomRunner.java
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/init/CustomRunner.java
@@ -102,43 +102,43 @@
     public List<String> getList(){
         List<String> lists = new ArrayList<>();
 
-        lists.add(OPCElement.COP010_F_HEART_BEAT);
+        //lists.add(OPCElement.COP010_F_HEART_BEAT);
         lists.add(OPCElement.COP010_J_PLC_START);
         lists.add(OPCElement.COP010_J_PLC_FINISH);
 
-        lists.add(OPCElement.COP020_F_HEART_BEAT);
+        //lists.add(OPCElement.COP020_F_HEART_BEAT);
         lists.add(OPCElement.COP020_J_PLC_START);
         lists.add(OPCElement.COP020_J_PLC_FINISH);
 
-        lists.add(OPCElement.COP030_F_HEART_BEAT);
+        //lists.add(OPCElement.COP030_F_HEART_BEAT);
         lists.add(OPCElement.COP030_J_PLC_START);
         lists.add(OPCElement.COP030_J_PLC_FINISH);
 
-        lists.add(OPCElement.BOP010_F_HEART_BEAT);
+        //lists.add(OPCElement.BOP010_F_HEART_BEAT);
         lists.add(OPCElement.BOP010_J_PLC_START);
         lists.add(OPCElement.BOP010_J_PLC_FINISH);
 
-        lists.add(OPCElement.BOP020_F_HEART_BEAT);
+        //lists.add(OPCElement.BOP020_F_HEART_BEAT);
         lists.add(OPCElement.BOP020_J_PLC_START);
         lists.add(OPCElement.BOP020_J_PLC_FINISH);
 
-        lists.add(OPCElement.BOP030_F_HEART_BEAT);
+        //lists.add(OPCElement.BOP030_F_HEART_BEAT);
         lists.add(OPCElement.BOP030_J_PLC_START);
         lists.add(OPCElement.BOP030_J_PLC_FINISH);
 
-        lists.add(OPCElement.BOP030B_F_HEART_BEAT);
+        //lists.add(OPCElement.BOP030B_F_HEART_BEAT);
         lists.add(OPCElement.BOP030B_J_PLC_START);
         lists.add(OPCElement.BOP030B_J_PLC_FINISH);
 
-        lists.add(OPCElement.BOP040_F_HEART_BEAT);
+        //lists.add(OPCElement.BOP040_F_HEART_BEAT);
         lists.add(OPCElement.BOP040_J_PLC_START);
         lists.add(OPCElement.BOP040_J_PLC_FINISH);
 
-        lists.add(OPCElement.BOP040B_F_HEART_BEAT);
+        //lists.add(OPCElement.BOP040B_F_HEART_BEAT);
         lists.add(OPCElement.BOP040B_J_PLC_START);
         lists.add(OPCElement.BOP040B_J_PLC_FINISH);
 
-        lists.add(OPCElement.DOP010_F_HEART_BEAT);
+        //lists.add(OPCElement.DOP010_F_HEART_BEAT);
         lists.add(OPCElement.DOP010_J_PLC_START);
         lists.add(OPCElement.DOP010_J_PLC_FINISH);
 
@@ -146,103 +146,103 @@
         lists.add(OPCElement.DOP020_J_PLC_START);
         lists.add(OPCElement.DOP020_J_PLC_FINISH);*/
 
-        lists.add(OPCElement.EOP010_F_HEART_BEAT);
+        //lists.add(OPCElement.EOP010_F_HEART_BEAT);
         lists.add(OPCElement.EOP010_J_PLC_START);
         lists.add(OPCElement.EOP010_J_PLC_FINISH);
 
-        lists.add(OPCElement.EOP020_F_HEART_BEAT);
+        //lists.add(OPCElement.EOP020_F_HEART_BEAT);
         lists.add(OPCElement.EOP020_J_PLC_START);
         lists.add(OPCElement.EOP020_J_PLC_FINISH);
 
-        lists.add(OPCElement.EOP030_F_HEART_BEAT);
+        //lists.add(OPCElement.EOP030_F_HEART_BEAT);
         lists.add(OPCElement.EOP030_J_PLC_START);
         lists.add(OPCElement.EOP030_J_PLC_FINISH);
 
-        lists.add(OPCElement.EOP040_F_HEART_BEAT);
+        //lists.add(OPCElement.EOP040_F_HEART_BEAT);
         lists.add(OPCElement.EOP040_J_PLC_START);
         lists.add(OPCElement.EOP040_J_PLC_FINISH);
 
-        lists.add(OPCElement.EOP050_F_HEART_BEAT);
+        //lists.add(OPCElement.EOP050_F_HEART_BEAT);
         lists.add(OPCElement.EOP050_J_PLC_START);
         lists.add(OPCElement.EOP050_J_PLC_FINISH);
 
-        lists.add(OPCElement.EOP060_F_HEART_BEAT);
+        //lists.add(OPCElement.EOP060_F_HEART_BEAT);
         lists.add(OPCElement.EOP060_J_PLC_START);
         lists.add(OPCElement.EOP060_J_PLC_FINISH);
 
-        lists.add(OPCElement.EOP070_F_HEART_BEAT);
+        //lists.add(OPCElement.EOP070_F_HEART_BEAT);
         lists.add(OPCElement.EOP070_J_PLC_START);
         lists.add(OPCElement.EOP070_J_PLC_FINISH);
 
-        lists.add(OPCElement.EOP070_F_HEART_BEAT);
+        //lists.add(OPCElement.EOP070_F_HEART_BEAT);
         lists.add(OPCElement.EOP070_J_PLC_START);
         lists.add(OPCElement.EOP070_J_PLC_FINISH);
 
-        lists.add(OPCElement.EOP090_F_HEART_BEAT);
+        //lists.add(OPCElement.EOP090_F_HEART_BEAT);
         lists.add(OPCElement.EOP090_J_PLC_START);
         lists.add(OPCElement.EOP090_J_PLC_FINISH);
 
-        lists.add(OPCElement.EOP090B_F_HEART_BEAT);
+        //lists.add(OPCElement.EOP090B_F_HEART_BEAT);
         lists.add(OPCElement.EOP090B_J_PLC_START);
         lists.add(OPCElement.EOP090B_J_PLC_FINISH);
 
-        lists.add(OPCElement.OP010_F_HEART_BEAT);
+        //lists.add(OPCElement.OP010_F_HEART_BEAT);
         lists.add(OPCElement.OP010_J_PLC_START);
         lists.add(OPCElement.OP010_J_PLC_FINISH);
 
-        lists.add(OPCElement.OP020_F_HEART_BEAT);
+        //lists.add(OPCElement.OP020_F_HEART_BEAT);
         lists.add(OPCElement.OP020_J_PLC_START);
         lists.add(OPCElement.OP020_J_PLC_FINISH);
 
-        lists.add(OPCElement.OP030_F_HEART_BEAT);
+        //lists.add(OPCElement.OP030_F_HEART_BEAT);
         lists.add(OPCElement.OP030_J_PLC_START);
         lists.add(OPCElement.OP030_J_PLC_FINISH);
 
-        lists.add(OPCElement.OP040_F_HEART_BEAT);
+        //lists.add(OPCElement.OP040_F_HEART_BEAT);
         lists.add(OPCElement.OP040_J_PLC_START);
         lists.add(OPCElement.OP040_J_PLC_FINISH);
 
-        lists.add(OPCElement.OP050_F_HEART_BEAT);
+        //lists.add(OPCElement.OP050_F_HEART_BEAT);
         lists.add(OPCElement.OP050_J_PLC_START);
         lists.add(OPCElement.OP050_J_PLC_FINISH);
 
-        lists.add(OPCElement.OP070_F_HEART_BEAT);
+        //lists.add(OPCElement.OP070_F_HEART_BEAT);
         lists.add(OPCElement.OP070_J_PLC_START);
         lists.add(OPCElement.OP070_J_PLC_FINISH);
 
-        lists.add(OPCElement.OP080_F_HEART_BEAT);
+        //lists.add(OPCElement.OP080_F_HEART_BEAT);
         lists.add(OPCElement.OP080_J_PLC_START);
         lists.add(OPCElement.OP080_J_PLC_FINISH);
 
-        lists.add(OPCElement.OP090_F_HEART_BEAT);
+        //lists.add(OPCElement.OP090_F_HEART_BEAT);
         lists.add(OPCElement.OP090_J_PLC_START);
         lists.add(OPCElement.OP090_J_PLC_FINISH);
 
-        lists.add(OPCElement.OP100_F_HEART_BEAT);
+        //lists.add(OPCElement.OP100_F_HEART_BEAT);
         lists.add(OPCElement.OP100_J_PLC_START);
         lists.add(OPCElement.OP100_J_PLC_FINISH);
 
-        lists.add(OPCElement.OP110_F_HEART_BEAT);
+        //lists.add(OPCElement.OP110_F_HEART_BEAT);
         lists.add(OPCElement.OP110_J_PLC_START);
         lists.add(OPCElement.OP110_J_PLC_FINISH);
 
-        lists.add(OPCElement.OP120_F_HEART_BEAT);
+        //lists.add(OPCElement.OP120_F_HEART_BEAT);
         lists.add(OPCElement.OP120_J_PLC_START);
         lists.add(OPCElement.OP120_J_PLC_FINISH);
 
-        lists.add(OPCElement.OP120B_F_HEART_BEAT);
+        //lists.add(OPCElement.OP120B_F_HEART_BEAT);
         lists.add(OPCElement.OP120B_J_PLC_START);
         lists.add(OPCElement.OP120B_J_PLC_FINISH);
 
-        lists.add(OPCElement.OP130_F_HEART_BEAT);
+        //lists.add(OPCElement.OP130_F_HEART_BEAT);
         lists.add(OPCElement.OP130_J_PLC_START);
         lists.add(OPCElement.OP130_J_PLC_FINISH);
 
-        lists.add(OPCElement.OP130B_F_HEART_BEAT);
+        //lists.add(OPCElement.OP130B_F_HEART_BEAT);
         lists.add(OPCElement.OP130B_J_PLC_START);
         lists.add(OPCElement.OP130B_J_PLC_FINISH);
 
-        lists.add(OPCElement.OP140_F_HEART_BEAT);
+        //lists.add(OPCElement.OP140_F_HEART_BEAT);
         lists.add(OPCElement.OP140_J_PLC_START);
         lists.add(OPCElement.OP140_J_PLC_FINISH);
 
@@ -250,11 +250,11 @@
         lists.add(OPCElement.OP150_J_PLC_START);
         lists.add(OPCElement.OP150_J_PLC_FINISH);*/
 
-        lists.add(OPCElement.OP160_F_HEART_BEAT);
+        //lists.add(OPCElement.OP160_F_HEART_BEAT);
         lists.add(OPCElement.OP160_J_PLC_START);
         lists.add(OPCElement.OP160_J_PLC_FINISH);
 
-        lists.add(OPCElement.OP170_F_HEART_BEAT);
+        //lists.add(OPCElement.OP170_F_HEART_BEAT);
         lists.add(OPCElement.OP170_J_PLC_START);
         lists.add(OPCElement.OP170_J_PLC_FINISH);
 

--
Gitblit v1.9.3