[add] 灯态增加线程

signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/cache/SignalDataCache.java

@@ -26,5 +26,5 @@ public class SignalDataCache {
     public static final Map<String, LightsStatusVO> runningStateInfoCache = new ConcurrentHashMap<>();
     // 海信推送方案相位信息，未计算灯态缓存
     public static final Map<String, LightsStatusVO> runningStateInfoCacheNoLamp = new ConcurrentHashMap<>();
-    public static final Map<String, Long> runningStatusStampMap = new HashMap<>();
+    public static final Map<String, Long> runningStatusStampMap = new ConcurrentHashMap<>();
 }

signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/task/HisensePhaseCountDownTask.java

@@ -19,6 +19,7 @@ import net.wanji.utc.hisense.pojo.dto.CrossSchemePhaseCountDownDTO;
 import net.wanji.utc.hisense.pojo.dto.PhaseCountDownDTO;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
@@ -40,60 +41,65 @@ public class HisensePhaseCountDownTask {
     private CrossSchemeMapper crossSchemeMapper;
     @Resource
     private CrossLightsMapper crossLightsMapper;
+    @Resource(name = "commonThreadPoolExecutor")
+    ThreadPoolTaskExecutor commonThreadPoolExecutor;
 
     @Scheduled(fixedRate = 1000, initialDelay = 1000)
     public void phaseTimeCountDown() throws Exception {
-        try {
-            Map<String, LightsStatusVO> runningStateInfoCacheNoLamp = SignalDataCache.runningStateInfoCacheNoLamp;
-            if (!runningStateInfoCacheNoLamp.isEmpty()) {
-                for (Map.Entry<String, LightsStatusVO> entry : runningStateInfoCacheNoLamp.entrySet()) {
-                    String crossId = entry.getKey();
-                    LightsStatusVO lightsStatusVO = entry.getValue();
-                    long timeStamp = Long.parseLong(lightsStatusVO.getTimeStamp());
-                    String schemeStartTime = lightsStatusVO.getSchemeStartTime();
-                    String phaseId = lightsStatusVO.getPhaseId();
-                    String schemeId = lightsStatusVO.getSchemeId();
-                    CrossSchemePO crossSchemePO = crossSchemeMapper.selectByCrossIdAndSchemeNo(crossId, Integer.valueOf(schemeId));
+        commonThreadPoolExecutor.execute(() -> {
+            try {
+                Map<String, LightsStatusVO> runningStateInfoCacheNoLamp = SignalDataCache.runningStateInfoCacheNoLamp;
+                if (!runningStateInfoCacheNoLamp.isEmpty()) {
+                    for (Map.Entry<String, LightsStatusVO> entry : runningStateInfoCacheNoLamp.entrySet()) {
+                        String crossId = entry.getKey();
+                        LightsStatusVO lightsStatusVO = entry.getValue();
+                        long timeStamp = Long.parseLong(lightsStatusVO.getTimeStamp());
+                        String schemeStartTime = lightsStatusVO.getSchemeStartTime();
+                        String phaseId = lightsStatusVO.getPhaseId();
+                        String schemeId = lightsStatusVO.getSchemeId();
+                        CrossSchemePO crossSchemePO = crossSchemeMapper.selectByCrossIdAndSchemeNo(crossId, Integer.valueOf(schemeId));
 
-                    // 通过时段表，切换方案 凌晨00：00 如果切换下一个日期方案，可能RefreshCacheTask还没执行
-                    String nextSectionSchemeNo = CrossRunSchemeCache.currentRunSchemeNoCache.get(crossId);
-                    Date currentDate = new Date();
-                    String currentTime = String.valueOf(currentDate.getTime());
-                    Date date2HoursAgo = DateUtils.addHours(currentDate, -1);
-                    if (StringUtils.equalsIgnoreCase(schemeStartTime, currentTime) || Long.parseLong(schemeStartTime) < date2HoursAgo.getTime()) {
-                        crossSchemePO = crossSchemeMapper.selectByCrossIdAndSchemeNo(crossId, Integer.valueOf(nextSectionSchemeNo));
-                        executeNextSectionScheme(crossId, lightsStatusVO, crossSchemePO);
-                        lightsStatusVO.setCycleLen(crossSchemePO.getCycle());
-                    } else {
-                        executeNextPeriod(crossId, lightsStatusVO, phaseId, crossSchemePO);
-                    }
-                    // 当前方案下一周期
-                    setDirLampGroupMap(lightsStatusVO);
-                    if (Objects.nonNull(lightsStatusVO.getDirLampGroupMap())) {
-                        if (Objects.equals(crossId, "13NI00B5RM0")) {
-                            List<String> dirList = Arrays.asList("1", "3", "7");
-                            Map<String, Object> dirLampGroupMap = lightsStatusVO.getDirLampGroupMap();
-                            for (String dir : dirList) {
-                                if (!dirLampGroupMap.containsKey(dir)) {
-                                    Map<Integer, String> value = new HashMap<>();
-                                    setAllTurnColorRed(value, null, null);
-                                    dirLampGroupMap.put(dir, value);
+                        // 通过时段表，切换方案 凌晨00：00 如果切换下一个日期方案，可能RefreshCacheTask还没执行
+                        String nextSectionSchemeNo = CrossRunSchemeCache.currentRunSchemeNoCache.get(crossId);
+                        Date currentDate = new Date();
+                        String currentTime = String.valueOf(currentDate.getTime());
+                        Date date2HoursAgo = DateUtils.addHours(currentDate, -1);
+                        if (StringUtils.equalsIgnoreCase(schemeStartTime, currentTime) || Long.parseLong(schemeStartTime) < date2HoursAgo.getTime()) {
+                            crossSchemePO = crossSchemeMapper.selectByCrossIdAndSchemeNo(crossId, Integer.valueOf(nextSectionSchemeNo));
+                            executeNextSectionScheme(crossId, lightsStatusVO, crossSchemePO);
+                            lightsStatusVO.setCycleLen(crossSchemePO.getCycle());
+                        } else {
+                            executeNextPeriod(crossId, lightsStatusVO, phaseId, crossSchemePO);
+                        }
+                        // 当前方案下一周期
+                        setDirLampGroupMap(lightsStatusVO);
+                        if (Objects.nonNull(lightsStatusVO.getDirLampGroupMap())) {
+                            if (Objects.equals(crossId, "13NI00B5RM0")) {
+                                List<String> dirList = Arrays.asList("1", "3", "7");
+                                Map<String, Object> dirLampGroupMap = lightsStatusVO.getDirLampGroupMap();
+                                for (String dir : dirList) {
+                                    if (!dirLampGroupMap.containsKey(dir)) {
+                                        Map<Integer, String> value = new HashMap<>();
+                                        setAllTurnColorRed(value, null, null);
+                                        dirLampGroupMap.put(dir, value);
+                                    }
                                 }
+                                lightsStatusVO.setDirLampGroupMap(dirLampGroupMap);
                             }
-                            lightsStatusVO.setDirLampGroupMap(dirLampGroupMap);
+                            // 当前时间戳自动加1s
+                            lightsStatusVO.setTimeStamp(String.valueOf(timeStamp + 1000));
+                            // 红灯倒计时
+                            getRedCountDown(crossId, lightsStatusVO, schemeId);
+                            SignalDataCache.runningStateInfoCache.put(crossId, lightsStatusVO);
                         }
-                        // 当前时间戳自动加1s
-                        lightsStatusVO.setTimeStamp(String.valueOf(timeStamp + 1000));
-                        // 红灯倒计时
-                        getRedCountDown(crossId, lightsStatusVO, schemeId);
-                        SignalDataCache.runningStateInfoCache.put(crossId, lightsStatusVO);
                     }
                 }
+            } catch (Exception e) {
+                log.error("定时任务计算路口相位灯态倒计时异常", e);
+                throw new RuntimeException(e);
             }
-        } catch (Exception e) {
-            log.error("定时任务计算路口相位灯态倒计时异常", e);
-            throw new Exception(e);
-        }
+        });
+
     }
 
     private static void getRedCountDown(String crossId, LightsStatusVO lightsStatusVO, String schemeId) {