jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 去除链式调用注解 不符合规范导致很多奇葩问题 例如: copy为空问题

Browse Source
This commit is contained in:
疯狂的狮子Li
2022-01-25 21:50:54 +08:00
parent 03bda9422d
commit 3706d2e1db
51 changed files with 56 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
View File

@ -11,7 +11,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
@ -24,7 +23,6 @@ import javax.validation.constraints.Size;
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("sys_config")
@ExcelIgnoreUnannotated
@ApiModel("参数配置业务对象")

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
View File

@ -10,7 +10,6 @@ import com.ruoyi.common.convert.ExcelDictConvert;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
@ -24,7 +23,6 @@ import java.util.Map;
*/
@Data
@Accessors(chain = true)
@TableName("sys_logininfor")
@ExcelIgnoreUnannotated
@ApiModel("系统访问记录业务对象")

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
View File

@ -7,7 +7,6 @@ import com.ruoyi.common.xss.Xss;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
@ -20,7 +19,6 @@ import javax.validation.constraints.Size;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("sys_notice")
public class SysNotice extends BaseEntity {

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
View File

@ -10,7 +10,6 @@ import com.ruoyi.common.convert.ExcelDictConvert;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
@ -24,7 +23,6 @@ import java.util.Map;
*/
@Data
@Accessors(chain = true)
@TableName("sys_oper_log")
@ExcelIgnoreUnannotated
@ApiModel("操作日志记录业务对象")

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java
View File

@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* OSS对象存储对象
@ -15,7 +14,6 @@ import lombok.experimental.Accessors;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("sys_oss")
public class SysOss extends BaseEntity {

1
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java
View File

@ -14,7 +14,6 @@ import lombok.experimental.Accessors;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("sys_oss_config")
public class SysOssConfig extends BaseEntity {

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
View File

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

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
View File

@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 角色和部门关联 sys_role_dept
@ -15,7 +14,6 @@ import lombok.experimental.Accessors;
*/
@Data
@Accessors(chain = true)
@TableName("sys_role_dept")
@ApiModel("角色和部门关联")
public class SysRoleDept {

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
View File

@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 角色和菜单关联 sys_role_menu
@ -15,7 +14,6 @@ import lombok.experimental.Accessors;
*/
@Data
@Accessors(chain = true)
@TableName("sys_role_menu")
@ApiModel("角色和菜单关联")
public class SysRoleMenu {

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java
View File

@ -3,7 +3,6 @@ package com.ruoyi.system.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 当前在线会话
@ -12,7 +11,6 @@ import lombok.experimental.Accessors;
*/
@Data
@Accessors(chain = true)
@ApiModel("当前在线会话业务对象")
public class SysUserOnline {

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java
View File

@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 用户和岗位关联 sys_user_post
@ -15,7 +14,6 @@ import lombok.experimental.Accessors;
*/
@Data
@Accessors(chain = true)
@TableName("sys_user_post")
@ApiModel("用户和岗位关联")
public class SysUserPost {

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java
View File

@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 用户和角色关联 sys_user_role
@ -15,7 +14,6 @@ import lombok.experimental.Accessors;
*/
@Data
@Accessors(chain = true)
@TableName("sys_user_role")
@ApiModel("用户和角色关联")
public class SysUserRole {

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
View File

@ -4,7 +4,6 @@ import com.ruoyi.common.utils.StringUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 路由显示信息
@ -13,7 +12,6 @@ import lombok.experimental.Accessors;
*/
@Data
@Accessors(chain = true)
@ApiModel("路由显示信息")
public class MetaVo {

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
View File

@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.List;
@ -14,7 +13,6 @@ import java.util.List;
* @author Lion Li
*/
@Data
@Accessors(chain = true)
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@ApiModel("路由配置信息")
public class RouterVo {

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java
View File

@ -5,7 +5,6 @@ import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
@ -18,7 +17,6 @@ import java.util.Date;
@Data
@NoArgsConstructor
@Accessors(chain = true)
public class SysUserExportVo implements Serializable {
private static final long serialVersionUID = 1L;

3
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
View File

@ -100,7 +100,8 @@ public class SysLogininforServiceImpl implements ISysLogininforService, Logininf
.between(params.get("beginTime") != null && params.get("endTime") != null,
SysLogininfor::getLoginTime, params.get("beginTime"), params.get("endTime"));
if (StringUtils.isBlank(pageQuery.getOrderByColumn())) {
pageQuery.setOrderByColumn("info_id").setIsAsc("desc");
pageQuery.setOrderByColumn("info_id");
pageQuery.setIsAsc("desc");
}
Page<SysLogininfor> page = baseMapper.selectPage(pageQuery.build(), lqw);
return TableDataInfo.build(page);

3
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
View File

@ -65,7 +65,8 @@ public class SysOperLogServiceImpl implements ISysOperLogService, OperLogService
.between(params.get("beginTime") != null && params.get("endTime") != null,
SysOperLog::getOperTime, params.get("beginTime"), params.get("endTime"));
if (StringUtils.isBlank(pageQuery.getOrderByColumn())) {
pageQuery.setOrderByColumn("oper_id").setIsAsc("desc");
pageQuery.setOrderByColumn("oper_id");
pageQuery.setIsAsc("desc");
}
Page<SysOperLog> page = baseMapper.selectPage(pageQuery.build(), lqw);
return TableDataInfo.build(page);

12
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java
View File

@ -73,12 +73,12 @@ public class SysOssServiceImpl implements ISysOssService {
throw new ServiceException(e.getMessage());
}
// 保存文件信息
SysOss oss = new SysOss()
.setUrl(uploadResult.getUrl())
.setFileSuffix(suffix)
.setFileName(uploadResult.getFilename())
.setOriginalName(originalfileName)
.setService(storage.getServiceType().getValue());
SysOss oss = new SysOss();
oss.setUrl(uploadResult.getUrl());
oss.setFileSuffix(suffix);
oss.setFileName(uploadResult.getFilename());
oss.setOriginalName(originalfileName);
oss.setService(storage.getServiceType().getValue());
baseMapper.insert(oss);
return oss;
}