[update] 济南测试平台-转向数据优化

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

@@ -309,8 +309,8 @@ public class TrendController {
     @ApiResponses({
             @ApiResponse(code = 200, message = "OK", response = List.class),
     })
-    public JsonViewObject lanePeriodTurnData(@RequestBody CommonCrossIdDateTimeVO crossIdDateTimeVO) throws Exception {
-        List<AnalysisRidTurnIndicators> result = trendService.lanePeriodTurnData(crossIdDateTimeVO);
+    public JsonViewObject lanePeriodTurnData(@RequestBody LanePeriodTurnVO lanePeriodTurnVO) throws Exception {
+        List<AnalysisRidTurnIndicators> result = trendService.lanePeriodTurnData(lanePeriodTurnVO);
         return JsonViewObject.newInstance().success(result);
     }
 }
\ No newline at end of file

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

@@ -62,5 +62,5 @@ public interface TrendService {
 
     List<TableQueryVO.RealTimeDataElement> laneSnapshotIndex(CommonCrossIdDateTimeVO crossIdDateTimeVO) throws Exception;
 
-    List<AnalysisRidTurnIndicators> lanePeriodTurnData(CommonCrossIdDateTimeVO crossIdDateTimeVO) throws Exception;
+    List<AnalysisRidTurnIndicators> lanePeriodTurnData(LanePeriodTurnVO lanePeriodTurnVO) throws Exception;
 }

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

@@ -1968,12 +1968,17 @@ public class TrendServiceImpl implements TrendService {
     }
 
     @Override
-    public List<AnalysisRidTurnIndicators> lanePeriodTurnData(CommonCrossIdDateTimeVO crossIdDateTimeVO) throws Exception {
-        String crossId = crossIdDateTimeVO.getCrossId();
-        Date start = crossIdDateTimeVO.getStart();
-        Date end = crossIdDateTimeVO.getEnd();
+    public List<AnalysisRidTurnIndicators> lanePeriodTurnData(LanePeriodTurnVO lanePeriodTurnVO) throws Exception {
+        String crossId = lanePeriodTurnVO.getCrossId();
+        Date start = lanePeriodTurnVO.getStart();
+        Date end = lanePeriodTurnVO.getEnd();
+        String granularity = lanePeriodTurnVO.getGranularity();
+        if (StringUtils.isBlank(granularity)) {
+            granularity = "5m";
+        }
         LambdaQueryWrapper<AnalysisRidTurnIndicators> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(AnalysisRidTurnIndicators::getCrossId, crossId);
+        queryWrapper.eq(AnalysisRidTurnIndicators::getGranularity, granularity);
         queryWrapper.between(AnalysisRidTurnIndicators::getRuksj, start, end);
         return ridTurnIndicatorsMapper.selectList(queryWrapper);
     }

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

+package net.wanji.opt.vo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author duanruiming
+ * @date 2024/05/17 9:00
+ */
+@Data
+@NoArgsConstructor
+@ApiModel(value = "LanePeriodTurnVO")
+public class LanePeriodTurnVO extends CommonCrossIdDateTimeVO {
+    @ApiModelProperty(value = "分析粒度【5m:五分钟 10m:10分钟 30m:30分钟 1h:一小时】")
+    @JsonProperty
+    private String granularity;
+}