xieyinlu/ruoyi-ai
1
0
Fork 0
mirror of https://gitcode.com/ageerle/ruoyi-ai.git synced 2026-04-08 09:17:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: 全局格式化代码

Browse Source
This commit is contained in:
evo
2025-12-06 14:38:41 +08:00
parent 96c53390aa
commit 7c7d5838cd
538 changed files with 21132 additions and 14160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/monitor/SysLogininforController.java
View File

@@ -55,6 +55,7 @@ public class SysLogininforController extends BaseController {
/**
* 批量删除登录日志
*
* @param infoIds 日志ids
*/
@SaCheckPermission("monitor:logininfor:remove")

1
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/monitor/SysOperlogController.java
View File

@@ -53,6 +53,7 @@ public class SysOperlogController extends BaseController {
/**
* 批量删除操作日志记录
*
* @param operIds 日志ids
*/
@Log(title = "操作日志", businessType = BusinessType.DELETE)

8
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/monitor/SysUserOnlineController.java
View File

@@ -54,16 +54,16 @@ public class SysUserOnlineController extends BaseController {
}
if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) {
userOnlineDTOList = StreamUtils.filter(userOnlineDTOList, userOnline ->
StringUtils.equals(ipaddr, userOnline.getIpaddr()) &&
StringUtils.equals(userName, userOnline.getUserName())
StringUtils.equals(ipaddr, userOnline.getIpaddr()) &&
StringUtils.equals(userName, userOnline.getUserName())
);
} else if (StringUtils.isNotEmpty(ipaddr)) {
userOnlineDTOList = StreamUtils.filter(userOnlineDTOList, userOnline ->
StringUtils.equals(ipaddr, userOnline.getIpaddr())
StringUtils.equals(ipaddr, userOnline.getIpaddr())
);
} else if (StringUtils.isNotEmpty(userName)) {
userOnlineDTOList = StreamUtils.filter(userOnlineDTOList, userOnline ->
StringUtils.equals(userName, userOnline.getUserName())
StringUtils.equals(userName, userOnline.getUserName())
);
}
Collections.reverse(userOnlineDTOList);

4
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysDeptController.java
View File

@@ -50,7 +50,7 @@ public class SysDeptController extends BaseController {
public R<List<SysDeptVo>> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) {
List<SysDeptVo> depts = deptService.selectDeptList(new SysDeptBo());
depts.removeIf(d -> d.getDeptId().equals(deptId)
|| StringUtils.splitList(d.getAncestors()).contains(Convert.toStr(deptId)));
|| StringUtils.splitList(d.getAncestors()).contains(Convert.toStr(deptId)));
return R.ok(depts);
}
@@ -93,7 +93,7 @@ public class SysDeptController extends BaseController {
} else if (dept.getParentId().equals(deptId)) {
return R.fail("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
} else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
&& deptService.selectNormalChildrenDeptById(deptId) > 0) {
&& deptService.selectNormalChildrenDeptById(deptId) > 0) {
return R.fail("该部门包含未停用的子部门！");
}
return toAjax(deptService.updateDept(dept));

1
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysDictTypeController.java
View File

