From 03cdc1111aa07041d635840eb30433cbb980accf Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 28 Feb 2018 16:44:48 +0800
Subject: [PATCH] test

---
 src/main/java/com/moral/monitor/entity/Equipment.java |  125 ++++++++++++++++++++++++++---------------
 1 files changed, 80 insertions(+), 45 deletions(-)

diff --git a/src/main/java/com/moral/monitor/entity/Equipment.java b/src/main/java/com/moral/monitor/entity/Equipment.java
index 62c8236..70a330c 100644
--- a/src/main/java/com/moral/monitor/entity/Equipment.java
+++ b/src/main/java/com/moral/monitor/entity/Equipment.java
@@ -2,33 +2,68 @@
 
 import java.util.Date;
 
-/**���������
- * Created by a on 2017/4/10.
- */
 public class Equipment {
-    private int id;
+    private Integer id;
+
     private String name;
+
     private String address;
-    private double longitude;
-    private double latitude;
+
+    private Double longitude;
+
+    private Double latitude;
+
     private String mac;
-    private String province;
-    private String city;
-    private String area;
-    private int  state;
+
+    private Integer state;
+
     private Date time;
+
     private String installer;
+
     private String repairman;
-    private String fei;
-    private String statedesc;
 
+    private String province;
 
+    private String city;
 
-    public int getId() {
+    private String area;
+
+    private String monitorpoint;
+
+    private String ownerId;
+    public MonitorPoint getMonitorpointDetail() {
+		return monitorpointDetail;
+	}
+
+	public void setMonitorpointDetail(MonitorPoint monitorpointDetail) {
+		this.monitorpointDetail = monitorpointDetail;
+	}
+
+	public Organization getOwnerDetail() {
+		return ownerDetail;
+	}
+
+	public void setOwnerDetail(Organization ownerDetail) {
+		this.ownerDetail = ownerDetail;
+	}
+
+	public User getInstallerDetail() {
+		return installerDetail;
+	}
+
+	public void setInstallerDetail(User installerDetail) {
+		this.installerDetail = installerDetail;
+	}
+
+	private MonitorPoint monitorpointDetail;
+    private Organization ownerDetail;
+    private User installerDetail;
+    public Integer getId() {
         return id;
     }
 
-    public void setId(int id) {
+    public void setId(Integer id) {
         this.id = id;
     }
 
@@ -37,7 +72,7 @@
     }
 
     public void setName(String name) {
-        this.name = name;
+        this.name = name == null ? null : name.trim();
     }
 
     public String getAddress() {
@@ -45,22 +80,22 @@
     }
 
     public void setAddress(String address) {
-        this.address = address;
+        this.address = address == null ? null : address.trim();
     }
 
-    public double getLongitude() {
+    public Double getLongitude() {
         return longitude;
     }
 
-    public void setLongitude(double longitude) {
+    public void setLongitude(Double longitude) {
         this.longitude = longitude;
     }
 
-    public double getLatitude() {
+    public Double getLatitude() {
         return latitude;
     }
 
-    public void setLatitude(double latitude) {
+    public void setLatitude(Double latitude) {
         this.latitude = latitude;
     }
 
@@ -69,14 +104,14 @@
     }
 
     public void setMac(String mac) {
-        this.mac = mac;
+        this.mac = mac == null ? null : mac.trim();
     }
 
-    public int getState() {
+    public Integer getState() {
         return state;
     }
 
-    public void setState(int state) {
+    public void setState(Integer state) {
         this.state = state;
     }
 
@@ -93,7 +128,7 @@
     }
 
     public void setInstaller(String installer) {
-        this.installer = installer;
+        this.installer = installer == null ? null : installer.trim();
     }
 
     public String getRepairman() {
@@ -101,23 +136,7 @@
     }
 
     public void setRepairman(String repairman) {
-        this.repairman = repairman;
-    }
-
-    public String getFei() {
-        return fei;
-    }
-
-    public void setFei(String fei) {
-        this.fei = fei;
-    }
-
-    public String getStatedesc() {
-        return statedesc;
-    }
-
-    public void setStatedesc(String statedesc) {
-        this.statedesc = statedesc;
+        this.repairman = repairman == null ? null : repairman.trim();
     }
 
     public String getProvince() {
@@ -125,7 +144,7 @@
     }
 
     public void setProvince(String province) {
-        this.province = province;
+        this.province = province == null ? null : province.trim();
     }
 
     public String getCity() {
@@ -133,7 +152,7 @@
     }
 
     public void setCity(String city) {
-        this.city = city;
+        this.city = city == null ? null : city.trim();
     }
 
     public String getArea() {
@@ -141,6 +160,22 @@
     }
 
     public void setArea(String area) {
-        this.area = area;
+        this.area = area == null ? null : area.trim();
     }
-}
+
+    public String getMonitorpoint() {
+        return monitorpoint;
+    }
+
+    public void setMonitorpoint(String monitorpoint) {
+        this.monitorpoint = monitorpoint == null ? null : monitorpoint.trim();
+    }
+
+    public String getOwnerId() {
+        return ownerId;
+    }
+
+    public void setOwnerId(String ownerId) {
+        this.ownerId = ownerId == null ? null : ownerId.trim();
+    }
+}
\ No newline at end of file

--
Gitblit v1.8.0