update...

潘钊
1 parent f7c126c5
Showing 7 changed files with 100 additions and 15 deletions
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
@@ -47,7 +47,7 @@ public class GeoDataServiceImpl implements GeoDataService {
         Map<String, Object> map = new HashMap();
         try {
-            String sql = "select DISTINCT versions from bsth_c_stationroute where line=" + lineCode + " and destroy=0";
+            String sql = "select versions from bsth_c_line_versions where line='"+lineCode+"' and status=1";
             //当前使用的线路版本
             Integer currentVersion = jdbcTemplate.queryForObject(sql, Integer.class);
@@ -67,6 +67,7 @@ public class GeoDataServiceImpl implements GeoDataService {
             map.put("status", ResponseCode.SUCCESS);
             map.put("list", list);
             map.put("currentVersion", currentVersion);
+            map.put("editVersion", version);
         } catch (Exception e) {
             logger.error("", e);
             map.put("status", ResponseCode.ERROR);
@@ -80,7 +81,7 @@ public class GeoDataServiceImpl implements GeoDataService {
         Map<String, Object> map = new HashMap();
         try {
-            String sql = "select DISTINCT versions from bsth_c_stationroute where line=" + lineCode + " and destroy=0";
+            String sql = "select versions from bsth_c_line_versions where line='"+lineCode+"' and status=1";
             //当前使用的线路版本
             Integer currentVersion = jdbcTemplate.queryForObject(sql, Integer.class);
@@ -419,6 +420,13 @@ public class GeoDataServiceImpl implements GeoDataService {
         def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
         TransactionStatus status = tran.getTransaction(def);
         try{
+            int versionCount = jdbcTemplate.queryForObject("select count(*) from bsth_c_line_versions where line_code='"+lineCode+"'", Integer.class);
+            if(versionCount == 1){
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "线路至少要保留一个走向版本！");
+                return rs;
+            }
+
            /* //要删除的站点ID（未被其他线路、版本引用的）
             String sql = "select DISTINCT station from bsth_c_ls_stationroute where line_code='"+lineCode+"' and versions="+version+" and station not in(" +
                             "select station from bsth_c_ls_stationroute where (line!='"+lineCode+"' or versions!="+version+") and station in (" +
@@ -644,8 +652,10 @@ public class GeoDataServiceImpl implements GeoDataService {
             for (int i = 0, size = routes.size(); i < size; i++) {
                 routes.get(i).setStationMark("Z");
             }
-            routes.get(0).setStationMark("B");
-            routes.get(routes.size() - 1).setStationMark("E");
+            if(routes.size() > 1){
+                routes.get(0).setStationMark("B");
+                routes.get(routes.size() - 1).setStationMark("E");
+            }
             final List<SaveStationRouteDTO> saveList = routes;
             //insert 新路由 （ID自增）
@@ -627,4 +627,33 @@ ul.context-menu-list.station-route-ct-menu.context-menu-root {
 .rt_show_version_txt{
     display: none;
+}
+
+.add_station_icon{
+    width: 140px;
+    border: 1px dashed #e2e2e2 !important;
+    text-align: center;
+    padding: 5px 0;
+    margin-left: 57px;
+    cursor: pointer;
+}
+
+.add_station_icon:hover{
+    border: 1px solid #e2e2e2;
+}
+
+.add_station_icon>span.uk-icon{
+    vertical-align: top;
+    margin-top: 3px;
+}
+
+.add_station_icon>a{
+    color: grey !important;
+    display: inline-block !important;
+    width: auto !important;
+    padding-left: 0 !important;
+}
+
+.road_route>ul.empty{
+    border-left: none;
 }
 \ No newline at end of file
 <div>
     <script id="geo_d_e_road_route-temp" type="text/html">
-        <ul class="uk-list">
+        <ul class="uk-list {{if list.length==0}}empty{{/if}}">
             {{each list as subArr i}}
             <li class="r_r_item f_r_a" data-id="{{subArr[0].id}}" data-code="{{subArr[0].sectionCode}}">
                 <a data-code="{{subArr[0].sectionCode}}" data-updown="{{subArr[0].directions}}">{{subArr[0].sectionName}}<span class="sub_name">{{subArr[0].crosesRoad}}</span></a>
@@ -17,6 +17,15 @@
                 {{/if}}
             </li>
             {{/each}}
+
+            {{if list.length==0}}
+            <li class="r_r_item">
+                <div class="add_station_icon">
+                    <span uk-icon="icon: plus;ratio:.8"></span>
+                    <a data-updown="{{updown}}">添加路段</a>
+                </div>
+            </li>
+            {{/if}}
         </ul>
     </script>
@@ -10,6 +10,15 @@
                 <a data-code="{{s.stationCode}}" data-updown="{{s.directions}}">{{s.stationName}}</a>
             </li>
             {{/each}}
+
+            {{if list.length==0}}
+                <li class="s_r_item">
+                    <div class="add_station_icon">
+                        <span uk-icon="icon: plus;ratio:.8"></span>
+                        <a data-updown="{{updown}}">添加站点</a>
+                    </div>
+                </li>
+            {{/if}}
         </ul>
     </script>
@@ -44,7 +44,7 @@ var gb_ct_map = function () {
     stCtrl.setOffset(new BMap.Size(20, 20));
     map.addControl(stCtrl);//添加全景控件
-    var roadPolylines = [], stationMarkers = [];
+    var roadPolylines = {0:[],1:[]}, stationMarkers = {0:[],1:[]};
     var _render = function (cb) {
         //绘制路段
         _renderRoads(gb_road_route.getData());
@@ -55,8 +55,10 @@ var gb_ct_map = function () {
         //居中至上行中间站点
         if(!initFlag){
-            var cm = stationMarkers[0][parseInt(stationMarkers[0].length / 2)];
-            map.setCenter(cm.point);
+            if(stationMarkers[0].length>0){
+                var cm = stationMarkers[0][parseInt(stationMarkers[0].length / 2)];
+                map.setCenter(cm.point);
+            }
             initFlag=true;
         }
@@ -67,11 +69,15 @@ var gb_ct_map = function () {
         return updown == 0 ? 'blue' : 'red';
     };
     var _renderRoads = function (data) {
+        if(data[0].length==0)
+            return;
         _renderPolyline(data[0], updownColor(0));//上行路段
         _renderPolyline(data[1], updownColor(1));//下行路段
     };
     var _renderStation = function (data) {
+        if(data[0].length==0)
+            return;
         _renderStationMarket(data[0]);//上行站点
         _renderStationMarket(data[1]);//下行站点
     };
@@ -36,7 +36,10 @@ var gb_road_route = function () {
                 this.cp = geolib.getCenter(_pos);
                 this.len = geolib.getPathLength(_pos);
             });
-            ep.emit('data', gb_common.groupBy(rs.list, 'directions'));
+            var data = {0:[],1:[]};
+            if(rs.list.length > 0)
+                data = gb_common.groupBy(rs.list, 'directions');
+            ep.emit('data', data);
         });
         //加载模板片段
@@ -10,12 +10,11 @@ var gb_station_route = function () {
         var ep = EventProxy.create("data", "temp", function (data, temp) {
             station_maps = data;
             temps = temp;
-            //当前编辑的线路版本
-            storage.setItem("geo_data_edit_line_version" , data[0][0].versions);
+
             //渲染页面
-            var upHtmlStr = temps['geo_d_e_station_route-temp']({list: station_maps[0]});
+            var upHtmlStr = temps['geo_d_e_station_route-temp']({list: station_maps[0],updown:0});
             $('.up_down_route_list>li:first>.station_route').html(upHtmlStr);
-            var downHtmlStr = temps['geo_d_e_station_route-temp']({list: station_maps[1]});
+            var downHtmlStr = temps['geo_d_e_station_route-temp']({list: station_maps[1],updown:1});
             $('.up_down_route_list>li:last>.station_route').html(downHtmlStr);
             cb && cb();
@@ -30,7 +29,13 @@ var gb_station_route = function () {
             //线路当前启用的线路版本
             storage.setItem("geo_data_enable_version" , rs['currentVersion']);
-            ep.emit('data', gb_common.groupBy(rs.list, 'directions'));
+            //当前编辑的线路版本
+            storage.setItem("geo_data_edit_line_version" , rs['editVersion']);
+
+            var data = {0:[],1:[]};
+            if(rs.list.length > 0)
+                data = gb_common.groupBy(rs.list, 'directions');
+            ep.emit('data', data);
         });
         //加载模板片段
@@ -170,13 +175,14 @@ var gb_station_route = function () {
             prev = $(that).prev();
             if(prev.length == 0)
-                return null;
+                return [];
             if(prev.hasClass(clazz))
                 return prev;
             that = prev;
         }
+        return [];
     };
     /**
@@ -246,6 +252,19 @@ var gb_station_route = function () {
         }
     });
+    /**
+     * 新线路 添加第一个站点
+     */
+    $(document).on('click', '.add_station_icon', function () {
+        //在之后插入站点
+        var cell = $(this);
+
+        var addCell = $(temps['geo_d_e_add_station_panel-temp']());
+        cell.after(addCell);
+
+        add_station(addCell);
+    });
+
     var showEditPanel = function (s) {
         var htmlStr = temps['geo_d_e_map_edit_buffer_panel-temp'](s);
         $('.ct_page').append(htmlStr);