From aecc4908e1f2861d2dab1929a88f9053238b2dd2 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期一, 26 八月 2024 16:58:33 +0800
Subject: [PATCH] kio opcda opcua代码升级
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/tag/controller/TagController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/tag/controller/TagController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/tag/controller/TagController.java
index 54cb417..5bb4e71 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/tag/controller/TagController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/tag/controller/TagController.java
@@ -1,5 +1,7 @@
package com.iailab.module.data.channel.tag.controller;
+import com.iailab.module.data.channel.kio.entity.ChannelKioDeviceEntity;
+import com.iailab.module.data.channel.kio.entity.ChannelKioTagEntity;
import com.iailab.module.data.common.enums.DataSourceType;
import com.iailab.framework.common.pojo.CommonResult;
import com.iailab.module.data.channel.kio.dto.ChannelKioDeviceDTO;
@@ -121,14 +123,14 @@
TagOptionDTO kioData = new TagOptionDTO();
kioData.setValue(DataSourceType.KIO.getCode());
kioData.setLabel(DataSourceType.KIO.getDesc());
- List<ChannelKioDeviceDTO> kioList = channelKioDeviceService.list(new HashMap<>());
+ List<ChannelKioDeviceEntity> kioList = channelKioDeviceService.list(new HashMap<>());
List<TagOptionDTO> kioDeviceOp = new ArrayList<>();
if (!CollectionUtils.isEmpty(kioList)) {
kioList.forEach(item -> {
TagOptionDTO op1 = new TagOptionDTO();
op1.setValue(item.getId());
op1.setLabel(item.getInstanceName());
- List<ChannelKioTagDTO> tags = channelKioTagService.getByDevice(item.getInstanceName());
+ List<ChannelKioTagEntity> tags = channelKioTagService.getByDevice(item.getInstanceName());
List<TagOptionDTO> op2 = new ArrayList<>();
tags.forEach(item1 -> {
TagOptionDTO op3 = new TagOptionDTO();
--
Gitblit v1.9.3