优化交通指标4个指标统计

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

@@ -278,7 +278,7 @@ public class TrendController {
     }
 
     /**
-     * 交通指标 - 车道级
+     * 交通指标 - 车道级数据
      * @param crossIdDateTimeVO
      * @return
      * @throws Exception
@@ -290,18 +290,18 @@ public class TrendController {
     @ApiResponses({
             @ApiResponse(code = 200, message = "OK", response = TableQueryVO.CycleDataElement.class),
     })
-    public JsonViewObject laneTrafficIndex(@RequestBody CommonCrossIdDateTimeVO crossIdDateTimeVO) throws Exception {
+    public JsonViewObject laneTrafficIndex(@RequestBody LanePeriodVO crossIdDateTimeVO) throws Exception {
         List<TableQueryVO.CycleDataElement> result = trendService.laneTrafficIndex(crossIdDateTimeVO);
         return JsonViewObject.newInstance().success(result);
     }
 
     /**
-     * 车道交通指标 - 转向级数据
+     * 交通指标 - 转向级数据
      * @param lanePeriodTurnVO
      * @return
      * @throws Exception
      */
-    @ApiOperation(value = "车道周期转向数据", notes = "车道周期转向数据", response = JsonViewObject.class,
+    @ApiOperation(value = "转向级交通指标", notes = "转向级交通指标", response = JsonViewObject.class,
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
     @PostMapping(value = "/lanePeriodTurnData",
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
@@ -329,7 +329,7 @@ public class TrendController {
      * @return
      * @throws Exception
      */
-    @ApiOperation(value = "路口方向级数据", notes = "路口方向级数据", response = JsonViewObject.class,
+    @ApiOperation(value = "方向级交通指标", notes = "方向级交通指标", response = JsonViewObject.class,
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
     @PostMapping(value = "/periodDirectionData",
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
@@ -354,7 +354,7 @@ public class TrendController {
      * @return
      * @throws Exception
      */
-    @ApiOperation(value = "路口级数据", notes = "路口级数据", response = JsonViewObject.class,
+    @ApiOperation(value = "路口级交通指标", notes = "路口级交通指标", response = JsonViewObject.class,
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
     @PostMapping(value = "/periodCrossingData",
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)

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

@@ -60,7 +60,7 @@ public interface TrendService {
 
     CrossStatusTimeRateVO crossStatusTimeRate(CommonCrossIdVO commonCrossIdVO) throws Exception;
 
-    List<TableQueryVO.CycleDataElement> laneTrafficIndex(CommonCrossIdDateTimeVO crossIdDateTimeVO) throws Exception;
+    List<TableQueryVO.CycleDataElement> laneTrafficIndex(LanePeriodVO lanePeriodVO) throws Exception;
 
     List<TableQueryVO.RealTimeDataElement> laneSnapshotIndex(LaneSnapshotIndexVO laneSnapshotIndexVO) throws Exception;
     List<OverflowEvent> overFlowEvent(LaneSnapshotIndexVO laneSnapshotIndexVO) throws Exception;

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

@@ -1642,7 +1642,7 @@ public class TrendServiceImpl implements TrendService {
     private List<CrossingTurnQueryVO.CycleDataElement> buildCrossingTurnCycleData(String crossId, List<CrossTurnDataHistVO> vos) {
         List<CrossingTurnQueryVO.CycleDataElement> res = new ArrayList<>();
 
-        int pedFlow = 0;
+//        int pedFlow = 0;
         for (CrossTurnDataHistVO po : vos) {
             CrossingTurnQueryVO.CycleDataElement vo = new CrossingTurnQueryVO.CycleDataElement();
             if (po.getStartTime() == null || po.getStartTime().equals("0000")){
@@ -1654,7 +1654,12 @@ public class TrendServiceImpl implements TrendService {
             vo.setTurnType(po.getTurnType());
             vo.setTurnTypeName(TurnConvertEnum.getDescByCode(po.getTurnType()));
             vo.setFlow(po.getFlow());
-            vo.setPedFlow(pedFlow);
+            //参照（行人流量 + 非机动车流量 + 交通流量）
+//            vo.setAllFlow(pedFlow + po.getNonMotorFlow() + po.getFlow());
+            //vo.setAllVehiceleFlow(po.getFlow() + po.getNonMotorFlow());
+            vo.setAllVehiceleFlow(po.getFlow() + 0);//车辆总和
+            vo.setAllFlow(0 + 0 + po.getFlow());
+            vo.setPedFlow(0);
             vo.setNonMotorFlow(0);//非机动车流量
             vo.setTrafficFlowA( po.getTrafficFlowA());
             vo.setTrafficFlowB( po.getTrafficFlowB());
@@ -1743,7 +1748,7 @@ public class TrendServiceImpl implements TrendService {
             vo.setPedCrossRedLightRate(0.0);
 
 //            vo.setV85(Math.round(po.getV85() * 100) / 100);
-//            vo.setAllFlow(pedFlow + po.getNonMotorFlow() + po.getFlow());
+//
 //            vo.setAllVehiceleFlow(po.getFlow() + po.getNonMotorFlow());
 //            vo.setTurn(po.getTurn());
 
@@ -1768,15 +1773,20 @@ public class TrendServiceImpl implements TrendService {
     private List<CrossingDirectionQueryVO.CycleDataElement> buildCrossingDirectionCycleData(String crossId, List<CrossDirDataHistVO> vos) {
         List<CrossingDirectionQueryVO.CycleDataElement> res = new ArrayList<>();
 
-        int pedFlow = 0;
+//        int pedFlow = 0;
         for (CrossDirDataHistVO po : vos) {
             CrossingDirectionQueryVO.CycleDataElement vo = new CrossingDirectionQueryVO.CycleDataElement();
 
             vo.setTime(po.getStartTime());
             vo.setDir(po.getDirType());
             vo.setDirName(BaseEnum.SignalDirectionEnum.getNameByCode(po.getDirType()));
-            vo.setFlow(po.getFlow());
-            vo.setPedFlow(pedFlow);
+            vo.setFlow(po.getFlow());//流量
+            //参照（行人流量 + 非机动车流量 + 交通流量）
+//            vo.setAllFlow(pedFlow + po.getNonMotorFlow() + po.getFlow());
+            vo.setAllFlow(0 + 0 + po.getFlow());//总流量
+            //vo.setAllVehiceleFlow(po.getFlow() + po.getNonMotorFlow());
+            vo.setAllVehiceleFlow(po.getFlow() + 0);//车辆总和
+            vo.setPedFlow(0);
             vo.setNonMotorFlow(0);//非机动车流量
             vo.setTrafficFlowA((int) po.getTrafficFlowA());
             vo.setTrafficFlowB((int) po.getTrafficFlowB());
@@ -1869,7 +1879,7 @@ public class TrendServiceImpl implements TrendService {
 
 //            vo.setV85(Math.round(po.getV85() * 100) / 100);
 //            vo.setAllFlow(pedFlow + po.getNonMotorFlow() + po.getFlow());
-//            vo.setAllVehiceleFlow(po.getFlow() + po.getNonMotorFlow());
+//
 //            vo.setTurn(0);
 
 //            String dirName = BaseEnum.SignalDirectionEnum.getNameByCode(po.getDir());
@@ -1894,12 +1904,15 @@ public class TrendServiceImpl implements TrendService {
     private List<CrossingQueryVO.CycleDataElement> buildCrossingCycleData(String crossId, List<CrossDataHistVO> poExtList) {
         List<CrossingQueryVO.CycleDataElement> res = new ArrayList<>();
 
-        int pedFlow = 0;
+//        int pedFlow = 0;
         for (CrossDataHistVO po : poExtList) {
             CrossingQueryVO.CycleDataElement vo = new CrossingQueryVO.CycleDataElement();
             vo.setTime(po.getStartTime());
             vo.setFlow(po.getFlow());
-            vo.setPedFlow(pedFlow);
+            //行人流量 + 非机动车流量 + 流量
+            vo.setAllFlow(0 + po.getNonMotorFlow() + po.getFlow());
+            vo.setAllVehiceleFlow(po.getFlow() + po.getNonMotorFlow());
+            vo.setPedFlow(0);
             vo.setNonMotorFlow(0);//非机动车流量
             vo.setTrafficFlowA( po.getTrafficFlowA());
             vo.setTrafficFlowB( po.getTrafficFlowB());
@@ -1991,14 +2004,9 @@ public class TrendServiceImpl implements TrendService {
             vo.setPedCrossRedLightRate(0.0);
 
 //            vo.setVehheadDist(po.getVehheadDist());
-//            vo.setTrafficFlowA(po.getTrafficFlowA());
-//            vo.setTrafficFlowB(po.getTrafficFlowB());
-//            vo.setTrafficFlowC(po.getTrafficFlowC());
             vo.setNonMotorFlow(po.getNonMotorFlow());
             vo.setV85(Math.round(po.getV85() * 100) / 100);
-            vo.setPedFlow(pedFlow);
-            vo.setAllFlow(pedFlow + po.getNonMotorFlow() + po.getFlow());
-            vo.setAllVehiceleFlow(po.getFlow() + po.getNonMotorFlow());
+
 //            vo.setTurn(po.getTurn());
 
             res.add(vo);
@@ -2520,28 +2528,28 @@ public class TrendServiceImpl implements TrendService {
 
     /**
      * 车道级数据查询
-     * @param crossIdDateTimeVO
+     * @param lanePeriodVO
      * @return
      * @throws Exception
      */
     @Override
-    public List<TableQueryVO.CycleDataElement> laneTrafficIndex(CommonCrossIdDateTimeVO crossIdDateTimeVO) throws Exception {
+    public List<TableQueryVO.CycleDataElement> laneTrafficIndex(LanePeriodVO lanePeriodVO) throws Exception {
         try {
-            String crossId = crossIdDateTimeVO.getCrossId();
-            int start = (int) (crossIdDateTimeVO.getStart().getTime() / 1000);
-            int end = (int) (crossIdDateTimeVO.getEnd().getTime() / 1000);
-            String ids = crossIdDateTimeVO.getIds();
+            String crossId = lanePeriodVO.getCrossId();
+            int start = (int) (lanePeriodVO.getStart().getTime() / 1000);
+            int end = (int) (lanePeriodVO.getEnd().getTime() / 1000);
+            String ids = lanePeriodVO.getIds();
             List<String> idsList = null;
             if (!StringUtils.isBlank(ids)) {
                 idsList = Arrays.asList(ids.split(","));
             }
 
             //分析粒度【5m:五分钟 10m:10分钟 30m:30分钟 1h:一小时】
-            String granularity = crossIdDateTimeVO.getGranularity();
+            String granularity = lanePeriodVO.getGranularity();
             if (StringUtils.isBlank(granularity)) {
                 granularity = "5";
             }else {
-                granularity = granularity.replace("m", "").replace("h", "");;
+                granularity = granularity.replace("m", "").replace("h", "");
             }
 
             // 查询周期数据

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

@@ -23,9 +23,6 @@ public class CommonCrossIdDateTimeVO {
     @ApiModelProperty(value = "路口ID")
     @NotBlank(message = "路口编号不能为空")
     private String crossId;
-    @ApiModelProperty(value = "车道IDs")
-    @NotBlank(message = "车道ids不能为空")
-    private String ids;
     @ApiModelProperty(value = "开始时间")
     @NotNull(message = "开始日期不能为空")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

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

@@ -37,9 +37,9 @@ public class CrossingDirectionQueryVO {
         @ExcelProperty("方向名称")
         private String dirName;
 
-//        @ApiModelProperty(value = "总流量")
-//        @ExcelProperty("总流量")
-//        private int allFlow;
+        @ApiModelProperty(value = "总流量")
+        @ExcelProperty("总流量")
+        private int allFlow;
 
         @ApiModelProperty(value = "行人流量")
         @ExcelProperty("行人流量")
@@ -207,8 +207,8 @@ public class CrossingDirectionQueryVO {
         @ExcelProperty("行人闯红灯率")
         private double pedCrossRedLightRate;
 
-//        @ApiModelProperty(value = "车辆总和")
-//        @ExcelProperty("车辆总和")
-//        private int allVehiceleFlow;
+        @ApiModelProperty(value = "车辆总和")
+        @ExcelProperty("车辆总和")
+        private int allVehiceleFlow;
     }
 }

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

@@ -49,9 +49,9 @@ public class CrossingTurnQueryVO {
         @ExcelProperty("转向类型名称")
         private String turnTypeName;
 
-//        @ApiModelProperty(value = "总流量")
-//        @ExcelProperty("总流量")
-//        private int allFlow;
+        @ApiModelProperty(value = "总流量")
+        @ExcelProperty("总流量")
+        private int allFlow;
 
         @ApiModelProperty(value = "行人流量")
         @ExcelProperty("行人流量")
@@ -219,8 +219,8 @@ public class CrossingTurnQueryVO {
         @ExcelProperty("行人闯红灯率")
         private double pedCrossRedLightRate;
 
-//        @ApiModelProperty(value = "车辆总和")
-//        @ExcelProperty("车辆总和")
-//        private int allVehiceleFlow;
+        @ApiModelProperty(value = "车辆总和")
+        @ExcelProperty("车辆总和")
+        private int allVehiceleFlow;
     }
 }

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

+package net.wanji.opt.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author duanruiming
+ * @date 2024/05/17 9:00
+ */
+@Data
+@NoArgsConstructor
+@ApiModel(value = "LanePeriodVO")
+public class LanePeriodVO extends CommonCrossIdDateTimeVO {
+    @ApiModelProperty(value = "分析粒度【5m:五分钟 10m:10分钟 30m:30分钟 1h:一小时】")
+    private String granularity;
+
+    @ApiModelProperty(value = "车道IDs")
+    @NotBlank(message = "车道ids不能为空")
+    private String ids;
+
+}

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

@@ -118,7 +118,7 @@ public class TableQueryVO {
         @ExcelIgnore
         private Integer dir;
 
-        @ExcelProperty("方向")
+        @ExcelProperty("方向名称")
         private String dirName;
 
         @ApiModelProperty(value = "车道转向：1左转；2直行；3右转；4掉头；5直左；6直右；7左直右；8左右；9左转掉头；10直行掉头；11右转掉头；12左直掉头；13直右掉头；14左直右掉头；15左右掉头',\n")

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

@@ -98,40 +98,41 @@
     <!-- 交通指标-路口级统计 -->
     <select id="selectByCrossIdAndStartEndStat" resultType="net.wanji.databus.vo.CrossDataHistVO">
         SELECT
-            cross_id AS crossId,
+            t2.cross_id AS crossId,
             <choose>
                 <!-- 小时 -->
                 <when test="granularity==1">
-                    DATE_FORMAT(start_time, '%Y-%m-%d %H:00:00') AS startTime,
+                    DATE_FORMAT(t2.start_time, '%Y-%m-%d %H:00:00') AS startTime,
                 </when>
                 <!-- 分钟 -->
                 <otherwise>
                     DATE_FORMAT(
-                    CONCAT( DATE ( start_time ), ' ', HOUR ( start_time ), ':', FLOOR( MINUTE ( start_time ) / #{granularity} ) * #{granularity} ),
+                    CONCAT( DATE ( t2.start_time ), ' ', HOUR ( t2.start_time ), ':', FLOOR( MINUTE ( t2.start_time ) / #{granularity} ) * #{granularity} ),
                     '%Y-%m-%d %H:%i:00'
                     ) AS startTime,
                 </otherwise>
             </choose>
             SUM( flow ) AS flow,
-            avg( traffic_flow_C ) AS trafficFlowC,
-            avg( traffic_flow_B ) AS trafficFlowB,
-            avg( traffic_flow_A ) AS trafficFlowA,
-            avg( speed ) AS speed,
-            MAX( queue_length ) AS queueLength,
-            AVG( stop_times ) AS stopTimes
+            COALESCE ( sum( traffic_flow_C ), 0) AS trafficFlowC,
+            COALESCE ( sum( traffic_flow_B ), 0) AS trafficFlowB,
+            COALESCE ( sum( traffic_flow_A ), 0) AS trafficFlowA,
+            avg( t2.speed ) AS speed,
+            MAX( t2.queue_length ) AS queueLength,
+            AVG( t2.stop_times ) AS stopTimes
         FROM
-            t_cross_data_hist
+            t_base_cross_info t1
+            LEFT JOIN t_cross_data_hist t2 ON t1.id = t2.cross_id
         WHERE 1=1
             <if test="crossId != null">
-                AND cross_id = #{crossId}
+                AND t2.cross_id = #{crossId}
             </if>
-            and batch_time <![CDATA[ >= ]]> #{startStamp}
-            and batch_time <![CDATA[ <= ]]> #{endStamp}
+            and t2.batch_time <![CDATA[ >= ]]> #{startStamp}
+            and t2.batch_time <![CDATA[ <= ]]> #{endStamp}
         GROUP BY
-            cross_id,
-            startTime
+            t2.cross_id,
+            t2.start_time
         ORDER BY
-            startTime DESC
+            t2.start_time DESC
     </select>
 
     <select id="selectMetricHistDTO" resultType="net.wanji.databus.dto.MetricHistDTO">