update...

潘钊
1 parent c838f1d2
Showing 10 changed files with 346 additions and 40 deletions
src/main/java/com/bsth/controller/geo_data/GeoDataController.java
src/main/java/com/bsth/data/gpsdata_v2/utils/GpsDataRecovery.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.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_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/station_route.js
src/main/resources/static/pages/base/geo_data_edit/js/submit.js
@@ -35,4 +35,9 @@ public class GeoDataController {
     public Map<String, Object> updateBufferInfo(GeoStation station){
         return geoDataService.updateBufferInfo(station);
     }
+
+    @RequestMapping(value = "updateStationName",method = RequestMethod.POST)
+    public Map<String, Object> updateStationName(@RequestParam Map<String, Object> map){
+        return geoDataService.updateStationName(map);
+    }
 }
@@ -84,7 +84,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         Calendar calendar = Calendar.getInstance();
         int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
  
-        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE,SERVER_TS from bsth_c_gps_info where days_year=329"; //+ dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE,SERVER_TS from bsth_c_gps_info where days_year=346"; //+ dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
  
         List<GpsEntity> list =
@@ -171,7 +171,7 @@ public class LateAdjustHandle implements ApplicationContextAware{
             }
         }catch (Exception e){
             e.printStackTrace();
-            logger.error("", e);
+            logger.error("late2 car arrive", e);
         }
     }
  
@@ -16,4 +16,6 @@ public interface GeoDataService {
     Map<String, Object> findGeoRoad(String lineCode);
  
     Map<String,Object> updateBufferInfo(GeoStation station);
+
+    Map<String,Object> updateStationName(Map<String, Object> map);
 }
@@ -11,7 +11,11 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
  
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -109,14 +113,7 @@ public class GeoDataServiceImpl implements GeoDataService {
  
             //从数据库里重新查询对象
             if(rsCount > 0){
-                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 id="+station.getId()+" AND destroy = 0) 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 s : list){
-                    if(s.getShapesType().equals("d"))
-                        s.setBdCoords(multiWgsToBd(s.getgPolygonGrid(), 9, 3));
-                }
-                rs.put("station", list.get(0));
+                rs.put("station", findOne(station.getId()));
                 rs.put("status", ResponseCode.SUCCESS);
             }
  
@@ -128,6 +125,62 @@ public class GeoDataServiceImpl implements GeoDataService {
         return rs;
     }
  
+    /**
+     * 修改站点路由和站点名称
+     * @param map
+     * @return
+     */
+    @Override
+    public Map<String, Object> updateStationName(Map<String, Object> map) {
+        Map<String, Object> rs = new HashMap<>();
+
+        //编程式事务
+        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
+        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+        TransactionStatus status = tran.getTransaction(def);
+        try{
+
+            int id = Integer.parseInt(map.get("id").toString());
+            String name = map.get("stationName").toString();
+            String code = map.get("stationCode").toString();
+            //String lineCode = map.get("lineCode").toString();
+            //String stationMark = map.get("stationMark").toString();
+
+            //更新历史站点路由
+            jdbcTemplate.update("update bsth_c_ls_stationroute set station_name=? where id=?", name, id);
+            //更新站点
+            jdbcTemplate.update("update bsth_c_station set station_name=? where station_cod=?", name, code);
+
+            tran.commit(status);
+
+            rs.put("station", findOne(id));
+            rs.put("status", ResponseCode.SUCCESS);
+        }catch (Exception e){
+            tran.rollback(status);
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", "服务器出现异常");
+        }
+        return rs;
+    }
+
+
+    /**
+     * 根据路由ID 获取站点
+     * @param id
+     * @return
+     */
+    private GeoStation findOne(int id){
+        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 id="+id+" AND destroy = 0) t1 LEFT JOIN bsth_c_station t2 ON t1.station_code = t2.station_cod";
+        List<GeoStation> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(GeoStation.class));
+
+        GeoStation s = list.get(0);
+        if(s.getShapesType().equals("d"))
+            s.setBdCoords(multiWgsToBd(s.getgPolygonGrid(), 9, 3));
+
+        return s;
+    }
  
     private String bdPolygon2Wgs(String bdPolygon){
         StringBuilder wgsPolygon = new StringBuilder();
@@ -134,7 +134,7 @@ div#map_wrap{
     width: calc(100% - 38px);
 }
  
