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

ljq
1 parent 247ee6cd
Showing 4 changed files with 16 additions and 75 deletions
src/main/java/com/bsth/server_rs/base_info/car/Car.java
src/main/java/com/bsth/server_rs/base_info/station/buffer/StationBufferData.java
src/main/java/com/bsth/server_rs/schedule/plan/SchedulePlanService.java
src/main/java/com/bsth/server_rs/schedule/real/ScheduleRealService.java
@@ -69,17 +69,6 @@ public class Car implements Serializable {
  
     private Date updateDate;
  
-
-
-    /** 车辆颜色 */
-    private String color;
-    /** 车辆最大乘坐人数 */
-    private String maxPeople;
-    /** 票价类型 */
-    private String priceType;
-    /** 票价 */
-    private String price;
-
     public String getNbbm() {
         return nbbm;
     }
@@ -191,44 +180,4 @@ public class Car implements Serializable {
     public void setRemark(String remark) {
         this.remark = remark;
     }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-
-    public String getColor() {
-        return color;
-    }
-
-    public void setColor(String color) {
-        this.color = color;
-    }
-
-    public String getMaxPeople() {
-        return maxPeople;
-    }
-
-    public void setMaxPeople(String maxPeople) {
-        this.maxPeople = maxPeople;
-    }
-
-    public String getPriceType() {
-        return priceType;
-    }
-
-    public void setPriceType(String priceType) {
-        this.priceType = priceType;
-    }
-
-    public String getPrice() {
-        return price;
-    }
-
-    public void setPrice(String price) {
-        this.price = price;
-    }
 }
@@ -114,15 +114,4 @@ public class StationBufferData implements CommandLineRunner {
         return listMap.asMap();
     }
  
-
-    public static Map<String, Collection<StationRotue>> findRouteByLineCoderegion(String lineCode,String region){
-
-        ArrayListMultimap<String, StationRotue> listMap = ArrayListMultimap.create();
-        String k1 = lineCode + "_" + 0
-                ,k2 = lineCode + "_" + 1;
-
-        listMap.putAll(k1+ "_" +region, routeListMap.get(k1));
-        listMap.putAll(k2 + "_" +region, routeListMap.get(k2));
-        return listMap.asMap();
-    }
 }
@@ -52,19 +52,6 @@ public class SchedulePlanService {
         return all;
     }
  
-    @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
@@ -16,6 +16,7 @@ import com.bsth.server_rs.base_info.line.Line;
 import com.bsth.server_rs.base_info.line.buffer.LineBufferData;
 import com.bsth.server_rs.gps.buffer.GpsRealDataBuffer;
 import com.bsth.server_rs.gps.entity.GpsEntity;
+import com.bsth.server_rs.schedule.dto.PlanScheduleDTO_JK;
 import com.bsth.server_rs.schedule.dto.ScheduleCcInfoConfig;
 import com.bsth.server_rs.schedule.dto.ScheduleInOut;
 import com.bsth.server_rs.schedule.dto.ScheduleRealInfoDTO_JK;
@@ -231,6 +232,21 @@ public class ScheduleRealService implements InitializingBean {
     }
  
     @GET
+    @Path("/sch_jk_line/{company}/{rq}/{lineCode}")
+    public List<ScheduleRealInfoDTO_JK> find_JK_line(@PathParam("company") String company, @PathParam("rq") String rq, @PathParam("lineCode") String lineCode){
+        List<ScheduleRealInfoDTO_JK> all = new ArrayList<>();
+
+        List<Line> lines = LineBufferData.findByCompany(company);
+        for(Line line : lines){
+            if(line.getLineCode().equals(lineCode)){
+                all.addAll(ScheduleRealInfoDTO_JK.getMultiInstance(redisService.read(rq, line.getLineCode())));
+            }
+        }
+        return all;
+    }
+
+
+    @GET
     @Path("/sch_jk_db/{company}/{rq}")
     public List<ScheduleRealInfoDTO_JK> sch_jk(@PathParam("company") String company, @PathParam("rq") String rq) {
         DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyyMMdd");