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/ChannelOPCDADeviceController.java | 74 +++++++++++++------------------------
1 files changed, 26 insertions(+), 48 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/controller/ChannelOPCDADeviceController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/controller/ChannelOPCDADeviceController.java
index 01e53fc..105998f 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/controller/ChannelOPCDADeviceController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/controller/ChannelOPCDADeviceController.java
@@ -1,86 +1,64 @@
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.ChannelOPCDADeviceEntity;
import com.iailab.module.data.channel.opcda.service.ChannelOPCDADeviceService;
-import com.iailab.module.data.common.utils.PageUtils;
-import com.iailab.module.data.common.utils.R;
+import com.iailab.module.data.channel.opcda.vo.OpcDaDevicePageReqVO;
+import com.iailab.module.data.channel.opcda.vo.OpcDaDeviceRespVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
import java.util.Date;
-import java.util.Map;
import java.util.UUID;
+
+import static com.iailab.framework.common.pojo.CommonResult.success;
/**
* 操作opc ua配置
- *
- * @author DongYukun
- * @createTime 2023年04月26日 10:33:00
+ * @author lirm
+ * @Description
+ * @createTime 2024年08月26日
*/
@RestController
-@RequestMapping("/channel/opcda/device")
+@RequestMapping("/data/channel/opcda/device")
public class ChannelOPCDADeviceController {
@Autowired
private ChannelOPCDADeviceService channelOPCDADeviceService;
- /**
- * 分页查询opc da 配置
- *
- * @param params
- */
- @GetMapping("/list")
- public R list(@RequestParam Map<String, Object> params) {
- PageUtils page = channelOPCDADeviceService.queryPage(params);
-
- return R.ok().put("page", page);
+ @GetMapping("page")
+ public CommonResult<PageResult<OpcDaDeviceRespVO>> list(@Valid OpcDaDevicePageReqVO reqVO) {
+ PageResult<ChannelOPCDADeviceEntity> page = channelOPCDADeviceService.queryPage(reqVO);
+ return success(BeanUtils.toBean(page, OpcDaDeviceRespVO.class));
}
- /**
- * 根据id查询opc da配置详情
- *
- * @param id
- */
@GetMapping("/info/{id}")
- public R info(@PathVariable("id") String id) {
+ public CommonResult<ChannelOPCDADeviceEntity> info(@PathVariable("id") String id) {
ChannelOPCDADeviceEntity info = channelOPCDADeviceService.info(id);
- return R.ok().put("data", info);
+ return success(info);
}
- /**
- * 添加opc ua配置
- *
- * @param channelOPCDADeviceEntity
- */
@PostMapping("/add")
- public R add(@RequestBody ChannelOPCDADeviceEntity channelOPCDADeviceEntity) {
+ public CommonResult<Boolean> add(@RequestBody ChannelOPCDADeviceEntity channelOPCDADeviceEntity) {
String id = UUID.randomUUID().toString();
channelOPCDADeviceEntity.setId(id);
channelOPCDADeviceEntity.setCreateTime(new Date());
channelOPCDADeviceService.add(channelOPCDADeviceEntity);
- return R.ok();
+ return success(true);
}
- /**
- * 修改opc ua配置
- *
- * @param channelOPCDADeviceEntity
- */
- @PostMapping("/update")
- public R update(@RequestBody ChannelOPCDADeviceEntity channelOPCDADeviceEntity) {
+ @PutMapping("/update")
+ public CommonResult<Boolean> update(@RequestBody ChannelOPCDADeviceEntity channelOPCDADeviceEntity) {
channelOPCDADeviceEntity.setUpdateTime(new Date());
channelOPCDADeviceService.update(channelOPCDADeviceEntity);
- return R.ok();
+ return success(true);
}
- /**
- * 删除opc ua配置
- *
- * @param params
- */
- @PostMapping("/delete")
- public R delete(@RequestBody Map<String, Object> params) {
- String id = (String) params.get("id");
+ @DeleteMapping("/delete")
+ public CommonResult<Boolean> delete(@RequestParam("id") String id) {
channelOPCDADeviceService.delete(id);
- return R.ok();
+ return success(true);
}
}
\ No newline at end of file
--
Gitblit v1.9.3