Merge branch 'minhang' into pudong

徐烜
2 parents 72edb127 ce60fe55
Showing 14 changed files with 292 additions and 74 deletions
src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/gpsdata/arrival/utils/SignalSchPlanMatcher.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/service/excep/impl/OutboundServiceImpl.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/util/ReportUtils.java
src/main/resources/static/pages/excep/boundList.html
src/main/resources/static/real_control_v2/fragments/home/tooltip.html
src/main/resources/static/real_control_v2/js/utils/svg_chart_tooltip.js
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v2/main.html
 package com.bsth.controller.realcontrol;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
 import com.bsth.data.gpsdata.arrival.GpsRealAnalyse;
 import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
 import com.bsth.data.msg_queue.DirectivePushQueue;
@@ -30,6 +31,10 @@ public class anomalyCheckController {
     @Autowired
     DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    GeoCacheData geoCacheData;
+
     /**
      * 出现重复班次的车辆
      * @param nbbm
@@ -75,4 +80,9 @@ public class anomalyCheckController {
             return;
         GpsDataLoaderThread.setFlag(flag);
     }
+
+    @RequestMapping(value = "/updateCacheBuff")
+    public void updateCacheBuff(){
+        geoCacheData.loadData();
+    }
 }
@@ -274,22 +274,23 @@ public class BasicData implements CommandLineRunner {
              * 加载运管处的站点及序号
              * 上行从1开始，下行顺序续编
              */
-            List<Object[]> ygcLines = stationRouteRepository.findAllLineWithYgc();
+            List<Map<String, String>> ygcLines = stationRouteRepository.findAllLineWithYgc();
             if(ygcLines != null && ygcLines.size() > 0){
                 int size = ygcLines.size();
-                Object[] tempArray ;
+                Map<String, String> tempMap ;
                 int num = 1;
                 String key;
                 String lineCode = "";
                 for (int i = 0; i < size; i ++){
-                    tempArray = ygcLines.get(i);
+                    tempMap = ygcLines.get(i);
                     if(lineCode.equals("")){
-                        lineCode = tempArray[0]+"";
-                    }else if(!lineCode.equals(tempArray[0]+"")){
+                        lineCode = tempMap.get("lineCode");
+                    }else if(!lineCode.equals(tempMap.get("lineCode"))){
                         num = 1;
-                        lineCode = tempArray[0]+"";
+                        lineCode = tempMap.get("lineCode");
                     }
-                    key = tempArray[0] + "_"+tempArray[1] + "_"+tempArray[3];
+                    key = tempMap.get("lineCode") + "_"+String.valueOf(tempMap.get("directions"))
+                            + "_"+tempMap.get("stationCode")+ "_"+tempMap.get("stationMark");
                     tempStationName2YgcNumber.put(key,num++);
                 }
             }
@@ -46,6 +46,16 @@ public class SignalSchPlanMatcher {
                     return;
                 }
             }
+
+            //线路编码不匹配
+            if("out".equals(sch.getBcType()) && !sch.getXlBm().equals(outSigal.getLineId())){
+                ScheduleRealInfo nextOut = dayOfSchedule.nextByBcType(sch, "out");
+                if(nextOut != null && nextOut.getXlBm().equals(outSigal.getLineId())
+                        && fcSpace(sch, outSigal) > fcSpace(nextOut, outSigal)){
+                    dayOfSchedule.addExecPlan(nextOut);
+                    return;
+                }
+            }
         }catch (Exception e){
             log.error("", e);
         }
@@ -63,4 +73,8 @@ public class SignalSchPlanMatcher {
             outMatch(outSigal, next);
         }
     }
+
+    public static int fcSpace(ScheduleRealInfo sch, GpsEntity gps){
+        return (int) Math.abs((sch.getDfsjT() - gps.getTimestamp()));
+    }
 }
@@ -790,12 +790,13 @@ public class DayOfSchedule {
         boolean flag = false;
         for(ScheduleRealInfo temp : list){
-            if(temp == sch){
-                flag = true;
-            }
             if(flag && temp.getBcType().equals(bcType))
                 return temp;
+
+            if(temp == sch){
+                flag = true;
+            }
         }
         return null;
     }
