[add]智慧大屏，新增优化对比

signal-control-service/src/main/java/net/wanji/web/service/impl/PlanSendServiceImpl.java

@@ -888,7 +888,6 @@ public class PlanSendServiceImpl implements PlanSendService {
 
                 if (CollectionUtil.isNotEmpty(afterTime)){
                     optPhaseList.clear();
-
                     for (int i = 0; i < afterTime.size(); i++) {
                         if (i == oriPhaseList.size()){
                             break;
@@ -913,40 +912,9 @@ public class PlanSendServiceImpl implements PlanSendService {
                         }
                         optPhaseList.add(optPhase);
                     }
+                }else {
+                    optPhaseList = oriPhaseList;
                 }
-
-
-
-
-
-               /* List<CrossSchemeStageOptLogPO> crossSchedulesPOList = mapper.convertValue(optView.getContent(), new TypeReference<List<CrossSchemeStageOptLogPO>>() {
-                });
-                if (ObjectUtils.isNotEmpty(crossSchedulesPOList)) {
-                    for (int i = 0; i < crossSchedulesPOList.size(); i++) {
-                        if (i == oriPhaseList.size()){
-                            break;
-                        }
-                        CrossSchemeStageOptLogPO optLogPO = crossSchedulesPOList.get(i);
-                        SaveSchemeConfigDTO.PhaseListElement phaseListElement = oriPhaseList.get(i);
-                        SaveSchemeConfigDTO.PhaseListElement optPhase = new SaveSchemeConfigDTO.PhaseListElement();
-                        BeanUtils.copyProperties(phaseListElement,optPhase);
-                        Integer yellowTime = phaseListElement.getYellowTime();
-                        Integer redTime = phaseListElement.getRedTime();
-                        //相位时间
-                        Integer phaseTime = optLogPO.getPhaseTime();
-                        //绿灯时间
-                        int greenTime = phaseTime - yellowTime - redTime;
-                        if (greenTime <= 0){
-                            optPhase.setGreenTime(phaseTime);
-                            optPhase.setYellowTime(0);
-                            optPhase.setRedTime(0);
-
-                        }else {
-                            optPhase.setGreenTime(greenTime);
-                        }
-                        optPhaseList.add(optPhase);
-                    }
-                }*/
             }
         }
         ringPhasePO.setOriPhaseList(oriPhaseList);

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

@@ -20,6 +20,7 @@ import net.wanji.utc.service.control.ControlCommandService;
 import net.wanji.utc.service.control.ControlCommandStrategyService;
 import net.wanji.utc.util.StringUtils;
 import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -31,7 +32,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * @author zhouleilei
  * @date 2024/12/30 14:01
  */
-//@Component
+@Component
 @Slf4j
 @SuppressWarnings("all")
 public class CommandFaildTask {