From ee9f604388a3e77d3f4654e326f3976552e7f532 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期一, 25 十一月 2024 13:40:07 +0800
Subject: [PATCH] 测点启用和禁用
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/controller/admin/ChannelModbusTagController.java | 82 +++++++++++++++++++++++++++++++++--------
1 files changed, 66 insertions(+), 16 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 00fec66..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
@@ -1,24 +1,40 @@
package com.iailab.module.data.channel.modbus.controller.admin;
+import com.iailab.framework.apilog.core.annotation.ApiAccessLog;
import com.iailab.framework.common.pojo.CommonResult;
+import com.iailab.framework.common.pojo.PageParam;
import com.iailab.framework.common.pojo.PageResult;
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.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;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
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;
/**
@@ -38,19 +54,13 @@
@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(reqVO.getDeviceId(),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);
}
/**
@@ -100,4 +110,44 @@
channelModbusTagService.delete(id);
return success(true);
}
+
+ @GetMapping("/export")
+ @Operation(summary = "导出modbus tag列表")
+ @PreAuthorize("@ss.hasPermission('data:channel-modbus-tag:export')")
+ @ApiAccessLog(operateType = EXPORT)
+ public void exportPointList(@Validated ModBusTagPageReqVO reqVO, HttpServletResponse response) throws IOException {
+ reqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+ PageResult<ChannelModBusTagEntity> page = channelModbusTagService.queryPage(reqVO);
+
+ List<ModBusTagExportExcelVO> list = ConvertUtils.sourceToTarget(page.getList(), ModBusTagExportExcelVO.class);
+ ExcelUtils.write(response, "tag列表.xls", "数据", ModBusTagExportExcelVO.class, list, true);
+ }
+
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "获得tag导入模板")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 手动创建导出 demo
+ List<ModBusTagImportExcelVO> list = Collections.singletonList(
+ ModBusTagImportExcelVO.builder().tagName("Tag名称").tagDesc("Tag描述").dataType("String").
+ address("123").format("1").samplingRate(1000).enabled(IsEnableEnum.ENABLE.getCode())
+ .build()
+ );
+ // 输出
+ ExcelUtils.write(response, "tag导入模板.xls", "tag列表", ModBusTagImportExcelVO.class, list, true);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "导入tag")
+ @Parameters({
+ @Parameter(name = "file", description = "Excel 文件", required = true),
+ @Parameter(name = "updateSupport", description = "是否支持更新，默认为 false", example = "true")
+ })
+ @PreAuthorize("@ss.hasPermission('data:channel-modbus-tag:import')")
+ public CommonResult<TagImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @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));
+ }
}
--
Gitblit v1.9.3