From ad69b5895a0348dd827a32513293ce4bee920519 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期四, 02 一月 2025 14:35:23 +0800
Subject: [PATCH] 调度模型下发数据类型字典、数据质量字典
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/controller/admin/HttpTagController.java | 30 ++++++++++--------------------
1 files changed, 10 insertions(+), 20 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 c296722..0731d9e 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,7 +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.collector.HttpCollector;
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;
@@ -15,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.DataQualityEnum;
import com.iailab.module.data.common.enums.IsEnableEnum;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -29,7 +30,6 @@
import javax.validation.Valid;
import java.io.IOException;
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,29 +47,19 @@
private HttpTagService tagService;
@Resource
- private HttpCollectorForIhd httpCollectorForIhd;
+ private HttpCollector httpCollector;
@PreAuthorize("@ss.hasPermission('data:channel-http:query')")
@GetMapping("page")
public CommonResult<PageResult<HttpTagRespVO>> page(@Valid HttpTagPageReqVO reqVO) {
-
PageResult<HttpTagEntity> page = tagService.queryPage(reqVO);
- 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);
+ PageResult<HttpTagRespVO> pageResult = BeanUtils.toBean(page, HttpTagRespVO.class);
+ pageResult.getList().forEach(item -> {
+ item.setDataValue(httpCollector.getTagValue(item.getApiId(), item.getTagName()));
+ item.setDataTime(new Date());
+ item.setDataQuality(DataQualityEnum.getEumByValue(item.getDataValue()).getDesc());
+ });
+ return success(pageResult);
}
@PreAuthorize("@ss.hasPermission('data:channel-http:query')")
--
Gitblit v1.9.3