1.产研院3个率

王通
1 parent dfa9ba0e
Showing 3 changed files with 406 additions and 393 deletions
src/main/java/com/bsth/server_rs/base_info/line/Line.java
src/main/java/com/bsth/server_rs/base_info/line/buffer/LineRefreshThread.java
src/main/java/com/bsth/server_rs/rate/RateService.java
-package com.bsth.server_rs.base_info.line;
-
-import com.bsth.server_rs.adapter.DateTimeAdapter;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import java.io.Serializable;
-import java.util.Date;
-
-
-/**
- * @ClassName: Line(线路实体类)
- * @Description: TODO(线路)
- * @Author bsth@lq
- * @Date 2016-4-11 16:06:17
- * @Version 公交调度系统BS版 0.1
- */
-@XmlRootElement
-public class Line implements Serializable {
-
-
-    /**线路名称  varchar length(50) 不能为空*/
-    private String name;
-
-    /** 线路编码 varchar length(50) 不能为空*/
-    private String lineCode;
-
-    /** 起始站名称*/
-    private String startStationName;
-
-    /** 终点站名称*/
-    private String endStationName;
-
-    /** 起始站首班车时间 00:00  */
-    private String startStationFirstTime;
-
-    /** 起始站末班车时间 00:00 */
-    private String startStationEndTime;
-
-    /** 终点站首班时间 00:00 */
-    private String endStationFirstTime;
-
-    /** 终点站末班时间 00:00 */
-    private String endStationEndTime;
-
-    /** 所属公司 */
-    private String company;
-
-    /** 分公司  */
-    private String brancheCompany;
-
-    /** 性质(线路类型) */
-    private String nature;
-
-    /**线路等级 */
-    private String level;
-
-    /**是否撤销 <1:是;0:否> */
-    private Integer destroy;
-
-    /** 是否夜宵线   <1:是;0:否> */
-    private Integer supperLine;
-
-    /** 设备线路编码 */
-    private String eqLinecode;
-
-    /**
-     * 创建日期 timestamp
-     */
-    private Date createDate;
-
-    //-------------- 标准信息 -----------
-    /** 标准总里程 */
-    private Double totalMileage;
-    /** 早高峰大间隔（分钟） */
-    private Double earlyIntervalLg;
-
-    /** 晚高峰大间隔（分钟） */
-    private Double lateIntervalLg;
-
-    /** 平时大间隔（分钟） */
-    private Double intervalLg;
-
-    /** 限速（平时） */
-    private Double speedLimit;
-
-    /** 滞站 */
-    private Integer lagStation;
-
-    /** 越站 */
-    private Integer skip;
-
-    /** 超速 */
-    private Integer speeding;
-
-    /** 串线 */
-    private Integer  crossedLine;
-
-    /** 越界 */
-    private Integer overflights;
-
-    /**
-     * 上海市线路编码
-     */
-    private String shanghaiLinecode;
-    
-    // 环线或双向
-    private int linePlayType;
-    // 区内/外
-    private int region;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-
-    public String getStartStationName() {
-        return startStationName;
-    }
-
-    public void setStartStationName(String startStationName) {
-        this.startStationName = startStationName;
-    }
-
-    public String getEndStationName() {
-        return endStationName;
-    }
-
-    public void setEndStationName(String endStationName) {
-        this.endStationName = endStationName;
-    }
-
-    public String getStartStationFirstTime() {
-        return startStationFirstTime;
-    }
-
-    public void setStartStationFirstTime(String startStationFirstTime) {
-        this.startStationFirstTime = startStationFirstTime;
-    }
-
-    public String getStartStationEndTime() {
-        return startStationEndTime;
-    }
-
-    public void setStartStationEndTime(String startStationEndTime) {
-        this.startStationEndTime = startStationEndTime;
-    }
-
-    public String getEndStationFirstTime() {
-        return endStationFirstTime;
-    }
-
-    public void setEndStationFirstTime(String endStationFirstTime) {
-        this.endStationFirstTime = endStationFirstTime;
-    }
-
-    public String getEndStationEndTime() {
-        return endStationEndTime;
-    }
-
-    public void setEndStationEndTime(String endStationEndTime) {
-        this.endStationEndTime = endStationEndTime;
-    }
-
-    public String getCompany() {
-        return company;
-    }
-
-    public void setCompany(String company) {
-        this.company = company;
-    }
-
-    public String getBrancheCompany() {
-        return brancheCompany;
-    }
-
-    public void setBrancheCompany(String brancheCompany) {
-        this.brancheCompany = brancheCompany;
-    }
-
-    public String getNature() {
-        return nature;
-    }
-
-    public void setNature(String nature) {
-        this.nature = nature;
-    }
-
-    public String getLevel() {
-        return level;
-    }
-
-    public void setLevel(String level) {
-        this.level = level;
-    }
-
-    public Integer getDestroy() {
-        return destroy;
-    }
-
-    public void setDestroy(Integer destroy) {
-        this.destroy = destroy;
-    }
-
-    public Integer getSupperLine() {
-        return supperLine;
-    }
-
-    public void setSupperLine(Integer supperLine) {
-        this.supperLine = supperLine;
-    }
-
-    public String getEqLinecode() {
-        return eqLinecode;
-    }
-
-    public void setEqLinecode(String eqLinecode) {
-        this.eqLinecode = eqLinecode;
-    }
-
-    @XmlJavaTypeAdapter(DateTimeAdapter.class)
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Double getTotalMileage() {
-        return totalMileage;
-    }
-
-    public void setTotalMileage(Double totalMileage) {
-        this.totalMileage = totalMileage;
-    }
-
-    public Double getEarlyIntervalLg() {
-        return earlyIntervalLg;
-    }
-
-    public void setEarlyIntervalLg(Double earlyIntervalLg) {
-        this.earlyIntervalLg = earlyIntervalLg;
-    }
-
-    public Double getLateIntervalLg() {
-        return lateIntervalLg;
-    }
-
-    public void setLateIntervalLg(Double lateIntervalLg) {
-        this.lateIntervalLg = lateIntervalLg;
-    }
-
-    public Double getIntervalLg() {
-        return intervalLg;
-    }
-
-    public void setIntervalLg(Double intervalLg) {
-        this.intervalLg = intervalLg;
-    }
-
-    public Double getSpeedLimit() {
-        return speedLimit;
-    }
-
-    public void setSpeedLimit(Double speedLimit) {
-        this.speedLimit = speedLimit;
-    }
-
-    public Integer getLagStation() {
-        return lagStation;
-    }
-
-    public void setLagStation(Integer lagStation) {
-        this.lagStation = lagStation;
-    }
-
-    public Integer getSkip() {
-        return skip;
-    }
-
-    public void setSkip(Integer skip) {
-        this.skip = skip;
-    }
-
-    public Integer getSpeeding() {
-        return speeding;
-    }
-
-    public void setSpeeding(Integer speeding) {
-        this.speeding = speeding;
-    }
-
-    public Integer getCrossedLine() {
-        return crossedLine;
-    }
-
-    public void setCrossedLine(Integer crossedLine) {
-        this.crossedLine = crossedLine;
-    }
-
-    public Integer getOverflights() {
-        return overflights;
-    }
-
-    public void setOverflights(Integer overflights) {
-        this.overflights = overflights;
-    }
-
-    public String getShanghaiLinecode() {
-        return shanghaiLinecode;
-    }
-
-    public void setShanghaiLinecode(String shanghaiLinecode) {
-        this.shanghaiLinecode = shanghaiLinecode;
-    }
-
-	public int getLinePlayType() {
-		return linePlayType;
-	}
-
-	public void setLinePlayType(int linePlayType) {
-		this.linePlayType = linePlayType;
-	}
-
-	public int getRegion() {
-		return region;
-	}
-
-	public void setRegion(int region) {
-		this.region = region;
-	}
-}
+package com.bsth.server_rs.base_info.line;
+
+import com.bsth.server_rs.adapter.DateTimeAdapter;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * @ClassName: Line(线路实体类)
+ * @Description: TODO(线路)
+ * @Author bsth@lq
+ * @Date 2016-4-11 16:06:17
+ * @Version 公交调度系统BS版 0.1
+ */
+@XmlRootElement
+public class Line implements Serializable {
+
+
+    /**线路名称  varchar length(50) 不能为空*/
+    private String name;
+
+    /** 线路编码 varchar length(50) 不能为空*/
+    private String lineCode;
+
+    /** 起始站名称*/
+    private String startStationName;
+
+    /** 终点站名称*/
+    private String endStationName;
+
+    /** 起始站首班车时间 00:00  */
+    private String startStationFirstTime;
+
+    /** 起始站末班车时间 00:00 */
+    private String startStationEndTime;
+
+    /** 终点站首班时间 00:00 */
+    private String endStationFirstTime;
+
+    /** 终点站末班时间 00:00 */
+    private String endStationEndTime;
+
+    /** 所属公司 */
+    private String company;
+
+    /**
+     * 所属公司名称
+     */
+    private String companyName;
+
+    /** 分公司  */
+    private String brancheCompany;
+
+    /** 性质(线路类型) */
+    private String nature;
+
+    /**线路等级 */
+    private String level;
+
+    /**是否撤销 <1:是;0:否> */
+    private Integer destroy;
+
+    /** 是否夜宵线   <1:是;0:否> */
+    private Integer supperLine;
+
+    /** 设备线路编码 */
+    private String eqLinecode;
+
+    /**
+     * 创建日期 timestamp
+     */
+    private Date createDate;
+
+    //-------------- 标准信息 -----------
+    /** 标准总里程 */
+    private Double totalMileage;
+    /** 早高峰大间隔（分钟） */
+    private Double earlyIntervalLg;
+
+    /** 晚高峰大间隔（分钟） */
+    private Double lateIntervalLg;
+
+    /** 平时大间隔（分钟） */
+    private Double intervalLg;
+
+    /** 限速（平时） */
+    private Double speedLimit;
+
+    /** 滞站 */
+    private Integer lagStation;
+
+    /** 越站 */
+    private Integer skip;
+
+    /** 超速 */
+    private Integer speeding;
+
+    /** 串线 */
+    private Integer  crossedLine;
+
+    /** 越界 */
+    private Integer overflights;
+
+    /**
+     * 上海市线路编码
+     */
+    private String shanghaiLinecode;
+    
+    // 环线或双向
+    private int linePlayType;
+    // 区内/外
+    private int region;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getStartStationName() {
+        return startStationName;
+    }
+
+    public void setStartStationName(String startStationName) {
+        this.startStationName = startStationName;
+    }
+
+    public String getEndStationName() {
+        return endStationName;
+    }
+
+    public void setEndStationName(String endStationName) {
+        this.endStationName = endStationName;
+    }
+
+    public String getStartStationFirstTime() {
+        return startStationFirstTime;
+    }
+
+    public void setStartStationFirstTime(String startStationFirstTime) {
+        this.startStationFirstTime = startStationFirstTime;
+    }
+
+    public String getStartStationEndTime() {
+        return startStationEndTime;
+    }
+
+    public void setStartStationEndTime(String startStationEndTime) {
+        this.startStationEndTime = startStationEndTime;
+    }
+
+    public String getEndStationFirstTime() {
+        return endStationFirstTime;
+    }
+
+    public void setEndStationFirstTime(String endStationFirstTime) {
+        this.endStationFirstTime = endStationFirstTime;
+    }
+
+    public String getEndStationEndTime() {
+        return endStationEndTime;
+    }
+
+    public void setEndStationEndTime(String endStationEndTime) {
+        this.endStationEndTime = endStationEndTime;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getBrancheCompany() {
+        return brancheCompany;
+    }
+
+    public void setBrancheCompany(String brancheCompany) {
+        this.brancheCompany = brancheCompany;
+    }
+
+    public String getNature() {
+        return nature;
+    }
+
+    public void setNature(String nature) {
+        this.nature = nature;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+    public Integer getDestroy() {
+        return destroy;
+    }
+
+    public void setDestroy(Integer destroy) {
+        this.destroy = destroy;
+    }
+
+    public Integer getSupperLine() {
+        return supperLine;
+    }
+
+    public void setSupperLine(Integer supperLine) {
+        this.supperLine = supperLine;
+    }
+
+    public String getEqLinecode() {
+        return eqLinecode;
+    }
+
+    public void setEqLinecode(String eqLinecode) {
+        this.eqLinecode = eqLinecode;
+    }
+
+    @XmlJavaTypeAdapter(DateTimeAdapter.class)
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Double getTotalMileage() {
+        return totalMileage;
+    }
+
+    public void setTotalMileage(Double totalMileage) {
+        this.totalMileage = totalMileage;
+    }
+
+    public Double getEarlyIntervalLg() {
+        return earlyIntervalLg;
+    }
+
+    public void setEarlyIntervalLg(Double earlyIntervalLg) {
+        this.earlyIntervalLg = earlyIntervalLg;
+    }
+
+    public Double getLateIntervalLg() {
+        return lateIntervalLg;
+    }
+
+    public void setLateIntervalLg(Double lateIntervalLg) {
+        this.lateIntervalLg = lateIntervalLg;
+    }
+
+    public Double getIntervalLg() {
+        return intervalLg;
+    }
+
+    public void setIntervalLg(Double intervalLg) {
+        this.intervalLg = intervalLg;
+    }
+
+    public Double getSpeedLimit() {
+        return speedLimit;
+    }
+
+    public void setSpeedLimit(Double speedLimit) {
+        this.speedLimit = speedLimit;
+    }
+
+    public Integer getLagStation() {
+        return lagStation;
+    }
+
+    public void setLagStation(Integer lagStation) {
+        this.lagStation = lagStation;
+    }
+
+    public Integer getSkip() {
+        return skip;
+    }
+
+    public void setSkip(Integer skip) {
+        this.skip = skip;
+    }
+
+    public Integer getSpeeding() {
+        return speeding;
+    }
+
+    public void setSpeeding(Integer speeding) {
+        this.speeding = speeding;
+    }
+
+    public Integer getCrossedLine() {
+        return crossedLine;
+    }
+
+    public void setCrossedLine(Integer crossedLine) {
+        this.crossedLine = crossedLine;
+    }
+
+    public Integer getOverflights() {
+        return overflights;
+    }
+
+    public void setOverflights(Integer overflights) {
+        this.overflights = overflights;
+    }
+
+    public String getShanghaiLinecode() {
+        return shanghaiLinecode;
+    }
+
+    public void setShanghaiLinecode(String shanghaiLinecode) {
+        this.shanghaiLinecode = shanghaiLinecode;
+    }
+
+	public int getLinePlayType() {
+		return linePlayType;
+	}
+
+	public void setLinePlayType(int linePlayType) {
+		this.linePlayType = linePlayType;
+	}
+
+	public int getRegion() {
+		return region;
+	}
+
+	public void setRegion(int region) {
+		this.region = region;
+	}
+}
-package com.bsth.server_rs.base_info.line.buffer;
-
-import com.bsth.server_rs.base_info.line.Line;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by panzhao on 2017/3/27.
- */
-@Component
-public class LineRefreshThread extends Thread{
-
-    @Autowired
-    JdbcTemplate jdbcTemplate;
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Override
-    public void run() {
-
-        try {
-            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",
-                    BeanPropertyRowMapper.newInstance(Line.class));
-
-            Map<String, Line> map = new HashMap<>();
-            //过滤数据，多条线路配人的保留一条
-            for(Line line : list){
-                map.put(line.getLineCode(), line);
-            }
-
-            if(list != null && list.size() > 0)
-                LineBufferData.replaceAll(new ArrayList(map.values()));
-        }catch (Exception e){
-            logger.error("", e);
-        }
-    }
-}
+package com.bsth.server_rs.base_info.line.buffer;
+
+import com.bsth.server_rs.base_info.line.Line;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/3/27.
+ */
+@Component
+public class LineRefreshThread extends Thread{
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+
+        try {
+            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, t3.business_name company_name FROM bsth_c_line t1 LEFT JOIN bsth_c_line_information t2 ON t1.id = t2.line LEFT JOIN bsth_c_business t3 on t1.company = t3.business_code where t1.destroy=0",
+                    BeanPropertyRowMapper.newInstance(Line.class));
+
+            Map<String, Line> map = new HashMap<>();
+            //过滤数据，多条线路配人的保留一条
+            for(Line line : list){
+                map.put(line.getLineCode(), line);
+            }
+
+            if(list != null && list.size() > 0)
+                LineBufferData.replaceAll(new ArrayList(map.values()));
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+}
@@ -85,7 +85,7 @@ public class RateService {
             map1.put("rq", map.get("date"));
             map1.put("xlbm", map.get("lineCode"));
             map1.put("xlmc", map.get("lineName"));
-            map1.put("ssgs", LineBufferData.findOne(String.valueOf(map.get("lineCode"))));
+            map1.put("ssgs", LineBufferData.findOne(String.valueOf(map.get("lineCode"))).getCompanyName());
             map1.put("jhzxbc", map.get("jhbc"));
             map1.put("sjzxbc", map.get("sjbc"));
             map1.put("bczxl", map.get("bczxl"));
@@ -107,7 +107,7 @@ public class RateService {
             map1.put("rq", map.get("date"));
             map1.put("xlbm", map.get("lineCode"));
             map1.put("xlmc", map.get("lineName"));
-            map1.put("ssgs", LineBufferData.findOne(String.valueOf(map.get("lineCode"))));
+            map1.put("ssgs", LineBufferData.findOne(String.valueOf(map.get("lineCode"))).getCompanyName());
             map1.put("sybcs", map.get("jhsmbcs"));
             map1.put("zdbcs", map.get("sjsmbczds"));
             map1.put("smbczdl", map.get("smbczdl"));
@@ -129,7 +129,7 @@ public class RateService {
             map1.put("rq", map.get("date"));
             map1.put("xlbm", map.get("lineCode"));
             map1.put("xlmc", map.get("lineName"));
-            map1.put("ssgs", LineBufferData.findOne(String.valueOf(map.get("lineCode"))));
+            map1.put("ssgs", LineBufferData.findOne(String.valueOf(map.get("lineCode"))).getCompanyName());
             map1.put("sybcs", map.get("jhszfcs"));
             map1.put("zdbcs", map.get("sjszfczds"));
             map1.put("qqzfczdl", map.get("szfczdl"));