update...

panzh
1 parent de957a9b
Showing 9 changed files with 80 additions and 62 deletions
src/main/java/com/bsth/controller/XmlInfoPublishController.java
src/main/java/com/bsth/data/gps/process/DataMainProcessor.java
src/main/java/com/bsth/data/gps/process/chains/InOutStationProcess.java
src/main/java/com/bsth/data/history/HistoryConsumeTimeDataHandler.java
src/main/java/com/bsth/entity/GpsEntity.java
src/main/java/com/bsth/util/geo/GeoUtils.java
src/main/resources/static/index.html
src/main/resources/static/pages/h_consume/list.html
src/main/resources/static/pages/interface_test/iTest.html
@@ -140,6 +140,7 @@ public class XmlInfoPublishController {
             List<GpsEntity> list = GpsCacheData.findList(lineid, upDown);
             Map<String, Double> disMap = new HashMap<>();
+            Map<String, Integer> snMap = new HashMap<>();
             List<StationRoute> srs = GeoCacheData.find(lineid, upDown);
             StationRoute es = GeoCacheData.findByCode(lineid, upDown, stopid), s = null;
@@ -147,6 +148,7 @@ public class XmlInfoPublishController {
             List<GpsEntity> vs = new ArrayList<>();
             ScheduleRealInfo sch = null;
             double sum;
+            int sn;
             int serialNo = es.getSerialNo();
             for (GpsEntity gps : list) {
@@ -155,8 +157,17 @@ public class XmlInfoPublishController {
                 if (null == s || s.getSerialNo() > serialNo)
                     continue;
+                if ("B".equals(s.getMark()) && gps.getInOut() == 1)
+                    continue;//起点站 站内车辆
+
                 sch = gps.getSch();
                 if (null != sch) {//有班次
+                    if ("ldks".equals(sch.getBcType())
+                            || "venting".equals(sch.getBcType())
+                            || "in".equals(sch.getBcType())
+                            || "out".equals(sch.getBcType()))
+                        continue;//非营运班次
+
                     if (serialNo > sch.getQdzNo() && serialNo < sch.getZdzNo())
                         vs.add(gps);
                 } else {
@@ -164,15 +175,18 @@ public class XmlInfoPublishController {
                 }
                 sum = 0;
+                sn = 1;
                 for (StationRoute sr : srs) {
                     if (sr.getSerialNo() < serialNo
                             && sr.getSerialNo() > gps.getStationNo()) {
                         sum += sr.getLength();
+                        sn++;
                     }
                 }
                 disMap.put(gps.getDeviceId(), sum);
+                snMap.put(gps.getDeviceId(), sn);
             }
@@ -187,7 +201,8 @@ public class XmlInfoPublishController {
             for (GpsEntity v : vs) {
                 sb.append("<car>");
                 sb.append("<terminal>" + BasicCacheData.device2plateMap.get(v.getDeviceId()) + "</terminal>");
-                sb.append("<stopdis>" + df.format(v.getStopDis()) + "</stopdis>");
+                //sb.append("<terminal>" + v.getNbbm() + "</terminal>");
+                sb.append("<stopdis>" + snMap.get(v.getDeviceId()) + "</stopdis>");
                 sb.append("<distance>" + df.format((disMap.get(v.getDeviceId()) + v.getDistance())) + "</distance>");
                 sb.append("<time>" + forecast.get(v.getDeviceId()) + "</time>");
                 sb.append("</car>");
@@ -52,7 +52,7 @@ public class DataMainProcessor {
     public void start() {
         Application.mainServices.scheduleWithFixedDelay(dataLoaderThread
-                , 40, 10, TimeUnit.SECONDS);
+                , 40, 5, TimeUnit.SECONDS);
     }
     public void process(ArrayListMultimap<String, GpsEntity> data) {
@@ -112,7 +112,7 @@ public class InOutStationProcess {
                 continue;
             for (int i = 1, size = ps.size(); i < size; i++) {
-                distance = GeoUtils.getDistanceFromLine(p, ps.get(i - 1), ps.get(i));
+                distance = GeoUtils.getDistanceFromLine(ps.get(i - 1), ps.get(i), p);
                 if (Double.isNaN(distance))
                     continue;
 package com.bsth.data.history;
 import com.bsth.Application;
+import com.bsth.data.BasicCacheData;
 import com.bsth.data.geo.GeoCacheData;
 import com.bsth.data.history.entity.LineConsumeTime;
 import com.bsth.data.history.entity.StationConsumeTime;
 import com.bsth.entity.GpsEntity;
+import com.bsth.entity.Line;
 import com.bsth.entity.StationRoute;
 import com.bsth.util.DateUtils;
 import com.bsth.util.db_utils.DBUtils_InfoPublish;
@@ -59,7 +61,7 @@ public class HistoryConsumeTimeDataHandler {
      */
     private static ConcurrentMap<String, LineConsumeTime> lctMaps;
-    Logger logger = LoggerFactory.getLogger(this.getClass());
+    static Logger logger = LoggerFactory.getLogger(HistoryConsumeTimeDataHandler.class);
     static {
         lastInStationMap = new ConcurrentHashMap();
@@ -109,8 +111,8 @@ public class HistoryConsumeTimeDataHandler {
     public void start() {
         //将到离站数据入库
-        //Application.mainServices.scheduleWithFixedDelay(consumeTimePstThread
-        //        , 60, 30, TimeUnit.SECONDS);
+        Application.mainServices.scheduleWithFixedDelay(consumeTimePstThread
+                , 30, 30, TimeUnit.SECONDS);
         //凌晨一点
@@ -226,8 +228,23 @@ public class HistoryConsumeTimeDataHandler {
                         jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(StationConsumeTime.class));
                 logger.info("select end,, " + list.size());
-                //按线路、走向、早晚高峰分组
                 ArrayListMultimap<String, StationConsumeTime> multimap = ArrayListMultimap.create();
+
+                /**
+                 * 初始化key
+                 * 保证即使某时段缺少历史数据的时候，仍然可以根据 key ，用实时距离初始化一份耗时数据
+                 */
+                Collection<Line> ls = BasicCacheData.code2LineMap.values();
+                for (Line line : ls) {
+                    multimap.putAll(line.getLineCode() + "_0_0", new ArrayList<>());
+                    multimap.putAll(line.getLineCode() + "_0_1", new ArrayList<>());
+                    multimap.putAll(line.getLineCode() + "_0_2", new ArrayList<>());
+                    multimap.putAll(line.getLineCode() + "_1_0", new ArrayList<>());
+                    multimap.putAll(line.getLineCode() + "_1_1", new ArrayList<>());
+                    multimap.putAll(line.getLineCode() + "_1_2", new ArrayList<>());
+                }
+
+                //按线路、走向、早晚高峰分组
                 int peakVal, v;
                 for (StationConsumeTime sct : list) {
                     peakVal = 1;
@@ -244,7 +261,7 @@ public class HistoryConsumeTimeDataHandler {
                 LineConsumeTime lct;
                 Set<String> ks = multimap.keySet();
                 for (String k : ks) {
-                    lct = buildLineConsumeData(multimap.get(k));
+                    lct = buildLineConsumeData(multimap.get(k), k);
                     map.put(k, lct);
                 }
@@ -256,9 +273,10 @@ public class HistoryConsumeTimeDataHandler {
             }
         }
-        private LineConsumeTime buildLineConsumeData(List<StationConsumeTime> list) {
-            String lineCode = list.get(0).getLineCode();
-            int upDown = list.get(0).getUpDown();
+        private LineConsumeTime buildLineConsumeData(List<StationConsumeTime> list, String k) {
+            String[] arr = k.split("_");
+            String lineCode = arr[0];
+            int upDown = Integer.parseInt(arr[1]);
             LineConsumeTime lct = new LineConsumeTime();
             lct.setLineCode(lineCode);
@@ -425,30 +443,34 @@ public class HistoryConsumeTimeDataHandler {
      */
     public static void batchSaveConsumeData(List<StationConsumeTime> list) {
         //写入数据
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_InfoPublish.getDataSource());
-        jdbcTemplate.batchUpdate("insert into bsth_h_consume_time(rq,line_code,up_down,key1,key2,in_d1,in_d2,distance,seconds,time_str,nbbm) " +
-                " values (?,?,?,?,?,?,?,?,?,?,?)", new BatchPreparedStatementSetter() {
-
-            @Override
-            public void setValues(PreparedStatement ps, int i) throws SQLException {
-                StationConsumeTime sct = list.get(i);
-                ps.setInt(1, sct.getRq());
-                ps.setString(2, sct.getLineCode());
-                ps.setInt(3, sct.getUpDown());
-                ps.setString(4, sct.getKey1());
-                ps.setString(5, sct.getKey2());
-                ps.setDouble(6, sct.getInD1());
-                ps.setDouble(7, sct.getInD2());
-                ps.setDouble(8, sct.getDistance());
-                ps.setInt(9, sct.getSeconds());
-                ps.setString(10, sct.getTimeStr());
-                ps.setString(11, sct.getNbbm());
-            }
+        try {
+            JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_InfoPublish.getDataSource());
+            jdbcTemplate.batchUpdate("insert into bsth_h_consume_time(rq,line_code,up_down,key1,key2,in_d1,in_d2,distance,seconds,time_str,nbbm) " +
+                    " values (?,?,?,?,?,?,?,?,?,?,?)", new BatchPreparedStatementSetter() {
+
+                @Override
+                public void setValues(PreparedStatement ps, int i) throws SQLException {
+                    StationConsumeTime sct = list.get(i);
+                    ps.setInt(1, sct.getRq());
+                    ps.setString(2, sct.getLineCode());
+                    ps.setInt(3, sct.getUpDown());
+                    ps.setString(4, sct.getKey1());
+                    ps.setString(5, sct.getKey2());
+                    ps.setDouble(6, sct.getInD1());
+                    ps.setDouble(7, sct.getInD2());
+                    ps.setDouble(8, sct.getDistance());
+                    ps.setInt(9, sct.getSeconds());
+                    ps.setString(10, sct.getTimeStr());
+                    ps.setString(11, sct.getNbbm());
+                }
-            @Override
-            public int getBatchSize() {
-                return list.size();
-            }
-        });
+                @Override
+                public int getBatchSize() {
+                    return list.size();
+                }
+            });
+        } catch (Exception e) {
+            logger.error("", e);
+        }
     }
 }
@@ -50,10 +50,6 @@ public class GpsEntity implements Serializable {
     private String stationCode;
     private String stationName;
     private int stationNo;
-    /**
-     * 当前站点站距信息
-     */
-    private double stopDis;
     /**
      * 0: 站外 1： 站内 2：场内
@@ -147,14 +143,12 @@ public class GpsEntity implements Serializable {
         this.stationCode = s.getStationCode();
         this.stationName = s.getName();
         this.stationNo = s.getSerialNo();
-        this.stopDis = s.getLength();
     }
     public void setStationInfo(GpsEntity prev){
         this.stationCode = prev.stationCode;
         this.stationName = prev.stationName;
         this.stationNo = prev.stationNo;
-        this.stopDis = prev.stopDis;
     }
     public Point getPoint(){
@@ -369,11 +363,4 @@ public class GpsEntity implements Serializable {
         this.release = release;
     }
-    public double getStopDis() {
-        return stopDis;
-    }
-
-    public void setStopDis(double stopDis) {
-        this.stopDis = stopDis;
-    }
 }
@@ -64,7 +64,7 @@ public class GeoUtils {
      */
     public static double getDistanceFromLine(Point s, Point e, Point p) {
         if (isPointInLine(p, s, e))
-            return 0;
+            return 0.5;
         double d1 = getDistance(s, p);
         double d2 = getDistance(p, e);
@@ -54,23 +54,17 @@
                     </a>
                 </li>
                 <li class="nav-item ">
-                    <a class="nav-link" href="../examples/typography.html">
-                        <i class="material-icons">history</i>
-                        <p>历史查询</p>
-                    </a>
-                </li>
-                <li class="nav-item ">
                     <a class="nav-link" href="/pages/interface_test/iTest.html">
                         <i class="material-icons">info</i>
                         <p>信息发布接口测试</p>
                     </a>
-                </li>
+                </li><!--
                 <li class="nav-item ">
                     <a class="nav-link" href="../examples/maps.html">
                         <i class="material-icons">bar_chart</i>
                         <p>统计分析</p>
                     </a>
-                </li>
+                </li>-->
             </ul>
         </div>
     </div>
@@ -152,7 +146,7 @@
             $('.left_menus ul>li.nav-item.active').removeClass('active');
             $(this).parents('li.nav-item').addClass('active');
             return false;
-        }).eq(5).trigger('click');
+        }).eq(4).trigger('click');
         $('body').bootstrapMaterialDesign();
@@ -71,7 +71,7 @@
                             <div class="form-group">
                                 <label class="bmd-label-floating">日期</label>
                                 <input type="text" name="rq" required class="form-control flatpickr_date"
-                                       value="2018-06-14">
+                                       value="2018-06-20">
                             </div>
                         </div>
                         <div class="col-md-2">
@@ -85,13 +85,13 @@
                         <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">
+                                <input type="time" name="st" required class="form-control flatpickr_time" value="05: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:59">
+                                <input type="time" name="et" required class="form-control flatpickr_time" value="10:00">
                             </div>
                         </div>
                         <div class="col-md-2">
@@ -60,7 +60,7 @@
                         <div class="col-md-2 field" style="margin-top: 5px;">
                             <div class="form-group">
                                 <label class="bmd-label-floating">时间（t）</label>
-                                <input type="text" name="t" class="form-control" value="2018-06-25 12:10">
+                                <input type="text" name="t" class="form-control" value="">
                             </div>
                         </div>
                         <div class="col-md-1">