Merge branch 'master' into 'master_dev'

Merge branch 'master' into 'master_dev'

See merge request yunteng/thingskit!240

@@ -177,3 +177,4 @@ ThingsKit像楊銝挽憭皞PaaS
 
 
 
+版本：v1.1.2_release

@@ -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.VALIDATE_PARAM_FAILED.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 {

@@ -6,7 +6,6 @@ import lombok.RequiredArgsConstructor;
 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.util.Assert;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -22,7 +21,6 @@ import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 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.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.MenuDTO;
@@ -162,7 +160,6 @@ public class TkAdminController extends BaseController {
   }
 
   @PostMapping("/tenant/adminUser")
-  @Transactional
   @PreAuthorize(
       "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:admin:tenant:adminUser:post'})")
   public ResponseEntity<UserDTO> createTenantAdmin(

@@ -11,7 +11,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.*;
 import org.thingsboard.server.common.data.audit.ActionType;
-import org.thingsboard.server.common.data.device.profile.*;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
@@ -20,7 +19,6 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
-import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 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;

@@ -38,7 +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.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()
@@ -218,10 +216,18 @@ public class TkDeviceScriptController extends BaseController {
             throw new TkDataValidationException(String.format(ErrorMessage.NEED_MAIN_PARAMETER.getMessage(),"设备地址码"));
         }
         if(StringUtils.isEmpty(inputParams.getMethod()) || null == inputParams.getCrc() ||
-        null ==inputParams.getRegisterNumber() || null ==inputParams.getRegisterAddress() ||
-                null ==inputParams.getRegisterValues() || inputParams.getRegisterValues().isEmpty()){
+                null ==inputParams.getRegisterAddress()){
             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 TkDataValidationException(ErrorMessage.REGISTER_VALUE_IS_NONE.getMessage());
+                }
+            }
+        }
         return ResponseEntity.ok(scriptService.modbus(inputParams));
     }
 

@@ -7,6 +7,7 @@ public enum ErrorMessage {
   // ERROR STARTS FROM HERE
   INTERNAL_ERROR(500000, "网络异常"),
   OPERATION_FAILED(500001, "操作失败"),
+  VALIDATE_PARAM_FAILED(440000, "参数验证失败"),
   NO_PERMISSION(403001, "没有操作权限"),
   ACCOUNT_DISABLED(403002, "账号已禁用"),
   ACCESS_DENIED(403003, "拒绝访问"),
@@ -109,7 +110,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;

@@ -23,9 +23,9 @@ public class TkDeviceRpcDTO implements Serializable {
   @ApiModelProperty(value = "寄存器地址", required = true)
   private Integer registerAddress;
 
-  @ApiModelProperty(value = "寄存器数量", required = true)
+  @ApiModelProperty(value = "寄存器数量")
   private Integer registerNumber;
 
-  @ApiModelProperty(value = "寄存器值", required = true)
+  @ApiModelProperty(value = "寄存器值")
   private List<Integer> registerValues;
 }