From 70ba17de2a2f8449e092807186cdd48d2543aae6 Mon Sep 17 00:00:00 2001 From: kyw7 <641364175@qq.com> Date: Mon, 10 Apr 2023 16:50:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?redis=E8=AE=BE=E7=BD=AE=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BD=BF=E7=94=A8=E5=AD=97=E9=9D=A2=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../austin/handler/shield/impl/ShieldServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/shield/impl/ShieldServiceImpl.java b/austin-handler/src/main/java/com/java3y/austin/handler/shield/impl/ShieldServiceImpl.java index e3b9f69..782697b 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/shield/impl/ShieldServiceImpl.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/shield/impl/ShieldServiceImpl.java @@ -1,6 +1,5 @@ package com.java3y.austin.handler.shield.impl; -import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; import com.java3y.austin.common.domain.AnchorInfo; @@ -15,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.LocalDateTime; -import java.util.Date; import java.util.HashSet; /** @@ -28,6 +26,8 @@ import java.util.HashSet; public class ShieldServiceImpl implements ShieldService { private static final String NIGHT_SHIELD_BUT_NEXT_DAY_SEND_KEY = "night_shield_send"; + + private static final long SECONDS_OF_A_DAY = 86400L; @Autowired private RedisUtils redisUtils; @Autowired @@ -52,7 +52,7 @@ public class ShieldServiceImpl implements ShieldService { if (ShieldType.NIGHT_SHIELD_BUT_NEXT_DAY_SEND.getCode().equals(taskInfo.getShieldType())) { redisUtils.lPush(NIGHT_SHIELD_BUT_NEXT_DAY_SEND_KEY, JSON.toJSONString(taskInfo, SerializerFeature.WriteClassName), - (DateUtil.offsetDay(new Date(), 1).getTime() / 1000) - DateUtil.currentSeconds()); + SECONDS_OF_A_DAY); logUtils.print(AnchorInfo.builder().state(AnchorState.NIGHT_SHIELD_NEXT_SEND.getCode()).businessId(taskInfo.getBusinessId()).ids(taskInfo.getReceiver()).build()); } taskInfo.setReceiver(new HashSet<>()); From 0a5c793bf43c374429f9c9826a0cbf1d338fb29f Mon Sep 17 00:00:00 2001 From: kyw7 <641364175@qq.com> Date: Mon, 10 Apr 2023 20:02:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=BAenum=E6=B7=BB=E5=8A=A0=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E7=9A=84int=E5=88=B0enum=E7=9A=84=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../austin/common/domain/AnchorInfo.java | 1 + .../dto/account/sms/TencentSmsAccount.java | 13 +++++++- .../austin/common/enums/AnchorState.java | 20 ++---------- .../austin/common/enums/AuditStatus.java | 2 +- .../austin/common/enums/ChannelType.java | 31 +++++-------------- .../common/enums/DeduplicationType.java | 18 ++--------- .../java3y/austin/common/enums/EnumUtil.java | 30 ++++++++++++++++++ .../java3y/austin/common/enums/FileType.java | 22 +++++-------- .../java3y/austin/common/enums/IdType.java | 2 +- .../austin/common/enums/MessageStatus.java | 2 +- .../austin/common/enums/MessageType.java | 22 +++---------- .../austin/common/enums/PowerfulEnum.java | 9 ++++++ .../austin/common/enums/RespStatusEnum.java | 2 +- .../austin/common/enums/ShieldType.java | 4 +-- .../java3y/austin/common/enums/SmsStatus.java | 20 +----------- .../austin/common/enums/SmsSupplier.java | 17 +--------- .../austin/common/enums/TemplateType.java | 2 +- 17 files changed, 83 insertions(+), 134 deletions(-) create mode 100644 austin-common/src/main/java/com/java3y/austin/common/enums/EnumUtil.java create mode 100644 austin-common/src/main/java/com/java3y/austin/common/enums/PowerfulEnum.java diff --git a/austin-common/src/main/java/com/java3y/austin/common/domain/AnchorInfo.java b/austin-common/src/main/java/com/java3y/austin/common/domain/AnchorInfo.java index d674e8d..9d07035 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/domain/AnchorInfo.java +++ b/austin-common/src/main/java/com/java3y/austin/common/domain/AnchorInfo.java @@ -25,6 +25,7 @@ public class AnchorInfo { /** * 具体点位 + * @see com.java3y.austin.common.enums.AnchorState */ private int state; diff --git a/austin-common/src/main/java/com/java3y/austin/common/dto/account/sms/TencentSmsAccount.java b/austin-common/src/main/java/com/java3y/austin/common/dto/account/sms/TencentSmsAccount.java index 73fe7cf..85b1524 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/dto/account/sms/TencentSmsAccount.java +++ b/austin-common/src/main/java/com/java3y/austin/common/dto/account/sms/TencentSmsAccount.java @@ -8,7 +8,18 @@ import lombok.NoArgsConstructor; * 腾讯短信参数 *

