fix:调整异常捕获

@@ -20,6 +20,7 @@ import org.thingsboard.server.common.data.yunteng.core.exception.*;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.SysLogOperateDTO;
 import org.thingsboard.server.dao.audit.AuditLogService;
+import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.exception.ThingsboardErrorResponseHandler;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.utils.yunteng.LogUtils;
@@ -36,22 +37,27 @@ public class ThingsKitExceptionHandler {
   private final AuditLogService auditLogService;
   private final ThingsboardErrorResponseHandler errorResponseHandler;
 
-  @ExceptionHandler(RuntimeException.class)
+  @ExceptionHandler(MethodArgumentNotValidException.class)
   public void handleMethodArgumentNotValidException(
-          RuntimeException ex,
-      HttpServletRequest request,
-      HttpServletResponse response) {
-    if(ex instanceof ThingsKitException){
-      errorResponseHandler.handle(
-              new ThingsKitException(
-                      ErrorMessage.INVALID_PARAMETER.setMessage(
-                              ex.getMessage()),
-                      HttpStatus.BAD_REQUEST),
-              response);
-    }else{
+          MethodArgumentNotValidException ex,
+          HttpServletRequest request,
+          HttpServletResponse response) {
+    produceLog(request, ex);
+    errorResponseHandler.handle(
+            new ThingsKitException(
+                    ErrorMessage.INVALID_PARAMETER.setMessage(
+                            Objects.requireNonNull(ex.getBindingResult().getFieldError()).getDefaultMessage()),
+                    HttpStatus.BAD_REQUEST),
+            response);
+  }
+
+  @ExceptionHandler(RuntimeException.class)
+  public void handleRuntimeException(
+      RuntimeException ex, HttpServletRequest request, HttpServletResponse response) {
+    if(!(ex instanceof ThingsKitException) && !(ex instanceof DataValidationException)){
       produceLog(request, ex);
-      errorResponseHandler.handle(ex,response);
     }
+    errorResponseHandler.handle(ex,response);
   }
 
   protected SecurityUser getCurrentUser() throws ThingsboardException {

@@ -27,6 +27,7 @@ import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.core.exception.ThingsKitException;
+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.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO;
@@ -37,8 +38,6 @@ import org.thingsboard.server.common.data.yunteng.enums.TkScriptFunctionType;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.common.msg.queue.ServiceQueue;
 import org.thingsboard.server.controller.BaseController;
-import org.thingsboard.server.dao.exception.DataValidationException;
-import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceScriptService;
 import org.thingsboard.server.transport.tcp.script.TkScriptInvokeService;
 
@@ -60,7 +59,6 @@ public class TkDeviceScriptController extends BaseController {
     private static final JsonParser parser = new JsonParser();
     private static final ObjectMapper objectMapper = new ObjectMapper();
     private final TkDeviceScriptService scriptService;
-    private final TkDeviceProfileService ytDeviceProfileService;
     private final TkScriptInvokeService jsEngine;
 
     @PostMapping()
@@ -215,18 +213,18 @@ public class TkDeviceScriptController extends BaseController {
     public ResponseEntity<String> modbus(@RequestBody TkDeviceRpcDTO inputParams)
             throws ThingsKitException {
         if(StringUtils.isEmpty(inputParams.getDeviceCode())){
-            throw new DataValidationException(String.format(ErrorMessage.NEED_MAIN_PARAMETER.getMessage(),"设备地址码"));
+            throw new TkDataValidationException(String.format(ErrorMessage.NEED_MAIN_PARAMETER.getMessage(),"设备地址码"));
         }
         if(StringUtils.isEmpty(inputParams.getMethod()) || null == inputParams.getCrc() ||
                 null ==inputParams.getRegisterAddress()){
-            throw new DataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+            throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
         }
         if(null !=inputParams.getRegisterNumber() && null !=inputParams.getRegisterValues() &&
                 !inputParams.getRegisterValues().isEmpty()){
             List<Integer> registerValues = inputParams.getRegisterValues();
             for (Integer value : registerValues){
                 if(null == value){
-                    throw new DataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+                    throw new TkDataValidationException(ErrorMessage.REGISTER_VALUE_IS_NONE.getMessage());
                 }
             }
         }

@@ -109,7 +109,8 @@ public enum ErrorMessage {
   RESET_PASSWORD_SUCCESS(400085,"重置成功，请使用默认密码登录"),
   HAVE_NO_PERMISSION(500002,"没有修改权限"),
   MESSAGE_TEMPLATE_DELETED(400020,"消息模板不存在！"),
-  NEED_MAIN_PARAMETER(400001, "缺少必要参数【%s】"),
+  NEED_MAIN_PARAMETER(400021, "缺少必要参数【%s】"),
+  REGISTER_VALUE_IS_NONE(400022, "寄存器值不能为空"),
   NOT_ALLOED_ISOLATED_IN_MONOLITH(500003,"【monolith】模式下，不能选择【isolated】类型的租户配置"),
   MESSAGE_TEMPLATE_USING_CONFIG(500004,"删除消息配置前，需要禁用使用消息配置的消息模板%s。");
   private final int code;