Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control into pudong

周勤
2 parents ac5896da f638bd22
Showing 10 changed files with 178 additions and 35 deletions
src/main/java/com/bsth/controller/realcontrol/RealMapController.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/realcontrol/RealMapService.java
src/main/java/com/bsth/service/realcontrol/dto/SectionRouteCoords.java
src/main/java/com/bsth/service/realcontrol/impl/RealMapServiceImpl.java
src/main/resources/static/pages/control/lineallot_v2/main.html
src/main/resources/static/pages/permission/authorize_all/user_auth.html
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/right.html
@@ -49,6 +49,12 @@ public class RealMapController {
         return realMapService.findRouteByLine(idx);
     }
+
+    @RequestMapping(value = "/findRouteAndVersionByLine")
+    public Map<String, Object> findRouteByLineAndVersion(@RequestParam String idx) {
+        return realMapService.findRouteAndVersionByLine(idx);
+    }
+
     @RequestMapping(value = "/multiRouteByLine")
     public Map<String, Object> multiRouteByLine(@RequestParam String codeStr) {
         return realMapService.multiRouteByLine(codeStr);
@@ -12,9 +12,11 @@ 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.LineVersions;
 import com.bsth.entity.directive.D80;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.CarParkRepository;
+import com.bsth.repository.LineVersionsRepository;
 import com.bsth.repository.StationRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.gps.entity.*;
@@ -81,6 +83,10 @@ public class GpsServiceImpl implements GpsService {
     @Autowired
     ScheduleRealInfoRepository scheduleRealInfoRepository;
+
+    @Autowired
+    LineVersionsRepository lineVersionsRepository;
+
     // 历史gps查询
     @Override
     public List<Map<String, Object>> history(String device, Long startTime, Long endTime, int directions) {
@@ -222,7 +228,35 @@ 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;
@@ -714,6 +748,7 @@ public class GpsServiceImpl implements GpsService {
             rs.put("outboundList", outboundList);
             rs.put("sumMileage", new DecimalFormat(".##").format(sum / 1000));
             rs.put("dcs", gpsMap.get("dcs"));
+            rs.put("lineVerson",gpsMap.get("lineVerson"));
         } catch (Exception e) {
             logger.error("", e);
             rs.put("status", ResponseCode.ERROR);
@@ -12,6 +12,8 @@ public interface RealMapService {
     Map<String, Object> findRouteByLine(String idx);
+    Map<String, Object> findRouteAndVersionByLine(String idx);
+
     Map<String,Object> findRouteAndStationByLine(String lineCode);
     Map<String,Object> multiSectionRoute(String codeIdx);
@@ -24,6 +24,16 @@ public class SectionRouteCoords {
     private Float sectionTime;
+    private Integer versions;
+
+    public Integer getVersions() {
+        return versions;
+    }
+
+    public void setVersions(Integer versions) {
+        this.versions = versions;
+    }
+
     public int getId() {
         return id;
     }
@@ -42,7 +42,7 @@ public class RealMapServiceImpl implements RealMapService {
             }
             inStr = " (" + inStr.substring(1) + ")";
-            String sql = "select r.LINE_CODE,r.STATION_NAME,r.STATION_CODE,r.STATION_MARK,r.DIRECTIONS,r.DISTANCES,r.TO_TIME, r.VERSIONS,s.G_LONX,s.G_LATY,s.RADIUS,s.SHAPES_TYPE,ST_AsText(s.G_POLYGON_GRID) as G_POLYGON_GRID, r.STATION_ROUTE_CODE from bsth_c_stationroute r inner join bsth_c_station s on r.station=s.id where r.line_code in " + inStr + " and r.destroy=0";
+            String sql = "select r.LINE_CODE,r.STATION_NAME,r.STATION_CODE,r.STATION_MARK,r.DIRECTIONS,r.DISTANCES,r.TO_TIME, r.VERSIONS,s.G_LONX,s.G_LATY,s.RADIUS,s.SHAPES_TYPE,ST_AsText(s.G_POLYGON_GRID) as G_POLYGON_GRID, r.STATION_ROUTE_CODE,r.versions from bsth_c_stationroute r inner join bsth_c_station s on r.station=s.id where r.line_code in " + inStr + " and r.destroy=0";
             List<StationSpatialData> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(StationSpatialData.class));
             rs.put("status", ResponseCode.SUCCESS);
@@ -84,7 +84,7 @@ public class RealMapServiceImpl implements RealMapService {
         }
         inCond.deleteCharAt(inCond.length() - 1).append(")");
-        String sql = "SELECT r.ID,r.LINE_CODE,r.SECTION_CODE,r.SECTIONROUTE_CODE,r.DIRECTIONS,s.SECTION_NAME,ST_AsText(s.GSECTION_VECTOR) GSECTION_VECTOR,s.SECTION_DISTANCE,s.SECTION_TIME FROM bsth_c_sectionroute r INNER JOIN bsth_c_section s on r.section_code=s.section_code WHERE r.line_code in "+inCond.toString()+" and r.destroy=0 order by sectionroute_code";
+        String sql = "SELECT r.ID,r.LINE_CODE,r.SECTION_CODE,r.SECTIONROUTE_CODE,r.DIRECTIONS,s.SECTION_NAME,ST_AsText(s.GSECTION_VECTOR) GSECTION_VECTOR,s.SECTION_DISTANCE,s.SECTION_TIME,r.versions FROM bsth_c_sectionroute r INNER JOIN bsth_c_section s on r.section_code=s.section_code WHERE r.line_code in "+inCond.toString()+" and r.destroy=0 order by sectionroute_code";
         List<SectionRouteCoords> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(SectionRouteCoords.class));
         //排序
@@ -133,6 +133,64 @@ public class RealMapServiceImpl implements RealMapService {
     }
     @Override
+    public Map<String, Object> findRouteAndVersionByLine(String idx) {
+        Map<String, Object> rs = new HashMap<>();
+        StringBuilder inCond = new StringBuilder("(");
+        List<String> codeList = Splitter.on(",").splitToList(idx);
+        for(String lineCode : codeList){
+            inCond.append("'" + lineCode + "',");
+        }
+        inCond.deleteCharAt(inCond.length() - 1).append(")");
+
+        String sql = "SELECT r.ID,r.LINE_CODE,r.SECTION_CODE,r.SECTIONROUTE_CODE,r.DIRECTIONS,s.SECTION_NAME,ST_AsText(s.GSECTION_VECTOR) GSECTION_VECTOR,s.SECTION_DISTANCE,s.SECTION_TIME,r.versions FROM bsth_c_sectionroute r INNER JOIN bsth_c_section s on r.section_code=s.section_code WHERE r.line_code in "+inCond.toString()+" and r.destroy=0 order by sectionroute_code";
+        List<SectionRouteCoords> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(SectionRouteCoords.class));
+
+        //排序
+        Collections.sort(list, new Comparator<SectionRouteCoords>() {
+            @Override
+            public int compare(SectionRouteCoords o1, SectionRouteCoords o2) {
+                return Integer.parseInt(o1.getSectionrouteCode()) - Integer.parseInt(o2.getSectionrouteCode());
+            }
+        });
+
+        ArrayListMultimap<String, SectionRouteCoords> listMultimap = ArrayListMultimap.create();
+        for (SectionRouteCoords sr : list) {
+            //按lineCode 分组
+            listMultimap.put(sr.getLineCode()+"_"+sr.getVersions(), sr);
+        }
+        //坐标转换
+        Map<String, Object> subMap;
+        Set<String> ks = listMultimap.keySet();
+        List<SectionRouteCoords> sublist;
+        List<String> upList,downList;
+        String vectorStr = "";
+        for(String k : ks){
+            subMap = new HashMap<>();
+            sublist = listMultimap.get(k);
+            upList = new ArrayList<>();
+            downList = new ArrayList<>();
+            for(SectionRouteCoords sr : sublist){
+                vectorStr = sr.getGsectionVector();
+                vectorStr = vectorStr.substring(11, vectorStr.length() - 2);
+                if (sr.getDirections() == 0)
+                    upList.add(vectorStr);
+                else
+                    downList.add(vectorStr);
+            }
+            subMap.put("up", upList);
+            //subMap.put("upJoins", jointCoords(upList));
+            subMap.put("down", downList);
+            subMap.put("up_bd", multiWgsToBd(upList));
+            subMap.put("down_bd", multiWgsToBd(downList));
+            subMap.put("up_gcj", multiWgsToGcj(upList));
+            subMap.put("down_gcj", multiWgsToGcj(downList));
+
+            rs.put(k, subMap);
+        }
+        return rs;
+    }
+
+    @Override
     public Map<String, Object> findRouteAndStationByLine(String lineCode) {
         Map<String, Object> rs = new HashMap<>();
         try {
@@ -507,6 +507,14 @@
             });
             //缓存路由
             idx=idx.substr(0, idx.length - 1);
+            $.get('/realMap/findRouteAndVersionByLine', {idx: idx}, function (rs) {
+                if (rs) {
+                    for(var lineCode in rs)
+                        storage.setItem(lineCode + '_route', JSON.stringify(rs[lineCode]));
+
+                    eq.emit('cache_route');
+                }
+            });
             $.get('/realMap/findRouteByLine', {idx: idx}, function (rs) {
                 if (rs) {
                     for(var lineCode in rs)
@@ -516,6 +524,7 @@
                 }
             });
+
             //检查线路配置
             checkLineConfig(ls_line_data, function (rs) {
                 if (rs.status == 0)
@@ -149,7 +149,7 @@
         (function () {
             var wrap = '#user_authorize_wrap', user, xd_auth, all_lines, companyData;
             //分公司名称映射（只用于分组展示，就写死）
-<<<<<<< HEAD
+
             var fgs_name_mapp = {
                 '55_3': '上南公司（六分公司）',
                 '55_1': '上南公司（二分公司）',
@@ -177,14 +177,7 @@
                 '24_1': '一车队',
                 '24_2': '二车队',
                 '24_3': '三车队'
-=======
-            var fgs_name_mapp={
-                '55_3': '上南公司（六分公司）', '55_1': '上南公司（二分公司）', '55_2': '上南公司（三分公司）', '55_4': '上南公司（一分公司）', '55_5': '上南公司（培训部）',
-                '22_2': '金高公司（二分公司）', '22_1': '金高公司（四分公司）', '22_3': '金高公司（三分公司）', '22_5': '金高公司（一分公司）',
-                '26_3': '南汇公司（三分公司）', '26_2': '南汇公司（南汇二分）', '26_1': '南汇公司（南汇一分）', '26_4': '南汇公司（南汇维修公司）', '26_5': '南汇公司（南汇公司）', '26_6': '南汇公司（南汇六分）',
-                '05_5': '杨高公司（杨高分公司）', '05_6': '杨高公司（周浦分公司）', '05_3': '杨高公司（芦潮港分公司）', '05_1': '杨高公司（川沙分公司）', '05_2': '杨高公司（金桥分公司）',
-                '77_78': '闵行公司','300_301': '金球公交','302_303': '露虹公交', '99_100': '青浦公交','24_1': '一车队', '24_2': '二车队', '24_3': '三车队'
->>>>>>> 46649faa9a8c89602fbb3f73b0242c178de95777
+
             };
             var defauleConfig;
@@ -466,7 +466,6 @@
     //query all role
     var paramsRole = {};
     paramsRole['codeName'] = 'ROLE_ADMIN';
-    var storage = window.localStorage;
     var userId=storage.getItem("editUser");
     $get('/user',{id_eq:userId}, function (rs) {
         debugger
@@ -106,7 +106,6 @@ var gb_schedule_table = (function () {
             //监听gps车辆信息
             gb_data_gps.registerCallback(renderCarRemark);
             gb_sch_legend.showYdSdDb();
-            gb_schedule_context_menu.ydsd_init()
             cb && cb();
         });
@@ -80,8 +80,11 @@
         var timeTip = $('.ui-slider-tip', rightWrap);
         var scale = $('.scale', progress);
         var play_before_flag;
+        var lineVersionList;
+        var currentVersion;
         $('.play-back-tools-wrap', rightWrap).on('ready-to-play', function (e, data) {
+            debugger
             e.stopPropagation();
             //reset
             reset();
@@ -89,6 +92,7 @@
             gpsArray = data.list;
             arrivalData = data.arrivalData;
             inoutLen = arrivalData.length;
+            lineVersionList=data.lineVerson;
             if(!gpsArray || gpsArray.length==0)
                 return;
@@ -241,7 +245,7 @@ debugger
             }
             gps = gpsArray[index];
-            drawCarMarker(gps);//更新GPS点位
+            getLineVersionAnddrawCarMarker(gps);
             updateTrailLine(gps, index);//行车轨迹线
             updateProgress(gps, index)//进度条
@@ -276,7 +280,8 @@ debugger
         var xlPolyline = {};
         var circleFirstStop=0;
         var circlePrevStop=0;
-        var drawCarMarker = function (gps) {
+        var circleLine=false;
+        var drawCarMarker = function (gps,lineVersion) {
             if(!gpsMarker){
                 gpsMarker = new BMap.Marker(new BMap.Point(gps.bd_lon, gps.bd_lat));
                 var width = gb_map_imap.calcGpsMarkerWidth(gps.nbbm);
@@ -291,19 +296,21 @@ debugger
                 var width = gb_map_imap.calcGpsMarkerWidth(gps.nbbm);
                 gpsMarker.setIcon(new BMap.Icon(gb_map_imap.createCarIconRotation(gps, width), new BMap.Size(width, 75)));
             }
-            var circleLine=queryIsCircle(gps.lineId,gps.nbbm,gps.timestamp,gps.stopNo);
+            if (gps.lineId!=xlPolyline.lineId) {
+            circleLine=queryIsCircle(gps.lineId,gps.nbbm,gps.timestamp,gps.stopNo);
+            }
             if (circleLine)
                  circleFirstStop=gps.stopNo;
             circleLine=circleLine&&circlePrevStop!=circleFirstStop?true:false;
             circlePrevStop=gps.stopNo;
-            if(autoChange && (gps.lineId!=xlPolyline.lineId || gps.upDown!=xlPolyline.upDown||circleLine)){
-                drawXlPolyline(gps.lineId, gps.upDown);
+            if(autoChange && (gps.lineId!=xlPolyline.lineId || gps.upDown!=xlPolyline.upDown||circleLine)||xlPolyline.lineVersion != lineVersion){
+                drawXlPolyline(gps.lineId, gps.upDown,lineVersion);
             }
         }
         var bform = $('.buffer_area_form', rightWrap);
         var autoChange=true;
-        function drawXlPolyline(lineCode, upDown) {
+        function drawXlPolyline(lineCode, upDown,lineVersion) {
             if(upDown!=0 && upDown!=1){
                 //upDown = xlPolyline.upDown?xlPolyline.upDown:0;
                 return;
@@ -311,19 +318,21 @@ debugger
             clearXlPolyline();
             //绘制路段
-            drawRoadPolyline(lineCode, upDown);
+            drawRoadPolyline(lineCode, upDown,lineVersion);
             //绘制站点
             if($('input[name=drawPoint]', bform)[0].checked)
-                drawStationMarkers(lineCode, upDown);
+                drawStationMarkers(lineCode, upDown,lineVersion);
             //绘制缓冲区
             if($('input[name=drawBuffArea]', bform)[0].checked)
-                drawBuffArea(lineCode, upDown);
+                drawBuffArea(lineCode, upDown,lineVersion);
             //绘制站点名称
             if($('input[name=stationName]', bform)[0].checked)
-                drawNameMarkers(lineCode, upDown);
+                drawNameMarkers(lineCode, upDown,lineVersion);
             xlPolyline.lineId = lineCode;
             xlPolyline.upDown = upDown;
+            xlPolyline.lineVersion = lineVersion;
+            currentVersion =lineVersion;
         }
         var storage = window.localStorage;
@@ -331,10 +340,11 @@ debugger
         var stations;//站点
         var parks;//停车场
-        function drawRoadPolyline(lineCode, upDown) {
+        function drawRoadPolyline(lineCode, upDown,lineVersion) {
             //从localStorage获取路段
-            routes = JSON.parse(storage.getItem(lineCode + '_route'));
+            routes = JSON.parse(storage.getItem(lineCode+"_"+lineVersion + '_route'));
             if(!routes){
+                debugger
                 var name = gb_data_basic.lineCode2NameAll()[lineCode];
                 notify_err("缺少" + name + "的路段信息，请选择" + name + "进入线调");
                 return;
@@ -355,7 +365,7 @@ debugger
             xlPolyline.polylines = pls;
         }
-        function drawStationMarkers(lineCode, upDown) {
+        function drawStationMarkers(lineCode, upDown,lineVersion) {
             if(!lineCode)return;
             //从地图模块获取站点数据
             stations = gb_map_spatial_data.getStationArray(lineCode);
@@ -367,6 +377,8 @@ debugger
             var array = stations[upDown], psm, zdMarkers=[];
             $.each(array, function () {
+                if(this.versions==lineVersion){
+
                 //坐标转换
                 var coord = TransGPS.wgsToBD(this.lat, this.lon);
                 this.bd_lat = coord.lat;
@@ -376,11 +388,12 @@ debugger
                 map.addOverlay(psm);
                 psm.setIcon(new BMap.Icon(gb_map_imap.createStationPointIcon(), new BMap.Size(12, 12)));
                 zdMarkers.push(psm);
+                }
             });
             xlPolyline.zdMarkers=zdMarkers;
         }
-        function drawBuffArea(lineCode, upDown) {
+        function drawBuffArea(lineCode, upDown,lineVersion) {
             if(!lineCode)return;
             stations = gb_map_spatial_data.getStationArray(lineCode);
             if(!stations){
@@ -391,6 +404,7 @@ debugger
             var array = stations[upDown], obj, buffs=[];
             $.each(array, function () {
+                if(this.versions==lineVersion){
                 if(this.shapesType=='r')
                     obj = drawCircle(new BMap.Point(this.bd_lon, this.bd_lat), this.radius);
                 else if(this.shapesType=='d')
@@ -398,12 +412,13 @@ debugger
                 if(obj)
                     buffs.push(obj);
+                }
             });
             xlPolyline.buffs = buffs;
         }
-        function drawNameMarkers(lineCode, upDown) {
+        function drawNameMarkers(lineCode, upDown,lineVersion) {
             if(!lineCode)return;
             //从地图模块获取站点数据
             stations = gb_map_spatial_data.getStationArray(lineCode);
@@ -416,6 +431,8 @@ debugger
             var style = {backgroundColor: "rgba(255, 255, 255, 0.69)",color : "black", borderColor: "black", fontSize : "12px", height : "16px", lineHeight : "16px", fontFamily:"微软雅黑"}
             var array = stations[upDown], tMarkers=[];
             $.each(array, function () {
+                if (this.versions==lineVersion) {
+
                 var width = this.stationName.length * 12;
                 var label = new BMap.Label(this.stationName, {
                     position:new BMap.Point(this.bd_lon, this.bd_lat),
@@ -424,6 +441,7 @@ debugger
                 label.setStyle(style);
                 map.addOverlay(label);
                 tMarkers.push(label);
+                }
             });
             xlPolyline.tMarkers = tMarkers;
@@ -564,27 +582,28 @@ debugger
             var name = $(this).attr('name'),
                     lineCode = xlPolyline.lineId,
                     upDown = xlPolyline.upDown;
+                    linesVersion = xlPolyline.lineVersion;
             switch (name){
                 case 'stationName':
                     //清除站点名称
                     clearOverlayArray(xlPolyline.tMarkers);
                     xlPolyline.tMarkers = [];
                     if(this.checked)
-                        drawNameMarkers(lineCode, upDown);
+                        drawNameMarkers(lineCode, upDown,linesVersion);
                     break;
                 case 'drawBuffArea':
                     //清除缓冲区
                     clearOverlayArray(xlPolyline.buffs);
                     xlPolyline.buffs = [];
                     if(this.checked)
-                        drawBuffArea(lineCode, upDown);
+                        drawBuffArea(lineCode, upDown,linesVersion);
                     break;
                 case 'drawPoint':
                     //清除站点
                     clearOverlayArray(xlPolyline.zdMarkers);
                     xlPolyline.zdMarkers = [];
                     if(this.checked)
-                        drawStationMarkers(lineCode, upDown);
+                        drawStationMarkers(lineCode, upDown,linesVersion);
                     break;
             }
         });
@@ -607,7 +626,8 @@ debugger
             var gps = gpsArray[ei];
             updateProgress(gps, ei);
             //更新gps marker
-            drawCarMarker(gps);
+            getLineVersionAnddrawCarMarker(gps);
+            //drawCarMarker(gps,lineVersionList);
             //更新轨迹线条
             trailArray = [];
@@ -645,8 +665,9 @@ debugger
                 return;
             var gps = gpsArray[ei];
+            getLineVersionAnddrawCarMarker(gps);
             //更新gps marker
-            drawCarMarker(gps);
+            //drawCarMarker(gps,lineVersionList);
             //更新轨迹线条
             trailArray = [];
             var i = 0;
@@ -659,6 +680,17 @@ debugger
             //居中
             map.panTo(gpsMarker.getPosition());
         }
+        function getLineVersionAnddrawCarMarker(gps){
+            if(lineVersionList.length>0){
+                for (var i = 0; i < lineVersionList.length; i++) {
+                    if ((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 {
+                drawCarMarker(gps,0);//除非线路没有版本信息
+            }
+        }
         /**
          * 初始化停车场下拉菜单
@@ -746,7 +778,7 @@ debugger
                 var code = $(this).data('code');
                 var updown = $(this).data('dir');
                 autoChange = false;
-                drawXlPolyline(code, updown);
+                drawXlPolyline(code, updown,currentVersion);
             });
         })();