Просмотр исходного кода

[mybatis升级到mybatis-plus][修改]:mybatisplus+pagehelp

release^2
Stormeye Wu 6 лет назад
Родитель
Сommit
b94f7a4aea
42 измененных файлов: 383 добавлений и 479 удалений
  1. +2
    -5
      mallinkService/src/main/java/com/iformall/common/CommonMapper.java
  2. +12
    -16
      mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java
  3. +4
    -3
      mallinkService/src/main/java/com/iformall/domain/dto/WxWeappCodeAuditDto.java
  4. +18
    -4
      mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java
  5. +20
    -19
      mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java
  6. +5
    -10
      mallinkService/src/main/java/com/iformall/domain/po/MallRole.java
  7. +13
    -21
      mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java
  8. +2
    -9
      mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java
  9. +4
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java
  10. +10
    -15
      mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java
  11. +3
    -10
      mallinkService/src/main/java/com/iformall/domain/po/WxComponentVerifyTicket.java
  12. +3
    -11
      mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java
  13. +6
    -8
      mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java
  14. +3
    -11
      mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java
  15. +2
    -10
      mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java
  16. +3
    -10
      mallinkService/src/main/java/com/iformall/domain/po/WxWeappBasicSet.java
  17. +2
    -9
      mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java
  18. +3
    -9
      mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java
  19. +2
    -9
      mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java
  20. +4
    -3
      mallinkService/src/main/java/com/iformall/mapper/MallPermissionMapper.java
  21. +19
    -1
      mallinkService/src/main/java/com/iformall/mapper/MallUserInfoMapper.java
  22. +2
    -23
      mallinkService/src/main/java/com/iformall/service/MallPermissionService.java
  23. +4
    -20
      mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java
  24. +8
    -7
      mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java
  25. +6
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java
  26. +15
    -14
      mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java
  27. +7
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java
  28. +6
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxComponentVerifyTicketServiceImpl.java
  29. +6
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java
  30. +6
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxWeappAuditStatusServiceImpl.java
  31. +6
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxWeappBasicSetServiceImpl.java
  32. +5
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java
  33. +8
    -7
      mallinkService/src/main/java/com/iformall/service/impl/WxWeappExtSetServiceImpl.java
  34. +6
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxWeappReleaseStatusServiceImpl.java
  35. +2
    -1
      mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java
  36. +103
    -93
      mallinkService/src/main/resources/mapper/MallPermissionMapper.xml
  37. +1
    -1
      mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml
  38. +3
    -0
      mlWechatOpen/pom.xml
  39. +2
    -3
      mlWechatOpen/src/main/java/com/iformall/WechatOpenApplication.java
  40. +1
    -1
      mlWechatOpen/src/main/java/com/iformall/schedule/UserUnionIdSchedule.java
  41. +13
    -15
      mlWechatOpen/src/main/resources/application.yml
  42. +33
    -54
      pom.xml

+ 2
- 5
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<T, ID extends Serializable> extends BaseMapper<T>, IdsMapper<T>, InsertListMapper<T>, Marker {
public interface CommonMapper<T, ID extends Serializable> extends BaseMapper<T> {
}

+ 12
- 16
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;
}

+ 4
- 3
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;



