From c212d4a32be33f173a1f4a58310349e98860c8d2 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 25 Oct 2017 16:40:50 +0800
Subject: [PATCH] 代码更新
---
src/main/java/com/moral/monitor/entity/History.java | 53 +++++++++++++++++++++++++++--------------------------
1 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/moral/monitor/entity/History.java b/src/main/java/com/moral/monitor/entity/History.java
index d417fb2..b0ae9d5 100644
--- a/src/main/java/com/moral/monitor/entity/History.java
+++ b/src/main/java/com/moral/monitor/entity/History.java
@@ -2,24 +2,33 @@
import java.util.Date;
-/**
- * Created by a on 2017/6/20.
- * ������������������������������������������������
- */
public class History {
+ private Integer id;
+
private String mac;
+
private String sensor;
- private String mac_key;
- private Double mac_value;
+
+ private String macKey;
+
+ private Double macValue;
+
private Date time;
- private String units;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
public String getMac() {
return mac;
}
public void setMac(String mac) {
- this.mac = mac;
+ this.mac = mac == null ? null : mac.trim();
}
public String getSensor() {
@@ -27,23 +36,23 @@
}
public void setSensor(String sensor) {
- this.sensor = sensor;
+ this.sensor = sensor == null ? null : sensor.trim();
}
- public String getMac_key() {
- return mac_key;
+ public String getMacKey() {
+ return macKey;
}
- public void setMac_key(String mac_key) {
- this.mac_key = mac_key;
+ public void setMacKey(String macKey) {
+ this.macKey = macKey == null ? null : macKey.trim();
}
- public Double getMac_value() {
- return mac_value;
+ public Double getMacValue() {
+ return macValue;
}
- public void setMac_value(Double mac_value) {
- this.mac_value = mac_value;
+ public void setMacValue(Double macValue) {
+ this.macValue = macValue;
}
public Date getTime() {
@@ -53,12 +62,4 @@
public void setTime(Date time) {
this.time = time;
}
-
- public String getUnits() {
- return units;
- }
-
- public void setUnits(String units) {
- this.units = units;
- }
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0