线调更新

lizhuojun
1 parent 98eb12d0
Showing 6 changed files with 124 additions and 61 deletions
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/resources/static/pages/permission/user/authorize.html
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.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/left.html
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v3/right.html
@@ -16,6 +16,7 @@ import com.bsth.entity.LineVersions;
 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.StationRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
@@ -87,6 +88,9 @@ public class GpsServiceImpl implements GpsService {
     @Autowired
     LineVersionsRepository lineVersionsRepository;
  
+    @Autowired
+    LineRepository lineRepository;
+
     // 历史gps查询
     @Override
     public List<Map<String, Object>> history(String device, Long startTime, Long endTime, int directions) {
@@ -228,50 +232,69 @@ public class GpsServiceImpl implements GpsService {
         //查询GPS数据
         JdbcTemplate jdbcTemplate_ms = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<Map<String, Object>> dataList = jdbcTemplate_ms.queryForList(sql.toString());
-        if (!dataList.isEmpty()){
  
-            int lineId=Integer.parseInt(map_get_str(dataList.get(0), "LINE_ID"));
-            List<LineVersions> lvs=lineVersionsRepository.findBylineId(lineId);
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-            List<Map<String,Object>> vlist=new ArrayList<>();
-            Map<String,Object> vMap;
-            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("version",lv.getVersions());
-                        vMap.put("vtime","all");
-                        vlist.add(vMap);
-                    }else if(sd<st&&et>ed&&st<ed){
-                        vMap.put("version",lv.getVersions());
-                        vMap.put("endTime",lv.getEndDate().getTime());
-                        vlist.add(vMap);
-                    }else if(st<sd&&et<ed&&sd<et){
-                        vMap.put("version",lv.getVersions());
-                        vMap.put("startTime",lv.getStartDate().getTime());
-                        vlist.add(vMap);
-                    }
-                }
-            }
-            rsMap.put("lineVerson",vlist);
-        }
         Float lon, lat;
         Location bdLoc, gdLoc;
         int inOutStop;
         long serviceState;
         ArrivalEntity arrival;
-
+        Set<String> lineSet=new HashSet();
+        String firstLineCode="";
+        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;
         Map<String, Object> map = null;
         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"))){
+                Map<String,Object> LSmap=new HashMap<>();
+                String name=lineRepository.findOne(Integer.valueOf(map_get_str( rs,"LINE_ID"))).getName();
+                String NextName=lineRepository.findOne(Integer.valueOf(map_get_str( dataList.get(index+1),"LINE_ID"))).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);
+            }
             serviceState = map_get_long(rs, "SERVICE_STATE");
-            if(getGpsValid(serviceState) == 1)
-                continue;
+            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;
+                }
+            }
+                //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;
+                }
+            }
             // 高德坐标
             gdLoc = TransGPS.transformFromWGSToGCJ(TransGPS.LocationMake(lon, lat));
             map.put("gcj_lon", gdLoc.getLng());
@@ -292,7 +315,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);
  
@@ -310,6 +333,48 @@ public class GpsServiceImpl implements GpsService {
             map.put("section_code", map_get_str(rs,"SECTION_CODE"));
             list.add(map);
         }
