From aa1aa68141e3ee33f98cdd785ddc5c244fedc592 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 11 十一月 2024 17:39:10 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/collector/OpcUaCollector.java | 12 +++++++++---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/kio/collector/KingIOCollector.java | 15 ++++++++++++---
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/kio/collector/KingIOCollector.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/kio/collector/KingIOCollector.java
index 77339a2..4ee8b2a 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/kio/collector/KingIOCollector.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/kio/collector/KingIOCollector.java
@@ -2,9 +2,12 @@
import com.iailab.module.data.channel.kio.entity.ChannelKioDeviceEntity;
import com.iailab.module.data.channel.kio.service.ChannelKioDeviceService;
+import com.iailab.module.data.channel.opcua.collector.OpcUaUtils;
+import com.iailab.module.data.common.enums.CommonConstant;
import com.iailab.module.data.common.enums.DataSourceType;
import com.iailab.module.data.common.utils.TagUtils;
import lombok.extern.slf4j.Slf4j;
+import org.eclipse.milo.opcua.sdk.client.OpcUaClient;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -50,9 +53,15 @@
return kingIOClient;
}
- public String getTagValue(String sourceId, String tagName) throws Exception {
- KingIOClient client = this.getClient(sourceId);
- String value = client.getTagValue(tagName);
+ public String getTagValue(String sourceId, String tagName) {
+ String value = CommonConstant.BAD_VALUE.toString();
+ try{
+ KingIOClient client = this.getClient(sourceId);
+ value = client.getTagValue(tagName);
+ }catch (Exception ex){
+ ex.printStackTrace();
+ return value;
+ }
return value;
}
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/collector/OpcUaCollector.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/collector/OpcUaCollector.java
index 306e4b2..4eeff2e 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/collector/OpcUaCollector.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/collector/OpcUaCollector.java
@@ -64,9 +64,15 @@
return opcUaClient;
}
- public String getTagValue(String sourceId, String tagNo) throws Exception {
- OpcUaClient opcUaClient = this.getClient(sourceId);
- String value = OpcUaUtils.readNode(opcUaClient, tagNo);
+ public String getTagValue(String sourceId, String tagNo) {
+ String value = CommonConstant.BAD_VALUE.toString();
+ try{
+ OpcUaClient opcUaClient = this.getClient(sourceId);
+ value = OpcUaUtils.readNode(opcUaClient, tagNo);
+ }catch (Exception ex){
+ ex.printStackTrace();
+ return value;
+ }
return value;
}
--
Gitblit v1.9.3