update...

潘钊
1 parent 93dd3f05
Showing 14 changed files with 191 additions and 28 deletions
src/main/java/com/bsth/controller/realcontrol/LineConfigController.java
src/main/java/com/bsth/data/LineConfigData.java
src/main/java/com/bsth/entity/realcontrol/LineConfig.java
src/main/java/com/bsth/service/realcontrol/LineConfigService.java
src/main/java/com/bsth/service/realcontrol/impl/LineConfigServiceImpl.java
src/main/resources/static/pages/permission/user/controlAllot.html
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/north/nav/line_config/buffer_config.html
src/main/resources/static/real_control_v2/fragments/north/nav/line_config/line_config.html
src/main/resources/static/real_control_v2/fragments/north/nav/line_config/line_config_entity.html
src/main/resources/static/real_control_v2/js/common.js
src/main/resources/static/real_control_v2/js/main.js
src/main/resources/static/real_control_v2/mapmonitor/css/real.css
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v2/main.html
@@ -54,8 +54,8 @@ public class LineConfigController extends BaseController&lt;LineConfig, Integer&gt;{
 	 * @return
 	 */
 	@RequestMapping(value = "/editOutTimeType", method = RequestMethod.POST)
-	public Map<String, Object> editOutTimeType(@RequestParam String lineCode, @RequestParam int type){
-		return lineConfigService.editOutTimeType(lineCode, type);
+	public Map<String, Object> editOutTimeType(@RequestParam String lineCode, @RequestParam int type,@RequestParam String parkCode,@RequestParam String stationCode){
+		return lineConfigService.editOutTimeType(lineCode, type, parkCode, stationCode);
 	}
 	/**
@@ -65,7 +65,7 @@ public class LineConfigData implements CommandLineRunner {
     public long applyOut(ScheduleRealInfo sch, Long timestamp) {
         LineConfig config = lineConfMap.get(sch.getXlBm());
         int diff = sch.getXlDir()=="0"?config.getUpOutDiff():config.getDownOutDiff();
-        return timestamp - (diff * 60 * 1000);
+        return timestamp - (diff * 1000);
     }
     /**
@@ -77,7 +77,7 @@ public class LineConfigData implements CommandLineRunner {
     public long applyIn(ScheduleRealInfo sch, Long timestamp){
         LineConfig config = lineConfMap.get(sch.getXlBm());
         int diff = sch.getXlDir()=="0"?config.getUpInDiff():config.getDownInDiff();
-        return timestamp - (diff * 60 * 1000);
+        return timestamp - (diff * 1000);
     }
     @Component
@@ -50,6 +50,9 @@ public class LineConfig {
 	/** 出站既出场 对应的停车场 */
 	private String twinsPark;
+	/** 出站既出场 对应的起点站 */
+	private String twinsStation;
+
 	/** 短语模板 , 号分隔多个 */
 	private String phraseTemps;
@@ -268,4 +271,12 @@ public class LineConfig {
 	public void setEnableYjtk(boolean enableYjtk) {
 		this.enableYjtk = enableYjtk;
 	}
+
+	public String getTwinsStation() {
+		return twinsStation;
+	}
+
+	public void setTwinsStation(String twinsStation) {
+		this.twinsStation = twinsStation;
+	}
 }
@@ -13,7 +13,7 @@ public interface LineConfigService extends BaseService&lt;LineConfig, Integer&gt;{
 	Map<String, Object> editStartOptTime(String time, String lineCode);
-	Map<String, Object> editOutTimeType(String lineCode, int type);
+	Map<String, Object> editOutTimeType(String lineCode, int type, String parkCode, String stationCode);
     LineConfig getByLineCode(String lineCode);
@@ -75,17 +75,20 @@ public class LineConfigServiceImpl extends BaseServiceImpl&lt;LineConfig, Integer&gt; 
     }
     @Override
-    public Map<String, Object> editOutTimeType(String lineCode, int type) {
+    public Map<String, Object> editOutTimeType(String lineCode, int type, String parkCode, String stationCode) {
         Map<String, Object> rs = new HashMap<>();
         try {
             LineConfig conf = lineConfigData.get(lineCode);
             conf.setOutConfig(type);
-            //conf.setInConfig(type);
+            if(type == 2){
+                conf.setTwinsPark(parkCode);
+                conf.setTwinsStation(stationCode);
+            }
             lineConfigData.set(conf);
             rs.put("status", ResponseCode.SUCCESS);
-            rs.put("type", type);
+            rs.put("conf", conf);
         } catch (Exception e) {
             rs.put("status", ResponseCode.ERROR);
             rs.put("msg", e.getMessage());
@@ -35,7 +35,7 @@
     <div style="border: 1px solid #cccbcb;height: 190px;position: relative;">
         <span style="display: block;margin: 10px;color: grey;">已分配的线路</span>
-        <div class="line-list" style="height: 110px;">
+        <div class="line-list" style="height: 110px;overflow: auto;padding: 9px;">
         </div>
         <div style="padding-left: 8px;">
@@ -899,4 +899,28 @@ option.oil_station_opt{
 #oil_station-modal .uk-modal .uk-form.fv-form{
     margin-bottom: 0 !important;
+}
+
+#gb_wait_modal .uk-modal-spinner{
+    top: 25px;
+    -webkit-transform: translate(-50%,0);
+    transform: translate(-50%,0);
+}
+
+#gb_wait_modal .wait-modal-text{
+    text-align: center;
+    margin-top: 35px;
+    font-size: 15px;
+    color: #635e5e;
+}
+
+.park-and-station-wrap{
+    margin-top: 9px;
+    border: 1px solid #3dce69;
+    width: 470px;
+    padding: 12px;
+    border-radius: 5px;
+}
+.park-and-station-wrap select{
+    width: auto !important;
 }
 \ No newline at end of file
@@ -34,7 +34,7 @@
                         <i class="uk-icon-pencil edit-icon"></i>
                     </div>
                 </form>
-                <a style="font-size: 80%;">编辑电子围栏</a>
+                <!--<a style="font-size: 80%;">编辑电子围栏</a>-->
             </div>
         </div>
@@ -139,6 +139,11 @@
             function enableYjtkForm() {
                 var f = $('form[name=yjtkForm]', wrap);
                 $('input', f).removeAttr('disabled');
+                //开始时间
+                if($('[name=yjtkStart]',f).val() == '')
+                    $('[name=yjtkStart]',f).val('00:00');
+                if($('[name=yjtkEnd]',f).val() == '')
+                    $('[name=yjtkEnd]',f).val('23:59');
                 var data = f.serializeJSON();
                 data.lineCode = conf.line.lineCode;
@@ -22,10 +22,9 @@
                 <li><a data-href="#schedule_reload_time_panel" >班次更新时间</a></li>
                 <li><a data-href="#out_time_type_panel" >出场时间类型</a></li>
                 <li><a data-href="#in_park_source_panel" >原线路回场</a></li>
-                <li><a>到站缓冲区设置</a></li>
-                <li><a>应急停靠</a></li>
-                <li><a>社会加油站</a></li>
-                <li><a class="disabled">漂移判定</a></li>
+                <li><a data-href="#buffer_inOut_diff_panel">到站缓冲区设置</a></li>
+                <li><a data-href="#emergency_stop_panel">应急停靠</a></li>
+                <li><a class="disabled">社会加油站</a></li>
                 <li><a class="disabled">到离站预测</a></li>
                 <li><a class="disabled">挂牌时刻表</a></li>
             </ul>
@@ -40,6 +40,8 @@
                     <option {{if outConfig==2}}selected{{/if}} value=2>出站既出场</option>
                 </select>
                 时间作为进出场班次的实际时间
+                <div class="park-and-station-wrap">
+                </div>
                 <ul class="uk-list">
                     <li>
                         <small>1、【GPS出场】 使用GPS信号捕获出场时间</small>
@@ -48,7 +50,7 @@
                         <small>2、【请求出场】 驾驶员请求出场，调度员同意后，取请求时间作为出场时间。如无请求出场，则捕获GPS时间。</small>
                     </li>
                     <li>
-                        <small>3、【出站既出场】 忽略出场班次，以头班车的发车时间作为出场时间，场既是站或停车场与起点站距离很近时推荐此项。</small>
+                        <small>3、【出站既出场】 忽略出场班次，以头班车的发车时间作为出场时间。</small>
                     </li>
                 </ul>
             </div>
@@ -76,10 +78,26 @@
             </div>
         </div>
     </script>
+
+    <script id="park-and-station-temp" type="text/html">
+        场
+        <select class="z-depth-input">
+            {{each parks as p i}}
+            <option value="{{p.code}}" {{if p.code==conf.twinsPark}}selected{{/if}}>{{p.name}}</option>
+            {{/each}}
+        </select>
+        既是站
+        <select class="z-depth-input">
+            {{each routes as r i}}
+            <option value="{{r.stationCode}}" {{if r.stationCode==conf.twinsStation}}selected{{/if}}>{{r.stationName}}
+            </option>
+            {{/each}}
+        </select>
+    </script>
     <script>
         (function () {
-            var wrap = '#line_config_entity_wrap', conf;
+            var wrap = '#line_config_entity_wrap', conf, parks, upStationRoutes;
             /**
              * 删除实际排班
@@ -87,14 +105,16 @@
             var clearRealSchedule = function (e) {
                 e.stopPropagation();
                 var lineCode = conf.line.lineCode;
-                var htmlStr = '<h4 style="color: red;">你确定要删除【' + conf.line.name + '】今日的实际排班？</h4><h5>人车、路牌、待发等相关班次调整信息会被删除。</h5><h5>调度指令和期间与设备的通讯记录被保留</h5><h5>后台日志中的人工操作痕迹被保留</h5>';
+                var htmlStr = '<h4 style="color: red;">你确定要删除【' + conf.line.name + '】今日的实际排班？</h4><h5 style="margin-top: 15px;">今日的实际排班会被删除</h5><h5 style="margin-top: 15px;">人车、路牌、待发等相关班次调整信息会被删除。</h5><h5 style="margin-top: 15px;">调度指令和期间与设备的通讯记录被保留</h5><h5 style="margin-top: 15px;">后台日志中的人工操作痕迹被保留</h5>';
                 alt_confirm(htmlStr, function () {
+                    show_wait_modal('正在清除数据...');
                     gb_common.$post('/realSchedule/deleteRealSchedule', {lineCode: lineCode}, function () {
                         //刷新班次表格
                         gb_schedule_table.reLoadAndRefresh(lineCode);
+                        hide_wait_modal();
                         notify_succ('删除班次成功！！！');
                     });
-                }, '确认删除' + conf.line.name + '的实际排班');
+                }, '确认删除' + conf.line.name + '的实际排班', true);
                 return false;
             };
@@ -105,9 +125,11 @@
             var reLoadRealSchedule = function (e) {
                 e.stopPropagation();
                 var lineCode = conf.line.lineCode;
+                show_wait_modal('正在重载数据...');
                 gb_common.$post('/realSchedule/reLoadRealSchedule', {lineCode: lineCode}, function () {
                     //刷新班次表格
                     gb_schedule_table.reLoadAndRefresh(lineCode);
+                    hide_wait_modal();
                     notify_succ('重新载入班次成功');
                 });
                 return false;
@@ -116,6 +138,18 @@
             $(wrap).on('init', function (e, data) {
                 e.stopPropagation();
                 conf = data.lineConfig;
+                //停车场
+                $.get('/basic/parks', function (rs) {
+                    parks = [];
+                    for (var code in rs) {
+                        parks.push({code: code, name: rs[code]});
+                    }
+                    renderPSDom();
+                });
+                //上行站点路由
+                upStationRoutes = gb_common.groupBy(gb_data_basic.stationRoutes(conf.line.lineCode).sort(function (a, b) {
+                    return a.stationRouteCode - b.stationRouteCode;
+                }), 'directions')[0];
                 var htmlStr = template('line_config_entity_form-temp', conf);
                 $('form', wrap).html(htmlStr);
@@ -135,14 +169,18 @@
             //更新排班时间
             var startOptFlag;
+
             function updateStartTime() {
-                if (startOptFlag || $(this).val()==conf.startOpt)
+                if (startOptFlag || $(this).val() == conf.startOpt)
                     return;
                 startOptFlag = true;
                 var that = this;
                 setTimeout(function () {
                     var timeStr = $(that).val();
-                    gb_common.$post('/lineConfig/editTime', {lineCode: conf.line.lineCode, time: timeStr}, function (rs) {
+                    gb_common.$post('/lineConfig/editTime', {
+                        lineCode: conf.line.lineCode,
+                        time: timeStr
+                    }, function (rs) {
                         notify_succ('班次更新时间调整为 ' + timeStr);
                         conf.startOpt = rs.time;
                     });
@@ -152,19 +190,53 @@
             function updateOutParkType() {
                 var type = $(this).val();
-                gb_common.$post('/lineConfig/editOutTimeType', {lineCode: conf.line.lineCode, type: type}, function () {
+                var lineCode = conf.line.lineCode;
+
+                var data = {lineCode: lineCode, type: type, parkCode: '', stationCode: ''};
+                //出站既是出场
+                if (type == 2) {
+                    //默认关联 线路标准停车场
+                    data.parkCode = gb_data_basic.getLineInformation(lineCode).carPark;
+                    //和上行起点站
+                    data.stationCode = upStationRoutes[0].stationCode;
+                }
+                gb_common.$post('/lineConfig/editOutTimeType', data, function (rs) {
                     notify_succ('调整出场时间类型成功！');
-                    conf.outConfig = type;
+                    conf = rs.conf;
+
+                    //渲染场站关联dom
+                    renderPSDom();
                 });
             }
             function enableInParkForSource() {
                 var enable = $(this).val();
-                gb_common.$post('/lineConfig/enableInParkForSource', {lineCode: conf.line.lineCode, enable: enable}, function () {
-                    notify_succ((enable==1?'启用':'禁用') + '原线路回场');
+                gb_common.$post('/lineConfig/enableInParkForSource', {
+                    lineCode: conf.line.lineCode,
+                    enable: enable
+                }, function () {
+                    notify_succ((enable == 1 ? '启用' : '禁用') + '原线路回场');
                     conf.inParkForSource = enable;
                 });
             }
+
+            /**
+             * 渲染场既是站dom
+             */
+            function renderPSDom() {
+                var htmlStr = '',
+                        $panel = $('.park-and-station-wrap', wrap);
+                if (conf['outConfig'] == 2) {
+                    htmlStr = template('park-and-station-temp', {
+                        parks: parks,
+                        conf: conf,
+                        routes: [upStationRoutes[0], upStationRoutes[upStationRoutes.length - 1]]
+                    });
+                    $panel.html(htmlStr).show();
+                }
+                else
+                    $panel.html('').hide();
+            }
         })();
     </script>
 </div>
 \ No newline at end of file
@@ -91,8 +91,11 @@ var gb_common = (function () {
             return;
         }
-        if (status == 'ERROR')
+        if (status == 'ERROR'){
             UIkit.modal.alert(errorHead + (json.msg ? json.msg : '未知异常'), {labels: {Ok: '确定'}});
+            //关闭wait窗口
+            hide_wait_modal();
+        }
         else
             handle && handle(json);
     }
@@ -102,6 +105,8 @@ var gb_common = (function () {
             successHandle(JSON.parse(xhr.responseText), succ);
         } else if (ts == 'error') {
             UIkit.modal.alert(errorHead + xhr.responseText, {labels: {Ok: '确定'}});
+            //关闭wait窗口
+            hide_wait_modal();
         }
     }
@@ -62,7 +62,6 @@ var gb_main_ep = new EventProxy(),
     });
-
 $(document).on('click', '.ct-bottom-drawer-close', function () {
     $(this).parents('.ct-bottom-drawer').removeClass('open');
 });
@@ -106,7 +105,7 @@ var notify_err = function (t) {
     });
 };
