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/kio/controller/admin/ChannelKioDeviceController.java | 89 +++++++++++++++++++-------------------------
1 files changed, 39 insertions(+), 50 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/kio/controller/admin/ChannelKioDeviceController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/kio/controller/admin/ChannelKioDeviceController.java
index 90e50fb..67b5070 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/kio/controller/admin/ChannelKioDeviceController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/kio/controller/admin/ChannelKioDeviceController.java
@@ -1,29 +1,29 @@
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.service.ChannelKioDeviceService;
+import com.iailab.framework.common.pojo.PageResult;
+import com.iailab.framework.common.util.object.BeanUtils;
import com.iailab.module.data.channel.kio.dto.ChannelKioDeviceDTO;
+import com.iailab.module.data.channel.kio.entity.ChannelKioDeviceEntity;
+import com.iailab.module.data.channel.kio.service.ChannelKioDeviceService;
+import com.iailab.module.data.channel.kio.vo.KioDevicePageReqVO;
+import com.iailab.module.data.channel.kio.vo.KioDeviceRespVO;
import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
-import javax.annotation.Resource;
+import org.springframework.security.access.prepost.PreAuthorize;
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;
/**
- * @author PanZhibao
+ * @author lirm
* @Description
- * @createTime 2024年06月04日
+ * @createTime 2024年08月26日
*/
@RestController
@RequestMapping("/data/channel/kio/device")
@@ -33,54 +33,43 @@
@Resource
private ChannelKioDeviceService channelKioDeviceService;
+ @PreAuthorize("@ss.hasPermission('data:channel-kio:query')")
@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<ChannelKioDeviceDTO>> list(@RequestParam Map<String, Object> params) {
- PageData<ChannelKioDeviceDTO> page = channelKioDeviceService.page(params);
- return success(page);
+ public CommonResult<PageResult<KioDeviceRespVO>> list(@Valid KioDevicePageReqVO reqVO) {
+ PageResult<ChannelKioDeviceEntity> page = channelKioDeviceService.queryPage(reqVO);
+ return success(BeanUtils.toBean(page, KioDeviceRespVO.class));
}
- @GetMapping("{id}")
+ @PreAuthorize("@ss.hasPermission('data:channel-kio:query')")
+ @GetMapping("/info/{id}")
@Operation(summary = "信息")
- public CommonResult<ChannelKioDeviceDTO> get(@PathVariable("id") String id) {
- ChannelKioDeviceDTO data = channelKioDeviceService.get(id);
- return success(data);
+ public CommonResult<ChannelKioDeviceEntity> info(@PathVariable("id") String id) {
+ ChannelKioDeviceEntity info = channelKioDeviceService.info(id);
+ return success(info);
}
- @PostMapping
- @Operation(summary = "保存")
- public CommonResult save(@RequestBody ChannelKioDeviceDTO dto) {
- //效验数据
- ValidationUtils.validate(dto, AddGroup.class, DefaultGroup.class);
+ @PreAuthorize("@ss.hasPermission('data:channel-kio:create')")
+ @PostMapping("/add")
+ public CommonResult<Boolean> create(@RequestBody ChannelKioDeviceEntity channelKioDeviceEntity) {
String id = UUID.randomUUID().toString();
- dto.setId(id);
- channelKioDeviceService.save(dto);
- return new CommonResult();
+ channelKioDeviceEntity.setId(id);
+ channelKioDeviceEntity.setCreateTime(new Date());
+ channelKioDeviceService.add(channelKioDeviceEntity);
+ return success(true);
}
- /**
- * 修改kio配置
- *
- */
- @PutMapping
- @Operation(summary = "修改")
- public CommonResult update(@RequestBody ChannelKioDeviceDTO dto) {
- //效验数据
- ValidationUtils.validate(dto, AddGroup.class, DefaultGroup.class);
- channelKioDeviceService.update(dto);
- return new CommonResult();
+ @PreAuthorize("@ss.hasPermission('data:channel-kio:update')")
+ @PutMapping("/update")
+ public CommonResult<Boolean> update(@RequestBody ChannelKioDeviceEntity channelKioDeviceEntity) {
+ channelKioDeviceEntity.setUpdateTime(new Date());
+ channelKioDeviceService.update(channelKioDeviceEntity);
+ return success(true);
}
- @DeleteMapping
- @Operation(summary = "删除")
- public CommonResult delete(@RequestBody String[] ids){
- channelKioDeviceService.delete(ids);
- return new CommonResult();
+ @PreAuthorize("@ss.hasPermission('data:channel-kio:delete')")
+ @DeleteMapping("/delete")
+ public CommonResult<Boolean> delete(@RequestParam("id") String id) {
+ channelKioDeviceService.delete(id);
+ return success(true);
}
}
\ No newline at end of file
--
Gitblit v1.9.3