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