From 730d1944e3a13c517c77df2b0712df05645a38dd Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期一, 06 一月 2025 16:00:58 +0800
Subject: [PATCH] chartParamList api
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/controller/admin/ChannelModbusTagController.java | 32 +++++++++++++-------------------
1 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/controller/admin/ChannelModbusTagController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/controller/admin/ChannelModbusTagController.java
index 366cd2f..ec6ade8 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/controller/admin/ChannelModbusTagController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/controller/admin/ChannelModbusTagController.java
@@ -9,13 +9,14 @@
import com.iailab.framework.excel.core.util.ExcelUtils;
import com.iailab.module.data.channel.modbus.collector.ModBusCollector;
import com.iailab.module.data.channel.modbus.entity.ChannelModBusTagEntity;
-import com.iailab.module.data.channel.modbus.entity.ChannelModBusTagEntity;
import com.iailab.module.data.channel.modbus.service.ChannelModbusTagService;
import com.iailab.module.data.channel.modbus.vo.ModBusTagExportExcelVO;
import com.iailab.module.data.channel.modbus.vo.ModBusTagImportExcelVO;
import com.iailab.module.data.channel.modbus.vo.ModBusTagPageReqVO;
import com.iailab.module.data.channel.modbus.vo.ModBusTagRespVO;
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;
@@ -27,13 +28,11 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
-import java.util.ArrayList;
import java.io.IOException;
import java.util.Collections;
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;
@@ -55,20 +54,15 @@
@GetMapping("/page")
public CommonResult<PageResult<ModBusTagRespVO>> list(@Valid ModBusTagPageReqVO reqVO) {
PageResult<ChannelModBusTagEntity> page = channelModbusTagService.queryPage(reqVO);
- PageResult<ModBusTagRespVO> pageResultVO = new PageResult<>();
- pageResultVO.setTotal(page.getTotal());
-
- List<ModBusTagRespVO> vos = page.getList().stream().map(entity -> {
-
- ModBusTagRespVO vo = BeanUtils.toBean(entity,ModBusTagRespVO.class);
- vo.setDataValue(modBusCollector.getTagValue(entity.getDevice(),entity.getTagName()));
- return vo;
- }).collect(Collectors.toList());
-
- pageResultVO.setList(vos);
-
- return success(pageResultVO);
+ PageResult<ModBusTagRespVO> pageResult = BeanUtils.toBean(page, ModBusTagRespVO.class);
+ pageResult.getList().forEach(item -> {
+ item.setDataValue(modBusCollector.getTagValue(reqVO.getDeviceId(), item.getTagName()));
+ item.setDataTime(new Date());
+ item.setDataQuality(DataQualityEnum.getEumByValue(item.getDataValue()).getDesc());
+ });
+ return success(pageResult);
}
+
/**
* 根据id查询设备详情
*
@@ -136,11 +130,11 @@
// 手动创建导出 demo
List<ModBusTagImportExcelVO> list = Collections.singletonList(
ModBusTagImportExcelVO.builder().tagName("Tag名称").tagDesc("Tag描述").dataType("String").
- address("123").format("1").samplingRate(1000).enabled(1)
+ address("123").format("1").samplingRate(1000).enabled(IsEnableEnum.ENABLE.getCode())
.build()
);
// 输出
- ExcelUtils.write(response, "tag导入模板.xls", "tag列表", ModBusTagImportExcelVO.class, list,true);
+ ExcelUtils.write(response, "tag导入模板.xls", "tag列表", ModBusTagImportExcelVO.class, list, true);
}
@PostMapping("/import")
@@ -154,6 +148,6 @@
@RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport,
@RequestParam("device") String device) throws Exception {
List<ModBusTagImportExcelVO> list = ExcelUtils.read(file, ModBusTagImportExcelVO.class);
- return success(channelModbusTagService.importModBusTagList(list, updateSupport,device));
+ return success(channelModbusTagService.importModBusTagList(list, updateSupport, device));
}
}
--
Gitblit v1.9.3