diff --git a/ruoyi/src/main/java/com/ruoyi/common/config/RuoYiConfig.java b/ruoyi/src/main/java/com/ruoyi/common/config/RuoYiConfig.java index d5d8723f1..682bebda4 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/config/RuoYiConfig.java +++ b/ruoyi/src/main/java/com/ruoyi/common/config/RuoYiConfig.java @@ -1,5 +1,9 @@ package com.ruoyi.common.config; +import lombok.Data; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -8,6 +12,10 @@ import org.springframework.stereotype.Component; * * @author ruoyi */ + +@Data +@NoArgsConstructor +@Accessors(chain = true) @Component @ConfigurationProperties(prefix = "ruoyi") public class RuoYiConfig @@ -25,66 +33,18 @@ public class RuoYiConfig private boolean demoEnabled; /** 上传路径 */ + @Getter private static String profile; /** 获取地址开关 */ + @Getter private static boolean addressEnabled; - public String getName() - { - return name; - } - - public void setName(String name) - { - this.name = name; - } - - public String getVersion() - { - return version; - } - - public void setVersion(String version) - { - this.version = version; - } - - public String getCopyrightYear() - { - return copyrightYear; - } - - public void setCopyrightYear(String copyrightYear) - { - this.copyrightYear = copyrightYear; - } - - public boolean isDemoEnabled() - { - return demoEnabled; - } - - public void setDemoEnabled(boolean demoEnabled) - { - this.demoEnabled = demoEnabled; - } - - public static String getProfile() - { - return profile; - } - public void setProfile(String profile) { RuoYiConfig.profile = profile; } - public static boolean isAddressEnabled() - { - return addressEnabled; - } - public void setAddressEnabled(boolean addressEnabled) { RuoYiConfig.addressEnabled = addressEnabled; diff --git a/ruoyi/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java index f7d5bf46d..55655bff4 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/ruoyi/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java @@ -1,16 +1,24 @@ package com.ruoyi.common.core.domain; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonFormat; /** * Entity基类 * * @author ruoyi */ + +@Data +@NoArgsConstructor +@Accessors(chain = true) public class BaseEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -36,79 +44,6 @@ public class BaseEntity implements Serializable private String remark; /** 请求参数 */ - private Map params; + private Map params = new HashMap<>(); - public String getSearchValue() - { - return searchValue; - } - - public void setSearchValue(String searchValue) - { - this.searchValue = searchValue; - } - - public String getCreateBy() - { - return createBy; - } - - public void setCreateBy(String createBy) - { - this.createBy = createBy; - } - - public Date getCreateTime() - { - return createTime; - } - - public void setCreateTime(Date createTime) - { - this.createTime = createTime; - } - - public String getUpdateBy() - { - return updateBy; - } - - public void setUpdateBy(String updateBy) - { - this.updateBy = updateBy; - } - - public Date getUpdateTime() - { - return updateTime; - } - - public void setUpdateTime(Date updateTime) - { - this.updateTime = updateTime; - } - - public String getRemark() - { - return remark; - } - - public void setRemark(String remark) - { - this.remark = remark; - } - - public Map getParams() - { - if (params == null) - { - params = new HashMap<>(); - } - return params; - } - - public void setParams(Map params) - { - this.params = params; - } } diff --git a/ruoyi/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/ruoyi/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java index a180a18c5..09c82c061 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java +++ b/ruoyi/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java @@ -1,5 +1,8 @@ package com.ruoyi.common.core.domain; +import lombok.*; +import lombok.experimental.Accessors; + import java.util.ArrayList; import java.util.List; @@ -8,6 +11,11 @@ import java.util.List; * * @author ruoyi */ + +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@Accessors(chain = true) public class TreeEntity extends BaseEntity { private static final long serialVersionUID = 1L; @@ -27,53 +35,4 @@ public class TreeEntity extends BaseEntity /** 子部门 */ private List children = new ArrayList<>(); - public String getParentName() - { - return parentName; - } - - public void setParentName(String parentName) - { - this.parentName = parentName; - } - - public Long getParentId() - { - return parentId; - } - - public void setParentId(Long parentId) - { - this.parentId = parentId; - } - - public Integer getOrderNum() - { - return orderNum; - } - - public void setOrderNum(Integer orderNum) - { - this.orderNum = orderNum; - } - - public String getAncestors() - { - return ancestors; - } - - public void setAncestors(String ancestors) - { - this.ancestors = ancestors; - } - - public List getChildren() - { - return children; - } - - public void setChildren(List children) - { - this.children = children; - } } diff --git a/ruoyi/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java b/ruoyi/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java index bd835db99..2049486fc 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java +++ b/ruoyi/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java @@ -1,17 +1,24 @@ package com.ruoyi.common.core.domain; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.ruoyi.common.core.domain.entity.SysDept; +import com.ruoyi.common.core.domain.entity.SysMenu; +import lombok.*; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.util.List; import java.util.stream.Collectors; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.domain.entity.SysMenu; /** * Treeselect树结构实体类 * * @author ruoyi */ + +@Data +@NoArgsConstructor +@Accessors(chain = true) public class TreeSelect implements Serializable { private static final long serialVersionUID = 1L; @@ -26,11 +33,6 @@ public class TreeSelect implements Serializable @JsonInclude(JsonInclude.Include.NON_EMPTY) private List children; - public TreeSelect() - { - - } - public TreeSelect(SysDept dept) { this.id = dept.getDeptId(); @@ -45,33 +47,4 @@ public class TreeSelect implements Serializable this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); } - public Long getId() - { - return id; - } - - public void setId(Long id) - { - this.id = id; - } - - public String getLabel() - { - return label; - } - - public void setLabel(String label) - { - this.label = label; - } - - public List getChildren() - { - return children; - } - - public void setChildren(List children) - { - this.children = children; - } } diff --git a/ruoyi/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java index c9238e234..5bfcb0594 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/ruoyi/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java @@ -1,24 +1,33 @@ package com.ruoyi.common.core.domain.entity; -import java.util.ArrayList; -import java.util.List; +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.domain.BaseEntity; +import java.io.Serializable; +import java.util.*; /** * 部门表 sys_dept * * @author ruoyi */ -public class SysDept extends BaseEntity + +@Data +@NoArgsConstructor +@Accessors(chain = true) +@TableName("sys_dept") +public class SysDept implements Serializable { private static final long serialVersionUID = 1L; /** 部门ID */ + @TableId(value = "dept_id",type = IdType.AUTO) private Long deptId; /** 父部门ID */ @@ -28,175 +37,61 @@ public class SysDept extends BaseEntity private String ancestors; /** 部门名称 */ + @NotBlank(message = "部门名称不能为空") + @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符") private String deptName; /** 显示顺序 */ + @NotBlank(message = "显示顺序不能为空") private String orderNum; /** 负责人 */ private String leader; /** 联系电话 */ + @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符") private String phone; /** 邮箱 */ + @Email(message = "邮箱格式不正确") + @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") private String email; /** 部门状态:0正常,1停用 */ private String status; /** 删除标志（0代表存在 2代表删除） */ + @TableLogic private String delFlag; /** 父部门名称 */ + @TableField(exist = false) private String parentName; + + /** 创建者 */ + private String createBy; + + /** 创建时间 */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** 更新者 */ + private String updateBy; + + /** 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; /** 子部门 */ + @TableField(exist = false) private List children = new ArrayList(); - public Long getDeptId() - { - return deptId; - } + /** + * 请求参数 + */ + @TableField(exist = false) + private Map params = new HashMap<>(); - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } - - public Long getParentId() - { - return parentId; - } - - public void setParentId(Long parentId) - { - this.parentId = parentId; - } - - public String getAncestors() - { - return ancestors; - } - - public void setAncestors(String ancestors) - { - this.ancestors = ancestors; - } - - @NotBlank(message = "部门名称不能为空") - @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符") - public String getDeptName() - { - return deptName; - } - - public void setDeptName(String deptName) - { - this.deptName = deptName; - } - - @NotBlank(message = "显示顺序不能为空") - public String getOrderNum() - { - return orderNum; - } - - public void setOrderNum(String orderNum) - { - this.orderNum = orderNum; - } - - public String getLeader() - { - return leader; - } - - public void setLeader(String leader) - { - this.leader = leader; - } - - @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符") - public String getPhone() - { - return phone; - } - - public void setPhone(String phone) - { - this.phone = phone; - } - - @Email(message = "邮箱格式不正确") - @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") - public String getEmail() - { - return email; - } - - public void setEmail(String email) - { - this.email = email; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - public String getDelFlag() - { - return delFlag; - } - - public void setDelFlag(String delFlag) - { - this.delFlag = delFlag; - } - - public String getParentName() - { - return parentName; - } - - public void setParentName(String parentName) - { - this.parentName = parentName; - } - - public List getChildren() - { - return children; - } - - public void setChildren(List children) - { - this.children = children; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("deptId", getDeptId()) - .append("parentId", getParentId()) - .append("ancestors", getAncestors()) - .append("deptName", getDeptName()) - .append("orderNum", getOrderNum()) - .append("leader", getLeader()) - .append("phone", getPhone()) - .append("email", getEmail()) - .append("status", getStatus()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } } diff --git a/ruoyi/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/ruoyi/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java index 3f152b340..43ed6e0f2 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java +++ b/ruoyi/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java @@ -1,25 +1,38 @@ package com.ruoyi.common.core.domain.entity; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel.ColumnType; import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; /** * 字典数据表 sys_dict_data * * @author ruoyi */ -public class SysDictData extends BaseEntity + +@Data +@NoArgsConstructor +@Accessors(chain = true) +@TableName("sys_dict_data") +public class SysDictData implements Serializable { private static final long serialVersionUID = 1L; /** 字典编码 */ @Excel(name = "字典编码", cellType = ColumnType.NUMERIC) + @TableId(value = "dict_code",type = IdType.AUTO) private Long dictCode; /** 字典排序 */ @@ -28,17 +41,24 @@ public class SysDictData extends BaseEntity /** 字典标签 */ @Excel(name = "字典标签") + @NotBlank(message = "字典标签不能为空") + @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符") private String dictLabel; /** 字典键值 */ @Excel(name = "字典键值") + @NotBlank(message = "字典键值不能为空") + @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符") private String dictValue; /** 字典类型 */ @Excel(name = "字典类型") + @NotBlank(message = "字典类型不能为空") + @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符") private String dictType; /** 样式属性（其他样式扩展） */ + @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符") private String cssClass; /** 表格字典样式 */ @@ -52,125 +72,34 @@ public class SysDictData extends BaseEntity @Excel(name = "状态", readConverterExp = "0=正常,1=停用") private String status; - public Long getDictCode() - { - return dictCode; - } + /** 创建者 */ + private String createBy; - public void setDictCode(Long dictCode) - { - this.dictCode = dictCode; - } + /** 创建时间 */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; - public Long getDictSort() - { - return dictSort; - } + /** 更新者 */ + private String updateBy; - public void setDictSort(Long dictSort) - { - this.dictSort = dictSort; - } + /** 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; - @NotBlank(message = "字典标签不能为空") - @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符") - public String getDictLabel() - { - return dictLabel; - } + /** 备注 */ + private String remark; - public void setDictLabel(String dictLabel) - { - this.dictLabel = dictLabel; - } - - @NotBlank(message = "字典键值不能为空") - @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符") - public String getDictValue() - { - return dictValue; - } - - public void setDictValue(String dictValue) - { - this.dictValue = dictValue; - } - - @NotBlank(message = "字典类型不能为空") - @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符") - public String getDictType() - { - return dictType; - } - - public void setDictType(String dictType) - { - this.dictType = dictType; - } - - @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符") - public String getCssClass() - { - return cssClass; - } - - public void setCssClass(String cssClass) - { - this.cssClass = cssClass; - } - - public String getListClass() - { - return listClass; - } - - public void setListClass(String listClass) - { - this.listClass = listClass; - } + /** + * 请求参数 + */ + @TableField(exist = false) + private Map params = new HashMap<>(); public boolean getDefault() { return UserConstants.YES.equals(this.isDefault) ? true : false; } - public String getIsDefault() - { - return isDefault; - } - - public void setIsDefault(String isDefault) - { - this.isDefault = isDefault; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("dictCode", getDictCode()) - .append("dictSort", getDictSort()) - .append("dictLabel", getDictLabel()) - .append("dictValue", getDictValue()) - .append("dictType", getDictType()) - .append("cssClass", getCssClass()) - .append("listClass", getListClass()) - .append("isDefault", getIsDefault()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } } diff --git a/ruoyi/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/ruoyi/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java index d2c424986..af2dca8aa 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java +++ b/ruoyi/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java @@ -1,94 +1,78 @@ package com.ruoyi.common.core.domain.entity; +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.annotation.Excel.ColumnType; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; /** * 字典类型表 sys_dict_type * * @author ruoyi */ -public class SysDictType extends BaseEntity + +@Data +@NoArgsConstructor +@Accessors(chain = true) +@TableName("sys_dict_type") +public class SysDictType implements Serializable { private static final long serialVersionUID = 1L; /** 字典主键 */ @Excel(name = "字典主键", cellType = ColumnType.NUMERIC) + @TableId(value = "dict_id",type = IdType.AUTO) private Long dictId; /** 字典名称 */ @Excel(name = "字典名称") + @NotBlank(message = "字典名称不能为空") + @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符") private String dictName; /** 字典类型 */ @Excel(name = "字典类型") + @NotBlank(message = "字典类型不能为空") + @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符") private String dictType; /** 状态（0正常 1停用） */ @Excel(name = "状态", readConverterExp = "0=正常,1=停用") private String status; - public Long getDictId() - { - return dictId; - } + /** 创建者 */ + private String createBy; - public void setDictId(Long dictId) - { - this.dictId = dictId; - } + /** 创建时间 */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; - @NotBlank(message = "字典名称不能为空") - @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符") - public String getDictName() - { - return dictName; - } + /** 更新者 */ + private String updateBy; - public void setDictName(String dictName) - { - this.dictName = dictName; - } + /** 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; - @NotBlank(message = "字典类型不能为空") - @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符") - public String getDictType() - { - return dictType; - } + /** 备注 */ + private String remark; - public void setDictType(String dictType) - { - this.dictType = dictType; - } + /** + * 请求参数 + */ + @TableField(exist = false) + private Map params = new HashMap<>(); - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("dictId", getDictId()) - .append("dictName", getDictName()) - .append("dictType", getDictType()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } } diff --git a/ruoyi/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java index 94d654ae1..f6f6bd2cd 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java +++ b/ruoyi/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java @@ -1,41 +1,56 @@ package com.ruoyi.common.core.domain.entity; -import java.util.ArrayList; -import java.util.List; +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.domain.BaseEntity; +import java.io.Serializable; +import java.util.*; /** * 菜单权限表 sys_menu * * @author ruoyi */ -public class SysMenu extends BaseEntity + +@Data +@NoArgsConstructor +@Accessors(chain = true) +@TableName("sys_menu") +public class SysMenu implements Serializable { private static final long serialVersionUID = 1L; /** 菜单ID */ + @TableId(value = "menu_id",type = IdType.AUTO) private Long menuId; /** 菜单名称 */ + @NotBlank(message = "菜单名称不能为空") + @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符") private String menuName; /** 父菜单名称 */ + @TableField(exist = false) private String parentName; /** 父菜单ID */ private Long parentId; /** 显示顺序 */ + @NotBlank(message = "显示顺序不能为空") private String orderNum; /** 路由地址 */ + @Size(min = 0, max = 200, message = "路由地址不能超过200个字符") private String path; /** 组件路径 */ + @Size(min = 0, max = 200, message = "组件路径不能超过255个字符") private String component; /** 是否为外链（0是 1否） */ @@ -45,6 +60,7 @@ public class SysMenu extends BaseEntity private String isCache; /** 类型（M目录 C菜单 F按钮） */ + @NotBlank(message = "菜单类型不能为空") private String menuType; /** 显示状态（0显示 1隐藏） */ @@ -54,192 +70,37 @@ public class SysMenu extends BaseEntity private String status; /** 权限字符串 */ + @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符") private String perms; /** 菜单图标 */ private String icon; + /** 创建者 */ + private String createBy; + + /** 创建时间 */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** 更新者 */ + private String updateBy; + + /** 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** 备注 */ + private String remark; + + /** 请求参数 */ + @TableField(exist = false) + private Map params = new HashMap<>(); + /** 子菜单 */ + @TableField(exist = false) private List children = new ArrayList(); - public Long getMenuId() - { - return menuId; - } - - public void setMenuId(Long menuId) - { - this.menuId = menuId; - } - - @NotBlank(message = "菜单名称不能为空") - @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符") - public String getMenuName() - { - return menuName; - } - - public void setMenuName(String menuName) - { - this.menuName = menuName; - } - - public String getParentName() - { - return parentName; - } - - public void setParentName(String parentName) - { - this.parentName = parentName; - } - - public Long getParentId() - { - return parentId; - } - - public void setParentId(Long parentId) - { - this.parentId = parentId; - } - - @NotBlank(message = "显示顺序不能为空") - public String getOrderNum() - { - return orderNum; - } - - public void setOrderNum(String orderNum) - { - this.orderNum = orderNum; - } - - @Size(min = 0, max = 200, message = "路由地址不能超过200个字符") - public String getPath() - { - return path; - } - - public void setPath(String path) - { - this.path = path; - } - - @Size(min = 0, max = 200, message = "组件路径不能超过255个字符") - public String getComponent() - { - return component; - } - - public void setComponent(String component) - { - this.component = component; - } - - public String getIsFrame() - { - return isFrame; - } - - public void setIsFrame(String isFrame) - { - this.isFrame = isFrame; - } - - public String getIsCache() - { - return isCache; - } - - public void setIsCache(String isCache) - { - this.isCache = isCache; - } - - @NotBlank(message = "菜单类型不能为空") - public String getMenuType() - { - return menuType; - } - - public void setMenuType(String menuType) - { - this.menuType = menuType; - } - - public String getVisible() - { - return visible; - } - - public void setVisible(String visible) - { - this.visible = visible; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符") - public String getPerms() - { - return perms; - } - - public void setPerms(String perms) - { - this.perms = perms; - } - - public String getIcon() - { - return icon; - } - - public void setIcon(String icon) - { - this.icon = icon; - } - - public List getChildren() - { - return children; - } - - public void setChildren(List children) - { - this.children = children; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("menuId", getMenuId()) - .append("menuName", getMenuName()) - .append("parentId", getParentId()) - .append("orderNum", getOrderNum()) - .append("path", getPath()) - .append("component", getComponent()) - .append("isFrame", getIsFrame()) - .append("IsCache", getIsCache()) - .append("menuType", getMenuType()) - .append("visible", getVisible()) - .append("status ", getStatus()) - .append("perms", getPerms()) - .append("icon", getIcon()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } } diff --git a/ruoyi/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/ruoyi/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java index 2991595ae..ba89becc9 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java +++ b/ruoyi/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java @@ -1,36 +1,54 @@ package com.ruoyi.common.core.domain.entity; +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.annotation.Excel.ColumnType; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; /** * 角色表 sys_role * * @author ruoyi */ -public class SysRole extends BaseEntity + +@Data +@NoArgsConstructor +@Accessors(chain = true) +@TableName("sys_role") +public class SysRole implements Serializable { private static final long serialVersionUID = 1L; /** 角色ID */ @Excel(name = "角色序号", cellType = ColumnType.NUMERIC) + @TableId(value = "role_id",type = IdType.AUTO) private Long roleId; /** 角色名称 */ @Excel(name = "角色名称") + @NotBlank(message = "角色名称不能为空") + @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符") private String roleName; /** 角色权限 */ @Excel(name = "角色权限") + @NotBlank(message = "权限字符不能为空") + @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符") private String roleKey; /** 角色排序 */ @Excel(name = "角色排序") + @NotBlank(message = "显示顺序不能为空") private String roleSort; /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限） */ @@ -48,37 +66,51 @@ public class SysRole extends BaseEntity private String status; /** 删除标志（0代表存在 2代表删除） */ + @TableLogic private String delFlag; + /** 创建者 */ + private String createBy; + + /** 创建时间 */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** 更新者 */ + private String updateBy; + + /** 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** 备注 */ + private String remark; + + /** + * 请求参数 + */ + @TableField(exist = false) + private Map params = new HashMap<>(); + /** 用户是否存在此角色标识 默认不存在 */ + @TableField(exist = false) private boolean flag = false; /** 菜单组 */ + @TableField(exist = false) private Long[] menuIds; /** 部门组（数据权限） */ + @TableField(exist = false) private Long[] deptIds; - public SysRole() - { - - } - public SysRole(Long roleId) { this.roleId = roleId; } - public Long getRoleId() - { - return roleId; - } - - public void setRoleId(Long roleId) - { - this.roleId = roleId; - } - public boolean isAdmin() { return isAdmin(this.roleId); @@ -89,138 +121,4 @@ public class SysRole extends BaseEntity return roleId != null && 1L == roleId; } - @NotBlank(message = "角色名称不能为空") - @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符") - public String getRoleName() - { - return roleName; - } - - public void setRoleName(String roleName) - { - this.roleName = roleName; - } - - @NotBlank(message = "权限字符不能为空") - @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符") - public String getRoleKey() - { - return roleKey; - } - - public void setRoleKey(String roleKey) - { - this.roleKey = roleKey; - } - - @NotBlank(message = "显示顺序不能为空") - public String getRoleSort() - { - return roleSort; - } - - public void setRoleSort(String roleSort) - { - this.roleSort = roleSort; - } - - public String getDataScope() - { - return dataScope; - } - - public void setDataScope(String dataScope) - { - this.dataScope = dataScope; - } - - public boolean isMenuCheckStrictly() - { - return menuCheckStrictly; - } - - public void setMenuCheckStrictly(boolean menuCheckStrictly) - { - this.menuCheckStrictly = menuCheckStrictly; - } - - public boolean isDeptCheckStrictly() - { - return deptCheckStrictly; - } - - public void setDeptCheckStrictly(boolean deptCheckStrictly) - { - this.deptCheckStrictly = deptCheckStrictly; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - public String getDelFlag() - { - return delFlag; - } - - public void setDelFlag(String delFlag) - { - this.delFlag = delFlag; - } - - public boolean isFlag() - { - return flag; - } - - public void setFlag(boolean flag) - { - this.flag = flag; - } - - public Long[] getMenuIds() - { - return menuIds; - } - - public void setMenuIds(Long[] menuIds) - { - this.menuIds = menuIds; - } - - public Long[] getDeptIds() - { - return deptIds; - } - - public void setDeptIds(Long[] deptIds) - { - this.deptIds = deptIds; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("roleId", getRoleId()) - .append("roleName", getRoleName()) - .append("roleKey", getRoleKey()) - .append("roleSort", getRoleSort()) - .append("dataScope", getDataScope()) - .append("menuCheckStrictly", isMenuCheckStrictly()) - .append("deptCheckStrictly", isDeptCheckStrictly()) - .append("status", getStatus()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } } diff --git a/ruoyi/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index d08668ab4..2f8fed1b2 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -1,31 +1,43 @@ package com.ruoyi.common.core.domain.entity; -import java.util.Date; -import java.util.List; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel.ColumnType; import com.ruoyi.common.annotation.Excel.Type; import com.ruoyi.common.annotation.Excels; -import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 用户对象 sys_user * * @author ruoyi */ -public class SysUser extends BaseEntity + +@Data +@NoArgsConstructor +@Accessors(chain = true) +@TableName("sys_user") +public class SysUser implements Serializable { private static final long serialVersionUID = 1L; /** 用户ID */ @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号") + @TableId(value = "user_id",type = IdType.AUTO) private Long userId; /** 部门ID */ @@ -33,18 +45,24 @@ public class SysUser extends BaseEntity private Long deptId; /** 用户账号 */ + @NotBlank(message = "用户账号不能为空") + @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符") @Excel(name = "登录名称") private String userName; /** 用户昵称 */ + @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符") @Excel(name = "用户名称") private String nickName; /** 用户邮箱 */ + @Email(message = "邮箱格式不正确") + @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") @Excel(name = "用户邮箱") private String email; /** 手机号码 */ + @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符") @Excel(name = "手机号码") private String phonenumber; @@ -55,9 +73,15 @@ public class SysUser extends BaseEntity /** 用户头像 */ private String avatar; - /** 密码 */ + /** 密码 */ + @JsonProperty private String password; + @JsonIgnore + public String getPassword() { + return password; + } + /** 盐加密 */ private String salt; @@ -66,6 +90,7 @@ public class SysUser extends BaseEntity private String status; /** 删除标志（0代表存在 2代表删除） */ + @TableLogic private String delFlag; /** 最后登录IP */ @@ -76,42 +101,56 @@ public class SysUser extends BaseEntity @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT) private Date loginDate; + /** 创建者 */ + private String createBy; + + /** 创建时间 */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** 更新者 */ + private String updateBy; + + /** 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** 备注 */ + private String remark; + + /** + * 请求参数 + */ + @TableField(exist = false) + private Map params = new HashMap<>(); + /** 部门对象 */ @Excels({ @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT), @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT) }) + @TableField(exist = false) private SysDept dept; /** 角色对象 */ + @TableField(exist = false) private List roles; /** 角色组 */ + @TableField(exist = false) private Long[] roleIds; /** 岗位组 */ + @TableField(exist = false) private Long[] postIds; - public SysUser() - { - - } - public SysUser(Long userId) { this.userId = userId; } - public Long getUserId() - { - return userId; - } - - public void setUserId(Long userId) - { - this.userId = userId; - } - public boolean isAdmin() { return isAdmin(this.userId); @@ -122,207 +161,4 @@ public class SysUser extends BaseEntity return userId != null && 1L == userId; } - public Long getDeptId() - { - return deptId; - } - - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } - - @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符") - public String getNickName() - { - return nickName; - } - - public void setNickName(String nickName) - { - this.nickName = nickName; - } - - @NotBlank(message = "用户账号不能为空") - @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符") - public String getUserName() - { - return userName; - } - - public void setUserName(String userName) - { - this.userName = userName; - } - - @Email(message = "邮箱格式不正确") - @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") - public String getEmail() - { - return email; - } - - public void setEmail(String email) - { - this.email = email; - } - - @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符") - public String getPhonenumber() - { - return phonenumber; - } - - public void setPhonenumber(String phonenumber) - { - this.phonenumber = phonenumber; - } - - public String getSex() - { - return sex; - } - - public void setSex(String sex) - { - this.sex = sex; - } - - public String getAvatar() - { - return avatar; - } - - public void setAvatar(String avatar) - { - this.avatar = avatar; - } - - @JsonIgnore - @JsonProperty - public String getPassword() - { - return password; - } - - public void setPassword(String password) - { - this.password = password; - } - - public String getSalt() - { - return salt; - } - - public void setSalt(String salt) - { - this.salt = salt; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - public String getDelFlag() - { - return delFlag; - } - - public void setDelFlag(String delFlag) - { - this.delFlag = delFlag; - } - - public String getLoginIp() - { - return loginIp; - } - - public void setLoginIp(String loginIp) - { - this.loginIp = loginIp; - } - - public Date getLoginDate() - { - return loginDate; - } - - public void setLoginDate(Date loginDate) - { - this.loginDate = loginDate; - } - - public SysDept getDept() - { - return dept; - } - - public void setDept(SysDept dept) - { - this.dept = dept; - } - - public List getRoles() - { - return roles; - } - - public void setRoles(List roles) - { - this.roles = roles; - } - - public Long[] getRoleIds() - { - return roleIds; - } - - public void setRoleIds(Long[] roleIds) - { - this.roleIds = roleIds; - } - - public Long[] getPostIds() - { - return postIds; - } - - public void setPostIds(Long[] postIds) - { - this.postIds = postIds; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("userId", getUserId()) - .append("deptId", getDeptId()) - .append("userName", getUserName()) - .append("nickName", getNickName()) - .append("email", getEmail()) - .append("phonenumber", getPhonenumber()) - .append("sex", getSex()) - .append("avatar", getAvatar()) - .append("password", getPassword()) - .append("salt", getSalt()) - .append("status", getStatus()) - .append("delFlag", getDelFlag()) - .append("loginIp", getLoginIp()) - .append("loginDate", getLoginDate()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .append("dept", getDept()) - .toString(); - } } diff --git a/ruoyi/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java b/ruoyi/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java index 03948b430..7d89e784c 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java +++ b/ruoyi/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java @@ -1,10 +1,17 @@ package com.ruoyi.common.core.domain.model; +import lombok.*; +import lombok.experimental.Accessors; + /** * 用户登录对象 * * @author ruoyi */ + +@Data +@NoArgsConstructor +@Accessors(chain = true) public class LoginBody { /** @@ -27,43 +34,4 @@ public class LoginBody */ private String uuid = ""; - public String getUsername() - { - return username; - } - - public void setUsername(String username) - { - this.username = username; - } - - public String getPassword() - { - return password; - } - - public void setPassword(String password) - { - this.password = password; - } - - public String getCode() - { - return code; - } - - public void setCode(String code) - { - this.code = code; - } - - public String getUuid() - { - return uuid; - } - - public void setUuid(String uuid) - { - this.uuid = uuid; - } } diff --git a/ruoyi/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/ruoyi/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java index 6e3f1c6b2..bb5b96eb2 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java +++ b/ruoyi/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java @@ -1,17 +1,24 @@ package com.ruoyi.common.core.domain.model; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.ruoyi.common.core.domain.entity.SysUser; +import lombok.*; +import lombok.experimental.Accessors; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + import java.util.Collection; import java.util.Set; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.userdetails.UserDetails; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.ruoyi.common.core.domain.entity.SysUser; /** * 登录用户身份权限 * * @author ruoyi */ + +@Data +@NoArgsConstructor +@Accessors(chain = true) public class LoginUser implements UserDetails { private static final long serialVersionUID = 1L; @@ -61,20 +68,6 @@ public class LoginUser implements UserDetails */ private SysUser user; - public String getToken() - { - return token; - } - - public void setToken(String token) - { - this.token = token; - } - - public LoginUser() - { - } - public LoginUser(SysUser user, Set permissions) { this.user = user; @@ -140,86 +133,6 @@ public class LoginUser implements UserDetails return true; } - public Long getLoginTime() - { - return loginTime; - } - - public void setLoginTime(Long loginTime) - { - this.loginTime = loginTime; - } - - public String getIpaddr() - { - return ipaddr; - } - - public void setIpaddr(String ipaddr) - { - this.ipaddr = ipaddr; - } - - public String getLoginLocation() - { - return loginLocation; - } - - public void setLoginLocation(String loginLocation) - { - this.loginLocation = loginLocation; - } - - public String getBrowser() - { - return browser; - } - - public void setBrowser(String browser) - { - this.browser = browser; - } - - public String getOs() - { - return os; - } - - public void setOs(String os) - { - this.os = os; - } - - public Long getExpireTime() - { - return expireTime; - } - - public void setExpireTime(Long expireTime) - { - this.expireTime = expireTime; - } - - public Set getPermissions() - { - return permissions; - } - - public void setPermissions(Set permissions) - { - this.permissions = permissions; - } - - public SysUser getUser() - { - return user; - } - - public void setUser(SysUser user) - { - this.user = user; - } - @Override public Collection getAuthorities() { diff --git a/ruoyi/src/main/java/com/ruoyi/common/core/page/PageDomain.java b/ruoyi/src/main/java/com/ruoyi/common/core/page/PageDomain.java index a68f2848b..2fc6b875a 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/core/page/PageDomain.java +++ b/ruoyi/src/main/java/com/ruoyi/common/core/page/PageDomain.java @@ -1,12 +1,18 @@ package com.ruoyi.common.core.page; import cn.hutool.core.util.StrUtil; +import lombok.*; +import lombok.experimental.Accessors; /** * 分页数据 * * @author ruoyi */ + +@Data +@NoArgsConstructor +@Accessors(chain = true) public class PageDomain { /** 当前记录起始索引 */ @@ -30,43 +36,4 @@ public class PageDomain return StrUtil.toUnderlineCase(orderByColumn) + " " + isAsc; } - public Integer getPageNum() - { - return pageNum; - } - - public void setPageNum(Integer pageNum) - { - this.pageNum = pageNum; - } - - public Integer getPageSize() - { - return pageSize; - } - - public void setPageSize(Integer pageSize) - { - this.pageSize = pageSize; - } - - public String getOrderByColumn() - { - return orderByColumn; - } - - public void setOrderByColumn(String orderByColumn) - { - this.orderByColumn = orderByColumn; - } - - public String getIsAsc() - { - return isAsc; - } - - public void setIsAsc(String isAsc) - { - this.isAsc = isAsc; - } } diff --git a/ruoyi/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java b/ruoyi/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java index 71aed2cce..72c284f11 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java +++ b/ruoyi/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java @@ -1,5 +1,8 @@ package com.ruoyi.common.core.page; +import lombok.*; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.util.List; @@ -8,6 +11,10 @@ import java.util.List; * * @author ruoyi */ + +@Data +@NoArgsConstructor +@Accessors(chain = true) public class TableDataInfo implements Serializable { private static final long serialVersionUID = 1L; @@ -24,13 +31,6 @@ public class TableDataInfo implements Serializable /** 消息内容 */ private String msg; - /** - * 表格数据对象 - */ - public TableDataInfo() - { - } - /** * 分页 * @@ -43,43 +43,4 @@ public class TableDataInfo implements Serializable this.total = total; } - public long getTotal() - { - return total; - } - - public void setTotal(long total) - { - this.total = total; - } - - public List getRows() - { - return rows; - } - - public void setRows(List rows) - { - this.rows = rows; - } - - public int getCode() - { - return code; - } - - public void setCode(int code) - { - this.code = code; - } - - public String getMsg() - { - return msg; - } - - public void setMsg(String msg) - { - this.msg = msg; - } } diff --git a/ruoyi/src/main/java/com/ruoyi/demo/controller/FeignTestController.java b/ruoyi/src/main/java/com/ruoyi/demo/controller/FeignTestController.java new file mode 100644 index 000000000..f4c5f4499 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/demo/controller/FeignTestController.java @@ -0,0 +1,24 @@ +package com.ruoyi.demo.controller; + +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.demo.feign.FeignTestService; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RestController +@RequestMapping("/feign/test") +public class FeignTestController { + + private final FeignTestService feignTestService; + + @GetMapping("/search/{wd}") + public AjaxResult search(@PathVariable String wd) { + String search = feignTestService.search(wd); + return AjaxResult.success("操作成功",search); + } +} diff --git a/ruoyi/src/main/java/com/ruoyi/demo/controller/package-info.java b/ruoyi/src/main/java/com/ruoyi/demo/controller/package-info.java new file mode 100644 index 000000000..4239668a6 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/demo/controller/package-info.java @@ -0,0 +1 @@ +package com.ruoyi.demo.controller; \ No newline at end of file diff --git a/ruoyi/src/main/java/com/ruoyi/demo/domain/package-info.java b/ruoyi/src/main/java/com/ruoyi/demo/domain/package-info.java new file mode 100644 index 000000000..e2da76563 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/demo/domain/package-info.java @@ -0,0 +1 @@ +package com.ruoyi.demo.domain; \ No newline at end of file diff --git a/ruoyi/src/main/java/com/ruoyi/demo/feign/FeignTestService.java b/ruoyi/src/main/java/com/ruoyi/demo/feign/FeignTestService.java new file mode 100644 index 000000000..4945f5967 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/demo/feign/FeignTestService.java @@ -0,0 +1,13 @@ +package com.ruoyi.demo.feign; + +import com.ruoyi.demo.feign.fallback.FeignTestFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +@FeignClient(name = "baidu",url = "http://www.baidu.com",fallback = FeignTestFallback.class) +public interface FeignTestService { + + @GetMapping("/s") + String search(@RequestParam("wd") String wd); +} diff --git a/ruoyi/src/main/java/com/ruoyi/demo/feign/fallback/FeignTestFallback.java b/ruoyi/src/main/java/com/ruoyi/demo/feign/fallback/FeignTestFallback.java new file mode 100644 index 000000000..9e49701c0 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/demo/feign/fallback/FeignTestFallback.java @@ -0,0 +1,17 @@ +package com.ruoyi.demo.feign.fallback; + + +import com.ruoyi.demo.feign.FeignTestService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +public class FeignTestFallback implements FeignTestService { + + @Override + public String search(String wd) { + log.error("fallback"); + return "报错啦"; + } +} diff --git a/ruoyi/src/main/java/com/ruoyi/demo/feign/fallback/package-info.java b/ruoyi/src/main/java/com/ruoyi/demo/feign/fallback/package-info.java new file mode 100644 index 000000000..47983a0e1 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/demo/feign/fallback/package-info.java @@ -0,0 +1 @@ +package com.ruoyi.demo.feign.fallback; \ No newline at end of file diff --git a/ruoyi/src/main/java/com/ruoyi/demo/feign/package-info.java b/ruoyi/src/main/java/com/ruoyi/demo/feign/package-info.java new file mode 100644 index 000000000..91e4b4a5b --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/demo/feign/package-info.java @@ -0,0 +1 @@ +package com.ruoyi.demo.feign; \ No newline at end of file diff --git a/ruoyi/src/main/java/com/ruoyi/demo/mapper/package-info.java b/ruoyi/src/main/java/com/ruoyi/demo/mapper/package-info.java new file mode 100644 index 000000000..7243da910 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/demo/mapper/package-info.java @@ -0,0 +1 @@ +package com.ruoyi.demo.mapper; \ No newline at end of file diff --git a/ruoyi/src/main/java/com/ruoyi/demo/service/impl/package-info.java b/ruoyi/src/main/java/com/ruoyi/demo/service/impl/package-info.java new file mode 100644 index 000000000..6060849c9 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/demo/service/impl/package-info.java @@ -0,0 +1 @@ +package com.ruoyi.demo.service.impl; \ No newline at end of file diff --git a/ruoyi/src/main/java/com/ruoyi/demo/service/package-info.java b/ruoyi/src/main/java/com/ruoyi/demo/service/package-info.java new file mode 100644 index 000000000..d6a44c989 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/demo/service/package-info.java @@ -0,0 +1 @@ +package com.ruoyi.demo.service; \ No newline at end of file diff --git a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java index 9baa12395..42b0031e0 100644 --- a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java @@ -1,25 +1,6 @@ package com.ruoyi.framework.aspectj; import cn.hutool.core.util.StrUtil; -import java.lang.reflect.Method; -import java.util.Collection; -import java.util.Iterator; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.Signature; -import org.aspectj.lang.annotation.AfterReturning; -import org.aspectj.lang.annotation.AfterThrowing; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Pointcut; -import org.aspectj.lang.reflect.MethodSignature; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; -import org.springframework.validation.BindingResult; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.servlet.HandlerMapping; import com.alibaba.fastjson.JSON; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.domain.model.LoginUser; @@ -42,6 +23,7 @@ import org.aspectj.lang.reflect.MethodSignature; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import org.springframework.validation.BindingResult; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.HandlerMapping; diff --git a/ruoyi/src/main/resources/mapper/demo/package-info.md b/ruoyi/src/main/resources/mapper/demo/package-info.md new file mode 100644 index 000000000..e69de29bb