From b7867218a276de8d49ef2fe34bddf0cca4640643 Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 24 Jul 2019 15:32:02 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=87=8D=E8=A6=81][=E9=87=8D=E8=A6=81]:?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E7=9A=84=E6=8E=92=E5=BA=8F,=E7=BC=96=E4=B8=8D=E8=BF=87!!!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/dto/KwMerchantMeterDto.java | 62 ---------- .../iformall/domain/dto/KwMeterDataDto.java | 11 +- .../com/iformall/domain/po/BaseEntity.java | 116 ++++++++++++++++++ .../java/com/iformall/domain/po/KwBox.java | 26 ---- .../iformall/domain/po/KwBoxCmdHistory.java | 26 ---- .../iformall/domain/po/KwMerchantMeter.java | 66 ---------- .../java/com/iformall/domain/po/KwMeter.java | 27 ---- .../com/iformall/domain/po/KwMeterData.java | 27 ---- .../iformall/domain/po/MallPermission.java | 67 ---------- .../com/iformall/domain/po/MallResource.java | 62 +--------- .../java/com/iformall/domain/po/MallRole.java | 63 +--------- .../domain/po/MallRolePermission.java | 60 +-------- .../com/iformall/domain/po/MallSaleType.java | 59 --------- .../iformall/domain/po/MallUserAction.java | 26 ---- .../com/iformall/domain/po/MallUserInfo.java | 32 ----- .../com/iformall/domain/po/MallUserRole.java | 2 - .../java/com/iformall/domain/po/WxCoupon.java | 2 - .../com/iformall/domain/po/WxMerchant.java | 6 - 18 files changed, 121 insertions(+), 619 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java index 0867c05c0..c33d6e5ee 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java @@ -17,7 +17,6 @@ public class KwMerchantMeterDto extends BaseEntity { private String tenantId; - @io.swagger.annotations.ApiModelProperty(value="商户名",name="name") private String merchantName; @@ -36,70 +35,9 @@ public class KwMerchantMeterDto extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="状态1使用0停用",name="merchantStatus") private Integer merchantStatus; - protected String sortColumns; - - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } @io.swagger.annotations.ApiModelProperty(value = "商户ID", name = "merchantId") private Long merchantId; - public static enum Field { - BusinessId_ASC("`business_id` ASC"), - BusinessId_DESC("`business_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(); - } - } - - public void setSortColumns(Field... fields) { - if (fields == null || fields.length == 0) { - return; - } - for (int k = 0; k < fields.length; k++) { - if (fields[k] == null) { - return; - } - } - StringBuilder sb = new StringBuilder(fields[0].toString()); - for (int k = 1; k < fields.length; k++) { - sb.append(","); - sb.append(fields[k].toString()); - } - this.sortColumns = sb.toString(); - } - public void setSortColumns(String sortColumns) { - if (sortColumns == null || "".equals(sortColumns.trim())) { - return; - } - if (sortColumns.contains(",")) { - String[] cols = sortColumns.split(","); - List fList = new ArrayList(); - for (int k = 0; k < cols.length; k++) { - fList.add(Field.valueOf(cols[k])); - } - this.setSortColumns(fList.toArray(new Field[fList.size()])); - } else { - this.setSortColumns(Field.valueOf(sortColumns)); - } - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java index e9b874f88..91d8fb4a3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java @@ -53,16 +53,7 @@ public class KwMeterDataDto extends BaseEntity { private Integer status; public static enum Field { - RecordStartTime_ASC("`recordStartTime` ASC"), - RecordStartTime_DESC("`recordStartTime` DESC"), - RecordEndTime_ASC("`recordEndTime` ASC"), - RecordEndTime_DESC("`recordEndTime` DESC"), - UsedPower_ASC("`usedPower` ASC"), - UsedPower_DESC("`usedPower` DESC"), - TotalEndTime_ASC("`totalPower` ASC"), - TotalEndTime_DESC("`totalPower` DESC"), - ReportTime_ASC("`reportTime` ASC"), - ReportTime_DESC("`reportTime` DESC"); + ; private String value; Field(String value) { 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 ed59d21e3..68c7dc7d5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java @@ -92,6 +92,122 @@ public class BaseEntity implements Serializable { } return result.toString(); } + public enum Field { + Id_ASC("`id` ASC"), + Id_DESC("`id` DESC"), + CreateTime_ASC("`create_time` ASC"), + CreateTime_DESC("`create_time` DESC"), + UpdateTime_ASC("`update_time` ASC"), + UpdateTime_DESC("`update_time` DESC"), + + BusinessId_ASC("`business_id` ASC"), + BusinessId_DESC("`business_id` DESC"), + + Name_ASC("`name` ASC"), + Name_DESC("`name` DESC"), + ParentId_ASC("`parent_id` ASC"), + ParentId_DESC("`parent_id` DESC"), + Available_ASC("`available` ASC"), + Available_DESC("`available` DESC"), + Permission_ASC("`permission` ASC"), + Permission_DESC("`permission` DESC"), + ResourceType_ASC("`resource_type` ASC"), + ResourceType_DESC("`resource_type` DESC"), + ModuleColor_ASC("`module_color` ASC"), + ModuleColor_DESC("`module_color` DESC"), + ModuleColorNum_ASC("`module_color_num` ASC"), + ModuleColorNum_DESC("`module_color_num` DESC"), + Url_ASC("`url` ASC"), + Url_DESC("`url` DESC"), + Icon_ASC("`icon` ASC"), + Icon_DESC("`icon` DESC"), + VersionType_ASC("`version_type` ASC"), + VersionType_DESC("`version_type` DESC"), + Sort_ASC("`sort` ASC"), + Sort_DESC("`sort` DESC"), + + TenantId_ASC("`tenant_id` ASC"), + TenantId_DESC("`tenant_id` DESC"), + Bucket_ASC("`bucket` ASC"), + Bucket_DESC("`bucket` DESC"), + Key_ASC("`s3_key` ASC"), + Key_DESC("`s3_key` DESC"), + + PermissionId_ASC("`permission_id` ASC"), + PermissionId_DESC("`permission_id` DESC"), + RoleId_ASC("`role_id` ASC"), + RoleId_DESC("`role_id` DESC"), + + Description_ASC("`description` ASC"), + Description_DESC("`description` DESC"), + Type_ASC("`type` ASC"), + Type_DESC("`type` DESC"), + Period_ASC("`period` ASC"), + Period_DESC("`period` DESC"), + + UserId_ASC("`user_id` ASC"), + UserId_DESC("`user_id` DESC"), + Ip_ASC("`ip` ASC"), + Ip_DESC("`ip` DESC"), + ActionDesc_ASC("`action_desc` ASC"), + ActionDesc_DESC("`action_desc` DESC"), + ActionTime_ASC("`action_time` ASC"), + ActionTime_DESC("`action_time` DESC"), + + Username_ASC("`username` ASC"), + Username_DESC("`username` DESC"), + Password_ASC("`password` ASC"), + Password_DESC("`password` DESC"), + LastLoginTime_ASC("`last_login_time` ASC"), + LastLoginTime_DESC("`last_login_time` DESC"), + Status_ASC("`status` ASC"), + Status_DESC("`status` DESC"), + IsAdmin_ASC("`is_admin` ASC"), + IsAdmin_DESC("`is_admin` DESC"), + NickName_ASC("`nick_name` ASC"), + NickName_DESC("`nick_name` DESC"), + Phone_ASC("`phone` ASC"), + Phone_DESC("`phone` DESC"), + BOpenId_ASC("`bopen_id` ASC"), + OpenId_DESC("`bopen_id` DESC"), + WebOpenId_ASC("`web_open_id` ASC"), + WebOpenId_DESC("`web_open_id` DESC"), + + Uid_ASC("`uid` ASC"), + Uid_DESC("`uid` DESC"), + + + + + + + RecordStartTime_ASC("`recordStartTime` ASC"), + RecordStartTime_DESC("`recordStartTime` DESC"), + RecordEndTime_ASC("`recordEndTime` ASC"), + RecordEndTime_DESC("`recordEndTime` DESC"), + UsedPower_ASC("`usedPower` ASC"), + UsedPower_DESC("`usedPower` DESC"), + TotalEndTime_ASC("`totalPower` ASC"), + TotalEndTime_DESC("`totalPower` DESC"), + ReportTime_ASC("`reportTime` ASC"), + ReportTime_DESC("`reportTime` 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(); + } + } public void setSortColumns(Field... fields) { if (fields == null || fields.length == 0) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java b/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java index d0a7e70f4..e0c14c29d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java @@ -75,31 +75,5 @@ public class KwBox extends BaseEntity { @Transient private List meters; - public static enum Field { - Id_ASC("`id` ASC"), - Id_DESC("`id` DESC"), - CreateTime_ASC("`create_time` ASC"), - CreateTime_DESC("`create_time` DESC"), - UpdateTime_ASC("`update_time` ASC"), - UpdateTime_DESC("`update_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/KwBoxCmdHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java index 89318c436..a5d5a35a2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java @@ -45,30 +45,4 @@ public class KwBoxCmdHistory extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime") private Date createTime; - - public static enum Field { - Id_ASC("`id` ASC"), - Id_DESC("`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/KwMerchantMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java index 98713e581..93a3a0435 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java @@ -23,14 +23,7 @@ public class KwMerchantMeter extends BaseEntity { protected Long id; @Transient protected List ids; - @Transient - protected String sortColumns; - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") private String tenantId; @@ -51,63 +44,4 @@ public class KwMerchantMeter extends BaseEntity { private Date updateTime; - public static enum Field { - Id_ASC("`id` ASC"), - Id_DESC("`id` DESC"), - CreateTime_ASC("`create_time` ASC"), - CreateTime_DESC("`create_time` DESC"), - UpdateTime_ASC("`update_time` ASC"), - UpdateTime_DESC("`update_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(); - } - } - - public void setSortColumns(Field... fields) { - if (fields == null || fields.length == 0) { - return; - } - for (int k = 0; k < fields.length; k++) { - if (fields[k] == null) { - return; - } - } - StringBuilder sb = new StringBuilder(fields[0].toString()); - for (int k = 1; k < fields.length; k++) { - sb.append(","); - sb.append(fields[k].toString()); - } - this.sortColumns = sb.toString(); - } - - public void setSortColumns(String sortColumns) { - if (sortColumns == null || "".equals(sortColumns.trim())) { - return; - } - if (sortColumns.contains(",")) { - String[] cols = sortColumns.split(","); - List fList = new ArrayList(); - for (int k = 0; k < cols.length; k++) { - fList.add(Field.valueOf(cols[k])); - } - this.setSortColumns(fList.toArray(new Field[fList.size()])); - } else { - this.setSortColumns(Field.valueOf(sortColumns)); - } - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java index 025592c3b..98c48f0a4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java @@ -92,31 +92,4 @@ public class KwMeter extends BaseEntity { @Transient protected KwMeterData latestRecord; - - public static enum Field { - Id_ASC("`id` ASC"), - Id_DESC("`id` DESC"), - CreateTime_ASC("`create_time` ASC"), - CreateTime_DESC("`create_time` DESC"), - UpdateTime_ASC("`update_time` ASC"), - UpdateTime_DESC("`update_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/KwMeterData.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java index ec5c115b5..fa24db3ba 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java @@ -59,31 +59,4 @@ public class KwMeterData extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "时段用电量开始电量", name = "lastTotalPower") private Integer lastTotalPower; - public static enum Field { - Id_ASC("`id` ASC"), - Id_DESC("`id` DESC"), - DeviceTime_ASC("`device_time` ASC"), - DeviceTime_DESC("`device_time` 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/MallPermission.java b/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java index 730dceacc..b09546030 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java @@ -18,8 +18,6 @@ public class MallPermission implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="权限名称",name="name") private String name; @@ -69,69 +67,4 @@ public class MallPermission implements Serializable { @io.swagger.annotations.ApiModelProperty(value="子菜单",name="children") private List children; - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") - ,ParentId_ASC("`parent_id` ASC"),ParentId_DESC("`parent_id` DESC") - ,Available_ASC("`available` ASC"),Available_DESC("`available` DESC") - ,Permission_ASC("`permission` ASC"),Permission_DESC("`permission` DESC") - ,ResourceType_ASC("`resource_type` ASC"),ResourceType_DESC("`resource_type` DESC") - ,ModuleColor_ASC("`module_color` ASC"),ModuleColor_DESC("`module_color` DESC") - ,ModuleColorNum_ASC("`module_color_num` ASC"),ModuleColorNum_DESC("`module_color_num` DESC") - ,Url_ASC("`url` ASC"),Url_DESC("`url` DESC") - ,Icon_ASC("`icon` ASC"),Icon_DESC("`icon` DESC") - ,VersionType_ASC("`version_type` ASC"),VersionType_DESC("`version_type` DESC") - ,Sort_ASC("`sort` ASC"),Sort_DESC("`sort` 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(); - } - } - - public void setSortColumns(MallPermission.Field... fields) - { - if (fields == null || fields.length == 0) { - return; - } - for (int k = 0; k < fields.length; k++) { - if (fields[k] == null) { - return; - } - } - StringBuilder sb = new StringBuilder(fields[0].toString()); - for (int k = 1; k < fields.length; k++) { - sb.append(","); - sb.append(fields[k].toString()); - } - - } - - public void setSortColumns(String sortColumns) - { - if (sortColumns == null || "".equals(sortColumns.trim())) { - return; - } - if (sortColumns.contains(",")) { - String[] cols = sortColumns.split(","); - java.util.List fList = new java.util.ArrayList(); - for (int k = 0; k < cols.length; k++) { - fList.add(Field.valueOf(cols[k])); - } - this.setSortColumns(fList.toArray(new Field[fList.size()])); - } else { - this.setSortColumns(Field.valueOf(sortColumns)); - } - } } 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 2fc17a6dd..e086f07c2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallResource.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallResource.java @@ -19,8 +19,7 @@ public class MallResource implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -32,63 +31,4 @@ public class MallResource implements Serializable { private String url; - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,Bucket_ASC("`bucket` ASC"),Bucket_DESC("`bucket` DESC") - ,Key_ASC("`s3_key` ASC"),Key_DESC("`s3_key` DESC") - ,Url_ASC("`url` ASC"),Url_DESC("`url` 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(); - } - } - - public void setSortColumns(MallResource.Field... fields) - { - if (fields == null || fields.length == 0) { - return; - } - for (int k = 0; k < fields.length; k++) { - if (fields[k] == null) { - return; - } - } - StringBuilder sb = new StringBuilder(fields[0].toString()); - for (int k = 1; k < fields.length; k++) { - sb.append(","); - sb.append(fields[k].toString()); - } - this.sortColumns = sb.toString(); - } - - public void setSortColumns(String sortColumns) - { - if (sortColumns == null || "".equals(sortColumns.trim())) { - return; - } - if (sortColumns.contains(",")) { - String[] cols = sortColumns.split(","); - java.util.List fList = new java.util.ArrayList(); - for (int k = 0; k < cols.length; k++) { - fList.add(Field.valueOf(cols[k])); - } - this.setSortColumns(fList.toArray(new Field[fList.size()])); - } else { - this.setSortColumns(Field.valueOf(sortColumns)); - } - } } 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 e0b444f98..6a91101a8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java @@ -18,9 +18,7 @@ public class MallRole implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; - + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="角色名称",name="name") @@ -34,62 +32,5 @@ public class MallRole implements Serializable { @io.swagger.annotations.ApiModelProperty(value="权限列表",name="menus") private String menus; - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") - ,Available_ASC("`available` ASC"),Available_DESC("`available` DESC") - ,Description_ASC("`description` ASC"),Description_DESC("`description` 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(); - } - } - - public void setSortColumns(MallRole.Field... fields) - { - if (fields == null || fields.length == 0) { - return; - } - for (int k = 0; k < fields.length; k++) { - if (fields[k] == null) { - return; - } - } - StringBuilder sb = new StringBuilder(fields[0].toString()); - for (int k = 1; k < fields.length; k++) { - sb.append(","); - sb.append(fields[k].toString()); - } - - } - - public void setSortColumns(String sortColumns) - { - if (sortColumns == null || "".equals(sortColumns.trim())) { - return; - } - if (sortColumns.contains(",")) { - String[] cols = sortColumns.split(","); - java.util.List fList = new java.util.ArrayList(); - for (int k = 0; k < cols.length; k++) { - fList.add(Field.valueOf(cols[k])); - } - this.setSortColumns(fList.toArray(new Field[fList.size()])); - } else { - this.setSortColumns(Field.valueOf(sortColumns)); - } - } + } 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 72382cf4b..08ee4b0fc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallRolePermission.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallRolePermission.java @@ -19,9 +19,7 @@ public class MallRolePermission implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; - + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="角色ID",name="roleId") @@ -29,61 +27,5 @@ public class MallRolePermission implements Serializable { @io.swagger.annotations.ApiModelProperty(value="权限ID",name="permissionId") private Long permissionId; - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` 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){ - this.value = value; - } - public String getValue() { - return value; - } - public void setCol(String value) { - this.value = value; - } - @Override - public String toString() { - return this.getValue(); - } - } - - public void setSortColumns(MallRolePermission.Field... fields) - { - if (fields == null || fields.length == 0) { - return; - } - for (int k = 0; k < fields.length; k++) { - if (fields[k] == null) { - return; - } - } - StringBuilder sb = new StringBuilder(fields[0].toString()); - for (int k = 1; k < fields.length; k++) { - sb.append(","); - sb.append(fields[k].toString()); - } - - } - public void setSortColumns(String sortColumns) - { - if (sortColumns == null || "".equals(sortColumns.trim())) { - return; - } - if (sortColumns.contains(",")) { - String[] cols = sortColumns.split(","); - List fList = new ArrayList(); - for (int k = 0; k < cols.length; k++) { - fList.add(Field.valueOf(cols[k])); - } - this.setSortColumns(fList.toArray(new Field[fList.size()])); - } else { - this.setSortColumns(Field.valueOf(sortColumns)); - } - } } 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 471e8270c..6093fa0d5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallSaleType.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallSaleType.java @@ -18,8 +18,6 @@ public class MallSaleType implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="销售类型名",name="name") private String name; @@ -30,61 +28,4 @@ public class MallSaleType implements Serializable { @io.swagger.annotations.ApiModelProperty(value="菜单列表",name="menus") private String menus; - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") - ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") - ,Period_ASC("`period` ASC"),Period_DESC("`period` 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(); - } - } - - public void setSortColumns(MallSaleType.Field... fields) - { - if (fields == null || fields.length == 0) { - return; - } - for (int k = 0; k < fields.length; k++) { - if (fields[k] == null) { - return; - } - } - StringBuilder sb = new StringBuilder(fields[0].toString()); - for (int k = 1; k < fields.length; k++) { - sb.append(","); - sb.append(fields[k].toString()); - } - - } - - public void setSortColumns(String sortColumns) - { - if (sortColumns == null || "".equals(sortColumns.trim())) { - return; - } - if (sortColumns.contains(",")) { - String[] cols = sortColumns.split(","); - List fList = new java.util.ArrayList(); - for (int k = 0; k < cols.length; k++) { - fList.add(Field.valueOf(cols[k])); - } - this.setSortColumns(fList.toArray(new Field[fList.size()])); - } else { - this.setSortColumns(Field.valueOf(sortColumns)); - } - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java index 25c2e2a4e..7dc3989c7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java @@ -35,30 +35,4 @@ public class MallUserAction extends BaseEntity { - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,UserId_ASC("`user_id` ASC"),UserId_DESC("`user_id` DESC") - ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") - ,Ip_ASC("`ip` ASC"),Ip_DESC("`ip` DESC") - ,ActionDesc_ASC("`action_desc` ASC"),ActionDesc_DESC("`action_desc` DESC") - ,ActionTime_ASC("`action_time` ASC"),ActionTime_DESC("`action_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/MallUserInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java index 6dc682fed..c86acf9c0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java @@ -122,36 +122,4 @@ public class MallUserInfo extends BaseEntity { return false; } - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,Username_ASC("`username` ASC"),Username_DESC("`username` DESC") - ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") - ,Password_ASC("`password` ASC"),Password_DESC("`password` DESC") - ,CreateTime_ASC("`create_time` ASC"),CreateTime_DESC("`create_time` DESC") - ,LastLoginTime_ASC("`last_login_time` ASC"),LastLoginTime_DESC("`last_login_time` DESC") - ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ,IsAdmin_ASC("`is_admin` ASC"),IsAdmin_DESC("`is_admin` DESC") - ,NickName_ASC("`nick_name` ASC"),NickName_DESC("`nick_name` DESC") - ,Phone_ASC("`phone` ASC"),Phone_DESC("`phone` DESC") - ,BOpenId_ASC("`bopen_id` ASC"),BOpenId_DESC("`bopen_id` DESC") - ,WebOpenId_ASC("`web_open_id` ASC"),WebOpenId_DESC("`web_open_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/MallUserRole.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserRole.java index e21aecbe3..8d79918c4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserRole.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserRole.java @@ -19,8 +19,6 @@ public class MallUserRole implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="用户ID",name="uid") private Long uid; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index ab9720204..030e604d6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -31,8 +31,6 @@ public class WxCoupon extends BaseEntity { @Transient protected List notinTypes; - @Transient - protected String sortColumns; @Transient protected String channels; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 9f0b03172..5754d85cb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -187,12 +187,6 @@ public class WxMerchant extends BaseEntity { @Transient private WxProfitSharingReceiver wxProfitSharingReceiver; - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } - public String getWeappPath() { if(id == null) return "pages/index/index";