From c4f1b4be4eb6a9c33d6433aa055a7db89ae32a2c Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 24 Jul 2019 14:55:35 +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/KwMerchantMeterDataDto.java | 4 ++ .../domain/dto/KwMerchantMeterDto.java | 2 + .../iformall/domain/dto/KwMeterDataDto.java | 41 +---------------- .../dto/MarkingCouponDataReportDto.java | 5 --- .../iformall/domain/dto/WxOrderReportDto.java | 5 --- .../com/iformall/domain/po/BaseEntity.java | 27 ++++++++++- .../java/com/iformall/domain/po/KwBox.java | 40 ----------------- .../iformall/domain/po/KwBoxCmdHistory.java | 40 ----------------- .../java/com/iformall/domain/po/KwMeter.java | 42 ----------------- .../com/iformall/domain/po/KwMeterData.java | 39 ---------------- .../iformall/domain/po/MallUserAction.java | 42 ----------------- .../com/iformall/domain/po/MallUserInfo.java | 42 ----------------- .../com/iformall/domain/po/WxActivity.java | 38 ---------------- .../iformall/domain/po/WxActivityJoin.java | 41 ----------------- .../com/iformall/domain/po/WxBillDaily.java | 45 +------------------ .../iformall/domain/po/WxCUserBasicInfo.java | 8 ---- .../iformall/domain/po/WxCarPayRecord.java | 5 --- .../java/com/iformall/domain/po/WxCoupon.java | 39 ---------------- .../iformall/domain/po/WxCouponChannel.java | 45 ------------------- .../iformall/domain/po/WxCouponInject.java | 7 --- .../com/iformall/domain/po/WxCouponOrder.java | 42 ----------------- .../com/iformall/domain/po/WxMerchant.java | 38 ---------------- .../iformall/domain/po/WxMerchantSubsidy.java | 36 +-------------- .../com/iformall/domain/po/WxMsgModel.java | 8 ---- .../iformall/domain/po/WxMsgSignature.java | 45 ------------------- .../java/com/iformall/domain/po/WxOrder.java | 8 ---- .../com/iformall/domain/po/WxScreenAd.java | 44 ------------------ .../java/com/iformall/domain/po/WxShop.java | 43 +----------------- .../java/com/iformall/domain/po/WxTopic.java | 5 --- .../com/iformall/domain/po/msg/BaseMsg.java | 5 --- .../domain/vo/KwMerchantMeterDataVo.java | 2 + .../iformall/domain/vo/KwMerchantMeterVo.java | 1 + .../com/iformall/domain/vo/KwMeterDataVo.java | 2 + .../com/iformall/domain/vo/WxBillAll.java | 6 +-- .../domain/vo/WxMerchantTradeDailyVo.java | 40 +---------------- .../domain/vo/WxOrderGroupMarketing.java | 5 --- .../iformall/domain/vo/WxOrderQueryVo.java | 5 --- .../vo/WxProfitSharingOrderQueryVo.java | 6 +-- .../kw/impl/KwMeterDataServiceImpl.java | 2 +- .../mapper/KwMerchantMeterMapper.xml | 4 +- 40 files changed, 49 insertions(+), 855 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDataDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDataDto.java index 09bf87601..81a5a978e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDataDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDataDto.java @@ -1,7 +1,9 @@ package com.iformall.domain.dto; import com.iformall.domain.po.BaseEntity; +import com.iformall.domain.po.WxBillProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.ArrayList; import java.util.Date; @@ -11,6 +13,7 @@ import java.util.List; * @author gongbiao */ @Data +@EqualsAndHashCode(callSuper = true) public class KwMerchantMeterDataDto extends KwMeterDataDto { @io.swagger.annotations.ApiModelProperty(value="状态1使用0停用",name="merchantStatus") @@ -24,4 +27,5 @@ public class KwMerchantMeterDataDto extends KwMeterDataDto { @io.swagger.annotations.ApiModelProperty(value = "获取个数", name = "limitCount") private Integer limitCount; + } 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 5a938b871..0867c05c0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java @@ -2,6 +2,7 @@ package com.iformall.domain.dto; import com.iformall.domain.po.BaseEntity; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.ArrayList; import java.util.Date; @@ -11,6 +12,7 @@ import java.util.List; * @author gongbiao */ @Data +@EqualsAndHashCode(callSuper = true) public class KwMerchantMeterDto extends BaseEntity { private String tenantId; 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 54d79d173..e9b874f88 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java @@ -17,17 +17,9 @@ import java.util.List; * @author gongbiao */ @Data +@EqualsAndHashCode(callSuper = true) public class KwMeterDataDto extends BaseEntity { - - 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; @@ -91,36 +83,5 @@ public class KwMeterDataDto extends BaseEntity { } } - 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/MarkingCouponDataReportDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java index 3a57c75aa..6c96f5fef 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java @@ -41,9 +41,4 @@ public class MarkingCouponDataReportDto extends BaseEntity { @SortColumn(column = "xTime") private String xtime; - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java index 826ca0be7..2f1920d56 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java @@ -22,9 +22,4 @@ public class WxOrderReportDto extends BaseEntity { private Integer type; private Integer orderStatus; - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } } 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 c63da00aa..ed59d21e3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java @@ -1,12 +1,15 @@ package com.iformall.domain.po; import com.iformall.common.SortColumn; +import com.iformall.domain.dto.KwMeterDataDto; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import javax.persistence.Transient; import java.io.Serializable; import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; /** * @author luozukai @@ -19,11 +22,13 @@ public class BaseEntity implements Serializable { private static final long serialVersionUID = 1L; @Transient private String sortColumn; + @Transient private String sortOrder; @Transient - public String sortColumns; + private String sortColumns; + public String getSortColumns() { if(StringUtils.isBlank(sortColumn)){ @@ -71,7 +76,7 @@ public class BaseEntity implements Serializable { * @param camelCaseName * @return */ - public static String underscoreName(String camelCaseName) { + private static String underscoreName(String camelCaseName) { StringBuilder result = new StringBuilder(); if (camelCaseName != null && camelCaseName.length() > 0) { result.append(camelCaseName.substring(0, 1).toLowerCase()); @@ -87,4 +92,22 @@ public class BaseEntity implements Serializable { } return result.toString(); } + + 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()); + } + sortColumns = sb.toString(); + } + } 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 a16e3f1a0..d0a7e70f4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java @@ -23,14 +23,6 @@ public class KwBox 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; @@ -110,36 +102,4 @@ public class KwBox extends BaseEntity { } } - 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/KwBoxCmdHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java index 113078a18..89318c436 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java @@ -23,14 +23,6 @@ public class KwBoxCmdHistory 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; @@ -79,36 +71,4 @@ public class KwBoxCmdHistory extends BaseEntity { } } - 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 29b6847ef..025592c3b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java @@ -24,14 +24,6 @@ public class KwMeter 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; @@ -101,7 +93,6 @@ public class KwMeter extends BaseEntity { protected KwMeterData latestRecord; - public static enum Field { Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), @@ -128,37 +119,4 @@ public class KwMeter extends BaseEntity { 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/KwMeterData.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java index ed956ceae..ec5c115b5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java @@ -27,14 +27,7 @@ public class KwMeterData extends BaseEntity { @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; @@ -93,36 +86,4 @@ public class KwMeterData extends BaseEntity { } } - 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/MallUserAction.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java index 393b3a0af..25c2e2a4e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java @@ -19,8 +19,6 @@ public class MallUserAction extends BaseEntity { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -62,45 +60,5 @@ public class MallUserAction extends BaseEntity { return this.getValue(); } } - - public void setSortColumns(MallUserAction.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)); - } - } - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } } 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 3cd24b97c..6dc682fed 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java @@ -28,14 +28,6 @@ public class MallUserInfo extends BaseEntity { @Transient protected List ids; - @Transient - protected String sortColumns; - - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -161,39 +153,5 @@ public class MallUserInfo extends BaseEntity { return this.getValue(); } } - - public void setSortColumns(MallUserInfo.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/WxActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java index 00d7275fa..05754ba1f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java @@ -24,14 +24,7 @@ public class WxActivity extends BaseEntity { @Transient protected List ids; - @Transient - protected String sortColumns; - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } @io.swagger.annotations.ApiModelProperty(value = "租户", name = "tenantId") private String tenantId; @@ -149,37 +142,6 @@ public class WxActivity extends BaseEntity { } } - public void setSortColumns(WxActivity.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 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/WxActivityJoin.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java index b5b550b6e..30670fa6b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java @@ -25,14 +25,6 @@ public class WxActivityJoin extends BaseEntity { @Transient protected List ids; - @Transient - protected String sortColumns; - - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; @@ -111,37 +103,4 @@ public class WxActivityJoin extends BaseEntity { } } - public void setSortColumns(WxActivityJoin.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(); - } - - @Override - 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/WxBillDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java index eb79f0fae..6a90eea9b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -25,16 +25,10 @@ import java.util.Map; public class WxBillDaily extends BaseEntity{ @Id protected Long id; - + @Transient protected List ids; - @Transient - protected String sortColumns; - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } + @Transient private String merchantName; @@ -147,39 +141,4 @@ public class WxBillDaily extends BaseEntity{ 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()); - } - - } - - 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/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java index 7494760c7..3176630e9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -25,14 +25,6 @@ public class WxCUserBasicInfo extends BaseEntity { @Transient protected List ids; - @Transient - protected String sortColumns; - - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } @Excel(name="姓名",width = 20,orderNum = "1") @NotNull diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java index 8a444ea10..3d761c6b1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java @@ -62,9 +62,4 @@ public class WxCarPayRecord extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="是否缴费",name="isPay") private Integer isPay; - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } } 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 4a85aebaa..ab9720204 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -37,12 +37,6 @@ public class WxCoupon extends BaseEntity { @Transient protected String channels; - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } - @Transient @SortColumn(column = "sale_price") private String salePriceStr; @@ -321,38 +315,5 @@ public class WxCoupon extends BaseEntity { } } - public void setSortColumns(WxCoupon.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/WxCouponChannel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java index 0572938e0..a2d067f53 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java @@ -23,15 +23,6 @@ public class WxCouponChannel extends BaseEntity { @Transient protected List ids; - @Transient - protected String sortColumns; - - @Override - public String getSortColumns(){ - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } - @Transient private Date startdate; @@ -150,40 +141,4 @@ public class WxCouponChannel extends BaseEntity { } } - public void setSortColumns(WxCouponChannel.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/WxCouponInject.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponInject.java index 19fc211c3..0eff9114e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponInject.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponInject.java @@ -22,8 +22,6 @@ public class WxCouponInject extends BaseEntity { @Transient protected List ids; - @Transient - protected String sortColumns; @Transient protected WxMsgModel msgModel; @@ -34,11 +32,6 @@ public class WxCouponInject extends BaseEntity { @Transient protected Date sendTimeEnd; - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } @io.swagger.annotations.ApiModelProperty(value="",name="tenantId") private String tenantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java index 6da8f95ed..17094e1d7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java @@ -22,14 +22,6 @@ public class WxCouponOrder extends BaseEntity{ @Transient protected List ids; - @Transient - protected String sortColumns; - - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; @@ -134,40 +126,6 @@ public class WxCouponOrder extends BaseEntity{ } } - public void setSortColumns(WxCouponOrder.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)); - } - } - public Long getcUserId() { return cUserId; } 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 cd10a652b..9f0b03172 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -23,8 +23,6 @@ public class WxMerchant extends BaseEntity { @Transient protected List ids; - @Transient - protected String sortColumns; @Transient private List userids; @@ -234,40 +232,4 @@ public class WxMerchant extends BaseEntity { return this.getValue(); } } - - public void setSortColumns(WxMerchant.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/WxMerchantSubsidy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java index fbed4d26e..23f82981c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java @@ -167,39 +167,5 @@ public class WxMerchantSubsidy extends BaseEntity { return this.getValue(); } } - - public void setSortColumns(WxMerchantSubsidy.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/WxMsgModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java index 8b2069af8..1c701a3d3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java @@ -21,14 +21,6 @@ public class WxMsgModel extends BaseEntity { @Transient protected List ids; - @Transient - protected String sortColumns; - - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java index 6904dc2d2..c99982b3f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java @@ -22,14 +22,6 @@ public class WxMsgSignature extends BaseEntity { @Transient protected List ids; - @Transient - protected String sortColumns; - - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -61,41 +53,4 @@ public class WxMsgSignature extends BaseEntity { return this.getValue(); } } - - public void setSortColumns(WxMsgSignature.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/WxOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java index 1bca0f8ae..7dde35982 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java @@ -22,14 +22,6 @@ public class WxOrder extends BaseEntity { @Transient protected List ids; - @Transient - protected String sortColumns; - - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } @Transient private String merchantName; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxScreenAd.java b/mallinkService/src/main/java/com/iformall/domain/po/WxScreenAd.java index 6255b0033..91410abe4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxScreenAd.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxScreenAd.java @@ -23,14 +23,6 @@ public class WxScreenAd extends BaseEntity { @Transient protected List ids; - @Transient - protected String sortColumns; - - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") private String tenantId; @@ -88,40 +80,4 @@ public class WxScreenAd extends BaseEntity { } } - public void setSortColumns(WxScreenAd.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/WxShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java index 83df35b6b..721e41061 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java @@ -32,12 +32,7 @@ public class WxShop extends BaseEntity { @Transient private String linkPhone; - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } - + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -158,39 +153,5 @@ public class WxShop extends BaseEntity { return this.getValue(); } } - - public void setSortColumns(WxShop.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()); - } - 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/WxTopic.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java index 488d53658..586b7c9e7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java @@ -81,11 +81,6 @@ public class WxTopic extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="小程序二维码Scene",name="weappScene") private String weappScene; - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } public String getWeappPath() { if(id == null) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java index 61d73f341..6ae826906 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java @@ -49,9 +49,4 @@ public class BaseMsg extends BaseEntity { @Transient private Integer delayTimeLevel = 0; - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/KwMerchantMeterDataVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/KwMerchantMeterDataVo.java index cc89b2965..a0fa5ca76 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/KwMerchantMeterDataVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/KwMerchantMeterDataVo.java @@ -2,6 +2,7 @@ package com.iformall.domain.vo; import com.iformall.domain.po.BaseEntity; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.Date; @@ -9,6 +10,7 @@ import java.util.Date; * @author gongbiao */ @Data +@EqualsAndHashCode(callSuper = true) public class KwMerchantMeterDataVo extends KwMeterDataVo { @io.swagger.annotations.ApiModelProperty(value = "商户ID", name = "merchantId") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/KwMerchantMeterVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/KwMerchantMeterVo.java index 04fbffb3e..ec12fbfc6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/KwMerchantMeterVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/KwMerchantMeterVo.java @@ -3,6 +3,7 @@ package com.iformall.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.domain.po.KwMeter; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.List; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java index 0920d2614..305e86032 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java @@ -2,6 +2,7 @@ package com.iformall.domain.vo; import com.iformall.domain.po.BaseEntity; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.ArrayList; import java.util.Date; @@ -11,6 +12,7 @@ import java.util.List; * @author gongbiao */ @Data +@EqualsAndHashCode(callSuper = true) public class KwMeterDataVo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java index 6ea91631e..2fdab3b4e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java @@ -16,11 +16,7 @@ import java.util.List; @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxBillAll extends BaseEntity { - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } + @io.swagger.annotations.ApiModelProperty(value="appId",name="appId") private String appId; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java index b78a8f3e7..07256d7c1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java @@ -22,13 +22,7 @@ public class WxMerchantTradeDailyVo extends BaseEntity { @Transient protected List ids; - @Transient - protected String sortColumns; - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } + @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; @@ -127,36 +121,4 @@ public class WxMerchantTradeDailyVo extends BaseEntity { } } - public void setSortColumns(WxMerchantTradeDailyVo.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 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/vo/WxOrderGroupMarketing.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java index 8c1d66aa4..a1e952fb2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java @@ -24,10 +24,5 @@ public class WxOrderGroupMarketing extends BaseEntity { private String verifyRatio; private String totalPeople; - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java index 3a7243731..e60b45477 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java @@ -36,9 +36,4 @@ public class WxOrderQueryVo extends BaseEntity { @Transient private Date createDate; - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java index 5e560ec17..cea5a7ae7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java @@ -41,9 +41,5 @@ public class WxProfitSharingOrderQueryVo extends BaseEntity { @javax.persistence.Transient private Date createTime; - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } + } diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java index b5f55522e..93aa77688 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java @@ -41,7 +41,7 @@ public class KwMeterDataServiceImpl implements KwMeterDataService { @Override public List findVoList(KwMeterDataDto kwMeterDataDto) { - if (kwMeterDataDto.getSortColumn() == null) + if (kwMeterDataDto.getSortColumn() == null && kwMeterDataDto.getSortColumns() == null) kwMeterDataDto.setSortColumns(KwMeterDataDto.Field.ReportTime_ASC); kwMeterDataDto.setStatus(EnumMeterStatus.VALID.getCode()); return kwMeterDataMapper.findVoList(kwMeterDataDto); diff --git a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml index ec008392a..f85c7e7b0 100644 --- a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml @@ -232,8 +232,10 @@ ,businessId - limit #{limitCount} + order by ${sortColumns} + + limit #{limitCount}