Commit 0916e846cab4b46fc2f5f97dd767e1a4f0a97fdc

Authored by 芯火源
1 parent b224559b

refactor: modbus指令对象字段调整

1、寄存器地址
2、寄存器数量
@@ -23,9 +23,9 @@ public class TkDeviceRpcDTO implements Serializable { @@ -23,9 +23,9 @@ public class TkDeviceRpcDTO implements Serializable {
23 private TkModBusCheckType crc; 23 private TkModBusCheckType crc;
24 24
25 @ApiModelProperty(value = "寄存器地址",required = true) 25 @ApiModelProperty(value = "寄存器地址",required = true)
26 - private Integer registerAddr; 26 + private Integer registerAddress;
27 @ApiModelProperty(value = "寄存器数量") 27 @ApiModelProperty(value = "寄存器数量")
28 - private Integer registerNum; 28 + private Integer registerNumber;
29 29
30 30
31 31
@@ -23,7 +23,6 @@ import org.thingsboard.server.common.data.yunteng.enums.TransportTypeEnum; @@ -23,7 +23,6 @@ import org.thingsboard.server.common.data.yunteng.enums.TransportTypeEnum;
23 import org.thingsboard.server.common.data.yunteng.utils.ByteUtils; 23 import org.thingsboard.server.common.data.yunteng.utils.ByteUtils;
24 import org.thingsboard.server.common.data.yunteng.utils.CrcUtils; 24 import org.thingsboard.server.common.data.yunteng.utils.CrcUtils;
25 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; 25 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
26 -import org.thingsboard.server.dao.yunteng.entities.TkDeviceProfileEntity;  
27 import org.thingsboard.server.dao.yunteng.entities.TkDeviceScriptEntity; 26 import org.thingsboard.server.dao.yunteng.entities.TkDeviceScriptEntity;
28 import org.thingsboard.server.dao.yunteng.mapper.TkDeviceProfileMapper; 27 import org.thingsboard.server.dao.yunteng.mapper.TkDeviceProfileMapper;
29 import org.thingsboard.server.dao.yunteng.mapper.TkDeviceScriptMapper; 28 import org.thingsboard.server.dao.yunteng.mapper.TkDeviceScriptMapper;
@@ -301,11 +300,11 @@ public class TkDeviceScriptServiceImpl @@ -301,11 +300,11 @@ public class TkDeviceScriptServiceImpl
301 StringBuilder result = new StringBuilder(config.getDeviceCode()); 300 StringBuilder result = new StringBuilder(config.getDeviceCode());
302 String functionCode = config.getMethod(); 301 String functionCode = config.getMethod();
303 result.append(functionCode); 302 result.append(functionCode);
304 - String addrStr = ByteUtils.integerToHex(config.getRegisterAddr()); 303 + String addrStr = ByteUtils.integerToHex(config.getRegisterAddress());
305 result.append(addrStr.substring(addrStr.length()-4)); 304 result.append(addrStr.substring(addrStr.length()-4));
306 305
307 List<Integer> values = config.getRegisterValues(); 306 List<Integer> values = config.getRegisterValues();
308 - Integer registerNum = config.getRegisterNum()==null?1:config.getRegisterNum(); 307 + Integer registerNum = config.getRegisterNumber()==null?1:config.getRegisterNumber();
309 if(values ==null || values.isEmpty()){ 308 if(values ==null || values.isEmpty()){
310 //读寄存器数据 309 //读寄存器数据
311 result.append(modelHex(registerNum)); 310 result.append(modelHex(registerNum));