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/src/main/java/cn/stylefeng/guns/plcserver/callback/EOP010Callback.java |   44 ++++----------------------------------------
 1 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/EOP010Callback.java b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/EOP010Callback.java
index 4b21f8a..5ff95b4 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/EOP010Callback.java
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/EOP010Callback.java
@@ -39,7 +39,7 @@
 import java.util.List;
 
 @Component
-public class EOP010Callback implements SubscriptionCallback {
+public class EOP010Callback {
 
     public MiloService miloService;
 
@@ -122,42 +122,6 @@
         this.productionOrderRecordsService = productionOrderRecordsService;
         this.productionOrderBatchInfoService = productionOrderBatchInfoService;
     }
-    @Override
-    public void onSubscribe(String identifier, Object value) {
-        String ecpStr = "";//寮傚父璁板綍鏍囪
-        try {
-            //蹇冭烦
-            if(null != value && identifier.equals(OPCElement.EOP010_F_HEART_BEAT)){
-                if( "false".equals(value.toString()))
-                {
-                    ReadWriteEntity entity = new ReadWriteEntity(OPCElement.EOP010_F_HEART_BEAT,true);
-                    miloService.writeToOpcUa(entity);
-                }
-            }
-            //PLC杩涚珯
-            else if(null != value && identifier.equals(OPCElement.EOP010_J_PLC_START)){
-                if("true".equals(value.toString())){
-                    handleOrder();
-                }
-            }
-            //PLC鍑虹珯
-            else if(null != value && identifier.equals(OPCElement.EOP010_J_PLC_FINISH)){
-                if("true".equals(value.toString())){
-                    handleFinsh();
-                    handleInfo();
-                    handleMaterial();
-                }
-            }else{
-                System.out.println("鍊兼病鏈夊彉");
-            }
-        } catch (Exception e) {
-            ecpStr ="鍑虹幇寮傚父锛�" + logUtil.getTrace(e);
-        }finally {
-            if(!"".equals(ecpStr)){
-                logger.info(ecpStr+"\r\n");
-            }
-        }
-    }
 
     //PC璇诲伐鍗�
     public void handleOrder() throws Exception {
@@ -194,7 +158,8 @@
         String S_PRODUCT_STATE_CODE = miloService.
                 readFromOpcUa(OPCElement.EOP010_S_PRODUCT_STATE_CODE)
                 .getValue().toString();
-
+        ReadWriteEntity entity = new ReadWriteEntity(OPCElement.EOP010_J_PC_FINISH,true);
+        miloService.writeToOpcUa(entity);//鍐橮C瀹屾垚
         //澶勭悊杩囩珯淇℃伅
         PassingStationCollectionParam param = new PassingStationCollectionParam();
         param.setWorkOrderNo(S_ORDER_CODE);
@@ -207,8 +172,7 @@
         param.setOutRsSign(S_PRODUCT_STATE_CODE);//鍑虹珯鏄惁鍚堟牸
         passingStationCollectionService.add(param);
 
-        ReadWriteEntity entity = new ReadWriteEntity(OPCElement.EOP010_J_PC_FINISH,true);
-        miloService.writeToOpcUa(entity);//鍐橮C瀹屾垚
+
         logger.info("handleFinsh PC澶勭悊瀹屾垚锛�");
     }
 

--
Gitblit v1.9.3