From dab0aaea6594da3719163b949f4a3c63bbd691a0 Mon Sep 17 00:00:00 2001 From: lishangbu Date: Fri, 27 Jul 2018 23:46:33 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20=E7=B2=BE=E7=AE=80=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/admin/api/entity/SysDept.java | 18 ---------------- .../admin/api/entity/SysDeptRelation.java | 9 +------- .../pigx/admin/api/entity/SysDict.java | 19 ----------------- .../pigx/admin/api/entity/SysLog.java | 19 ----------------- .../pigx/admin/api/entity/SysMenu.java | 21 ------------------- .../api/entity/SysOauthClientDetails.java | 10 +-------- .../pigx/admin/api/entity/SysRole.java | 9 +------- .../pigx/admin/api/entity/SysRoleDept.java | 11 ---------- .../pigx/admin/api/entity/SysRoleMenu.java | 8 ------- .../pigx/admin/api/entity/SysUser.java | 5 ----- .../pigx/admin/api/entity/SysUserRole.java | 8 ------- 11 files changed, 3 insertions(+), 134 deletions(-) diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java index fc3c94a2c..c70ed2d2e 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java @@ -20,7 +20,6 @@ package com.pig4cloud.pigx.admin.api.entity; import com.baomidou.mybatisplus.activerecord.Model; -import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableLogic; import com.baomidou.mybatisplus.annotations.TableName; @@ -55,26 +54,21 @@ public class SysDept extends Model { /** * 排序 */ - @TableField("order_num") private Integer orderNum; /** * 创建时间 */ - @TableField("create_time") private Date createTime; /** * 修改时间 */ - @TableField("update_time") private Date updateTime; /** * 是否删除 -1：已删除 0：正常 */ - @TableField("del_flag") @TableLogic private String delFlag; - @TableField("parent_id") private Integer parentId; @@ -82,16 +76,4 @@ public class SysDept extends Model { protected Serializable pkVal() { return this.deptId; } - - @Override - public String toString() { - return "SysDept{" + - ", deptId=" + deptId + - ", name=" + name + - ", orderNum=" + orderNum + - ", createTime=" + createTime + - ", updateTime=" + updateTime + - ", delFlag=" + delFlag + - "}"; - } } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java index 4f2774397..2ae64c99a 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java @@ -28,7 +28,7 @@ import java.io.Serializable; /** *

- * + * 部门关系表 *

* * @author lengleng @@ -56,11 +56,4 @@ public class SysDeptRelation extends Model { return this.ancestor; } - @Override - public String toString() { - return "SysDeptRelation{" + - ", ancestor=" + ancestor + - ", descendant=" + descendant + - "}"; - } } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java index 137c245b6..650e5ab93 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java @@ -20,7 +20,6 @@ package com.pig4cloud.pigx.admin.api.entity; import com.baomidou.mybatisplus.activerecord.Model; -import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableLogic; import com.baomidou.mybatisplus.annotations.TableName; @@ -75,12 +74,10 @@ public class SysDict extends Model { /** * 创建时间 */ - @TableField("create_time") private Date createTime; /** * 更新时间 */ - @TableField("update_time") private Date updateTime; /** * 备注信息 @@ -89,7 +86,6 @@ public class SysDict extends Model { /** * 删除标记 */ - @TableField("del_flag") @TableLogic private String delFlag; @@ -99,19 +95,4 @@ public class SysDict extends Model { return this.id; } - @Override - public String toString() { - return "SysDict{" + - ", id=" + id + - ", value=" + value + - ", label=" + label + - ", type=" + type + - ", description=" + description + - ", sort=" + sort + - ", createTime=" + createTime + - ", updateTime=" + updateTime + - ", remarks=" + remarks + - ", delFlag=" + delFlag + - "}"; - } } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java index 17834b76f..2b653a242 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java @@ -107,23 +107,4 @@ public class SysLog implements Serializable { private String serviceId; - @Override - public String toString() { - return "SysLog{" + - "id=" + id + - ", type='" + type + '\'' + - ", title='" + title + '\'' + - ", createBy='" + createBy + '\'' + - ", createTime=" + createTime + - ", updateTime=" + updateTime + - ", remoteAddr='" + remoteAddr + '\'' + - ", userAgent='" + userAgent + '\'' + - ", requestUri='" + requestUri + '\'' + - ", method='" + method + '\'' + - ", params='" + params + '\'' + - ", time=" + time + - ", delFlag='" + delFlag + '\'' + - ", exception='" + exception + '\'' + - '}'; - } } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java index 8c41eefdb..5294ed1df 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java @@ -20,7 +20,6 @@ package com.pig4cloud.pigx.admin.api.entity; import com.baomidou.mybatisplus.activerecord.Model; -import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableLogic; import com.baomidou.mybatisplus.annotations.TableName; @@ -62,7 +61,6 @@ public class SysMenu extends Model { /** * 父菜单ID */ - @TableField("parent_id") private Integer parentId; /** * 图标 @@ -83,18 +81,15 @@ public class SysMenu extends Model { /** * 创建时间 */ - @TableField("create_time") private Date createTime; /** * 更新时间 */ - @TableField("update_time") private Date updateTime; /** * 0--正常 1--删除 */ @TableLogic - @TableField("del_flag") private String delFlag; /** * 前端URL @@ -107,20 +102,4 @@ public class SysMenu extends Model { return this.menuId; } - @Override - public String toString() { - return "SysMenu{" + - ", menuId=" + menuId + - ", name=" + name + - ", permission=" + permission + - ", parentId=" + parentId + - ", icon=" + icon + - ", component=" + component + - ", sort=" + sort + - ", type=" + type + - ", createTime=" + createTime + - ", updateTime=" + updateTime + - ", delFlag=" + delFlag + - "}"; - } } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java index 7ab56808f..39963748c 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java @@ -20,7 +20,6 @@ package com.pig4cloud.pigx.admin.api.entity; import com.baomidou.mybatisplus.activerecord.Model; -import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.IdType; @@ -31,7 +30,7 @@ import java.io.Serializable; /** *

- * + * 客户端信息 *

* * @author lengleng @@ -46,21 +45,14 @@ public class SysOauthClientDetails extends Model { @TableId(value = "client_id", type = IdType.INPUT) private String clientId; - @TableField("resource_ids") private String resourceIds; - @TableField("client_secret") private String clientSecret; private String scope; - @TableField("authorized_grant_types") private String authorizedGrantTypes; - @TableField("web_server_redirect_uri") private String webServerRedirectUri; private String authorities; - @TableField("access_token_validity") private Integer accessTokenValidity; - @TableField("refresh_token_validity") private Integer refreshTokenValidity; - @TableField("additional_information") private String additionalInformation; private String autoapprove; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java index ee017d61b..afe6f08b6 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java @@ -20,7 +20,6 @@ package com.pig4cloud.pigx.admin.api.entity; import com.baomidou.mybatisplus.activerecord.Model; -import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableLogic; import com.baomidou.mybatisplus.annotations.TableName; @@ -33,7 +32,7 @@ import java.util.Date; /** *

- *

+ * 角色表 *

* * @author lengleng @@ -48,21 +47,15 @@ public class SysRole extends Model { @TableId(value = "role_id", type = IdType.AUTO) private Integer roleId; - @TableField("role_name") private String roleName; - @TableField("role_code") private String roleCode; - @TableField("role_desc") private String roleDesc; - @TableField("create_time") private Date createTime; - @TableField("update_time") private Date updateTime; /** * 删除标识（0-正常,1-删除） */ @TableLogic - @TableField("del_flag") private String delFlag; @Override diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRoleDept.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRoleDept.java index ffe79657c..64fd192db 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRoleDept.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRoleDept.java @@ -20,7 +20,6 @@ package com.pig4cloud.pigx.admin.api.entity; import com.baomidou.mybatisplus.activerecord.Model; -import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.IdType; @@ -49,12 +48,10 @@ public class SysRoleDept extends Model { /** * 角色ID */ - @TableField("role_id") private Integer roleId; /** * 部门ID */ - @TableField("dept_id") private Integer deptId; @@ -63,12 +60,4 @@ public class SysRoleDept extends Model { return this.id; } - @Override - public String toString() { - return "SysRoleDept{" + - ", id=" + id + - ", roleId=" + roleId + - ", deptId=" + deptId + - "}"; - } } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRoleMenu.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRoleMenu.java index 7bfe64fab..f2c6fabde 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRoleMenu.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRoleMenu.java @@ -58,12 +58,4 @@ public class SysRoleMenu extends Model { protected Serializable pkVal() { return this.roleId; } - - @Override - public String toString() { - return "SysRoleMenu{" + - ", roleId=" + roleId + - ", menuId=" + menuId + - "}"; - } } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java index eface6dd7..d90dfe799 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java @@ -19,7 +19,6 @@ package com.pig4cloud.pigx.admin.api.entity; -import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableLogic; import com.baomidou.mybatisplus.annotations.TableName; @@ -63,18 +62,15 @@ public class SysUser implements Serializable { /** * 创建时间 */ - @TableField("create_time") private Date createTime; /** * 修改时间 */ - @TableField("update_time") private Date updateTime; /** * 0-正常，1-删除 */ @TableLogic - @TableField("del_flag") private String delFlag; /** @@ -89,7 +85,6 @@ public class SysUser implements Serializable { /** * 部门ID */ - @TableField("dept_id") private Integer deptId; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUserRole.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUserRole.java index 839baa495..8c8dcfe19 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUserRole.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUserRole.java @@ -59,12 +59,4 @@ public class SysUserRole extends Model { protected Serializable pkVal() { return this.userId; } - - @Override - public String toString() { - return "SysUserRole{" + - ", userId=" + userId + - ", roleId=" + roleId + - "}"; - } }