Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents f393f13c 4453aa59
Showing 8 changed files with 386 additions and 58 deletions
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/resources/static/pages/summary/fast_and_slow/data.html
src/main/resources/static/pages/summary/fast_and_slow/f_a_s_wrap.html
src/main/resources/static/pages/summary/fast_and_slow/main.html
src/main/resources/static/pages/summary/work_hours/list.html
src/main/resources/static/real_control_v2/js/utils/dispatch_pattern.js
@@ -358,6 +358,8 @@ public class InOutStationSignalHandle extends SignalHandle{
             //通知客户端
             sendUtils.sendZdsj(sch, lpNext, doneSum);
             logger.info("车辆：" + sch.getClZbh() + " 班次：" + sch.getDfsj() + "到终点， 时间：" + sch.getZdsjActual());
+            //清除车辆误点调整监听
+            LateAdjustHandle.remove(sch.getClZbh());
             //准备执行下一个班次
             if (next != null) {
                 //将gps转换为下一个班次走向的站内信号
@@ -117,6 +117,7 @@ public class LateAdjustHandle implements ApplicationContextAware{
             sch.setLateMinute(0);
             sch.setDfAuto(false);
+            lateSchMap.remove(nbbm);
             logger.info("移除误点调整 nbbm -" + nbbm);
         }
     }
@@ -141,7 +142,7 @@ public class LateAdjustHandle implements ApplicationContextAware{
                 //自动调整待发 到达时间 + 停靠时间
                 long dt = Arith.addLong(gps.getTimestamp(), (sch.getLateMinute() * 60 * 1000));
-                //超过2小时最大阈值，放弃
+                //超过2小时最大阈值，放弃 -临时代码，待删除
                 if(Math.abs(dt - sch.getDfsjT()) > 1000 * 60 * 60 * 2){
                     logger.info(sch.getClZbh() + " 超过误点调整阈值，放弃");
                 }
@@ -1645,73 +1645,79 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		}
 		for(String key : keyMap.keySet()){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
-			int jhbc = 0;
-			int sjbc = 0;
-			int jhlc = 0;
-			int sjlc = 0;
-			int lzbc = 0, lzlc = 0, dmbc = 0, dmlc = 0,
-					gzbc = 0, gzlc = 0, jfbc = 0, jflc = 0,
-					zsbc = 0, zslc = 0, qrbc = 0, qrlc = 0,
-					qcbc = 0, qclc = 0, kxbc = 0, kxlc = 0,
-					qhbc = 0, qhlc = 0, wybc = 0, wylc = 0;
-			int qtbc = 0, qtlc = 0;
+			int jhbc = 0, sjbc = 0,
+					lzbc = 0, dmbc = 0,
+					gzbc = 0, jfbc = 0, zsbc = 0,
+					qrbc = 0, qcbc = 0, kxbc = 0,
+					qhbc = 0, wybc = 0, qtbc = 0;
+			BigDecimal jhlc = new BigDecimal("0"), sjlc = new BigDecimal("0"),
+					lzlc = new BigDecimal("0"), dmlc = new BigDecimal("0"),
+					gzlc = new BigDecimal("0"), jflc = new BigDecimal("0"),
+					zslc = new BigDecimal("0"), qrlc = new BigDecimal("0"),
+					qclc = new BigDecimal("0"), kxlc = new BigDecimal("0"),
+					qhlc = new BigDecimal("0"), wylc = new BigDecimal("0"),
+					qtlc = new BigDecimal("0");
 			String companyName = "", subCompanyName = "";
 			for(ScheduleRealInfo schedule : keyMap.get(key)){
 				if(schedule.getGsName() != null && companyName.length() == 0)
 					companyName = schedule.getGsName();
 				if(schedule.getFgsName() != null && subCompanyName.length() == 0)
 					subCompanyName = schedule.getFgsName();
-				double lc = 0d;
+				BigDecimal lc = new BigDecimal("0");
 				if(schedule.getJhlcOrig() != null && schedule.getJhlcOrig() > 0.1d){
-					lc = schedule.getJhlcOrig();
+					lc = new BigDecimal("0"+schedule.getJhlcOrig());
 				} else {
-					lc = schedule.getJhlc();
+					lc = new BigDecimal("0"+schedule.getJhlc());
 				}
 				if(!schedule.isSflj()){
 					jhbc++;
-					jhlc += lc;
+					jhlc = jhlc.add(lc);
 				}
 				if(schedule.getStatus() != -1){
 					sjbc++;
-					sjlc += lc;
+					sjlc = sjlc.add(lc);
 				} else if(schedule.getStatus() == -1){
 					if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("路阻") != -1){
 						lzbc++;
-						lzlc += lc;
+						lzlc = lzlc.add(lc);
 					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("吊慢") != -1){
 						dmbc++;
-						dmlc += lc;
+						dmlc = dmlc.add(lc);
 					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("故障") != -1){
 						gzbc++;
-						gzlc += lc;
+						gzlc = gzlc.add(lc);
 					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("纠纷") != -1){
 						jfbc++;
-						jflc += lc;
+						jflc = jflc.add(lc);
 					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("肇事") != -1){
 						zsbc++;
-						zslc += lc;
+						zslc = zslc.add(lc);
 					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("缺人") != -1){
 						qrbc++;
-						qrlc += lc;
+						qrlc = qrlc.add(lc);
 					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("缺车") != -1){
 						qcbc++;
-						qclc += lc;
+						qclc = qclc.add(lc);
 					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("客稀") != -1){
 						kxbc++;
-						kxlc += lc;
+						kxlc = kxlc.add(lc);
 					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("气候") != -1){
 						qhbc++;
-						qhlc += lc;
+						qhlc = qhlc.add(lc);
 					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("外援") != -1){
 						wybc++;
-						wylc += lc;
+						wylc = wylc.add(lc);
 					} else {
 						qtbc++;
-						qtlc += lc;
+						qtlc = qtlc.add(lc);
 					}
 				}
 			}
+			boolean flag = true;
+			if(jhlc.toString().equals("0")){
+				flag = false;
+			}
 			tempMap.put("date", Date);
 			tempMap.put("company", companyName);
 			tempMap.put("subCompany", subCompanyName);
@@ -1720,42 +1726,43 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			tempMap.put("jhbc", jhbc);
 			tempMap.put("sjbc", sjbc);
 			tempMap.put("bcbfb", df.format(jhbc>0?(double)sjbc/jhbc*100:0)+"%");
-			tempMap.put("jhlc", jhlc);
-			tempMap.put("sjlc", sjlc);
-			tempMap.put("lcbfb", df.format(jhlc>0?(double)sjlc/jhlc*100:0)+"%");
+			tempMap.put("jhlc", jhlc.doubleValue());
+			tempMap.put("sjlc", sjlc.doubleValue());
+//			tempMap.put("lcbfb", df.format(flag?(double)sjlc/jhlc*100:0)+"%");
+			tempMap.put("lcbfb", df.format(flag?sjlc.divide(jhlc, 4, BigDecimal.ROUND_HALF_UP).doubleValue()*100:0)+"%");
 			tempMap.put("lzbc", lzbc);
-			tempMap.put("lzlc", lzlc);
-			tempMap.put("lzbfb", df.format(jhlc>0?(double)lzbc/jhbc*100:0)+"%");
+			tempMap.put("lzlc", lzlc.doubleValue());
+			tempMap.put("lzbfb", df.format(flag?(double)lzbc/jhbc*100:0)+"%");
 			tempMap.put("dmbc", dmbc);
-			tempMap.put("dmlc", dmlc);
-			tempMap.put("dmbfb", df.format(jhlc>0?(double)dmbc/jhbc*100:0)+"%");
+			tempMap.put("dmlc", dmlc.doubleValue());
+			tempMap.put("dmbfb", df.format(flag?(double)dmbc/jhbc*100:0)+"%");
 			tempMap.put("gzbc", gzbc);
-			tempMap.put("gzlc", gzlc);
-			tempMap.put("gzbfb", df.format(jhlc>0?(double)gzbc/jhbc*100:0)+"%");
+			tempMap.put("gzlc", gzlc.doubleValue());
+			tempMap.put("gzbfb", df.format(flag?(double)gzbc/jhbc*100:0)+"%");
 			tempMap.put("jfbc", jfbc);
-			tempMap.put("jflc", jflc);
-			tempMap.put("jfbfb", df.format(jhlc>0?(double)jfbc/jhbc*100:0)+"%");
+			tempMap.put("jflc", jflc.doubleValue());
+			tempMap.put("jfbfb", df.format(flag?(double)jfbc/jhbc*100:0)+"%");
 			tempMap.put("zsbc", zsbc);
-			tempMap.put("zslc", zslc);
-			tempMap.put("zsbfb", df.format(jhlc>0?(double)zsbc/jhbc*100:0)+"%");
+			tempMap.put("zslc", zslc.doubleValue());
+			tempMap.put("zsbfb", df.format(flag?(double)zsbc/jhbc*100:0)+"%");
 			tempMap.put("qrbc", qrbc);
-			tempMap.put("qrlc", qrlc);
-			tempMap.put("qrbfb", df.format(jhlc>0?(double)qrbc/jhbc*100:0)+"%");
+			tempMap.put("qrlc", qrlc.doubleValue());
+			tempMap.put("qrbfb", df.format(flag?(double)qrbc/jhbc*100:0)+"%");
 			tempMap.put("qcbc", qcbc);
-			tempMap.put("qclc", qclc);
-			tempMap.put("qcbfb", df.format(jhlc>0?(double)qcbc/jhbc*100:0)+"%");
+			tempMap.put("qclc", qclc.doubleValue());
+			tempMap.put("qcbfb", df.format(flag?(double)qcbc/jhbc*100:0)+"%");
 			tempMap.put("kxbc", kxbc);
-			tempMap.put("kxlc", kxlc);
-			tempMap.put("kxbfb", df.format(jhlc>0?(double)kxbc/jhbc*100:0)+"%");
+			tempMap.put("kxlc", kxlc.doubleValue());
+			tempMap.put("kxbfb", df.format(flag?(double)kxbc/jhbc*100:0)+"%");
 			tempMap.put("qhbc", qhbc);
-			tempMap.put("qhlc", qhlc);
-			tempMap.put("qhbfb", df.format(jhlc>0?(double)qhbc/jhbc*100:0)+"%");
+			tempMap.put("qhlc", qhlc.doubleValue());
+			tempMap.put("qhbfb", df.format(flag?(double)qhbc/jhbc*100:0)+"%");
 			tempMap.put("wybc", wybc);
-			tempMap.put("wylc", wylc);
-			tempMap.put("wybfb", df.format(jhlc>0?(double)wybc/jhbc*100:0)+"%");
+			tempMap.put("wylc", wylc.doubleValue());
+			tempMap.put("wybfb", df.format(flag?(double)wybc/jhbc*100:0)+"%");
 			tempMap.put("qtbc", qtbc);
-			tempMap.put("qtlc", qtlc);
-			tempMap.put("qtbfb", df.format(jhlc>0?(double)qtbc/jhbc*100:0)+"%");
+			tempMap.put("qtlc", qtlc.doubleValue());
+			tempMap.put("qtbfb", df.format(flag?(double)qtbc/jhbc*100:0)+"%");
 			resList.add(tempMap);
 		}
