From af012402d448313b0888868b9e0230ff3a8f0d49 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 30 十二月 2024 16:18:29 +0800
Subject: [PATCH] t_st_schedule_model_out
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/controller/admin/HttpTagController.java | 33 ++++++++++++---------------------
1 files changed, 12 insertions(+), 21 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 e4079de..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,8 @@
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;
import io.swagger.v3.oas.annotations.Parameters;
@@ -28,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;
@@ -46,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')")
@@ -125,7 +116,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