[update] 济南测试平台-态势检测-重点路口检测

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

@@ -13,10 +13,7 @@ import net.wanji.opt.dto.trend.EventAlarmDTO;
 import net.wanji.opt.dto.trend.GreenwaveListDTO;
 import net.wanji.opt.service.impl.TrendServiceImpl;
 import net.wanji.opt.vo.*;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.ws.rs.core.MediaType;
 import java.text.ParseException;
@@ -173,7 +170,7 @@ public class TrendController {
         return jsonViewObject.success(eventAlarmVOList);
     }
 
-    @ApiOperation(value = "数量实时推送", notes = "数量实时推送",response = JsonViewObject.class,
+    @ApiOperation(value = "数量实时推送", notes = "数量实时推送", response = JsonViewObject.class,
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
     @PostMapping(value = "/countRealTime",
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
@@ -186,7 +183,7 @@ public class TrendController {
         return JsonViewObject.newInstance().success(countRealTimeVO);
     }
 
-    @ApiOperation(value = "表格分时段查询", notes = "表格分时段查询",response = JsonViewObject.class,
+    @ApiOperation(value = "表格分时段查询", notes = "表格分时段查询", response = JsonViewObject.class,
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
     @PostMapping(value = "/tableQuery",
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
@@ -198,7 +195,7 @@ public class TrendController {
         return JsonViewObject.newInstance().success(tableQueryVO);
     }
 
-    @ApiOperation(value = "表格实时推送", notes = "表格实时推送",response = JsonViewObject.class,
+    @ApiOperation(value = "表格实时推送", notes = "表格实时推送", response = JsonViewObject.class,
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
     @PostMapping(value = "/tableRealTime",
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
@@ -210,7 +207,7 @@ public class TrendController {
         return JsonViewObject.newInstance().success(tableRealTimeVO);
     }
 
-    @ApiOperation(value = "优化类型", notes = "优化类型",response = JsonViewObject.class,
+    @ApiOperation(value = "优化类型", notes = "优化类型", response = JsonViewObject.class,
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
     @PostMapping(value = "/optType",
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
@@ -221,4 +218,11 @@ public class TrendController {
         OptTypeVO optTypeVO = trendService.optType(crossIdBO);
         return JsonViewObject.newInstance().success(optTypeVO);
     }
+
+    @ApiOperation(value = "重点路口监测", notes = "重点路口监测", response = JsonViewObject.class)
+    @GetMapping(value = "/hotspotCross")
+    public JsonViewObject hotspotCross() throws Exception {
+        List<HotspotCrossVO> hotspotCrossVOS = trendService.hotspotCross();
+        return JsonViewObject.newInstance().success(hotspotCrossVOS);
+    }
 }
\ No newline at end of file

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

@@ -46,4 +46,6 @@ public interface TrendService {
     TableQueryVO tableRealTime(CrossIdAndIsFirstBO crossIdAndIsFirstBO) throws Exception;
 
     OptTypeVO optType(CrossIdBO crossIdBO);
+
+    List<HotspotCrossVO> hotspotCross() throws Exception;
 }

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

+package net.wanji.opt.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author duanruiming
+ * @date 2024/05/06 10:58
+ */
+@NoArgsConstructor
+@Data
+@ApiModel(value = "重点路口监测实体", description = "重点路口监测实体")
+public class HotspotCrossVO {
+    private Date timeStamp;
+    private List<DetailVO> detailList;
+    @Data
+    public static class DetailVO {
+        private Integer dir;
+        private Double queueLength;
+    }
+}

wj-databus/src/main/resources/mapper/CrossDataRealtimeMapper.xml

@@ -88,7 +88,7 @@
                 and t1.type = #{type}
             </if>
             <if test="status == null">
-                and t1.status in (0, 1, 2, 3)
+                and t1.status in (0, 1, 2, 3, 5)
             </if>
             and t2.is_signal = 1
         </where>