@@ -1777,6 +1784,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				e.printStackTrace();
 			}
 		}
+		System.out.println(map);
 		return resList;
 	}
+<div class="ct_data_body_wrap">
+    <div class="uk-card uk-card-default uk-card-body ct_rq_left">
+        <ul uk-scrollspy-nav="closest: li; scroll: true; offset: 100"
+            class="uk-nav uk-nav-default tm-nav uk-nav-parent-icon">
+            <li class="uk-active"><a href="#table_20171010">2017-10-10</a></li>
+            <li><a href="#table_20171011">2017-10-11</a></li>
+            <li><a href="#table_20171012">2017-10-12</a></li>
+            <li><a href="#table_20171013">2017-10-13</a></li>
+            <li><a href="#table_20171014">2017-10-14</a></li>
+            <li><a href="#table_20171015">2017-10-15</a></li>
+            <li><a href="#table_20171016">2017-10-16</a></li>
+        </ul>
+    </div>
+
+    <div class="uk-card uk-card-default uk-card-body ct_right_tables">
+        <div id="table_20171010">
+            <table>
+
+            </table>
+        </div>
+    </div>
+
+    <script>
+        (function () {
+            var wrap = '.ct_data_body_wrap';
+
+            $(wrap).on('init', function (e, data) {
+                e.stopPropagation();
+                console.log('data init');
+
+            });
+        })();
+    </script>
+</div>
 \ No newline at end of file