@@ -259,8 +259,9 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 	@Query("select s from StationRoute s where s.destroy=0 and s.lineCode=?1")
 	List<StationRoute> findByLineCode(String lineCode);
-	@Query("SELECT " +
-			"lineCode,directions,stationName,stationCode " +
+	@Query("SELECT new map(" +
+			"lineCode as lineCode,directions as directions,stationName as stationName,stationCode as stationCode," +
+			"line.linePlayType as linePlayType,s.stationMark as stationMark) " +
 			"FROM " +
 			"StationRoute s " +
 			"WHERE " +
@@ -268,7 +269,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 			"and s.lineCode in(select lineCode from Line where inUse = 1) " +
 			"ORDER BY " +
 			"lineCode,directions,stationRouteCode")
-	List<Object[]> findAllLineWithYgc();
+	List<Map<String, String>> findAllLineWithYgc();
     @Modifying
     @Query(value="update bsth_c_stationroute set directions = case directions when 1 then 0 when 0 then 1 end where line_code = ?1 ", nativeQuery=true)
@@ -69,7 +69,7 @@ public class OutboundServiceImpl implements OutboundService{
 			}
 		}
-		sql +=" order by id limit ?,?";
+		sql +=" limit ?,?";
 		try {
@@ -134,12 +134,19 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	 * 上传线路信息
 	 */
 	@Override
-	public String setXL() {
+	public String setXL(Map<String, Object> param) {
 		String result = "failure";
 		StringBuffer sBuffer = new StringBuffer();
 		try {
-			Iterator<Line> lineIterator = lineRepository.findAll().iterator();
+			Map<String,Object> map = new HashMap<String,Object>();
+			map.put("lineCode_eq", param.get("xl.lineCode_like")+"");
+			Iterator<Line> lineIterator;
 			Line line = null;
+			if(param.get("xl.lineCode_like").equals("")){
+				lineIterator = lineRepository.findAll().iterator();
+			}else {
+				line = lineRepository.findOne(new CustomerSpecs<Line>(map));
+			}
 			List<StationRoute> upStationsList = null;// 上行站点路由集
 			List<StationRoute> downStationsList = null;// 下行站点路由集
 			List<LineInformation> lineInformationsList = null;
@@ -147,14 +154,15 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			sBuffer.append("<Data>");
 			sBuffer.append("<RequestOrg>上海巴士拓华科技发展有限公司</RequestOrg>");
 			sBuffer.append("<DataList>");
-			while(lineIterator.hasNext()){
-				line = lineIterator.next();
-				if(!line.getName().equals("浦江4路")){
-					continue;
-				}
-				if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null
+//			while(lineIterator.hasNext()){
+//				line = lineIterator.next();
+//				if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null
+//						|| line.getInUse() == 0){
+//					continue;
+//				}
+			if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null
 						|| line.getInUse() == 0){
-					continue;
+					return result;
 				}
 				sBuffer.append("<LINE_ID>").append(line.getId()).append("</LINE_ID>");
 				sBuffer.append("<LINE_CODE>").append(BasicData.lineId2ShangHaiCodeMap.get(line.getId())).append("</LINE_CODE>");
@@ -176,7 +184,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				startId = packagStationPointXml(upStationsList, sBuffer, startId);
 				packagStationPointXml(downStationsList, sBuffer, startId);
 				sBuffer.append("</LinePointList>");
-			}
+//			}
 			sBuffer.append("</DataList>");
 			sBuffer.append("</Data>");
 			System.out.println(sBuffer.toString());
@@ -301,6 +309,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			List<ScheduleRealInfo> list = scheduleRealInfoRepository.setLD(date);
 			List<Map<String,Object>> listGroup = scheduleRealInfoRepository.setLDGroup(date);
 			Map<String,Object> map = new HashMap<String,Object>();
+			HashMap<String,String> paramMap;
+			HashMap<String,String> otherMap = new HashMap<String, String>();
 			for(Map<String,Object> schRealInfo:listGroup){
 				if(schRealInfo != null){
 					//根据车辆自编号查询车牌号
@@ -347,16 +357,20 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 							sf.append("<SJGH>"+scheduleRealInfo.getjGh()+"</SJGH>");
 							sf.append("<SXX>"+scheduleRealInfo.getXlDir()+"</SXX>");
 							sf.append("<FCZDMC>"+scheduleRealInfo.getQdzName()+"</FCZDMC>");
-							sf.append("<FCZDXH>" + getYgcStationNumByLineCodeAndDirectionAndStationName(
-									scheduleRealInfo.getXlBm(), scheduleRealInfo.getXlDir(), scheduleRealInfo.getQdzCode()) + "</FCZDXH>");
+							// 起点站的参数
+							otherMap.put("stationMark","B");
+							paramMap = packageYgcStationNumParam(scheduleRealInfo,otherMap);
+							sf.append("<FCZDXH>" + getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap) + "</FCZDXH>");
 							sf.append("<FCZDBM>"+scheduleRealInfo.getQdzCode()+"</FCZDBM>");
 							sf.append("<JHFCSJ>"+scheduleRealInfo.getFcsj()+"</JHFCSJ>");
 							sf.append("<DFSJ>"+scheduleRealInfo.getDfsj()+"</DFSJ>");
 							sf.append("<SJFCSJ>"+scheduleRealInfo.getFcsjActual()+"</SJFCSJ>");
 							sf.append("<FCZDLX>"+""+"</FCZDLX>");
 							sf.append("<DDZDMC>"+scheduleRealInfo.getZdzName()+"</DDZDMC>");
-							sf.append("<DDZDXH>"+ getYgcStationNumByLineCodeAndDirectionAndStationName(
-									scheduleRealInfo.getXlBm(), scheduleRealInfo.getXlDir(), scheduleRealInfo.getZdzCode()) +"</DDZDXH>");
+							// 终点站的参数
+							otherMap.put("stationMark","E");
+							paramMap = packageYgcStationNumParam(scheduleRealInfo,otherMap);
+							sf.append("<DDZDXH>"+ getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap) +"</DDZDXH>");
 							sf.append("<DDZDBM>"+scheduleRealInfo.getZdzCode()+"</DDZDBM>");
 							sf.append("<JHDDSJ>"+scheduleRealInfo.getZdsj()+"</JHDDSJ>");
 							sf.append("<SJDDSJ>"+scheduleRealInfo.getZdsjActual()+"</SJDDSJ>");
@@ -650,6 +664,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			List<SchedulePlanInfo> schedulePlanList = schedulePlanInfoRepository.findLineScheduleBc(tomorrow);
 			int j = 0; // 初始化标识
 			if(schedulePlanList != null ){
+				HashMap<String,String> paramMap;
+				HashMap<String,String> otherMap = new HashMap<String, String>();
 				int size = schedulePlanList.size();
 				for (int i = 0; i < size; i++) {
 					schedulePlanInfo = schedulePlanList.get(i);
@@ -676,12 +692,16 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 						sBuffer.append("<SJGH>").append(schedulePlanInfo.getjGh()).append("</SJGH>");
 						sBuffer.append("<SXX>").append(schedulePlanInfo.getXlDir()).append("</SXX>");
 						sBuffer.append("<FCZDMC>").append(schedulePlanInfo.getQdzName()).append("</FCZDMC>");
-						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
-								schedulePlanInfo.getXlBm(), schedulePlanInfo.getXlDir(), schedulePlanInfo.getQdzCode())).append("</ZDXH>");
+						// 起点站的参数
+						otherMap.put("stationMark","B");
+						paramMap = packageYgcStationNumParam(schedulePlanInfo,otherMap);
+						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap)).append("</ZDXH>");
 						sBuffer.append("<JHFCSJ>").append(schedulePlanInfo.getFcsj()).append("</JHFCSJ>");
 						sBuffer.append("<DDZDMC>").append(schedulePlanInfo.getZdzName()).append("</DDZDMC>");
-						sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
-								schedulePlanInfo.getXlBm(), schedulePlanInfo.getXlDir(), schedulePlanInfo.getZdzCode())).append("</DDXH>");
+						// 起点站的参数
+						otherMap.put("stationMark","E");
+						paramMap = packageYgcStationNumParam(schedulePlanInfo,otherMap);
+						sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap)).append("</DDXH>");
 						sBuffer.append("<JHDDSJ>").append(calcDdsj(schedulePlanInfo.getFcsj(),schedulePlanInfo.getBcsj()))
 								.append("</JHDDSJ>");
 						sBuffer.append("</BC>");
