Merge remote-tracking branch 'origin/master'

signal-optimize-data-compute/src/main/java/net/wanji/opt/controllerv2/report/design/CrossProblemTotalityAnalysisResult.java

@@ -32,10 +32,6 @@ public class CrossProblemTotalityAnalysisResult extends ParentResult {
 @Data
 class  CrossProblemTotalityResultResponse {
 
-
-    @ApiModelProperty(value = "路口名称", example = "经十路（舜耕路-山大路）",position = 0)
-    private String crossName;
-
     @ApiModelProperty(value = "本周溢出总次数", example = "20次",position = 1)
     private String weekOverFlowCount;
     @ApiModelProperty(value = "本周溢出总次数与上周比较情况", example = "增加【减少】10%",position = 2)

signal-optimize-service/src/main/java/net/wanji/opt/controllerv2/judgeanalysis/AnalysisProblemGreenDayController.java

@@ -166,13 +166,14 @@ public class AnalysisProblemGreenDayController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "greenId", value = "绿波ID", required = true, dataType = "Integer", paramType = "query"),
             @ApiImplicitParam(name = "startTime", value = "日期,格式：yyyy-MM-dd HH:mm:ss", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "endTime", value = "日期,格式：yyyy-MM-dd HH:mm:ss", required = true, dataType = "String")
+            @ApiImplicitParam(name = "endTime", value = "日期,格式：yyyy-MM-dd HH:mm:ss", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "status", value = "2：缓行 3：拥堵", required = true, dataType = "String")
     })
     @GetMapping(value = "/getGreenHighFrequencyProblem")
     @ApiResponses({
             @ApiResponse(code = 200, message = "OK", response = GreenHighFrequencyProblemReasonResult.class),
     })
-    public JsonViewObject getTrunkLineCrossProblem(Integer greenId, String startTime ,String endTim) {
+    public JsonViewObject getTrunkLineCrossProblem(Integer greenId, Integer status, String startTime ,String endTim) {
         JsonViewObject object = JsonViewObject.newInstance();
         try {
 

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

@@ -32,10 +32,6 @@ public class CrossProblemTotalityAnalysisResult extends ParentResult {
 @Data
 class  CrossProblemTotalityResultResponse {
 
-
-    @ApiModelProperty(value = "路口名称", example = "经十路（舜耕路-山大路）",position = 0)
-    private String crossName;
-
     @ApiModelProperty(value = "本周溢出总次数", example = "20次",position = 1)
     private String weekOverFlowCount;
     @ApiModelProperty(value = "本周溢出总次数与上周比较情况", example = "增加【减少】10%",position = 2)

signal-optimize-service/src/main/java/net/wanji/opt/dao/mapper/report/CrossProblemMapper.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 public interface CrossProblemMapper {
-    List<CrossProblemVO> selectCrossProblem(@Param("crossIdList") List<String> crossIdList,@Param("yearWeek") String yearWeek);
+    CrossProblemVO selectCrossProblem(@Param("crossIdList") List<String> crossIdList,@Param("yearWeek") String yearWeek);
     List<CrossImportProblemDetailVO> selectCrossProblemSeriousDataByType(@Param("crossId") String crossId, @Param("yearWeek") String yearWeek,@Param("eventType") String eventType);
     CrossImportProblemDataForQuery selectCrossProblemWorkDayByType(@Param("crossId") String crossId, @Param("yearWeek") String yearWeek, @Param("eventType") String eventType);
     List<CrossImportProblemDataForQuery> selectCrossProblemByType(@Param("crossIdList") List<String> crossIdList,@Param("yearWeek") String yearWeek,@Param("eventType") String eventType);

signal-optimize-service/src/main/java/net/wanji/opt/vo2/report/CrossProblemTotalityResult.java

@@ -10,8 +10,6 @@ import java.util.List;
 @Data
 @ApiModel(value = "CrossProblemTotalityResult", description = "路口事情信息")
 public class CrossProblemTotalityResult {
-    @ApiModelProperty(value = "路口名称", example = "经十路（舜耕路-山大路）",position = 0)
-    private String crossName;
 
     @ApiModelProperty(value = "本周溢出总次数", example = "20次",position = 1)
     private String weekOverFlowCount;

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

@@ -31,12 +31,12 @@
     </resultMap>
 
     <select id="selectCrossProblem"  resultMap="CrossProblemMap">
-        select t4.cross_id, t4.name, sum(even_number_701) as even_number_701, sum(event_total_time_701) as event_total_time_701,
+        select sum(even_number_701) as even_number_701, sum(event_total_time_701) as event_total_time_701,
         sum(even_number_702) as even_number_702, sum(event_total_time_702) as event_total_time_702,
         sum(even_number_703) as even_number_703, sum(event_total_time_703) as event_total_time_703,
         sum(even_number_707) as even_number_707, sum(event_total_time_707) as event_total_time_707
         from
-        (select t3.cross_id, t3.name, case t3.event_type when 701 then t3.event_number else 0 end  as even_number_701 ,
+        (select case t3.event_type when 701 then t3.event_number else 0 end  as even_number_701 ,
         case t3.event_type when 701 then t3.event_total_time else 0 end as event_total_time_701,
         case t3.event_type when 702 then t3.event_number else 0 end  as even_number_702 ,
         case t3.event_type when 702 then t3.event_total_time else 0 end as event_total_time_702,
@@ -45,27 +45,21 @@
         case t3.event_type when 707 then t3.event_number else 0 end  as even_number_707 ,
         case t3.event_type when 707 then t3.event_total_time else 0 end as event_total_time_707
         from
-        (select t5.cross_id, t5.name,t5.event_type,sum(t5.event_number) as event_number, sum(t5.event_total_time) as event_total_time
-        from
-        (select t.id as cross_id, t.name,IFNULL(t1.event_type,701) as event_type,IFNULL(t1.event_number,0) as event_number , IFNULL(t1.event_total_time,0) as  event_total_time
-        from t_base_cross_info t
-        left join (select cross_id,event_type,event_number,event_total_time from t_analysis_problem_cross_day where 1=1
+        (select event_type,sum(event_number) as event_number,sum(event_total_time) as event_total_time
+        from t_analysis_problem_cross_day
+        where 1=1
         <if test="yearWeek != null">
             and year_week = #{yearWeek}
         </if>
-        ) t1 on t1.cross_id = t.id
-        where  t.is_signal = 1
-        order by t.id, t.name,t1.event_type) t5
-        group by t5.cross_id, t5.name,t5.event_type) t3) t4
-        where 1=1
         <if test="crossIdList != null">
-            and t4.cross_id in
+            and cross_id in
             <foreach collection="crossIdList" item="crossId" open="(" close=")" separator=",">
                 #{crossId}
             </foreach>
         </if>
-        group by t4.cross_id,t4.name
-
+        group by event_type
+        ) t3
+        ) t4
     </select>
 
     <select id="selectCrossProblemByType" parameterType="String" resultMap="CrossProblemQueryMap">

signal-optimize-service/src/main/resources/rebel.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>signal-optimize-service</id>
+
+	<classpath>
+		<dir name="D:/workspace/traffic-signal-platform-v2/traffic-signal-platform/signal-optimize-service/target/classes">
+		</dir>
+	</classpath>
+
+</application>