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