From 4a5d67b1e01c4ee6582b2bb43a06ede8f09e9311 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 08 十一月 2024 09:40:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/controller/admin/HttpTagController.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/controller/admin/HttpTagController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/controller/admin/HttpTagController.java
index ceeac7b..c296722 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/controller/admin/HttpTagController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/controller/admin/HttpTagController.java
@@ -7,6 +7,7 @@
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.http.collector.ihdb.HttpCollectorForIhd;
import com.iailab.module.data.channel.http.entity.HttpTagEntity;
import com.iailab.module.data.channel.http.service.HttpTagService;
import com.iailab.module.data.channel.http.vo.HttpTagPageReqVO;
@@ -14,6 +15,7 @@
import com.iailab.module.data.channel.tag.vo.TagExportExcelVO;
import com.iailab.module.data.channel.tag.vo.TagImportExcelVO;
import com.iailab.module.data.channel.tag.vo.TagImportRespVO;
+import com.iailab.module.data.common.enums.IsEnableEnum;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
@@ -26,11 +28,8 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-
+import java.util.*;
+import java.util.stream.Collectors;
import static com.iailab.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static com.iailab.framework.common.pojo.CommonResult.success;
@@ -47,11 +46,30 @@
@Resource
private HttpTagService tagService;
+ @Resource
+ private HttpCollectorForIhd httpCollectorForIhd;
+
@PreAuthorize("@ss.hasPermission('data:channel-http:query')")
@GetMapping("page")
public CommonResult<PageResult<HttpTagRespVO>> page(@Valid HttpTagPageReqVO reqVO) {
+
PageResult<HttpTagEntity> page = tagService.queryPage(reqVO);
- return success(BeanUtils.toBean(page, HttpTagRespVO.class));
+ PageResult<HttpTagRespVO> pageResultVO = new PageResult<>();
+ List<String> tagNames = page.getList().stream()
+ .map(HttpTagEntity::getTagName)
+ .collect(Collectors.toList());
+ Map<String, Object> dataMap = httpCollectorForIhd.getLastValues(tagNames);
+
+ List<HttpTagRespVO> vos = page.getList().stream().map(entity -> {
+
+ HttpTagRespVO vo = BeanUtils.toBean(entity,HttpTagRespVO.class);
+ vo.setDataValue(Double.parseDouble(dataMap.get(entity.getTagName()).toString()));
+ return vo;
+ }).collect(Collectors.toList());
+
+ pageResultVO.setList(vos);
+
+ return success(pageResultVO);
}
@PreAuthorize("@ss.hasPermission('data:channel-http:query')")
@@ -108,7 +126,7 @@
public void importTemplate(HttpServletResponse response) throws IOException {
// 手动创建导出 demo
List<TagImportExcelVO> list = Collections.singletonList(
- TagImportExcelVO.builder().tagName("Tag名称").tagDesc("Tag描述").dataType("String").enabled(1)
+ TagImportExcelVO.builder().tagName("Tag名称").tagDesc("Tag描述").dataType("String").enabled(IsEnableEnum.ENABLE.getCode())
.build()
);
// 输出
--
Gitblit v1.9.3