* 账号参数示例： - * {"url":"sms.tencentcloudapi.com","region":"ap-guangzhou","secretId":"AKIDhDxxxxxxxx1WljQq","secretKey":"B4hwww39yxxxrrrrgxyi","smsSdkAppId":"1423123125","templateId":"1182097","signName":"Java3y公众号","supplierId":10,"supplierName":"腾讯云","scriptName":"TencentSmsScript"} + * { + * "url": "sms.tencentcloudapi.com", + * "region": "ap-guangzhou", + * "secretId": "AKIDhDxxxxxxxx1WljQq", + * "secretKey": "B4hwww39yxxxrrrrgxyi", + * "smsSdkAppId": "1423123125", + * "templateId": "1182097", + * "signName": "Java3y公众号", + * "supplierId": 10, + * "supplierName": "腾讯云", + * "scriptName": "TencentSmsScript" + * } * * @author 3y */ diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/AnchorState.java b/austin-common/src/main/java/com/java3y/austin/common/enums/AnchorState.java index 8415fc9..6211313 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/AnchorState.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/AnchorState.java @@ -13,7 +13,7 @@ import lombok.ToString; @Getter @ToString @AllArgsConstructor -public enum AnchorState { +public enum AnchorState implements PowerfulEnum { /** * 消息接收成功（获取到请求） @@ -56,26 +56,10 @@ public enum AnchorState { /** * 点击（下发的消息被点击） */ - CLICK(0100, "消息被点击"), + CLICK(64, "消息被点击"), ; private final Integer code; private final String description; - - /** - * 通过code获取描述 - * - * @param code - * @return - */ - public static String getDescriptionByCode(Integer code) { - for (AnchorState anchorState : AnchorState.values()) { - if (anchorState.getCode().equals(code)) { - return anchorState.getDescription(); - } - } - return "未知点位"; - } - } diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/AuditStatus.java b/austin-common/src/main/java/com/java3y/austin/common/enums/AuditStatus.java index 97797ff..7e2e8a8 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/AuditStatus.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/AuditStatus.java @@ -12,7 +12,7 @@ import lombok.ToString; @Getter @ToString @AllArgsConstructor -public enum AuditStatus { +public enum AuditStatus implements PowerfulEnum { /** * 10.待审核 diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/ChannelType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/ChannelType.java index 16ca665..2fe1f5c 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/ChannelType.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/ChannelType.java @@ -6,6 +6,9 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.ToString; +import java.util.Arrays; +import java.util.Objects; + /** * 发送渠道类型枚举 * @@ -14,7 +17,7 @@ import lombok.ToString; @Getter @ToString @AllArgsConstructor -public enum ChannelType { +public enum ChannelType implements PowerfulEnum { /** @@ -94,28 +97,8 @@ public enum ChannelType { * @return */ public static Class getChanelModelClassByCode(Integer code) { - ChannelType[] values = values(); - for (ChannelType value : values) { - if (value.getCode().equals(code)) { - return value.getContentModelClass(); - } - } - return null; - } - - /** - * 通过code获取enum - * - * @param code - * @return - */ - public static ChannelType getEnumByCode(Integer code) { - ChannelType[] values = values(); - for (ChannelType value : values) { - if (value.getCode().equals(code)) { - return value; - } - } - return null; + return Arrays.stream(values()).filter(channelType -> Objects.equals(code, channelType.getCode())) + .map(ChannelType::getContentModelClass) + .findFirst().orElse(null); } } diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/DeduplicationType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/DeduplicationType.java index 1cfa77f..a57d162 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/DeduplicationType.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/DeduplicationType.java @@ -5,7 +5,9 @@ import lombok.Getter; import lombok.ToString; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; /** * 去重类型枚举 @@ -15,7 +17,7 @@ import java.util.List; @Getter @ToString @AllArgsConstructor -public enum DeduplicationType { +public enum DeduplicationType implements PowerfulEnum { /** * 相同内容去重 @@ -29,18 +31,4 @@ public enum DeduplicationType { ; private final Integer code; private final String description; - - - /** - * 获取去重渠道的列表 - * - * @return - */ - public static List getDeduplicationList() { - ArrayList result = new ArrayList<>(); - for (DeduplicationType value : DeduplicationType.values()) { - result.add(value.getCode()); - } - return result; - } } diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/EnumUtil.java b/austin-common/src/main/java/com/java3y/austin/common/enums/EnumUtil.java new file mode 100644 index 0000000..51dcb3e --- /dev/null +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/EnumUtil.java @@ -0,0 +1,30 @@ +package com.java3y.austin.common.enums; + +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +public class EnumUtil { + + private EnumUtil() { + } + + public static String getDescriptionByCode(Integer code, Class enumClass) { + return Arrays.stream(enumClass.getEnumConstants()) + .filter(e -> Objects.equals(e.getCode(), code)) + .findFirst().map(PowerfulEnum::getDescription).orElse(""); + } + + public static T getEnumByCode(Integer code, Class enumClass) { + return Arrays.stream(enumClass.getEnumConstants()) + .filter(e -> Objects.equals(e.getCode(), code)) + .findFirst().orElse(null); + } + + public static List getCodeList(Class enumClass) { + return Arrays.stream(enumClass.getEnumConstants()) + .map(PowerfulEnum::getCode) + .collect(Collectors.toList()); + } +} diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/FileType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/FileType.java index 8d57357..02adb20 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/FileType.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/FileType.java @@ -13,33 +13,25 @@ import lombok.ToString; @Getter @ToString @AllArgsConstructor -public enum FileType { +public enum FileType implements PowerfulEnum { /** * 图片 */ - IMAGE("10", "image"), + IMAGE(10, "image"), /** * 语音 */ - VOICE("20", "voice"), + VOICE(20, "voice"), /** * 普通文件 */ - COMMON_FILE("30", "file"), + COMMON_FILE(30, "file"), /** * 视频 */ - VIDEO("40", "video"), + VIDEO(40, "video"), ; - private final String code; - private final String name; + private final Integer code; + private final String description; - public static String getNameByCode(String code) { - for (FileType fileType : FileType.values()) { - if (fileType.getCode().equals(code)) { - return fileType.getName(); - } - } - return null; - } } diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/IdType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/IdType.java index 2861f48..e4be0d9 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/IdType.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/IdType.java @@ -13,7 +13,7 @@ import lombok.ToString; @Getter @ToString @AllArgsConstructor -public enum IdType { +public enum IdType implements PowerfulEnum { /** * 站内userId */ diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/MessageStatus.java b/austin-common/src/main/java/com/java3y/austin/common/enums/MessageStatus.java index 0d29926..5e0bb52 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/MessageStatus.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/MessageStatus.java @@ -11,7 +11,7 @@ import lombok.ToString; @Getter @ToString @AllArgsConstructor -public enum MessageStatus { +public enum MessageStatus implements PowerfulEnum { /** * 10.新建 diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/MessageType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/MessageType.java index de40d1f..7b97462 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/MessageType.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/MessageType.java @@ -4,6 +4,9 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.ToString; +import java.util.Arrays; +import java.util.Objects; + /** * 发送的消息类型 * @@ -12,7 +15,7 @@ import lombok.ToString; @Getter @ToString @AllArgsConstructor -public enum MessageType { +public enum MessageType implements PowerfulEnum { /** * 通知类消息 @@ -44,21 +47,4 @@ public enum MessageType { private final String codeEn; - /** - * 通过code获取enum - * - * @param code - * @return - */ - public static MessageType getEnumByCode(Integer code) { - MessageType[] values = values(); - for (MessageType value : values) { - if (value.getCode().equals(code)) { - return value; - } - } - return null; - } - - } diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/PowerfulEnum.java b/austin-common/src/main/java/com/java3y/austin/common/enums/PowerfulEnum.java new file mode 100644 index 0000000..6d9f8fa --- /dev/null +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/PowerfulEnum.java @@ -0,0 +1,9 @@ +package com.java3y.austin.common.enums; + +public interface PowerfulEnum { + + Integer getCode(); + + String getDescription(); + +} diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/RespStatusEnum.java b/austin-common/src/main/java/com/java3y/austin/common/enums/RespStatusEnum.java index c745ba0..4830964 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/RespStatusEnum.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/RespStatusEnum.java @@ -13,7 +13,7 @@ import lombok.ToString; @Getter @ToString @AllArgsConstructor -public enum RespStatusEnum { +public enum RespStatusEnum { /** * 错误 diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/ShieldType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/ShieldType.java index e5e68d4..74770db 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/ShieldType.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/ShieldType.java @@ -12,7 +12,7 @@ import lombok.ToString; @Getter @ToString @AllArgsConstructor -public enum ShieldType { +public enum ShieldType implements PowerfulEnum { /** @@ -30,6 +30,4 @@ public enum ShieldType { private final Integer code; private final String description; - - } diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/SmsStatus.java b/austin-common/src/main/java/com/java3y/austin/common/enums/SmsStatus.java index c7d2511..b3976ac 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/SmsStatus.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/SmsStatus.java @@ -12,7 +12,7 @@ import lombok.ToString; @Getter @ToString @AllArgsConstructor -public enum SmsStatus { +public enum SmsStatus implements PowerfulEnum{ /** * 调用渠道接口发送成功 @@ -33,22 +33,4 @@ public enum SmsStatus { private final Integer code; private final String description; - - - /** - * 根据状态获取描述信息 - * - * @param code - * @return - */ - public static String getDescriptionByStatus(Integer code) { - for (SmsStatus value : SmsStatus.values()) { - if (value.getCode().equals(code)) { - return value.getDescription(); - } - } - return ""; - } - - } diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/SmsSupplier.java b/austin-common/src/main/java/com/java3y/austin/common/enums/SmsSupplier.java index 1fcc07b..f986478 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/SmsSupplier.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/SmsSupplier.java @@ -13,7 +13,7 @@ import lombok.ToString; @Getter @ToString @AllArgsConstructor -public enum SmsSupplier { +public enum SmsSupplier implements PowerfulEnum { /** @@ -27,19 +27,4 @@ public enum SmsSupplier { private final Integer code; private final String description; - - /** - * 根据状态获取描述信息 - * - * @param code - * @return - */ - public static String getDescriptionByStatus(Integer code) { - for (SmsStatus value : SmsStatus.values()) { - if (value.getCode().equals(code)) { - return value.getDescription(); - } - } - return ""; - } } diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/TemplateType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/TemplateType.java index 2900033..6e80ee4 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/TemplateType.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/TemplateType.java @@ -12,7 +12,7 @@ import lombok.ToString; @Getter @ToString @AllArgsConstructor -public enum TemplateType { +public enum TemplateType implements PowerfulEnum { /** * 定时类的模板(后台定时调用) From c64889f3c4401999be82443380bbb39db9f292f2 Mon Sep 17 00:00:00 2001 From: kyw7 <641364175@qq.com> Date: Tue, 11 Apr 2023 12:16:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=BAenum=E6=B7=BB=E5=8A=A0=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E7=9A=84int=E5=88=B0enum=E7=9A=84=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/deduplication/DeduplicationRuleService.java | 3 ++- .../austin/handler/flowcontrol/FlowControlFactory.java | 3 ++- .../java3y/austin/handler/utils/GroupIdMappingUtils.java | 5 +++-- .../java3y/austin/web/service/impl/DataServiceImpl.java | 5 +++-- .../austin/web/service/impl/MaterialServiceImpl.java | 6 ++++-- .../java/com/java3y/austin/web/utils/Convert4Amis.java | 7 ++++--- 6 files changed, 18 insertions(+), 11 deletions(-) diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/DeduplicationRuleService.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/DeduplicationRuleService.java index bf9595d..b26a59f 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/DeduplicationRuleService.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/DeduplicationRuleService.java @@ -3,6 +3,7 @@ package com.java3y.austin.handler.deduplication; import com.java3y.austin.common.constant.CommonConstant; import com.java3y.austin.common.domain.TaskInfo; import com.java3y.austin.common.enums.DeduplicationType; +import com.java3y.austin.common.enums.EnumUtil; import com.java3y.austin.support.service.ConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -31,7 +32,7 @@ public class DeduplicationRuleService { String deduplicationConfig = config.getProperty(DEDUPLICATION_RULE_KEY, CommonConstant.EMPTY_JSON_OBJECT); // 去重 - List deduplicationList = DeduplicationType.getDeduplicationList(); + List deduplicationList = EnumUtil.getCodeList(DeduplicationType.class); for (Integer deduplicationType : deduplicationList) { DeduplicationParam deduplicationParam = deduplicationHolder.selectBuilder(deduplicationType).build(deduplicationConfig, taskInfo); if (Objects.nonNull(deduplicationParam)) { diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/FlowControlFactory.java b/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/FlowControlFactory.java index d55e258..f163c9e 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/FlowControlFactory.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/FlowControlFactory.java @@ -6,6 +6,7 @@ import com.google.common.util.concurrent.RateLimiter; import com.java3y.austin.common.constant.CommonConstant; import com.java3y.austin.common.domain.TaskInfo; import com.java3y.austin.common.enums.ChannelType; +import com.java3y.austin.common.enums.EnumUtil; import com.java3y.austin.handler.enums.RateLimitStrategy; import com.java3y.austin.handler.flowcontrol.annotations.LocalRateLimit; import com.java3y.austin.support.service.ConfigService; @@ -63,7 +64,7 @@ public class FlowControlFactory implements ApplicationContextAware { double costTime = flowControlService.flowControl(taskInfo, flowControlParam); if (costTime > 0) { log.info("consumer {} flow control time {}", - ChannelType.getEnumByCode(taskInfo.getSendChannel()).getDescription(), costTime); + EnumUtil.getEnumByCode(taskInfo.getSendChannel(), ChannelType.class).getDescription(), costTime); } } diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/utils/GroupIdMappingUtils.java b/austin-handler/src/main/java/com/java3y/austin/handler/utils/GroupIdMappingUtils.java index 183e799..3a8802c 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/utils/GroupIdMappingUtils.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/utils/GroupIdMappingUtils.java @@ -3,6 +3,7 @@ package com.java3y.austin.handler.utils; import com.java3y.austin.common.domain.TaskInfo; import com.java3y.austin.common.enums.ChannelType; +import com.java3y.austin.common.enums.EnumUtil; import com.java3y.austin.common.enums.MessageType; import java.util.ArrayList; @@ -37,8 +38,8 @@ public class GroupIdMappingUtils { * @return */ public static String getGroupIdByTaskInfo(TaskInfo taskInfo) { - String channelCodeEn = ChannelType.getEnumByCode(taskInfo.getSendChannel()).getCodeEn(); - String msgCodeEn = MessageType.getEnumByCode(taskInfo.getMsgType()).getCodeEn(); + String channelCodeEn = EnumUtil.getEnumByCode(taskInfo.getSendChannel(), ChannelType.class).getCodeEn(); + String msgCodeEn = EnumUtil.getEnumByCode(taskInfo.getMsgType(),MessageType.class).getCodeEn(); return channelCodeEn + "." + msgCodeEn; } } diff --git a/austin-web/src/main/java/com/java3y/austin/web/service/impl/DataServiceImpl.java b/austin-web/src/main/java/com/java3y/austin/web/service/impl/DataServiceImpl.java index dbfca46..2ac25e2 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/service/impl/DataServiceImpl.java +++ b/austin-web/src/main/java/com/java3y/austin/web/service/impl/DataServiceImpl.java @@ -11,6 +11,7 @@ import com.java3y.austin.common.constant.AustinConstant; import com.java3y.austin.common.domain.SimpleAnchorInfo; import com.java3y.austin.common.enums.AnchorState; import com.java3y.austin.common.enums.ChannelType; +import com.java3y.austin.common.enums.EnumUtil; import com.java3y.austin.support.dao.MessageTemplateDao; import com.java3y.austin.support.dao.SmsRecordDao; import com.java3y.austin.support.domain.MessageTemplate; @@ -83,7 +84,7 @@ public class DataServiceImpl implements DataService { sb.append(StrPool.CRLF); } String startTime = DateUtil.format(new Date(simpleAnchorInfo.getTimestamp()), DatePattern.NORM_DATETIME_PATTERN); - String stateDescription = AnchorState.getDescriptionByCode(simpleAnchorInfo.getState()); + String stateDescription = EnumUtil.getDescriptionByCode(simpleAnchorInfo.getState(), AnchorState.class); sb.append(startTime).append(StrPool.C_COLON).append(stateDescription).append("==>"); } @@ -91,7 +92,7 @@ public class DataServiceImpl implements DataService { if (StrUtil.isNotBlank(detail)) { UserTimeLineVo.ItemsVO itemsVO = UserTimeLineVo.ItemsVO.builder() .businessId(entry.getKey()) - .sendType(ChannelType.getEnumByCode(messageTemplate.getSendChannel()).getDescription()) + .sendType(EnumUtil.getEnumByCode(messageTemplate.getSendChannel(), ChannelType.class).getDescription()) .creator(messageTemplate.getCreator()) .title(messageTemplate.getName()) .detail(detail) diff --git a/austin-web/src/main/java/com/java3y/austin/web/service/impl/MaterialServiceImpl.java b/austin-web/src/main/java/com/java3y/austin/web/service/impl/MaterialServiceImpl.java index 3fabfdc..ab6cb3d 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/service/impl/MaterialServiceImpl.java +++ b/austin-web/src/main/java/com/java3y/austin/web/service/impl/MaterialServiceImpl.java @@ -12,6 +12,7 @@ import com.google.common.base.Throwables; import com.java3y.austin.common.constant.CommonConstant; import com.java3y.austin.common.constant.SendAccountConstant; import com.java3y.austin.common.dto.account.EnterpriseWeChatRobotAccount; +import com.java3y.austin.common.enums.EnumUtil; import com.java3y.austin.common.enums.FileType; import com.java3y.austin.common.enums.RespStatusEnum; import com.java3y.austin.common.vo.BasicResultVO; @@ -56,7 +57,7 @@ public class MaterialServiceImpl implements MaterialService { FileItem item = new FileItem(new StringBuilder().append(IdUtil.fastSimpleUUID()).append(file.getOriginalFilename()).toString(), file.getInputStream()); req.setMedia(item); - req.setType(FileType.getNameByCode(fileType)); + req.setType(EnumUtil.getDescriptionByCode(Integer.valueOf(fileType), FileType.class)); rsp = client.execute(req, accessToken); if (rsp.getErrcode() == 0L) { return new BasicResultVO(RespStatusEnum.SUCCESS, UploadResponseVo.builder().id(rsp.getMediaId()).build()); @@ -94,7 +95,8 @@ public class MaterialServiceImpl implements MaterialService { WxCpDefaultConfigImpl accountConfig = accountUtils.getAccountById(Integer.valueOf(sendAccount), WxCpDefaultConfigImpl.class); WxCpServiceImpl wxCpService = new WxCpServiceImpl(); wxCpService.setWxCpConfigStorage(accountConfig); - WxMediaUploadResult result = wxCpService.getMediaService().upload(FileType.getNameByCode(fileType), SpringFileUtils.getFile(multipartFile)); + WxMediaUploadResult result = wxCpService.getMediaService() + .upload(EnumUtil.getDescriptionByCode(Integer.valueOf(fileType), FileType.class), SpringFileUtils.getFile(multipartFile)); if (StrUtil.isNotBlank(result.getMediaId())) { return new BasicResultVO(RespStatusEnum.SUCCESS, UploadResponseVo.builder().id(result.getMediaId()).build()); } diff --git a/austin-web/src/main/java/com/java3y/austin/web/utils/Convert4Amis.java b/austin-web/src/main/java/com/java3y/austin/web/utils/Convert4Amis.java index 296c32d..d3a34e6 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/utils/Convert4Amis.java +++ b/austin-web/src/main/java/com/java3y/austin/web/utils/Convert4Amis.java @@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.java3y.austin.common.enums.AnchorState; import com.java3y.austin.common.enums.ChannelType; +import com.java3y.austin.common.enums.EnumUtil; import com.java3y.austin.common.enums.SmsStatus; import com.java3y.austin.support.domain.ChannelAccount; import com.java3y.austin.support.domain.SmsRecord; @@ -389,7 +390,7 @@ public class Convert4Amis { if (CollUtil.isNotEmpty(anchorResult)) { anchorResult = MapUtil.sort(anchorResult); for (Map.Entry entry : anchorResult.entrySet()) { - String description = AnchorState.getDescriptionByCode(Integer.valueOf(String.valueOf(entry.getKey()))); + String description = EnumUtil.getDescriptionByCode((Integer) entry.getKey(),AnchorState.class); xAxisList.add(description); actualData.add(Integer.valueOf(String.valueOf(entry.getValue()))); } @@ -426,10 +427,10 @@ public class Convert4Amis { if (smsRecord.getMessageTemplateId() > 0) { itemsVO.setBusinessId(String.valueOf(smsRecord.getMessageTemplateId())); itemsVO.setContent(smsRecord.getMsgContent()); - itemsVO.setSendType(SmsStatus.getDescriptionByStatus(smsRecord.getStatus())); + itemsVO.setSendType(EnumUtil.getDescriptionByCode(smsRecord.getStatus(),SmsStatus.class)); itemsVO.setSendTime(DateUtil.format(new Date(Long.valueOf(smsRecord.getCreated() * 1000L)), DatePattern.NORM_DATETIME_PATTERN)); } else { - itemsVO.setReceiveType(SmsStatus.getDescriptionByStatus(smsRecord.getStatus())); + itemsVO.setReceiveType(EnumUtil.getDescriptionByCode(smsRecord.getStatus(),SmsStatus.class)); itemsVO.setReceiveContent(smsRecord.getReportContent()); itemsVO.setReceiveTime(DateUtil.format(new Date(Long.valueOf(smsRecord.getUpdated() * 1000L)), DatePattern.NORM_DATETIME_PATTERN)); }