From e8ad669f7c97d45cd23630dc101180a130d6c17e Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 05 十一月 2024 10:04:57 +0800
Subject: [PATCH] tag当前值开发
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/controller/admin/ChannelOPCDATagController.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/controller/admin/ChannelOPCDATagController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/controller/admin/ChannelOPCDATagController.java
index 2a6fb45..e04d02a 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/controller/admin/ChannelOPCDATagController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/controller/admin/ChannelOPCDATagController.java
@@ -3,19 +3,27 @@
import com.iailab.framework.common.pojo.CommonResult;
import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.util.object.BeanUtils;
+import com.iailab.module.data.channel.opcda.collector.OpcDACollector;
+import com.iailab.module.data.channel.opcda.entity.ChannelOPCDADeviceEntity;
import com.iailab.module.data.channel.opcda.entity.ChannelOPCDATagEntity;
+import com.iailab.module.data.channel.opcda.service.ChannelOPCDADeviceService;
import com.iailab.module.data.channel.opcda.service.ChannelOPCDATagService;
import com.iailab.module.data.channel.opcda.vo.OpcDaTagPageReqVO;
import com.iailab.module.data.channel.opcda.vo.OpcDaTagRespVO;
+import com.iailab.module.data.common.enums.DataSourceType;
import com.iailab.module.data.common.exception.RRException;
+import com.iailab.module.data.common.utils.TagUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
import java.util.UUID;
+import java.util.stream.Collectors;
import static com.iailab.framework.common.pojo.CommonResult.success;
@@ -31,11 +39,34 @@
@Autowired
private ChannelOPCDATagService channelOPCDATagService;
+ @Autowired
+ private OpcDACollector opcDACollector;
+
+ @Autowired
+ private ChannelOPCDADeviceService channelOPCDADeviceService;
+
@PreAuthorize("@ss.hasPermission('data:channel-opcua:query')")
@GetMapping("page")
public CommonResult<PageResult<OpcDaTagRespVO>> list(@Valid OpcDaTagPageReqVO reqVO) {
+
PageResult<ChannelOPCDATagEntity> page = channelOPCDATagService.queryPage(reqVO);
- return success(BeanUtils.toBean(page, OpcDaTagRespVO.class));
+ PageResult<OpcDaTagRespVO> pageResultVO = new PageResult<>();
+ pageResultVO.setTotal(page.getTotal());
+
+ List<OpcDaTagRespVO> vos = page.getList().stream().map(entity -> {
+
+ OpcDaTagRespVO vo = BeanUtils.toBean(entity,OpcDaTagRespVO.class);
+ List<String[]> tags = new ArrayList<>();
+ String[] array = {reqVO.getServerId(),entity.getTagName()};
+ tags.add(array);
+ ChannelOPCDADeviceEntity OPCDADevice = channelOPCDADeviceService.info(reqVO.getServerId());
+ vo.setDataValue(Double.parseDouble(opcDACollector.getTagValues(tags).get(TagUtils.genTagId(DataSourceType.OPCDA.getCode(), OPCDADevice.getServerName(),entity.getTagName())).toString()));
+ return vo;
+ }).collect(Collectors.toList());
+
+ pageResultVO.setList(vos);
+
+ return success(pageResultVO);
}
@PreAuthorize("@ss.hasPermission('data:channel-opcua:query')")
--
Gitblit v1.9.3