[update] 微观大数据平台-缓存优化

signal-optimize-service/src/main/java/net/wanji/opt/cache/BaseCrossInfoCache.java

@@ -5,11 +5,11 @@ import net.wanji.databus.dao.mapper.BaseCrossInfoMapper;
 import net.wanji.databus.po.BaseCrossInfoPO;
 import net.wanji.databus.vo.CrossInfoVO;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -22,7 +22,7 @@ import java.util.stream.Collectors;
 @Slf4j
 public class BaseCrossInfoCache implements CommandLineRunner {
 
-    @Autowired
+    @Resource
     private BaseCrossInfoMapper baseCrossInfoMapper;
 
     private static final List<BaseCrossInfoPO> crossInfoList = new ArrayList<>();
@@ -54,8 +54,7 @@ public class BaseCrossInfoCache implements CommandLineRunner {
      * @return
      */
     public List<String> getIsSignalCrossIdList() {
-        List<String> isSignalCrossIdList = crossInfoList.stream().filter(crossInfoPO -> crossInfoPO.getIsSignal() == 1).map(BaseCrossInfoPO::getId).collect(Collectors.toList());
-        return isSignalCrossIdList;
+        return crossInfoList.stream().filter(crossInfoPO -> crossInfoPO.getIsSignal() == 1).map(BaseCrossInfoPO::getId).collect(Collectors.toList());
     }
 
     public String getCrossName(String crossId) {

signal-optimize-service/src/main/java/net/wanji/opt/cache/BaseCrossPhaseInfoCache.java

@@ -29,7 +29,7 @@ public class BaseCrossPhaseInfoCache implements CommandLineRunner {
      * 路口相位缓存
      * key:crossId value:List<CrossPhasePO>
      */
-    private static Map<String, List<CrossPhasePO>> crossPhaseInfoMap = new HashMap<>();
+    private static final Map<String, List<CrossPhasePO>> crossPhaseInfoMap = new HashMap<>();
 
     /**
      * 获取所有路口相位列表
@@ -48,14 +48,7 @@ public class BaseCrossPhaseInfoCache implements CommandLineRunner {
         if (!crossPhaseInfoMap.isEmpty()) {
             return crossPhaseInfoMap.get(crossId);
         }
-        return Collections.EMPTY_LIST;
-    }
-
-    /**
-     * 刷新缓存
-     */
-    public void refresh() {
-        init();
+        return Collections.emptyList();
     }
 
     @Override
@@ -66,7 +59,7 @@ public class BaseCrossPhaseInfoCache implements CommandLineRunner {
     public void init() {
         List<CrossPhasePO> crossPhasePOS = baseCrossPhaseMapper.listCrossPhasePO(new CrossPhasePO());
         if (!CollectionUtils.isEmpty(crossPhasePOS)) {
-            crossPhaseInfoMap = crossPhasePOS.stream().collect(Collectors.groupingBy(CrossPhasePO::getCrossId));
+            crossPhaseInfoMap.putAll(crossPhasePOS.stream().collect(Collectors.groupingBy(CrossPhasePO::getCrossId)));
         }
     }
 }

signal-optimize-service/src/main/java/net/wanji/opt/cache/BaseCrossSchemeInfoCache.java

@@ -27,7 +27,7 @@ public class BaseCrossSchemeInfoCache implements CommandLineRunner {
     /**
      * key:crossId_id  value:CrossSchemePO
      */
-    private static Map<String, BaseCrossSchemePO> crossSchemeInfoMap = new HashMap<>();
+    private static final Map<String, BaseCrossSchemePO> crossSchemeInfoMap = new HashMap<>();
 
     /**
      * 获取所有路口方案信息
@@ -49,13 +49,6 @@ public class BaseCrossSchemeInfoCache implements CommandLineRunner {
         return null;
     }
 
-    /**
-     * 刷新缓存
-     */
-    public void refresh() {
-        init();
-    }
-
     @Override
     public void run(String... args) throws Exception {
         init();

signal-optimize-service/src/main/java/net/wanji/opt/cache/CrossDirTurnPhaseCache.java

@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
 @Slf4j
 public class CrossDirTurnPhaseCache implements CommandLineRunner {
 
-    private static Map<String, CrossPhaseDTO> phaseMap = new HashMap<>();
+    private static final Map<String, CrossPhaseDTO> phaseMap = new HashMap<>();
 
     @Resource
     CrossSchedulesService crossSchedulesService;

signal-optimize-service/src/main/java/net/wanji/opt/cache/CrossRidInfoCache.java

@@ -26,7 +26,7 @@ public class CrossRidInfoCache implements CommandLineRunner {
     @Resource
     RidInfoMapper ridInfoMapper;
 
-    private static List<RidInfoEntity> ridInfoList = new ArrayList<>();
+    private static final List<RidInfoEntity> ridInfoList = new ArrayList<>();
 
     /**
      * 获取所有路口关联列表