update...

panzh
1 parent 04521cb1
Showing 11 changed files with 374 additions and 27 deletions
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/controller/AccuracyDataController.java
src/main/java/com/bsth/data/charts_data/AccuracyDataHandler.java
src/main/java/com/bsth/data/gps/process/chains/ForecastProcess.java
src/main/java/com/bsth/data/history/HistoryConsumeTimeDataHandler.java
src/main/java/com/bsth/data/history/recovery/RecoveryByHistoryGps.java
src/main/java/com/bsth/entity/GpsEntity.java
src/main/java/com/bsth/service/AccuracyDataService.java
src/main/java/com/bsth/service/impl/AccuracyDataServiceImpl.java
src/main/resources/static/index.html
src/main/resources/static/pages/charts_data/accuracy.html
@@ -2,9 +2,11 @@ package com.bsth;
  
 import com.bsth.client.ClientApp;
 import com.bsth.data.BasicCacheData;
+import com.bsth.data.charts_data.AccuracyDataHandler;
 import com.bsth.data.geo.loader.thread.DataLoadThread;
 import com.bsth.data.gps.process.DataMainProcessor;
 import com.bsth.data.history.HistoryConsumeTimeDataHandler;
+import com.bsth.data.history.recovery.RecoveryByHistoryGps;
 import com.bsth.data.schedule.ScheduleCacheData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,6 +42,12 @@ public class StartCommand implements CommandLineRunner {
     @Autowired
     HistoryConsumeTimeDataHandler historyConsumeTimeDataHandler;
  
+    @Autowired
+    AccuracyDataHandler accuracyDataHandler;
+
+    @Autowired
+    RecoveryByHistoryGps recoveryByHistoryGps;
+
     Logger logger = LoggerFactory.getLogger(this.getClass());
  
     @Override
@@ -57,16 +65,25 @@ public class StartCommand implements CommandLineRunner {
             logger.info("load geo data end...");
             sexec.scheduleWithFixedDelay(fixedLoadCacheThread, 60 * 300, 60 * 300, TimeUnit.SECONDS);
  
-            //定时刷新班次信息
-            sexec.scheduleWithFixedDelay(refreshScheduleCacheThread, 60, 30, TimeUnit.SECONDS);
  
-            //gps socket client
-            clientApp.init();
-            //gps 数据处理
-            dataMainProcessor.start();
+            /**/ //定时刷新班次信息
+             sexec.scheduleWithFixedDelay(refreshScheduleCacheThread, 60, 30, TimeUnit.SECONDS);
+
+             //gps socket client
+             clientApp.init();
+             //gps 数据处理
+             dataMainProcessor.start();
+
+             //历史站点耗时数据
+             historyConsumeTimeDataHandler.start();
+
+             //预测准确性
+             accuracyDataHandler.start();
+
+
  
-            //历史站点耗时数据
-            historyConsumeTimeDataHandler.start();
+            //historyConsumeTimeDataHandler.start();//历史站点耗时数据
+            //recoveryByHistoryGps.recovery();//恢复到离站
         } catch (Exception e) {
             e.printStackTrace();
         }
+package com.bsth.controller;
+
+import com.bsth.entity.Accuracy;
+import com.bsth.service.AccuracyDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("accuracy_data")
+public class AccuracyDataController {
+
+    @Autowired
+    AccuracyDataService accuracyDataService;
+
+    @RequestMapping("search")
+    public List<Accuracy> search(@RequestParam String rq
+            , @RequestParam String lineCode
+            , @RequestParam String st
+            , @RequestParam String et, String nbbm) {
+
+        return accuracyDataService.search(rq, lineCode, st, et, nbbm);
+    }
+}
@@ -3,8 +3,10 @@ package com.bsth.data.charts_data;
 import com.alibaba.fastjson.JSON;
 import com.bsth.Application;
 import com.bsth.controller.dto.CarMonitorEntity;
+import com.bsth.data.geo.GeoCacheData;
 import com.bsth.entity.Accuracy;
 import com.bsth.entity.GpsEntity;
+import com.bsth.entity.StationRoute;
 import com.bsth.util.IpUtils;
 import com.bsth.util.db_utils.DBUtils_InfoPublish;
 import com.google.common.collect.*;
@@ -82,8 +84,9 @@ public class AccuracyDataHandler {
         //params
         accuracy.setLineCode(gps.getLineId());
         accuracy.setUpDown(gps.getUpDown());
-        accuracy.setStation(station);
-        accuracy.setT1(gps.getTimestamp());
+        StationRoute sr = GeoCacheData.findByCode(gps.getLineId(), gps.getUpDown(), station);
+        accuracy.setStation(null == sr ? station : sr.getName());
+        accuracy.setT1(System.currentTimeMillis());
         accuracy.setNbbm(gps.getNbbm());
         accuracy.setPlate(near.getPlate());
         accuracy.setStopDis(near.getStopdis());
@@ -108,9 +111,8 @@ public class AccuracyDataHandler {
         if (null == list || list.size() == 0)
             return;
  
-
         for (Accuracy a : list) {
-            a.setT2(gps.getTimestamp());
+            a.setT2(gps.getServerTimestamp());
             a.setRealSeconds((int) ((a.getT2() - a.getT1()) / 1000));
             a.setD2(gps.getInStationDistance());
  
@@ -28,7 +28,7 @@ public class ForecastProcess {
         if (isValidSignal(list)) {
             GpsEntity first = list.get(0);
             double sumDist = GeoUtils.getDistance(first, gps);//行驶距离
-            double seconds = (gps.getTimestamp() - first.getTimestamp()) / 1000 - 30;//耗时
+            double seconds = (gps.getTimestamp() - first.getTimestamp()) / 1000 - 45;//耗时
             double avgSpeed = sumDist / seconds;//均速
             gps.setSeconds((int) (gps.getDistance() / avgSpeed));//到下一站的时间
         } else {
@@ -60,7 +60,7 @@ public class HistoryConsumeTimeDataHandler {
     private final static int IN_STATION_SPEED = 15;
  
     //按实时路段距离换算时间时，给的默认速度
-    private final static int DEFAULT_SPEED = 18;
+    private final static int DEFAULT_SPEED = 10;
  
     /**
      * K : lineCode_upDown
@@ -230,7 +230,7 @@ public class HistoryConsumeTimeDataHandler {
                 dt.minusDays(7);//减7天
                 String rq = dt.toString("yyyyMMdd ");
  
-                rq = "20180627";
+                rq = "20180625";
                 String sql = "select * from bsth_h_consume_time where rq=" + rq;
                 JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_InfoPublish.getDataSource());
                 List<StationConsumeTime> list =
@@ -428,7 +428,7 @@ public class HistoryConsumeTimeDataHandler {
             List<StationConsumeTime> list = new ArrayList<>();
             try {
                 StationConsumeTime sct;
-                for (int i = 0; i < 1000; i++) {
+                for (int i = 0; i < 4000; i++) {
                     sct = pstQueue.poll();
                     if (null == sct)
                         break;
@@ -30,13 +30,21 @@ public class RecoveryByHistoryGps {
  
     public void recovery() {
  
-        Collection<Line> lines = BasicCacheData.code2LineMap.values();
+        List<Line> lines = new ArrayList<>(BasicCacheData.code2LineMap.values());
  
         List<GpsEntity> list;
-        for (Line line : lines) {
-            list = loadByLineCode(line.getLineCode(), 176);
+        Line line;
+        for (int i = 0, len = lines.size(); i < len; i++) {
+            line = lines.get(i);
  
-            handler(list);
+            try {
+                logger.info("线路：" + line.getName() + " -i: " + i + " -size: " + len);
+                list = loadByLineCode(line.getLineCode(), 177);
+
+                handler(list);
+            } catch (Exception e) {
+                logger.error("", e);
+            }
         }
     }
  
@@ -44,7 +52,7 @@ public class RecoveryByHistoryGps {
         //按设备号分组
         ArrayListMultimap<String, GpsEntity> listMap = ArrayListMultimap.create();
         for (GpsEntity gps : list) {
-            if (gps.getDeviceId() != null) {
+            if (gps.getDeviceId() != null && gps.getValid() == 0) {
                 gps.setNbbm(BasicCacheData.device2nbbmMap.get(gps.getDeviceId()));
                 listMap.put(gps.getDeviceId(), gps);
             }
@@ -71,7 +79,7 @@ public class RecoveryByHistoryGps {
         logger.info("load gps start -" + lineCode);
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_InfoPublish.getDataSource());
  
-        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE,SERVER_TS from bsth_c_gps_info_2018 where days_year=" + days_year + " and line_id='" + lineCode + "'";
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE,SERVER_TS from test_gps_info177all where days_year=" + days_year + " and line_id='" + lineCode + "'";
         List<GpsEntity> list =
                 jdbcTemplate.query(sql, (rs, rowNum) -> {
                     GpsEntity gps = new GpsEntity();
@@ -85,6 +93,7 @@ public class RecoveryByHistoryGps {
                     gps.setUpDown((byte) getUpOrDown(rs.getLong("SERVICE_STATE")));
                     gps.setServerTimestamp(rs.getLong("SERVER_TS"));
                     gps.setState((int) getService(rs.getLong("SERVICE_STATE")));
+                    gps.setValid(getGpsValid(rs.getLong("SERVICE_STATE")));
                     return gps;
                 });
  
@@ -92,6 +101,10 @@ public class RecoveryByHistoryGps {
         return list;
     }
  
+    public static byte getGpsValid(long serviceState) {
+        return (byte) (((serviceState & 0x80000000) == 0x80000000) ? 1 : 0);
+    }
+
     public static int getUpOrDown(long serviceState) {
         if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000
                 || (serviceState & 0x01000000) == 0x01000000 || (serviceState & 0x08000000) == 0x08000000)
@@ -109,7 +122,7 @@ public class RecoveryByHistoryGps {
         @Override
         public int compare(GpsEntity g1, GpsEntity g2) {
             if (g1.getTimestamp() == g2.getTimestamp())
-                return -1;
+                return 0;
             return (int) (g1.getTimestamp() - g2.getTimestamp());
         }
     }
@@ -163,8 +163,8 @@ public class GpsEntity implements Serializable {
  
     public void smoothTransition(long t) {
         int diff = (int) (t - timestamp), newSeconds;
-        //掉线1分半的，平滑过渡一下预测时间
-        if (diff > 1000 * 60 * 1.5) {
+        //时间差半分钟的，平滑过渡一下预测时间
+        if (diff > 1000 * 30) {
             newSeconds = seconds - (diff / 1000 - 15);
             seconds2 = newSeconds < 0 ? 0 : newSeconds;
         }
+package com.bsth.service;
+
+import com.bsth.entity.Accuracy;
+
+import java.util.List;
+
+public interface AccuracyDataService {
+
+    List<Accuracy> search(String rq
+            , String lineCode
+            , String st
+            , String et, String nbbm);
+}
+package com.bsth.service.impl;
+
+import com.bsth.entity.Accuracy;
+import com.bsth.service.AccuracyDataService;
+import com.bsth.util.db_utils.DBUtils_InfoPublish;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class AccuracyDataServiceImpl implements AccuracyDataService {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    private static DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyyMMddHH:mm");
+
+    @Override
+    public List<Accuracy> search(String rq, String lineCode, String st, String et, String nbbm) {
+        List<Accuracy> list = null;
+        try {
+
+            rq = rq.replaceAll("-", "");
+            long s = fmtyyyyMMddHHmm.parseMillis(rq + st);
+            long e = fmtyyyyMMddHHmm.parseMillis(rq + et);
+
+            String sql = "select * from bsth_h_forecast_accuracy where rq=" + rq + " and line_code='" + lineCode + "' and t1>=" + s + " and t1<=" + e;
+            if (StringUtils.isNotBlank(nbbm))
+                sql += " and nbbm like '%" + nbbm + "%'";
+
+            sql += " order by t1";
+            JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_InfoPublish.getDataSource());
+            list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(Accuracy.class));
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+        return list;
+    }
+}
@@ -161,7 +161,7 @@
             $('.left_menus ul>li.nav-item.active').removeClass('active');
             $(this).parents('li.nav-item').addClass('active');
             return false;
-        }).eq(4).trigger('click');
+        }).eq(5).trigger('click');
  
  
         $('body').bootstrapMaterialDesign();
-aaaa
 \ No newline at end of file
+<style>
+    #accuracy_data_page .table_wrap {
+        height: calc(100% - 70px);
+        margin-top: 25px;
+    }
+
+    #accuracy_data_page div.data_list {
+        overflow: auto;
+        height: calc(100% - 66px);
+        display: block;
+        position: relative;
+        font-size: 14px;
+    }
+
+    #accuracy_data_page table th:nth-of-type(1), #accuracy_data_page table td:nth-of-type(1) {
+        width: 10%;
+    }
+
+    #accuracy_data_page table th:nth-of-type(2), #accuracy_data_page table td:nth-of-type(2) {
+        width: 10%;
+    }
+
+    #accuracy_data_page table th:nth-of-type(3), #accuracy_data_page table td:nth-of-type(3) {
+        width: 10%;
+    }
+
+    #accuracy_data_page table th:nth-of-type(4), #accuracy_data_page table td:nth-of-type(4) {
+        width: 10%;
+    }
+
+    #accuracy_data_page table th:nth-of-type(5), #accuracy_data_page table td:nth-of-type(5) {
+        width: 10%;
+    }
+
+    #accuracy_data_page table th:nth-of-type(6), #accuracy_data_page table td:nth-of-type(6) {
+        width: 10%;
+    }
+
+    #accuracy_data_page table th:nth-of-type(7), #accuracy_data_page table td:nth-of-type(7) {
+        width: 10%;
+    }
+
+    #accuracy_data_page table th:nth-of-type(8), #accuracy_data_page table td:nth-of-type(8) {
+        width: 10%;
+    }
+
+    #accuracy_data_page table th:nth-of-type(9), #accuracy_data_page table td:nth-of-type(9) {
+        width: 10%;
+    }
+
+    #accuracy_data_page table th:nth-of-type(10), #accuracy_data_page table td:nth-of-type(10) {
+        width: 10%;
+    }
+
+    table i.material-icons {
+        font-size: 16px !important;
+        vertical-align: middle !important;
+        color: #FFC107;
+        margin-left: 2px;
+        cursor: default;
+    }
+</style>
+<div class="container-fluid page" id="accuracy_data_page">
+    <div class="card">
+
+        <div class="card-body" style="height: 100%">
+            <div class="top_form_card" style="width: 100%;">
+                <form>
+                    <div class="row">
+                        <div class="col-md-2">
+                            <div class="form-group">
+                                <label class="bmd-label-floating">日期</label>
+                                <input type="text" name="rq" required class="form-control flatpickr_date"
+                                       value="2018-07-02">
+                            </div>
+                        </div>
+                        <div class="col-md-2">
+                            <div class="form-group">
+                                <label class="bmd-label-floating">线路</label>
+                                <div class="ct_auto_wrap line_autocompleter">
+                                    <input type="text" name="lineName" required class="form-control" autocomplete="off">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-md-2" style="padding-right: 0">
+                            <div class="form-group">
+                                <label class="bmd-label-floating">时间</label>
+                                <input type="time" name="st" required class="form-control flatpickr_time" value="00:00">
+                            </div>
+                        </div>
+                        <div class="col-md-2" style="padding-left: 0">
+                            <div class="form-group">
+                                <label class="bmd-label-floating">至</label>
+                                <input type="time" name="et" required class="form-control flatpickr_time" value="23:00">
+                            </div>
+                        </div>
+                        <div class="col-md-2">
+                            <div class="form-group">
+                                <label class="bmd-label-floating">车辆</label>
+                                <input type="text" name="nbbm" class="form-control " autocomplete="off">
+                            </div>
+                        </div>
+                        <div class="col-md-1">
+                            <div class="form-group">
+                                <button type="submit" class="btn btn-primary btn-raised" style="margin-top: 22px;">
+                                    <i class="material-icons">search</i> 搜索
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+
+            <div class="table_wrap">
+                <div class="table-responsive">
+                    <table class="table table-hover" style="margin-bottom: 0;">
+                        <thead class="">
+                        <th>发布时间</th>
+                        <th>站点</th>
+                        <th>自编号</th>
+                        <th>车牌号</th>
+                        <th>站数</th>
+                        <th>距离（米）</th>
+                        <th>预计（秒）</th>
+                        <th>实际（秒）</th>
+                        <th>dd2</th>
+                        <th>状态</th>
+                        </thead>
+                    </table>
+
+                    <div class="data_list">
+                        <table class="table table-hover">
+                            <tbody></tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script id="accuracy_list-temp" type="text/html">
+    {{each list as obj i}}
+    <tr>
+        <td>{{obj.timeStr}}</td>
+        <td>{{obj.station}}</td>
+        <td>{{obj.nbbm}}</td>
+        <td>{{obj.plate}}</td>
+        <td>{{obj.stopDis}}</td>
+        <td>{{obj.distance}}</td>
+        <td>{{obj.seconds}}</td>
+        <td>{{obj.realSeconds}}</td>
+        <td>{{obj.d2}}</td>
+        <td>
+            {{if obj.status == 1}}
+                <span class="badge badge-success">准</span>
+            {{else if obj.status == -1}}
+                <span class="badge badge-danger">不准确</span>
+            {{/if}}
+        </td>
+    </tr>
+    {{/each}}
+</script>
+
+<script>
+    (function () {
+        var wrap = '#accuracy_data_page';
+
+        flatpickr(wrap + ' .flatpickr_date', flatpickrDateConfig);
+        $('[data-toggle="tooltip"]').tooltip();
+        //滚动条
+        $('div.data_list', wrap).perfectScrollbar({suppressScrollX: true});
+        //线路自动补全
+        $.get('/basic/lines', function (rs) {
+            var data = [], item;
+            for (var i = 0, len = rs.length; i < len; i++) {
+                item = rs[i];
+                data.push({
+                    code: item.lineCode,
+                    text: item.name,
+                    others: [item.fullChars, item.camelChars]
+                });
+            }
+            gb_ct_autocompleter.build($('.line_autocompleter', wrap), data);
+        });
+
+
+        var f = $('form', wrap);
+        f.on('submit', function () {
+            try {
+                query();
+            } catch (e) {
+                console.log(e);
+            }
+            return false;
+        });
+
+        function query() {
+            var data = f.serializeJSON();
+            data.lineCode = $('[name=lineName]', f).data('val');
+            if (!data.rq) {
+                gb_utils.showNotification('参数异常', '必须选择日期', 'danger');
+                return;
+            }
+
+            $.get('/accuracy_data/search', data, function (rs) {
+                var diff;
+                for (var i = 0, len = rs.length; i < len; i++) {
+                    rs[i].timeStr = moment(rs[i].t1).format('HH:mm');
+
+                    diff = Math.abs(rs[i]['realSeconds'] - rs[i]['seconds']);
+                    //是否准点
+                    if (diff > 60 * 3)
+                        rs[i].status = -1;
+                    else {
+
+                        if (diff / rs[i]['stopDis'] <  40)
+                            rs[i].status = 1;
+                        else
+                            rs[i].status = -1;
+                    }
+                }
+
+                var htmlStr = template('accuracy_list-temp', {list: rs});
+
+                $('div.data_list>table tbody', wrap).html(htmlStr);
+                $('div.data_list', wrap).perfectScrollbar('update');
+            });
+        }
+    })();
+</script>
 \ No newline at end of file