update...

潘钊
1 parent e3533c18
Showing 12 changed files with 325 additions and 52 deletions
src/main/java/com/bsth/controller/geo_data/GeoDataController.java
src/main/java/com/bsth/entity/geo_data/GeoStation.java
src/main/java/com/bsth/service/geo_data/GeoDataService.java
src/main/java/com/bsth/service/geo_data/impl/GeoDataServiceImpl.java
src/main/resources/static/pages/base/geo_data_edit/css/mian.css
src/main/resources/static/pages/base/geo_data_edit/fragments/f_road_route.html
src/main/resources/static/pages/base/geo_data_edit/fragments/f_station_route.html
src/main/resources/static/pages/base/geo_data_edit/js/map.js
src/main/resources/static/pages/base/geo_data_edit/js/road_route.js
src/main/resources/static/pages/base/geo_data_edit/js/station_route.js
src/main/resources/static/pages/base/geo_data_edit/js/submit.js
src/main/resources/static/pages/base/geo_data_edit/main.html
@@ -46,4 +46,9 @@ public class GeoDataController {
             ,@RequestParam String stationName,@RequestParam Float lat,@RequestParam Float lng,@RequestParam int prevRouteId){
         return geoDataService.addNewStationRoute(lineCode, upDown, versions, stationName, lat, lng, prevRouteId);
     }
+
+    @RequestMapping(value = "destroyStation",method = RequestMethod.POST)
+    public Map<String, Object> destroyStation(GeoStation station){
+        return geoDataService.destroyStation(station);
+    }
 }
 \ No newline at end of file
@@ -23,7 +23,7 @@ public class GeoStation {
     private String stationMark;
-    private Integer version;
+    private Integer versions;
     private Float gLonx;
@@ -94,14 +94,6 @@ public class GeoStation {
         this.stationMark = stationMark;
     }
-    public Integer getVersion() {
-        return version;
-    }
-
-    public void setVersion(Integer version) {
-        this.version = version;
-    }
-
     public Float getgLonx() {
         return gLonx;
     }
@@ -149,4 +141,12 @@ public class GeoStation {
     public void setBdCoords(List<String> bdCoords) {
         this.bdCoords = bdCoords;
     }
+
+    public Integer getVersions() {
+        return versions;
+    }
+
+    public void setVersions(Integer versions) {
+        this.versions = versions;
+    }
 }
 \ No newline at end of file
@@ -20,4 +20,6 @@ public interface GeoDataService {
     Map<String, Object> updateStationName(Map<String, Object> map);
     Map<String,Object> addNewStationRoute(String lineCode, int upDown,int versions, String stationName, Float lat, Float lng, int prevRouteId);
+
+    Map<String,Object> destroyStation(GeoStation station);
 }
@@ -183,7 +183,14 @@ public class GeoDataServiceImpl implements GeoDataService {
             String sql = "select * from bsth_c_ls_stationroute where line_code='"+lineCode+"' and line="+lineId+" and directions="+upDown+" and destroy=0 and versions=" + versions;
             List<SaveStationRouteDTO> routes = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(SaveStationRouteDTO.class));
+            for(SaveStationRouteDTO s : routes){
+                if(s.getStationName().equals(stationName)){
+                    rs.put("status", ResponseCode.ERROR);
+                    rs.put("msg", "重复的站点路由名称！");
+                    return rs;
+                }
+            }
             //按路由顺序排列
             Collections.sort(routes, new StationRouteComp());
@@ -215,23 +222,23 @@ public class GeoDataServiceImpl implements GeoDataService {
                 }
             }
-            sr = new SaveStationRouteDTO();
-            sr.setLine(lineId);
-            sr.setLineCode(lineCode);
-            sr.setDirections(upDown);
-            sr.setVersions(versions);
-            sr.setStationRouteCode(currentNo);
-            sr.setStation(sCode);
-            sr.setStationCode(sCode + "");
-            sr.setStationName(stationName);
-            sr.setDistances(0d);
-            sr.setToTime(0d);
+            SaveStationRouteDTO nsr = new SaveStationRouteDTO();
+            nsr.setLine(lineId);
+            nsr.setLineCode(lineCode);
+            nsr.setDirections(upDown);
+            nsr.setVersions(versions);
+            nsr.setStationRouteCode(currentNo);
+            nsr.setStation(sCode);
+            nsr.setStationCode(sCode + "");
+            nsr.setStationName(stationName);
+            nsr.setDistances(0d);
+            nsr.setToTime(0d);
             Date d = new Date();
