From 217e39bec2ae2a861c4619d277ab0bc823cf85d4 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 28 二月 2025 11:41:35 +0800
Subject: [PATCH] Merge branch 'dev_cr' into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java
index 989bdd6..4ce8563 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java
@@ -1,21 +1,17 @@
package com.ruoyi.web.controller.system;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.domain.entity.Custom;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.service.CustomService;
-import com.ruoyi.system.service.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.util.Map;
+import java.util.List;
/**
@@ -33,12 +29,12 @@
private CustomService customService;
@ApiOperation(value = "鑾峰彇瀹㈡埛鍒楄〃")
- @PostMapping("/selectCustomPageList")
- public Result selectCustomPageList(@RequestBody Map<String, Object> data) throws Exception {
- return Result.success(customService.selectCustomPageList(null, null));
+ @GetMapping("/selectCustomPageList")
+ public Result<IPage<Custom>> selectCustomPageList(Page page, Custom custom) throws Exception {
+ return Result.success(customService.selectCustomPageList(page, custom));
}
@ApiOperation(value = "鍒犻櫎瀹㈡埛淇℃伅")
- @PostMapping("/delCustomById")
+ @DeleteMapping("/delCustomById")
public Result delCustomById(Long id) {
return Result.success(customService.delCustomById(id));
}
@@ -56,5 +52,11 @@
return Result.success(customService.upCustom(custom));
}
+ @ApiOperation(value = "鑾峰彇瀹㈡埛鏋氫妇")
+ @GetMapping ("/selectCustomEnum")
+ public Result<List<Custom>> selectCustomEnum(){
+ return Result.success(customService.selectCustomEnum());
+ }
+
}
--
Gitblit v1.9.3