+ 18
- 4
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<Long> 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)){


+ 20
- 19
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<Long> 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<String> 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;



+ 5
- 10
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<Long> 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;



+ 13
- 21
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<Long> 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<MallRole> role;
//该用户包含的所有权限
@Transient
@TableField(exist = false)
private List<MallPermission> permission;
//拥有的菜单权限
@Transient
@TableField(exist = false)
private String menus;

@Transient
@TableField(exist = false)
private String captcha;

@io.swagger.annotations.ApiModelProperty(value = "邮箱", name = "email")


+ 2
- 9
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<Long> ids;

@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;


+ 4
- 6
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<Long> ids;

@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")


+ 10
- 15
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<Long> 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<String> 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;



+ 3
- 10
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<Long> ids;

@io.swagger.annotations.ApiModelProperty(value="微信第三方componentAppid",name="componentAppid")
private String componentAppid;


+ 3
- 11
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<Long> ids;

@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;


+ 6
- 8
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<Long> ids;

@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")


+ 3
- 11
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<Long> ids;

@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;


+ 2
- 10
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<Long> ids;

@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId")


+ 3
- 10
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<Long> ids;

@io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type")
private Integer type;


+ 2
- 9
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<Long> ids;

@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId")


+ 3
- 9
mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java Просмотреть файл

@@ -1,25 +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;

@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<Long> ids;

@io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId")
private String appId;


+ 2
- 9
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<Long> ids;

@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId")


+ 4
- 3
mallinkService/src/main/java/com/iformall/mapper/MallPermissionMapper.java Просмотреть файл

@@ -9,9 +9,10 @@ import java.util.List;
public interface MallPermissionMapper extends CommonMapper<MallPermission, String> {

List<MallPermission> findList(MallPermission mallPermission);
List<MallPermission> findPermissionByRoleId(Long roleId);
List<MallPermission> findPermissionByRoleIds(@Param("roleIds") List<Long> roleIds);

List<MallPermission> queryListParentId(Long parentId);

List<MallPermission> queryNotButtonList();



+ 19
- 1
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, String> {

MallUserInfo selectById(@Param("id") Long id);
MallUserInfo getById(@Param("id") Long id);

List<MallUserInfo> findList(MallUserInfo mallUserInfo);

@@ -24,6 +25,8 @@ public interface MallUserInfoMapper extends CommonMapper<MallUserInfo, String> {

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<MallUserInfo, String> {

List<MallUserInfoVo> selectUsersByWebOpenId(@Param("webOpenId") String webOpenId);

/**
* 查询用户的所有菜单
* @param userId 用户ID
*/
List<MallPermission> queryAllMenu(Long userId);
/**
* 查询用户的所有权限
* @param userId 用户ID
*/
List<String> queryAllPerms(Long userId);

/**
* 查询用户的所有菜单ID
*/
List<Long> queryAllMenuId(Long userId);
}

+ 2
- 23
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<MallPermission> 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<MallPermission> findPermissionByRoleId(Long roleId);

/**
* 根据ruleId权限组查找相应权限
* @param roleIds
* @return
*/
List<MallPermission> findPermissionByRoleIds(List<Long> roleIds);

}

+ 4
- 20
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<MallPermission> findPermissionByRoleId(Long roleId) {
return mallPermissionMapper.findPermissionByRoleId(roleId);
}

@Override
public List<MallPermission> findPermissionByRoleIds(List<Long> roleIds) {
return mallPermissionMapper.findPermissionByRoleIds(roleIds);
}
}

+ 8
- 7
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


+ 6
- 5
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<WxAppinfo> appList = wxAppinfoMapper.select(appinfoQ);
List<WxAppinfo> 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);
}
}

+ 15
- 14
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


+ 7
- 6
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


+ 6
- 5
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);
}


+ 6
- 5
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);
}


+ 6
- 5
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);
}


+ 6
- 6
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);
}


+ 5
- 4
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);
}


+ 8
- 7
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);
}


+ 6
- 5
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);
}


+ 2
- 1
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();
}


+ 103
- 93
mallinkService/src/main/resources/mapper/MallPermissionMapper.xml Просмотреть файл

@@ -1,99 +1,109 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.iformall.mapper.MallPermissionMapper">
<resultMap id="BaseResultMap" type="com.iformall.domain.po.MallPermission">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="available" jdbcType="VARCHAR" property="available" />
<result column="parent_id" jdbcType="BIGINT" property="parentId" />
<result column="parent_ids" jdbcType="VARCHAR" property="parentIds" />
<result column="permission" jdbcType="VARCHAR" property="permission" />
<result column="resource_type" jdbcType="VARCHAR" property="resourceType" />
<result column="url" jdbcType="VARCHAR" property="url" />
<result column="sort" jdbcType="INTEGER" property="sort" />
</resultMap>
<sql id="allColumns">
`id`,`name`,`available`,`parent_id`,`parent_ids`,`permission`,`resource_type`,`url`,`sort`
</sql>
<resultMap id="BaseResultMap" type="com.iformall.domain.po.MallPermission">
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="parent_id" jdbcType="BIGINT" property="parentId"/>
<result column="available" jdbcType="VARCHAR" property="available"/>
<result column="permission" jdbcType="VARCHAR" property="permission"/>
<result column="resource_type" jdbcType="VARCHAR" property="resourceType"/>
<result column="module_color" jdbcType="VARCHAR" property="moduleColor"/>
<result column="module_color_num" jdbcType="VARCHAR" property="moduleColorNum"/>
<result column="url" jdbcType="VARCHAR" property="url"/>
<result column="icon" jdbcType="VARCHAR" property="icon"/>
<result column="version_type" jdbcType="VARCHAR" property="versionType"/>
<result column="sort" jdbcType="INTEGER" property="sort"/>
</resultMap>

