From 19ef4ca4f7252c34fe2e2a03b8868fc997ddd86f Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期五, 13 九月 2024 08:37:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/kio/controller/admin/ChannelKioTagController.java | 83 +++++++++++++++++------------------------
1 files changed, 34 insertions(+), 49 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/kio/controller/admin/ChannelKioTagController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/kio/controller/admin/ChannelKioTagController.java
index da0b4c9..df61b27 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/kio/controller/admin/ChannelKioTagController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/kio/controller/admin/ChannelKioTagController.java
@@ -1,27 +1,24 @@
package com.iailab.module.data.channel.kio.controller.admin;
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.framework.common.page.PageData;
import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.framework.common.util.validation.ValidationUtils;
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.DefaultGroup;
-import com.iailab.module.data.channel.kio.dto.ChannelKioTagDTO;
+import com.iailab.framework.common.pojo.PageResult;
+import com.iailab.framework.common.util.object.BeanUtils;
+import com.iailab.module.data.channel.kio.entity.ChannelKioTagEntity;
import com.iailab.module.data.channel.kio.service.ChannelKioTagService;
+import com.iailab.module.data.channel.kio.vo.KioTagPageReqVO;
+import com.iailab.module.data.channel.kio.vo.KioTagRespVO;
import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import javax.annotation.Resource;
import org.springframework.web.bind.annotation.*;
-import java.util.Map;
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.Date;
import java.util.UUID;
+import static com.iailab.framework.common.pojo.CommonResult.success;
+
/**
- * 操作opcua tag配置
- *
- * @author DongYukun
- * @createTime 2023年05月6日 17:44:00
+
*/
@RestController
@RequestMapping("/data/channel/kio/tag")
@@ -33,50 +30,38 @@
* 分页查询tag
* */
@GetMapping("page")
- @Operation(summary = "分页")
- @Parameters({
- @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) ,
- @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
- @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
- @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
- })
- public CommonResult<PageData<ChannelKioTagDTO>> page(@RequestParam Map<String, Object> params){
- PageData<ChannelKioTagDTO> page = channelKioTagService.page(params);
- return new CommonResult<PageData<ChannelKioTagDTO>>().setData(page);
+ public CommonResult<PageResult<KioTagRespVO>> page(@Valid KioTagPageReqVO reqVO){
+ PageResult<ChannelKioTagEntity> page = channelKioTagService.queryPage(reqVO);
+ return success(BeanUtils.toBean(page, KioTagRespVO.class));
}
- @GetMapping("{id}")
+ @GetMapping("/info/{id}")
@Operation(summary = "信息")
- public CommonResult<ChannelKioTagDTO> get(@PathVariable("id") String id){
- ChannelKioTagDTO data= channelKioTagService.get(id);
- return new CommonResult<ChannelKioTagDTO>().setData(data);
+ public CommonResult<ChannelKioTagEntity> info(@PathVariable("id") String id) {
+ ChannelKioTagEntity info = channelKioTagService.info(id);
+ return success(info);
}
- @PostMapping
- @Operation(summary = "保存")
- public CommonResult save(@RequestBody ChannelKioTagDTO entity){
- entity.setId(UUID.randomUUID().toString());
- channelKioTagService.save(entity);
- return new CommonResult();
+ @PostMapping("/add")
+ public CommonResult<Boolean> add(@RequestBody ChannelKioTagEntity channelKioTagEntity) {
+ String id = UUID.randomUUID().toString();
+ channelKioTagEntity.setId(id);
+ channelKioTagEntity.setCreateTime(new Date());
+ channelKioTagService.add(channelKioTagEntity);
+ return success(true);
}
- /**
- * 修改tag
- */
- @PutMapping
- @Operation(summary = "修改")
- public CommonResult update(@RequestBody ChannelKioTagDTO dto) {
- //效验数据
- ValidationUtils.validate(dto, AddGroup.class, DefaultGroup.class);
- channelKioTagService.update(dto);
- return new CommonResult();
+ @PutMapping("/update")
+ public CommonResult<Boolean> update(@RequestBody ChannelKioTagEntity channelKioTagEntity) {
+ channelKioTagEntity.setUpdateTime(new Date());
+ channelKioTagService.update(channelKioTagEntity);
+ return success(true);
}
- @DeleteMapping
- @Operation(summary = "删除")
- public CommonResult tagDelete(@RequestBody String[] ids) {
- channelKioTagService.delete(ids);
- return new CommonResult();
+ @DeleteMapping("/delete")
+ public CommonResult<Boolean> delete(@RequestParam("id") String id) {
+ channelKioTagService.delete(id);
+ return success(true);
}
}
--
Gitblit v1.9.3