@@ -743,6 +763,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			HashMap<String,Object> param = new HashMap<String, Object>();
 			String lineCode ;
 			sBuffer.append("<SKBs>");
+			HashMap<String,String> paramMap;
+			HashMap<String,String> otherMap = new HashMap<String, String>();
 			for (int i = 0; i < idArray.length; i++) {
 				ttInfo = ttInfoRepository.findOne(Long.valueOf(idArray[i]));
 				if(ttInfo == null)
@@ -783,12 +805,16 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 						sBuffer.append("<LPBH>").append(ttInfoDetail.getLp().getLpNo()).append("</LPBH>");
 						sBuffer.append("<SXX>").append(ttInfoDetail.getXlDir()).append("</SXX>");
 						sBuffer.append("<FCZDMC>").append(ttInfoDetail.getQdz().getStationName()).append("</FCZDMC>");
-						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
-								lineCode, ttInfoDetail.getXlDir(), ttInfoDetail.getQdz().getStationCod())).append("</ZDXH>");
+						// 起点站的参数
+						otherMap.put("stationMark","B");
+						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
+						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap)).append("</ZDXH>");
 						sBuffer.append("<JHFCSJ>").append(changeTimeFormat(ttInfoDetail)).append("</JHFCSJ>");
 						sBuffer.append("<DDZDMC>").append(ttInfoDetail.getZdz().getStationName()).append("</DDZDMC>");
