Bläddra i källkod

[重要][重要]:调整基础数据类的排序,编不过!!!

release_toaliyun_real
hupeng 6 år sedan
förälder
incheckning
b7867218a2
18 ändrade filer med 121 tillägg och 619 borttagningar
  1. +0
    -62
      mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java
  2. +1
    -10
      mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java
  3. +116
    -0
      mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java
  4. +0
    -26
      mallinkService/src/main/java/com/iformall/domain/po/KwBox.java
  5. +0
    -26
      mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java
  6. +0
    -66
      mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java
  7. +0
    -27
      mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java
  8. +0
    -27
      mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java
  9. +0
    -67
      mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java
  10. +1
    -61
      mallinkService/src/main/java/com/iformall/domain/po/MallResource.java
  11. +2
    -61
      mallinkService/src/main/java/com/iformall/domain/po/MallRole.java
  12. +1
    -59
      mallinkService/src/main/java/com/iformall/domain/po/MallRolePermission.java
  13. +0
    -59
      mallinkService/src/main/java/com/iformall/domain/po/MallSaleType.java
  14. +0
    -26
      mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java
  15. +0
    -32
      mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java
  16. +0
    -2
      mallinkService/src/main/java/com/iformall/domain/po/MallUserRole.java
  17. +0
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
  18. +0
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java

+ 0
- 62
mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java Visa fil

@@ -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<Field> 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));
}
}
}

+ 1
- 10
mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java Visa fil

@@ -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) {


+ 116
- 0
mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java Visa fil

@@ -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) {


+ 0
- 26
mallinkService/src/main/java/com/iformall/domain/po/KwBox.java Visa fil

@@ -75,31 +75,5 @@ public class KwBox extends BaseEntity {
@Transient
private List<KwMeter> 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();
}
}

}

+ 0
- 26
mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java Visa fil

@@ -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();
}
}

}

+ 0
- 66
mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java Visa fil

@@ -23,14 +23,7 @@ public class KwMerchantMeter extends BaseEntity {
protected Long id;
@Transient
protected List<Long> 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<Field> 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));
}
}
}

+ 0
- 27
mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java Visa fil

@@ -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();
}
}
}

+ 0
- 27
mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java Visa fil

@@ -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();
}
}

}

+ 0
- 67
mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java Visa fil

@@ -18,8 +18,6 @@ public class MallPermission implements Serializable {
@Transient
protected List<Long> 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<Field> 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));
}
}
}

+ 1
- 61
mallinkService/src/main/java/com/iformall/domain/po/MallResource.java Visa fil

@@ -19,8 +19,7 @@ public class MallResource implements Serializable {
@Transient
protected List<Long> 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<Field> 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));
}
}
}

+ 2
- 61
mallinkService/src/main/java/com/iformall/domain/po/MallRole.java Visa fil

@@ -18,9 +18,7 @@ public class MallRole implements Serializable {
@Transient
protected List<Long> 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<Field> 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));
}
}

}

+ 1
- 59
mallinkService/src/main/java/com/iformall/domain/po/MallRolePermission.java Visa fil

@@ -19,9 +19,7 @@ public class MallRolePermission implements Serializable {
@Transient
protected List<String> 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<Field> 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));
}
}
}

+ 0
- 59
mallinkService/src/main/java/com/iformall/domain/po/MallSaleType.java Visa fil

@@ -18,8 +18,6 @@ public class MallSaleType implements Serializable {

@Transient
protected List<Long> 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<Field> 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));
}
}
}

+ 0
- 26
mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java Visa fil

@@ -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();
}
}

}

+ 0
- 32
mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java Visa fil

@@ -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();
}
}

}

+ 0
- 2
mallinkService/src/main/java/com/iformall/domain/po/MallUserRole.java Visa fil

@@ -19,8 +19,6 @@ public class MallUserRole implements Serializable {
@Transient
protected List<String> ids;
@Transient
protected String sortColumns;
@io.swagger.annotations.ApiModelProperty(value="用户ID",name="uid")
private Long uid;


+ 0
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java Visa fil

@@ -31,8 +31,6 @@ public class WxCoupon extends BaseEntity {

@Transient
protected List<Long> notinTypes;
@Transient
protected String sortColumns;

@Transient
protected String channels;


+ 0
- 6
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java Visa fil

@@ -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";


Laddar…
Avbryt
Spara