Merge remote-tracking branch 'origin/master'

signal-optimize-service/src/main/java/net/wanji/opt/controllerv2/report/GreenWaveOverviewController.java

@@ -41,13 +41,15 @@ public class GreenWaveOverviewController {
 
     @ApiOperation(httpMethod="GET",value="干线概况-总体情况说明", notes="")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "干线ID,多个id用','分隔", required = true, dataType = "String",defaultValue = "1,2"),
+            @ApiImplicitParam(name = "ids", value = "干线ID,多个id用','分隔【为空时查询所有干线】", required = true, dataType = "String",defaultValue = "1,2"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "String",defaultValue = "2025"),
+            @ApiImplicitParam(name = "week", value = "一年的第几周", required = true, dataType = "String",defaultValue = "20"),
             })
     @GetMapping(value = "/getOverallSituation")
     @ApiResponses({
             @ApiResponse(code = 200, message = "OK", response = GreenReportOverviewAnalysisResult.class),
     })
-    public JsonViewObject getGreenInfoList(@RequestParam(value = "ids", required = false, defaultValue = "2") String ids) {
+    public JsonViewObject getGreenInfoList(Integer year,Integer week, String ids) {
         JsonViewObject jsonViewObject = JsonViewObject.newInstance();
         try {
 
@@ -63,12 +65,14 @@ public class GreenWaveOverviewController {
     @ApiOperation(httpMethod="GET",value="干线概况-工作日同期对比", notes="")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "ids", value = "干线ID,多个id用','分隔", required = true, dataType = "String",defaultValue = "1,2"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "String",defaultValue = "2025"),
+            @ApiImplicitParam(name = "week", value = "一年的第几周", required = true, dataType = "String",defaultValue = "20"),
     })
     @GetMapping(value = "/getSamePeriodCompare")
     @ApiResponses({
             @ApiResponse(code = 200, message = "OK", response = GreenReportSamePeriodCompareResult.class),
     })
-    public JsonViewObject getSamePeriodCompare(@RequestParam(value = "ids", required = false, defaultValue = "2") String ids) {
+    public JsonViewObject getSamePeriodCompare(Integer year,Integer week, String ids) {
         JsonViewObject jsonViewObject = JsonViewObject.newInstance();
         try {
 

signal-optimize-service/src/main/java/net/wanji/opt/controllerv2/report/design/GreenReportSamePeriodCompareResult.java

@@ -11,13 +11,13 @@ import java.util.List;
 @Data
 public class GreenReportSamePeriodCompareResult extends ParentResult {
 
-    private GreenReportSamePeriodCompareDataResponse content;
+    private List<GreenReportSamePeriodCompareDataResponse> content;
 
-    public  GreenReportSamePeriodCompareDataResponse getContent() {
+    public List<GreenReportSamePeriodCompareDataResponse> getContent() {
         return content;
     }
 
-    public GreenReportSamePeriodCompareResult setContent(GreenReportSamePeriodCompareDataResponse content) {
+    public GreenReportSamePeriodCompareResult setContent(List<GreenReportSamePeriodCompareDataResponse> content) {
         this.content = content;
         return this;
     }
@@ -33,26 +33,26 @@ public class GreenReportSamePeriodCompareResult extends ParentResult {
 @Data
 class GreenReportSamePeriodCompareDataResponse {
 
-    @ApiModelProperty(value = "路口ID",example = "")
-    private   String greenId ;
+    @ApiModelProperty(value = "路口ID", example = "")
+    private String greenId;
 
-    @ApiModelProperty(value = "干线名称",example = "")
-    private   String greenName ;
+    @ApiModelProperty(value = "干线名称", example = "")
+    private String greenName;
 
-    @ApiModelProperty(value = "早高峰流量情况",example = "减少")
-    private   String amPeakSituation ;
+    @ApiModelProperty(value = "早高峰流量情况", example = "减少")
+    private String amPeakSituation;
 
-    @ApiModelProperty(value = "晚高峰流量情况",example = "减少")
-    private   String pmPeakSituation ;
+    @ApiModelProperty(value = "晚高峰流量情况", example = "减少")
+    private String pmPeakSituation;
 
-    @ApiModelProperty(value = "行程时间同比情况",example = "增加20s")
-    private   String amTravelTimeSituation ;
+    @ApiModelProperty(value = "行程时间同比情况", example = "增加20s")
+    private String amTravelTimeSituation;
 
-    @ApiModelProperty(value = "行程时间同比情况",example = "减少20s")
-    private   String pmTravelTimeSituation ;
+    @ApiModelProperty(value = "行程时间同比情况", example = "减少20s")
+    private String pmTravelTimeSituation;
 
 
-    private List<GreenReportSamePeriodData> dataList=new ArrayList<>();
+    private List<GreenReportSamePeriodData> dataList = new ArrayList<>();
 
 }
 
@@ -60,30 +60,30 @@ class GreenReportSamePeriodCompareDataResponse {
 @Data
 class GreenReportSamePeriodData {
 
-    @ApiModelProperty(value = "峰期类型 早高峰、晚高峰、全天",example = "早高峰")
-    private   String peakName ;
+    @ApiModelProperty(value = "峰期类型 早高峰、晚高峰、全天", example = "早高峰")
+    private String peakName;
 
-    @ApiModelProperty(value = "通行量（辆）",example = "736278")
-    private   Integer peakFlow ;
-    @ApiModelProperty(value = "通行量同比",example = "-1.5%")
-    private   Double peakFlowRatio ;
+    @ApiModelProperty(value = "通行量（辆）", example = "736278")
+    private Integer peakFlow;
+    @ApiModelProperty(value = "通行量同比", example = "-1.5%")
+    private Double peakFlowRatio;
 
-    @ApiModelProperty(value = "拥堵指数",example = "3.5")
-    private   Double congestIndex ;
-    @ApiModelProperty(value = "拥堵指数同比",example = "3.5%")
-    private   Double congestIndexRatio ;
+    @ApiModelProperty(value = "拥堵指数", example = "3.5")
+    private Double congestIndex;
+    @ApiModelProperty(value = "拥堵指数同比", example = "3.5%")
+    private Double congestIndexRatio;
 
-    @ApiModelProperty(value = "平均车速km/h",example = "30.5")
-    private   Double avgSpeed ;
+    @ApiModelProperty(value = "平均车速km/h", example = "30.5")
+    private Double avgSpeed;
 
-    @ApiModelProperty(value = "平均车速同比",example = "-1.5%")
-    private   Double avgSpeedRatio ;
+    @ApiModelProperty(value = "平均车速同比", example = "-1.5%")
+    private Double avgSpeedRatio;
 
-    @ApiModelProperty(value = "行程时间（分钟）",example = "6.5")
-    private   Double travelTime ;
+    @ApiModelProperty(value = "行程时间（分钟）", example = "6.5")
+    private Double travelTime;
 
-    @ApiModelProperty(value = "行程时间同比",example = "-1.5%")
-    private   Double travelTimeRatio ;
+    @ApiModelProperty(value = "行程时间同比", example = "-1.5%")
+    private Double travelTimeRatio;
 }