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/modbus/controller/admin/ChannelModbusTagController.java | 187 ++++++++++++++++++++++++++++++----------------
1 files changed, 123 insertions(+), 64 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 d855638..366cd2f 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,100 +1,159 @@
package com.iailab.module.data.channel.modbus.controller.admin;
-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.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.sun.xml.internal.messaging.saaj.util.Base64;
-import javax.annotation.Resource;
+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 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.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;
/**
- * 操作modbus tag配置
- *
- * @author DongYukun
- * @createTime 2023年04月25日 10:31:00
+ * @author lirm
+ * @Description
+ * @createTime 2024年08月27日
*/
@RestController
@RequestMapping("/data/channel/modbus/tag")
public class ChannelModbusTagController {
@Resource
private ChannelModbusTagService channelModbusTagService;
- /**
- * 分页查询tag
- *
- * @param params
- */
- @GetMapping("/list")
- public R tagList(@RequestParam Map<String, Object> params){
- PageUtils page = channelModbusTagService.queryPage(params);
- return R.ok().put("page", page);
+ @Resource
+ private ModBusCollector modBusCollector;
+
+ @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(entity.getDevice(),entity.getTagName()));
+ return vo;
+ }).collect(Collectors.toList());
+
+ pageResultVO.setList(vos);
+
+ return success(pageResultVO);
}
/**
- * 根据id查询tag详情
+ * 根据id查询设备详情
*
* @param id
*/
@GetMapping("/info/{id}")
- public R tagInfo(@PathVariable("id") String id){
- ChannelModBusTagEntity info= channelModbusTagService.info(Base64.base64Decode(id));
- return R.ok().put("data", info);
- }
- /**
- * 添加tag
- *
- * @param entity
- */
- @PostMapping("/add")
- public R tagAdd(@RequestBody ChannelModBusTagEntity entity){
- entity.setId(UUID.randomUUID().toString());
- channelModbusTagService.add(entity);
- return R.ok();
+ public CommonResult<ChannelModBusTagEntity> info(@PathVariable("id") String id) {
+ ChannelModBusTagEntity info = channelModbusTagService.info(id);
+ return success(info);
}
/**
- * 修改tag
+ * 添加设备
*
* @param channelModBusTagEntity
*/
- @PostMapping("/update")
- public R tagUpdate(@RequestBody ChannelModBusTagEntity channelModBusTagEntity) {
- channelModbusTagService.update(channelModBusTagEntity);
- return R.ok();
+ @PostMapping("/create")
+ public CommonResult<Boolean> create(@RequestBody ChannelModBusTagEntity channelModBusTagEntity) {
+ String id = UUID.randomUUID().toString();
+ channelModBusTagEntity.setId(id);
+ channelModBusTagEntity.setCreateTime(new Date());
+ channelModbusTagService.add(channelModBusTagEntity);
+ return success(true);
}
/**
- * 删除tag
- * @param params
+ * 修改设备
*
+ * @param channelModBusTagEntity
*/
- @PostMapping("/delete")
- public R tagDelete(@RequestBody Map<String, Object> params) {
- String id = (String)params.get("id");
- channelModbusTagService.delete(id);
- return R.ok();
+ @PutMapping("/update")
+ public CommonResult<Boolean> update(@RequestBody ChannelModBusTagEntity channelModBusTagEntity) {
+ channelModBusTagEntity.setUpdateTime(new Date());
+ channelModbusTagService.update(channelModBusTagEntity);
+ return success(true);
}
-// /**
-// * 导入
-// *
-// * @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("上传文件不能为空");
-// }
-// channelModbusTagService.importTag(device, file);
-// } catch (Exception ex) {
-// return R.error(ex.getMessage());
-// }
-// return R.ok();
-// }
+ /**
+ * 删除设备
+ *
+ * @param id
+ */
+ @DeleteMapping("/delete")
+ public CommonResult<Boolean> delete(@RequestParam("id") String id) {
+ 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(1)
+ .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