车辆的班次里程与油电耗接口加一个含非营运班次的版本

娄高锋
1 parent 9460dd02
Showing 1 changed file with 23 additions and 2 deletions
src/main/java/com/bsth/server_rs/bigdata/BigdataService.java
@@ -1790,6 +1790,25 @@ public class BigdataService {
 	@Path("/scheduleAndMileage/date/{date}")
 	public List<Map<String, Object>> scheduleAndMileage(@PathParam("date") String date) throws ParseException {
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		List<Map<String, Object>> scheduleAndMileageByAllLine = this.scheduleAndMileageByAllLine(date);
+		for(Map<String, Object> m : scheduleAndMileageByAllLine){
+			if(m.containsKey("sfyy") && "1".equals(m.get("sfyy").toString())){
+				resList.add(m);
+			}
+		}
+		return resList;
+	}
+	
+	/**
+     * 车辆的班次里程与油电耗（给电科，含非营运线路）
+     * @param date
+     * @return
+     * @throws ParseException 
+     */
+	@GET
+	@Path("/scheduleAndMileageByAllLine/date/{date}")
+	public List<Map<String, Object>> scheduleAndMileageByAllLine(@PathParam("date") String date) throws ParseException {
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		Date rq = sdf.parse(date);
  
@@ -2059,8 +2078,10 @@ public class BigdataService {
 			Map<String, Object> m = xlMap.get(key);
 			m.put("cars", carsMap.get(key));
 			String xl = m.get("xl").toString();
-			if(!yyLine.contains(xl)){
-				continue;
+			if(yyLine.contains(xl)){
+				m.put("sfyy", 1);
+			} else {
+				m.put("sfyy", 0);
 			}
 			if(warrantCarMap.containsKey(xl)){
 				m.put("warrantCar", warrantCarMap.get(xl));