From aecc4908e1f2861d2dab1929a88f9053238b2dd2 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期一, 26 八月 2024 16:58:33 +0800
Subject: [PATCH] kio opcda opcua代码升级
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/controller/ChannelOPCDATagController.java | 102 +++++++++++++++++++-------------------------------
1 files changed, 39 insertions(+), 63 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/controller/ChannelOPCDATagController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/controller/ChannelOPCDATagController.java
index 22d3aca..fe783cd 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/controller/ChannelOPCDATagController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/controller/ChannelOPCDATagController.java
@@ -1,102 +1,78 @@
package com.iailab.module.data.channel.opcda.controller;
+import com.iailab.framework.common.pojo.CommonResult;
+import com.iailab.framework.common.pojo.PageResult;
+import com.iailab.framework.common.util.object.BeanUtils;
import com.iailab.module.data.channel.opcda.entity.ChannelOPCDATagEntity;
import com.iailab.module.data.channel.opcda.service.ChannelOPCDATagService;
+import com.iailab.module.data.channel.opcda.vo.OpcDaTagPageReqVO;
+import com.iailab.module.data.channel.opcda.vo.OpcDaTagRespVO;
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 jodd.util.Base64;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import java.util.Map;
+import javax.validation.Valid;
+import java.util.Date;
import java.util.UUID;
+
+import static com.iailab.framework.common.pojo.CommonResult.success;
/**
* 操作OPCDA tag配置
- *
- * @author DongYukun
- * @createTime 2023年05月6日 17:44:00
+ * @author lirm
+ * @Description
+ * @createTime 2024年08月26日
*/
@RestController
-@RequestMapping("/channel/opcda/tag")
+@RequestMapping("/data/channel/opcda/tag")
public class ChannelOPCDATagController {
@Autowired
private ChannelOPCDATagService channelOPCDATagService;
- /**
- * 分页查询tag
- *
- * @param params
- */
- @GetMapping("/list")
- public R tagList(@RequestParam Map<String, Object> params){
- PageUtils page = channelOPCDATagService.queryPage(params);
-
- return R.ok().put("page", page);
+
+ @GetMapping("page")
+ public CommonResult<PageResult<OpcDaTagRespVO>> list(@Valid OpcDaTagPageReqVO reqVO) {
+ PageResult<ChannelOPCDATagEntity> page = channelOPCDATagService.queryPage(reqVO);
+ return success(BeanUtils.toBean(page, OpcDaTagRespVO.class));
}
- /**
- * 根据id查询tag详情
- *
- * @param id
- */
+
@GetMapping("/info/{id}")
- public R tagInfo(@PathVariable("id") String id){
- ChannelOPCDATagEntity info= channelOPCDATagService.info(Base64.decodeToString(id));
- return R.ok().put("data", info);
+ public CommonResult<ChannelOPCDATagEntity> info(@PathVariable("id") String id) {
+ ChannelOPCDATagEntity info = channelOPCDATagService.info(id);
+ return success(info);
}
- /**
- * 添加tag
- *
- * @param entity
- */
+
@PostMapping("/add")
- public R tagAdd(@RequestBody ChannelOPCDATagEntity entity){
- entity.setId(UUID.randomUUID().toString());
- channelOPCDATagService.add(entity);
- return R.ok();
+ public CommonResult<Boolean> add(@RequestBody ChannelOPCDATagEntity channelOPCDATagEntity) {
+ String id = UUID.randomUUID().toString();
+ channelOPCDATagEntity.setId(id);
+ channelOPCDATagEntity.setCreateTime(new Date());
+ channelOPCDATagService.add(channelOPCDATagEntity);
+ return success(true);
}
- /**
- * 修改tag
- *
- * @param channelOPCDATagEntity
- */
- @PostMapping("/update")
- public R tagUpdate(@RequestBody ChannelOPCDATagEntity channelOPCDATagEntity) {
+ @PutMapping("/update")
+ public CommonResult<Boolean> update(@RequestBody ChannelOPCDATagEntity channelOPCDATagEntity) {
+ channelOPCDATagEntity.setUpdateTime(new Date());
channelOPCDATagService.update(channelOPCDATagEntity);
- return R.ok();
+ return success(true);
}
- /**
- * 删除tag
- * @param params
- *
- */
- @PostMapping("/delete")
- public R tagDelete(@RequestBody Map<String, Object> params) {
- String id = (String)params.get("id");
+ @DeleteMapping("/delete")
+ public CommonResult<Boolean> delete(@RequestParam("id") String id) {
channelOPCDATagService.delete(id);
- return R.ok();
+ return success(true);
}
-
- /**
- * 导入
- *
- * @param serverId
- * @param file
- * @return
- */
@PostMapping("/import/{serverId}")
- public R importTag(@PathVariable("serverId") String serverId, @RequestParam("file") MultipartFile file) {
+ public CommonResult<String> importTag(@PathVariable("serverId") String serverId, @RequestParam("file") MultipartFile file) {
try {
if (file.isEmpty()) {
throw new RRException("上传文件不能为空");
}
channelOPCDATagService.importTag(serverId, file);
} catch (Exception ex) {
- return R.error(ex.getMessage());
+ ex.getMessage();
}
- return R.ok();
+ return success("上传成功");
}
}
--
Gitblit v1.9.3