update...

潘钊
1 parent 692e166b
Showing 8 changed files with 101 additions and 14 deletions
src/main/java/com/bsth/data/car_out_info/CarOutInfoHandler.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.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/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/main.html
src/main/resources/static/pages/base/line/list.html
 package com.bsth.data.car_out_info;
  
 import com.bsth.data.BasicData;
+import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
+import com.bsth.data.gpsdata_v2.entity.StationRoute;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -166,6 +168,11 @@ public class CarOutInfoHandler {
      * @param list
      * @return
      */
+    private static String[] fls = new String[]{"in","out","ldks","venting","major"};
+    private static List<String> clearTypes;
+    static {
+        clearTypes = Arrays.asList(fls);
+    }
     private ScheduleRealInfo[] nexts(List<ScheduleRealInfo> list) {
         ScheduleRealInfo[] array = new ScheduleRealInfo[3];
         Collections.sort(list, schDFSJComparator);
@@ -181,11 +188,16 @@ public class CarOutInfoHandler {
                 continue;
  
             //进场、出场、2点间空驶
-            if (sch.getBcType().equals("in")
-                    || sch.getBcType().equals("out")
-                    || sch.getBcType().equals("ldks"))
+            if (clearTypes.contains(sch.getBcType()))
                 continue;
  
+            //区间
+            if (sch.getBcType().equals("region")){
+                //是否起点发出
+                if(!isStartOut(sch))
+                    continue;
+            }
+
             //有实发实达时间的
             if (StringUtils.isNotEmpty(sch.getFcsjActual())
                     || StringUtils.isNotEmpty(sch.getZdsjActual()))
@@ -199,4 +211,30 @@ public class CarOutInfoHandler {
         }
         return array;
     }
+
+    private static StationRouteComp sComp = new StationRouteComp();
+    private boolean isStartOut(ScheduleRealInfo sch) {
+        try{
+            List<StationRoute> list = GeoCacheData.getStationRoute(sch.getXlBm(), Integer.parseInt(sch.getXlDir()));
+
+            if(null == list && list.size() == 0)
+                return false;
+            //排序
+            Collections.sort(list, sComp);
+
+            if(sch.getQdzName().equals(list.get(0).getName()))
+                return true;
+        }catch (Exception e){
+            logger.error("", e);
+        }
+        return false;
+    }
+
+    private static class StationRouteComp implements Comparator<StationRoute> {
+
+        @Override
+        public int compare(StationRoute s1, StationRoute s2) {
+            return s1.getRouteSort() - s2.getRouteSort();
+        }
+    }
 }
@@ -1252,6 +1252,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
  
                 //入库
                 dayOfSchedule.save(sch);
+                //重新计算当前执行班次
+                dayOfSchedule.reCalcExecPlan(sch.getClZbh());
                 rs.put("status", ResponseCode.SUCCESS);
                 rs.put("t", sch);
  
@@ -604,4 +604,12 @@ ul.context-menu-list.station-route-ct-menu.context-menu-root {
  
 .main_lt_search_panel .uk-form-icon:not(a):not(button):not(input){
     pointer-events: auto;
+}
+
+#add_line_versions_modal form.uk-form-horizontal .uk-form-label{
+    width: 100px !important;
+}
+
+#add_line_versions_modal form.uk-form-horizontal .uk-form-controls{
+    margin-left: 115px;
 }
 \ No newline at end of file
@@ -26,13 +26,13 @@
             <li>交叉路名： {{crosesRoad}}</li>
             <li>路段编号：{{sectionCode}}</li>
             <li>路由序号：{{sectionrouteCode}}</li>
-            <li>坐标：
+            <!--<li>坐标：
                 <div class="ct_coord_str">
                 {{each bdCoords as coord i}}
                     <code>{{coord}}</code><br>
                 {{/each}}
                 </div>
-            </li>
+            </li>-->
         </ul>
     </script>
  
@@ -126,6 +126,8 @@ var gb_road_route = function () {
  
     var addPrevId;//添加路段路由的上一个路由ID
     var insert_road_before = function (road) {
+        isPrevEnd();
+
         //在之前插入路段
         var cell = getRoadLI(road);
  
@@ -137,6 +139,8 @@ var gb_road_route = function () {
     };
  
     var insert_road_after = function (road) {
+        isPrevEnd();
+
         //在之后插入路段
         var cell = getRoadLI(road);
  
@@ -152,6 +156,11 @@ var gb_road_route = function () {
         add_road(addCell);
     };
  
+    var isPrevEnd = function () {
+        if($('.up_down_route_list>li:eq('+r.directions+')>.road_route .road_li_transient').length > 0)
+            return UIkit.notification("你需要完成上一个路段新增！", {status: 'danger'});
+    };
+
     var add_road = function (cell) {
         gb_ct_map.closeInfoWin();
         //焦点
@@ -158,13 +158,6 @@ var gb_station_route = function () {
             if(event.keyCode == "13")
                 $('.search_point_icon_btn', addCell).trigger('click');
         });
-
-        /*//上一个站点的ID
-        var $prev = addCell.prev('.s_r_item');
-        if($prev.length > 0)
-            addPrevId = $prev.data('id');
-        else
-            addPrevId = -1;*/
     };
  
     var prevs = function (that, clazz) {
@@ -25,7 +25,7 @@
         <div class="_line_info">
             <div class="_line_name">
                 <span></span>
-                <a uk-icon="icon: plus" class="add_line_version_icon" title="添加一个新的线路版本" uk-tooltip></a>
+                <a uk-icon="icon: plus" class="add_line_version_icon" title="新增一个线路走向版本" uk-tooltip></a>
             </div>
             <div class="_version_dropdown_wrap">
                 <a class="_version_text"></a>
@@ -84,6 +84,40 @@
     </div>
 </div>
  
+<div id="add_line_versions_modal" uk-modal>
+    <div class="uk-modal-dialog uk-modal-body">
+        <button class="uk-modal-close-default" type="button" uk-close></button>
+        <h2 class="uk-modal-title">新增线路走向版本</h2>
+
+        <form class="uk-form-horizontal uk-margin-large">
+            <div class="uk-margin">
+                <label class="uk-form-label" for="form-horizontal-select">原因</label>
+                <div class="uk-form-controls">
+                    <select class="uk-select" id="form-horizontal-select">
+                        <option>线路改道</option>
+                    </select>
+                </div>
+            </div>
+
+            <div class="uk-margin">
+                <label class="uk-form-label" for="form-horizontal-text">启用时间</label>
+                <div class="uk-form-controls">
+                    <input class="uk-input" id="form-horizontal-text" type="text" placeholder="启用改版本走向的时间">
+                </div>
+            </div>
+
+            <div class="uk-margin">
+                <div class="uk-form-label">继承</div>
+                <div class="uk-form-controls uk-form-controls-text">
+                    <label><input class="uk-radio" type="radio" name="radio1"> Option 01</label><br>
+                    <label><input class="uk-radio" type="radio" name="radio1"> Option 02</label>
+                </div>
+            </div>
+
+        </form>
+    </div>
+</div>
+
 <script id="geo_d_e_search_result-temp" type="text/html">
     <ul class="s_list uk-list">
         {{each list as obj i}}
@@ -191,6 +225,9 @@
         e.stopPropagation();
         return false;
     });
+
+    //$('#add_line_versions_modal').
+    //UIkit.modal('#add_line_versions_modal').show();
 </script>
  
 <!--- js -->
@@ -347,7 +347,7 @@
 				<a href="/pages/base/lineinformation/list.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a>
 			</td>
 			<td>
-				<a href="/pages/base/stationroute/list.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a>
+				<a href="javascript:window.localStorage.setItem('geo_data_edit_line_code' , '{{obj.lineCode}}');window.location.href='/pages/base/geo_data_edit/uk3_wrap.html';" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a>
 			</td>
 			<td>
 				<a href="details.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 详细 </a>