From 1cad14bca191807e18705c3a5526eda8151be439 Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期一, 14 四月 2025 23:10:22 +0800 Subject: [PATCH] 批量审核和图片保存bug --- ycl-platform/src/main/java/com/ycl/controller/epuipment/OrgGridController.java | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/controller/epuipment/OrgGridController.java b/ycl-platform/src/main/java/com/ycl/controller/epuipment/OrgGridController.java index e952c59..eab449b 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/epuipment/OrgGridController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/epuipment/OrgGridController.java @@ -10,8 +10,6 @@ import com.ycl.entity.equipment.OrgGrid; import com.ycl.service.equipment.IOrgGridService; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -34,28 +32,28 @@ @GetMapping("/query") @ApiOperation(value = "鏌ヨ缃戞牸") - public CommonResult search(@RequestParam(required = false) String area, - @RequestParam Integer size, - @RequestParam Integer current) { - return CommonResult.success(iOrgGridService.page(new Page<>(size, current), new LambdaQueryWrapper<OrgGrid>() - .like(StringUtils.isNotBlank(area), OrgGrid::getArea, area))); + public CommonResult search(@RequestParam(required = false) String name, + @RequestParam Integer pageSize, + @RequestParam Integer currentPage) { + return CommonResult.success(iOrgGridService.search(pageSize, currentPage, name)); + } - @PostMapping("/addition") + @PostMapping("/add") @ApiOperation(value = "娣诲姞") @LogSave(operationType = "缃戞牸绠$悊", contain = "娣诲姞") public CommonResult add(@RequestBody OrgGrid orgGrid) { return CommonResult.success(iOrgGridService.save(orgGrid)); } - @DeleteMapping("/deletion") + @DeleteMapping("/delete/{id}") @ApiOperation(value = "鍒犻櫎") @LogSave(operationType = "缃戞牸绠$悊", contain = "鍒犻櫎") - public CommonResult delete(@RequestParam Integer id) { + public CommonResult delete(@PathVariable Long id) { return CommonResult.success(iOrgGridService.removeById(id)); } - @GetMapping("/modification") + @PutMapping("/update") @ApiOperation(value = "淇敼") @LogSave(operationType = "缃戞牸绠$悊", contain = "淇敼") public CommonResult modify(@RequestBody OrgGrid orgGrid) { -- Gitblit v1.8.0