From db184afd0c5bf3359b44eb0251fa5b07386eb3ff Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期三, 06 十一月 2024 09:48:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/controller/admin/HttpTagController.java | 80 +++++++++++++++++++++++++++++++++++++--
1 files changed, 75 insertions(+), 5 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 c014183..e4079de 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
@@ -1,21 +1,35 @@
package com.iailab.module.data.channel.http.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.http.collector.ihdb.HttpCollectorForIhd;
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;
import com.iailab.module.data.channel.http.vo.HttpTagRespVO;
+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 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.Date;
-import java.util.List;
-import java.util.UUID;
-
+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;
@@ -31,11 +45,30 @@
@Resource
private HttpTagService tagService;
+ @Resource
+ private HttpCollectorForIhd httpCollectorForIhd;
+
@PreAuthorize("@ss.hasPermission('data:channel-http:query')")
@GetMapping("page")
public CommonResult<PageResult<HttpTagRespVO>> page(@Valid HttpTagPageReqVO reqVO) {
+
PageResult<HttpTagEntity> page = tagService.queryPage(reqVO);
- return success(BeanUtils.toBean(page, HttpTagRespVO.class));
+ 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);
}
@PreAuthorize("@ss.hasPermission('data:channel-http:query')")
@@ -75,4 +108,41 @@
tagService.delete(id);
return success(true);
}
+
+ @GetMapping("/export")
+ @Operation(summary = "导出modbus tag列表")
+ @PreAuthorize("@ss.hasPermission('data:channel-http-tag:export')")
+ @ApiAccessLog(operateType = EXPORT)
+ public void exportPointList(@Validated HttpTagPageReqVO reqVO, HttpServletResponse response) throws IOException {
+ reqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+ PageResult<HttpTagEntity> page = tagService.queryPage(reqVO);
+ List<TagExportExcelVO> list = ConvertUtils.sourceToTarget(page.getList(), TagExportExcelVO.class);
+ ExcelUtils.write(response, "tag列表.xls", "数据", TagExportExcelVO.class, list, true);
+ }
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "获得tag导入模板")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 手动创建导出 demo
+ List<TagImportExcelVO> list = Collections.singletonList(
+ TagImportExcelVO.builder().tagName("Tag名称").tagDesc("Tag描述").dataType("String").enabled(1)
+ .build()
+ );
+ // 输出
+ ExcelUtils.write(response, "tag导入模板.xls", "tag列表", TagImportExcelVO.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-http-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<TagImportExcelVO> list = ExcelUtils.read(file, TagImportExcelVO.class);
+ return success(tagService.importHttpTagList(list, updateSupport, device));
+ }
}
--
Gitblit v1.9.3