Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong

娄高锋
2 parents cfd48412 17469ee9
Showing 4 changed files with 42 additions and 34 deletions
src/main/java/com/bsth/data/gpsdata_v2/cache/GeoCacheData.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/resources/fatso/package.json
@@ -21,6 +21,8 @@ import org.springframework.stereotype.Component;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 /**
  * 空间数据缓存
@@ -38,7 +40,7 @@ public class GeoCacheData {
     /**
      * 路段编码和名称对照
      */
-    private static Map<String, String> sectionCode2Name;
+    private static ConcurrentMap<String, String> sectionCode2Name;
     /**
      * 线路站点路由
      */
@@ -50,15 +52,15 @@ public class GeoCacheData {
     /**
      * 线路_上下行_站点编码 ——> 站点
      */
-    private static Map<String, StationRoute> routeCodeMap;
+    private static ConcurrentMap<String, StationRoute> routeCodeMap;
     /**
      * 停车场
      */
-    public static Map<String, Polygon> tccMap;
+    public static ConcurrentMap<String, Polygon> tccMap;
     /**
      * 线路限速信息
      */
-    private static Map<String, Double> speedLimitMap;
+    private static ConcurrentMap<String, Double> speedLimitMap;
     @Autowired
     JdbcTemplate jdbcTemplate;
@@ -118,7 +120,7 @@ public class GeoCacheData {
         //按线路和走向分组
         if (routeList.size() > 0) {
             ArrayListMultimap<String, StationRoute> tempMap = ArrayListMultimap.create();
-            Map<String, StationRoute> codeMap = new HashMap<>(routeList.size());
+            ConcurrentMap<String, StationRoute> codeMap = new ConcurrentHashMap<>(routeList.size());
             for (StationRoute sr : routeList) {
                 tempMap.put(sr.getLineCode() + "_" + sr.getDirections(), sr);
                 //站点编码 ——> 和路由顺序对照
@@ -141,7 +143,7 @@ public class GeoCacheData {
         //加载停车场数据
         String sql = "select PARK_CODE, ST_AsText(G_PARK_POINT) as G_PARK_POINT from bsth_c_car_park where park_code is not null and b_park_point is not null and destroy=0";
         List<Map<String, Object>> tccList = jdbcTemplate.queryForList(sql);
-        Map<String, Polygon> tccTempMap = new HashMap<>();
+        ConcurrentMap<String, Polygon> tccTempMap = new ConcurrentHashMap<>();
         Polygon polygon;
         for (Map<String, Object> tMap : tccList) {
@@ -163,7 +165,7 @@ public class GeoCacheData {
         //加载线路限速信息
         String sql = "select l.LINE_CODE,i.SPEEDING from bsth_c_line_information i left join bsth_c_line l on i.line=l.id where i.speed_limit is not null";
         List<Map<String, Object>> speedMap = jdbcTemplate.queryForList(sql);
-        Map<String, Double> speedTempMap = new HashMap<>();
+        ConcurrentMap<String, Double> speedTempMap = new ConcurrentHashMap();
         for (Map<String, Object> tMap : speedMap) {
             try {
                 speedTempMap.put(tMap.get("LINE_CODE").toString(), Double.parseDouble(tMap.get("SPEEDING").toString()));
@@ -208,7 +210,7 @@ public class GeoCacheData {
         if(sectionCacheTempMap.size() > 0)
             sectionCacheMap = sectionCacheTempMap;
-        Map<String, String> sectionCode2NameTemp = new HashMap<>();
+        ConcurrentMap<String, String> sectionCode2NameTemp = new ConcurrentHashMap<>();
         //加载全量路段编码和名称对照
         sql = "select SECTION_CODE,SECTION_NAME,CROSES_ROAD from bsth_c_section";
@@ -38,6 +38,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
 /**
  * @author PanZhao
@@ -63,10 +64,10 @@ public class DayOfSchedule {
     private static ArrayListMultimap<String, ScheduleRealInfo> lpScheduleMap;
     // 班次主键映射
-    private static Map<Long, ScheduleRealInfo> id2SchedulMap;
+    private static ConcurrentMap<Long, ScheduleRealInfo> id2SchedulMap;
     //车辆 ——> 当前执行班次
-    private static Map<String, ScheduleRealInfo> carExecutePlanMap;
+    private static ConcurrentMap<String, ScheduleRealInfo> carExecutePlanMap;
     // 持久化
     public static ConcurrentLinkedQueue<ScheduleRealInfo> pstBuffer;
@@ -1098,7 +1099,7 @@ public class DayOfSchedule {
      */
     public int reCalcIdMaps(){
         Collection<ScheduleRealInfo> all = findAll();
-        Map<Long, ScheduleRealInfo> id2SchedulMapCopy = new ConcurrentHashMap<>();
+        ConcurrentMap<Long, ScheduleRealInfo> id2SchedulMapCopy = new ConcurrentHashMap<>();
         for(ScheduleRealInfo sch : all){
             id2SchedulMapCopy.put(sch.getId(), sch);
@@ -68,8 +68,6 @@ public class LateAdjustHandle implements ApplicationContextAware{
                     //通知客户端
                     sch.setLate2(true);
                     sendUtils.sendAutoWdtz(sch, old);
-
-                    logger.info("【应发未到】班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入误点调整！");
                 }
             }
@@ -84,19 +82,26 @@ public class LateAdjustHandle implements ApplicationContextAware{
      * @return 返回被移除的误点班次
      */
     private static ScheduleRealInfo popLateSch(ScheduleRealInfo sch) {
-        List<ScheduleRealInfo> list = lateSchMaps.get(sch.getXlBm());
+        List<ScheduleRealInfo> list = lateSchMaps.get(sch.getClZbh());
-        if(null == list || list.size() == 0)
+        if(null == list || list.size() == 0){
             lateSchMaps.put(sch.getClZbh(), sch);
+            logger.info("【应发未到】班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入误点调整！");
+        }
         else {
             ScheduleRealInfo old = findExistQdz(list, sch.getQdzCode(), sch.getQdzName());
+            if(null == old){
+                lateSchMaps.put(sch.getClZbh(), sch);
+                logger.info("【应发未到 -多个("+lateSchMaps.get(sch.getClZbh()).size()+")】班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入误点调整！");
+            }
             //同一个起点，保留时间最大的班次
-            if(null == old || old.getDfsjT() < sch.getDfsjT()){
+            else if(old.getDfsjT() < sch.getDfsjT()){
                 lateSchMaps.remove(old.getClZbh(), old);
                 lateSchMaps.put(sch.getClZbh(), sch);
                 logger.info(sch.getClZbh() + "【应发未到】old 班次 " + old.getId() + " -被覆盖！");
+                logger.info("【应发未到 -多个("+lateSchMaps.get(sch.getClZbh()).size()+")】班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入误点调整！");
                 return old;
             }
         }
-{
-  "name": "fatso",
-  "version": "1.0.0",
-  "description": "子页面js检查、合并、压缩等处理",
-  "main": "start.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "panzhaov5",
-  "license": "ISC",
-  "dependencies": {
-    "cheerio": "^0.20.0",
-    "clean-css": "^4.0.12",
-    "colors": "^1.1.2",
-    "eventproxy": "^0.3.4",
-    "uglify-js": "^2.6.2"
-  }
-}
+{
+  "name": "fatso",
+  "version": "1.0.0",
+  "description": "子页面js检查、合并、压缩等处理",
+  "main": "start.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "panzhaov5",
+  "license": "ISC",
+  "dependencies": {
+    "cheerio": "^0.20.0",
+    "clean-css": "^4.0.12",
+    "colors": "^1.1.2",
+    "eventproxy": "^0.3.4",
+    "uglify-js": "^2.6.2"
+  }
+}
 \ No newline at end of file