+<!-- 快慢误点统计 -->
+<iframe src="/pages/summary/fast_and_slow/main.html?origin=real_control_iframe" frameborder="0" style="height: 100%;width: 100%;"></iframe>
 \ No newline at end of file
+<!DOCTYPE html>
+<html lang="zh-cn">
+
+<head>
+    <meta charset="UTF-8">
+    <link rel="stylesheet" href="/assets/plugins/uk3.0/uikit.min.css"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" />
+    <!-- flatpickr -->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.css">
+    <style>
+        html,body{
+            height: 100%;
+        }
+        .ct_page{
+            padding: 25px 15px;
+            height: 100%;
+            height: calc(100% - 50px);
+        }
+
+        .ct_cont{
+            height: calc(100% - 35px);
+        }
+
+        .ct_cont>div>div.uk-card{
+            height: 99%;
+        }
+
+        .loading{
+            height: 100%;
+            text-align: center;
+        }
+        .loading .uk-spinner{
+            margin-top: 200px;
+        }
+        .loading circle{
+            stroke: red;
+        }
+
+        .ps-container > .ps-scrollbar-x-rail, .ps-container > .ps-scrollbar-y-rail{
+            opacity: 0.6 !important;
+            padding: 0 !important;
+        }
+
+        .ct_search_form_wrap{
+            border-bottom: 1px solid #e5e5e5;
+            padding: 10px 0 25px 10px;
+        }
+        .ct_search_form_wrap .ct_field{
+            display: inline-block;
+            margin: 0 5px;
+        }
+
+        .ct_search_form_wrap .ct_field label{
+            font-size: 14px;
+        }
+
+        .ct_search_form_wrap .ct_field input[type=text]{
+            width: 110px;
+        }
+
+        .ct_search_form_wrap .ct_field select{
+            width: auto;
+            min-width: 100px;
+        }
+
+        .ct_search_form_wrap .uk-button{
+            padding: 0 14px;
+        }
+
+        .ct_search_form_wrap .uk-button i{
+            vertical-align: middle;
+            margin-top: -2px;
+            margin-right: 7px;
+        }
+
+        .ct_field.ct_field_bottom{
+            vertical-align: bottom;
+            font-size: 12px;
+            margin-left: 0;
+        }
+
+        .ct_cont_body{
+            height: calc(100% - 88px);
+            width: 100%;
+            padding-top: 12px;
+        }
+
+        .ct_data_body_wrap{
+            height: 100%;
+            width: 100%;
+        }
+
+        .ct_rq_left{
+            width: 200px;
+            display: inline-block;
+            vertical-align: top;
+            height: 99%;
+            height: calc(100% - 5px);
+        }
+
+        .ct_right_tables{
+            width: calc(100% - 220px);
+            display: inline-block;
+            margin-left: 12px;
+            height: 99%;
+            height: calc(100% - 5px);
+        }
+
+        .tm-nav>li a{
+            position: relative;
+            font-size: 15px;
+        }
+        .tm-nav>li.uk-active>a:before {
+            content: "";
+            position: absolute;
+            width: 15px;
+            border-top: 1px solid #1e87f0;
+            z-index: 9;
+            right: 60px;
+            top: 15px;
+        }
+        .uk-nav-default>li.uk-active>a {
+            color: #222;
+        }
+    </style>
+</head>
+
+<body>
+<div class="loading">
+    <div uk-spinner></div>
+</div>
+<div class="ct_page" style="display: none;">
+    <h3 class="uk-heading-line uk-heading-bullet"><span>快慢误点统计</span></h3>
+    <div class="ct_cont" >
+        <div class="ct_search_form_wrap">
+            <form>
+                <div class="ct_field">
+                    <label>公司：
+                        <select class="uk-select" name="companyId_eq">
+                        </select>
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>分公司：
+                        <select class="uk-select" name="subCompanyId_eq">
+                        </select>
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>线路：
+                        <select class="uk-select" name="lineCode_eq">
+                        </select>
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>日期范围：
+                        <input class="uk-input" name="rq" style="width: 200px;">
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label><input class="uk-radio" type="radio" name="type" checked> 全部</label>&nbsp;
+                    <label><input class="uk-radio" type="radio" name="type"> 快误</label>&nbsp;
+                    <label><input class="uk-radio" type="radio" name="type"> 慢误</label>
+                </div>
+                <div class="ct_field">
+                    <button class="uk-button uk-button-primary search"><i uk-icon="icon: search"></i>搜索</button>
+                </div>
+                <div class="ct_field ct_field_bottom">
+                    <button class="uk-button uk-button-text" style="padding: 0 5px;">导出数据</button>
+                </div>
+                <div class="ct_field ct_field_bottom">
+                    <span uk-icon="icon: question" title="统计 “正常”、“区间”、“放站” 班次" uk-tooltip="pos: bottom"></span>
+                </div>
+            </form>
+        </div>
+
+        <div class="ct_cont_body">
+        </div>
+    </div>
+</div>
+
+<script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
+<script src="/assets/plugins/uk3.0/uikit.min.js"></script>
+<script src="/assets/plugins/uk3.0/uikit-icons.min.js"></script>
+<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js" ></script>
+<!-- EventProxy  -->
+<script src="/assets/js/eventproxy.js"></script>
+<!-- art-template 模版引擎 -->
+<script src="/assets/plugins/template.js"></script>
+<script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
+<!-- jquery.serializejson JSON序列化插件 -->
+<script src="/assets/plugins/jquery.serializejson.js"  merge="plugins"></script>
+<!-- flatpickr -->
+<script src="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.js" ></script>
+<script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" ></script>
+<script>
+
+(function () {
+    //var data_dom;
+    var f = $('form', '');
+    var ep = EventProxy.create('query_comps', 'query_lines', function () {
+        $('[name=companyId_eq]', f).trigger('change');//公司change
+        //query();
+
+        $('.loading').remove();
+        $('.ct_page').show();
+    });
+
+    $.get('/pages/summary/fast_and_slow/data.html', function (rs) {
+        $('.ct_cont_body').html(rs);
+    });
+
+    //点击搜索按钮
+    $('.search', f).on('click', function () {
+        $('.ct_data_body_wrap').trigger('init');
+    });
+
+    //日期选择框
+    var fs='YYYY-MM-DD'
+            , ets=moment().format(fs)
+            , sts=moment().subtract(7, 'days').format(fs);
+    flatpickr('.ct_search_form_wrap [name=rq]', {
+        mode: "range", dateFormat: "Y-m-d","locale": "zh", defaultDate: [sts, ets]
+    });
+    var comps;
+    //构建公司级联下拉框
+    $.get('/user/companyData', function (rs) {
+        comps = rs;
+        var opts = '';
+        for(var i=0,obj;obj=comps[i++];){
+            opts += '<option value="'+obj.companyCode+'">'+obj.companyName+'</option>';
+        }
+        $('[name=companyId_eq]', f).html(opts);
+        ep.emit('query_comps');
+    });
+    var lineMapps;
+    //加载线路信息
+    $.get('/line/all', {'destroy_eq': 0}, function (rs) {
+        rs.sort(function (a, b) {
+            return a.name.localeCompare(b.name);
+        });
+        lineMapps={};
+        var k;
+        $.each(rs, function () {
+            k = this.company+'_'+this.brancheCompany;
+            if(!lineMapps[k])
+                lineMapps[k]=[];
+            lineMapps[k].push(this);
+        });
+
+        ep.emit('query_lines');
+    });
+
+    $('[name=companyId_eq]', f).on('change', function () {
+        var code = $(this).val(), subs=[];
+        $.each(comps, function () {
+            if(this.companyCode==code)
+                subs=this.children;
+        });
+
+        var opts='';
+        $.each(subs, function () {
+            opts += '<option value="'+this.code+'">'+this.name+'</option>';
+        });
+        $('[name=subCompanyId_eq]', f).html(opts).trigger('change');
+    });
+
+    $('[name=subCompanyId_eq]', f).on('change', function () {
+        var k = $('[name=companyId_eq]', f).val() + '_' + $(this).val();
+        var array = lineMapps[k];
+        var opts = '';
+        if(array){
+            $.each(array, function () {
+                opts += '<option value="'+this.lineCode+'">'+this.name+'</option>';
+            });
+        }
+        $('[name=lineCode_eq]', f).html(opts);
+    });
+})();
+</script>
+</body>
+</html>
 \ No newline at end of file
