Commit 34a105e0a8152be07b614d1ba8a63966aa10d9a5

Authored by xp.Huang
1 parent 4265dba3

perf: 修改类名称

@@ -2,7 +2,7 @@ package org.thingsboard.server.common.data.yunteng.dto; @@ -2,7 +2,7 @@ package org.thingsboard.server.common.data.yunteng.dto;
2 2
3 import io.swagger.annotations.ApiModelProperty; 3 import io.swagger.annotations.ApiModelProperty;
4 import lombok.Data; 4 import lombok.Data;
5 -import org.thingsboard.server.common.data.yunteng.enums.TkModebusCheckType; 5 +import org.thingsboard.server.common.data.yunteng.enums.TkModBusCheckType;
6 6
7 import javax.validation.constraints.NotEmpty; 7 import javax.validation.constraints.NotEmpty;
8 import java.io.Serializable; 8 import java.io.Serializable;
@@ -20,7 +20,7 @@ public class TkDeviceRpcDTO implements Serializable { @@ -20,7 +20,7 @@ public class TkDeviceRpcDTO implements Serializable {
20 private String deviceCode; 20 private String deviceCode;
21 21
22 @ApiModelProperty(value = "数据校验算法",required = true) 22 @ApiModelProperty(value = "数据校验算法",required = true)
23 - private TkModebusCheckType crc; 23 + private TkModBusCheckType crc;
24 24
25 @ApiModelProperty(value = "寄存器地址",required = true) 25 @ApiModelProperty(value = "寄存器地址",required = true)
26 private Integer registerAddr; 26 private Integer registerAddr;
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/enums/TkModBusCheckType.java renamed from common/data/src/main/java/org/thingsboard/server/common/data/yunteng/enums/TkModebusCheckType.java
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 TkModBusCheckType {
4 TOTAL_AND_SUM(16,0xffff,0xA001,0,0xA001,true,true,true), 4 TOTAL_AND_SUM(16,0xffff,0xA001,0,0xA001,true,true,true),
5 AND_TOTAL_XOR(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), 6 CRC_8(16,0xffff,0xA001,0,0xA001,true,true,true),
@@ -26,7 +26,7 @@ public enum TkModebusCheckType { @@ -26,7 +26,7 @@ public enum TkModebusCheckType {
26 /**字节序,默认高位在前*/ 26 /**字节序,默认高位在前*/
27 private final Boolean byteOrder; 27 private final Boolean byteOrder;
28 28
29 - TkModebusCheckType(Integer width, Integer init, Integer xorIn, Integer xorOut, Integer check, Boolean refIn, Boolean refOut , Boolean byteOrder) { 29 + TkModBusCheckType(Integer width, Integer init, Integer xorIn, Integer xorOut, Integer check, Boolean refIn, Boolean refOut , Boolean byteOrder) {
30 this.width = width; 30 this.width = width;
31 this.init = init; 31 this.init = init;
32 this.xorIn = xorIn; 32 this.xorIn = xorIn;
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/enums/TkModBusFunctionCode.java renamed from common/data/src/main/java/org/thingsboard/server/common/data/yunteng/enums/TkModebusFunctionCode.java
1 package org.thingsboard.server.common.data.yunteng.enums; 1 package org.thingsboard.server.common.data.yunteng.enums;
2 2
3 -public enum TkModebusFunctionCode { 3 +public enum TkModBusFunctionCode {
4 READ_COIL("01",1), 4 READ_COIL("01",1),
5 REAL_SPLIT_INPUT("02",1), 5 REAL_SPLIT_INPUT("02",1),
6 READ_PERSIST_REGISTER("03",1), 6 READ_PERSIST_REGISTER("03",1),
@@ -21,7 +21,7 @@ public enum TkModebusFunctionCode { @@ -21,7 +21,7 @@ public enum TkModebusFunctionCode {
21 /**寄存器值长度*/ 21 /**寄存器值长度*/
22 private final Integer valueSize; 22 private final Integer valueSize;
23 23
24 - TkModebusFunctionCode(String code, Integer valueSize) { 24 + TkModBusFunctionCode(String code, Integer valueSize) {
25 this.code = code; 25 this.code = code;
26 this.valueSize = valueSize; 26 this.valueSize = valueSize;
27 } 27 }
@@ -17,7 +17,7 @@ import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidatio @@ -17,7 +17,7 @@ import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidatio
17 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage; 17 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
18 import org.thingsboard.server.common.data.yunteng.dto.*; 18 import org.thingsboard.server.common.data.yunteng.dto.*;
19 import org.thingsboard.server.common.data.yunteng.enums.StatusEnum; 19 import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
20 -import org.thingsboard.server.common.data.yunteng.enums.TkModebusFunctionCode; 20 +import org.thingsboard.server.common.data.yunteng.enums.TkModBusFunctionCode;
21 import org.thingsboard.server.common.data.yunteng.enums.TkScriptFunctionType; 21 import org.thingsboard.server.common.data.yunteng.enums.TkScriptFunctionType;
22 import org.thingsboard.server.common.data.yunteng.enums.TransportTypeEnum; 22 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;
@@ -316,7 +316,7 @@ public class TkDeviceScriptServiceImpl @@ -316,7 +316,7 @@ public class TkDeviceScriptServiceImpl
316 if(values ==null || values.isEmpty()){ 316 if(values ==null || values.isEmpty()){
317 //读寄存器数据 317 //读寄存器数据
318 result.append(modelHex(registerNum)); 318 result.append(modelHex(registerNum));
319 - }else if(values.size() == 1 &&(TkModebusFunctionCode.WRITE_ONE_COIL.getCode().equals(functionCode) ||TkModebusFunctionCode.WRITE_ONE_REGISTER.getCode().equals(functionCode) )){ 319 + }else if(values.size() == 1 &&(TkModBusFunctionCode.WRITE_ONE_COIL.getCode().equals(functionCode) || TkModBusFunctionCode.WRITE_ONE_REGISTER.getCode().equals(functionCode) )){
320 //单个写入 320 //单个写入
321 result.append(modelHex(values.get(0))); 321 result.append(modelHex(values.get(0)));
322 }else{ 322 }else{
@@ -342,7 +342,7 @@ public class TkDeviceScriptServiceImpl @@ -342,7 +342,7 @@ public class TkDeviceScriptServiceImpl
342 } 342 }
343 private String multData(String functionCode,List<Integer>datas){ 343 private String multData(String functionCode,List<Integer>datas){
344 StringBuilder dataStr = new StringBuilder(); 344 StringBuilder dataStr = new StringBuilder();
345 - if(TkModebusFunctionCode.WRITE_MANY_REGISTER.equals(functionCode)){ 345 + if(TkModBusFunctionCode.WRITE_MANY_REGISTER.equals(functionCode)){
346 dataStr.append(dataLength(datas.size()*2)); 346 dataStr.append(dataLength(datas.size()*2));
347 for(Integer item: datas){ 347 for(Integer item: datas){
348 dataStr.append(modelHex(item)); 348 dataStr.append(modelHex(item));