Merge branch 'master' of 192.168.168.201:panzhaov5/bsth_control

徐烜
2 parents 117b56b4 7660a526
Showing 1 changed file with 16 additions and 1 deletions
src/main/java/com/bsth/entity/StationRoute.java
@@ -4,12 +4,15 @@ import java.util.Date;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 /**
  * 
  * @ClassName : StationRoute(站点路由实体类)
@@ -39,6 +42,9 @@ public class StationRoute {
 	// 站点编码
 	private String stationCode;
+	// 站点名称
+	private String stationName;
+	
 	// 线路编码
 	private String lineCode;
@@ -95,7 +101,8 @@ public class StationRoute {
 	private Date updateDate;
 	// 站点信息
-	@ManyToOne
+	@JsonIgnore
+	@ManyToOne(fetch = FetchType.LAZY)
 	private Station station;
 	// 线路信息
@@ -126,6 +133,14 @@ public class StationRoute {
 		this.stationCode = stationCode;
 	}
+	public String getStationName() {
+		return stationName;
+	}
+
+	public void setStationName(String stationName) {
+		this.stationName = stationName;
+	}
+
 	public String getLineCode() {
 		return lineCode;
 	}