diff --git a/mallinkService/src/main/java/com/iformall/common/CommonMapper.java b/mallinkService/src/main/java/com/iformall/common/CommonMapper.java index cc76bf6..23980a0 100644 --- a/mallinkService/src/main/java/com/iformall/common/CommonMapper.java +++ b/mallinkService/src/main/java/com/iformall/common/CommonMapper.java @@ -1,9 +1,6 @@ package com.iformall.common; -import tk.mybatis.mapper.common.BaseMapper; -import tk.mybatis.mapper.common.IdsMapper; -import tk.mybatis.mapper.common.Marker; -import tk.mybatis.mapper.common.special.InsertListMapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.io.Serializable; @@ -12,5 +9,5 @@ import java.io.Serializable; * @date 2017-12-27 */ -public interface CommonMapper extends BaseMapper, IdsMapper, InsertListMapper, Marker { +public interface CommonMapper extends BaseMapper { } diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java index 526487e..76533aa 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java @@ -1,26 +1,22 @@ package com.iformall.domain.dto; +import com.baomidou.mybatisplus.annotation.TableField; +import com.iformall.domain.po.BaseEntity; import lombok.Data; +import lombok.EqualsAndHashCode; -import java.io.Serializable; import java.util.Date; - -import javax.persistence.Id; -import javax.persistence.Transient; /** * 用户查询dto * @author jinguo * */ @Data -public class WxCUserBasicInfoDto implements Serializable{ +@EqualsAndHashCode(callSuper = true) +public class WxCUserBasicInfoDto extends BaseEntity { - /** - * - */ private static final long serialVersionUID = -1116465873573690766L; - @Id protected Long id; @io.swagger.annotations.ApiModelProperty(value="开始时间",name="startTime") @@ -35,22 +31,22 @@ public class WxCUserBasicInfoDto implements Serializable{ @io.swagger.annotations.ApiModelProperty(value="姓名",name="name") private String name; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") private String tenantId; - - @Transient + + @TableField(exist = false) private Date birthStartTime; - @Transient + @TableField(exist = false) private Date birthEndTime; - @Transient + @TableField(exist = false) private Integer levelStartScore; - @Transient + @TableField(exist = false) private Integer levelEndScore; - @Transient + @TableField(exist = false) private Integer sex; } diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxWeappCodeAuditDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxWeappCodeAuditDto.java index bbd3c61..0b71abf 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxWeappCodeAuditDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxWeappCodeAuditDto.java @@ -1,8 +1,8 @@ package com.iformall.domain.dto; +import com.iformall.domain.po.BaseEntity; import lombok.Data; - -import java.io.Serializable; +import lombok.EqualsAndHashCode; /** * 审核提交 @@ -10,7 +10,8 @@ import java.io.Serializable; * */ @Data -public class WxWeappCodeAuditDto implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxWeappCodeAuditDto extends BaseEntity { private static final long serialVersionUID = -1116465873573690766L; 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 17d22c5..f5b75b2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java @@ -1,13 +1,14 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; 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; +import java.util.List; /** * @author luozukai @@ -18,15 +19,28 @@ import java.lang.reflect.Field; public class BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @Transient + + @TableField(exist = false) + private List ids; + + @TableField(exist = false) private String sortColumn; - @Transient + @TableField(exist = false) private String sortOrder; - @Transient + @TableField(exist = false) private String sortColumns; + @TableField(exist = false) + protected String floorForRule; + + @TableField(exist = false) + protected String businessForRule; + + @TableField(exist = false) + protected String[] tempShop; + public String getSortColumns() { if(StringUtils.isBlank(sortColumn)){ 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 09a3505..fca6cec 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java @@ -1,41 +1,42 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; -import javax.persistence.Transient; import java.util.List; -import javax.persistence.Id; -@Table(name = "mall_permission") +@TableName(value = "mall_permission") @Data @EqualsAndHashCode(callSuper = true) public class MallPermission extends BaseEntity { 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 + + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="权限名称[LIKE]",name="nameLike") private String nameLike; + @io.swagger.annotations.ApiModelProperty(value="父编号ID,一级菜单为0",name="parentId") private Long parentId; - @Transient + + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="父菜单",name="parentName") 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 + + @TableField(exist = false) private List permissions; + @io.swagger.annotations.ApiModelProperty(value="资源类型0:目录 1:菜单 2:按钮",name="resourceType") private Integer resourceType; @io.swagger.annotations.ApiModelProperty(value="菜单背景色-1级菜单使用",name="moduleColor") @@ -51,20 +52,20 @@ public class MallPermission extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="排序",name="sort") private Integer sort; - @Transient + @TableField(exist = false) private Integer sortFrom; - @Transient + @TableField(exist = false) private Integer sortTo; - @Transient + @TableField(exist = false) private Integer sortGte; - @Transient + @TableField(exist = false) private Integer sortGt; - @Transient + @TableField(exist = false) private Integer sortLte; - @Transient + @TableField(exist = false) private Integer sortLt; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="子菜单",name="children") private List children; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java b/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java index aa0039a..cb7b39a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java @@ -1,24 +1,19 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; -import javax.persistence.Transient; import java.util.List; -import javax.persistence.Id; -@Table(name = "mall_role") +@TableName(value = "mall_role") @Data @EqualsAndHashCode(callSuper = true) public class MallRole extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - - @Transient - protected List ids; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -28,8 +23,8 @@ public class MallRole extends BaseEntity { private String available; @io.swagger.annotations.ApiModelProperty(value="角色描述",name="description") private String description; - - @Transient + + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="权限列表",name="menus") private String menus; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java index c86acf9..b6874eb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java @@ -1,5 +1,7 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.enums.EnumUserAdmin; import com.iformall.enums.EnumUserWechat; import com.iformall.utils.Constant; @@ -7,27 +9,17 @@ 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.util.ArrayList; import java.util.Date; import java.util.List; -@Table(name = "mall_user_info") +@TableName(value = "mall_user_info") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class MallUserInfo extends BaseEntity { - @Id protected Long id; - - @Transient - protected List ids; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -57,29 +49,29 @@ public class MallUserInfo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="admin用户微信登录用,可绑定多个账户",name="webOpenId") private String webOpenId; - @io.swagger.annotations.ApiModelProperty(value="1 未绑定wechat,0 绑定微信",name="withWechat") - @Transient + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="1 未绑定wechat,0 绑定微信",name="withWechat") private Integer withWechat; - @Transient + @TableField(exist = false) private Integer withWechatForQuery; - @Transient + @TableField(exist = false) private Long roleId; - - @Transient + + @TableField(exist = false) private String roleName; //该用户所有的角色 - @Transient + @TableField(exist = false) private List role; //该用户包含的所有权限 - @Transient + @TableField(exist = false) private List permission; //拥有的菜单权限 - @Transient + @TableField(exist = false) private String menus; - @Transient + @TableField(exist = false) private String captcha; @io.swagger.annotations.ApiModelProperty(value = "邮箱", name = "email") 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 c679e21..0c1f71b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java @@ -1,24 +1,17 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; -@Table(name = "wx_appinfo") +@TableName(value = "wx_appinfo") @Data @EqualsAndHashCode(callSuper = true) public class WxAppinfo extends BaseEntity { - @Id protected Long id; - - @Transient - protected List ids; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; 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 e2f3b0a..28fa154 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java @@ -1,23 +1,21 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; import java.util.List; -@Table(name = "wx_authorizer_info") +@TableName(value = "wx_authorizer_info") @Data @EqualsAndHashCode(callSuper = true) public class WxAuthorizerInfo extends BaseEntity { - @Id protected Long id; - @Transient + @TableField(exist = false) protected List ids; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") 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 9987be6..b6b5e68 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java @@ -1,31 +1,26 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.utils.Constant; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -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 java.util.UUID; -@Table(name = "wx_c_user") +@TableName(value = "wx_c_user") @JsonIgnoreProperties(ignoreUnknown = true) @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxCUser extends BaseEntity { - @Id protected Long id; - - @Transient - protected List ids; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -114,28 +109,28 @@ public class WxCUser extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="积分",name="credit") private Integer credit; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="渠道名称",name="channelName") private String channelName; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="渠道描述",name="sceneDescription") protected String sceneDescription; - @Transient + @TableField(exist = false) List sceneList; - @Transient + @TableField(exist = false) protected Date startDate; - @Transient + @TableField(exist = false) protected Date endDate; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="操作人类型 枚举:EnumUserType",name="operatorType") private Integer operatorType; - @Transient + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="操作人ID",name="operatorId") private Long operatorId; 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 8995517..2d5146e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxComponentVerifyTicket.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxComponentVerifyTicket.java @@ -1,25 +1,18 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_component_verify_ticket") +@TableName(value = "wx_component_verify_ticket") @Data @EqualsAndHashCode(callSuper = true) public class WxComponentVerifyTicket extends BaseEntity { private static final long serialVersionUID = 1L; - - @Id + protected Long id; - - @Transient - protected List ids; @io.swagger.annotations.ApiModelProperty(value="微信第三方componentAppid",name="componentAppid") private String componentAppid; 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 17c213b..7a9f6ba 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java @@ -1,24 +1,16 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; - -@Table(name = "wx_pay_account") +@TableName(value = "wx_pay_account") @Data @EqualsAndHashCode(callSuper = true) public class WxPayAccount extends BaseEntity { private static final long serialVersionUID = 1L; - - @Id + protected Long id; - - @Transient - protected List ids; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; 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 092d538..4fc154f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java @@ -1,23 +1,21 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -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_pay_order") +@TableName(value = "wx_pay_order") @Data public class WxPayOrder implements Serializable { private static final long serialVersionUID = 1L; - - @Id + protected Long id; - - @Transient + + @TableField(exist = false) protected List ids; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") 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 ecdf5cf..3b08816 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java @@ -1,26 +1,18 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; 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_template_msg") +@TableName(value = "wx_template_msg") @Data @EqualsAndHashCode(callSuper = true) public class WxTemplateMsg extends BaseEntity { private static final long serialVersionUID = 1L; - - @Id + protected Long id; - - @Transient - protected List ids; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; 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 c523117..2e4c5cb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java @@ -1,27 +1,19 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; 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_weapp_audit_status") +@TableName(value = "wx_weapp_audit_status") @Data @EqualsAndHashCode(callSuper = true) public class WxWeappAuditStatus extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") 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 8fee48d..ee8b442 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappBasicSet.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappBasicSet.java @@ -1,26 +1,19 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; 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_basic_set") +@TableName(value = "wx_weapp_basic_set") @Data @EqualsAndHashCode(callSuper = true) public class WxWeappBasicSet extends BaseEntity { private static final long serialVersionUID = 1L; - - @Id + protected Long id; - - @Transient - protected List ids; @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") private Integer type; 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 c47ef2f..ced0525 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java @@ -1,27 +1,20 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; 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_weapp_code_status") +@TableName(value = "wx_weapp_code_status") @Data @EqualsAndHashCode(callSuper = true) public class WxWeappCodeStatus extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") 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 a217bc7..92034c7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java @@ -1,25 +1,18 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.*; import java.util.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -@Table(name = "wx_weapp_ext_set") +@TableName(value = "wx_weapp_ext_set") @Data @EqualsAndHashCode(callSuper = true) public class WxWeappExtSet extends BaseEntity { private static final long serialVersionUID = 1L; - - @Id + protected Long id; - - @Transient - protected List ids; @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") private String appId; @@ -31,6 +24,8 @@ public class WxWeappExtSet extends BaseEntity { private String releaseJson; @io.swagger.annotations.ApiModelProperty(value="停车(0:不支持,1:etcp)",name="carSupport") private Integer carSupport; + @io.swagger.annotations.ApiModelProperty(value="菜单(0:全有,1:我的/首页, 2:无停车)",name="storeApp") + private Integer storeApp; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") 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 08d548d..83fa6dd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java @@ -1,26 +1,19 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import java.util.Date; -import java.util.List; -@Table(name = "wx_weapp_release_status") +@TableName(value = "wx_weapp_release_status") @Data @EqualsAndHashCode(callSuper = true) public class WxWeappReleaseStatus extends BaseEntity { private static final long serialVersionUID = 1L; - @Id protected Long id; - @Transient - protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumEnableType.java b/mallinkService/src/main/java/com/iformall/enums/EnumEnableType.java new file mode 100644 index 0000000..7400713 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumEnableType.java @@ -0,0 +1,38 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumEnableType { + + // 0: SUCCESS, 1: FAIL + + SUCC(0, "SUCCESS"), + FAIL(1, "FAIL"), + ; + + public static EnumEnableType getEnum(Integer code) { + for (EnumEnableType value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumEnableType(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/MallPermissionMapper.java b/mallinkService/src/main/java/com/iformall/mapper/MallPermissionMapper.java index a84a507..9ae767c 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/MallPermissionMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/MallPermissionMapper.java @@ -9,9 +9,10 @@ import java.util.List; public interface MallPermissionMapper extends CommonMapper { List findList(MallPermission mallPermission); - - List findPermissionByRoleId(Long roleId); - List findPermissionByRoleIds(@Param("roleIds") List roleIds); + + List queryListParentId(Long parentId); + + List queryNotButtonList(); diff --git a/mallinkService/src/main/java/com/iformall/mapper/MallUserInfoMapper.java b/mallinkService/src/main/java/com/iformall/mapper/MallUserInfoMapper.java index f40d727..e0bab1f 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/MallUserInfoMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/MallUserInfoMapper.java @@ -1,6 +1,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; +import com.iformall.domain.po.MallPermission; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.vo.MallUserInfoVo; import org.apache.ibatis.annotations.Param; @@ -10,7 +11,7 @@ import java.util.Map; public interface MallUserInfoMapper extends CommonMapper { - MallUserInfo selectById(@Param("id") Long id); + MallUserInfo getById(@Param("id") Long id); List findList(MallUserInfo mallUserInfo); @@ -24,6 +25,8 @@ public interface MallUserInfoMapper extends CommonMapper { void removeWebOpenId(MallUserInfo mallUserInfo); + void removeAllOpenId(MallUserInfo mallUserInfo); + MallUserInfo selectByPhone(@Param("phone") String phone, @Param("tenantId") String tenantId); Integer hasButtonPermission(@Param("userId") Long userId, @Param("permission") String permission); @@ -35,4 +38,19 @@ public interface MallUserInfoMapper extends CommonMapper { List selectUsersByWebOpenId(@Param("webOpenId") String webOpenId); + /** + * 查询用户的所有菜单 + * @param userId 用户ID + */ + List queryAllMenu(Long userId); + /** + * 查询用户的所有权限 + * @param userId 用户ID + */ + List queryAllPerms(Long userId); + + /** + * 查询用户的所有菜单ID + */ + List queryAllMenuId(Long userId); } diff --git a/mallinkService/src/main/java/com/iformall/service/MallPermissionService.java b/mallinkService/src/main/java/com/iformall/service/MallPermissionService.java index 69505f0..4c11145 100644 --- a/mallinkService/src/main/java/com/iformall/service/MallPermissionService.java +++ b/mallinkService/src/main/java/com/iformall/service/MallPermissionService.java @@ -11,8 +11,8 @@ public interface MallPermissionService { * 根据实体查询分页列表 * * @param record - * @param offset - * @param limit + * @param pageIndex + * @param pageSize * @return */ PageInfo listAsPage(MallPermission record, Integer pageIndex, Integer pageSize); @@ -38,25 +38,4 @@ public interface MallPermissionService { * @param id */ void deleteById(Long id); - - /** - * 根据roleId查询菜单和按钮权限 - * @param roleId - * @return - */ - List findPermissionByRoleId(Long roleId); - - /** - * 根据ruleId权限组查找相应权限 - * @param roleIds - * @return - */ - List findPermissionByRoleIds(List roleIds); - - - - - - - } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java index e9a9318..e8b12c4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java @@ -28,7 +28,7 @@ public class MallPermissionServiceImpl implements MallPermissionService { @Override public MallPermission getById(Long id) { - return mallPermissionMapper.selectByPrimaryKey(id); + return mallPermissionMapper.selectById(id); } @Override @@ -37,31 +37,15 @@ public class MallPermissionServiceImpl implements MallPermissionService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - mallPermissionMapper.insertSelective(record); + mallPermissionMapper.insert(record); } else { - mallPermissionMapper.updateByPrimaryKeySelective(record); + mallPermissionMapper.updateById(record); } } @Override public void deleteById(Long id) { - mallPermissionMapper.deleteByPrimaryKey(id); + mallPermissionMapper.deleteById(id); } - @Override - public List findPermissionByRoleId(Long roleId) { - return mallPermissionMapper.findPermissionByRoleId(roleId); - } - - @Override - public List findPermissionByRoleIds(List roleIds) { - return mallPermissionMapper.findPermissionByRoleIds(roleIds); - } - - - - - - - } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java index a4921df..b56d8a2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; @@ -31,12 +32,12 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { @Override public int cntUserList(MallUserInfo record) { - return mallUserInfoMapper.selectCount(record); + return mallUserInfoMapper.selectCount(new QueryWrapper<>(record)); } @Override public MallUserInfo getById(Long id) { - return mallUserInfoMapper.selectById(id); + return mallUserInfoMapper.getById(id); } @Override @@ -49,7 +50,7 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { MallUserInfo updateUser = new MallUserInfo(); updateUser.setId(user.getId()); updateUser.setBopenId(user.getBopenId()); - mallUserInfoMapper.updateByPrimaryKeySelective(user); + mallUserInfoMapper.updateById(user); } @Override @@ -78,15 +79,15 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - mallUserInfoMapper.insertSelective(record); + mallUserInfoMapper.insert(record); } else { - mallUserInfoMapper.updateByPrimaryKeySelective(record); + mallUserInfoMapper.updateById(record); } } @Override public void deleteById(Long id) { - mallUserInfoMapper.deleteByPrimaryKey(id); + mallUserInfoMapper.deleteById(id); } @Override @@ -98,7 +99,7 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { public long cntByUserName(String username) { MallUserInfo userInfo = new MallUserInfo(); userInfo.setUsername(username); - return PageHelper.count(() -> mallUserInfoMapper.select(userInfo)); + return PageHelper.count(() -> mallUserInfoMapper.selectList(new QueryWrapper<>(userInfo))); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java index c303575..eda83a6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxAppinfo; @@ -26,7 +27,7 @@ public class WxAppinfoServiceImpl implements WxAppinfoService { WxAppinfo appinfoQ = new WxAppinfo(); appinfoQ.setTenantId(tenantId); appinfoQ.setType(EnumAppType.C.getCode()); - List appList = wxAppinfoMapper.select(appinfoQ); + List appList = wxAppinfoMapper.selectList(new QueryWrapper<>(appinfoQ)); if (appList.size() > 0) { appInfo = appList.get(0); } @@ -50,7 +51,7 @@ public class WxAppinfoServiceImpl implements WxAppinfoService { @Override public WxAppinfo getById(Long id) { - return wxAppinfoMapper.selectByPrimaryKey(id); + return wxAppinfoMapper.selectById(id); } @Override @@ -59,14 +60,14 @@ public class WxAppinfoServiceImpl implements WxAppinfoService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxAppinfoMapper.insertSelective(record); + wxAppinfoMapper.insert(record); } else { - wxAppinfoMapper.updateByPrimaryKeySelective(record); + wxAppinfoMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxAppinfoMapper.deleteByPrimaryKey(id); + wxAppinfoMapper.deleteById(id); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java index 5394ada..199429d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxAppinfo; @@ -53,7 +54,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { @Override public WxAuthorizerInfo getById(Long id) { - return authorizerInfoMapper.selectByPrimaryKey(id); + return authorizerInfoMapper.selectById(id); } @Override @@ -61,7 +62,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { WxAuthorizerInfo authQ = new WxAuthorizerInfo(); authQ.setAuthorizerAppid(appId); try { - WxAuthorizerInfo authorizerInfo = authorizerInfoMapper.selectOne(authQ); + WxAuthorizerInfo authorizerInfo = authorizerInfoMapper.selectOne(new QueryWrapper<>(authQ)); return authorizerInfo; } catch (Exception e) { logger.error(e.getMessage()); @@ -80,7 +81,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { try { WxAuthorizerInfo aiQ = new WxAuthorizerInfo(); aiQ.setAuthorizerAppid(record.getAuthorizerAppid()); - authorizerInfo = authorizerInfoMapper.selectOne(aiQ); + authorizerInfo = authorizerInfoMapper.selectOne(new QueryWrapper<>(aiQ)); } catch (Exception e) { logger.error(e.getMessage()); } @@ -98,7 +99,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { record.setCreateTime(curDate); record.setUpdateTime(curDate); // 授权表 添加 - authorizerInfoMapper.insertSelective(record); + authorizerInfoMapper.insert(record); if(appinfo != null && appinfo.getType() != null) { if (appinfo.getType().equals(EnumAppType.C.getCode()) || appinfo.getType().equals(EnumAppType.B.getCode())) { @@ -114,20 +115,20 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { } weappExtSet.setCreateDate(curDate); weappExtSet.setUpdateDate(curDate); - weappExtSetMapper.insertSelective(weappExtSet); + weappExtSetMapper.insert(weappExtSet); } } } else { record.setId(authorizerInfo.getId()); record.setUpdateTime(curDate); logger.info(record.toString()); - authorizerInfoMapper.updateByPrimaryKeySelective(record); + authorizerInfoMapper.updateById(record); } } @Override public void deleteById(Long id) { - authorizerInfoMapper.deleteByPrimaryKey(id); + authorizerInfoMapper.deleteById(id); } @Override @@ -143,7 +144,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { info.setBaseStatus(record.getBaseStatus()); info.setBaseTime(curDate); info.setUpdateTime(curDate); - return authorizerInfoMapper.updateByPrimaryKeySelective(info); + return authorizerInfoMapper.updateById(info); } @Override @@ -154,7 +155,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { info.setDomainStatus(record.getDomainStatus()); info.setDomainTime(curDate); info.setUpdateTime(curDate); - return authorizerInfoMapper.updateByPrimaryKeySelective(info); + return authorizerInfoMapper.updateById(info); } @Override @@ -165,7 +166,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { info.setWebdomainStatus(record.getWebdomainStatus()); info.setWebdomainTime(curDate); info.setUpdateTime(curDate); - return authorizerInfoMapper.updateByPrimaryKeySelective(info); + return authorizerInfoMapper.updateById(info); } @Override @@ -176,7 +177,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { info.setTemplateStatus(record.getTemplateStatus()); info.setTemplateTime(curDate); info.setUpdateTime(curDate); - return authorizerInfoMapper.updateByPrimaryKeySelective(info); + return authorizerInfoMapper.updateById(info); } @Override @@ -186,7 +187,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { info.setId(record.getId()); info.setOpenAppid(record.getOpenAppid()); info.setBindOpenTime(curDate); - return authorizerInfoMapper.updateByPrimaryKeySelective(info); + return authorizerInfoMapper.updateById(info); } @Override @@ -199,7 +200,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { WxAuthorizerInfo authorizerInfo = authorizerInfoMapper.findByAppid(record.getAuthorizerAppid()); if(authorizerInfo != null) { record.setId(authorizerInfo.getId()); - return authorizerInfoMapper.updateByPrimaryKeySelective(record); + return authorizerInfoMapper.updateById(record); } else { /// TODO } @@ -221,7 +222,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { } else { // 不是同一个月,重置authBackNum record.setAuditBackNum(1); - return authorizerInfoMapper.updateByPrimaryKeySelective(record); + return authorizerInfoMapper.updateById(record); } } else { /// TODO diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java index cd61dcf..4643f49 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; @@ -32,7 +33,7 @@ public class WxCUserServiceImpl implements WxCUserService { @Override public WxCUser getById(Long id) { - return wxCUserMapper.selectByPrimaryKey(id); + return wxCUserMapper.selectById(id); } @Override @@ -43,7 +44,7 @@ public class WxCUserServiceImpl implements WxCUserService { @Override public WxCUser getByObject(WxCUser record) { try { - return wxCUserMapper.selectOne(record); + return wxCUserMapper.selectOne(new QueryWrapper<>(record)); } catch (Exception e) { logger.error("NOT found: " + e.getMessage()); } @@ -62,7 +63,7 @@ public class WxCUserServiceImpl implements WxCUserService { // 已有,更新 user.setId(oldUser.getId()); // TODO 是否其他信息需要更新 - ret = wxCUserMapper.updateByPrimaryKeySelective(user); + ret = wxCUserMapper.updateById(user); return ret; } } @@ -71,10 +72,10 @@ public class WxCUserServiceImpl implements WxCUserService { user.setLoginCount(1); user.setCreateDate(curr); user.setUpdateDate(curr); - ret = wxCUserMapper.insertSelective(user); + ret = wxCUserMapper.insert(user); } else { user.setUpdateDate(curr); - ret = wxCUserMapper.updateByPrimaryKeySelective(user); + ret = wxCUserMapper.updateById(user); } return ret; @@ -138,7 +139,7 @@ public class WxCUserServiceImpl implements WxCUserService { @Override public void deleteById(Long id) { - wxCUserMapper.deleteByPrimaryKey(id); + wxCUserMapper.deleteById(id); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxComponentVerifyTicketServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxComponentVerifyTicketServiceImpl.java index b6f29c1..b79d67e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxComponentVerifyTicketServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxComponentVerifyTicketServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxComponentVerifyTicket; @@ -26,7 +27,7 @@ public class WxComponentVerifyTicketServiceImpl implements WxComponentVerifyTick @Override public WxComponentVerifyTicket getById(Long id) { - return wxComponentVerifyTicketMapper.selectByPrimaryKey(id); + return wxComponentVerifyTicketMapper.selectById(id); } @Override @@ -35,23 +36,23 @@ public class WxComponentVerifyTicketServiceImpl implements WxComponentVerifyTick try { WxComponentVerifyTicket ctQ = new WxComponentVerifyTicket(); ctQ.setComponentAppid(record.getComponentAppid()); - wxComponentVerifyTicket = wxComponentVerifyTicketMapper.selectOne(ctQ); + wxComponentVerifyTicket = wxComponentVerifyTicketMapper.selectOne(new QueryWrapper<>(ctQ)); } catch (Exception e) { logger.error(e.getMessage()); } if (wxComponentVerifyTicket == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxComponentVerifyTicketMapper.insertSelective(record); + wxComponentVerifyTicketMapper.insert(record); } else { record.setId(wxComponentVerifyTicket.getId()); - wxComponentVerifyTicketMapper.updateByPrimaryKeySelective(record); + wxComponentVerifyTicketMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxComponentVerifyTicketMapper.deleteByPrimaryKey(id); + wxComponentVerifyTicketMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java index 0376b3b..03606bd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxTemplateMsg; @@ -28,12 +29,12 @@ public class WxTemplateMsgServiceImpl implements WxTemplateMsgService { @Override public WxTemplateMsg getById(Long id) { - return wxTemplateMsgMapper.selectByPrimaryKey(id); + return wxTemplateMsgMapper.selectById(id); } @Override public WxTemplateMsg getByObj(WxTemplateMsg record) { - return wxTemplateMsgMapper.selectOne(record); + return wxTemplateMsgMapper.selectOne(new QueryWrapper<>(record)); } @Override @@ -45,16 +46,16 @@ public class WxTemplateMsgServiceImpl implements WxTemplateMsgService { record.setId(idWorker.nextId()); record.setCreateDate(curDate); record.setUpdateDate(curDate); - wxTemplateMsgMapper.insertSelective(record); + wxTemplateMsgMapper.insert(record); } else { record.setUpdateDate(curDate); - wxTemplateMsgMapper.updateByPrimaryKeySelective(record); + wxTemplateMsgMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxTemplateMsgMapper.deleteByPrimaryKey(id); + wxTemplateMsgMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappAuditStatusServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappAuditStatusServiceImpl.java index 878fcb9..b1f8f43 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappAuditStatusServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappAuditStatusServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; @@ -40,31 +41,31 @@ public class WxWeappAuditStatusServiceImpl implements WxWeappAuditStatusService @Override public WxWeappAuditStatus getById(Long id) { - return weappAuditStatusMapper.selectByPrimaryKey(id); + return weappAuditStatusMapper.selectById(id); } @Override public WxWeappAuditStatus getByAppId(String appId) { WxWeappAuditStatus statusQ = new WxWeappAuditStatus(); statusQ.setAppId(appId); - return weappAuditStatusMapper.selectOne(statusQ); + return weappAuditStatusMapper.selectOne(new QueryWrapper<>(statusQ)); } @Override public void saveStatus(WxWeappAuditStatus record) { logger.info("AUDIT: " + record.toString()); - weappAuditStatusMapper.insertSelective(record); + weappAuditStatusMapper.insert(record); } @Override public void updateStatus(WxWeappAuditStatus record) { logger.info("AUDIT: " + record.toString()); - weappAuditStatusMapper.updateByPrimaryKeySelective(record); + weappAuditStatusMapper.updateById(record); } @Override public void deleteById(Long id) { - weappAuditStatusMapper.deleteByPrimaryKey(id); + weappAuditStatusMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappBasicSetServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappBasicSetServiceImpl.java index 87c23a0..c6d198e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappBasicSetServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappBasicSetServiceImpl.java @@ -1,6 +1,6 @@ package com.iformall.service.impl; -import java.util.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxWeappBasicSet; @@ -24,12 +24,12 @@ public class WxWeappBasicSetServiceImpl implements WxWeappBasicSetService { @Override public WxWeappBasicSet getById(Long id) { - return wxWeappBasicSetMapper.selectByPrimaryKey(id); + return wxWeappBasicSetMapper.selectById(id); } @Override public WxWeappBasicSet getByTypeAndDeploy(WxWeappBasicSet weappBasicSet) { - return wxWeappBasicSetMapper.selectOne(weappBasicSet); + return wxWeappBasicSetMapper.selectOne(new QueryWrapper<>(weappBasicSet)); } @Override @@ -38,15 +38,15 @@ public class WxWeappBasicSetServiceImpl implements WxWeappBasicSetService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - wxWeappBasicSetMapper.insertSelective(record); + wxWeappBasicSetMapper.insert(record); } else { - wxWeappBasicSetMapper.updateByPrimaryKeySelective(record); + wxWeappBasicSetMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxWeappBasicSetMapper.deleteByPrimaryKey(id); + wxWeappBasicSetMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java index dd15f5b..2fbd70d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; @@ -42,20 +43,20 @@ public class WxWeappCodeStatusServiceImpl implements WxWeappCodeStatusService { @Override public WxWeappCodeStatus getById(Long id) { - return weappCodeStatusMapper.selectByPrimaryKey(id); + return weappCodeStatusMapper.selectById(id); } @Override public WxWeappCodeStatus getByAppId(String appId) { WxWeappCodeStatus weappCodeStatusQ = new WxWeappCodeStatus(); weappCodeStatusQ.setAppId(appId); - return weappCodeStatusMapper.selectOne(weappCodeStatusQ); + return weappCodeStatusMapper.selectOne(new QueryWrapper<>(weappCodeStatusQ)); } @Override public void saveStatus(WxWeappCodeStatus record) { logger.info("CODE-COMMIT: " + record.toString()); - weappCodeStatusMapper.insertSelective(record); + weappCodeStatusMapper.insert(record); } @Override @@ -66,7 +67,7 @@ public class WxWeappCodeStatusServiceImpl implements WxWeappCodeStatusService { @Override public void deleteById(Long id) { - weappCodeStatusMapper.deleteByPrimaryKey(id); + weappCodeStatusMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappExtSetServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappExtSetServiceImpl.java index 7e166c3..c295636 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappExtSetServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappExtSetServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxAppinfo; @@ -36,12 +37,12 @@ public class WxWeappExtSetServiceImpl implements WxWeappExtSetService { @Override public WxWeappExtSet getById(Long id) { - return wxWeappExtSetMapper.selectByPrimaryKey(id); + return wxWeappExtSetMapper.selectById(id); } @Override public WxWeappExtSet getByObj(WxWeappExtSet record) { - return wxWeappExtSetMapper.selectOne(record); + return wxWeappExtSetMapper.selectOne(new QueryWrapper<>(record)); } @Override @@ -55,7 +56,7 @@ public class WxWeappExtSetServiceImpl implements WxWeappExtSetService { record.setType(appinfo.getType()); WxWeappExtSet q = new WxWeappExtSet(); q.setId(appinfo.getId()); - int count = wxWeappExtSetMapper.selectCount(q); + int count = wxWeappExtSetMapper.selectCount(new QueryWrapper<>(q)); if (count > 0) { isUpdate = true; } @@ -66,19 +67,19 @@ public class WxWeappExtSetServiceImpl implements WxWeappExtSetService { record.setCreateDate(curDate); record.setUpdateDate(curDate); if (!isUpdate) { - wxWeappExtSetMapper.insertSelective(record); + wxWeappExtSetMapper.insert(record); } else { - wxWeappExtSetMapper.updateByPrimaryKeySelective(record); + wxWeappExtSetMapper.updateById(record); } } else { record.setUpdateDate(curDate); - wxWeappExtSetMapper.updateByPrimaryKeySelective(record); + wxWeappExtSetMapper.updateById(record); } } @Override public void deleteById(Long id) { - wxWeappExtSetMapper.deleteByPrimaryKey(id); + wxWeappExtSetMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappReleaseStatusServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappReleaseStatusServiceImpl.java index 663bf83..93f11bd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappReleaseStatusServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappReleaseStatusServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxAuthorizerInfo; @@ -47,21 +48,21 @@ public class WxWeappReleaseStatusServiceImpl implements WxWeappReleaseStatusServ @Override public WxWeappReleaseStatus getById(Long id) { - return weappReleaseStatusMapper.selectByPrimaryKey(id); + return weappReleaseStatusMapper.selectById(id); } @Override public WxWeappReleaseStatus getByAppId(String appId) { WxWeappReleaseStatus weappCodeStatusQ = new WxWeappReleaseStatus(); weappCodeStatusQ.setAppId(appId); - return weappReleaseStatusMapper.selectOne(weappCodeStatusQ); + return weappReleaseStatusMapper.selectOne(new QueryWrapper<>(weappCodeStatusQ)); } @Override public void saveStatus(WxWeappReleaseStatus record) { Date curDate = new Date(); logger.info("RELEASE: " + record.toString()); - weappReleaseStatusMapper.insertSelective(record); + weappReleaseStatusMapper.insert(record); // 更新 小程序 状态 if(record.getReleaseStatus().equals(EnumWeappReleaseStatus.SUCCESS.getCode())) { // 发布成功 WxAuthorizerInfo updateInfo = new WxAuthorizerInfo(); @@ -93,7 +94,7 @@ public class WxWeappReleaseStatusServiceImpl implements WxWeappReleaseStatusServ try { WxAuthorizerInfo appQ = new WxAuthorizerInfo(); appQ.setAuthorizerAppid(record.getAppId()); - WxAuthorizerInfo authorizerInfo = authorizerInfoMapper.selectOne(appQ); + WxAuthorizerInfo authorizerInfo = authorizerInfoMapper.selectOne(new QueryWrapper<>(appQ)); if(authorizerInfo != null) { record.setUserVersion(authorizerInfo.getCurrentVersion()); record.setVersionDesc(authorizerInfo.getCurrentDesc()); @@ -108,7 +109,7 @@ public class WxWeappReleaseStatusServiceImpl implements WxWeappReleaseStatusServ @Override public void deleteById(Long id) { - weappReleaseStatusMapper.deleteByPrimaryKey(id); + weappReleaseStatusMapper.deleteById(id); } diff --git a/mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java b/mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java index 1fa0e51..d5f36fc 100644 --- a/mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java +++ b/mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java @@ -1,5 +1,6 @@ package com.iformall.service.wechat; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.common.FmHttpClientBuilder; import com.iformall.domain.po.WxAuthorizerInfo; import com.iformall.domain.po.WxComponentVerifyTicket; @@ -90,7 +91,7 @@ public class FmOpenInRedisDBConfigStorage extends WxOpenInMemoryConfigStorage { WxComponentVerifyTicket wxComponentVerifyTicket = new WxComponentVerifyTicket(); wxComponentVerifyTicket.setComponentAppid(getComponentAppId()); try { - wxComponentVerifyTicket = wxComponentVerifyTicketMapper.selectOne(wxComponentVerifyTicket); + wxComponentVerifyTicket = wxComponentVerifyTicketMapper.selectOne(new QueryWrapper<>(wxComponentVerifyTicket)); if(wxComponentVerifyTicket != null) { ticket = wxComponentVerifyTicket.getComponentVerifyTicket(); } diff --git a/mallinkService/src/main/java/com/iformall/utils/Constant.java b/mallinkService/src/main/java/com/iformall/utils/Constant.java index e6b5ac8..a729490 100644 --- a/mallinkService/src/main/java/com/iformall/utils/Constant.java +++ b/mallinkService/src/main/java/com/iformall/utils/Constant.java @@ -8,6 +8,9 @@ public class Constant { public static final int SYS_MENU_MAX = 2000; // 系统菜单最大值 + public static final String C = "C"; + public static final String B = "B"; + // 1小时过期, public final static int H_EXPIRE = 3600000; diff --git a/mallinkService/src/main/java/com/iformall/utils/OpenConstant.java b/mallinkService/src/main/java/com/iformall/utils/OpenConstant.java new file mode 100644 index 0000000..9040fdf --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/utils/OpenConstant.java @@ -0,0 +1,48 @@ +package com.iformall.utils; + +public class OpenConstant { + + public static final String EXT = "ext"; + public static final String ATTR = "attr"; + public static final String EXT_APPID = "extAppid"; + public static final String WE_APPID = "weappId"; + public static final String NAME = "name"; + public static final String TYPE = "type"; + public static final String VERSION = "version"; + public static final String TEMPLATE_ID = "templateId"; + + public static final String APPS = "apps"; + + public static final String APP_VERSION = "appVersion"; + public static final String USER_VERSION = "userVersion"; + public static final String USER_DESC = "userDesc"; + + public static final String ID = "id"; + public static final String KEY_ID_LIST = "keyword_id_list"; + public static final String CUSTOM_PARAM = "custom_param"; + + public static final String IF_HAVE_CAR_MODULE = "ifHaveCarModular"; + public static final String IF_STORE_APP = "ifStoreApp"; + + + public static final String ERRCODE = "errcode"; + public static final Integer SUCC = 0; + + public static final String VERIFY_SUCC = "verify_success"; + public static final String VERIFY_FAIL = "verify_fail"; + public static final String SET = "set"; + public static final String URL = "url"; + public static final String REQ_DOMAIN = "requestdomain"; + public static final String WS_DOMAIN = "wsrequestdomain"; + public static final String UPLOAD_DOMAIN = "uploaddomain"; + public static final String DOWNLOAD_DOMAIN = "downloaddomain"; + + public static final String WEB = "web"; + public static final String WEB_DOMAIN = "webviewdomain"; + + + public static final String ERR_CODE_APP_IS_RELEASED = "85052"; + public static final Integer ERR_APP_IS_RELEASED = 85052; + + +} diff --git a/mallinkService/src/main/resources/mapper/MallPermissionMapper.xml b/mallinkService/src/main/resources/mapper/MallPermissionMapper.xml index f94081d..88b85f3 100644 --- a/mallinkService/src/main/resources/mapper/MallPermissionMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallPermissionMapper.xml @@ -4,50 +4,46 @@ - - + + + + + - `id`,`name`,`available`,`parent_id`,`parent_ids`,`permission`,`resource_type`,`url`,`sort` + `id`,`name`,`parent_id`,`available`,`permission`,`resource_type`,`module_color`,`module_color_num`,`url`,`icon`,`sort` - where 1 = 1 and `id` = #{id} - - and `name` like concat('%', #{name},'%') - + and `name` = #{name} - and `name` like concat('%', #{nameLike},'%') - - - and `available` like concat('%', #{available},'%') + + and `name` like concat('%', #{nameLike},'%') and `parent_id` = #{parentId} - - - and `parent_ids` like concat('%', #{parentIds},'%') - + + and `available` = #{available} - and `permission` like concat('%', #{permission},'%') + and `permission` = #{permission} @@ -58,18 +54,19 @@ - and `resource_type` like concat('%', #{resourceType},'%') - + and `resource_type` = #{resourceType} and `url` like concat('%', #{url},'%') + + + and `icon` = #{icon} and `sort` = #{sort} - and `sort` >= #{sortFrom} and #{sortTo} >= `sort` @@ -93,5 +90,18 @@ + + + diff --git a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml index edfcdaa..8df9420 100644 --- a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml @@ -115,7 +115,7 @@ - select from mall_user_info diff --git a/mlWechatOpen/pom.xml b/mlWechatOpen/pom.xml index 57c4b4e..b580832 100644 --- a/mlWechatOpen/pom.xml +++ b/mlWechatOpen/pom.xml @@ -21,6 +21,7 @@ mallinkService 1.0 + com.google.zxing core @@ -48,6 +49,7 @@ ch.qos.logback, com.alibaba, com.amazonaws, + com.baomidou, com.mchange, com.fasterxml.jackson.core, com.fasterxml.jackson.dataformat, @@ -98,6 +100,8 @@ javax.servlet, javax.validation, javax.xml.bind, + javax.xml.soap, + javax.xml.ws, joda-time, junit, mysql, @@ -135,6 +139,8 @@ org.jboss.xnio, org.jdom, org.jodd, + org.jvnet.mimepull, + org.jvnet.staxex, org.mapstruct, org.mockito, org.mybatis, @@ -143,6 +149,7 @@ org.ow2.asm, org.projectlombok, org.quartz-scheduler, + org.reactivestreams, org.reflections, org.rocketmq.spring.boot, org.slf4j, diff --git a/mlWechatOpen/src/main/java/com/iformall/WechatOpenApplication.java b/mlWechatOpen/src/main/java/com/iformall/WechatOpenApplication.java index c56bdde..e371a1e 100644 --- a/mlWechatOpen/src/main/java/com/iformall/WechatOpenApplication.java +++ b/mlWechatOpen/src/main/java/com/iformall/WechatOpenApplication.java @@ -1,20 +1,19 @@ package com.iformall; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; -import io.swagger.models.auth.In; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; import springfox.documentation.swagger2.annotations.EnableSwagger2; -import tk.mybatis.spring.annotation.MapperScan; /** * @author stormeye * @date 2019-01-14 */ @SpringBootApplication -@MapperScan(basePackages = {"com.iformall.mapper"}) +@MapperScan("com.iformall.mapper") @EnableSwagger2 @EnableEncryptableProperties public class WechatOpenApplication { diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappSetController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappSetController.java index 583a48c..5df98e3 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappSetController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappSetController.java @@ -6,6 +6,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxAuthorizerInfo; +import com.iformall.enums.EnumEnableType; import com.iformall.enums.EnumWxAuthorizationStatus; import com.iformall.service.WxAuthorizerInfoService; import com.iformall.service.wechat.FmOpenService; @@ -107,13 +108,13 @@ public class WechatWeappSetController { logger.info(openRet.toString()); if(openRet.isSuccess()) { logger.info("设置服务器域名成功"); - authorizerInfo.setDomainStatus(0); + authorizerInfo.setDomainStatus(EnumEnableType.SUCC.getCode()); authorizerInfo.setDomainTime(new Date()); authorizerInfo.setUpdateTime(new Date()); } else { logger.info("设置服务器域名成功"); - authorizerInfo.setDomainStatus(1); + authorizerInfo.setDomainStatus(EnumEnableType.FAIL.getCode()); authorizerInfo.setDomainTime(new Date()); authorizerInfo.setUpdateTime(new Date()); } @@ -146,12 +147,12 @@ public class WechatWeappSetController { JSONObject webRetObj = JSON.parseObject(openRet); if(webRetObj.getInteger("errcode").equals(0)) { logger.info("设置服务器业务域名成功"); - authorizerInfo.setWebdomainStatus(0); + authorizerInfo.setWebdomainStatus(EnumEnableType.SUCC.getCode()); authorizerInfo.setWebdomainTime(new Date()); authorizerInfo.setUpdateTime(new Date()); } else { logger.info("设置服务器业务域名失败"); - authorizerInfo.setWebdomainStatus(1); + authorizerInfo.setWebdomainStatus(EnumEnableType.FAIL.getCode()); authorizerInfo.setWebdomainTime(new Date()); authorizerInfo.setUpdateTime(new Date()); } diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java index 46c15df..4fac15e 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java @@ -11,6 +11,7 @@ import com.iformall.domain.po.WxWeappExtSet; import com.iformall.enums.EnumAppType; import com.iformall.service.WxAppinfoService; import com.iformall.service.WxWeappExtSetService; +import com.iformall.utils.OpenConstant; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -89,11 +90,11 @@ public class WxWeappExtSetController extends BaseController { if(obj == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - JSONObject extObj = obj.getJSONObject("ext"); + JSONObject extObj = obj.getJSONObject(OpenConstant.EXT); if(extObj == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - JSONObject attrObj = extObj.getJSONObject("attr"); + JSONObject attrObj = extObj.getJSONObject(OpenConstant.ATTR); if(attrObj == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } @@ -105,19 +106,20 @@ public class WxWeappExtSetController extends BaseController { if(appinfo == null) { continue; } - obj.put("extAppid", info.getAppId()); + obj.put(OpenConstant.EXT_APPID, info.getAppId()); if(weappExtSet.getType().equals(EnumAppType.C.getCode())) { if (attrObj != null) { - attrObj.put("ifHaveCarModular", String.valueOf(info.getCarSupport())); + attrObj.put(OpenConstant.IF_HAVE_CAR_MODULE, String.valueOf(info.getCarSupport())); + attrObj.put(OpenConstant.IF_STORE_APP, String.valueOf(info.getStoreApp())); } } if(extObj != null) { - extObj.put("weappId", info.getAppId()); - extObj.put("name", appinfo.getName()); + extObj.put(OpenConstant.WE_APPID, info.getAppId()); + extObj.put(OpenConstant.NAME, appinfo.getName()); if(weappExtSet.getType().equals(EnumAppType.C.getCode())) { - extObj.put("attr", attrObj); + extObj.put(OpenConstant.ATTR, attrObj); } - obj.put("ext", extObj); + obj.put(OpenConstant.EXT, extObj); } WxWeappExtSet newInfo = new WxWeappExtSet(); diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java index d8f92da..9a834fd 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java @@ -21,6 +21,8 @@ import com.iformall.domain.vo.WxWeappReleaseStatusVo; import com.iformall.enums.*; import com.iformall.service.*; import com.iformall.service.wechat.FmOpenService; +import com.iformall.utils.Constant; +import com.iformall.utils.OpenConstant; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -121,8 +123,8 @@ public class WxWeappInfoController extends BaseController { @PostMapping("batchBasicSet") public ResultData batchSet(@RequestBody Map params) { logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchBasicSet"); - String appsStr = params.get("apps"); - String typeStr = params.get("type"); + String appsStr = params.get(OpenConstant.APPS); + String typeStr = params.get(OpenConstant.TYPE); if(StringUtils.isBlank(typeStr)) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "type参数不能为空"); @@ -236,9 +238,9 @@ public class WxWeappInfoController extends BaseController { return; } logger.info(msgObj.toJSONString()); - String id = msgObj.getString("id"); - JSONArray keyidlist = msgObj.getJSONArray("keyword_id_list"); - String customParam = msgObj.getString("custom_param"); + String id = msgObj.getString(OpenConstant.ID); + JSONArray keyidlist = msgObj.getJSONArray(OpenConstant.KEY_ID_LIST); + String customParam = msgObj.getString(OpenConstant.CUSTOM_PARAM); logger.info(customParam); JSONObject customParamObj = JSON.parseObject(customParam); List keyArr1 = getIdList(keyidlist); @@ -264,12 +266,12 @@ public class WxWeappInfoController extends BaseController { private void setBasicTemplateMsgVerifySuccess(JSONObject templeObj, WxAppinfo appinfo, WxMaService maService) throws WxErrorException { // 核销成功消息 - setBasicTemplateMsg(templeObj, appinfo, maService, EnumTemplateType.VERIFY_SUCCESS.getCode(), "verify_success"); + setBasicTemplateMsg(templeObj, appinfo, maService, EnumTemplateType.VERIFY_SUCCESS.getCode(), OpenConstant.VERIFY_SUCC); } private void setBasicTemplateMsgVerifyFail(JSONObject templeObj, WxAppinfo appinfo, WxMaService maService) throws WxErrorException { // 核销失败消息 - setBasicTemplateMsg(templeObj, appinfo, maService, EnumTemplateType.VERIFY_FAIL.getCode(), "verify_fail"); + setBasicTemplateMsg(templeObj, appinfo, maService, EnumTemplateType.VERIFY_FAIL.getCode(), OpenConstant.VERIFY_FAIL); } private void setBasicTemplateMsgPressSuccess(JSONObject templeObj, WxAppinfo appinfo, WxMaService maService) throws WxErrorException { @@ -282,12 +284,12 @@ public class WxWeappInfoController extends BaseController { private void setDomainUrl(JSONObject domainObj, WxAuthorizerInfo authorizerInfo, WxOpenMaService openMaService) throws WxErrorException { // 服务器域名 - String action = "set"; - JSONObject urlObj = domainObj.getJSONObject("url"); - List requestDomain = getUrlList(urlObj.getJSONArray("requestdomain")); - List wsrequestDomain = getUrlList(urlObj.getJSONArray("wsrequestdomain")); - List uploadDomain = getUrlList(urlObj.getJSONArray("uploaddomain")); - List downloadDomain = getUrlList(urlObj.getJSONArray("downloaddomain")); + String action = OpenConstant.SET; + JSONObject urlObj = domainObj.getJSONObject(OpenConstant.URL); + List requestDomain = getUrlList(urlObj.getJSONArray(OpenConstant.REQ_DOMAIN)); + List wsrequestDomain = getUrlList(urlObj.getJSONArray(OpenConstant.WS_DOMAIN)); + List uploadDomain = getUrlList(urlObj.getJSONArray(OpenConstant.UPLOAD_DOMAIN)); + List downloadDomain = getUrlList(urlObj.getJSONArray(OpenConstant.DOWNLOAD_DOMAIN)); logger.info(downloadDomain.toString()); WxOpenMaDomainResult openRet = openMaService.modifyDomain(action, requestDomain, wsrequestDomain, @@ -295,31 +297,31 @@ public class WxWeappInfoController extends BaseController { logger.info(openRet.toString()); if(openRet.isSuccess()) { logger.info("设置服务器域名成功"); - authorizerInfo.setDomainStatus(0); + authorizerInfo.setDomainStatus(EnumEnableType.SUCC.getCode()); authorizerInfo.setDomainTime(new Date()); authorizerInfo.setUpdateTime(new Date()); } else { logger.info("设置服务器域名成功"); - authorizerInfo.setDomainStatus(1); + authorizerInfo.setDomainStatus(EnumEnableType.FAIL.getCode()); authorizerInfo.setDomainTime(new Date()); authorizerInfo.setUpdateTime(new Date()); } authorizerInfoService.updateDomainUrl(authorizerInfo); // 业务域名 - JSONObject webObj = domainObj.getJSONObject("web"); - List urlList = getUrlList(webObj.getJSONArray("webviewdomain")); + JSONObject webObj = domainObj.getJSONObject(OpenConstant.WEB); + List urlList = getUrlList(webObj.getJSONArray(OpenConstant.WEB_DOMAIN)); String openRet1 = openMaService.setWebViewDomain(action, urlList); logger.info(openRet1); JSONObject webRetObj = JSON.parseObject(openRet1); - if(webRetObj.getInteger("errcode").equals(0)) { + if(webRetObj.getInteger(OpenConstant.ERRCODE).equals(0)) { logger.info("设置服务器业务域名成功"); - authorizerInfo.setWebdomainStatus(0); + authorizerInfo.setWebdomainStatus(EnumEnableType.SUCC.getCode()); authorizerInfo.setWebdomainTime(new Date()); authorizerInfo.setUpdateTime(new Date()); } else { logger.info("设置服务器业务域名失败"); - authorizerInfo.setWebdomainStatus(1); + authorizerInfo.setWebdomainStatus(EnumEnableType.FAIL.getCode()); authorizerInfo.setWebdomainTime(new Date()); authorizerInfo.setUpdateTime(new Date()); } @@ -331,10 +333,10 @@ public class WxWeappInfoController extends BaseController { String versionRet = openMaService.setSupportVersion(weappBasicSet.getVersion()); logger.info(versionRet); JSONObject verObj = JSON.parseObject(versionRet); - if(verObj.getInteger("errcode").equals(0)) { - authorizerInfo.setBaseStatus(0); + if(verObj.getInteger(OpenConstant.ERRCODE).equals(OpenConstant.SUCC)) { + authorizerInfo.setBaseStatus(EnumEnableType.SUCC.getCode()); } else { - authorizerInfo.setBaseStatus(1); + authorizerInfo.setBaseStatus(EnumEnableType.FAIL.getCode()); } authorizerInfo.setBaseTime(new Date()); authorizerInfo.setUpdateTime(new Date()); @@ -361,11 +363,11 @@ public class WxWeappInfoController extends BaseController { @PostMapping("batchCodeCommit") public ResultData batchCodeCommit(@RequestBody Map params) { logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchExtSet"); - String appsStr = params.get("apps"); - String templateIdStr = params.get("templateId"); - String typeStr = params.get("type"); - String userVersion = params.get("userVersion"); - String userDesc = params.get("userDesc"); + String appsStr = params.get(OpenConstant.APPS); + String templateIdStr = params.get(OpenConstant.TEMPLATE_ID); + String typeStr = params.get(OpenConstant.TYPE); + String userVersion = params.get(OpenConstant.USER_VERSION); + String userDesc = params.get(OpenConstant.USER_DESC); Integer type = null; Long templateId = null; @@ -436,9 +438,9 @@ public class WxWeappInfoController extends BaseController { int iAppType = 0; String appTypeStr = userVersion.substring(0, 1); - if(appTypeStr.equalsIgnoreCase("C")) + if(appTypeStr.equalsIgnoreCase(Constant.C)) iAppType = EnumAppType.C.getCode(); - else if(appTypeStr.equalsIgnoreCase("B")) + else if(appTypeStr.equalsIgnoreCase(Constant.B)) iAppType = EnumAppType.B.getCode(); if(!appinfo.getType().equals(iAppType)) { @@ -466,9 +468,9 @@ public class WxWeappInfoController extends BaseController { @PostMapping("batchCodeAudit") public ResultData batchCodeAudit(@RequestBody Map params) { logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchExtSet"); - String appsStr = params.get("apps"); - String typeStr = params.get("type"); - String userVersion = params.get("userVersion"); + String appsStr = params.get(OpenConstant.APPS); + String typeStr = params.get(OpenConstant.TYPE); + String userVersion = params.get(OpenConstant.USER_VERSION); Integer type = null; try { type = Integer.parseInt(typeStr); @@ -560,8 +562,8 @@ public class WxWeappInfoController extends BaseController { WxMaOpenCommitExtInfo extInfo = gson.fromJson(extSet.getExtJson(), new TypeToken() {}.getType()); logger.info("OLD: " + extInfo.toString()); // 自动修改提交的版本 - if(extInfo.getExtMap().containsKey("appVersion")) { - extInfo.getExtMap().put("appVersion", userVersion); + if(extInfo.getExtMap().containsKey(OpenConstant.APP_VERSION)) { + extInfo.getExtMap().put(OpenConstant.APP_VERSION, userVersion); } logger.info("NEW: " + extInfo.toString()); WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appinfo.getAppId()); @@ -677,8 +679,8 @@ public class WxWeappInfoController extends BaseController { public ResultData batchAuditQuery(@RequestBody Map params) { logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchAuditQuery"); Gson gson = new GsonBuilder().create(); - String typeStr = params.get("type"); - String version = params.get("version"); + String typeStr = params.get(OpenConstant.TYPE); + String version = params.get(OpenConstant.VERSION); Integer type = null; try { type = Integer.parseInt(typeStr); @@ -736,8 +738,8 @@ public class WxWeappInfoController extends BaseController { public ResultData batchAuditCancel(@RequestBody Map params) { logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchAuditCancel"); Gson gson = new GsonBuilder().create(); - String typeStr = params.get("type"); - String version = params.get("version"); + String typeStr = params.get(OpenConstant.TYPE); + String version = params.get(OpenConstant.VERSION); Integer type = null; try { type = Integer.parseInt(typeStr); @@ -777,8 +779,8 @@ public class WxWeappInfoController extends BaseController { public ResultData batchRelease(@RequestBody Map params) { logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchRelease"); Gson gson = new GsonBuilder().create(); - String typeStr = params.get("type"); - String version = params.get("version"); + String typeStr = params.get(OpenConstant.TYPE); + String version = params.get(OpenConstant.VERSION); Integer type = null; try { type = Integer.parseInt(typeStr); @@ -827,7 +829,7 @@ public class WxWeappInfoController extends BaseController { if(releaseSuccess) { releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.SUCCESS.getCode()); } else { - if(openRet.getErrcode().equals("85052")) { + if(openRet.getErrcode().equals(OpenConstant.ERR_CODE_APP_IS_RELEASED)) { releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.SUCCESS.getCode()); } else { releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.FAIL.getCode()); @@ -842,7 +844,7 @@ public class WxWeappInfoController extends BaseController { } } catch (WxErrorException e) { logger.error(e.getMessage()); - if(e.getError().getErrorCode() == 85052) { + if(e.getError().getErrorCode() == OpenConstant.ERR_APP_IS_RELEASED) { releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.SUCCESS.getCode()); } else { releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.FAIL.getCode()); diff --git a/mlWechatOpen/src/main/java/com/iformall/schedule/UserUnionIdSchedule.java b/mlWechatOpen/src/main/java/com/iformall/schedule/UserUnionIdSchedule.java index 5f5abfb..a65be8a 100644 --- a/mlWechatOpen/src/main/java/com/iformall/schedule/UserUnionIdSchedule.java +++ b/mlWechatOpen/src/main/java/com/iformall/schedule/UserUnionIdSchedule.java @@ -65,7 +65,7 @@ public class UserUnionIdSchedule { String openRet = openMaService.getPaidUnionId(payOrderVo.getOpenId(), payOrderVo.getTransactionId(), null, null); logger.info(openRet); } else { - WxPayAccount payAccount = payAccountMapper.selectByPrimaryKey(payOrderVo.getPayId()); + WxPayAccount payAccount = payAccountMapper.selectById(payOrderVo.getPayId()); if(payAccount != null) { String openRet = openMaService.getPaidUnionId(payOrderVo.getOpenId(), null, payAccount.getMchId(), payOrderVo.getPayOrderNo()); logger.info(openRet); diff --git a/mlWechatOpen/src/main/resources/application.yml b/mlWechatOpen/src/main/resources/application.yml index 7ab5626..69555a4 100644 --- a/mlWechatOpen/src/main/resources/application.yml +++ b/mlWechatOpen/src/main/resources/application.yml @@ -22,21 +22,6 @@ spring: redis: time-to-live: 60000ms #很重要,缓存的有效时间,以便缓存的过期(单位为毫秒) - - -# @{link} https://github.com/abel533 -#Mybatis -mybatis: - type-aliases-package: com.iformall.domain.po - mapper-locations: classpath:mapper/*Mapper.xml - configuration: - map-underscore-to-camel-case: true - cache-enabled: true - lazy-loading-enabled: true - use-generated-keys: true - default-fetch-size: 100 - default-statement-timeout: 10 - #PageHelper pagehelper: helperDialect: mysql @@ -51,4 +36,17 @@ mapper: mappers: - com.iformall.common.CommonMapper +mybatis-plus: + mapper-locations: classpath:mapper/*Mapper.xml + global-config: + db-config: + id-type: id_worker + field-strategy: not_null + db-type: mysql + configuration: + jdbc-type-for-null: 'null' + cache-enabled: false + call-setters-on-nulls: true + type-aliases-package: com.iformall.domain.po + version: @project.version@ \ No newline at end of file diff --git a/pom.xml b/pom.xml index bce62b1..a5823bc 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.5.RELEASE + 2.1.8.RELEASE @@ -82,20 +82,38 @@ spring-boot-starter-mail - - org.mybatis.spring.boot - mybatis-spring-boot-starter - 1.3.2 - com.github.pagehelper pagehelper-spring-boot-starter - 1.2.7 + 1.2.10 + + + org.mybatis + mybatis + + + org.mybatis + mybatis-spring + + + - tk.mybatis - mapper-spring-boot-starter - 2.0.4 + com.baomidou + mybatis-plus-boot-starter + 3.1.0 + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 2.1.0 + + + + org.mybatis.generator + mybatis-generator-core + 1.3.7 @@ -106,7 +124,7 @@ mysql mysql-connector-java - 8.0.11 + 8.0.17 runtime @@ -148,27 +166,6 @@ druid 1.1.12 - - org.mybatis.generator - mybatis-generator-core - 1.3.7 - - - - org.quartz-scheduler - quartz - ${quartz.version} - - - com.mchange - c3p0 - - - com.zaxxer - HikariCP-java6 - - - @@ -201,29 +198,12 @@ jaxb-api 2.3.0 - - javax.persistence - persistence-api - 1.0.2 - org.projectlombok lombok 1.18.2 provided - - - - - - - - - - - - org.apache.shiro shiro-spring @@ -253,13 +233,6 @@ bcpkix-jdk15on 1.60 - - - - - - - commons-io commons-io