@@ -39,6 +39,7 @@ public class SysDictTypeController extends BaseController {
public TableDataInfo<SysDictTypeVo> all(SysDictTypeBo dictType, PageQuery pageQuery) {
return dictTypeService.selectAll(dictType);
}
/**
* 查询字典类型列表
*/

2
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysNoticeStateController.java
View File

@@ -61,7 +61,7 @@ public class SysNoticeStateController extends BaseController {
*/
@GetMapping("/{id}")
public R<SysNoticeStateVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
@PathVariable Long id) {
return R.ok(sysNoticeStateService.queryById(id));
}

2
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysTenantPackageController.java
View File

@@ -79,7 +79,7 @@ public class SysTenantPackageController extends BaseController {
@SaCheckPermission("system:tenantPackage:query")
@GetMapping("/{packageId}")
public R<SysTenantPackageVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long packageId) {
@PathVariable Long packageId) {
return R.ok(tenantPackageService.queryById(packageId));
}

13
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysUserController.java
View File

@@ -53,6 +53,7 @@ public class SysUserController extends BaseController {
private final ISysDeptService deptService;
private final ISysTenantService tenantService;
private final ISysOssService ossService;
/**
* 获取用户列表
*/
@@ -69,8 +70,8 @@ public class SysUserController extends BaseController {
public R<List<SysUserOptionVo>> getUserOption() {
List<SysUserVo> sysUserVos = userService.selectUserList(new SysUserBo());
List<SysUserOptionVo> collect = sysUserVos.stream()
.map(this::convertToUserOptionVo)
.collect(Collectors.toList());
.map(this::convertToUserOptionVo)
.collect(Collectors.toList());
return R.ok(collect);
}
@@ -176,10 +177,10 @@ public class SysUserController extends BaseController {
return R.fail("当前租户下用户名额不足，请联系管理员");
}
}
if(StringUtils.isEmpty(user.getPassword())){
if (StringUtils.isEmpty(user.getPassword())) {
user.setPassword("123456");
}
if(StringUtils.isEmpty(user.getNickName())){
if (StringUtils.isEmpty(user.getNickName())) {
user.setNickName(user.getUserName());
}
user.setDeptId(103L);
@@ -211,7 +212,7 @@ public class SysUserController extends BaseController {
*/
@Log(title = "修改用户名称", businessType = BusinessType.UPDATE)
@PostMapping("/editName")
public R<Void> editName(@RequestBody @Validated UserRequest userRequest) {
public R<Void> editName(@RequestBody @Validated UserRequest userRequest) {
LoginUser loginUser = LoginHelper.getLoginUser();
userService.updateUserName(loginUser.getUserId(), userRequest.getNickName());
return R.ok("操作成功!");
@@ -327,7 +328,7 @@ public class SysUserController extends BaseController {
* 根据部门ID统计用户数量 /system/user/list/dept/
*
* @param deptId 部门ID
*/
*/
@SaCheckPermission("system:user:list:dept")
@GetMapping("/list/dept/{deptId}")
public R<List<SysUserVo>> countUsersByDept(@PathVariable Long deptId) {

4
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/listener/CustomerBigDecimalSerialize.java
View File

@@ -11,13 +11,13 @@ import java.util.Objects;
public class CustomerBigDecimalSerialize extends JsonSerializer<BigDecimal> {
@Override
public void serialize(BigDecimal value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
if(Objects.nonNull(value)) {
if (Objects.nonNull(value)) {
//返回到前端的数据为数字类型,前端接收有可能丢失精度
//gen.writeNumber(value.stripTrailingZeros());
//返回到前端的数据为字符串类型
gen.writeString(value.stripTrailingZeros().toPlainString());
//去除0后缀,如果想统一进行保留精度，也可以采用类似处理
}else {//如果为null的话，就写null
} else {//如果为null的话，就写null
gen.writeNull();
}
}

9
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/listener/SysUserImportListener.java
View File

@@ -35,14 +35,13 @@ public class SysUserImportListener extends AnalysisEventListener<SysUserImportVo
private final Boolean isUpdateSupport;
private final Long operUserId;
private int successNum = 0;
private int failureNum = 0;
private final StringBuilder successMsg = new StringBuilder();
private final StringBuilder failureMsg = new StringBuilder();
private int successNum = 0;
private int failureNum = 0;
public SysUserImportListener(Boolean isUpdateSupport) {
// String initPassword = SpringUtils.getBean(ISysConfigService.class).selectConfigByKey("sys.user.initPassword");
// String initPassword = SpringUtils.getBean(ISysConfigService.class).selectConfigByKey("sys.user.initPassword");
this.userService = SpringUtils.getBean(ISysUserService.class);
this.password = BCrypt.hashpw("123456");
this.isUpdateSupport = isUpdateSupport;
@@ -57,7 +56,7 @@ public class SysUserImportListener extends AnalysisEventListener<SysUserImportVo
if (ObjectUtil.isNull(sysUser)) {
SysUserBo user = BeanUtil.toBean(userVo, SysUserBo.class);
ValidatorUtils.validate(user);
if(StringUtils.isEmpty(user.getNickName())){
if (StringUtils.isEmpty(user.getNickName())) {
user.setNickName(user.getUserName());
}
user.setDeptId(103L);

20
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/SysRegisterService.java
View File

@@ -42,14 +42,14 @@ public class SysRegisterService {
String tenantId = Constants.TENANT_ID;
if(StringUtils.isNotBlank(registerBody.getTenantId())){
if (StringUtils.isNotBlank(registerBody.getTenantId())) {
tenantId = registerBody.getTenantId();
}
String username = registerBody.getUsername();
String password = registerBody.getPassword();
// 检查验证码是否正确
validateEmail(username,registerBody.getCode());
validateEmail(username, registerBody.getCode());
SysUserBo sysUser = new SysUserBo();
sysUser.setDomainName(registerBody.getDomainName());
sysUser.setUserName(username);
@@ -78,12 +78,12 @@ public class SysRegisterService {
String username = registerBody.getUsername();
String password = registerBody.getPassword();
SysUserVo user = userService.selectUserByUserName(username);
if(user == null){
throw new UserException(String.format("用户【%s】,未注册!",username));
if (user == null) {
throw new UserException(String.format("用户【%s】,未注册!", username));
}
// 检查验证码是否正确
validateEmail(username,registerBody.getCode());
userService.resetUserPwd(user.getUserId(),BCrypt.hashpw(password));
validateEmail(username, registerBody.getCode());
userService.resetUserPwd(user.getUserId(), BCrypt.hashpw(password));
}
/**
@@ -91,12 +91,12 @@ public class SysRegisterService {
*
* @param username 用户名
*/
public void validateEmail(String username,String code) {
public void validateEmail(String username, String code) {
String key = GlobalConstants.CAPTCHA_CODE_KEY + username;
String captcha = RedisUtils.getCacheObject(key);
if(code.equals(captcha)){
String captcha = RedisUtils.getCacheObject(key);
if (code.equals(captcha)) {
RedisUtils.deleteObject(captcha);
}else {
} else {
throw new BaseException("验证码错误,请重试！");
}
}