+
+        if (lineSet.size()>0){
+            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()){
+                for (LineVersions lv : lvs) {
+                    vMap=new HashMap();
+                    Long sd=lv.getStartDate().getTime();
+                    Long ed=lv.getEndDate().getTime();
+                    if (sd<st&&et<ed){
+                        vMap.put("version",lv.getVersions());
+                        vMap.put("vtime","all");
+                        vlist.add(vMap);
+                    }else if(sd<st&&et>ed&&st<ed){
+                        vMap.put("version",lv.getVersions());
+                        vMap.put("endTime",lv.getEndDate().getTime());
+                        vMap.put("abnormalType","versionSwitch");
+                        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("version",lv.getVersions());
+                        vMap.put("startTime",lv.getStartDate().getTime());
+                        vlist.add(vMap);
+                    }
+                }
+            }
+            rsMap.put("lineVerson",vlist);
+            if (vlist.size()>1){
+                Map<String,Object> VSmap=new HashMap<>();
+                VSmap.put("abnormalType","vserionSwitch");
+                VSmap.put("st",qt);
+                versionSwitchList.add(VSmap);
+            }
+            }
+
+        }
         // 按时间排序
         Collections.sort(list, new Comparator<Map<String, Object>>() {
  
@@ -321,6 +386,9 @@ public class GpsServiceImpl implements GpsService {
  
         rsMap.put("list", list);
         rsMap.put("dcs", dcs);
+        rsMap.put("gpsNotValid",gpsNotValidList);
+        rsMap.put("lineSwitch",lineSwitch);
+        rsMap.put("lonlatZero",gpsEqualsZeroList);
         return rsMap;
     }
  
@@ -749,6 +817,9 @@ public class GpsServiceImpl implements GpsService {
             rs.put("sumMileage", new DecimalFormat(".##").format(sum / 1000));
             rs.put("dcs", gpsMap.get("dcs"));
             rs.put("lineVerson",gpsMap.get("lineVerson"));
+            rs.put("gpsInvalid",gpsMap.get("gpsNotValid"));
+            rs.put("gpslineSwitch",gpsMap.get("lineSwitch"));
+            rs.put("gpslonlatex",gpsMap.get("lonlatZero"));
         } catch (Exception e) {
             logger.error("", e);
             rs.put("status", ResponseCode.ERROR);
@@ -309,15 +309,6 @@
     <div class="ct_cont uk-grid-small uk-child-width-expand" uk-grid>
         <div class="role_list uk-width-1-4 ">
             <div class="uk-card uk-card-default">
-                <form>
-                    <div class="uk-margin">
-                        <div class="uk-inline" >
-                            <!--<span class="uk-form-icon uk-form-icon-flip" uk-icon="icon: search"></span>-->
-                            <!--<input class="uk-input role_search_input" type="text" placeholder="搜索角色">-->
-                        </div>
-                    </div>
-                </form>
-
                 <div class="ct-card-body" >
                     <ul class="uk-list uk-list-large uk-list-divider role-list">
                     </ul>
@@ -326,15 +317,6 @@
         </div>
         <div class="user_list uk-width-1-5 ">
             <div class="uk-card uk-card-default">
-                <form>
-                    <div class="uk-margin">
-                        <div class="uk-inline" >
-                            <!--<span class="uk-form-icon uk-form-icon-flip" uk-icon="icon: search"></span>-->
-                            <!--<input class="uk-input user_search_input" type="text" placeholder="搜索用户">-->
-                        </div>
-                    </div>
-                </form>
-
                 <div class="ct-card-body">
                     <ul class="uk-list uk-list-large user-list">
                     </ul>
@@ -343,7 +325,6 @@
         </div>
         <div class="auth_cont ">
             <div class="uk-card uk-card-default authorize_right_cont">
-
             </div>
         </div>
     </div>
@@ -29,7 +29,6 @@ var gb_schedule_table = (function () {
  
     var show = function (cb) {
         //从服务器获取班次数据
-        debugger
         $.get('/realSchedule/lines', {
             lines: gb_data_basic.line_idx
         }, function (rs) {
@@ -96,13 +96,21 @@
         <dl>
             <dd>
                 {{if item.abnormalType == 'speed'}}
-                    {{if item.speed>=100}}
-                        速度异常
-                    {{else}}
-                        超速({{item.speed}})
-                    {{/if}}
+                {{if item.speed>=100}}
+                速度异常
+                {{else}}
+                超速({{item.speed}})
+                {{/if}}
                 {{else if item.abnormalType == 'outbound'}}
                 越界
+                {{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>
+                {{else if item.abnormalType == 'versionSwitch'}}
+                线路版本切换
+                {{else if item.abnormalType == 'gpsZero'}}
+                经纬度为0
                 {{/if}}
             </dd>
             <dd>{{item.st_str}}</dd>
@@ -218,7 +218,7 @@
                         fillTrailTable(rs.list);//填充行车轨迹表格
                         fillArivalStationTable(rs.list);//填充到离站表格
                         $('.sum_mileage_span', leftWrap).text('共约 ' + rs.sumMileage + ' 公里');
-                        fillAbnormalTable(rs['outboundList'], rs['speedList']);//填充异常信息表格
+                        fillAbnormalTable(rs['outboundList'], rs['speedList'],rs['gpsInvalid'],rs['gpslineSwitch'],rs['lineVerson'],rs['gpslonlatex']);//填充异常信息表格
                         //准备播放
                         rs.arrivalData = arrivalData;
                         $('.gps-play-back-panel-v3>div.right-panel .play-back-tools-wrap').trigger('ready-to-play', rs);
@@ -461,14 +461,21 @@
             for(var i = 0; i < arguments.length; i ++){
                 array = array.concat(arguments[i]);
             }
+            var i=null;
             //格式化时间
             $.each(array, function () {
+                if(!this.abnormalType&&this.version){
+                    i=array.indexOf(this);
+                }
                 if(this.st)
                     this.st_str = moment(this.st).format('HH:mm.ss');
                 if(this.et)
                     this.et_str = moment(this.et).format('HH:mm.ss');
             });
  
+            if(i){
+                array.splice(i,1);
+            }
             //排序
             array.sort(function (a, b) {
                 return a.st - b.st;
@@ -84,7 +84,6 @@
         var currentVersion;
  
         $('.play-back-tools-wrap', rightWrap).on('ready-to-play', function (e, data) {
-            debugger
             e.stopPropagation();
             //reset
             reset();
@@ -191,7 +190,6 @@
         $('.top-btn-list .play', rightWrap).on('click', function () {
             if(toolsDisabled())
                 return;
-debugger
             if(!$(this).hasClass('pause')){
                 //第一次点击播放，清除一下
                 if(play_before_flag){
@@ -344,7 +342,6 @@ debugger
             //从localStorage获取路段
             routes = JSON.parse(storage.getItem(lineCode+"_"+lineVersion + '_route'));
             if(!routes){
-                debugger
                 var name = gb_data_basic.lineCode2NameAll()[lineCode];
                 notify_err("缺少" + name + "的路段信息，请选择" + name + "进入线调");
                 return;