潘钊 / control_service_data_Interface · Commits

Commit 543e09f03dd5f9d1dff56dfe5161a1b1b6fbc916

Authored by 廖磊
2 parents a64f2c0a 5dff31bd
build: skipped

Merge branch 'master' of 192.168.168.201:panzhaov5/control_service_data_Interface

Inline Side-by-side
Showing 2 changed files with 11 additions and 1 deletions
src/main/java/com/bsth/server_rs/base_info/line/Line.java
  View file @543e09f
... ... @@ -106,6 +106,8 @@ public class Line implements Serializable {
106 106  
107 107 // 环线或双向
108 108 private int linePlayType;
  109 + // 区内/外
  110 + private int region;
109 111  
110 112 public String getName() {
111 113 return name;
... ... @@ -331,4 +333,12 @@ public class Line implements Serializable {
331 333 public void setLinePlayType(int linePlayType) {
332 334 this.linePlayType = linePlayType;
333 335 }
  336 +
  337 + public int getRegion() {
  338 + return region;
  339 + }
  340 +
  341 + public void setRegion(int region) {
  342 + this.region = region;
  343 + }
334 344 }
... ...
src/main/java/com/bsth/server_rs/base_info/line/buffer/LineRefreshThread.java
  View file @543e09f
... ... @@ -28,7 +28,7 @@ public class LineRefreshThread extends Thread{
28 28 public void run() {
29 29  
30 30 try {
31   - List<Line> list = jdbcTemplate.query("SELECT t1. NAME,t1.line_code,t1.start_station_name,t1.end_station_name,t1.start_station_first_time,t1.start_station_end_time,t1.end_station_first_time,t1.end_station_end_time,t1.company,t1.branche_company,t1.nature,t1.`level`,t1.destroy,t1.supper_line,t1.eq_linecode,t1.create_date,t2.total_mileage,t2.early_interval_lg,t2.late_interval_lg,t2.interval_lg,t2.speed_limit,t2.lag_station,t2.skip,t2.speeding,t2.crossed_line,t2.overflights,t1.shanghai_linecode, t1.line_play_type FROM bsth_c_line t1 LEFT JOIN bsth_c_line_information t2 ON t1.id = t2.line where t1.destroy=0",
  31 + List<Line> list = jdbcTemplate.query("SELECT t1. NAME,t1.line_code,t1.start_station_name,t1.end_station_name,t1.start_station_first_time,t1.start_station_end_time,t1.end_station_first_time,t1.end_station_end_time,t1.company,t1.branche_company,t1.nature,t1.`level`,t1.destroy,t1.supper_line,t1.eq_linecode,t1.create_date,t2.total_mileage,t2.early_interval_lg,t2.late_interval_lg,t2.interval_lg,t2.speed_limit,t2.lag_station,t2.skip,t2.speeding,t2.crossed_line,t2.overflights,t1.shanghai_linecode, t1.line_play_type, t1.region FROM bsth_c_line t1 LEFT JOIN bsth_c_line_information t2 ON t1.id = t2.line where t1.destroy=0",
32 32 BeanPropertyRowMapper.newInstance(Line.class));
33 33  
34 34 Map<String, Line> map = new HashMap<>();
... ...