[update] 干线评价--修改干线方案获取方式

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

+package net.wanji.opt.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Kent HAN
+ * @date 2023/6/9 13:52
+ */
+@Data
+@ApiModel(value = "GreenwaveNameBO", description = "绿波名称")
+public class GreenwaveNameBO {
+    @ApiModelProperty(value = "绿波名称")
+    private String greenwaveName;
+}

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

@@ -14,8 +14,8 @@ import java.util.Date;
 @Data
 @ApiModel(value = "MainlineSchemeEvaluateBO", description = "干线方案评价")
 public class MainlineSchemeEvaluateBO {
-    @ApiModelProperty(value = "绿波ID")
-    private Integer greenwaveId;
+    @ApiModelProperty(value = "方案名称")
+    private String greenwaveName;
 
     @ApiModelProperty(value = "方向名称")
     private String dirName;

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

@@ -66,7 +66,7 @@ public class MainlineEvaluateController {
     @ApiResponses({
             @ApiResponse(code = 200, message = "OK", response = MainlineSchemeAnalysisVO.class),
     })
-    public JsonViewObject mainlineSchemeAnalysis(@RequestBody MainlineSchemeAnalysisBO bo) {
+    public JsonViewObject mainlineSchemeAnalysis(@RequestBody MainlineSchemeAnalysisBO bo) throws ParseException {
         MainlineSchemeAnalysisVO res = mainlineEvaluateService.mainlineSchemeAnalysis(bo);
         return JsonViewObject.newInstance().success(res);
     }

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

@@ -8,6 +8,7 @@ import net.wanji.databus.bo.CrossIdBO;
 import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.opt.bo.GreenwaveIdAndTimeStampBO;
 import net.wanji.opt.bo.GreenwaveIdBO;
+import net.wanji.opt.bo.GreenwaveNameBO;
 import net.wanji.opt.bo.SaveGreenwaveStrategyBO;
 import net.wanji.opt.dto.trend.AbnormalCrossListDTO;
 import net.wanji.opt.dto.trend.EventAlarmDTO;
@@ -73,8 +74,8 @@ public class TrendController {
     @ApiResponses({
             @ApiResponse(code = 200, message = "OK", response = GreenwaveDetailVO.class),
     })
-    public JsonViewObject greenwaveDetail(@RequestBody GreenwaveIdBO greenwaveIdBO) {
-        GreenwaveDetailVO res = trendService.greenwaveDetail(greenwaveIdBO);
+    public JsonViewObject greenwaveDetail(@RequestBody GreenwaveNameBO bo) {
+        GreenwaveDetailVO res = trendService.greenwaveDetail(bo);
         return JsonViewObject.newInstance().success(res);
     }
 

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

+package net.wanji.opt.dto;
+
+import lombok.Data;
+
+/**
+ * @author Kent HAN
+ * @date 2022/12/20 10:17
+ */
+@Data
+public class GreenwaveInSectionDTO {
+    private boolean greenwaveInSection;
+    private String planName;
+    private Integer planId;
+    private String startTime;
+    private String endTime;
+}

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

+package net.wanji.opt.dto;
+
+import lombok.Data;
+import net.wanji.databus.dao.entity.GreenwaveHistPO;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 干线方案缓存
+ * @author Kent HAN
+ * @date 2022/12/20 10:17
+ */
+@Data
+public class LineSchemeDTO {
+
+    // 绿波历史列表
+    private List<GreenwaveHistPO> greenwaveHistPOList = new ArrayList<>();
+
+    // 时段ID
+    private Integer sectionId;
+
+    // 计划ID
+    private Integer planId;
+
+    // 绿波ID
+    private Integer greenwaveId;
+
+}

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

@@ -14,7 +14,7 @@ public interface MainlineEvaluateService {
 
     List<MainlineListVO> mainlineList();
 
-    MainlineSchemeAnalysisVO mainlineSchemeAnalysis(MainlineSchemeAnalysisBO bo);
+    MainlineSchemeAnalysisVO mainlineSchemeAnalysis(MainlineSchemeAnalysisBO bo) throws ParseException;
 
     MainlineSchemeEvaluateVO mainlineSchemeEvaluate(MainlineSchemeEvaluateBO bo);
 

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

@@ -3,6 +3,7 @@ package net.wanji.opt.service;
 import net.wanji.databus.bo.CrossIdBO;
 import net.wanji.opt.bo.GreenwaveIdAndTimeStampBO;
 import net.wanji.opt.bo.GreenwaveIdBO;
+import net.wanji.opt.bo.GreenwaveNameBO;
 import net.wanji.opt.bo.SaveGreenwaveStrategyBO;
 import net.wanji.opt.dto.trend.AbnormalCrossListDTO;
 import net.wanji.opt.dto.trend.GreenwaveListDTO;
@@ -32,7 +33,7 @@ public interface TrendService {
 
     List<GreenwaveRunMonitorVO> greenwaveRunMonitor(GreenwaveIdBO greenwaveIdBO);
 
-    GreenwaveDetailVO greenwaveDetail(GreenwaveIdBO greenwaveIdBO);
+    GreenwaveDetailVO greenwaveDetail(GreenwaveNameBO greenwaveNameBO);
 
     List<GreenwaveCrossMetricsVO> greenwaveCrossMetrics(GreenwaveIdAndTimeStampBO greenwaveIdAndTimeStampBO);
 

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

@@ -13,6 +13,7 @@ import net.wanji.databus.po.*;
 import net.wanji.databus.vo.AbnormalCrossListVO;
 import net.wanji.opt.bo.GreenwaveIdAndTimeStampBO;
 import net.wanji.opt.bo.GreenwaveIdBO;
+import net.wanji.opt.bo.GreenwaveNameBO;
 import net.wanji.opt.bo.SaveGreenwaveStrategyBO;
 import net.wanji.opt.dao.mapper.CrossSchemeOptLogMapper;
 import net.wanji.opt.dao.mapper.strategy.SceneMapper;
@@ -21,6 +22,7 @@ import net.wanji.opt.dao.mapper.strategy.SceneStrategyMapper;
 import net.wanji.opt.dao.mapper.strategy.StrategyMapper;
 import net.wanji.opt.dao.mapper.trend.EventAlarmMapper;
 import net.wanji.opt.dao.mapper.trend.GreenwaveInfoMapper;
+import net.wanji.opt.dto.LineSchemeDTO;
 import net.wanji.opt.dto.trend.AbnormalCrossListDTO;
 import net.wanji.opt.dto.trend.GreenwaveListDTO;
 import net.wanji.opt.po.base.CrossSchemeOptLogPO;
@@ -36,6 +38,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -70,6 +73,7 @@ public class TrendServiceImpl implements TrendService {
     private final GreenwaveSceneMapper greenwaveSceneMapper;
     private final SceneStrategyMapper sceneStrategyMapper;
     private final SceneMapper sceneMapper;
+    private final BaseCrossPlanMapper baseCrossPlanMapper;
 
     // 用于计算路口状态,key为方向，value为状态
     private Map<Integer, Integer> preStatus = new HashMap<Integer, Integer>() {{
@@ -90,7 +94,7 @@ public class TrendServiceImpl implements TrendService {
                             CrossTurnDataRealtimeMapper crossTurnDataRealtimeMapper,
                             CrossDirDataHistMapper crossDirDataHistMapper, EventAlarmMapper eventAlarmMapper,
                             RidInfoMapper ridInfoMapper, BaseCrossDirInfoMapper baseCrossDirInfoMapper,
-                            CrossSchemeOptLogMapper crossSchemeOptLogMapper, GreenwaveCrossMapper greenwaveCrossMapper, CrossDirDataRealtimeMapper crossDirDataRealtimeMapper, GreenwaveHistMapper greenwaveHistMapper, GreenwaveRealtimeMapper greenwaveRealtimeMapper, SceneStrategyIdeaMapper strategyIdeaMapper, StrategyMapper strategyMapper, BaseCrossSchedulesMapper baseCrossSchedulesMapper, BaseCrossSchedulesPlanMapper baseCrossSchedulesPlanMapper, BaseCrossSectionMapper baseCrossSectionMapper, BaseCrossSchemeMapper crossSchemeMapper, BaseCrossSchemeMapper baseCrossSchemeMapper, BaseCrossPhaseMapper baseCrossPhaseMapper, BaseCrossPhaseLightsMapper crossPhaseLightsMapper, BaseCrossLaneLightsMapper baseCrossLaneLightsMapper, CrossBaseLaneInfoMapper crossBaseLaneInfoMapper, CrossTurnDataHistMapper crossTurnDataHistMapper, @Qualifier("greenwaveSceneMapper") GreenwaveSceneMapper greenwaveSceneMapper, @Qualifier("sceneStrategyMapper") SceneStrategyMapper sceneStrategyMapper, @Qualifier("sceneMapper") SceneMapper sceneMapper) {
+                            CrossSchemeOptLogMapper crossSchemeOptLogMapper, GreenwaveCrossMapper greenwaveCrossMapper, CrossDirDataRealtimeMapper crossDirDataRealtimeMapper, GreenwaveHistMapper greenwaveHistMapper, GreenwaveRealtimeMapper greenwaveRealtimeMapper, SceneStrategyIdeaMapper strategyIdeaMapper, StrategyMapper strategyMapper, BaseCrossSchedulesMapper baseCrossSchedulesMapper, BaseCrossSchedulesPlanMapper baseCrossSchedulesPlanMapper, BaseCrossSectionMapper baseCrossSectionMapper, BaseCrossSchemeMapper crossSchemeMapper, BaseCrossSchemeMapper baseCrossSchemeMapper, BaseCrossPhaseMapper baseCrossPhaseMapper, BaseCrossPhaseLightsMapper crossPhaseLightsMapper, BaseCrossLaneLightsMapper baseCrossLaneLightsMapper, CrossBaseLaneInfoMapper crossBaseLaneInfoMapper, CrossTurnDataHistMapper crossTurnDataHistMapper, @Qualifier("greenwaveSceneMapper") GreenwaveSceneMapper greenwaveSceneMapper, @Qualifier("sceneStrategyMapper") SceneStrategyMapper sceneStrategyMapper, @Qualifier("sceneMapper") SceneMapper sceneMapper, @Qualifier("baseCrossPlanMapper") BaseCrossPlanMapper baseCrossPlanMapper) {
         this.greenwaveInfoMapper = greenwaveInfoMapper;
         this.baseCrossInfoMapper = baseCrossInfoMapper;
         this.crossDataRealtimeMapper = crossDataRealtimeMapper;
@@ -117,6 +121,7 @@ public class TrendServiceImpl implements TrendService {
         this.greenwaveSceneMapper = greenwaveSceneMapper;
         this.sceneStrategyMapper = sceneStrategyMapper;
         this.sceneMapper = sceneMapper;
+        this.baseCrossPlanMapper = baseCrossPlanMapper;
     }
 
     @Override
@@ -371,8 +376,11 @@ public class TrendServiceImpl implements TrendService {
     }
 
     @Override
-    public GreenwaveDetailVO greenwaveDetail(GreenwaveIdBO greenwaveIdBO) {
-        Integer greenwaveId = greenwaveIdBO.getGreenwaveId();
+    public GreenwaveDetailVO greenwaveDetail(GreenwaveNameBO greenwaveNameBO) {
+        String greenwaveName = greenwaveNameBO.getGreenwaveName();
+        LineSchemeDTO lineSchemeDTO = MainlineEvaluateServiceImpl.lineSchemeBuffer.get(greenwaveName);
+        Integer greenwaveId = lineSchemeDTO.getGreenwaveId();
+
         GreenwaveDetailVO res = new GreenwaveDetailVO();
         GreenwaveRealtimePO greenwaveRealtimePO = greenwaveRealtimeMapper.selectById(greenwaveId);
         GreenwaveInfoPO greenwaveInfoPO = greenwaveInfoMapper.selectById(greenwaveId);
@@ -408,7 +416,7 @@ public class TrendServiceImpl implements TrendService {
                 .collect(Collectors.toList());
         res.setStrategySelected(collect);
         // 绿波路口信息
-        List<GreenwaveDetailVO.GreenwaveCross> greenwaveCrossList = buildGreenwaveCrossList(greenwaveId);
+        List<GreenwaveDetailVO.GreenwaveCross> greenwaveCrossList = buildGreenwaveCrossList(greenwaveId, greenwaveName);
         res.setGreenwaveCrossList(greenwaveCrossList);
         // 绿波带
         if (dir == 0) { // 正向
@@ -573,19 +581,29 @@ public class TrendServiceImpl implements TrendService {
         return greenwavePoint;
     }
 
-    private List<GreenwaveDetailVO.GreenwaveCross> buildGreenwaveCrossList(Integer greenwaveId) {
+    private List<GreenwaveDetailVO.GreenwaveCross> buildGreenwaveCrossList(Integer greenwaveId, String greenwaveName) {
         List<GreenwaveDetailVO.GreenwaveCross> res = new ArrayList<>();
         List<GreenwaveCrossPO> greenwaveCrossList = greenwaveCrossMapper.selectByGreenwaveId(greenwaveId);
+        Map<String, GreenwaveCrossPO> uniqueCrossIdMap = greenwaveCrossList.stream()
+                .collect(Collectors.toMap(
+                        GreenwaveCrossPO::getCrossId,
+                        Function.identity(),
+                        (existing, replacement) -> existing
+                ));
+
+        List<GreenwaveCrossPO> filteredList = new ArrayList<>(uniqueCrossIdMap.values());
+        filteredList.sort(Comparator.comparing(GreenwaveCrossPO::getSort));
+
         // 相对相位差列表
-        List<Integer> relativeOffsets = greenwaveCrossList.stream()
+        List<Integer> relativeOffsets = filteredList.stream()
                 .map(GreenwaveCrossPO::getOffset)
                 .collect(Collectors.toList());
         // 绝对相位差列表
         List<Integer> absoluteOffsets = buildAbsoluteOffsets(relativeOffsets);
 
-        int size = greenwaveCrossList.size();
+        int size = filteredList.size();
         for (int i = 0; i < size; i++) {
-            GreenwaveCrossPO greenwaveCrossPO = greenwaveCrossList.get(i);
+            GreenwaveCrossPO greenwaveCrossPO = filteredList.get(i);
             GreenwaveDetailVO.GreenwaveCross greenwaveCross = new GreenwaveDetailVO.GreenwaveCross();
             String crossId = greenwaveCrossPO.getCrossId();
             greenwaveCross.setCrossId(crossId);
@@ -610,8 +628,15 @@ public class TrendServiceImpl implements TrendService {
             greenwaveCross.setOffset(greenwaveCrossPO.getOffset());
 
             // 获取当前方案
-            Integer sectionId = greenwaveCrossPO.getSectionId();
-            CrossSectionPO crossSectionPO = baseCrossSectionMapper.selectById(sectionId);
+            String[] split = greenwaveName.split(" "); // 旅游路 东向西 转山西路至霞景路路段:正向绿波 工作日 19:00-20:00
+            String s = split[4];
+            String[] split1 = s.split("-");
+            String startTime = split1[0];
+            // 获取 planId
+            String planName = split[3];
+            BaseCrossPlanPO baseCrossPlanPO = baseCrossPlanMapper.selectByCrossIdAndName(crossId, planName);
+            Integer planId = baseCrossPlanPO.getId();
+            CrossSectionPO crossSectionPO = baseCrossSectionMapper.selectbyStartTimeCrossIdPlanId(startTime, crossId, planId);
             if (crossSectionPO == null) {
                 throw new RuntimeException("无当前时段方案信息");
             }

wj-databus/src/main/java/net/wanji/databus/dao/entity/GreenwaveHistPO.java

@@ -15,7 +15,4 @@ public class GreenwaveHistPO extends GreenwaveRealtimePO{
 
     @ApiModelProperty(value = "协调方向：0正向；1反向；2双向")
     private Integer dir;
-
-    @ApiModelProperty(value = "时段ID")
-    private Integer sectionId;
 }

wj-databus/src/main/java/net/wanji/databus/dao/mapper/BaseCrossPlanMapper.java

@@ -30,4 +30,6 @@ public interface BaseCrossPlanMapper {
     List<BaseCrossPlanPO> selectByCrossId(String crossId);
 
     BaseCrossPlanPO selectByCrossIdAndPlanNo(@Param("crossId") String crossId, @Param("planNo") String planNo);
+
+    List<BaseCrossPlanPO> selectAll();
 }

wj-databus/src/main/java/net/wanji/databus/dao/mapper/BaseCrossSectionMapper.java

@@ -30,4 +30,12 @@ public interface BaseCrossSectionMapper {
     List<CrossSectionPO> selectByCrossId(String crossId);
 
     List<CrossSectionPO> selectByCrossIdPlanIdAndSchemeId(String crossId, Integer planId, Integer schemeId);
+
+    CrossSectionPO selectByEndTimePlanId(String endTime, Integer planId);
+
+    CrossSectionPO selectByStartTimePlanId(String startTime, Integer planId);
+
+    List<CrossSectionPO> selectAll();
+
+    CrossSectionPO selectbyStartTimeCrossIdPlanId(String startTime, String crossId, Integer planId);
 }

wj-databus/src/main/java/net/wanji/databus/dao/mapper/CrossDataHistMapper.java

@@ -30,4 +30,7 @@ public interface CrossDataHistMapper extends BaseMapper<CrossDataHistPO> {
     Integer selectCrossEmergencyCount(String crossId, int startStamp, int endStamp);
 
     List<CrossDataHistPO> selectByCrossIdsAndTimestamp(List<String> crossIdList, int startTimeStamp, int endTimeStamp);
+
+    List<CrossDataHistPO> selectByStartEnd(int startStamp, int endStamp);
+
 }

wj-databus/src/main/java/net/wanji/databus/dao/mapper/CrossPlanMapper.java

@@ -22,4 +22,5 @@ public interface CrossPlanMapper {
 
     List<CrossPlanPO> selectByCrossIdAndPlanNo(@Param("crossId") String crossId, @Param("planNo")Integer planNo);
 
+    CrossPlanPO selectById(Integer planId);
 }

wj-databus/src/main/java/net/wanji/databus/dao/mapper/GreenwaveCrossMapper.java

@@ -13,5 +13,9 @@ import java.util.List;
 public interface GreenwaveCrossMapper {
     List<GreenwaveCrossPO> selectByGreenwaveId(Integer id);
 
-    GreenwaveCrossPO selectByGreenwaveIdAndKeyRoute(Integer greenwaveId);
+    List<GreenwaveCrossPO> selectByGreenwaveIdAndKeyRoute(Integer greenwaveId);
+
+    List<GreenwaveCrossPO> selectByKeyRoute();
+
+    List<GreenwaveCrossPO> selectAll();
 }

wj-databus/src/main/resources/mapper/BaseCrossPlanMapper.xml

@@ -77,5 +77,11 @@
         where cross_id = #{crossId} and plan_no = #{planNo}
     </select>
 
+    <select id="selectAll" resultType="net.wanji.databus.dao.entity.BaseCrossPlanPO">
+        select
+            id,plan_no,name,cross_id,gmt_create,gmt_modified
+        from t_base_cross_plan
+    </select>
+
 
 </mapper>

wj-databus/src/main/resources/mapper/BaseCrossSectionMapper.xml

@@ -81,5 +81,28 @@
         where cross_id = #{crossId} and plan_id = #{planId} and scheme_id = #{schemeId}
     </select>
 
+    <select id="selectByEndTimePlanId" resultType="net.wanji.databus.dao.entity.CrossSectionPO">
+        select <include refid="Base_Column_list"/>
+        from t_base_cross_section
+        where end_time = #{endTime} and plan_id = #{planId}
+    </select>
+
+    <select id="selectByStartTimePlanId" resultType="net.wanji.databus.dao.entity.CrossSectionPO">
+        select <include refid="Base_Column_list"/>
+        from t_base_cross_section
+        where start_time = #{startTime} and plan_id = #{planId}
+    </select>
+
+    <select id="selectAll" resultType="net.wanji.databus.dao.entity.CrossSectionPO">
+        select <include refid="Base_Column_list"/>
+        from t_base_cross_section
+    </select>
+
+    <select id="selectbyStartTimeCrossIdPlanId" resultType="net.wanji.databus.dao.entity.CrossSectionPO">
+        select <include refid="Base_Column_list"/>
+        from t_base_cross_section
+        where start_time = #{startTime} and cross_id = #{crossId} and plan_id = #{planId}
+    </select>
+
 
 </mapper>

wj-databus/src/main/resources/mapper/CrossDataHistMapper.xml

@@ -124,4 +124,12 @@
         order by batch_time
     </select>
 
+    <select id="selectByStartEnd" resultType="net.wanji.databus.po.CrossDataHistPO">
+        select <include refid="Base_Column_List"></include>
+        from t_cross_data_hist
+        where batch_time <![CDATA[ >= ]]> #{startStamp}
+        and batch_time <![CDATA[ <= ]]> #{endStamp}
+        order by batch_time
+    </select>
+
 </mapper>
\ No newline at end of file

wj-databus/src/main/resources/mapper/CrossPlanMapper.xml

@@ -48,5 +48,12 @@
         from t_cross_plan
         where cross_id = #{crossId} and plan_no = #{planNo}
     </select>
+
+    <select id="selectById" resultType="net.wanji.databus.dao.entity.CrossPlanPO">
+        select
+            id,plan_no,name,cross_id,gmt_create,gmt_modified
+        from t_cross_plan
+        where id = #{planId}
+    </select>
 </mapper>
 

wj-databus/src/main/resources/mapper/GreenwaveCrossMapper.xml

@@ -19,5 +19,16 @@
         where green_id = #{id} and is_key_route = 1
     </select>
 
+    <select id="selectByKeyRoute" resultType="net.wanji.databus.dao.entity.GreenwaveCrossPO">
+        select <include refid="Base_Column_List"/>
+        from t_greenwave_cross
+        where is_key_route = 1
+    </select>
+
+    <select id="selectAll" resultType="net.wanji.databus.dao.entity.GreenwaveCrossPO">
+        select <include refid="Base_Column_List"/>
+        from t_greenwave_cross
+    </select>
+
 
 </mapper>