[update] 全息事件查询添加类型参数；车道快照查询添加排序

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

@@ -322,8 +322,8 @@ public class TrendController {
     @ApiResponses({
             @ApiResponse(code = 200, message = "OK", response = HoloEventInfoPO.class),
     })
-    public JsonViewObject holoEvenList(@RequestBody CommonCrossIdDateTimeVO crossIdDateTimeVO) throws Exception {
-        List<HoloEventInfoPO> result = trendService.holoEvenList(crossIdDateTimeVO);
+    public JsonViewObject holoEvenList(@RequestBody HoloEventVO holoEventVO) throws Exception {
+        List<HoloEventInfoPO> result = trendService.holoEvenList(holoEventVO);
         return JsonViewObject.newInstance().success(result);
     }
 

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

@@ -65,7 +65,7 @@ public interface TrendService {
 
     List<AnalysisRidTurnIndicators> lanePeriodTurnData(LanePeriodTurnVO lanePeriodTurnVO) throws Exception;
 
-    List<HoloEventInfoPO> holoEvenList(CommonCrossIdDateTimeVO crossIdDateTimeVO) throws Exception;
+    List<HoloEventInfoPO> holoEvenList(HoloEventVO holoEventVO) throws Exception;
 
     List<LaneIdAliasNameVO> laneIdList(CommonCrossIdVO commonCrossIdVO) throws Exception;
 }

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

@@ -128,7 +128,7 @@ public class TrendServiceImpl implements TrendService {
                             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, @Qualifier("baseCrossPlanMapper") BaseCrossPlanMapper baseCrossPlanMapper, MainlineEvaluateServiceImpl mainlineEvaluateServiceImpl, CrossLaneDataHistMapper crossLaneDataHistMapper, LaneSnapshotDataQueryService laneSnapshotDataQueryService, DirectionMappingsConfig directionMappingsConfig,
                             CrossDataHistMapper crossDataHistMapper, RunningEvaluateServiceImpl runningEvaluateService,
-                            AnalysisRidTurnIndicatorsMapper ridTurnIndicatorsMapper,HoloEventMapper holoEventMapper) {
+                            AnalysisRidTurnIndicatorsMapper ridTurnIndicatorsMapper, HoloEventMapper holoEventMapper) {
         this.greenwaveInfoMapper = greenwaveInfoMapper;
         this.baseCrossInfoMapper = baseCrossInfoMapper;
         this.crossDataRealtimeMapper = crossDataRealtimeMapper;
@@ -1992,7 +1992,12 @@ public class TrendServiceImpl implements TrendService {
             // 查询秒级数据
             List<CrossLaneSnapshotDataDTO> dtoList =
                     laneSnapshotDataQueryService.queryByCrossIdAndTimeSpan(crossId, start, end, pageNum, laneId);
-            return buildRealTimeList(dtoList);
+            List<TableQueryVO.RealTimeDataElement> result = buildRealTimeList(dtoList);
+            List<TableQueryVO.RealTimeDataElement> sorts = new ArrayList<>();
+            if (!CollectionUtils.isEmpty(sorts)) {
+                sorts = result.stream().sorted(Comparator.comparing(TableQueryVO.RealTimeDataElement::getTime)).collect(Collectors.toList());
+            }
+            return sorts;
         } catch (Exception e) {
             log.error("车道快照数据查询异常：", e);
             throw new Exception(e);
@@ -2021,17 +2026,28 @@ public class TrendServiceImpl implements TrendService {
     }
 
     @Override
-    public List<HoloEventInfoPO> holoEvenList(CommonCrossIdDateTimeVO crossIdDateTimeVO) throws Exception {
+    public List<HoloEventInfoPO> holoEvenList(HoloEventVO holoEventVO) throws Exception {
         try {
             LambdaQueryWrapper<HoloEventInfoPO> queryWrapper = new LambdaQueryWrapper<>();
-            String crossId = crossIdDateTimeVO.getCrossId();
-            Date start = crossIdDateTimeVO.getStart();
+            String crossId = holoEventVO.getCrossId();
+            Date start = holoEventVO.getStart();
             LocalDateTime localDateTime1 = LocalDateTime.ofInstant(start.toInstant(), ZoneId.of("+8"));
-            Date end = crossIdDateTimeVO.getEnd();
+            Date end = holoEventVO.getEnd();
             LocalDateTime localDateTime2 = LocalDateTime.ofInstant(end.toInstant(), ZoneId.of("+8"));
+            String types = holoEventVO.getTypes();
             queryWrapper.eq(HoloEventInfoPO::getCrossId, crossId);
             queryWrapper.between(HoloEventInfoPO::getDetectTime, localDateTime1, localDateTime2);
-            return holoEventMapper.selectList(queryWrapper);
+            List<HoloEventInfoPO> holoEventInfoPOS = holoEventMapper.selectList(queryWrapper);
+            List<HoloEventInfoPO> results = new ArrayList<>();
+            if (!CollectionUtils.isEmpty(holoEventInfoPOS) && StringUtils.isNotBlank(types)) {
+                for (HoloEventInfoPO holoEventInfoPO : holoEventInfoPOS) {
+                    String type = holoEventInfoPO.getType();
+                    if (types.contains(type)) {
+                        results.add(holoEventInfoPO);
+                    }
+                }
+            }
+            return results;
         } catch (Exception e) {
             log.error("全息事件查询异常：", e);
             throw new Exception(e);

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

+package net.wanji.opt.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author duanruiming
+ * @date 2024/05/24 8:57
+ */
+@Data
+@ApiModel(value = "HoloEventVO", description = "全息事件查询实体")
+public class HoloEventVO extends CommonCrossIdDateTimeVO{
+    @ApiModelProperty(value = "事件类型")
+    private String types;
+}