Revert "[add] 方案优化对比"

This reverts commit 834582f2.

signal-optimize-service/src/main/java/net/wanji/opt/controller/DiagnoController.java

@@ -9,7 +9,10 @@ import net.wanji.common.enums.BaseEnum;
 import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.databus.bo.CrossIdAndSchemeIdBO;
 import net.wanji.databus.bo.CrossIdBO;
-import net.wanji.opt.dto.*;
+import net.wanji.opt.dto.CrossIdAndDirDTO;
+import net.wanji.opt.dto.CrossIdAndSchemeIdDTO;
+import net.wanji.opt.dto.SaveLaneInfoDTO;
+import net.wanji.opt.dto.SendManualDTO;
 import net.wanji.opt.dto.strategy.AddOrUpdateSceneDTO;
 import net.wanji.opt.service.DiagnoService;
 import net.wanji.opt.vo.CrossIdAndLocationVO;
@@ -97,7 +100,7 @@ public class DiagnoController {
             @ApiResponse(code = 200, message = "OK", response = SchemeOptVO.PhaseOptTime.class),
     })
     public JsonViewObject schemeComparison(@RequestBody CrossIdAndSchemeIdDTO crossIdAndSchemeIdDTO) {
-        SchemeComparisonVO phaseOptTimeList = diagnoService.schemeComparison(crossIdAndSchemeIdDTO);
+        List<SchemeOptVO.PhaseOptTime> phaseOptTimeList = diagnoService.schemeComparison(crossIdAndSchemeIdDTO);
         return JsonViewObject.newInstance().success(phaseOptTimeList);
     }
 

signal-optimize-service/src/main/java/net/wanji/opt/controller/induce/GreenwaveInducesHistController.java

