feat:新增：1.阿里云电话通知。2.删除设备时同时删除该设备的告警

@@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.thingsboard.rule.engine.api.msg.DeviceCredentialsUpdateNotificationMsg;
@@ -39,6 +40,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.entities.TkUserCollectEntity;
+import org.thingsboard.server.dao.yunteng.service.TkAlarmInfoService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 import org.thingsboard.server.dao.yunteng.service.TkUserCollectService;
@@ -63,6 +65,7 @@ public class TkDeviceController extends BaseController {
   private final ObjectMapper objectMapper;
   private final TkDeviceProfileService ytDeviceProfileService;
   private final GatewayNotificationsService gatewayNotificationsService;
+  private final TkAlarmInfoService tkAlarmInfoService ;
 
 
   @PostMapping
@@ -314,6 +317,7 @@ public class TkDeviceController extends BaseController {
 
   @DeleteMapping
   @ApiOperation("删除")
+  @Transactional
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:device:delete'})")
   public void deleteDevices(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
       throws ThingsboardException {
@@ -322,6 +326,7 @@ public class TkDeviceController extends BaseController {
     if(null !=tdIds){
       for (String id : tdIds) {
         deleteTbDevice(id);
+        tkAlarmInfoService.deleteByDeviceId(currentTenantId,id);
       }
       tkdeviceService.deleteDevices(currentTenantId, deleteDTO.getIds());
     }

@@ -132,6 +132,11 @@
             <artifactId>alibaba-dingtalk-service-sdk</artifactId>
             <version>2.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>dyvmsapi20170525</artifactId>
+            <version>2.1.4</version>
+        </dependency>
         <!-- 腾讯云短信 -->
         <dependency>
             <groupId>com.tencentcloudapi</groupId>

@@ -5,13 +5,15 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import org.thingsboard.server.common.data.yunteng.config.dingtalk.DingTalkSmsProviderConfiguration;
 import org.thingsboard.server.common.data.yunteng.config.message.ali.AliSmsProviderConfiguration;
 import org.thingsboard.server.common.data.yunteng.config.message.tencent.TencentSmsProviderConfiguration;
+import org.thingsboard.server.common.data.yunteng.config.voice.AliVoiceSmsProviderConfiguration;
 import org.thingsboard.server.common.data.yunteng.enums.MessageProviderTypeEnum;
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
 @JsonSubTypes({
-  @JsonSubTypes.Type(value = AliSmsProviderConfiguration.class, name = "ALI_CLOUD"),
-  @JsonSubTypes.Type(value = TencentSmsProviderConfiguration.class, name = "TENCENT_CLOUD"),
-  @JsonSubTypes.Type(value = DingTalkSmsProviderConfiguration.class, name = "DING_TALK")
+        @JsonSubTypes.Type(value = AliSmsProviderConfiguration.class, name = "ALI_CLOUD"),
+        @JsonSubTypes.Type(value = TencentSmsProviderConfiguration.class, name = "TENCENT_CLOUD"),
+        @JsonSubTypes.Type(value = DingTalkSmsProviderConfiguration.class, name = "DING_TALK"),
+        @JsonSubTypes.Type(value = AliVoiceSmsProviderConfiguration.class, name = "ALI_VOICE")
 })
 public interface MessageProviderConfiguration {
 

@@ -7,6 +7,8 @@ import org.thingsboard.server.common.data.yunteng.config.message.ali.AliSmsProvi
 import org.thingsboard.server.common.data.yunteng.config.message.ali.AliSmsSender;
 import org.thingsboard.server.common.data.yunteng.config.message.tencent.TencentSmsProviderConfiguration;
 import org.thingsboard.server.common.data.yunteng.config.message.tencent.TencentSmsSender;
+import org.thingsboard.server.common.data.yunteng.config.voice.AliVoiceSmsProviderConfiguration;
+import org.thingsboard.server.common.data.yunteng.config.voice.AliVoiceSmsSender;
 
 import java.util.HashMap;
 import java.util.List;
@@ -40,6 +42,9 @@ public class TkDefaultMessageSenderFactory implements MessageSenderFactory {
                 (DingTalkSmsProviderConfiguration) config);
         smsSenderMap.put(key,dingTalkSmsSender);
         return dingTalkSmsSender;
+      case ALI_VOICE:
+        return new AliVoiceSmsSender(
+                (AliVoiceSmsProviderConfiguration) config);
       default:
         throw new RuntimeException("Unknown SMS provider type " + config.getType());
     }

+package org.thingsboard.server.common.data.yunteng.config.voice;
+
+import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.config.message.MessageProviderConfiguration;
+import org.thingsboard.server.common.data.yunteng.enums.MessageProviderTypeEnum;
+
+@Data
+public class AliVoiceSmsProviderConfiguration implements MessageProviderConfiguration {
+
+  /** 阿里云AccessKeyId */
+  private String accessKeyId;
+
+  /** 阿里云AccessKeySecret */
+  private String accessKeySecret;
+
+  @Override
+  public MessageProviderTypeEnum getType() {
+    return MessageProviderTypeEnum.ALI_VOICE;
+  }
+}

+package org.thingsboard.server.common.data.yunteng.config.voice;
+
+
+
+import com.aliyun.dyvmsapi20170525.Client;
+import com.aliyun.dyvmsapi20170525.models.SingleCallByTtsRequest;
+import com.aliyun.dyvmsapi20170525.models.SingleCallByTtsResponse;
+import com.aliyun.teaopenapi.models.Config;
+import com.aliyun.teautil.models.RuntimeOptions;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.thingsboard.server.common.data.yunteng.config.message.AbstractMessageSender;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.enums.ResponseCodeEnum;
+
+import java.util.LinkedHashMap;
+
+@Slf4j
+public class AliVoiceSmsSender extends AbstractMessageSender {
+
+  /** 阿里云短信参数配置 */
+  private final AliVoiceSmsProviderConfiguration config;
+
+  private Config profile;
+
+  public AliVoiceSmsSender(AliVoiceSmsProviderConfiguration config) {
+    if (StringUtils.isEmpty(config.getAccessKeyId())
+        || StringUtils.isEmpty(config.getAccessKeyId())) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    this.config = config;
+    initProfile();
+  }
+
+  /** 使用AK&SK初始化账号Client */
+  private void initProfile() {
+    String endpoint = "dyvmsapi.aliyuncs.com";
+    profile = new Config();
+    profile.setAccessKeyId(config.getAccessKeyId());
+    profile.setAccessKeySecret(config.getAccessKeySecret());
+    profile.setEndpoint(endpoint);
+  }
+
+  @Override
+  public String sendSms(
+      String phone, String templateCode, LinkedHashMap<String, Object> param, String signName) {
+    validatePhoneNumber(phone);
+    if (null == param || param.isEmpty()) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    try {
+      Client client = new Client(profile);
+      SingleCallByTtsRequest singleCallByTtsRequest  =  new SingleCallByTtsRequest();
+      singleCallByTtsRequest.setCalledShowNumber(StringUtils.isEmpty(signName)?null:signName);
+      singleCallByTtsRequest.setCalledNumber(phone);
+      singleCallByTtsRequest.setTtsCode(templateCode);
+      String TtsCodeParam = "{\"deviceName\":\""+param.get("deviceName")+"\",\"severity\":\""+param.get("severity")+"\"}";
+      singleCallByTtsRequest.setTtsParam(TtsCodeParam);
+      singleCallByTtsRequest.setSpeed(-100);
+      RuntimeOptions runtimeOptions = new RuntimeOptions();
+      SingleCallByTtsResponse response =  client.singleCallByTtsWithOptions(singleCallByTtsRequest,runtimeOptions);
+      return response.getBody().getCode().equalsIgnoreCase(ResponseCodeEnum.OK.name())
+          ? ResponseCodeEnum.SUCCESS.name()
+          : response.getBody().getMessage();
+    } catch (Exception e) {
+      e.printStackTrace();
+      return e.getMessage();
+    }
+  }
+}

@@ -4,5 +4,6 @@ package org.thingsboard.server.common.data.yunteng.enums;
 public enum MessageProviderTypeEnum {
   ALI_CLOUD,
   TENCENT_CLOUD,
-  DING_TALK
+  DING_TALK,
+  ALI_VOICE
 }

@@ -5,5 +5,6 @@ public enum MessageTypeEnum {
   EMAIL_MESSAGE,
   PHONE_MESSAGE,
   DING_TALK_MESSAGE,
-  WECHAT_MESSAGE
+  WECHAT_MESSAGE,
+  VOICE_MESSAGE
 }

@@ -122,4 +122,10 @@ public class TkAlarmInfoServiceImpl implements TkAlarmInfoService {
   public List<SysDictDTO> alarmType(TenantId tenantId) {
     return ReflectUtils.sourceToTarget(tkJpaAarmDao.alarmType(tenantId.getId()), SysDictDTO.class);
   }
+
+  @Override
+  public void deleteByDeviceId(String tenantId, String tbDeviceId) {
+    tkJpaAarmDao.deleteByDeviceId(tenantId,tbDeviceId);
+  }
+
 }

@@ -66,13 +66,13 @@ public class TkMessageServiceImpl implements TkMessageService {
     }
     /** 消息模板是否可用 */
     QueryWrapper<TkMessageTemplateEntity> messageTemplateQueryWrapper =
-        new QueryWrapper<TkMessageTemplateEntity>();
+            new QueryWrapper<TkMessageTemplateEntity>();
     messageTemplateQueryWrapper
-        .lambda()
-        .eq(TkMessageTemplateEntity::getId, templateId)
-        .eq(TkMessageTemplateEntity::getStatus, AssetStatusEnum.ENABLE.ordinal());
+            .lambda()
+            .eq(TkMessageTemplateEntity::getId, templateId)
+            .eq(TkMessageTemplateEntity::getStatus, AssetStatusEnum.ENABLE.ordinal());
     TkMessageTemplateEntity messageTemplate =
-        messageTemplateMapper.selectOne(messageTemplateQueryWrapper);
+            messageTemplateMapper.selectOne(messageTemplateQueryWrapper);
     if (null == messageTemplate) {
       throw new TkDataValidationException(ErrorMessage.MESSAGE_TEMPLATE_NOT_EXISTS.getMessage());
     }
@@ -87,12 +87,12 @@ public class TkMessageServiceImpl implements TkMessageService {
 
     boolean isMatch = true;
     if (platForm.equals(MessageProviderTypeEnum.TENCENT_CLOUD.name())
-        && (null == configJsonNode.get("appId")
+            && (null == configJsonNode.get("appId")
             || null == configJsonNode.get("secretId")
             || null == configJsonNode.get("secretKey"))) {
       isMatch = false;
     } else if (platForm.equals(MessageProviderTypeEnum.ALI_CLOUD.name())
-        && (null == configJsonNode.get("accessKeyId")
+            && (null == configJsonNode.get("accessKeyId")
             || null == configJsonNode.get("accessKeySecret"))) {
       isMatch = false;
     }
@@ -102,6 +102,11 @@ public class TkMessageServiceImpl implements TkMessageService {
             || null == configJsonNode.get("clientSecret"))) {
       isMatch = false;
     }
+    else if (platForm.equals(MessageProviderTypeEnum.ALI_VOICE.name())
+            && (null == configJsonNode.get("accessKeyId")
+            || null == configJsonNode.get("accessKeySecret"))) {
+      isMatch = false;
+    }
     if (!isMatch) {
       throw new TkDataValidationException(ErrorMessage.SMS_CONFIG_ERROR.getMessage());
     }
@@ -113,16 +118,16 @@ public class TkMessageServiceImpl implements TkMessageService {
       keyList.add(messageConfig.getTenantId());
     }
     MessageProviderConfiguration smsProviderConfiguration =
-        JacksonUtil.convertValue(configObjectNode, MessageProviderConfiguration.class);
+            JacksonUtil.convertValue(configObjectNode, MessageProviderConfiguration.class);
     if (null != smsProviderConfiguration) {
       MessageSender smsSender = tkDefaultSmsSenderFactory.createSmsSender(smsProviderConfiguration
               ,keyList);
       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();
@@ -151,34 +156,34 @@ public class TkMessageServiceImpl implements TkMessageService {
   public boolean sendSmsCode(String phoneNumber, MsgTemplatePurposeEnum purpose) {
     // 检查手机号码是否存在系统，以免乱发消息
     List<SysUserEntity> users =
-        userMapper.selectList(
-            new QueryWrapper<SysUserEntity>()
-                .lambda()
-                .eq(SysUserEntity::getPhoneNumber, phoneNumber));
+            userMapper.selectList(
+                    new QueryWrapper<SysUserEntity>()
+                            .lambda()
+                            .eq(SysUserEntity::getPhoneNumber, phoneNumber));
     if (users.isEmpty()) {
       throw new TkDataValidationException("电话号码未在系统注册，请联系你的管理员");
     }
     if (users.get(0).getAccountExpireTime() != null
-        && users.get(0).getAccountExpireTime().isBefore(LocalDateTime.now())) {
+            && users.get(0).getAccountExpireTime().isBefore(LocalDateTime.now())) {
       throw new TkDataValidationException(ErrorMessage.ACCOUNT_HAS_EXPIRED.getMessage());
     }
     // 获取是否有验证码存在，防止发送数量过多
     String key =
-        purpose.name()
-            + DEFAULT_DELIMITER
-            + MessageTypeEnum.PHONE_MESSAGE.name()
-            + DEFAULT_DELIMITER
-            + phoneNumber;
+            purpose.name()
+                    + DEFAULT_DELIMITER
+                    + MessageTypeEnum.PHONE_MESSAGE.name()
+                    + DEFAULT_DELIMITER
+                    + phoneNumber;
     boolean canSend =
-        cacheUtils
-            .get(MOBILE_LOGIN_SMS_CODE, key)
-            .map(
-                o -> {
-                  CodeTTL codeTTL = (CodeTTL) o;
-                  return System.currentTimeMillis() - codeTTL.getSendTs()
-                      >= 60 * 1000; // 大于1分钟才允许下次再发送短信
-                })
-            .orElse(true);
+            cacheUtils
+                    .get(MOBILE_LOGIN_SMS_CODE, key)
+                    .map(
+                            o -> {
+                              CodeTTL codeTTL = (CodeTTL) o;
+                              return System.currentTimeMillis() - codeTTL.getSendTs()
+                                      >= 60 * 1000; // 大于1分钟才允许下次再发送短信
+                            })
+                    .orElse(true);
     if (!canSend) {
       throw new TkDataValidationException(ErrorMessage.MESSAGE_SEND_TOO_FAST.getMessage());
     }
@@ -186,15 +191,15 @@ public class TkMessageServiceImpl implements TkMessageService {
     /** 消息模板是否可用 */
     SysUserEntity entity = users.get(0);
     List<TkMessageTemplateEntity> messageTemplates =
-        messageTemplateMapper.selectList(
-            new QueryWrapper<TkMessageTemplateEntity>()
-                .lambda()
-                .eq(
-                    TkMessageTemplateEntity::getTenantId,
-                    entity.getLevel() == 3 ? entity.getTenantId() : EntityId.NULL_UUID.toString())
-                .eq(TkMessageTemplateEntity::getStatus, 1)
-                .eq(TkMessageTemplateEntity::getTemplatePurpose, purpose.name())
-                .eq(TkMessageTemplateEntity::getMessageType, MessageTypeEnum.PHONE_MESSAGE.name()));
+            messageTemplateMapper.selectList(
+                    new QueryWrapper<TkMessageTemplateEntity>()
+                            .lambda()
+                            .eq(
+                                    TkMessageTemplateEntity::getTenantId,
+                                    entity.getLevel() == 3 ? entity.getTenantId() : EntityId.NULL_UUID.toString())
+                            .eq(TkMessageTemplateEntity::getStatus, 1)
+                            .eq(TkMessageTemplateEntity::getTemplatePurpose, purpose.name())
+                            .eq(TkMessageTemplateEntity::getMessageType, MessageTypeEnum.PHONE_MESSAGE.name()));
     if (messageTemplates.isEmpty()) {
       throw new TkDataValidationException(ErrorMessage.MESSAGE_TEMPLATE_NOT_EXISTS.getMessage());
     }

@@ -153,6 +153,14 @@ public class TkNoticeServiceImpl implements TkNoticeService {
                     organization,
                     contacts);
               }
+                if (messageCode.contains(MessageTypeEnum.VOICE_MESSAGE.name())
+                        && templatesMap.containsKey(MessageTypeEnum.VOICE_MESSAGE.name())) {
+                    aLiVoice4Alarm(
+                            alarmInfo,
+                            templatesMap.get(MessageTypeEnum.VOICE_MESSAGE.name()),
+                            organization,
+                            contacts);
+                }
             });
   }
 
@@ -289,6 +297,35 @@ public class TkNoticeServiceImpl implements TkNoticeService {
             });
   }
 
+    /**
+     * 电话通知设备告警信息
+     *
+     * @param alarmInfo 告警信息
+     * @param templateId 告警模板主键
+     * @param organization 设备所属组织
+     * @param contacts 设备告警联系人
+     */
+    private void aLiVoice4Alarm(
+            AlarmInfoDTO alarmInfo,
+            String templateId,
+            TkOrganizationEntity organization,
+            List<TkAlarmContactEntity> contacts) {
+        // TODO 电话通知
+        SmsReqDTO info = new SmsReqDTO();
+        info.setId(templateId);
+        info.setParams(setAliAlarmParams(alarmInfo, organization));
+        info.setTemplatePurpose(MsgTemplatePurposeEnum.FOR_ALARM_NOTICE.name());
+        contacts.stream()
+                .parallel()
+                .forEach(
+                        item -> {
+                            if (!item.getPhone().isEmpty()) {
+                                info.setPhoneNumbers(item.getPhone());
+                                smsService.sendSms(info);
+                            }
+                        });
+    }
+
   private LinkedHashMap<String, Object> setAliAlarmParams(
       AlarmInfoDTO alarmInfo, TkOrganizationEntity organization) {
     LinkedHashMap<String, Object> params = new LinkedHashMap<>();

@@ -35,4 +35,5 @@ public interface TkAlarmMapper extends BaseMapper<TkAlarmEntity> {
 
     List<SysDictEntity> alarmType(@Param("tenantId") UUID tenantId);
     List<AggregationDTO> countAlarms(@Param("queryMap") Map<String, Object> queryMap);
+    void deleteByDeviceId(@Param("tenantId") String tenantId, @Param("tbDeviceId") String tbDeviceId);
 }

@@ -53,4 +53,6 @@ public interface TkAlarmInfoService {
    * @return
    */
   List<SysDictDTO> alarmType(TenantId tenantId);
+
+  void deleteByDeviceId(String tenantId, String tbDeviceId);
 }

@@ -119,4 +119,14 @@
         </where>
         GROUP BY status;
     </select>
+
+    <delete id="deleteByDeviceId">
+        delete from alarm where 1=1
+        <if test="tenantId !=null">
+            AND tenant_id= #{tenantId}::uuid
+        </if>
+        <if test="tbDeviceId !=null">
+            AND originator_id= #{tbDeviceId}::uuid
+        </if>
+    </delete>
 </mapper>