Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong

徐烜
2 parents 1f790a99 67ac8a6e
Showing 9 changed files with 247 additions and 133 deletions
src/main/java/com/bsth/entity/report/RepairReport.java
src/main/java/com/bsth/repository/RepairReportRepository.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/gps/entity/HistoryGps_DTOV3.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/control/lineallot_v2/main.html
src/main/resources/static/real_control_v2/js/safe_driv/safeDriv.js
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v3/layout.html
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v3/right.html
@@ -46,6 +46,8 @@ public class RepairReport {
 	// 格式化的时间字符串
 	@Transient
 	private String reportStateStr;
+	// 上报方式 0自动 1主动
+	private int reportMode;
 	public Integer getId() {
 		return id;
@@ -150,4 +152,12 @@ public class RepairReport {
 	public void setReportStateStr(String reportStateStr) {
 		this.reportStateStr = reportStateStr;
 	}
+
+	public int getReportMode() {
+		return reportMode;
+	}
+
+	public void setReportMode(int reportMode) {
+		this.reportMode = reportMode;
+	}
 }
@@ -31,4 +31,7 @@ public interface RepairReportRepository extends BaseRepository&lt;RepairReport, Int
 			+ " RepairReport r where r.lineId = ?1 and r.reportDate between ?2 and "
 			+ "?3 and r.incode like ?4%")
 	List<RepairReport> repairReportList(String lineId,Date start,Date end,String incode);
+	
+	@Query(value="select count(r) from RepairReport r where r.schId = ?1 and r.reportMode = ?2")
+	int repairReportBySch(Long schId, int reportMode);
 }
 package com.bsth.service.gps;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Field;
+import java.net.URLEncoder;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+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;
+import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
 import com.bsth.data.forecast.entity.ArrivalEntity;
@@ -12,50 +56,28 @@ import com.bsth.data.pilot80.PilotReport;
 import com.bsth.data.safe_driv.SafeDriv;
 import com.bsth.data.safe_driv.SafeDrivCenter;
 import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.Line;
 import com.bsth.entity.LineVersions;
+import com.bsth.entity.LsSectionRoute;
+import com.bsth.entity.LsStationRoute;
 import com.bsth.entity.directive.D80;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.CarParkRepository;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.LineVersionsRepository;
+import com.bsth.repository.LsSectionRouteRepository;
+import com.bsth.repository.LsStationRouteRepository;
 import com.bsth.repository.StationRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
-import com.bsth.service.gps.entity.*;
+import com.bsth.service.gps.entity.DeviceChange;
+import com.bsth.service.gps.entity.GpsOutbound_DTO;
+import com.bsth.service.gps.entity.GpsSpeed;
+import com.bsth.service.gps.entity.GpsSpeed_DTO;
+import com.bsth.service.gps.entity.HistoryGps_DTO;
+import com.bsth.service.gps.entity.HistoryGps_DTOV3;
+import com.bsth.service.gps.entity.Road_DTO;
 import com.bsth.util.TransGPS;
 import com.bsth.util.TransGPS.Location;
 import com.bsth.util.db.DBUtils_MS;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-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;
