Selaa lähdekoodia

电源线路控制值暂时用不上,可能导致NumberFormatException错误

weizhengliang 1 vuosi sitten
vanhempi
commit
613e3b807a

+ 12 - 12
middleware/src/main/code/com/wdkl/ncs/android/middleware/model/dos/DeviceDO.java

@@ -256,9 +256,9 @@ public class DeviceDO implements Serializable {
      * @param null
      * @return {@link null}
      */
-    @Column(name = "power_control_address", allowNullUpdate = false)
-    @ApiModelProperty(value = "485电源控制版地址", required = false)
-    private Integer powerControlAddress;
+    //@Column(name = "power_control_address", allowNullUpdate = false)
+    //@ApiModelProperty(value = "485电源控制版地址", required = false)
+    //private Integer powerControlAddress;
 
     /**
      * 485电源控制版线路
@@ -268,9 +268,9 @@ public class DeviceDO implements Serializable {
      * @param null
      * @return {@link null}
      */
-    @Column(name = "control_line_number", allowNullUpdate = false)
-    @ApiModelProperty(value = "485电源控制版线路", required = false)
-    private Integer controlLineNumber;
+    //@Column(name = "control_line_number", allowNullUpdate = false)
+    //@ApiModelProperty(value = "485电源控制版线路", required = false)
+    //private String controlLineNumber;
 
     @PrimaryKeyField
     public Integer getId() {
@@ -622,7 +622,7 @@ public class DeviceDO implements Serializable {
         this.part_union_id = part_union_id;
     }
 
-    public Integer getPowerControlAddress() {
+    /*public Integer getPowerControlAddress() {
         return powerControlAddress;
     }
 
@@ -630,13 +630,13 @@ public class DeviceDO implements Serializable {
         this.powerControlAddress = powerControlAddress;
     }
 
-    public Integer getControlLineNumber() {
+    public String getControlLineNumber() {
         return controlLineNumber;
     }
 
-    public void setControlLineNumber(Integer controlLineNumber) {
+    public void setControlLineNumber(String controlLineNumber) {
         this.controlLineNumber = controlLineNumber;
-    }
+    }*/
 
     @Override
     public boolean equals(Object o) {
@@ -724,8 +724,8 @@ public class DeviceDO implements Serializable {
                 ", ledResolutionRatio='" + ledResolutionRatio + '\'' +
                 ", ledVoice=" + ledVoice +
                 ", ledFontSize=" + ledFontSize +
-                ", powerControlAddress=" + powerControlAddress +
-                ", controlLineNumber=" + controlLineNumber +
+                //", powerControlAddress=" + powerControlAddress +
+                //", controlLineNumber=" + controlLineNumber +
                 '}';
     }
 }