update...

潘钊
1 parent 995d98c7
Showing 24 changed files with 1196 additions and 225 deletions
src/main/java/com/bsth/CXFConfig.java
src/main/java/com/bsth/common/BasicData.java
src/main/java/com/bsth/entity/ChildTaskPlan.java
src/main/java/com/bsth/entity/ScheduleRealInfo.java
src/main/java/com/bsth/redis/OilRedisService.java
src/main/java/com/bsth/redis/PlanScheduleRedisService.java
src/main/java/com/bsth/redis/ScheduleRedisService.java
src/main/java/com/bsth/server_rs/adapter/DateTimeAdapter.java
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/base_info/station/StationRestService.java
src/main/java/com/bsth/server_rs/base_info/station/buffer/StationBufferData.java
src/main/java/com/bsth/server_rs/base_info/station/buffer/StationRefreshThread.java
src/main/java/com/bsth/server_rs/base_info/station/entity/Station.java
src/main/java/com/bsth/server_rs/base_info/station/entity/StationRotue.java
src/main/java/com/bsth/server_rs/gps/GpsRestService.java
src/main/java/com/bsth/server_rs/gps/buffer/GpsRealDataBuffer.java
src/main/java/com/bsth/server_rs/gps/buffer/GpsRefreshThread.java
src/main/java/com/bsth/server_rs/gps/dao/HistoryGpsDao.java
src/main/java/com/bsth/server_rs/gps/GpsEntity.java → src/main/java/com/bsth/server_rs/gps/entity/GpsEntity.java
@@ -4,6 +4,7 @@ import com.bsth.server_rs.AuthorizeInterceptor_IN;
 import com.bsth.server_rs.base_info.car.CarRestService;
 import com.bsth.server_rs.base_info.line.LineRestService;
 import com.bsth.server_rs.base_info.person.PersonRestService;
+import com.bsth.server_rs.base_info.station.StationRestService;
 import com.bsth.server_rs.exception.AesExceptionMapper;
 import com.bsth.server_rs.gps.GpsRestService;
 import com.bsth.server_rs.schedule.real.ScheduleRealService;
@@ -73,6 +74,9 @@ public class CXFConfig {
     @Autowired
     ScheduleRealService scheduleRealService;
+    @Autowired
+    StationRestService stationRestService;
+
     @Bean
     public Server rsServer() {
         JAXRSServerFactoryBean endpoint = new JAXRSServerFactoryBean();
@@ -83,7 +87,8 @@ public class CXFConfig {
                 new CarRestService(),
                 new PersonRestService(),
                 new GpsRestService(),
-                scheduleRealService));
+                scheduleRealService,
+                stationRestService));
         endpoint.setProviders(Arrays.asList(new JacksonJsonProvider(), new AesExceptionMapper()));
         //endpoint.setFeatures(Arrays.asList(new Swagger2Feature()));
         endpoint.getInInterceptors().add(new AuthorizeInterceptor_IN());
@@ -3,6 +3,7 @@ package com.bsth.common;
 import com.bsth.Application;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
@@ -16,6 +17,7 @@ import java.util.concurrent.TimeUnit;
  * Created by panzhao on 2017/8/24.
  */
 @Component
