[update] 优化代码6，优化讲台方案灯态定时任务程序可读性

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

@@ -113,25 +113,7 @@ public class SignalStatus4StaticSchemeTask {
                             if (isNotNextSchemeNo(crossSchemePO)) {
                                 continue;
                             }
-                            List<CrossSchemePhaseCountDownDTO> crossSchemePhaseCountDownList = CrossSchemePhaseTimeCountCache.crossSchemePhaseCountDownList;
-                            for (CrossSchemePhaseCountDownDTO crossSchemePhaseCountDownDTO : crossSchemePhaseCountDownList) {
-                                if (StringUtils.equalsIgnoreCase(schemeNo, crossSchemePhaseCountDownDTO.getSchemeNo()) &&
-                                        StringUtils.equalsIgnoreCase(crossId, crossSchemePhaseCountDownDTO.getCrossId())) {
-                                    lightsStatusVO.setCrossId(crossId);
-                                    lightsStatusVO.setCyclePhaseCountDown(0);
-                                    lightsStatusVO.setCycleCountDown(0);
-                                    lightsStatusVO.setSchemeId(schemeNo);
-                                    lightsStatusVO.setCycleLen(crossSchemePO.getCycle());
-                                    lightsStatusVO.setPhaseId("0");
-                                    String currentTimeStr = String.valueOf(date.getTime());
-                                    lightsStatusVO.setTimeStamp(currentTimeStr);
-                                    lightsStatusVO.setCode(code);
-                                    lightsStatusVO.setRunMode("11");
-                                    lightsStatusVO.setControlMode("11");
-                                    lightsStatusVO.setManufacturerCode("STATIC");
-                                    currentCrossLightStatusCache.put(crossId, lightsStatusVO);
-                                }
-                            }
+                            initLightsStatus(crossId, code, lightsStatusVO, date, crossSchemePO, schemeNo);
                         }
                     }
                 }
@@ -142,6 +124,37 @@ public class SignalStatus4StaticSchemeTask {
         }
     }
 
+    /**
+     * 初始化灯态信息
+     * @param crossId
+     * @param code
+     * @param lightsStatusVO
+     * @param date
+     * @param crossSchemePO
+     * @param schemeNo
+     */
+    private static void initLightsStatus(String crossId, String code, LightsStatusVO lightsStatusVO, Date date, CrossSchemePO crossSchemePO, String schemeNo) {
+        List<CrossSchemePhaseCountDownDTO> crossSchemePhaseCountDownList = CrossSchemePhaseTimeCountCache.crossSchemePhaseCountDownList;
+        for (CrossSchemePhaseCountDownDTO crossSchemePhaseCountDownDTO : crossSchemePhaseCountDownList) {
+            if (StringUtils.equalsIgnoreCase(schemeNo, crossSchemePhaseCountDownDTO.getSchemeNo()) &&
+                    StringUtils.equalsIgnoreCase(crossId, crossSchemePhaseCountDownDTO.getCrossId())) {
+                lightsStatusVO.setCrossId(crossId);
+                lightsStatusVO.setCyclePhaseCountDown(0);
+                lightsStatusVO.setCycleCountDown(0);
+                lightsStatusVO.setSchemeId(schemeNo);
+                lightsStatusVO.setCycleLen(crossSchemePO.getCycle());
+                lightsStatusVO.setPhaseId("0");
+                String currentTimeStr = String.valueOf(date.getTime());
+                lightsStatusVO.setTimeStamp(currentTimeStr);
+                lightsStatusVO.setCode(code);
+                lightsStatusVO.setRunMode("11");
+                lightsStatusVO.setControlMode("11");
+                lightsStatusVO.setManufacturerCode("STATIC");
+                currentCrossLightStatusCache.put(crossId, lightsStatusVO);
+            }
+        }
+    }
+
     private boolean isNotNextSchemeNo(CrossSchemePO crossSchemePO) {
         if (Objects.nonNull(crossSchemePO)) {
             String schemeNo = crossSchemePO.getSchemeNo();
@@ -238,7 +251,7 @@ public class SignalStatus4StaticSchemeTask {
                                 && StringUtils.equalsIgnoreCase(schemeId, String.valueOf(turnPojo.getSchemeNo()))
                                 && StringUtils.equalsIgnoreCase(dirTurnPhaseNo, String.valueOf(turnPojo.getPhaseNo()))) {
 
-                            Integer strphase = turnPojo.getPhaseNo();
+                            Integer phaseNoStr = turnPojo.getPhaseNo();
 
                             if (Objects.nonNull(turnPojo.getDirTurnMap())) {
                                 for (Map.Entry<Integer, List<CrossLightsPO>> entry : turnPojo.getDirTurnMap().entrySet()) {