diff --git a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java index f0f2359b0..312022110 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java @@ -1,6 +1,7 @@ package com.iformall.domain.po; import com.iformall.common.SortColumn; +import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -12,6 +13,7 @@ import java.lang.reflect.Field; * @author luozukai * @date 2019/4/24 14:32 */ +@Data public class BaseEntity implements Serializable { private final Logger logger = LoggerFactory.getLogger(this.getClass()); private static final long serialVersionUID = 1L; @@ -85,24 +87,4 @@ public class BaseEntity implements Serializable { } return result.toString(); } - - public void setSortColumn(String sortColumn) { - this.sortColumn = sortColumn; - } - - public String getSortOrder() { - return sortOrder; - } - - public void setSortOrder(String sortOrder) { - this.sortOrder = sortOrder; - } - - public void setSortColumns(String sortColumns) { - this.sortColumns = sortColumns; - } - - public String getSortColumn() { - return sortColumn; - } } 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 ecdc62f25..9a39a7a07 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java @@ -8,8 +8,8 @@ import java.util.List; import javax.persistence.Id; import java.io.Serializable; -@Data @Table(name = "mall_permission") +@Data public class MallPermission implements Serializable { private static final long serialVersionUID = 1L; 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 7fb3e9cd7..72382cf4b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallRolePermission.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallRolePermission.java @@ -1,5 +1,7 @@ package com.iformall.domain.po; +import lombok.Data; + import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; @@ -8,6 +10,7 @@ import java.util.ArrayList; import java.util.List; @Table(name = "mall_role_permission") +@Data public class MallRolePermission implements Serializable { private static final long serialVersionUID = 1L; @@ -18,64 +21,20 @@ public class MallRolePermission implements Serializable { protected List ids; @Transient protected String sortColumns; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getSortColumns() { - return sortColumns; - } - - public List getIds() { - return ids; - } - public void setIds(List ids) { - this.ids = ids; - } - - - /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /*权限ID**/ + @io.swagger.annotations.ApiModelProperty(value="角色ID",name="roleId") + private Long roleId; @io.swagger.annotations.ApiModelProperty(value="权限ID",name="permissionId") private Long permissionId; - /*角色ID**/ - @io.swagger.annotations.ApiModelProperty(value="角色ID",name="roleId") - private Long roleId; - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public Long getPermissionId() { - return permissionId; - } - public void setPermissionId(Long _permissionId) { - permissionId = _permissionId; - } - public Long getRoleId() { - return roleId; - } - public void setRoleId(Long _roleId) { - roleId = _roleId; - } - - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,PermissionId_ASC("`permissionId` ASC"),PermissionId_DESC("`permissionId` DESC") - ,RoleId_ASC("`roleId` ASC"),RoleId_DESC("`roleId` DESC") + ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") + ,PermissionId_ASC("`permission_id` ASC"),PermissionId_DESC("`permission_id` DESC") + ,RoleId_ASC("`role_id` ASC"),RoleId_DESC("`role_id` DESC") ; private String value; Field(String value){ 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 d4d4d4772..471e8270c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallSaleType.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallSaleType.java @@ -8,8 +8,8 @@ import javax.persistence.Transient; import java.io.Serializable; import java.util.List; -@Data @Table(name = "mall_sale_type") +@Data public class MallSaleType implements Serializable { private static final long serialVersionUID = 1L; 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 c0d03ea6e..e21aecbe3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserRole.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserRole.java @@ -1,5 +1,7 @@ package com.iformall.domain.po; +import lombok.Data; + import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; @@ -8,6 +10,7 @@ import java.util.ArrayList; import java.util.List; @Table(name = "mall_user_role") +@Data public class MallUserRole implements Serializable { private static final long serialVersionUID = 1L; @@ -18,54 +21,17 @@ public class MallUserRole implements Serializable { protected List ids; @Transient protected String sortColumns; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getSortColumns() { - return sortColumns; - } - - public List getIds() { - return ids; - } - public void setIds(List ids) { - this.ids = ids; - } - - - /*用户ID**/ @io.swagger.annotations.ApiModelProperty(value="用户ID",name="uid") private Long uid; - /*角色ID**/ @io.swagger.annotations.ApiModelProperty(value="角色ID",name="roleId") private Long roleId; - public Long getUid() { - return uid; - } - public void setUid(Long _uid) { - uid = _uid; - } - public Long getRoleId() { - return roleId; - } - public void setRoleId(Long _roleId) { - roleId = _roleId; - } - - public static enum Field { - Uid_ASC("`uid` ASC"),Uid_DESC("`uid` DESC") - ,RoleId_ASC("`roleId` ASC"),RoleId_DESC("`roleId` DESC") - ,Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + 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){ 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 ddbe681f6..ec0434f29 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/PushLimit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/PushLimit.java @@ -1,5 +1,7 @@ package com.iformall.domain.po; +import lombok.Data; + import javax.persistence.*; import java.util.*; import javax.persistence.Transient; @@ -8,6 +10,7 @@ import javax.persistence.Id; import java.io.Serializable; @Table(name = "push_limit") +@Data public class PushLimit implements Serializable { private static final long serialVersionUID = 1L; @@ -19,107 +22,22 @@ public class PushLimit implements Serializable { @Transient protected String sortColumns; - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getSortColumns() { - return sortColumns; - } - - public List getIds() { - return ids; - } - - public void setIds(List ids) { - this.ids = ids; - } - - - - /**租户ID*/ @io.swagger.annotations.ApiModelProperty(value="",name="tenantId") private String tenantId; - /**每人每天可接收短信数**/ @io.swagger.annotations.ApiModelProperty(value="每人每天可接收短信数",name="msgAmount") private Integer msgAmount; - /**每人每周可接收发券数**/ @io.swagger.annotations.ApiModelProperty(value="每人每周可接收发券数",name="couponAmount") private Integer couponAmount; - /**(每人几天内,不会收到同一个券**/ @io.swagger.annotations.ApiModelProperty(value="每人几天内,不会收到同一个券",name="couponDay") private Integer couponDay; - /**发券,发短信开始时间**/ @io.swagger.annotations.ApiModelProperty(value="发券,发短信开始时间",name="timeStart") private String timeStart; - /**发券,发短信结束时间**/ @io.swagger.annotations.ApiModelProperty(value="发券,发短信结束时间",name="timeEnd") private String timeEnd; - /***/ @io.swagger.annotations.ApiModelProperty(value="",name="createTime") private Date createTime; - /***/ @io.swagger.annotations.ApiModelProperty(value="",name="updateTime") private Date updateTime; - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public Integer getMsgAmount() { - return msgAmount; - } - public void setMsgAmount(Integer _msgAmount) { - msgAmount = _msgAmount; - } - public Integer getCouponAmount() { - return couponAmount; - } - public void setCouponAmount(Integer _couponAmount) { - couponAmount = _couponAmount; - } - public Integer getCouponDay() { - return couponDay; - } - public void setCouponDay(Integer _couponDay) { - couponDay = _couponDay; - } - - public String getTimeStart() { - return timeStart; - } - - public void setTimeStart(String timeStart) { - this.timeStart = timeStart; - } - - public String getTimeEnd() { - return timeEnd; - } - - public void setTimeEnd(String timeEnd) { - this.timeEnd = timeEnd; - } - - public Date getCreateTime() { - return createTime; - } - public void setCreateTime(Date _createTime) { - createTime = _createTime; - } - public Date getUpdateTime() { - return updateTime; - } - public void setUpdateTime(Date _updateTime) { - updateTime = _updateTime; - } - - public static enum Field { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAdminLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAdminLog.java index 703a81146..970550cc0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAdminLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAdminLog.java @@ -1,5 +1,7 @@ package com.iformall.domain.po; +import lombok.Data; + import javax.persistence.*; import javax.persistence.Transient; import java.util.List; @@ -7,6 +9,7 @@ import javax.persistence.Id; import java.io.Serializable; @Table(name = "wx_admin_log") +@Data public class WxAdminLog implements Serializable { private static final long serialVersionUID = 1L; @@ -17,83 +20,24 @@ public class WxAdminLog implements Serializable { protected List ids; @Transient protected String sortColumns; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getSortColumns() { - return sortColumns; - } - - public List getIds() { - return ids; - } - - public void setIds(List ids) { - this.ids = ids; - } - - - /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /*网址**/ @io.swagger.annotations.ApiModelProperty(value="网址",name="url") private String url; - /*时间**/ @io.swagger.annotations.ApiModelProperty(value="时间",name="actionDate") private String actionDate; - /*1. pv 2. uv**/ @io.swagger.annotations.ApiModelProperty(value="1. pv 2. uv",name="type") private Integer type; - /*计数**/ @io.swagger.annotations.ApiModelProperty(value="计数",name="count") private Integer count; - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public String getUrl() { - return url; - } - public void setUrl(String _url) { - url = _url; - } - public String getActionDate() { - return actionDate; - } - public void setActionDate(String _actionDate) { - actionDate = _actionDate; - } - public Integer getType() { - return type; - } - public void setType(Integer _type) { - type = _type; - } - public Integer getCount() { - return count; - } - public void setCount(Integer _count) { - count = _count; - } - - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") + ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") ,Url_ASC("`url` ASC"),Url_DESC("`url` DESC") - ,ActionDate_ASC("`actionDate` ASC"),ActionDate_DESC("`actionDate` DESC") + ,ActionDate_ASC("`action_date` ASC"),ActionDate_DESC("`action_date` DESC") ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") ,Count_ASC("`count` ASC"),Count_DESC("`count` DESC") ; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java index f0b0f212f..d2c0abd98 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java @@ -1,5 +1,7 @@ package com.iformall.domain.po; +import lombok.Data; + import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; @@ -8,6 +10,7 @@ import java.util.Date; import java.util.List; @Table(name = "wx_appinfo") +@Data public class WxAppinfo implements Serializable { private static final long serialVersionUID = 1L; @@ -18,63 +21,29 @@ public class WxAppinfo implements Serializable { protected List ids; @Transient protected String sortColumns; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getSortColumns() { - return sortColumns; - } - - public List getIds() { - return ids; - } - - public void setIds(List ids) { - this.ids = ids; - } - - - /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /*小程序ID**/ @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") private String appId; - /*公众号ID**/ @io.swagger.annotations.ApiModelProperty(value="公众号ID",name="parentAppId") private String parentAppId; - /*小程序名**/ @io.swagger.annotations.ApiModelProperty(value="小程序名",name="name") private String name; - /*小程序secret**/ @io.swagger.annotations.ApiModelProperty(value="小程序secret",name="secret") private String secret; - /*消息token**/ @io.swagger.annotations.ApiModelProperty(value="消息token",name="token") private String token; - /*消息aeskey**/ @io.swagger.annotations.ApiModelProperty(value="消息aeskey",name="aesKey") private String aesKey; - /*消息类型**/ @io.swagger.annotations.ApiModelProperty(value="消息类型",name="msgDataFormat") private String msgDataFormat; - /*微信访问token**/ @io.swagger.annotations.ApiModelProperty(value="微信访问token",name="accessToken") private String accessToken; - /*上次生成accesstoken时间**/ @io.swagger.annotations.ApiModelProperty(value="上次生成accesstoken时间",name="lastTokenTime") private Date lastTokenTime; - /*微信token有效时间单位(秒)**/ @io.swagger.annotations.ApiModelProperty(value="微信token有效时间单位(秒)",name="expiresIn") private Integer expiresIn; - /*支付ID,参看wx_pay_account**/ @io.swagger.annotations.ApiModelProperty(value="支付ID,参看wx_pay_account",name="payId") private Long payId; @io.swagger.annotations.ApiModelProperty(value="1B端2C端",name="type") @@ -82,96 +51,6 @@ public class WxAppinfo implements Serializable { @io.swagger.annotations.ApiModelProperty(value="支付ID,参看wx_pay_account_bill",name="payBillId") private Long payBillId; - public Long getPayBillId() { - return payBillId; - } - - public void setPayBillId(Long payBillId) { - this.payBillId = payBillId; - } - - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public String getAppId() { - return appId; - } - public void setAppId(String _appId) { - appId = _appId; - } - public String getParentAppId() { - return parentAppId; - } - - public void setParentAppId(String parentAppId) { - this.parentAppId = parentAppId; - } - public String getName() { - return name; - } - public void setName(String _name) { - name = _name; - } - public String getSecret() { - return secret; - } - public void setSecret(String _secret) { - secret = _secret; - } - public String getToken() { - return token; - } - public void setToken(String _token) { - token = _token; - } - public String getAesKey() { - return aesKey; - } - public void setAesKey(String _aesKey) { - aesKey = _aesKey; - } - public String getMsgDataFormat() { - return msgDataFormat; - } - public void setMsgDataFormat(String _msgDataFormat) { - msgDataFormat = _msgDataFormat; - } - public String getAccessToken() { - return accessToken; - } - public void setAccessToken(String _accessToken) { - accessToken = _accessToken; - } - public Date getLastTokenTime() { - return lastTokenTime; - } - public void setLastTokenTime(Date _lastTokenTime) { - lastTokenTime = _lastTokenTime; - } - public Integer getExpiresIn() { - return expiresIn; - } - public void setExpiresIn(Integer _expiresIn) { - expiresIn = _expiresIn; - } - public Long getPayId() { - return payId; - } - public void setPayId(Long _payId) { - payId = _payId; - } - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC")