[add] 新信号评价-方案评价-路口方案列表增加返回字段

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

@@ -414,6 +414,7 @@ public class RunningEvaluateServiceImpl implements RunningEvaluateService {
             RunningEvaluateMetricsDetailVO.ProblemScheme problemScheme =
                     new RunningEvaluateMetricsDetailVO.ProblemScheme();
             problemScheme.setSchemeName(schemeName);
+            problemScheme.setSchemeId(schemeId);
             problemScheme.setStartTime(sectionStartTime);
             problemScheme.setEndTime(sectionEndTime);
             res.add(problemScheme);

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

@@ -236,21 +236,28 @@ public class SchemeEvaluateServiceImpl implements SchemeEvaluateService {
             List<RunningEvaluateMetricsDetailVO.ProblemScheme> problemSchemes = entry.getValue();
 
             for (RunningEvaluateMetricsDetailVO.ProblemScheme problemScheme : problemSchemes) {
+                Integer schemeId = problemScheme.getSchemeId();
                 String schemeName = problemScheme.getSchemeName();
+                String schemeIdName = schemeId + "_" + schemeName;
                 SchemeEvaluateProblemSchemeVO.SchemeDatetime schemeDatetime =
                         new SchemeEvaluateProblemSchemeVO.SchemeDatetime();
+                schemeDatetime.setYear(date);
+                schemeDatetime.setWeek(DateUtil.dayOfWeek(date));
                 schemeDatetime.setProblemDate(date);
                 schemeDatetime.setStartTime(problemScheme.getStartTime());
                 schemeDatetime.setEndTime(problemScheme.getEndTime());
 
-                tempMap.computeIfAbsent(schemeName, k -> new ArrayList<>()).add(schemeDatetime);
+                tempMap.computeIfAbsent(schemeIdName, k -> new ArrayList<>()).add(schemeDatetime);
             }
         }
         // 构建最终的 List<BySchemeVO>
         List<SchemeEvaluateProblemSchemeVO.BySchemeVO> bySchemeVOList = tempMap.entrySet().stream()
                 .map(entry -> {
                     SchemeEvaluateProblemSchemeVO.BySchemeVO bySchemeVO = new SchemeEvaluateProblemSchemeVO.BySchemeVO();
-                    bySchemeVO.setSchemeName(entry.getKey());
+                    String schemeIdName = entry.getKey();
+                    String[] s = schemeIdName.split("_");
+                    bySchemeVO.setSchemeId(Integer.parseInt(s[0]));
+                    bySchemeVO.setSchemeName(s[1]);
                     bySchemeVO.setSchemeDatetimeList(entry.getValue());
                     return bySchemeVO;
                 })

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

@@ -46,6 +46,9 @@ public class RunningEvaluateMetricsDetailVO {
     @NoArgsConstructor
     @Data
     public static class ProblemScheme {
+        @ApiModelProperty(value = "方案ID")
+        private Integer schemeId;
+
         @ApiModelProperty(value = "方案名称")
         private String schemeName;
 

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

@@ -62,8 +62,12 @@ public class SchemeEvaluateProblemSchemeVO {
     @NoArgsConstructor
     @Data
     public static class BySchemeVO {
+        @ApiModelProperty(value = "方案ID")
+        private Integer schemeId;
+
         @ApiModelProperty(value = "方案名称")
         private String schemeName;
+
         @ApiModelProperty(value = "方案日期时间列表")
         private List<SchemeDatetime> SchemeDatetimeList;
     }
@@ -71,7 +75,7 @@ public class SchemeEvaluateProblemSchemeVO {
     @NoArgsConstructor
     @Data
     public static class SchemeDatetime {
-        @ApiModelProperty(value = "日期")
+        @ApiModelProperty(value = "月日")
         @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "M/d", timezone = "GMT+8")
         private Date problemDate;
 
@@ -80,5 +84,12 @@ public class SchemeEvaluateProblemSchemeVO {
 
         @ApiModelProperty(value = "结束时间 HH:mm")
         String endTime;
+
+        @ApiModelProperty(value = "星期：1周日，2周一，3周二，4周三，5周四，6周五，7周六")
+        private Integer week;
+
+        @ApiModelProperty(value = "年份")
+        @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy", timezone = "GMT+8")
+        private Date year;
     }
 }