From 93fade738acef078e8793653f6c982b6ddca7d7a Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 24 Jul 2019 15:45:36 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=B3=BB=E7=BB=9F][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=9E=E4=BD=93]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxMsgValidationcodeModelController.java | 8 ++- .../com/iformall/domain/po/BaseEntity.java | 16 ------ .../iformall/domain/po/MallPermission.java | 36 ++++++------- .../com/iformall/domain/po/MallUserRole.java | 34 ------------- .../com/iformall/domain/po/PushLimit.java | 35 ------------- .../com/iformall/domain/po/SysMonitor.java | 36 ------------- .../com/iformall/domain/po/WxAdminLog.java | 38 +------------- .../com/iformall/domain/po/WxAppinfo.java | 38 +------------- .../iformall/domain/po/WxAuthorizerInfo.java | 36 ------------- .../java/com/iformall/domain/po/WxBLog.java | 34 ------------- .../com/iformall/domain/po/WxBillAction.java | 34 ------------- .../com/iformall/domain/po/WxBillDeposit.java | 36 ------------- .../com/iformall/domain/po/WxBillOther.java | 42 --------------- .../domain/po/WxBillOtherDeposit.java | 39 -------------- .../iformall/domain/po/WxBillProperty.java | 41 --------------- .../domain/po/WxBillPropertyDeposit.java | 36 ------------- .../com/iformall/domain/po/WxBillRent.java | 41 --------------- .../java/com/iformall/domain/po/WxBrand.java | 41 --------------- .../com/iformall/domain/po/WxBusiness.java | 40 +-------------- .../java/com/iformall/domain/po/WxCLog.java | 34 ------------- .../java/com/iformall/domain/po/WxCUser.java | 44 ---------------- .../iformall/domain/po/WxCUserBasicInfo.java | 36 ------------- .../com/iformall/domain/po/WxCUserCar.java | 36 ------------- .../com/iformall/domain/po/WxCUserFromB.java | 35 +------------ .../com/iformall/domain/po/WxCUserTags.java | 34 ------------- .../com/iformall/domain/po/WxCampaign.java | 42 --------------- .../com/iformall/domain/po/WxCarCmdLog.java | 38 +------------- .../com/iformall/domain/po/WxCardInfo.java | 36 ------------- .../com/iformall/domain/po/WxCardSpend.java | 36 ------------- .../com/iformall/domain/po/WxChannel.java | 36 ------------- .../domain/po/WxComponentVerifyTicket.java | 37 +------------- .../iformall/domain/po/WxCouponActionLog.java | 37 -------------- .../com/iformall/domain/po/WxCouponCar.java | 36 ------------- .../iformall/domain/po/WxCouponInject.java | 36 ------------- .../iformall/domain/po/WxCouponMerchant.java | 36 ------------- .../com/iformall/domain/po/WxCouponSend.java | 44 ---------------- .../domain/po/WxCouponSendConfig.java | 36 ------------- .../com/iformall/domain/po/WxCouponType.java | 35 +------------ .../iformall/domain/po/WxCreditHistory.java | 36 ------------- .../domain/po/WxDateAmountRecord.java | 38 +------------- .../java/com/iformall/domain/po/WxDevice.java | 44 ---------------- .../java/com/iformall/domain/po/WxGame.java | 33 ------------ .../iformall/domain/po/WxGameActionLog.java | 37 -------------- .../iformall/domain/po/WxGameTemplate.java | 37 +------------- .../java/com/iformall/domain/po/WxGroup.java | 39 +------------- .../com/iformall/domain/po/WxLevelConfig.java | 38 -------------- .../iformall/domain/po/WxLevelMerchant.java | 36 ------------- .../java/com/iformall/domain/po/WxMall.java | 39 +------------- .../com/iformall/domain/po/WxMallApply.java | 37 +------------- .../iformall/domain/po/WxMallBuilding.java | 36 ------------- .../com/iformall/domain/po/WxMallFloor.java | 36 ------------- .../iformall/domain/po/WxMerchantBUser.java | 35 ------------- .../iformall/domain/po/WxMerchantCorp.java | 34 ------------- .../iformall/domain/po/WxMerchantShop.java | 38 -------------- .../iformall/domain/po/WxMerchantSubsidy.java | 5 -- .../com/iformall/domain/po/WxMerchantTax.java | 36 ------------- .../domain/po/WxMerchantTradeDaily.java | 34 ------------- .../com/iformall/domain/po/WxMsgCallback.java | 43 ---------------- .../com/iformall/domain/po/WxMsgConfig.java | 36 ------------- .../com/iformall/domain/po/WxMsgLimit.java | 43 ---------------- .../com/iformall/domain/po/WxMsgModel.java | 36 ------------- .../domain/po/WxMsgValidationcode.java | 34 ------------- .../domain/po/WxMsgValidationcodeModel.java | 38 +------------- .../java/com/iformall/domain/po/WxOrder.java | 36 +------------ .../com/iformall/domain/po/WxOrderGroup.java | 35 ------------- .../com/iformall/domain/po/WxOrderPress.java | 36 ------------- .../java/com/iformall/domain/po/WxPark.java | 37 -------------- .../com/iformall/domain/po/WxPayAccount.java | 38 -------------- .../iformall/domain/po/WxPayAccountBill.java | 38 -------------- .../com/iformall/domain/po/WxPayBill.java | 37 -------------- .../com/iformall/domain/po/WxPayOrder.java | 37 -------------- .../com/iformall/domain/po/WxPrepayment.java | 34 ------------- .../domain/po/WxPrepaymentHistory.java | 34 ------------- .../domain/po/WxProfitSharingOrder.java | 40 +-------------- .../domain/po/WxProfitSharingReceiver.java | 38 -------------- .../domain/po/WxProfitSharingResult.java | 38 +------------- .../domain/po/WxPropertyContract.java | 41 +-------------- .../com/iformall/domain/po/WxQuestion.java | 37 -------------- .../iformall/domain/po/WxQuestionConfig.java | 38 -------------- .../com/iformall/domain/po/WxQuestionLog.java | 38 -------------- .../com/iformall/domain/po/WxRefundOrder.java | 38 +------------- .../iformall/domain/po/WxRentContract.java | 36 ------------- .../iformall/domain/po/WxScoreHistory.java | 39 +------------- .../com/iformall/domain/po/WxScoreRules.java | 38 +------------- .../domain/po/WxScoreValidityPeriod.java | 38 +------------- .../com/iformall/domain/po/WxSubBusiness.java | 40 +-------------- .../com/iformall/domain/po/WxSubsidy.java | 42 --------------- .../java/com/iformall/domain/po/WxTags.java | 40 +-------------- .../com/iformall/domain/po/WxTagsGroup.java | 38 -------------- .../com/iformall/domain/po/WxTagsType.java | 38 -------------- .../com/iformall/domain/po/WxTemplateMsg.java | 38 -------------- .../com/iformall/domain/po/WxUserChannel.java | 39 +------------- .../com/iformall/domain/po/WxUserVisit.java | 38 +------------- .../domain/po/WxWeappAuditStatus.java | 36 ------------- .../iformall/domain/po/WxWeappBasicSet.java | 36 ------------- .../iformall/domain/po/WxWeappCodeStatus.java | 36 ------------- .../com/iformall/domain/po/WxWeappExtSet.java | 36 ------------- .../domain/po/WxWeappReleaseStatus.java | 36 ------------- .../com/iformall/domain/po/WxWiWideInfo.java | 37 -------------- .../com/iformall/domain/po/msg/WxMsg.java | 39 -------------- .../iformall/domain/vo/MallUserActionVo.java | 40 --------------- .../com/iformall/domain/vo/WxCardCVo.java | 37 -------------- .../iformall/domain/vo/WxCouponOrderBVo.java | 6 --- .../domain/vo/WxMerchantSubsidyVo.java | 36 ------------- .../com/iformall/domain/vo/WxOrderPayVo.java | 34 ------------- .../domain/vo/WxRentPropertyContractVo.java | 8 --- .../com/iformall/domain/vo/WxWeappInfo.java | 34 ------------- .../iformall/enums/EnumMsgModelReplace.java | 51 +++++++++++++++++++ .../service/impl/WxFlowServiceImpl.java | 11 ++-- 109 files changed, 112 insertions(+), 3798 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumMsgModelReplace.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java index 2d7b4fe13..2c642b3f4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java @@ -6,6 +6,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMsgValidationcodeModel; +import com.iformall.enums.EnumMsgModelReplace; import com.iformall.service.WxMsgValidationcodeModelService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -33,7 +34,12 @@ public class WxMsgValidationcodeModelController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeModelController::list"); if (null == wxMsgValidationcodeModel) wxMsgValidationcodeModel = new WxMsgValidationcodeModel(); wxMsgValidationcodeModel.setTenantId(getTenantId()); - final PageInfo page = wxMsgValidationcodeModelService.listAsPage(wxMsgValidationcodeModel, pageNum, pageSize); + PageInfo page = wxMsgValidationcodeModelService.listAsPage(wxMsgValidationcodeModel, pageNum, pageSize); + page.getList().forEach(m -> { + for (EnumMsgModelReplace e : EnumMsgModelReplace.values()) { + m.setContent(m.getContent().replace(e.getCode(),e.getMessage())); + } + }); return new ResultData(page); } 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 68c7dc7d5..b695ea803 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java @@ -209,21 +209,5 @@ public class BaseEntity implements Serializable { } } - 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/MallPermission.java b/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java index b09546030..4d3a8a755 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java @@ -11,19 +11,19 @@ import java.io.Serializable; @Table(name = "mall_permission") @Data public class MallPermission implements Serializable { - private static final long serialVersionUID = 1L; - - @Id + private static final long serialVersionUID = 1L; + + @Id protected Long id; - + @Transient protected List ids; - @io.swagger.annotations.ApiModelProperty(value="权限名称",name="name") - private String name; - @Transient + @io.swagger.annotations.ApiModelProperty(value="权限名称",name="name") + private String name; + @Transient @io.swagger.annotations.ApiModelProperty(value="权限名称[LIKE]",name="nameLike") - private String nameLike; + private String nameLike; @io.swagger.annotations.ApiModelProperty(value="父编号ID,一级菜单为0",name="parentId") private Long parentId; @Transient @@ -31,24 +31,24 @@ public class MallPermission implements Serializable { private String parentName; @io.swagger.annotations.ApiModelProperty(value="是否可用 Y/N",name="permission") private String available; - @io.swagger.annotations.ApiModelProperty(value="授权(多个用逗号分隔,如:user:list,user:create)",name="permission") - private String permission; - @Transient - private List permissions; - @io.swagger.annotations.ApiModelProperty(value="资源类型0:目录 1:菜单 2:按钮",name="resourceType") - private Integer resourceType; + @io.swagger.annotations.ApiModelProperty(value="授权(多个用逗号分隔,如:user:list,user:create)",name="permission") + private String permission; + @Transient + private List permissions; + @io.swagger.annotations.ApiModelProperty(value="资源类型0:目录 1:菜单 2:按钮",name="resourceType") + private Integer resourceType; @io.swagger.annotations.ApiModelProperty(value="菜单背景色-1级菜单使用",name="moduleColor") private String moduleColor; @io.swagger.annotations.ApiModelProperty(value="菜单字体颜色-1级菜单使用",name="moduleColorNum") private String moduleColorNum; - @io.swagger.annotations.ApiModelProperty(value="资源路径(user/list or http://localhost/1.html)",name="url") - private String url; + @io.swagger.annotations.ApiModelProperty(value="资源路径(user/list or http://localhost/1.html)",name="url") + private String url; @io.swagger.annotations.ApiModelProperty(value="菜单图标",name="icon") private String icon; @io.swagger.annotations.ApiModelProperty(value="版本类型(1:标准版)",name="versionType") private Integer versionType; - @io.swagger.annotations.ApiModelProperty(value="排序",name="sort") - private Integer sort; + @io.swagger.annotations.ApiModelProperty(value="排序",name="sort") + private Integer sort; @Transient private Integer sortFrom; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallUserRole.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserRole.java index 8d79918c4..65c4bf587 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserRole.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserRole.java @@ -47,38 +47,4 @@ public class MallUserRole implements Serializable { } } - public void setSortColumns(MallUserRole.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/PushLimit.java b/mallinkService/src/main/java/com/iformall/domain/po/PushLimit.java index 2fc3e6124..5668f4fdb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/PushLimit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/PushLimit.java @@ -19,8 +19,6 @@ public class PushLimit implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -73,38 +71,5 @@ public class PushLimit implements Serializable { } } - public void setSortColumns(PushLimit.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/SysMonitor.java b/mallinkService/src/main/java/com/iformall/domain/po/SysMonitor.java index 07f0d4e5a..7c26e7214 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/SysMonitor.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/SysMonitor.java @@ -17,8 +17,6 @@ public class SysMonitor implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="网址url",name="name") private String name; @@ -61,38 +59,4 @@ public class SysMonitor implements Serializable { } } - public void setSortColumns(SysMonitor.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/WxAdminLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAdminLog.java index 970550cc0..63cdc142b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAdminLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAdminLog.java @@ -18,9 +18,7 @@ public class WxAdminLog 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="url") @@ -57,38 +55,4 @@ public class WxAdminLog implements Serializable { } } - public void setSortColumns(WxAdminLog.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/WxAppinfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java index d2c0abd98..d57353ee1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java @@ -19,9 +19,7 @@ public class WxAppinfo 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="appId") @@ -85,38 +83,4 @@ public class WxAppinfo implements Serializable { } } - public void setSortColumns(WxAppinfo.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/WxAuthorizerInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java index a918c0546..31c93077f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java @@ -18,8 +18,6 @@ public class WxAuthorizerInfo implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -125,38 +123,4 @@ public class WxAuthorizerInfo implements Serializable { } } - public void setSortColumns(WxAuthorizerInfo.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/WxBLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBLog.java index d87656daf..44215f590 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBLog.java @@ -53,38 +53,4 @@ public class WxBLog implements Serializable { } } - public void setSortColumns(WxBLog.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/WxBillAction.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java index bd1392144..87e5cd959 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java @@ -22,8 +22,6 @@ public class WxBillAction implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") @@ -84,36 +82,4 @@ public class WxBillAction implements Serializable { } } - public void setSortColumns(WxBillAction.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/WxBillDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java index 07c448211..8788ee52d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java @@ -23,8 +23,6 @@ public class WxBillDeposit implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @Transient @@ -117,38 +115,4 @@ public class WxBillDeposit implements Serializable { } } - 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/WxBillOther.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java index 586665270..cdb4baa25 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java @@ -28,14 +28,6 @@ public class WxBillOther 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 = "2") @Transient @@ -174,38 +166,4 @@ public class WxBillOther 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()); - } - - } - - 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/WxBillOtherDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java index 636244106..02d745661 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java @@ -28,14 +28,7 @@ public class WxBillOtherDeposit 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 = "2") @Transient @@ -184,36 +177,4 @@ public class WxBillOtherDeposit 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()); - } - - } - - 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/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index c9037aa45..b24611633 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -28,13 +28,6 @@ public class WxBillProperty 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 = "2") @Transient @@ -213,38 +206,4 @@ public class WxBillProperty 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/WxBillPropertyDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java index 4bc5529a8..391d4c377 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java @@ -23,8 +23,6 @@ public class WxBillPropertyDeposit implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @Transient private String merchantName; @@ -116,38 +114,4 @@ public class WxBillPropertyDeposit implements Serializable { } } - 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/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index 2d373016b..0715d4ac3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -28,13 +28,6 @@ public class WxBillRent 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 = "2") @Transient @@ -224,38 +217,4 @@ public class WxBillRent 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/WxBrand.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java index bc8f5a6ea..7af5eee2d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java @@ -23,13 +23,6 @@ public class WxBrand 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; @@ -78,38 +71,4 @@ public class WxBrand 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/WxBusiness.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java index bd57e0f65..61ef93a64 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java @@ -19,9 +19,7 @@ public class WxBusiness implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; - + @io.swagger.annotations.ApiModelProperty(value="业态名",name="title") private String title; @io.swagger.annotations.ApiModelProperty(value="1.优惠券",name="type") @@ -70,40 +68,4 @@ public class WxBusiness implements Serializable { } } - 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/WxCLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCLog.java index 801548297..177f85474 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCLog.java @@ -52,38 +52,4 @@ public class WxCLog implements Serializable { } } - public void setSortColumns(WxCLog.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/WxCUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java index 1db5124bf..28bd755e3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java @@ -27,14 +27,6 @@ public class WxCUser 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; @@ -207,42 +199,6 @@ public class WxCUser extends BaseEntity { } } - public void setSortColumns(WxCUser.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 String createToken(Date currentDate) { if (expireTime == null || expireTime.getTime() - Constant.H_EXPIRE < currentDate.getTime()) 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 3176630e9..994c24a4c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -167,42 +167,6 @@ public class WxCUserBasicInfo extends BaseEntity { } } - public void setSortColumns(WxCUserBasicInfo.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 boolean equals(final Object obj) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java index b1729a544..eff7febfe 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java @@ -19,8 +19,6 @@ public class WxCUserCar implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -64,38 +62,4 @@ public class WxCUserCar implements Serializable { } } - public void setSortColumns(WxCUserCar.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/WxCUserFromB.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserFromB.java index 647740a4f..ec43f6aa7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserFromB.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserFromB.java @@ -71,38 +71,5 @@ public class WxCUserFromB implements Serializable { } } - 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/WxCUserTags.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java index 0f5a51daa..9a94494ce 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java @@ -58,38 +58,4 @@ public class WxCUserTags implements Serializable { } } - public void setSortColumns(WxCUserTags.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/WxCampaign.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java index 46a2993ab..6f65797c0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java @@ -24,16 +24,8 @@ public class WxCampaign extends BaseEntity { @Transient protected List ids; @Transient - protected String sortColumns; - @Transient protected List coupons; - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } - @io.swagger.annotations.ApiModelProperty(value="",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") @@ -147,38 +139,4 @@ public class WxCampaign extends BaseEntity { } } - public void setSortColumns(WxCampaign.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/WxCarCmdLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCarCmdLog.java index 63a8a367b..a4577d2cd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCarCmdLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCarCmdLog.java @@ -19,9 +19,7 @@ public class WxCarCmdLog 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="停车厂家,1. ETCP,2.停简单",name="vendorType") @@ -61,38 +59,4 @@ public class WxCarCmdLog implements Serializable { } } - public void setSortColumns(WxCarCmdLog.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/WxCardInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java index 681fd8f19..ceb876535 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java @@ -22,8 +22,6 @@ public class WxCardInfo implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -97,38 +95,4 @@ public class WxCardInfo implements Serializable { } } - public void setSortColumns(WxCardInfo.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/WxCardSpend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java index 3fde4db8d..78bcaf7ef 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java @@ -21,8 +21,6 @@ public class WxCardSpend implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -164,38 +162,4 @@ public class WxCardSpend implements Serializable { } } - public void setSortColumns(WxCardSpend.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/WxChannel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxChannel.java index e9423e986..e626b787d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxChannel.java @@ -18,8 +18,6 @@ public class WxChannel implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value = "渠道ID", name = "channelId") private Integer channelId; @@ -56,38 +54,4 @@ public class WxChannel implements Serializable { } } - public void setSortColumns(WxChannel.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/WxComponentVerifyTicket.java b/mallinkService/src/main/java/com/iformall/domain/po/WxComponentVerifyTicket.java index 2f470bc74..c712e7584 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxComponentVerifyTicket.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxComponentVerifyTicket.java @@ -18,8 +18,6 @@ public class WxComponentVerifyTicket implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="微信第三方componentAppid",name="componentAppid") private String componentAppid; @@ -60,38 +58,5 @@ public class WxComponentVerifyTicket implements Serializable { } } - public void setSortColumns(WxComponentVerifyTicket.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/WxCouponActionLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponActionLog.java index 5caef8362..936a474f1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponActionLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponActionLog.java @@ -20,8 +20,6 @@ public class WxCouponActionLog implements Serializable { @Transient protected List ids; @Transient - protected String sortColumns; - @Transient protected Date startTime; @Transient protected Date endTime; @@ -68,39 +66,4 @@ public class WxCouponActionLog implements Serializable { } } - public void setSortColumns(WxCouponActionLog.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/WxCouponCar.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponCar.java index c8410d65b..39847b8b6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponCar.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponCar.java @@ -19,8 +19,6 @@ public class WxCouponCar implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -61,38 +59,4 @@ public class WxCouponCar implements Serializable { } } - public void setSortColumns(WxCouponCar.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/WxCouponInject.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponInject.java index 0eff9114e..ed6a248b1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponInject.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponInject.java @@ -106,40 +106,4 @@ public class WxCouponInject extends BaseEntity { } } - public void setSortColumns(WxCouponInject.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/WxCouponMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponMerchant.java index 02aede021..9a76a0cf9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponMerchant.java @@ -19,8 +19,6 @@ public class WxCouponMerchant implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -63,38 +61,4 @@ public class WxCouponMerchant implements Serializable { } } - public void setSortColumns(WxCouponMerchant.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/WxCouponSend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java index 8975469b6..430c032aa 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java @@ -20,14 +20,6 @@ public class WxCouponSend 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; @@ -83,40 +75,4 @@ public class WxCouponSend extends BaseEntity { } } - public void setSortColumns(WxCouponSend.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/WxCouponSendConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSendConfig.java index 4107e3352..7c5ff1f9f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSendConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSendConfig.java @@ -19,8 +19,6 @@ public class WxCouponSendConfig implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") private String tenantId; @@ -61,38 +59,4 @@ public class WxCouponSendConfig implements Serializable { } } - public void setSortColumns(WxCouponSendConfig.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/WxCouponType.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponType.java index 6532e8761..0fea65808 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponType.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponType.java @@ -45,38 +45,5 @@ public class WxCouponType implements Serializable { } } - public void setSortColumns(WxCouponType.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/WxCreditHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java index 4b73d3cf9..986b00c22 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java @@ -20,8 +20,6 @@ public class WxCreditHistory implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @Transient @io.swagger.annotations.ApiModelProperty(value="开始时间",name="startTime") @@ -109,38 +107,4 @@ public class WxCreditHistory implements Serializable { } } - 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/WxDateAmountRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxDateAmountRecord.java index fe393dba4..956297f09 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxDateAmountRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxDateAmountRecord.java @@ -19,9 +19,7 @@ public class WxDateAmountRecord implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; - + @io.swagger.annotations.ApiModelProperty(value="日期",name="date") private Date date; @io.swagger.annotations.ApiModelProperty(value="周几 从1开始",name="dayOfWeek") @@ -74,38 +72,4 @@ public class WxDateAmountRecord implements Serializable { } } - public void setSortColumns(WxDateAmountRecord.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/WxDevice.java b/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java index b59a8f41c..f4e834654 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java @@ -22,14 +22,6 @@ public class WxDevice 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; @@ -105,40 +97,4 @@ public class WxDevice extends BaseEntity { } } - public void setSortColumns(WxDevice.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/WxGame.java b/mallinkService/src/main/java/com/iformall/domain/po/WxGame.java index 2675015dc..6c748001d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxGame.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxGame.java @@ -19,8 +19,6 @@ public class WxGame implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; @@ -132,36 +130,5 @@ public class WxGame implements Serializable { } } - public void setSortColumns(WxGame.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/WxGameActionLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java index 0091e7bf7..6871aabe9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java @@ -20,8 +20,6 @@ public class WxGameActionLog implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @Transient protected Date startTime; @@ -68,39 +66,4 @@ public class WxGameActionLog implements Serializable { } } - public void setSortColumns(WxGameActionLog.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/WxGameTemplate.java b/mallinkService/src/main/java/com/iformall/domain/po/WxGameTemplate.java index f557f64b2..20f7187b1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxGameTemplate.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxGameTemplate.java @@ -17,8 +17,6 @@ public class WxGameTemplate implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="游戏名称",name="name") private String name; @@ -59,38 +57,5 @@ public class WxGameTemplate implements Serializable { } } - public void setSortColumns(WxGameTemplate.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/WxGroup.java b/mallinkService/src/main/java/com/iformall/domain/po/WxGroup.java index 72799e1c7..c142ee7a9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxGroup.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxGroup.java @@ -20,9 +20,7 @@ public class WxGroup implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; - + @io.swagger.annotations.ApiModelProperty(value="商场名",name="name") private String name; @io.swagger.annotations.ApiModelProperty(value="国家",name="country") @@ -72,38 +70,5 @@ public class WxGroup implements Serializable { } } - 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/WxLevelConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java index c69300614..88a239a02 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java @@ -19,8 +19,6 @@ public class WxLevelConfig implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") private String tenantId; @@ -73,40 +71,4 @@ public class WxLevelConfig implements Serializable { } } - public void setSortColumns(WxLevelConfig.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/WxLevelMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelMerchant.java index f7e468b63..ca8b25391 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelMerchant.java @@ -19,8 +19,6 @@ public class WxLevelMerchant implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") @@ -62,38 +60,4 @@ public class WxLevelMerchant implements Serializable { } } - public void setSortColumns(WxLevelMerchant.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/WxMall.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java index e901cf181..07042c019 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java @@ -21,9 +21,7 @@ public class WxMall implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; - + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -134,39 +132,4 @@ public class WxMall implements Serializable { } } - public void setSortColumns(WxMall.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/WxMallApply.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMallApply.java index eb108388e..4fd737a74 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMallApply.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMallApply.java @@ -20,8 +20,6 @@ public class WxMallApply implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @Transient protected String verifyCode; @@ -59,38 +57,5 @@ public class WxMallApply implements Serializable { } } - 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/WxMallBuilding.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMallBuilding.java index e7e2d4699..1164b94a2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMallBuilding.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMallBuilding.java @@ -19,8 +19,6 @@ public class WxMallBuilding implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @Transient protected List floors; @@ -63,38 +61,4 @@ public class WxMallBuilding implements Serializable { } } - public void setSortColumns(WxMallBuilding.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/WxMallFloor.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java index b24b25e35..867c527cd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java @@ -19,8 +19,6 @@ public class WxMallFloor implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -64,38 +62,4 @@ public class WxMallFloor implements Serializable { } } - public void setSortColumns(WxMallFloor.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/WxMerchantBUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java index 4efd5b442..9fc4b75c4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java @@ -21,8 +21,6 @@ public class WxMerchantBUser implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; @@ -81,39 +79,6 @@ public class WxMerchantBUser implements Serializable { } } - public void setSortColumns(WxMerchantBUser.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 String createToken(Date currentDate) { if (expireTime == null || expireTime.getTime() - Constant.H_EXPIRE < currentDate.getTime()) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantCorp.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantCorp.java index a49fa2320..2967ae543 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantCorp.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantCorp.java @@ -82,38 +82,4 @@ public class WxMerchantCorp implements Serializable { } } - 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/WxMerchantShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantShop.java index dbc0b4f28..12a05f292 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantShop.java @@ -19,8 +19,6 @@ public class WxMerchantShop implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -63,40 +61,4 @@ public class WxMerchantShop implements Serializable { } } - public void setSortColumns(WxMerchantShop.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 23f82981c..9c4836da3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java @@ -30,11 +30,6 @@ public class WxMerchantSubsidy extends BaseEntity { @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/WxMerchantTax.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTax.java index 5c7b83c37..ebb6e5e4a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTax.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTax.java @@ -20,8 +20,6 @@ public class WxMerchantTax implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -89,38 +87,4 @@ public class WxMerchantTax implements Serializable { } } - 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/WxMerchantTradeDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java index dce88b088..769a07cc3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java @@ -20,8 +20,6 @@ public class WxMerchantTradeDaily implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") @@ -108,36 +106,4 @@ public class WxMerchantTradeDaily implements Serializable { } } - public void setSortColumns(WxMerchantTradeDaily.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/WxMsgCallback.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java index 3f209a30f..93028e10b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java @@ -20,14 +20,6 @@ public class WxMsgCallback 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="callbackId") private Long callbackId; @@ -86,40 +78,5 @@ public class WxMsgCallback extends BaseEntity{ } } - public void setSortColumns(WxMsgCallback.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/WxMsgConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java index 1a76edb7f..468cdc2e0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java @@ -18,8 +18,6 @@ public class WxMsgConfig implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -87,38 +85,4 @@ public class WxMsgConfig implements Serializable { } } - public void setSortColumns(WxMsgConfig.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/WxMsgLimit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgLimit.java index 128481256..a98634de8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgLimit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgLimit.java @@ -20,14 +20,7 @@ public class WxMsgLimit 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; @@ -68,40 +61,4 @@ public class WxMsgLimit extends BaseEntity { } } - public void setSortColumns(WxMsgLimit.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/WxMsgModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java index 1c701a3d3..a40c8a020 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java @@ -66,40 +66,4 @@ public class WxMsgModel extends BaseEntity { } } - public void setSortColumns(WxMsgModel.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/WxMsgValidationcode.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcode.java index f694b0890..ecc8d1782 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcode.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcode.java @@ -74,38 +74,4 @@ public class WxMsgValidationcode implements Serializable { } } - 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/WxMsgValidationcodeModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java index 1b67d9160..e4a8fb9fa 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java @@ -20,9 +20,7 @@ public class WxMsgValidationcodeModel implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; - + @io.swagger.annotations.ApiModelProperty(value="名称",name="name") private String name; @@ -82,38 +80,4 @@ public class WxMsgValidationcodeModel implements Serializable { } } - 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/WxOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java index 7dde35982..61921bfab 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java @@ -113,39 +113,5 @@ public class WxOrder extends BaseEntity { } } - public void setSortColumns(WxOrder.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/WxOrderGroup.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOrderGroup.java index 55aba53a5..5b55437f6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOrderGroup.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOrderGroup.java @@ -19,8 +19,6 @@ public class WxOrderGroup implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; @@ -63,39 +61,6 @@ public class WxOrderGroup implements Serializable { } } - public void setSortColumns(WxOrder.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(WxOrder.Field.valueOf(cols[k])); - } - this.setSortColumns(fList.toArray(new WxOrder.Field[fList.size()])); - } else { - this.setSortColumns(WxOrder.Field.valueOf(sortColumns)); - } - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOrderPress.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOrderPress.java index d3395ab3b..4422a7682 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOrderPress.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOrderPress.java @@ -19,8 +19,6 @@ public class WxOrderPress implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -65,38 +63,4 @@ public class WxOrderPress implements Serializable { } } - public void setSortColumns(WxOrderPress.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/WxPark.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPark.java index 33a27728a..b19e12e60 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPark.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPark.java @@ -19,9 +19,6 @@ public class WxPark implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -80,38 +77,4 @@ public class WxPark implements Serializable { } } - public void setSortColumns(WxPark.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/WxPayAccount.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java index 7f30f16f0..dc7086d99 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java @@ -18,8 +18,6 @@ public class WxPayAccount implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -83,40 +81,4 @@ public class WxPayAccount implements Serializable { } } - public void setSortColumns(WxPayAccount.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/WxPayAccountBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccountBill.java index c218e0835..42135fcb4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccountBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccountBill.java @@ -21,8 +21,6 @@ public class WxPayAccountBill implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") @@ -89,40 +87,4 @@ public class WxPayAccountBill implements Serializable { } } - public void setSortColumns(WxPayAccountBill.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/WxPayBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPayBill.java index 5ba1deadb..820878d96 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayBill.java @@ -23,8 +23,6 @@ public class WxPayBill implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; /**租户ID**/ @@ -246,39 +244,4 @@ public class WxPayBill implements Serializable { } } - public void setSortColumns(WxPayBill.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/WxPayOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java index fb3c42d9b..c59efc3b3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java @@ -19,8 +19,6 @@ public class WxPayOrder implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -106,39 +104,4 @@ public class WxPayOrder implements Serializable { } } - public void setSortColumns(WxPayOrder.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/WxPrepayment.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPrepayment.java index fb6c6d8d0..455e02029 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPrepayment.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPrepayment.java @@ -22,8 +22,6 @@ public class WxPrepayment implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; @@ -77,36 +75,4 @@ public class WxPrepayment implements Serializable { } } - public void setSortColumns(WxPrepayment.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/WxPrepaymentHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPrepaymentHistory.java index d6ab748c6..3e88ced34 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPrepaymentHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPrepaymentHistory.java @@ -22,8 +22,6 @@ public class WxPrepaymentHistory implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; @@ -70,36 +68,4 @@ public class WxPrepaymentHistory implements Serializable { } } - public void setSortColumns(WxPrepaymentHistory.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/WxProfitSharingOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java index 95f2dd30e..adf8df401 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java @@ -19,9 +19,7 @@ public class WxProfitSharingOrder implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; - + @io.swagger.annotations.ApiModelProperty(value="接收方(商场租户id)",name="tenantId") private String tenantId; @@ -84,40 +82,4 @@ public class WxProfitSharingOrder implements Serializable { } } - public void setSortColumns(WxProfitSharingOrder.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/WxProfitSharingReceiver.java b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiver.java index 8f90672b4..fbe96eca4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiver.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiver.java @@ -19,9 +19,6 @@ public class WxProfitSharingReceiver implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; - @io.swagger.annotations.ApiModelProperty(value="接收方(商场租户id)",name="tenantId") private String tenantId; @@ -88,39 +85,4 @@ public class WxProfitSharingReceiver implements Serializable { } } - public void setSortColumns(WxProfitSharingReceiver.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/WxProfitSharingResult.java b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingResult.java index 8ef7c95b0..fd33c9d58 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingResult.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingResult.java @@ -19,8 +19,6 @@ public class WxProfitSharingResult implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="接收方(商场租户id)",name="tenantId") private String tenantId; @@ -76,39 +74,5 @@ public class WxProfitSharingResult implements Serializable { } } - public void setSortColumns(WxProfitSharingResult.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/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java index 7b39482d3..2940873a4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -34,13 +34,6 @@ public class WxPropertyContract extends BaseEntity { @Transient protected List ids; - @Transient - protected String sortColumns; - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } @Transient @SortColumn(column = "shopNumber") @@ -236,40 +229,8 @@ public class WxPropertyContract 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()); - } - - } + - 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)); - } - } // public Integer getAdjustPeriod() { // if(EnumPriceUnit.D.getCode().equals(this.getPriceUnit()) && EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode().equals(adjustPeriod)){ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestion.java b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestion.java index 42978af3a..b37808284 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestion.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestion.java @@ -19,8 +19,6 @@ public class WxQuestion implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -49,40 +47,5 @@ public class WxQuestion implements Serializable { } } - public void setSortColumns(WxQuestion.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/WxQuestionConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionConfig.java index e14efbe9a..405489539 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionConfig.java @@ -20,8 +20,6 @@ public class WxQuestionConfig implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -70,40 +68,4 @@ public class WxQuestionConfig implements Serializable { } } - public void setSortColumns(WxQuestionConfig.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/WxQuestionLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionLog.java index e46a2dcd4..44ff6100c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionLog.java @@ -20,8 +20,6 @@ public class WxQuestionLog implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -116,40 +114,4 @@ public class WxQuestionLog implements Serializable { } } - public void setSortColumns(WxQuestionLog.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/WxRefundOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRefundOrder.java index aed2f62a9..8abb189d4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRefundOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRefundOrder.java @@ -19,9 +19,7 @@ public class WxRefundOrder implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; - + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -89,38 +87,4 @@ public class WxRefundOrder implements Serializable { } } - public void setSortColumns(WxRefundOrder.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/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 93a560831..833749091 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -32,11 +32,6 @@ public class WxRentContract extends BaseEntity { protected List ids; @Transient protected String sortColumns; - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } @Transient @SortColumn(column = "shopNumber") @@ -297,38 +292,7 @@ public class WxRentContract 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/WxScoreHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java index 0254cad49..f26827b7a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java @@ -20,9 +20,7 @@ public class WxScoreHistory implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; - + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -82,38 +80,5 @@ public class WxScoreHistory implements Serializable { } } - public void setSortColumns(WxScoreHistory.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/WxScoreRules.java b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java index 5b3c33425..45dcd7470 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java @@ -84,9 +84,7 @@ public class WxScoreRules implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; - + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -176,39 +174,5 @@ public class WxScoreRules implements Serializable { } } - public void setSortColumns(WxScoreRules.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/WxScoreValidityPeriod.java b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreValidityPeriod.java index 7522da2bd..b8e7f7982 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreValidityPeriod.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreValidityPeriod.java @@ -19,9 +19,7 @@ public class WxScoreValidityPeriod implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; - + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -60,38 +58,4 @@ public class WxScoreValidityPeriod implements Serializable { } } - public void setSortColumns(WxScoreValidityPeriod.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/WxSubBusiness.java b/mallinkService/src/main/java/com/iformall/domain/po/WxSubBusiness.java index 9134a711a..2f77de3b4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxSubBusiness.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxSubBusiness.java @@ -20,9 +20,7 @@ public class WxSubBusiness implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; - + @io.swagger.annotations.ApiModelProperty(value="子业态名",name="title") private String title; @@ -64,40 +62,4 @@ public class WxSubBusiness implements Serializable { } } - 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/WxSubsidy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxSubsidy.java index 80ebad69a..8d08361b8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxSubsidy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxSubsidy.java @@ -21,14 +21,6 @@ public class WxSubsidy 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; @@ -108,38 +100,4 @@ public class WxSubsidy extends BaseEntity { } } - public void setSortColumns(WxSubsidy.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/WxTags.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTags.java index 0ebc76cea..4e30d7d03 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTags.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTags.java @@ -19,9 +19,7 @@ public class WxTags implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; - + @io.swagger.annotations.ApiModelProperty(value="名称",name="name") private String name; @io.swagger.annotations.ApiModelProperty(value="1基础2生活属性3消费偏好4行为偏好",name="groupId") @@ -61,40 +59,4 @@ public class WxTags implements Serializable { } } - public void setSortColumns(WxTags.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/WxTagsGroup.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTagsGroup.java index 61ed492a3..e9cccf624 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTagsGroup.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTagsGroup.java @@ -20,8 +20,6 @@ public class WxTagsGroup implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="名称",name="name") private String name; @@ -48,40 +46,4 @@ public class WxTagsGroup implements Serializable { } } - public void setSortColumns(WxTagsGroup.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/WxTagsType.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTagsType.java index 0e6fa889a..158939ac2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTagsType.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTagsType.java @@ -19,8 +19,6 @@ public class WxTagsType implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="名称",name="name") private String name; @@ -58,40 +56,4 @@ public class WxTagsType implements Serializable { } } - public void setSortColumns(WxTagsType.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/WxTemplateMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java index ebe5af406..af2ccf1c0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java @@ -19,8 +19,6 @@ public class WxTemplateMsg implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -61,40 +59,4 @@ public class WxTemplateMsg implements Serializable { } } - public void setSortColumns(WxTemplateMsg.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/WxUserChannel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxUserChannel.java index b6123d543..c3d05fa9a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxUserChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxUserChannel.java @@ -18,9 +18,7 @@ public class WxUserChannel implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; - + @io.swagger.annotations.ApiModelProperty(value="",name="channelName") private String channelName; @@ -55,38 +53,5 @@ public class WxUserChannel implements Serializable { } } - public void setSortColumns(WxUserChannel.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/WxUserVisit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java index d0baf7711..6e25a1b0b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java @@ -19,9 +19,7 @@ public class WxUserVisit implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; - + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -80,38 +78,4 @@ public class WxUserVisit implements Serializable { } } - public void setSortColumns(WxUserVisit.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/WxWeappAuditStatus.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java index 37fedde95..58e2128bc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java @@ -20,8 +20,6 @@ public class WxWeappAuditStatus implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -69,38 +67,4 @@ public class WxWeappAuditStatus implements Serializable { } } - public void setSortColumns(WxWeappAuditStatus.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/WxWeappBasicSet.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappBasicSet.java index 6f8e53330..e683cf701 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappBasicSet.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappBasicSet.java @@ -18,8 +18,6 @@ public class WxWeappBasicSet implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") private Integer type; @@ -65,38 +63,4 @@ public class WxWeappBasicSet implements Serializable { } } - public void setSortColumns(WxWeappBasicSet.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/WxWeappCodeStatus.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java index 86800b39c..990e3797f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java @@ -20,8 +20,6 @@ public class WxWeappCodeStatus implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -65,38 +63,4 @@ public class WxWeappCodeStatus implements Serializable { } } - public void setSortColumns(WxWeappCodeStatus.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/WxWeappExtSet.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java index f2ae99c70..f4e2238bb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java @@ -18,8 +18,6 @@ public class WxWeappExtSet implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") private String appId; @@ -65,38 +63,4 @@ public class WxWeappExtSet implements Serializable { } } - public void setSortColumns(WxWeappExtSet.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/WxWeappReleaseStatus.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java index 44a607b97..952a462ca 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java @@ -20,8 +20,6 @@ public class WxWeappReleaseStatus implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -65,38 +63,4 @@ public class WxWeappReleaseStatus implements Serializable { } } - public void setSortColumns(WxWeappReleaseStatus.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/WxWiWideInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWiWideInfo.java index babcff6b7..8399daa2b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWiWideInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWiWideInfo.java @@ -20,8 +20,6 @@ public class WxWiWideInfo implements Serializable { @Transient protected List ids; - @Transient - protected String sortColumns; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -66,39 +64,4 @@ public class WxWiWideInfo implements Serializable { } } - public void setSortColumns(WxWiWideInfo.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/msg/WxMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java index 38c7e9b84..345f01ad9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java @@ -18,11 +18,6 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class WxMsg extends BaseMsg{ private static final long serialVersionUID = 1L; - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } @Id protected Long id; @@ -127,38 +122,4 @@ public class WxMsg extends BaseMsg{ } } - public void setSortColumns(WxMsg.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/vo/MallUserActionVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/MallUserActionVo.java index 43631f7b4..6d71a7985 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/MallUserActionVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/MallUserActionVo.java @@ -56,44 +56,4 @@ public class MallUserActionVo extends MallUserAction { } } - 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(MallUserAction.Field.valueOf(cols[k])); - } - this.setSortColumns(fList.toArray(new MallUserAction.Field[fList.size()])); - } else { - this.setSortColumns(MallUserAction.Field.valueOf(sortColumns)); - } - } - - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java index e1b30c1e4..d47884a90 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java @@ -15,9 +15,6 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class WxCardCVo extends WxCouponOrder { - @Transient - protected String sortColumns; - /** 券类型信息 */ @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") private String coverImg; @@ -96,38 +93,4 @@ public class WxCardCVo extends WxCouponOrder { } } - 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(); - super.sortColumns = this.sortColumns; - - } - - 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(WxCouponOrder.Field.valueOf(cols[k])); - } - this.setSortColumns(fList.toArray(new WxCouponOrder.Field[fList.size()])); - } else { - this.setSortColumns(WxCouponOrder.Field.valueOf(sortColumns)); - } - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java index bc6d5098f..e871c7476 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -25,12 +25,6 @@ public class WxCouponOrderBVo extends WxCouponOrder{ @Excel(name = "券码", width = 20, orderNum = "1") protected Long id; - @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/vo/WxMerchantSubsidyVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSubsidyVo.java index 1e5dcf4fb..daadf9e7c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSubsidyVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSubsidyVo.java @@ -45,8 +45,6 @@ public class WxMerchantSubsidyVo extends WxMerchantSubsidy { @io.swagger.annotations.ApiModelProperty(value="持有人手机",name="phone") private String phone; - @Transient - protected String sortColumns; public static enum Field { @@ -82,38 +80,4 @@ public class WxMerchantSubsidyVo extends WxMerchantSubsidy { } } - 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(WxMerchantSubsidy.Field.valueOf(cols[k])); - } - this.setSortColumns(fList.toArray(new WxMerchantSubsidy.Field[fList.size()])); - } else { - this.setSortColumns(WxMerchantSubsidy.Field.valueOf(sortColumns)); - } - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPayVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPayVo.java index c73114d5e..461fa4235 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPayVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPayVo.java @@ -60,39 +60,5 @@ public class WxOrderPayVo extends WxOrder { } } - public void setSortColumns(WxOrder.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(WxOrder.Field.valueOf(cols[k])); - } - this.setSortColumns(fList.toArray(new WxOrder.Field[fList.size()])); - } else { - this.setSortColumns(WxOrder.Field.valueOf(sortColumns)); - } - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java index 638ddaa2e..ef336e23e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java @@ -20,14 +20,6 @@ public class WxRentPropertyContractVo extends BaseEntity { @Id protected Long id; - @Transient - protected String sortColumns; - - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } @io.swagger.annotations.ApiModelProperty(value = "合同编号", name = "contractNumber") private String contractNumber; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappInfo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappInfo.java index ef0b2306f..5189084f3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappInfo.java @@ -60,38 +60,4 @@ public class WxWeappInfo extends WxAuthorizerInfo { } } - public void setSortColumns(WxWeappInfo.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/enums/EnumMsgModelReplace.java b/mallinkService/src/main/java/com/iformall/enums/EnumMsgModelReplace.java new file mode 100644 index 000000000..b17b78026 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMsgModelReplace.java @@ -0,0 +1,51 @@ +package com.iformall.enums; + +/** + * 消息内容文本替换 + * 用于A端展示 + */ +public enum EnumMsgModelReplace { + + R1("{merName}", "【商户名称】"), + R2("{price}", "【金额】"), + R3("{date}", "【日期】"), + R4("{title}", "【券名称】"), + R10("{time}", "【时间】"), + R5("{merchant}", "【商户名称】"), + R6("{account}", "【账号】"), + R11("{person}", "【用户昵称】"), + R7("{party}", "【活动名称】"), + R8("{userName}", "【成员】"), + R9("{toUserName}", "【下个审批人】"), + R12("{type}", "【任务类型】"), + R13("{name}", "【任务名称】"), + R14("{page}", "【管理端】"), + R15("{bustype}", "【任务类型】"), + R16("{contract}", "【合同编号】"), + ; + + public static EnumMsgModelReplace getEnum(Integer code) { + for (EnumMsgModelReplace value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private String code; + private String message; + + EnumMsgModelReplace(String code, String message) { + this.code = code; + this.message = message; + } + + public String getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 693403275..eec5784ec 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -869,16 +869,21 @@ public class WxFlowServiceImpl implements WxFlowService { // 给代办人发送通知短信 String assignee = ""; List mallUserInfoList = getUserByProcessInstanceId(processInstanceId); - for (MallUserInfo mallUserInfo:mallUserInfoList) { + for (int i = 0; i < mallUserInfoList.size(); i++) { + MallUserInfo mallUserInfo = mallUserInfoList.get(i); sendAssigneeMsgAndEmail(tenantId,mallUserInfo.getPhone(),mallUserInfo.getEmail(),userName,businessId,flowType); + if(i == mallUserInfoList.size()-1){ + assignee += mallUserInfo.getName(); + }else{ + assignee += mallUserInfo.getName() +","; + } } - // 给发起人发送短信 msgReplaceMap = new HashedMap(); msgReplaceMap.put("userName",userName); msgReplaceMap.put("page",Constant.adminPage); msgReplaceMap.put("contract", (String)getVariableByKey(variables,"contractNumber")); - msgReplaceMap.put("toUserName",assignee.trim()); + msgReplaceMap.put("toUserName",assignee); WxMsgRecord wxMsgRecord = new WxMsgRecord(); wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode());