From d7ac861cab28bc39f87c1af464ec4d319a0cbb37 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期二, 19 十一月 2024 15:46:15 +0800
Subject: [PATCH] test配置增加deploy.server属性，解决多网卡ip注册错误的问题
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/controller/admin/ChannelOPCDATagController.java | 97 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 91 insertions(+), 6 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/controller/admin/ChannelOPCDATagController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/controller/admin/ChannelOPCDATagController.java
index 2a6fb45..7a11afc 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/controller/admin/ChannelOPCDATagController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/controller/admin/ChannelOPCDATagController.java
@@ -1,22 +1,46 @@
package com.iailab.module.data.channel.opcda.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.module.data.channel.opcda.collector.OpcDACollector;
+import com.iailab.module.data.channel.opcda.entity.ChannelOPCDADeviceEntity;
+import com.iailab.framework.common.util.object.ConvertUtils;
+import com.iailab.framework.excel.core.util.ExcelUtils;
import com.iailab.module.data.channel.opcda.entity.ChannelOPCDATagEntity;
+import com.iailab.module.data.channel.opcda.service.ChannelOPCDADeviceService;
import com.iailab.module.data.channel.opcda.service.ChannelOPCDATagService;
+import com.iailab.module.data.channel.opcda.vo.OpcDaTagExportExcelVO;
+import com.iailab.module.data.channel.opcda.vo.OpcDaTagImportExcelVO;
import com.iailab.module.data.channel.opcda.vo.OpcDaTagPageReqVO;
import com.iailab.module.data.channel.opcda.vo.OpcDaTagRespVO;
+import com.iailab.module.data.common.enums.DataSourceType;
+import com.iailab.module.data.channel.tag.vo.TagImportRespVO;
+import com.iailab.module.data.common.enums.IsEnableEnum;
import com.iailab.module.data.common.exception.RRException;
+import com.iailab.module.data.common.utils.TagUtils;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
import org.springframework.beans.factory.annotation.Autowired;
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.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;
/**
@@ -31,21 +55,44 @@
@Autowired
private ChannelOPCDATagService channelOPCDATagService;
- @PreAuthorize("@ss.hasPermission('data:channel-opcua:query')")
+ @Autowired
+ private OpcDACollector opcDACollector;
+
+ @Autowired
+ private ChannelOPCDADeviceService channelOPCDADeviceService;
+
+ @PreAuthorize("@ss.hasPermission('data:channel-opcda:query')")
@GetMapping("page")
public CommonResult<PageResult<OpcDaTagRespVO>> list(@Valid OpcDaTagPageReqVO reqVO) {
+
PageResult<ChannelOPCDATagEntity> page = channelOPCDATagService.queryPage(reqVO);
- return success(BeanUtils.toBean(page, OpcDaTagRespVO.class));
+ PageResult<OpcDaTagRespVO> pageResultVO = new PageResult<>();
+ pageResultVO.setTotal(page.getTotal());
+
+ List<OpcDaTagRespVO> vos = page.getList().stream().map(entity -> {
+
+ OpcDaTagRespVO vo = BeanUtils.toBean(entity,OpcDaTagRespVO.class);
+ List<String[]> tags = new ArrayList<>();
+ String[] array = {reqVO.getServerId(),entity.getTagName()};
+ tags.add(array);
+ ChannelOPCDADeviceEntity OPCDADevice = channelOPCDADeviceService.info(reqVO.getServerId());
+ vo.setDataValue(Double.parseDouble(opcDACollector.getTagValues(tags).get(TagUtils.genTagId(DataSourceType.OPCDA.getCode(), OPCDADevice.getServerName(),entity.getTagName())).toString()));
+ return vo;
+ }).collect(Collectors.toList());
+
+ pageResultVO.setList(vos);
+
+ return success(pageResultVO);
}
- @PreAuthorize("@ss.hasPermission('data:channel-opcua:query')")
+ @PreAuthorize("@ss.hasPermission('data:channel-opcda:query')")
@GetMapping("/info/{id}")
public CommonResult<ChannelOPCDATagEntity> info(@PathVariable("id") String id) {
ChannelOPCDATagEntity info = channelOPCDATagService.info(id);
return success(info);
}
- @PreAuthorize("@ss.hasPermission('data:channel-opcua:create')")
+ @PreAuthorize("@ss.hasPermission('data:channel-opcda:create')")
@PostMapping("/create")
public CommonResult<Boolean> create(@RequestBody ChannelOPCDATagEntity channelOPCDATagEntity) {
String id = UUID.randomUUID().toString();
@@ -55,7 +102,7 @@
return success(true);
}
- @PreAuthorize("@ss.hasPermission('data:channel-opcua:update')")
+ @PreAuthorize("@ss.hasPermission('data:channel-opcda:update')")
@PutMapping("/update")
public CommonResult<Boolean> update(@RequestBody ChannelOPCDATagEntity channelOPCDATagEntity) {
channelOPCDATagEntity.setUpdateTime(new Date());
@@ -63,7 +110,7 @@
return success(true);
}
- @PreAuthorize("@ss.hasPermission('data:channel-opcua:delete')")
+ @PreAuthorize("@ss.hasPermission('data:channel-opcda:delete')")
@DeleteMapping("/delete")
public CommonResult<Boolean> delete(@RequestParam("id") String id) {
channelOPCDATagService.delete(id);
@@ -82,4 +129,42 @@
}
return success("上传成功");
}
+
+ @GetMapping("/export")
+ @Operation(summary = "导出modbus tag列表")
+ @PreAuthorize("@ss.hasPermission('data:channel-opcda-tag:export')")
+ @ApiAccessLog(operateType = EXPORT)
+ public void exportPointList(@Validated OpcDaTagPageReqVO reqVO, HttpServletResponse response) throws IOException {
+ reqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+ PageResult<ChannelOPCDATagEntity> page = channelOPCDATagService.queryPage(reqVO);
+ List<OpcDaTagExportExcelVO> list = ConvertUtils.sourceToTarget(page.getList(), OpcDaTagExportExcelVO.class);
+ ExcelUtils.write(response, "tag列表.xls", "数据", OpcDaTagExportExcelVO.class, list, true);
+ }
+
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "获得tag导入模板")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 手动创建导出 demo
+ List<OpcDaTagImportExcelVO> list = Collections.singletonList(
+ OpcDaTagImportExcelVO.builder().tagName("Tag名称").dataType("String").enabled(IsEnableEnum.ENABLE.getCode())
+ .build()
+ );
+ // 输出
+ ExcelUtils.write(response, "tag导入模板.xls", "tag列表", OpcDaTagImportExcelVO.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-opcda-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<OpcDaTagImportExcelVO> list = ExcelUtils.read(file, OpcDaTagImportExcelVO.class);
+ return success(channelOPCDATagService.importOpcDaTagList(list, updateSupport,device));
+ }
}
--
Gitblit v1.9.3