From dd046d8bed00a7815bb6a61a9e4f4d8964f0b2a1 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 13 二月 2025 14:57:27 +0800
Subject: [PATCH] 全局Result重新修改
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java | 8
ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java | 42 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java | 30
pom.xml | 8
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java | 24
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 14
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 14
ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java | 4
ruoyi-generator/src/main/resources/vm/java/controller.java.vm | 12
ruoyi-system/src/main/resources/mapper/system/CustomMapper.xml | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 28
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java | 22
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java | 34
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java | 4
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java | 18
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/Result.java | 201 ++-------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java | 14
/dev/null | 115 ------
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomServiceImpl.java | 6
ruoyi-common/src/main/java/com/ruoyi/common/utils/QueryWrappers.java | 68 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 26
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java | 12
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java | 32
ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java | 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java | 14
ruoyi-system/src/main/java/com/ruoyi/system/service/CustomService.java | 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java | 216 +++++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java | 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java | 10
39 files changed, 596 insertions(+), 504 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1e1daae..b2aed96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,7 @@
<javase.version>3.4.1</javase.version>
<minio.version>8.4.3</minio.version>
<okhttp.version>4.9.0</okhttp.version>
+ <hutool.version>5.8.18</hutool.version>
</properties>
<!-- 渚濊禆澹版槑 -->
@@ -298,6 +299,13 @@
<artifactId>javase</artifactId>
<version>${javase.version}</version> <!-- 鎴栬�呮洿楂樼増鏈� -->
</dependency>
+
+ <!--hutool宸ュ叿鍖�-->
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ <version>${hutool.version}</version>
+ </dependency>
</dependencies>
<modules>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
index 4de1a9c..a6f4a3b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
@@ -14,7 +14,7 @@
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.sign.Base64;
import com.ruoyi.common.utils.uuid.IdUtils;
@@ -43,9 +43,9 @@
* 鐢熸垚楠岃瘉鐮�
*/
@GetMapping("/captchaImage")
- public Result getCode(HttpServletResponse response) throws IOException
+ public AjaxResult getCode(HttpServletResponse response) throws IOException
{
- Result ajax = Result.success();
+ AjaxResult ajax = AjaxResult.success();
boolean captchaEnabled = configService.selectCaptchaEnabled();
ajax.put("captchaEnabled", captchaEnabled);
if (!captchaEnabled)
@@ -84,7 +84,7 @@
}
catch (IOException e)
{
- return Result.error(e.getMessage());
+ return AjaxResult.error(e.getMessage());
}
ajax.put("uuid", uuid);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
index cb32f2f..d58b107 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@@ -15,7 +15,7 @@
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils;
@@ -73,7 +73,7 @@
* 閫氱敤涓婁紶璇锋眰锛堝崟涓級
*/
@PostMapping("/upload")
- public Result uploadFile(MultipartFile file) throws Exception
+ public AjaxResult uploadFile(MultipartFile file) throws Exception
{
try
{
@@ -82,7 +82,7 @@
// 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
String fileName = FileUploadUtils.upload(filePath, file);
String url = serverConfig.getUrl() + fileName;
- Result ajax = Result.success();
+ AjaxResult ajax = AjaxResult.success();
ajax.put("url", url);
ajax.put("fileName", fileName);
ajax.put("newFileName", FileUtils.getName(fileName));
@@ -91,7 +91,7 @@
}
catch (Exception e)
{
- return Result.error(e.getMessage());
+ return AjaxResult.error(e.getMessage());
}
}
@@ -99,7 +99,7 @@
* 閫氱敤涓婁紶璇锋眰锛堝涓級
*/
@PostMapping("/uploads")
- public Result uploadFiles(List<MultipartFile> files) throws Exception
+ public AjaxResult uploadFiles(List<MultipartFile> files) throws Exception
{
try
{
@@ -119,7 +119,7 @@
newFileNames.add(FileUtils.getName(fileName));
originalFilenames.add(file.getOriginalFilename());
}
- Result ajax = Result.success();
+ AjaxResult ajax = AjaxResult.success();
ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER));
ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
ajax.put("newFileNames", StringUtils.join(newFileNames, FILE_DELIMETER));
@@ -128,7 +128,7 @@
}
catch (Exception e)
{
- return Result.error(e.getMessage());
+ return AjaxResult.error(e.getMessage());
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
index 684c000..b3859cb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
@@ -18,7 +18,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.constant.CacheConstants;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.SysCache;
@@ -47,7 +47,7 @@
@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@GetMapping()
- public Result getInfo() throws Exception
+ public AjaxResult getInfo() throws Exception
{
Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info());
Properties commandStats = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info("commandstats"));
@@ -66,56 +66,56 @@
pieList.add(data);
});
result.put("commandStats", pieList);
- return Result.success(result);
+ return AjaxResult.success(result);
}
@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@GetMapping("/getNames")
- public Result cache()
+ public AjaxResult cache()
{
- return Result.success(caches);
+ return AjaxResult.success(caches);
}
@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@GetMapping("/getKeys/{cacheName}")
- public Result getCacheKeys(@PathVariable String cacheName)
+ public AjaxResult getCacheKeys(@PathVariable String cacheName)
{
Set<String> cacheKeys = redisTemplate.keys(cacheName + "*");
- return Result.success(new TreeSet<>(cacheKeys));
+ return AjaxResult.success(new TreeSet<>(cacheKeys));
}
@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@GetMapping("/getValue/{cacheName}/{cacheKey}")
- public Result getCacheValue(@PathVariable String cacheName, @PathVariable String cacheKey)
+ public AjaxResult getCacheValue(@PathVariable String cacheName, @PathVariable String cacheKey)
{
String cacheValue = redisTemplate.opsForValue().get(cacheKey);
SysCache sysCache = new SysCache(cacheName, cacheKey, cacheValue);
- return Result.success(sysCache);
+ return AjaxResult.success(sysCache);
}
@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@DeleteMapping("/clearCacheName/{cacheName}")
- public Result clearCacheName(@PathVariable String cacheName)
+ public AjaxResult clearCacheName(@PathVariable String cacheName)
{
Collection<String> cacheKeys = redisTemplate.keys(cacheName + "*");
redisTemplate.delete(cacheKeys);
- return Result.success();
+ return AjaxResult.success();
}
@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@DeleteMapping("/clearCacheKey/{cacheKey}")
- public Result clearCacheKey(@PathVariable String cacheKey)
+ public AjaxResult clearCacheKey(@PathVariable String cacheKey)
{
redisTemplate.delete(cacheKey);
- return Result.success();
+ return AjaxResult.success();
}
@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@DeleteMapping("/clearCacheAll")
- public Result clearCacheAll()
+ public AjaxResult clearCacheAll()
{
Collection<String> cacheKeys = redisTemplate.keys("*");
redisTemplate.delete(cacheKeys);
- return Result.success();
+ return AjaxResult.success();
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
index 8aced92..aab1419 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
@@ -4,7 +4,7 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.framework.web.domain.Server;
/**
@@ -18,10 +18,10 @@
{
@PreAuthorize("@ss.hasPermi('monitor:server:list')")
@GetMapping()
- public Result getInfo() throws Exception
+ public AjaxResult getInfo() throws Exception
{
Server server = new Server();
server.copyTo();
- return Result.success(server);
+ return AjaxResult.success(server);
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
index 4935a56..7e4fb7f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
@@ -12,7 +12,7 @@
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -57,7 +57,7 @@
@PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
@Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.DELETE)
@DeleteMapping("/{infoIds}")
- public Result remove(@PathVariable Long[] infoIds)
+ public AjaxResult remove(@PathVariable Long[] infoIds)
{
return toAjax(logininforService.deleteLogininforByIds(infoIds));
}
@@ -65,7 +65,7 @@
@PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
@Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.CLEAN)
@DeleteMapping("/clean")
- public Result clean()
+ public AjaxResult clean()
{
logininforService.cleanLogininfor();
return success();
@@ -74,7 +74,7 @@
@PreAuthorize("@ss.hasPermi('monitor:logininfor:unlock')")
@Log(title = "璐︽埛瑙ｉ攣", businessType = BusinessType.OTHER)
@GetMapping("/unlock/{userName}")
- public Result unlock(@PathVariable("userName") String userName)
+ public AjaxResult unlock(@PathVariable("userName") String userName)
{
passwordService.clearLoginRecordCache(userName);
return success();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
index c480438..5e17574 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
@@ -12,7 +12,7 @@
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -53,7 +53,7 @@
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.DELETE)
@PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
@DeleteMapping("/{operIds}")
- public Result remove(@PathVariable Long[] operIds)
+ public AjaxResult remove(@PathVariable Long[] operIds)
{
return toAjax(operLogService.deleteOperLogByIds(operIds));
}
@@ -61,7 +61,7 @@
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.CLEAN)
@PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
@DeleteMapping("/clean")
- public Result clean()
+ public AjaxResult clean()
{
operLogService.cleanOperLog();
return success();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
index d6799fd..a26dcf5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
@@ -14,7 +14,7 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.redis.RedisCache;
@@ -75,7 +75,7 @@
@PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
@Log(title = "鍦ㄧ嚎鐢ㄦ埛", businessType = BusinessType.FORCE)
@DeleteMapping("/{tokenId}")
- public Result forceLogout(@PathVariable String tokenId)
+ public AjaxResult forceLogout(@PathVariable String tokenId)
{
redisCache.deleteObject(CacheConstants.LOGIN_TOKEN_KEY + tokenId);
return success();
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..040af38 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,9 +29,9 @@
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")
@@ -56,5 +52,11 @@
return Result.success(customService.upCustom(custom));
}
+ @ApiOperation(value = "鑾峰彇瀹㈡埛鏋氫妇")
+ @GetMapping ("/selectCustomEnum")
+ public Result<List<Custom>> selectCustomEnum(){
+ return Result.success(customService.selectCustomEnum());
+ }
+
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
index 39c0ec8..69499bb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
@@ -15,7 +15,7 @@
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -61,7 +61,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:config:query')")
@GetMapping(value = "/{configId}")
- public Result getInfo(@PathVariable Long configId)
+ public AjaxResult getInfo(@PathVariable Long configId)
{
return success(configService.selectConfigById(configId));
}
@@ -70,7 +70,7 @@
* 鏍规嵁鍙傛暟閿悕鏌ヨ鍙傛暟鍊�
*/
@GetMapping(value = "/configKey/{configKey}")
- public Result getConfigKey(@PathVariable String configKey)
+ public AjaxResult getConfigKey(@PathVariable String configKey)
{
return success(configService.selectConfigByKey(configKey));
}
@@ -81,7 +81,7 @@
@PreAuthorize("@ss.hasPermi('system:config:add')")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
- public Result add(@Validated @RequestBody SysConfig config)
+ public AjaxResult add(@Validated @RequestBody SysConfig config)
{
if (!configService.checkConfigKeyUnique(config))
{
@@ -97,7 +97,7 @@
@PreAuthorize("@ss.hasPermi('system:config:edit')")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
- public Result edit(@Validated @RequestBody SysConfig config)
+ public AjaxResult edit(@Validated @RequestBody SysConfig config)
{
if (!configService.checkConfigKeyUnique(config))
{
@@ -113,7 +113,7 @@
@PreAuthorize("@ss.hasPermi('system:config:remove')")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{configIds}")
- public Result remove(@PathVariable Long[] configIds)
+ public AjaxResult remove(@PathVariable Long[] configIds)
{
configService.deleteConfigByIds(configIds);
return success();
@@ -125,7 +125,7 @@
@PreAuthorize("@ss.hasPermi('system:config:remove')")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.CLEAN)
@DeleteMapping("/refreshCache")
- public Result refreshCache()
+ public AjaxResult refreshCache()
{
configService.resetConfigCache();
return success();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
index 60c2f4d..1315ed3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
@@ -16,7 +16,7 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
@@ -39,7 +39,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:dept:list')")
@GetMapping("/list")
- public Result list(SysDept dept)
+ public AjaxResult list(SysDept dept)
{
List<SysDept> depts = deptService.selectDeptList(dept);
return success(depts);
@@ -50,7 +50,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:dept:list')")
@GetMapping("/list/exclude/{deptId}")
- public Result excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
+ public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
{
List<SysDept> depts = deptService.selectDeptList(new SysDept());
depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
@@ -62,7 +62,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:dept:query')")
@GetMapping(value = "/{deptId}")
- public Result getInfo(@PathVariable Long deptId)
+ public AjaxResult getInfo(@PathVariable Long deptId)
{
deptService.checkDeptDataScope(deptId);
return success(deptService.selectDeptById(deptId));
@@ -74,7 +74,7 @@
@PreAuthorize("@ss.hasPermi('system:dept:add')")
@Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
- public Result add(@Validated @RequestBody SysDept dept)
+ public AjaxResult add(@Validated @RequestBody SysDept dept)
{
if (!deptService.checkDeptNameUnique(dept))
{
@@ -90,7 +90,7 @@
@PreAuthorize("@ss.hasPermi('system:dept:edit')")
@Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
- public Result edit(@Validated @RequestBody SysDept dept)
+ public AjaxResult edit(@Validated @RequestBody SysDept dept)
{
Long deptId = dept.getDeptId();
deptService.checkDeptDataScope(deptId);
@@ -116,7 +116,7 @@
@PreAuthorize("@ss.hasPermi('system:dept:remove')")
@Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{deptId}")
- public Result remove(@PathVariable Long deptId)
+ public AjaxResult remove(@PathVariable Long deptId)
{
if (deptService.hasChildByDeptId(deptId))
{
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
index 2f1ad82..4d4d2e5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
@@ -16,7 +16,7 @@
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
@@ -64,7 +64,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:dict:query')")
@GetMapping(value = "/{dictCode}")
- public Result getInfo(@PathVariable Long dictCode)
+ public AjaxResult getInfo(@PathVariable Long dictCode)
{
return success(dictDataService.selectDictDataById(dictCode));
}
@@ -73,7 +73,7 @@
* 鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁淇℃伅
*/
@GetMapping(value = "/type/{dictType}")
- public Result dictType(@PathVariable String dictType)
+ public AjaxResult dictType(@PathVariable String dictType)
{
List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
if (StringUtils.isNull(data))
@@ -89,7 +89,7 @@
@PreAuthorize("@ss.hasPermi('system:dict:add')")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.INSERT)
@PostMapping
- public Result add(@Validated @RequestBody SysDictData dict)
+ public AjaxResult add(@Validated @RequestBody SysDictData dict)
{
dict.setCreateBy(getUsername());
return toAjax(dictDataService.insertDictData(dict));
@@ -101,7 +101,7 @@
@PreAuthorize("@ss.hasPermi('system:dict:edit')")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.UPDATE)
@PutMapping
- public Result edit(@Validated @RequestBody SysDictData dict)
+ public AjaxResult edit(@Validated @RequestBody SysDictData dict)
{
dict.setUpdateBy(getUsername());
return toAjax(dictDataService.updateDictData(dict));
@@ -113,7 +113,7 @@
@PreAuthorize("@ss.hasPermi('system:dict:remove')")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE)
@DeleteMapping("/{dictCodes}")
- public Result remove(@PathVariable Long[] dictCodes)
+ public AjaxResult remove(@PathVariable Long[] dictCodes)
{
dictDataService.deleteDictDataByIds(dictCodes);
return success();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
index e27445e..7e3a519 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
@@ -15,7 +15,7 @@
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
@@ -58,7 +58,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:dict:query')")
@GetMapping(value = "/{dictId}")
- public Result getInfo(@PathVariable Long dictId)
+ public AjaxResult getInfo(@PathVariable Long dictId)
{
return success(dictTypeService.selectDictTypeById(dictId));
}
@@ -69,7 +69,7 @@
@PreAuthorize("@ss.hasPermi('system:dict:add')")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.INSERT)
@PostMapping
- public Result add(@Validated @RequestBody SysDictType dict)
+ public AjaxResult add(@Validated @RequestBody SysDictType dict)
{
if (!dictTypeService.checkDictTypeUnique(dict))
{
@@ -85,7 +85,7 @@
@PreAuthorize("@ss.hasPermi('system:dict:edit')")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.UPDATE)
@PutMapping
- public Result edit(@Validated @RequestBody SysDictType dict)
+ public AjaxResult edit(@Validated @RequestBody SysDictType dict)
{
if (!dictTypeService.checkDictTypeUnique(dict))
{
@@ -101,7 +101,7 @@
@PreAuthorize("@ss.hasPermi('system:dict:remove')")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE)
@DeleteMapping("/{dictIds}")
- public Result remove(@PathVariable Long[] dictIds)
+ public AjaxResult remove(@PathVariable Long[] dictIds)
{
dictTypeService.deleteDictTypeByIds(dictIds);
return success();
@@ -113,7 +113,7 @@
@PreAuthorize("@ss.hasPermi('system:dict:remove')")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.CLEAN)
@DeleteMapping("/refreshCache")
- public Result refreshCache()
+ public AjaxResult refreshCache()
{
dictTypeService.resetDictCache();
return success();
@@ -123,7 +123,7 @@
* 鑾峰彇瀛楀吀閫夋嫨妗嗗垪琛�
*/
@GetMapping("/optionselect")
- public Result optionselect()
+ public AjaxResult optionselect()
{
List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
return success(dictTypes);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index c05ebf3..ae31b90 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -8,7 +8,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginBody;
@@ -46,9 +46,9 @@
* @return 缁撴灉
*/
@PostMapping("/login")
- public Result login(@RequestBody LoginBody loginBody)
+ public AjaxResult login(@RequestBody LoginBody loginBody)
{
- Result ajax = Result.success();
+ AjaxResult ajax = AjaxResult.success();
// 鐢熸垚浠ょ墝
String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
loginBody.getUuid());
@@ -62,7 +62,7 @@
* @return 鐢ㄦ埛淇℃伅
*/
@GetMapping("getInfo")
- public Result getInfo()
+ public AjaxResult getInfo()
{
LoginUser loginUser = SecurityUtils.getLoginUser();
SysUser user = loginUser.getUser();
@@ -75,7 +75,7 @@
loginUser.setPermissions(permissions);
tokenService.refreshToken(loginUser);
}
- Result ajax = Result.success();
+ AjaxResult ajax = AjaxResult.success();
ajax.put("user", user);
ajax.put("roles", roles);
ajax.put("permissions", permissions);
@@ -88,10 +88,10 @@
* @return 璺敱淇℃伅
*/
@GetMapping("getRouters")
- public Result getRouters()
+ public AjaxResult getRouters()
{
Long userId = SecurityUtils.getUserId();
List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
- return Result.success(menuService.buildMenus(menus));
+ return AjaxResult.success(menuService.buildMenus(menus));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
index 4f92606..fa6d4c6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
@@ -15,7 +15,7 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
@@ -38,7 +38,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:menu:list')")
@GetMapping("/list")
- public Result list(SysMenu menu)
+ public AjaxResult list(SysMenu menu)
{
List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
return success(menus);
@@ -49,7 +49,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:menu:query')")
@GetMapping(value = "/{menuId}")
- public Result getInfo(@PathVariable Long menuId)
+ public AjaxResult getInfo(@PathVariable Long menuId)
{
return success(menuService.selectMenuById(menuId));
}
@@ -58,7 +58,7 @@
* 鑾峰彇鑿滃崟涓嬫媺鏍戝垪琛�
*/
@GetMapping("/treeselect")
- public Result treeselect(SysMenu menu)
+ public AjaxResult treeselect(SysMenu menu)
{
List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
return success(menuService.buildMenuTreeSelect(menus));
@@ -68,10 +68,10 @@
* 鍔犺浇瀵瑰簲瑙掕壊鑿滃崟鍒楄〃鏍�
*/
@GetMapping(value = "/roleMenuTreeselect/{roleId}")
- public Result roleMenuTreeselect(@PathVariable("roleId") Long roleId)
+ public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
{
List<SysMenu> menus = menuService.selectMenuList(getUserId());
- Result ajax = Result.success();
+ AjaxResult ajax = AjaxResult.success();
ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
ajax.put("menus", menuService.buildMenuTreeSelect(menus));
return ajax;
@@ -83,7 +83,7 @@
@PreAuthorize("@ss.hasPermi('system:menu:add')")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
- public Result add(@Validated @RequestBody SysMenu menu)
+ public AjaxResult add(@Validated @RequestBody SysMenu menu)
{
if (!menuService.checkMenuNameUnique(menu))
{
@@ -103,7 +103,7 @@
@PreAuthorize("@ss.hasPermi('system:menu:edit')")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
- public Result edit(@Validated @RequestBody SysMenu menu)
+ public AjaxResult edit(@Validated @RequestBody SysMenu menu)
{
if (!menuService.checkMenuNameUnique(menu))
{
@@ -127,7 +127,7 @@
@PreAuthorize("@ss.hasPermi('system:menu:remove')")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{menuId}")
- public Result remove(@PathVariable("menuId") Long menuId)
+ public AjaxResult remove(@PathVariable("menuId") Long menuId)
{
if (menuService.hasChildByMenuId(menuId))
{
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
index 7be78b5..18d4384 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
@@ -14,7 +14,7 @@
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.domain.SysNotice;
@@ -49,7 +49,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:notice:query')")
@GetMapping(value = "/{noticeId}")
- public Result getInfo(@PathVariable Long noticeId)
+ public AjaxResult getInfo(@PathVariable Long noticeId)
{
return success(noticeService.selectNoticeById(noticeId));
}
@@ -60,7 +60,7 @@
@PreAuthorize("@ss.hasPermi('system:notice:add')")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.INSERT)
@PostMapping
- public Result add(@Validated @RequestBody SysNotice notice)
+ public AjaxResult add(@Validated @RequestBody SysNotice notice)
{
notice.setCreateBy(getUsername());
return toAjax(noticeService.insertNotice(notice));
@@ -72,7 +72,7 @@
@PreAuthorize("@ss.hasPermi('system:notice:edit')")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.UPDATE)
@PutMapping
- public Result edit(@Validated @RequestBody SysNotice notice)
+ public AjaxResult edit(@Validated @RequestBody SysNotice notice)
{
notice.setUpdateBy(getUsername());
return toAjax(noticeService.updateNotice(notice));
@@ -84,7 +84,7 @@
@PreAuthorize("@ss.hasPermi('system:notice:remove')")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.DELETE)
@DeleteMapping("/{noticeIds}")
- public Result remove(@PathVariable Long[] noticeIds)
+ public AjaxResult remove(@PathVariable Long[] noticeIds)
{
return toAjax(noticeService.deleteNoticeByIds(noticeIds));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
index 68889dc..56bb00f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
@@ -15,7 +15,7 @@
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -61,7 +61,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:post:query')")
@GetMapping(value = "/{postId}")
- public Result getInfo(@PathVariable Long postId)
+ public AjaxResult getInfo(@PathVariable Long postId)
{
return success(postService.selectPostById(postId));
}
@@ -72,7 +72,7 @@
@PreAuthorize("@ss.hasPermi('system:post:add')")
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
- public Result add(@Validated @RequestBody SysPost post)
+ public AjaxResult add(@Validated @RequestBody SysPost post)
{
if (!postService.checkPostNameUnique(post))
{
@@ -92,7 +92,7 @@
@PreAuthorize("@ss.hasPermi('system:post:edit')")
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
- public Result edit(@Validated @RequestBody SysPost post)
+ public AjaxResult edit(@Validated @RequestBody SysPost post)
{
if (!postService.checkPostNameUnique(post))
{
@@ -112,7 +112,7 @@
@PreAuthorize("@ss.hasPermi('system:post:remove')")
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{postIds}")
- public Result remove(@PathVariable Long[] postIds)
+ public AjaxResult remove(@PathVariable Long[] postIds)
{
return toAjax(postService.deletePostByIds(postIds));
}
@@ -121,7 +121,7 @@
* 鑾峰彇宀椾綅閫夋嫨妗嗗垪琛�
*/
@GetMapping("/optionselect")
- public Result optionselect()
+ public AjaxResult optionselect()
{
List<SysPost> posts = postService.selectPostAll();
return success(posts);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
index 679be7c..24c4b2b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
@@ -13,7 +13,7 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.BusinessType;
@@ -43,11 +43,11 @@
* 涓汉淇℃伅
*/
@GetMapping
- public Result profile()
+ public AjaxResult profile()
{
LoginUser loginUser = getLoginUser();
SysUser user = loginUser.getUser();
- Result ajax = Result.success(user);
+ AjaxResult ajax = AjaxResult.success(user);
ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
return ajax;
@@ -58,7 +58,7 @@
*/
@Log(title = "涓汉淇℃伅", businessType = BusinessType.UPDATE)
@PutMapping
- public Result updateProfile(@RequestBody SysUser user)
+ public AjaxResult updateProfile(@RequestBody SysUser user)
{
LoginUser loginUser = getLoginUser();
SysUser currentUser = loginUser.getUser();
@@ -88,7 +88,7 @@
*/
@Log(title = "涓汉淇℃伅", businessType = BusinessType.UPDATE)
@PutMapping("/updatePwd")
- public Result updatePwd(@RequestBody Map<String, String> params)
+ public AjaxResult updatePwd(@RequestBody Map<String, String> params)
{
String oldPassword = params.get("oldPassword");
String newPassword = params.get("newPassword");
@@ -119,7 +119,7 @@
*/
@Log(title = "鐢ㄦ埛澶村儚", businessType = BusinessType.UPDATE)
@PostMapping("/avatar")
- public Result avatar(@RequestParam("avatarfile") MultipartFile file) throws Exception
+ public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws Exception
{
if (!file.isEmpty())
{
@@ -127,7 +127,7 @@
String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION);
if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
{
- Result ajax = Result.success();
+ AjaxResult ajax = AjaxResult.success();
ajax.put("imgUrl", avatar);
// 鏇存柊缂撳瓨鐢ㄦ埛澶村儚
loginUser.getUser().setAvatar(avatar);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
index 9d15189..6599809 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
@@ -5,7 +5,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.model.RegisterBody;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.SysRegisterService;
@@ -26,7 +26,7 @@
private ISysConfigService configService;
@PostMapping("/register")
- public Result register(@RequestBody RegisterBody user)
+ public AjaxResult register(@RequestBody RegisterBody user)
{
if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser"))))
{
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
index 03da97c..abe942b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@@ -15,7 +15,7 @@
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -79,7 +79,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:role:query')")
@GetMapping(value = "/{roleId}")
- public Result getInfo(@PathVariable Long roleId)
+ public AjaxResult getInfo(@PathVariable Long roleId)
{
roleService.checkRoleDataScope(roleId);
return success(roleService.selectRoleById(roleId));
@@ -91,7 +91,7 @@
@PreAuthorize("@ss.hasPermi('system:role:add')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
- public Result add(@Validated @RequestBody SysRole role)
+ public AjaxResult add(@Validated @RequestBody SysRole role)
{
if (!roleService.checkRoleNameUnique(role))
{
@@ -112,7 +112,7 @@
@PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
- public Result edit(@Validated @RequestBody SysRole role)
+ public AjaxResult edit(@Validated @RequestBody SysRole role)
{
roleService.checkRoleAllowed(role);
roleService.checkRoleDataScope(role.getRoleId());
@@ -147,7 +147,7 @@
@PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/dataScope")
- public Result dataScope(@RequestBody SysRole role)
+ public AjaxResult dataScope(@RequestBody SysRole role)
{
roleService.checkRoleAllowed(role);
roleService.checkRoleDataScope(role.getRoleId());
@@ -160,7 +160,7 @@
@PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
- public Result changeStatus(@RequestBody SysRole role)
+ public AjaxResult changeStatus(@RequestBody SysRole role)
{
roleService.checkRoleAllowed(role);
roleService.checkRoleDataScope(role.getRoleId());
@@ -174,7 +174,7 @@
@PreAuthorize("@ss.hasPermi('system:role:remove')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{roleIds}")
- public Result remove(@PathVariable Long[] roleIds)
+ public AjaxResult remove(@PathVariable Long[] roleIds)
{
return toAjax(roleService.deleteRoleByIds(roleIds));
}
@@ -184,7 +184,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:role:query')")
@GetMapping("/optionselect")
- public Result optionselect()
+ public AjaxResult optionselect()
{
return success(roleService.selectRoleAll());
}
@@ -219,7 +219,7 @@
@PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
@PutMapping("/authUser/cancel")
- public Result cancelAuthUser(@RequestBody SysUserRole userRole)
+ public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
{
return toAjax(roleService.deleteAuthUser(userRole));
}
@@ -230,7 +230,7 @@
@PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
@PutMapping("/authUser/cancelAll")
- public Result cancelAuthUserAll(Long roleId, Long[] userIds)
+ public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
{
return toAjax(roleService.deleteAuthUsers(roleId, userIds));
}
@@ -241,7 +241,7 @@
@PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
@PutMapping("/authUser/selectAll")
- public Result selectAuthUserAll(Long roleId, Long[] userIds)
+ public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
{
roleService.checkRoleDataScope(roleId);
return toAjax(roleService.insertAuthUsers(roleId, userIds));
@@ -252,9 +252,9 @@
*/
@PreAuthorize("@ss.hasPermi('system:role:query')")
@GetMapping(value = "/deptTree/{roleId}")
- public Result deptTree(@PathVariable("roleId") Long roleId)
+ public AjaxResult deptTree(@PathVariable("roleId") Long roleId)
{
- Result ajax = Result.success();
+ AjaxResult ajax = AjaxResult.success();
ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
ajax.put("depts", deptService.selectDeptTreeList(new SysDept()));
return ajax;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 1f3eebd..a6b0865 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -18,7 +18,7 @@
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -78,7 +78,7 @@
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
@PreAuthorize("@ss.hasPermi('system:user:import')")
@PostMapping("/importData")
- public Result importData(MultipartFile file, boolean updateSupport) throws Exception
+ public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
{
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
List<SysUser> userList = util.importExcel(file.getInputStream());
@@ -99,14 +99,14 @@
*/
@PreAuthorize("@ss.hasPermi('system:user:query')")
@GetMapping(value = { "/", "/{userId}" })
- public Result getInfo(@PathVariable(value = "userId", required = false) Long userId)
+ public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
{
- Result ajax = Result.success();
+ AjaxResult ajax = AjaxResult.success();
if (StringUtils.isNotNull(userId))
{
userService.checkUserDataScope(userId);
SysUser sysUser = userService.selectUserById(userId);
- ajax.put(Result.DATA_TAG, sysUser);
+ ajax.put(AjaxResult.DATA_TAG, sysUser);
ajax.put("postIds", postService.selectPostListByUserId(userId));
ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
}
@@ -122,7 +122,7 @@
@PreAuthorize("@ss.hasPermi('system:user:add')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
- public Result add(@Validated @RequestBody SysUser user)
+ public AjaxResult add(@Validated @RequestBody SysUser user)
{
deptService.checkDeptDataScope(user.getDeptId());
roleService.checkRoleDataScope(user.getRoleIds());
@@ -149,7 +149,7 @@
@PreAuthorize("@ss.hasPermi('system:user:edit')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
- public Result edit(@Validated @RequestBody SysUser user)
+ public AjaxResult edit(@Validated @RequestBody SysUser user)
{
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
@@ -177,7 +177,7 @@
@PreAuthorize("@ss.hasPermi('system:user:remove')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{userIds}")
- public Result remove(@PathVariable Long[] userIds)
+ public AjaxResult remove(@PathVariable Long[] userIds)
{
if (ArrayUtils.contains(userIds, getUserId()))
{
@@ -192,7 +192,7 @@
@PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/resetPwd")
- public Result resetPwd(@RequestBody SysUser user)
+ public AjaxResult resetPwd(@RequestBody SysUser user)
{
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
@@ -207,7 +207,7 @@
@PreAuthorize("@ss.hasPermi('system:user:edit')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
- public Result changeStatus(@RequestBody SysUser user)
+ public AjaxResult changeStatus(@RequestBody SysUser user)
{
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
@@ -220,9 +220,9 @@
*/
@PreAuthorize("@ss.hasPermi('system:user:query')")
@GetMapping("/authRole/{userId}")
- public Result authRole(@PathVariable("userId") Long userId)
+ public AjaxResult authRole(@PathVariable("userId") Long userId)
{
- Result ajax = Result.success();
+ AjaxResult ajax = AjaxResult.success();
SysUser user = userService.selectUserById(userId);
List<SysRole> roles = roleService.selectRolesByUserId(userId);
ajax.put("user", user);
@@ -236,7 +236,7 @@
@PreAuthorize("@ss.hasPermi('system:user:edit')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.GRANT)
@PutMapping("/authRole")
- public Result insertAuthRole(Long userId, Long[] roleIds)
+ public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
{
userService.checkUserDataScope(userId);
roleService.checkRoleDataScope(roleIds);
@@ -249,7 +249,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:user:list')")
@GetMapping("/deptTree")
- public Result deptTree(SysDept dept)
+ public AjaxResult deptTree(SysDept dept)
{
return success(deptService.selectDeptTreeList(dept));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
index b4f6bac..5618863 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
@@ -13,7 +13,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.utils.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -24,7 +24,7 @@
/**
* swagger 鐢ㄦ埛娴嬭瘯鏂规硶
- *
+ *
* @author ruoyi
*/
@Api("鐢ㄦ埛淇℃伅绠＄悊")
@@ -40,24 +40,24 @@
@ApiOperation("鑾峰彇鐢ㄦ埛鍒楄〃")
@GetMapping("/list")
- public R<List<UserEntity>> userList()
+ public Result<List<UserEntity>> userList()
{
List<UserEntity> userList = new ArrayList<UserEntity>(users.values());
- return R.ok(userList);
+ return Result.success(userList);
}
@ApiOperation("鑾峰彇鐢ㄦ埛璇︾粏")
@ApiImplicitParam(name = "userId", value = "鐢ㄦ埛ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
@GetMapping("/{userId}")
- public R<UserEntity> getUser(@PathVariable Integer userId)
+ public Result<UserEntity> getUser(@PathVariable Integer userId)
{
if (!users.isEmpty() && users.containsKey(userId))
{
- return R.ok(users.get(userId));
+ return Result.success(users.get(userId));
}
else
{
- return R.fail("鐢ㄦ埛涓嶅瓨鍦�");
+ return Result.fail("鐢ㄦ埛涓嶅瓨鍦�");
}
}
@@ -69,46 +69,46 @@
@ApiImplicitParam(name = "mobile", value = "鐢ㄦ埛鎵嬫満", dataType = "String", dataTypeClass = String.class)
})
@PostMapping("/save")
- public R<String> save(UserEntity user)
+ public Result<String> save(UserEntity user)
{
if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
{
- return R.fail("鐢ㄦ埛ID涓嶈兘涓虹┖");
+ return Result.fail("鐢ㄦ埛ID涓嶈兘涓虹┖");
}
users.put(user.getUserId(), user);
- return R.ok();
+ return Result.success();
}
@ApiOperation("鏇存柊鐢ㄦ埛")
@PutMapping("/update")
- public R<String> update(@RequestBody UserEntity user)
+ public Result<String> update(@RequestBody UserEntity user)
{
if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
{
- return R.fail("鐢ㄦ埛ID涓嶈兘涓虹┖");
+ return Result.fail("鐢ㄦ埛ID涓嶈兘涓虹┖");
}
if (users.isEmpty() || !users.containsKey(user.getUserId()))
{
- return R.fail("鐢ㄦ埛涓嶅瓨鍦�");
+ return Result.fail("鐢ㄦ埛涓嶅瓨鍦�");
}
users.remove(user.getUserId());
users.put(user.getUserId(), user);
- return R.ok();
+ return Result.success();
}
@ApiOperation("鍒犻櫎鐢ㄦ埛淇℃伅")
@ApiImplicitParam(name = "userId", value = "鐢ㄦ埛ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
@DeleteMapping("/{userId}")
- public R<String> delete(@PathVariable Integer userId)
+ public Result<String> delete(@PathVariable Integer userId)
{
if (!users.isEmpty() && users.containsKey(userId))
{
users.remove(userId);
- return R.ok();
+ return Result.success();
}
else
{
- return R.fail("鐢ㄦ埛涓嶅瓨鍦�");
+ return Result.fail("鐢ㄦ埛涓嶅瓨鍦�");
}
}
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
index 24dbd70..b29a15e 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -10,7 +10,7 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.PageDomain;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -93,49 +93,49 @@
/**
* 杩斿洖鎴愬姛
*/
- public Result success()
+ public AjaxResult success()
{
- return Result.success();
+ return AjaxResult.success();
}
/**
* 杩斿洖澶辫触娑堟伅
*/
- public Result error()
+ public AjaxResult error()
{
- return Result.error();
+ return AjaxResult.error();
}
/**
* 杩斿洖鎴愬姛娑堟伅
*/
- public Result success(String message)
+ public AjaxResult success(String message)
{
- return Result.success(message);
+ return AjaxResult.success(message);
}
/**
* 杩斿洖鎴愬姛娑堟伅
*/
- public Result success(Object data)
+ public AjaxResult success(Object data)
{
- return Result.success(data);
+ return AjaxResult.success(data);
}
/**
* 杩斿洖澶辫触娑堟伅
*/
- public Result error(String message)
+ public AjaxResult error(String message)
{
- return Result.error(message);
+ return AjaxResult.error(message);
}
/**
* 杩斿洖璀﹀憡娑堟伅
*/
- public Result warn(String message)
+ public AjaxResult warn(String message)
{
- return Result.warn(message);
+ return AjaxResult.warn(message);
}
/**
@@ -144,9 +144,9 @@
* @param rows 褰卞搷琛屾暟
* @return 鎿嶄綔缁撴灉
*/
- protected Result toAjax(int rows)
+ protected AjaxResult toAjax(int rows)
{
- return rows > 0 ? Result.success() : Result.error();
+ return rows > 0 ? AjaxResult.success() : AjaxResult.error();
}
/**
@@ -155,7 +155,7 @@
* @param result 缁撴灉
* @return 鎿嶄綔缁撴灉
*/
- protected Result toAjax(boolean result)
+ protected AjaxResult toAjax(boolean result)
{
return result ? success() : error();
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
new file mode 100644
index 0000000..81c92c0
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
@@ -0,0 +1,216 @@
+package com.ruoyi.common.core.domain;
+
+import java.util.HashMap;
+import java.util.Objects;
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.utils.StringUtils;
+
+/**
+ * 鎿嶄綔娑堟伅鎻愰啋
+ *
+ * @author ruoyi
+ */
+public class AjaxResult extends HashMap<String, Object>
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 鐘舵�佺爜 */
+ public static final String CODE_TAG = "code";
+
+ /** 杩斿洖鍐呭 */
+ public static final String MSG_TAG = "msg";
+
+ /** 鏁版嵁瀵硅薄 */
+ public static final String DATA_TAG = "data";
+
+ /**
+ * 鍒濆鍖栦竴涓柊鍒涘缓鐨� AjaxResult 瀵硅薄锛屼娇鍏惰〃绀轰竴涓┖娑堟伅銆�
+ */
+ public AjaxResult()
+ {
+ }
+
+ /**
+ * 鍒濆鍖栦竴涓柊鍒涘缓鐨� AjaxResult 瀵硅薄
+ *
+ * @param code 鐘舵�佺爜
+ * @param msg 杩斿洖鍐呭
+ */
+ public AjaxResult(int code, String msg)
+ {
+ super.put(CODE_TAG, code);
+ super.put(MSG_TAG, msg);
+ }
+
+ /**
+ * 鍒濆鍖栦竴涓柊鍒涘缓鐨� AjaxResult 瀵硅薄
+ *
+ * @param code 鐘舵�佺爜
+ * @param msg 杩斿洖鍐呭
+ * @param data 鏁版嵁瀵硅薄
+ */
+ public AjaxResult(int code, String msg, Object data)
+ {
+ super.put(CODE_TAG, code);
+ super.put(MSG_TAG, msg);
+ if (StringUtils.isNotNull(data))
+ {
+ super.put(DATA_TAG, data);
+ }
+ }
+
+ /**
+ * 杩斿洖鎴愬姛娑堟伅
+ *
+ * @return 鎴愬姛娑堟伅
+ */
+ public static AjaxResult success()
+ {
+ return AjaxResult.success("鎿嶄綔鎴愬姛");
+ }
+
+ /**
+ * 杩斿洖鎴愬姛鏁版嵁
+ *
+ * @return 鎴愬姛娑堟伅
+ */
+ public static AjaxResult success(Object data)
+ {
+ return AjaxResult.success("鎿嶄綔鎴愬姛", data);
+ }
+
+ /**
+ * 杩斿洖鎴愬姛娑堟伅
+ *
+ * @param msg 杩斿洖鍐呭
+ * @return 鎴愬姛娑堟伅
+ */
+ public static AjaxResult success(String msg)
+ {
+ return AjaxResult.success(msg, null);
+ }
+
+ /**
+ * 杩斿洖鎴愬姛娑堟伅
+ *
+ * @param msg 杩斿洖鍐呭
+ * @param data 鏁版嵁瀵硅薄
+ * @return 鎴愬姛娑堟伅
+ */
+ public static AjaxResult success(String msg, Object data)
+ {
+ return new AjaxResult(HttpStatus.SUCCESS, msg, data);
+ }
+
+ /**
+ * 杩斿洖璀﹀憡娑堟伅
+ *
+ * @param msg 杩斿洖鍐呭
+ * @return 璀﹀憡娑堟伅
+ */
+ public static AjaxResult warn(String msg)
+ {
+ return AjaxResult.warn(msg, null);
+ }
+
+ /**
+ * 杩斿洖璀﹀憡娑堟伅
+ *
+ * @param msg 杩斿洖鍐呭
+ * @param data 鏁版嵁瀵硅薄
+ * @return 璀﹀憡娑堟伅
+ */
+ public static AjaxResult warn(String msg, Object data)
+ {
+ return new AjaxResult(HttpStatus.WARN, msg, data);
+ }
+
+ /**
+ * 杩斿洖閿欒娑堟伅
+ *
+ * @return 閿欒娑堟伅
+ */
+ public static AjaxResult error()
+ {
+ return AjaxResult.error("鎿嶄綔澶辫触");
+ }
+
+ /**
+ * 杩斿洖閿欒娑堟伅
+ *
+ * @param msg 杩斿洖鍐呭
+ * @return 閿欒娑堟伅
+ */
+ public static AjaxResult error(String msg)
+ {
+ return AjaxResult.error(msg, null);
+ }
+
+ /**
+ * 杩斿洖閿欒娑堟伅
+ *
+ * @param msg 杩斿洖鍐呭
+ * @param data 鏁版嵁瀵硅薄
+ * @return 閿欒娑堟伅
+ */
+ public static AjaxResult error(String msg, Object data)
+ {
+ return new AjaxResult(HttpStatus.ERROR, msg, data);
+ }
+
+ /**
+ * 杩斿洖閿欒娑堟伅
+ *
+ * @param code 鐘舵�佺爜
+ * @param msg 杩斿洖鍐呭
+ * @return 閿欒娑堟伅
+ */
+ public static AjaxResult error(int code, String msg)
+ {
+ return new AjaxResult(code, msg, null);
+ }
+
+ /**
+ * 鏄惁涓烘垚鍔熸秷鎭�
+ *
+ * @return 缁撴灉
+ */
+ public boolean isSuccess()
+ {
+ return Objects.equals(HttpStatus.SUCCESS, this.get(CODE_TAG));
+ }
+
+ /**
+ * 鏄惁涓鸿鍛婃秷鎭�
+ *
+ * @return 缁撴灉
+ */
+ public boolean isWarn()
+ {
+ return Objects.equals(HttpStatus.WARN, this.get(CODE_TAG));
+ }
+
+ /**
+ * 鏄惁涓洪敊璇秷鎭�
+ *
+ * @return 缁撴灉
+ */
+ public boolean isError()
+ {
+ return Objects.equals(HttpStatus.ERROR, this.get(CODE_TAG));
+ }
+
+ /**
+ * 鏂逛究閾惧紡璋冪敤
+ *
+ * @param key 閿�
+ * @param value 鍊�
+ * @return 鏁版嵁瀵硅薄
+ */
+ @Override
+ public AjaxResult put(String key, Object value)
+ {
+ super.put(key, value);
+ return this;
+ }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
deleted file mode 100644
index ef15802..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.ruoyi.common.core.domain;
-
-import java.io.Serializable;
-import com.ruoyi.common.constant.HttpStatus;
-
-/**
- * 鍝嶅簲淇℃伅涓讳綋
- *
- * @author ruoyi
- */
-public class R<T> implements Serializable
-{
- private static final long serialVersionUID = 1L;
-
- /** 鎴愬姛 */
- public static final int SUCCESS = HttpStatus.SUCCESS;
-
- /** 澶辫触 */
- public static final int FAIL = HttpStatus.ERROR;
-
- private int code;
-
- private String msg;
-
- private T data;
-
- public static <T> R<T> ok()
- {
- return restResult(null, SUCCESS, "鎿嶄綔鎴愬姛");
- }
-
- public static <T> R<T> ok(T data)
- {
- return restResult(data, SUCCESS, "鎿嶄綔鎴愬姛");
- }
-
- public static <T> R<T> ok(T data, String msg)
- {
- return restResult(data, SUCCESS, msg);
- }
-
- public static <T> R<T> fail()
- {
- return restResult(null, FAIL, "鎿嶄綔澶辫触");
- }
-
- public static <T> R<T> fail(String msg)
- {
- return restResult(null, FAIL, msg);
- }
-
- public static <T> R<T> fail(T data)
- {
- return restResult(data, FAIL, "鎿嶄綔澶辫触");
- }
-
- public static <T> R<T> fail(T data, String msg)
- {
- return restResult(data, FAIL, msg);
- }
-
- public static <T> R<T> fail(int code, String msg)
- {
- return restResult(null, code, msg);
- }
-
- private static <T> R<T> restResult(T data, int code, String msg)
- {
- R<T> apiResult = new R<>();
- apiResult.setCode(code);
- apiResult.setData(data);
- apiResult.setMsg(msg);
- return apiResult;
- }
-
- public int getCode()
- {
- return code;
- }
-
- public void setCode(int code)
- {
- this.code = code;
- }
-
- public String getMsg()
- {
- return msg;
- }
-
- public void setMsg(String msg)
- {
- this.msg = msg;
- }
-
- public T getData()
- {
- return data;
- }
-
- public void setData(T data)
- {
- this.data = data;
- }
-
- public static <T> Boolean isError(R<T> ret)
- {
- return !isSuccess(ret);
- }
-
- public static <T> Boolean isSuccess(R<T> ret)
- {
- return R.SUCCESS == ret.getCode();
- }
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/Result.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/Result.java
index f840d4c..2703c59 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/Result.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/Result.java
@@ -1,216 +1,115 @@
package com.ruoyi.common.core.domain;
-import java.util.HashMap;
-import java.util.Objects;
+import java.io.Serializable;
import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.common.utils.StringUtils;
/**
- * 鎿嶄綔娑堟伅鎻愰啋
+ * 鍝嶅簲淇℃伅涓讳綋
*
* @author ruoyi
*/
-public class Result extends HashMap<String, Object>
+public class Result<T> implements Serializable
{
private static final long serialVersionUID = 1L;
- /** 鐘舵�佺爜 */
- public static final String CODE_TAG = "code";
+ /** 鎴愬姛 */
+ public static final int SUCCESS = HttpStatus.SUCCESS;
- /** 杩斿洖鍐呭 */
- public static final String MSG_TAG = "msg";
+ /** 澶辫触 */
+ public static final int FAIL = HttpStatus.ERROR;
- /** 鏁版嵁瀵硅薄 */
- public static final String DATA_TAG = "data";
+ private int code;
- /**
- * 鍒濆鍖栦竴涓柊鍒涘缓鐨� AjaxResult 瀵硅薄锛屼娇鍏惰〃绀轰竴涓┖娑堟伅銆�
- */
- public Result()
+ private String msg;
+
+ private T data;
+
+ public static <T> Result<T> success()
{
+ return restResult(null, SUCCESS, "鎿嶄綔鎴愬姛");
}
- /**
- * 鍒濆鍖栦竴涓柊鍒涘缓鐨� AjaxResult 瀵硅薄
- *
- * @param code 鐘舵�佺爜
- * @param msg 杩斿洖鍐呭
- */
- public Result(int code, String msg)
+ public static <T> Result<T> success(T data)
{
- super.put(CODE_TAG, code);
- super.put(MSG_TAG, msg);
+ return restResult(data, SUCCESS, "鎿嶄綔鎴愬姛");
}
- /**
- * 鍒濆鍖栦竴涓柊鍒涘缓鐨� AjaxResult 瀵硅薄
- *
- * @param code 鐘舵�佺爜
- * @param msg 杩斿洖鍐呭
- * @param data 鏁版嵁瀵硅薄
- */
- public Result(int code, String msg, Object data)
+ public static <T> Result<T> success(T data, String msg)
{
- super.put(CODE_TAG, code);
- super.put(MSG_TAG, msg);
- if (StringUtils.isNotNull(data))
- {
- super.put(DATA_TAG, data);
- }
+ return restResult(data, SUCCESS, msg);
}
- /**
- * 杩斿洖鎴愬姛娑堟伅
- *
- * @return 鎴愬姛娑堟伅
- */
- public static Result success()
+ public static <T> Result<T> fail()
{
- return Result.success("鎿嶄綔鎴愬姛");
+ return restResult(null, FAIL, "鎿嶄綔澶辫触");
}
- /**
- * 杩斿洖鎴愬姛鏁版嵁
- *
- * @return 鎴愬姛娑堟伅
- */
- public static Result success(Object data)
+ public static <T> Result<T> fail(String msg)
{
- return Result.success("鎿嶄綔鎴愬姛", data);
+ return restResult(null, FAIL, msg);
}
- /**
- * 杩斿洖鎴愬姛娑堟伅
- *
- * @param msg 杩斿洖鍐呭
- * @return 鎴愬姛娑堟伅
- */
- public static Result success(String msg)
+ public static <T> Result<T> fail(T data)
{
- return Result.success(msg, null);
+ return restResult(data, FAIL, "鎿嶄綔澶辫触");
}
- /**
- * 杩斿洖鎴愬姛娑堟伅
- *
- * @param msg 杩斿洖鍐呭
- * @param data 鏁版嵁瀵硅薄
- * @return 鎴愬姛娑堟伅
- */
- public static Result success(String msg, Object data)
+ public static <T> Result<T> fail(T data, String msg)
{
- return new Result(HttpStatus.SUCCESS, msg, data);
+ return restResult(data, FAIL, msg);
}
- /**
- * 杩斿洖璀﹀憡娑堟伅
- *
- * @param msg 杩斿洖鍐呭
- * @return 璀﹀憡娑堟伅
- */
- public static Result warn(String msg)
+ public static <T> Result<T> fail(int code, String msg)
{
- return Result.warn(msg, null);
+ return restResult(null, code, msg);
}
- /**
- * 杩斿洖璀﹀憡娑堟伅
- *
- * @param msg 杩斿洖鍐呭
- * @param data 鏁版嵁瀵硅薄
- * @return 璀﹀憡娑堟伅
- */
- public static Result warn(String msg, Object data)
+ private static <T> Result<T> restResult(T data, int code, String msg)
{
- return new Result(HttpStatus.WARN, msg, data);
+ Result<T> apiResult = new Result<>();
+ apiResult.setCode(code);
+ apiResult.setData(data);
+ apiResult.setMsg(msg);
+ return apiResult;
}
- /**
- * 杩斿洖閿欒娑堟伅
- *
- * @return 閿欒娑堟伅
- */
- public static Result error()
+ public int getCode()
{
- return Result.error("鎿嶄綔澶辫触");
+ return code;
}
- /**
- * 杩斿洖閿欒娑堟伅
- *
- * @param msg 杩斿洖鍐呭
- * @return 閿欒娑堟伅
- */
- public static Result error(String msg)
+ public void setCode(int code)
{
- return Result.error(msg, null);
+ this.code = code;
}
- /**
- * 杩斿洖閿欒娑堟伅
- *
- * @param msg 杩斿洖鍐呭
- * @param data 鏁版嵁瀵硅薄
- * @return 閿欒娑堟伅
- */
- public static Result error(String msg, Object data)
+ public String getMsg()
{
- return new Result(HttpStatus.ERROR, msg, data);
+ return msg;
}
- /**
- * 杩斿洖閿欒娑堟伅
- *
- * @param code 鐘舵�佺爜
- * @param msg 杩斿洖鍐呭
- * @return 閿欒娑堟伅
- */
- public static Result error(int code, String msg)
+ public void setMsg(String msg)
{
- return new Result(code, msg, null);
+ this.msg = msg;
}
- /**
- * 鏄惁涓烘垚鍔熸秷鎭�
- *
- * @return 缁撴灉
- */
- public boolean isSuccess()
+ public T getData()
{
- return Objects.equals(HttpStatus.SUCCESS, this.get(CODE_TAG));
+ return data;
}
- /**
- * 鏄惁涓鸿鍛婃秷鎭�
- *
- * @return 缁撴灉
- */
- public boolean isWarn()
+ public void setData(T data)
{
- return Objects.equals(HttpStatus.WARN, this.get(CODE_TAG));
+ this.data = data;
}
- /**
- * 鏄惁涓洪敊璇秷鎭�
- *
- * @return 缁撴灉
- */
- public boolean isError()
+ public static <T> Boolean isError(Result<T> ret)
{
- return Objects.equals(HttpStatus.ERROR, this.get(CODE_TAG));
+ return !isSuccess(ret);
}
- /**
- * 鏂逛究閾惧紡璋冪敤
- *
- * @param key 閿�
- * @param value 鍊�
- * @return 鏁版嵁瀵硅薄
- */
- @Override
- public Result put(String key, Object value)
+ public static <T> Boolean isSuccess(Result<T> ret)
{
- super.put(key, value);
- return this;
+ return Result.SUCCESS == ret.getCode();
}
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/QueryWrappers.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/QueryWrappers.java
new file mode 100644
index 0000000..0878afb
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/QueryWrappers.java
@@ -0,0 +1,68 @@
+package com.ruoyi.common.utils;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Field;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/*
+ * 鏉庢灄
+ * 鐢熸垚SQL璇彞*/
+
+@Component
+@AllArgsConstructor
+public class QueryWrappers<T> {
+
+ public static <T> QueryWrapper<T> queryWrappers(T entity) {
+ if (ObjectUtil.isEmpty(entity)) return null;
+ Class<?> aClass = entity.getClass();
+ QueryWrapper<T> wrapper = Wrappers.<T>query();
+ List<Field> fieldList = new ArrayList<>();
+ while (aClass != null) {
+ fieldList.addAll(new ArrayList<>(Arrays.asList(aClass.getDeclaredFields())));
+ aClass = aClass.getSuperclass();
+ }
+ for (Field field : fieldList) {
+ field.setAccessible(true);
+ Object value;
+ try {
+ value = field.get(entity);
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ throw new RuntimeException("鏌ヨ鏉′欢鐢熸垚閿欒");
+ }
+// System.out.println(field.getName() + "|" + (value == null || value.equals("")) + "|" + value);
+ if(value == null || value.equals("")){
+ continue;
+ }
+ /*boolean bool = field.isAnnotationPresent(TableField.class);
+ if (bool){
+ if(field.getAnnotation(TableField.class).exist()==false)continue;
+ }*/
+ if (!field.getName().equals("orderBy")) {
+ if(value.getClass()== LocalDateTime.class){
+ wrapper.like(StrUtil.toUnderlineCase(field.getName()), ((LocalDateTime) value).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ }else{
+ wrapper.like(StrUtil.toUnderlineCase(field.getName()), value);
+ }
+ } else {
+ Map<String, String> map = (Map<String, String>) value;
+ if(map.get("order")!=null){
+ wrapper.orderBy(true, map.get("order").equals("asc"), StrUtil.toUnderlineCase(map.get("field")));
+ }
+ }
+ }
+// System.out.println(wrapper.getExpression().getSqlSegment());
+ return wrapper;
+ }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index 082041a..15f5db2 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -75,7 +75,7 @@
import com.ruoyi.common.annotation.Excel.Type;
import com.ruoyi.common.annotation.Excels;
import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.exception.UtilException;
import com.ruoyi.common.utils.DateUtils;
@@ -531,7 +531,7 @@
* @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
* @return 缁撴灉
*/
- public Result exportExcel(List<T> list, String sheetName)
+ public AjaxResult exportExcel(List<T> list, String sheetName)
{
return exportExcel(list, sheetName, StringUtils.EMPTY);
}
@@ -544,7 +544,7 @@
* @param title 鏍囬
* @return 缁撴灉
*/
- public Result exportExcel(List<T> list, String sheetName, String title)
+ public AjaxResult exportExcel(List<T> list, String sheetName, String title)
{
this.init(list, sheetName, title, Type.EXPORT);
return exportExcel();
@@ -586,7 +586,7 @@
* @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
* @return 缁撴灉
*/
- public Result importTemplateExcel(String sheetName)
+ public AjaxResult importTemplateExcel(String sheetName)
{
return importTemplateExcel(sheetName, StringUtils.EMPTY);
}
@@ -598,7 +598,7 @@
* @param title 鏍囬
* @return 缁撴灉
*/
- public Result importTemplateExcel(String sheetName, String title)
+ public AjaxResult importTemplateExcel(String sheetName, String title)
{
this.init(null, sheetName, title, Type.IMPORT);
return exportExcel();
@@ -657,7 +657,7 @@
*
* @return 缁撴灉
*/
- public Result exportExcel()
+ public AjaxResult exportExcel()
{
OutputStream out = null;
try
@@ -666,7 +666,7 @@
String filename = encodingFilename(sheetName);
out = new FileOutputStream(getAbsoluteFile(filename));
wb.write(out);
- return Result.success(filename);
+ return AjaxResult.success(filename);
}
catch (Exception e)
{
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
index fb31b37..c49eaf4 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
@@ -8,7 +8,7 @@
import org.springframework.web.servlet.HandlerInterceptor;
import com.alibaba.fastjson2.JSON;
import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.ServletUtils;
/**
@@ -31,7 +31,7 @@
{
if (this.isRepeatSubmit(request, annotation))
{
- Result ajaxResult = Result.error(annotation.message());
+ AjaxResult ajaxResult = AjaxResult.error(annotation.message());
ServletUtils.renderString(response, JSON.toJSONString(ajaxResult));
return false;
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java
index f2118e2..781658c 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java
@@ -9,7 +9,7 @@
import org.springframework.stereotype.Component;
import com.alibaba.fastjson2.JSON;
import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
@@ -29,6 +29,6 @@
{
int code = HttpStatus.UNAUTHORIZED;
String msg = StringUtils.format("璇锋眰璁块棶锛歿}锛岃璇佸け璐ワ紝鏃犳硶璁块棶绯荤粺璧勬簮", request.getRequestURI());
- ServletUtils.renderString(response, JSON.toJSONString(Result.error(code, msg)));
+ ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(code, msg)));
}
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
index db4334a..ba23910 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
@@ -10,7 +10,7 @@
import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
import com.alibaba.fastjson2.JSON;
import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.common.utils.ServletUtils;
@@ -48,6 +48,6 @@
// 璁板綍鐢ㄦ埛閫�鍑烘棩蹇�
AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, MessageUtils.message("user.logout.success")));
}
- ServletUtils.renderString(response, JSON.toJSONString(Result.success(MessageUtils.message("user.logout.success"))));
+ ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.success(MessageUtils.message("user.logout.success"))));
}
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
index dc53250..b88fc96 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
@@ -12,7 +12,7 @@
import org.springframework.web.bind.annotation.RestControllerAdvice;
import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.exception.DemoModeException;
import com.ruoyi.common.exception.ServiceException;
@@ -33,52 +33,52 @@
* 鏉冮檺鏍￠獙寮傚父
*/
@ExceptionHandler(AccessDeniedException.class)
- public Result handleAccessDeniedException(AccessDeniedException e, HttpServletRequest request)
+ public AjaxResult handleAccessDeniedException(AccessDeniedException e, HttpServletRequest request)
{
String requestURI = request.getRequestURI();
log.error("璇锋眰鍦板潃'{}',鏉冮檺鏍￠獙澶辫触'{}'", requestURI, e.getMessage());
- return Result.error(HttpStatus.FORBIDDEN, "娌℃湁鏉冮檺锛岃鑱旂郴绠＄悊鍛樻巿鏉�");
+ return AjaxResult.error(HttpStatus.FORBIDDEN, "娌℃湁鏉冮檺锛岃鑱旂郴绠＄悊鍛樻巿鏉�");
}
/**
* 璇锋眰鏂瑰紡涓嶆敮鎸�
*/
@ExceptionHandler(HttpRequestMethodNotSupportedException.class)
- public Result handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException e,
- HttpServletRequest request)
+ public AjaxResult handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException e,
+ HttpServletRequest request)
{
String requestURI = request.getRequestURI();
log.error("璇锋眰鍦板潃'{}',涓嶆敮鎸�'{}'璇锋眰", requestURI, e.getMethod());
- return Result.error(e.getMessage());
+ return AjaxResult.error(e.getMessage());
}
/**
* 涓氬姟寮傚父
*/
@ExceptionHandler(ServiceException.class)
- public Result handleServiceException(ServiceException e, HttpServletRequest request)
+ public AjaxResult handleServiceException(ServiceException e, HttpServletRequest request)
{
log.error(e.getMessage(), e);
Integer code = e.getCode();
- return StringUtils.isNotNull(code) ? Result.error(code, e.getMessage()) : Result.error(e.getMessage());
+ return StringUtils.isNotNull(code) ? AjaxResult.error(code, e.getMessage()) : AjaxResult.error(e.getMessage());
}
/**
* 璇锋眰璺緞涓己灏戝繀闇�鐨勮矾寰勫彉閲�
*/
@ExceptionHandler(MissingPathVariableException.class)
- public Result handleMissingPathVariableException(MissingPathVariableException e, HttpServletRequest request)
+ public AjaxResult handleMissingPathVariableException(MissingPathVariableException e, HttpServletRequest request)
{
String requestURI = request.getRequestURI();
log.error("璇锋眰璺緞涓己灏戝繀闇�鐨勮矾寰勫彉閲�'{}',鍙戠敓绯荤粺寮傚父.", requestURI, e);
- return Result.error(String.format("璇锋眰璺緞涓己灏戝繀闇�鐨勮矾寰勫彉閲廩%s]", e.getVariableName()));
+ return AjaxResult.error(String.format("璇锋眰璺緞涓己灏戝繀闇�鐨勮矾寰勫彉閲廩%s]", e.getVariableName()));
}
/**
* 璇锋眰鍙傛暟绫诲瀷涓嶅尮閰�
*/
@ExceptionHandler(MethodArgumentTypeMismatchException.class)
- public Result handleMethodArgumentTypeMismatchException(MethodArgumentTypeMismatchException e, HttpServletRequest request)
+ public AjaxResult handleMethodArgumentTypeMismatchException(MethodArgumentTypeMismatchException e, HttpServletRequest request)
{
String requestURI = request.getRequestURI();
String value = Convert.toStr(e.getValue());
@@ -87,40 +87,40 @@
value = EscapeUtil.clean(value);
}
log.error("璇锋眰鍙傛暟绫诲瀷涓嶅尮閰�'{}',鍙戠敓绯荤粺寮傚父.", requestURI, e);
- return Result.error(String.format("璇锋眰鍙傛暟绫诲瀷涓嶅尮閰嶏紝鍙傛暟[%s]瑕佹眰绫诲瀷涓猴細'%s'锛屼絾杈撳叆鍊间负锛�'%s'", e.getName(), e.getRequiredType().getName(), value));
+ return AjaxResult.error(String.format("璇锋眰鍙傛暟绫诲瀷涓嶅尮閰嶏紝鍙傛暟[%s]瑕佹眰绫诲瀷涓猴細'%s'锛屼絾杈撳叆鍊间负锛�'%s'", e.getName(), e.getRequiredType().getName(), value));
}
/**
* 鎷︽埅鏈煡鐨勮繍琛屾椂寮傚父
*/
@ExceptionHandler(RuntimeException.class)
- public Result handleRuntimeException(RuntimeException e, HttpServletRequest request)
+ public AjaxResult handleRuntimeException(RuntimeException e, HttpServletRequest request)
{
String requestURI = request.getRequestURI();
log.error("璇锋眰鍦板潃'{}',鍙戠敓鏈煡寮傚父.", requestURI, e);
- return Result.error(e.getMessage());
+ return AjaxResult.error(e.getMessage());
}
/**
* 绯荤粺寮傚父
*/
@ExceptionHandler(Exception.class)
- public Result handleException(Exception e, HttpServletRequest request)
+ public AjaxResult handleException(Exception e, HttpServletRequest request)
{
String requestURI = request.getRequestURI();
log.error("璇锋眰鍦板潃'{}',鍙戠敓绯荤粺寮傚父.", requestURI, e);
- return Result.error(e.getMessage());
+ return AjaxResult.error(e.getMessage());
}
/**
* 鑷畾涔夐獙璇佸紓甯�
*/
@ExceptionHandler(BindException.class)
- public Result handleBindException(BindException e)
+ public AjaxResult handleBindException(BindException e)
{
log.error(e.getMessage(), e);
String message = e.getAllErrors().get(0).getDefaultMessage();
- return Result.error(message);
+ return AjaxResult.error(message);
}
/**
@@ -131,15 +131,15 @@
{
log.error(e.getMessage(), e);
String message = e.getBindingResult().getFieldError().getDefaultMessage();
- return Result.error(message);
+ return AjaxResult.error(message);
}
/**
* 婕旂ず妯″紡寮傚父
*/
@ExceptionHandler(DemoModeException.class)
- public Result handleDemoModeException(DemoModeException e)
+ public AjaxResult handleDemoModeException(DemoModeException e)
{
- return Result.error("婕旂ず妯″紡锛屼笉鍏佽鎿嶄綔");
+ return AjaxResult.error("婕旂ず妯″紡锛屼笉鍏佽鎿嶄綔");
}
}
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
index e6afa76..ac040ed 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
@@ -24,7 +24,7 @@
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.BusinessType;
@@ -68,7 +68,7 @@
*/
@PreAuthorize("@ss.hasPermi('tool:gen:query')")
@GetMapping(value = "/{tableId}")
- public Result getInfo(@PathVariable Long tableId)
+ public AjaxResult getInfo(@PathVariable Long tableId)
{
GenTable table = genTableService.selectGenTableById(tableId);
List<GenTable> tables = genTableService.selectGenTableAll();
@@ -112,7 +112,7 @@
@PreAuthorize("@ss.hasPermi('tool:gen:import')")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.IMPORT)
@PostMapping("/importTable")
- public Result importTableSave(String tables)
+ public AjaxResult importTableSave(String tables)
{
String[] tableNames = Convert.toStrArray(tables);
// 鏌ヨ琛ㄤ俊鎭�
@@ -127,7 +127,7 @@
@PreAuthorize("@ss.hasRole('admin')")
@Log(title = "鍒涘缓琛�", businessType = BusinessType.OTHER)
@PostMapping("/createTable")
- public Result createTableSave(String sql)
+ public AjaxResult createTableSave(String sql)
{
try
{
@@ -149,12 +149,12 @@
List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames.toArray(new String[tableNames.size()]));
String operName = SecurityUtils.getUsername();
genTableService.importGenTable(tableList, operName);
- return Result.success();
+ return AjaxResult.success();
}
catch (Exception e)
{
logger.error(e.getMessage(), e);
- return Result.error("鍒涘缓琛ㄧ粨鏋勫紓甯�");
+ return AjaxResult.error("鍒涘缓琛ㄧ粨鏋勫紓甯�");
}
}
@@ -164,7 +164,7 @@
@PreAuthorize("@ss.hasPermi('tool:gen:edit')")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE)
@PutMapping
- public Result editSave(@Validated @RequestBody GenTable genTable)
+ public AjaxResult editSave(@Validated @RequestBody GenTable genTable)
{
genTableService.validateEdit(genTable);
genTableService.updateGenTable(genTable);
@@ -177,7 +177,7 @@
@PreAuthorize("@ss.hasPermi('tool:gen:remove')")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.DELETE)
@DeleteMapping("/{tableIds}")
- public Result remove(@PathVariable Long[] tableIds)
+ public AjaxResult remove(@PathVariable Long[] tableIds)
{
genTableService.deleteGenTableByIds(tableIds);
return success();
@@ -188,7 +188,7 @@
*/
@PreAuthorize("@ss.hasPermi('tool:gen:preview')")
@GetMapping("/preview/{tableId}")
- public Result preview(@PathVariable("tableId") Long tableId) throws IOException
+ public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException
{
Map<String, String> dataMap = genTableService.previewCode(tableId);
return success(dataMap);
@@ -212,11 +212,11 @@
@PreAuthorize("@ss.hasPermi('tool:gen:code')")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
@GetMapping("/genCode/{tableName}")
- public Result genCode(@PathVariable("tableName") String tableName)
+ public AjaxResult genCode(@PathVariable("tableName") String tableName)
{
if (!GenConfig.isAllowOverwrite())
{
- return Result.error("銆愮郴缁熼璁俱�戜笉鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦�");
+ return AjaxResult.error("銆愮郴缁熼璁俱�戜笉鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦�");
}
genTableService.generatorCode(tableName);
return success();
@@ -228,7 +228,7 @@
@PreAuthorize("@ss.hasPermi('tool:gen:edit')")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE)
@GetMapping("/synchDb/{tableName}")
- public Result synchDb(@PathVariable("tableName") String tableName)
+ public AjaxResult synchDb(@PathVariable("tableName") String tableName)
{
genTableService.synchDb(tableName);
return success();
diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
index 304339e..0eab21c 100644
--- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -14,7 +14,7 @@
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import ${packageName}.domain.${ClassName};
import ${packageName}.service.I${ClassName}Service;
@@ -50,7 +50,7 @@
return getDataTable(list);
}
#elseif($table.tree)
- public Result list(${ClassName} ${className})
+ public AjaxResult list(${ClassName} ${className})
{
List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
return success(list);
@@ -75,7 +75,7 @@
*/
@PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
@GetMapping(value = "/{${pkColumn.javaField}}")
- public Result getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
+ public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
{
return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
}
@@ -86,7 +86,7 @@
@PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
@Log(title = "${functionName}", businessType = BusinessType.INSERT)
@PostMapping
- public Result add(@RequestBody ${ClassName} ${className})
+ public AjaxResult add(@RequestBody ${ClassName} ${className})
{
return toAjax(${className}Service.insert${ClassName}(${className}));
}
@@ -97,7 +97,7 @@
@PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
@Log(title = "${functionName}", businessType = BusinessType.UPDATE)
@PutMapping
- public Result edit(@RequestBody ${ClassName} ${className})
+ public AjaxResult edit(@RequestBody ${ClassName} ${className})
{
return toAjax(${className}Service.update${ClassName}(${className}));
}
@@ -108,7 +108,7 @@
@PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
@Log(title = "${functionName}", businessType = BusinessType.DELETE)
@DeleteMapping("/{${pkColumn.javaField}s}")
- public Result remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
+ public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
{
return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s));
}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
index 90e44e8..4fd7aab 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
@@ -16,7 +16,7 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.job.TaskException;
@@ -69,7 +69,7 @@
*/
@PreAuthorize("@ss.hasPermi('monitor:job:query')")
@GetMapping(value = "/{jobId}")
- public Result getInfo(@PathVariable("jobId") Long jobId)
+ public AjaxResult getInfo(@PathVariable("jobId") Long jobId)
{
return success(jobService.selectJobById(jobId));
}
@@ -80,7 +80,7 @@
@PreAuthorize("@ss.hasPermi('monitor:job:add')")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.INSERT)
@PostMapping
- public Result add(@RequestBody SysJob job) throws SchedulerException, TaskException
+ public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException
{
if (!CronUtils.isValid(job.getCronExpression()))
{
@@ -116,7 +116,7 @@
@PreAuthorize("@ss.hasPermi('monitor:job:edit')")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
@PutMapping
- public Result edit(@RequestBody SysJob job) throws SchedulerException, TaskException
+ public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException
{
if (!CronUtils.isValid(job.getCronExpression()))
{
@@ -152,7 +152,7 @@
@PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
- public Result changeStatus(@RequestBody SysJob job) throws SchedulerException
+ public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException
{
SysJob newJob = jobService.selectJobById(job.getJobId());
newJob.setStatus(job.getStatus());
@@ -165,7 +165,7 @@
@PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
@PutMapping("/run")
- public Result run(@RequestBody SysJob job) throws SchedulerException
+ public AjaxResult run(@RequestBody SysJob job) throws SchedulerException
{
boolean result = jobService.run(job);
return result ? success() : error("浠诲姟涓嶅瓨鍦ㄦ垨宸茶繃鏈燂紒");
@@ -177,7 +177,7 @@
@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.DELETE)
@DeleteMapping("/{jobIds}")
- public Result remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException
+ public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException
{
jobService.deleteJobByIds(jobIds);
return success();
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
index e3c8a36..4f6bb63 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
@@ -12,7 +12,7 @@
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -61,7 +61,7 @@
*/
@PreAuthorize("@ss.hasPermi('monitor:job:query')")
@GetMapping(value = "/{jobLogId}")
- public Result getInfo(@PathVariable Long jobLogId)
+ public AjaxResult getInfo(@PathVariable Long jobLogId)
{
return success(jobLogService.selectJobLogById(jobLogId));
}
@@ -73,7 +73,7 @@
@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
@Log(title = "瀹氭椂浠诲姟璋冨害鏃ュ織", businessType = BusinessType.DELETE)
@DeleteMapping("/{jobLogIds}")
- public Result remove(@PathVariable Long[] jobLogIds)
+ public AjaxResult remove(@PathVariable Long[] jobLogIds)
{
return toAjax(jobLogService.deleteJobLogByIds(jobLogIds));
}
@@ -84,7 +84,7 @@
@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
@Log(title = "璋冨害鏃ュ織", businessType = BusinessType.CLEAN)
@DeleteMapping("/clean")
- public Result clean()
+ public AjaxResult clean()
{
jobLogService.cleanJobLog();
return success();
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/CustomService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/CustomService.java
index 0b703c2..6ee01f2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/CustomService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/CustomService.java
@@ -14,7 +14,7 @@
*/
public interface CustomService extends IService<Custom> {
- Map<String, Object> selectCustomPageList(IPage<Custom> page, Custom custom);
+ IPage<Custom> selectCustomPageList(IPage<Custom> page, Custom custom);
int delCustomById(Long id);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomServiceImpl.java
index c5942ef..44ee431 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.entity.Custom;
+import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.system.mapper.CustomMapper;
import com.ruoyi.system.service.CustomService;
import lombok.AllArgsConstructor;
@@ -26,9 +27,8 @@
private CustomMapper customMapper;
@Override
- public Map<String, Object> selectCustomPageList(IPage<Custom> page, Custom custom) {
-
- return null;
+ public IPage<Custom> selectCustomPageList(IPage<Custom> page, Custom custom) {
+ return customMapper.selectCustomPageList(page, QueryWrappers.queryWrappers(custom));
}
@Override
diff --git a/ruoyi-system/src/main/resources/mapper/system/CustomMapper.xml b/ruoyi-system/src/main/resources/mapper/system/CustomMapper.xml
new file mode 100644
index 0000000..b4f43ed
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/CustomMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.system.mapper.CustomMapper">
+ <update id="delCustomById">
+ update user set is_custom = 0
+ where id = #{id}
+ </update>
+ <select id="selectCustomPageList" resultType="com.ruoyi.common.core.domain.entity.Custom">
+ select * from custom
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+</mapper>
--
Gitblit v1.9.3