DeXun/klp-oa
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!8 sync 同步ruoyi-vue-plus更新

Browse Source 
fix -- 修复代码生成页面错误bug
fix -- 调整返回类型为R，修正脚本
This commit is contained in:
KonBAI
2022-01-30 15:34:26 +00:00
parent 47539482b4
commit a423f02fad
187 changed files with 2181 additions and 1821 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pom.xml
View File

@@ -18,21 +18,21 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version> <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
<druid.version>1.2.8</druid.version> <druid.version>1.2.8</druid.version>
<knife4j.version>3.0.3</knife4j.version> <knife4j.version>3.0.3</knife4j.version>
<swagger-annotations.version>1.5.22</swagger-annotations.version> <swagger-annotations.version>1.5.22</swagger-annotations.version>
<poi.version>4.1.2</poi.version> <poi.version>4.1.2</poi.version>
<easyexcel.version>2.2.11</easyexcel.version> <easyexcel.version>3.0.5</easyexcel.version>
<cglib.version>3.3.0</cglib.version> <cglib.version>3.3.0</cglib.version>
<velocity.version>2.3</velocity.version> <velocity.version>2.3</velocity.version>
<satoken.version>1.28.0</satoken.version> <satoken.version>1.28.0</satoken.version>
<mybatis-plus.version>3.5.0</mybatis-plus.version> <mybatis-plus.version>3.5.1</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version> <p6spy.version>3.9.1</p6spy.version>
<hutool.version>5.7.18</hutool.version> <hutool.version>5.7.20</hutool.version>
<okhttp.version>4.9.2</okhttp.version> <okhttp.version>4.9.2</okhttp.version>
<spring-boot-admin.version>2.6.0</spring-boot-admin.version> <spring-boot-admin.version>2.6.2</spring-boot-admin.version>
<redisson.version>3.16.7</redisson.version> <redisson.version>3.16.8</redisson.version>
<lock4j.version>2.2.1</lock4j.version> <lock4j.version>2.2.1</lock4j.version>
<dynamic-ds.version>3.5.0</dynamic-ds.version> <dynamic-ds.version>3.5.0</dynamic-ds.version>
<tlog.version>1.3.6</tlog.version> <tlog.version>1.3.6</tlog.version>
@@ -43,10 +43,10 @@
<jaxb.version>3.0.1</jaxb.version> <jaxb.version>3.0.1</jaxb.version>
<!-- OSS 配置 --> <!-- OSS 配置 -->
<qiniu.version>7.9.0</qiniu.version> <qiniu.version>7.9.2</qiniu.version>
<aliyun.oss.version>3.13.1</aliyun.oss.version> <aliyun.oss.version>3.14.0</aliyun.oss.version>
<qcloud.cos.version>5.6.58</qcloud.cos.version> <qcloud.cos.version>5.6.68</qcloud.cos.version>
<minio.version>8.3.4</minio.version> <minio.version>8.3.5</minio.version>
<!-- docker 配置 --> <!-- docker 配置 -->
<docker.registry.url>localhost</docker.registry.url> <docker.registry.url>localhost</docker.registry.url>
@@ -316,7 +316,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version> <version>3.9.0</version>
<configuration> <configuration>
<source>${java.version}</source> <source>${java.version}</source>
<target>${java.version}</target> <target>${java.version}</target>
@@ -336,6 +336,7 @@
<includes> <includes>
<include>application*</include> <include>application*</include>
<include>bootstrap*</include> <include>bootstrap*</include>
<include>banner*</include>
</includes> </includes>
<!-- 启用过滤 即该资源中的变量将会被过滤器中的值替换 --> <!-- 启用过滤 即该资源中的变量将会被过滤器中的值替换 -->
<filtering>true</filtering> <filtering>true</filtering>

2
ruoyi-admin/pom.xml
View File

@@ -92,7 +92,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>3.2.0</version> <version>3.2.2</version>
<configuration> <configuration>
<failOnMissingWebXml>false</failOnMissingWebXml> <failOnMissingWebXml>false</failOnMissingWebXml>
<warName>${project.artifactId}</warName> <warName>${project.artifactId}</warName>

13
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
View File

@@ -5,10 +5,10 @@ import cn.hutool.captcha.generator.CodeGenerator;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.CaptchaType; import com.ruoyi.common.enums.CaptchaType;
import com.ruoyi.common.utils.redis.RedisUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.redis.RedisUtils;
import com.ruoyi.common.utils.reflect.ReflectUtils; import com.ruoyi.common.utils.reflect.ReflectUtils;
import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.framework.config.properties.CaptchaProperties; import com.ruoyi.framework.config.properties.CaptchaProperties;
@@ -16,7 +16,6 @@ import com.ruoyi.system.service.ISysConfigService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@@ -30,7 +29,7 @@ import java.util.concurrent.TimeUnit;
* @author Lion Li * @author Lion Li
*/ */
@Api(value = "验证码操作处理", tags = {"验证码管理"}) @Api(value = "验证码操作处理", tags = {"验证码管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
public class CaptchaController { public class CaptchaController {
@@ -42,12 +41,12 @@ public class CaptchaController {
*/ */
@ApiOperation("生成验证码") @ApiOperation("生成验证码")
@GetMapping("/captchaImage") @GetMapping("/captchaImage")
public AjaxResult<Map<String, Object>> getCode() { public R<Map<String, Object>> getCode() {
Map<String, Object> ajax = new HashMap<>(); Map<String, Object> ajax = new HashMap<>();
boolean captchaOnOff = configService.selectCaptchaOnOff(); boolean captchaOnOff = configService.selectCaptchaOnOff();
ajax.put("captchaOnOff", captchaOnOff); ajax.put("captchaOnOff", captchaOnOff);
if (!captchaOnOff) { if (!captchaOnOff) {
return AjaxResult.success(ajax); return R.ok(ajax);
} }
// 保存验证码信息 // 保存验证码信息
String uuid = IdUtil.simpleUUID(); String uuid = IdUtil.simpleUUID();
@@ -64,7 +63,7 @@ public class CaptchaController {
RedisUtils.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES); RedisUtils.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
ajax.put("uuid", uuid); ajax.put("uuid", uuid);
ajax.put("img", captcha.getImageBase64()); ajax.put("img", captcha.getImageBase64());
return AjaxResult.success(ajax); return R.ok(ajax);
} }
private String getCodeResult(String capStr) { private String getCodeResult(String capStr) {

9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
View File

@@ -1,12 +1,11 @@
package com.ruoyi.web.controller.monitor; package com.ruoyi.web.controller.monitor;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.connection.RedisServerCommands; import org.springframework.data.redis.connection.RedisServerCommands;
import org.springframework.data.redis.core.RedisCallback; import org.springframework.data.redis.core.RedisCallback;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
@@ -22,7 +21,7 @@ import java.util.*;
* @author Lion Li * @author Lion Li
*/ */
@Api(value = "缓存监控", tags = {"缓存监控管理"}) @Api(value = "缓存监控", tags = {"缓存监控管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/monitor/cache") @RequestMapping("/monitor/cache")
public class CacheController { public class CacheController {
@@ -32,7 +31,7 @@ public class CacheController {
@ApiOperation("获取缓存监控详细信息") @ApiOperation("获取缓存监控详细信息")
@SaCheckPermission("monitor:cache:list") @SaCheckPermission("monitor:cache:list")
@GetMapping() @GetMapping()
public AjaxResult<Map<String, Object>> getInfo() throws Exception { public R<Map<String, Object>> getInfo() throws Exception {
Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) RedisServerCommands::info); Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) RedisServerCommands::info);
Properties commandStats = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info("commandstats")); Properties commandStats = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info("commandstats"));
Object dbSize = redisTemplate.execute((RedisCallback<Object>) RedisServerCommands::dbSize); Object dbSize = redisTemplate.execute((RedisCallback<Object>) RedisServerCommands::dbSize);
@@ -52,6 +51,6 @@ public class CacheController {
}); });
} }
result.put("commandStats", pieList); result.put("commandStats", pieList);
return AjaxResult.success(result); return R.ok(result);
} }
} }

11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
View File

