Commit 31563635c4a399d750e94b4f1150c631d7d14df1

Authored by 李强
1 parent 25b18de9

站点字段修正

src/main/java/com/bsth/entity/Station.java
@@ -14,13 +14,13 @@ import javax.persistence.Table; @@ -14,13 +14,13 @@ import javax.persistence.Table;
14 * 14 *
15 * @ClassName : Station(站点实体类) 15 * @ClassName : Station(站点实体类)
16 * 16 *
17 - * @author : bsth@lq 17 + * @Author : bsth@lq
18 * 18 *
19 * @Description : TODO(站点) 19 * @Description : TODO(站点)
20 * 20 *
21 * @Data :2016-04-19 21 * @Data :2016-04-19
22 * 22 *
23 - * @version 公交调度系统BS版 0.1 23 + * @Version 公交调度系统BS版 0.1
24 * 24 *
25 */ 25 */
26 26
@@ -65,8 +65,17 @@ public class Station { @@ -65,8 +65,17 @@ public class Station {
65 // 城建坐标 y 65 // 城建坐标 y
66 private Float y; 66 private Float y;
67 67
68 - // GPS空间坐标点集合  
69 - private byte[] gSpaceGrid; 68 + /**
  69 + * 图形类型
  70 + *
  71 + * ------ r:圆形
  72 + *
  73 + * ------ p:多边形
  74 + */
  75 + private String shapesType;
  76 +
  77 + // 圆形半径
  78 + private Integer radius;
70 79
71 // 多边形空间坐标点集合 80 // 多边形空间坐标点集合
72 private byte[] gPolygonGrid; 81 private byte[] gPolygonGrid;
@@ -80,15 +89,18 @@ public class Station { @@ -80,15 +89,18 @@ public class Station {
80 */ 89 */
81 private boolean destroy; 90 private boolean destroy;
82 91
  92 + // 版本号
  93 + private Integer versions;
  94 +
  95 + // 描述
  96 + private String descriptions;
  97 +
83 // 创建人 98 // 创建人
84 private Integer createBy; 99 private Integer createBy;
85 100
86 // 修改人 101 // 修改人
87 private Integer updateBy; 102 private Integer updateBy;
88 103
89 - // 描述  
90 - private String descriptions;  
91 -  
92 // 创建日期 104 // 创建日期
93 @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP") 105 @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
94 private Date createDate; 106 private Date createDate;
@@ -177,12 +189,20 @@ public class Station { @@ -177,12 +189,20 @@ public class Station {
177 this.y = y; 189 this.y = y;
178 } 190 }
179 191
180 - public byte[] getgSpaceGrid() {  
181 - return gSpaceGrid; 192 + public String getShapesType() {
  193 + return shapesType;
182 } 194 }
183 195
184 - public void setgSpaceGrid(byte[] gSpaceGrid) {  
185 - this.gSpaceGrid = gSpaceGrid; 196 + public void setShapesType(String shapesType) {
  197 + this.shapesType = shapesType;
  198 + }
  199 +
  200 + public Integer getRadius() {
  201 + return radius;
  202 + }
  203 +
  204 + public void setRadius(Integer radius) {
  205 + this.radius = radius;
186 } 206 }
187 207
188 public byte[] getgPolygonGrid() { 208 public byte[] getgPolygonGrid() {
@@ -201,6 +221,22 @@ public class Station { @@ -201,6 +221,22 @@ public class Station {
201 this.destroy = destroy; 221 this.destroy = destroy;
202 } 222 }
203 223
  224 + public Integer getVersions() {
  225 + return versions;
  226 + }
  227 +
  228 + public void setVersions(Integer versions) {
  229 + this.versions = versions;
  230 + }
  231 +
  232 + public String getDescriptions() {
  233 + return descriptions;
  234 + }
  235 +
  236 + public void setDescriptions(String descriptions) {
  237 + this.descriptions = descriptions;
  238 + }
  239 +
204 public Integer getCreateBy() { 240 public Integer getCreateBy() {
205 return createBy; 241 return createBy;
206 } 242 }
@@ -217,14 +253,6 @@ public class Station { @@ -217,14 +253,6 @@ public class Station {
217 this.updateBy = updateBy; 253 this.updateBy = updateBy;
218 } 254 }
219 255
220 - public String getDescriptions() {  
221 - return descriptions;  
222 - }  
223 -  
224 - public void setDescriptions(String descriptions) {  
225 - this.descriptions = descriptions;  
226 - }  
227 -  
228 public Date getCreateDate() { 256 public Date getCreateDate() {
229 return createDate; 257 return createDate;
230 } 258 }