Browse Source

:recycle: 精简代码

lishangbu 7 years ago
parent
commit
dab0aaea65

+ 0 - 18
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<SysDept> {
 	/**
 	 * 排序
 	 */
-	@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<SysDept> {
 	protected Serializable pkVal() {
 		return this.deptId;
 	}
-
-	@Override
-	public String toString() {
-		return "SysDept{" +
-			", deptId=" + deptId +
-			", name=" + name +
-			", orderNum=" + orderNum +
-			", createTime=" + createTime +
-			", updateTime=" + updateTime +
-			", delFlag=" + delFlag +
-			"}";
-	}
 }

+ 1 - 8
pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java

@@ -28,7 +28,7 @@ import java.io.Serializable;
 
 /**
  * <p>
- *
+ * 部门关系表
  * </p>
  *
  * @author lengleng
@@ -56,11 +56,4 @@ public class SysDeptRelation extends Model<SysDeptRelation> {
 		return this.ancestor;
 	}
 
-	@Override
-	public String toString() {
-		return "SysDeptRelation{" +
-			", ancestor=" + ancestor +
-			", descendant=" + descendant +
-			"}";
-	}
 }

+ 0 - 19
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<SysDict> {
 	/**
 	 * 创建时间
 	 */
-	@TableField("create_time")
 	private Date createTime;
 	/**
 	 * 更新时间
 	 */
-	@TableField("update_time")
 	private Date updateTime;
 	/**
 	 * 备注信息
@@ -89,7 +86,6 @@ public class SysDict extends Model<SysDict> {
 	/**
 	 * 删除标记
 	 */
-	@TableField("del_flag")
 	@TableLogic
 	private String delFlag;
 
@@ -99,19 +95,4 @@ public class SysDict extends Model<SysDict> {
 		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 +
-			"}";
-	}
 }

+ 0 - 19
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 + '\'' +
-			'}';
-	}
 }

+ 0 - 21
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<SysMenu> {
 	/**
 	 * 父菜单ID
 	 */
-	@TableField("parent_id")
 	private Integer parentId;
 	/**
 	 * 图标
@@ -83,18 +81,15 @@ public class SysMenu extends Model<SysMenu> {
 	/**
 	 * 创建时间
 	 */
-	@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<SysMenu> {
 		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 +
-			"}";
-	}
 }

+ 1 - 9
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;
 
 /**
  * <p>
- *
+ * 客户端信息
  * </p>
  *
  * @author lengleng
@@ -46,21 +45,14 @@ public class SysOauthClientDetails extends Model<SysOauthClientDetails> {
 
 	@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;
 

+ 1 - 8
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;
 
 /**
  * <p>
- * <p>
+ * 角色表
  * </p>
  *
  * @author lengleng
@@ -48,21 +47,15 @@ public class SysRole extends Model<SysRole> {
 
 	@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

+ 0 - 11
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<SysRoleDept> {
 	/**
 	 * 角色ID
 	 */
-	@TableField("role_id")
 	private Integer roleId;
 	/**
 	 * 部门ID
 	 */
-	@TableField("dept_id")
 	private Integer deptId;
 
 
@@ -63,12 +60,4 @@ public class SysRoleDept extends Model<SysRoleDept> {
 		return this.id;
 	}
 
-	@Override
-	public String toString() {
-		return "SysRoleDept{" +
-			", id=" + id +
-			", roleId=" + roleId +
-			", deptId=" + deptId +
-			"}";
-	}
 }

+ 0 - 8
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<SysRoleMenu> {
 	protected Serializable pkVal() {
 		return this.roleId;
 	}
-
-	@Override
-	public String toString() {
-		return "SysRoleMenu{" +
-			", roleId=" + roleId +
-			", menuId=" + menuId +
-			"}";
-	}
 }

+ 0 - 5
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;
 
 }

+ 0 - 8
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<SysUserRole> {
 	protected Serializable pkVal() {
 		return this.userId;
 	}
-
-	@Override
-	public String toString() {
-		return "SysUserRole{" +
-			", userId=" + userId +
-			", roleId=" + roleId +
-			"}";
-	}
 }