Merge branch '20220923' into 'master'

fix(DEFECT-762): 调整邮件推送频率

See merge request huang/thingsboard3.3.2!137

@@ -10,6 +10,8 @@ import org.thingsboard.server.common.data.yunteng.common.AddGroup;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
 import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.MessageTemplateDTO;
 import org.thingsboard.server.common.data.yunteng.dto.MessageTemplateDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.EmailReqDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.EmailReqDTO;
@@ -92,15 +94,19 @@ public class YtMessageTemplateController extends BaseController {
   public ResponseResult<String> sendSms(
   public ResponseResult<String> sendSms(
       @Validated({AddGroup.class}) @RequestBody SmsReqDTO smsReqDTO) {
       @Validated({AddGroup.class}) @RequestBody SmsReqDTO smsReqDTO) {
     boolean result = smsService.sendSms(smsReqDTO);
     boolean result = smsService.sendSms(smsReqDTO);
-    String message = result ? ResponseCodeEnum.SUCCESS.name() : ResponseCodeEnum.FAILED.name();
-    return ResponseResult.success(message);
+    if(!result){
+        throw new YtDataValidationException(ErrorMessage.MESSAGE_SEND_FAILED.getMessage());
+    }
+    return ResponseResult.success(ResponseCodeEnum.SUCCESS.name() );
   }
   }
 
 
   @PostMapping("/send_email")
   @PostMapping("/send_email")
   public ResponseResult<String> sendEmail(
   public ResponseResult<String> sendEmail(
       @Validated({AddGroup.class}) @RequestBody EmailReqDTO emailReqDTO) {
       @Validated({AddGroup.class}) @RequestBody EmailReqDTO emailReqDTO) {
     boolean result = mailService.sendEmail(emailReqDTO);
     boolean result = mailService.sendEmail(emailReqDTO);
-    String message = result ? ResponseCodeEnum.SUCCESS.name() : ResponseCodeEnum.FAILED.name();
-    return ResponseResult.success(message);
+      if(!result){
+          throw new YtDataValidationException(ErrorMessage.MESSAGE_SEND_FAILED.getMessage());
+      }
+    return ResponseResult.success(ResponseCodeEnum.SUCCESS.name() );
   }
   }
 }
 }

@@ -340,6 +340,9 @@ public class RestAuthenticationProvider implements AuthenticationProvider {
     User user = new User();
     User user = new User();
     String tbEmail = optionalUser.get().getUsername() + "@" + accountProperties.getEmailSuffix();
     String tbEmail = optionalUser.get().getUsername() + "@" + accountProperties.getEmailSuffix();
     UserDetailsDTO ytDetailDTO = optionalUser.get();
     UserDetailsDTO ytDetailDTO = optionalUser.get();
+    if(ytDetailDTO.getAccountExpireTime() != null && ytDetailDTO.getAccountExpireTime().isBefore(LocalDateTime.now())){
+      throw  new AccountExpiredException(ErrorMessage.ACCOUNT_HAS_EXPIRED.getMessage());
+    }
     //如果是平台管理员
     //如果是平台管理员
     if(isPlatFormUser(ytDetailDTO)){
     if(isPlatFormUser(ytDetailDTO)){
       user.setAuthority(Authority.PLATFORM_USER);
       user.setAuthority(Authority.PLATFORM_USER);

@@ -17,7 +17,6 @@ public enum ErrorMessage {
   USERNAME_PASSWORD_INCORRECT(401001, "用户名或密码错误"),
   USERNAME_PASSWORD_INCORRECT(401001, "用户名或密码错误"),
   TOKEN_EXPIRED(401002, "token已过期，请重新登录"),
   TOKEN_EXPIRED(401002, "token已过期，请重新登录"),
   NONE_TENANT_ASSET(401003, "非当前租户资产"),
   NONE_TENANT_ASSET(401003, "非当前租户资产"),
-  AUTHENTICATION_FAILED_ACCOUNT_EXPIRED(401003, "账号已过期，请联系你的管理员"),
   BAD_PARAMETER(400000, "查询参数无效"),
   BAD_PARAMETER(400000, "查询参数无效"),
   INVALID_PARAMETER(400001, "无效参数"),
   INVALID_PARAMETER(400001, "无效参数"),
   TOO_MANY_REQUEST(429001, "请求过多"),
   TOO_MANY_REQUEST(429001, "请求过多"),
@@ -81,6 +80,7 @@ public enum ErrorMessage {
   DATA_BOARD_IS_PRIVATE(400057,"该数据看板不是公有视图"),
   DATA_BOARD_IS_PRIVATE(400057,"该数据看板不是公有视图"),
   MESSAGE_SEND_TOO_FAST(400058,"1分钟内请求次数过多，请休息一下！"),
   MESSAGE_SEND_TOO_FAST(400058,"1分钟内请求次数过多，请休息一下！"),
   PASSWORD_INCORRECT(4010059, "密码错误!"),
   PASSWORD_INCORRECT(4010059, "密码错误!"),
+  MESSAGE_SEND_FAILED(4010059, "消息发送失败!"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private final int code;
   private String message;
   private String message;

@@ -8,6 +8,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.JacksonUtil;
@@ -133,6 +134,9 @@ public class YtSmsServiceImpl implements YtSmsService {
     if (users.isEmpty()) {
     if (users.isEmpty()) {
       throw new YtDataValidationException("电话号码未在系统注册，请联系你的管理员");
       throw new YtDataValidationException("电话号码未在系统注册，请联系你的管理员");
     }
     }
+    if(users.get(0).getAccountExpireTime() != null && users.get(0).getAccountExpireTime().isBefore(LocalDateTime.now())){
+      throw  new YtDataValidationException(ErrorMessage.ACCOUNT_HAS_EXPIRED.getMessage());
+    }
     // 获取是否有验证码存在，防止发送数量过多
     // 获取是否有验证码存在，防止发送数量过多
     String key =
     String key =
         purpose.name()
         purpose.name()

@@ -327,6 +327,12 @@ class ReactState {
         currentAlarm.setPropagate(false);
         currentAlarm.setPropagate(false);
 
 
         currentAlarm = ctx.getAlarmService().createOrUpdateAlarm(currentAlarm);
         currentAlarm = ctx.getAlarmService().createOrUpdateAlarm(currentAlarm);
+        Alarm oldAlarm = currentAlarms.get(deviceId);
+        if(oldAlarm != null
+                && currentAlarm.getId().equals(oldAlarm.getId())
+                && currentAlarm.getSeverity().equals(oldAlarm.getSeverity())){
+            return;
+        }
         ytDeviceService.freshAlarmStatus(entityId, 1);
         ytDeviceService.freshAlarmStatus(entityId, 1);
         currentAlarms.put(deviceId, currentAlarm);
         currentAlarms.put(deviceId, currentAlarm);
         alarmMsg(ctx, msg, currentAlarm, "Alarm Cleared");
         alarmMsg(ctx, msg, currentAlarm, "Alarm Cleared");