Merge branch '20220322' into 'master'

20220322

See merge request huang/thingsboard3.3.2!72

@@ -43,6 +43,7 @@ import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.yunteng.core.Result;
 import org.thingsboard.server.common.data.yunteng.core.Result;
 import org.thingsboard.server.common.data.yunteng.core.exception.ThingsKitException;
 import org.thingsboard.server.common.data.yunteng.core.exception.ThingsKitException;
 import org.thingsboard.server.common.msg.tools.TbRateLimitsException;
 import org.thingsboard.server.common.msg.tools.TbRateLimitsException;
+import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.service.security.exception.AuthMethodNotSupportedException;
 import org.thingsboard.server.service.security.exception.AuthMethodNotSupportedException;
 import org.thingsboard.server.service.security.exception.JwtExpiredTokenException;
 import org.thingsboard.server.service.security.exception.JwtExpiredTokenException;
 import org.thingsboard.server.service.security.exception.UserPasswordExpiredException;
 import org.thingsboard.server.service.security.exception.UserPasswordExpiredException;
@@ -134,6 +135,9 @@ public class ThingsboardErrorResponseHandler extends ResponseEntityExceptionHand
                     handleAuthenticationException((AuthenticationException) exception, response);
                     handleAuthenticationException((AuthenticationException) exception, response);
                 }else if(exception instanceof ThingsKitException){
                 }else if(exception instanceof ThingsKitException){
                     handleThingsKitException((ThingsKitException)exception, response);
                     handleThingsKitException((ThingsKitException)exception, response);
+                }else if(exception instanceof DataValidationException){
+                    response.setStatus(HttpStatus.BAD_REQUEST.value());
+                    mapper.writeValue(response.getWriter(), exception.getMessage());
                 }
                 }
                 else {
                 else {
                     response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
                     response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());

@@ -114,7 +114,7 @@ class TriggerState {
         }
         }
         AlarmEvalResult evalResult = evalFunction.apply(ruleState, data);
         AlarmEvalResult evalResult = evalFunction.apply(ruleState, data);
         if (AlarmEvalResult.TRUE.equals(evalResult)) {
         if (AlarmEvalResult.TRUE.equals(evalResult)) {
-            stateUpdate = true;
+            stateUpdate = clearAlarmState(stateUpdate, ruleState);
         } else if (AlarmEvalResult.FALSE.equals(evalResult)) {
         } else if (AlarmEvalResult.FALSE.equals(evalResult)) {
             stateUpdate = clearAlarmState(stateUpdate, ruleState);
             stateUpdate = clearAlarmState(stateUpdate, ruleState);
         }
         }