From c9dd12a0042b50af36edf2ae710d33430542385d Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期二, 24 十二月 2024 10:15:43 +0800
Subject: [PATCH] 预测值 开始时间计算bug，数据补全bug
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/kio/controller/admin/ChannelKioTagController.java | 29 ++++++++---------------------
1 files changed, 8 insertions(+), 21 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 02b60d5..f0b2ce7 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
@@ -8,8 +8,6 @@
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;
@@ -17,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;
@@ -34,7 +33,6 @@
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;
@@ -57,25 +55,14 @@
@PreAuthorize("@ss.hasPermission('data:channel-kio:query')")
@GetMapping("page")
public CommonResult<PageResult<KioTagRespVO>> page(@Valid KioTagPageReqVO reqVO){
-
PageResult<ChannelKioTagEntity> page = channelKioTagService.queryPage(reqVO);
- 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);
+ PageResult<KioTagRespVO> pageResult = BeanUtils.toBean(page, KioTagRespVO.class);
+ pageResult.getList().forEach(item -> {
+ item.setDataValue(kingIOCollector.getTagValue(item.getDevice(), item.getTagName()));
+ item.setDataTime(new Date());
+ item.setDataQuality(DataQualityEnum.getEumByValue(item.getDataValue()).getDesc());
+ });
+ return success(pageResult);
}
@PreAuthorize("@ss.hasPermission('data:channel-kio:query')")
--
Gitblit v1.9.3