@@ -18,7 +18,7 @@
         }
         .ct_cont{
-            height: calc(100% - 41px);
+            height: calc(100% - 35px);
         }
         .ct_cont>div>div.uk-card{
@@ -122,7 +122,7 @@
     <div uk-spinner></div>
 </div>
 <div class="ct_page" style="display: none;">
-    <h2 class="uk-heading-line uk-heading-bullet"><span>工时统计</span></h2>
+    <h3 class="uk-heading-line uk-heading-bullet"><span>工时统计</span></h3>
     <div class="ct_cont" >
         <div class="ct_search_form_wrap">
             <form>
@@ -141,7 +141,6 @@
                 <div class="ct_field">
                     <label>线路：
                         <select class="uk-select" name="lineCode_eq">
-                            <option value="81101">航头4路</option>
                         </select>
                     </label>
                 </div>
@@ -264,7 +263,7 @@
     //日期选择器
     $('[name=rq_eq]', f).val('2017-10-10');
-    flatpickr('.ct_search_form_wrap [name=rq_eq]', {"locale": "zh", maxDate: '2017-10-10', minDate: '2017-07-01'});
+    flatpickr('.ct_search_form_wrap [name=rq_eq]', {"locale": "zh", maxDate: '2017-10-16', minDate: '2017-07-01'});
     var comps;
     //构建公司级联下拉框
 /** 调度模式 */
+//主调和监控模式
+var operationMode = window.localStorage.getItem('operationMode');
 var gb_dp_initHttpIntercept = function () {
-    //主调和监控模式
-    var operationMode = window.localStorage.getItem('operationMode');
     $(document).off('ajaxSend', interceptPOST);
     $('body>.north').removeClass('monitor main');
     if (operationMode == 0) {