|
@@ -63,14 +63,14 @@ public class DeviceUpdataEntity implements Serializable {
|
|
|
@Column(name = "tenant_id")
|
|
|
private String tenantId;
|
|
|
|
|
|
- @Column(name = "convert_temp")
|
|
|
- private double convertTemp;
|
|
|
+ @Column(name = "data_temp_convert")
|
|
|
+ private double dataTempConvert;
|
|
|
|
|
|
- @Column(name = "convert_humi")
|
|
|
- private double convertHumi;
|
|
|
+ @Column(name = "data_humi_convert")
|
|
|
+ private double dataHumiConvert;
|
|
|
|
|
|
- @Column(name = "convert_bat")
|
|
|
- private double convertBat;
|
|
|
+ @Column(name = "data_bat_convert")
|
|
|
+ private double dataBatConvert;
|
|
|
|
|
|
public void setId(Integer id) {
|
|
|
this.id = id;
|
|
@@ -216,28 +216,28 @@ public class DeviceUpdataEntity implements Serializable {
|
|
|
this.tenantId = tenantId;
|
|
|
}
|
|
|
|
|
|
- public double getConvertTemp() {
|
|
|
- return convertTemp;
|
|
|
+ public double getDataTempConvert() {
|
|
|
+ return dataTempConvert;
|
|
|
}
|
|
|
|
|
|
- public void setConvertTemp(double convertTemp) {
|
|
|
- this.convertTemp = convertTemp;
|
|
|
+ public void setDataTempConvert(double dataTempConvert) {
|
|
|
+ this.dataTempConvert = dataTempConvert;
|
|
|
}
|
|
|
|
|
|
- public double getConvertHumi() {
|
|
|
- return convertHumi;
|
|
|
+ public double getDataHumiConvert() {
|
|
|
+ return dataHumiConvert;
|
|
|
}
|
|
|
|
|
|
- public void setConvertHumi(double convertHumi) {
|
|
|
- this.convertHumi = convertHumi;
|
|
|
+ public void setDataHumiConvert(double dataHumiConvert) {
|
|
|
+ this.dataHumiConvert = dataHumiConvert;
|
|
|
}
|
|
|
|
|
|
- public double getConvertBat() {
|
|
|
- return convertBat;
|
|
|
+ public double getDataBatConvert() {
|
|
|
+ return dataBatConvert;
|
|
|
}
|
|
|
|
|
|
- public void setConvertBat(double convertBat) {
|
|
|
- this.convertBat = convertBat;
|
|
|
+ public void setDataBatConvert(double dataBatConvert) {
|
|
|
+ this.dataBatConvert = dataBatConvert;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -261,9 +261,9 @@ public class DeviceUpdataEntity implements Serializable {
|
|
|
", dataHumi=" + dataHumi +
|
|
|
", dataBat=" + dataBat +
|
|
|
", tenantId='" + tenantId + '\'' +
|
|
|
- ", convertTemp=" + convertTemp +
|
|
|
- ", convertHumi=" + convertHumi +
|
|
|
- ", convertBat=" + convertBat +
|
|
|
+ ", dataTempConvert=" + dataTempConvert +
|
|
|
+ ", dataHumiConvert=" + dataHumiConvert +
|
|
|
+ ", dataBatConvert=" + dataBatConvert +
|
|
|
'}';
|
|
|
}
|
|
|
}
|