Merge branch '20230914' into 'master_dev'

fix(DEFECT-1523): 非业务异常日志问题修复

See merge request yunteng/thingskit!232

@@ -36,18 +36,22 @@ public class ThingsKitExceptionHandler {
   private final AuditLogService auditLogService;
   private final AuditLogService auditLogService;
   private final ThingsboardErrorResponseHandler errorResponseHandler;
   private final ThingsboardErrorResponseHandler errorResponseHandler;
 
 
-  @ExceptionHandler(MethodArgumentNotValidException.class)
+  @ExceptionHandler(RuntimeException.class)
   public void handleMethodArgumentNotValidException(
   public void handleMethodArgumentNotValidException(
-      MethodArgumentNotValidException ex,
+          RuntimeException ex,
       HttpServletRequest request,
       HttpServletRequest request,
       HttpServletResponse response) {
       HttpServletResponse response) {
-    produceLog(request, ex);
-    errorResponseHandler.handle(
-        new ThingsKitException(
-            ErrorMessage.INVALID_PARAMETER.setMessage(
-                Objects.requireNonNull(ex.getBindingResult().getFieldError()).getDefaultMessage()),
-            HttpStatus.BAD_REQUEST),
-        response);
+    if(ex instanceof ThingsKitException){
+      errorResponseHandler.handle(
+              new ThingsKitException(
+                      ErrorMessage.INVALID_PARAMETER.setMessage(
+                              ex.getMessage()),
+                      HttpStatus.BAD_REQUEST),
+              response);
+    }else{
+      produceLog(request, ex);
+      errorResponseHandler.handle(ex,response);
+    }
   }
   }
 
 
   protected SecurityUser getCurrentUser() throws ThingsboardException {
   protected SecurityUser getCurrentUser() throws ThingsboardException {

@@ -94,7 +94,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
   }
   }
 
 
   @Override
   @Override
-  public void validateFormData(String currentTenantId, DeviceDTO deviceDTO) {
+  public void validateFormData(String currentTenantId, DeviceDTO deviceDTO)  throws RuntimeException{
     boolean insert = StringUtils.isBlank(deviceDTO.getId());
     boolean insert = StringUtils.isBlank(deviceDTO.getId());
     String deviceTenantId;
     String deviceTenantId;
     if (StringUtils.isBlank(deviceDTO.getName())) {
     if (StringUtils.isBlank(deviceDTO.getName())) {
@@ -132,7 +132,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     DeviceProfile deviceProfile =
     DeviceProfile deviceProfile =
         deviceProfileDao.findById(id, UUID.fromString(deviceDTO.getProfileId()));
         deviceProfileDao.findById(id, UUID.fromString(deviceDTO.getProfileId()));
     OrganizationDTO organization =
     OrganizationDTO organization =
-            organizationService.findOrganizationById(deviceTenantId,deviceDTO.getOrganizationId());
+            organizationService.findOrganizationById(deviceDTO.getOrganizationId(),deviceTenantId);
     if (null == deviceProfile || null == organization) {
     if (null == deviceProfile || null == organization) {
       throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
       throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     } else if (!organization.getTenantId().equals(deviceTenantId)) {
     } else if (!organization.getTenantId().equals(deviceTenantId)) {

@@ -44,9 +44,6 @@
         LEFT JOIN tk_organization org ON org.id = d.organization_id
         LEFT JOIN tk_organization org ON org.id = d.organization_id
         <where>
         <where>
             m.tenant_id = #{tenantId}
             m.tenant_id = #{tenantId}
-            <if test="customerId!=null">
-                AND m.customer_id = #{customerId}
-            </if>
             <if test="severity!=null">
             <if test="severity!=null">
                 AND severity = #{severity}
                 AND severity = #{severity}
             </if>
             </if>

@@ -62,6 +62,7 @@ class ReactState {
   private final TkNoticeService noticeService;
   private final TkNoticeService noticeService;
   private TkDeviceService ytDeviceService;
   private TkDeviceService ytDeviceService;
 
 
+  private String actionData;
   ReactState(String reactId, TbContext ctx, TbSceneReactNodeConfig config) {
   ReactState(String reactId, TbContext ctx, TbSceneReactNodeConfig config) {
     this.reactId = reactId;
     this.reactId = reactId;
     this.reactName = config.getNames().get(reactId);
     this.reactName = config.getNames().get(reactId);
@@ -82,6 +83,7 @@ class ReactState {
     }
     }
     this.noticeService = SpringBeanUtils.getBean(TkNoticeService.class);
     this.noticeService = SpringBeanUtils.getBean(TkNoticeService.class);
     this.ytDeviceService = SpringBeanUtils.getBean(TkDeviceService.class);
     this.ytDeviceService = SpringBeanUtils.getBean(TkDeviceService.class);
+    actionData ="";
   }
   }
 
 
   /**
   /**
@@ -219,8 +221,10 @@ class ReactState {
                           }));
                           }));
             });
             });
 
 
-    if (triggerMatched.get() && conditionMatched.get()) {
-      log.debug(String.format("设备【%s】的消息内容【%s】触发动作", deviceId, msg.getData()));
+    String msgData = msg.getData();
+    if (triggerMatched.get() && conditionMatched.get() && !actionData.equals(msgData)) {
+      actionData = msgData;
+      log.debug(String.format("设备【%s】的消息内容【%s】触发动作", deviceId, msgData));
       for (TkDoActionEntity item : actions) {
       for (TkDoActionEntity item : actions) {
         if (ActionTypeEnum.MSG_NOTIFY.equals(item.getOutTarget())) {
         if (ActionTypeEnum.MSG_NOTIFY.equals(item.getOutTarget())) {
           noticeMsg(ctx, msg, item, deviceId, detail, msg.getTs());
           noticeMsg(ctx, msg, item, deviceId, detail, msg.getTs());