diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/DeptTree.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/DeptTree.java index ec3d767c..d016b054 100644 --- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/DeptTree.java +++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/DeptTree.java @@ -1,18 +1,13 @@ package com.github.pig.admin.model.dto; +import lombok.Data; + /** * @author lengleng * @date 2018/1/20 * 部门树 */ +@Data public class DeptTree extends TreeNode { private String name; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } } diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/MenuTree.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/MenuTree.java index 180fd851..63f06c1f 100644 --- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/MenuTree.java +++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/MenuTree.java @@ -1,9 +1,12 @@ package com.github.pig.admin.model.dto; +import lombok.Data; + /** * @author lengleng * @date 2017年11月9日23:33:27 */ +@Data public class MenuTree extends TreeNode { private String icon; private String name; @@ -15,56 +18,7 @@ public class MenuTree extends TreeNode { private String redirect; private String code; private String type; - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getPath() { - return path; - } - - public void setPath(String path) { - this.path = path; - } - - public String getComponent() { - return component; - } - - public void setComponent(String component) { - this.component = component; - } - - public String getAuthority() { - return authority; - } - - public void setAuthority(String authority) { - this.authority = authority; - } - - public String getRedirect() { - return redirect; - } - - public void setRedirect(String redirect) { - this.redirect = redirect; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - String label; + private String label; public MenuTree() { } @@ -82,44 +36,4 @@ public class MenuTree extends TreeNode { this.name = name; this.label = name; } - - public String getIcon() { - return icon; - } - - public void setIcon(String icon) { - this.icon = icon; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - public boolean isSpread() { - return spread; - } - - public void setSpread(boolean spread) { - this.spread = spread; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } } diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/RoleDto.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/RoleDto.java index 9d3d8c3e..2ade4f50 100644 --- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/RoleDto.java +++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/RoleDto.java @@ -1,12 +1,14 @@ package com.github.pig.admin.model.dto; import com.github.pig.admin.model.entity.SysRole; +import lombok.Data; /** * @author lengleng * @date 2018/1/20 * 角色Dto */ +@Data public class RoleDto extends SysRole { /** * 角色部门Id @@ -17,20 +19,4 @@ public class RoleDto extends SysRole { * 部门名称 */ private String deptName; - - public Integer getRoleDeptId() { - return roleDeptId; - } - - public void setRoleDeptId(Integer roleDeptId) { - this.roleDeptId = roleDeptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } } diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/RouteConfig.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/RouteConfig.java index 87bda7c4..df292e32 100644 --- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/RouteConfig.java +++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/RouteConfig.java @@ -1,5 +1,7 @@ package com.github.pig.admin.model.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Map; @@ -7,6 +9,7 @@ import java.util.Map; * @author lengleng * @date 2017/11/7 */ +@Data public class RouteConfig implements Serializable{ @com.alibaba.fastjson.annotation.JSONField(name = "path") @@ -33,100 +36,4 @@ public class RouteConfig implements Serializable{ private Boolean caseSensitive; @com.alibaba.fastjson.annotation.JSONField(name = "pathToRegexpOptions") private String pathToRegexpOptions; - - public String getPath() { - return path; - } - - public void setPath(String path) { - this.path = path; - } - - public String getComponent() { - return component; - } - - public void setComponent(String component) { - this.component = component; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getComponents() { - return components; - } - - public void setComponents(String components) { - this.components = components; - } - - public String getRedirect() { - return redirect; - } - - public void setRedirect(String redirect) { - this.redirect = redirect; - } - - public String getProps() { - return props; - } - - public void setProps(String props) { - this.props = props; - } - - public String getAlias() { - return alias; - } - - public void setAlias(String alias) { - this.alias = alias; - } - - public String getChildren() { - return children; - } - - public void setChildren(String children) { - this.children = children; - } - - public String getBeforeEnter() { - return beforeEnter; - } - - public void setBeforeEnter(String beforeEnter) { - this.beforeEnter = beforeEnter; - } - - public Map getMeta() { - return meta; - } - - public void setMeta(Map meta) { - this.meta = meta; - } - - public Boolean isCaseSensitive() { - return caseSensitive; - } - - public void setCaseSensitive(Boolean caseSensitive) { - this.caseSensitive = caseSensitive; - } - - public String getPathToRegexpOptions() { - return pathToRegexpOptions; - } - - public void setPathToRegexpOptions(String pathToRegexpOptions) { - this.pathToRegexpOptions = pathToRegexpOptions; - } } diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/TreeNode.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/TreeNode.java index 9e08983b..8e782413 100644 --- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/TreeNode.java +++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/TreeNode.java @@ -10,32 +10,7 @@ import java.util.List; public class TreeNode { protected int id; protected int parentId; - - public List getChildren() { - return children; - } - - public void setChildren(List children) { - this.children = children; - } - - List children = new ArrayList(); - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public int getParentId() { - return parentId; - } - - public void setParentId(int parentId) { - this.parentId = parentId; - } + protected List children = new ArrayList(); public void add(TreeNode node) { children.add(node); diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/UserDto.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/UserDto.java index 914ab30a..c0f50276 100644 --- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/UserDto.java +++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/UserDto.java @@ -1,11 +1,13 @@ package com.github.pig.admin.model.dto; import com.github.pig.admin.model.entity.SysUser; +import lombok.Data; /** * @author lengleng * @date 2017/11/5 */ +@Data public class UserDto extends SysUser { /** * 角色ID @@ -18,21 +20,4 @@ public class UserDto extends SysUser { * 新密码 */ private String newpassword1; - - public Integer getRole() { - return role; - } - - public void setRole(Integer role) { - this.role = role; - } - - public String getNewpassword1() { - return newpassword1; - } - - public void setNewpassword1(String newpassword1) { - this.newpassword1 = newpassword1; - } - } diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/UserInfo.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/UserInfo.java index faf559ea..058e4191 100644 --- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/UserInfo.java +++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/UserInfo.java @@ -1,6 +1,7 @@ package com.github.pig.admin.model.dto; import com.github.pig.admin.model.entity.SysUser; +import lombok.Data; import java.io.Serializable; @@ -14,6 +15,7 @@ import java.io.Serializable; * commit('SET_INTRODUCTION', data) * commit('SET_PERMISSIONS', data) */ +@Data public class UserInfo implements Serializable { /** * 用户基本信息 @@ -28,28 +30,4 @@ public class UserInfo implements Serializable { * 角色集合 */ private String[] roles; - - public String[] getPermissions() { - return permissions; - } - - public void setPermissions(String[] permissions) { - this.permissions = permissions; - } - - public String[] getRoles() { - return roles; - } - - public void setRoles(String[] roles) { - this.roles = roles; - } - - public SysUser getSysUser() { - return sysUser; - } - - public void setSysUser(SysUser sysUser) { - this.sysUser = sysUser; - } } diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/entity/SysDept.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/entity/SysDept.java index 4502afe9..693ac723 100644 --- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/entity/SysDept.java +++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/entity/SysDept.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.IdType; +import lombok.Data; import java.io.Serializable; import java.util.Date; @@ -17,6 +18,7 @@ import java.util.Date; * @author lengleng * @since 2018-01-22 */ +@Data @TableName("sys_dept") public class SysDept extends Model { @@ -53,62 +55,6 @@ public class SysDept extends Model { private Integer parentId; - public Integer getDeptId() { - return deptId; - } - - public void setDeptId(Integer deptId) { - this.deptId = deptId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Integer getOrderNum() { - return orderNum; - } - - public void setOrderNum(Integer orderNum) { - this.orderNum = orderNum; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - - public String getDelFlag() { - return delFlag; - } - - public void setDelFlag(String delFlag) { - this.delFlag = delFlag; - } - - public Integer getParentId() { - return parentId; - } - - public void setParentId(Integer parentId) { - this.parentId = parentId; - } - @Override protected Serializable pkVal() { return this.deptId; diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/entity/SysDeptRelation.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/entity/SysDeptRelation.java index 82cff565..eb83dda4 100644 --- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/entity/SysDeptRelation.java +++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/entity/SysDeptRelation.java @@ -2,6 +2,7 @@ package com.github.pig.admin.model.entity; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; import java.io.Serializable; @@ -13,6 +14,7 @@ import java.io.Serializable; * @author lengleng * @since 2018-01-22 */ +@Data @TableName("sys_dept_relation") public class SysDeptRelation extends Model { @@ -28,22 +30,6 @@ public class SysDeptRelation extends Model { private Integer descendant; - public Integer getAncestor() { - return ancestor; - } - - public void setAncestor(Integer ancestor) { - this.ancestor = ancestor; - } - - public Integer getDescendant() { - return descendant; - } - - public void setDescendant(Integer descendant) { - this.descendant = descendant; - } - @Override protected Serializable pkVal() { return this.ancestor; diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/entity/SysRole.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/entity/SysRole.java index 1703401c..7f8b8791 100644 --- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/entity/SysRole.java +++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/entity/SysRole.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.IdType; +import lombok.Data; import java.io.Serializable; import java.util.Date; @@ -17,6 +18,7 @@ import java.util.Date; * @author lengleng * @since 2017-10-29 */ +@Data @TableName("sys_role") public class SysRole extends Model { @@ -40,63 +42,6 @@ public class SysRole extends Model { @TableField("del_flag") private String delFlag; - - public Integer getRoleId() { - return roleId; - } - - public void setRoleId(Integer roleId) { - this.roleId = roleId; - } - - public String getRoleName() { - return roleName; - } - - public void setRoleName(String roleName) { - this.roleName = roleName; - } - - public String getRoleCode() { - return roleCode; - } - - public void setRoleCode(String roleCode) { - this.roleCode = roleCode; - } - - public String getRoleDesc() { - return roleDesc; - } - - public void setRoleDesc(String roleDesc) { - this.roleDesc = roleDesc; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - - public String getDelFlag() { - return delFlag; - } - - public void setDelFlag(String delFlag) { - this.delFlag = delFlag; - } - @Override protected Serializable pkVal() { return this.roleId;