+@Order(1)
 public class BasicData implements CommandLineRunner {
     /**
@@ -24,12 +26,15 @@ public class BasicData implements CommandLineRunner {
      */
     public static Map<String, String> lineDateMap;
+    public static Map<String, String> lineStartTimeMap;
+
     @Autowired
     BasicDataLoader basicDataLoader;
     @Override
     public void run(String... strings) throws Exception {
-        Application.mainServices.scheduleWithFixedDelay(basicDataLoader, 10, 60 * 10, TimeUnit.SECONDS);
+        basicDataLoader.run();
+        Application.mainServices.scheduleWithFixedDelay(basicDataLoader, 60 * 10, 60 * 10, TimeUnit.SECONDS);
     }
@@ -46,17 +51,24 @@ public class BasicData implements CommandLineRunner {
         private void loadLineDateMap(){
             Map<String, String> lineDateMapCopy = new HashMap<>();
+            Map<String, String> lineStartTimeMapCopy = new HashMap<>();
+
             String sql = "select START_OPT,t2.LINE_CODE from bsth_c_line_config t1 INNER JOIN bsth_c_line t2 on t1.line=t2.id where t2.line_code is not null";
             List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
+            String lineCode, startTime;
             for(Map<String, Object> map : list){
-                lineDateMapCopy.put(map.get("LINE_CODE").toString(), calcScheduleDate(map.get("START_OPT")));
+                lineCode = map.get("LINE_CODE").toString();
+                startTime = map.get("START_OPT").toString();
+                lineDateMapCopy.put(lineCode, calcScheduleDate(startTime));
+                lineStartTimeMapCopy.put(lineCode, startTime);
             }
             lineDateMap = lineDateMapCopy;
+            lineStartTimeMap = lineStartTimeMapCopy;
         }
-        private String calcScheduleDate(Object startDate){
+        private String calcScheduleDate(String startDate){
             return "20170828";
         }
     }
 package com.bsth.entity;
+import com.bsth.server_rs.adapter.DateTimeAdapter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import javax.persistence.*;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import java.io.Serializable;
 import java.util.Date;
@@ -15,6 +18,7 @@ import java.util.Date;
  * @date 2016年6月20日 上午11:22:22
  *
  */
+@XmlRootElement
 @Entity
 @Table(name = "bsth_c_s_child_task")
 @NamedEntityGraphs({
@@ -235,6 +239,7 @@ public class ChildTaskPlan implements Serializable {
 		return this.id.equals(((ChildTaskPlan)obj).getId());
 	}
+	@XmlJavaTypeAdapter(DateTimeAdapter.class)
 	public Date getCreateDate() {
 		return createDate;
 	}
 package com.bsth.entity;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
 import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
@@ -128,7 +131,7 @@ public class ScheduleRealInfo implements Serializable{
 	/** 备注*/
 	private String remarks;
-	
+
 	/**待发时间（格式 HH:mm） */
 	private String dfsj;
@@ -138,7 +141,7 @@ public class ScheduleRealInfo implements Serializable{
 	/** 指令下发状态  60: 已发送， 100： 设备确认收到， 200：驾驶员确认   0：失败 */
 	private Integer directiveState = -1;
-	
+
 	/** 起点站计划到达时间 */
 	@Transient
 	private String qdzArrDatejh;
@@ -603,4 +606,28 @@ public class ScheduleRealInfo implements Serializable{
 	public void setJhlcOrig(Double jhlcOrig) {
 		this.jhlcOrig = jhlcOrig;
 	}
+
+	@Transient
+	private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
+	/**
+	 *
+	 * @Title: setFcsjActualAll
+	 * @Description: TODO(设置实际发车时间 时间戳)
+	 * @throws
+	 */
+	public void setFcsjActualAll(Long t){
+		this.fcsjActualTime = t;
+		this.fcsjActual = fmtHHmm.print(t);
+	}
+
+	/**
+	 *
+	 * @Title: setFcsjActualAll
+	 * @Description: TODO(设置实际终点时间)
+	 * @throws
+	 */
+	public void setZdsjActualAll(Long t){
+		this.zdsjActualTime = t;
+		this.zdsjActual = fmtHHmm.print(t);
+	}
 }
 package com.bsth.redis;
-import com.bsth.Application;
 import com.bsth.entity.OilInfo;
 import com.bsth.redis.util.RedisUtils;
 import com.bsth.repository.OilInfoRepository;
@@ -19,7 +18,6 @@ import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 /**
  * 油量数据Redis缓存
@@ -124,7 +122,7 @@ public class OilRedisService implements CommandLineRunner {
     @Override
     public void run(String... strings) throws Exception {
         //定时刷新油耗信息
-        Application.mainServices.scheduleWithFixedDelay(oilRefreshThread, 40, 60 * 40, TimeUnit.SECONDS);
+        //Application.mainServices.scheduleWithFixedDelay(oilRefreshThread, 40, 60 * 40, TimeUnit.SECONDS);
     }
     /**
 package com.bsth.redis;
-import com.bsth.Application;
 import com.bsth.entity.SchedulePlanInfo;
-import com.bsth.redis.util.DateUtils;
 import com.bsth.redis.util.RedisUtils;
 import com.bsth.repository.SchedulePlanInfoRepository;
 import com.bsth.server_rs.base_info.line.Line;
@@ -18,7 +16,6 @@ import org.springframework.boot.CommandLineRunner;
 import org.springframework.core.annotation.Order;
 import org.springframework.data.redis.core.ListOperations;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
@@ -26,7 +23,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 /**
  * 计调的 计划排班redis缓存
@@ -124,7 +120,7 @@ public class PlanScheduleRedisService implements CommandLineRunner {
     @Override
     public void run(String... strings) throws Exception {
-        int cacheDays = Integer.parseInt(ConfigUtil.get("cache.days"));
+        /*int cacheDays = Integer.parseInt(ConfigUtil.get("cache.days"));
         //设置key 序列化器
         redisTemplate.setKeySerializer(new StringRedisSerializer());
@@ -139,7 +135,7 @@ public class PlanScheduleRedisService implements CommandLineRunner {
         long diff = (DateUtils.getTimestamp() + 1000 * 60 * 5) - System.currentTimeMillis();
         if (diff < 0)
             diff += (1000 * 60 * 60 * 24);
-        Application.mainServices.scheduleAtFixedRate(planClearThread, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+        Application.mainServices.scheduleAtFixedRate(planClearThread, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);*/
     }
     public List<SchedulePlanInfo> findByMultiLine(List<String> lineArray, String rq) {
 package com.bsth.redis;
 import com.bsth.Application;
+import com.bsth.common.BasicData;
 import com.bsth.entity.ScheduleRealInfo;
 import com.bsth.redis.util.RedisUtils;
 import com.bsth.repository.ScheduleRealInfoRepository;
@@ -10,7 +11,10 @@ import com.bsth.server_ws.WebServiceProxy;
 import com.bsth.util.ConfigUtil;
 import com.bsth.util.ConvertUtil;
 import com.google.common.collect.ArrayListMultimap;
+import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +55,8 @@ public class ScheduleRedisService implements CommandLineRunner {
     static Logger logger = LoggerFactory.getLogger(ScheduleRedisService.class);
+    private final static long DAY_TIME = 1000 * 60 * 60 * 24L;
+
     /**
      * 将一批班次写入redis
      *
@@ -218,6 +224,7 @@ public class ScheduleRedisService implements CommandLineRunner {
         DateTime dt = new DateTime();
         dt = dt.minusDays(cacheDays);
         List<ScheduleRealInfo> list = scheduleRealInfoRepository.findByDateLT(dt.toString("yyyy-MM-dd"));
+        calcTime(list);
         //写入redis
         wirte(list);
@@ -282,4 +289,62 @@ public class ScheduleRedisService implements CommandLineRunner {
             }
         }
     }
+
+    /**
+     * ############ 时间戳计算 ##########
+     */
+    private static DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm"),
+            fmtHHmm = DateTimeFormat.forPattern("HH:mm");
+
+    private void calcTime(List<ScheduleRealInfo> list){
+        if(list.size() == 0)
+            return;
+
+        //计算真实执行日期 和 时间戳
+        for(ScheduleRealInfo sch : list){
+            calcRealDate(BasicData.lineStartTimeMap.get(sch.getXlBm()), sch);
+        }
+    }
+
+    /**
+     * @Title: calcRealDate
+     * @Description: TODO(计算班次的真实执行日期)
+     */
+    public void calcRealDate(String startTime, ScheduleRealInfo sch) {
+        try {
+
+            String rq = sch.getScheduleDateStr();
+            //计发时间
+            sch.setFcsjT(parseTime(rq, sch.getFcsj(), startTime));
+            //待发时间
+            sch.setDfsjT(parseTime(rq, sch.getDfsj(), startTime));
+            //计划终点时间
+            if(StringUtils.isEmpty(sch.getZdsj())){
+                sch.setZdsjT(sch.getDfsjT() + (sch.getBcsj() * 60 * 1000));
+                sch.setZdsj(fmtHHmm.print(sch.getZdsjT()));
+            }
+            else
+                sch.setZdsjT(sch.getDfsjT() + (sch.getBcsj() * 60 * 1000));
+            //实发时间
+            if(StringUtils.isEmpty(sch.getFcsjActual()))
+                sch.setFcsjActualAll(sch.getDfsjT());
+            else
+                sch.setFcsjActualAll(parseTime(rq, sch.getFcsjActual(), startTime));
+            //实达时间
+            if(StringUtils.isEmpty(sch.getZdsjActual()))
+                sch.setZdsjActualAll(sch.getZdsjT());
+            else
+                sch.setZdsjActualAll(parseTime(rq, sch.getZdsjActual(), startTime));
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+
+    private long parseTime(String rq, String sj, String startTime){
+        long t = fmtyyyyMMddHHmm.parseMillis(rq + sj);
+        if(sj.compareTo(startTime) < 0){
+            t += DAY_TIME;
+        }
+        return t;
+    }
 }
+package com.bsth.server_rs.adapter;
+
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+import java.util.Date;
+
+/**
+ * 时间格式处理 yyyy-MM-dd
+ * Created by panzhao on 2017/3/28.
+ */
+public class DateTimeAdapter extends XmlAdapter<Long, Date> {
+
+    @Override
+    public Date unmarshal(Long v) throws Exception {
+        return new Date(v);
+    }
+
+    @Override
+    public Long marshal(Date v) throws Exception {
+        return v.getTime();
+    }
+}
 package com.bsth.server_rs.base_info.line;
-import com.bsth.server_rs.adapter.DateAdapter_yMdHms;
+import com.bsth.server_rs.adapter.DateTimeAdapter;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -18,166 +18,86 @@ import java.util.Date;
 @XmlRootElement
 public class Line implements Serializable {
-    /**
-     * 线路ID 主键(唯一标识符) int length(11)
-     */
-    private Integer id;
-    /**
-     * 线路名称  varchar length(50) 不能为空
-     */
+    /**线路名称  varchar length(50) 不能为空*/
     private String name;
-    /**
-     * 线路编码 varchar length(50) 不能为空
-     */
+    /** 线路编码 varchar length(50) 不能为空*/
     private String lineCode;
-    /**
-     * 英文名  varchar length(50)
-     */
-    private String es;
-
-    /**
-     * 简称 varchar length(50)
-     */
-    private String shortName;
-
-    /**
-     * 起始站名称 varchar length(50) 不能为空
-     * 该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的起点站。默认使用该字段填写值
-     */
+    /** 起始站名称*/
     private String startStationName;
-    /**
-     * 终点站名称 varchar length(50) 不能为空
-     * 该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的起点站。默认使用该字段填写值
-     */
+    /** 终点站名称*/
     private String endStationName;
-    /**
-     * 起始站首班车时间 00:00 上海公交APP中某个接口所需要的字段值 varchar length(50) 不能为空
-     */
+    /** 起始站首班车时间 00:00  */
     private String startStationFirstTime;
-    /**
-     * 起始站末班车时间 00:00 上海公交APP中某个接口所需要的字段值 varchar length(50) 不能为空
-     */
+    /** 起始站末班车时间 00:00 */
     private String startStationEndTime;
-    /**
-     * 终点站首班时间 00:00 上海公交APP中某个接口所需要的字段值 varchar length(50) 不能为空
-     */
+    /** 终点站首班时间 00:00 */
     private String endStationFirstTime;
-    /**
-     * 终点站末班时间 00:00 上海公交APP中某个接口所需要的字段值
-     */
+    /** 终点站末班时间 00:00 */
     private String endStationEndTime;
-    /**
-     * 所属公司 varchar length(50)
-     */
+    /** 所属公司 */
     private String company;
-    /**
-     * 分公司  varchar length(50)
-     */
+    /** 分公司  */
     private String brancheCompany;
-    /**
-     * 性质(线路类型) varchar length(50)
-     */
+    /** 性质(线路类型) */
     private String nature;
-    /**
-     * 线路等级 varchar length(50)
-     */
+    /**线路等级 */
     private String level;
-    /**
-     * 线路长度
-     */
-    private double length;
-
-    /**
-     * 线路负责人 varchar length(50)
-     */
-    private String chargeName;
-
-    /**
-     * 负责人电话 varchar length(50)
-     */
-    private String telephone;
-
-    /**
-     * 是否撤销 <1:是;0:否> bit length(50)
-     */
+    /**是否撤销 <1:是;0:否> */
     private Integer destroy;
-    /**
-     * 是否夜宵线   <1:是;0:否> bit length(50)
-     */
+    /** 是否夜宵线   <1:是;0:否> */
     private Integer supperLine;
-    /**
-     * 起始调度电话 varchar length(50)
-     */
-    private String startPhone;
+    /** 设备线路编码 */
+    private String eqLinecode;
     /**
-     * 终点调度电话  varchar length(50)
+     * 创建日期 timestamp
      */
-    private String endPhone;
+    private Date createDate;
-    /**
-     * 开辟日期 date
-     */
-    private Date openDate;
+    //-------------- 标准信息 -----------
+    /** 标准总里程 */
+    private Double totalMileage;
+    /** 早高峰大间隔（分钟） */
+    private Double earlyIntervalLg;
-    /**
-     * 线路沿革 varchar length(50)
-     */
-    private String history;
+    /** 晚高峰大间隔（分钟） */
+    private Double lateIntervalLg;
-    /**
-     * 上海市线路编码 varchar length(50)
-     */
-    private String shanghaiLinecode;
+    /** 平时大间隔（分钟） */
+    private Double intervalLg;
-    /**
-     * 设备线路编码 varchar length(50)
-     */
-    private String eqLinecode;
+    /** 限速（平时） */
+    private Double speedLimit;
-    /**
-     * 权证车辆数量  报表需要的字段值
-     */
-    private Integer warrantCar;
+    /** 滞站 */
+    private Integer lagStation;
+    /** 越站 */
+    private Integer skip;
-    /**
-     * 线路规划类型 <0:双向;1:环线> int length(11) 运管处接口需要的字段 不能为空
-     */
-    private Integer linePlayType;
+    /** 超速 */
+    private Integer speeding;
-    /**
-     * 描述 varchar length(255)
-     */
-    private String descriptions;
+    /** 串线 */
+    private Integer  crossedLine;
-    /**
-     * 创建日期 timestamp
-     */
-    private Date createDate;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
+    /** 越界 */
+    private Integer overflights;
     public String getName() {
         return name;
@@ -195,22 +115,6 @@ public class Line implements Serializable {
         this.lineCode = lineCode;
     }
-    public String getEs() {
-        return es;
-    }
-
-    public void setEs(String es) {
-        this.es = es;
-    }
-
-    public String getShortName() {
-        return shortName;
-    }
-
-    public void setShortName(String shortName) {
-        this.shortName = shortName;
-    }
-
     public String getStartStationName() {
         return startStationName;
     }
@@ -291,30 +195,6 @@ public class Line implements Serializable {
         this.level = level;
     }
-    public double getLength() {
-        return length;
-    }
-
-    public void setLength(double length) {
-        this.length = length;
-    }
-
-    public String getChargeName() {
-        return chargeName;
-    }
-
-    public void setChargeName(String chargeName) {
-        this.chargeName = chargeName;
-    }
-
-    public String getTelephone() {
-        return telephone;
-    }
-
-    public void setTelephone(String telephone) {
-        this.telephone = telephone;
-    }
-
     public Integer getDestroy() {
         return destroy;
     }
@@ -331,85 +211,100 @@ public class Line implements Serializable {
         this.supperLine = supperLine;
     }
-    public String getStartPhone() {
-        return startPhone;
+    public String getEqLinecode() {
+        return eqLinecode;
     }
-    public void setStartPhone(String startPhone) {
-        this.startPhone = startPhone;
+    public void setEqLinecode(String eqLinecode) {
+        this.eqLinecode = eqLinecode;
     }
-    public String getEndPhone() {
-        return endPhone;
+    @XmlJavaTypeAdapter(DateTimeAdapter.class)
+    public Date getCreateDate() {
+        return createDate;
     }
-    public void setEndPhone(String endPhone) {
-        this.endPhone = endPhone;
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
     }
-    @XmlJavaTypeAdapter(DateAdapter_yMdHms.class)
-    public Date getOpenDate() {
-        return openDate;
+    public Double getTotalMileage() {
+        return totalMileage;
     }
-    public void setOpenDate(Date openDate) {
-        this.openDate = openDate;
+    public void setTotalMileage(Double totalMileage) {
+        this.totalMileage = totalMileage;
     }
-    public String getHistory() {
-        return history;
+    public Double getEarlyIntervalLg() {
+        return earlyIntervalLg;
     }
-    public void setHistory(String history) {
-        this.history = history;
+    public void setEarlyIntervalLg(Double earlyIntervalLg) {
+        this.earlyIntervalLg = earlyIntervalLg;
     }
-    public String getShanghaiLinecode() {
-        return shanghaiLinecode;
+    public Double getLateIntervalLg() {
+        return lateIntervalLg;
     }
-    public void setShanghaiLinecode(String shanghaiLinecode) {
-        this.shanghaiLinecode = shanghaiLinecode;
+    public void setLateIntervalLg(Double lateIntervalLg) {
+        this.lateIntervalLg = lateIntervalLg;
     }
-    public String getEqLinecode() {
-        return eqLinecode;
+    public Double getIntervalLg() {
+        return intervalLg;
     }
-    public void setEqLinecode(String eqLinecode) {
-        this.eqLinecode = eqLinecode;
+    public void setIntervalLg(Double intervalLg) {
+        this.intervalLg = intervalLg;
     }
-    public Integer getWarrantCar() {
-        return warrantCar;
+    public Double getSpeedLimit() {
+        return speedLimit;
     }
-    public void setWarrantCar(Integer warrantCar) {
-        this.warrantCar = warrantCar;
+    public void setSpeedLimit(Double speedLimit) {
+        this.speedLimit = speedLimit;
     }
-    public Integer getLinePlayType() {
-        return linePlayType;
+    public Integer getLagStation() {
+        return lagStation;
     }
-    public void setLinePlayType(Integer linePlayType) {
-        this.linePlayType = linePlayType;
+    public void setLagStation(Integer lagStation) {
+        this.lagStation = lagStation;
     }
-    public String getDescriptions() {
-        return descriptions;
+    public Integer getSkip() {
+        return skip;
     }
-    public void setDescriptions(String descriptions) {
-        this.descriptions = descriptions;
+    public void setSkip(Integer skip) {
+        this.skip = skip;
     }
-    @XmlJavaTypeAdapter(DateAdapter_yMdHms.class)
-    public Date getCreateDate() {
-        return createDate;
+    public Integer getSpeeding() {
+        return speeding;
     }
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
+    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;
     }
 }
@@ -25,7 +25,8 @@ public class LineRefreshThread extends Thread{
     public void run() {
         try {
-            List<Line> list = jdbcTemplate.query("select * from bsth_c_line",BeanPropertyRowMapper.newInstance(Line.class));
+            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 FROM bsth_c_line t1 LEFT JOIN bsth_c_line_information t2 ON t1.id = t2.line",
+                    BeanPropertyRowMapper.newInstance(Line.class));
             if(list != null && list.size() > 0)
                 LineBufferData.replaceAll(list);
         }catch (Exception e){
+package com.bsth.server_rs.base_info.station;
+
+import com.bsth.server_rs.base_info.station.buffer.StationBufferData;
+import com.bsth.server_rs.base_info.station.entity.StationRotue;
+import org.springframework.stereotype.Component;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/8/31.
+ */
+@Component
+@Path("/station")
+@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+public class StationRestService {
+
+    @GET
+    @Path("/{company}")
+    public Map<String, Collection<StationRotue>> findByCompany(@PathParam("company") String company){
+        return StationBufferData.findRouteByCompany(company);
+    }
+}
+package com.bsth.server_rs.base_info.station.buffer;
+
+import com.bsth.Application;
+import com.bsth.server_rs.base_info.line.Line;
+import com.bsth.server_rs.base_info.line.buffer.LineBufferData;
+import com.bsth.server_rs.base_info.station.entity.Station;
+import com.bsth.server_rs.base_info.station.entity.StationRotue;
+import com.google.common.collect.ArrayListMultimap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 站点数据缓存（自更新）
+ * Created by panzhao on 2017/3/27.
+ */
+@Component
+@Order(6)
+public class StationBufferData implements CommandLineRunner {
+
+    @Autowired
+    StationRefreshThread stationRefreshThread;
+
+    private static List<Station> data;
+    private static Map<String, Station> codeMap;
+
+    /**
+        路由缓存
+        线路编码_上下行 ——> 路由集合
+     */
+    private static ArrayListMultimap<String, StationRotue> routeListMap;
+
+
+    public static List<Station> findAll(){
+        return data;
+    }
+
+    public static Map<String, Collection<StationRotue>> findAllRoute(){
+        return routeListMap.asMap();
+    }
+
+    public static Station findOne(String code){
+        return codeMap.get(code);
+    }
+
+    public static void replaceAll(List<Station> newData){
+        data = newData;
+        Map<String, Station> codeMapCopy = new HashMap<>();
+        for(Station station : data){
+            codeMapCopy.put(station.getStationCode(), station);
+        }
+
+        codeMap = codeMapCopy;
+    }
+
+    public static void replaceRoutes(List<StationRotue> list){
+        Collections.sort(list, new Comparator<StationRotue>() {
+            @Override
+            public int compare(StationRotue o1, StationRotue o2) {
+                return o1.getStationRouteCode().compareTo(o2.getStationRouteCode());
+            }
+        });
+
+        ArrayListMultimap<String, StationRotue> routeListMapCopy = ArrayListMultimap.create();
+        for(StationRotue sr : list){
+            routeListMapCopy.put(sr.getLineCode()+"_" + sr.getDirections(), sr);
+        }
+
+        routeListMap = routeListMapCopy;
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        Application.mainServices.scheduleWithFixedDelay(stationRefreshThread, 10, 60 * 60, TimeUnit.SECONDS);
+    }
+
+    public static Map<String, Collection<StationRotue>> findRouteByCompany(String company) {
+        List<Line> lines = LineBufferData.findByCompany(company);
+
+        ArrayListMultimap<String, StationRotue> listMap = ArrayListMultimap.create();
+
+
+        Set<String> ks = routeListMap.keySet();
+
+        for(String k : ks){
+            if(include(lines, k)){
+                listMap.putAll(k, routeListMap.get(k));
+            }
+        }
+        return listMap.asMap();
+    }
+
+    private static boolean include(List<Line> lines, String k){
+
+        for(Line line : lines){
+            if(k.startsWith(line.getLineCode() + "_"))
+                return true;
+        }
+        return false;
+    }
+}
+package com.bsth.server_rs.base_info.station.buffer;
+
+import com.bsth.server_rs.base_info.station.entity.Station;
+import com.bsth.server_rs.base_info.station.entity.StationRotue;
+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.List;
+
+/**
+ * Created by panzhao on 2017/3/27.
+ */
+@Component
+public class StationRefreshThread extends Thread{
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+
+        try {
+            //站点信息
+            List<Station> stationList = jdbcTemplate.query("SELECT station_cod AS station_code,station_name,g_lonx AS lon,g_laty AS lat,shapes_type,radius,g_polygon_grid AS polygon_grid,versions FROM bsth_c_station where destroy=0 ",
+                    BeanPropertyRowMapper.newInstance(Station.class));
+
+            if(stationList == null || stationList.size() == 0)
+                return;
+            StationBufferData.replaceAll(stationList);
+
+            //站点路由信息
+            List<StationRotue> routeList = jdbcTemplate.query("select id, line, station_route_code, line_code,station_code,station_mark,distances, to_time,directions from bsth_c_stationroute",
+                    BeanPropertyRowMapper.newInstance(StationRotue.class));
+
+            for(StationRotue sr : routeList){
+                sr.setStation(StationBufferData.findOne(sr.getStationCode()));
+            }
+            StationBufferData.replaceRoutes(routeList);
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+}
+package com.bsth.server_rs.base_info.station.entity;
+
+/**
+ * 站点信息
+ * Created by panzhao on 2017/8/31.
+ */
+public class Station {
+
+    /** 站点编码 */
+    private String stationCode;
+
+    /** 站点名称 */
+    private String stationName;
+
+    /** WGS 经度 */
+    private Float lon;
+
+    /** WGS 纬度 */
+    private Float lat;
+
+    /**
+     * 电子围栏类型
+     *
+     * ------ r：圆形
+     *
+     * ------ d：多边形
+     */
+    private String shapesType;
+
+    /** 圆形半径 */
+    private Integer radius;
+
+    /** 多边形 WGS 坐标 */
+    private String polygonGrid;
+
+    /** 版本号 */
+    private Integer versions;
+
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+    public String getShapesType() {
+        return shapesType;
+    }
+
+    public void setShapesType(String shapesType) {
+        this.shapesType = shapesType;
+    }
+
+    public Integer getRadius() {
+        return radius;
+    }
+
+    public void setRadius(Integer radius) {
+        this.radius = radius;
+    }
+
+
+    public Integer getVersions() {
+        return versions;
+    }
+
+    public void setVersions(Integer versions) {
+        this.versions = versions;
+    }
+
+    public String getStationCode() {
+        return stationCode;
+    }
+
+    public void setStationCode(String stationCode) {
+        this.stationCode = stationCode;
+    }
+
+    public Float getLon() {
+        return lon;
+    }
+
+    public void setLon(Float lon) {
+        this.lon = lon;
+    }
+
+    public Float getLat() {
+        return lat;
+    }
+
+    public void setLat(Float lat) {
+        this.lat = lat;
+    }
+
+    public String getPolygonGrid() {
+        return polygonGrid;
+    }
+
+    public void setPolygonGrid(String polygonGrid) {
+        this.polygonGrid = polygonGrid;
+    }
+}
+package com.bsth.server_rs.base_info.station.entity;
+
+/**
+ * Created by panzhao on 2017/8/31.
+ */
+public class StationRotue {
+
+    /** 线路编码 */
+    private String lineCode;
+
+    /** 站点路由序号 */
+    private Integer stationRouteCode;
+
+    private String stationCode;
+
+    private Station station;
+
+    /**
+     * 站点类型
+     * ------ B：起点站
+     * ------ Z：中途站
+     * ------ E：终点站
+     * ------ T：停车场
+     */
+    private String stationMark;
+
+    /** 站点路由到站距离 */
+    private Double distances;
+
+    /** 站点路由到站时间 */
+    private Double toTime;
+
+    /** 首班时间 */
+    private String firstTime;
+
+    /** 末班时间 */
+    private String endTime;
+
+    /** 站点路由方向 */
+    private Integer directions;
+
+    /** 版本号 */
+    private Integer versions;
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public Integer getStationRouteCode() {
+        return stationRouteCode;
+    }
+
+    public void setStationRouteCode(Integer stationRouteCode) {
+        this.stationRouteCode = stationRouteCode;
+    }
+
+    public Station getStation() {
+        return station;
+    }
+
+    public void setStation(Station station) {
+        this.station = station;
+    }
+
+    public String getStationMark() {
+        return stationMark;
+    }
+
+    public void setStationMark(String stationMark) {
+        this.stationMark = stationMark;
+    }
+
+    public Double getDistances() {
+        return distances;
+    }
+
+    public void setDistances(Double distances) {
+        this.distances = distances;
+    }
+
+    public Double getToTime() {
+        return toTime;
+    }
+
+    public void setToTime(Double toTime) {
+        this.toTime = toTime;
+    }
+
+    public String getFirstTime() {
+        return firstTime;
+    }
+
+    public void setFirstTime(String firstTime) {
+        this.firstTime = firstTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public Integer getDirections() {
+        return directions;
+    }
+
+    public void setDirections(Integer directions) {
+        this.directions = directions;
+    }
+
+    public Integer getVersions() {
+        return versions;
+    }
+
+    public void setVersions(Integer versions) {
+        this.versions = versions;
+    }
+
+    public String getStationCode() {
+        return stationCode;
+    }
+
+    public void setStationCode(String stationCode) {
+        this.stationCode = stationCode;
+    }
+}
 package com.bsth.server_rs.gps;
 import com.bsth.server_rs.gps.buffer.GpsRealDataBuffer;
+import com.bsth.server_rs.gps.entity.GpsEntity;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 package com.bsth.server_rs.gps.buffer;
 import com.bsth.Application;
-import com.bsth.server_rs.gps.GpsEntity;
+import com.bsth.server_rs.gps.entity.GpsEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.core.annotation.Order;
@@ -2,7 +2,7 @@ package com.bsth.server_rs.gps.buffer;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.bsth.server_rs.gps.GpsEntity;
+import com.bsth.server_rs.gps.entity.GpsEntity;
 import com.bsth.util.ConfigUtil;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.config.RequestConfig;
+package com.bsth.server_rs.gps.dao;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * Created by panzhao on 2017/8/31.
+ */
+@Component
+public class HistoryGpsDao {
+
+
+}
-package com.bsth.server_rs.gps;
+package com.bsth.server_rs.gps.entity;
 import javax.xml.bind.annotation.XmlRootElement;
 import java.io.Serializable;
+package com.bsth.server_rs.gps.entity;
+
+/**
+ * 历史GPS
+ * Created by panzhao on 2017/8/31.
+ */
+public class HistoryGpsEntity {
+
+    /** 车辆自编号 */
+    private String nbbm;
+
+    /** 设备号 */
+    private String deviceId;
+
+    /** 线路编码 */
+    private String lineId;
+
+    /** 上下行 */
+    private int upDown;
+
+    /** 角度 */
+    private float direction;
+
+    /** 经度 */
+    private double lon;
+
+    /** 纬度 */
+    private double lat;
+
+    /** gps 时间戳*/
+    private long ts;
+
+    /** 站点编码 */
+    private String stopNo;
+
+    /** 速度 */
+    private float speed;
+
+    /** 进出站状态 */
+    private int inout_stop;
+
+    /** 营运状态 */
+    private int state;
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getLineId() {
+        return lineId;
+    }
+
+    public void setLineId(String lineId) {
+        this.lineId = lineId;
+    }
+
+    public int getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(int upDown) {
+        this.upDown = upDown;
+    }
+
+    public float getDirection() {
+        return direction;
+    }
+
+    public void setDirection(float direction) {
+        this.direction = direction;
+    }
+
+    public double getLon() {
+        return lon;
+    }
+
+    public void setLon(double lon) {
+        this.lon = lon;
+    }
+
+    public double getLat() {
+        return lat;
+    }
+
+    public void setLat(double lat) {
+        this.lat = lat;
+    }
+
+    public long getTs() {
+        return ts;
+    }
+
+    public void setTs(long ts) {
+        this.ts = ts;
+    }
+
+    public String getStopNo() {
+        return stopNo;
+    }
+
+    public void setStopNo(String stopNo) {
+        this.stopNo = stopNo;
+    }
+
+    public float getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(float speed) {
+        this.speed = speed;
+    }
+
+    public int getInout_stop() {
+        return inout_stop;
+    }
+
+    public void setInout_stop(int inout_stop) {
+        this.inout_stop = inout_stop;
+    }
+
+    public int getState() {
+        return state;
+    }
+
+    public void setState(int state) {
+        this.state = state;
+    }
+}
@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.entity.ScheduleRealInfo;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -11,7 +13,8 @@ import java.util.List;
  * 进出场班次数据 ---给停车场用的
  * Created by panzhao on 2017/8/24.
  */
-public class ScheduleInOut {
+@XmlRootElement
+public class ScheduleInOut implements Serializable {
     public static List<ScheduleInOut> getMultiInstance(List<ScheduleRealInfo> list, String tccCode){
         List<ScheduleInOut> rs = new ArrayList<>();
+package com.bsth.server_rs.schedule.dto;
+
+import com.bsth.entity.ChildTaskPlan;
+import com.bsth.entity.ScheduleRealInfo;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
+import java.util.*;
+
+/**
+ * 输出给监控平台的实际排班
+ * Created by panzhao on 2017/8/30.
+ */
+@XmlRootElement
+public class ScheduleRealInfoDTO_JK implements Serializable {
+
+    public static List<ScheduleRealInfoDTO_JK> getMultiInstance(List<ScheduleRealInfo> list){
+        Collections.sort(list, new Comparator<ScheduleRealInfo>() {
+            @Override
+            public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
+                return o1.getFcsj().compareTo(o2.getFcsj());
+            }
+        });
+
+        List<ScheduleRealInfoDTO_JK> rs = new ArrayList<>();
+        ScheduleRealInfoDTO_JK s;
+        for(ScheduleRealInfo sch : list){
+            s = new ScheduleRealInfoDTO_JK(sch);
+            if(!s.getId().toString().equals("2740904"))
+                continue;
+            rs.add(s);
+        }
+        return rs;
+    }
+
+    ScheduleRealInfoDTO_JK(){}
+
+    ScheduleRealInfoDTO_JK(ScheduleRealInfo sch){
+        this.id = sch.getId();
+        this.scheduleDate = sch.getScheduleDateStr();
+        this.lineName = sch.getXlName();
+        this.lineCode = sch.getXlBm();
+        this.lpName = sch.getLpName();
+        this.nbbm = sch.getClZbh();
+        this.jsy = sch.getjGh() + "/" + sch.getjName();
+        this.spy = sch.getsGh() + "/" + sch.getsName();
+        this.upDown = Integer.parseInt(sch.getXlDir());
+        this.qdzCode = sch.getQdzCode();
+        this.qdzName = sch.getQdzName();
+        this.zdzCode = sch.getZdzCode();
+        this.zdzName = sch.getZdzName();
+        this.fcsjT = sch.getFcsjT();
+        this.dfsjT = sch.getDfsjT();
+        this.zdsjT = sch.getZdsjT();
+        this.fcsjActualTime = sch.getFcsjActualTime();
+        this.zdsjActualTime = sch.getZdsjActualTime();
+        this.jhlc = sch.getJhlc();
+        this.jhlcOrig = sch.getJhlcOrig();
+        this.bcsj = sch.getBcsj();
+        this.bcType = sch.getBcType();
+        this.status = sch.getStatus();
+        this.adjustExps = sch.getAdjustExps();
+        this.sflj = sch.isSflj();
+        this.remarks = sch.getRemarks();
+        this.cTasks = sch.getcTasks();
+    }
+
+    private Long id;
+
+    private String scheduleDate;
+
+    /** 线路名称 */
+    private String lineName;
+    /** 线路编码 */
+    private String lineCode;
+
+    /** 路牌名称 */
+    private String lpName;
+
+    /** 车辆自编号 */
+    private String nbbm;
+
+    /** 驾驶员工号/名称 */
+    private String jsy;
+    /** 售票员工号/名称 */
+    private String spy;
+
+    /** 线路方向 */
+    private Integer upDown;
+    /** 起点站code*/
+    private String qdzCode;
+    /** 起点站名字 */
+    private String qdzName;
+
+    /** 终点站code*/
+    private String zdzCode;
+    /** 终点站名字 */
+    private String zdzName;
+
+    /** 计划发车时间戳*/
+    private Long fcsjT;
+    /**待发时间戳 */
+    private Long dfsjT;
+    /** 计划终点时间戳*/
+    private Long zdsjT;
+
+    /** 实际发车时间戳*/
+    private Long fcsjActualTime;
+    /** 实际终点时间戳*/
+    private Long zdsjActualTime;
+
+    /** 实际计划里程 */
+    private Double jhlc;
+
+    /** 计划里程 */
+    private Double jhlcOrig;
+
+    /** 班次历时 */
+    private Integer bcsj;
+
+    /**
+     * 班次类型 TODO：正常班次、出场、进场、加油、区间班次、放空班次、放大站班次、两点间空驶
+     */
+    private String bcType;
+
+
+    /**班次状态 0 未执行 1 正在执行 2 已执行 -1 已烂班 */
+    private int status;
+
+    private String adjustExps;
+
+    /** 是否是临加班次 */
+    private boolean sflj;
+
+    /** 备注*/
+    private String remarks;
+
+    /** 子任务 */
+    private Set<ChildTaskPlan> cTasks;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getScheduleDate() {
+        return scheduleDate;
+    }
+
+    public void setScheduleDate(String scheduleDate) {
+        this.scheduleDate = scheduleDate;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getLpName() {
+        return lpName;
+    }
+
+    public void setLpName(String lpName) {
+        this.lpName = lpName;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public String getJsy() {
+        return jsy;
+    }
+
+    public void setJsy(String jsy) {
+        this.jsy = jsy;
+    }
+
+    public String getSpy() {
+        return spy;
+    }
+
+    public void setSpy(String spy) {
+        this.spy = spy;
+    }
+
+    public String getQdzCode() {
+        return qdzCode;
+    }
+
+    public void setQdzCode(String qdzCode) {
+        this.qdzCode = qdzCode;
+    }
+
+    public String getQdzName() {
+        return qdzName;
+    }
+
+    public void setQdzName(String qdzName) {
+        this.qdzName = qdzName;
+    }
+
+    public String getZdzCode() {
+        return zdzCode;
+    }
+
+    public void setZdzCode(String zdzCode) {
+        this.zdzCode = zdzCode;
+    }
+
+    public String getZdzName() {
+        return zdzName;
+    }
+
+    public void setZdzName(String zdzName) {
+        this.zdzName = zdzName;
+    }
+
+    public Long getFcsjT() {
+        return fcsjT;
+    }
+
+    public void setFcsjT(Long fcsjT) {
+        this.fcsjT = fcsjT;
+    }
+
+    public Long getDfsjT() {
+        return dfsjT;
+    }
+
+    public void setDfsjT(Long dfsjT) {
+        this.dfsjT = dfsjT;
+    }
+
+    public Long getZdsjT() {
+        return zdsjT;
+    }
+
+    public void setZdsjT(Long zdsjT) {
+        this.zdsjT = zdsjT;
+    }
+
+    public Long getFcsjActualTime() {
+        return fcsjActualTime;
+    }
+
+    public void setFcsjActualTime(Long fcsjActualTime) {
+        this.fcsjActualTime = fcsjActualTime;
+    }
+
+    public Long getZdsjActualTime() {
+        return zdsjActualTime;
+    }
+
+    public void setZdsjActualTime(Long zdsjActualTime) {
+        this.zdsjActualTime = zdsjActualTime;
+    }
+
+    public Double getJhlc() {
+        return jhlc;
+    }
+
+    public void setJhlc(Double jhlc) {
+        this.jhlc = jhlc;
+    }
+
+    public Double getJhlcOrig() {
+        return jhlcOrig;
+    }
+
+    public void setJhlcOrig(Double jhlcOrig) {
+        this.jhlcOrig = jhlcOrig;
+    }
+
+    public Integer getBcsj() {
+        return bcsj;
+    }
+
+    public void setBcsj(Integer bcsj) {
+        this.bcsj = bcsj;
+    }
+
+    public String getBcType() {
+        return bcType;
+    }
+
+    public void setBcType(String bcType) {
+        this.bcType = bcType;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getAdjustExps() {
+        return adjustExps;
+    }
+
+    public void setAdjustExps(String adjustExps) {
+        this.adjustExps = adjustExps;
+    }
+
+    public boolean isSflj() {
+        return sflj;
+    }
+
+    public void setSflj(boolean sflj) {
+        this.sflj = sflj;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public Set<ChildTaskPlan> getcTasks() {
+        return cTasks;
+    }
+
+    public void setcTasks(Set<ChildTaskPlan> cTasks) {
+        this.cTasks = cTasks;
+    }
+
+    public Integer getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(Integer upDown) {
+        this.upDown = upDown;
+    }
+}
@@ -2,7 +2,10 @@ package com.bsth.server_rs.schedule.real;
 import com.bsth.common.BasicData;
 import com.bsth.redis.ScheduleRedisService;
+import com.bsth.server_rs.base_info.line.Line;
+import com.bsth.server_rs.base_info.line.buffer.LineBufferData;
 import com.bsth.server_rs.schedule.dto.ScheduleInOut;
+import com.bsth.server_rs.schedule.dto.ScheduleRealInfoDTO_JK;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -20,7 +23,7 @@ import java.util.Set;
  */
 @Component
 @Path("/schedule_real")
-@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+@Produces({MediaType.APPLICATION_JSON})
 public class ScheduleRealService {
     @Autowired
@@ -28,17 +31,30 @@ public class ScheduleRealService {
     /**
      * 获取当天指定停车场的进出场排班数据
+     *
      * @return
      */
     @GET
     @Path("/in_out/{code}")
-    public List<ScheduleInOut> findInOut(@PathParam("code") String code){
+    public List<ScheduleInOut> findInOut(@PathParam("code") String code) {
         Set<String> lineArray = BasicData.lineDateMap.keySet();
         List<ScheduleInOut> all = new ArrayList<>();
-        for(String lineCode : lineArray){
+        for (String lineCode : lineArray) {
             all.addAll(ScheduleInOut.getMultiInstance(redisService.read(BasicData.lineDateMap.get(lineCode), lineCode), code));
         }
         return all;
     }
+
+    @GET
+    @Path("/sch_jk/{company}/{rq}")
+    public List<ScheduleRealInfoDTO_JK> find_JK(@PathParam("company") String company, @PathParam("rq") String rq) {
+        List<ScheduleRealInfoDTO_JK> all = new ArrayList<>();
+
+        List<Line> lines = LineBufferData.findByCompany(company);
+        for(Line line : lines){
+            all.addAll(ScheduleRealInfoDTO_JK.getMultiInstance(redisService.read(rq, line.getLineCode())));
+        }
+        return all;
+    }
 }