-						sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
-								lineCode, ttInfoDetail.getXlDir(), ttInfoDetail.getZdz().getStationCod())).append("</DDXH>");
+						// 起点站的参数
+						otherMap.put("stationMark","E");
+						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
+						sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap)).append("</DDXH>");
 						sBuffer.append("<JHDDSJ>").append(calcDdsj(ttInfoDetail.getFcsj(),ttInfoDetail.getBcsj())).append("</JHDDSJ>");
 						sBuffer.append("</BC>");
 					}
@@ -1136,6 +1162,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	private int packagStationXml(List<StationRoute> stationsList,StringBuffer sBuffer,int startId){
 		int size = stationsList.size();
 		StationRoute srRoute;
+		HashMap<String,String> paraMap;
 		String zdlx ;// 站点类型：0：起点站、1：终点站、2：中途站
 		for (int i = 0; i < size; i++) {
 			srRoute = stationsList.get(i);
@@ -1147,10 +1174,11 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			}else{
 				zdlx = "2";
 			}
+			paraMap = packageYgcStationNumParam(srRoute,null);
 			sBuffer.append("<Station>");
-			sBuffer.append("<STATION_ID>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(srRoute.getLineCode(),srRoute.getDirections()+"",srRoute.getStationCode())).append("</STATION_ID>");
+			sBuffer.append("<STATION_ID>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paraMap)).append("</STATION_ID>");
 			sBuffer.append("<UPDDOWN>").append(srRoute.getDirections()).append("</UPDDOWN>");
-			sBuffer.append("<STATION_NO>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(srRoute.getLineCode(),srRoute.getDirections()+"",srRoute.getStationCode())).append("</STATION_NO>");
+			sBuffer.append("<STATION_NO>").append(i).append("</STATION_NO>");
 			sBuffer.append("<STATION_CODE>").append(srRoute.getStationCode()).append("</STATION_CODE>");
 			sBuffer.append("<STATION_NAME>").append(srRoute.getStationName()).append("</STATION_NAME>");
 			sBuffer.append("<STATION_LON>").append(srRoute.getStation().getgLonx()).append("</STATION_LON>");
@@ -1173,6 +1201,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	private int packagStationPointXml(List<StationRoute> stationsList,StringBuffer sBuffer,int startId){
 		int size = stationsList.size();
 		StationRoute srRoute;
+		HashMap<String,String> paraMap;
 		String zdlx ;// 站点类型：0：起点站、1：终点站、2：中途站
 		for (int i = 0; i < size; i++) {
 			srRoute = stationsList.get(i);
@@ -1184,8 +1213,9 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			}else{
 				zdlx = "2";
 			}
+			paraMap = packageYgcStationNumParam(srRoute,null);
 			sBuffer.append("<Point>");
-			sBuffer.append("<POINT_ID>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(srRoute.getLineCode(),srRoute.getDirections()+"",srRoute.getStationCode())).append("</POINT_ID>");
+			sBuffer.append("<POINT_ID>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paraMap)).append("</POINT_ID>");
 			sBuffer.append("<UPDDOWN>").append(srRoute.getDirections()).append("</UPDDOWN>");
 			sBuffer.append("<POINTLON>").append(srRoute.getStation().getgLonx()).append("</POINTLON>");
 			sBuffer.append("<POINTLAT>").append(srRoute.getStation().getgLaty()).append("</POINTLAT>");
@@ -1196,15 +1226,94 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	}
 	/**
-	 *
-	 * @param lineCode 线路编码
-	 * @param direction 线路方向
-	 * @param stationCode 让点名称
+	 *  获取运管处站点序号
+	 * @param map
 	 * @return 运管处站点序号
 	 */
-	private Integer getYgcStationNumByLineCodeAndDirectionAndStationName(String lineCode,String direction,String stationCode){
-		Integer number = 0;
-		number = BasicData.stationName2YgcNumber.get(lineCode+"_"+direction+"_"+stationCode);
+	private Integer getYgcStationNumByLineCodeAndDirectionAndStationName(HashMap<String,String> map){
+		// 线路编码
+		String lineCode = map.get("lineCode");
+		// 线路走向 0：上行  1：下行
+		String direction = map.get("direction");
+		// 站点编码
+		String stationCode = map.get("stationCode");
+		// 站点类型：B：起点站 Z：中途站 E：终点站 T：停车场
+		String stationMark = map.get("stationMark");
+		String[] marks = null;
+		// 起点站，先从起点找，找不到再从中途站找，最后从终点找
+		if(stationMark.equals("B")){
+			marks= new String[]{"B","Z","E"};
+		}else if(stationMark.equals("E")){// 终点站相反
+			marks= new String[]{"E","Z","B"};
+		}else if(stationMark.equals("Z")){
+			marks= new String[]{"Z"};
+		}
+		Integer number = null;
+		for (int i = 0 ;i < marks.length ; i ++){
+			number = BasicData.stationName2YgcNumber.get(lineCode+"_"+direction+"_"+stationCode+"_"+marks[i]);
+			if(number != null){
+				break;
+			}
+		}
 		return number == null ? 0 : number;
 	}
+
+	/**
+	 * 封装查询站序条件
+	 * @param obj
+	 * @return
+	 */
+	private HashMap packageYgcStationNumParam(Object obj,HashMap<String,String> otherParam){
+		HashMap<String,String> map = new HashMap<String,String>();
+		String lineCode = "",direction = "",stationCode = "",stationMark = "";
+		// 站点路由
+		if(obj instanceof StationRoute){
+			StationRoute sr = (StationRoute)obj;
+			lineCode = sr.getLineCode();
+			direction = String.valueOf(sr.getDirections());
+			stationCode = sr.getStationCode();
+			stationMark = sr.getStationMark();
+		}else if(obj instanceof ScheduleRealInfo){ //实际排班计划明细。
+			ScheduleRealInfo sri = (ScheduleRealInfo)obj;
+			lineCode = sri.getXlBm();
+			direction = sri.getXlDir();
+			if(otherParam != null && otherParam.get("stationMark") != null){
+				stationMark = otherParam.get("stationMark");
+				if(stationMark.equals("B")){ // 起点站
+					stationCode = sri.getQdzCode();
+				}else if(stationMark.equals("E")){ // 终点站
+					stationCode = sri.getZdzCode();
+				}
+			}
+		}else if(obj instanceof SchedulePlanInfo){ //排班计划明细
+			SchedulePlanInfo spi = (SchedulePlanInfo)obj;
+			lineCode = spi.getXlBm();
+			direction = spi.getXlDir();
+			if(otherParam != null && otherParam.get("stationMark") != null){
+				stationMark = otherParam.get("stationMark");
+				if(stationMark.equals("B")){ // 起点站
+					stationCode = spi.getQdzCode();
+				}else if(stationMark.equals("E")){ // 终点站
+					stationCode = spi.getZdzCode();
+				}
+			}
+		}else if(obj instanceof TTInfoDetail){ //时刻表明细
+			TTInfoDetail ttid = (TTInfoDetail)obj;
+			lineCode = ttid.getXl().getLineCode();
+			direction = ttid.getXlDir();
+			if(otherParam != null && otherParam.get("stationMark") != null){
+				stationMark = otherParam.get("stationMark");
+				if(stationMark.equals("B")){ // 起点站
+					stationCode = ttid.getQdz().getStationCod();
+				}else if(stationMark.equals("E")){ // 终点站
+					stationCode = ttid.getZdz().getStationCod();
+				}
+			}
+		}
+		map.put("lineCode",lineCode);// 站点编码
+		map.put("direction",direction); // 上下行
+		map.put("stationCode",stationCode); // 站点编号
+		map.put("stationMark",stationMark); // 站点类型
+		return map;
+	}
 }
@@ -31,6 +31,7 @@ import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
+import com.bsth.entity.mcy_forms.Daily;
 import com.bsth.entity.oil.Cyl;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.oil.Ylxxb;
@@ -100,7 +101,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			// TODO Auto-generated method stub
 			Map<String, Object> newMap=new HashMap<String,Object>();
 			//当天YLB信息
-			List<Ylb> ylList=repository.obtainYl(rq,"","","","","nbbm");
+//			List<Ylb> ylList=repository.obtainYl(rq,"","","","","nbbm");
+			List<Ylb> ylList=this.listOrderBy(rq,"","","","","nbbm");
 			//当天YLXXB信息
 	//		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq);
 			//前一天所有车辆最后进场班次信息
@@ -258,7 +260,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			DecimalFormat df = new DecimalFormat("#.00");
 			// TODO Auto-generated method stub
 			// 当天YLB信息
-			List<Ylb> ylList = repository.obtainYl(rq,gsbm,fgsbm,line,nbbm,"nbbm");
+			List<Ylb> ylList = this.listOrderBy(rq,gsbm,fgsbm,line,nbbm,"nbbm");
+//					repository.obtainYl(rq,gsbm,fgsbm,line,nbbm,"nbbm");
 			// 当天YLXXB信息
 			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm);
 			// 前一天所有车辆最后进场班次信息
@@ -482,13 +485,15 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			List<Ylb> ylbList =new ArrayList<Ylb>();
 			List<Ylb> ylbLists =new ArrayList<Ylb>();
 			List<Ylb> iterator2=new ArrayList<Ylb>();
-			if(xlbm.equals("")){
-				ylbLists=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
-				iterator2=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
-			}else{
-				ylbLists=repository.obtainYl_eq(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
-				iterator2=repository.obtainYl_eq(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
-			}
+//			if(xlbm.equals("")){
+				ylbLists=this.listOrderBy(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
+//						repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
+				iterator2=this.listOrderBy(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
+//						repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
+//			}else{
+//				ylbLists=repository.obtainYl_eq(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
+//				iterator2=repository.obtainYl_eq(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
+//			}
 			// 从排班表中计算出行驶的总里程
@@ -602,8 +607,14 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 									if(j==iterator2.size()-1){
 										ylxs=czyl;
 									}else{
-										l=Math.round(nextJzyl);
-										ylxs=l*100/100;
+//										l=Math.round(nextJzyl);
+//										ylxs=l*100/100;
+										if(iterator2.get(j+1).getNbbm().equals(t.getNbbm())){
+											l=Math.round(nextJzyl);
+											ylxs=l*100/100;
+										}else{
+											ylxs=czyl;
+										}
 									}
 									yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
@@ -833,7 +844,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			}
 //			List<Ylb> ylListBe=repository.obtainYlbefore(rq, gsbm, "", xlbm, nbbm);
 			List<Ylb> ylListBe=repository.listMaxRqJcsx(rq, gsbm, fgsbm, xlbm, nbbm);
-			List<Ylb> ylbList=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
+			List<Ylb> ylbList=this.listOrderBy(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
+//					repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
 			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,0,gsbm);
 			for (int i = 0; i < ylxxbList.size(); i++) {
 				Boolean fage=true;
@@ -1278,8 +1290,10 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				map.put("nbbm_eq", nbbm_eq);
 				map.put("rq_eq", rq_eq);
-				List<Ylb> iterator2=repository.obtainYl(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),"",
+				List<Ylb> iterator2=this.listOrderBy(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),"",
 						ylb.getNbbm(),"jcsx");
+//						repository.obtainYl(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),"",
+//						ylb.getNbbm(),"jcsx");
 				DecimalFormat df = new DecimalFormat("#.00");
 				Double zyl = 0.0;
 				Double nextJzyl = 0.0;
@@ -1395,7 +1409,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		t.setCreatetime(new Date());
 		String[] jhsjStr = jhsj.split(":");
 		long fcsjL= Long.parseLong(jhsjStr[0])*60+Long.parseLong(jhsjStr[1]);
-		List<Ylb> list=repository.obtainYl(rq, gsdm, fgsdm, xlbm, nbbm, "jhsj");
+		List<Ylb> list=this.listOrderBy(rq, gsdm, fgsdm, xlbm, nbbm, "jhsj");
+//				repository.obtainYl(rq, gsdm, fgsdm, xlbm, nbbm, "jhsj");
 		int jcsx=1;
 		if(list.size()>0){
 			for (int i = 0; i < list.size(); i++) {
@@ -1439,4 +1454,43 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		}
 		return maps;
 	}
+	
+	public  List<Ylb> listOrderBy(String rq,String gsdm,
+			String fgsdm,String xlbm,String nbbm,
+			String px) {
+		// TODO Auto-generated method stub
+		String sql="SELECT * FROM bsth_c_ylb  "
+				+ " where to_days('"+rq+"')=to_days(rq) and ssgsdm like '%"+gsdm+"%' "
+				+ " and fgsdm like '%"+fgsdm+"%'";
+		if(xlbm.equals("")){
+			sql+= " and xlbm like '%"+xlbm+"%' ";
+		}else{
+			sql+= " and xlbm = '"+xlbm+"' ";
+		}
+				
+		sql += "and nbbm like '%"+nbbm+"%' order by "+px+" asc ";
+		
+		List<Ylb> list = jdbcTemplate.query(sql, new RowMapper<Ylb>() {
+			@Override
+			public Ylb mapRow(ResultSet arg0, int arg1) throws SQLException {
+				Ylb y = new Ylb();
+				y.setId(arg0.getInt("id"));
+				return y;
+			}
+		});
+		List<Ylb> lists=new ArrayList<Ylb>();
+		List<Ylb> ylbLists=repository.obtainYl(rq,gsdm,fgsdm,xlbm,nbbm,"jcsx");
+		for (int i = 0; i < list.size(); i++) {
+			Ylb t=list.get(i);
+			for (int j = 0; j < ylbLists.size(); j++) {
+				Ylb t2=ylbLists.get(j);
+				if(t.getId().intValue()==t2.getId().intValue()){
+					lists.add(t2);
+					break;
+				}
+			}
+		}
+		
+		return lists;
+	}
 }
@@ -3267,26 +3267,28 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             yesterdayDataList.get(x).put("totalKilometers", zlc);
         }
+        List<Map<String, Object>> yesterdayDataLists = new ArrayList<Map<String, Object>>();
+
         for (int i = 0; i < yesterdayDataList.size(); i++) {
         	Map<String, Object> map=yesterdayDataList.get(i);
         	 Double zlc=map.get("totalKilometers")==null?0.0:Double.parseDouble(map.get("totalKilometers").toString());
-        	 if(zlc<=0){
-        		 yesterdayDataList.remove(map);
+        	 if(zlc>0){
+        		 yesterdayDataLists.add(map);
         	 }
         }
         //增加顺序号
-        for (int i = 0; i < yesterdayDataList.size(); i++) {
+        for (int i = 0; i < yesterdayDataLists.size(); i++) {
             if (i == 0) {
-                yesterdayDataList.get(i).put("seqNumber", 1);
+            	yesterdayDataLists.get(i).put("seqNumber", 1);
             } else {
-                if (yesterdayDataList.get(i - 1).get("clZbh").equals(yesterdayDataList.get(i).get("clZbh"))) {
-                    yesterdayDataList.get(i).put("seqNumber", 1 + (int) yesterdayDataList.get(i - 1).get("seqNumber"));
+                if (yesterdayDataLists.get(i - 1).get("clZbh").equals(yesterdayDataLists.get(i).get("clZbh"))) {
+                	yesterdayDataLists.get(i).put("seqNumber", 1 + (int) yesterdayDataLists.get(i - 1).get("seqNumber"));
                 } else {
-                    yesterdayDataList.get(i).put("seqNumber", 1);
+                	yesterdayDataLists.get(i).put("seqNumber", 1);
                 }
             }
         }
-        return yesterdayDataList;
+        return yesterdayDataLists;
     }
     /**
@@ -47,10 +47,12 @@ public class ReportUtils {
 			POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(
 					sourcePath));
 			HSSFWorkbook wb = new HSSFWorkbook(fs);
-			Map<String, Object> m = (Map<String, Object>)tArray[0];
-			if(m.containsKey("sheetName") && m.get("sheetName")!=null
-					&& m.get("sheetName").toString().trim().length()!=0)
-				wb.setSheetName(0, m.get("sheetName").toString());
+			if(tArray.length != 0 && tArray[0] instanceof java.util.Map){
+				Map<String, Object> m = (Map<String, Object>)tArray[0];
+				if(m.containsKey("sheetName") && m.get("sheetName")!=null
+						&& m.get("sheetName").toString().trim().length()!=0)
+					wb.setSheetName(0, m.get("sheetName").toString());
+			}
 			HSSFSheet sheet = wb.getSheetAt(0);
 			HSSFRow row;
 			HSSFCell cell = null;
@@ -157,7 +157,7 @@ $(function(){
 	    increaseArea: '20%'
 	}
-	jsDoQuery(null,true);
+// 	jsDoQuery(null,true);
 	//重置
 	$('tr.filter .filter-cancel').on('click', function(){
@@ -19,6 +19,9 @@
                     </a>
                 </div>
                 <div>
+                    <span class="field">车牌号：</span>{{plateNo}}
+                </div>
+                <div>
                     <span class="field">站点：</span>{{stationName}}
                 </div>
                 <!-- <div>
@@ -56,6 +59,9 @@
                 </a>
             </div>
             <div>
+                <span class="field">车牌号：</span>{{gps.plateNo}}
+            </div>
+            <div>
               <span class="field">站点：</span>{{gps.stationName}}
             </div>
             <div>
@@ -13,6 +13,7 @@ var gb_svg_tooltip = (function () {
         if (rect.attr('aria-describedby'))
             return;
         var gps = gb_data_gps.findOne($(this).attr('_id').split('_')[1]);
+        addPlateNo(gps);
         $(this).qtip({
             show: {
                 ready: true,
@@ -70,6 +71,7 @@ var gb_svg_tooltip = (function () {
             },
             content: {
                 text: function () {
+                    addPlateNo(gpsArray);
                     return temps['tooltip_multi_gps_temp']({list: gpsArray});
                 }
             },
@@ -190,6 +192,7 @@ var gb_svg_tooltip = (function () {
      */
     var refreshTooltip = function (deviceId, wrap) {
         var gps = gb_data_gps.findOne(deviceId);
+        addPlateNo(gps);
         var cont = temps['tooltip_gps_temp'](gps);
         var htmlStr = $(cont).find('.cont-text-panel').html();
@@ -201,6 +204,21 @@ var gb_svg_tooltip = (function () {
         //console.log('refreshTooltip htmlStr', htmlStr, wrap);
     };
+    /**
+     * 为GPS附加车牌号
+     * @param gpsArray
+     */
+    function addPlateNo(gpsArray) {
+        if (!isArray(gpsArray))
+            gpsArray = [gpsArray];
+        try {
+            $.each(gpsArray, function () {
+                if(!this.plateNo)
+                    this.plateNo = gb_data_basic.nbbm2PlateMap()[this.nbbm];
+            });
+        }catch (e){}
+    }
+
     return {
         update: updateFixedTip,
         refresh: refresh,
@@ -1021,7 +1021,7 @@
                     //从localStorage 获取路段
                     routes = JSON.parse(storage.getItem(lineCode + '_route'));
                     routes = [routes.up_bd, routes.down_bd];
-                    switchPolyline(lineCode, updown);
+                    switchPolyline(updown);
                 };
                 return {
                     initData: initData,