[update] 车道周期数据优化

wj-datacenter-service/src/main/java/net/wanji/datacenter/pojo/dto/CrossPeriodLaneDTO.java

@@ -202,6 +202,52 @@ public class CrossPeriodLaneDTO {
                 notes = ""
         )
         private int trafficFlowC;
+
+        @ApiModelProperty(
+                value = "流量",
+                notes = ""
+        )
+        private int trafficFlow;
+        @ApiModelProperty(
+                value = "速度",
+                notes = ""
+        )
+        private Double meanV;
+        @ApiModelProperty(
+                value = "静态最大排队",
+                notes = ""
+        )
+        private Double staticQueueLengthMax;
+        @ApiModelProperty(
+                name = "通行能力（辆/某一时段内最大过车数）,通行能力=自然流量",
+                notes = ""
+        )
+        private Integer laneCapacity;
+        @ApiModelProperty(
+                name = "车道饱和度",
+                notes = ""
+        )
+        private Double laneSaturation;
+        @ApiModelProperty(
+                name = "不停车率",
+                notes = ""
+        )
+        private Double laneNoStopRate;
+        @ApiModelProperty(
+                name = "一次停车率",
+                notes = ""
+        )
+        private Double laneOneStopRate;
+        @ApiModelProperty(
+                name = "二次停车率",
+                notes = ""
+        )
+        private Double laneTwoStopRate;
+        @ApiModelProperty(
+                name = "三次停车率",
+                notes = ""
+        )
+        private Double laneThreeStopRate;
     }
 
 }

wj-datacenter-service/src/main/java/net/wanji/datacenter/service/impl/DataProcessServiceImpl.java

@@ -93,11 +93,13 @@ public class DataProcessServiceImpl implements DataProcessService {
                     // 当前方向车道数量
                     int size = value.size();
                     // 车道级别
+                    int i = 0;
                     for (CrossPeriodLaneDTO.CrossLaneDataRealTimeDTO crossLaneDataRealTimeDTO : value) {
-                        Integer wjLaneId = size - dir + 1 + 10;
+                        Integer wjLaneId = size - i + 10;
                         // 神思车道号与万集车道号镜像
                         String key = crossId.concat(String.valueOf(dir + 1)).concat(String.valueOf(wjLaneId));
                         LaneInfoPO laneInfoPO = crossIdLaneId2Map.get(key);
+                        ++i;
                         if (Objects.isNull(laneInfoPO)) {
                             continue;
                         }
@@ -109,6 +111,15 @@ public class DataProcessServiceImpl implements DataProcessService {
                         crossLaneDataRealTime.setStartTime(startDate);
                         Integer batchTime = Integer.valueOf(String.valueOf(startDate.getTime()).substring(0, 10));
                         crossLaneDataRealTime.setBatchTime(batchTime);
+                        crossLaneDataRealTime.setFlow(crossLaneDataRealTimeDTO.getTrafficFlow());
+                        crossLaneDataRealTime.setSpeed(crossLaneDataRealTimeDTO.getMeanV());
+                        crossLaneDataRealTime.setQueueLength(crossLaneDataRealTimeDTO.getStaticQueueLengthMax());
+                        crossLaneDataRealTime.setCapacity(crossLaneDataRealTimeDTO.getLaneCapacity());
+                        crossLaneDataRealTime.setSturation(crossLaneDataRealTimeDTO.getLaneSaturation());
+                        crossLaneDataRealTime.setNoStopRate(crossLaneDataRealTimeDTO.getNoStopRate());
+                        crossLaneDataRealTime.setOneStopRate(crossLaneDataRealTimeDTO.getOneStopRate());
+                        crossLaneDataRealTime.setTwoStopRate(crossLaneDataRealTimeDTO.getTwoStopRate());
+                        crossLaneDataRealTime.setThreeStopRate(crossLaneDataRealTimeDTO.getThreeStopRate());
                         insertList.add(crossLaneDataRealTime);
                     }
                 }