From 48c2e5ffb3f9ad3509006e50f3142ea4d0e7f619 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期三, 16 十月 2024 09:32:16 +0800
Subject: [PATCH] 修改拼接sql逻辑以及返回逻辑
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/DaPointController.java | 103 +++++++++++++++++++++------------------------------
1 files changed, 42 insertions(+), 61 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/DaPointController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/DaPointController.java
index d29f255..53a5e34 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/DaPointController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/DaPointController.java
@@ -1,37 +1,33 @@
package com.iailab.module.data.point.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.UpdateGroup;
-import com.iailab.framework.common.validation.group.DefaultGroup;
+import com.iailab.framework.common.pojo.PageResult;
+import com.iailab.framework.common.util.object.BeanUtils;
import com.iailab.module.data.point.dto.DaPointDTO;
+import com.iailab.module.data.point.entity.DaPointEntity;
import com.iailab.module.data.point.service.DaPointService;
+import com.iailab.module.data.point.vo.DaPointPageReqVO;
+import com.iailab.module.data.point.vo.DaPointRespVO;
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 javax.annotation.security.PermitAll;
-import javax.validation.Valid;
-
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import java.util.List;
import java.util.Map;
+import java.util.UUID;
import static com.iailab.framework.common.pojo.CommonResult.success;
/**
- * @author PanZhibao
+ * @author lirm
* @Description
- * @createTime 2024年05月12日
+ * @createTime 2024年09月2日
*/
@Tag(name = "数据采集，测点")
@RestController
@@ -42,69 +38,52 @@
@Resource
private DaPointService daPointService;
- @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)")
- })
@PreAuthorize("@ss.hasPermission('data:point:query')")
- public CommonResult<PageData<DaPointDTO>> page(@RequestParam Map<String, Object> params){
- PageData<DaPointDTO> page = daPointService.page(params);
-
+ @GetMapping("page")
+ public CommonResult<PageResult<DaPointDTO>> page(@Valid DaPointPageReqVO reqVO){
+ PageResult<DaPointDTO> page = daPointService.queryPage(reqVO);
return success(page);
}
- @GetMapping("{id}")
- @Operation(summary = "信息")
@PreAuthorize("@ss.hasPermission('data:point:query')")
- public CommonResult<DaPointDTO> get(@PathVariable("id") String id){
- DaPointDTO data = daPointService.get(id);
-
- return new CommonResult<DaPointDTO>().setData(data);
- }
-
@GetMapping("/list")
@Operation(summary = "列表")
- @PreAuthorize("@ss.hasPermission('data:point:query')")
public CommonResult<List<DaPointDTO>> list(@Valid @RequestParam Map<String, Object> params) {
List<DaPointDTO> list = daPointService.list(params);
return success(list);
}
- @PostMapping
- @Operation(summary = "保存")
- @PreAuthorize("@ss.hasPermission('data:point:save')")
- public CommonResult save(@RequestBody DaPointDTO dto){
- //效验数据
- ValidationUtils.validate(dto, AddGroup.class, DefaultGroup.class);
- daPointService.add(dto);
-
- return new CommonResult();
+ @PreAuthorize("@ss.hasPermission('data:point:query')")
+ @GetMapping("/info/{id}")
+ public CommonResult<DaPointDTO> info(@PathVariable("id") String id){
+ DaPointDTO info= daPointService.info(id);
+ return success(info);
}
- @PutMapping
- @Operation(summary = "修改")
+ @PreAuthorize("@ss.hasPermission('data:point:create')")
+ @PostMapping("create")
+ public CommonResult<Boolean> create(@RequestBody DaPointDTO daPointDTO){
+ String id = UUID.randomUUID().toString();
+ daPointDTO.setId(id);
+ daPointService.add(daPointDTO);
+ return success(true);
+ }
+
@PreAuthorize("@ss.hasPermission('data:point:update')")
- public CommonResult update(@RequestBody DaPointDTO dto){
- //效验数据
- ValidationUtils.validate(dto, UpdateGroup.class, DefaultGroup.class);
-
- daPointService.update(dto);
-
- return new CommonResult();
+ @PutMapping("/update")
+ public CommonResult<Boolean> update(@RequestBody DaPointDTO daPointDTO) {
+ daPointService.update(daPointDTO);
+ return success(true);
}
- @DeleteMapping
- @Operation(summary = "删除")
@PreAuthorize("@ss.hasPermission('data:point:delete')")
- public CommonResult delete(@RequestBody String[] ids){
- daPointService.delete(ids);
- return new CommonResult();
+ @DeleteMapping("/delete")
+ public CommonResult<Boolean> delete(String id) {
+ daPointService.delete(new String[]{id});
+ return success(true);
}
+ @PreAuthorize("@ss.hasPermission('data:point:query')")
@GetMapping("pointNo")
public CommonResult<List<DaPointDTO>> getpoint(@RequestParam Map<String, Object> params){
List<DaPointDTO> list = daPointService.list(params);
@@ -112,20 +91,22 @@
return new CommonResult<List<DaPointDTO>>().setData(list);
}
+ @PreAuthorize("@ss.hasPermission('data:point:update')")
@PutMapping("/enable")
@Operation(summary = "启用")
@Transactional
- public CommonResult enable(@RequestBody String[] ids) {
+ public CommonResult<Boolean> enable(@RequestBody String[] ids) {
daPointService.enableByIds(ids);
- return new CommonResult();
+ return success(true);
}
+ @PreAuthorize("@ss.hasPermission('data:point:update')")
@PutMapping("/disable")
@Operation(summary = "禁用")
@Transactional
- public CommonResult disable(@RequestBody String[] ids) {
+ public CommonResult<Boolean> disable(@RequestBody String[] ids) {
daPointService.disableByIds(ids);
- return new CommonResult();
+ return success(true);
}
}
\ No newline at end of file
--
Gitblit v1.9.3