From f284c5ef6a1aa6e9ba5d4e94e4b2abe83b6ea18c Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 31 七月 2024 14:54:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java index 102d8ee..1260ea4 100644 --- a/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java +++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java @@ -1,7 +1,9 @@ package com.ycl.platform.controller; +import com.ycl.platform.domain.form.BatchEditPointForm; import com.ycl.system.domain.group.Update; import com.ycl.system.domain.group.Add; +import jakarta.validation.constraints.NotBlank; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import lombok.RequiredArgsConstructor; @@ -34,50 +36,70 @@ @PostMapping @ApiOperation(value = "娣诲姞", notes = "娣诲姞") + @PreAuthorize("@ss.hasPermi('point:add')") public Result add(@RequestBody @Validated(Add.class) YwPointForm form) { return ywPointService.add(form); } @PostMapping("/batch") @ApiOperation(value = "鎵归噺娣诲姞", notes = "鎵归噺娣诲姞") + @PreAuthorize("@ss.hasPermi('point:add')") public Result batchAdd(@RequestBody @NotEmpty(message = "鏁版嵁涓嶈兘涓虹┖") List<YwPointForm> form) { return ywPointService.batchAdd(form); } @PutMapping @ApiOperation(value = "淇敼", notes = "淇敼") + @PreAuthorize("@ss.hasPermi('point:edit')") public Result update(@RequestBody @Validated(Update.class) YwPointForm form) { return ywPointService.update(form); } + @PutMapping("/batch") + @ApiOperation(value = "鎵归噺淇敼杩愮淮鍗曚綅", notes = "鎵归噺淇敼杩愮淮鍗曚綅") + @PreAuthorize("@ss.hasPermi('point:edit')") + public Result batchEdit(@RequestBody @Validated BatchEditPointForm form) { + return ywPointService.batchEdit(form); + } + @DeleteMapping("/{id}") @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎") + @PreAuthorize("@ss.hasPermi('point:remove')") public Result removeById(@PathVariable("id") String id) { return ywPointService.removeById(id); } @DeleteMapping("/batch") @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎") + @PreAuthorize("@ss.hasPermi('point:remove')") public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) { return ywPointService.remove(ids); } -// @PreAuthorize("@ss.hasPermi('point:page')") @GetMapping("/page") @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉") + @PreAuthorize("@ss.hasPermi('point:page')") public Result page(YwPointQuery query) { return ywPointService.page(query); } @GetMapping("/{id}") @ApiOperation(value = "璇︽儏", notes = "璇︽儏") + @PreAuthorize("@ss.hasPermi('point:query')") public Result detail(@PathVariable("id") String id) { return ywPointService.detail(id); } @GetMapping("/list") @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃") + @PreAuthorize("@ss.hasPermi('point:list')") public Result list() { return ywPointService.all(); } + + @GetMapping("/select") + @ApiOperation(value = "鐐逛綅涓嬫媺", notes = "鐐逛綅涓嬫媺") + public Result select(@NotBlank(message = "璇疯緭鍏ョ偣浣�") String keyword) { + return ywPointService.select(keyword); + } } -- Gitblit v1.8.0