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/opcua/controller/admin/ChannelOPCUATagController.java | 202 +++++++++++++++++++++++++++++++-------------------
1 files changed, 124 insertions(+), 78 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 94f65c7..b4f579d 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
@@ -1,102 +1,148 @@
package com.iailab.module.data.channel.opcua.controller.admin;
-import cn.hutool.core.codec.Base64;
-import com.iailab.module.data.common.exception.RRException;
-import com.iailab.module.data.common.utils.PageUtils;
-import com.iailab.module.data.common.utils.R;
+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.opcua.collector.OpcUaCollector;
+import com.iailab.framework.common.util.object.ConvertUtils;
+import com.iailab.framework.excel.core.util.ExcelUtils;
import com.iailab.module.data.channel.opcua.entity.ChannelOPCUATagEntity;
import com.iailab.module.data.channel.opcua.service.ChannelOPCUATagService;
-import javax.annotation.Resource;
+import com.iailab.module.data.channel.opcua.vo.OpcUaTagExportExcelVO;
+import com.iailab.module.data.channel.opcua.vo.OpcUaTagImportExcelVO;
+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 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 java.util.Map;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+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;
/**
* 操作opcua tag配置
- *
- * @author DongYukun
- * @createTime 2023年05月6日 17:44:00
+ * @author lirm
+ * @Description
+ * @createTime 2024年08月26日
*/
@RestController
@RequestMapping("/data/channel/opcua/tag")
public class ChannelOPCUATagController {
@Resource
private ChannelOPCUATagService channelOpcuaTagService;
- /**
- * 分页查询tag
- *
- * @param params
- */
- @GetMapping("/list")
- public R tagList(@RequestParam Map<String, Object> params){
- PageUtils page = channelOpcuaTagService.queryPage(params);
- return R.ok().put("page", page);
- }
- /**
- * 根据id查询tag详情
- *
- * @param id
- */
- @GetMapping("/info/{id}")
- public R tagInfo(@PathVariable("id") String id){
- ChannelOPCUATagEntity info= channelOpcuaTagService.info(Base64.decodeStr(id));
- return R.ok().put("data", info);
- }
- /**
- * 添加tag
- *
- * @param entity
- */
- @PostMapping("/add")
- public R tagAdd(@RequestBody ChannelOPCUATagEntity entity){
- entity.setId(UUID.randomUUID().toString());
- channelOpcuaTagService.add(entity);
- return R.ok();
- }
+ @Resource
+ private OpcUaCollector opcUaCollector;
- /**
- * 修改tag
- *
- * @param channelOPCUATagEntity
- */
- @PostMapping("/update")
- public R tagUpdate(@RequestBody ChannelOPCUATagEntity channelOPCUATagEntity) {
- channelOpcuaTagService.update(channelOPCUATagEntity);
- return R.ok();
- }
+ @PreAuthorize("@ss.hasPermission('data:channel-opcua:query')")
+ @GetMapping("page")
+ public CommonResult<PageResult<OpcUaTagRespVO>> list(@Valid OpcUaTagPageReqVO reqVO) {
- /**
- * 删除tag
- * @param params
- *
- */
- @PostMapping("/delete")
- public R tagDelete(@RequestBody Map<String, Object> params) {
- String id = (String)params.get("id");
- channelOpcuaTagService.delete(id);
- return R.ok();
- }
+ PageResult<ChannelOPCUATagEntity> page = channelOpcuaTagService.queryPage(reqVO);
+ PageResult<OpcUaTagRespVO> pageResultVO = new PageResult<>();
+ pageResultVO.setTotal(page.getTotal());
- /**
- * 导入
- *
- * @param device
- * @param file
- * @return
- */
- @PostMapping("/import/{device}")
- public R importTag(@PathVariable("device") String device, @RequestParam("file") MultipartFile file) {
- try {
- if (file.isEmpty()) {
- throw new RRException("上传文件不能为空");
+ List<OpcUaTagRespVO> vos = page.getList().stream().map(entity -> {
+
+ OpcUaTagRespVO vo = BeanUtils.toBean(entity,OpcUaTagRespVO.class);
+ try{
+ vo.setDataValue( Double.parseDouble(opcUaCollector.getTagValue(reqVO.getDeviceId(),entity.getTagName())));
+ }catch (Exception e){
+ e.printStackTrace();
}
- channelOpcuaTagService.importTag(device, file);
- } catch (Exception ex) {
- return R.error(ex.getMessage());
- }
- return R.ok();
+ return vo;
+ }).collect(Collectors.toList());
+
+ pageResultVO.setList(vos);
+
+ return success(pageResultVO);
+ }
+
+ @PreAuthorize("@ss.hasPermission('data:channel-opcua:query')")
+ @GetMapping("/info/{id}")
+ public CommonResult<ChannelOPCUATagEntity> info(@PathVariable("id") String id) {
+ ChannelOPCUATagEntity info = channelOpcuaTagService.info(id);
+ return success(info);
+ }
+
+ @PreAuthorize("@ss.hasPermission('data:channel-opcua:create')")
+ @PostMapping("/create")
+ public CommonResult<Boolean> create(@RequestBody ChannelOPCUATagEntity channelOPCUATagEntity) {
+ String id = UUID.randomUUID().toString();
+ channelOPCUATagEntity.setId(id);
+ channelOPCUATagEntity.setCreateTime(new Date());
+ channelOpcuaTagService.add(channelOPCUATagEntity);
+ return success(true);
+ }
+
+ @PreAuthorize("@ss.hasPermission('data:channel-opcua:update')")
+ @PutMapping("/update")
+ public CommonResult<Boolean> update(@RequestBody ChannelOPCUATagEntity channelOPCUATagEntity) {
+ channelOPCUATagEntity.setUpdateTime(new Date());
+ channelOpcuaTagService.update(channelOPCUATagEntity);
+ return success(true);
+ }
+
+ @PreAuthorize("@ss.hasPermission('data:channel-opcua:delete')")
+ @DeleteMapping("/delete")
+ public CommonResult<Boolean> delete(@RequestParam("id") String id) {
+ channelOpcuaTagService.delete(id);
+ return success(true);
+ }
+
+ @GetMapping("/export")
+ @Operation(summary = "导出modbus tag列表")
+ @PreAuthorize("@ss.hasPermission('data:channel-opcua-tag:export')")
+ @ApiAccessLog(operateType = EXPORT)
+ public void exportPointList(@Validated OpcUaTagPageReqVO reqVO, HttpServletResponse response) throws IOException {
+ reqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+ PageResult<ChannelOPCUATagEntity> page = channelOpcuaTagService.queryPage(reqVO);
+ List<OpcUaTagExportExcelVO> list = ConvertUtils.sourceToTarget(page.getList(), OpcUaTagExportExcelVO.class);
+ ExcelUtils.write(response, "tag列表.xls", "数据", OpcUaTagExportExcelVO.class, list, true);
+ }
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "获得tag导入模板")
+ 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)
+ .build()
+ );
+ // 输出
+ ExcelUtils.write(response, "tag导入模板.xls", "tag列表", OpcUaTagImportExcelVO.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-opcua-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<OpcUaTagImportExcelVO> list = ExcelUtils.read(file, OpcUaTagImportExcelVO.class);
+ return success(channelOpcuaTagService.importOpcUaTagList(list, updateSupport,device));
}
}
--
Gitblit v1.9.3