From ad903cac22aaae30dc7367bd70f5a1aecf8c3f28 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 09 一月 2023 17:26:12 +0800
Subject: [PATCH] 网格管理

---
 ycl-platform/src/main/java/com/ycl/controller/epuipment/OrgGridController.java |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 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 d8be847..c34bc96 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
@@ -32,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")
+    @GetMapping("/update")
     @ApiOperation(value = "淇敼")
     @LogSave(operationType = "缃戞牸绠$悊", contain = "淇敼")
     public CommonResult modify(@RequestBody OrgGrid orgGrid) {

--
Gitblit v1.8.0