update 电单车协议

jsowell-pile/src/main/java/com/jsowell/pile/domain/PileBasicInfo.java

@@ -3,6 +3,8 @@ package com.jsowell.pile.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jsowell.common.annotation.Excel;
 import com.jsowell.common.core.domain.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +16,8 @@ import java.util.Date;
  * @author jsowell
  * @date 2022-08-26
  */
+@Getter
+@Setter
 public class PileBasicInfo extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 
@@ -52,9 +56,9 @@ public class PileBasicInfo extends BaseEntity {
 	private String secretKey;
 
 	/**
-	 * 软件协议（1-云快充；2-永联）
+	 * 软件协议（1-云快充; 2-永联; 3-友电）
 	 */
-	@Excel(name = "软件协议", readConverterExp = "1=-云快充；2-永联")
+	@Excel(name = "软件协议", readConverterExp = "1=-云快充; 2-永联; 3-友电")
 	private String softwareProtocol;
 
 	/**
@@ -107,131 +111,6 @@ public class PileBasicInfo extends BaseEntity {
 	 */
 	private String delFlag;
 
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setSn(String sn) {
-		this.sn = sn;
-	}
-
-	public String getSn() {
-		return sn;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public void setBusinessType(String businessType) {
-		this.businessType = businessType;
-	}
-
-	public String getBusinessType() {
-		return businessType;
-	}
-
-	public void setSoftwareProtocol(String softwareProtocol) {
-		this.softwareProtocol = softwareProtocol;
-	}
-
-	public String getSoftwareProtocol() {
-		return softwareProtocol;
-	}
-
-	public void setProductionDate(Date productionDate) {
-		this.productionDate = productionDate;
-	}
-
-	public Date getProductionDate() {
-		return productionDate;
-	}
-
-	public void setLicenceId(Long licenceId) {
-		this.licenceId = licenceId;
-	}
-
-	public Long getLicenceId() {
-		return licenceId;
-	}
-
-	public void setModelId(Long modelId) {
-		this.modelId = modelId;
-	}
-
-	public Long getModelId() {
-		return modelId;
-	}
-
-	public void setSimId(Long simId) {
-		this.simId = simId;
-	}
-
-	public Long getSimId() {
-		return simId;
-	}
-
-	public void setMerchantId(Long merchantId) {
-		this.merchantId = merchantId;
-	}
-
-	public Long getMerchantId() {
-		return merchantId;
-	}
-
-	public void setStationId(Long stationId) {
-		this.stationId = stationId;
-	}
-
-	public Long getStationId() {
-		return stationId;
-	}
-
-	public void setFaultReason(String faultReason) {
-		this.faultReason = faultReason;
-	}
-
-	public String getFaultReason() {
-		return faultReason;
-	}
-
-	public void setDelFlag(String delFlag) {
-		this.delFlag = delFlag;
-	}
-
-	public String getDelFlag() {
-		return delFlag;
-	}
-
-	public String getSecretKey() {
-		return secretKey;
-	}
-
-	public void setSecretKey(String secretKey) {
-		this.secretKey = secretKey;
-	}
-
-	public static long getSerialVersionUID() {
-		return serialVersionUID;
-	}
-
-	@Override
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
 	@Override
 	public String toString() {
 		return new ToStringBuilder(this, ToStringStyle.JSON_STYLE)

jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd20.java

@@ -42,7 +42,7 @@ public class EBikeMessageCmd20 extends AbsEBikeMessage {
         /**
          * 端口数量 表示设备总共有多少个端口
          */
-        private String portNumber;
+        private int portNumber;
 
         /**
          * 虚拟ID：需要内部组网的设备的本地地址，如485、LORA系列，如不需组网的设备，默认为00
@@ -66,7 +66,7 @@ public class EBikeMessageCmd20 extends AbsEBikeMessage {
 
         public DeviceRegister(byte[] dataBytes) {
             this.firmwareVersion = BytesUtil.bytesToIntLittle(Arrays.copyOfRange(dataBytes, 0, 2)) * 0.01 + "";
-            this.portNumber = BytesUtil.bytesToIntLittle(Arrays.copyOfRange(dataBytes, 2, 3)) + "";
+            this.portNumber = BytesUtil.bytesToIntLittle(Arrays.copyOfRange(dataBytes, 2, 3));
             this.virtualId = BytesUtil.bytesToIntLittle(Arrays.copyOfRange(dataBytes, 3, 4)) + "";
             this.deviceType = BytesUtil.printHexBinary(Arrays.copyOfRange(dataBytes, 4, 5));
             this.workMode = BytesUtil.bcd2StrLittle(Arrays.copyOfRange(dataBytes, 5, 6));