简柏林 / thingskit · Commits

Commit 463622649a289ae1d9cac82185fccf05b7cd1df5

Authored by 芯火源
1 parent d8ef107b

fix(DEFECT-1229): modbus数据校验算法问题

Inline Side-by-side
Showing 2 changed files with 5 additions and 1 deletions
@@ -26,6 +26,7 @@ import org.thingsboard.server.common.data.id.DeviceProfileId; @@ -26,6 +26,7 @@ import org.thingsboard.server.common.data.id.DeviceProfileId;
26 import org.thingsboard.server.common.data.id.RuleChainId; 26 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.TkDataValidationException; 30 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
30 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage; 31 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
31 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO; 32 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
@@ -224,7 +225,7 @@ public class TkDeviceScriptController extends BaseController { @@ -224,7 +225,7 @@ public class TkDeviceScriptController extends BaseController {
224 @PostMapping("/modbus") 225 @PostMapping("/modbus")
225 @ApiOperation("生成Modbus指令") 226 @ApiOperation("生成Modbus指令")
226 public ResponseEntity<String> modbus(@RequestBody TkDeviceRpcDTO inputParams) 227 public ResponseEntity<String> modbus(@RequestBody TkDeviceRpcDTO inputParams)
227 - throws ThingsboardException { 228 + throws ThingsKitException {
228 return ResponseEntity.ok(scriptService.modbus(inputParams)); 229 return ResponseEntity.ok(scriptService.modbus(inputParams));
229 } 230 }
230 231
1 package org.thingsboard.server.common.data.yunteng.enums; 1 package org.thingsboard.server.common.data.yunteng.enums;
2 2
3 public enum TkModebusCheckType { 3 public enum TkModebusCheckType {
  4 + TOTAL_AND_SUM(16,0xffff,0xA001,0,0xA001,true,true,true),
  5 + AND_TOTAL_XOR(16,0xffff,0xA001,0,0xA001,true,true,true),
  6 + CRC_8(16,0xffff,0xA001,0,0xA001,true,true,true),
4 CRC_16_HIGH(16,0xffff,0xA001,0,0xA001,true,true,true), 7 CRC_16_HIGH(16,0xffff,0xA001,0,0xA001,true,true,true),
5 CRC_16_LOWER(16,0xffff,0xA001,0,0xA001,true,true,false), 8 CRC_16_LOWER(16,0xffff,0xA001,0,0xA001,true,true,false),
6 CRC_32_HIGH(32,0xffffffff,0x4c11db7,0,0x4c11db7,false,false,true), 9 CRC_32_HIGH(32,0xffffffff,0x4c11db7,0,0x4c11db7,false,false,true),