-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #46 from lianluoyi/dev
V1.34.0版本更新
- Loading branch information
Showing
69 changed files
with
2,494 additions
and
810 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
easyink-common/src/main/java/com/easyink/common/enums/chat/ChatTypeEnum.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| package com.easyink.common.enums.chat; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import lombok.Getter; | ||
|
|
||
| /** | ||
| * 聊天类型枚举 | ||
| * | ||
| * @author lichaoyu | ||
| * @date 2023/10/23 20:50 | ||
| */ | ||
| @AllArgsConstructor | ||
| @Getter | ||
| public enum ChatTypeEnum { | ||
|
|
||
| //是否为客户 0-内部 1-外部 2-群聊 | ||
| /** | ||
| * 内部聊天（员工聊天） | ||
| */ | ||
| INSIDE_CHAT(0), | ||
| /** | ||
| * 外部聊天（客户聊天） | ||
| */ | ||
| OUTSIDE_CHAT(1), | ||
| /** | ||
| * 群聊聊天 | ||
| */ | ||
| GROUP_CHAT(2); | ||
|
|
||
| /** | ||
| * 聊天类型 | ||
| */ | ||
| private Integer type; | ||
| } |
30 changes: 30 additions & 0 deletions
30
easyink-common/src/main/java/com/easyink/common/enums/wemsgtlp/LogicTypeEnum.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| package com.easyink.common.enums.wemsgtlp; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import lombok.Getter; | ||
|
|
||
| /** | ||
| * 过滤条件关联逻辑判断枚举 | ||
| * | ||
| * @author lichaoyu | ||
| * @date 2023/10/26 9:22 | ||
| */ | ||
| @AllArgsConstructor | ||
| @Getter | ||
| public enum LogicTypeEnum { | ||
|
|
||
| /** | ||
| * 逻辑判断 或 | ||
| */ | ||
| OR(0), | ||
| /** | ||
| * 逻辑判断 且 | ||
| */ | ||
| AND(1); | ||
|
|
||
| /** | ||
| * 判断类型 | ||
| */ | ||
| private final Integer type; | ||
|
|
||
| } |
35 changes: 35 additions & 0 deletions
35
easyink-common/src/main/java/com/easyink/common/enums/wemsgtlp/WeMsgTlpFilterEnum.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| package com.easyink.common.enums.wemsgtlp; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import lombok.Getter; | ||
|
|
||
| /** | ||
| * 欢迎语客户筛选类型枚举 | ||
| * | ||
| * @author lichaoyu | ||
| * @date 2023/10/25 18:02 | ||
| */ | ||
| @AllArgsConstructor | ||
| @Getter | ||
| public enum WeMsgTlpFilterEnum { | ||
|
|
||
| /** | ||
| * 来源 | ||
| */ | ||
| SOURCE(0, "来源"), | ||
| /** | ||
| * 性别 | ||
| */ | ||
| GENDER(1, "性别"); | ||
|
|
||
| /** | ||
| * 类型 | ||
| */ | ||
| private final Integer type; | ||
|
|
||
| /** | ||
| * 描述 | ||
| */ | ||
| private final String name; | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
easyink-wecom/src/main/java/com/easyink/wecom/domain/WeMsgTlpFilterRule.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| package com.easyink.wecom.domain; | ||
|
|
||
| import com.baomidou.mybatisplus.annotation.TableField; | ||
| import com.baomidou.mybatisplus.annotation.TableId; | ||
| import com.baomidou.mybatisplus.annotation.TableName; | ||
| import io.swagger.annotations.ApiModel; | ||
| import io.swagger.annotations.ApiModelProperty; | ||
| import lombok.AllArgsConstructor; | ||
| import lombok.Data; | ||
| import lombok.NoArgsConstructor; | ||
|
|
||
| /** | ||
| * 欢迎语筛选条件表对象 we_msg_tlp_filter_rule | ||
| * | ||
| * @author lichaoyu | ||
| * @date 2023/10/25 14:25 | ||
| */ | ||
| @Data | ||
| @AllArgsConstructor | ||
| @NoArgsConstructor | ||
| @TableName("we_msg_tlp_filter_rule") | ||
| @ApiModel("欢迎语筛选条件表对象") | ||
| public class WeMsgTlpFilterRule { | ||
|
|
||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| @ApiModelProperty(value = "主键id") | ||
| @TableId | ||
| @TableField("id") | ||
| private Long id; | ||
|
|
||
| @ApiModelProperty(value = "欢迎语模板id") | ||
| @TableField("msg_tlp_id") | ||
| private Long msgTlpId; | ||
|
|
||
| @ApiModelProperty(value = "筛选类型，0：来源；1：性别") | ||
| @TableField("filter_type") | ||
| private Integer filterType; | ||
|
|
||
| @ApiModelProperty(value = "筛选条件，0：不是；1：是") | ||
| @TableField("filter_condition") | ||
| private Boolean filterCondition; | ||
|
|
||
| @ApiModelProperty(value = "筛选值，来源见：AddWayEnum类，性别见：WeConstans.corpUserEnum") | ||
| @TableField("filter_value") | ||
| private String filterValue; | ||
|
|
||
|
|
||
| /** | ||
| * 为筛选条件构建企业信息和欢迎语关联信息 | ||
| * | ||
| * @param msgTlpId 欢迎语模板ID | ||
| */ | ||
| public void builderMsgTlpInfo(Long msgTlpId) { | ||
| this.msgTlpId = msgTlpId; | ||
| } | ||
| } |
Oops, something went wrong.