From 58f51c889aecd7065a82b99d29b3ef4aee891ec1 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 25 Oct 2017 16:31:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/monitor/entity/Sensor.java | 143 ++++++++++++++++++++++++-----------------------
1 files changed, 74 insertions(+), 69 deletions(-)
diff --git a/src/main/java/com/moral/monitor/entity/Sensor.java b/src/main/java/com/moral/monitor/entity/Sensor.java
index 796f42a..adae357 100644
--- a/src/main/java/com/moral/monitor/entity/Sensor.java
+++ b/src/main/java/com/moral/monitor/entity/Sensor.java
@@ -1,83 +1,32 @@
package com.moral.monitor.entity;
-/**���������������
- * Created by a on 2017/4/10.
- */
public class Sensor {
- private int id;
+ private Integer id;
+
private String type;
+
private String sensor;
- private String sensor_desc;
- private String mac_key;
+
+ private String sensorDesc;
+
+ private String macKey;
+
private String upper;
+
private String lower;
+
private String units;
- private int digit;
+
+ private Integer digit;
+
private String ver;
-
- public int getId() {
+ public Integer getId() {
return id;
}
- public void setId(int id) {
+ public void setId(Integer id) {
this.id = id;
- }
-
- public String getSensor() {
- return sensor;
- }
-
- public void setSensor(String sensor) {
- this.sensor = sensor;
- }
-
- public String getSensor_desc() {
- return sensor_desc;
- }
-
- public void setSensor_desc(String sensor_desc) {
- this.sensor_desc = sensor_desc;
- }
-
- public String getMac_key() {
- return mac_key;
- }
-
- public void setMac_key(String mac_key) {
- this.mac_key = mac_key;
- }
-
- public String getUpper() {
- return upper;
- }
-
- public void setUpper(String upper) {
- this.upper = upper;
- }
-
- public String getLower() {
- return lower;
- }
-
- public void setLower(String lower) {
- this.lower = lower;
- }
-
- public String getUnits() {
- return units;
- }
-
- public void setUnits(String units) {
- this.units = units;
- }
-
- public int getDigit() {
- return digit;
- }
-
- public void setDigit(int digit) {
- this.digit = digit;
}
public String getType() {
@@ -85,7 +34,63 @@
}
public void setType(String type) {
- this.type = type;
+ this.type = type == null ? null : type.trim();
+ }
+
+ public String getSensor() {
+ return sensor;
+ }
+
+ public void setSensor(String sensor) {
+ this.sensor = sensor == null ? null : sensor.trim();
+ }
+
+ public String getSensorDesc() {
+ return sensorDesc;
+ }
+
+ public void setSensorDesc(String sensorDesc) {
+ this.sensorDesc = sensorDesc == null ? null : sensorDesc.trim();
+ }
+
+ public String getMacKey() {
+ return macKey;
+ }
+
+ public void setMacKey(String macKey) {
+ this.macKey = macKey == null ? null : macKey.trim();
+ }
+
+ public String getUpper() {
+ return upper;
+ }
+
+ public void setUpper(String upper) {
+ this.upper = upper == null ? null : upper.trim();
+ }
+
+ public String getLower() {
+ return lower;
+ }
+
+ public void setLower(String lower) {
+ this.lower = lower == null ? null : lower.trim();
+ }
+
+ public String getUnits() {
+ return units;
+ }
+
+ public void setUnits(String units) {
+ this.units = units == null ? null : units.trim();
+ }
+
+ public Integer getDigit() {
+ return digit;
+ }
+
+ public void setDigit(Integer digit) {
+ this.digit = digit;
}
public String getVer() {
@@ -93,6 +98,6 @@
}
public void setVer(String ver) {
- this.ver = ver;
+ this.ver = ver == null ? null : ver.trim();
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0