<sql id="dynamicWhereConditions">
where 1 = 1
<if test=" null != id ">
and `id` = #{id}
</if>

<if test=" null != name ">
and `name` like concat('%', #{name},'%')
</if>
<if test=" null != nameLike and '' != nameLike "> and `name` like concat('%', #{nameLike},'%')</if>
<if test=" null != available ">
and `available` like concat('%', #{available},'%')
</if>
<if test=" null != parentId ">
and `parent_id` = #{parentId}
</if>
<if test=" null != parentIds ">
and `parent_ids` like concat('%', #{parentIds},'%')
</if>
<if test=" null != permission ">
and `permission` like concat('%', #{permission},'%')
</if>
<if test=" null != permissions ">
and `permission` in
<foreach collection="permissions" item="item_permission" open="(" close=")" separator=",">
#{item_permission}
</foreach>
</if>
<if test=" null != resourceType ">
and `resource_type` like concat('%', #{resourceType},'%')
</if>
<if test=" null != url ">
and `url` like concat('%', #{url},'%')
</if>
<if test=" null != sort ">
and `sort` = #{sort}
</if>
<if test=" null != sortFrom "> and `sort` >= #{sortFrom} </if>
<if test=" null != sortTo "> and #{sortTo} >= `sort` </if>
<if test=" null != sortGte "> and `sort` >= #{sortGte} </if>
<if test=" null != sortGt "> and `sort` > #{sortGt} </if>
<if test=" null != sortLte "> and #{sortLte} >= `sort` </if>
<if test=" null != sortLt "> and #{sortLt} > `sort` </if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</if>
<if test=" null != sortColumns"> order by ${sortColumns} </if>
<sql id="allColumns">
`id`,`name`,`parent_id`,`available`,`permission`,`resource_type`,`module_color`,`module_color_num`,`url`,`icon`,`sort`
</sql>
<select id="findList" parameterType="com.iformall.domain.po.MallPermission" resultMap="BaseResultMap">
select <include refid="allColumns" /> from mall_permission
<include refid="dynamicWhereConditions" />
</select>

<sql id="dynamicWhereConditions">
where 1 = 1

<if test=" null != id ">
and `id` = #{id}
</if>

<if test=" null != name ">
and `name` = #{name}
</if>

<if test=" null != nameLike and '' != nameLike ">
and `name` like concat('%', #{nameLike},'%')
</if>

<if test=" null != parentId ">
and `parent_id` = #{parentId}
</if>

<if test=" null != available ">
and `available` = #{available}
</if>

<if test=" null != permission ">
and `permission` = #{permission}

</if>
<if test=" null != permissions ">
and `permission` in
<foreach collection="permissions" item="item_permission" open="(" close=")" separator=",">
#{item_permission}
</foreach>
</if>

<if test=" null != resourceType ">
and `resource_type` = #{resourceType}
</if>

<if test=" null != url ">
and `url` like concat('%', #{url},'%')
</if>

<if test=" null != icon ">
and `icon` = #{icon}
</if>

<if test=" null != sort ">
and `sort` = #{sort}
</if>
<if test=" null != sortFrom ">and `sort` >= #{sortFrom}</if>
<if test=" null != sortTo ">and #{sortTo} >= `sort`</if>
<if test=" null != sortGte ">and `sort` >= #{sortGte}</if>
<if test=" null != sortGt ">and `sort` > #{sortGt}</if>
<if test=" null != sortLte ">and #{sortLte} >= `sort`</if>
<if test=" null != sortLt ">and #{sortLt} > `sort`</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</if>
<if test=" null != sortColumns">order by ${sortColumns}</if>
</sql>

<select id="findList" parameterType="com.iformall.domain.po.MallPermission" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from mall_permission
<include refid="dynamicWhereConditions"/>
</select>

<select id="queryListParentId" parameterType="long" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from mall_permission
where 1=1 and `parent_id` = #{value} and available = 'Y' order by sort asc
</select>

<select id="queryNotButtonList" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from mall_permission
where 1=1 and `resource_type` != 2 and `available` = 'Y' order by sort asc
</select>


</mapper>

+ 1
- 1
mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml Просмотреть файл

@@ -115,7 +115,7 @@
</if>
</select>

<select id="selectById" resultMap="BaseResultMap">
<select id="getById" resultMap="BaseResultMap">
select
<include refid="allSafeColumns"/>
from mall_user_info


+ 3
- 0
mlWechatOpen/pom.xml Просмотреть файл

@@ -21,6 +21,7 @@
<artifactId>mallinkService</artifactId>
<version>1.0</version>
</dependency>

<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
@@ -41,6 +42,7 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<executable>true</executable>
<!--
<layout>ZIP</layout>
<excludeGroupIds>
antlr,
@@ -159,6 +161,7 @@
xmlpull,
xpp3
</excludeGroupIds>
-->
</configuration>
</plugin>
</plugins>


+ 2
- 3
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 {


+ 1
- 1
mlWechatOpen/src/main/java/com/iformall/schedule/UserUnionIdSchedule.java Просмотреть файл

@@ -66,7 +66,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);


+ 13
- 15
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@

+ 33
- 54
pom.xml Просмотреть файл

@@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.5.RELEASE</version>
<version>2.1.8.RELEASE</version>
<relativePath/>
</parent>

@@ -82,20 +82,44 @@
<artifactId>spring-boot-starter-mail</artifactId>
</dependency>

<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.2.10</version>
<exclusions>
<exclusion>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
</exclusion>
<exclusion>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-spring</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.1.0</version>
</dependency>

<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>1.3.2</version>
<version>2.1.0</version>
</dependency>

<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.2.7</version>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>2.1.0</version>
</dependency>

<dependency>
<groupId>tk.mybatis</groupId>
<artifactId>mapper-spring-boot-starter</artifactId>
<version>2.0.4</version>
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-core</artifactId>
<version>1.3.7</version>
</dependency>

<dependency>
@@ -106,7 +130,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.11</version>
<version>8.0.17</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -148,27 +172,6 @@
<artifactId>druid</artifactId>
<version>1.1.12</version>
</dependency>
<dependency>
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-core</artifactId>
<version>1.3.7</version>
</dependency>

<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<version>${quartz.version}</version>
<exclusions>
<exclusion>
<groupId>com.mchange</groupId>
<artifactId>c3p0</artifactId>
</exclusion>
<exclusion>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP-java6</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Swagger -->
<dependency>
@@ -201,29 +204,12 @@
<artifactId>jaxb-api</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
<version>1.0.2</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.2</version>
<scope>provided</scope>
</dependency>
<!-- </dependencyManagement> -->
<!-- <dependencies> -->
<!-- <dependency> -->
<!-- <groupId>com.iformall</groupId> -->
<!-- <artifactId>base</artifactId> -->
<!-- <version>1.0</version> -->
<!-- </dependency> -->
<!-- <dependency> -->
<!-- <groupId>com.iformall</groupId> -->
<!-- <artifactId>freemarker</artifactId> -->
<!-- <version>1.0</version> -->
<!-- </dependency> -->
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring</artifactId>
@@ -253,13 +239,6 @@
<artifactId>bcpkix-jdk15on</artifactId>
<version>1.60</version>
</dependency>
<!-- <dependency> -->
<!-- <groupId>net.coobird</groupId> -->
<!-- <artifactId>thumbnailator</artifactId> -->
<!-- <version>0.4.8</version> -->
<!-- </dependency> -->

<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>


Загрузка…
Отмена
Сохранить