diff --git a/czsj-system/src/main/java/com/czsj/account/domain/CzsjMember.java b/czsj-system/src/main/java/com/czsj/account/domain/CzsjMember.java index 0dcafcc..2b89ba5 100644 --- a/czsj-system/src/main/java/com/czsj/account/domain/CzsjMember.java +++ b/czsj-system/src/main/java/com/czsj/account/domain/CzsjMember.java @@ -18,7 +18,7 @@ public class CzsjMember extends BaseEntity private static final long serialVersionUID = 1L; /** 会员ID */ - private Long uid; + private Integer uid; /** 姓名 */ @Excel(name = "姓名") @@ -46,11 +46,11 @@ public class CzsjMember extends BaseEntity /** 会员卡号 */ @Excel(name = "会员卡号") - private Long memberId; + private Integer memberId; /** 会员等级 */ @Excel(name = "会员等级") - private Long memberLevel; + private Integer memberLevel; /** 城市 */ @Excel(name = "城市") @@ -88,18 +88,18 @@ public class CzsjMember extends BaseEntity /** 创建人ID */ @Excel(name = "创建人ID") - private Long createUserId; + private Integer createUserId; /** 修改人ID */ @Excel(name = "修改人ID") - private Long updateUserId; + private Integer updateUserId; - public void setUid(Long uid) + public void setUid(Integer uid) { this.uid = uid; } - public Long getUid() + public Integer getUid() { return uid; } @@ -157,21 +157,21 @@ public class CzsjMember extends BaseEntity { return phone; } - public void setMemberId(Long memberId) + public void setMemberId(Integer memberId) { this.memberId = memberId; } - public Long getMemberId() + public Integer getMemberId() { return memberId; } - public void setMemberLevel(Long memberLevel) + public void setMemberLevel(Integer memberLevel) { this.memberLevel = memberLevel; } - public Long getMemberLevel() + public Integer getMemberLevel() { return memberLevel; } @@ -247,21 +247,21 @@ public class CzsjMember extends BaseEntity { return delFlag; } - public void setCreateUserId(Long createUserId) + public void setCreateUserId(Integer createUserId) { this.createUserId = createUserId; } - public Long getCreateUserId() + public Integer getCreateUserId() { return createUserId; } - public void setUpdateUserId(Long updateUserId) + public void setUpdateUserId(Integer updateUserId) { this.updateUserId = updateUserId; } - public Long getUpdateUserId() + public Integer getUpdateUserId() { return updateUserId; } diff --git a/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberCard.java b/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberCard.java index 108cbbf..f0a6ac3 100644 --- a/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberCard.java +++ b/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberCard.java @@ -20,7 +20,7 @@ public class CzsjMemberCard extends BaseEntity /** 会员ID */ @Excel(name = "会员ID") - private Long memberUid; + private Integer memberUid; /** 证件类型 */ @Excel(name = "证件类型") @@ -35,11 +35,11 @@ public class CzsjMemberCard extends BaseEntity /** 创建人ID */ @Excel(name = "创建人ID") - private Long createUserId; + private Integer createUserId; /** 修改人ID */ @Excel(name = "修改人ID") - private Long updateUserId; + private Integer updateUserId; public void setUid(Integer uid) { @@ -50,12 +50,12 @@ public class CzsjMemberCard extends BaseEntity { return uid; } - public void setMemberUid(Long memberUid) + public void setMemberUid(Integer memberUid) { this.memberUid = memberUid; } - public Long getMemberUid() + public Integer getMemberUid() { return memberUid; } @@ -86,21 +86,21 @@ public class CzsjMemberCard extends BaseEntity { return delFlag; } - public void setCreateUserId(Long createUserId) + public void setCreateUserId(Integer createUserId) { this.createUserId = createUserId; } - public Long getCreateUserId() + public Integer getCreateUserId() { return createUserId; } - public void setUpdateUserId(Long updateUserId) + public void setUpdateUserId(Integer updateUserId) { this.updateUserId = updateUserId; } - public Long getUpdateUserId() + public Integer getUpdateUserId() { return updateUserId; } diff --git a/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberLocus.java b/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberLocus.java index 035a879..b2a38c1 100644 --- a/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberLocus.java +++ b/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberLocus.java @@ -18,15 +18,15 @@ public class CzsjMemberLocus extends BaseEntity private static final long serialVersionUID = 1L; /** 会员轨迹ID */ - private Long uid; + private Integer uid; /** 会员ID */ @Excel(name = "会员ID") - private Long memberUid; + private Integer memberUid; /** 轨迹类型(1:信息动态;2:社交动态;3:活动规则;4:待办动态) */ @Excel(name = "轨迹类型(1:信息动态;2:社交动态;3:活动规则;4:待办动态)") - private Long trajectoryType; + private Integer trajectoryType; /** 文案内容 */ @Excel(name = "文案内容") @@ -42,36 +42,36 @@ public class CzsjMemberLocus extends BaseEntity /** 创建人ID */ @Excel(name = "创建人ID") - private Long createUserId; + private Integer createUserId; /** 修改人ID */ @Excel(name = "修改人ID") - private Long updateUserId; + private Integer updateUserId; - public void setUid(Long uid) + public void setUid(Integer uid) { this.uid = uid; } - public Long getUid() + public Integer getUid() { return uid; } - public void setMemberUid(Long memberUid) + public void setMemberUid(Integer memberUid) { this.memberUid = memberUid; } - public Long getMemberUid() + public Integer getMemberUid() { return memberUid; } - public void setTrajectoryType(Long trajectoryType) + public void setTrajectoryType(Integer trajectoryType) { this.trajectoryType = trajectoryType; } - public Long getTrajectoryType() + public Integer getTrajectoryType() { return trajectoryType; } @@ -102,21 +102,21 @@ public class CzsjMemberLocus extends BaseEntity { return delFlag; } - public void setCreateUserId(Long createUserId) + public void setCreateUserId(Integer createUserId) { this.createUserId = createUserId; } - public Long getCreateUserId() + public Integer getCreateUserId() { return createUserId; } - public void setUpdateUserId(Long updateUserId) + public void setUpdateUserId(Integer updateUserId) { this.updateUserId = updateUserId; } - public Long getUpdateUserId() + public Integer getUpdateUserId() { return updateUserId; } diff --git a/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberRelation.java b/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberRelation.java index d49f338..25bc8e5 100644 --- a/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberRelation.java +++ b/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberRelation.java @@ -16,11 +16,11 @@ public class CzsjMemberRelation extends BaseEntity private static final long serialVersionUID = 1L; /** 会员关系ID */ - private Long uid; + private Integer uid; /** 会员ID */ @Excel(name = "会员ID") - private Long memberUid; + private Integer memberUid; /** 关系 */ @Excel(name = "关系") @@ -28,7 +28,7 @@ public class CzsjMemberRelation extends BaseEntity /** 关系会员ID */ @Excel(name = "关系会员ID") - private Long memberRelationUid; + private Integer memberRelationUid; /** 备注 */ @Excel(name = "备注") @@ -39,27 +39,27 @@ public class CzsjMemberRelation extends BaseEntity /** 创建人ID */ @Excel(name = "创建人ID") - private Long createUserId; + private Integer createUserId; /** 修改人ID */ @Excel(name = "修改人ID") - private Long updateUserId; + private Integer updateUserId; - public void setUid(Long uid) + public void setUid(Integer uid) { this.uid = uid; } - public Long getUid() + public Integer getUid() { return uid; } - public void setMemberUid(Long memberUid) + public void setMemberUid(Integer memberUid) { this.memberUid = memberUid; } - public Long getMemberUid() + public Integer getMemberUid() { return memberUid; } @@ -72,12 +72,12 @@ public class CzsjMemberRelation extends BaseEntity { return relation; } - public void setMemberRelationUid(Long memberRelationUid) + public void setMemberRelationUid(Integer memberRelationUid) { this.memberRelationUid = memberRelationUid; } - public Long getMemberRelationUid() + public Integer getMemberRelationUid() { return memberRelationUid; } @@ -99,21 +99,21 @@ public class CzsjMemberRelation extends BaseEntity { return delFlag; } - public void setCreateUserId(Long createUserId) + public void setCreateUserId(Integer createUserId) { this.createUserId = createUserId; } - public Long getCreateUserId() + public Integer getCreateUserId() { return createUserId; } - public void setUpdateUserId(Long updateUserId) + public void setUpdateUserId(Integer updateUserId) { this.updateUserId = updateUserId; } - public Long getUpdateUserId() + public Integer getUpdateUserId() { return updateUserId; } diff --git a/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberSign.java b/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberSign.java index a09fb8f..7914c02 100644 --- a/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberSign.java +++ b/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberSign.java @@ -18,11 +18,11 @@ public class CzsjMemberSign extends BaseEntity private static final long serialVersionUID = 1L; /** 签到记录ID */ - private Long uid; + private Integer uid; /** 用户ID */ @Excel(name = "用户ID") - private Long memberUid; + private Integer memberUid; /** 签到日期 */ @JsonFormat(pattern = "yyyy-MM-dd") @@ -34,27 +34,27 @@ public class CzsjMemberSign extends BaseEntity /** 创建人ID */ @Excel(name = "创建人ID") - private Long createUserId; + private Integer createUserId; /** 修改人ID */ @Excel(name = "修改人ID") - private Long updateUserId; + private Integer updateUserId; - public void setUid(Long uid) + public void setUid(Integer uid) { this.uid = uid; } - public Long getUid() + public Integer getUid() { return uid; } - public void setMemberUid(Long memberUid) + public void setMemberUid(Integer memberUid) { this.memberUid = memberUid; } - public Long getMemberUid() + public Integer getMemberUid() { return memberUid; } @@ -76,21 +76,21 @@ public class CzsjMemberSign extends BaseEntity { return delFlag; } - public void setCreateUserId(Long createUserId) + public void setCreateUserId(Integer createUserId) { this.createUserId = createUserId; } - public Long getCreateUserId() + public Integer getCreateUserId() { return createUserId; } - public void setUpdateUserId(Long updateUserId) + public void setUpdateUserId(Integer updateUserId) { this.updateUserId = updateUserId; } - public Long getUpdateUserId() + public Integer getUpdateUserId() { return updateUserId; } diff --git a/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberTag.java b/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberTag.java index 0b65636..49d81ce 100644 --- a/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberTag.java +++ b/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberTag.java @@ -16,7 +16,7 @@ public class CzsjMemberTag extends BaseEntity private static final long serialVersionUID = 1L; /** 标签ID */ - private Long uid; + private Integer uid; /** 标签名称 */ @Excel(name = "标签名称") @@ -28,25 +28,25 @@ public class CzsjMemberTag extends BaseEntity /** 标签组ID */ @Excel(name = "标签组ID") - private Long tagGroupUid; + private Integer tagGroupUid; /** 有效标识，0有效，1无效 */ private Integer delFlag; /** 创建人ID */ @Excel(name = "创建人ID") - private Long createUserId; + private Integer createUserId; /** 修改人ID */ @Excel(name = "修改人ID") - private Long updateUserId; + private Integer updateUserId; - public void setUid(Long uid) + public void setUid(Integer uid) { this.uid = uid; } - public Long getUid() + public Integer getUid() { return uid; } @@ -68,12 +68,12 @@ public class CzsjMemberTag extends BaseEntity { return mark; } - public void setTagGroupUid(Long tagGroupUid) + public void setTagGroupUid(Integer tagGroupUid) { this.tagGroupUid = tagGroupUid; } - public Long getTagGroupUid() + public Integer getTagGroupUid() { return tagGroupUid; } @@ -86,21 +86,21 @@ public class CzsjMemberTag extends BaseEntity { return delFlag; } - public void setCreateUserId(Long createUserId) + public void setCreateUserId(Integer createUserId) { this.createUserId = createUserId; } - public Long getCreateUserId() + public Integer getCreateUserId() { return createUserId; } - public void setUpdateUserId(Long updateUserId) + public void setUpdateUserId(Integer updateUserId) { this.updateUserId = updateUserId; } - public Long getUpdateUserId() + public Integer getUpdateUserId() { return updateUserId; } diff --git a/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberTagGroup.java b/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberTagGroup.java index 598fd5c..3719507 100644 --- a/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberTagGroup.java +++ b/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberTagGroup.java @@ -16,7 +16,7 @@ public class CzsjMemberTagGroup extends BaseEntity private static final long serialVersionUID = 1L; /** 标签组ID */ - private Long uid; + private Integer uid; /** 标签组名称 */ @Excel(name = "标签组名称") @@ -31,18 +31,18 @@ public class CzsjMemberTagGroup extends BaseEntity /** 创建人ID */ @Excel(name = "创建人ID") - private Long createUserId; + private Integer createUserId; /** 修改人ID */ @Excel(name = "修改人ID") - private Long updateUserId; + private Integer updateUserId; - public void setUid(Long uid) + public void setUid(Integer uid) { this.uid = uid; } - public Long getUid() + public Integer getUid() { return uid; } @@ -73,21 +73,21 @@ public class CzsjMemberTagGroup extends BaseEntity { return delFlag; } - public void setCreateUserId(Long createUserId) + public void setCreateUserId(Integer createUserId) { this.createUserId = createUserId; } - public Long getCreateUserId() + public Integer getCreateUserId() { return createUserId; } - public void setUpdateUserId(Long updateUserId) + public void setUpdateUserId(Integer updateUserId) { this.updateUserId = updateUserId; } - public Long getUpdateUserId() + public Integer getUpdateUserId() { return updateUserId; } diff --git a/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberWxFans.java b/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberWxFans.java index 986bdd2..a688f1b 100644 --- a/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberWxFans.java +++ b/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberWxFans.java @@ -18,11 +18,11 @@ public class CzsjMemberWxFans extends BaseEntity private static final long serialVersionUID = 1L; /** 会员微信粉丝ID */ - private Long uid; + private Integer uid; /** 会员ID */ @Excel(name = "会员ID") - private Long memberUid; + private Integer memberUid; /** 公众号ID */ @Excel(name = "公众号ID") @@ -72,27 +72,27 @@ public class CzsjMemberWxFans extends BaseEntity /** 创建人ID */ @Excel(name = "创建人ID") - private Long createUserId; + private Integer createUserId; /** 修改人ID */ @Excel(name = "修改人ID") - private Long updateUserId; + private Integer updateUserId; - public void setUid(Long uid) + public void setUid(Integer uid) { this.uid = uid; } - public Long getUid() + public Integer getUid() { return uid; } - public void setMemberUid(Long memberUid) + public void setMemberUid(Integer memberUid) { this.memberUid = memberUid; } - public Long getMemberUid() + public Integer getMemberUid() { return memberUid; } @@ -195,21 +195,21 @@ public class CzsjMemberWxFans extends BaseEntity { return delFlag; } - public void setCreateUserId(Long createUserId) + public void setCreateUserId(Integer createUserId) { this.createUserId = createUserId; } - public Long getCreateUserId() + public Integer getCreateUserId() { return createUserId; } - public void setUpdateUserId(Long updateUserId) + public void setUpdateUserId(Integer updateUserId) { this.updateUserId = updateUserId; } - public Long getUpdateUserId() + public Integer getUpdateUserId() { return updateUserId; } diff --git a/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberWxSource.java b/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberWxSource.java index 80e912b..b38c244 100644 --- a/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberWxSource.java +++ b/czsj-system/src/main/java/com/czsj/account/domain/CzsjMemberWxSource.java @@ -16,7 +16,7 @@ public class CzsjMemberWxSource extends BaseEntity private static final long serialVersionUID = 1L; /** 会员来源ID */ - private Long uid; + private Integer uid; /** 微信unionID */ @Excel(name = "微信unionID") @@ -67,18 +67,18 @@ public class CzsjMemberWxSource extends BaseEntity /** 创建人ID */ @Excel(name = "创建人ID") - private Long createUserId; + private Integer createUserId; /** 修改人ID */ @Excel(name = "修改人ID") - private Long updateUserId; + private Integer updateUserId; - public void setUid(Long uid) + public void setUid(Integer uid) { this.uid = uid; } - public Long getUid() + public Integer getUid() { return uid; } @@ -190,21 +190,21 @@ public class CzsjMemberWxSource extends BaseEntity { return delFlag; } - public void setCreateUserId(Long createUserId) + public void setCreateUserId(Integer createUserId) { this.createUserId = createUserId; } - public Long getCreateUserId() + public Integer getCreateUserId() { return createUserId; } - public void setUpdateUserId(Long updateUserId) + public void setUpdateUserId(Integer updateUserId) { this.updateUserId = updateUserId; } - public Long getUpdateUserId() + public Integer getUpdateUserId() { return updateUserId; } diff --git a/czsj-system/src/main/java/com/czsj/wechat/domain/CzsjWxAccount.java b/czsj-system/src/main/java/com/czsj/wechat/domain/CzsjWxAccount.java index 1939808..359dca1 100644 --- a/czsj-system/src/main/java/com/czsj/wechat/domain/CzsjWxAccount.java +++ b/czsj-system/src/main/java/com/czsj/wechat/domain/CzsjWxAccount.java @@ -16,7 +16,7 @@ public class CzsjWxAccount extends BaseEntity private static final long serialVersionUID = 1L; /** 微信公众号ID */ - private Long uid; + private Integer uid; /** 公众号appID */ @Excel(name = "公众号appID") @@ -47,18 +47,18 @@ public class CzsjWxAccount extends BaseEntity /** 创建人ID */ @Excel(name = "创建人ID") - private Long createUserId; + private Integer createUserId; /** 修改人ID */ @Excel(name = "修改人ID") - private Long updateUserId; + private Integer updateUserId; - public void setUid(Long uid) + public void setUid(Integer uid) { this.uid = uid; } - public Long getUid() + public Integer getUid() { return uid; } @@ -125,21 +125,21 @@ public class CzsjWxAccount extends BaseEntity { return delFlag; } - public void setCreateUserId(Long createUserId) + public void setCreateUserId(Integer createUserId) { this.createUserId = createUserId; } - public Long getCreateUserId() + public Integer getCreateUserId() { return createUserId; } - public void setUpdateUserId(Long updateUserId) + public void setUpdateUserId(Integer updateUserId) { this.updateUserId = updateUserId; } - public Long getUpdateUserId() + public Integer getUpdateUserId() { return updateUserId; } diff --git a/czsj-system/src/main/java/com/czsj/wechat/domain/CzsjWxMessage.java b/czsj-system/src/main/java/com/czsj/wechat/domain/CzsjWxMessage.java index 3081d81..4baf578 100644 --- a/czsj-system/src/main/java/com/czsj/wechat/domain/CzsjWxMessage.java +++ b/czsj-system/src/main/java/com/czsj/wechat/domain/CzsjWxMessage.java @@ -16,7 +16,7 @@ public class CzsjWxMessage extends BaseEntity private static final long serialVersionUID = 1L; /** 微信消息ID */ - private Long uid; + private Integer uid; /** 公众号appID */ @Excel(name = "公众号appID") @@ -28,7 +28,7 @@ public class CzsjWxMessage extends BaseEntity /** 消息方向 */ @Excel(name = "消息方向") - private Long inOut; + private Integer inOut; /** 消息类型 */ @Excel(name = "消息类型") @@ -43,18 +43,18 @@ public class CzsjWxMessage extends BaseEntity /** 创建人ID */ @Excel(name = "创建人ID") - private Long createUserId; + private Integer createUserId; /** 修改人ID */ @Excel(name = "修改人ID") - private Long updateUserId; + private Integer updateUserId; - public void setUid(Long uid) + public void setUid(Integer uid) { this.uid = uid; } - public Long getUid() + public Integer getUid() { return uid; } @@ -76,12 +76,12 @@ public class CzsjWxMessage extends BaseEntity { return openId; } - public void setInOut(Long inOut) + public void setInOut(Integer inOut) { this.inOut = inOut; } - public Long getInOut() + public Integer getInOut() { return inOut; } @@ -112,21 +112,21 @@ public class CzsjWxMessage extends BaseEntity { return delFlag; } - public void setCreateUserId(Long createUserId) + public void setCreateUserId(Integer createUserId) { this.createUserId = createUserId; } - public Long getCreateUserId() + public Integer getCreateUserId() { return createUserId; } - public void setUpdateUserId(Long updateUserId) + public void setUpdateUserId(Integer updateUserId) { this.updateUserId = updateUserId; } - public Long getUpdateUserId() + public Integer getUpdateUserId() { return updateUserId; } diff --git a/czsj-system/src/main/java/com/czsj/wechat/domain/CzsjWxQrCode.java b/czsj-system/src/main/java/com/czsj/wechat/domain/CzsjWxQrCode.java index 6bb85ef..f6012a3 100644 --- a/czsj-system/src/main/java/com/czsj/wechat/domain/CzsjWxQrCode.java +++ b/czsj-system/src/main/java/com/czsj/wechat/domain/CzsjWxQrCode.java @@ -18,7 +18,7 @@ public class CzsjWxQrCode extends BaseEntity private static final long serialVersionUID = 1L; /** 公众号二维码ID */ - private Long uid; + private Integer uid; /** 公众号appID */ @Excel(name = "公众号appID") @@ -50,18 +50,18 @@ public class CzsjWxQrCode extends BaseEntity /** 创建人ID */ @Excel(name = "创建人ID") - private Long createUserId; + private Integer createUserId; /** 修改人ID */ @Excel(name = "修改人ID") - private Long updateUserId; + private Integer updateUserId; - public void setUid(Long uid) + public void setUid(Integer uid) { this.uid = uid; } - public Long getUid() + public Integer getUid() { return uid; } @@ -128,21 +128,21 @@ public class CzsjWxQrCode extends BaseEntity { return delFlag; } - public void setCreateUserId(Long createUserId) + public void setCreateUserId(Integer createUserId) { this.createUserId = createUserId; } - public Long getCreateUserId() + public Integer getCreateUserId() { return createUserId; } - public void setUpdateUserId(Long updateUserId) + public void setUpdateUserId(Integer updateUserId) { this.updateUserId = updateUserId; } - public Long getUpdateUserId() + public Integer getUpdateUserId() { return updateUserId; } diff --git a/czsj-system/src/main/java/com/czsj/wechat/domain/CzsjWxReplyRule.java b/czsj-system/src/main/java/com/czsj/wechat/domain/CzsjWxReplyRule.java index b8bf353..3e5ce1d 100644 --- a/czsj-system/src/main/java/com/czsj/wechat/domain/CzsjWxReplyRule.java +++ b/czsj-system/src/main/java/com/czsj/wechat/domain/CzsjWxReplyRule.java @@ -18,7 +18,7 @@ public class CzsjWxReplyRule extends BaseEntity private static final long serialVersionUID = 1L; /** 回复规则ID */ - private Long uid; + private Integer uid; /** 公众号appID */ @Excel(name = "公众号appID") @@ -34,7 +34,7 @@ public class CzsjWxReplyRule extends BaseEntity /** 是否精确匹配 */ @Excel(name = "是否精确匹配") - private Integer exactMatch; + private Boolean exactMatch; /** 回复类型 */ @Excel(name = "回复类型") @@ -59,18 +59,18 @@ public class CzsjWxReplyRule extends BaseEntity /** 创建人ID */ @Excel(name = "创建人ID") - private Long createUserId; + private Integer createUserId; /** 修改人ID */ @Excel(name = "修改人ID") - private Long updateUserId; + private Integer updateUserId; - public void setUid(Long uid) + public void setUid(Integer uid) { this.uid = uid; } - public Long getUid() + public Integer getUid() { return uid; } @@ -101,12 +101,12 @@ public class CzsjWxReplyRule extends BaseEntity { return matchValue; } - public void setExactMatch(Integer exactMatch) + public void setExactMatch(Boolean exactMatch) { this.exactMatch = exactMatch; } - public Integer getExactMatch() + public Boolean getExactMatch() { return exactMatch; } @@ -155,21 +155,21 @@ public class CzsjWxReplyRule extends BaseEntity { return delFlag; } - public void setCreateUserId(Long createUserId) + public void setCreateUserId(Integer createUserId) { this.createUserId = createUserId; } - public Long getCreateUserId() + public Integer getCreateUserId() { return createUserId; } - public void setUpdateUserId(Long updateUserId) + public void setUpdateUserId(Integer updateUserId) { this.updateUserId = updateUserId; } - public Long getUpdateUserId() + public Integer getUpdateUserId() { return updateUserId; } diff --git a/czsj-system/src/main/java/com/czsj/wechat/domain/CzsjWxTemplate.java b/czsj-system/src/main/java/com/czsj/wechat/domain/CzsjWxTemplate.java index ecac046..48b9516 100644 --- a/czsj-system/src/main/java/com/czsj/wechat/domain/CzsjWxTemplate.java +++ b/czsj-system/src/main/java/com/czsj/wechat/domain/CzsjWxTemplate.java @@ -16,7 +16,7 @@ public class CzsjWxTemplate extends BaseEntity private static final long serialVersionUID = 1L; /** 消息模板ID */ - private Long uid; + private Integer uid; /** 公众号ID */ @Excel(name = "公众号ID") @@ -51,18 +51,18 @@ public class CzsjWxTemplate extends BaseEntity /** 创建人ID */ @Excel(name = "创建人ID") - private Long createUserId; + private Integer createUserId; /** 修改人ID */ @Excel(name = "修改人ID") - private Long updateUserId; + private Integer updateUserId; - public void setUid(Long uid) + public void setUid(Integer uid) { this.uid = uid; } - public Long getUid() + public Integer getUid() { return uid; } @@ -138,21 +138,21 @@ public class CzsjWxTemplate extends BaseEntity { return delFlag; } - public void setCreateUserId(Long createUserId) + public void setCreateUserId(Integer createUserId) { this.createUserId = createUserId; } - public Long getCreateUserId() + public Integer getCreateUserId() { return createUserId; } - public void setUpdateUserId(Long updateUserId) + public void setUpdateUserId(Integer updateUserId) { this.updateUserId = updateUserId; } - public Long getUpdateUserId() + public Integer getUpdateUserId() { return updateUserId; } diff --git a/czsj-system/src/main/java/com/czsj/wechat/domain/CzsjWxTemplateLog.java b/czsj-system/src/main/java/com/czsj/wechat/domain/CzsjWxTemplateLog.java index 2cc171b..d639547 100644 --- a/czsj-system/src/main/java/com/czsj/wechat/domain/CzsjWxTemplateLog.java +++ b/czsj-system/src/main/java/com/czsj/wechat/domain/CzsjWxTemplateLog.java @@ -16,7 +16,7 @@ public class CzsjWxTemplateLog extends BaseEntity private static final long serialVersionUID = 1L; /** 消息模板日志ID */ - private Long uid; + private Integer uid; /** 公众号ID */ @Excel(name = "公众号ID") @@ -28,7 +28,7 @@ public class CzsjWxTemplateLog extends BaseEntity /** 模板ID */ @Excel(name = "模板ID") - private Long templateUid; + private Integer templateUid; /** 消息体 */ @Excel(name = "消息体") @@ -51,18 +51,18 @@ public class CzsjWxTemplateLog extends BaseEntity /** 创建人ID */ @Excel(name = "创建人ID") - private Long createUserId; + private Integer createUserId; /** 修改人ID */ @Excel(name = "修改人ID") - private Long updateUserId; + private Integer updateUserId; - public void setUid(Long uid) + public void setUid(Integer uid) { this.uid = uid; } - public Long getUid() + public Integer getUid() { return uid; } @@ -84,12 +84,12 @@ public class CzsjWxTemplateLog extends BaseEntity { return toUser; } - public void setTemplateUid(Long templateUid) + public void setTemplateUid(Integer templateUid) { this.templateUid = templateUid; } - public Long getTemplateUid() + public Integer getTemplateUid() { return templateUid; } @@ -138,21 +138,21 @@ public class CzsjWxTemplateLog extends BaseEntity { return delFlag; } - public void setCreateUserId(Long createUserId) + public void setCreateUserId(Integer createUserId) { this.createUserId = createUserId; } - public Long getCreateUserId() + public Integer getCreateUserId() { return createUserId; } - public void setUpdateUserId(Long updateUserId) + public void setUpdateUserId(Integer updateUserId) { this.updateUserId = updateUserId; } - public Long getUpdateUserId() + public Integer getUpdateUserId() { return updateUserId; } diff --git a/czsj-system/src/main/java/com/czsj/wechat/service/ICzsjWxAccountService.java b/czsj-system/src/main/java/com/czsj/wechat/service/ICzsjWxAccountService.java index da2a72b..d7158b1 100644 --- a/czsj-system/src/main/java/com/czsj/wechat/service/ICzsjWxAccountService.java +++ b/czsj-system/src/main/java/com/czsj/wechat/service/ICzsjWxAccountService.java @@ -1,7 +1,11 @@ package com.czsj.wechat.service; +import java.util.Collection; import java.util.List; +import java.util.Map; + import com.czsj.wechat.domain.CzsjWxAccount; +import com.czsj.wechat.utils.PageUtils; /** * 微信公众号Service接口 @@ -11,6 +15,11 @@ import com.czsj.wechat.domain.CzsjWxAccount; */ public interface ICzsjWxAccountService { + + + void loadWxMpConfigStorages(); + + boolean removeByIds(Collection idList); /** * 查询微信公众号 * diff --git a/czsj-system/src/main/java/com/czsj/wechat/service/MsgReplyRuleService.java b/czsj-system/src/main/java/com/czsj/wechat/service/MsgReplyRuleService.java deleted file mode 100644 index e70717a..0000000 --- a/czsj-system/src/main/java/com/czsj/wechat/service/MsgReplyRuleService.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.czsj.wechat.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.czsj.wechat.utils.PageUtils; -import com.czsj.wechat.entity.MsgReplyRule; - -import java.util.List; -import java.util.Map; - -public interface MsgReplyRuleService extends IService { - /** - * 分页查询用户数据 - * @param params 查询参数 - * @return PageUtils 分页结果 - */ - PageUtils queryPage(Map params); - - /** - * 保存自动回复规则 - * - * @param msgReplyRule - */ - - @Override - boolean save(MsgReplyRule msgReplyRule); - - /** - * 获取所有的回复规则 - * - * @return - */ - List getRules(); - - /** - * 获取当前时段内所有有效的回复规则 - * - * @return 有效的规则列表 - */ - List getValidRules(); - - /** - * 筛选符合条件的回复规则 - * - * - * @param appid - * @param exactMatch 是否精确匹配 - * @param keywords 关键词 - * @return 规则列表 - */ - List getMatchedRules(String appid, boolean exactMatch, String keywords); -} diff --git a/czsj-system/src/main/java/com/czsj/wechat/service/impl/CzsjWxAccountServiceImpl.java b/czsj-system/src/main/java/com/czsj/wechat/service/impl/CzsjWxAccountServiceImpl.java index 8e2c5c6..de63b49 100644 --- a/czsj-system/src/main/java/com/czsj/wechat/service/impl/CzsjWxAccountServiceImpl.java +++ b/czsj-system/src/main/java/com/czsj/wechat/service/impl/CzsjWxAccountServiceImpl.java @@ -1,7 +1,17 @@ package com.czsj.wechat.service.impl; +import java.util.Collection; import java.util.List; +import java.util.Map; + import com.czsj.common.utils.DateUtils; +import com.czsj.wechat.entity.WxAccount; +import com.czsj.wechat.utils.PageUtils; +import lombok.extern.slf4j.Slf4j; +import me.chanjar.weixin.common.redis.WxRedisOps; +import me.chanjar.weixin.mp.api.WxMpService; +import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl; +import me.chanjar.weixin.mp.config.impl.WxMpRedisConfigImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.czsj.wechat.mapper.CzsjWxAccountMapper; @@ -14,12 +24,38 @@ import com.czsj.wechat.service.ICzsjWxAccountService; * @author czsj * @date 2024-12-07 */ +@Slf4j @Service public class CzsjWxAccountServiceImpl implements ICzsjWxAccountService { + + @Autowired + private WxMpService wxMpService; + + @Autowired + private WxRedisOps wxRedisOps; + @Autowired private CzsjWxAccountMapper czsjWxAccountMapper; + + + @Override + public void loadWxMpConfigStorages() { + List accountList = czsjWxAccountMapper.selectCzsjWxAccountList(null); + if (accountList == null || accountList.isEmpty()) { + log.info("未读取到公众号配置，请在管理后台添加"); + return; + } + log.info("加载到{}条公众号配置",accountList.size()); + accountList.forEach(this::addAccountToRuntime); + } + + @Override + public boolean removeByIds(Collection idList) { + return false; + } + /** * 查询微信公众号 * @@ -54,6 +90,7 @@ public class CzsjWxAccountServiceImpl implements ICzsjWxAccountService public int insertCzsjWxAccount(CzsjWxAccount czsjWxAccount) { czsjWxAccount.setCreateTime(DateUtils.getNowDate()); + addAccountToRuntime(czsjWxAccount); return czsjWxAccountMapper.insertCzsjWxAccount(czsjWxAccount); } @@ -67,6 +104,7 @@ public class CzsjWxAccountServiceImpl implements ICzsjWxAccountService public int updateCzsjWxAccount(CzsjWxAccount czsjWxAccount) { czsjWxAccount.setUpdateTime(DateUtils.getNowDate()); + addAccountToRuntime(czsjWxAccountMapper.selectCzsjWxAccountByUid(czsjWxAccount.getUid())); return czsjWxAccountMapper.updateCzsjWxAccount(czsjWxAccount); } @@ -79,6 +117,9 @@ public class CzsjWxAccountServiceImpl implements ICzsjWxAccountService @Override public int deleteCzsjWxAccountByUids(Long[] uids) { + for (Long uid : uids) { + removeAccountToRuntime(czsjWxAccountMapper.selectCzsjWxAccountByUid(uid)); + } return czsjWxAccountMapper.deleteCzsjWxAccountByUids(uids); } @@ -93,4 +134,34 @@ public class CzsjWxAccountServiceImpl implements ICzsjWxAccountService { return czsjWxAccountMapper.deleteCzsjWxAccountByUid(uid); } + + /** + * 添加账号到当前程序，如首次添加需初始化configStorageMap + * @param entity + */ + private synchronized void addAccountToRuntime(CzsjWxAccount entity) { + String appid = entity.getAppId(); + WxMpDefaultConfigImpl config = buildWxMpConfigImpl(entity); + wxMpService.addConfigStorage(appid, config); + } + + /** + * 移除当前账号到当前程序 + * @param entity + */ + private synchronized void removeAccountToRuntime(CzsjWxAccount entity) { + String appid = entity.getAppId(); + wxMpService.removeConfigStorage(appid); + } + + + private WxMpDefaultConfigImpl buildWxMpConfigImpl(CzsjWxAccount entity) { + log.info("添加公众号配置到程序！公众号appID:" + entity.getAppId()); + WxMpRedisConfigImpl configStorage = new WxMpRedisConfigImpl(wxRedisOps, "v1:@ss.hasPermi(mp"); + configStorage.setAppId(entity.getAppId()); + configStorage.setSecret(entity.getSecret()); + configStorage.setToken(entity.getToken()); + configStorage.setAesKey(entity.getAesKey()); + return configStorage; + } } diff --git a/czsj-system/src/main/java/com/czsj/wechat/service/impl/MsgReplyRuleServiceImpl.java b/czsj-system/src/main/java/com/czsj/wechat/service/impl/MsgReplyRuleServiceImpl.java deleted file mode 100644 index 702e0bd..0000000 --- a/czsj-system/src/main/java/com/czsj/wechat/service/impl/MsgReplyRuleServiceImpl.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.czsj.wechat.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.czsj.wechat.utils.PageUtils; -import com.czsj.wechat.utils.Query; -import com.czsj.wechat.mapper.MsgReplyRuleMapper; -import com.czsj.wechat.entity.MsgReplyRule; -import com.czsj.wechat.service.MsgReplyRuleService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -import java.time.LocalTime; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -@Service -public class MsgReplyRuleServiceImpl extends ServiceImpl implements MsgReplyRuleService { - @Autowired - MsgReplyRuleMapper msgReplyRuleMapper; - - @Override - public PageUtils queryPage(Map params) { - String matchValue = (String) params.get("matchValue"); - String appid = (String) params.get("appid"); - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper() - .eq(StringUtils.hasText(appid), "appid", appid) - .or() - .apply("appid is null or appid = ''") - .like(StringUtils.hasText(matchValue), "match_value", matchValue) - .orderByDesc("update_time") - ); - - return new PageUtils(page); - } - - /** - * 保存自动回复规则 - * - * @param msgReplyRule - */ - - @Override - public boolean save(MsgReplyRule msgReplyRule) { - if (msgReplyRule.getRuleId() > 0) { - msgReplyRuleMapper.updateById(msgReplyRule); - } else { - msgReplyRuleMapper.insert(msgReplyRule); - } - return false; - } - - /** - * 获取所有的回复规则 - * - * @return - */ - @Override - public List getRules() { - return msgReplyRuleMapper.selectList(new QueryWrapper().orderByDesc("rule_id")); - } - - /** - * 获取当前时段内所有有效的回复规则 - * - * @return - */ - @Override - public List getValidRules() { - return msgReplyRuleMapper.selectList( - new QueryWrapper() - .eq("status", 1) - .isNotNull("match_value") - .ne("match_value", "") - .orderByDesc("priority")); - } - - /** - * 筛选符合条件的回复规则 - * - * - * @param appid 公众号appid - * @param exactMatch 是否精确匹配 - * @param keywords 关键词 - * @return 规则列表 - */ - @Override - public List getMatchedRules(String appid, boolean exactMatch, String keywords) { - LocalTime now = LocalTime.now(); - return this.getValidRules().stream() - .filter(rule->!StringUtils.hasText(rule.getAppid()) || appid.equals(rule.getAppid())) // 检测是否是对应公众号的规则，如果appid为空则为通用规则 - .filter(rule->null == rule.getEffectTimeStart() || rule.getEffectTimeStart().toLocalTime().isBefore(now))// 检测是否在有效时段，effectTimeStart为null则一直有效 - .filter(rule->null == rule.getEffectTimeEnd() || rule.getEffectTimeEnd().toLocalTime().isAfter(now)) // 检测是否在有效时段，effectTimeEnd为null则一直有效 - .filter(rule->isMatch(exactMatch || rule.isExactMatch(),rule.getMatchValue().split(","),keywords)) //检测是否符合匹配规则 - .collect(Collectors.toList()); - } - - /** - * 检测文字是否匹配规则 - * 精确匹配时，需关键词与规则词语一致 - * 非精确匹配时，检测文字需包含任意一个规则词语 - * - * @param exactMatch 是否精确匹配 - * @param ruleWords 规则列表 - * @param checkWords 需检测的文字 - * @return - */ - public static boolean isMatch(boolean exactMatch, String[] ruleWords, String checkWords) { - if (!StringUtils.hasText(checkWords)) { - return false; - } - for (String words : ruleWords) { - if (exactMatch && words.equals(checkWords)) { - return true;//精确匹配，需关键词与规则词语一致 - } - if (!exactMatch && checkWords.contains(words)) { - return true;//模糊匹配 - } - } - return false; - } -} diff --git a/czsj-system/src/main/java/com/czsj/wechat/service/impl/MsgReplyServiceImpl.java b/czsj-system/src/main/java/com/czsj/wechat/service/impl/MsgReplyServiceImpl.java index ba538da..3837550 100644 --- a/czsj-system/src/main/java/com/czsj/wechat/service/impl/MsgReplyServiceImpl.java +++ b/czsj-system/src/main/java/com/czsj/wechat/service/impl/MsgReplyServiceImpl.java @@ -3,6 +3,8 @@ package com.czsj.wechat.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.czsj.wechat.config.TaskExcutor; +import com.czsj.wechat.domain.CzsjWxReplyRule; +import com.czsj.wechat.service.ICzsjWxReplyRuleService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.api.WxConsts; @@ -10,9 +12,7 @@ import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage; -import com.czsj.wechat.entity.MsgReplyRule; import com.czsj.wechat.entity.WxMsg; -import com.czsj.wechat.service.MsgReplyRuleService; import com.czsj.wechat.service.MsgReplyService; import com.czsj.wechat.service.WxMsgService; import org.springframework.beans.factory.annotation.Autowired; @@ -33,7 +33,8 @@ import java.util.concurrent.TimeUnit; @Slf4j public class MsgReplyServiceImpl implements MsgReplyService { @Autowired - MsgReplyRuleService msgReplyRuleService; + ICzsjWxReplyRuleService czsjWxReplyRuleService; + @Autowired WxMpService wxMpService; @Value("${wx.mp.autoReplyInterval:1000}") @@ -54,12 +55,15 @@ public class MsgReplyServiceImpl implements MsgReplyService { @Override public boolean tryAutoReply(String appid, boolean exactMatch, String toUser, String keywords) { try { - List rules = msgReplyRuleService.getMatchedRules(appid,exactMatch, keywords); - if (rules.isEmpty()) { + CzsjWxReplyRule czsjWxReplyRule = new CzsjWxReplyRule(); + czsjWxReplyRule.setAppId(appid); + czsjWxReplyRule.setReplyContent(keywords); + czsjWxReplyRule.setExactMatch(exactMatch); + List rules = czsjWxReplyRuleService.selectCzsjWxReplyRuleList(czsjWxReplyRule);if (rules.isEmpty()) { return false; } long delay = 0; - for (MsgReplyRule rule : rules) { + for (CzsjWxReplyRule rule : rules) { TaskExcutor.schedule(() -> { wxMpService.switchover(appid); this.reply(toUser,rule.getReplyType(),rule.getReplyContent()); diff --git a/czsj-system/src/main/java/com/czsj/wechat/service/impl/WxAccountServiceImpl.java b/czsj-system/src/main/java/com/czsj/wechat/service/impl/WxAccountServiceImpl.java index 871346d..1b86904 100644 --- a/czsj-system/src/main/java/com/czsj/wechat/service/impl/WxAccountServiceImpl.java +++ b/czsj-system/src/main/java/com/czsj/wechat/service/impl/WxAccountServiceImpl.java @@ -49,7 +49,7 @@ public class WxAccountServiceImpl extends ServiceImpl accountList = this.list(); // if (accountList == null || accountList.isEmpty()) { // log.info("未读取到公众号配置，请在管理后台添加"); @@ -57,7 +57,7 @@ public class WxAccountServiceImpl extends ServiceImpl and match_value = #{matchValue} and exact_match = #{exactMatch} and reply_type = #{replyType} - and reply_content = #{replyContent} + and reply_content like concat('%', #{replyContent}, '%') and start_time = #{startTime} and end_time = #{endTime} and create_user_id = #{createUserId}