fix: [DEFECT-905] sms config error throw exception

黄 x
1 parent e5be8978
Showing 2 changed files with 59 additions and 44 deletions
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/message/ErrorMessage.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkSmsServiceImpl.java
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/message/ErrorMessage.java
View file @4af840a
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/message/ErrorMessage.java
View file @4af840a
@@ -85,6 +85,7 @@ public enum ErrorMessage {
   PROJECT_USED_SCRIPT(400061,"产品【%s】正在使用待删除的解析脚本"),
   RULE_CHAIN_NOT_ENABLE(400062,"规则链不是有效的！"),
   DUPLICATE_IDENTIFIERS_EXIST(400063,"存在重复的功能标识符。"),
+  SMS_CONFIG_ERROR(400064,"短信配置错误。"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private String message;
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkSmsServiceImpl.java
View file @4af840a
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkSmsServiceImpl.java
View file @4af840a
 package org.thingsboard.server.dao.yunteng.impl;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -19,10 +18,7 @@ import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidatio
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.request.CodeTTL;
 import org.thingsboard.server.common.data.yunteng.dto.request.SmsReqDTO;
-import org.thingsboard.server.common.data.yunteng.enums.AssetStatusEnum;
-import org.thingsboard.server.common.data.yunteng.enums.MessageTypeEnum;
-import org.thingsboard.server.common.data.yunteng.enums.MsgTemplatePurposeEnum;
-import org.thingsboard.server.common.data.yunteng.enums.ResponseCodeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.*;
 import org.thingsboard.server.dao.yunteng.entities.TkMessageConfigEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkMessageTemplateEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkSmsLogEntity;
@@ -66,44 +62,60 @@ public class TkSmsServiceImpl implements TkSmsService {
     if (StringUtils.isEmpty(phoneNumbers) || StringUtils.isEmpty(templateId)) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
-    /**消息模板是否可用*/
-    QueryWrapper<TkMessageTemplateEntity> messageTemplateQueryWrapper = new QueryWrapper<TkMessageTemplateEntity>();
-    messageTemplateQueryWrapper.lambda()
-            .eq(TkMessageTemplateEntity::getId, templateId)
-            .eq(TkMessageTemplateEntity::getStatus, AssetStatusEnum.ENABLE.ordinal());
-    TkMessageTemplateEntity messageTemplate = messageTemplateMapper.selectOne(messageTemplateQueryWrapper);
+    /** 消息模板是否可用 */
+    QueryWrapper<TkMessageTemplateEntity> messageTemplateQueryWrapper =
+        new QueryWrapper<TkMessageTemplateEntity>();
+    messageTemplateQueryWrapper
+        .lambda()
+        .eq(TkMessageTemplateEntity::getId, templateId)
+        .eq(TkMessageTemplateEntity::getStatus, AssetStatusEnum.ENABLE.ordinal());
+    TkMessageTemplateEntity messageTemplate =
+        messageTemplateMapper.selectOne(messageTemplateQueryWrapper);
     if (null == messageTemplate) {
       throw new YtDataValidationException(ErrorMessage.MESSAGE_TEMPLATE_NOT_EXISTS.getMessage());
     }
-    /**消息配置是否可用*/
+    /** 消息配置是否可用 */
     QueryWrapper<TkMessageConfigEntity> configQueryWrapper = new QueryWrapper<>();
-    configQueryWrapper.lambda()
-            .eq(TkMessageConfigEntity::getId, messageTemplate.getMessageConfigId())
-            .eq(TkMessageConfigEntity::getStatus, AssetStatusEnum.ENABLE.ordinal());
-    TkMessageConfigEntity messageConfig =
-            messageConfigMapper.selectOne(configQueryWrapper);
+    configQueryWrapper
+        .lambda()
+        .eq(TkMessageConfigEntity::getId, messageTemplate.getMessageConfigId())
+        .eq(TkMessageConfigEntity::getStatus, AssetStatusEnum.ENABLE.ordinal());
+    TkMessageConfigEntity messageConfig = messageConfigMapper.selectOne(configQueryWrapper);
     if (null == messageConfig) {
       throw new YtDataValidationException(ErrorMessage.MESSAGE_CONFIG_NOT_EXISTS.getMessage());
     }
     JsonNode configJsonNode = messageConfig.getConfig();
     ObjectNode configObjectNode = (ObjectNode) configJsonNode;
-    configObjectNode.put("type", messageConfig.getPlatformType());
+    String platForm = messageConfig.getPlatformType();
+    configObjectNode.put("type", platForm);
+    boolean isMatch = true;
+    if (platForm.equals(SmsProviderTypeEnum.TENCENT_CLOUD.name())
+        && (null == configJsonNode.get("appId") || null == configJsonNode.get("appKey"))) {
+      isMatch = false;
+    } else if (platForm.equals(SmsProviderTypeEnum.ALI_CLOUD.name())
+        && (null == configJsonNode.get("accessKeyId")
+            || null == configJsonNode.get("accessKeySecret"))) {
+      isMatch = false;
+    }
+    if (!isMatch) {
+      throw new YtDataValidationException(ErrorMessage.SMS_CONFIG_ERROR.getMessage());
+    }
     SmsProviderConfiguration smsProviderConfiguration =
-            JacksonUtil.convertValue(configObjectNode, SmsProviderConfiguration.class);
+        JacksonUtil.convertValue(configObjectNode, SmsProviderConfiguration.class);
     if (null != smsProviderConfiguration) {
       SmsSender smsSender = ytDefaultSmsSenderFactory.createSmsSender(smsProviderConfiguration);
       String result =
-              smsSender.sendSms(
-                      phoneNumbers,
-                      messageTemplate.getTemplateCode(),
-                      templateParam,
-                      messageTemplate.getSignName());
+          smsSender.sendSms(
+              phoneNumbers,
+              messageTemplate.getTemplateCode(),
+              templateParam,
+              messageTemplate.getSignName());
       // 记录短信日志
       String status = ResponseCodeEnum.SUCCESS.name();
-      String remark = smsReqDTO.getRemark()==null?"":smsReqDTO.getRemark();
-      if(!ResponseCodeEnum.SUCCESS.name().equals(result)){
+      String remark = smsReqDTO.getRemark() == null ? "" : smsReqDTO.getRemark();
+      if (!ResponseCodeEnum.SUCCESS.name().equals(result)) {
         status = ResponseCodeEnum.FAILED.name();
         remark += result;
       }
@@ -123,18 +135,21 @@ public class TkSmsServiceImpl implements TkSmsService {
     return false;
   }
-
   @Override
   @Transactional
-  public boolean sendSmsCode(String phoneNumber,MsgTemplatePurposeEnum purpose) {
+  public boolean sendSmsCode(String phoneNumber, MsgTemplatePurposeEnum purpose) {
     // 检查手机号码是否存在系统，以免乱发消息
-    List<SysUserEntity> users = userMapper
-            .selectList(new QueryWrapper<SysUserEntity>().lambda().eq(SysUserEntity::getPhoneNumber, phoneNumber));
+    List<SysUserEntity> users =
+        userMapper.selectList(
+            new QueryWrapper<SysUserEntity>()
+                .lambda()
+                .eq(SysUserEntity::getPhoneNumber, phoneNumber));
     if (users.isEmpty()) {
       throw new YtDataValidationException("电话号码未在系统注册，请联系你的管理员");
     }
-    if(users.get(0).getAccountExpireTime() != null && users.get(0).getAccountExpireTime().isBefore(LocalDateTime.now())){
-      throw  new YtDataValidationException(ErrorMessage.ACCOUNT_HAS_EXPIRED.getMessage());
+    if (users.get(0).getAccountExpireTime() != null
+        && users.get(0).getAccountExpireTime().isBefore(LocalDateTime.now())) {
+      throw new YtDataValidationException(ErrorMessage.ACCOUNT_HAS_EXPIRED.getMessage());
     }
     // 获取是否有验证码存在，防止发送数量过多
     String key =
@@ -157,28 +172,27 @@ public class TkSmsServiceImpl implements TkSmsService {
       throw new YtDataValidationException(ErrorMessage.MESSAGE_SEND_TOO_FAST.getMessage());
     }
-    /**消息模板是否可用*/
+    /** 消息模板是否可用 */
     List<TkMessageTemplateEntity> messageTemplates =
         messageTemplateMapper.selectList(
             new QueryWrapper<TkMessageTemplateEntity>()
                 .lambda()
-                    .eq(TkMessageTemplateEntity::getTenantId, users.get(0).getTenantId())
-                    .eq(TkMessageTemplateEntity::getStatus, 1)
-                    .eq(TkMessageTemplateEntity::getTemplatePurpose, purpose.name())
-                    .eq(TkMessageTemplateEntity::getMessageType, MessageTypeEnum.PHONE_MESSAGE.name()));
+                .eq(TkMessageTemplateEntity::getTenantId, users.get(0).getTenantId())
+                .eq(TkMessageTemplateEntity::getStatus, 1)
+                .eq(TkMessageTemplateEntity::getTemplatePurpose, purpose.name())
+                .eq(TkMessageTemplateEntity::getMessageType, MessageTypeEnum.PHONE_MESSAGE.name()));
     if (messageTemplates.isEmpty()) {
       throw new YtDataValidationException(ErrorMessage.MESSAGE_TEMPLATE_NOT_EXISTS.getMessage());
     }
-    /**消息配置是否可用*/
-
+    /** 消息配置是否可用 */
     TkMessageTemplateEntity messageTemplate = messageTemplates.get(0);
     QueryWrapper<TkMessageConfigEntity> configQueryWrapper = new QueryWrapper<>();
-    configQueryWrapper.lambda()
-            .eq(TkMessageConfigEntity::getId, messageTemplate.getMessageConfigId())
-            .eq(TkMessageConfigEntity::getStatus, AssetStatusEnum.ENABLE.ordinal());
-    TkMessageConfigEntity messageConfig =
-            messageConfigMapper.selectOne(configQueryWrapper);
+    configQueryWrapper
+        .lambda()
+        .eq(TkMessageConfigEntity::getId, messageTemplate.getMessageConfigId())
+        .eq(TkMessageConfigEntity::getStatus, AssetStatusEnum.ENABLE.ordinal());
+    TkMessageConfigEntity messageConfig = messageConfigMapper.selectOne(configQueryWrapper);
     if (null == messageConfig) {
       throw new YtDataValidationException(ErrorMessage.MESSAGE_CONFIG_NOT_EXISTS.getMessage());
     }