| @@ -46,15 +46,19 @@ public class IdWorker { | |||
| ///////////////////////////////////////////////////////////////////////////////// | |||
| private static class IdGenHolder { | |||
| private static final IdWorker instance = new IdWorker(); | |||
| } | |||
| public static IdWorker get(){ | |||
| return IdGenHolder.instance; | |||
| private static IdWorker instance = null; | |||
| public static IdWorker get() { | |||
| if(instance == null) { | |||
| synchronized (IdWorker.class){ | |||
| if(instance==null){ | |||
| instance = new IdWorker(); | |||
| } | |||
| } | |||
| } | |||
| return instance; | |||
| } | |||
| public IdWorker() { | |||
| private IdWorker() { | |||
| this(0L, 0L); | |||
| } | |||
| @@ -0,0 +1,16 @@ | |||
| package com.iformall.common; | |||
| import java.lang.annotation.ElementType; | |||
| import java.lang.annotation.Retention; | |||
| import java.lang.annotation.RetentionPolicy; | |||
| import java.lang.annotation.Target; | |||
| /** | |||
| * @author luozukai | |||
| * 排序注解 | |||
| */ | |||
| @Target(ElementType.FIELD) | |||
| @Retention(RetentionPolicy.RUNTIME) | |||
| public @interface SortColumn { | |||
| String column(); | |||
| } | |||
| @@ -0,0 +1,197 @@ | |||
| package com.iformall.domain.po; | |||
| import com.iformall.common.SortColumn; | |||
| import lombok.Data; | |||
| import lombok.extern.slf4j.Slf4j; | |||
| import org.apache.commons.lang3.StringUtils; | |||
| import javax.persistence.Transient; | |||
| import java.io.Serializable; | |||
| import java.lang.reflect.Field; | |||
| /** | |||
| * @author luozukai | |||
| * @date 2019/4/24 14:32 | |||
| */ | |||
| @Data | |||
| @Slf4j | |||
| public class BaseEntity implements Serializable { | |||
| private static final long serialVersionUID = 1L; | |||
| @Transient | |||
| private String sortColumn; | |||
| @Transient | |||
| private String sortOrder; | |||
| @Transient | |||
| private String sortColumns; | |||
| public String getSortColumns() { | |||
| if(StringUtils.isBlank(sortColumn)){ | |||
| return sortColumns; | |||
| } | |||
| try { | |||
| //扫描子类SortColumn注解的属性,替换sortColumn | |||
| if(StringUtils.isNotBlank(sortColumn)) { | |||
| Field[] fields = this.getClass().getDeclaredFields(); | |||
| //扫描注解,优先解析注解 | |||
| for (Field field : fields) { | |||
| SortColumn sortColumnField = field.getAnnotation(SortColumn.class); | |||
| if (sortColumnField != null && field.getName().equals(sortColumn)) { | |||
| return sortColumnField.column() + " "+sortOrder; | |||
| } | |||
| } | |||
| //判断是否合法 | |||
| boolean find = false; | |||
| for (Field field : fields){ | |||
| if (field.getName().equals(sortColumn)) { | |||
| find = true; | |||
| break; | |||
| } | |||
| } | |||
| if(!find) { | |||
| return null; | |||
| } | |||
| //默认驼峰解析 | |||
| return underscoreName(sortColumn) +" "+sortOrder; | |||
| } | |||
| } catch (Exception e) { | |||
| log.error("BaseEntity.getSortColumn解析失败",e); | |||
| e.printStackTrace(); | |||
| } | |||
| return sortColumns; | |||
| } | |||
| /** | |||
| * 转换为下划线 | |||
| * | |||
| * @param camelCaseName | |||
| * @return | |||
| */ | |||
| private static String underscoreName(String camelCaseName) { | |||
| StringBuilder result = new StringBuilder(); | |||
| if (camelCaseName != null && camelCaseName.length() > 0) { | |||
| result.append(camelCaseName.substring(0, 1).toLowerCase()); | |||
| for (int i = 1; i < camelCaseName.length(); i++) { | |||
| char ch = camelCaseName.charAt(i); | |||
| if (Character.isUpperCase(ch)) { | |||
| result.append("_"); | |||
| result.append(Character.toLowerCase(ch)); | |||
| } else { | |||
| result.append(ch); | |||
| } | |||
| } | |||
| } | |||
| return result.toString(); | |||
| } | |||
| public void setSortColumns(SortField... 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 enum SortField { | |||
| Id_ASC("`id` ASC"), | |||
| Id_DESC("`id` DESC"), | |||
| CreateDate_ASC("`create_date` ASC"), | |||
| CreateDate_DESC("`create_date` DESC"), | |||
| UpdateDate_ASC("`update_date` ASC"), | |||
| UpdateDate_DESC("`update_date` DESC"), | |||
| Createtime_ASC("`createtime` ASC"), | |||
| Createtime_DESC("`createtime` DESC"), | |||
| CreateTime_ASC("`create_time` ASC"), | |||
| CreateTime_DESC("`create_time` DESC"), | |||
| ReportTime_ASC("`reportTime` ASC"), | |||
| ReportTime_DESC("`reportTime` DESC"), | |||
| ActiveTime_ASC("`active_time` ASC"), | |||
| ActiveTime_DESC("`active_time` DESC"), | |||
| TopTime_ASC("`top_time` ASC"), | |||
| TopTime_DESC("`top_time` DESC"), | |||
| MerchantId_ASC("`merchant_id` ASC"), | |||
| MerchantId_DESC("`merchant_id` DESC"), | |||
| LimitDate_ASC("`limit_date` ASC"), | |||
| LimitDate_DESC("`limit_date` DESC"), | |||
| SortNum_ASC("`sort_num` ASC"), | |||
| SortNum_DESC("`sort_num` DESC"), | |||
| Sort_ASC("`sort` ASC"), | |||
| Sort_DESC("`sort` DESC"), | |||
| Points_ASC("`points` ASC"), | |||
| Points_DESC("`points` DESC"), | |||
| Period_ASC("`period` ASC"), | |||
| Period_DESC("`period` DESC"), | |||
| UsedPower_ASC("`usedPower` ASC"), | |||
| UsedPower_DESC("`usedPower` DESC"), | |||
| Date_ASC("`date` ASC"), | |||
| Date_DESC("`date` DESC"), | |||
| TenantId_ASC("`tenant_id` ASC"), | |||
| TenantId_DESC("`tenant_id` DESC"), | |||
| Type_ASC("`type` ASC"), | |||
| Type_DESC("`type` DESC"), | |||
| Name_ASC("`name` ASC"), | |||
| Name_DESC("`name` DESC"), | |||
| CurrentVersion_ASC("`current_version` ASC"), | |||
| CurrentVersion_DESC("`current_version` DESC"), | |||
| CodeTime_ASC("`code_time` ASC"), | |||
| CodeTime_DESC("`code_time` DESC"), | |||
| UserVersion_ASC("`user_version` ASC"), | |||
| UserVersion_DESC("`user_version` DESC"), | |||
| AuditTime_ASC("`audit_time` ASC"), | |||
| AuditTime_DESC("`audit_time` DESC"), | |||
| ReleaseTime_ASC("`release_time` ASC"), | |||
| ReleaseTime_DESC("`release_time` DESC"), | |||
| ; | |||
| private String value; | |||
| SortField(String value) { | |||
| this.value = value; | |||
| } | |||
| public String getValue() { | |||
| return value; | |||
| } | |||
| @Override | |||
| public String toString() { | |||
| return this.getValue(); | |||
| } | |||
| } | |||
| } | |||
| @@ -1,16 +1,17 @@ | |||
| package com.iformall.domain.po; | |||
| import lombok.Data; | |||
| import lombok.EqualsAndHashCode; | |||
| import javax.persistence.*; | |||
| import javax.persistence.Transient; | |||
| import java.util.List; | |||
| import javax.persistence.Id; | |||
| import java.io.Serializable; | |||
| @Table(name = "mall_permission") | |||
| @Data | |||
| public class MallPermission implements Serializable { | |||
| @EqualsAndHashCode(callSuper = true) | |||
| public class MallPermission extends BaseEntity { | |||
| private static final long serialVersionUID = 1L; | |||
| @Id | |||
| @@ -18,8 +19,6 @@ public class MallPermission implements Serializable { | |||
| @Transient | |||
| protected List<Long> ids; | |||
| @Transient | |||
| protected String sortColumns; | |||
| @io.swagger.annotations.ApiModelProperty(value="权限名称",name="name") | |||
| private String name; | |||
| @@ -69,69 +68,4 @@ public class MallPermission implements Serializable { | |||
| @io.swagger.annotations.ApiModelProperty(value="子菜单",name="children") | |||
| private List<?> children; | |||
| public static enum Field | |||
| { | |||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | |||
| ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") | |||
| ,ParentId_ASC("`parent_id` ASC"),ParentId_DESC("`parent_id` DESC") | |||
| ,Available_ASC("`available` ASC"),Available_DESC("`available` DESC") | |||
| ,Permission_ASC("`permission` ASC"),Permission_DESC("`permission` DESC") | |||
| ,ResourceType_ASC("`resource_type` ASC"),ResourceType_DESC("`resource_type` DESC") | |||
| ,ModuleColor_ASC("`module_color` ASC"),ModuleColor_DESC("`module_color` DESC") | |||
| ,ModuleColorNum_ASC("`module_color_num` ASC"),ModuleColorNum_DESC("`module_color_num` DESC") | |||
| ,Url_ASC("`url` ASC"),Url_DESC("`url` DESC") | |||
| ,Icon_ASC("`icon` ASC"),Icon_DESC("`icon` DESC") | |||
| ,VersionType_ASC("`version_type` ASC"),VersionType_DESC("`version_type` DESC") | |||
| ,Sort_ASC("`sort` ASC"),Sort_DESC("`sort` DESC") | |||
| ; | |||
| private String value; | |||
| Field(String value){ | |||
| this.value = value; | |||
| } | |||
| public String getValue() { | |||
| return value; | |||
| } | |||
| public void setCol(String value) { | |||
| this.value = value; | |||
| } | |||
| @Override | |||
| public String toString() { | |||
| return this.getValue(); | |||
| } | |||
| } | |||
| public void setSortColumns(MallPermission.Field... fields) | |||
| { | |||
| if (fields == null || fields.length == 0) { | |||
| return; | |||
| } | |||
| for (int k = 0; k < fields.length; k++) { | |||
| if (fields[k] == null) { | |||
| return; | |||
| } | |||
| } | |||
| StringBuilder sb = new StringBuilder(fields[0].toString()); | |||
| for (int k = 1; k < fields.length; k++) { | |||
| sb.append(","); | |||
| sb.append(fields[k].toString()); | |||
| } | |||
| } | |||
| public void setSortColumns(String sortColumns) | |||
| { | |||
| if (sortColumns == null || "".equals(sortColumns.trim())) { | |||
| return; | |||
| } | |||
| if (sortColumns.contains(",")) { | |||
| String[] cols = sortColumns.split(","); | |||
| java.util.List<Field> fList = new java.util.ArrayList(); | |||
| for (int k = 0; k < cols.length; k++) { | |||
| fList.add(Field.valueOf(cols[k])); | |||
| } | |||
| this.setSortColumns(fList.toArray(new Field[fList.size()])); | |||
| } else { | |||
| this.setSortColumns(Field.valueOf(sortColumns)); | |||
| } | |||
| } | |||
| } | |||
| @@ -1,16 +1,17 @@ | |||
| package com.iformall.domain.po; | |||
| import lombok.Data; | |||
| import lombok.EqualsAndHashCode; | |||
| import javax.persistence.*; | |||
| import javax.persistence.Transient; | |||
| import java.util.List; | |||
| import javax.persistence.Id; | |||
| import java.io.Serializable; | |||
| @Table(name = "mall_role") | |||
| @Data | |||
| public class MallRole implements Serializable { | |||
| @EqualsAndHashCode(callSuper = true) | |||
| public class MallRole extends BaseEntity { | |||
| private static final long serialVersionUID = 1L; | |||
| @Id | |||
| @@ -18,9 +19,7 @@ public class MallRole implements Serializable { | |||
| @Transient | |||
| protected List<Long> ids; | |||
| @Transient | |||
| protected String sortColumns; | |||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | |||
| private String tenantId; | |||
| @io.swagger.annotations.ApiModelProperty(value="角色名称",name="name") | |||
| @@ -34,62 +33,5 @@ public class MallRole implements Serializable { | |||
| @io.swagger.annotations.ApiModelProperty(value="权限列表",name="menus") | |||
| private String menus; | |||
| public static enum Field | |||
| { | |||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | |||
| ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") | |||
| ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") | |||
| ,Available_ASC("`available` ASC"),Available_DESC("`available` DESC") | |||
| ,Description_ASC("`description` ASC"),Description_DESC("`description` DESC") | |||
| ; | |||
| private String value; | |||
| Field(String value){ | |||
| this.value = value; | |||
| } | |||
| public String getValue() { | |||
| return value; | |||
| } | |||
| public void setCol(String value) { | |||
| this.value = value; | |||
| } | |||
| @Override | |||
| public String toString() { | |||
| return this.getValue(); | |||
| } | |||
| } | |||
| public void setSortColumns(MallRole.Field... fields) | |||
| { | |||
| if (fields == null || fields.length == 0) { | |||
| return; | |||
| } | |||
| for (int k = 0; k < fields.length; k++) { | |||
| if (fields[k] == null) { | |||
| return; | |||
| } | |||
| } | |||
| StringBuilder sb = new StringBuilder(fields[0].toString()); | |||
| for (int k = 1; k < fields.length; k++) { | |||
| sb.append(","); | |||
| sb.append(fields[k].toString()); | |||
| } | |||
| } | |||
| public void setSortColumns(String sortColumns) | |||
| { | |||
| if (sortColumns == null || "".equals(sortColumns.trim())) { | |||
| return; | |||
| } | |||
| if (sortColumns.contains(",")) { | |||
| String[] cols = sortColumns.split(","); | |||
| java.util.List<Field> fList = new java.util.ArrayList(); | |||
| for (int k = 0; k < cols.length; k++) { | |||
| fList.add(Field.valueOf(cols[k])); | |||
| } | |||
| this.setSortColumns(fList.toArray(new Field[fList.size()])); | |||
| } else { | |||
| this.setSortColumns(Field.valueOf(sortColumns)); | |||
| } | |||
| } | |||
| } | |||
| @@ -4,28 +4,30 @@ import com.iformall.enums.EnumUserAdmin; | |||
| import com.iformall.enums.EnumUserWechat; | |||
| import com.iformall.utils.Constant; | |||
| import lombok.Data; | |||
| import lombok.EqualsAndHashCode; | |||
| import lombok.ToString; | |||
| import org.apache.commons.lang3.StringUtils; | |||
| import org.slf4j.Logger; | |||
| import org.slf4j.LoggerFactory; | |||
| import javax.persistence.Id; | |||
| import javax.persistence.Table; | |||
| import javax.persistence.Transient; | |||
| import java.io.Serializable; | |||
| import java.util.ArrayList; | |||
| import java.util.Date; | |||
| import java.util.List; | |||
| @Table(name = "mall_user_info") | |||
| @Data | |||
| public class MallUserInfo implements Serializable { | |||
| private static final long serialVersionUID = 1L; | |||
| @ToString(callSuper = true) | |||
| @EqualsAndHashCode(callSuper = true) | |||
| public class MallUserInfo extends BaseEntity { | |||
| @Id | |||
| protected Long id; | |||
| @Transient | |||
| protected List<Long> ids; | |||
| @Transient | |||
| protected String sortColumns; | |||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | |||
| private String tenantId; | |||
| @@ -120,70 +122,4 @@ public class MallUserInfo implements Serializable { | |||
| return false; | |||
| } | |||
| public static enum Field | |||
| { | |||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | |||
| ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") | |||
| ,Username_ASC("`username` ASC"),Username_DESC("`username` DESC") | |||
| ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") | |||
| ,Password_ASC("`password` ASC"),Password_DESC("`password` DESC") | |||
| ,CreateTime_ASC("`create_time` ASC"),CreateTime_DESC("`create_time` DESC") | |||
| ,LastLoginTime_ASC("`last_login_time` ASC"),LastLoginTime_DESC("`last_login_time` DESC") | |||
| ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") | |||
| ,IsAdmin_ASC("`is_admin` ASC"),IsAdmin_DESC("`is_admin` DESC") | |||
| ,NickName_ASC("`nick_name` ASC"),NickName_DESC("`nick_name` DESC") | |||
| ,Phone_ASC("`phone` ASC"),Phone_DESC("`phone` DESC") | |||
| ,BOpenId_ASC("`bopen_id` ASC"),BOpenId_DESC("`bopen_id` DESC") | |||
| ,WebOpenId_ASC("`web_open_id` ASC"),WebOpenId_DESC("`web_open_id` DESC") | |||
| ; | |||
| private String value; | |||
| Field(String value){ | |||
| this.value = value; | |||
| } | |||
| public String getValue() { | |||
| return value; | |||
| } | |||
| public void setCol(String value) { | |||
| this.value = value; | |||
| } | |||
| @Override | |||
| public String toString() { | |||
| return this.getValue(); | |||
| } | |||
| } | |||
| public void setSortColumns(MallUserInfo.Field... fields) | |||
| { | |||
| if (fields == null || fields.length == 0) { | |||
| return; | |||
| } | |||
| for (int k = 0; k < fields.length; k++) { | |||
| if (fields[k] == null) { | |||
| return; | |||
| } | |||
| } | |||
| StringBuilder sb = new StringBuilder(fields[0].toString()); | |||
| for (int k = 1; k < fields.length; k++) { | |||
| sb.append(","); | |||
| sb.append(fields[k].toString()); | |||
| } | |||
| this.sortColumns=sb.toString(); | |||
| } | |||
| public void setSortColumns(String sortColumns) | |||
| { | |||
| if (sortColumns == null || "".equals(sortColumns.trim())) { | |||
| return; | |||
| } | |||
| if (sortColumns.contains(",")) { | |||
| String[] cols = sortColumns.split(","); | |||
| List<Field> fList = new ArrayList(); | |||
| for (int k = 0; k < cols.length; k++) { | |||
| fList.add(Field.valueOf(cols[k])); | |||
| } | |||
| this.setSortColumns(fList.toArray(new Field[fList.size()])); | |||
| } else { | |||
| this.setSortColumns(Field.valueOf(sortColumns)); | |||
| } | |||
| } | |||
| } | |||
| @@ -1,27 +1,25 @@ | |||
| package com.iformall.domain.po; | |||
| import lombok.Data; | |||
| import lombok.EqualsAndHashCode; | |||
| import javax.persistence.Id; | |||
| import javax.persistence.Table; | |||
| import javax.persistence.Transient; | |||
| import java.io.Serializable; | |||
| import java.util.Date; | |||
| import java.util.List; | |||
| @Table(name = "wx_appinfo") | |||
| @Data | |||
| public class WxAppinfo implements Serializable { | |||
| private static final long serialVersionUID = 1L; | |||
| @EqualsAndHashCode(callSuper = true) | |||
| public class WxAppinfo extends BaseEntity { | |||
| @Id | |||
| protected Long id; | |||
| @Transient | |||
| protected List<Long> ids; | |||
| @Transient | |||
| protected String sortColumns; | |||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | |||
| private String tenantId; | |||
| @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") | |||
| @@ -51,72 +49,4 @@ public class WxAppinfo implements Serializable { | |||
| @io.swagger.annotations.ApiModelProperty(value="支付ID,参看wx_pay_account_bill",name="payBillId") | |||
| private Long payBillId; | |||
| public static enum Field | |||
| { | |||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | |||
| ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") | |||
| ,AppId_ASC("`app_id` ASC"),AppId_DESC("`app_id` DESC") | |||
| ,ParentAppId_ASC("`parent_app_id` ASC"),ParentAppId_DESC("`parent_app_id` DESC") | |||
| ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") | |||
| ,Secret_ASC("`secret` ASC"),Secret_DESC("`secret` DESC") | |||
| ,Token_ASC("`token` ASC"),Token_DESC("`token` DESC") | |||
| ,AesKey_ASC("`aesKey` ASC"),AesKey_DESC("`aesKey` DESC") | |||
| ,MsgDataFormat_ASC("`msg_data_format` ASC"),MsgDataFormat_DESC("`msg_data_format` DESC") | |||
| ,AccessToken_ASC("`access_token` ASC"),AccessToken_DESC("`access_token` DESC") | |||
| ,LastTokenTime_ASC("`last_token_time` ASC"),LastTokenTime_DESC("`last_token_time` DESC") | |||
| ,ExpiresIn_ASC("`expires_in` ASC"),ExpiresIn_DESC("`expires_in` DESC") | |||
| ,PayId_ASC("`pay_id` ASC"),PayId_DESC("`pay_id` DESC") | |||
| ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") | |||
| ; | |||
| private String value; | |||
| Field(String value){ | |||
| this.value = value; | |||
| } | |||
| public String getValue() { | |||
| return value; | |||
| } | |||
| public void setCol(String value) { | |||
| this.value = value; | |||
| } | |||
| @Override | |||
| public String toString() { | |||
| return this.getValue(); | |||
| } | |||
| } | |||
| public void setSortColumns(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<Field> fList = new java.util.ArrayList(); | |||
| for (int k = 0; k < cols.length; k++) { | |||
| fList.add(Field.valueOf(cols[k])); | |||
| } | |||
| this.setSortColumns(fList.toArray(new Field[fList.size()])); | |||
| } else { | |||
| this.setSortColumns(Field.valueOf(sortColumns)); | |||
| } | |||
| } | |||
| } | |||
| @@ -1,25 +1,24 @@ | |||
| package com.iformall.domain.po; | |||
| import lombok.Data; | |||
| import javax.persistence.*; | |||
| import java.util.*; | |||
| import lombok.EqualsAndHashCode; | |||
| import javax.persistence.Id; | |||
| import javax.persistence.Table; | |||
| import javax.persistence.Transient; | |||
| import java.util.Date; | |||
| import java.util.List; | |||
| import javax.persistence.Id; | |||
| import java.io.Serializable; | |||
| @Table(name = "wx_authorizer_info") | |||
| @Data | |||
| public class WxAuthorizerInfo implements Serializable { | |||
| private static final long serialVersionUID = 1L; | |||
| @EqualsAndHashCode(callSuper = true) | |||
| public class WxAuthorizerInfo extends BaseEntity { | |||
| @Id | |||
| protected Long id; | |||
| @Transient | |||
| protected List<Long> ids; | |||
| @Transient | |||
| protected String sortColumns; | |||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | |||
| private String tenantId; | |||
| @@ -77,86 +76,5 @@ public class WxAuthorizerInfo implements Serializable { | |||
| private String accessToken; | |||
| @io.swagger.annotations.ApiModelProperty(value="accessToken过期时间",name="accessTokenExpire") | |||
| private Date accessTokenExpire; | |||
| public static enum Field | |||
| { | |||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | |||
| ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") | |||
| ,AuthorizerAppid_ASC("`authorizer_appid` ASC"),AuthorizerAppid_DESC("`authorizer_appid` DESC") | |||
| ,HeadImg_ASC("`head_img` ASC"),HeadImg_DESC("`head_img` DESC") | |||
| ,Alias_ASC("`alias` ASC"),Alias_DESC("`alias` DESC") | |||
| ,QrcodeUrl_ASC("`qrcode_url` ASC"),QrcodeUrl_DESC("`qrcode_url` DESC") | |||
| ,CreateTime_ASC("`create_time` ASC"),CreateTime_DESC("`create_time` DESC") | |||
| ,UpdateTime_ASC("`update_time` ASC"),UpdateTime_DESC("`update_time` DESC") | |||
| ,AuthorizationStatus_ASC("`authorization_status` ASC"),AuthorizationStatus_DESC("`authorization_status` DESC") | |||
| ,AuthTime_ASC("`auth_time` ASC"),AuthTime_DESC("`auth_time` DESC") | |||
| ,BaseStatus_ASC("`base_status` ASC"),BaseStatus_DESC("`base_status` DESC") | |||
| ,BaseTime_ASC("`base_time` ASC"),BaseTime_DESC("`base_time` DESC") | |||
| ,DomainStatus_ASC("`domain_status` ASC"),DomainStatus_DESC("`domain_status` DESC") | |||
| ,DomainTime_ASC("`domain_time` ASC"),DomainTime_DESC("`domain_time` DESC") | |||
| ,WebDomainStatus_ASC("`webdomain_status` ASC"),WebDomainStatus_DESC("`webdomain_status` DESC") | |||
| ,WebDomainTime_ASC("`webdomain_time` ASC"),WebDomainTime_DESC("`webdomain_time` DESC") | |||
| ,TemplateStatus_ASC("`template_status` ASC"),TemplateStatus_DESC("`template_status` DESC") | |||
| ,TemplateTime_ASC("`template_time` ASC"),TemplateTime_DESC("`template_time` DESC") | |||
| ,AuditBackNum_ASC("`audit_back_num` ASC"),AuditBackNum_DESC("`audit_back_num` DESC") | |||
| ,AuditBackTime_ASC("`audit_back_time` ASC"),AuditBackTime_DESC("`audit_back_time` DESC") | |||
| ,CurrentVersion_ASC("`current_version` ASC"),CurrentVersion_DESC("`current_version` DESC") | |||
| ,CurrentDesc_ASC("`current_desc` ASC"),CurrentDesc_DESC("`current_desc` DESC") | |||
| ,ReleaseTime_ASC("`release_time` ASC"),ReleaseTime_DESC("`release_time` DESC") | |||
| ,OpenAppId_ASC("`open_appid` ASC"),OpenAppId_DESC("`open_appid` DESC") | |||
| ,BindOpenTime_ASC("`bind_open_time` ASC"),BindOpen_DESC("`bind_open_time` DESC") | |||
| ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") | |||
| ; | |||
| private String value; | |||
| Field(String value){ | |||
| this.value = value; | |||
| } | |||
| public String getValue() { | |||
| return value; | |||
| } | |||
| public void setCol(String value) { | |||
| this.value = value; | |||
| } | |||
| @Override | |||
| public String toString() { | |||
| return this.getValue(); | |||
| } | |||
| } | |||
| public void setSortColumns(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<Field> fList = new java.util.ArrayList(); | |||
| for (int k = 0; k < cols.length; k++) { | |||
| fList.add(Field.valueOf(cols[k])); | |||
| } | |||
| this.setSortColumns(fList.toArray(new Field[fList.size()])); | |||
| } else { | |||
| this.setSortColumns(Field.valueOf(sortColumns)); | |||
| } | |||
| } | |||
| } | |||
| @@ -3,28 +3,29 @@ package com.iformall.domain.po; | |||
| import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | |||
| import com.iformall.utils.Constant; | |||
| import lombok.Data; | |||
| import lombok.EqualsAndHashCode; | |||
| import lombok.ToString; | |||
| import javax.persistence.*; | |||
| import java.util.*; | |||
| import java.math.*; | |||
| import javax.persistence.Id; | |||
| import javax.persistence.Table; | |||
| import javax.persistence.Transient; | |||
| import java.math.BigDecimal; | |||
| import java.util.Date; | |||
| import java.util.List; | |||
| import javax.persistence.Id; | |||
| import java.io.Serializable; | |||
| import java.util.UUID; | |||
| @Table(name = "wx_c_user") | |||
| @JsonIgnoreProperties(ignoreUnknown = true) | |||
| @Data | |||
| public class WxCUser implements Serializable { | |||
| private static final long serialVersionUID = 1L; | |||
| @ToString(callSuper = true) | |||
| @EqualsAndHashCode(callSuper = true) | |||
| public class WxCUser extends BaseEntity { | |||
| @Id | |||
| protected Long id; | |||
| @Transient | |||
| protected List<Long> ids; | |||
| @Transient | |||
| protected String sortColumns; | |||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | |||
| private String tenantId; | |||
| @@ -138,95 +139,6 @@ public class WxCUser implements Serializable { | |||
| @io.swagger.annotations.ApiModelProperty(value="操作人ID",name="operatorId") | |||
| private Long operatorId; | |||
| public static enum Field | |||
| { | |||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | |||
| ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") | |||
| ,OpenId_ASC("`open_id` ASC"),OpenId_DESC("`open_id` DESC") | |||
| ,UnionId_ASC("`union_id` ASC"),UnionId_DESC("`union_id` DESC") | |||
| ,NickName_ASC("`nick_name` ASC"),NickName_DESC("`nick_name` DESC") | |||
| ,Gender_ASC("`gender` ASC"),Gender_DESC("`gender` DESC") | |||
| ,AvatarUrl_ASC("`avatar_url` ASC"),AvatarUrl_DESC("`avatar_url` DESC") | |||
| ,Phone_ASC("`phone` ASC"),Phone_DESC("`phone` DESC") | |||
| ,PurePhone_ASC("`pure_phone` ASC"),PurePhone_DESC("`pure_phone` DESC") | |||
| ,City_ASC("`city` ASC"),City_DESC("`city` DESC") | |||
| ,Province_ASC("`province` ASC"),Province_DESC("`province` DESC") | |||
| ,Language_ASC("`language` ASC"),Language_DESC("`language` DESC") | |||
| ,CountryCode_ASC("`country_code` ASC"),CountryCode_DESC("`country_code` DESC") | |||
| ,RegisterIp_ASC("`register_ip` ASC"),RegisterIp_DESC("`register_ip` DESC") | |||
| ,VerifyCodePhone_ASC("`verify_code_phone` ASC"),VerifyCodePhone_DESC("`verify_code_phone` DESC") | |||
| ,QrcodeSource_ASC("`qrcode_source` ASC"),QrcodeSource_DESC("`qrcode_source` DESC") | |||
| ,Scene_ASC("`scene` ASC"),Scene_DESC("`scene` DESC") | |||
| ,SceneAddress_ASC("`scene_address` ASC"),SceneAddress_DESC("`scene_address` DESC") | |||
| ,SessionKey_ASC("`session_key` ASC"),SessionKey_DESC("`session_key` DESC") | |||
| ,Score_ASC("`score` ASC"),Score_DESC("`score` DESC") | |||
| ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") | |||
| ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") | |||
| ,AppId_ASC("`app_id` ASC"),AppId_DESC("`app_id` DESC") | |||
| ,Token_ASC("`token` ASC"),Token_DESC("`token` DESC") | |||
| ,ExpireTime_ASC("`expire_time` ASC"),ExpireTime_DESC("`expire_time` DESC") | |||
| ,Longitude_ASC("`longitude` ASC"),Longitude_DESC("`longitude` DESC") | |||
| ,Latitude_ASC("`latitude` ASC"),Latitude_DESC("`latitude` DESC") | |||
| ,LoginCount_ASC("`login_count` ASC"),LoginCount_DESC("`login_count` DESC") | |||
| ,ExtraInfo_ASC("`extra_info` ASC"),ExtraInfo_DESC("`extra_info` DESC") | |||
| ,IsSubscribe_ASC("`is_subscribe` ASC"),IsSubscribe_DESC("`is_subscribe` DESC") | |||
| ,Credit_ASC("`credit` ASC"),Credit_DESC("`credit` DESC") | |||
| ,ActiveTime_ASC("`active_time` ASC"),ActiveTime_DESC("`active_time` DESC") | |||
| ; | |||
| private String value; | |||
| Field(String value){ | |||
| this.value = value; | |||
| } | |||
| public String getValue() { | |||
| return value; | |||
| } | |||
| public void setCol(String value) { | |||
| this.value = value; | |||
| } | |||
| @Override | |||
| public String toString() { | |||
| return this.getValue(); | |||
| } | |||
| } | |||
| public void setSortColumns(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<Field> fList = new java.util.ArrayList(); | |||
| for (int k = 0; k < cols.length; k++) { | |||
| fList.add(Field.valueOf(cols[k])); | |||
| } | |||
| this.setSortColumns(fList.toArray(new Field[fList.size()])); | |||
| } else { | |||
| this.setSortColumns(Field.valueOf(sortColumns)); | |||
| } | |||
| } | |||
| public String createToken(Date currentDate) { | |||
| if (expireTime == null || expireTime.getTime() - Constant.H_EXPIRE < currentDate.getTime()) | |||
| { | |||
| @@ -1,16 +1,18 @@ | |||
| package com.iformall.domain.po; | |||
| import lombok.Data; | |||
| import lombok.EqualsAndHashCode; | |||
| import javax.persistence.*; | |||
| import java.util.*; | |||
| import javax.persistence.Transient; | |||
| import java.util.List; | |||
| import javax.persistence.Id; | |||
| import java.io.Serializable; | |||
| @Table(name = "wx_component_verify_ticket") | |||
| @Data | |||
| public class WxComponentVerifyTicket implements Serializable { | |||
| @EqualsAndHashCode(callSuper = true) | |||
| public class WxComponentVerifyTicket extends BaseEntity { | |||
| private static final long serialVersionUID = 1L; | |||
| @Id | |||
| @@ -18,8 +20,6 @@ public class WxComponentVerifyTicket implements Serializable { | |||
| @Transient | |||
| protected List<Long> ids; | |||
| @Transient | |||
| protected String sortColumns; | |||
| @io.swagger.annotations.ApiModelProperty(value="微信第三方componentAppid",name="componentAppid") | |||
| private String componentAppid; | |||
| @@ -34,64 +34,4 @@ public class WxComponentVerifyTicket implements Serializable { | |||
| @io.swagger.annotations.ApiModelProperty(value="access_token过期时间",name="accessTokenExpire") | |||
| private Date accessTokenExpire; | |||
| public static enum Field | |||
| { | |||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | |||
| ,ComponentAppid_ASC("`component_appid` ASC"),ComponentAppid_DESC("`component_appid` DESC") | |||
| ,ComponentVerifyTicket_ASC("`component_verify_ticket` ASC"),ComponentVerifyTicket_DESC("`component_verify_ticket` DESC") | |||
| ,CreateTime_ASC("`create_time` ASC"),CreateTime_DESC("`create_time` DESC") | |||
| ,Deadline_ASC("`deadline` ASC"),Deadline_DESC("`deadline` DESC") | |||
| ; | |||
| private String value; | |||
| Field(String value){ | |||
| this.value = value; | |||
| } | |||
| public String getValue() { | |||
| return value; | |||
| } | |||
| public void setCol(String value) { | |||
| this.value = value; | |||
| } | |||
| @Override | |||
| public String toString() { | |||
| return this.getValue(); | |||
| } | |||
| } | |||
| public void setSortColumns(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<Field> fList = new java.util.ArrayList(); | |||
| for (int k = 0; k < cols.length; k++) { | |||
| fList.add(Field.valueOf(cols[k])); | |||
| } | |||
| this.setSortColumns(fList.toArray(new Field[fList.size()])); | |||
| } else { | |||
| this.setSortColumns(Field.valueOf(sortColumns)); | |||
| } | |||
| } | |||
| } | |||
| @@ -1,16 +1,17 @@ | |||
| package com.iformall.domain.po; | |||
| import lombok.Data; | |||
| import lombok.EqualsAndHashCode; | |||
| import javax.persistence.*; | |||
| import javax.persistence.Transient; | |||
| import java.util.List; | |||
| import javax.persistence.Id; | |||
| import java.io.Serializable; | |||
| @Table(name = "wx_pay_account") | |||
| @Data | |||
| public class WxPayAccount implements Serializable { | |||
| @EqualsAndHashCode(callSuper = true) | |||
| public class WxPayAccount extends BaseEntity { | |||
| private static final long serialVersionUID = 1L; | |||
| @Id | |||
| @@ -18,8 +19,6 @@ public class WxPayAccount implements Serializable { | |||
| @Transient | |||
| protected List<Long> ids; | |||
| @Transient | |||
| protected String sortColumns; | |||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | |||
| private String tenantId; | |||
| @@ -39,6 +38,8 @@ public class WxPayAccount implements Serializable { | |||
| private Integer share; | |||
| @io.swagger.annotations.ApiModelProperty(value="手续费(万分之几,默认60)",name="rate") | |||
| private Integer rate; | |||
| @io.swagger.annotations.ApiModelProperty(value="实际手续费(万分之几,默认60)",name="realRate") | |||
| private Integer realRate; | |||
| public String getPayNotifyUrl() { | |||
| return notifyUrl + "/pay"; | |||
| @@ -46,77 +47,9 @@ public class WxPayAccount implements Serializable { | |||
| public String getRefundNotifyUrl() { | |||
| return notifyUrl + "/refund"; | |||
| } | |||
| public String getSeparateNotifyUrl() { | |||
| return notifyUrl + "/separate"; | |||
| } | |||
| public String getSubsidyNotifyUrl() { | |||
| return notifyUrl + "/subsidyPay"; | |||
| } | |||
| public static enum Field | |||
| { | |||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | |||
| ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") | |||
| ,MchId_ASC("`mch_id` ASC"),MchId_DESC("`mch_id` DESC") | |||
| ,SubMchId_ASC("`sub_mch_id` ASC"),SubMchId_DESC("`sub_mch_id` DESC") | |||
| ,ApiKey_ASC("`api_key` ASC"),ApiKey_DESC("`api_key` DESC") | |||
| ,NotifyUrl_ASC("`notify_url` ASC"),NotifyUrl_DESC("`notify_url` DESC") | |||
| ,CertPath_ASC("`cert_path` ASC"),CertPath_DESC("`cert_path` DESC") | |||
| ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") | |||
| ,Share_ASC("`share` ASC"),Share_DESC("`share` DESC") | |||
| ,Rate_ASC("`rate` ASC"),Rate_DESC("`rate` DESC") | |||
| ; | |||
| private String value; | |||
| Field(String value){ | |||
| this.value = value; | |||
| } | |||
| public String getValue() { | |||
| return value; | |||
| } | |||
| public void setCol(String value) { | |||
| this.value = value; | |||
| } | |||
| @Override | |||
| public String toString() { | |||
| return this.getValue(); | |||
| } | |||
| } | |||
| public void setSortColumns(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<Field> fList = new java.util.ArrayList(); | |||
| for (int k = 0; k < cols.length; k++) { | |||
| fList.add(Field.valueOf(cols[k])); | |||
| } | |||
| this.setSortColumns(fList.toArray(new Field[fList.size()])); | |||
| } else { | |||
| this.setSortColumns(Field.valueOf(sortColumns)); | |||
| } | |||
| } | |||
| } | |||
| @@ -19,8 +19,6 @@ public class WxPayOrder implements Serializable { | |||
| @Transient | |||
| protected List<Long> ids; | |||
| @Transient | |||
| protected String sortColumns; | |||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | |||
| private String tenantId; | |||
| @@ -58,84 +56,12 @@ public class WxPayOrder implements Serializable { | |||
| private Integer share; | |||
| @io.swagger.annotations.ApiModelProperty(value="分账金额(总金额扣除手续费后的金额)",name="shareAmount") | |||
| private Integer shareAmount; | |||
| @io.swagger.annotations.ApiModelProperty(value="通道费差(购买时刻的通道费差,分账完结时使用)",name="rateAmount") | |||
| private Integer rateAmount; | |||
| @io.swagger.annotations.ApiModelProperty(value="支付失败原因",name="failReason") | |||
| private String failReason; | |||
| @io.swagger.annotations.ApiModelProperty(value="支付后结果来源(0:callback, 1:query)",name="payEndFrom") | |||
| private Integer payEndFrom; | |||
| public static enum Field | |||
| { | |||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | |||
| ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") | |||
| ,CreateTime_ASC("`create_time` ASC"),CreateTime_DESC("`create_time` DESC") | |||
| ,UpdateTime_ASC("`update_time` ASC"),UpdateTime_DESC("`update_time` DESC") | |||
| ,OrderId_ASC("`order_id` ASC"),OrderId_DESC("`order_id` DESC") | |||
| ,CUserId_ASC("`c_user_id` ASC"),CUserId_DESC("`c_user_id` DESC") | |||
| ,BUserId_ASC("`b_user_id` ASC"),BUserId_DESC("`b_user_id` DESC") | |||
| ,AuthCode_ASC("`auth_code` ASC"),AuthCode_DESC("`auth_code` DESC") | |||
| ,Ip_ASC("`ip` ASC"),Ip_DESC("`ip` DESC") | |||
| ,PayAmount_ASC("`pay_amount` ASC"),PayAmount_DESC("`pay_amount` DESC") | |||
| ,PayTimeStart_ASC("`pay_time_start` ASC"),PayTimeStart_DESC("`pay_time_start` DESC") | |||
| ,PayTimeEnd_ASC("`pay_time_end` ASC"),PayTimeEnd_DESC("`pay_time_end` DESC") | |||
| ,PrepayId_ASC("`prepay_id` ASC"),PrepayId_DESC("`transaction_id` DESC") | |||
| ,TransactionId_ASC("`transaction_id` ASC"),TransactionId_DESC("`prepay_id` DESC") | |||
| ,PayVendor_ASC("`pay_vendor` ASC"),PayVendor_DESC("`pay_vendor` DESC") | |||
| ,PayOrderNo_ASC("`pay_order_no` ASC"),PayOrderNo_DESC("`pay_order_no` DESC") | |||
| ,PayOrderStatus_ASC("`pay_order_status` ASC"),PayOrderStatus_DESC("`pay_order_status` DESC") | |||
| ,Share_ASC("`share` ASC"),Share_DESC("`share` DESC") | |||
| ,ShareAmount_ASC("`share_amount` ASC"),ShareAmount_DESC("`share_amount` DESC") | |||
| ,FailReason_ASC("`fail_reason` ASC"),FailReason_DESC("`fail_reason` DESC") | |||
| ,PayEndFrom_ASC("`pay_end_from` ASC"),PayEndFrom_DESC("`pay_end_from` DESC") | |||
| ; | |||
| private String value; | |||
| Field(String value){ | |||
| this.value = value; | |||
| } | |||
| public String getValue() { | |||
| return value; | |||
| } | |||
| public void setCol(String value) { | |||
| this.value = value; | |||
| } | |||
| @Override | |||
| public String toString() { | |||
| return this.getValue(); | |||
| } | |||
| } | |||
| public void setSortColumns(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<Field> fList = new java.util.ArrayList(); | |||
| for (int k = 0; k < cols.length; k++) { | |||
| fList.add(Field.valueOf(cols[k])); | |||
| } | |||
| this.setSortColumns(fList.toArray(new Field[fList.size()])); | |||
| } else { | |||
| this.setSortColumns(Field.valueOf(sortColumns)); | |||
| } | |||
| } | |||
| } | |||
| @@ -1,6 +1,7 @@ | |||
| package com.iformall.domain.po; | |||
| import lombok.Data; | |||
| import lombok.EqualsAndHashCode; | |||
| import javax.persistence.*; | |||
| import java.util.*; | |||
| @@ -11,7 +12,8 @@ import java.io.Serializable; | |||
| @Table(name = "wx_template_msg") | |||
| @Data | |||
| public class WxTemplateMsg implements Serializable { | |||
| @EqualsAndHashCode(callSuper = true) | |||
| public class WxTemplateMsg extends BaseEntity { | |||
| private static final long serialVersionUID = 1L; | |||
| @Id | |||
| @@ -19,8 +21,6 @@ public class WxTemplateMsg implements Serializable { | |||
| @Transient | |||
| protected List<Long> ids; | |||
| @Transient | |||
| protected String sortColumns; | |||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | |||
| private String tenantId; | |||
| @@ -36,65 +36,4 @@ public class WxTemplateMsg implements Serializable { | |||
| private Date updateDate; | |||
| public static enum Field | |||
| { | |||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | |||
| ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") | |||
| ,TemplateId_ASC("`template_id` ASC"),TemplateId_DESC("`template_id` DESC") | |||
| ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") | |||
| ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") | |||
| ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") | |||
| ; | |||
| private String value; | |||
| Field(String value){ | |||
| this.value = value; | |||
| } | |||
| public String getValue() { | |||
| return value; | |||
| } | |||
| public void setCol(String value) { | |||
| this.value = value; | |||
| } | |||
| @Override | |||
| public String toString() { | |||
| return this.getValue(); | |||
| } | |||
| } | |||
| public void setSortColumns(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<Field> fList = new java.util.ArrayList(); | |||
| for (int k = 0; k < cols.length; k++) { | |||
| fList.add(Field.valueOf(cols[k])); | |||
| } | |||
| this.setSortColumns(fList.toArray(new Field[fList.size()])); | |||
| } else { | |||
| this.setSortColumns(Field.valueOf(sortColumns)); | |||
| } | |||
| } | |||
| } | |||
| @@ -1,18 +1,19 @@ | |||
| package com.iformall.domain.po; | |||
| import lombok.Data; | |||
| import lombok.EqualsAndHashCode; | |||
| import javax.persistence.Id; | |||
| import javax.persistence.Table; | |||
| import javax.persistence.Transient; | |||
| import java.io.Serializable; | |||
| import java.util.ArrayList; | |||
| import java.util.Date; | |||
| import java.util.List; | |||
| @Table(name = "wx_weapp_audit_status") | |||
| @Data | |||
| public class WxWeappAuditStatus implements Serializable { | |||
| @EqualsAndHashCode(callSuper = true) | |||
| public class WxWeappAuditStatus extends BaseEntity { | |||
| private static final long serialVersionUID = 1L; | |||
| @Id | |||
| @@ -20,8 +21,6 @@ public class WxWeappAuditStatus implements Serializable { | |||
| @Transient | |||
| protected List<Long> ids; | |||
| @Transient | |||
| protected String sortColumns; | |||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | |||
| private String tenantId; | |||
| @@ -44,63 +43,4 @@ public class WxWeappAuditStatus implements Serializable { | |||
| @io.swagger.annotations.ApiModelProperty(value="审核时间",name="auditTime") | |||
| private Date auditTime; | |||
| public static enum Field | |||
| { | |||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | |||
| ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") | |||
| ,AppId_ASC("`app_id` ASC"),AppId_DESC("`app_id` DESC") | |||
| ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") | |||
| ,UserVersion_ASC("`user_version` ASC"),UserVersion_DESC("`user_version` DESC") | |||
| ,AuditTime_ASC("`audit_time` ASC"),AuditTime_DESC("`audit_time` DESC") | |||
| ; | |||
| private String value; | |||
| Field(String value){ | |||
| this.value = value; | |||
| } | |||
| public String getValue() { | |||
| return value; | |||
| } | |||
| public void setCol(String value) { | |||
| this.value = value; | |||
| } | |||
| @Override | |||
| public String toString() { | |||
| return this.getValue(); | |||
| } | |||
| } | |||
| public void setSortColumns(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<Field> fList = new ArrayList(); | |||
| for (int k = 0; k < cols.length; k++) { | |||
| fList.add(Field.valueOf(cols[k])); | |||
| } | |||
| this.setSortColumns(fList.toArray(new Field[fList.size()])); | |||
| } else { | |||
| this.setSortColumns(Field.valueOf(sortColumns)); | |||
| } | |||
| } | |||
| } | |||
| @@ -1,6 +1,8 @@ | |||
| package com.iformall.domain.po; | |||
| import lombok.Data; | |||
| import lombok.EqualsAndHashCode; | |||
| import javax.persistence.*; | |||
| import java.util.*; | |||
| import javax.persistence.Transient; | |||
| @@ -10,7 +12,8 @@ import java.io.Serializable; | |||
| @Table(name = "wx_weapp_basic_set") | |||
| @Data | |||
| public class WxWeappBasicSet implements Serializable { | |||
| @EqualsAndHashCode(callSuper = true) | |||
| public class WxWeappBasicSet extends BaseEntity { | |||
| private static final long serialVersionUID = 1L; | |||
| @Id | |||
| @@ -18,8 +21,6 @@ public class WxWeappBasicSet implements Serializable { | |||
| @Transient | |||
| protected List<Long> ids; | |||
| @Transient | |||
| protected String sortColumns; | |||
| @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") | |||
| private Integer type; | |||
| @@ -36,67 +37,4 @@ public class WxWeappBasicSet implements Serializable { | |||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | |||
| private Date updateDate; | |||
| public static enum Field | |||
| { | |||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | |||
| ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") | |||
| ,Deploy_ASC("`deploy` ASC"),Deploy_DESC("`deploy` DESC") | |||
| ,DomainUrl_ASC("`domain_url` ASC"),DomainUrl_DESC("`domain_url` DESC") | |||
| ,Version_ASC("`version` ASC"),Version_DESC("`version` DESC") | |||
| ,TemplateInfo_ASC("`template_info` ASC"),TemplateInfo_DESC("`template_info` DESC") | |||
| ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") | |||
| ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") | |||
| ; | |||
| private String value; | |||
| Field(String value){ | |||
| this.value = value; | |||
| } | |||
| public String getValue() { | |||
| return value; | |||
| } | |||
| public void setCol(String value) { | |||
| this.value = value; | |||
| } | |||
| @Override | |||
| public String toString() { | |||
| return this.getValue(); | |||
| } | |||
| } | |||
| public void setSortColumns(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<Field> fList = new java.util.ArrayList(); | |||
| for (int k = 0; k < cols.length; k++) { | |||
| fList.add(Field.valueOf(cols[k])); | |||
| } | |||
| this.setSortColumns(fList.toArray(new Field[fList.size()])); | |||
| } else { | |||
| this.setSortColumns(Field.valueOf(sortColumns)); | |||
| } | |||
| } | |||
| } | |||
| @@ -1,18 +1,19 @@ | |||
| package com.iformall.domain.po; | |||
| import lombok.Data; | |||
| import lombok.EqualsAndHashCode; | |||
| import javax.persistence.Id; | |||
| import javax.persistence.Table; | |||
| import javax.persistence.Transient; | |||
| import java.io.Serializable; | |||
| import java.util.ArrayList; | |||
| import java.util.Date; | |||
| import java.util.List; | |||
| @Table(name = "wx_weapp_code_status") | |||
| @Data | |||
| public class WxWeappCodeStatus implements Serializable { | |||
| @EqualsAndHashCode(callSuper = true) | |||
| public class WxWeappCodeStatus extends BaseEntity { | |||
| private static final long serialVersionUID = 1L; | |||
| @Id | |||
| @@ -20,8 +21,6 @@ public class WxWeappCodeStatus implements Serializable { | |||
| @Transient | |||
| protected List<Long> ids; | |||
| @Transient | |||
| protected String sortColumns; | |||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | |||
| private String tenantId; | |||
| @@ -40,63 +39,4 @@ public class WxWeappCodeStatus implements Serializable { | |||
| @io.swagger.annotations.ApiModelProperty(value="code提交时间",name="codeTime") | |||
| private Date codeTime; | |||
| public static enum Field | |||
| { | |||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | |||
| ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") | |||
| ,AppId_ASC("`app_id` ASC"),AppId_DESC("`app_id` DESC") | |||
| ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") | |||
| ,UserVersion_ASC("`user_version` ASC"),UserVersion_DESC("`user_version` DESC") | |||
| ,CodeTime_ASC("`code_time` ASC"),CodeTime_DESC("`code_time` DESC") | |||
| ; | |||
| private String value; | |||
| Field(String value){ | |||
| this.value = value; | |||
| } | |||
| public String getValue() { | |||
| return value; | |||
| } | |||
| public void setCol(String value) { | |||
| this.value = value; | |||
| } | |||
| @Override | |||
| public String toString() { | |||
| return this.getValue(); | |||
| } | |||
| } | |||
| public void setSortColumns(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<Field> fList = new ArrayList(); | |||
| for (int k = 0; k < cols.length; k++) { | |||
| fList.add(Field.valueOf(cols[k])); | |||
| } | |||
| this.setSortColumns(fList.toArray(new Field[fList.size()])); | |||
| } else { | |||
| this.setSortColumns(Field.valueOf(sortColumns)); | |||
| } | |||
| } | |||
| } | |||
| @@ -1,16 +1,18 @@ | |||
| package com.iformall.domain.po; | |||
| import lombok.Data; | |||
| import lombok.EqualsAndHashCode; | |||
| import javax.persistence.*; | |||
| import java.util.*; | |||
| import javax.persistence.Transient; | |||
| import java.util.List; | |||
| import javax.persistence.Id; | |||
| import java.io.Serializable; | |||
| @Table(name = "wx_weapp_ext_set") | |||
| @Data | |||
| public class WxWeappExtSet implements Serializable { | |||
| @EqualsAndHashCode(callSuper = true) | |||
| public class WxWeappExtSet extends BaseEntity { | |||
| private static final long serialVersionUID = 1L; | |||
| @Id | |||
| @@ -18,8 +20,6 @@ public class WxWeappExtSet implements Serializable { | |||
| @Transient | |||
| protected List<Long> ids; | |||
| @Transient | |||
| protected String sortColumns; | |||
| @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") | |||
| private String appId; | |||
| @@ -37,66 +37,4 @@ public class WxWeappExtSet implements Serializable { | |||
| private Date updateDate; | |||
| public static enum Field | |||
| { | |||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | |||
| ,AppId_ASC("`app_id` ASC"),AppId_DESC("`app_id` DESC") | |||
| ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") | |||
| ,ExtJson_ASC("`ext_json` ASC"),ExtJson_DESC("`ext_json` DESC") | |||
| ,ReleaseJson_ASC("`release_json` ASC"),ReleaseJson_DESC("`release_json` DESC") | |||
| ,CarSupport_ASC("`car_support` ASC"),CarSupport_DESC("`car_support` DESC") | |||
| ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") | |||
| ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") | |||
| ; | |||
| private String value; | |||
| Field(String value){ | |||
| this.value = value; | |||
| } | |||
| public String getValue() { | |||
| return value; | |||
| } | |||
| public void setCol(String value) { | |||
| this.value = value; | |||
| } | |||
| @Override | |||
| public String toString() { | |||
| return this.getValue(); | |||
| } | |||
| } | |||
| public void setSortColumns(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<Field> fList = new java.util.ArrayList(); | |||
| for (int k = 0; k < cols.length; k++) { | |||
| fList.add(Field.valueOf(cols[k])); | |||
| } | |||
| this.setSortColumns(fList.toArray(new Field[fList.size()])); | |||
| } else { | |||
| this.setSortColumns(Field.valueOf(sortColumns)); | |||
| } | |||
| } | |||
| } | |||
| @@ -1,18 +1,18 @@ | |||
| package com.iformall.domain.po; | |||
| import lombok.Data; | |||
| import lombok.EqualsAndHashCode; | |||
| import javax.persistence.Id; | |||
| import javax.persistence.Table; | |||
| import javax.persistence.Transient; | |||
| import java.io.Serializable; | |||
| import java.util.ArrayList; | |||
| import java.util.Date; | |||
| import java.util.List; | |||
| @Table(name = "wx_weapp_release_status") | |||
| @Data | |||
| public class WxWeappReleaseStatus implements Serializable { | |||
| @EqualsAndHashCode(callSuper = true) | |||
| public class WxWeappReleaseStatus extends BaseEntity { | |||
| private static final long serialVersionUID = 1L; | |||
| @Id | |||
| @@ -20,8 +20,6 @@ public class WxWeappReleaseStatus implements Serializable { | |||
| @Transient | |||
| protected List<Long> ids; | |||
| @Transient | |||
| protected String sortColumns; | |||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | |||
| private String tenantId; | |||
| @@ -40,63 +38,5 @@ public class WxWeappReleaseStatus implements Serializable { | |||
| @io.swagger.annotations.ApiModelProperty(value="发布时间",name="releaseTime") | |||
| private Date releaseTime; | |||
| public static enum Field | |||
| { | |||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | |||
| ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") | |||
| ,AppId_ASC("`app_id` ASC"),AppId_DESC("`app_id` DESC") | |||
| ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") | |||
| ,UserVersion_ASC("`user_version` ASC"),UserVersion_DESC("`user_version` DESC") | |||
| ,ReleaseTime_ASC("`release_time` ASC"),ReleaseTime_DESC("`release_time` DESC") | |||
| ; | |||
| private String value; | |||
| Field(String value){ | |||
| this.value = value; | |||
| } | |||
| public String getValue() { | |||
| return value; | |||
| } | |||
| public void setCol(String value) { | |||
| this.value = value; | |||
| } | |||
| @Override | |||
| public String toString() { | |||
| return this.getValue(); | |||
| } | |||
| } | |||
| public void setSortColumns(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<Field> fList = new ArrayList(); | |||
| for (int k = 0; k < cols.length; k++) { | |||
| fList.add(Field.valueOf(cols[k])); | |||
| } | |||
| this.setSortColumns(fList.toArray(new Field[fList.size()])); | |||
| } else { | |||
| this.setSortColumns(Field.valueOf(sortColumns)); | |||
| } | |||
| } | |||
| } | |||
| @@ -18,28 +18,4 @@ public class WxPayOrderVo extends WxPayOrder { | |||
| @io.swagger.annotations.ApiModelProperty(value="支付ID,参看wx_pay_account",name="payId") | |||
| private Long payId; | |||
| public String getOpenId() { | |||
| return openId; | |||
| } | |||
| public void setOpenId(String openId) { | |||
| this.openId = openId; | |||
| } | |||
| public String getAppId() { | |||
| return appId; | |||
| } | |||
| public void setAppId(String appId) { | |||
| this.appId = appId; | |||
| } | |||
| public Long getPayId() { | |||
| return payId; | |||
| } | |||
| public void setPayId(Long payId) { | |||
| this.payId = payId; | |||
| } | |||
| } | |||
| @@ -16,82 +16,4 @@ public class WxWeappInfo extends WxAuthorizerInfo { | |||
| @io.swagger.annotations.ApiModelProperty(value="小程序名称",name="name") | |||
| private String name; | |||
| public static enum Field | |||
| { | |||
| Id_ASC("ai.`id` ASC"),Id_DESC("ai.`id` DESC") | |||
| ,TenantID_ASC("ai.`tenant_id` ASC"),TenantID_DESC("ai.`tenant_id` DESC") | |||
| ,Type_ASC("ai.`type` ASC"),Type_DESC("ai.`type` DESC") | |||
| ,AuthorizerAppid_ASC("ai.`authorizer_appid` ASC"),AuthorizerAppid_DESC("ai.`authorizer_appid` DESC") | |||
| ,HeadImg_ASC("ai.`head_img` ASC"),HeadImg_DESC("ai.`head_img` DESC") | |||
| ,Alias_ASC("ai.`alias` ASC"),Alias_DESC("ai.`alias` DESC") | |||
| ,QrcodeUrl_ASC("ai.`qrcode_url` ASC"),QrcodeUrl_DESC("ai.`qrcode_url` DESC") | |||
| ,CreateTime_ASC("ai.`create_time` ASC"),CreateTime_DESC("ai.`create_time` DESC") | |||
| ,UpdateTime_ASC("ai.`update_time` ASC"),UpdateTime_DESC("ai.`update_time` DESC") | |||
| ,AuthorizationStatus_ASC("ai.`authorization_status` ASC"),AuthorizationStatus_DESC("ai.`authorization_status` DESC") | |||
| ,AuthTime_ASC("ai.`auth_time` ASC"),AuthTime_DESC("ai.`auth_time` DESC") | |||
| ,BaseStatus_ASC("ai.`base_status` ASC"),BaseStatus_DESC("ai.`base_status` DESC") | |||
| ,BaseTime_ASC("ai.`base_time` ASC"),BaseTime_DESC("ai.`base_time` DESC") | |||
| ,DomainStatus_ASC("ai.`domain_status` ASC"),DomainStatus_DESC("ai.`domain_status` DESC") | |||
| ,DomainTime_ASC("ai.`domain_time` ASC"),DomainTime_DESC("ai.`domain_time` DESC") | |||
| ,WebDomainStatus_ASC("ai.`webdomain_status` ASC"),WebDomainStatus_DESC("ai.`webdomain_status` DESC") | |||
| ,WebDomainTime_ASC("ai.`webdomain_time` ASC"),WebDomainTime_DESC("ai.`webdomain_time` DESC") | |||
| ,TemplateStatus_ASC("ai.`template_status` ASC"),TemplateStatus_DESC("ai.`template_status` DESC") | |||
| ,TemplateTime_ASC("ai.`template_time` ASC"),TemplateTime_DESC("ai.`template_time` DESC") | |||
| ,CurrentVersion_ASC("ai.`current_version` ASC"),CurrentVersion_DESC("ai.`current_version` DESC") | |||
| ,CurrentDesc_ASC("ai.`current_desc` ASC"),CurrentDesc_DESC("ai.`current_desc` DESC") | |||
| ,ReleaseTime_ASC("ai.`release_time` ASC"),ReleaseTime_DESC("ai.`release_time` DESC") | |||
| ,OpenAppid_ASC("ai.`open_appid` ASC"),OpenAppid_DESC("ai.`open_appid` DESC") | |||
| ,BindOpenTime_ASC("ai.`bind_open_time` ASC"),BindOpenTime_DESC("ai.`bind_open_time` DESC") | |||
| ,Name_ASC("a.`name` ASC"),Name_DESC("a.`name` DESC") | |||
| ; | |||
| private String value; | |||
| Field(String value){ | |||
| this.value = value; | |||
| } | |||
| public String getValue() { | |||
| return value; | |||
| } | |||
| public void setCol(String value) { | |||
| this.value = value; | |||
| } | |||
| @Override | |||
| public String toString() { | |||
| return this.getValue(); | |||
| } | |||
| } | |||
| public void setSortColumns(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<Field> fList = new ArrayList(); | |||
| for (int k = 0; k < cols.length; k++) { | |||
| fList.add(Field.valueOf(cols[k])); | |||
| } | |||
| this.setSortColumns(fList.toArray(new Field[fList.size()])); | |||
| } else { | |||
| this.setSortColumns(Field.valueOf(sortColumns)); | |||
| } | |||
| } | |||
| } | |||
| @@ -9,7 +9,8 @@ public enum EnumTemplateType { | |||
| VERIFY_SUCCESS(1, "核销成功消息"), | |||
| VERIFY_FAIL(2, "核销失败消息"), | |||
| AUDIT_MESSAGE(3, "审核结果通知") | |||
| PRESS_PRICE_SUCCESS(3, "砍价成功消息"), | |||
| AUDIT_MESSAGE(101, "审核结果通知"), // 公众号 | |||
| ; | |||
| public static EnumTemplateType getEnum(Integer code) { | |||
| @@ -210,15 +210,15 @@ | |||
| </resultMap> | |||
| <sql id="allVColumns"> | |||
| ai.`id`,ai.`tenant_id`,ai.`type`,ai.`authorizer_appid`,ai.`head_img`,ai.`alias`,ai.`qrcode_url`,ai.`create_time`,ai.`update_time`, | |||
| ai.`id`,ai.`tenant_id` as `tenant_id`,ai.`type` as `type`,ai.`authorizer_appid`,ai.`head_img`,ai.`alias`,ai.`qrcode_url`,ai.`create_time`,ai.`update_time`, | |||
| ai.`authorization_status`,ai.`auth_time`, | |||
| ai.`base_status`,ai.`base_time`, | |||
| ai.`domain_status`,ai.`domain_time`, | |||
| ai.`webdomain_status`,ai.`webdomain_time`, | |||
| ai.`template_status`,ai.`template_time`, | |||
| ai.`current_version`,ai.`current_desc`,ai.`release_time`, | |||
| ai.`current_version` as `current_version`,ai.`current_desc`,ai.`release_time`, | |||
| ai.`open_appid`,ai.`bind_open_time`, | |||
| a.`name` | |||
| a.`name` as `name` | |||
| </sql> | |||
| <sql id="dynamicVWhereConditions"> | |||
| @@ -94,8 +94,8 @@ | |||
| </resultMap> | |||
| <sql id="allVoColumns"> | |||
| c.`id`,c.`tenant_id`,c.`app_id`,c.`type`,c.`user_version`,`version_desc`, | |||
| c.`audit_status`,c.`audit_err_code`,c.`audit_time`, | |||
| c.`id`,c.`tenant_id` as `tenant_id`,c.`app_id`,c.`type` as `type`,c.`user_version` as `user_version`,`version_desc`, | |||
| c.`audit_status`,c.`audit_err_code`,c.`audit_time` as `audit_time`, | |||
| a.`name` | |||
| </sql> | |||
| @@ -87,7 +87,7 @@ | |||
| </resultMap> | |||
| <sql id="allVoColumns"> | |||
| c.`id`,c.`tenant_id`,c.`app_id`,c.`type`,c.`user_version`,c.`version_desc`,c.`code_status`,c.`code_err_code`,c.`code_time`, a.`name` | |||
| c.`id`,c.`tenant_id` as `tenant_id`,c.`app_id`,c.`type` as `type`,c.`user_version` as `user_version`,c.`version_desc`,c.`code_status`,c.`code_err_code`,c.`code_time` as `code_time`, a.`name` | |||
| </sql> | |||
| <sql id="dynamicVoWhereConditions"> | |||
| @@ -87,8 +87,8 @@ | |||
| </resultMap> | |||
| <sql id="allVoColumns"> | |||
| c.`id`,c.`tenant_id`,c.`app_id`,c.`type`,c.`user_version`,c.`version_desc`, | |||
| c.`release_status`,c.`release_err_code`,c.`release_time`, | |||
| c.`id`,c.`tenant_id` as `tenant_id`,c.`app_id`,c.`type` as `type`,c.`user_version` as `user_version`,c.`version_desc`, | |||
| c.`release_status`,c.`release_err_code`,c.`release_time` as `release_time`, | |||
| a.`name` | |||
| </sql> | |||
| @@ -72,7 +72,7 @@ public class WechatWeappMsgTemplateController { | |||
| @GetMapping("getTemplateLibraryKeywordList") | |||
| @ApiImplicitParams({ | |||
| @ApiImplicitParam(name = "appId", value = "appId", dataType = "String", paramType = "query", required = true), | |||
| @ApiImplicitParam(name = "id", value = "页数", dataType = "String", paramType = "query", required = true)}) | |||
| @ApiImplicitParam(name = "id", value = "模板标题id", dataType = "String", paramType = "query", required = true)}) | |||
| public ResultData findTemplateLibraryKeywordList(String appId, String id) { | |||
| try { | |||
| WxMaService maService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); | |||
| @@ -96,7 +96,7 @@ public class WxWeappInfoController extends BaseController { | |||
| weappInfo.setName(null); | |||
| } | |||
| } | |||
| weappInfo.setSortColumns(WxWeappInfo.Field.TenantID_ASC,WxWeappInfo.Field.Type_ASC,WxWeappInfo.Field.Name_ASC); | |||
| weappInfo.setSortColumns(BaseEntity.SortField.TenantId_ASC,BaseEntity.SortField.Type_ASC,BaseEntity.SortField.Name_ASC); | |||
| final PageInfo<WxWeappInfo> page = authorizerInfoService.listVoAsPage(weappInfo, pageNum, pageSize); | |||
| return new ResultData(page); | |||
| } | |||
| @@ -112,7 +112,7 @@ public class WxWeappInfoController extends BaseController { | |||
| weappInfo.setName(null); | |||
| } | |||
| } | |||
| weappInfo.setSortColumns(WxAuthorizerInfo.Field.CurrentVersion_DESC); | |||
| weappInfo.setSortColumns(BaseEntity.SortField.CurrentVersion_DESC); | |||
| final List<WxWeappInfo> list = authorizerInfoService.getList(weappInfo); | |||
| return new ResultData(list); | |||
| } | |||
| @@ -150,6 +150,7 @@ public class WxWeappInfoController extends BaseController { | |||
| return new ResultData(ErrorCode.WEAPP_BASIC_SET_DOMAIN_ERR); | |||
| } | |||
| JSONObject templeObj = JSON.parseObject(weappBasicSet.getTemplateInfo()); | |||
| logger.info(templeObj.toJSONString()); | |||
| if(StringUtils.isBlank(appsStr)) { | |||
| WxWeappInfo weappInfoQ = new WxWeappInfo(); | |||
| @@ -183,69 +184,15 @@ public class WxWeappInfoController extends BaseController { | |||
| if(authorizerInfo == null) { | |||
| return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); | |||
| } | |||
| WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); | |||
| try { | |||
| WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); | |||
| // 设置基础版本 | |||
| String versionRet = openMaService.setSupportVersion(weappBasicSet.getVersion()); | |||
| logger.info(versionRet); | |||
| JSONObject verObj = JSON.parseObject(versionRet); | |||
| if(verObj.getInteger("errcode").equals(0)) { | |||
| authorizerInfo.setBaseStatus(0); | |||
| } else { | |||
| authorizerInfo.setBaseStatus(1); | |||
| } | |||
| authorizerInfo.setBaseTime(new Date()); | |||
| authorizerInfo.setUpdateTime(new Date()); | |||
| authorizerInfoService.updateBaseVersion(authorizerInfo); | |||
| // 服务器域名 | |||
| String action = "set"; | |||
| JSONObject urlObj = domainObj.getJSONObject("url"); | |||
| List<String> requestDomain = getUrlList(urlObj.getJSONArray("requestdomain")); | |||
| List<String> wsrequestDomain = getUrlList(urlObj.getJSONArray("wsrequestdomain")); | |||
| List<String> uploadDomain = getUrlList(urlObj.getJSONArray("uploaddomain")); | |||
| List<String> downloadDomain = getUrlList(urlObj.getJSONArray("downloaddomain")); | |||
| logger.info(downloadDomain.toString()); | |||
| WxOpenMaDomainResult openRet = openMaService.modifyDomain(action, | |||
| requestDomain, wsrequestDomain, | |||
| uploadDomain, downloadDomain); | |||
| logger.info(openRet.toString()); | |||
| if(openRet.isSuccess()) { | |||
| logger.info("设置服务器域名成功"); | |||
| authorizerInfo.setDomainStatus(0); | |||
| authorizerInfo.setDomainTime(new Date()); | |||
| authorizerInfo.setUpdateTime(new Date()); | |||
| setBasicVersion(weappBasicSet, authorizerInfo, openMaService); | |||
| } else { | |||
| logger.info("设置服务器域名成功"); | |||
| authorizerInfo.setDomainStatus(1); | |||
| authorizerInfo.setDomainTime(new Date()); | |||
| authorizerInfo.setUpdateTime(new Date()); | |||
| } | |||
| authorizerInfoService.updateDomainUrl(authorizerInfo); | |||
| // 业务域名 | |||
| JSONObject webObj = domainObj.getJSONObject("web"); | |||
| List<String> urlList = getUrlList(webObj.getJSONArray("webviewdomain")); | |||
| String openRet1 = openMaService.setWebViewDomain(action, urlList); | |||
| logger.info(openRet1); | |||
| JSONObject webRetObj = JSON.parseObject(openRet1); | |||
| if(webRetObj.getInteger("errcode").equals(0)) { | |||
| logger.info("设置服务器业务域名成功"); | |||
| authorizerInfo.setWebdomainStatus(0); | |||
| authorizerInfo.setWebdomainTime(new Date()); | |||
| authorizerInfo.setUpdateTime(new Date()); | |||
| } else { | |||
| logger.info("设置服务器业务域名失败"); | |||
| authorizerInfo.setWebdomainStatus(1); | |||
| authorizerInfo.setWebdomainTime(new Date()); | |||
| authorizerInfo.setUpdateTime(new Date()); | |||
| } | |||
| authorizerInfoService.updateWebDomainUrl(authorizerInfo); | |||
| setDomainUrl(domainObj, authorizerInfo, openMaService); | |||
| } catch (WxErrorException e) { | |||
| logger.error(e.getMessage()); | |||
| return new ResultData(Result.ERROR, e.getMessage()); | |||
| } | |||
| // 设置微信模板 | |||
| if(weappBasicSet.getType().equals(EnumAppType.C.getCode())) { | |||
| if(authorizerInfo.getTemplateStatus() == null || | |||
| @@ -256,46 +203,9 @@ public class WxWeappInfoController extends BaseController { | |||
| WxMaService maService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); | |||
| try { | |||
| // 核销成功消息 | |||
| JSONObject verify_success = templeObj.getJSONObject("verify_success"); | |||
| JSONArray keyidlist = verify_success.getJSONArray("keyword_id_list"); | |||
| List<Integer> keyArr = getIdList(keyidlist); | |||
| WxMaTemplateAddResult ret = maService.getTemplateService().addTemplate(verify_success.getString("id"), keyArr); | |||
| logger.info(ret.toString()); | |||
| if(appinfo != null) { | |||
| // wx_template_msg | |||
| WxTemplateMsg templateMsgQ = new WxTemplateMsg(); | |||
| templateMsgQ.setTenantId(appinfo.getTenantId()); | |||
| templateMsgQ.setType(EnumTemplateType.VERIFY_SUCCESS.getCode()); | |||
| WxTemplateMsg templateMsg = templateMsgService.getByObj(templateMsgQ); | |||
| if(templateMsg != null) { | |||
| templateMsg.setTemplateId(ret.getTemplateId()); | |||
| templateMsgService.saveOrUpdate(templateMsg); | |||
| } else { | |||
| templateMsgQ.setTemplateId(ret.getTemplateId()); | |||
| templateMsgService.saveOrUpdate(templateMsgQ); | |||
| } | |||
| } | |||
| // 核销失败消息 | |||
| JSONObject verify_fail = templeObj.getJSONObject("verify_fail"); | |||
| keyidlist = verify_fail.getJSONArray("keyword_id_list"); | |||
| List<Integer> keyArr1 = getIdList(keyidlist); | |||
| ret = maService.getTemplateService().addTemplate(verify_fail.getString("id"), keyArr1); | |||
| logger.info(ret.toString()); | |||
| if(appinfo != null) { | |||
| // wx_template_msg | |||
| WxTemplateMsg templateMsgQ = new WxTemplateMsg(); | |||
| templateMsgQ.setTenantId(appinfo.getTenantId()); | |||
| templateMsgQ.setType(EnumTemplateType.VERIFY_FAIL.getCode()); | |||
| WxTemplateMsg templateMsg = templateMsgService.getByObj(templateMsgQ); | |||
| if(templateMsg != null) { | |||
| templateMsg.setTemplateId(ret.getTemplateId()); | |||
| templateMsgService.saveOrUpdate(templateMsg); | |||
| } else { | |||
| templateMsgQ.setTemplateId(ret.getTemplateId()); | |||
| templateMsgService.saveOrUpdate(templateMsgQ); | |||
| } | |||
| } | |||
| setBasicTemplateMsgVerifySuccess(templeObj, appinfo, maService); | |||
| setBasicTemplateMsgVerifyFail(templeObj, appinfo, maService); | |||
| setBasicTemplateMsgPressSuccess(templeObj, appinfo, maService); | |||
| // 更新状态 | |||
| authorizerInfo.setTemplateStatus(EnumWxAuthotizationTemplateStatus.SUCCESS.getCode()); | |||
| @@ -317,6 +227,120 @@ public class WxWeappInfoController extends BaseController { | |||
| return null; | |||
| } | |||
| private void setBasicTemplateMsg(JSONObject templeObj, WxAppinfo appinfo, WxMaService maService, Integer msgCode, String msgTypeStr) throws WxErrorException { | |||
| JSONObject msgObj; | |||
| try { | |||
| msgObj = templeObj.getJSONObject(msgTypeStr); | |||
| } catch (Exception e) { | |||
| logger.error(e.getMessage()); | |||
| return; | |||
| } | |||
| logger.info(msgObj.toJSONString()); | |||
| String id = msgObj.getString("id"); | |||
| JSONArray keyidlist = msgObj.getJSONArray("keyword_id_list"); | |||
| String customParam = msgObj.getString("custom_param"); | |||
| logger.info(customParam); | |||
| JSONObject customParamObj = JSON.parseObject(customParam); | |||
| List<Integer> keyArr1 = getIdList(keyidlist); | |||
| if (appinfo != null) { | |||
| // wx_template_msg | |||
| WxTemplateMsg templateMsgQ = new WxTemplateMsg(); | |||
| templateMsgQ.setTenantId(appinfo.getTenantId()); | |||
| logger.info(msgCode.toString()); | |||
| templateMsgQ.setType(msgCode); | |||
| WxTemplateMsg templateMsg = templateMsgService.getByObj(templateMsgQ); | |||
| if (templateMsg != null) { | |||
| templateMsg.setCustomParam(customParamObj.toJSONString()); | |||
| templateMsgService.saveOrUpdate(templateMsg); | |||
| } else { | |||
| WxMaTemplateAddResult ret = maService.getTemplateService().addTemplate(id, keyArr1); | |||
| logger.info(ret.toString()); | |||
| templateMsgQ.setTemplateId(ret.getTemplateId()); | |||
| templateMsgQ.setCustomParam(customParamObj.toJSONString()); | |||
| templateMsgService.saveOrUpdate(templateMsgQ); | |||
| } | |||
| } | |||
| } | |||
| private void setBasicTemplateMsgVerifySuccess(JSONObject templeObj, WxAppinfo appinfo, WxMaService maService) throws WxErrorException { | |||
| // 核销成功消息 | |||
| setBasicTemplateMsg(templeObj, appinfo, maService, EnumTemplateType.VERIFY_SUCCESS.getCode(), "verify_success"); | |||
| } | |||
| private void setBasicTemplateMsgVerifyFail(JSONObject templeObj, WxAppinfo appinfo, WxMaService maService) throws WxErrorException { | |||
| // 核销失败消息 | |||
| setBasicTemplateMsg(templeObj, appinfo, maService, EnumTemplateType.VERIFY_FAIL.getCode(), "verify_fail"); | |||
| } | |||
| private void setBasicTemplateMsgPressSuccess(JSONObject templeObj, WxAppinfo appinfo, WxMaService maService) throws WxErrorException { | |||
| // 砍价成功消息 | |||
| logger.info("setBasicTemplateMsgPressSuccess begin.."); | |||
| /// EnumTemplateType.PRESS_PRICE_SUCCESS.getCode() | |||
| setBasicTemplateMsg(templeObj, appinfo, maService, 3, "press_success"); | |||
| logger.info("setBasicTemplateMsgPressSuccess end."); | |||
| } | |||
| private void setDomainUrl(JSONObject domainObj, WxAuthorizerInfo authorizerInfo, WxOpenMaService openMaService) throws WxErrorException { | |||
| // 服务器域名 | |||
| String action = "set"; | |||
| JSONObject urlObj = domainObj.getJSONObject("url"); | |||
| List<String> requestDomain = getUrlList(urlObj.getJSONArray("requestdomain")); | |||
| List<String> wsrequestDomain = getUrlList(urlObj.getJSONArray("wsrequestdomain")); | |||
| List<String> uploadDomain = getUrlList(urlObj.getJSONArray("uploaddomain")); | |||
| List<String> downloadDomain = getUrlList(urlObj.getJSONArray("downloaddomain")); | |||
| logger.info(downloadDomain.toString()); | |||
| WxOpenMaDomainResult openRet = openMaService.modifyDomain(action, | |||
| requestDomain, wsrequestDomain, | |||
| uploadDomain, downloadDomain); | |||
| logger.info(openRet.toString()); | |||
| if(openRet.isSuccess()) { | |||
| logger.info("设置服务器域名成功"); | |||
| authorizerInfo.setDomainStatus(0); | |||
| authorizerInfo.setDomainTime(new Date()); | |||
| authorizerInfo.setUpdateTime(new Date()); | |||
| } else { | |||
| logger.info("设置服务器域名成功"); | |||
| authorizerInfo.setDomainStatus(1); | |||
| authorizerInfo.setDomainTime(new Date()); | |||
| authorizerInfo.setUpdateTime(new Date()); | |||
| } | |||
| authorizerInfoService.updateDomainUrl(authorizerInfo); | |||
| // 业务域名 | |||
| JSONObject webObj = domainObj.getJSONObject("web"); | |||
| List<String> urlList = getUrlList(webObj.getJSONArray("webviewdomain")); | |||
| String openRet1 = openMaService.setWebViewDomain(action, urlList); | |||
| logger.info(openRet1); | |||
| JSONObject webRetObj = JSON.parseObject(openRet1); | |||
| if(webRetObj.getInteger("errcode").equals(0)) { | |||
| logger.info("设置服务器业务域名成功"); | |||
| authorizerInfo.setWebdomainStatus(0); | |||
| authorizerInfo.setWebdomainTime(new Date()); | |||
| authorizerInfo.setUpdateTime(new Date()); | |||
| } else { | |||
| logger.info("设置服务器业务域名失败"); | |||
| authorizerInfo.setWebdomainStatus(1); | |||
| authorizerInfo.setWebdomainTime(new Date()); | |||
| authorizerInfo.setUpdateTime(new Date()); | |||
| } | |||
| authorizerInfoService.updateWebDomainUrl(authorizerInfo); | |||
| } | |||
| private void setBasicVersion(WxWeappBasicSet weappBasicSet, WxAuthorizerInfo authorizerInfo, WxOpenMaService openMaService) throws WxErrorException { | |||
| // 设置基础版本 | |||
| String versionRet = openMaService.setSupportVersion(weappBasicSet.getVersion()); | |||
| logger.info(versionRet); | |||
| JSONObject verObj = JSON.parseObject(versionRet); | |||
| if(verObj.getInteger("errcode").equals(0)) { | |||
| authorizerInfo.setBaseStatus(0); | |||
| } else { | |||
| authorizerInfo.setBaseStatus(1); | |||
| } | |||
| authorizerInfo.setBaseTime(new Date()); | |||
| authorizerInfo.setUpdateTime(new Date()); | |||
| authorizerInfoService.updateBaseVersion(authorizerInfo); | |||
| } | |||
| private List<Integer> getIdList(JSONArray keyidlist) { | |||
| List<Integer> keyArr = new ArrayList<Integer>(); | |||
| for (int i = 0; i < keyidlist.size(); i++) { | |||
| @@ -852,7 +876,7 @@ public class WxWeappInfoController extends BaseController { | |||
| weappCodeStatusVo.setName(null); | |||
| } | |||
| } | |||
| weappCodeStatusVo.setSortColumns(WxWeappCodeStatus.Field.CodeTime_DESC, WxWeappCodeStatus.Field.TenantId_ASC, WxWeappCodeStatus.Field.Type_ASC, WxWeappCodeStatus.Field.UserVersion_DESC); | |||
| weappCodeStatusVo.setSortColumns(BaseEntity.SortField.CodeTime_DESC, BaseEntity.SortField.TenantId_ASC, BaseEntity.SortField.Type_ASC, BaseEntity.SortField.UserVersion_DESC); | |||
| final PageInfo<WxWeappCodeStatusVo> page = weappCodeStatusService.listAsPage(weappCodeStatusVo, pageNum, pageSize); | |||
| return new ResultData(page); | |||
| } | |||
| @@ -874,7 +898,7 @@ public class WxWeappInfoController extends BaseController { | |||
| weappAuditStatusVo.setName(null); | |||
| } | |||
| } | |||
| weappAuditStatusVo.setSortColumns(WxWeappAuditStatus.Field.AuditTime_DESC, WxWeappAuditStatus.Field.TenantId_ASC, WxWeappAuditStatus.Field.Type_ASC, WxWeappAuditStatus.Field.UserVersion_DESC); | |||
| weappAuditStatusVo.setSortColumns(BaseEntity.SortField.AuditTime_DESC, BaseEntity.SortField.TenantId_ASC, BaseEntity.SortField.Type_ASC, BaseEntity.SortField.UserVersion_DESC); | |||
| final PageInfo<WxWeappAuditStatusVo> page = weappAuditStatusService.listAsPage(weappAuditStatusVo, pageNum, pageSize); | |||
| return new ResultData(page); | |||
| } | |||
| @@ -896,7 +920,7 @@ public class WxWeappInfoController extends BaseController { | |||
| weappReleaseStatusVo.setName(null); | |||
| } | |||
| } | |||
| weappReleaseStatusVo.setSortColumns(WxWeappReleaseStatus.Field.ReleaseTime_DESC, WxWeappReleaseStatus.Field.TenantId_ASC, WxWeappReleaseStatus.Field.Type_ASC,WxWeappReleaseStatus.Field.UserVersion_DESC); | |||
| weappReleaseStatusVo.setSortColumns(BaseEntity.SortField.ReleaseTime_DESC, BaseEntity.SortField.TenantId_ASC, BaseEntity.SortField.Type_ASC,BaseEntity.SortField.UserVersion_DESC); | |||
| final PageInfo<WxWeappReleaseStatusVo> page = weappReleaseStatusService.listAsPage(weappReleaseStatusVo, pageNum, pageSize); | |||
| return new ResultData(page); | |||
| } | |||