diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java b/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java index 4d3a8a755..4d2b67e2c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java @@ -1,6 +1,7 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.*; import javax.persistence.Transient; @@ -10,20 +11,21 @@ import java.io.Serializable; @Table(name = "mall_permission") @Data -public class MallPermission implements Serializable { - private static final long serialVersionUID = 1L; - - @Id +@EqualsAndHashCode(callSuper = true) +public class MallPermission extends BaseEntity { + private static final long serialVersionUID = 1L; + + @Id protected Long id; - + @Transient protected List ids; - @io.swagger.annotations.ApiModelProperty(value="权限名称",name="name") - private String name; - @Transient + @io.swagger.annotations.ApiModelProperty(value="权限名称",name="name") + private String name; + @Transient @io.swagger.annotations.ApiModelProperty(value="权限名称[LIKE]",name="nameLike") - private String nameLike; + private String nameLike; @io.swagger.annotations.ApiModelProperty(value="父编号ID,一级菜单为0",name="parentId") private Long parentId; @Transient @@ -31,24 +33,24 @@ public class MallPermission implements Serializable { private String parentName; @io.swagger.annotations.ApiModelProperty(value="是否可用 Y/N",name="permission") private String available; - @io.swagger.annotations.ApiModelProperty(value="授权(多个用逗号分隔,如:user:list,user:create)",name="permission") - private String permission; - @Transient - private List permissions; - @io.swagger.annotations.ApiModelProperty(value="资源类型0:目录 1:菜单 2:按钮",name="resourceType") - private Integer resourceType; + @io.swagger.annotations.ApiModelProperty(value="授权(多个用逗号分隔,如:user:list,user:create)",name="permission") + private String permission; + @Transient + private List permissions; + @io.swagger.annotations.ApiModelProperty(value="资源类型0:目录 1:菜单 2:按钮",name="resourceType") + private Integer resourceType; @io.swagger.annotations.ApiModelProperty(value="菜单背景色-1级菜单使用",name="moduleColor") private String moduleColor; @io.swagger.annotations.ApiModelProperty(value="菜单字体颜色-1级菜单使用",name="moduleColorNum") private String moduleColorNum; - @io.swagger.annotations.ApiModelProperty(value="资源路径(user/list or http://localhost/1.html)",name="url") - private String url; + @io.swagger.annotations.ApiModelProperty(value="资源路径(user/list or http://localhost/1.html)",name="url") + private String url; @io.swagger.annotations.ApiModelProperty(value="菜单图标",name="icon") private String icon; @io.swagger.annotations.ApiModelProperty(value="版本类型(1:标准版)",name="versionType") private Integer versionType; - @io.swagger.annotations.ApiModelProperty(value="排序",name="sort") - private Integer sort; + @io.swagger.annotations.ApiModelProperty(value="排序",name="sort") + private Integer sort; @Transient private Integer sortFrom; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallResource.java b/mallinkService/src/main/java/com/iformall/domain/po/MallResource.java index e086f07c2..0eda6039a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallResource.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallResource.java @@ -1,6 +1,8 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; + import javax.persistence.*; import java.util.*; import java.math.*; @@ -11,7 +13,8 @@ import java.io.Serializable; @Table(name = "mall_resource") @Data -public class MallResource implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class MallResource extends BaseEntity { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java b/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java index 6a91101a8..35c9f65fb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java @@ -1,6 +1,7 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.*; import javax.persistence.Transient; @@ -10,7 +11,8 @@ import java.io.Serializable; @Table(name = "mall_role") @Data -public class MallRole implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class MallRole extends BaseEntity { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallRolePermission.java b/mallinkService/src/main/java/com/iformall/domain/po/MallRolePermission.java index 08ee4b0fc..723ef741a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallRolePermission.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallRolePermission.java @@ -1,6 +1,7 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Id; import javax.persistence.Table; @@ -11,7 +12,8 @@ import java.util.List; @Table(name = "mall_role_permission") @Data -public class MallRolePermission implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class MallRolePermission extends BaseEntity { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallSaleType.java b/mallinkService/src/main/java/com/iformall/domain/po/MallSaleType.java index 6093fa0d5..90dbba9a6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallSaleType.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallSaleType.java @@ -1,6 +1,7 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Id; import javax.persistence.Table; @@ -10,7 +11,8 @@ import java.util.List; @Table(name = "mall_sale_type") @Data -public class MallSaleType implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class MallSaleType extends BaseEntity { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallUserRole.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserRole.java index 65c4bf587..4ed3373d5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserRole.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserRole.java @@ -1,6 +1,7 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Id; import javax.persistence.Table; @@ -11,7 +12,8 @@ import java.util.List; @Table(name = "mall_user_role") @Data -public class MallUserRole implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class MallUserRole extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -25,26 +27,4 @@ public class MallUserRole implements Serializable { @io.swagger.annotations.ApiModelProperty(value="角色ID",name="roleId") private Long roleId; - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,Uid_ASC("`uid` ASC"),Uid_DESC("`uid` DESC") - ,RoleId_ASC("`role_id` ASC"),RoleId_DESC("`role_id` DESC") - ; - private String value; - Field(String value){ - this.value = value; - } - public String getValue() { - return value; - } - public void setCol(String value) { - this.value = value; - } - @Override - public String toString() { - return this.getValue(); - } - } - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/PushLimit.java b/mallinkService/src/main/java/com/iformall/domain/po/PushLimit.java index 5668f4fdb..ce4f69556 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/PushLimit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/PushLimit.java @@ -1,6 +1,7 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.*; import java.util.*; @@ -11,7 +12,8 @@ import java.io.Serializable; @Table(name = "push_limit") @Data -public class PushLimit implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class PushLimit extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -41,35 +43,4 @@ public class PushLimit implements Serializable { @io.swagger.annotations.ApiModelProperty(value="是否启用,0:Enable,1:Disable",name="enable") private Integer enable; - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,MsgAmount_ASC("`msg_amount` ASC"),MsgAmount_DESC("`msg_amount` DESC") - ,CouponAmount_ASC("`coupon_amount` ASC"),CouponAmount_DESC("`coupon_amount` DESC") - ,CouponDay_ASC("`coupon_day` ASC"),CouponDay_DESC("`coupon_day` DESC") - ,TimeEnable_ASC("`time_enable` ASC"),TimeEnable_DESC("`time_enable` DESC") - ,TimeStart_ASC("`time_start` ASC"),TimeStart_DESC("`time_start` DESC") - ,TimeEnd_ASC("`time_end` ASC"),TimeEnd_DESC("`time_end` DESC") - ,CreateTime_ASC("`create_time` ASC"),CreateTime_DESC("`create_time` DESC") - ,UpdateTime_ASC("`update_time` ASC"),UpdateTime_DESC("`update_time` DESC") - ,Enable_ASC("`enable` ASC"),Enable_DESC("`enable` DESC") - ; - private String value; - Field(String value){ - this.value = value; - } - public String getValue() { - return value; - } - public void setCol(String value) { - this.value = value; - } - @Override - public String toString() { - return this.getValue(); - } - } - - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/SysMonitor.java b/mallinkService/src/main/java/com/iformall/domain/po/SysMonitor.java index 7c26e7214..77a13adf5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/SysMonitor.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/SysMonitor.java @@ -1,6 +1,8 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; + import javax.persistence.*; import javax.persistence.Transient; import java.util.List; @@ -9,7 +11,8 @@ import java.io.Serializable; @Table(name = "sys_monitor") @Data -public class SysMonitor implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class SysMonitor extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -31,32 +34,4 @@ public class SysMonitor implements Serializable { @io.swagger.annotations.ApiModelProperty(value="",name="errMsg") private String errMsg; - - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") - ,Url_ASC("`url` ASC"),Url_DESC("`url` DESC") - ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") - ,Deploy_ASC("`deploy` ASC"),Deploy_DESC("`deploy` DESC") - ,Enable_ASC("`enable` ASC"),Enable_DESC("`enable` DESC") - ,ErrMsg_ASC("`err_msg` ASC"),ErrMsg_DESC("`err_msg` DESC") - ; - private String value; - Field(String value){ - this.value = value; - } - public String getValue() { - return value; - } - public void setCol(String value) { - this.value = value; - } - @Override - public String toString() { - return this.getValue(); - } - } - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxDateAmountRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxDateAmountRecord.java index 956297f09..14d9bfafd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxDateAmountRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxDateAmountRecord.java @@ -1,6 +1,7 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.*; import java.util.*; @@ -11,7 +12,8 @@ import java.io.Serializable; @Table(name = "wx_date_amount_record") @Data -public class WxDateAmountRecord implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxDateAmountRecord extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -41,35 +43,4 @@ public class WxDateAmountRecord implements Serializable { @io.swagger.annotations.ApiModelProperty(value="类型:0 交易记录 1.核销记录",name="type") private Integer type; - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,Date_ASC("`date` ASC"),Date_DESC("`date` DESC") - ,DayOfWeek_ASC("`day_of_week` ASC"),DayOfWeek_DESC("`day_of_week` DESC") - ,WeekOfYear_ASC("`week_of_year` ASC"),WeekOfYear_DESC("`week_of_year` DESC") - ,PayPrice_ASC("`pay_price` ASC"),PayPrice_DESC("`pay_price` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,Month_ASC("`month` ASC"),Month_DESC("`month` DESC") - ,MerchantId_ASC("`merchant_id` ASC"),MerchantId_DESC("`merchant_id` DESC") - ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") - ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") - ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") - ; - private String value; - Field(String value){ - this.value = value; - } - public String getValue() { - return value; - } - public void setCol(String value) { - this.value = value; - } - @Override - public String toString() { - return this.getValue(); - } - } - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java b/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java index f4e834654..5e5fd998b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java @@ -65,36 +65,4 @@ public class WxDevice extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="设备配置",name="config") private String config; - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,DeviceId_ASC("`device_id` ASC"),DeviceId_DESC("`device_id` DESC") - ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") - ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ,Version_ASC("`version` ASC"),Version_DESC("`version` DESC") - ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") - ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") - ,LastHbTime_ASC("`last_hb_time` ASC"),LastHbTime_DESC("`last_hb_time` DESC") - ,FirstHbTime_ASC("`first_hb_time` ASC"),FirstHbTime_DESC("`first_hb_time` DESC") - ,OnlineStatus_ASC("`online_status` ASC"),OnlineStatus_DESC("`online_status` DESC") - ,HbCmd_ASC("`hb_cmd` ASC"),HbCmd_DESC("`hb_cmd` DESC") - ; - private String value; - Field(String value){ - this.value = value; - } - public String getValue() { - return value; - } - public void setCol(String value) { - this.value = value; - } - @Override - public String toString() { - return this.getValue(); - } - } - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java index e7f6444a3..91d21e778 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java @@ -11,7 +11,7 @@ import java.util.List; @Table(name = "wx_flow_record") @Data -public class WxFlowRecord implements Serializable { +public class WxFlowRecord extends BaseEntity { private static final long serialVersionUID = 1849242743274278L; @Id diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxGame.java b/mallinkService/src/main/java/com/iformall/domain/po/WxGame.java index 6c748001d..f8ec1fa57 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxGame.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxGame.java @@ -1,6 +1,7 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Id; import javax.persistence.Table; @@ -11,7 +12,8 @@ import java.util.List; @Table(name = "wx_game") @Data -public class WxGame implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxGame extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -20,6 +22,7 @@ public class WxGame implements Serializable { @Transient protected List ids; + @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; @@ -99,36 +102,4 @@ public class WxGame implements Serializable { this.type = gameTemplate.getType(); } } - - public static enum Field { - Id_ASC("`id` ASC"), Id_DESC("`id` DESC") - , TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC") - , GameId_ASC("`game_id` ASC"), GameId_DESC("`game_id` DESC") - , Status_ASC("`status` ASC"), Status_DESC("`status` DESC") - , ValidStartDate_ASC("`valid_start_date` ASC"), ValidStartDate_DESC("`valid_start_date` DESC") - , ValidEndDate_ASC("`valid_end_date` ASC"), ValidEndDate_DESC("`valid_end_date` DESC") - , TriggleAction_ASC("`triggle_action` ASC"), TriggleAction_DESC("`triggle_action` DESC") - , PlayLimit_ASC("`play_limit` ASC"), PlayLimit_DESC("`play_limit` DESC") - , AwardLimit_ASC("`award_limit` ASC"), AwardLimit_DESC("`award_limit` DESC"); - private String value; - - Field(String value) { - this.value = value; - } - - public String getValue() { - return value; - } - - public void setCol(String value) { - this.value = value; - } - - @Override - public String toString() { - return this.getValue(); - } - } - - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java index 6871aabe9..1eede0cb2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java @@ -1,6 +1,7 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Id; import javax.persistence.Table; @@ -12,7 +13,8 @@ import java.util.List; @Table(name = "wx_game_action_log") @Data -public class WxGameActionLog implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxGameActionLog extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -41,29 +43,5 @@ public class WxGameActionLog implements Serializable { @io.swagger.annotations.ApiModelProperty(value="",name="createTime") private Date createTime; - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,GameId_ASC("`game_id` ASC"),GameId_DESC("`game_id` DESC") - ,UserId_ASC("`user_id` ASC"),UserId_DESC("`user_id` DESC") - ,CouponOrderId_ASC("`coupon_order_id` ASC"),CouponOrderId_DESC("`coupon_order_id` DESC") - ,CreateTime_ASC("`create_time` ASC"),CreateTime_DESC("`create_time` DESC") - ; - private String value; - Field(String value){ - this.value = value; - } - public String getValue() { - return value; - } - public void setCol(String value) { - this.value = value; - } - @Override - public String toString() { - return this.getValue(); - } - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxGameTemplate.java b/mallinkService/src/main/java/com/iformall/domain/po/WxGameTemplate.java index 20f7187b1..c6c256665 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxGameTemplate.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxGameTemplate.java @@ -1,6 +1,8 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; + import javax.persistence.*; import javax.persistence.Transient; import java.util.List; @@ -9,7 +11,8 @@ import java.io.Serializable; @Table(name = "wx_game_template") @Data -public class WxGameTemplate implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxGameTemplate extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -31,31 +34,6 @@ public class WxGameTemplate implements Serializable { @io.swagger.annotations.ApiModelProperty(value="游戏类型(1:卡牌),目前无用",name="type") private Integer type; - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") - ,Url_ASC("`url` ASC"),Url_DESC("`url` DESC") - ,ImgUrl_ASC("`img_url` ASC"),ImgUrl_DESC("`img_url` DESC") - ,OptionLimit_ASC("`option_limit` ASC"),OptionLimit_DESC("`option_limit` DESC") - ,Rules_ASC("`rules` ASC"),Rules_DESC("`rules` DESC") - ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") - ; - private String value; - Field(String value){ - this.value = value; - } - public String getValue() { - return value; - } - public void setCol(String value) { - this.value = value; - } - @Override - public String toString() { - return this.getValue(); - } - } - + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxGroup.java b/mallinkService/src/main/java/com/iformall/domain/po/WxGroup.java index c142ee7a9..e7d15ac7a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxGroup.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxGroup.java @@ -1,6 +1,7 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Id; import javax.persistence.Table; @@ -12,7 +13,8 @@ import java.util.List; @Table(name = "wx_group") @Data -public class WxGroup implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxGroup extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -21,6 +23,7 @@ public class WxGroup implements Serializable { @Transient protected List ids; + @io.swagger.annotations.ApiModelProperty(value="商场名",name="name") private String name; @io.swagger.annotations.ApiModelProperty(value="国家",name="country") @@ -40,35 +43,4 @@ public class WxGroup implements Serializable { @io.swagger.annotations.ApiModelProperty(value="",name="logurl") private String logurl; - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") - ,Country_ASC("`country` ASC"),Country_DESC("`country` DESC") - ,Province_ASC("`province` ASC"),Province_DESC("`province` DESC") - ,City_ASC("`city` ASC"),City_DESC("`city` DESC") - ,Addr_ASC("`addr` ASC"),Addr_DESC("`addr` DESC") - ,Longitude_ASC("`longitude` ASC"),Longitude_DESC("`longitude` DESC") - ,Latitude_ASC("`latitude` ASC"),Latitude_DESC("`latitude` DESC") - ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") - ,Logurl_ASC("`logurl` ASC"),Logurl_DESC("`logurl` DESC") - ; - private String value; - Field(String value){ - this.value = value; - } - public String getValue() { - return value; - } - public void setCol(String value) { - this.value = value; - } - @Override - public String toString() { - return this.getValue(); - } - } - - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java index 88a239a02..0c16e5bb1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java @@ -1,6 +1,7 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.*; import java.util.*; @@ -11,7 +12,8 @@ import java.io.Serializable; @Table(name = "wx_level_config") @Data -public class WxLevelConfig implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxLevelConfig extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -20,6 +22,7 @@ public class WxLevelConfig implements Serializable { @Transient protected List ids; + @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") private String tenantId; @@ -46,29 +49,4 @@ public class WxLevelConfig implements Serializable { @Transient protected Long userCount; - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,Points_ASC("`points` ASC"),Points_DESC("`points` DESC") - ,Level_ASC("`level` ASC"),Level_DESC("`level` DESC") - ,Description_ASC("`description` ASC"),Description_DESC("`description` DESC") - ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") - ; - private String value; - Field(String value){ - this.value = value; - } - public String getValue() { - return value; - } - public void setCol(String value) { - this.value = value; - } - @Override - public String toString() { - return this.getValue(); - } - } - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelMerchant.java index ca8b25391..35129d315 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelMerchant.java @@ -1,6 +1,7 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Id; import javax.persistence.Table; @@ -11,7 +12,8 @@ import java.util.List; @Table(name = "wx_level_merchant") @Data -public class WxLevelMerchant implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxLevelMerchant extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -20,7 +22,6 @@ public class WxLevelMerchant implements Serializable { @Transient protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="等级ID",name="levelId") @@ -34,30 +35,4 @@ public class WxLevelMerchant implements Serializable { @io.swagger.annotations.ApiModelProperty(value="折扣率(0-100折扣)",name="discount") private Integer discount; - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,LevelId_ASC("`level_id` ASC"),LevelId_DESC("`product_id` DESC") - ,Discount_ASC("`discount` ASC"),Discount_DESC("`discount` DESC") - ,MerchantId_ASC("`merchant_id` ASC"),MerchantId_DESC("`merchant_id` DESC") - ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") - - ; - private String value; - Field(String value){ - this.value = value; - } - public String getValue() { - return value; - } - public void setCol(String value) { - this.value = value; - } - @Override - public String toString() { - return this.getValue(); - } - } - }