-var alt_confirm = function (content, succ, okBtn) {
+var alt_confirm = function (content, succ, okBtn, noCenter) {
     var modalEl = UIkit.modal.confirm(content, function () {
         succ && succ();
         modalEl.hide();
@@ -115,10 +114,31 @@ var alt_confirm = function (content, succ, okBtn) {
             Ok: okBtn,
             Cancel: '取消'
         }
-        , center: true
+        , center: !noCenter
     });
 };
+var show_wait_modal = function (text) {
+    var modalHtml =
+        '<div class="uk-modal" id="gb_wait_modal">' +
+        '    <div class="uk-modal-dialog">' +
+        '       <div class="uk-modal-spinner"></div>' +
+        '       <div class="wait-modal-text">' + text + '</div>' +
+        ' </div>' +
+        '</div>';
+
+    $(document.body).append(modalHtml);
+    return UIkit.modal('#gb_wait_modal', {
+        bgclose: false,
+        modal: false
+    }).show();
+};
+
+var hide_wait_modal = function () {
+    UIkit.modal('#gb_wait_modal').hide();
+};
+
+
 var isArray = function (obj) {
     return Object.prototype.toString.call(obj) === '[object Array]';
 };
@@ -643,4 +643,10 @@ input[type=checkbox].disabled{
 .uk-button.play-btn[data-type=pause]{
     color: #ff3c3c;
     border: 1px solid #ff3c3c;
+}
+
+#map-playback2-modal .z-depth-viewport{
+    padding-top: 15px;
+    border-right: 1px solid #d8d7d7;
+    box-shadow: 3px 1px 8px 0 rgba(0, 0, 0, 0.12), 1px 0px 8px 0 rgba(0, 0, 0, 0.12);
 }
 \ No newline at end of file
+<div class="uk-modal" id="map-playback2-modal">
+    <div class="uk-modal-dialog uk-modal-dialog-blank">
+        <button class="uk-modal-close uk-close" type="button"></button>
+        <div class="uk-grid uk-flex-middle" data-uk-grid-margin>
+            <div class="uk-width-medium-1-10 uk-height-viewport z-depth-viewport" >
+            </div>
+            <div class="uk-width-medium-2-10 uk-height-viewport z-depth-viewport">
+            </div>
+            <div class="uk-width-medium-7-10 uk-height-viewport">
+            </div>
+        </div>
+    </div>
+    <script>
+        (function () {
+            var modal = '#map-playback2-modal';
+        })();
+    </script>
+</div>