-import org.springframework.dao.DataAccessException;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Service;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Field;
-import java.net.URLEncoder;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.DecimalFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
 @Service
 public class GpsServiceImpl implements GpsService {
@@ -91,6 +113,12 @@ public class GpsServiceImpl implements GpsService {
     @Autowired
     LineRepository lineRepository;
+    
+    @Autowired
+    LsStationRouteRepository lsStationRouteRepository;
+    
+    @Autowired
+    LsSectionRouteRepository lsSectionRouteRepository;
     // 历史gps查询
     @Override
@@ -239,66 +267,76 @@ public class GpsServiceImpl implements GpsService {
         int inOutStop;
         long serviceState;
         ArrivalEntity arrival;
-        Set<String> lineSet=new HashSet();
+        Set<Integer> lineSet=new HashSet<Integer>();
         List<Map<String,Object>> lineSwitch=new ArrayList<>();
-        List<Map> gpsNotValidList=new ArrayList();
-        List<Map> versionSwitchList=new ArrayList();
-        List<Map> gpsEqualsZeroList=new ArrayList();
-        Map<String,Object> zeroMap=null;
-        Map<String,Object> gpsNotValidMap=null;
-        boolean isFirstNotValid=true;
-        boolean isFirstLonlatZero=true;
+        List<Map<String, Object>> gpsNotValidList=new ArrayList<>();
+        List<Map<String, Object>> gpsEqualsZeroList=new ArrayList<>();
         Map<String, Object> map = null;
-        int index=0;
-        for(Map<String, Object> rs : dataList){
-            if (index< dataList.size()-1&&!map_get_str( rs,"LINE_ID").equals(map_get_str( dataList.get(index+1),"LINE_ID"))){
-                Line cLine =lineRepository.findOne(Integer.valueOf(map_get_str( rs,"LINE_ID")));
-                Line nextLine =lineRepository.findOne(Integer.valueOf(map_get_str( dataList.get(index+1),"LINE_ID")));
-                if (cLine!=null&&nextLine!=null){
-                    Map<String,Object> LSmap=new HashMap<>();
-                    String name=cLine.getName();
-                    String NextName=nextLine.getName();
-                    LSmap.put("abnormalType","linesSwitch");
-                    LSmap.put("line_line",name+"-->"+NextName);
-                    LSmap.put("st",map_get_long(rs, "TS"));
-                    LSmap.put("et",index== dataList.size()-1?map_get_long(rs, "TS"):map_get_long( dataList.get(index+1), "TS"));
-                    lineSwitch.add(LSmap);
-                }
-            }
+        int oldLineId = -1, oldGpsValid = -1, oldLonlat = -1;
+        
+        // 默认加入一个线路切换信息
+        Map<String, Object> fls = new HashMap<String, Object>();
+        fls.put("abnormalType", "normal");
+        fls.put("st", "-1");
+        lineSwitch.add(fls);
+        
+        // 默认加入一个GPS无效异常信息
+        Map<String, Object> fgv = new HashMap<String, Object>();
+        fgv.put("abnormalType", "normal");
+        fgv.put("st", "-1");
+        gpsNotValidList.add(fgv);
+        
+        // 默认加入一个经纬度为零异常信息
+        Map<String, Object> fgez = new HashMap<String, Object>();
+        fgez.put("abnormalType", "normal");
+        fgez.put("st", "-1");
+        gpsEqualsZeroList.add(fgez);
+        
+        for(Map<String, Object> rs : dataList) {
+        	Object lineId = rs.get("LINE_ID");
+        	// 线路ID发生变化时补全线路切换信息 并新加入一个
+        	if (oldLineId != (Integer)lineId) {
+        		String lineName = BasicData.lineCode2NameMap.get(lineId.toString());
+        		lineSwitch.get(lineSwitch.size() - 1).put("line2", lineName);
+        		lineSwitch.get(lineSwitch.size() - 1).put("et", rs.get("TS"));
+        		
+        		Map<String, Object> ls = new HashMap<String, Object>();
+                ls.put("abnormalType", "lineSwitch");
+                ls.put("line1", lineName);
+                lineSwitch.add(ls);
+                
+                lineSet.add((Integer)lineId);
+                oldLineId = (Integer)lineId;
+        	}
             serviceState = map_get_long(rs, "SERVICE_STATE");
-            if(getGpsValid(serviceState) == 1){
-                if (isFirstNotValid) {
-                    gpsNotValidMap=new HashMap<>();
-                    gpsNotValidMap.put("abnormalType","gpsNotValid");
-                    gpsNotValidMap.put("st",map_get_long(rs,"TS"));
-                    isFirstNotValid=false;
-                }
-                if (index== dataList.size()-1||index< dataList.size()-1&&getGpsValid(map_get_long(dataList.get(index+1), "SERVICE_STATE"))!=1){
-                    gpsNotValidMap.put("et",map_get_long(rs,"TS"));
-                    gpsNotValidList.add(gpsNotValidMap);
-                    isFirstNotValid=true;
-                    gpsNotValidMap=null;
-                }
+            // GPS状态发生变化时补全信息 并新加入一个
+            if (getGpsValid(serviceState) != oldGpsValid) {
+            	gpsNotValidList.get(gpsNotValidList.size() - 1).put("et", rs.get("TS"));
+            	
+            	Map<String, Object> gv = new HashMap<String, Object>();
+                gv.put("abnormalType", getGpsValid(serviceState) == 0 ? "normal" : "gpsNotValid");
+                gv.put("st", rs.get("TS"));
+                gpsNotValidList.add(gv);
+                
+                oldGpsValid = getGpsValid(serviceState);
             }
-            //continue;
             map = new HashMap<>();
             lon = map_get_float(rs, "LON");
             lat = map_get_float(rs, "LAT");
-            if (lon==0||lat==0){
-                if (isFirstLonlatZero){
-                    zeroMap=new HashMap<>();
-                    zeroMap.put("abnormalType","gpsZero");
-                    zeroMap.put("st",map_get_long(rs,"TS"));
-                    isFirstLonlatZero=false;
-                }
-                if (index<dataList.size()-1&&(map_get_float(dataList.get(index+1),"LON")!=0&&map_get_float(dataList.get(index+1),"LAT")!=0)){
-                    zeroMap.put("et",map_get_long(rs,"TS"));
-                    gpsEqualsZeroList.add(zeroMap);
-                    isFirstLonlatZero=true;
-                }
+            // 经纬度为零
+            if ((lon == 0 || lat == 0 ? 1 : 0) != oldLonlat){
+            	gpsEqualsZeroList.get(gpsEqualsZeroList.size() - 1).put("et", rs.get("TS"));
+            	
+            	Map<String, Object> gez = new HashMap<String, Object>();
+                gez.put("abnormalType", (lon == 0 || lat == 0 ? 1 : 0) == 0 ? "normal" : "gpsZero");
+                gez.put("st", rs.get("TS"));
+                gpsEqualsZeroList.add(gez);
+                
+                oldLonlat = (lon == 0 || lat == 0 ? 1 : 0);
             }
+            
             // 高德坐标
             gdLoc = TransGPS.transformFromWGSToGCJ(TransGPS.LocationMake(lon, lat));
             map.put("gcj_lon", gdLoc.getLng());
@@ -319,7 +357,7 @@ public class GpsServiceImpl implements GpsService {
             map.put("lineId", map_get_str(rs, "LINE_ID"));
             map.put("speed", map_get_float(rs,"SPEED_GPS"));
-            lineSet.add(map_get_str(rs, "LINE_ID"));
+            
             inOutStop = Integer.parseInt(rs.get("INOUT_STOP").toString());
             map.put("inout_stop", inOutStop);
@@ -336,52 +374,93 @@ public class GpsServiceImpl implements GpsService {
             //路段编码
             map.put("section_code", map_get_str(rs,"SECTION_CODE"));
             list.add(map);
-            index++;
+        }
+        if (dataList.size() > 0) {
+        	Map<String, Object> rs = dataList.get(dataList.size() - 1);
+        	gpsNotValidList.get(gpsNotValidList.size() - 1).put("et", rs.get("TS"));
+        	gpsEqualsZeroList.get(gpsEqualsZeroList.size() - 1).put("et", rs.get("TS"));
+        }
+        
+        for (int i = lineSwitch.size() - 1;i > -1;i--) {
+        	Map<String, Object> ls = lineSwitch.get(i);
+        	if ("normal".equals(ls.get("abnormalType")) || ls.get("et") == null) {
+        		lineSwitch.remove(i);
+        	}
+        }
+        
+        for (int i = gpsNotValidList.size() - 1;i > -1;i--) {
+        	Map<String, Object> gnv = gpsNotValidList.get(i);
+        	if ("normal".equals(gnv.get("abnormalType"))) {
+        		gpsNotValidList.remove(i);
+        	}
+        }
+        
+        for (int i = gpsEqualsZeroList.size() - 1;i > -1;i--) {
+        	Map<String, Object> gez = gpsEqualsZeroList.get(i);
+        	if ("normal".equals(gez.get("abnormalType"))) {
+        		gpsEqualsZeroList.remove(i);
+        	}
         }
-        if (lineSet.size()>0){
+        if (lineSet.size() > 0){
             List<Map<String,Object>> vlist=new ArrayList<>();
-            for (String s : lineSet) {
-                int lineId=Integer.parseInt(s);
-                List<LineVersions> lvs=lineVersionsRepository.findBylineId(lineId);
-                Map<String,Object> vMap;
-                Long qt=0L;
-                if (lvs!=null&&!lvs.isEmpty()){
-                    for (LineVersions lv : lvs) {
-                        vMap=new HashMap();
-                        Long sd=lv.getStartDate().getTime();
-                        Long ed=lv.getEndDate().getTime();
-                        if (sd<st&&et<ed){
-                            vMap.put("line",s);
-                            vMap.put("version",lv.getVersions());
-                            vMap.put("vtime","all");
-                        }else if(sd<st&&et>ed&&st<ed){
-                            vMap.put("line",s);
-                            vMap.put("version",lv.getVersions());
-                            vMap.put("endTime",lv.getEndDate().getTime());
-                            vMap.put("abnormalType","versionSwitch");
-                            vMap.put("startTime",st);
-                            vMap.put("st",lv.getEndDate().getTime());
-                            qt=lv.getEndDate().getTime();
-                        }else if(st<sd&&et<ed&&sd<et){
-                            vMap.put("line",s);
-                            vMap.put("version",lv.getVersions());
-                            vMap.put("startTime",lv.getStartDate().getTime());
-                            vMap.put("endTime",et);
-                        }
-                        if (!vMap.isEmpty()) {
-                            vlist.add(vMap);
-                        }
-                    }
-                }
-                if (vlist.size()>1){
-                    Map<String,Object> VSmap=new HashMap<>();
-                    VSmap.put("abnormalType","vserionSwitch");
-                    VSmap.put("st",qt);
-                    versionSwitchList.add(VSmap);
+            Map<String, Map<String, Object>> vmap = new HashMap<>();
+            Map<String, Map<String, String>> lv2station = new HashMap<String, Map<String, String>>();//lv2section = new HashMap<String, Map<String, String>>();
+            for (Integer lineId : lineSet) {
+                List<LineVersions> lvs = lineVersionsRepository.findBylineId(lineId);
+                for (LineVersions lv : lvs) {
+                	long vst = lv.getStartDate().getTime(), vet = lv.getEndDate().getTime();
+                	if (st >= vst && st <= vet || et >= vst && et <= vet) {
+                		List<LsStationRoute> stations = lsStationRouteRepository.findupdated(lineId, lineId.toString(), lv.getVersions());
+                		//List<LsSectionRoute> sections = lsSectionRouteRepository.findupdated(lineId, lineId.toString(), lv.getVersions());
+                		Map<String, Object> vm = new HashMap<String, Object>();
+                		vm.put("lineId", lineId.toString());
+                		vm.put("version", lv.getVersions());
+                		vm.put("startTime", vst);
+                		vm.put("endTime", vet);
+                		vm.put("stations", stations);
+                		//vm.put("sections", sections);
+                		
+                		Map<String, String> stationcode2name = new HashMap<String, String>();//sectioncode2name = new HashMap<String, String>();
+                		for (LsStationRoute lsr : stations) {
+                			stationcode2name.put(lsr.getStationCode(), lsr.getStationName());
+                		}
+                		//for (LsSectionRoute lsr : sections) {
+                		//	sectioncode2name.put(lsr.getSectionCode(), lsr.getSection().getSectionName());
+                		//}
+                		lv2station.put(lineId + "_" + lv.getVersions(), stationcode2name);
+                		// 路段因为可能漂到其它线路路段 因此需要使用最新的全量路段
+                		//lv2section.put(lineId + "_" + lv.getVersions(), sectioncode2name);
+                		
+                		vlist.add(vm);
+                		vmap.put(lineId + "_" + lv.getVersions(), vm);
+                	}
                 }
             }
             rsMap.put("lineVerson",vlist);
+            
+            for (Map<String, Object> gps : list) {
+            	long ts = (long)gps.get("timestamp");
+            	for (Map<String, Object> vm : vlist) {
+            		long vst = (long)vm.get("startTime"), vet = (long)vm.get("endTime");
+            		if (gps.get("lineId").equals(vm.get("lineId")) && ts >= vst && ts <= vet) {
+            			gps.put("version", vm.get("version"));
+            			String key = vm.get("lineId") + "_" + vm.get("version");
+            			/*if (StringUtils.isEmpty(sectionCode)) {
+            				gps.put("section_code", "-00404");
+            				gps.put("section_name", "未知路段");
+            			}
+            			gps.put("section_name", lv2section.get(key).get(sectionCode));*/
+            			ArrivalEntity ae = (ArrivalEntity)gps.get("inout_stop_info");
+            			if (ae != null) {
+            				ae.setStopName(lv2station.get(key).get(ae.getStopNo()));
+            				if (StringUtils.isEmpty(lv2station.get(key).get(ae.getStopNo()))) {
+            					ae.setStopName(BasicData.stationCode2NameMap.get(ae.getStopNo()));
+            				}
+            			}
+            		}
+            	}
+            }
         }
         // 按时间排序
         Collections.sort(list, new Comparator<Map<String, Object>>() {
@@ -50,6 +50,8 @@ public class HistoryGps_DTOV3 {
     private String section_code;
     private String section_name;
+    
+    private int version;
     @JsonIgnore
     private Point point;
@@ -119,7 +121,7 @@ public class HistoryGps_DTOV3 {
         this.stopNo = stopNo;
     }
-    public float getDirection() {
+	public float getDirection() {
         return direction;
     }
@@ -222,4 +224,12 @@ public class HistoryGps_DTOV3 {
     public void setSection_name(String section_name) {
         this.section_name = section_name;
     }
+
+	public int getVersion() {
+		return version;
+	}
+
+	public void setVersion(int version) {
+		this.version = version;
+	}
 }
@@ -1534,6 +1534,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     private static DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm");
+    @Transactional
     @Override
     public Map<String, Object> schInfoFineTune(Map<String, String> map) {
         Map<String, Object> rs = new HashMap<>();
@@ -1543,7 +1544,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         	if (StringUtils.isNotBlank(map.get("repairTypes"))) {
         		Map<String, Object> param = new HashMap<String, Object>();
         		param.putAll(map);
-        		repairReport(param, false);
+        		rs = repairReport(param, false);
         	}
             Long id = Long.parseLong(map.get("id"));
@@ -6068,6 +6069,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 					res.put("status", ResponseCode.ERROR);
 					res.putAll(response);
 				}
+			} else {
+				res.put("status", ResponseCode.ERROR);
+				res.put("msg", "调用上报接口异常");
 			}
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
@@ -6116,9 +6120,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		StringBuilder url = new StringBuilder(ConfigUtil.get("http.report.url." + arr[1]));
 		url.append("?nbbm=").append(incode).append("&bxy=").append(reportUser).append("&bxbm=").append(repairTypes).append("&fgs=").append(arr[0]);
+		int count = repairReportRepository.repairReportBySch(id, 0);
+		if (count > 0) return res;
 		RepairReport lrr = dayOfSchedule.getLastestRepairReport(incode);
-		// 非主动上报并且无上报记录或上次已上报或上次上报的同一个班次 则不用上报
-		if (!isActive && (lrr == null || lrr.getReportState() != 0 || lrr.getSchId().equals(id))) {
+		// 非主动上报并且无上报记录或上次已上报 则不用上报
+		if (!isActive && (lrr == null || lrr.getReportState() != 0)) {
 			reportState = 0;
 		} else {
 			res = request(url.toString());
@@ -6136,6 +6142,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		rr.setRepairType(repairTypes);
 		rr.setReportDate(new Date());
 		rr.setReportState(reportState);
+		rr.setReportMode(isActive ? 1 : 0);
 		repairReportRepository.save(rr);
 		dayOfSchedule.setLastestRepairReport(rr);
@@ -507,6 +507,8 @@
             });
             //缓存路由
             idx=idx.substr(0, idx.length - 1);
+            
+            $.ajaxSettings.async = false;
             $.get('/realMap/findRouteAndVersionByLine', {idx: idx}, function (rs) {
                 if (rs) {
                     for(var lineCode in rs)
@@ -514,6 +516,7 @@
                     //eq.emit('cache_route');
                 }
             });
+            $.ajaxSettings.async = true;
             $.get('/realMap/findRouteByLine', {idx: idx}, function (rs) {
                 if (rs) {
                     for(var lineCode in rs)
@@ -14,7 +14,7 @@ var gb_safe_driv = (function () {
         'A9': '玩手机'
     };
-    var path = 'http://180.166.5.82:9005/CurrentSafeDriving/';
+    var path = 'http://211.95.61.66:9005/CurrentSafeDriving/';
     var $wrap = $('.safe_driv_pop_wrap');
     var max = 5;
@@ -106,7 +106,7 @@
                 {{else if item.abnormalType == 'gpsNotValid'}}
                 gps无效
                 {{else if item.abnormalType == 'linesSwitch'}}
-                <span style="font-size:12px;-webkit-transform:scale(0.9);display:block;text-indent: 5px;">{{item.line_line}}</span>
+                <span style="font-size:12px;-webkit-transform:scale(0.9);display:block;text-indent: 5px;">{{item.line1}}->{{item.line2}}</span>
                 {{else if item.abnormalType == 'versionSwitch'}}
                 线路版本切换
                 {{else if item.abnormalType == 'gpsZero'}}
@@ -81,7 +81,7 @@
         var scale = $('.scale', progress);
         var play_before_flag;
         var lineVersionList;
-        var currentVersion;
+        var currentVersion = 0;
         $('.play-back-tools-wrap', rightWrap).on('ready-to-play', function (e, data) {
             e.stopPropagation();
@@ -304,6 +304,7 @@
             circleLine = circleLine && circlePrevStop != circleFirstStop ? true : false;
             circlePrevStop = gps.stopNo;
             if (autoChange && (gps.lineId != xlPolyline.lineId || gps.upDown != xlPolyline.upDown || circleLine) || xlPolyline.lineVersion != lineVersion) {
+            	debugger;
                 drawXlPolyline(gps.lineId, gps.upDown, lineVersion);
             }
         }
@@ -343,6 +344,7 @@
         function drawRoadPolyline(lineCode, upDown, lineVersion) {
             //从localStorage获取路段
+            //debugger;
             if (lineVersion==0)
                 routes = JSON.parse(storage.getItem(lineCode + '_route'));
             else
@@ -698,9 +700,9 @@
             if (lineVersionList.length > 0) {
                 var isNotLine=0
                 for (var i = 0; i < lineVersionList.length; i++) {
-                    if(lineVersionList[i].line!=gps.lineId)
+                    if(lineVersionList[i].lineId!=gps.lineId)
                         isNotLine++;
-                    if (lineVersionList[i]&&lineVersionList[i].line==gps.lineId&&(lineVersionList[i].endTime && lineVersionList[i].endTime > gps.timestamp&&lineVersionList[i].startTime && lineVersionList[i].startTime < gps.timestamp||lineVersionList[i].vtime && lineVersionList[i].vtime == 'all')) {
+                    if (lineVersionList[i]&&lineVersionList[i].lineId==gps.lineId&&(lineVersionList[i].endTime && lineVersionList[i].endTime > gps.timestamp&&lineVersionList[i].startTime && lineVersionList[i].startTime < gps.timestamp)) {
                         drawCarMarker(gps, lineVersionList[i].version);//更新GPS点位
                     }else if(lineVersionList[i].length == 0){
                         drawCarMarker(gps, 0);//除非线路没有版本信息