@@ -275,8 +275,7 @@ public class GreenwaveInducesHistController {
         List<InduceHist> list = induceHistService.list(queryWrapper);
         List<GreenwaveInducesDTO> results = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {
-            Map<String, Integer> map = list.stream().collect
-                    (Collectors.toMap(InduceHist::getEquipCode, InduceHist::getGreenId,
+            Map<String, Integer> map = list.stream().collect(Collectors.toMap(InduceHist::getEquipCode, InduceHist::getGreenId,
                     (existing, replacement) -> existing));
             for (GreenwaveInducesDTO greenwaveInducesDTO : greenwaveInfoList) {
                 Integer greenId = greenwaveInducesDTO.getGreenId();

signal-optimize-service/src/main/java/net/wanji/opt/dto/SchemeComparisonVO.java

-package net.wanji.opt.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import net.wanji.opt.vo.SchemeOptVO;
-
-import java.util.List;
-
-/**
- * @author zhouleilei
- * @date 2025/05/22 19:03
- * @desc 方案优化对比
- */
-@Data
-public class SchemeComparisonVO {
-    @ApiModelProperty(name = "路口ID",notes = "")
-    private String crossId;
-
-    @ApiModelProperty(name = "方案号",notes = "")
-    private String schemeNo ;
-
-    @ApiModelProperty(name = "相位对比信息",notes = "")
-    private List<SchemeOptVO.PhaseOptTime> phaseOptTimeList;
-
-}

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

@@ -2,7 +2,10 @@ package net.wanji.opt.service;
 
 import net.wanji.databus.bo.CrossIdAndSchemeIdBO;
 import net.wanji.databus.bo.CrossIdBO;
-import net.wanji.opt.dto.*;
+import net.wanji.opt.dto.CrossIdAndDirDTO;
+import net.wanji.opt.dto.CrossIdAndSchemeIdDTO;
+import net.wanji.opt.dto.SaveLaneInfoDTO;
+import net.wanji.opt.dto.SendManualDTO;
 import net.wanji.opt.dto.strategy.AddOrUpdateSceneDTO;
 import net.wanji.opt.vo.CrossIdAndLocationVO;
 import net.wanji.opt.vo.OptEffectVO;
@@ -22,7 +25,7 @@ public interface DiagnoService {
     SchemeOptVO querySchemeOpt(CrossIdAndSchemeIdBO bo);
 
     List<SchemeOptVO.PhaseOptTime> queryOptTime(CrossIdAndSchemeIdDTO crossIdAndSchemeIdDTO);
-    SchemeComparisonVO schemeComparison(CrossIdAndSchemeIdDTO crossIdAndSchemeIdDTO);
+    List<SchemeOptVO.PhaseOptTime> schemeComparison(CrossIdAndSchemeIdDTO crossIdAndSchemeIdDTO);
 
     void sendManual(SendManualDTO sendManualDTO) throws Exception;
 

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/DiagnoServiceImpl.java

@@ -232,38 +232,34 @@ public class DiagnoServiceImpl implements DiagnoService {
     }
 
     @Override
-    public SchemeComparisonVO schemeComparison(CrossIdAndSchemeIdDTO crossIdAndSchemeIdDTO) {
-
+    public List<SchemeOptVO.PhaseOptTime> schemeComparison(CrossIdAndSchemeIdDTO crossIdAndSchemeIdDTO) {
         String crossId = crossIdAndSchemeIdDTO.getCrossId();
         List<SchemeOptVO.PhaseOptTime> phaseOptTimeList = new ArrayList<>();
         QueryByCrossIdAndTimeDTO queryByCrossIdAndTimeDTO = new QueryByCrossIdAndTimeDTO();
         queryByCrossIdAndTimeDTO.setCrossId(crossId);
         queryByCrossIdAndTimeDTO.setDatetime(new Date());
-        SchemeComparisonVO comparisonVO = new  SchemeComparisonVO();
-        comparisonVO.setCrossId(crossId);
         //查询路口当前方案
         JsonViewObject jsonViewObjectScheme = utcFeignClients.selectSchemeByParams(queryByCrossIdAndTimeDTO);
         Integer jsonViewObjectSchemeCode = jsonViewObjectScheme.getCode();
         if (jsonViewObjectSchemeCode != 200){
             log.info("未查询到当前路口号,crossId:{}",crossId);
-            return comparisonVO;
+            return phaseOptTimeList;
         }
         ObjectMapper mapper1 = JacksonUtils.getInstance();
         BaseCrossSchemePO baseCrossSchemePO = mapper1.convertValue(jsonViewObjectScheme.getContent(), new TypeReference<BaseCrossSchemePO>() {
         });
 
         if (ObjectUtils.isEmpty(baseCrossSchemePO)){
-            return comparisonVO;
+            return phaseOptTimeList;
         }
         Integer schemeNo = Integer.valueOf(baseCrossSchemePO.getSchemeNo());
-        comparisonVO.setSchemeNo(baseCrossSchemePO.getSchemeNo());
         if (ObjectUtil.isEmpty(schemeNo) || schemeNo == 85){
             log.info("当前路口为黃闪,crossId:{}",crossId);
-            return comparisonVO;
+            return phaseOptTimeList;
         }
         List<CrossPhasePO> phasePOList = baseCrossPhaseMapper.selectByCrossIdAndSchemeNo(crossId, schemeNo);
         if (ObjectUtils.isEmpty(phasePOList) || ObjectUtils.isEmpty(schemeNo)) {
-            return comparisonVO;
+            return phaseOptTimeList;
         }
         CrossSchemeRingsDTO crossSchemeRingsDTO = new CrossSchemeRingsDTO();
         crossSchemeRingsDTO.setCrossId(crossId);
@@ -306,8 +302,7 @@ public class DiagnoServiceImpl implements DiagnoService {
                 phaseOptTimeList.add(phaseOptTime);
             }
         }
-        comparisonVO.setPhaseOptTimeList(phaseOptTimeList);
-        return comparisonVO;
+        return phaseOptTimeList;
     }
 
     @Override