map入参调整

src/main/java/com/sqx/modules/oss/controller/SysOssController.java

@@ -1,5 +1,6 @@
 package com.sqx.modules.oss.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.google.gson.Gson;
 import com.sqx.common.exception.SqxException;
 import com.sqx.common.utils.ConfigConstant;
@@ -27,6 +28,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Arrays;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -48,10 +50,19 @@ public class SysOssController {
 	 */
 	@GetMapping("/list")
 	@RequiresPermissions("sys:oss:all")
-	public Result list(Map<String, Object> params){
-		PageUtils page = sysOssService.queryPage(params);
+	public Result list(String page, String limit){
+		Map<String, Object> params = new HashMap<>();
+		if (StrUtil.isNotBlank(page)) {
+			params.put(Constant.PAGE, page);
+		}
+
+		if (StrUtil.isNotBlank(limit)) {
+			params.put(Constant.LIMIT, page);
+		}
+
+		PageUtils pageResult = sysOssService.queryPage(params);
 
-		return Result.success().put("page", page);
+		return Result.success().put("page", pageResult);
 	}
 
 

src/main/java/com/sqx/modules/sys/controller/SysConfigController.java

@@ -1,13 +1,13 @@
 package com.sqx.modules.sys.controller;
 
 
+import cn.hutool.core.util.StrUtil;
 import com.sqx.common.annotation.SysLog;
-import com.sqx.common.utils.PageUtils;
+import com.sqx.common.utils.Constant;
 import com.sqx.common.utils.Result;
 import com.sqx.common.validator.ValidatorUtils;
 import com.sqx.modules.sys.entity.SysConfigEntity;
 import com.sqx.modules.sys.service.SysConfigService;
-import icu.xuyijie.secureapi.annotation.DecryptParam;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -34,10 +35,22 @@ public class SysConfigController extends AbstractController {
 	 */
 	@GetMapping("/list")
 	@RequiresPermissions("sys:config:list")
-	public Result list(Map<String, Object> params){
-		PageUtils page = sysConfigService.queryPage(params);
+	public Result list(String page, String limit, String paramKey){
+		Map<String, Object> params = new HashMap<>();
 
-		return Result.success().put("page", page);
+		if (StrUtil.isNotBlank(paramKey)) {
+			params.put("paramKey", paramKey);
+		}
+
+		if (StrUtil.isNotBlank(page)) {
+			params.put(Constant.PAGE, page);
+		}
+
+		if (StrUtil.isNotBlank(limit)) {
+			params.put(Constant.LIMIT, page);
+		}
+
+		return Result.success().put("page", sysConfigService.queryPage(params));
 	}
 
 

src/main/java/com/sqx/modules/sys/controller/SysDictController.java

@@ -1,11 +1,11 @@
 package com.sqx.modules.sys.controller;
 
-import com.sqx.common.utils.PageUtils;
+import cn.hutool.core.util.StrUtil;
+import com.sqx.common.utils.Constant;
 import com.sqx.common.utils.Result;
 import com.sqx.common.validator.ValidatorUtils;
 import com.sqx.modules.sys.entity.SysDictEntity;
 import com.sqx.modules.sys.service.SysDictService;
-import icu.xuyijie.secureapi.annotation.DecryptParam;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -31,10 +32,22 @@ public class SysDictController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("sys:dict:list")
-    public Result list(Map<String, Object> params){
-        PageUtils page = sysDictService.queryPage(params);
+    public Result list(String name, String page, String limit){
+        Map<String, Object> params = new HashMap<>();
 
-        return Result.success().put("page", page);
+        if (StrUtil.isNotBlank(name)) {
+            params.put("name", name);
+        }
+
+        if (StrUtil.isNotBlank(page)) {
+            params.put(Constant.PAGE, page);
+        }
+
+        if (StrUtil.isNotBlank(limit)) {
+            params.put(Constant.LIMIT, page);
+        }
+
+        return Result.success().put("page", sysDictService.queryPage(params));
     }
 
 

src/main/java/com/sqx/modules/sys/controller/SysLogController.java

@@ -1,9 +1,9 @@
 package com.sqx.modules.sys.controller;
 
-import com.sqx.common.utils.PageUtils;
+import cn.hutool.core.util.StrUtil;
+import com.sqx.common.utils.Constant;
 import com.sqx.common.utils.Result;
 import com.sqx.modules.sys.service.SysLogService;
-import icu.xuyijie.secureapi.annotation.DecryptParam;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.HashMap;
 import java.util.Map;
 
 
@@ -30,10 +31,22 @@ public class SysLogController {
 	@ResponseBody
 	@GetMapping("/list")
 	@RequiresPermissions("sys:log:list")
-	public Result list(Map<String, Object> params){
-		PageUtils page = sysLogService.queryPage(params);
+	public Result list(String page, String limit, String key){
+		Map<String, Object> params = new HashMap<>();
 
-		return Result.success().put("page", page);
+		if (StrUtil.isNotBlank(key)) {
+			params.put("key", key);
+		}
+
+		if (StrUtil.isNotBlank(page)) {
+			params.put(Constant.PAGE, page);
+		}
+
+		if (StrUtil.isNotBlank(limit)) {
+			params.put(Constant.LIMIT, page);
+		}
+
+		return Result.success().put("page", sysLogService.queryPage(params));
 	}
 	
 }

src/main/java/com/sqx/modules/sys/controller/SysRoleController.java

@@ -1,13 +1,13 @@
 package com.sqx.modules.sys.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.sqx.common.annotation.SysLog;
-import com.sqx.common.utils.PageUtils;
+import com.sqx.common.utils.Constant;
 import com.sqx.common.utils.Result;
 import com.sqx.common.validator.ValidatorUtils;
 import com.sqx.modules.sys.entity.SysRoleEntity;
 import com.sqx.modules.sys.service.SysRoleMenuService;
 import com.sqx.modules.sys.service.SysRoleService;
-import icu.xuyijie.secureapi.annotation.DecryptParam;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,13 +38,23 @@ public class SysRoleController extends AbstractController {
 	 */
 	@GetMapping("/list")
 	@RequiresPermissions("sys:role:list")
-	public Result list(Map<String, Object> params){
-		//如果不是超级管理员，则只查询自己创建的角色列表
-		/*if(getUserId() != Constant.SUPER_ADMIN){
-			params.put("createUserId", getUserId());
-		}*/
-		PageUtils page = sysRoleService.queryPage(params);
-		return Result.success().put("page", page);
+	public Result list(String page, String limit, String roleName){
+
+		Map<String, Object> params = new HashMap<>();
+
+		if (StrUtil.isNotBlank(roleName)) {
+			params.put("roleName", roleName);
+		}
+
+		if (StrUtil.isNotBlank(page)) {
+			params.put(Constant.PAGE, page);
+		}
+
+		if (StrUtil.isNotBlank(limit)) {
+			params.put(Constant.LIMIT, page);
+		}
+
+		return Result.success().put("page", sysRoleService.queryPage(params));
 	}
 
 	/**

src/main/java/com/sqx/modules/sys/controller/SysUserController.java

@@ -1,8 +1,9 @@
 package com.sqx.modules.sys.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.sqx.common.annotation.SysLog;
-import com.sqx.common.utils.PageUtils;
+import com.sqx.common.utils.Constant;
 import com.sqx.common.utils.Result;
 import com.sqx.common.validator.Assert;
 import com.sqx.common.validator.ValidatorUtils;
@@ -19,7 +20,6 @@ import com.sqx.modules.sys.entity.SysUserEntity;
 import com.sqx.modules.sys.form.PasswordForm;
 import com.sqx.modules.sys.service.SysUserRoleService;
 import com.sqx.modules.sys.service.SysUserService;
-import icu.xuyijie.secureapi.annotation.DecryptParam;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.crypto.hash.Sha256Hash;
@@ -32,6 +32,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -60,14 +61,26 @@ public class SysUserController extends AbstractController {
 	 */
 	@GetMapping("/list")
 	@RequiresPermissions("sys:user:list")
-	public Result list(Map<String, Object> params){
-		//只有超级管理员，才能查看所有管理员列表
-		/*if(getUserId() != Constant.SUPER_ADMIN){
-			params.put("createUserId", getUserId());
-		}*/
-		PageUtils page = sysUserService.queryPage(params);
+	public Result list(String page, String limit, String username, String shopName){
+		Map<String, Object> params = new HashMap<>();
 
-		return Result.success().put("page", page);
+		if (StrUtil.isNotBlank(username)) {
+			params.put("username", username);
+		}
+
+		if (StrUtil.isNotBlank(shopName)) {
+			params.put("shopName", shopName);
+		}
+
+		if (StrUtil.isNotBlank(page)) {
+			params.put(Constant.PAGE, page);
+		}
+
+		if (StrUtil.isNotBlank(limit)) {
+			params.put(Constant.LIMIT, page);
+		}
+
+		return Result.success().put("page", sysUserService.queryPage(params));
 	}
 	
 	/**