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/modbus/controller/admin/ChannelModbusTagController.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/controller/admin/ChannelModbusTagController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/controller/admin/ChannelModbusTagController.java
index 38b5a98..00fec66 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/controller/admin/ChannelModbusTagController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/controller/admin/ChannelModbusTagController.java
@@ -3,6 +3,7 @@
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.modbus.collector.ModBusCollector;
import com.iailab.module.data.channel.modbus.entity.ChannelModBusTagEntity;
import com.iailab.module.data.channel.modbus.entity.ChannelModBusTagEntity;
import com.iailab.module.data.channel.modbus.service.ChannelModbusTagService;
@@ -12,8 +13,11 @@
import javax.annotation.Resource;
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;
@@ -28,11 +32,25 @@
@Resource
private ChannelModbusTagService channelModbusTagService;
+ @Resource
+ private ModBusCollector modBusCollector;
+
@GetMapping("/page")
public CommonResult<PageResult<ModBusTagRespVO>> list(@Valid ModBusTagPageReqVO reqVO) {
PageResult<ChannelModBusTagEntity> page = channelModbusTagService.queryPage(reqVO);
+ PageResult<ModBusTagRespVO> pageResultVO = new PageResult<>();
+ pageResultVO.setTotal(page.getTotal());
- return success(BeanUtils.toBean(page, ModBusTagRespVO.class));
+ List<ModBusTagRespVO> vos = page.getList().stream().map(entity -> {
+
+ ModBusTagRespVO vo = BeanUtils.toBean(entity,ModBusTagRespVO.class);
+ vo.setDataValue(modBusCollector.getTagValue(reqVO.getDeviceId(),entity.getTagName()));
+ return vo;
+ }).collect(Collectors.toList());
+
+ pageResultVO.setList(vos);
+
+ return success(pageResultVO);
}
/**
--
Gitblit v1.9.3