From 314bc7a1733856bd82c9d99bdfa27b34a4a762c3 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期一, 22 一月 2024 12:58:37 +0800
Subject: [PATCH] 修改数据采集
---
guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/InitCallback.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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/callback/InitCallback.java
index 50da06a..79ae7ed 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
@@ -398,7 +398,6 @@
public void onSubscribe(String identifier, Object value) {
String ecpStr = "";//寮傚父璁板綍鏍囪
try {
-
if(null != value) {
//OP010
//蹇冭烦
@@ -1076,7 +1075,7 @@
EOP090BCallback.handleInfo();
}
- else if (identifier.contains("STATE") && null != value && "true".equals(value.toString())) {
+ else if (identifier.contains("STATE") && null != value) {
EquipmentInfoParam equipmentInfoParam = new EquipmentInfoParam();
equipmentInfoParam.setSpareField1(identifier);
List<EquipmentInfoResult> lists = equipmentInfoService.findListBySpec(equipmentInfoParam);
@@ -1132,10 +1131,12 @@
}
}
-
- // handleOilState("DOP020");
- StateCallback.handleOilStateOP050("OP050");
- StateCallback.handleOilStateBOP030("BOP030");
+ if(identifier.contains("OP050") && !identifier.contains("EOP050") ){
+ StateCallback.handleOilStateOP050("OP050");
+ }
+ if (identifier.contains("BOP030")){
+ StateCallback.handleOilStateBOP030("BOP030");
+ }
}
else {
--
Gitblit v1.9.3