fix: Modbus命令下发参数校验

@@ -218,10 +218,18 @@ public class TkDeviceScriptController extends BaseController {
             throw new TkDataValidationException(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() ||
         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());
             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.INVALID_PARAMETER.getMessage());
+                }
+            }
+        }
         return ResponseEntity.ok(scriptService.modbus(inputParams));
         return ResponseEntity.ok(scriptService.modbus(inputParams));
     }
     }
 
 

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