From ba1a7a9ef126296e2798e313dc5b43f775a1123c Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期四, 23 五月 2024 17:44:36 +0800
Subject: [PATCH] 修改数据采集
---
guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/init/SubscriptionManage.java | 743 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 558 insertions(+), 185 deletions(-)
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/init/SubscriptionManage.java
similarity index 71%
rename from guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/InitCallback.java
rename to guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/init/SubscriptionManage.java
index 685fa49..13ebf19 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/init/SubscriptionManage.java
@@ -1,62 +1,33 @@
-package cn.stylefeng.guns.plcserver.callback;
+package cn.stylefeng.guns.plcserver.init;
-import cn.stylefeng.guns.modular.bs.collectionParamConf.model.params.CollectionParamConfParam;
-import cn.stylefeng.guns.modular.bs.collectionParamConf.model.result.CollectionParamConfResult;
import cn.stylefeng.guns.modular.bs.collectionParamConf.service.CollectionParamConfService;
-import cn.stylefeng.guns.modular.bs.equipmentInfo.model.params.EquipmentInfoParam;
-import cn.stylefeng.guns.modular.bs.equipmentInfo.model.result.EquipmentInfoResult;
import cn.stylefeng.guns.modular.bs.equipmentInfo.service.EquipmentInfoService;
-import cn.stylefeng.guns.modular.bs.locationInfo.model.params.LocationInfoParam;
-import cn.stylefeng.guns.modular.bs.locationInfo.model.result.LocationInfoResult;
import cn.stylefeng.guns.modular.bs.locationInfo.service.LocationInfoService;
-import cn.stylefeng.guns.modular.cm.paramCollection.model.params.ParamCollectionParam;
import cn.stylefeng.guns.modular.cm.paramCollection.service.ParamCollectionService;
-import cn.stylefeng.guns.modular.cm.passingStationCollection.model.params.PassingStationCollectionParam;
import cn.stylefeng.guns.modular.cm.passingStationCollection.service.PassingStationCollectionService;
-import cn.stylefeng.guns.modular.dq.materialTraceability.model.params.MaterialTraceabilityParam;
import cn.stylefeng.guns.modular.dq.materialTraceability.service.MaterialTraceabilityService;
-import cn.stylefeng.guns.modular.em.equipmentAlarm.model.params.EquipmentAlarmParam;
import cn.stylefeng.guns.modular.em.equipmentAlarm.service.EquipmentAlarmService;
-import cn.stylefeng.guns.modular.em.equipmentStatus.model.params.EquipmentStatusParam;
-import cn.stylefeng.guns.modular.em.equipmentStatus.model.result.EquipmentStatusResult;
import cn.stylefeng.guns.modular.em.equipmentStatus.service.EquipmentStatusService;
import cn.stylefeng.guns.modular.gm.greaseManage.service.GreaseManageService;
-import cn.stylefeng.guns.modular.om.productionOrdeInfo.model.params.ProductionOrdeInfoParam;
-import cn.stylefeng.guns.modular.om.productionOrdeInfo.model.result.ProductionOrdeInfoResult;
import cn.stylefeng.guns.modular.om.productionOrdeInfo.service.ProductionOrdeInfoService;
-import cn.stylefeng.guns.modular.om.productionOrderBatchInfo.model.params.ProductionOrderBatchInfoParam;
-import cn.stylefeng.guns.modular.om.productionOrderBatchInfo.model.result.ProductionOrderBatchInfoResult;
import cn.stylefeng.guns.modular.om.productionOrderBatchInfo.service.ProductionOrderBatchInfoService;
-import cn.stylefeng.guns.modular.om.productionOrderRecords.model.params.ProductionOrderRecordsParam;
-import cn.stylefeng.guns.modular.om.productionOrderRecords.model.result.ProductionOrderRecordsResult;
import cn.stylefeng.guns.modular.om.productionOrderRecords.service.ProductionOrderRecordsService;
-import cn.stylefeng.guns.modular.sc.repairManageInfo.model.params.RepairManageInfoParam;
-import cn.stylefeng.guns.modular.sc.repairManageInfo.model.result.RepairManageInfoResult;
import cn.stylefeng.guns.modular.sc.repairManageInfo.service.RepairManageInfoService;
-import cn.stylefeng.guns.modular.sc.serialNumbersConf.model.params.SerialNumbersConfParam;
-import cn.stylefeng.guns.modular.sc.serialNumbersConf.model.result.SerialNumbersConfResult;
import cn.stylefeng.guns.modular.sc.serialNumbersConf.service.SerialNumbersConfService;
+import cn.stylefeng.guns.plcserver.callback.*;
import cn.stylefeng.guns.plcserver.opc.GlobalVariable;
import cn.stylefeng.guns.plcserver.opc.OPCElement;
-import cn.stylefeng.guns.plcserver.opc.unit.SFCCodeTool;
-import cn.stylefeng.guns.plcserver.tool.DateTool;
import cn.stylefeng.guns.plcserver.tool.LogUtil;
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.runner.subscription.SubscriptionCallback;
import com.kangaroohy.milo.service.MiloService;
-import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
@Component
-public class InitCallback implements SubscriptionCallback {
+public class SubscriptionManage implements SubscriptionCallback {
public MiloService miloService;
@@ -97,14 +68,14 @@
private static Logger logger;
LogUtil logUtil = new LogUtil();
static {
- logger = Logger.getLogger(InitCallback.class);
+ logger = Logger.getLogger(SubscriptionManage.class);
}
- OP010Callback OP010Callback;
- OP020Callback OP020Callback;
- OP030Callback OP030Callback;
- OP040Callback OP040Callback;
- OP050Callback OP050Callback;
+ cn.stylefeng.guns.plcserver.callback.OP010Callback OP010Callback;
+ cn.stylefeng.guns.plcserver.callback.OP020Callback OP020Callback;
+ cn.stylefeng.guns.plcserver.callback.OP030Callback OP030Callback;
+ cn.stylefeng.guns.plcserver.callback.OP040Callback OP040Callback;
+ cn.stylefeng.guns.plcserver.callback.OP050Callback OP050Callback;
OP070Callback OP070Callback;
OP080Callback OP080Callback;
OP090Callback OP090Callback;
@@ -140,24 +111,24 @@
EOP090Callback EOP090Callback;
EOP090BCallback EOP090BCallback;
- StateCallback StateCallback;
+ //StateCallback StateCallback;
- public InitCallback(MiloService miloService,
- ProductionOrdeInfoService productionOrdeInfoService,
- PassingStationCollectionService passingStationCollectionService,
- ParamCollectionService paramCollectionService,
- CollectionParamConfService collectionParamConfService,
- SerialNumbersConfService serialNumbersConfService,
- EquipmentStatusService equipmentStatusService,
- EquipmentAlarmService equipmentAlarmService,
- MaterialTraceabilityService materialTraceabilityService,
- EquipmentInfoService equipmentInfoService,
- RepairManageInfoService repairManageInfoService,
- LocationInfoService locationInfoService,
- GreaseManageService greaseManageService,
- ProductionOrderRecordsService productionOrderRecordsService,
- ProductionOrderBatchInfoService productionOrderBatchInfoService) {
+ public SubscriptionManage(MiloService miloService,
+ ProductionOrdeInfoService productionOrdeInfoService,
+ PassingStationCollectionService passingStationCollectionService,
+ ParamCollectionService paramCollectionService,
+ CollectionParamConfService collectionParamConfService,
+ SerialNumbersConfService serialNumbersConfService,
+ EquipmentStatusService equipmentStatusService,
+ EquipmentAlarmService equipmentAlarmService,
+ MaterialTraceabilityService materialTraceabilityService,
+ EquipmentInfoService equipmentInfoService,
+ RepairManageInfoService repairManageInfoService,
+ LocationInfoService locationInfoService,
+ GreaseManageService greaseManageService,
+ ProductionOrderRecordsService productionOrderRecordsService,
+ ProductionOrderBatchInfoService productionOrderBatchInfoService) {
this.miloService = miloService;
this.productionOrdeInfoService = productionOrdeInfoService;
this.passingStationCollectionService = passingStationCollectionService;
@@ -375,11 +346,11 @@
repairManageInfoService,locationInfoService,greaseManageService,productionOrderRecordsService,
productionOrderBatchInfoService);
- StateCallback = new StateCallback(miloService,productionOrdeInfoService,
+ /* StateCallback = new StateCallback(miloService,productionOrdeInfoService,
passingStationCollectionService,paramCollectionService,collectionParamConfService,serialNumbersConfService,
equipmentStatusService,equipmentAlarmService,materialTraceabilityService,equipmentInfoService,
repairManageInfoService,locationInfoService,greaseManageService,productionOrderRecordsService,
- productionOrderBatchInfoService);
+ productionOrderBatchInfoService);*/
}
@@ -389,13 +360,37 @@
String ecpStr = "";//寮傚父璁板綍鏍囪
try {
if(null != value) {
+
+ if(!GlobalVariable.IS_CLOCK){
+ System.out.println("----------------------绯荤粺宸茬粡杩囨湡锛岃鑱旂郴绠＄悊鍛樿繘琛屽崌绾�----------------------");
+ System.out.println("----------------------绯荤粺宸茬粡杩囨湡锛岃鑱旂郴绠＄悊鍛樿繘琛屽崌绾�----------------------");
+ System.out.println("----------------------绯荤粺宸茬粡杩囨湡锛岃鑱旂郴绠＄悊鍛樿繘琛屽崌绾�----------------------");
+ System.out.println("----------------------绯荤粺宸茬粡杩囨湡锛岃鑱旂郴绠＄悊鍛樿繘琛屽崌绾�----------------------");
+ return;
+ }
//OP010
//蹇冭烦
- if (identifier.equals(OPCElement.OP010_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ if (identifier.equals(OPCElement.OP010_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP010_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.OP010_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ String isRepair = miloService.readFromOpcUa(OPCElement.OP010_P_REPAIR).getValue().toString();//鏄惁杩斾慨
+ if (isRepair.equals("true")) {
+ OP010Callback.handleRepair();
+ } else {
+ OP010Callback.handleOrder();
+ }
+ }
+ if("2".equals(value.toString())){
+ OP010Callback.handleFinsh();
+ OP010Callback.handleMaterial();
+ }
+ }
+
+
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.OP010_J_PLC_START) && null != value && "true".equals(value.toString())) {
String isRepair = miloService.readFromOpcUa(OPCElement.OP010_P_REPAIR).getValue().toString();//鏄惁杩斾慨
if (isRepair.equals("true")) {
@@ -408,15 +403,25 @@
else if (identifier.equals(OPCElement.OP010_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
OP010Callback.handleFinsh();
//OP010Callback.handleMaterial();
- }
+ }*/
//OP020
//蹇冭烦
- else if (identifier.equals(OPCElement.OP020_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.OP020_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP020_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.OP020_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ OP020Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ OP020Callback.handleFinsh();
+ OP020Callback.handleInfo();
+ OP020Callback.handleMaterial();
+ }
+ }
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.OP020_J_PLC_START) && null != value && "true".equals(value.toString())) {
OP020Callback.handleOrder();
}
@@ -426,15 +431,26 @@
OP020Callback.handleInfo();
//OP020Callback.handleMaterial();
- }
+ }*/
//OP030
//蹇冭烦
- else if (identifier.equals(OPCElement.OP030_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.OP030_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP030_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+
+ else if(identifier.equals(OPCElement.OP030_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ OP030Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ OP030Callback.handleFinsh();
+ OP030Callback.handleMaterial();
+ }
+ }
+
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.OP030_J_PLC_START) && null != value && "true".equals(value.toString())) {
OP030Callback.handleOrder();
}
@@ -444,15 +460,27 @@
OP030Callback.handleInfo();
//OP030Callback.handleMaterial();
- }
+ }*/
//OP040
//蹇冭烦
- else if (identifier.equals(OPCElement.OP040_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.OP040_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP040_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+
+ else if(identifier.equals(OPCElement.OP040_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ OP040Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ OP040Callback.handleFinsh();
+ OP040Callback.handleInfo();
+ OP040Callback.handleMaterial();
+ }
+ }
+
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.OP040_J_PLC_START) && null != value && "true".equals(value.toString())) {
OP040Callback.handleOrder();
}
@@ -462,15 +490,29 @@
OP040Callback.handleInfo();
//OP040Callback.handleMaterial();
- }
+ }*/
//OP050
//蹇冭烦
- else if (identifier.equals(OPCElement.OP050_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.OP050_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP050_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+
+ else if(identifier.equals(OPCElement.OP050_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ OP050Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ OP050Callback.handleFinsh();
+ OP050Callback.handleInfo();
+ OP050Callback.handleMaterial();
+
+
+ }
+ }
+
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.OP050_J_PLC_START) && null != value && "true".equals(value.toString())) {
OP050Callback.handleOrder();
}
@@ -479,15 +521,27 @@
OP050Callback.handleFinsh();
OP050Callback.handleInfo();
//OP050Callback.handleMaterial();
- }
+ }*/
//OP070
//蹇冭烦
- else if (identifier.equals(OPCElement.OP070_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.OP070_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP070_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+
+ else if(identifier.equals(OPCElement.OP070_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ OP070Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ OP070Callback.handleFinsh();
+ OP070Callback.handleInfo();
+ OP070Callback.handleMaterial();
+ }
+ }
+
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.OP070_J_PLC_START) && null != value && "true".equals(value.toString())) {
OP070Callback.handleOrder();
}
@@ -496,15 +550,29 @@
OP070Callback.handleFinsh();
OP070Callback.handleMaterial();
//OP070Callback.handleInfo();
- }
+ }*/
//OP080
//蹇冭烦
- else if (identifier.equals(OPCElement.OP080_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.OP080_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP080_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.OP080_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ String isRepair = miloService.readFromOpcUa(OPCElement.OP080_P_REPAIR).getValue().toString();//鏄惁杩斾慨
+ if (isRepair.equals("true")) {
+ OP080Callback.handleRepair();
+ } else {
+ OP080Callback.handleOrder();
+ }
+ }
+ if("2".equals(value.toString())){
+ OP080Callback.handleFinsh();
+ OP080Callback.handleMaterial();
+ }
+ }
+ /*//PLC杩涚珯
else if (identifier.equals(OPCElement.OP080_J_PLC_START) && null != value && "true".equals(value.toString())) {
String isRepair = miloService.readFromOpcUa(OPCElement.OP080_P_REPAIR).getValue().toString();//鏄惁杩斾慨
if (isRepair.equals("true")) {
@@ -519,15 +587,25 @@
OP080Callback.handleInfo();
//OP080Callback.handleMaterial();
- }
+ }*/
//OP090
//蹇冭烦
- else if (identifier.equals(OPCElement.OP090_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.OP090_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP090_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.OP090_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ OP090Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ OP090Callback.handleFinsh();
+ OP090Callback.handleInfo();
+ OP090Callback.handleMaterial();
+ }
+ }
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.OP090_J_PLC_START) && null != value && "true".equals(value.toString())) {
OP090Callback.handleOrder();
}
@@ -536,17 +614,25 @@
OP090Callback.handleFinsh();
OP090Callback.handleInfo();
//OP090Callback.handleMaterial();
-
-
- }
+ }*/
//OP100
//蹇冭烦
- else if (identifier.equals(OPCElement.OP100_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.OP100_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP100_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.OP100_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ OP100Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ OP100Callback.handleFinsh();
+ OP100Callback.handleInfo();
+ OP100Callback.handleMaterial();
+ }
+ }
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.OP100_J_PLC_START) && null != value && "true".equals(value.toString())) {
OP100Callback.handleOrder();
}
@@ -555,17 +641,24 @@
OP100Callback.handleFinsh();
OP100Callback.handleInfo();
//OP100Callback.handleMaterial();
-
-
- }
+ }*/
//OP110
//蹇冭烦
- else if (identifier.equals(OPCElement.OP110_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.OP110_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP110_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.OP110_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ OP110Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ OP110Callback.handleFinsh();
+ OP110Callback.handleMaterial();
+ }
+ }
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.OP110_J_PLC_START) && null != value && "true".equals(value.toString())) {
OP110Callback.handleOrder();
}
@@ -575,15 +668,25 @@
OP110Callback.handleInfo();
//OP110Callback.handleMaterial();
- }
+ }*/
//OP120
//蹇冭烦
- else if (identifier.equals(OPCElement.OP120_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.OP120_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP120_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.OP120_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ OP120Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ OP120Callback.handleFinsh();
+ OP120Callback.handleInfo();
+ OP120Callback.handleMaterial();
+ }
+ }
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.OP120_J_PLC_START) && null != value && "true".equals(value.toString())) {
OP120Callback.handleOrder();
}
@@ -593,15 +696,24 @@
OP120Callback.handleInfo();
//OP120Callback.handleMaterial();
- }
+ }*/
//OP120B
//蹇冭烦
- else if (identifier.equals(OPCElement.OP120B_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.OP120B_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP120B_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.OP120B_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ OP120BCallback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ OP120BCallback.handleFinsh();
+ OP120BCallback.handleInfo();
+ }
+ }
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.OP120B_J_PLC_START) && null != value && "true".equals(value.toString())) {
OP120BCallback.handleOrder();
}
@@ -610,15 +722,25 @@
OP120BCallback.handleFinsh();
//OP120BCallback.handleMaterial();
//OP120BCallback.handleInfo();
- }
+ }*/
//OP130
//蹇冭烦
- else if (identifier.equals(OPCElement.OP130_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.OP130_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP130_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.OP130_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ OP130Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ OP130Callback.handleFinsh();
+ OP130Callback.handleInfo();
+ OP130Callback.handleMaterial();
+ }
+ }
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.OP130_J_PLC_START) && null != value && "true".equals(value.toString())) {
OP130Callback.handleOrder();
}
@@ -628,15 +750,26 @@
OP130Callback.handleInfo();
//OP130Callback.handleMaterial();
- }
+ }*/
//OP130B
//蹇冭烦
- else if (identifier.equals(OPCElement.OP130B_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.OP130B_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP130B_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+
+ else if(identifier.equals(OPCElement.OP130B_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ OP130BCallback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ OP130BCallback.handleFinsh();
+ OP130BCallback.handleInfo();
+ }
+ }
+
+ /*//PLC杩涚珯
else if (identifier.equals(OPCElement.OP130B_J_PLC_START) && null != value && "true".equals(value.toString())) {
OP130BCallback.handleOrder();
}
@@ -646,15 +779,25 @@
OP130BCallback.handleInfo();
//OP130BCallback.handleMaterial();
- }
+ }*/
//OP140
//蹇冭烦
- else if (identifier.equals(OPCElement.OP140_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.OP140_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP140_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.OP140_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ OP140Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ OP140Callback.handleFinsh();
+ OP140Callback.handleInfo();
+ OP140Callback.handleMaterial();
+ }
+ }
+ /*//PLC杩涚珯
else if (identifier.equals(OPCElement.OP140_J_PLC_START) && null != value && "true".equals(value.toString())) {
OP140Callback.handleOrder();
}
@@ -664,16 +807,26 @@
OP140Callback.handleInfo();
//OP140Callback.handleMaterial();
- }
+ }*/
//OP150
//蹇冭烦
- else if (identifier.equals(OPCElement.OP150_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.OP150_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP150_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
+ else if(identifier.equals(OPCElement.OP150_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ OP150Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ OP150Callback.handleFinsh();
+ OP150Callback.handleInfo();
+ OP150Callback.handleMaterial();
+ }
+ }
//PLC杩涚珯
- else if (identifier.equals(OPCElement.OP150_J_PLC_START) && null != value && "true".equals(value.toString())) {
+ /*else if (identifier.equals(OPCElement.OP150_J_PLC_START) && null != value && "true".equals(value.toString())) {
OP150Callback.handleOrder();
}
//PLC鍑虹珯
@@ -681,33 +834,49 @@
OP150Callback.handleFinsh();
OP150Callback.handleMaterial();
//OP150Callback.handleInfo();
- }
+ }*/
//OP160
//蹇冭烦
- else if (identifier.equals(OPCElement.OP160_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.OP160_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP160_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
+ /* else if(identifier.equals(OPCElement.OP160_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ OP160Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ OP160Callback.handleFinsh();
+ }
+ }*/
//PLC杩涚珯
- else if (identifier.equals(OPCElement.OP160_J_PLC_START) && null != value && "true".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.OP160_J_PLC_START) && "true".equals(value.toString())) {
OP160Callback.handleOrder();
}
//PLC鍑虹珯
- else if (identifier.equals(OPCElement.OP160_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.OP160_J_PLC_FINISH) && "true".equals(value.toString())) {
OP160Callback.handleFinsh();
- //OP160Callback.handleMaterial();
- OP160Callback.handleInfo();
+ OP160Callback.handleMaterial();
+ //OP160Callback.handleInfo();
}
//OP170
//蹇冭烦
- else if (identifier.equals(OPCElement.OP170_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.OP170_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP170_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
+ else if(identifier.equals(OPCElement.OP170_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ OP170Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ OP170Callback.handleFinsh();
+ }
+ }
//PLC杩涚珯
- else if (identifier.equals(OPCElement.OP170_J_PLC_START) && null != value && "true".equals(value.toString())) {
+ /* else if (identifier.equals(OPCElement.OP170_J_PLC_START) && null != value && "true".equals(value.toString())) {
OP170Callback.handleOrder();
}
//PLC鍑虹珯
@@ -715,38 +884,57 @@
OP170Callback.handleFinsh();
//OP170Callback.handleMaterial();
//OP170Callback.handleInfo();
- }
+ }*/
//BOP010
//蹇冭烦
- else if (identifier.equals(OPCElement.BOP010_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.BOP010_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.BOP010_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
- else if (identifier.equals(OPCElement.BOP010_J_PLC_START) && null != value && "true".equals(value.toString())) {
- String isRepair = miloService.readFromOpcUa(OPCElement.BOP010_P_REPAIR).getValue().toString();//鏄惁杩斾慨
- if (isRepair.equals("true")) {
- BOP010Callback.handleRepair();
- } else {
- BOP010Callback.handleOrder();
+ else if(identifier.equals(OPCElement.BOP010_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ String isRepair = miloService.readFromOpcUa(OPCElement.BOP010_P_REPAIR).getValue().toString();//鏄惁杩斾慨
+ if (isRepair.equals("true")) {
+ BOP010Callback.handleRepair();
+ } else {
+ BOP010Callback.handleOrder();
+ }
}
+ if("2".equals(value.toString())){
+ BOP010Callback.handleFinsh();
+ BOP010Callback.handleMaterial();
+ }
+ }
+ /* //PLC杩涚珯
+ else if (identifier.equals(OPCElement.BOP010_J_PLC_START) && null != value && "true".equals(value.toString())) {
+
}
//PLC鍑虹珯
else if (identifier.equals(OPCElement.BOP010_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
BOP010Callback.handleFinsh();
//BOP010Callback.handleMaterial();
//BOP010Callback.handleInfo();
- }
+ }*/
//BOP020
//蹇冭烦
- else if (identifier.equals(OPCElement.BOP020_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.BOP020_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.BOP020_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.BOP020_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ BOP020Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ BOP020Callback.handleFinsh();
+ BOP020Callback.handleInfo();
+ BOP020Callback.handleMaterial();
+ }
+ }
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.BOP020_J_PLC_START) && null != value && "true".equals(value.toString())) {
BOP020Callback.handleOrder();
}
@@ -755,16 +943,27 @@
BOP020Callback.handleFinsh();
BOP020Callback.handleInfo();
//BOP020Callback.handleMaterial();
- }
+ }*/
//BOP030
//蹇冭烦
- else if (identifier.equals(OPCElement.BOP030_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.BOP030_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.BOP030_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+
+ else if(identifier.equals(OPCElement.BOP030_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ BOP030Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ BOP030Callback.handleFinsh();
+ BOP030Callback.handleMaterial();
+ }
+ }
+
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.BOP030_J_PLC_START) && null != value && "true".equals(value.toString())) {
BOP030Callback.handleOrder();
}
@@ -774,15 +973,23 @@
BOP030Callback.handleInfo();
//BOP030Callback.handleMaterial();
- }
+ }*/
//BOP030B
//蹇冭烦
- else if (identifier.equals(OPCElement.BOP030B_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.BOP030B_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.BOP030B_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.BOP030B_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ BOP030BCallback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ BOP030BCallback.handleFinsh();
+ }
+ }
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.BOP030B_J_PLC_START) && null != value && "true".equals(value.toString())) {
BOP030BCallback.handleOrder();
}
@@ -791,15 +998,24 @@
BOP030BCallback.handleFinsh();
//BOP030BCallback.handleMaterial();
//BOP030BCallback.handleInfo();
- }
+ }*/
//BOP040
//蹇冭烦
- else if (identifier.equals(OPCElement.BOP040_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.BOP040_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.BOP040_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.BOP040_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ BOP040Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ BOP040Callback.handleFinsh();
+ BOP040Callback.handleMaterial();
+ }
+ }
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.BOP040_J_PLC_START) && null != value && "true".equals(value.toString())) {
BOP040Callback.handleOrder();
}
@@ -809,15 +1025,23 @@
BOP040Callback.handleInfo();
//BOP040Callback.handleMaterial();
- }
+ }*/
//BOP040B
//蹇冭烦
- else if (identifier.equals(OPCElement.BOP040B_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.BOP040B_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.BOP040B_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.BOP040B_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ BOP040BCallback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ BOP040BCallback.handleFinsh();
+ }
+ }
+ /*//PLC杩涚珯
else if (identifier.equals(OPCElement.BOP040B_J_PLC_START) && null != value && "true".equals(value.toString())) {
BOP040BCallback.handleOrder();
}
@@ -826,16 +1050,30 @@
BOP040BCallback.handleFinsh();
// BOP040BCallback.handleMaterial();
//BOP040BCallback.handleInfo();
- }
+ }*/
//COP010
//蹇冭烦
- else if (identifier.equals(OPCElement.COP010_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.COP010_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.COP010_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.COP010_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ String isRepair = miloService.readFromOpcUa(OPCElement.COP010_P_REPAIR).getValue().toString();//鏄惁杩斾慨
+ if (isRepair.equals("true")) {
+ COP010Callback.handleRepair();
+ } else {
+ COP010Callback.handleOrder();
+ }
+ }
+ if("2".equals(value.toString())){
+ COP010Callback.handleFinsh();
+ COP010Callback.handleMaterial();
+ }
+ }
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.COP010_J_PLC_START) && null != value && "true".equals(value.toString())) {
String isRepair = miloService.readFromOpcUa(OPCElement.COP010_P_REPAIR).getValue().toString();//鏄惁杩斾慨
if (isRepair.equals("true")) {
@@ -849,16 +1087,26 @@
COP010Callback.handleFinsh();
//COP010Callback.handleMaterial();
//COP010Callback.handleInfo();
- }
+ }*/
//COP020
//蹇冭烦
- else if (identifier.equals(OPCElement.COP020_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.COP020_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.COP020_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.COP020_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ COP020Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ COP020Callback.handleFinsh();
+ COP020Callback.handleInfo();
+ COP020Callback.handleMaterial();
+ }
+ }
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.COP020_J_PLC_START) && null != value && "true".equals(value.toString())) {
COP020Callback.handleOrder();
}
@@ -868,16 +1116,26 @@
COP020Callback.handleInfo();
//COP020Callback.handleMaterial();
- }
+ }*/
//COP030
//蹇冭烦
- else if (identifier.equals(OPCElement.COP030_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.COP030_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.COP030_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.COP030_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ COP030Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ COP030Callback.handleFinsh();
+ COP030Callback.handleInfo();
+ COP030Callback.handleMaterial();
+ }
+ }
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.COP030_J_PLC_START) && null != value && "true".equals(value.toString())) {
COP030Callback.handleOrder();
}
@@ -887,16 +1145,30 @@
COP030Callback.handleInfo();
//COP030Callback.handleMaterial();
- }
+ }*/
//DOP010
//蹇冭烦
- else if (identifier.equals(OPCElement.DOP010_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.DOP010_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.DOP010_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.DOP010_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ String isRepair = miloService.readFromOpcUa(OPCElement.DOP010_P_REPAIR).getValue().toString();//鏄惁杩斾慨
+ if (isRepair.equals("true")) {
+ DOP010Callback.handleRepair();
+ } else {
+ DOP010Callback.handleOrder();
+ }
+ }
+ if("2".equals(value.toString())){
+ DOP010Callback.handleFinsh();
+ DOP010Callback.handleMaterial();
+ }
+ }
+ /*//PLC杩涚珯
else if (identifier.equals(OPCElement.DOP010_J_PLC_START) && null != value && "true".equals(value.toString())) {
String isRepair = miloService.readFromOpcUa(OPCElement.DOP010_P_REPAIR).getValue().toString();//鏄惁杩斾慨
if (isRepair.equals("true")) {
@@ -910,16 +1182,25 @@
DOP010Callback.handleFinsh();
DOP010Callback.handleMaterial();
//DOP010Callback.handleInfo();
- }
+ }*/
//DOP020
//蹇冭烦
- else if (identifier.equals(OPCElement.DOP020_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.DOP020_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.DOP020_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.DOP020_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ DOP020Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ DOP020Callback.handleFinsh();
+ DOP020Callback.handleMaterial();
+ }
+ }
+ /*//PLC杩涚珯
else if (identifier.equals(OPCElement.DOP020_J_PLC_START) && null != value && "true".equals(value.toString())) {
DOP020Callback.handleOrder();
}
@@ -929,15 +1210,24 @@
DOP020Callback.handleInfo();
//DOP020Callback.handleMaterial();
- }
+ }*/
//EOP010
//蹇冭烦
- else if (identifier.equals(OPCElement.EOP010_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.EOP010_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.EOP010_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.EOP010_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ EOP010Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ EOP010Callback.handleFinsh();
+ EOP010Callback.handleMaterial();
+ }
+ }
+ /*//PLC杩涚珯
else if (identifier.equals(OPCElement.EOP010_J_PLC_START) && null != value && "true".equals(value.toString())) {
EOP010Callback.handleOrder();
}
@@ -947,14 +1237,23 @@
EOP010Callback.handleInfo();
//EOP010Callback.handleMaterial();
- }
+ }*/
//EOP020
//蹇冭烦
- else if (identifier.equals(OPCElement.EOP020_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.EOP020_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.EOP020_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.EOP020_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ EOP020Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ EOP020Callback.handleFinsh();
+ EOP020Callback.handleMaterial();
+ }
+ }
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.EOP020_J_PLC_START) && null != value && "true".equals(value.toString())) {
EOP020Callback.handleOrder();
}
@@ -964,15 +1263,24 @@
EOP020Callback.handleInfo();
//EOP020Callback.handleMaterial();
- }
+ }*/
//EOP030
//蹇冭烦
- else if (identifier.equals(OPCElement.EOP030_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.EOP030_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.EOP030_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.EOP030_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ EOP030Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ EOP030Callback.handleFinsh();
+ EOP030Callback.handleMaterial();
+ }
+ }
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.EOP030_J_PLC_START) && null != value && "true".equals(value.toString())) {
EOP030Callback.handleOrder();
}
@@ -982,15 +1290,25 @@
EOP030Callback.handleInfo();
//EOP030Callback.handleMaterial();
- }
+ }*/
//EOP040
//蹇冭烦
- else if (identifier.equals(OPCElement.EOP040_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.EOP040_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.EOP040_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.EOP040_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ EOP040Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ EOP040Callback.handleFinsh();
+ EOP040Callback.handleInfo();
+ EOP040Callback.handleMaterial();
+ }
+ }
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.EOP040_J_PLC_START) && null != value && "true".equals(value.toString())) {
EOP040Callback.handleOrder();
}
@@ -1000,15 +1318,25 @@
EOP040Callback.handleInfo();
//EOP040Callback.handleMaterial();
- }
+ }*/
//EOP050
//蹇冭烦
- else if (identifier.equals(OPCElement.EOP050_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.EOP050_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.EOP050_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.EOP050_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ EOP050Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ EOP050Callback.handleFinsh();
+ EOP050Callback.handleInfo();
+ EOP050Callback.handleMaterial();
+ }
+ }
+ /*//PLC杩涚珯
else if (identifier.equals(OPCElement.EOP050_J_PLC_START) && null != value && "true".equals(value.toString())) {
EOP050Callback.handleOrder();
}
@@ -1018,15 +1346,24 @@
EOP050Callback.handleInfo();
//EOP050Callback.handleMaterial();
- }
+ }*/
//EOP060
//蹇冭烦
- else if (identifier.equals(OPCElement.EOP060_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.EOP060_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.EOP060_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.EOP060_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ EOP060Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ EOP060Callback.handleFinsh();
+ EOP060Callback.handleMaterial();
+ }
+ }
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.EOP060_J_PLC_START) && null != value && "true".equals(value.toString())) {
EOP060Callback.handleOrder();
}
@@ -1036,15 +1373,24 @@
EOP060Callback.handleInfo();
//EOP060Callback.handleMaterial();
- }
+ }*/
//EOP070
//蹇冭烦
- else if (identifier.equals(OPCElement.EOP070_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.EOP070_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.EOP070_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.EOP070_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ EOP070Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ EOP070Callback.handleFinsh();
+ EOP070Callback.handleMaterial();
+ }
+ }
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.EOP070_J_PLC_START) && null != value && "true".equals(value.toString())) {
EOP070Callback.handleOrder();
}
@@ -1054,15 +1400,25 @@
EOP070Callback.handleInfo();
//EOP070Callback.handleMaterial();
- }
+ }*/
//EOP080
//蹇冭烦
- else if (identifier.equals(OPCElement.EOP080_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.EOP080_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.EOP080_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.EOP080_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ EOP080Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ EOP080Callback.handleFinsh();
+ EOP080Callback.handleInfo();
+ EOP080Callback.handleMaterial();
+ }
+ }
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.EOP080_J_PLC_START) && null != value && "true".equals(value.toString())) {
EOP080Callback.handleOrder();
}
@@ -1072,15 +1428,24 @@
EOP080Callback.handleInfo();
//EOP080Callback.handleMaterial();
- }
+ }*/
//EOP090
//蹇冭烦
- else if (identifier.equals(OPCElement.EOP090_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.EOP090_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.EOP090_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.EOP090_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ EOP090Callback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ EOP090Callback.handleFinsh();
+ EOP090Callback.handleMaterial();
+ }
+ }
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.EOP090_J_PLC_START) && null != value && "true".equals(value.toString())) {
EOP090Callback.handleOrder();
}
@@ -1090,15 +1455,23 @@
EOP090Callback.handleInfo();
//EOP090Callback.handleMaterial();
- }
+ }*/
//EOP090B
//蹇冭烦
- else if (identifier.equals(OPCElement.EOP090B_F_HEART_BEAT) && null != value && "false".equals(value.toString())) {
+ else if (identifier.equals(OPCElement.EOP090B_F_HEART_BEAT) && "false".equals(value.toString())) {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.EOP090B_F_HEART_BEAT, true);
miloService.writeToOpcUa(entity);
}
- //PLC杩涚珯
+ else if(identifier.equals(OPCElement.EOP090B_PLC_REQUST) ){
+ if("1".equals(value.toString())){
+ EOP090BCallback.handleOrder();
+ }
+ if("2".equals(value.toString())){
+ EOP090BCallback.handleFinsh();
+ }
+ }
+ /* //PLC杩涚珯
else if (identifier.equals(OPCElement.EOP090B_J_PLC_START) && null != value && "true".equals(value.toString())) {
EOP090BCallback.handleOrder();
}
@@ -1107,7 +1480,7 @@
EOP090BCallback.handleFinsh();
EOP090BCallback.handleMaterial();
//EOP090BCallback.handleInfo();
- }
+ }*/
/* else if (identifier.contains("STATE") && null != value) {
EquipmentInfoParam equipmentInfoParam = new EquipmentInfoParam();
--
Gitblit v1.9.3