gps轨迹回放

lizhuojun
1 parent 54228753
Showing 3 changed files with 30 additions and 25 deletions
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/resources/static/pages/control/lineallot_v2/main.html
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v3/right.html
@@ -250,10 +250,9 @@ public class GpsServiceImpl implements GpsService {
         boolean isFirstNotValid=true;
         boolean isFirstLonlatZero=true;
         Map<String, Object> map = null;
+        int index=0;
         for(Map<String, Object> rs : dataList){
-            int index=dataList.indexOf(rs);
             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){
@@ -337,14 +336,14 @@ public class GpsServiceImpl implements GpsService {
             //路段编码
             map.put("section_code", map_get_str(rs,"SECTION_CODE"));
             list.add(map);
+            index++;
         }
         if (lineSet.size()>0){
-            List listvs=new ArrayList();
+            List<Map<String,Object>> vlist=new ArrayList<>();
             for (String s : lineSet) {
                 int lineId=Integer.parseInt(s);
                 List<LineVersions> lvs=lineVersionsRepository.findBylineId(lineId);
-                List<Map<String,Object>> vlist=new ArrayList<>();
                 Map<String,Object> vMap;
                 Long qt=0L;
                 if (lvs!=null&&!lvs.isEmpty()){
@@ -353,27 +352,28 @@ public class GpsServiceImpl implements GpsService {
                         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");
-                            vlist.add(vMap);
                         }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());
-                            //vMap.put("et",lvs.indexOf(lv)==lvs.size()-1?lv.getEndDate().getTime():lvs.get(lvs.indexOf(lv)+1).getStartDate().getTime());
                             qt=lv.getEndDate().getTime();
-                            vlist.add(vMap);
                         }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()>0){
-                    listvs.add(vlist);
-                }
                 if (vlist.size()>1){
                     Map<String,Object> VSmap=new HashMap<>();
                     VSmap.put("abnormalType","vserionSwitch");
@@ -381,7 +381,7 @@ public class GpsServiceImpl implements GpsService {
                     versionSwitchList.add(VSmap);
                 }
             }
-            rsMap.put("lineVerson",listvs);
+            rsMap.put("lineVerson",vlist);
         }
         // 按时间排序
         Collections.sort(list, new Comparator<Map<String, Object>>() {
@@ -511,8 +511,7 @@
                 if (rs) {
                     for(var lineCode in rs)
                         storage.setItem(lineCode + '_route', JSON.stringify(rs[lineCode]));
-
-                    eq.emit('cache_route');
+                    //eq.emit('cache_route');
                 }
             });
             $.get('/realMap/findRouteByLine', {idx: idx}, function (rs) {
@@ -189,6 +189,7 @@
          * 播放
          */
         $('.top-btn-list .play', rightWrap).on('click', function () {
+            debugger
             if (toolsDisabled())
                 return;
             if (!$(this).hasClass('pause')) {
@@ -342,7 +343,10 @@
         function drawRoadPolyline(lineCode, upDown, lineVersion) {
             //从localStorage获取路段
-            routes = JSON.parse(storage.getItem(lineCode + "_" + lineVersion + '_route'));
+            if (lineVersion==0)
+                routes = JSON.parse(storage.getItem(lineCode + '_route'));
+            else
+                routes = JSON.parse(storage.getItem(lineCode + "_" + lineVersion + '_route'));
             if (!routes) {
                 var name = gb_data_basic.lineCode2NameAll()[lineCode];
                 notify_err("缺少" + name + "的路段信息，请选择" + name + "进入线调");
@@ -377,7 +381,7 @@
             var array = stations[upDown], psm, zdMarkers = [];
             $.each(array, function () {
-                if (this.versions == lineVersion) {
+                if (this.versions == lineVersion||lineVersion==0) {
                     //坐标转换
                     var coord = TransGPS.wgsToBD(this.lat, this.lon);
@@ -404,7 +408,7 @@
             var array = stations[upDown], obj, buffs = [];
             $.each(array, function () {
-                if (this.versions == lineVersion) {
+                if (this.versions == lineVersion||lineVersion==0) {
                     if (this.shapesType == 'r')
                         obj = drawCircle(new BMap.Point(this.bd_lon, this.bd_lat), this.radius);
                     else if (this.shapesType == 'd')
@@ -439,7 +443,7 @@
             }
             var array = stations[upDown], tMarkers = [];
             $.each(array, function () {
-                if (this.versions == lineVersion) {
+                if (this.versions == lineVersion||lineVersion==0) {
                     var width = this.stationName.length * 12;
                     var label = new BMap.Label(this.stationName, {
@@ -692,17 +696,19 @@
         function getLineVersionAnddrawCarMarker(gps) {
             if (lineVersionList.length > 0) {
+                var isNotLine=0
                 for (var i = 0; i < lineVersionList.length; i++) {
-                    if (lineVersionList[i].length > 0) {
-                        for (var j = 0; j < lineVersionList[i].length; j++) {
-                            if ((lineVersionList[i][j].endTime && lineVersionList[i][j].endTime > gps.timestamp) || (lineVersionList[i][j].startTime && lineVersionList[i][j].startTime < gps.timestamp) || (lineVersionList[i][j].vtime && lineVersionList[i][j].vtime == 'all')) {
-                                drawCarMarker(gps, lineVersionList[i][j].version);//更新GPS点位
-                            }
-                        }
-
-
+                    if(lineVersionList[i].line!=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')) {
+                        drawCarMarker(gps, lineVersionList[i].version);//更新GPS点位
+                    }else if(lineVersionList[i].length == 0){
+                        drawCarMarker(gps, 0);//除非线路没有版本信息
                     }
                 }
+                if(isNotLine==lineVersionList.length){
+                    drawCarMarker(gps, 0);//除非线路没有正确的版本信息
+                }
             } else {
                 drawCarMarker(gps, 0);//除非线路没有版本信息
             }