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/opcua/controller/admin/ChannelOPCUATagController.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/controller/admin/ChannelOPCUATagController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/controller/admin/ChannelOPCUATagController.java
index 365bcc2..8c85b89 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/controller/admin/ChannelOPCUATagController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/controller/admin/ChannelOPCUATagController.java
@@ -7,6 +7,7 @@
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.opcua.collector.OpcUaCollector;
import com.iailab.module.data.channel.opcua.entity.ChannelOPCUATagEntity;
import com.iailab.module.data.channel.opcua.service.ChannelOPCUATagService;
import com.iailab.module.data.channel.opcua.vo.OpcUaTagExportExcelVO;
@@ -14,6 +15,8 @@
import com.iailab.module.data.channel.opcua.vo.OpcUaTagPageReqVO;
import com.iailab.module.data.channel.opcua.vo.OpcUaTagRespVO;
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;
@@ -36,6 +39,7 @@
/**
* 操作opcua tag配置
+ *
* @author lirm
* @Description
* @createTime 2024年08月26日
@@ -46,11 +50,20 @@
@Resource
private ChannelOPCUATagService channelOpcuaTagService;
+ @Resource
+ private OpcUaCollector opcUaCollector;
+
@PreAuthorize("@ss.hasPermission('data:channel-opcua:query')")
@GetMapping("page")
public CommonResult<PageResult<OpcUaTagRespVO>> list(@Valid OpcUaTagPageReqVO reqVO) {
PageResult<ChannelOPCUATagEntity> page = channelOpcuaTagService.queryPage(reqVO);
- return success(BeanUtils.toBean(page, OpcUaTagRespVO.class));
+ PageResult<OpcUaTagRespVO> pageResult = BeanUtils.toBean(page, OpcUaTagRespVO.class);
+ pageResult.getList().forEach(item -> {
+ item.setDataValue(opcUaCollector.getTagValue(reqVO.getDeviceId(), item.getTagName()));
+ item.setDataTime(new Date());
+ item.setDataQuality(DataQualityEnum.getEumByValue(item.getDataValue()).getDesc());
+ });
+ return success(pageResult);
}
@PreAuthorize("@ss.hasPermission('data:channel-opcua:query')")
@@ -101,11 +114,11 @@
public void importTemplate(HttpServletResponse response) throws IOException {
// 手动创建导出 demo
List<OpcUaTagImportExcelVO> list = Collections.singletonList(
- OpcUaTagImportExcelVO.builder().tagName("Tag名称").dataType("String").address("123").samplingRate(1000).enabled(1)
+ OpcUaTagImportExcelVO.builder().tagName("Tag名称").dataType("String").address("123").samplingRate(1000).enabled(IsEnableEnum.ENABLE.getCode())
.build()
);
// 输出
- ExcelUtils.write(response, "tag导入模板.xls", "tag列表", OpcUaTagImportExcelVO.class, list,true);
+ ExcelUtils.write(response, "tag导入模板.xls", "tag列表", OpcUaTagImportExcelVO.class, list, true);
}
@PostMapping("/import")
@@ -119,6 +132,6 @@
@RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport,
@RequestParam("device") String device) throws Exception {
List<OpcUaTagImportExcelVO> list = ExcelUtils.read(file, OpcUaTagImportExcelVO.class);
- return success(channelOpcuaTagService.importOpcUaTagList(list, updateSupport,device));
+ return success(channelOpcuaTagService.importOpcUaTagList(list, updateSupport, device));
}
}
--
Gitblit v1.9.3