-.station_route>ul.uk-list>li:nth-child(n+2), .uk-list>li>ul {
+.up_down_route_list ul.uk-list>li:nth-child(n+2), .uk-list>li>ul {
     margin-top: 0;
 }
  
@@ -297,7 +297,7 @@ ul.context-menu-list.station-route-ct-menu.context-menu-root {
 .buffer_edit_panel{
     position: absolute;
     top: 5px;
-    width: 360px;
+    width: 390px;
     height: 120px;
     background: #ffffff;
     left: calc(50% - 170px);
@@ -306,7 +306,7 @@ ul.context-menu-list.station-route-ct-menu.context-menu-root {
     display: none;
 }
 .buffer_edit_body{
-    padding: 5px;
+    padding: 5px 0 0 15px;
 }
  
 .buffer_edit_body>.name{
@@ -316,7 +316,7 @@ ul.context-menu-list.station-route-ct-menu.context-menu-root {
 }
  
 .buffer_edit_body .ct_row .uk-inline{
-    width: 167px;
+    width: 175px;
     height: 30px;
     margin-right: 7px;
 }
@@ -420,4 +420,63 @@ ul.context-menu-list.station-route-ct-menu.context-menu-root {
  
 .shapes_type.st_d .draw_polygon_switch>a{
     color: red;
+}
+
+.ul_li_input{
+    display: inline-block;
+    padding: 4px 0;
+    width: calc(100% - 53px);
+    background: #f7f7f7;
+}
+
+.ul_li_input input{
+    width: 140px;
+    height: 28px;
+    margin-left: 5px;
+}
+
+.save_icon_btn{
+    color: #2121d1;
+    margin-right: 4px;
+}
+
+.ul_li_input .uk-icon:hover{
+    background: #dfdfdf;
+}
+
+.station_li_transient .ct_route_badge{
+    background: #ddcd3f;
+    vertical-align: middle;
+}
+
+.station_li_transient .search_point_icon_btn{
+    color: #FF9800;
+    margin-right: 5px;
+}
+
+.station_route ._edit_name .ct_route_badge{
+    vertical-align: middle;
+}
+
+.add_station_search_point_wrap{
+    width: 390px;
+    height: 140px;
+    position: absolute;
+    top: 10px;
+    left: calc(50% - 200px);
+    z-index: 999;
+    background: #ffface;
+    box-shadow: 5px 5px 15px rgba(90, 90, 90, 0.48);
+}
+
+.add_station_search_point_wrap ._title {
+    text-align: center;
+    font-size: 17px;
+    color: #2b2b2b;
+    padding: 2px 0 0 0;
+    font-weight: 600;
+}
+
+.add_station_search_point_wrap .buffer_edit_body .ct_row {
+    margin-top: 8px;
 }
 \ No newline at end of file
@@ -4,7 +4,7 @@
             {{each list as s i}}
                 <li class="station_li_{{s.stationCode}}">
                     <div class="ct_route_badge_wrap">
-                    <span class="uk-badge ct_route_badge {{if s.stationMark=='B'}}start{{else if s.stationMark=='E'}}end{{/if}} {{if shapesType=='d'}}polygon{{/if}}">
+                    <span class="uk-badge ct_route_badge {{if s.stationMark=='B'}}start{{else if s.stationMark=='E'}}end{{/if}} {{if s.shapesType=='d'}}polygon{{/if}}">
                     {{if s.stationMark=='B'}}起点站{{else if s.stationMark=='E'}}终点站{{else}}{{i + 1}}{{/if}}</span>
                     </div>
                     <a data-code="{{s.stationCode}}" data-updown="{{s.directions}}">{{s.stationName}}</a>
@@ -13,6 +13,16 @@
         </ul>
     </script>
  
+    <script id="geo_d_e_station_route_one-temp" type="text/html">
+        <li class="station_li_{{stationCode}}">
+            <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>
+            </div>
+            <a class="uk-animation-shake" data-code="{{stationCode}}" data-updown="{{directions}}">{{stationName}}</a>
+        </li>
+    </script>
+
  
     <script id="geo_d_e_station_info_win-temp" type="text/html">
         <ul class="uk-list station_info_win">
@@ -90,4 +100,74 @@
             </div>
         </div>
     </script>
+
+    <script id="geo_d_e_edit_name_panel-temp" type="text/html">
+        <div class="ul_li_input">
+            <form>
+                <input type="hidden" value="{{id}}" name="id">
+                <input type="hidden" value="{{stationCode}}" name="stationCode">
+                <input type="hidden" value="{{lineCode}}" name="lineCode">
+                <input type="hidden" value="{{stationMark}}" name="stationMark">
+                <input class="uk-input" autocomplete="off" value="{{stationName}}" name="stationName">
+                <span uk-icon="icon: check" title="确定" uk-tooltip class="save_icon_btn"></span>
+                <span uk-icon="icon: close" title="取消" uk-tooltip class="cancel_icon_btn"></span>
+            </form>
+        </div>
+    </script>
+
+    <script id="geo_d_e_add_station_panel-temp" type="text/html">
+        <li class="station_li_transient">
+            <div class="ct_route_badge_wrap">
+                    <span class="uk-badge ct_route_badge ">?</span>
+            </div>
+            <div class="ul_li_input">
+                <form>
+                    <input class="uk-input" value="" autocomplete="off"  placeholder="输入站点名称" name="stationName">
+                    <span uk-icon="icon: location;ratio:.8" title="选择一个坐标位置" uk-tooltip class="search_point_icon_btn"></span>
+                    <span uk-icon="icon: close" title="取消" uk-tooltip class="cancel_icon_btn"></span>
+                </form>
+            </div>
+        </li>
+    </script>
+
+    <script id="geo_d_e_add_search_point_panel-temp" type="text/html">
+        <div class="add_station_search_point_wrap uk-animation-slide-top-small">
+            <div class="_title">为 {{name}} 选择一个坐标位置</div>
+            <div class="buffer_edit_body">
+                <form>
+                    <div class="ct_row">
+                        <div class="uk-inline">
+                            <span class="uk-form-icon uk-form-icon-flip" >经度</span>
+                            <input class="uk-input" name="gLaty" type="text" readonly>
+                        </div>
+                        <div class="uk-inline">
+                            <span class="uk-form-icon uk-form-icon-flip" >纬度</span>
+                            <input class="uk-input" name="gLonx" type="text" readonly>
+                        </div>
+                    </div>
+                    <div class="ct_row shapes_type ">
+                        <div class="uk-inline" >
+                            <select name="shapesType" class="uk-select">
+                                <option value="r" >圆形</option>
+                                <option value="d" >多边形</option>
+                            </select>
+                            <span class="draw_polygon_switch" data-type="1"><a>暂停绘制</a></span>
+                        </div>
+                        <div class="uk-inline">
+                            <span class="uk-form-icon uk-form-icon-flip" >半径</span>
+                            <input class="uk-input" name="radius" type="text" >
+                        </div>
+                        <div class="uk-inline btns">
+                            <button class="uk-button uk-button-primary submit">确定</button>
+                            <button class="uk-button uk-button-default cancel">取消</button>
+                        </div>
+                    </div>
+                    <div class="ct_row" style="color: #5e5d5d;font-size: 12px;">
+                        <span uk-icon="icon: question;ratio:.7;" style="vertical-align: top;margin-top: 2px;"></span>
+                        双击地图拾取坐标点位
+                    </div>
+                </form>
+            </div>
+        </div>
+    </script>
 </div>
 \ No newline at end of file
@@ -307,8 +307,8 @@ var gb_ct_map = function () {
  
     var exitEditBufferStatus = function (s) {
         map_status = 0;
-        enabledOtherElem();
-        gb_station_route.hideEditPanel();
+        //enabledOtherElem();
+        //gb_station_route.hideEditPanel();
  
         clearOtherOverlay();
         reSetDragMarker();//关闭marker 拖拽
@@ -340,6 +340,7 @@ var gb_ct_map = function () {
         if(s.shapesType=='r'){
             //lineupdate
             bElem.addEventListener('lineupdate', function (e) {
+                //console.log('lineupdatelineupdate 1111', e);
                 gb_station_route.reWriteEditPanel(e.target);
             });
         }
@@ -393,10 +394,6 @@ var gb_ct_map = function () {
         $('.main_left_panel_m_layer').show();
     };
  
-    var enabledOtherElem = function () {
-        $('.main_left_panel_m_layer').hide();
-    };
-
     var openBufferOverlay = function (m) {
         var elem;
         var data = m.ct_data;
@@ -466,6 +463,11 @@ var gb_ct_map = function () {
         }
         else if(v == 'r'){
             updateDragRadius(80);
+
+            //圆形编辑事件 reWriteEditPanel
+            editCircle.addEventListener('lineupdate', function (e) {
+                gb_station_route.reWriteEditPanel(e.target);
+            });
             /*map.removeOverlay(editCircle);
             map.removeOverlay(editPolygon);
  
@@ -527,6 +529,29 @@ var gb_ct_map = function () {
             //obj = null;
         }
     };
+
+    var closeInfoWin = function () {
+        map.closeInfoWindow();
+    };
+
+    /**
+     * 为新增的站点选择一个位置
+     */
+    var showAddPointPanel = function (name) {
+        map_status = 1;
+        var spp = gb_station_route.getTemps()['geo_d_e_add_search_point_panel-temp']({name: name});
+        $('body').append(spp);
+
+        //按名称定位地图位置
+        var local = new BMap.LocalSearch(map, {
+            renderOptions:{map: map},
+            onMarkersSet: function (pos) {
+                console.log('onMarkersSet', pos);
+            }
+        });
+        local.search(name + "-公交车站");
+    };
+
     res_load_ep.emitLater('load_map');
     return {
         _render: _render,
@@ -542,6 +567,11 @@ var gb_ct_map = function () {
         getDrawPolygon: function () {
             return editPolygon;
         },
-        updateDragRadius: updateDragRadius
+        updateDragRadius: updateDragRadius,
+        closeInfoWin: closeInfoWin,
+        showAddPointPanel: showAddPointPanel,
+        resetMapStatus: function () {
+            map_status = 0;
+        }
     };
 }();
 \ No newline at end of file
@@ -77,23 +77,73 @@ var gb_station_route = function () {
         return null;
     };
  
+    /**
+     * 编辑站点名称
+     * @param station
+     */
+    var station_edit_name = function (station) {
+        var cellWrap = getStationLI(station);
+        $('a[data-code]', cellWrap).hide();
+
+        cellWrap.append(temps['geo_d_e_edit_name_panel-temp'](station)).addClass('_edit_name');
+        //焦点
+        $('input[name=stationName]', cellWrap).focus();
+        //取消
+        $('.cancel_icon_btn', cellWrap).on('click', function () {
+            $('.ul_li_input', cellWrap).remove();
+            $('a[data-code]', cellWrap).show();
+        });
+    };
+
+    var getStationLI = function (s) {
+        return $('.up_down_route_list>li:eq('+s.directions+')>.station_route .station_li_' + s.stationCode);
+    };
+
+    var insert_station_before = function (station) {
+        //在之前插入站点
+        var cell = getStationLI(station);
+
+        var addCell = $(temps['geo_d_e_add_station_panel-temp'](station));
+        cell.before(addCell);
+
+        gb_ct_map.closeInfoWin();
+        //焦点
+        var $nameInput = $('input[name=stationName]', addCell);
+        $nameInput.focus();
+        //取消
+        $('.cancel_icon_btn', addCell).on('click', function () {
+            addCell.remove();
+        });
+
+        //选择地图位置
+        $('.search_point_icon_btn', addCell).on('click', function () {
+            var name = $nameInput.val();
+            if(!name)
+                return UIkit.notification("你必须输入站点名称！", {status: 'danger',pos: 'bottom-left'});
+
+            $('.main_left_panel_m_layer').show();
+            gb_ct_map.showAddPointPanel(name);
+        });
+    };
+
     var realEditStation;
     var callbackHandler = {
         edit_buffer: function (station) {
-            //编辑缓冲区
-            realEditStation = station;
             gb_ct_map.editStationBuffer(station);
-        }
+        },
+        edit_name: station_edit_name,
+        insert_before: insert_station_before
     };
  
     $.contextMenu({
-        selector: '._route_info_wrap .up_down_route_list .station_route>ul>li',
+        selector: '._route_info_wrap .up_down_route_list .station_route>ul>li>a[data-code]',
         className: 'station-route-ct-menu',
         callback: function (key, options) {
-            var aLink = options.$trigger.find('a[data-code]');
+            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: {
@@ -101,14 +151,17 @@ var gb_station_route = function () {
                 name: '编辑缓冲区'
             },
             'sep1': '---------',
-            'edit': {
-                name: '编辑基础信息'
+            'edit_name': {
+                name: '修改站点名称'
             },
             'insert_before': {
-                name: '新增站点（前）'
+                name: '新增站点（之前）'
             },
             'insert_after': {
-                name: '新增站点（后）'
+                name: '新增站点（之后）'
+            },
+            'destroy': {
+                name: '撤销站点'
             }
         }
     });
@@ -119,10 +172,6 @@ var gb_station_route = function () {
         $('.buffer_edit_panel').show();
     };
  
-    var hideEditPanel = function () {
-        $('.buffer_edit_panel').remove();
-    };
-
     var edPanelRunFlag;
     var ecObj;
     var reWriteEditPanel = function (ec, isPolygon) {
@@ -157,8 +206,22 @@ var gb_station_route = function () {
                 break;
             }
         }
+
+        //替换
+        var sCell = $(temps['geo_d_e_station_route_one-temp'](s));
+        $('a.uk-animation-shake', sCell).on('webkitAnimationEnd', function () {
+            $(this).removeClass('uk-animation-shake');
+        });
+        getStationLI(s).replaceWith(sCell);
     };
  
+    //取消按钮
+    $(document).on('click','.buffer_edit_body button.cancel', function (e) {
+        $('.main_left_panel_m_layer').hide();
+        $(this).parents('.buffer_edit_body').parent().remove();
+        gb_ct_map.resetMapStatus();
+    });
+
  
     var $editWrap = '.buffer_edit_panel>.buffer_edit_body';
     /**
@@ -230,7 +293,6 @@ var gb_station_route = function () {
         $(drawPolygonSwitch).data('type', 2).find('a').text('重新绘制');
     };
  
-
     res_load_ep.emitLater('load_station_route');
     return {
         init: init,
@@ -243,7 +305,6 @@ var gb_station_route = function () {
         clearFocus: clearFocus,
         focus: focus,
         showEditPanel: showEditPanel,
-        hideEditPanel: hideEditPanel,
         reWriteEditPanel: reWriteEditPanel,
         update: update,
         drawEnd: drawEnd,
@@ -27,7 +27,7 @@ var gb_data_submit = function () {
             }
  
             //gb_ct_map.removeDragMarkerEvent();
-            show_run_text('正在提交缓冲区信息');
+            show_run_text('正在提交缓冲区信息...');
             gb_common.$post('/_geo_data/updateBufferInfo', data, function (rs) {
                 hide_run_text();
                 UIkit.notification("提交成功！", {status: 'success'});
@@ -38,12 +38,28 @@ var gb_data_submit = function () {
                 //退出编辑模式
                 gb_ct_map.exitEditBufferStatus(rs.station);
             });
-        }, function () {
-            console.log('Rejected.')
         });
         return false;
     });
  
+    /**
+     * 修改名称提交
+     */
+    $(document).on('click', '.up_down_route_list .station_route .ul_li_input .save_icon_btn', function (e) {
+        var f = $(this).parents('form');
+        var data = f.serializeJSON();
+
+        UIkit.modal.confirm('确定将站点名称修改为【'+data.stationName+'】？').then(function() {
+            show_run_text('正在保存...');
+
+            gb_common.$post('/_geo_data/updateStationName', data, function (rs) {
+                hide_run_text();
+                UIkit.notification("修改成功！", {status: 'success'});
+                gb_station_route.update(rs.station);
+            });
+        });
+    });
+
     var show_run_text = function (t) {
         $('.text', $loadPanel).text(t);
         $loadPanel.show();