From 73bc0656dc15cd9cc95c6f4f51949ef0437088ce Mon Sep 17 00:00:00 2001 From: cl <418351270@qq.com> Date: 星期五, 23 二月 2024 09:28:13 +0800 Subject: [PATCH] 修改数据采集 --- guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/OP100Callback.java | 85 +++++++++++++----------------------------- 1 files changed, 27 insertions(+), 58 deletions(-) diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/OP100Callback.java b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/OP100Callback.java index 4d5e051..1126b4b 100644 --- a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/OP100Callback.java +++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/OP100Callback.java @@ -41,7 +41,7 @@ import java.util.List; @Component -public class OP100Callback implements SubscriptionCallback { +public class OP100Callback{ public MiloService miloService; @@ -125,42 +125,7 @@ this.productionOrderBatchInfoService = productionOrderBatchInfoService; } - @Override - public void onSubscribe(String identifier, Object value) { - String ecpStr = "";//寮傚父璁板綍鏍囪 - try { - //蹇冭烦 - if(null != value && identifier.equals(OPCElement.OP100_F_HEART_BEAT)){ - if( "false".equals(value.toString())) - { - ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP100_F_HEART_BEAT,true); - miloService.writeToOpcUa(entity); - } - } - //PLC杩涚珯 - else if(null != value && identifier.equals(OPCElement.OP100_J_PLC_START)){ - if("true".equals(value.toString())){ - handleOrder(); - } - } - //PLC鍑虹珯 - else if(null != value && identifier.equals(OPCElement.OP100_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 { @@ -198,7 +163,10 @@ readFromOpcUa(OPCElement.OP100_S_PRODUCT_STATE_CODE) .getValue().toString(); - if("2".equals(S_PRODUCT_STATE_CODE)){ + ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP100_J_PC_FINISH,true); + miloService.writeToOpcUa(entity);//鍐橮C瀹屾垚 + + /* if("2".equals(S_PRODUCT_STATE_CODE)){ ProductionOrderRecordsParam productionOrderRecordsParam = new ProductionOrderRecordsParam(); productionOrderRecordsParam.setWorkOrderNo(S_ORDER_CODE); productionOrderRecordsParam.setProductNo(S_SFC_CODE); @@ -209,7 +177,7 @@ productionOrderRecordsParam.setWhetherPass(S_PRODUCT_STATE_CODE); productionOrderRecordsService.update(productionOrderRecordsParam); } - } + }*/ //澶勭悊杩囩珯淇℃伅 PassingStationCollectionParam param = new PassingStationCollectionParam(); param.setWorkOrderNo(S_ORDER_CODE); @@ -222,8 +190,7 @@ param.setOutRsSign(S_PRODUCT_STATE_CODE);//鍑虹珯鏄惁鍚堟牸 passingStationCollectionService.add(param); - ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP100_J_PC_FINISH,true); - miloService.writeToOpcUa(entity);//鍐橮C瀹屾垚 + logger.info("handleFinsh PC澶勭悊瀹屾垚锛�"); } @@ -271,24 +238,26 @@ if(null != list && !list.isEmpty()) { for (int i = 0; i < list.size(); i++) { CollectionParamConfResult result = (CollectionParamConfResult) list.get(i); - String value = miloService. + Object value = miloService. readFromOpcUa(result.getGatherAddress()) - .getValue().toString();//璇诲弬鏁板�� - ParamCollectionParam paramCollectionParam = new ParamCollectionParam(); - paramCollectionParam.setParamCode(result.getParamCode()); - paramCollectionParam.setParamName(result.getParamName()); - paramCollectionParam.setWorkOrderNo(S_ORDER_CODE); - paramCollectionParam.setSfcCode(S_SFC_CODE); - paramCollectionParam.setProductCode(S_PRODUCT_CODE); - paramCollectionParam.setProductionLine(result.getProductionLine()); - paramCollectionParam.setLocationCode(result.getLocationCode()); - paramCollectionParam.setParamValue(value); - paramCollectionParam.setParamLower(result.getParamLower()); - paramCollectionParam.setParamUpper(result.getParamUpper()); - paramCollectionParam.setParamStandard(result.getParamCentral()); - paramCollectionParam.setCollectionTime(DateTool.getLocalTimeForDate()); - paramCollectionParam.setUnit(result.getUnit()); - paramCollectionService.add(paramCollectionParam); + .getValue();//璇诲弬鏁板�� + if(null != value) { + ParamCollectionParam paramCollectionParam = new ParamCollectionParam(); + paramCollectionParam.setParamCode(result.getParamCode()); + paramCollectionParam.setParamName(result.getParamName()); + paramCollectionParam.setWorkOrderNo(S_ORDER_CODE); + paramCollectionParam.setSfcCode(S_SFC_CODE); + paramCollectionParam.setProductCode(S_PRODUCT_CODE); + paramCollectionParam.setProductionLine(result.getProductionLine()); + paramCollectionParam.setLocationCode(result.getLocationCode()); + paramCollectionParam.setParamValue(value.toString()); + paramCollectionParam.setParamLower(result.getParamLower()); + paramCollectionParam.setParamUpper(result.getParamUpper()); + paramCollectionParam.setParamStandard(result.getParamCentral()); + paramCollectionParam.setCollectionTime(DateTool.getLocalTimeForDate()); + paramCollectionParam.setUnit(result.getUnit()); + paramCollectionService.add(paramCollectionParam); + } } } -- Gitblit v1.9.3