From 02722a3f9eca857ce7fffea352e9f7ee692a1b71 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期五, 08 十一月 2024 08:35:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/kio/controller/admin/ChannelKioTagController.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/kio/controller/admin/ChannelKioTagController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/kio/controller/admin/ChannelKioTagController.java
index b1e28b1..02b60d5 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/kio/controller/admin/ChannelKioTagController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/kio/controller/admin/ChannelKioTagController.java
@@ -7,6 +7,9 @@
import com.iailab.framework.common.util.object.BeanUtils;
import com.iailab.framework.common.util.object.ConvertUtils;
import com.iailab.framework.excel.core.util.ExcelUtils;
+import com.iailab.module.data.channel.kio.collector.KingIOCollector;
+import com.iailab.framework.common.util.object.ConvertUtils;
+import com.iailab.framework.excel.core.util.ExcelUtils;
import com.iailab.module.data.channel.kio.entity.ChannelKioTagEntity;
import com.iailab.module.data.channel.kio.service.ChannelKioTagService;
import com.iailab.module.data.channel.kio.vo.KioTagPageReqVO;
@@ -31,6 +34,7 @@
import java.util.Date;
import java.util.List;
import java.util.UUID;
+import java.util.stream.Collectors;
import static com.iailab.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static com.iailab.framework.common.pojo.CommonResult.success;
@@ -44,14 +48,34 @@
@Resource
private ChannelKioTagService channelKioTagService;
+ @Resource
+ private KingIOCollector kingIOCollector;
+
/**
* 分页查询tag
* */
@PreAuthorize("@ss.hasPermission('data:channel-kio:query')")
@GetMapping("page")
public CommonResult<PageResult<KioTagRespVO>> page(@Valid KioTagPageReqVO reqVO){
+
PageResult<ChannelKioTagEntity> page = channelKioTagService.queryPage(reqVO);
- return success(BeanUtils.toBean(page, KioTagRespVO.class));
+ PageResult<KioTagRespVO> pageResultVO = new PageResult<>();
+ pageResultVO.setTotal(page.getTotal());
+
+ List<KioTagRespVO> vos = page.getList().stream().map(entity -> {
+
+ KioTagRespVO vo = BeanUtils.toBean(entity,KioTagRespVO.class);
+ try {
+ vo.setDataValue(Double.parseDouble(kingIOCollector.getTagValue(reqVO.getDeviceId(), entity.getTagName())));
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return vo;
+ }).collect(Collectors.toList());
+
+ pageResultVO.setList(vos);
+
+ return success(pageResultVO);
}
@PreAuthorize("@ss.hasPermission('data:channel-kio:query')")
@@ -97,7 +121,7 @@
List<TagExportExcelVO> list = ConvertUtils.sourceToTarget(page.getList(), TagExportExcelVO.class);
ExcelUtils.write(response, "tag列表.xls", "数据", TagExportExcelVO.class, list, true);
}
-
+
@GetMapping("/get-import-template")
@Operation(summary = "获得tag导入模板")
public void importTemplate(HttpServletResponse response) throws IOException {
--
Gitblit v1.9.3