Commit 6615cdb926f2565f8d2f2758878c77baa5b9ce04

Authored by xp.Huang
1 parent ae7793a3

fix: Modbus命令下发参数校验

... ... @@ -27,7 +27,6 @@ import org.thingsboard.server.common.data.id.RuleChainId;
27 27 import org.thingsboard.server.common.data.id.TenantId;
28 28 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
29 29 import org.thingsboard.server.common.data.yunteng.core.exception.ThingsKitException;
30   -import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
31 30 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
32 31 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
33 32 import org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO;
... ... @@ -38,6 +37,7 @@ import org.thingsboard.server.common.data.yunteng.enums.TkScriptFunctionType;
38 37 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
39 38 import org.thingsboard.server.common.msg.queue.ServiceQueue;
40 39 import org.thingsboard.server.controller.BaseController;
  40 +import org.thingsboard.server.dao.exception.DataValidationException;
41 41 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
42 42 import org.thingsboard.server.dao.yunteng.service.TkDeviceScriptService;
43 43 import org.thingsboard.server.transport.tcp.script.TkScriptInvokeService;
... ... @@ -215,18 +215,18 @@ public class TkDeviceScriptController extends BaseController {
215 215 public ResponseEntity<String> modbus(@RequestBody TkDeviceRpcDTO inputParams)
216 216 throws ThingsKitException {
217 217 if(StringUtils.isEmpty(inputParams.getDeviceCode())){
218   - throw new TkDataValidationException(String.format(ErrorMessage.NEED_MAIN_PARAMETER.getMessage(),"设备地址码"));
  218 + throw new DataValidationException(String.format(ErrorMessage.NEED_MAIN_PARAMETER.getMessage(),"设备地址码"));
219 219 }
220 220 if(StringUtils.isEmpty(inputParams.getMethod()) || null == inputParams.getCrc() ||
221 221 null ==inputParams.getRegisterAddress()){
222   - throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
  222 + throw new DataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
223 223 }
224 224 if(null !=inputParams.getRegisterNumber() && null !=inputParams.getRegisterValues() &&
225 225 !inputParams.getRegisterValues().isEmpty()){
226 226 List<Integer> registerValues = inputParams.getRegisterValues();
227 227 for (Integer value : registerValues){
228 228 if(null == value){
229   - throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
  229 + throw new DataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
230 230 }
231 231 }
232 232 }
... ...