增加问题次数计算

signal-optimize-data-compute/src/main/resources/mapper/HoloEventMapper.xml

@@ -95,6 +95,9 @@
         <if test="startDate!=null and endDate !=''">
             and start_time > #{startDate} and start_time &lt; #{endDate}
         </if>
+        <if test="dt!=null and dt !=''">
+            and dt = #{dt}
+        </if>
         GROUP BY cross_id,type
     </select>
     <!--  路口监测左下角路口事件列表 -->

signal-optimize-data-compute/src/main/resources/mapper/report/AnalysisReportCrossOptimizeDetailMapper.xml

@@ -286,7 +286,8 @@
         last_week_max_queue_length,
         last_week_speed,
         last_week_congest_index,
-        dirs
+        dirs,
+        problem_count
     ) VALUES
     <foreach collection="list" item="entity" separator=",">
         (
@@ -312,6 +313,7 @@
         ,#{entity.lastWeekSpeed}
         ,#{entity.lastWeekCongestIndex}
         ,#{entity.dirs}
+        ,#{entity.problemCount}
         )
     </foreach>
     ON DUPLICATE KEY UPDATE
@@ -336,6 +338,7 @@
     last_week_max_queue_length = VALUES(last_week_max_queue_length),
     last_week_speed = VALUES(last_week_speed),
     last_week_congest_index = VALUES(last_week_congest_index),
-    dirs = VALUES(dirs)
+    dirs = VALUES(dirs),
+        problem_count = VALUES(problem_count)
     </insert>
 </mapper>

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

@@ -32,70 +32,70 @@ public class AreaCrossProblemDayAnalysisResult extends ParentResult {
 @Data
 class AreaCrossProblemDayAnalysisResultResponse {
 
-    @ApiModelProperty(value = "区域内所有路口【溢出】问题总次数", example = "100次",position = 0)
+    @ApiModelProperty(value = "区域内所有路口【溢出】问题总次数", example = "100次",position = 1)
     private String overFlowProblemCount;
-    @ApiModelProperty(value = "区域内所有路口【溢出】问题总时长", example = "100min",position = 0)
+    @ApiModelProperty(value = "区域内所有路口【溢出】问题总时长", example = "100min",position = 2)
     private String overFlowProblemDuration;
-    @ApiModelProperty(value = "区域内所有路口【溢出】问题主要时段", example = "100min",position = 0)
+    @ApiModelProperty(value = "区域内所有路口【溢出】问题主要时段", example = "100min",position = 3)
     private String overFlowProblemTimeSpan;
 
-    @ApiModelProperty(value = "区域内所有路口【拥堵】问题总次数", example = "100次",position = 0)
+    @ApiModelProperty(value = "区域内所有路口【拥堵】问题总次数", example = "100次",position = 4)
     private String congestProblemCount;
-    @ApiModelProperty(value = "区域内所有路口【拥堵】问题总时长", example = "100min",position = 0)
+    @ApiModelProperty(value = "区域内所有路口【拥堵】问题总时长", example = "100min",position = 5)
     private String congestProblemDuration;
-    @ApiModelProperty(value = "区域内所有路口【拥堵】问题主要时段", example = "100min",position = 0)
+    @ApiModelProperty(value = "区域内所有路口【拥堵】问题主要时段", example = "100min",position = 6)
     private String congestProblemTimeSpan;
 
-    @ApiModelProperty(value = "区域内所有路口【失衡】问题总次数", example = "100次",position = 0)
+    @ApiModelProperty(value = "区域内所有路口【失衡】问题总次数", example = "100次",position = 7)
     private String unbalanceProblemCount;
-    @ApiModelProperty(value = "区域内所有路口【失衡】问题总时长", example = "100min",position = 0)
+    @ApiModelProperty(value = "区域内所有路口【失衡】问题总时长", example = "100min",position = 8)
     private String unbalanceProblemDuration;
-    @ApiModelProperty(value = "区域内所有路口【失衡】问题主要时段", example = "100min",position = 0)
+    @ApiModelProperty(value = "区域内所有路口【失衡】问题主要时段", example = "100min",position = 9)
     private String unbalanceProblemTimeSpan;
 
-    @ApiModelProperty(value = "区域内所有路口【空放】问题总次数", example = "100次",position = 0)
+    @ApiModelProperty(value = "区域内所有路口【空放】问题总次数", example = "100次",position = 10)
     private String emptyPassProblemCount;
-    @ApiModelProperty(value = "区域内所有路口【空放】问题总时长", example = "100min",position = 0)
+    @ApiModelProperty(value = "区域内所有路口【空放】问题总时长", example = "100min",position = 11)
     private String emptyPassProblemDuration;
-    @ApiModelProperty(value = "区域内所有路口【空放】问题主要时段", example = "100min",position = 0)
+    @ApiModelProperty(value = "区域内所有路口【空放】问题主要时段", example = "100min",position = 12)
     private String emptyPassProblemTimeSpan;
 
-    @ApiModelProperty(value = "区域内【溢出】最严重路口", example = "旅游路-洪山路",position = 0)
+    @ApiModelProperty(value = "区域内【溢出】最严重路口", example = "旅游路-洪山路",position = 13)
     private String seriousOverFlowCrossName;
-    @ApiModelProperty(value = "区域内【溢出】最严重路口：发生次数", example = "旅游路-洪山路",position = 0)
+    @ApiModelProperty(value = "区域内【溢出】最严重路口：发生次数", example = "旅游路-洪山路",position = 14)
     private String seriousOverFlowCount;
-    @ApiModelProperty(value = "区域内【溢出】最严重路口总时长", example = "旅游路-洪山路",position = 0)
+    @ApiModelProperty(value = "区域内【溢出】最严重路口总时长", example = "旅游路-洪山路",position = 15)
     private String seriousOverFlowDuration;
 
-    @ApiModelProperty(value = "区域内【拥堵】最严重路口", example = "旅游路-洪山路",position = 0)
+    @ApiModelProperty(value = "区域内【拥堵】最严重路口", example = "旅游路-洪山路",position = 16)
     private String seriousCongestCrossName;
-    @ApiModelProperty(value = "区域内【拥堵】最严重路口：发生次数", example = "旅游路-洪山路",position = 0)
+    @ApiModelProperty(value = "区域内【拥堵】最严重路口：发生次数", example = "旅游路-洪山路",position = 17)
     private String seriousCongestCount;
-    @ApiModelProperty(value = "区域内【拥堵】最严重路口总时长", example = "旅游路-洪山路",position = 0)
+    @ApiModelProperty(value = "区域内【拥堵】最严重路口总时长", example = "旅游路-洪山路",position = 18)
     private String seriousCongestDuration;
 
-    @ApiModelProperty(value = "区域内【失衡】最严重路口", example = "旅游路-洪山路",position = 0)
+    @ApiModelProperty(value = "区域内【失衡】最严重路口", example = "旅游路-洪山路",position = 19)
     private String seriousUnbalanceCrossName;
-    @ApiModelProperty(value = "区域内【失衡】最严重路口：发生次数", example = "旅游路-洪山路",position = 0)
+    @ApiModelProperty(value = "区域内【失衡】最严重路口：发生次数", example = "旅游路-洪山路",position = 20)
     private String seriousUnbalanceCount;
-    @ApiModelProperty(value = "区域内【失衡】最严重路口总时长", example = "旅游路-洪山路",position = 0)
+    @ApiModelProperty(value = "区域内【失衡】最严重路口总时长", example = "旅游路-洪山路",position = 21)
     private String seriousUnbalanceDuration;
 
-    @ApiModelProperty(value = "区域内【空放】最严重路口", example = "旅游路-洪山路",position = 0)
+    @ApiModelProperty(value = "区域内【空放】最严重路口", example = "旅游路-洪山路",position = 22)
     private String seriousEmptyPassCrossName;
-    @ApiModelProperty(value = "区域内【空放】最严重路口：发生次数", example = "旅游路-洪山路",position = 0)
+    @ApiModelProperty(value = "区域内【空放】最严重路口：发生次数", example = "旅游路-洪山路",position = 23)
     private String seriousEmptyPassCount;
-    @ApiModelProperty(value = "区域内【空放】最严重路口总时长", example = "旅游路-洪山路",position = 0)
+    @ApiModelProperty(value = "区域内【空放】最严重路口总时长", example = "旅游路-洪山路",position = 24)
     private String seriousEmptyPassDuration;
 
 
-    @ApiModelProperty(value = "区域内路口溢出排名",position = 8)
+    @ApiModelProperty(value = "区域内路口溢出排名",position = 25)
     private List<AreaCrossProblemRankData> overFlowRankList = new ArrayList<>();
 
-    @ApiModelProperty(value = "区域内路口失衡排名",position = 9)
+    @ApiModelProperty(value = "区域内路口失衡排名",position = 26)
     private List<AreaCrossProblemRankData> unbalanceRankList = new ArrayList<>();
 
-    @ApiModelProperty(value = "区域内路口拥堵排名",position = 10)
+    @ApiModelProperty(value = "区域内路口拥堵排名",position = 27)
     private List<AreaCrossProblemRankData> congestRankList = new ArrayList<>();
 
 }

signal-optimize-service/src/main/java/net/wanji/opt/entity/report/AnalysisGreenWaveOptimizeWeek.java

@@ -131,6 +131,8 @@ public class AnalysisGreenWaveOptimizeWeek implements Serializable {
      * 数据插入时间
      */
     private LocalDateTime insertTime;
-
-
+    /**
+     * 问题次数
+     */
+    private Integer problemCount;
 }

signal-optimize-service/src/main/resources/mapper/report/AnalysisReportCrossOptimizeDetailMapper.xml

@@ -286,7 +286,8 @@
         last_week_max_queue_length,
         last_week_speed,
         last_week_congest_index,
-        dirs
+        dirs,
+        problem_count
     ) VALUES
     <foreach collection="list" item="entity" separator=",">
         (
@@ -312,6 +313,7 @@
         ,#{entity.lastWeekSpeed}
         ,#{entity.lastWeekCongestIndex}
         ,#{entity.dirs}
+        ,#{entity.problemCount}
         )
     </foreach>
     ON DUPLICATE KEY UPDATE
@@ -336,6 +338,7 @@
     last_week_max_queue_length = VALUES(last_week_max_queue_length),
     last_week_speed = VALUES(last_week_speed),
     last_week_congest_index = VALUES(last_week_congest_index),
-    dirs = VALUES(dirs)
+    dirs = VALUES(dirs),
+    problem_count = VALUES(problem_count)
     </insert>
 </mapper>