增加单条线路的实际排班接口

ljq
1 parent b35edf95
Showing 4 changed files with 18 additions and 579 deletions
src/main/java/com/bsth/CXFConfig.java
src/main/java/com/bsth/server_rs/qh_data/QhSchService.java
src/main/java/com/bsth/server_rs/qh_data/ScheduleRealInfo_JK.java
src/main/java/com/bsth/server_rs/schedule/plan/SchedulePlanService.java
@@ -22,7 +22,6 @@ import com.bsth.server_rs.gps.GpsRestService;
 import com.bsth.server_rs.info_publish.XxfbRestService;
 import com.bsth.server_rs.logs.RealLogRestService;
 import com.bsth.server_rs.man_hours.ManHoursRestService;
-import com.bsth.server_rs.qh_data.QhSchService;
 import com.bsth.server_rs.rate.RateService;
 import com.bsth.server_rs.schedule.plan.SchedulePlanService;
 import com.bsth.server_rs.schedule.real.ScheduleRealService;
@@ -140,9 +139,6 @@ public class CXFConfig {
     private XxfbRestService xxfbRestService;
     @Autowired
     private ManHoursRestService manHoursRestService;
-    @Autowired
-    private QhSchService qhSchService;
-    
     @Autowired
     private BxRestService bxRestService;
@@ -152,7 +148,8 @@ public class CXFConfig {
         JAXRSServerFactoryBean endpoint = new JAXRSServerFactoryBean();
         endpoint.setBus(springBus());
         endpoint.setAddress("/rest");
-        endpoint.setServiceBeans(Arrays.<Object>asList(                new LineRestService(),
+        endpoint.setServiceBeans(Arrays.<Object>asList(
+                new LineRestService(),
                 new CarRestService(),
                 new PersonRestService(),
                 gpsRestService,
@@ -175,8 +172,7 @@ public class CXFConfig {
                 dksRestService,
                 xxfbRestService,
                 manHoursRestService,
-                bxRestService,
-                qhSchService));
+                bxRestService));
         endpoint.setProviders(Arrays.asList(new JacksonJsonProvider(), new AesExceptionMapper()));
         //endpoint.setFeatures(Arrays.asList(new Swagger2Feature()));
         endpoint.getInInterceptors().add(new AuthorizeInterceptor_IN());
-package com.bsth.server_rs.qh_data;
-
-
-import com.bsth.redis.PlanScheduleRedisService;
-import com.bsth.redis.ScheduleRedisService;
-import com.bsth.redis.util.DateUtils;
-import com.bsth.server_rs.base_info.car.Car;
-import com.bsth.server_rs.base_info.car.buffer.CarBufferData;
-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.buffer.StationBufferData;
-import com.bsth.server_rs.base_info.station.entity.StationRotue;
-import com.bsth.server_rs.info_publish.Accuracy;
-import com.bsth.server_rs.schedule.dto.PlanScheduleDTO_JK;
-import com.bsth.server_rs.schedule.dto.ScheduleRealInfoDTO_JK;
-import com.bsth.util.DBUtils_Xxfb;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-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.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.*;
-
-/**
- * 与清华团队对接的接口  班次类型
- */
-@Component
-@Path("/snt")
-@Produces({MediaType.APPLICATION_JSON})
-public class QhSchService {
-    @Autowired
-    PlanScheduleRedisService redisService;
-
-    @Autowired
-    ScheduleRedisService redisServiceReal;
-
-    @Autowired
-    JdbcTemplate jdbcTemplate;
-    //未来7天计划排班的接口
-    @GET
-    @Path("/sch_jh/{company}")
-    public Map<String,List<PlanScheduleDTO_JK>> find_JK(@PathParam("company") String company){
-        List<PlanScheduleDTO_JK> all = new ArrayList<>();
-        Map m = new HashMap<>();
-        List<Line> lines = LineBufferData.findByCompany(company);
-        //获取后7天日期分别获取
-        ArrayList<String> datelist = DateUtils.contextLoads();
-        for(Line line : lines){
-            //取一天的
-            for (String rq:datelist) {
-                all.addAll(PlanScheduleDTO_JK.getMultiInstance(redisService.read(rq, line.getLineCode())));
-                m.put(line.getLineCode()+"_"+rq ,all);
-            }
-        }
-        return m;
-    }
-    
-    //当天的实际排班
-    @GET
-    @Path("/sch_jk/{company}/{rq}")
-    public List<ScheduleRealInfo_JK> find_JK(@PathParam("company") String company, @PathParam("rq") String rq) {
-        List<ScheduleRealInfo_JK> all = new ArrayList<>();
-
-        List<Line> lines = LineBufferData.findByCompany(company);
-        for (Line line : lines) {
-            all.addAll(ScheduleRealInfo_JK.getMultiInstance(redisServiceReal.read(rq, line.getLineCode())));
-        }
-        return all;
-    }
-
-    //区域
-    @GET
-    @Path("/qx_line")
-    public List<Map> qxLine() {
-      
-        List<Map> xl = new ArrayList<>();
-        String sql ="select line,region from bsth_c_region_line_car group by region,line";
-        List<Map<String, Object>> LineList = jdbcTemplate.query(sql,new RowMapper<Map<String, Object>>(){
-            @Override
-            public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-                Map<String, Object> m=new HashMap<String,Object>();
-                m.put("line", rs.getString("line"));
-                m.put("region", rs.getString("region"));
-                return m;
-            }
-        });
-        for(Map m :LineList){
-            Map<String, Collection<StationRotue>> t =StationBufferData.findRouteByLineCoderegion(m.get("line").toString(),m.get("region").toString());
-            xl.add(t);
-        }
-        
-        
-        return xl;
-    }
-
-    //区域
-    @GET
-    @Path("/qx_Car")
-    public List<Map> qxCar() {
-        List<Map> xl = new ArrayList<>();
-        String sql ="select line,cl_zbh,region from bsth_c_region_line_car";
-        List<Map<String, Object>> LineList = jdbcTemplate.query(sql,new RowMapper<Map<String, Object>>(){
-            @Override
-            public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-                Map<String, Object> m=new HashMap<String,Object>();
-                m.put("line", rs.getString("line"));
-                m.put("clZbh", rs.getString("cl_zbh"));
-                m.put("region", rs.getString("region"));
-                return m;
-            }
-        });
-
-        for(Map m :LineList){
-            Map map = new HashMap();
-            Car car = CarBufferData.findOne(m.get("clZbh").toString());
-            map.put(m.get("line")+ "_" +m.get("region"),car);
-            xl.add(map);
-        }
-        return xl;
-    }
-        
-    
-}
-package com.bsth.server_rs.qh_data;
-
-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 ScheduleRealInfo_JK implements Serializable {
-
-    public static List<ScheduleRealInfo_JK> getMultiInstance(List<ScheduleRealInfo> list) {
-
-        List<ScheduleRealInfo_JK> rs = new ArrayList<>();
-
-        if(list == null || list.size()==0)
-            return rs;
-        Collections.sort(list, new Comparator<ScheduleRealInfo>() {
-            @Override
-            public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
-                return o1.getFcsj().compareTo(o2.getFcsj());
-            }
-        });
-
-        for (ScheduleRealInfo sch : list) {
-            rs.add(new ScheduleRealInfo_JK(sch));
-        }
-        return rs;
-    }
-
-    ScheduleRealInfo_JK() {
-    }
-
-    ScheduleRealInfo_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();
-        this.updateDate = sch.getUpdateDate().getTime();
-    }
-
-    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 Double oilConsum;
-    private Double elecConsum;
-    private Double h2Consum;
-    private Long updateDate;
-
-    /**
-     * 子任务
-     */
-    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;
-    }
-
-    public Double getOilConsum() {
-        return oilConsum;
-    }
-
-    public void setOilConsum(Double oilConsum) {
-        this.oilConsum = oilConsum;
-    }
-
-    public Double getElecConsum() {
-        return elecConsum;
-    }
-
-    public void setElecConsum(Double elecConsum) {
-        this.elecConsum = elecConsum;
-    }
-
-    public Double getH2Consum() {
-        return h2Consum;
-    }
-
-    public void setH2Consum(Double h2Consum) {
-        this.h2Consum = h2Consum;
-    }
-
-    public Long getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Long updateDate) {
-        this.updateDate = updateDate;
-    }
-}
@@ -53,6 +53,21 @@ public class SchedulePlanService {
     }
     @GET
+    @Path("/sch_jk_line/{company}/{rq}/{lineCode}")
+    public List<PlanScheduleDTO_JK> find_JK_line(@PathParam("company") String company, @PathParam("rq") String rq, @PathParam("lineCode") String lineCode){
+        List<PlanScheduleDTO_JK> all = new ArrayList<>();
+
+        List<Line> lines = LineBufferData.findByCompany(company);
+        for(Line line : lines){
+            if(line.getLineCode().equals(lineCode)){
+                all.addAll(PlanScheduleDTO_JK.getMultiInstance(redisService.read(rq, line.getLineCode())));
+            }
+        }
+        return all;
+    }
+
+
+    @GET
     @Path("/ycqts/{company}/{month}")
     public List<AttendancePlanMonth> count_ycqts(@PathParam("company") String company,@PathParam("month") String month){
         try {