update...

panzh
1 parent c4167f3d
Showing 5 changed files with 35 additions and 25 deletions
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/data/geo/loader/DataLoader.java
src/main/java/com/bsth/data/geo/loader/thread/DataLoadThread.java
src/main/java/com/bsth/data/geo/loader/util/GeoCalculator.java
src/main/java/com/bsth/data/history/HistoryConsumeTimeDataHandler.java
@@ -63,7 +63,7 @@ public class StartCommand implements CommandLineRunner {
             logger.info("load geo data start...");
             fixedLoadCacheThread.run();
             logger.info("load geo data end...");
-            sexec.scheduleWithFixedDelay(fixedLoadCacheThread, 60 * 300, 60 * 300, TimeUnit.SECONDS);
+            sexec.scheduleWithFixedDelay(fixedLoadCacheThread, 60 * 10, 60 * 10, TimeUnit.SECONDS);
             /**/ //定时刷新班次信息
@@ -33,6 +33,7 @@ public class DataLoader {
     public void load(List<String> codes) {
         try {
+            logger.info("load geo data, codes: " + codes);
             String inCond = null;
             if (null != codes && codes.size() > 0) {
                 StringBuilder sb = new StringBuilder();
@@ -56,7 +57,7 @@ public class DataLoader {
                 //计算空间属性
                 fullSections = GeoCalculator.calc(stationMaps.get(k), sectionMaps.get(k));
-                if(null != fullSections)
+                if (null != fullSections)
                     fullSectionMaps.putAll(k, fullSections);
             }
@@ -75,7 +76,7 @@ public class DataLoader {
         List<CarPark> cps = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(CarPark.class));
         Polygon polygon;
-        for(CarPark cp : cps){
+        for (CarPark cp : cps) {
             polygon = GeoUtils.parsePolygon(cp.getPolygonStr());
             cp.setPolygon(polygon);
         }
@@ -96,7 +97,7 @@ public class DataLoader {
                 " FROM" +
                 " ( SELECT line_code, station_code, station_name AS NAME, station_route_code AS serial_no, directions AS up_down FROM bsth_c_stationroute WHERE destroy = 0 ) a" +
                 " LEFT JOIN bsth_c_station b ON a.station_code = b.station_cod"
-                + (inCont == null ? "" : " where a.line_code in (" + inCont + ")");
+                + (inCont == null ? "" : " where a.line_code in (" + inCont + ")") + " order by serial_no";
         List<StationRoute> srs = jdbcTemplate.query(sql
                 , BeanPropertyRowMapper.newInstance(StationRoute.class));
@@ -123,7 +124,7 @@ public class DataLoader {
                 " FROM " +
                 " ( SELECT line_code, directions, sectionroute_code AS i, section_code FROM bsth_c_sectionroute WHERE destroy = 0 ) a " +
                 " LEFT JOIN bsth_c_section b ON a.section_code = b.section_code "
-                + (inCont == null ? "" : " where a.line_code in (" + inCont + ")");
+                + (inCont == null ? "" : " where a.line_code in (" + inCont + ")") + " order by i";
         List<SectionRoute> srs = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(SectionRoute.class));
@@ -36,20 +36,19 @@ public class DataLoadThread extends Thread {
     public void run() {
         try {
-            t = System.currentTimeMillis();
             if (firstLoadFlag) {
                 cacheLoader.load(null);
                 firstLoadFlag = false;
             } else {
-                String timeStr = fmtyyyyMMddHHmm.print(t),
-                        sql = "select DISTINCT line_code from bsth_c_sectionroute where section_code in (select section_code from bsth_c_section where update_date>='" + timeStr + "') " +
-                                        " UNION" +
-                                        " select DISTINCT line_code from bsth_c_stationroute where station_code in ( select station_cod from bsth_c_station where update_date>='" + timeStr + "') " +
-                                        " UNION" +
-                                        " select DISTINCT line_code from bsth_c_stationroute where update_date>='" + timeStr + "' " +
-                                        " UNION" +
-                                        " select DISTINCT line_code from bsth_c_sectionroute where update_date>='" + timeStr + "'";
+                String timeStr = fmtyyyyMMddHHmm.print(t - 1000 * 20);
+                String sql = "select DISTINCT line_code from bsth_c_sectionroute where section_code in (select section_code from bsth_c_section where update_date>='" + timeStr + "') " +
+                        " UNION" +
+                        " select DISTINCT line_code from bsth_c_stationroute where station_code in ( select station_cod from bsth_c_station where update_date>='" + timeStr + "') " +
+                        " UNION" +
+                        " select DISTINCT line_code from bsth_c_stationroute where update_date>='" + timeStr + "' " +
+                        " UNION" +
+                        " select DISTINCT line_code from bsth_c_sectionroute where update_date>='" + timeStr + "'";
                 List<String> codes = jdbcTemplate.queryForList(sql, String.class);
@@ -57,6 +56,8 @@ public class DataLoadThread extends Thread {
                 if (codes.size() > 0)
                     cacheLoader.load(codes);
             }
+
+            t = System.currentTimeMillis();
         } catch (Exception e) {
             logger.error("", e);
         }
@@ -162,10 +162,10 @@ public class GeoCalculator {
         }
         //路段倒着画
-        double d1 = GeoUtils.getDistance(all.get(0), sections.get(0));
+
+        double d4 = GeoUtils.getDistance(all.get(size - 1), sections.get(size2 - 1));double d1 = GeoUtils.getDistance(all.get(0), sections.get(0));
         double d2 = GeoUtils.getDistance(all.get(0), sections.get(size2 - 1));
         double d3 = GeoUtils.getDistance(all.get(size - 1), sections.get(0));
-        double d4 = GeoUtils.getDistance(all.get(size - 1), sections.get(size2 - 1));
         int dt = 10;
         if (d1 < dt && d1 < d2)
@@ -131,8 +131,9 @@ public class HistoryConsumeTimeDataHandler {
         Application.mainServices.scheduleAtFixedRate(consumeTimeLoadThread
                 , timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
-        if (timeDiff > 1000 * 60 * 10)
-            consumeTimeLoadThread.run();
+        consumeTimeLoadThread.run();
+        //if (timeDiff > 1000 * 60 * 10)
+        //    consumeTimeLoadThread.run();
     }
     public static LineConsumeTime getLct(String lineCode, int upDown) {
@@ -230,7 +231,7 @@ public class HistoryConsumeTimeDataHandler {
                 dt.minusDays(7);//减7天
                 String rq = dt.toString("yyyyMMdd ");
-                rq = "20180625";
+                rq = "20180626";
                 String sql = "select * from bsth_h_consume_time where rq=" + rq;
                 JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_InfoPublish.getDataSource());
                 List<StationConsumeTime> list =
@@ -276,7 +277,7 @@ public class HistoryConsumeTimeDataHandler {
                 if (map.size() > 0)
                     lctMaps = map;
-                logger.info("calc end...");
+                logger.info("load ConsumeTime end...");
             } catch (Exception e) {
                 logger.error("", e);
             }
@@ -343,12 +344,19 @@ public class HistoryConsumeTimeDataHandler {
                 return null;
             List<Integer> ns = new ArrayList<>(list.size());
             //把进站距离部分 均算成耗时
-            double inD;
-            int normal = 40;
+            double ad;
+            int normal = 20;
             for (StationConsumeTime sct : list) {
-                inD = sct.getInD1() + sct.getInD2();
-                if (inD > normal)
-                    sct.setSeconds((int) (sct.getSeconds() + ((inD - normal) / IN_STATION_SPEED)));
+
+                //加进距2
+                if (sct.getInD2() > normal) {
+                    sct.setSeconds((int) (sct.getSeconds() + ((sct.getInD2() - normal) / IN_STATION_SPEED)));
+                }
+
+                //减进距1
+                if (sct.getInD1() > normal) {
+                    sct.setSeconds((int) (sct.getSeconds() - ((sct.getInD1() - normal) / IN_STATION_SPEED)));
+                }
                 ns.add(sct.getSeconds());
             }