-            sr.setCreateDate(d);
-            sr.setUpdateDate(d);
-            sr.setDestroy(0);
+            nsr.setCreateDate(d);
+            nsr.setUpdateDate(d);
+            nsr.setDestroy(0);
-            routes.add(sr);
+            //routes.add(sr);
             //重新标记mark
             Collections.sort(routes, new StationRouteComp());
@@ -242,10 +249,16 @@ public class GeoDataServiceImpl implements GeoDataService {
             routes.get(routes.size() - 1).setStationMark("E");
             final List<SaveStationRouteDTO> saveList = routes;
-            //insert 路由
-            jdbcTemplate.update("delete from bsth_c_ls_stationroute where line_code='"+lineCode+"' and line="+lineId+" and directions="+upDown+" and destroy=0 and versions=" + versions);
-            jdbcTemplate.batchUpdate("insert into bsth_c_ls_stationroute(line, station, station_name, station_route_code, line_code, station_code, station_mark, distances, to_time, destroy, versions, create_date, update_date,directions) " +
-                    " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)", new BatchPreparedStatementSetter() {
+            //insert 新路由 （ID自增）
+            jdbcTemplate.update("insert into bsth_c_ls_stationroute(line, station, station_name, station_route_code, line_code, station_code, station_mark, distances, to_time, destroy, versions, create_date, update_date,directions) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)"
+            ,nsr.getLine(),nsr.getStation(),nsr.getStationName(),nsr.getStationRouteCode(),nsr.getLineCode(),nsr.getStationCode(),nsr.getStationMark()
+                    ,nsr.getDistances(),nsr.getToTime(),nsr.getDestroy(),nsr.getVersions(),nsr.getCreateDate(),nsr.getUpdateDate(),nsr.getDirections());
+
+            // update 原路由
+            jdbcTemplate.batchUpdate("update bsth_c_ls_stationroute set line=?,station=?,station_name=?,station_route_code=?," +
+                    "line_code=?,station_code=?,station_mark=?,distances=?,to_time=?,destroy=?,versions=?,create_date=?,update_date=?,directions=?" +
+                            " where id=?"
+                    , new BatchPreparedStatementSetter() {
                 @Override
                 public void setValues(PreparedStatement ps, int i) throws SQLException {
                     SaveStationRouteDTO sr = saveList.get(i);
@@ -263,6 +276,7 @@ public class GeoDataServiceImpl implements GeoDataService {
                     ps.setTimestamp(12, new java.sql.Timestamp(sr.getCreateDate().getTime()));
                     ps.setTimestamp(13, new java.sql.Timestamp(sr.getUpdateDate().getTime()));
                     ps.setInt(14, sr.getDirections());
+                    ps.setInt(15, sr.getId());
                 }
                 @Override
@@ -272,6 +286,12 @@ public class GeoDataServiceImpl implements GeoDataService {
             });
             tran.commit(status);
+
+            //返回更新之后的数据
+            List<GeoStation> list = findByUpdown(lineCode, upDown, versions);
+
+            rs.put("list", list);
+            rs.put("newStationRouteCode", currentNo);
             rs.put("status", ResponseCode.SUCCESS);
         } catch (Exception e) {
             tran.rollback(status);
@@ -282,6 +302,38 @@ public class GeoDataServiceImpl implements GeoDataService {
         return rs;
     }
+    private List<GeoStation> findByUpdown(String lineCode, int upDown, int versions){
+        //返回更新之后的数据
+        String sql = "select t1.*,t2.g_lonx,g_laty,ST_AsText(g_polygon_grid) as g_polygon_grid,radius,shapes_type from (select id,station_name,station_route_code,line_code,station_code,station_mark,versions,directions from bsth_c_ls_stationroute where line=" + lineCode + " and directions="+upDown+" and destroy=0 and versions="+versions+") t1 LEFT JOIN bsth_c_station t2 on t1.station_code=t2.station_cod";
+        List<GeoStation> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(GeoStation.class));
+
+        for (GeoStation station : list) {
+            if (station.getShapesType().equals("d"))
+                station.setBdCoords(multiWgsToBd(station.getgPolygonGrid(), 9, 3));
+        }
+        return list;
+    }
+
+    @Override
+    public Map<String, Object> destroyStation(GeoStation station) {
+        Map<String, Object> rs = new HashMap<>();
+
+        try {
+            String sql = "update bsth_c_ls_stationroute set destroy=1 where id=?";
+            jdbcTemplate.update(sql, station.getId());
+
+            //返回更新之后的数据
+            List<GeoStation> list = findByUpdown(station.getLineCode(), station.getDirections(), station.getVersions());
+            rs.put("list", list);
+            rs.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", "服务器出现异常");
+        }
+        return rs;
+    }
+
     /**
      * 根据路由ID 获取站点
@@ -259,11 +259,11 @@ ul.uk-list.station_info_win&gt;li.s_name{
 }
 .road_route .uk-list ul{
-    padding-left: 22px;
+    padding-left: 0;
 }
 .road_route>ul>li>ul>li{
-    padding-left: 8px;
+    padding-left: 22px;
 }
 .ct_coord_str{
@@ -2,14 +2,14 @@
     <script id="geo_d_e_road_route-temp" type="text/html">
         <ul class="uk-list">
             {{each list as subArr i}}
-            <li class="road_li_{{subArr[0].sectionCode}} first_road_active">
+            <li class="r_r_item first_road_active" >
                 <a data-code="{{subArr[0].sectionCode}}" data-updown="{{subArr[0].directions}}">{{subArr[0].sectionName}}<span class="sub_name">{{subArr[0].crosesRoad}}</span></a>
                 {{if subArr.length > 1}}
                     {{each subArr as obj j}}
                     <ul class="uk-list">
                         {{if j > 0}}
-                        <li class="road_li_{{obj.sectionCode}}">
+                        <li class="r_r_item">
                             <a data-code="{{obj.sectionCode}}" data-updown="{{obj.directions}}">{{obj.sectionName}}<span class="sub_name">{{obj.crosesRoad}}</span></a></li>
                         {{/if}}
                     </ul>
@@ -14,7 +14,7 @@
     </script>
     <script id="geo_d_e_station_route_one-temp" type="text/html">
-        <li class="station_li_{{stationCode}}">
+        <li class="s_r_item"  data-code="{{stationCode}}" data-id="{{id}}">
             <div class="ct_route_badge_wrap">
                     <span class="uk-badge ct_route_badge {{if stationMark=='B'}}start{{else if stationMark=='E'}}end{{/if}} {{if shapesType=='d'}}polygon{{/if}}">
                     {{if stationMark=='B'}}起点站{{else if stationMark=='E'}}终点站{{else}}{{index}}{{/if}}</span>
@@ -76,7 +76,7 @@ var gb_ct_map = function () {
             array.push(marker);
         });
-        stationMarkers.push(array);
+        stationMarkers[routes[0].directions] = array;
     };
     function transCoord(obj) {
@@ -303,6 +303,8 @@ var gb_ct_map = function () {
     var exitEditBufferStatus = function (s) {
         map_status = 0;
+        $('.main_left_panel_m_layer').hide();
+        $('.buffer_edit_panel').remove();
         //enabledOtherElem();
         //gb_station_route.hideEditPanel();
@@ -543,10 +545,25 @@ var gb_ct_map = function () {
         var local = new BMap.LocalSearch(map, {
             renderOptions: {map: map},
             onMarkersSet: function (pos) {
-                var old_m = pos[0].marker;
-                var point = old_m.point;
-                //清除默认的点
-                map.removeOverlay(old_m);
+                var point;
+                if(!pos || pos.length==0){
+                    var pId = gb_station_route.getAddPrevId();
+                    if(pId){
+                        //百度没有定位到位置，默认靠近在上一个站
+                        var prev = gb_station_route.getStationById(pId);
+                        point = new BMap.Point(prev.bd_lon - 0.0001, prev.bd_lat - 0.0001);
+                    }
+                    else{
+                        //没有上一个站点，默认在地图中间
+                        point = map.getCenter()
+                    }
+                }
+                else{
+                    var old_m = pos[0].marker;
+                    point = old_m.point;
+                    //清除默认的点
+                    map.removeOverlay(old_m);
+                }
                 //进入新增点位 地图选点模式
                 startSearchPoint(point, name);
             }
@@ -560,6 +577,10 @@ var gb_ct_map = function () {
         var m = createYellowStation(point, name);
         m.enableDragging();
         map.addOverlay(m);
+        map.setCenter(point);
+
+        if(map.getZoom() < 16)
+            map.setZoom(16);
         _updateSearchPoint(m);
         m.addEventListener('dragging', function () {
@@ -616,6 +637,20 @@ var gb_ct_map = function () {
         return marker;
     }
+    /**
+     * 重绘一个走向的站点
+     * @param upDown
+     */
+    var reDrawStation = function (upDown) {
+        $.each(stationMarkers[upDown], function () {
+            map.removeOverlay(this);
+        });
+        stationMarkers[upDown] = [];
+
+        clearOtherOverlay();
+        _renderStationMarket(gb_station_route.getData()[upDown]);
+    };
+
     res_load_ep.emitLater('load_map');
     return {
         _render: _render,
@@ -639,6 +674,7 @@ var gb_ct_map = function () {
             clearOtherOverlay();
             map.removeEventListener('dblclick', pickupPoint);
             map.enableDoubleClickZoom();
-        }
+        },
+        reDrawStation: reDrawStation
     };
 }();
 \ No newline at end of file
@@ -15,7 +15,6 @@ var gb_road_route = function () {
             //按顺序，名称分组
             var ups = _group(road_maps[0]);
             var downs = _group(road_maps[1]);
-            console.log('upsupsups', ups, 'downsdownsdowns', downs);
             //渲染
             var upHtmlStr = temps['geo_d_e_road_route-temp']({list: ups});
             $('.up_down_route_list>li:first>.road_route').html(upHtmlStr);
@@ -71,7 +70,8 @@ var gb_road_route = function () {
     var focus = function (data) {
         //sectionCode
-        var elem = $('.up_down_route_list>li>.road_route .road_li_' + data.sectionCode);
+        var elem = $('.up_down_route_list>li>.road_route .r_r_item a[data-code='+data.sectionCode+']');
+        elem = elem.parent();
         elem.addClass('ct_active');
         if (!isShow(elem)) {
@@ -89,6 +89,36 @@ var gb_road_route = function () {
         return elem.offset().top < wrap.height() + 122 && elem.offset().top > 122;
     };
+    //$('.up_down_route_list>li>.road_route .r_r_item a[data-code='+data.sectionCode+']')
+    $.contextMenu({
+        selector: '.up_down_route_list>li>.road_route .r_r_item a[data-code]',
+        className: 'station-route-ct-menu',
+        callback: function (key, options) {
+            /*var aLink = options.$trigger;
+            var code = aLink.data('code'),
+                updown = aLink.data('updown');
+            var station = getStation(code, updown);
+            realEditStation = station;
+            callbackHandler[key] && callbackHandler[key](station);*/
+        },
+        items: {
+            'edit_buffer': {
+                name: '编辑'
+            },
+            'sep1': '---------',
+            'insert_after': {
+                name: '新增路段（之后）'
+            },
+            'insert_before': {
+                name: '新增路段（之前）'
+            },
+            'destroy': {
+                name: '撤销路段'
+            }
+        }
+    });
+
+
     res_load_ep.emitLater('load_road_route');
     return {
         init: init, getData: function () {
@@ -106,6 +106,10 @@ var gb_station_route = function () {
         var addCell = $(temps['geo_d_e_add_station_panel-temp'](station));
         cell.before(addCell);
+        add_station(addCell);
+    };
+
+    var add_station = function (addCell) {
         gb_ct_map.closeInfoWin();
         //焦点
         var $nameInput = $('input[name=stationName]', addCell);
@@ -117,13 +121,23 @@ var gb_station_route = function () {
         //选择地图位置
         $('.search_point_icon_btn', addCell).on('click', function () {
+            $('.station_li_transient').removeClass('_search_point');
+            $(this).parents('.station_li_transient').addClass('_search_point');
             var name = $nameInput.val();
             if(!name)
-                return UIkit.notification("你必须输入站点名称！", {status: 'danger',pos: 'bottom-left'});
+                return UIkit.notification("你必须输入站点名称！", {status: 'danger'});
+
+            if(is_duplication(name))
+                return UIkit.notification("站点路由名称重复！！", {status: 'danger'});
             $('.main_left_panel_m_layer').show();
             gb_ct_map.showAddPointPanel(name);
         });
+        //监听回车事件
+        $('[name=stationName]', addCell).on('keydown', function (e) {
+            if(event.keyCode == "13")
+                $('.search_point_icon_btn', addCell).trigger('click');
+        });
         //上一个站点的ID
         var $prev = addCell.prev('.s_r_item');
@@ -133,13 +147,40 @@ var gb_station_route = function () {
             addPrevId = -1;
     };
+    /**
+     * name 是否重复
+     * @param name
+     */
+    var is_duplication = function (name) {
+        var array = station_maps[getUpDown()];
+        for(var i=0, s; s=array[i++];){
+            if(s.stationName==name)
+                return true;
+        }
+        return false;
+    };
+
+    var insert_station_after = function (station) {
+        //在之后插入站点
+        var cell = getStationLI(station);
+
+        var addCell = $(temps['geo_d_e_add_station_panel-temp'](station));
+        cell.after(addCell);
+
+        add_station(addCell);
+    };
+    
     var realEditStation;
     var callbackHandler = {
         edit_buffer: function (station) {
             gb_ct_map.editStationBuffer(station);
         },
         edit_name: station_edit_name,
-        insert_before: insert_station_before
+        insert_before: insert_station_before,
+        insert_after: insert_station_after,
+        destroy: function (station) {
+            gb_data_submit.destroyStation(station);
+        }
     };
     $.contextMenu({
@@ -161,12 +202,12 @@ var gb_station_route = function () {
             'edit_name': {
                 name: '修改站点名称'
             },
-            'insert_before': {
-                name: '新增站点（之前）'
-            },
             'insert_after': {
                 name: '新增站点（之后）'
             },
+            'insert_before': {
+                name: '新增站点（之前）'
+            },
             'destroy': {
                 name: '撤销站点'
             }
@@ -319,6 +360,85 @@ var gb_station_route = function () {
         }, 200);
     };
+    var updateStationRouteData = function (list) {
+        list.sort(function (a, b) {
+            return parseInt(a.stationRouteCode) - parseInt(b.stationRouteCode);
+        });
+
+        var upDown = list[0].directions;
+        var dataMaps = {};
+        //更新数据
+        for(var i=0,s;s=list[i++];){
+            s.index = i;
+            dataMaps[s.id] = s;
+        }
+        station_maps[upDown] = list;
+        //更新序号
+        var wrap = $('.up_down_route_list>li:eq('+upDown+')>.station_route');
+        $('.s_r_item', wrap).each(function () {
+            $(this).replaceWith(
+                temps['geo_d_e_station_route_one-temp'](dataMaps[$(this).data('id')]));
+        });
+
+        //延迟清除动画class
+        setTimeout(function () {
+            $('.s_r_item a.uk-animation-shake', wrap).removeClass('uk-animation-shake');
+        }, 1000);
+
+        //更新地图
+        gb_ct_map.reDrawStation(upDown);
+    };
+
+    /**
+     * 添加结束，刷新List
+     * @param list
+     */
+    var addEnd = function (list, _newRCode) {
+        updateStationRouteData(list);
+
+        var upDown = list[0].directions;
+        var wrap = $('.up_down_route_list>li:eq('+upDown+')>.station_route');
+        //新增的站点路由
+        var ns = getStationByRouteCode(upDown, _newRCode);
+        $('.station_li_transient._search_point', wrap).replaceWith(
+            temps['geo_d_e_station_route_one-temp'](ns)
+        );
+
+        $('.main_left_panel_m_layer').hide();
+        $('.add_station_search_point_wrap').remove();
+    };
+
+    /**
+     * 撤销完成
+     * @param list
+     */
+    var destroyEnd = function (list, station) {
+        //被撤销的
+        $('.up_down_route_list .s_r_item[data-id='+station.id+']').remove();
+        updateStationRouteData(list);
+    };
+    
+    var getStationByRouteCode = function (upDown, _newRCode) {
+        var list = station_maps[upDown];
+        for(var i=0,s; s=list[i++];){
+            if(s.stationRouteCode==_newRCode)
+                return s;
+        }
+        return null;
+    };
+
+    var getStationById = function (id) {
+        for(var i=0,s;s=station_maps[0][i++];){
+            if(s.id == id)
+                return s;
+        }
+        for(var i=0,s;s=station_maps[1][i++];){
+            if(s.id == id)
+                return s;
+        }
+        return null;
+    };
+
     res_load_ep.emitLater('load_station_route');
     return {
         init: init,
@@ -340,6 +460,9 @@ var gb_station_route = function () {
         reWriteSearchPointPanel: reWriteSearchPointPanel,
         getAddPrevId: function () {
             return addPrevId;
-        }
+        },
+        addEnd: addEnd,
+        destroyEnd: destroyEnd,
+        getStationById:getStationById
     };
 }();
 \ No newline at end of file
@@ -77,9 +77,10 @@ var gb_data_submit = function () {
             delete data.gLonx;
             delete data.gLaty;
-            //console.log('data', data);
             //添加
             gb_common.$post('/_geo_data/addNewStationRoute', data, function (rs) {
+                gb_station_route.addEnd(rs.list, rs.newStationRouteCode);
+
                 hide_run_text();
                 UIkit.notification("修改成功！", {status: 'success'});
             });
@@ -97,8 +98,27 @@ var gb_data_submit = function () {
         $loadPanel.hide();
     };
+    /**
+     * 撤销站点
+     * @param station
+     */
+    var destroyStation = function (station) {
+
+        UIkit.modal.confirm('确定撤销站点【'+station.stationName+'】？').then(function() {
+            show_run_text('正在撤销...');
+
+            gb_common.$post("/_geo_data/destroyStation", station, function (rs) {
+                gb_station_route.destroyEnd(rs.list, station);
+                hide_run_text();
+                UIkit.notification("撤销成功！", {status: 'success'});
+            });
+        });
+    }
+
     function getUpDown(){
         return $('._route_info_wrap>ul>li:first').hasClass('uk-active')?0:1;
     }
-    return {};
+    return {
+        destroyStation: destroyStation
+    };
 }();
 \ No newline at end of file
@@ -108,7 +108,7 @@
     var $loadPanel = $('body>.loading');
     //___________________________________
     var storage = window.localStorage;
-    storage.setItem("geo_data_edit_line_code" , "70123");
+    storage.setItem("geo_data_edit_line_code" , "10648");
     storage.setItem("geo_data_edit_line_version" , "1");
     //___________________________________
@@ -142,7 +142,7 @@
                 eq.once('end', function () {
                     $loadPanel.hide();
                 });
-    });
+            });
     function g_emit(id) {
         console.log('g_emit [' + id + ']');
@@ -161,13 +161,18 @@
     });
     function getUpDown(){
-        return $('._route_info_wrap>ul>li:first').hasClass('uk-active')?0:1;
+        return $('.up_down_route_list>li:first').hasClass('uk-active')?0:1;
     }
     //切换上下行显示
     $('.up_down_route_list').on('show', function () {
         gb_ct_map.changeUpDown();
     });
+
+    $(document).on('submit', 'form', function (e) {
+        e.stopPropagation();
+        return false;
+    });
 </script>
 <!--- js -->