@@ -3,7 +3,7 @@ package com.ruoyi.web.controller.monitor;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
@@ -13,7 +13,6 @@ import com.ruoyi.system.service.ISysLogininforService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -27,7 +26,7 @@ import java.util.List;
*/ */
@Validated @Validated
@Api(value = "系统访问记录", tags = {"系统访问记录管理"}) @Api(value = "系统访问记录", tags = {"系统访问记录管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/monitor/logininfor") @RequestMapping("/monitor/logininfor")
public class SysLogininforController extends BaseController { public class SysLogininforController extends BaseController {
@@ -54,7 +53,7 @@ public class SysLogininforController extends BaseController {
@SaCheckPermission("monitor:logininfor:remove") @SaCheckPermission("monitor:logininfor:remove")
@Log(title = "登录日志", businessType = BusinessType.DELETE) @Log(title = "登录日志", businessType = BusinessType.DELETE)
@DeleteMapping("/{infoIds}") @DeleteMapping("/{infoIds}")
public AjaxResult<Void> remove(@PathVariable Long[] infoIds) { public R<Void> remove(@PathVariable Long[] infoIds) {
return toAjax(logininforService.deleteLogininforByIds(infoIds)); return toAjax(logininforService.deleteLogininforByIds(infoIds));
} }
@@ -62,8 +61,8 @@ public class SysLogininforController extends BaseController {
@SaCheckPermission("monitor:logininfor:remove") @SaCheckPermission("monitor:logininfor:remove")
@Log(title = "登录日志", businessType = BusinessType.CLEAN) @Log(title = "登录日志", businessType = BusinessType.CLEAN)
@DeleteMapping("/clean") @DeleteMapping("/clean")
public AjaxResult<Void> clean() { public R<Void> clean() {
logininforService.cleanLogininfor(); logininforService.cleanLogininfor();
return AjaxResult.success(); return R.ok();
} }
} }

11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
View File

@@ -3,7 +3,7 @@ package com.ruoyi.web.controller.monitor;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
@@ -13,7 +13,6 @@ import com.ruoyi.system.service.ISysOperLogService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -27,7 +26,7 @@ import java.util.List;
*/ */
@Validated @Validated
@Api(value = "操作日志记录", tags = {"操作日志记录管理"}) @Api(value = "操作日志记录", tags = {"操作日志记录管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/monitor/operlog") @RequestMapping("/monitor/operlog")
public class SysOperlogController extends BaseController { public class SysOperlogController extends BaseController {
@@ -54,7 +53,7 @@ public class SysOperlogController extends BaseController {
@Log(title = "操作日志", businessType = BusinessType.DELETE) @Log(title = "操作日志", businessType = BusinessType.DELETE)
@SaCheckPermission("monitor:operlog:remove") @SaCheckPermission("monitor:operlog:remove")
@DeleteMapping("/{operIds}") @DeleteMapping("/{operIds}")
public AjaxResult<Void> remove(@PathVariable Long[] operIds) { public R<Void> remove(@PathVariable Long[] operIds) {
return toAjax(operLogService.deleteOperLogByIds(operIds)); return toAjax(operLogService.deleteOperLogByIds(operIds));
} }
@@ -62,8 +61,8 @@ public class SysOperlogController extends BaseController {
@Log(title = "操作日志", businessType = BusinessType.CLEAN) @Log(title = "操作日志", businessType = BusinessType.CLEAN)
@SaCheckPermission("monitor:operlog:remove") @SaCheckPermission("monitor:operlog:remove")
@DeleteMapping("/clean") @DeleteMapping("/clean")
public AjaxResult<Void> clean() { public R<Void> clean() {
operLogService.cleanOperLog(); operLogService.cleanOperLog();
return AjaxResult.success(); return R.ok();
} }
} }

11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
View File

@@ -7,7 +7,7 @@ import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.dto.UserOnlineDTO; import com.ruoyi.common.core.domain.dto.UserOnlineDTO;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
@@ -17,7 +17,6 @@ import com.ruoyi.system.domain.SysUserOnline;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.ArrayList; import java.util.ArrayList;
@@ -31,7 +30,7 @@ import java.util.stream.Collectors;
* @author Lion Li * @author Lion Li
*/ */
@Api(value = "在线用户监控", tags = {"在线用户监控管理"}) @Api(value = "在线用户监控", tags = {"在线用户监控管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/monitor/online") @RequestMapping("/monitor/online")
public class SysUserOnlineController extends BaseController { public class SysUserOnlineController extends BaseController {
@@ -58,7 +57,7 @@ public class SysUserOnlineController extends BaseController {
).collect(Collectors.toList()); ).collect(Collectors.toList());
} else if (StringUtils.isNotEmpty(ipaddr)) { } else if (StringUtils.isNotEmpty(ipaddr)) {
userOnlineDTOList = userOnlineDTOList.stream().filter(userOnline -> userOnlineDTOList = userOnlineDTOList.stream().filter(userOnline ->
StringUtils.equals(ipaddr, userOnline.getIpaddr())) StringUtils.equals(ipaddr, userOnline.getIpaddr()))
.collect(Collectors.toList()); .collect(Collectors.toList());
} else if (StringUtils.isNotEmpty(userName)) { } else if (StringUtils.isNotEmpty(userName)) {
userOnlineDTOList = userOnlineDTOList.stream().filter(userOnline -> userOnlineDTOList = userOnlineDTOList.stream().filter(userOnline ->
@@ -78,11 +77,11 @@ public class SysUserOnlineController extends BaseController {
@SaCheckPermission("monitor:online:forceLogout") @SaCheckPermission("monitor:online:forceLogout")
@Log(title = "在线用户", businessType = BusinessType.FORCE) @Log(title = "在线用户", businessType = BusinessType.FORCE)
@DeleteMapping("/{tokenId}") @DeleteMapping("/{tokenId}")
public AjaxResult<Void> forceLogout(@PathVariable String tokenId) { public R<Void> forceLogout(@PathVariable String tokenId) {
try { try {
StpUtil.kickoutByTokenValue(tokenId); StpUtil.kickoutByTokenValue(tokenId);
} catch (NotLoginException e) { } catch (NotLoginException e) {
} }
return AjaxResult.success(); return R.ok();
} }
} }

27
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
View File

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
@@ -15,7 +15,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -29,7 +28,7 @@ import java.util.List;
*/ */
@Validated @Validated
@Api(value = "参数配置控制器", tags = {"参数配置管理"}) @Api(value = "参数配置控制器", tags = {"参数配置管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/system/config") @RequestMapping("/system/config")
public class SysConfigController extends BaseController { public class SysConfigController extends BaseController {
@@ -61,8 +60,8 @@ public class SysConfigController extends BaseController {
@ApiOperation("根据参数编号获取详细信息") @ApiOperation("根据参数编号获取详细信息")
@SaCheckPermission("system:config:query") @SaCheckPermission("system:config:query")
@GetMapping(value = "/{configId}") @GetMapping(value = "/{configId}")
public AjaxResult<SysConfig> getInfo(@ApiParam("参数ID") @PathVariable Long configId) { public R<SysConfig> getInfo(@ApiParam("参数ID") @PathVariable Long configId) {
return AjaxResult.success(configService.selectConfigById(configId)); return R.ok(configService.selectConfigById(configId));
} }
/** /**
@@ -70,8 +69,8 @@ public class SysConfigController extends BaseController {
*/ */
@ApiOperation("根据参数键名查询参数值") @ApiOperation("根据参数键名查询参数值")
@GetMapping(value = "/configKey/{configKey}") @GetMapping(value = "/configKey/{configKey}")
public AjaxResult<Void> getConfigKey(@ApiParam("参数Key") @PathVariable String configKey) { public R<Void> getConfigKey(@ApiParam("参数Key") @PathVariable String configKey) {
return AjaxResult.success(configService.selectConfigByKey(configKey)); return R.ok(configService.selectConfigByKey(configKey));
} }
/** /**
@@ -81,9 +80,9 @@ public class SysConfigController extends BaseController {
@SaCheckPermission("system:config:add") @SaCheckPermission("system:config:add")
@Log(title = "参数管理", businessType = BusinessType.INSERT) @Log(title = "参数管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult<Void> add(@Validated @RequestBody SysConfig config) { public R<Void> add(@Validated @RequestBody SysConfig config) {
if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) { if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
return AjaxResult.error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在"); return R.fail("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
} }
return toAjax(configService.insertConfig(config)); return toAjax(configService.insertConfig(config));
} }
@@ -95,9 +94,9 @@ public class SysConfigController extends BaseController {
@SaCheckPermission("system:config:edit") @SaCheckPermission("system:config:edit")
@Log(title = "参数管理", businessType = BusinessType.UPDATE) @Log(title = "参数管理", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult<Void> edit(@Validated @RequestBody SysConfig config) { public R<Void> edit(@Validated @RequestBody SysConfig config) {
if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) { if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
return AjaxResult.error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在"); return R.fail("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
} }
return toAjax(configService.updateConfig(config)); return toAjax(configService.updateConfig(config));
} }
@@ -109,7 +108,7 @@ public class SysConfigController extends BaseController {
@SaCheckPermission("system:config:remove") @SaCheckPermission("system:config:remove")
@Log(title = "参数管理", businessType = BusinessType.DELETE) @Log(title = "参数管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{configIds}") @DeleteMapping("/{configIds}")
public AjaxResult<Void> remove(@ApiParam("参数ID串") @PathVariable Long[] configIds) { public R<Void> remove(@ApiParam("参数ID串") @PathVariable Long[] configIds) {
configService.deleteConfigByIds(configIds); configService.deleteConfigByIds(configIds);
return success(); return success();
} }
@@ -121,8 +120,8 @@ public class SysConfigController extends BaseController {
@SaCheckPermission("system:config:remove") @SaCheckPermission("system:config:remove")
@Log(title = "参数管理", businessType = BusinessType.CLEAN) @Log(title = "参数管理", businessType = BusinessType.CLEAN)
@DeleteMapping("/refreshCache") @DeleteMapping("/refreshCache")
public AjaxResult<Void> refreshCache() { public R<Void> refreshCache() {
configService.resetConfigCache(); configService.resetConfigCache();
return AjaxResult.success(); return R.ok();
} }
} }

52
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
View File

@@ -6,7 +6,7 @@ import cn.hutool.core.util.ArrayUtil;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
@@ -15,7 +15,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -30,7 +29,7 @@ import java.util.Map;
*/ */
@Validated @Validated
@Api(value = "部门控制器", tags = {"部门管理"}) @Api(value = "部门控制器", tags = {"部门管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/system/dept") @RequestMapping("/system/dept")
public class SysDeptController extends BaseController { public class SysDeptController extends BaseController {
@@ -43,9 +42,9 @@ public class SysDeptController extends BaseController {
@ApiOperation("获取部门列表") @ApiOperation("获取部门列表")
@SaCheckPermission("system:dept:list") @SaCheckPermission("system:dept:list")
@GetMapping("/list") @GetMapping("/list")
public AjaxResult<List<SysDept>> list(SysDept dept) { public R<List<SysDept>> list(SysDept dept) {
List<SysDept> depts = deptService.selectDeptList(dept); List<SysDept> depts = deptService.selectDeptList(dept);
return AjaxResult.success(depts); return R.ok(depts);
} }
/** /**
@@ -54,11 +53,11 @@ public class SysDeptController extends BaseController {
@ApiOperation("查询部门列表（排除节点）") @ApiOperation("查询部门列表（排除节点）")
@SaCheckPermission("system:dept:list") @SaCheckPermission("system:dept:list")
@GetMapping("/list/exclude/{deptId}") @GetMapping("/list/exclude/{deptId}")
public AjaxResult<List<SysDept>> excludeChild(@ApiParam("部门ID") @PathVariable(value = "deptId", required = false) Long deptId) { public R<List<SysDept>> excludeChild(@ApiParam("部门ID") @PathVariable(value = "deptId", required = false) Long deptId) {
List<SysDept> depts = deptService.selectDeptList(new SysDept()); List<SysDept> depts = deptService.selectDeptList(new SysDept());
depts.removeIf(d -> d.getDeptId().equals(deptId) depts.removeIf(d -> d.getDeptId().equals(deptId)
|| ArrayUtil.contains(StringUtils.split(d.getAncestors(), ","), deptId + "")); || ArrayUtil.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
return AjaxResult.success(depts); return R.ok(depts);
} }
/** /**
@@ -67,9 +66,9 @@ public class SysDeptController extends BaseController {
@ApiOperation("根据部门编号获取详细信息") @ApiOperation("根据部门编号获取详细信息")
@SaCheckPermission("system:dept:query") @SaCheckPermission("system:dept:query")
@GetMapping(value = "/{deptId}") @GetMapping(value = "/{deptId}")
public AjaxResult<SysDept> getInfo(@ApiParam("部门ID") @PathVariable Long deptId) { public R<SysDept> getInfo(@ApiParam("部门ID") @PathVariable Long deptId) {
deptService.checkDeptDataScope(deptId); deptService.checkDeptDataScope(deptId);
return AjaxResult.success(deptService.selectDeptById(deptId)); return R.ok(deptService.selectDeptById(deptId));
} }
/** /**
@@ -77,9 +76,9 @@ public class SysDeptController extends BaseController {
*/ */
@ApiOperation("获取部门下拉树列表") @ApiOperation("获取部门下拉树列表")
@GetMapping("/treeselect") @GetMapping("/treeselect")
public AjaxResult<List<Tree<Long>>> treeselect(SysDept dept) { public R<List<Tree<Long>>> treeselect(SysDept dept) {
List<SysDept> depts = deptService.selectDeptList(dept); List<SysDept> depts = deptService.selectDeptList(dept);
return AjaxResult.success(deptService.buildDeptTreeSelect(depts)); return R.ok(deptService.buildDeptTreeSelect(depts));
} }
/** /**
@@ -87,12 +86,12 @@ public class SysDeptController extends BaseController {
*/ */
@ApiOperation("加载对应角色部门列表树") @ApiOperation("加载对应角色部门列表树")
@GetMapping(value = "/roleDeptTreeselect/{roleId}") @GetMapping(value = "/roleDeptTreeselect/{roleId}")
public AjaxResult<Map<String, Object>> roleDeptTreeselect(@ApiParam("角色ID") @PathVariable("roleId") Long roleId) { public R<Map<String, Object>> roleDeptTreeselect(@ApiParam("角色ID") @PathVariable("roleId") Long roleId) {
List<SysDept> depts = deptService.selectDeptList(new SysDept()); List<SysDept> depts = deptService.selectDeptList(new SysDept());
Map<String, Object> ajax = new HashMap<>(); Map<String, Object> ajax = new HashMap<>();
ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId)); ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
ajax.put("depts", deptService.buildDeptTreeSelect(depts)); ajax.put("depts", deptService.buildDeptTreeSelect(depts));
return AjaxResult.success(ajax); return R.ok(ajax);
} }
/** /**
@@ -102,9 +101,9 @@ public class SysDeptController extends BaseController {
@SaCheckPermission("system:dept:add") @SaCheckPermission("system:dept:add")
@Log(title = "部门管理", businessType = BusinessType.INSERT) @Log(title = "部门管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult<Void> add(@Validated @RequestBody SysDept dept) { public R<Void> add(@Validated @RequestBody SysDept dept) {
if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) { if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在"); return R.fail("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
} }
return toAjax(deptService.insertDept(dept)); return toAjax(deptService.insertDept(dept));
} }
@@ -116,14 +115,16 @@ public class SysDeptController extends BaseController {
@SaCheckPermission("system:dept:edit") @SaCheckPermission("system:dept:edit")
@Log(title = "部门管理", businessType = BusinessType.UPDATE) @Log(title = "部门管理", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult<Void> edit(@Validated @RequestBody SysDept dept) { public R<Void> edit(@Validated @RequestBody SysDept dept) {
Long deptId = dept.getDeptId();
deptService.checkDeptDataScope(deptId);
if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) { if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在"); return R.fail("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
} else if (dept.getParentId().equals(dept.getDeptId())) { } else if (dept.getParentId().equals(deptId)) {
return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己"); return R.fail("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
} else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
&& deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0) { && deptService.selectNormalChildrenDeptById(deptId) > 0) {
return AjaxResult.error("该部门包含未停用的子部门！"); return R.fail("该部门包含未停用的子部门！");
} }
return toAjax(deptService.updateDept(dept)); return toAjax(deptService.updateDept(dept));
} }
@@ -135,13 +136,14 @@ public class SysDeptController extends BaseController {
@SaCheckPermission("system:dept:remove") @SaCheckPermission("system:dept:remove")
@Log(title = "部门管理", businessType = BusinessType.DELETE) @Log(title = "部门管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{deptId}") @DeleteMapping("/{deptId}")
public AjaxResult<Void> remove(@ApiParam("部门ID串") @PathVariable Long deptId) { public R<Void> remove(@ApiParam("部门ID串") @PathVariable Long deptId) {
if (deptService.hasChildByDeptId(deptId)) { if (deptService.hasChildByDeptId(deptId)) {
return AjaxResult.error("存在下级部门,不允许删除"); return R.fail("存在下级部门,不允许删除");
} }
if (deptService.checkDeptExistUser(deptId)) { if (deptService.checkDeptExistUser(deptId)) {
return AjaxResult.error("部门存在用户,不允许删除"); return R.fail("部门存在用户,不允许删除");
} }
deptService.checkDeptDataScope(deptId);
return toAjax(deptService.deleteDeptById(deptId)); return toAjax(deptService.deleteDeptById(deptId));
} }
} }

23
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
View File

@@ -1,14 +1,14 @@
package com.ruoyi.web.controller.system; package com.ruoyi.web.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDictDataService; import com.ruoyi.system.service.ISysDictDataService;
import com.ruoyi.system.service.ISysDictTypeService; import com.ruoyi.system.service.ISysDictTypeService;
@@ -16,7 +16,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -31,7 +30,7 @@ import java.util.List;
*/ */
@Validated @Validated
@Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"}) @Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/system/dict/data") @RequestMapping("/system/dict/data")
public class SysDictDataController extends BaseController { public class SysDictDataController extends BaseController {
@@ -61,8 +60,8 @@ public class SysDictDataController extends BaseController {
@ApiOperation("查询字典数据详细") @ApiOperation("查询字典数据详细")
@SaCheckPermission("system:dict:query") @SaCheckPermission("system:dict:query")
@GetMapping(value = "/{dictCode}") @GetMapping(value = "/{dictCode}")
public AjaxResult<SysDictData> getInfo(@ApiParam("字典code") @PathVariable Long dictCode) { public R<SysDictData> getInfo(@ApiParam("字典code") @PathVariable Long dictCode) {
return AjaxResult.success(dictDataService.selectDictDataById(dictCode)); return R.ok(dictDataService.selectDictDataById(dictCode));
} }
/** /**
@@ -70,12 +69,12 @@ public class SysDictDataController extends BaseController {
*/ */
@ApiOperation("根据字典类型查询字典数据信息") @ApiOperation("根据字典类型查询字典数据信息")
@GetMapping(value = "/type/{dictType}") @GetMapping(value = "/type/{dictType}")
public AjaxResult<List<SysDictData>> dictType(@ApiParam("字典类型") @PathVariable String dictType) { public R<List<SysDictData>> dictType(@ApiParam("字典类型") @PathVariable String dictType) {
List<SysDictData> data = dictTypeService.selectDictDataByType(dictType); List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
if (StringUtils.isNull(data)) { if (ObjectUtil.isNull(data)) {
data = new ArrayList<>(); data = new ArrayList<>();
} }
return AjaxResult.success(data); return R.ok(data);
} }
/** /**
@@ -85,7 +84,7 @@ public class SysDictDataController extends BaseController {
@SaCheckPermission("system:dict:add") @SaCheckPermission("system:dict:add")
@Log(title = "字典数据", businessType = BusinessType.INSERT) @Log(title = "字典数据", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult<Void> add(@Validated @RequestBody SysDictData dict) { public R<Void> add(@Validated @RequestBody SysDictData dict) {
return toAjax(dictDataService.insertDictData(dict)); return toAjax(dictDataService.insertDictData(dict));
} }
@@ -96,7 +95,7 @@ public class SysDictDataController extends BaseController {
@SaCheckPermission("system:dict:edit") @SaCheckPermission("system:dict:edit")
@Log(title = "字典数据", businessType = BusinessType.UPDATE) @Log(title = "字典数据", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult<Void> edit(@Validated @RequestBody SysDictData dict) { public R<Void> edit(@Validated @RequestBody SysDictData dict) {
return toAjax(dictDataService.updateDictData(dict)); return toAjax(dictDataService.updateDictData(dict));
} }
@@ -107,7 +106,7 @@ public class SysDictDataController extends BaseController {
@SaCheckPermission("system:dict:remove") @SaCheckPermission("system:dict:remove")
@Log(title = "字典类型", businessType = BusinessType.DELETE) @Log(title = "字典类型", businessType = BusinessType.DELETE)
@DeleteMapping("/{dictCodes}") @DeleteMapping("/{dictCodes}")
public AjaxResult<Void> remove(@ApiParam("字典code串") @PathVariable Long[] dictCodes) { public R<Void> remove(@ApiParam("字典code串") @PathVariable Long[] dictCodes) {
dictDataService.deleteDictDataByIds(dictCodes); dictDataService.deleteDictDataByIds(dictCodes);
return success(); return success();
} }

27
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
View File

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysDictType; import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
@@ -15,7 +15,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -29,7 +28,7 @@ import java.util.List;
*/ */
@Validated @Validated
@Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"}) @Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/system/dict/type") @RequestMapping("/system/dict/type")
public class SysDictTypeController extends BaseController { public class SysDictTypeController extends BaseController {
@@ -58,8 +57,8 @@ public class SysDictTypeController extends BaseController {
@ApiOperation("查询字典类型详细") @ApiOperation("查询字典类型详细")
@SaCheckPermission("system:dict:query") @SaCheckPermission("system:dict:query")
@GetMapping(value = "/{dictId}") @GetMapping(value = "/{dictId}")
public AjaxResult<SysDictType> getInfo(@ApiParam("字典ID") @PathVariable Long dictId) { public R<SysDictType> getInfo(@ApiParam("字典ID") @PathVariable Long dictId) {
return AjaxResult.success(dictTypeService.selectDictTypeById(dictId)); return R.ok(dictTypeService.selectDictTypeById(dictId));
} }
/** /**
@@ -69,9 +68,9 @@ public class SysDictTypeController extends BaseController {
@SaCheckPermission("system:dict:add") @SaCheckPermission("system:dict:add")
@Log(title = "字典类型", businessType = BusinessType.INSERT) @Log(title = "字典类型", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult<Void> add(@Validated @RequestBody SysDictType dict) { public R<Void> add(@Validated @RequestBody SysDictType dict) {
if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在"); return R.fail("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
} }
return toAjax(dictTypeService.insertDictType(dict)); return toAjax(dictTypeService.insertDictType(dict));
} }
@@ -83,9 +82,9 @@ public class SysDictTypeController extends BaseController {
@SaCheckPermission("system:dict:edit") @SaCheckPermission("system:dict:edit")
@Log(title = "字典类型", businessType = BusinessType.UPDATE) @Log(title = "字典类型", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult<Void> edit(@Validated @RequestBody SysDictType dict) { public R<Void> edit(@Validated @RequestBody SysDictType dict) {
if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在"); return R.fail("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
} }
return toAjax(dictTypeService.updateDictType(dict)); return toAjax(dictTypeService.updateDictType(dict));
} }
@@ -97,7 +96,7 @@ public class SysDictTypeController extends BaseController {
@SaCheckPermission("system:dict:remove") @SaCheckPermission("system:dict:remove")
@Log(title = "字典类型", businessType = BusinessType.DELETE) @Log(title = "字典类型", businessType = BusinessType.DELETE)
@DeleteMapping("/{dictIds}") @DeleteMapping("/{dictIds}")
public AjaxResult<Void> remove(@ApiParam("字典ID串") @PathVariable Long[] dictIds) { public R<Void> remove(@ApiParam("字典ID串") @PathVariable Long[] dictIds) {
dictTypeService.deleteDictTypeByIds(dictIds); dictTypeService.deleteDictTypeByIds(dictIds);
return success(); return success();
} }
@@ -109,9 +108,9 @@ public class SysDictTypeController extends BaseController {
@SaCheckPermission("system:dict:remove") @SaCheckPermission("system:dict:remove")
@Log(title = "字典类型", businessType = BusinessType.CLEAN) @Log(title = "字典类型", businessType = BusinessType.CLEAN)
@DeleteMapping("/refreshCache") @DeleteMapping("/refreshCache")
public AjaxResult<Void> refreshCache() { public R<Void> refreshCache() {
dictTypeService.resetDictCache(); dictTypeService.resetDictCache();
return AjaxResult.success(); return R.ok();
} }
/** /**
@@ -119,8 +118,8 @@ public class SysDictTypeController extends BaseController {
*/ */
@ApiOperation("获取字典选择框列表") @ApiOperation("获取字典选择框列表")
@GetMapping("/optionselect") @GetMapping("/optionselect")
public AjaxResult<List<SysDictType>> optionselect() { public R<List<SysDictType>> optionselect() {
List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll(); List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
return AjaxResult.success(dictTypes); return R.ok(dictTypes);
} }
} }

3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
View File

@@ -5,7 +5,6 @@ import com.ruoyi.common.utils.StringUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@@ -15,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
* @author Lion Li * @author Lion Li
*/ */
@Api(value = "首页控制器", tags = {"首页管理"}) @Api(value = "首页控制器", tags = {"首页管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
public class SysIndexController { public class SysIndexController {

33
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
View File

@@ -3,21 +3,19 @@ package com.ruoyi.web.controller.system;
import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.exception.NotLoginException;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginBody; import com.ruoyi.common.core.domain.model.LoginBody;
import com.ruoyi.common.core.service.UserService; import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.LoginUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.domain.vo.RouterVo; import com.ruoyi.system.domain.vo.RouterVo;
import com.ruoyi.system.service.ISysMenuService; import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.SysLoginService; import com.ruoyi.system.service.SysLoginService;
import com.ruoyi.system.service.SysPermissionService; import com.ruoyi.system.service.SysPermissionService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@@ -36,12 +34,13 @@ import java.util.Set;
*/ */
@Validated @Validated
@Api(value = "登录验证控制器", tags = {"登录验证管理"}) @Api(value = "登录验证控制器", tags = {"登录验证管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
public class SysLoginController { public class SysLoginController {
private final SysLoginService loginService; private final SysLoginService loginService;
private final ISysMenuService menuService; private final ISysMenuService menuService;
private final ISysUserService userService;
private final SysPermissionService permissionService; private final SysPermissionService permissionService;
/** /**
@@ -52,23 +51,23 @@ public class SysLoginController {
*/ */
@ApiOperation("登录方法") @ApiOperation("登录方法")
@PostMapping("/login") @PostMapping("/login")
public AjaxResult<Map<String, Object>> login(@RequestBody LoginBody loginBody) { public R<Map<String, Object>> login(@Validated @RequestBody LoginBody loginBody) {
Map<String, Object> ajax = new HashMap<>(); Map<String, Object> ajax = new HashMap<>();
// 生成令牌 // 生成令牌
String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
loginBody.getUuid()); loginBody.getUuid());
ajax.put(Constants.TOKEN, token); ajax.put(Constants.TOKEN, token);
return AjaxResult.success(ajax); return R.ok(ajax);
} }
@ApiOperation("登出方法") @ApiOperation("登出方法")
@PostMapping("/logout") @PostMapping("/logout")
public AjaxResult<Void> logout(){ public R<Void> logout() {
try { try {
StpUtil.logout(); StpUtil.logout();
} catch (NotLoginException e) { } catch (NotLoginException e) {
} }
return AjaxResult.success("退出成功"); return R.ok("退出成功");
} }
/** /**
@@ -78,8 +77,8 @@ public class SysLoginController {
*/ */
@ApiOperation("获取用户信息") @ApiOperation("获取用户信息")
@GetMapping("getInfo") @GetMapping("getInfo")
public AjaxResult<Map<String, Object>> getInfo() { public R<Map<String, Object>> getInfo() {
SysUser user = SpringUtils.getBean(UserService.class).selectUserById(LoginUtils.getUserId()); SysUser user = userService.selectUserById(LoginHelper.getUserId());
// 角色集合 // 角色集合
Set<String> roles = permissionService.getRolePermission(user); Set<String> roles = permissionService.getRolePermission(user);
// 权限集合 // 权限集合
@@ -88,7 +87,7 @@ public class SysLoginController {
ajax.put("user", user); ajax.put("user", user);
ajax.put("roles", roles); ajax.put("roles", roles);
ajax.put("permissions", permissions); ajax.put("permissions", permissions);
return AjaxResult.success(ajax); return R.ok(ajax);
} }
/** /**
@@ -98,9 +97,9 @@ public class SysLoginController {
*/ */
@ApiOperation("获取路由信息") @ApiOperation("获取路由信息")
@GetMapping("getRouters") @GetMapping("getRouters")
public AjaxResult<List<RouterVo>> getRouters() { public R<List<RouterVo>> getRouters() {
Long userId = LoginUtils.getUserId(); Long userId = LoginHelper.getUserId();
List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId); List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
return AjaxResult.success(menuService.buildMenus(menus)); return R.ok(menuService.buildMenus(menus));
} }
} }

41
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
View File

@@ -5,7 +5,7 @@ import cn.hutool.core.lang.tree.Tree;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
@@ -14,7 +14,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -29,7 +28,7 @@ import java.util.Map;
*/ */
@Validated @Validated
@Api(value = "菜单信息控制器", tags = {"菜单信息管理"}) @Api(value = "菜单信息控制器", tags = {"菜单信息管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/system/menu") @RequestMapping("/system/menu")
public class SysMenuController extends BaseController { public class SysMenuController extends BaseController {
@@ -42,9 +41,9 @@ public class SysMenuController extends BaseController {
@ApiOperation("获取菜单列表") @ApiOperation("获取菜单列表")
@SaCheckPermission("system:menu:list") @SaCheckPermission("system:menu:list")
@GetMapping("/list") @GetMapping("/list")
public AjaxResult<List<SysMenu>> list(SysMenu menu) { public R<List<SysMenu>> list(SysMenu menu) {
List<SysMenu> menus = menuService.selectMenuList(menu, getUserId()); List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
return AjaxResult.success(menus); return R.ok(menus);
} }
/** /**
@@ -53,8 +52,8 @@ public class SysMenuController extends BaseController {
@ApiOperation("根据菜单编号获取详细信息") @ApiOperation("根据菜单编号获取详细信息")
@SaCheckPermission("system:menu:query") @SaCheckPermission("system:menu:query")
@GetMapping(value = "/{menuId}") @GetMapping(value = "/{menuId}")
public AjaxResult<SysMenu> getInfo(@ApiParam("菜单ID") @PathVariable Long menuId) { public R<SysMenu> getInfo(@ApiParam("菜单ID") @PathVariable Long menuId) {
return AjaxResult.success(menuService.selectMenuById(menuId)); return R.ok(menuService.selectMenuById(menuId));
} }
/** /**
@@ -62,9 +61,9 @@ public class SysMenuController extends BaseController {
*/ */
@ApiOperation("获取菜单下拉树列表") @ApiOperation("获取菜单下拉树列表")
@GetMapping("/treeselect") @GetMapping("/treeselect")
public AjaxResult<List<Tree<Long>>> treeselect(SysMenu menu) { public R<List<Tree<Long>>> treeselect(SysMenu menu) {
List<SysMenu> menus = menuService.selectMenuList(menu, getUserId()); List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
return AjaxResult.success(menuService.buildMenuTreeSelect(menus)); return R.ok(menuService.buildMenuTreeSelect(menus));
} }
/** /**
@@ -72,12 +71,12 @@ public class SysMenuController extends BaseController {
*/ */
@ApiOperation("加载对应角色菜单列表树") @ApiOperation("加载对应角色菜单列表树")
@GetMapping(value = "/roleMenuTreeselect/{roleId}") @GetMapping(value = "/roleMenuTreeselect/{roleId}")
public AjaxResult<Map<String, Object>> roleMenuTreeselect(@ApiParam("角色ID") @PathVariable("roleId") Long roleId) { public R<Map<String, Object>> roleMenuTreeselect(@ApiParam("角色ID") @PathVariable("roleId") Long roleId) {
List<SysMenu> menus = menuService.selectMenuList(getUserId()); List<SysMenu> menus = menuService.selectMenuList(getUserId());
Map<String, Object> ajax = new HashMap<>(); Map<String, Object> ajax = new HashMap<>();
ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId)); ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
ajax.put("menus", menuService.buildMenuTreeSelect(menus)); ajax.put("menus", menuService.buildMenuTreeSelect(menus));
return AjaxResult.success(ajax); return R.ok(ajax);
} }
/** /**
@@ -87,11 +86,11 @@ public class SysMenuController extends BaseController {
@SaCheckPermission("system:menu:add") @SaCheckPermission("system:menu:add")
@Log(title = "菜单管理", businessType = BusinessType.INSERT) @Log(title = "菜单管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult<Void> add(@Validated @RequestBody SysMenu menu) { public R<Void> add(@Validated @RequestBody SysMenu menu) {
if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) { if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); return R.fail("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
} else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) { } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头"); return R.fail("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
} }
return toAjax(menuService.insertMenu(menu)); return toAjax(menuService.insertMenu(menu));
} }
@@ -103,13 +102,13 @@ public class SysMenuController extends BaseController {
@SaCheckPermission("system:menu:edit") @SaCheckPermission("system:menu:edit")
@Log(title = "菜单管理", businessType = BusinessType.UPDATE) @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult<Void> edit(@Validated @RequestBody SysMenu menu) { public R<Void> edit(@Validated @RequestBody SysMenu menu) {
if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) { if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); return R.fail("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
} else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) { } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头"); return R.fail("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
} else if (menu.getMenuId().equals(menu.getParentId())) { } else if (menu.getMenuId().equals(menu.getParentId())) {
return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己"); return R.fail("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
} }
return toAjax(menuService.updateMenu(menu)); return toAjax(menuService.updateMenu(menu));
} }
@@ -121,12 +120,12 @@ public class SysMenuController extends BaseController {
@SaCheckPermission("system:menu:remove") @SaCheckPermission("system:menu:remove")
@Log(title = "菜单管理", businessType = BusinessType.DELETE) @Log(title = "菜单管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{menuId}") @DeleteMapping("/{menuId}")
public AjaxResult<Void> remove(@ApiParam("菜单ID") @PathVariable("menuId") Long menuId) { public R<Void> remove(@ApiParam("菜单ID") @PathVariable("menuId") Long menuId) {
if (menuService.hasChildByMenuId(menuId)) { if (menuService.hasChildByMenuId(menuId)) {
return AjaxResult.error("存在子菜单,不允许删除"); return R.fail("存在子菜单,不允许删除");
} }
if (menuService.checkMenuExistRole(menuId)) { if (menuService.checkMenuExistRole(menuId)) {
return AjaxResult.error("菜单已分配,不允许删除"); return R.fail("菜单已分配,不允许删除");
} }
return toAjax(menuService.deleteMenuById(menuId)); return toAjax(menuService.deleteMenuById(menuId));
} }

19
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
View File

@@ -3,19 +3,18 @@ package com.ruoyi.web.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.domain.SysNotice; import com.ruoyi.system.domain.SysNotice;
import com.ruoyi.system.service.ISysNoticeService; import com.ruoyi.system.service.ISysNoticeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/** /**
* 公告 信息操作处理 * 公告 信息操作处理
@@ -24,7 +23,7 @@ import lombok.RequiredArgsConstructor;
*/ */
@Validated @Validated
@Api(value = "公告信息控制器", tags = {"公告信息管理"}) @Api(value = "公告信息控制器", tags = {"公告信息管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/system/notice") @RequestMapping("/system/notice")
public class SysNoticeController extends BaseController { public class SysNoticeController extends BaseController {
@@ -47,8 +46,8 @@ public class SysNoticeController extends BaseController {
@ApiOperation("根据通知公告编号获取详细信息") @ApiOperation("根据通知公告编号获取详细信息")
@SaCheckPermission("system:notice:query") @SaCheckPermission("system:notice:query")
@GetMapping(value = "/{noticeId}") @GetMapping(value = "/{noticeId}")
public AjaxResult<SysNotice> getInfo(@ApiParam("公告ID") @PathVariable Long noticeId) { public R<SysNotice> getInfo(@ApiParam("公告ID") @PathVariable Long noticeId) {
return AjaxResult.success(noticeService.selectNoticeById(noticeId)); return R.ok(noticeService.selectNoticeById(noticeId));
} }
/** /**
@@ -58,7 +57,7 @@ public class SysNoticeController extends BaseController {
@SaCheckPermission("system:notice:add") @SaCheckPermission("system:notice:add")
@Log(title = "通知公告", businessType = BusinessType.INSERT) @Log(title = "通知公告", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult<Void> add(@Validated @RequestBody SysNotice notice) { public R<Void> add(@Validated @RequestBody SysNotice notice) {
return toAjax(noticeService.insertNotice(notice)); return toAjax(noticeService.insertNotice(notice));
} }
@@ -69,7 +68,7 @@ public class SysNoticeController extends BaseController {
@SaCheckPermission("system:notice:edit") @SaCheckPermission("system:notice:edit")
@Log(title = "通知公告", businessType = BusinessType.UPDATE) @Log(title = "通知公告", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult<Void> edit(@Validated @RequestBody SysNotice notice) { public R<Void> edit(@Validated @RequestBody SysNotice notice) {
return toAjax(noticeService.updateNotice(notice)); return toAjax(noticeService.updateNotice(notice));
} }
@@ -80,7 +79,7 @@ public class SysNoticeController extends BaseController {
@SaCheckPermission("system:notice:remove") @SaCheckPermission("system:notice:remove")
@Log(title = "通知公告", businessType = BusinessType.DELETE) @Log(title = "通知公告", businessType = BusinessType.DELETE)
@DeleteMapping("/{noticeIds}") @DeleteMapping("/{noticeIds}")
public AjaxResult<Void> remove(@ApiParam("公告ID串") @PathVariable Long[] noticeIds) { public R<Void> remove(@ApiParam("公告ID串") @PathVariable Long[] noticeIds) {
return toAjax(noticeService.deleteNoticeByIds(noticeIds)); return toAjax(noticeService.deleteNoticeByIds(noticeIds));
} }
} }

17
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
View File

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.AddGroup;
@@ -18,7 +18,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -35,7 +34,7 @@ import java.util.Arrays;
*/ */
@Validated @Validated
@Api(value = "对象存储配置控制器", tags = {"对象存储配置管理"}) @Api(value = "对象存储配置控制器", tags = {"对象存储配置管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/system/oss/config") @RequestMapping("/system/oss/config")
public class SysOssConfigController extends BaseController { public class SysOssConfigController extends BaseController {
@@ -58,10 +57,10 @@ public class SysOssConfigController extends BaseController {
@ApiOperation("获取对象存储配置详细信息") @ApiOperation("获取对象存储配置详细信息")
@SaCheckPermission("system:oss:query") @SaCheckPermission("system:oss:query")
@GetMapping("/{ossConfigId}") @GetMapping("/{ossConfigId}")
public AjaxResult<SysOssConfigVo> getInfo(@ApiParam("OSS配置ID") public R<SysOssConfigVo> getInfo(@ApiParam("OSS配置ID")
@NotNull(message = "主键不能为空") @NotNull(message = "主键不能为空")
@PathVariable("ossConfigId") Integer ossConfigId) { @PathVariable("ossConfigId") Integer ossConfigId) {
return AjaxResult.success(iSysOssConfigService.queryById(ossConfigId)); return R.ok(iSysOssConfigService.queryById(ossConfigId));
} }
/** /**
@@ -72,7 +71,7 @@ public class SysOssConfigController extends BaseController {
@Log(title = "对象存储配置", businessType = BusinessType.INSERT) @Log(title = "对象存储配置", businessType = BusinessType.INSERT)
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping()
public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) { public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) {
return toAjax(iSysOssConfigService.insertByBo(bo) ? 1 : 0); return toAjax(iSysOssConfigService.insertByBo(bo) ? 1 : 0);
} }
@@ -84,7 +83,7 @@ public class SysOssConfigController extends BaseController {
@Log(title = "对象存储配置", businessType = BusinessType.UPDATE) @Log(title = "对象存储配置", businessType = BusinessType.UPDATE)
@RepeatSubmit() @RepeatSubmit()
@PutMapping() @PutMapping()
public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) { public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) {
return toAjax(iSysOssConfigService.updateByBo(bo) ? 1 : 0); return toAjax(iSysOssConfigService.updateByBo(bo) ? 1 : 0);
} }
@@ -95,7 +94,7 @@ public class SysOssConfigController extends BaseController {
@SaCheckPermission("system:oss:remove") @SaCheckPermission("system:oss:remove")
@Log(title = "对象存储配置", businessType = BusinessType.DELETE) @Log(title = "对象存储配置", businessType = BusinessType.DELETE)
@DeleteMapping("/{ossConfigIds}") @DeleteMapping("/{ossConfigIds}")
public AjaxResult<Void> remove(@ApiParam("OSS配置ID串") public R<Void> remove(@ApiParam("OSS配置ID串")
@NotEmpty(message = "主键不能为空") @NotEmpty(message = "主键不能为空")
@PathVariable Long[] ossConfigIds) { @PathVariable Long[] ossConfigIds) {
return toAjax(iSysOssConfigService.deleteWithValidByIds(Arrays.asList(ossConfigIds), true) ? 1 : 0); return toAjax(iSysOssConfigService.deleteWithValidByIds(Arrays.asList(ossConfigIds), true) ? 1 : 0);
@@ -108,7 +107,7 @@ public class SysOssConfigController extends BaseController {
@SaCheckPermission("system:oss:edit") @SaCheckPermission("system:oss:edit")
@Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE) @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus") @PutMapping("/changeStatus")
public AjaxResult<Void> changeStatus(@RequestBody SysOssConfigBo bo) { public R<Void> changeStatus(@RequestBody SysOssConfigBo bo) {
return toAjax(iSysOssConfigService.updateOssConfigStatus(bo)); return toAjax(iSysOssConfigService.updateOssConfigStatus(bo));
} }
} }

17
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
View File

@@ -9,7 +9,7 @@ import cn.hutool.http.HttpUtil;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.QueryGroup; import com.ruoyi.common.core.validate.QueryGroup;
@@ -26,7 +26,6 @@ import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysOssService; import com.ruoyi.system.service.ISysOssService;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -47,7 +46,7 @@ import java.util.Map;
*/ */
@Validated @Validated
@Api(value = "OSS对象存储控制器", tags = {"OSS对象存储管理"}) @Api(value = "OSS对象存储控制器", tags = {"OSS对象存储管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/system/oss") @RequestMapping("/system/oss")
public class SysOssController extends BaseController { public class SysOssController extends BaseController {
@@ -76,7 +75,7 @@ public class SysOssController extends BaseController {
@Log(title = "OSS对象存储", businessType = BusinessType.INSERT) @Log(title = "OSS对象存储", businessType = BusinessType.INSERT)
@RepeatSubmit @RepeatSubmit
@PostMapping("/upload") @PostMapping("/upload")
public AjaxResult<Map<String, String>> upload(@RequestPart("file") MultipartFile file) { public R<Map<String, String>> upload(@RequestPart("file") MultipartFile file) {
if (ObjectUtil.isNull(file)) { if (ObjectUtil.isNull(file)) {
throw new ServiceException("上传文件不能为空"); throw new ServiceException("上传文件不能为空");
} }
@@ -84,7 +83,7 @@ public class SysOssController extends BaseController {
Map<String, String> map = new HashMap<>(2); Map<String, String> map = new HashMap<>(2);
map.put("url", oss.getUrl()); map.put("url", oss.getUrl());
map.put("fileName", oss.getFileName()); map.put("fileName", oss.getFileName());
return AjaxResult.success(map); return R.ok(map);
} }
@ApiOperation("下载OSS对象存储") @ApiOperation("下载OSS对象存储")
@@ -118,7 +117,7 @@ public class SysOssController extends BaseController {
@SaCheckPermission("system:oss:remove") @SaCheckPermission("system:oss:remove")
@Log(title = "OSS对象存储", businessType = BusinessType.DELETE) @Log(title = "OSS对象存储", businessType = BusinessType.DELETE)
@DeleteMapping("/{ossIds}") @DeleteMapping("/{ossIds}")
public AjaxResult<Void> remove(@ApiParam("OSS对象ID串") public R<Void> remove(@ApiParam("OSS对象ID串")
@NotEmpty(message = "主键不能为空") @NotEmpty(message = "主键不能为空")
@PathVariable Long[] ossIds) { @PathVariable Long[] ossIds) {
return toAjax(iSysOssService.deleteWithValidByIds(Arrays.asList(ossIds), true) ? 1 : 0); return toAjax(iSysOssService.deleteWithValidByIds(Arrays.asList(ossIds), true) ? 1 : 0);
@@ -131,9 +130,11 @@ public class SysOssController extends BaseController {
@SaCheckPermission("system:oss:edit") @SaCheckPermission("system:oss:edit")
@Log(title = "OSS对象存储", businessType = BusinessType.UPDATE) @Log(title = "OSS对象存储", businessType = BusinessType.UPDATE)
@PutMapping("/changePreviewListResource") @PutMapping("/changePreviewListResource")
public AjaxResult<Void> changePreviewListResource(@RequestBody String body) { public R<Void> changePreviewListResource(@RequestBody String body) {
Map<String, Boolean> map = JsonUtils.parseMap(body); Map<String, Boolean> map = JsonUtils.parseMap(body);
SysConfig config = iSysConfigService.getOne(new SysConfig().setConfigKey(OssConstant.PEREVIEW_LIST_RESOURCE_KEY)); SysConfig sysConfig = new SysConfig();
sysConfig.setConfigKey(OssConstant.PEREVIEW_LIST_RESOURCE_KEY);
SysConfig config = iSysConfigService.getOne(sysConfig);
config.setConfigValue(map.get("previewListResource").toString()); config.setConfigValue(map.get("previewListResource").toString());
return toAjax(iSysConfigService.updateConfig(config)); return toAjax(iSysConfigService.updateConfig(config));
} }

27
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
View File

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
@@ -15,7 +15,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -29,7 +28,7 @@ import java.util.List;
*/ */
@Validated @Validated
@Api(value = "岗位信息控制器", tags = {"岗位信息管理"}) @Api(value = "岗位信息控制器", tags = {"岗位信息管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/system/post") @RequestMapping("/system/post")
public class SysPostController extends BaseController { public class SysPostController extends BaseController {
@@ -61,8 +60,8 @@ public class SysPostController extends BaseController {
@ApiOperation("根据岗位编号获取详细信息") @ApiOperation("根据岗位编号获取详细信息")
@SaCheckPermission("system:post:query") @SaCheckPermission("system:post:query")
@GetMapping(value = "/{postId}") @GetMapping(value = "/{postId}")
public AjaxResult<SysPost> getInfo(@ApiParam("岗位ID") @PathVariable Long postId) { public R<SysPost> getInfo(@ApiParam("岗位ID") @PathVariable Long postId) {
return AjaxResult.success(postService.selectPostById(postId)); return R.ok(postService.selectPostById(postId));
} }
/** /**
@@ -72,11 +71,11 @@ public class SysPostController extends BaseController {
@SaCheckPermission("system:post:add") @SaCheckPermission("system:post:add")
@Log(title = "岗位管理", businessType = BusinessType.INSERT) @Log(title = "岗位管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult<Void> add(@Validated @RequestBody SysPost post) { public R<Void> add(@Validated @RequestBody SysPost post) {
if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) { if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) {
return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在"); return R.fail("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
} else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) { } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) {
return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在"); return R.fail("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
} }
return toAjax(postService.insertPost(post)); return toAjax(postService.insertPost(post));
} }
@@ -88,11 +87,11 @@ public class SysPostController extends BaseController {
@SaCheckPermission("system:post:edit") @SaCheckPermission("system:post:edit")
@Log(title = "岗位管理", businessType = BusinessType.UPDATE) @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult<Void> edit(@Validated @RequestBody SysPost post) { public R<Void> edit(@Validated @RequestBody SysPost post) {
if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) { if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) {
return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在"); return R.fail("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
} else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) { } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) {
return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在"); return R.fail("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
} }
return toAjax(postService.updatePost(post)); return toAjax(postService.updatePost(post));
} }
@@ -104,7 +103,7 @@ public class SysPostController extends BaseController {
@SaCheckPermission("system:post:remove") @SaCheckPermission("system:post:remove")
@Log(title = "岗位管理", businessType = BusinessType.DELETE) @Log(title = "岗位管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{postIds}") @DeleteMapping("/{postIds}")
public AjaxResult<Void> remove(@ApiParam("岗位ID串") @PathVariable Long[] postIds) { public R<Void> remove(@ApiParam("岗位ID串") @PathVariable Long[] postIds) {
return toAjax(postService.deletePostByIds(postIds)); return toAjax(postService.deletePostByIds(postIds));
} }
@@ -113,8 +112,8 @@ public class SysPostController extends BaseController {
*/ */
@ApiOperation("获取岗位选择框列表") @ApiOperation("获取岗位选择框列表")
@GetMapping("/optionselect") @GetMapping("/optionselect")
public AjaxResult<List<SysPost>> optionselect() { public R<List<SysPost>> optionselect() {
List<SysPost> posts = postService.selectPostAll(); List<SysPost> posts = postService.selectPostAll();
return AjaxResult.success(posts); return R.ok(posts);
} }
} }

47
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
View File

@@ -3,14 +3,12 @@ package com.ruoyi.web.controller.system;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.service.UserService;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.LoginUtils; import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.domain.SysOss; import com.ruoyi.system.domain.SysOss;
import com.ruoyi.system.service.ISysOssService; import com.ruoyi.system.service.ISysOssService;
import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
@@ -19,7 +17,6 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@@ -35,7 +32,7 @@ import java.util.Map;
*/ */
@Validated @Validated
@Api(value = "个人信息控制器", tags = {"个人信息管理"}) @Api(value = "个人信息控制器", tags = {"个人信息管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/system/user/profile") @RequestMapping("/system/user/profile")
public class SysProfileController extends BaseController { public class SysProfileController extends BaseController {
@@ -48,13 +45,13 @@ public class SysProfileController extends BaseController {
*/ */
@ApiOperation("个人信息") @ApiOperation("个人信息")
@GetMapping @GetMapping
public AjaxResult<Map<String, Object>> profile() { public R<Map<String, Object>> profile() {
SysUser user = userService.selectUserById(getUserId()); SysUser user = userService.selectUserById(getUserId());
Map<String, Object> ajax = new HashMap<>(); Map<String, Object> ajax = new HashMap<>();
ajax.put("user", user); ajax.put("user", user);
ajax.put("roleGroup", userService.selectUserRoleGroup(user.getUserName())); ajax.put("roleGroup", userService.selectUserRoleGroup(user.getUserName()));
ajax.put("postGroup", userService.selectUserPostGroup(user.getUserName())); ajax.put("postGroup", userService.selectUserPostGroup(user.getUserName()));
return AjaxResult.success(ajax); return R.ok(ajax);
} }
/** /**
@@ -63,22 +60,22 @@ public class SysProfileController extends BaseController {
@ApiOperation("修改用户") @ApiOperation("修改用户")
@Log(title = "个人信息", businessType = BusinessType.UPDATE) @Log(title = "个人信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult<Void> updateProfile(@RequestBody SysUser user) { public R<Void> updateProfile(@RequestBody SysUser user) {
if (StringUtils.isNotEmpty(user.getPhonenumber()) if (StringUtils.isNotEmpty(user.getPhonenumber())
&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) { && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在"); return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
} }
if (StringUtils.isNotEmpty(user.getEmail()) if (StringUtils.isNotEmpty(user.getEmail())
&& UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) { && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在"); return R.fail("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
} }
user.setUserId(getUserId()); user.setUserId(getUserId());
user.setUserName(null); user.setUserName(null);
user.setPassword(null); user.setPassword(null);
if (userService.updateUserProfile(user) > 0) { if (userService.updateUserProfile(user) > 0) {
return AjaxResult.success(); return R.ok();
} }
return AjaxResult.error("修改个人信息异常，请联系管理员"); return R.fail("修改个人信息异常，请联系管理员");
} }
/** /**
@@ -91,20 +88,20 @@ public class SysProfileController extends BaseController {
}) })
@Log(title = "个人信息", businessType = BusinessType.UPDATE) @Log(title = "个人信息", businessType = BusinessType.UPDATE)
@PutMapping("/updatePwd") @PutMapping("/updatePwd")
public AjaxResult<Void> updatePwd(String oldPassword, String newPassword) { public R<Void> updatePwd(String oldPassword, String newPassword) {
SysUser user = SpringUtils.getBean(UserService.class).selectUserById(LoginUtils.getUserId()); SysUser user = userService.selectUserById(LoginHelper.getUserId());
String userName = user.getUserName(); String userName = user.getUserName();
String password = user.getPassword(); String password = user.getPassword();
if (!SecurityUtils.matchesPassword(oldPassword, password)) { if (!SecurityUtils.matchesPassword(oldPassword, password)) {
return AjaxResult.error("修改密码失败，旧密码错误"); return R.fail("修改密码失败，旧密码错误");
} }
if (SecurityUtils.matchesPassword(newPassword, password)) { if (SecurityUtils.matchesPassword(newPassword, password)) {
return AjaxResult.error("新密码不能与旧密码相同"); return R.fail("新密码不能与旧密码相同");
} }
if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) { if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) {
return AjaxResult.success(); return R.ok();
} }
return AjaxResult.error("修改密码异常，请联系管理员"); return R.fail("修改密码异常，请联系管理员");
} }
/** /**
@@ -116,16 +113,16 @@ public class SysProfileController extends BaseController {
}) })
@Log(title = "用户头像", businessType = BusinessType.UPDATE) @Log(title = "用户头像", businessType = BusinessType.UPDATE)
@PostMapping("/avatar") @PostMapping("/avatar")
public AjaxResult<Map<String, Object>> avatar(@RequestPart("avatarfile") MultipartFile file) { public R<Map<String, Object>> avatar(@RequestPart("avatarfile") MultipartFile file) {
Map<String,Object> ajax = new HashMap<>(); Map<String, Object> ajax = new HashMap<>();
if (!file.isEmpty()) { if (!file.isEmpty()) {
SysOss oss = iSysOssService.upload(file); SysOss oss = iSysOssService.upload(file);
String avatar = oss.getUrl(); String avatar = oss.getUrl();
if (userService.updateUserAvatar(getUsername(), avatar)) { if (userService.updateUserAvatar(getUsername(), avatar)) {
ajax.put("imgUrl", avatar); ajax.put("imgUrl", avatar);
return AjaxResult.success(ajax); return R.ok(ajax);
} }
} }
return AjaxResult.error("上传图片异常，请联系管理员", ajax); return R.fail("上传图片异常，请联系管理员");
} }
} }

12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
View File

@@ -1,15 +1,13 @@
package com.ruoyi.web.controller.system; package com.ruoyi.web.controller.system;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.model.RegisterBody; import com.ruoyi.common.core.domain.model.RegisterBody;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.SysRegisterService; import com.ruoyi.system.service.SysRegisterService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
@@ -22,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
*/ */
@Validated @Validated
@Api(value = "注册验证控制器", tags = {"注册验证管理"}) @Api(value = "注册验证控制器", tags = {"注册验证管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
public class SysRegisterController extends BaseController { public class SysRegisterController extends BaseController {
@@ -31,11 +29,11 @@ public class SysRegisterController extends BaseController {
@ApiOperation("用户注册") @ApiOperation("用户注册")
@PostMapping("/register") @PostMapping("/register")
public AjaxResult<Void> register(@RequestBody RegisterBody user) { public R<Void> register(@Validated @RequestBody RegisterBody user) {
if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) { if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
return error("当前系统没有开启注册功能！"); return error("当前系统没有开启注册功能！");
} }
String msg = registerService.register(user); registerService.register(user);
return StringUtils.isEmpty(msg) ? success() : error(msg); return success();
} }
} }

53
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
View File

@@ -1,18 +1,18 @@
package com.ruoyi.web.controller.system; package com.ruoyi.web.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.LoginUtils; import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysRoleService;
@@ -20,7 +20,6 @@ import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.SysPermissionService; import com.ruoyi.system.service.SysPermissionService;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -34,7 +33,7 @@ import java.util.List;
*/ */
@Validated @Validated
@Api(value = "角色信息控制器", tags = {"角色信息管理"}) @Api(value = "角色信息控制器", tags = {"角色信息管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/system/role") @RequestMapping("/system/role")
public class SysRoleController extends BaseController { public class SysRoleController extends BaseController {
@@ -65,9 +64,9 @@ public class SysRoleController extends BaseController {
@ApiOperation("根据角色编号获取详细信息") @ApiOperation("根据角色编号获取详细信息")
@SaCheckPermission("system:role:query") @SaCheckPermission("system:role:query")
@GetMapping(value = "/{roleId}") @GetMapping(value = "/{roleId}")
public AjaxResult<SysRole> getInfo(@ApiParam("角色ID") @PathVariable Long roleId) { public R<SysRole> getInfo(@ApiParam("角色ID") @PathVariable Long roleId) {
roleService.checkRoleDataScope(roleId); roleService.checkRoleDataScope(roleId);
return AjaxResult.success(roleService.selectRoleById(roleId)); return R.ok(roleService.selectRoleById(roleId));
} }
/** /**
@@ -77,11 +76,11 @@ public class SysRoleController extends BaseController {
@SaCheckPermission("system:role:add") @SaCheckPermission("system:role:add")
@Log(title = "角色管理", businessType = BusinessType.INSERT) @Log(title = "角色管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult<Void> add(@Validated @RequestBody SysRole role) { public R<Void> add(@Validated @RequestBody SysRole role) {
if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) { if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在"); return R.fail("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
} else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) { } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在"); return R.fail("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
} }
return toAjax(roleService.insertRole(role)); return toAjax(roleService.insertRole(role));
@@ -94,25 +93,26 @@ public class SysRoleController extends BaseController {
@SaCheckPermission("system:role:edit") @SaCheckPermission("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.UPDATE) @Log(title = "角色管理", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult<Void> edit(@Validated @RequestBody SysRole role) { public R<Void> edit(@Validated @RequestBody SysRole role) {
roleService.checkRoleAllowed(role); roleService.checkRoleAllowed(role);
roleService.checkRoleDataScope(role.getRoleId());
if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) { if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在"); return R.fail("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
} else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) { } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在"); return R.fail("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
} }
if (roleService.updateRole(role) > 0) { if (roleService.updateRole(role) > 0) {
// 更新缓存用户权限 // 更新缓存用户权限
LoginUser loginUser = getLoginUser(); LoginUser loginUser = getLoginUser();
SysUser sysUser = userService.selectUserById(loginUser.getUserId()); SysUser sysUser = userService.selectUserById(loginUser.getUserId());
if (StringUtils.isNotNull(sysUser) && !sysUser.isAdmin()) { if (ObjectUtil.isNotNull(sysUser) && !sysUser.isAdmin()) {
loginUser.setMenuPermission(permissionService.getMenuPermission(sysUser)); loginUser.setMenuPermission(permissionService.getMenuPermission(sysUser));
LoginUtils.setLoginUser(loginUser); LoginHelper.setLoginUser(loginUser);
} }
return AjaxResult.success(); return R.ok();
} }
return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，请联系管理员"); return R.fail("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
} }
/** /**
@@ -122,8 +122,9 @@ public class SysRoleController extends BaseController {
@SaCheckPermission("system:role:edit") @SaCheckPermission("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.UPDATE) @Log(title = "角色管理", businessType = BusinessType.UPDATE)
@PutMapping("/dataScope") @PutMapping("/dataScope")
public AjaxResult<Void> dataScope(@RequestBody SysRole role) { public R<Void> dataScope(@RequestBody SysRole role) {
roleService.checkRoleAllowed(role); roleService.checkRoleAllowed(role);
roleService.checkRoleDataScope(role.getRoleId());
return toAjax(roleService.authDataScope(role)); return toAjax(roleService.authDataScope(role));
} }
@@ -134,8 +135,9 @@ public class SysRoleController extends BaseController {
@SaCheckPermission("system:role:edit") @SaCheckPermission("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.UPDATE) @Log(title = "角色管理", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus") @PutMapping("/changeStatus")
public AjaxResult<Void> changeStatus(@RequestBody SysRole role) { public R<Void> changeStatus(@RequestBody SysRole role) {
roleService.checkRoleAllowed(role); roleService.checkRoleAllowed(role);
roleService.checkRoleDataScope(role.getRoleId());
return toAjax(roleService.updateRoleStatus(role)); return toAjax(roleService.updateRoleStatus(role));
} }
@@ -146,7 +148,7 @@ public class SysRoleController extends BaseController {
@SaCheckPermission("system:role:remove") @SaCheckPermission("system:role:remove")
@Log(title = "角色管理", businessType = BusinessType.DELETE) @Log(title = "角色管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{roleIds}") @DeleteMapping("/{roleIds}")
public AjaxResult<Void> remove(@ApiParam("岗位ID串") @PathVariable Long[] roleIds) { public R<Void> remove(@ApiParam("岗位ID串") @PathVariable Long[] roleIds) {
return toAjax(roleService.deleteRoleByIds(roleIds)); return toAjax(roleService.deleteRoleByIds(roleIds));
} }
@@ -156,8 +158,8 @@ public class SysRoleController extends BaseController {
@ApiOperation("获取角色选择框列表") @ApiOperation("获取角色选择框列表")
@SaCheckPermission("system:role:query") @SaCheckPermission("system:role:query")
@GetMapping("/optionselect") @GetMapping("/optionselect")
public AjaxResult<List<SysRole>> optionselect() { public R<List<SysRole>> optionselect() {
return AjaxResult.success(roleService.selectRoleAll()); return R.ok(roleService.selectRoleAll());
} }
/** /**
@@ -187,7 +189,7 @@ public class SysRoleController extends BaseController {
@SaCheckPermission("system:role:edit") @SaCheckPermission("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.GRANT) @Log(title = "角色管理", businessType = BusinessType.GRANT)
@PutMapping("/authUser/cancel") @PutMapping("/authUser/cancel")
public AjaxResult<Void> cancelAuthUser(@RequestBody SysUserRole userRole) { public R<Void> cancelAuthUser(@RequestBody SysUserRole userRole) {
return toAjax(roleService.deleteAuthUser(userRole)); return toAjax(roleService.deleteAuthUser(userRole));
} }
@@ -202,7 +204,7 @@ public class SysRoleController extends BaseController {
@SaCheckPermission("system:role:edit") @SaCheckPermission("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.GRANT) @Log(title = "角色管理", businessType = BusinessType.GRANT)
@PutMapping("/authUser/cancelAll") @PutMapping("/authUser/cancelAll")
public AjaxResult<Void> cancelAuthUserAll(Long roleId, Long[] userIds) { public R<Void> cancelAuthUserAll(Long roleId, Long[] userIds) {
return toAjax(roleService.deleteAuthUsers(roleId, userIds)); return toAjax(roleService.deleteAuthUsers(roleId, userIds));
} }
@@ -217,7 +219,8 @@ public class SysRoleController extends BaseController {
@SaCheckPermission("system:role:edit") @SaCheckPermission("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.GRANT) @Log(title = "角色管理", businessType = BusinessType.GRANT)
@PutMapping("/authUser/selectAll") @PutMapping("/authUser/selectAll")
public AjaxResult<Void> selectAuthUserAll(Long roleId, Long[] userIds) { public R<Void> selectAuthUserAll(Long roleId, Long[] userIds) {
roleService.checkRoleDataScope(roleId);
return toAjax(roleService.insertAuthUsers(roleId, userIds)); return toAjax(roleService.insertAuthUsers(roleId, userIds));
} }
} }

57
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
View File

@@ -7,7 +7,7 @@ import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysRole;
@@ -26,7 +26,6 @@ import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@@ -45,7 +44,7 @@ import java.util.stream.Collectors;
*/ */
@Validated @Validated
@Api(value = "用户信息控制器", tags = {"用户信息管理"}) @Api(value = "用户信息控制器", tags = {"用户信息管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/system/user") @RequestMapping("/system/user")
public class SysUserController extends BaseController { public class SysUserController extends BaseController {
@@ -84,14 +83,14 @@ public class SysUserController extends BaseController {
@ApiOperation("导入用户列表") @ApiOperation("导入用户列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "file", value = "导入文件", dataType = "java.io.File", required = true), @ApiImplicitParam(name = "file", value = "导入文件", dataType = "java.io.File", required = true),
}) })
@Log(title = "用户管理", businessType = BusinessType.IMPORT) @Log(title = "用户管理", businessType = BusinessType.IMPORT)
@SaCheckPermission("system:user:import") @SaCheckPermission("system:user:import")
@PostMapping("/importData") @PostMapping("/importData")
public AjaxResult<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception { public R<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
ExcelResult<SysUserImportVo> result = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class, new SysUserImportListener(updateSupport)); ExcelResult<SysUserImportVo> result = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class, new SysUserImportListener(updateSupport));
return AjaxResult.success(result.getAnalysis()); return R.ok(result.getAnalysis());
} }
@ApiOperation("下载导入模板") @ApiOperation("下载导入模板")
@@ -105,20 +104,20 @@ public class SysUserController extends BaseController {
*/ */
@ApiOperation("根据用户编号获取详细信息") @ApiOperation("根据用户编号获取详细信息")
@SaCheckPermission("system:user:query") @SaCheckPermission("system:user:query")
@GetMapping(value = {"/", "/{userId}" }) @GetMapping(value = {"/", "/{userId}"})
public AjaxResult<Map<String, Object>> getInfo(@ApiParam("用户ID") @PathVariable(value = "userId", required = false) Long userId) { public R<Map<String, Object>> getInfo(@ApiParam("用户ID") @PathVariable(value = "userId", required = false) Long userId) {
userService.checkUserDataScope(userId); userService.checkUserDataScope(userId);
Map<String, Object> ajax = new HashMap<>(); Map<String, Object> ajax = new HashMap<>();
List<SysRole> roles = roleService.selectRoleAll(); List<SysRole> roles = roleService.selectRoleAll();
ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
ajax.put("posts", postService.selectPostAll()); ajax.put("posts", postService.selectPostAll());
if (StringUtils.isNotNull(userId)) { if (ObjectUtil.isNotNull(userId)) {
SysUser sysUser = userService.selectUserById(userId); SysUser sysUser = userService.selectUserById(userId);
ajax.put("user", sysUser); ajax.put("user", sysUser);
ajax.put("postIds", postService.selectPostListByUserId(userId)); ajax.put("postIds", postService.selectPostListByUserId(userId));
ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList())); ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
} }
return AjaxResult.success(ajax); return R.ok(ajax);
} }
/** /**
@@ -128,15 +127,15 @@ public class SysUserController extends BaseController {
@SaCheckPermission("system:user:add") @SaCheckPermission("system:user:add")
@Log(title = "用户管理", businessType = BusinessType.INSERT) @Log(title = "用户管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult<Void> add(@Validated @RequestBody SysUser user) { public R<Void> add(@Validated @RequestBody SysUser user) {
if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) { if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) {
return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在"); return R.fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
} else if (StringUtils.isNotEmpty(user.getPhonenumber()) } else if (StringUtils.isNotEmpty(user.getPhonenumber())
&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) { && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在"); return R.fail("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
} else if (StringUtils.isNotEmpty(user.getEmail()) } else if (StringUtils.isNotEmpty(user.getEmail())
&& UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) { && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在"); return R.fail("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
} }
user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
return toAjax(userService.insertUser(user)); return toAjax(userService.insertUser(user));
@@ -149,14 +148,15 @@ public class SysUserController extends BaseController {
@SaCheckPermission("system:user:edit") @SaCheckPermission("system:user:edit")
@Log(title = "用户管理", businessType = BusinessType.UPDATE) @Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult<Void> edit(@Validated @RequestBody SysUser user) { public R<Void> edit(@Validated @RequestBody SysUser user) {
userService.checkUserAllowed(user); userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
if (StringUtils.isNotEmpty(user.getPhonenumber()) if (StringUtils.isNotEmpty(user.getPhonenumber())
&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) { && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在"); return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
} else if (StringUtils.isNotEmpty(user.getEmail()) } else if (StringUtils.isNotEmpty(user.getEmail())
&& UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) { && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在"); return R.fail("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
} }
return toAjax(userService.updateUser(user)); return toAjax(userService.updateUser(user));
} }
@@ -168,7 +168,7 @@ public class SysUserController extends BaseController {
@SaCheckPermission("system:user:remove") @SaCheckPermission("system:user:remove")
@Log(title = "用户管理", businessType = BusinessType.DELETE) @Log(title = "用户管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{userIds}") @DeleteMapping("/{userIds}")
public AjaxResult<Void> remove(@ApiParam("角色ID串") @PathVariable Long[] userIds) { public R<Void> remove(@ApiParam("角色ID串") @PathVariable Long[] userIds) {
if (ArrayUtil.contains(userIds, getUserId())) { if (ArrayUtil.contains(userIds, getUserId())) {
return error("当前用户不能删除"); return error("当前用户不能删除");
} }
@@ -182,8 +182,9 @@ public class SysUserController extends BaseController {
@SaCheckPermission("system:user:resetPwd") @SaCheckPermission("system:user:resetPwd")
@Log(title = "用户管理", businessType = BusinessType.UPDATE) @Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PutMapping("/resetPwd") @PutMapping("/resetPwd")
public AjaxResult<Void> resetPwd(@RequestBody SysUser user) { public R<Void> resetPwd(@RequestBody SysUser user) {
userService.checkUserAllowed(user); userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
return toAjax(userService.resetPwd(user)); return toAjax(userService.resetPwd(user));
} }
@@ -195,8 +196,9 @@ public class SysUserController extends BaseController {
@SaCheckPermission("system:user:edit") @SaCheckPermission("system:user:edit")
@Log(title = "用户管理", businessType = BusinessType.UPDATE) @Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus") @PutMapping("/changeStatus")
public AjaxResult<Void> changeStatus(@RequestBody SysUser user) { public R<Void> changeStatus(@RequestBody SysUser user) {
userService.checkUserAllowed(user); userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
return toAjax(userService.updateUserStatus(user)); return toAjax(userService.updateUserStatus(user));
} }
@@ -206,13 +208,13 @@ public class SysUserController extends BaseController {
@ApiOperation("根据用户编号获取授权角色") @ApiOperation("根据用户编号获取授权角色")
@SaCheckPermission("system:user:query") @SaCheckPermission("system:user:query")
@GetMapping("/authRole/{userId}") @GetMapping("/authRole/{userId}")
public AjaxResult<Map<String, Object>> authRole(@ApiParam("用户ID") @PathVariable("userId") Long userId) { public R<Map<String, Object>> authRole(@ApiParam("用户ID") @PathVariable("userId") Long userId) {
SysUser user = userService.selectUserById(userId); SysUser user = userService.selectUserById(userId);
List<SysRole> roles = roleService.selectRolesByUserId(userId); List<SysRole> roles = roleService.selectRolesByUserId(userId);
Map<String, Object> ajax = new HashMap<>(); Map<String, Object> ajax = new HashMap<>();
ajax.put("user", user); ajax.put("user", user);
ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
return AjaxResult.success(ajax); return R.ok(ajax);
} }
/** /**
@@ -226,7 +228,8 @@ public class SysUserController extends BaseController {
@SaCheckPermission("system:user:edit") @SaCheckPermission("system:user:edit")
@Log(title = "用户管理", businessType = BusinessType.GRANT) @Log(title = "用户管理", businessType = BusinessType.GRANT)
@PutMapping("/authRole") @PutMapping("/authRole")
public AjaxResult<Void> insertAuthRole(Long userId, Long[] roleIds) { public R<Void> insertAuthRole(Long userId, Long[] roleIds) {
userService.checkUserDataScope(userId);
userService.insertUserAuth(userId, roleIds); userService.insertUserAuth(userId, roleIds);
return success(); return success();
} }

12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowCategoryController.java
View File

@@ -5,7 +5,7 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.core.validate.EditGroup;
@@ -72,10 +72,10 @@ public class FlowCategoryController extends BaseController {
@ApiOperation("获取流程分类详细信息") @ApiOperation("获取流程分类详细信息")
@SaCheckPermission("workflow:category:query") @SaCheckPermission("workflow:category:query")
@GetMapping("/{categoryId}") @GetMapping("/{categoryId}")
public AjaxResult<FlowCategoryVo> getInfo(@ApiParam("主键") public R<FlowCategoryVo> getInfo(@ApiParam("主键")
@NotNull(message = "主键不能为空") @NotNull(message = "主键不能为空")
@PathVariable("categoryId") Long categoryId) { @PathVariable("categoryId") Long categoryId) {
return AjaxResult.success(iFlowCategoryService.queryById(categoryId)); return R.ok(iFlowCategoryService.queryById(categoryId));
} }
/** /**
@@ -86,7 +86,7 @@ public class FlowCategoryController extends BaseController {
@Log(title = "流程分类", businessType = BusinessType.INSERT) @Log(title = "流程分类", businessType = BusinessType.INSERT)
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping()
public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody FlowCategoryBo bo) { public R<Void> add(@Validated(AddGroup.class) @RequestBody FlowCategoryBo bo) {
return toAjax(iFlowCategoryService.insertByBo(bo) ? 1 : 0); return toAjax(iFlowCategoryService.insertByBo(bo) ? 1 : 0);
} }
@@ -98,7 +98,7 @@ public class FlowCategoryController extends BaseController {
@Log(title = "流程分类", businessType = BusinessType.UPDATE) @Log(title = "流程分类", businessType = BusinessType.UPDATE)
@RepeatSubmit() @RepeatSubmit()
@PutMapping() @PutMapping()
public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody FlowCategoryBo bo) { public R<Void> edit(@Validated(EditGroup.class) @RequestBody FlowCategoryBo bo) {
return toAjax(iFlowCategoryService.updateByBo(bo) ? 1 : 0); return toAjax(iFlowCategoryService.updateByBo(bo) ? 1 : 0);
} }
@@ -109,7 +109,7 @@ public class FlowCategoryController extends BaseController {
@SaCheckPermission("workflow:category:remove") @SaCheckPermission("workflow:category:remove")
@Log(title = "流程分类" , businessType = BusinessType.DELETE) @Log(title = "流程分类" , businessType = BusinessType.DELETE)
@DeleteMapping("/{categoryIds}") @DeleteMapping("/{categoryIds}")
public AjaxResult<Void> remove(@ApiParam("主键串") public R<Void> remove(@ApiParam("主键串")
@NotEmpty(message = "主键不能为空") @NotEmpty(message = "主键不能为空")
@PathVariable Long[] categoryIds) { @PathVariable Long[] categoryIds) {
return toAjax(iFlowCategoryService.deleteWithValidByIds(Arrays.asList(categoryIds), true) ? 1 : 0); return toAjax(iFlowCategoryService.deleteWithValidByIds(Arrays.asList(categoryIds), true) ? 1 : 0);

26
ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowDefinitionController.java
View File

@@ -2,7 +2,7 @@ package com.ruoyi.web.controller.workflow;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
@@ -75,7 +75,7 @@ public class FlowDefinitionController extends BaseController {
@ApiOperation(value = "导入流程文件", notes = "上传bpmn20的xml文件") @ApiOperation(value = "导入流程文件", notes = "上传bpmn20的xml文件")
@PostMapping("/import") @PostMapping("/import")
public AjaxResult<Void> importFile(@RequestParam(required = false) String name, public R<Void> importFile(@RequestParam(required = false) String name,
@RequestParam(required = false) String category, @RequestParam(required = false) String category,
MultipartFile file) { MultipartFile file) {
try (InputStream in = file.getInputStream()) { try (InputStream in = file.getInputStream()) {
@@ -91,11 +91,11 @@ public class FlowDefinitionController extends BaseController {
@ApiOperation(value = "读取xml文件") @ApiOperation(value = "读取xml文件")
@GetMapping("/readXml/{definitionId}") @GetMapping("/readXml/{definitionId}")
public AjaxResult<String> readXml(@ApiParam(value = "流程定义ID") @PathVariable(value = "definitionId") String definitionId) { public R<String> readXml(@ApiParam(value = "流程定义ID") @PathVariable(value = "definitionId") String definitionId) {
try { try {
return AjaxResult.success(null, flowDefinitionService.readXml(definitionId)); return R.ok(null, flowDefinitionService.readXml(definitionId));
} catch (Exception e) { } catch (Exception e) {
return AjaxResult.error("加载xml文件异常", null); return R.fail("加载xml文件异常", null);
} }
} }
@@ -118,7 +118,7 @@ public class FlowDefinitionController extends BaseController {
@ApiOperation(value = "保存流程设计器内的xml文件") @ApiOperation(value = "保存流程设计器内的xml文件")
@PostMapping("/save") @PostMapping("/save")
public AjaxResult<Void> save(@RequestBody FlowSaveXmlVo vo) { public R<Void> save(@RequestBody FlowSaveXmlVo vo) {
try (InputStream in = new ByteArrayInputStream(vo.getXml().getBytes(StandardCharsets.UTF_8))) { try (InputStream in = new ByteArrayInputStream(vo.getXml().getBytes(StandardCharsets.UTF_8))) {
flowDefinitionService.importFile(vo.getName(), vo.getCategory(), in); flowDefinitionService.importFile(vo.getName(), vo.getCategory(), in);
} catch (Exception e) { } catch (Exception e) {
@@ -132,7 +132,7 @@ public class FlowDefinitionController extends BaseController {
@ApiOperation(value = "根据流程定义id启动流程实例") @ApiOperation(value = "根据流程定义id启动流程实例")
@PostMapping("/start/{procDefId}") @PostMapping("/start/{procDefId}")
public AjaxResult<Void> start(@ApiParam(value = "流程定义id") @PathVariable(value = "procDefId") String procDefId, public R<Void> start(@ApiParam(value = "流程定义id") @PathVariable(value = "procDefId") String procDefId,
@ApiParam(value = "变量集合,json对象") @RequestBody Map<String, Object> variables) { @ApiParam(value = "变量集合,json对象") @RequestBody Map<String, Object> variables) {
flowDefinitionService.startProcessInstanceById(procDefId, variables); flowDefinitionService.startProcessInstanceById(procDefId, variables);
return success("流程启动成功"); return success("流程启动成功");
@@ -141,7 +141,7 @@ public class FlowDefinitionController extends BaseController {
@ApiOperation(value = "激活或挂起流程定义") @ApiOperation(value = "激活或挂起流程定义")
@PutMapping(value = "/updateState") @PutMapping(value = "/updateState")
public AjaxResult<Void> updateState(@ApiParam(value = "ture:挂起,false:激活", required = true) @RequestParam Boolean suspended, public R<Void> updateState(@ApiParam(value = "ture:挂起,false:激活", required = true) @RequestParam Boolean suspended,
@ApiParam(value = "流程定义ID", required = true) @RequestParam String definitionId) { @ApiParam(value = "流程定义ID", required = true) @RequestParam String definitionId) {
flowDefinitionService.updateState(suspended, definitionId); flowDefinitionService.updateState(suspended, definitionId);
return success(); return success();
@@ -149,23 +149,23 @@ public class FlowDefinitionController extends BaseController {
@ApiOperation(value = "删除流程") @ApiOperation(value = "删除流程")
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public AjaxResult<Void> delete(@ApiParam(value = "流程部署ID", required = true) @RequestParam String deployId) { public R<Void> delete(@ApiParam(value = "流程部署ID", required = true) @RequestParam String deployId) {
flowDefinitionService.delete(deployId); flowDefinitionService.delete(deployId);
return success(); return success();
} }
@ApiOperation(value = "指定流程办理人员列表") @ApiOperation(value = "指定流程办理人员列表")
@GetMapping("/userList") @GetMapping("/userList")
public AjaxResult<List<SysUser>> userList(SysUser user) { public R<List<SysUser>> userList(SysUser user) {
List<SysUser> list = userService.selectUserList(user); List<SysUser> list = userService.selectUserList(user);
return AjaxResult.success(list); return R.ok(list);
} }
@ApiOperation(value = "指定流程办理组列表") @ApiOperation(value = "指定流程办理组列表")
@GetMapping("/roleList") @GetMapping("/roleList")
public AjaxResult<List<SysRole>> roleList(SysRole role) { public R<List<SysRole>> roleList(SysRole role) {
List<SysRole> list = sysRoleService.selectRoleList(role); List<SysRole> list = sysRoleService.selectRoleList(role);
return AjaxResult.success(list); return R.ok(list);
} }
} }

16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowInstanceController.java
View File

@@ -1,7 +1,7 @@
package com.ruoyi.web.controller.workflow; package com.ruoyi.web.controller.workflow;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.workflow.domain.vo.FlowTaskVo; import com.ruoyi.workflow.domain.vo.FlowTaskVo;
import com.ruoyi.workflow.service.IFlowInstanceService; import com.ruoyi.workflow.service.IFlowInstanceService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@@ -30,7 +30,7 @@ public class FlowInstanceController {
@ApiOperation(value = "根据流程定义id启动流程实例") @ApiOperation(value = "根据流程定义id启动流程实例")
@PostMapping("/startBy/{procDefId}") @PostMapping("/startBy/{procDefId}")
public AjaxResult startById(@ApiParam(value = "流程定义id") @PathVariable(value = "procDefId") String procDefId, public R startById(@ApiParam(value = "流程定义id") @PathVariable(value = "procDefId") String procDefId,
@ApiParam(value = "变量集合,json对象") @RequestBody Map<String, Object> variables) { @ApiParam(value = "变量集合,json对象") @RequestBody Map<String, Object> variables) {
return flowInstanceService.startProcessInstanceById(procDefId, variables); return flowInstanceService.startProcessInstanceById(procDefId, variables);
} }
@@ -38,24 +38,24 @@ public class FlowInstanceController {
@ApiOperation(value = "激活或挂起流程实例") @ApiOperation(value = "激活或挂起流程实例")
@PostMapping(value = "/updateState") @PostMapping(value = "/updateState")
public AjaxResult updateState(@ApiParam(value = "1:激活,2:挂起", required = true) @RequestParam Integer state, public R updateState(@ApiParam(value = "1:激活,2:挂起", required = true) @RequestParam Integer state,
@ApiParam(value = "流程实例ID", required = true) @RequestParam String instanceId) { @ApiParam(value = "流程实例ID", required = true) @RequestParam String instanceId) {
flowInstanceService.updateState(state,instanceId); flowInstanceService.updateState(state,instanceId);
return AjaxResult.success(); return R.ok();
} }
@ApiOperation("结束流程实例") @ApiOperation("结束流程实例")
@PostMapping(value = "/stopProcessInstance") @PostMapping(value = "/stopProcessInstance")
public AjaxResult stopProcessInstance(@RequestBody FlowTaskVo flowTaskVo) { public R stopProcessInstance(@RequestBody FlowTaskVo flowTaskVo) {
flowInstanceService.stopProcessInstance(flowTaskVo); flowInstanceService.stopProcessInstance(flowTaskVo);
return AjaxResult.success(); return R.ok();
} }
@ApiOperation(value = "删除流程实例") @ApiOperation(value = "删除流程实例")
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public AjaxResult delete(@ApiParam(value = "流程实例ID", required = true) @RequestParam String instanceId, public R delete(@ApiParam(value = "流程实例ID", required = true) @RequestParam String instanceId,
@ApiParam(value = "删除原因") @RequestParam(required = false) String deleteReason) { @ApiParam(value = "删除原因") @RequestParam(required = false) String deleteReason) {
flowInstanceService.delete(instanceId,deleteReason); flowInstanceService.delete(instanceId,deleteReason);
return AjaxResult.success(); return R.ok();
} }
} }

52
ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowTaskController.java
View File

@@ -1,6 +1,6 @@
package com.ruoyi.web.controller.workflow; package com.ruoyi.web.controller.workflow;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.workflow.domain.dto.FlowTaskDto; import com.ruoyi.workflow.domain.dto.FlowTaskDto;
import com.ruoyi.workflow.domain.vo.FlowTaskVo; import com.ruoyi.workflow.domain.vo.FlowTaskVo;
import com.ruoyi.workflow.service.IFlowTaskService; import com.ruoyi.workflow.service.IFlowTaskService;
@@ -35,33 +35,33 @@ public class FlowTaskController {
@ApiOperation(value = "我发起的流程", response = FlowTaskDto.class) @ApiOperation(value = "我发起的流程", response = FlowTaskDto.class)
@GetMapping(value = "/myProcess") @GetMapping(value = "/myProcess")
public AjaxResult myProcess(@ApiParam(value = "当前页码", required = true) @RequestParam Integer pageNum, public R myProcess(@ApiParam(value = "当前页码", required = true) @RequestParam Integer pageNum,
@ApiParam(value = "每页条数", required = true) @RequestParam Integer pageSize) { @ApiParam(value = "每页条数", required = true) @RequestParam Integer pageSize) {
return flowTaskService.myProcess(pageNum, pageSize); return flowTaskService.myProcess(pageNum, pageSize);
} }
@ApiOperation(value = "取消申请", response = FlowTaskDto.class) @ApiOperation(value = "取消申请", response = FlowTaskDto.class)
@PostMapping(value = "/stopProcess") @PostMapping(value = "/stopProcess")
public AjaxResult stopProcess(@RequestBody FlowTaskVo flowTaskVo) { public R stopProcess(@RequestBody FlowTaskVo flowTaskVo) {
return flowTaskService.stopProcess(flowTaskVo); return flowTaskService.stopProcess(flowTaskVo);
} }
@ApiOperation(value = "撤回流程", response = FlowTaskDto.class) @ApiOperation(value = "撤回流程", response = FlowTaskDto.class)
@PostMapping(value = "/revokeProcess") @PostMapping(value = "/revokeProcess")
public AjaxResult revokeProcess(@RequestBody FlowTaskVo flowTaskVo) { public R revokeProcess(@RequestBody FlowTaskVo flowTaskVo) {
return flowTaskService.revokeProcess(flowTaskVo); return flowTaskService.revokeProcess(flowTaskVo);
} }
@ApiOperation(value = "获取待办列表", response = FlowTaskDto.class) @ApiOperation(value = "获取待办列表", response = FlowTaskDto.class)
@GetMapping(value = "/todoList") @GetMapping(value = "/todoList")
public AjaxResult todoList(@ApiParam(value = "当前页码", required = true) @RequestParam Integer pageNum, public R todoList(@ApiParam(value = "当前页码", required = true) @RequestParam Integer pageNum,
@ApiParam(value = "每页条数", required = true) @RequestParam Integer pageSize) { @ApiParam(value = "每页条数", required = true) @RequestParam Integer pageSize) {
return flowTaskService.todoList(pageNum, pageSize); return flowTaskService.todoList(pageNum, pageSize);
} }
@ApiOperation(value = "获取已办任务", response = FlowTaskDto.class) @ApiOperation(value = "获取已办任务", response = FlowTaskDto.class)
@GetMapping(value = "/finishedList") @GetMapping(value = "/finishedList")
public AjaxResult finishedList(@ApiParam(value = "当前页码", required = true) @RequestParam Integer pageNum, public R finishedList(@ApiParam(value = "当前页码", required = true) @RequestParam Integer pageNum,
@ApiParam(value = "每页条数", required = true) @RequestParam Integer pageSize) { @ApiParam(value = "每页条数", required = true) @RequestParam Integer pageSize) {
return flowTaskService.finishedList(pageNum, pageSize); return flowTaskService.finishedList(pageNum, pageSize);
} }
@@ -69,81 +69,81 @@ public class FlowTaskController {
@ApiOperation(value = "流程历史流转记录", response = FlowTaskDto.class) @ApiOperation(value = "流程历史流转记录", response = FlowTaskDto.class)
@GetMapping(value = "/flowRecord") @GetMapping(value = "/flowRecord")
public AjaxResult flowRecord(String procInsId, String deployId) { public R flowRecord(String procInsId, String deployId) {
return flowTaskService.flowRecord(procInsId,deployId); return flowTaskService.flowRecord(procInsId,deployId);
} }
@ApiOperation(value = "获取流程变量", response = FlowTaskDto.class) @ApiOperation(value = "获取流程变量", response = FlowTaskDto.class)
@GetMapping(value = "/processVariables/{taskId}") @GetMapping(value = "/processVariables/{taskId}")
public AjaxResult processVariables(@ApiParam(value = "流程任务Id") @PathVariable(value = "taskId") String taskId) { public R processVariables(@ApiParam(value = "流程任务Id") @PathVariable(value = "taskId") String taskId) {
return flowTaskService.processVariables(taskId); return flowTaskService.processVariables(taskId);
} }
@ApiOperation(value = "审批任务") @ApiOperation(value = "审批任务")
@PostMapping(value = "/complete") @PostMapping(value = "/complete")
public AjaxResult complete(@RequestBody FlowTaskVo flowTaskVo) { public R complete(@RequestBody FlowTaskVo flowTaskVo) {
return flowTaskService.complete(flowTaskVo); return flowTaskService.complete(flowTaskVo);
} }
@ApiOperation(value = "驳回任务") @ApiOperation(value = "驳回任务")
@PostMapping(value = "/reject") @PostMapping(value = "/reject")
public AjaxResult taskReject(@RequestBody FlowTaskVo flowTaskVo) { public R taskReject(@RequestBody FlowTaskVo flowTaskVo) {
flowTaskService.taskReject(flowTaskVo); flowTaskService.taskReject(flowTaskVo);
return AjaxResult.success(); return R.ok();
} }
@ApiOperation(value = "退回任务") @ApiOperation(value = "退回任务")
@PostMapping(value = "/return") @PostMapping(value = "/return")
public AjaxResult taskReturn(@RequestBody FlowTaskVo flowTaskVo) { public R taskReturn(@RequestBody FlowTaskVo flowTaskVo) {
flowTaskService.taskReturn(flowTaskVo); flowTaskService.taskReturn(flowTaskVo);
return AjaxResult.success(); return R.ok();
} }
@ApiOperation(value = "获取所有可回退的节点") @ApiOperation(value = "获取所有可回退的节点")
@PostMapping(value = "/returnList") @PostMapping(value = "/returnList")
public AjaxResult findReturnTaskList(@RequestBody FlowTaskVo flowTaskVo) { public R findReturnTaskList(@RequestBody FlowTaskVo flowTaskVo) {
return flowTaskService.findReturnTaskList(flowTaskVo); return flowTaskService.findReturnTaskList(flowTaskVo);
} }
@ApiOperation(value = "删除任务") @ApiOperation(value = "删除任务")
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public AjaxResult delete(@RequestBody FlowTaskVo flowTaskVo) { public R delete(@RequestBody FlowTaskVo flowTaskVo) {
flowTaskService.deleteTask(flowTaskVo); flowTaskService.deleteTask(flowTaskVo);
return AjaxResult.success(); return R.ok();
} }
@ApiOperation(value = "认领/签收任务") @ApiOperation(value = "认领/签收任务")
@PostMapping(value = "/claim") @PostMapping(value = "/claim")
public AjaxResult claim(@RequestBody FlowTaskVo flowTaskVo) { public R claim(@RequestBody FlowTaskVo flowTaskVo) {
flowTaskService.claim(flowTaskVo); flowTaskService.claim(flowTaskVo);
return AjaxResult.success(); return R.ok();
} }
@ApiOperation(value = "取消认领/签收任务") @ApiOperation(value = "取消认领/签收任务")
@PostMapping(value = "/unClaim") @PostMapping(value = "/unClaim")
public AjaxResult unClaim(@RequestBody FlowTaskVo flowTaskVo) { public R unClaim(@RequestBody FlowTaskVo flowTaskVo) {
flowTaskService.unClaim(flowTaskVo); flowTaskService.unClaim(flowTaskVo);
return AjaxResult.success(); return R.ok();
} }
@ApiOperation(value = "委派任务") @ApiOperation(value = "委派任务")
@PostMapping(value = "/delegate") @PostMapping(value = "/delegate")
public AjaxResult delegate(@RequestBody FlowTaskVo flowTaskVo) { public R delegate(@RequestBody FlowTaskVo flowTaskVo) {
flowTaskService.delegateTask(flowTaskVo); flowTaskService.delegateTask(flowTaskVo);
return AjaxResult.success(); return R.ok();
} }
@ApiOperation(value = "转办任务") @ApiOperation(value = "转办任务")
@PostMapping(value = "/assign") @PostMapping(value = "/assign")
public AjaxResult assign(@RequestBody FlowTaskVo flowTaskVo) { public R assign(@RequestBody FlowTaskVo flowTaskVo) {
flowTaskService.assignTask(flowTaskVo); flowTaskService.assignTask(flowTaskVo);
return AjaxResult.success(); return R.ok();
} }
@ApiOperation(value = "获取下一节点") @ApiOperation(value = "获取下一节点")
@PostMapping(value = "/nextFlowNode") @PostMapping(value = "/nextFlowNode")
public AjaxResult getNextFlowNode(@RequestBody FlowTaskVo flowTaskVo) { public R getNextFlowNode(@RequestBody FlowTaskVo flowTaskVo) {
return flowTaskService.getNextFlowNode(flowTaskVo); return flowTaskService.getNextFlowNode(flowTaskVo);
} }
@@ -185,7 +185,7 @@ public class FlowTaskController {
* @param procInsId 任务ID * @param procInsId 任务ID
*/ */
@RequestMapping("/flowViewer/{procInsId}") @RequestMapping("/flowViewer/{procInsId}")
public AjaxResult getFlowViewer(@PathVariable("procInsId") String procInsId) { public R getFlowViewer(@PathVariable("procInsId") String procInsId) {
return flowTaskService.getFlowViewer(procInsId); return flowTaskService.getFlowViewer(procInsId);
} }
} }

14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/SysFormController.java
View File

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -58,8 +58,8 @@ public class SysFormController extends BaseController {
*/ */
@SaCheckPermission("flowable:form:query") @SaCheckPermission("flowable:form:query")
@GetMapping(value = "/{formId}") @GetMapping(value = "/{formId}")
public AjaxResult getInfo(@PathVariable("formId") Long formId) { public R getInfo(@PathVariable("formId") Long formId) {
return AjaxResult.success(SysFormService.selectSysFormById(formId)); return R.ok(SysFormService.selectSysFormById(formId));
} }
/** /**
@@ -68,7 +68,7 @@ public class SysFormController extends BaseController {
@SaCheckPermission("flowable:form:add") @SaCheckPermission("flowable:form:add")
@Log(title = "流程表单", businessType = BusinessType.INSERT) @Log(title = "流程表单", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody SysForm sysForm) { public R add(@RequestBody SysForm sysForm) {
return toAjax(SysFormService.insertSysForm(sysForm)); return toAjax(SysFormService.insertSysForm(sysForm));
} }
@@ -78,7 +78,7 @@ public class SysFormController extends BaseController {
@SaCheckPermission("flowable:form:edit") @SaCheckPermission("flowable:form:edit")
@Log(title = "流程表单", businessType = BusinessType.UPDATE) @Log(title = "流程表单", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody SysForm sysForm) { public R edit(@RequestBody SysForm sysForm) {
return toAjax(SysFormService.updateSysForm(sysForm)); return toAjax(SysFormService.updateSysForm(sysForm));
} }
@@ -88,7 +88,7 @@ public class SysFormController extends BaseController {
@SaCheckPermission("flowable:form:remove") @SaCheckPermission("flowable:form:remove")
@Log(title = "流程表单", businessType = BusinessType.DELETE) @Log(title = "流程表单", businessType = BusinessType.DELETE)
@DeleteMapping("/{formIds}") @DeleteMapping("/{formIds}")
public AjaxResult remove(@PathVariable Long[] formIds) { public R remove(@PathVariable Long[] formIds) {
return toAjax(SysFormService.deleteSysFormByIds(formIds)); return toAjax(SysFormService.deleteSysFormByIds(formIds));
} }
@@ -98,7 +98,7 @@ public class SysFormController extends BaseController {
*/ */
@Log(title = "流程表单", businessType = BusinessType.INSERT) @Log(title = "流程表单", businessType = BusinessType.INSERT)
@PostMapping("/addDeployForm") @PostMapping("/addDeployForm")
public AjaxResult addDeployForm(@RequestBody SysDeployForm sysDeployForm) { public R addDeployForm(@RequestBody SysDeployForm sysDeployForm) {
return toAjax(sysDeployFormService.insertSysDeployForm(sysDeployForm)); return toAjax(sysDeployFormService.insertSysDeployForm(sysDeployForm));
} }
} }

12
ruoyi-admin/src/main/resources/application-dev.yml
View File

@@ -9,7 +9,7 @@ spring:
# 设置 Spring Boot Admin Server 地址 # 设置 Spring Boot Admin Server 地址
url: http://localhost:9090/admin url: http://localhost:9090/admin
instance: instance:
prefer-ip: true # 注册实例时，优先使用 IP service-host-type: IP
username: ruoyi username: ruoyi
password: 123456 password: 123456
@@ -55,7 +55,7 @@ spring:
# rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
url: jdbc:mysql://localhost:3306/ry-flowable-plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&nullCatalogMeansCurrent=true url: jdbc:mysql://localhost:3306/ry-flowable-plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&nullCatalogMeansCurrent=true
username: root username: root
password: 123456 password: root
# 从库数据源 # 从库数据源
slave: slave:
lazy: true lazy: true
@@ -121,7 +121,7 @@ spring:
# 数据库索引 # 数据库索引
database: 0 database: 0
# 密码 # 密码
password: konbai123.. password:
# 连接超时时间 # 连接超时时间
timeout: 10s timeout: 10s
# 是否开启ssl # 是否开启ssl
@@ -150,11 +150,5 @@ redisson:
retryAttempts: 3 retryAttempts: 3
# 命令重试发送时间间隔，单位：毫秒 # 命令重试发送时间间隔，单位：毫秒
retryInterval: 1500 retryInterval: 1500
# 发布和订阅连接的最小空闲连接数
subscriptionConnectionMinimumIdleSize: 1
# 发布和订阅连接池大小 # 发布和订阅连接池大小
subscriptionConnectionPoolSize: 50 subscriptionConnectionPoolSize: 50
# 单个连接最大订阅数量
subscriptionsPerConnection: 5
# DNS监测时间间隔，单位：毫秒
dnsMonitoringInterval: 5000

10
ruoyi-admin/src/main/resources/application-prod.yml
View File

@@ -16,7 +16,7 @@ spring:
# 设置 Spring Boot Admin Server 地址 # 设置 Spring Boot Admin Server 地址
url: http://172.30.0.90:9090/admin url: http://172.30.0.90:9090/admin
instance: instance:
prefer-ip: true # 注册实例时，优先使用 IP service-host-type: IP
username: ruoyi username: ruoyi
password: 123456 password: 123456
@@ -60,7 +60,7 @@ spring:
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.cj.jdbc.Driver
# jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
# rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
url: jdbc:mysql://172.30.0.36:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true url: jdbc:mysql://172.30.0.36:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
username: root username: root
password: root password: root
# 从库数据源 # 从库数据源
@@ -157,11 +157,5 @@ redisson:
retryAttempts: 3 retryAttempts: 3
# 命令重试发送时间间隔，单位：毫秒 # 命令重试发送时间间隔，单位：毫秒
retryInterval: 1500 retryInterval: 1500
# 发布和订阅连接的最小空闲连接数
subscriptionConnectionMinimumIdleSize: 1
# 发布和订阅连接池大小 # 发布和订阅连接池大小
subscriptionConnectionPoolSize: 50 subscriptionConnectionPoolSize: 50
# 单个连接最大订阅数量
subscriptionsPerConnection: 5
# DNS监测时间间隔，单位：毫秒
dnsMonitoringInterval: 5000

10
ruoyi-admin/src/main/resources/application.yml
View File

@@ -5,7 +5,7 @@ ruoyi:
# 版本 # 版本
version: ${ruoyi-flowable-plus.version} version: ${ruoyi-flowable-plus.version}
# 版权年份 # 版权年份
copyrightYear: 2021 copyrightYear: 2022
# 实例演示开关 # 实例演示开关
demoEnabled: true demoEnabled: true
# 获取ip地址开关 # 获取ip地址开关
@@ -53,10 +53,6 @@ logging:
org.springframework: warn org.springframework: warn
config: classpath:logback.xml config: classpath:logback.xml
# tlog 全局访问性能拦截
tlog:
enable-invoke-time-print: true
# Spring配置 # Spring配置
spring: spring:
application: application:
@@ -326,5 +322,9 @@ management:
logfile: logfile:
external-file: ./logs/sys-console.log external-file: ./logs/sys-console.log
--- # Flowable 配置
flowable: flowable:
# 关闭定时任务 job
async-executor-activate: false
# 库与数据库表结构不一致时，会自动将数据库表结构升级至新版本。
database-schema-update: true database-schema-update: true

7
ruoyi-admin/src/main/resources/i18n/messages.properties
View File

@@ -1,5 +1,6 @@
#错误消息 #错误消息
not.null=* 必须填写 not.null=* 必须填写
user.jcaptcha.blank=验证码不能为空
user.jcaptcha.error=验证码错误 user.jcaptcha.error=验证码错误
user.jcaptcha.expire=验证码已失效 user.jcaptcha.expire=验证码已失效
user.not.exists=对不起, 您的账号：{0} 不存在. user.not.exists=对不起, 您的账号：{0} 不存在.
@@ -11,12 +12,18 @@ user.blocked=对不起，您的账号：{0} 已禁用，请联系管理员
role.blocked=角色已封禁，请联系管理员 role.blocked=角色已封禁，请联系管理员
user.logout.success=退出成功 user.logout.success=退出成功
length.not.valid=长度必须在{min}到{max}个字符之间 length.not.valid=长度必须在{min}到{max}个字符之间
user.username.not.blank=用户名不能为空
user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头 user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
user.username.length.valid=账户长度必须在{min}到{max}个字符之间
user.password.not.blank=用户密码不能为空
user.password.length.valid=用户密码长度必须在{min}到{max}个字符之间
user.password.not.valid=* 5-50个字符 user.password.not.valid=* 5-50个字符
user.email.not.valid=邮箱格式错误 user.email.not.valid=邮箱格式错误
user.mobile.phone.number.not.valid=手机号格式错误 user.mobile.phone.number.not.valid=手机号格式错误
user.login.success=登录成功 user.login.success=登录成功
user.register.success=注册成功 user.register.success=注册成功
user.register.save.error=保存用户 {0} 失败，注册账号已存在
user.register.error=注册失败，请联系系统管理人员
user.notfound=请重新登录 user.notfound=请重新登录
user.forcelogout=管理员强制退出，请重新登录 user.forcelogout=管理员强制退出，请重新登录
user.unknown.error=未知错误，请重新登录 user.unknown.error=未知错误，请重新登录

6
ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
View File

@@ -11,12 +11,18 @@ user.blocked=Sorry, your account: {0} has been disabled. Please contact the admi
role.blocked=Role disabled，please contact administrators role.blocked=Role disabled，please contact administrators
user.logout.success=Exit successful user.logout.success=Exit successful
length.not.valid=The length must be between {min} and {max} characters length.not.valid=The length must be between {min} and {max} characters
user.username.not.blank=Username cannot be blank
user.username.not.valid=* 2 to 20 chinese characters, letters, numbers or underscores, and must start with a non number user.username.not.valid=* 2 to 20 chinese characters, letters, numbers or underscores, and must start with a non number
user.username.length.valid=Account length must be between {min} and {max} characters
user.password.not.blank=Password cannot be empty
user.password.length.valid=Password length must be between {min} and {max} characters
user.password.not.valid=* 5-50 characters user.password.not.valid=* 5-50 characters
user.email.not.valid=Mailbox format error user.email.not.valid=Mailbox format error
user.mobile.phone.number.not.valid=Phone number format error user.mobile.phone.number.not.valid=Phone number format error
user.login.success=Login successful user.login.success=Login successful
user.register.success=Register successful user.register.success=Register successful
user.register.save.error=Failed to save user {0}, The registered account already exists
user.register.error=Register failed, please contact system administrator
user.notfound=Please login again user.notfound=Please login again
user.forcelogout=The administrator is forced to exit，please login again user.forcelogout=The administrator is forced to exit，please login again
user.unknown.error=Unknown error, please login again user.unknown.error=Unknown error, please login again

6
ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties
View File

@@ -11,12 +11,18 @@ user.blocked=对不起，您的账号：{0} 已禁用，请联系管理员
role.blocked=角色已封禁，请联系管理员 role.blocked=角色已封禁，请联系管理员
user.logout.success=退出成功 user.logout.success=退出成功
length.not.valid=长度必须在{min}到{max}个字符之间 length.not.valid=长度必须在{min}到{max}个字符之间
user.username.not.blank=用户名不能为空
user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头 user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
user.username.length.valid=账户长度必须在{min}到{max}个字符之间
user.password.not.blank=用户密码不能为空
user.password.length.valid=用户密码长度必须在{min}到{max}个字符之间
user.password.not.valid=* 5-50个字符 user.password.not.valid=* 5-50个字符
user.email.not.valid=邮箱格式错误 user.email.not.valid=邮箱格式错误
user.mobile.phone.number.not.valid=手机号格式错误 user.mobile.phone.number.not.valid=手机号格式错误
user.login.success=登录成功 user.login.success=登录成功
user.register.success=注册成功 user.register.success=注册成功
user.register.save.error=保存用户 {0} 失败，注册账号已存在
user.register.error=注册失败，请联系系统管理人员
user.notfound=请重新登录 user.notfound=请重新登录
user.forcelogout=管理员强制退出，请重新登录 user.forcelogout=管理员强制退出，请重新登录
user.unknown.error=未知错误，请重新登录 user.unknown.error=未知错误，请重新登录

2
ruoyi-admin/src/main/resources/logback.xml
View File

@@ -2,7 +2,7 @@
<configuration> <configuration>
<property name="log.path" value="./logs"/> <property name="log.path" value="./logs"/>
<property name="console.log.pattern" <property name="console.log.pattern"
value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %msg%n"/> value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
<property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/> <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/>
<!-- 控制台输出 --> <!-- 控制台输出 -->

1
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Sensitive.java
View File

@@ -12,6 +12,7 @@ import java.lang.annotation.Target;
/** /**
* 数据脱敏注解 * 数据脱敏注解
*
* @author zhujie * @author zhujie
*/ */
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)

4
ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java
View File

@@ -15,7 +15,7 @@ public class UnsignedMathGenerator implements CodeGenerator {
private static final long serialVersionUID = -5514819971774091076L; private static final long serialVersionUID = -5514819971774091076L;
private static final String operators = "+-*"; private static final String OPERATORS = "+-*";
/** /**
* 参与计算数字最大长度 * 参与计算数字最大长度
@@ -48,7 +48,7 @@ public class UnsignedMathGenerator implements CodeGenerator {
number1 = StringUtils.rightPad(number1, this.numberLength, CharUtil.SPACE); number1 = StringUtils.rightPad(number1, this.numberLength, CharUtil.SPACE);
number2 = StringUtils.rightPad(number2, this.numberLength, CharUtil.SPACE); number2 = StringUtils.rightPad(number2, this.numberLength, CharUtil.SPACE);
return number1 + RandomUtil.randomChar(operators) + number2 + '='; return number1 + RandomUtil.randomChar(OPERATORS) + number2 + '=';
} }
@Override @Override

2
ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
View File

@@ -2,7 +2,6 @@ package com.ruoyi.common.config;
import lombok.Data; import lombok.Data;
import lombok.Getter; import lombok.Getter;
import lombok.experimental.Accessors;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -13,7 +12,6 @@ import org.springframework.stereotype.Component;
*/ */
@Data @Data
@Accessors(chain = true)
@Component @Component
@ConfigurationProperties(prefix = "ruoyi") @ConfigurationProperties(prefix = "ruoyi")
public class RuoYiConfig { public class RuoYiConfig {

11
ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java
View File

@@ -4,8 +4,9 @@ import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.alibaba.excel.converters.Converter; import com.alibaba.excel.converters.Converter;
import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.enums.CellDataTypeEnum;
import com.alibaba.excel.metadata.CellData;
import com.alibaba.excel.metadata.GlobalConfiguration; import com.alibaba.excel.metadata.GlobalConfiguration;
import com.alibaba.excel.metadata.data.ReadCellData;
import com.alibaba.excel.metadata.data.WriteCellData;
import com.alibaba.excel.metadata.property.ExcelContentProperty; import com.alibaba.excel.metadata.property.ExcelContentProperty;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -31,19 +32,19 @@ public class ExcelBigNumberConvert implements Converter<Long> {
} }
@Override @Override
public Long convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) { public Long convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
return Convert.toLong(cellData.getData()); return Convert.toLong(cellData.getData());
} }
@Override @Override
public CellData<Object> convertToExcelData(Long object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) { public WriteCellData<Object> convertToExcelData(Long object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
if (ObjectUtil.isNotNull(object)) { if (ObjectUtil.isNotNull(object)) {
String str = Convert.toStr(object); String str = Convert.toStr(object);
if (str.length() > 15) { if (str.length() > 15) {
return new CellData<>(str); return new WriteCellData<>(str);
} }
} }
CellData<Object> cellData = new CellData<>(new BigDecimal(object)); WriteCellData<Object> cellData = new WriteCellData<>(new BigDecimal(object));
cellData.setType(CellDataTypeEnum.NUMBER); cellData.setType(CellDataTypeEnum.NUMBER);
return cellData; return cellData;
} }

14
ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java
View File

@@ -2,10 +2,12 @@ package com.ruoyi.common.convert;
import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.annotation.AnnotationUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.excel.converters.Converter; import com.alibaba.excel.converters.Converter;
import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.enums.CellDataTypeEnum;
import com.alibaba.excel.metadata.CellData;
import com.alibaba.excel.metadata.GlobalConfiguration; import com.alibaba.excel.metadata.GlobalConfiguration;
import com.alibaba.excel.metadata.data.ReadCellData;
import com.alibaba.excel.metadata.data.WriteCellData;
import com.alibaba.excel.metadata.property.ExcelContentProperty; import com.alibaba.excel.metadata.property.ExcelContentProperty;
import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.core.service.DictService; import com.ruoyi.common.core.service.DictService;
@@ -35,7 +37,7 @@ public class ExcelDictConvert implements Converter<Object> {
} }
@Override @Override
public Object convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) { public Object convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
ExcelDictFormat anno = getAnnotation(contentProperty.getField()); ExcelDictFormat anno = getAnnotation(contentProperty.getField());
String type = anno.dictType(); String type = anno.dictType();
String label = cellData.getStringValue(); String label = cellData.getStringValue();
@@ -49,9 +51,9 @@ public class ExcelDictConvert implements Converter<Object> {
} }
@Override @Override
public CellData<String> convertToExcelData(Object object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) { public WriteCellData<String> convertToExcelData(Object object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
if (StringUtils.isNull(object)) { if (ObjectUtil.isNull(object)) {
return new CellData<>(""); return new WriteCellData<>("");
} }
ExcelDictFormat anno = getAnnotation(contentProperty.getField()); ExcelDictFormat anno = getAnnotation(contentProperty.getField());
String type = anno.dictType(); String type = anno.dictType();
@@ -62,7 +64,7 @@ public class ExcelDictConvert implements Converter<Object> {
} else { } else {
label = SpringUtils.getBean(DictService.class).getDictLabel(type, value, anno.separator()); label = SpringUtils.getBean(DictService.class).getDictLabel(type, value, anno.separator());
} }
return new CellData<>(label); return new WriteCellData<>(label);
} }
private ExcelDictFormat getAnnotation(Field field) { private ExcelDictFormat getAnnotation(Field field) {

34
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
View File

@@ -1,8 +1,8 @@
package com.ruoyi.common.core.controller; package com.ruoyi.common.core.controller;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.LoginUtils; import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
/** /**
@@ -15,29 +15,29 @@ public class BaseController {
/** /**
* 返回成功 * 返回成功
*/ */
public AjaxResult<Void> success() { public R<Void> success() {
return AjaxResult.success(); return R.ok();
} }
/** /**
* 返回失败消息 * 返回失败消息
*/ */
public AjaxResult<Void> error() { public R<Void> error() {
return AjaxResult.error(); return R.fail();
} }
/** /**
* 返回成功消息 * 返回成功消息
*/ */
public AjaxResult<Void> success(String message) { public R<Void> success(String message) {
return AjaxResult.success(message); return R.ok(message);
} }
/** /**
* 返回失败消息 * 返回失败消息
*/ */
public AjaxResult<Void> error(String message) { public R<Void> error(String message) {
return AjaxResult.error(message); return R.fail(message);
} }
/** /**
@@ -46,8 +46,8 @@ public class BaseController {
* @param rows 影响行数 * @param rows 影响行数
* @return 操作结果 * @return 操作结果
*/ */
protected AjaxResult<Void> toAjax(int rows) { protected R<Void> toAjax(int rows) {
return rows > 0 ? AjaxResult.success() : AjaxResult.error(); return rows > 0 ? R.ok() : R.fail();
} }
/** /**
@@ -56,7 +56,7 @@ public class BaseController {
* @param result 结果 * @param result 结果
* @return 操作结果 * @return 操作结果
*/ */
protected AjaxResult<Void> toAjax(boolean result) { protected R<Void> toAjax(boolean result) {
return result ? success() : error(); return result ? success() : error();
} }
@@ -71,27 +71,27 @@ public class BaseController {
* 获取用户缓存信息 * 获取用户缓存信息
*/ */
public LoginUser getLoginUser() { public LoginUser getLoginUser() {
return LoginUtils.getLoginUser(); return LoginHelper.getLoginUser();
} }
/** /**
* 获取登录用户id * 获取登录用户id
*/ */
public Long getUserId() { public Long getUserId() {
return LoginUtils.getUserId(); return LoginHelper.getUserId();
} }
/** /**
* 获取登录部门id * 获取登录部门id
*/ */
public Long getDeptId() { public Long getDeptId() {
return LoginUtils.getDeptId(); return LoginHelper.getDeptId();
} }
/** /**
* 获取登录用户名 * 获取登录用户名
*/ */
public String getUsername() { public String getUsername() {
return LoginUtils.getUsername(); return LoginHelper.getUsername();
} }
} }

134
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
View File

@@ -1,134 +0,0 @@
package com.ruoyi.common.core.domain;
import cn.hutool.http.HttpStatus;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
/**
* 操作消息提醒
*
* @author Lion Li
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Accessors(chain = true)
@ApiModel("请求响应对象")
public class AjaxResult<T> {
private static final long serialVersionUID = 1L;
/**
* 状态码
*/
@ApiModelProperty("消息状态码")
private int code;
/**
* 返回内容
*/
@ApiModelProperty("消息内容")
private String msg;
/**
* 数据对象
*/
@ApiModelProperty("数据对象")
private T data;
/**
* 初始化一个新创建的 R 对象
*
* @param code 状态码
* @param msg 返回内容
*/
public AjaxResult(int code, String msg) {
this.code = code;
this.msg = msg;
}
/**
* 返回成功消息
*
* @return 成功消息
*/
public static AjaxResult<Void> success() {
return AjaxResult.success("操作成功");
}
/**
* 返回成功数据
*
* @return 成功消息
*/
public static <T> AjaxResult<T> success(T data) {
return AjaxResult.success("操作成功", data);
}
/**
* 返回成功消息
*
* @param msg 返回内容
* @return 成功消息
*/
public static AjaxResult<Void> success(String msg) {
return AjaxResult.success(msg, null);
}
/**
* 返回成功消息
*
* @param msg 返回内容
* @param data 数据对象
* @return 成功消息
*/
public static <T> AjaxResult<T> success(String msg, T data) {
return new AjaxResult<>(HttpStatus.HTTP_OK, msg, data);
}
/**
* 返回错误消息
*
* @return
*/
public static AjaxResult<Void> error() {
return AjaxResult.error("操作失败");
}
/**
* 返回错误消息
*
* @param msg 返回内容
* @return 警告消息
*/
public static AjaxResult<Void> error(String msg) {
return AjaxResult.error(msg, null);
}
/**
* 返回错误消息
*
* @param msg 返回内容
* @param data 数据对象
* @return 警告消息
*/
public static <T> AjaxResult<T> error(String msg, T data) {
return new AjaxResult<>(HttpStatus.HTTP_INTERNAL_ERROR, msg, data);
}
/**
* 返回错误消息
*
* @param code 状态码
* @param msg 返回内容
* @return 警告消息
*/
public static AjaxResult<Void> error(int code, String msg) {
return new AjaxResult<>(code, msg, null);
}
}

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
View File

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
@@ -18,7 +17,6 @@ import java.util.Map;
*/ */
@Data @Data
@Accessors(chain = true)
public class BaseEntity implements Serializable { public class BaseEntity implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java
View File

@@ -7,7 +7,6 @@ import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.sql.SqlUtil; import com.ruoyi.common.utils.sql.SqlUtil;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable; import java.io.Serializable;
@@ -18,7 +17,6 @@ import java.io.Serializable;
*/ */
@Data @Data
@Accessors(chain = true)
public class PageQuery implements Serializable { public class PageQuery implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

84
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java Normal file
View File

@@ -0,0 +1,84 @@
package com.ruoyi.common.core.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* 响应信息主体
*
* @author Lion Li
*/
@Data
@NoArgsConstructor
@ApiModel("请求响应对象")
public class R<T> implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 成功
*/
public static final int SUCCESS = 200;
/**
* 失败
*/
public static final int FAIL = 500;
@ApiModelProperty("消息状态码")
private int code;
@ApiModelProperty("消息内容")
private String msg;
@ApiModelProperty("数据对象")
private T data;
public static <T> R<T> ok() {
return restResult(null, SUCCESS, null);
}
public static <T> R<T> ok(T data) {
return restResult(data, SUCCESS, null);
}
public static <T> R<T> ok(String msg) {
return restResult(null, SUCCESS, msg);
}
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, null);
}
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, null);
}
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> r = new R<>();
r.setCode(code);
r.setData(data);
r.setMsg(msg);
return r;
}
}

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
View File

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -17,7 +16,6 @@ import java.util.List;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
public class TreeEntity extends BaseEntity { public class TreeEntity extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

4
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/OperLogDTO.java
View File

@@ -1,8 +1,6 @@
package com.ruoyi.common.core.domain.dto; package com.ruoyi.common.core.domain.dto;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
@@ -14,8 +12,6 @@ import java.util.Date;
*/ */
@Data @Data
@NoArgsConstructor
@Accessors(chain = true)
public class OperLogDTO implements Serializable { public class OperLogDTO implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

38
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/RoleDTO.java Normal file
View File

@@ -0,0 +1,38 @@
package com.ruoyi.common.core.domain.dto;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* 角色
*
* @author Lion Li
*/
@Data
@NoArgsConstructor
public class RoleDTO implements Serializable {
/**
* 角色ID
*/
private Long roleId;
/**
* 角色名称
*/
private String roleName;
/**
* 角色权限
*/
private String roleKey;
/**
* 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限）
*/
private String dataScope;
}

3
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java
View File

@@ -1,8 +1,8 @@
package com.ruoyi.common.core.domain.dto; package com.ruoyi.common.core.domain.dto;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable; import java.io.Serializable;
@@ -14,7 +14,6 @@ import java.io.Serializable;
@Data @Data
@NoArgsConstructor @NoArgsConstructor
@Accessors(chain = true)
public class UserOnlineDTO implements Serializable { public class UserOnlineDTO implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

7
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
View File

@@ -8,10 +8,10 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.Email; import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
/** /**
@@ -22,7 +22,6 @@ import javax.validation.constraints.Size;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("sys_dept") @TableName("sys_dept")
@ApiModel("部门业务对象") @ApiModel("部门业务对象")
public class SysDept extends TreeEntity { public class SysDept extends TreeEntity {
@@ -47,8 +46,8 @@ public class SysDept extends TreeEntity {
* 显示顺序 * 显示顺序
*/ */
@ApiModelProperty(value = "显示顺序") @ApiModelProperty(value = "显示顺序")
@NotBlank(message = "显示顺序不能为空") @NotNull(message = "显示顺序不能为空")
private String orderNum; private Long orderNum;
/** /**
* 负责人 * 负责人

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
View File

@@ -12,7 +12,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
@@ -25,7 +24,6 @@ import javax.validation.constraints.Size;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("sys_dict_data") @TableName("sys_dict_data")
@ExcelIgnoreUnannotated @ExcelIgnoreUnannotated
@ApiModel("字典数据业务对象") @ApiModel("字典数据业务对象")

1
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
View File

@@ -24,7 +24,6 @@ import javax.validation.constraints.Size;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("sys_dict_type") @TableName("sys_dict_type")
@ExcelIgnoreUnannotated @ExcelIgnoreUnannotated
@ApiModel("字典类型业务对象") @ApiModel("字典类型业务对象")

7
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
View File

@@ -8,9 +8,9 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
/** /**
@@ -21,7 +21,6 @@ import javax.validation.constraints.Size;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("sys_menu") @TableName("sys_menu")
@ApiModel("菜单权限业务对象") @ApiModel("菜单权限业务对象")
public class SysMenu extends TreeEntity { public class SysMenu extends TreeEntity {
@@ -45,8 +44,8 @@ public class SysMenu extends TreeEntity {
* 显示顺序 * 显示顺序
*/ */
@ApiModelProperty(value = "显示顺序") @ApiModelProperty(value = "显示顺序")
@NotBlank(message = "显示顺序不能为空") @NotNull(message = "显示顺序不能为空")
private String orderNum; private Long orderNum;
/** /**
* 路由地址 * 路由地址

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
View File

@@ -13,7 +13,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
@@ -27,7 +26,6 @@ import javax.validation.constraints.Size;
@Data @Data
@NoArgsConstructor @NoArgsConstructor
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("sys_role") @TableName("sys_role")
@ExcelIgnoreUnannotated @ExcelIgnoreUnannotated
public class SysRole extends BaseEntity { public class SysRole extends BaseEntity {

8
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
View File

@@ -12,7 +12,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import javax.validation.constraints.Email; import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
@@ -29,7 +28,6 @@ import java.util.List;
@Data @Data
@NoArgsConstructor @NoArgsConstructor
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("sys_user") @TableName("sys_user")
@ApiModel("用户信息业务对象") @ApiModel("用户信息业务对象")
public class SysUser extends BaseEntity { public class SysUser extends BaseEntity {
@@ -64,6 +62,12 @@ public class SysUser extends BaseEntity {
@Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符") @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
private String nickName; private String nickName;
/**
* 用户类型（sys_user系统用户）
*/
@ApiModelProperty(value = "用户类型")
private String userType;
/** /**
* 用户邮箱 * 用户邮箱
*/ */

11
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
View File

@@ -1,9 +1,12 @@
package com.ruoyi.common.core.domain.model; package com.ruoyi.common.core.domain.model;
import com.ruoyi.common.constant.UserConstants;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
/** /**
* 用户登录对象 * 用户登录对象
@@ -12,25 +15,29 @@ import lombok.experimental.Accessors;
*/ */
@Data @Data
@Accessors(chain = true)
@ApiModel("用户登录对象") @ApiModel("用户登录对象")
public class LoginBody { public class LoginBody {
/** /**
* 用户名 * 用户名
*/ */
@NotBlank(message = "{user.username.not.blank}")
@Length(min = UserConstants.USERNAME_MIN_LENGTH, max = UserConstants.USERNAME_MAX_LENGTH, message = "{user.username.length.valid}")
@ApiModelProperty(value = "用户名") @ApiModelProperty(value = "用户名")
private String username; private String username;
/** /**
* 用户密码 * 用户密码
*/ */
@NotBlank(message = "{user.password.not.blank}")
@Length(min = UserConstants.PASSWORD_MIN_LENGTH, max = UserConstants.PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}")
@ApiModelProperty(value = "用户密码") @ApiModelProperty(value = "用户密码")
private String password; private String password;
/** /**
* 验证码 * 验证码
*/ */
@NotBlank(message = "{user.jcaptcha.blank}")
@ApiModelProperty(value = "验证码") @ApiModelProperty(value = "验证码")
private String code; private String code;

42
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
View File

@@ -1,10 +1,12 @@
package com.ruoyi.common.core.domain.model; package com.ruoyi.common.core.domain.model;
import com.ruoyi.common.core.domain.dto.RoleDTO;
import com.ruoyi.common.helper.LoginHelper;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
import java.util.Set; import java.util.Set;
/** /**
@@ -15,7 +17,6 @@ import java.util.Set;
@Data @Data
@NoArgsConstructor @NoArgsConstructor
@Accessors(chain = true)
public class LoginUser implements Serializable { public class LoginUser implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@@ -30,11 +31,21 @@ public class LoginUser implements Serializable {
*/ */
private Long deptId; private Long deptId;
/**
* 部门名
*/
private String deptName;
/** /**
* 用户唯一标识 * 用户唯一标识
*/ */
private String token; private String token;
/**
* 用户类型
*/
private String userType;
/** /**
* 登录时间 * 登录时间
*/ */
@@ -75,14 +86,31 @@ public class LoginUser implements Serializable {
*/ */
private Set<String> rolePermission; private Set<String> rolePermission;
/**
* 昵称
*/
private String nickName;
/** /**
* 用户名 * 用户名
*/ */
private String username; private String username;
/**
* 用户名
*/
private String nickName;
/**
* 角色对象
*/
private List<RoleDTO> roles;
/**
* 数据权限 当前角色ID
*/
private Long roleId;
/**
* 获取登录id
*/
public String getLoginId() {
return userType + LoginHelper.JOIN_CODE + userId;
}
} }

8
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java
View File

@@ -1,13 +1,21 @@
package com.ruoyi.common.core.domain.model; package com.ruoyi.common.core.domain.model;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/** /**
* 用户注册对象 * 用户注册对象
* *
* @author Lion Li * @author Lion Li
*/ */
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel("用户注册对象") @ApiModel("用户注册对象")
public class RegisterBody extends LoginBody { public class RegisterBody extends LoginBody {
@ApiModelProperty(value = "用户类型")
private String userType;
} }

1
ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java
View File

@@ -19,7 +19,6 @@ import java.util.List;
@Data @Data
@NoArgsConstructor @NoArgsConstructor
@Accessors(chain = true)
@ApiModel("分页响应对象") @ApiModel("分页响应对象")
public class TableDataInfo<T> implements Serializable { public class TableDataInfo<T> implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

28
ruoyi-common/src/main/java/com/ruoyi/common/core/service/UserService.java
View File

@@ -1,28 +0,0 @@
package com.ruoyi.common.core.service;
import com.ruoyi.common.core.domain.entity.SysUser;
/**
* 通用 用户业务
*
* @author Lion Li
*/
public interface UserService {
/**
* 通过用户名查询用户
*
* @param userName 用户名
* @return 用户对象信息
*/
SysUser selectUserByUserName(String userName);
/**
* 通过用户ID查询用户
*
* @param userId 用户ID
* @return 用户对象信息
*/
SysUser selectUserById(Long userId);
}

8
ruoyi-common/src/main/java/com/ruoyi/common/enums/DataScopeType.java
View File

@@ -6,10 +6,10 @@ import lombok.Getter;
/** /**
* 数据权限类型 * 数据权限类型
* * <p>
* 语法支持 spel 模板表达式 * 语法支持 spel 模板表达式
* * <p>
* 内置数据 user 当前用户 内容参考 SysUser * 内置数据 user 当前用户 内容参考 LoginUser
* 如需扩展数据 可使用 {@link com.ruoyi.common.helper.DataPermissionHelper} 操作 * 如需扩展数据 可使用 {@link com.ruoyi.common.helper.DataPermissionHelper} 操作
* 内置服务 sdss 系统数据权限服务 内容参考 SysDataScopeService * 内置服务 sdss 系统数据权限服务 内容参考 SysDataScopeService
* 如需扩展更多自定义服务 可以参考 sdss 自行编写 * 如需扩展更多自定义服务 可以参考 sdss 自行编写
@@ -44,7 +44,7 @@ public enum DataScopeType {
/** /**
* 仅本人数据权限 * 仅本人数据权限
*/ */
SELF("5", " #{#userName} = #{#user.userId} " , " 1 = 0 "); SELF("5", " #{#userName} = #{#user.userId} ", " 1 = 0 ");
private final String code; private final String code;

16
ruoyi-common/src/main/java/com/ruoyi/common/enums/UserType.java
View File

@@ -1,11 +1,12 @@
package com.ruoyi.common.enums; package com.ruoyi.common.enums;
import com.ruoyi.common.utils.StringUtils;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
/** /**
* 设备类型 * 设备类型
* 针对两套 用户体系 * 针对多套 用户体系
* *
* @author Lion Li * @author Lion Li
*/ */
@@ -16,12 +17,21 @@ public enum UserType {
/** /**
* pc端 * pc端
*/ */
SYS_USER("sys_user:"), SYS_USER("sys_user"),
/** /**
* app端 * app端
*/ */
APP_USER("app_user:"); APP_USER("app_user");
private final String userType; private final String userType;
public static UserType getUserType(String str) {
for (UserType value : values()) {
if (StringUtils.contains(str, value.getUserType())) {
return value;
}
}
throw new RuntimeException("'UserType' not found By " + str);
}
} }

4
ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java
View File

@@ -2,7 +2,9 @@ package com.ruoyi.common.exception.base;
import com.ruoyi.common.utils.MessageUtils; import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import lombok.*; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
/** /**
* 基础异常 * 基础异常

4
ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java
View File

@@ -20,10 +20,10 @@ public class RepeatableFilter implements Filter {
@Override @Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException { throws IOException, ServletException {
ServletRequest requestWrapper = null; ServletRequest requestWrapper = null;
if (request instanceof HttpServletRequest if (request instanceof HttpServletRequest
&& StringUtils.startsWithIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE)) { && StringUtils.startsWithIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE)) {
requestWrapper = new RepeatedlyRequestWrapper((HttpServletRequest) request, response); requestWrapper = new RepeatedlyRequestWrapper((HttpServletRequest) request, response);
} }
if (null == requestWrapper) { if (null == requestWrapper) {

2
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java
View File

@@ -33,7 +33,7 @@ public class XssFilter implements Filter {
@Override @Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException { throws IOException, ServletException {
HttpServletRequest req = (HttpServletRequest) request; HttpServletRequest req = (HttpServletRequest) request;
HttpServletResponse resp = (HttpServletResponse) response; HttpServletResponse resp = (HttpServletResponse) response;
if (handleExcludeURL(req, resp)) { if (handleExcludeURL(req, resp)) {

4
ruoyi-common/src/main/java/com/ruoyi/common/helper/DataPermissionHelper.java
View File

@@ -2,6 +2,8 @@ package com.ruoyi.common.helper;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.ServletUtils;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.HashMap; import java.util.HashMap;
@@ -13,6 +15,7 @@ import java.util.Map;
* @author Lion Li * @author Lion Li
* @version 3.5.0 * @version 3.5.0
*/ */
@NoArgsConstructor(access = AccessLevel.PRIVATE)
@SuppressWarnings("unchecked cast") @SuppressWarnings("unchecked cast")
public class DataPermissionHelper { public class DataPermissionHelper {
@@ -24,7 +27,6 @@ public class DataPermissionHelper {
} }
public static void setVariable(String key, Object value) { public static void setVariable(String key, Object value) {
Map<String, Object> context = getContext(); Map<String, Object> context = getContext();
context.put(key, value); context.put(key, value);

80
ruoyi-common/src/main/java/com/ruoyi/common/utils/LoginUtils.java → ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java
View File

@@ -1,4 +1,4 @@
package com.ruoyi.common.utils; package com.ruoyi.common.helper;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
@@ -6,51 +6,73 @@ import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.DeviceType; import com.ruoyi.common.enums.DeviceType;
import com.ruoyi.common.enums.UserType; import com.ruoyi.common.enums.UserType;
import com.ruoyi.common.exception.UtilException; import com.ruoyi.common.exception.UtilException;
import com.ruoyi.common.utils.StringUtils;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
/** /**
* 登录鉴权工具 * 登录鉴权助手
* 为适配多端登录而封装 * 为适配多端登录而封装
* *
* @author Lion Li * @author Lion Li
*/ */
public class LoginUtils { @NoArgsConstructor(access = AccessLevel.PRIVATE)
public class LoginHelper {
private final static String LOGIN_USER_KEY = "loginUser"; public static final String JOIN_CODE = ":";
public static final String LOGIN_USER_KEY = "loginUser";
private static final ThreadLocal<LoginUser> LOGIN_CACHE = new ThreadLocal<>();
/** /**
* 登录系统 * 登录系统
* 针对两套用户体系 * 针对两套用户体系
*
* @param loginUser 登录用户信息 * @param loginUser 登录用户信息
*/ */
public static void login(LoginUser loginUser, UserType userType) { public static void login(LoginUser loginUser) {
StpUtil.login(userType.getUserType() + loginUser.getUserId()); LOGIN_CACHE.set(loginUser);
StpUtil.login(loginUser.getLoginId());
setLoginUser(loginUser); setLoginUser(loginUser);
} }
/** /**
* 登录系统 基于 设备类型 * 登录系统 基于 设备类型
* 针对一套用户体系 * 针对一套用户体系
*
* @param loginUser 登录用户信息 * @param loginUser 登录用户信息
*/ */
public static void loginByDevice(LoginUser loginUser, UserType userType, DeviceType deviceType) { public static void loginByDevice(LoginUser loginUser, DeviceType deviceType) {
StpUtil.login(userType.getUserType() + loginUser.getUserId(), deviceType.getDevice()); LOGIN_CACHE.set(loginUser);
StpUtil.login(loginUser.getLoginId(), deviceType.getDevice());
setLoginUser(loginUser); setLoginUser(loginUser);
} }
/** /**
* 设置用户数据 * 设置用户数据(多级缓存)
*/ */
public static void setLoginUser(LoginUser loginUser) { public static void setLoginUser(LoginUser loginUser) {
StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser); StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
} }
/** /**
* 获取用户 * 获取用户(多级缓存)
**/ */
public static LoginUser getLoginUser() { public static LoginUser getLoginUser() {
LoginUser loginUser = LOGIN_CACHE.get();
if (loginUser != null) {
return loginUser;
}
return (LoginUser) StpUtil.getTokenSession().get(LOGIN_USER_KEY); return (LoginUser) StpUtil.getTokenSession().get(LOGIN_USER_KEY);
} }
/**
* 清除一级缓存 防止内存问题
*/
public static void clearCache() {
LOGIN_CACHE.remove();
}
/** /**
* 获取用户id * 获取用户id
*/ */
@@ -58,13 +80,15 @@ public class LoginUtils {
LoginUser loginUser = getLoginUser(); LoginUser loginUser = getLoginUser();
if (ObjectUtil.isNull(loginUser)) { if (ObjectUtil.isNull(loginUser)) {
String loginId = StpUtil.getLoginIdAsString(); String loginId = StpUtil.getLoginIdAsString();
String userId; String userId = null;
String replace = ""; for (UserType value : UserType.values()) {
if (StringUtils.contains(loginId, UserType.SYS_USER.getUserType())) { if (StringUtils.contains(loginId, value.getUserType())) {
userId = StringUtils.replace(loginId, UserType.SYS_USER.getUserType(), replace); String[] strs = StringUtils.split(loginId, JOIN_CODE);
} else if (StringUtils.contains(loginId, UserType.APP_USER.getUserType())){ // 用户id在总是在最后
userId = StringUtils.replace(loginId, UserType.APP_USER.getUserType(), replace); userId = strs[strs.length - 1];
} else { }
}
if (StringUtils.isBlank(userId)) {
throw new UtilException("登录用户: LoginId异常 => " + loginId); throw new UtilException("登录用户: LoginId异常 => " + loginId);
} }
return Long.parseLong(userId); return Long.parseLong(userId);
@@ -74,21 +98,21 @@ public class LoginUtils {
/** /**
* 获取部门ID * 获取部门ID
**/ */
public static Long getDeptId() { public static Long getDeptId() {
return getLoginUser().getDeptId(); return getLoginUser().getDeptId();
} }
/** /**
* 获取用户账户 * 获取用户账户
**/ */
public static String getUsername() { public static String getUsername() {
return getLoginUser().getUsername(); return getLoginUser().getUsername();
} }
/** /**
* 获取用户账户 * 获取用户昵称
**/ */
public static String getNickName() { public static String getNickName() {
return getLoginUser().getNickName(); return getLoginUser().getNickName();
} }
@@ -98,17 +122,7 @@ public class LoginUtils {
*/ */
public static UserType getUserType() { public static UserType getUserType() {
String loginId = StpUtil.getLoginIdAsString(); String loginId = StpUtil.getLoginIdAsString();
return getUserType(loginId); return UserType.getUserType(loginId);
}
public static UserType getUserType(Object loginId) {
if (StringUtils.contains(loginId.toString(), UserType.SYS_USER.getUserType())) {
return UserType.SYS_USER;
} else if (StringUtils.contains(loginId.toString(), UserType.APP_USER.getUserType())){
return UserType.APP_USER;
} else {
throw new UtilException("登录用户: LoginId异常 => " + loginId);
}
} }
} }

5
ruoyi-common/src/main/java/com/ruoyi/common/jackson/SensitiveJsonSerializer.java
View File

@@ -16,6 +16,7 @@ import java.util.Objects;
/** /**
* 数据脱敏json序列化工具 * 数据脱敏json序列化工具
*
* @author Yjoioooo * @author Yjoioooo
*/ */
public class SensitiveJsonSerializer extends JsonSerializer<String> implements ContextualSerializer { public class SensitiveJsonSerializer extends JsonSerializer<String> implements ContextualSerializer {
@@ -25,7 +26,7 @@ public class SensitiveJsonSerializer extends JsonSerializer<String> implements C
@Override @Override
public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException { public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
SensitiveService sensitiveService = SpringUtils.getBean(SensitiveService.class); SensitiveService sensitiveService = SpringUtils.getBean(SensitiveService.class);
if (sensitiveService.isSensitive()){ if (sensitiveService.isSensitive()) {
gen.writeString(value); gen.writeString(value);
} else { } else {
gen.writeString(strategy.desensitizer().apply(value)); gen.writeString(strategy.desensitizer().apply(value));
@@ -36,7 +37,7 @@ public class SensitiveJsonSerializer extends JsonSerializer<String> implements C
@Override @Override
public JsonSerializer<?> createContextual(SerializerProvider prov, BeanProperty property) throws JsonMappingException { public JsonSerializer<?> createContextual(SerializerProvider prov, BeanProperty property) throws JsonMappingException {
Sensitive annotation = property.getAnnotation(Sensitive.class); Sensitive annotation = property.getAnnotation(Sensitive.class);
if (Objects.nonNull(annotation)&&Objects.equals(String.class, property.getType().getRawClass())) { if (Objects.nonNull(annotation) && Objects.equals(String.class, property.getType().getRawClass())) {
this.strategy = annotation.strategy(); this.strategy = annotation.strategy();
return this; return this;
} }

4
ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java
View File

@@ -13,6 +13,10 @@ import java.util.Map;
/** /**
* bean深拷贝工具(基于 cglib 性能优异) * bean深拷贝工具(基于 cglib 性能优异)
* <p>
* 重点 cglib 不支持 拷贝到链式对象
* 例如: 源对象 拷贝到 目标(链式对象)
* 请区分好`浅拷贝`和`深拷贝`再做使用
* *
* @author Lion Li * @author Lion Li
*/ */

6
ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
View File

@@ -28,9 +28,9 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss"; public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
private static String[] parsePatterns = { private static String[] parsePatterns = {
"yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
"yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM", "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
"yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"}; "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
/** /**
* 获取当前Date型日期 * 获取当前Date型日期

159
ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
View File

@@ -1,159 +0,0 @@
package com.ruoyi.common.utils;
import cn.hutool.core.collection.CollUtil;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.utils.redis.RedisUtils;
import java.util.Collection;
import java.util.List;
/**
* 字典工具类
*
* @author ruoyi
* @deprecated 3.5.0 版本删除 迁移至 {@link com.ruoyi.common.core.service.DictService}
*/
@Deprecated
public class DictUtils {
/**
* 分隔符
*/
public static final String SEPARATOR = ",";
/**
* 设置字典缓存
*
* @param key 参数键
* @param dictDatas 字典数据列表
*/
public static void setDictCache(String key, List<SysDictData> dictDatas) {
RedisUtils.setCacheObject(getCacheKey(key), dictDatas);
}
/**
* 获取字典缓存
*
* @param key 参数键
* @return dictDatas 字典数据列表
*/
public static List<SysDictData> getDictCache(String key) {
List<SysDictData> dictDatas = RedisUtils.getCacheObject(getCacheKey(key));
if (StringUtils.isNotNull(dictDatas)) {
return dictDatas;
}
return null;
}
/**
* 根据字典类型和字典值获取字典标签
*
* @param dictType 字典类型
* @param dictValue 字典值
* @return 字典标签
*/
public static String getDictLabel(String dictType, String dictValue) {
return getDictLabel(dictType, dictValue, SEPARATOR);
}
/**
* 根据字典类型和字典标签获取字典值
*
* @param dictType 字典类型
* @param dictLabel 字典标签
* @return 字典值
*/
public static String getDictValue(String dictType, String dictLabel) {
return getDictValue(dictType, dictLabel, SEPARATOR);
}
/**
* 根据字典类型和字典值获取字典标签
*
* @param dictType 字典类型
* @param dictValue 字典值
* @param separator 分隔符
* @return 字典标签
*/
public static String getDictLabel(String dictType, String dictValue, String separator) {
StringBuilder propertyString = new StringBuilder();
List<SysDictData> datas = getDictCache(dictType);
if (StringUtils.containsAny(dictValue, separator) && CollUtil.isNotEmpty(datas)) {
for (SysDictData dict : datas) {
for (String value : dictValue.split(separator)) {
if (value.equals(dict.getDictValue())) {
propertyString.append(dict.getDictLabel() + separator);
break;
}
}
}
} else {
for (SysDictData dict : datas) {
if (dictValue.equals(dict.getDictValue())) {
return dict.getDictLabel();
}
}
}
return StringUtils.stripEnd(propertyString.toString(), separator);
}
/**
* 根据字典类型和字典标签获取字典值
*
* @param dictType 字典类型
* @param dictLabel 字典标签
* @param separator 分隔符
* @return 字典值
*/
public static String getDictValue(String dictType, String dictLabel, String separator) {
StringBuilder propertyString = new StringBuilder();
List<SysDictData> datas = getDictCache(dictType);
if (StringUtils.containsAny(dictLabel, separator) && CollUtil.isNotEmpty(datas)) {
for (SysDictData dict : datas) {
for (String label : dictLabel.split(separator)) {
if (label.equals(dict.getDictLabel())) {
propertyString.append(dict.getDictValue() + separator);
break;
}
}
}
} else {
for (SysDictData dict : datas) {
if (dictLabel.equals(dict.getDictLabel())) {
return dict.getDictValue();
}
}
}
return StringUtils.stripEnd(propertyString.toString(), separator);
}
/**
* 删除指定字典缓存
*
* @param key 字典键
*/
public static void removeDictCache(String key) {
RedisUtils.deleteObject(getCacheKey(key));
}
/**
* 清空字典缓存
*/
public static void clearDictCache() {
Collection<String> keys = RedisUtils.keys(Constants.SYS_DICT_KEY + "*");
RedisUtils.deleteObject(keys);
}
/**
* 设置cache key
*
* @param configKey 参数键
* @return 缓存键key
*/
public static String getCacheKey(String configKey) {
return Constants.SYS_DICT_KEY + configKey;
}
}

3
ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java
View File

@@ -1,6 +1,7 @@
package com.ruoyi.common.utils; package com.ruoyi.common.utils;
import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
@@ -28,7 +29,7 @@ public class JsonUtils {
} }
public static String toJsonString(Object object) { public static String toJsonString(Object object) {
if (StringUtils.isNull(object)) { if (ObjectUtil.isNull(object)) {
return null; return null;
} }
try { try {

134
ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
View File

@@ -2,15 +2,15 @@ package com.ruoyi.common.utils;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Validator; import cn.hutool.core.lang.Validator;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.springframework.util.AntPathMatcher; import org.springframework.util.AntPathMatcher;
import java.util.*; import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/** /**
* 字符串工具类 * 字符串工具类
@@ -20,16 +20,6 @@ import java.util.*;
@NoArgsConstructor(access = AccessLevel.PRIVATE) @NoArgsConstructor(access = AccessLevel.PRIVATE)
public class StringUtils extends org.apache.commons.lang3.StringUtils { public class StringUtils extends org.apache.commons.lang3.StringUtils {
/**
* 获取参数不为空值
*
* @param value defaultValue 要判断的value
* @return value 返回值
*/
public static <T> T nvl(T value, T defaultValue) {
return ObjectUtil.defaultIfNull(value, defaultValue);
}
/** /**
* 获取参数不为空值 * 获取参数不为空值
* *
@@ -40,86 +30,6 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
return StrUtil.blankToDefault(str, defaultValue); return StrUtil.blankToDefault(str, defaultValue);
} }
/**
* * 判断一个Collection是否为空， 包含List，Set，Queue
*
* @param coll 要判断的Collection
* @return true：为空 false：非空
*/
public static boolean isEmpty(Collection<?> coll) {
return CollUtil.isEmpty(coll);
}
/**
* * 判断一个Collection是否非空，包含List，Set，Queue
*
* @param coll 要判断的Collection
* @return true：非空 false：空
*/
public static boolean isNotEmpty(Collection<?> coll) {
return !isEmpty(coll);
}
/**
* * 判断一个对象数组是否为空
*
* @param objects 要判断的对象数组
* * @return true：为空 false：非空
*/
public static boolean isEmpty(Object[] objects) {
return ArrayUtil.isEmpty(objects);
}
/**
* * 判断一个对象数组是否非空
*
* @param objects 要判断的对象数组
* @return true：非空 false：空
*/
public static boolean isNotEmpty(Object[] objects) {
return !isEmpty(objects);
}
/**
* * 判断一个对象是否为空
*
* @param object 要判断的对象数组
* * @return true：为空 false：非空
*/
public static boolean isEmpty(Object object) {
return ObjectUtil.isEmpty(object);
}
/**
* * 判断一个对象是否非空
*
* @param object 要判断的对象数组
* @return true：非空 false：空
*/
public static boolean isNotEmpty(Object object) {
return !isEmpty(object);
}
/**
* * 判断一个Map是否为空
*
* @param map 要判断的Map
* @return true：为空 false：非空
*/
public static boolean isEmpty(Map<?, ?> map) {
return MapUtil.isEmpty(map);
}
/**
* * 判断一个Map是否为空
*
* @param map 要判断的Map
* @return true：非空 false：空
*/
public static boolean isNotEmpty(Map<?, ?> map) {
return !isEmpty(map);
}
/** /**
* * 判断一个字符串是否为空串 * * 判断一个字符串是否为空串
* *
@@ -140,36 +50,6 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
return !isEmpty(str); return !isEmpty(str);
} }
/**
* * 判断一个对象是否为空
*
* @param object Object
* @return true：为空 false：非空
*/
public static boolean isNull(Object object) {
return ObjectUtil.isNull(object);
}
/**
* * 判断一个对象是否非空
*
* @param object Object
* @return true：非空 false：空
*/
public static boolean isNotNull(Object object) {
return !isNull(object);
}
/**
* * 判断一个对象是否是数组类型（Java基本型别的数组）
*
* @param object 对象
* @return true：是数组 false：不是数组
*/
public static boolean isArray(Object object) {
return ArrayUtil.isArray(object);
}
/** /**
* 去空格 * 去空格
*/ */
@@ -325,7 +205,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
* @return 是否匹配 * @return 是否匹配
*/ */
public static boolean matches(String str, List<String> strs) { public static boolean matches(String str, List<String> strs) {
if (isEmpty(str) || isEmpty(strs)) { if (isEmpty(str) || CollUtil.isEmpty(strs)) {
return false; return false;
} }
for (String pattern : strs) { for (String pattern : strs) {
@@ -351,8 +231,4 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
return matcher.match(pattern, url); return matcher.match(pattern, url);
} }
@SuppressWarnings("unchecked")
public static <T> T cast(Object obj) {
return (T) obj;
}
} }

10
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
View File

@@ -29,11 +29,11 @@ public class FileUtils extends FileUtil {
StringBuilder contentDispositionValue = new StringBuilder(); StringBuilder contentDispositionValue = new StringBuilder();
contentDispositionValue.append("attachment; filename=") contentDispositionValue.append("attachment; filename=")
.append(percentEncodedFileName) .append(percentEncodedFileName)
.append(";") .append(";")
.append("filename*=") .append("filename*=")
.append("utf-8''") .append("utf-8''")
.append(percentEncodedFileName); .append(percentEncodedFileName);
response.addHeader("Access-Control-Allow-Origin", "*"); response.addHeader("Access-Control-Allow-Origin", "*");
response.addHeader("Access-Control-Expose-Headers", "Content-Disposition,download-filename"); response.addHeader("Access-Control-Expose-Headers", "Content-Disposition,download-filename");

6
ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
View File

@@ -41,9 +41,9 @@ public class AddressUtils {
if (RuoYiConfig.isAddressEnabled()) { if (RuoYiConfig.isAddressEnabled()) {
try { try {
String rspStr = HttpUtil.createGet(IP_URL) String rspStr = HttpUtil.createGet(IP_URL)
.body("ip=" + ip + "&json=true", Constants.GBK) .body("ip=" + ip + "&json=true", Constants.GBK)
.execute() .execute()
.body(); .body();
if (StringUtils.isEmpty(rspStr)) { if (StringUtils.isEmpty(rspStr)) {
log.error("获取地理位置异常 {}", ip); log.error("获取地理位置异常 {}", ip);
return UNKNOWN; return UNKNOWN;

8
ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/RedisUtils.java
View File

@@ -130,7 +130,7 @@ public class RedisUtils {
/** /**
* 注册对象监听器 * 注册对象监听器
* * <p>
* key 监听器需开启 `notify-keyspace-events` 等 redis 相关配置 * key 监听器需开启 `notify-keyspace-events` 等 redis 相关配置
* *
* @param key 缓存的键值 * @param key 缓存的键值
@@ -223,7 +223,7 @@ public class RedisUtils {
/** /**
* 注册List监听器 * 注册List监听器
* * <p>
* key 监听器需开启 `notify-keyspace-events` 等 redis 相关配置 * key 监听器需开启 `notify-keyspace-events` 等 redis 相关配置
* *
* @param key 缓存的键值 * @param key 缓存的键值
@@ -259,7 +259,7 @@ public class RedisUtils {
/** /**
* 注册Set监听器 * 注册Set监听器
* * <p>
* key 监听器需开启 `notify-keyspace-events` 等 redis 相关配置 * key 监听器需开启 `notify-keyspace-events` 等 redis 相关配置
* *
* @param key 缓存的键值 * @param key 缓存的键值
@@ -296,7 +296,7 @@ public class RedisUtils {
/** /**
* 注册Map监听器 * 注册Map监听器
* * <p>
* key 监听器需开启 `notify-keyspace-events` 等 redis 相关配置 * key 监听器需开启 `notify-keyspace-events` 等 redis 相关配置
* *
* @param key 缓存的键值 * @param key 缓存的键值

2
ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
View File

@@ -16,7 +16,7 @@ public class SqlUtil {
/** /**
* 定义常用的 sql关键字 * 定义常用的 sql关键字
*/ */
public static String SQL_REGEX = "select |insert |delete |update |drop |count |exec |chr |mid |master |truncate |char |and |declare "; public static final String SQL_REGEX = "select |insert |delete |update |drop |count |exec |chr |mid |master |truncate |char |and |declare ";
/** /**
* 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序） * 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序）

21
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java
View File

@@ -1,11 +1,10 @@
package com.ruoyi.demo.controller; package com.ruoyi.demo.controller;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.redis.RedisUtils; import com.ruoyi.common.utils.redis.RedisUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.CachePut;
import org.springframework.cache.annotation.Cacheable; import org.springframework.cache.annotation.Cacheable;
@@ -23,7 +22,7 @@ import java.util.concurrent.TimeUnit;
// 类级别 缓存统一配置 // 类级别 缓存统一配置
//@CacheConfig(cacheNames = "redissonCacheMap") //@CacheConfig(cacheNames = "redissonCacheMap")
@Api(value = "spring-cache 演示案例", tags = {"spring-cache 演示案例"}) @Api(value = "spring-cache 演示案例", tags = {"spring-cache 演示案例"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/demo/cache") @RequestMapping("/demo/cache")
public class RedisCacheController { public class RedisCacheController {
@@ -45,8 +44,8 @@ public class RedisCacheController {
@ApiOperation("测试 @Cacheable") @ApiOperation("测试 @Cacheable")
@Cacheable(cacheNames = "redissonCacheMap", key = "#key", condition = "#key != null") @Cacheable(cacheNames = "redissonCacheMap", key = "#key", condition = "#key != null")
@GetMapping("/test1") @GetMapping("/test1")
public AjaxResult<String> test1(String key, String value) { public R<String> test1(String key, String value) {
return AjaxResult.success("操作成功", value); return R.ok("操作成功", value);
} }
/** /**
@@ -60,8 +59,8 @@ public class RedisCacheController {
@ApiOperation("测试 @CachePut") @ApiOperation("测试 @CachePut")
@CachePut(cacheNames = "redissonCacheMap", key = "#key", condition = "#key != null") @CachePut(cacheNames = "redissonCacheMap", key = "#key", condition = "#key != null")
@GetMapping("/test2") @GetMapping("/test2")
public AjaxResult<String> test2(String key, String value) { public R<String> test2(String key, String value) {
return AjaxResult.success("操作成功", value); return R.ok("操作成功", value);
} }
/** /**
@@ -75,8 +74,8 @@ public class RedisCacheController {
@ApiOperation("测试 @CacheEvict") @ApiOperation("测试 @CacheEvict")
@CacheEvict(cacheNames = "redissonCacheMap", key = "#key", condition = "#key != null") @CacheEvict(cacheNames = "redissonCacheMap", key = "#key", condition = "#key != null")
@GetMapping("/test3") @GetMapping("/test3")
public AjaxResult<String> test3(String key, String value) { public R<String> test3(String key, String value) {
return AjaxResult.success("操作成功", value); return R.ok("操作成功", value);
} }
/** /**
@@ -86,7 +85,7 @@ public class RedisCacheController {
*/ */
@ApiOperation("测试设置过期时间") @ApiOperation("测试设置过期时间")
@GetMapping("/test6") @GetMapping("/test6")
public AjaxResult<Boolean> test6(String key, String value) { public R<Boolean> test6(String key, String value) {
RedisUtils.setCacheObject(key, value); RedisUtils.setCacheObject(key, value);
boolean flag = RedisUtils.expire(key, 10, TimeUnit.SECONDS); boolean flag = RedisUtils.expire(key, 10, TimeUnit.SECONDS);
System.out.println("***********" + flag); System.out.println("***********" + flag);
@@ -96,7 +95,7 @@ public class RedisCacheController {
e.printStackTrace(); e.printStackTrace();
} }
Object obj = RedisUtils.getCacheObject(key); Object obj = RedisUtils.getCacheObject(key);
return AjaxResult.success("操作成功", value.equals(obj)); return R.ok(value.equals(obj));
} }
} }

12
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java
View File

@@ -4,7 +4,7 @@ import com.baomidou.lock.LockInfo;
import com.baomidou.lock.LockTemplate; import com.baomidou.lock.LockTemplate;
import com.baomidou.lock.annotation.Lock4j; import com.baomidou.lock.annotation.Lock4j;
import com.baomidou.lock.executor.RedissonLockExecutor; import com.baomidou.lock.executor.RedissonLockExecutor;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -36,7 +36,7 @@ public class RedisLockController {
@ApiOperation("测试lock4j 注解") @ApiOperation("测试lock4j 注解")
@Lock4j(keys = {"#key"}) @Lock4j(keys = {"#key"})
@GetMapping("/testLock4j") @GetMapping("/testLock4j")
public AjaxResult<String> testLock4j(String key, String value) { public R<String> testLock4j(String key, String value) {
System.out.println("start:" + key + ",time:" + LocalTime.now().toString()); System.out.println("start:" + key + ",time:" + LocalTime.now().toString());
try { try {
Thread.sleep(10000); Thread.sleep(10000);
@@ -44,15 +44,15 @@ public class RedisLockController {
e.printStackTrace(); e.printStackTrace();
} }
System.out.println("end :" + key + ",time:" + LocalTime.now().toString()); System.out.println("end :" + key + ",time:" + LocalTime.now().toString());
return AjaxResult.success("操作成功", value); return R.ok("操作成功", value);
} }
/** /**
* 测试lock4j 工具 * 测试lock4j 工具
*/ */
@ApiOperation("测试lock4j 工具") @ApiOperation("测试lock4j 工具")
@GetMapping("/testLock4jLockTemaplate") @GetMapping("/testLock4jLockTemplate")
public AjaxResult<String> testLock4jLockTemaplate(String key, String value) { public R<String> testLock4jLockTemplate(String key, String value) {
final LockInfo lockInfo = lockTemplate.lock(key, 30000L, 5000L, RedissonLockExecutor.class); final LockInfo lockInfo = lockTemplate.lock(key, 30000L, 5000L, RedissonLockExecutor.class);
if (null == lockInfo) { if (null == lockInfo) {
throw new RuntimeException("业务处理中,请稍后再试"); throw new RuntimeException("业务处理中,请稍后再试");
@@ -70,7 +70,7 @@ public class RedisLockController {
lockTemplate.releaseLock(lockInfo); lockTemplate.releaseLock(lockInfo);
} }
//结束 //结束
return AjaxResult.success("操作成功", value); return R.ok("操作成功", value);
} }
} }

13
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java
View File

@@ -1,12 +1,11 @@
package com.ruoyi.demo.controller; package com.ruoyi.demo.controller;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.redis.RedisUtils; import com.ruoyi.common.utils.redis.RedisUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@@ -17,27 +16,27 @@ import org.springframework.web.bind.annotation.RestController;
* @author Lion Li * @author Lion Li
*/ */
@Api(value = "Redis发布订阅 演示案例", tags = {"Redis发布订阅"}) @Api(value = "Redis发布订阅 演示案例", tags = {"Redis发布订阅"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/demo/redis/pubsub") @RequestMapping("/demo/redis/pubsub")
public class RedisPubSubController { public class RedisPubSubController {
@ApiOperation("发布消息") @ApiOperation("发布消息")
@GetMapping("/pub") @GetMapping("/pub")
public AjaxResult<Void> pub(@ApiParam("通道Key") String key, @ApiParam("发送内容") String value) { public R<Void> pub(@ApiParam("通道Key") String key, @ApiParam("发送内容") String value) {
RedisUtils.publish(key, value, consumer -> { RedisUtils.publish(key, value, consumer -> {
System.out.println("发布通道 => " + key + ", 发送值 => " + value); System.out.println("发布通道 => " + key + ", 发送值 => " + value);
}); });
return AjaxResult.success("操作成功"); return R.ok("操作成功");
} }
@ApiOperation("订阅消息") @ApiOperation("订阅消息")
@GetMapping("/sub") @GetMapping("/sub")
public AjaxResult<Void> sub(@ApiParam("通道Key") String key) { public R<Void> sub(@ApiParam("通道Key") String key) {
RedisUtils.subscribe(key, String.class, msg -> { RedisUtils.subscribe(key, String.class, msg -> {
System.out.println("订阅通道 => " + key + ", 接收值 => " + msg); System.out.println("订阅通道 => " + key + ", 接收值 => " + msg);
}); });
return AjaxResult.success("操作成功"); return R.ok("操作成功");
} }
} }

14
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java
View File

@@ -1,7 +1,7 @@
package com.ruoyi.demo.controller; package com.ruoyi.demo.controller;
import com.ruoyi.common.annotation.RateLimiter; import com.ruoyi.common.annotation.RateLimiter;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.LimitType; import com.ruoyi.common.enums.LimitType;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@@ -29,8 +29,8 @@ public class RedisRateLimiterController {
@ApiOperation("测试全局限流") @ApiOperation("测试全局限流")
@RateLimiter(count = 2, time = 10) @RateLimiter(count = 2, time = 10)
@GetMapping("/test") @GetMapping("/test")
public AjaxResult<String> test(String value) { public R<String> test(String value) {
return AjaxResult.success("操作成功", value); return R.ok("操作成功", value);
} }
/** /**
@@ -40,8 +40,8 @@ public class RedisRateLimiterController {
@ApiOperation("测试请求IP限流") @ApiOperation("测试请求IP限流")
@RateLimiter(count = 2, time = 10, limitType = LimitType.IP) @RateLimiter(count = 2, time = 10, limitType = LimitType.IP)
@GetMapping("/testip") @GetMapping("/testip")
public AjaxResult<String> testip(String value) { public R<String> testip(String value) {
return AjaxResult.success("操作成功", value); return R.ok("操作成功", value);
} }
/** /**
@@ -51,8 +51,8 @@ public class RedisRateLimiterController {
@ApiOperation("测试集群实例限流") @ApiOperation("测试集群实例限流")
@RateLimiter(count = 2, time = 10, limitType = LimitType.CLUSTER) @RateLimiter(count = 2, time = 10, limitType = LimitType.CLUSTER)
@GetMapping("/testcluster") @GetMapping("/testcluster")
public AjaxResult<String> testcluster(String value) { public R<String> testcluster(String value) {
return AjaxResult.success("操作成功", value); return R.ok("操作成功", value);
} }
} }

6
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java
View File

@@ -1,6 +1,6 @@
package com.ruoyi.demo.controller; package com.ruoyi.demo.controller;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
@@ -31,8 +31,8 @@ public class Swagger3DemoController {
@ApiImplicitParam(name = "file", value = "文件", dataType = "java.io.File", required = true), @ApiImplicitParam(name = "file", value = "文件", dataType = "java.io.File", required = true),
}) })
@PostMapping(value = "/upload") @PostMapping(value = "/upload")
public AjaxResult<String> upload(@RequestPart("file") MultipartFile file) { public R<String> upload(@RequestPart("file") MultipartFile file) {
return AjaxResult.success("操作成功", file.getOriginalFilename()); return R.ok("操作成功", file.getOriginalFilename());
} }
} }

31
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java
View File

@@ -2,13 +2,12 @@ package com.ruoyi.demo.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.demo.domain.TestDemo; import com.ruoyi.demo.domain.TestDemo;
import com.ruoyi.demo.mapper.TestDemoMapper; import com.ruoyi.demo.mapper.TestDemoMapper;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,7 +23,7 @@ import java.util.List;
* @date 2021-05-30 * @date 2021-05-30
*/ */
@Api(value = "测试批量方法", tags = {"测试批量方法"}) @Api(value = "测试批量方法", tags = {"测试批量方法"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/demo/batch") @RequestMapping("/demo/batch")
public class TestBatchController extends BaseController { public class TestBatchController extends BaseController {
@@ -36,37 +35,45 @@ public class TestBatchController extends BaseController {
/** /**
* 新增批量方法 可完美替代 saveBatch 秒级插入上万数据 (对mysql负荷较大) * 新增批量方法 可完美替代 saveBatch 秒级插入上万数据 (对mysql负荷较大)
* * <p>
* 3.5.0 版本 增加 rewriteBatchedStatements=true 批处理参数 使 MP 原生批处理可以达到同样的速度 * 3.5.0 版本 增加 rewriteBatchedStatements=true 批处理参数 使 MP 原生批处理可以达到同样的速度
*/ */
@ApiOperation(value = "新增批量方法") @ApiOperation(value = "新增批量方法")
@PostMapping("/add") @PostMapping("/add")
// @DS("slave") // @DS("slave")
public AjaxResult<Void> add() { public R<Void> add() {
List<TestDemo> list = new ArrayList<>(); List<TestDemo> list = new ArrayList<>();
for (int i = 0; i < 1000; i++) { for (int i = 0; i < 1000; i++) {
list.add(new TestDemo().setOrderNum(-1L).setTestKey("批量新增").setValue("测试新增")); TestDemo testDemo = new TestDemo();
testDemo.setOrderNum(-1L);
testDemo.setTestKey("批量新增");
testDemo.setValue("测试新增");
list.add(testDemo);
} }
return toAjax(testDemoMapper.insertBatch(list) ? 1 : 0); return toAjax(testDemoMapper.insertBatch(list) ? 1 : 0);
} }
/** /**
* 新增或更新 可完美替代 saveOrUpdateBatch 高性能 * 新增或更新 可完美替代 saveOrUpdateBatch 高性能
* * <p>
* 3.5.0 版本 增加 rewriteBatchedStatements=true 批处理参数 使 MP 原生批处理可以达到同样的速度 * 3.5.0 版本 增加 rewriteBatchedStatements=true 批处理参数 使 MP 原生批处理可以达到同样的速度
*/ */
@ApiOperation(value = "新增或更新批量方法") @ApiOperation(value = "新增或更新批量方法")
@PostMapping("/addOrUpdate") @PostMapping("/addOrUpdate")
// @DS("slave") // @DS("slave")
public AjaxResult<Void> addOrUpdate() { public R<Void> addOrUpdate() {
List<TestDemo> list = new ArrayList<>(); List<TestDemo> list = new ArrayList<>();
for (int i = 0; i < 1000; i++) { for (int i = 0; i < 1000; i++) {
list.add(new TestDemo().setOrderNum(-1L).setTestKey("批量新增").setValue("测试新增")); TestDemo testDemo = new TestDemo();
} testDemo.setOrderNum(-1L);
testDemo.setTestKey("批量新增");
testDemo.setValue("测试新增");
list.add(testDemo); }
testDemoMapper.insertBatch(list); testDemoMapper.insertBatch(list);
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
TestDemo testDemo = list.get(i); TestDemo testDemo = list.get(i);
testDemo.setTestKey("批量新增或修改").setValue("批量新增或修改"); testDemo.setTestKey("批量新增或修改");
testDemo.setValue("批量新增或修改");
if (i % 2 == 0) { if (i % 2 == 0) {
testDemo.setId(null); testDemo.setId(null);
} }
@@ -80,7 +87,7 @@ public class TestBatchController extends BaseController {
@ApiOperation(value = "删除批量方法") @ApiOperation(value = "删除批量方法")
@DeleteMapping() @DeleteMapping()
// @DS("slave") // @DS("slave")
public AjaxResult<Void> remove() { public R<Void> remove() {
return toAjax(testDemoMapper.delete(new LambdaQueryWrapper<TestDemo>() return toAjax(testDemoMapper.delete(new LambdaQueryWrapper<TestDemo>()
.eq(TestDemo::getOrderNum, -1L))); .eq(TestDemo::getOrderNum, -1L)));
} }

23
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
View File

@@ -5,15 +5,15 @@ import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.core.validate.QueryGroup; import com.ruoyi.common.core.validate.QueryGroup;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.ValidatorUtils;
import com.ruoyi.common.excel.ExcelResult; import com.ruoyi.common.excel.ExcelResult;
import com.ruoyi.common.utils.ValidatorUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.demo.domain.TestDemo; import com.ruoyi.demo.domain.TestDemo;
import com.ruoyi.demo.domain.bo.TestDemoBo; import com.ruoyi.demo.domain.bo.TestDemoBo;
@@ -22,7 +22,6 @@ import com.ruoyi.demo.domain.vo.TestDemoVo;
import com.ruoyi.demo.service.ITestDemoService; import com.ruoyi.demo.service.ITestDemoService;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@@ -42,7 +41,7 @@ import java.util.concurrent.TimeUnit;
*/ */
@Validated @Validated
@Api(value = "测试单表控制器", tags = {"测试单表管理"}) @Api(value = "测试单表控制器", tags = {"测试单表管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/demo/demo") @RequestMapping("/demo/demo")
public class TestDemoController extends BaseController { public class TestDemoController extends BaseController {
@@ -76,12 +75,12 @@ public class TestDemoController extends BaseController {
@Log(title = "测试单表", businessType = BusinessType.IMPORT) @Log(title = "测试单表", businessType = BusinessType.IMPORT)
@SaCheckPermission("demo:demo:import") @SaCheckPermission("demo:demo:import")
@PostMapping("/importData") @PostMapping("/importData")
public AjaxResult<Void> importData(@RequestPart("file") MultipartFile file) throws Exception { public R<Void> importData(@RequestPart("file") MultipartFile file) throws Exception {
ExcelResult<TestDemoImportVo> excelResult = ExcelUtil.importExcel(file.getInputStream(), TestDemoImportVo.class, true); ExcelResult<TestDemoImportVo> excelResult = ExcelUtil.importExcel(file.getInputStream(), TestDemoImportVo.class, true);
List<TestDemoImportVo> volist = excelResult.getList(); List<TestDemoImportVo> volist = excelResult.getList();
List<TestDemo> list = BeanUtil.copyToList(volist, TestDemo.class); List<TestDemo> list = BeanUtil.copyToList(volist, TestDemo.class);
iTestDemoService.saveBatch(list); iTestDemoService.saveBatch(list);
return AjaxResult.success(excelResult.getAnalysis()); return R.ok(excelResult.getAnalysis());
} }
/** /**
@@ -106,10 +105,10 @@ public class TestDemoController extends BaseController {
@ApiOperation("获取测试单表详细信息") @ApiOperation("获取测试单表详细信息")
@SaCheckPermission("demo:demo:query") @SaCheckPermission("demo:demo:query")
@GetMapping("/{id}") @GetMapping("/{id}")
public AjaxResult<TestDemoVo> getInfo(@ApiParam("测试ID") public R<TestDemoVo> getInfo(@ApiParam("测试ID")
@NotNull(message = "主键不能为空") @NotNull(message = "主键不能为空")
@PathVariable("id") Long id) { @PathVariable("id") Long id) {
return AjaxResult.success(iTestDemoService.queryById(id)); return R.ok(iTestDemoService.queryById(id));
} }
/** /**
@@ -120,7 +119,7 @@ public class TestDemoController extends BaseController {
@Log(title = "测试单表", businessType = BusinessType.INSERT) @Log(title = "测试单表", businessType = BusinessType.INSERT)
@RepeatSubmit(interval = 2, timeUnit = TimeUnit.SECONDS, message = "不允许重复提交") @RepeatSubmit(interval = 2, timeUnit = TimeUnit.SECONDS, message = "不允许重复提交")
@PostMapping() @PostMapping()
public AjaxResult<Void> add(@RequestBody TestDemoBo bo) { public R<Void> add(@RequestBody TestDemoBo bo) {
// 使用校验工具对标 @Validated(AddGroup.class) 注解 // 使用校验工具对标 @Validated(AddGroup.class) 注解
// 用于在非 Controller 的地方校验对象 // 用于在非 Controller 的地方校验对象
ValidatorUtils.validate(bo, AddGroup.class); ValidatorUtils.validate(bo, AddGroup.class);
@@ -135,7 +134,7 @@ public class TestDemoController extends BaseController {
@Log(title = "测试单表", businessType = BusinessType.UPDATE) @Log(title = "测试单表", businessType = BusinessType.UPDATE)
@RepeatSubmit @RepeatSubmit
@PutMapping() @PutMapping()
public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody TestDemoBo bo) { public R<Void> edit(@Validated(EditGroup.class) @RequestBody TestDemoBo bo) {
return toAjax(iTestDemoService.updateByBo(bo) ? 1 : 0); return toAjax(iTestDemoService.updateByBo(bo) ? 1 : 0);
} }
@@ -144,9 +143,9 @@ public class TestDemoController extends BaseController {
*/ */
@ApiOperation("删除测试单表") @ApiOperation("删除测试单表")
@SaCheckPermission("demo:demo:remove") @SaCheckPermission("demo:demo:remove")
@Log(title = "测试单表" , businessType = BusinessType.DELETE) @Log(title = "测试单表", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public AjaxResult<Void> remove(@ApiParam("测试ID串") public R<Void> remove(@ApiParam("测试ID串")
@NotEmpty(message = "主键不能为空") @NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) { @PathVariable Long[] ids) {
return toAjax(iTestDemoService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0); return toAjax(iTestDemoService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);

14
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java
View File

@@ -1,6 +1,6 @@
package com.ruoyi.demo.controller; package com.ruoyi.demo.controller;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.MessageUtils; import com.ruoyi.common.utils.MessageUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@@ -35,8 +35,8 @@ public class TestI18nController {
*/ */
@ApiOperation("通过code获取国际化内容") @ApiOperation("通过code获取国际化内容")
@GetMapping() @GetMapping()
public AjaxResult<Void> get(@ApiParam("国际化code") String code) { public R<Void> get(@ApiParam("国际化code") String code) {
return AjaxResult.success(MessageUtils.message(code)); return R.ok(MessageUtils.message(code));
} }
/** /**
@@ -47,8 +47,8 @@ public class TestI18nController {
*/ */
@ApiOperation("Validator 校验国际化") @ApiOperation("Validator 校验国际化")
@GetMapping("/test1") @GetMapping("/test1")
public AjaxResult<Void> test1(@NotBlank(message = "{not.null}") String str) { public R<Void> test1(@NotBlank(message = "{not.null}") String str) {
return AjaxResult.success(str); return R.ok(str);
} }
/** /**
@@ -59,8 +59,8 @@ public class TestI18nController {
*/ */
@ApiOperation("Bean 校验国际化") @ApiOperation("Bean 校验国际化")
@GetMapping("/test2") @GetMapping("/test2")
public AjaxResult<TestI18nBo> test2(@Validated TestI18nBo bo) { public R<TestI18nBo> test2(@Validated TestI18nBo bo) {
return AjaxResult.success(bo); return R.ok(bo);
} }
@Data @Data

24
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java
View File

@@ -2,25 +2,24 @@ package com.ruoyi.demo.controller;
import com.ruoyi.common.annotation.Sensitive; import com.ruoyi.common.annotation.Sensitive;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.SensitiveStrategy; import com.ruoyi.common.enums.SensitiveStrategy;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
/** /**
* 测试数据脱敏控制器 * 测试数据脱敏控制器
* * <p>
* 默认管理员不过滤 * 默认管理员不过滤
* 需自行根据业务重写实现 * 需自行根据业务重写实现
* *
* @see com.ruoyi.common.core.service.SensitiveService
* @author Lion Li * @author Lion Li
* @version 3.6.0 * @version 3.6.0
* @see com.ruoyi.common.core.service.SensitiveService
*/ */
@Api(value = "测试数据脱敏控制器", tags = {"测试数据脱敏管理"}) @Api(value = "测试数据脱敏控制器", tags = {"测试数据脱敏管理"})
@RestController @RestController
@@ -32,18 +31,17 @@ public class TestSensitiveController extends BaseController {
*/ */
@ApiOperation("查询测试单表列表") @ApiOperation("查询测试单表列表")
@GetMapping("/test") @GetMapping("/test")
public AjaxResult<TestSensitive> test() { public R<TestSensitive> test() {
TestSensitive testSensitive = new TestSensitive() TestSensitive testSensitive = new TestSensitive();
.setIdCard("210397198608215431") testSensitive.setIdCard("210397198608215431");
.setPhone("17640125371") testSensitive.setPhone("17640125371");
.setAddress("北京市朝阳区某某四合院1203室") testSensitive.setAddress("北京市朝阳区某某四合院1203室");
.setEmail("17640125371@163.com") testSensitive.setEmail("17640125371@163.com");
.setBankCard("6226456952351452853"); testSensitive.setBankCard("6226456952351452853");
return AjaxResult.success(testSensitive); return R.ok(testSensitive);
} }
@Data @Data
@Accessors(chain = true)
static class TestSensitive { static class TestSensitive {
/** /**

21
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java
View File

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.core.validate.QueryGroup; import com.ruoyi.common.core.validate.QueryGroup;
@@ -17,7 +17,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -35,7 +34,7 @@ import java.util.List;
*/ */
@Validated @Validated
@Api(value = "测试树表控制器", tags = {"测试树表管理"}) @Api(value = "测试树表控制器", tags = {"测试树表管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/demo/tree") @RequestMapping("/demo/tree")
public class TestTreeController extends BaseController { public class TestTreeController extends BaseController {
@@ -48,9 +47,9 @@ public class TestTreeController extends BaseController {
@ApiOperation("查询测试树表列表") @ApiOperation("查询测试树表列表")
@SaCheckPermission("demo:tree:list") @SaCheckPermission("demo:tree:list")
@GetMapping("/list") @GetMapping("/list")
public AjaxResult<List<TestTreeVo>> list(@Validated(QueryGroup.class) TestTreeBo bo) { public R<List<TestTreeVo>> list(@Validated(QueryGroup.class) TestTreeBo bo) {
List<TestTreeVo> list = iTestTreeService.queryList(bo); List<TestTreeVo> list = iTestTreeService.queryList(bo);
return AjaxResult.success(list); return R.ok(list);
} }
/** /**
@@ -71,10 +70,10 @@ public class TestTreeController extends BaseController {
@ApiOperation("获取测试树表详细信息") @ApiOperation("获取测试树表详细信息")
@SaCheckPermission("demo:tree:query") @SaCheckPermission("demo:tree:query")
@GetMapping("/{id}") @GetMapping("/{id}")
public AjaxResult<TestTreeVo> getInfo(@ApiParam("测试树ID") public R<TestTreeVo> getInfo(@ApiParam("测试树ID")
@NotNull(message = "主键不能为空") @NotNull(message = "主键不能为空")
@PathVariable("id") Long id) { @PathVariable("id") Long id) {
return AjaxResult.success(iTestTreeService.queryById(id)); return R.ok(iTestTreeService.queryById(id));
} }
/** /**
@@ -85,7 +84,7 @@ public class TestTreeController extends BaseController {
@Log(title = "测试树表", businessType = BusinessType.INSERT) @Log(title = "测试树表", businessType = BusinessType.INSERT)
@RepeatSubmit @RepeatSubmit
@PostMapping() @PostMapping()
public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody TestTreeBo bo) { public R<Void> add(@Validated(AddGroup.class) @RequestBody TestTreeBo bo) {
return toAjax(iTestTreeService.insertByBo(bo) ? 1 : 0); return toAjax(iTestTreeService.insertByBo(bo) ? 1 : 0);
} }
@@ -97,7 +96,7 @@ public class TestTreeController extends BaseController {
@Log(title = "测试树表", businessType = BusinessType.UPDATE) @Log(title = "测试树表", businessType = BusinessType.UPDATE)
@RepeatSubmit @RepeatSubmit
@PutMapping() @PutMapping()
public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody TestTreeBo bo) { public R<Void> edit(@Validated(EditGroup.class) @RequestBody TestTreeBo bo) {
return toAjax(iTestTreeService.updateByBo(bo) ? 1 : 0); return toAjax(iTestTreeService.updateByBo(bo) ? 1 : 0);
} }
@@ -106,9 +105,9 @@ public class TestTreeController extends BaseController {
*/ */
@ApiOperation("删除测试树表") @ApiOperation("删除测试树表")
@SaCheckPermission("demo:tree:remove") @SaCheckPermission("demo:tree:remove")
@Log(title = "测试树表" , businessType = BusinessType.DELETE) @Log(title = "测试树表", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public AjaxResult<Void> remove(@ApiParam("测试树ID串") public R<Void> remove(@ApiParam("测试树ID串")
@NotEmpty(message = "主键不能为空") @NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) { @PathVariable Long[] ids) {
return toAjax(iTestTreeService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0); return toAjax(iTestTreeService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);

21
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java
View File

@@ -1,13 +1,12 @@
package com.ruoyi.demo.controller.queue; package com.ruoyi.demo.controller.queue;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.redis.QueueUtils; import com.ruoyi.common.utils.redis.QueueUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@@ -25,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
*/ */
@Slf4j @Slf4j
@Api(value = "有界队列 演示案例", tags = {"有界队列"}) @Api(value = "有界队列 演示案例", tags = {"有界队列"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/demo/queue/bounded") @RequestMapping("/demo/queue/bounded")
public class BoundedQueueController { public class BoundedQueueController {
@@ -33,7 +32,7 @@ public class BoundedQueueController {
@ApiOperation("添加队列数据") @ApiOperation("添加队列数据")
@GetMapping("/add") @GetMapping("/add")
public AjaxResult<Void> add(@ApiParam("队列名") String queueName, public R<Void> add(@ApiParam("队列名") String queueName,
@ApiParam("容量") int capacity) { @ApiParam("容量") int capacity) {
// 用完了一定要销毁 否则会一直存在 // 用完了一定要销毁 否则会一直存在
boolean b = QueueUtils.destroyBoundedQueueObject(queueName); boolean b = QueueUtils.destroyBoundedQueueObject(queueName);
@@ -43,7 +42,7 @@ public class BoundedQueueController {
log.info("通道: {} , 设置容量: {}", queueName, capacity); log.info("通道: {} , 设置容量: {}", queueName, capacity);
} else { } else {
log.info("通道: {} , 设置容量失败", queueName); log.info("通道: {} , 设置容量失败", queueName);
return AjaxResult.error("操作失败"); return R.fail("操作失败");
} }
for (int i = 0; i < 11; i++) { for (int i = 0; i < 11; i++) {
String data = "data-" + i; String data = "data-" + i;
@@ -54,30 +53,30 @@ public class BoundedQueueController {
log.info("通道: {} , 发送数据: {}", queueName, data); log.info("通道: {} , 发送数据: {}", queueName, data);
} }
} }
return AjaxResult.success("操作成功"); return R.ok("操作成功");
} }
@ApiOperation("删除队列数据") @ApiOperation("删除队列数据")
@GetMapping("/remove") @GetMapping("/remove")
public AjaxResult<Void> remove(@ApiParam("队列名") String queueName) { public R<Void> remove(@ApiParam("队列名") String queueName) {
String data = "data-" + 5; String data = "data-" + 5;
if (QueueUtils.removeBoundedQueueObject(queueName, data)) { if (QueueUtils.removeBoundedQueueObject(queueName, data)) {
log.info("通道: {} , 删除数据: {}", queueName, data); log.info("通道: {} , 删除数据: {}", queueName, data);
} else { } else {
return AjaxResult.error("操作失败"); return R.fail("操作失败");
} }
return AjaxResult.success("操作成功"); return R.ok("操作成功");
} }
@ApiOperation("获取队列数据") @ApiOperation("获取队列数据")
@GetMapping("/get") @GetMapping("/get")
public AjaxResult<Void> get(@ApiParam("队列名") String queueName) { public R<Void> get(@ApiParam("队列名") String queueName) {
String data; String data;
do { do {
data = QueueUtils.getBoundedQueueObject(queueName); data = QueueUtils.getBoundedQueueObject(queueName);
log.info("通道: {} , 获取数据: {}", queueName, data); log.info("通道: {} , 获取数据: {}", queueName, data);
} while (data != null); } while (data != null);
return AjaxResult.success("操作成功"); return R.ok("操作成功");
} }
} }

23
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java
View File

@@ -1,13 +1,12 @@
package com.ruoyi.demo.controller.queue; package com.ruoyi.demo.controller.queue;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.redis.QueueUtils; import com.ruoyi.common.utils.redis.QueueUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@@ -28,52 +27,52 @@ import java.util.concurrent.TimeUnit;
*/ */
@Slf4j @Slf4j
@Api(value = "延迟队列 演示案例", tags = {"延迟队列"}) @Api(value = "延迟队列 演示案例", tags = {"延迟队列"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/demo/queue/delayed") @RequestMapping("/demo/queue/delayed")
public class DelayedQueueController { public class DelayedQueueController {
@ApiOperation("订阅队列") @ApiOperation("订阅队列")
@GetMapping("/subscribe") @GetMapping("/subscribe")
public AjaxResult<Void> subscribe(@ApiParam("队列名") String queueName) { public R<Void> subscribe(@ApiParam("队列名") String queueName) {
log.info("通道: {} 监听中......", queueName); log.info("通道: {} 监听中......", queueName);
// 项目初始化设置一次即可 // 项目初始化设置一次即可
QueueUtils.subscribeBlockingQueue(queueName, (String orderNum) -> { QueueUtils.subscribeBlockingQueue(queueName, (String orderNum) -> {
// 观察接收时间 // 观察接收时间
log.info("通道: {}, 收到数据: {}", queueName, orderNum); log.info("通道: {}, 收到数据: {}", queueName, orderNum);
}); });
return AjaxResult.success("操作成功"); return R.ok("操作成功");
} }
@ApiOperation("添加队列数据") @ApiOperation("添加队列数据")
@GetMapping("/add") @GetMapping("/add")
public AjaxResult<Void> add(@ApiParam("队列名") String queueName, public R<Void> add(@ApiParam("队列名") String queueName,
@ApiParam("订单号") String orderNum, @ApiParam("订单号") String orderNum,
@ApiParam("延迟时间(秒)") Long time) { @ApiParam("延迟时间(秒)") Long time) {
QueueUtils.addDelayedQueueObject(queueName, orderNum, time, TimeUnit.SECONDS); QueueUtils.addDelayedQueueObject(queueName, orderNum, time, TimeUnit.SECONDS);
// 观察发送时间 // 观察发送时间
log.info("通道: {} , 发送数据: {}", queueName, orderNum); log.info("通道: {} , 发送数据: {}", queueName, orderNum);
return AjaxResult.success("操作成功"); return R.ok("操作成功");
} }
@ApiOperation("删除队列数据") @ApiOperation("删除队列数据")
@GetMapping("/remove") @GetMapping("/remove")
public AjaxResult<Void> remove(@ApiParam("队列名") String queueName, public R<Void> remove(@ApiParam("队列名") String queueName,
@ApiParam("订单号") String orderNum) { @ApiParam("订单号") String orderNum) {
if (QueueUtils.removeDelayedQueueObject(queueName, orderNum)) { if (QueueUtils.removeDelayedQueueObject(queueName, orderNum)) {
log.info("通道: {} , 删除数据: {}", queueName, orderNum); log.info("通道: {} , 删除数据: {}", queueName, orderNum);
} else { } else {
return AjaxResult.error("操作失败"); return R.fail("操作失败");
} }
return AjaxResult.success("操作成功"); return R.ok("操作成功");
} }
@ApiOperation("销毁队列") @ApiOperation("销毁队列")
@GetMapping("/destroy") @GetMapping("/destroy")
public AjaxResult<Void> destroy(@ApiParam("队列名") String queueName) { public R<Void> destroy(@ApiParam("队列名") String queueName) {
// 用完了一定要销毁 否则会一直存在 // 用完了一定要销毁 否则会一直存在
QueueUtils.destroyDelayedQueue(queueName); QueueUtils.destroyDelayedQueue(queueName);
return AjaxResult.success("操作成功"); return R.ok("操作成功");
} }
} }

2
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java
View File

@@ -2,7 +2,6 @@ package com.ruoyi.demo.controller.queue;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
/** /**
* 实体类 注意不允许使用内部类 否则会找不到类 * 实体类 注意不允许使用内部类 否则会找不到类
@@ -11,7 +10,6 @@ import lombok.experimental.Accessors;
* @version 3.6.0 * @version 3.6.0
*/ */
@Data @Data
@Accessors(chain = true)
@NoArgsConstructor @NoArgsConstructor
public class PriorityDemo { public class PriorityDemo {
private String name; private String name;

29
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java
View File

@@ -1,14 +1,13 @@
package com.ruoyi.demo.controller.queue; package com.ruoyi.demo.controller.queue;
import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.RandomUtil;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.redis.QueueUtils; import com.ruoyi.common.utils.redis.QueueUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@@ -26,14 +25,14 @@ import org.springframework.web.bind.annotation.RestController;
*/ */
@Slf4j @Slf4j
@Api(value = "优先队列 演示案例", tags = {"优先队列"}) @Api(value = "优先队列 演示案例", tags = {"优先队列"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/demo/queue/priority") @RequestMapping("/demo/queue/priority")
public class PriorityQueueController { public class PriorityQueueController {
@ApiOperation("添加队列数据") @ApiOperation("添加队列数据")
@GetMapping("/add") @GetMapping("/add")
public AjaxResult<Void> add(@ApiParam("队列名") String queueName) { public R<Void> add(@ApiParam("队列名") String queueName) {
// 用完了一定要销毁 否则会一直存在 // 用完了一定要销毁 否则会一直存在
boolean b = QueueUtils.destroyPriorityQueueObject(queueName); boolean b = QueueUtils.destroyPriorityQueueObject(queueName);
log.info("通道: {} , 删除: {}", queueName, b); log.info("通道: {} , 删除: {}", queueName, b);
@@ -43,43 +42,47 @@ public class PriorityQueueController {
log.info("通道: {} , 设置比较器成功", queueName); log.info("通道: {} , 设置比较器成功", queueName);
} else { } else {
log.info("通道: {} , 设置比较器失败", queueName); log.info("通道: {} , 设置比较器失败", queueName);
return AjaxResult.error("操作失败"); return R.fail("操作失败");
} }
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
int randomNum = RandomUtil.randomInt(10); int randomNum = RandomUtil.randomInt(10);
PriorityDemo data = new PriorityDemo().setName("data-" + i).setOrderNum(randomNum); PriorityDemo data = new PriorityDemo();
data.setName("data-" + i);
data.setOrderNum(randomNum);
if (QueueUtils.addPriorityQueueObject(queueName, data)) { if (QueueUtils.addPriorityQueueObject(queueName, data)) {
log.info("通道: {} , 发送数据: {}", queueName, data); log.info("通道: {} , 发送数据: {}", queueName, data);
} else { } else {
log.info("通道: {} , 发送数据: {}, 发送失败", queueName, data); log.info("通道: {} , 发送数据: {}, 发送失败", queueName, data);
} }
} }
return AjaxResult.success("操作成功"); return R.ok("操作成功");
} }
@ApiOperation("删除队列数据") @ApiOperation("删除队列数据")
@GetMapping("/remove") @GetMapping("/remove")
public AjaxResult<Void> remove(@ApiParam("队列名") String queueName, public R<Void> remove(@ApiParam("队列名") String queueName,
@ApiParam("对象名") String name, @ApiParam("对象名") String name,
@ApiParam("排序号") Integer orderNum) { @ApiParam("排序号") Integer orderNum) {
PriorityDemo data = new PriorityDemo().setName(name).setOrderNum(orderNum); PriorityDemo data = new PriorityDemo();
data.setName(name);
data.setOrderNum(orderNum);
if (QueueUtils.removePriorityQueueObject(queueName, data)) { if (QueueUtils.removePriorityQueueObject(queueName, data)) {
log.info("通道: {} , 删除数据: {}", queueName, data); log.info("通道: {} , 删除数据: {}", queueName, data);
} else { } else {
return AjaxResult.error("操作失败"); return R.fail("操作失败");
} }
return AjaxResult.success("操作成功"); return R.ok("操作成功");
} }
@ApiOperation("获取队列数据") @ApiOperation("获取队列数据")
@GetMapping("/get") @GetMapping("/get")
public AjaxResult<Void> get(@ApiParam("队列名") String queueName) { public R<Void> get(@ApiParam("队列名") String queueName) {
PriorityDemo data; PriorityDemo data;
do { do {
data = QueueUtils.getPriorityQueueObject(queueName); data = QueueUtils.getPriorityQueueObject(queueName);
log.info("通道: {} , 获取数据: {}", queueName, data); log.info("通道: {} , 获取数据: {}", queueName, data);
} while (data != null); } while (data != null);
return AjaxResult.success("操作成功"); return R.ok("操作成功");
} }
} }

2
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java
View File

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/** /**
* 测试单表对象 test_demo * 测试单表对象 test_demo
@@ -14,7 +13,6 @@ import lombok.experimental.Accessors;
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("test_demo") @TableName("test_demo")
public class TestDemo extends BaseEntity { public class TestDemo extends BaseEntity {

2
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java
View File

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.Version;
import com.ruoyi.common.core.domain.TreeEntity; import com.ruoyi.common.core.domain.TreeEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/** /**
* 测试树表对象 test_tree * 测试树表对象 test_tree
@@ -17,7 +16,6 @@ import lombok.experimental.Accessors;
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("test_tree") @TableName("test_tree")
public class TestTree extends TreeEntity { public class TestTree extends TreeEntity {

2
ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-dev.yml
View File

@@ -9,6 +9,6 @@ spring:
# 设置 Spring Boot Admin Server 地址 # 设置 Spring Boot Admin Server 地址
url: http://localhost:9090/admin url: http://localhost:9090/admin
instance: instance:
prefer-ip: true # 注册实例时，优先使用 IP service-host-type: IP
username: ruoyi username: ruoyi
password: 123456 password: 123456

2
ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-prod.yml
View File

@@ -9,6 +9,6 @@ spring:
# 设置 Spring Boot Admin Server 地址 # 设置 Spring Boot Admin Server 地址
url: http://172.30.0.90:9090/admin url: http://172.30.0.90:9090/admin
instance: instance:
prefer-ip: true # 注册实例时，优先使用 IP service-host-type: IP
username: ruoyi username: ruoyi
password: 123456 password: 123456

2
ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml
View File

@@ -9,7 +9,7 @@ spring:
# 设置 Spring Boot Admin Server 地址 # 设置 Spring Boot Admin Server 地址
url: http://localhost:9090/admin url: http://localhost:9090/admin
instance: instance:
prefer-ip: true # 注册实例时，优先使用 IP service-host-type: IP
username: ruoyi username: ruoyi
password: 123456 password: 123456

2
ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml
View File

@@ -9,7 +9,7 @@ spring:
# 设置 Spring Boot Admin Server 地址 # 设置 Spring Boot Admin Server 地址
url: http://172.30.0.90:9090/admin url: http://172.30.0.90:9090/admin
instance: instance:
prefer-ip: true # 注册实例时，优先使用 IP service-host-type: IP
username: ruoyi username: ruoyi
password: 123456 password: 123456

11
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
View File

@@ -1,12 +1,13 @@
package com.ruoyi.framework.aspectj; package com.ruoyi.framework.aspectj;
import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.dto.OperLogDTO; import com.ruoyi.common.core.domain.dto.OperLogDTO;
import com.ruoyi.common.core.service.OperLogService; import com.ruoyi.common.core.service.OperLogService;
import com.ruoyi.common.enums.BusinessStatus; import com.ruoyi.common.enums.BusinessStatus;
import com.ruoyi.common.enums.HttpMethod; import com.ruoyi.common.enums.HttpMethod;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.JsonUtils; import com.ruoyi.common.utils.JsonUtils;
import com.ruoyi.common.utils.LoginUtils;
import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.common.utils.spring.SpringUtils;
@@ -66,7 +67,7 @@ public class LogAspect {
String ip = ServletUtils.getClientIP(); String ip = ServletUtils.getClientIP();
operLog.setOperIp(ip); operLog.setOperIp(ip);
operLog.setOperUrl(ServletUtils.getRequest().getRequestURI()); operLog.setOperUrl(ServletUtils.getRequest().getRequestURI());
operLog.setOperName(LoginUtils.getUsername()); operLog.setOperName(LoginHelper.getUsername());
if (e != null) { if (e != null) {
operLog.setStatus(BusinessStatus.FAIL.ordinal()); operLog.setStatus(BusinessStatus.FAIL.ordinal());
@@ -110,7 +111,7 @@ public class LogAspect {
setRequestValue(joinPoint, operLog); setRequestValue(joinPoint, operLog);
} }
// 是否需要保存response，参数和值 // 是否需要保存response，参数和值
if (log.isSaveResponseData() && StringUtils.isNotNull(jsonResult)) { if (log.isSaveResponseData() && ObjectUtil.isNotNull(jsonResult)) {
operLog.setJsonResult(StringUtils.substring(JsonUtils.toJsonString(jsonResult), 0, 2000)); operLog.setJsonResult(StringUtils.substring(JsonUtils.toJsonString(jsonResult), 0, 2000));
} }
} }
@@ -139,7 +140,7 @@ public class LogAspect {
StringBuilder params = new StringBuilder(); StringBuilder params = new StringBuilder();
if (paramsArray != null && paramsArray.length > 0) { if (paramsArray != null && paramsArray.length > 0) {
for (Object o : paramsArray) { for (Object o : paramsArray) {
if (StringUtils.isNotNull(o) && !isFilterObject(o)) { if (ObjectUtil.isNotNull(o) && !isFilterObject(o)) {
try { try {
params.append(JsonUtils.toJsonString(o)).append(" "); params.append(JsonUtils.toJsonString(o)).append(" ");
} catch (Exception e) { } catch (Exception e) {
@@ -175,6 +176,6 @@ public class LogAspect {
} }
} }
return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse
|| o instanceof BindingResult; || o instanceof BindingResult;
} }
} }

4
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
View File

@@ -3,8 +3,8 @@ package com.ruoyi.framework.aspectj;
import com.ruoyi.common.annotation.RateLimiter; import com.ruoyi.common.annotation.RateLimiter;
import com.ruoyi.common.enums.LimitType; import com.ruoyi.common.enums.LimitType;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.redis.RedisUtils;
import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.redis.RedisUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.JoinPoint; import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Aspect;
@@ -52,7 +52,7 @@ public class RateLimiterAspect {
if (rateLimiter.limitType() == LimitType.IP) { if (rateLimiter.limitType() == LimitType.IP) {
// 获取请求ip // 获取请求ip
stringBuffer.append(ServletUtils.getClientIP()).append("-"); stringBuffer.append(ServletUtils.getClientIP()).append("-");
} else if (rateLimiter.limitType() == LimitType.CLUSTER){ } else if (rateLimiter.limitType() == LimitType.CLUSTER) {
// 获取客户端实例id // 获取客户端实例id
stringBuffer.append(RedisUtils.getClient().getId()).append("-"); stringBuffer.append(RedisUtils.getClient().getId()).append("-");
} }

8
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java
View File

@@ -1,21 +1,21 @@
package com.ruoyi.framework.aspectj; package com.ruoyi.framework.aspectj;
import cn.dev33.satoken.SaManager; import cn.dev33.satoken.SaManager;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.SecureUtil;
import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.JsonUtils; import com.ruoyi.common.utils.JsonUtils;
import com.ruoyi.common.utils.redis.RedisUtils;
import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.redis.RedisUtils;
import com.ruoyi.framework.config.properties.RepeatSubmitProperties; import com.ruoyi.framework.config.properties.RepeatSubmitProperties;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.JoinPoint; import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before; import org.aspectj.lang.annotation.Before;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit;
* @author Lion Li * @author Lion Li
*/ */
@Slf4j @Slf4j
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@Aspect @Aspect
@Component @Component
public class RepeatSubmitAspect { public class RepeatSubmitAspect {
@@ -76,7 +76,7 @@ public class RepeatSubmitAspect {
StringBuilder params = new StringBuilder(); StringBuilder params = new StringBuilder();
if (paramsArray != null && paramsArray.length > 0) { if (paramsArray != null && paramsArray.length > 0) {
for (Object o : paramsArray) { for (Object o : paramsArray) {
if (StringUtils.isNotNull(o) && !isFilterObject(o)) { if (ObjectUtil.isNotNull(o) && !isFilterObject(o)) {
try { try {
params.append(JsonUtils.toJsonString(o)).append(" "); params.append(JsonUtils.toJsonString(o)).append(" ");
} catch (Exception e) { } catch (Exception e) {

27
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
View File

@@ -11,15 +11,14 @@ import org.redisson.config.Config;
import org.redisson.spring.cache.CacheConfig; import org.redisson.spring.cache.CacheConfig;
import org.redisson.spring.cache.RedissonSpringCacheManager; import org.redisson.spring.cache.RedissonSpringCacheManager;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.data.redis.RedisProperties; import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
import org.springframework.cache.CacheManager; import org.springframework.cache.CacheManager;
import org.springframework.cache.annotation.CachingConfigurerSupport; import org.springframework.cache.annotation.CachingConfigurerSupport;
import org.springframework.cache.annotation.EnableCaching; import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -44,9 +43,9 @@ public class RedisConfig extends CachingConfigurerSupport {
@Autowired @Autowired
private RedissonProperties redissonProperties; private RedissonProperties redissonProperties;
@Primary
@Bean(destroyMethod = "shutdown") @Bean(destroyMethod = "shutdown")
@ConditionalOnMissingBean(RedissonClient.class) public RedissonClient redisson() {
public RedissonClient redisson() throws IOException {
String prefix = REDIS_PROTOCOL_PREFIX; String prefix = REDIS_PROTOCOL_PREFIX;
if (redisProperties.isSsl()) { if (redisProperties.isSsl()) {
prefix = REDISS_PROTOCOL_PREFIX; prefix = REDISS_PROTOCOL_PREFIX;
@@ -68,14 +67,11 @@ public class RedisConfig extends CachingConfigurerSupport {
.setTimeout(singleServerConfig.getTimeout()) .setTimeout(singleServerConfig.getTimeout())
.setRetryAttempts(singleServerConfig.getRetryAttempts()) .setRetryAttempts(singleServerConfig.getRetryAttempts())
.setRetryInterval(singleServerConfig.getRetryInterval()) .setRetryInterval(singleServerConfig.getRetryInterval())
.setSubscriptionsPerConnection(singleServerConfig.getSubscriptionsPerConnection())
.setClientName(singleServerConfig.getClientName()) .setClientName(singleServerConfig.getClientName())
.setIdleConnectionTimeout(singleServerConfig.getIdleConnectionTimeout()) .setIdleConnectionTimeout(singleServerConfig.getIdleConnectionTimeout())
.setSubscriptionConnectionMinimumIdleSize(singleServerConfig.getSubscriptionConnectionMinimumIdleSize())
.setSubscriptionConnectionPoolSize(singleServerConfig.getSubscriptionConnectionPoolSize()) .setSubscriptionConnectionPoolSize(singleServerConfig.getSubscriptionConnectionPoolSize())
.setConnectionMinimumIdleSize(singleServerConfig.getConnectionMinimumIdleSize()) .setConnectionMinimumIdleSize(singleServerConfig.getConnectionMinimumIdleSize())
.setConnectionPoolSize(singleServerConfig.getConnectionPoolSize()) .setConnectionPoolSize(singleServerConfig.getConnectionPoolSize());
.setDnsMonitoringInterval(singleServerConfig.getDnsMonitoringInterval());
} }
// 集群配置方式 参考下方注释 // 集群配置方式 参考下方注释
RedissonProperties.ClusterServersConfig clusterServersConfig = redissonProperties.getClusterServersConfig(); RedissonProperties.ClusterServersConfig clusterServersConfig = redissonProperties.getClusterServersConfig();
@@ -93,19 +89,14 @@ public class RedisConfig extends CachingConfigurerSupport {
.setTimeout(clusterServersConfig.getTimeout()) .setTimeout(clusterServersConfig.getTimeout())
.setRetryAttempts(clusterServersConfig.getRetryAttempts()) .setRetryAttempts(clusterServersConfig.getRetryAttempts())
.setRetryInterval(clusterServersConfig.getRetryInterval()) .setRetryInterval(clusterServersConfig.getRetryInterval())
.setSubscriptionsPerConnection(clusterServersConfig.getSubscriptionsPerConnection())
.setClientName(clusterServersConfig.getClientName()) .setClientName(clusterServersConfig.getClientName())
.setIdleConnectionTimeout(clusterServersConfig.getIdleConnectionTimeout()) .setIdleConnectionTimeout(clusterServersConfig.getIdleConnectionTimeout())
.setPingConnectionInterval(clusterServersConfig.getPingConnectionInterval()) .setPingConnectionInterval(clusterServersConfig.getPingConnectionInterval())
.setSubscriptionConnectionMinimumIdleSize(clusterServersConfig.getSubscriptionConnectionMinimumIdleSize())
.setSubscriptionConnectionPoolSize(clusterServersConfig.getSubscriptionConnectionPoolSize()) .setSubscriptionConnectionPoolSize(clusterServersConfig.getSubscriptionConnectionPoolSize())
.setMasterConnectionMinimumIdleSize(clusterServersConfig.getMasterConnectionMinimumIdleSize()) .setMasterConnectionMinimumIdleSize(clusterServersConfig.getMasterConnectionMinimumIdleSize())
.setMasterConnectionPoolSize(clusterServersConfig.getMasterConnectionPoolSize()) .setMasterConnectionPoolSize(clusterServersConfig.getMasterConnectionPoolSize())
.setSlaveConnectionMinimumIdleSize(clusterServersConfig.getSlaveConnectionMinimumIdleSize()) .setSlaveConnectionMinimumIdleSize(clusterServersConfig.getSlaveConnectionMinimumIdleSize())
.setSlaveConnectionPoolSize(clusterServersConfig.getSlaveConnectionPoolSize()) .setSlaveConnectionPoolSize(clusterServersConfig.getSlaveConnectionPoolSize())
.setDnsMonitoringInterval(clusterServersConfig.getDnsMonitoringInterval())
.setFailedSlaveReconnectionInterval(clusterServersConfig.getFailedSlaveReconnectionInterval())
.setScanInterval(clusterServersConfig.getScanInterval())
.setReadMode(clusterServersConfig.getReadMode()) .setReadMode(clusterServersConfig.getReadMode())
.setSubscriptionMode(clusterServersConfig.getSubscriptionMode()) .setSubscriptionMode(clusterServersConfig.getSubscriptionMode())
.setNodeAddresses(nodes); .setNodeAddresses(nodes);
@@ -177,18 +168,8 @@ public class RedisConfig extends CachingConfigurerSupport {
* retryAttempts: 3 * retryAttempts: 3
* # 命令重试发送时间间隔，单位：毫秒 * # 命令重试发送时间间隔，单位：毫秒
* retryInterval: 1500 * retryInterval: 1500
* # 从可用服务器的内部列表中排除 Redis Slave 重新连接尝试的间隔。
* failedSlaveReconnectionInterval: 3000
* # 发布和订阅连接池最小空闲连接数
* subscriptionConnectionMinimumIdleSize: 1
* # 发布和订阅连接池大小 * # 发布和订阅连接池大小
* subscriptionConnectionPoolSize: 50 * subscriptionConnectionPoolSize: 50
* # 单个连接最大订阅数量
* subscriptionsPerConnection: 5
* # 扫描间隔
* scanInterval: 1000
* # DNS监测时间间隔，单位：毫秒
* dnsMonitoringInterval: 5000
* # 读取模式 * # 读取模式
* readMode: "SLAVE" * readMode: "SLAVE"
* # 订阅模式 * # 订阅模式

Some files were not shown because too many files have changed in this diff Show More