[add] 实时数据优化

wj-databus/src/main/java/net/wanji/databus/dao/entity/GreenwaveRealtimePO.java

 package net.wanji.databus.dao.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -63,4 +64,28 @@ public class GreenwaveRealtimePO {
     /** 修改时间 */
     @ApiModelProperty(name = "修改时间",notes = "")
     private Date gmtModified ;
+    /** add 20241123 适配神思数据 */
+    @ApiModelProperty(value = "执行策略 失衡 2拥堵 3溢出 4死锁  5 空放", notes = "")
+    private Integer strategy;
+    @ApiModelProperty(value = "策略执行持续时间；单位：s", notes = "")
+    private Integer strategyDuration;
+    @ApiModelProperty(value = "优化执行次数", notes = "")
+    private Integer optimizeCount;
+    @ApiModelProperty(value = "优化时长，单位秒", notes = "")
+    private Integer optimizeSeconds;
+    @ApiModelProperty(value = "绿波带宽，单位秒", notes = "")
+    private Integer greenWaveWidth;
+    @ApiModelProperty(value = "协调方向 0正向 1反向 2双向", notes = "")
+    private Integer direction;
+    @ApiModelProperty(value = "方案周期，单位秒", notes = "")
+    private Integer planCycle;
+    @ApiModelProperty(value = "方推荐速度上限 km/h", notes = "")
+    private Integer speedHigh;
+    @ApiModelProperty(value = "推荐速度下限 km/h", notes = "")
+    private Integer speedDown;
+    @ApiModelProperty(value = "推荐速度下限 km/h", notes = "")
+    private Integer roadDirection;
+    @ApiModelProperty(value = "饱和度", notes = "")
+    private Integer sturation;
+
 }

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

@@ -74,8 +74,9 @@
              #{entity.clearRate},#{entity.loadBalance},#{entity.notClearCarNums},#{entity.greenLightEfficiency},#{entity.effusionRate},
             #{entity.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate},
             #{entity.nonMotorFlow},#{entity.v85},#{entity.trafficFlowA},#{entity.trafficFlowB},
-             #{entity.trafficFlowC},#{entity.vehicleLengthRatioMean},#{entity.timeOccupancy}),
-            #{entity.strategy}, #{entity.strategy_duration}, #{entity.optimize_count}, #{entity.optimize_seconds}, #{entity.empty_pass}
+             #{entity.trafficFlowC},#{entity.vehicleLengthRatioMean},#{entity.timeOccupancy},
+            #{entity.strategy}, #{entity.strategyDuration}, #{entity.optimizeCount}, #{entity.optimizeSeconds}, #{entity.emptyPass},
+            )
         </foreach>
     </insert>
 

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

@@ -21,11 +21,19 @@
         <result property="startTime" column="start_time"/>
         <result property="gmtCreate" column="gmt_create"/>
         <result property="gmtModified" column="gmt_modified"/>
+        <!-- add 20241123 适配神思数据       -->
+        <result column="strategy" property="strategy"></result>
+        <result column="strategy_duration" property="strategyDuration"></result>
+        <result column="optimize_count" property="optimizeCount"></result>
+        <result column="optimize_seconds" property="optimizeSeconds"></result>
+        <result column="empty_pass" property="emptyPass"></result>
     </resultMap>
 
     <sql id="Base_Column_List">
         id, green_id, status,type,traffic_index,speed,trval_time,stop_times,queue_length,cong_rate,delay_time,nopark_pass_rate,
-        cord_reliability,cord_queue_ratio,uncoordinate_phase_queue, start_time, gmt_create,gmt_modified
+        cord_reliability,cord_queue_ratio,uncoordinate_phase_queue, start_time, gmt_create,gmt_modified,
+        strategy, strategy_duration, optimize_count, optimize_seconds,
+        green_wave_width, direction, plan_cycle, speed_high, speed_down, road_direction, sturation
     </sql>
 
     <select id="selectRunMonitor" resultType="net.wanji.databus.dao.entity.GreenwaveHistPOExt">
@@ -82,7 +90,11 @@
             (#{entity.id}, #{entity.greenId}, #{entity.status}, #{entity.type}, #{entity.trafficIndex},#{entity.speed},
             #{entity.trvalTime}, #{entity.stopTimes}, #{entity.queueLength}, #{entity.congRate},
             #{entity.delayTime}, #{entity.noparkPassRate}, #{entity.cordReliability}, #{entity.cordQueueRatio},
-            #{entity.uncoordinatePhaseQueue}, #{entity.startTime}, #{entity.gmtCreate}, #{entity.gmtModified})
+            #{entity.uncoordinatePhaseQueue}, #{entity.startTime}, #{entity.gmtCreate}, #{entity.gmtModified},
+            #{entity.strategy}, #{entity.strategyDuration}, #{entity.optimizeCount}, #{entity.optimizeSeconds},
+            #{entity.greenWaveWidth}, #{entity.direction}, #{entity.planCycle}, #{entity.speedHigh},
+            #{entity.speedDown}, #{entity.roadDirection}, #{entity.sturation}
+            )
         </foreach>
     </insert>
 

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

@@ -21,11 +21,27 @@
         <result property="startTime" column="start_time"/>
         <result property="gmtCreate" column="gmt_create"/>
         <result property="gmtModified" column="gmt_modified"/>
+        <!-- add 20241123 适配神思数据       -->
+        <result column="strategy" property="strategy"></result>
+        <result column="strategy_duration" property="strategyDuration"></result>
+        <result column="optimize_count" property="optimizeCount"></result>
+        <result column="optimize_seconds" property="optimizeSeconds"></result>
+
+        <result column="green_wave_width" property="greenWaveWidth"></result>
+        <result column="direction" property="direction"></result>
+        <result column="plan_cycle" property="planCycle"></result>
+        <result column="speed_high" property="speedHigh"></result>
+        <result column="speed_down" property="speedDown"></result>
+        <result column="road_direction" property="roadDirection"></result>
+        <result column="sturation" property="sturation"></result>
     </resultMap>
 
     <sql id="Base_Column_List">
         id, green_id, status,type,traffic_index,speed,trval_time,stop_times,queue_length,cong_rate,delay_time,nopark_pass_rate,
-        cord_reliability, cord_queue_ratio, uncoordinate_phase_queue, start_time, gmt_create,gmt_modified
+        cord_reliability, cord_queue_ratio, uncoordinate_phase_queue, start_time, gmt_create,gmt_modified,
+        strategy, strategy_duration, optimize_count, optimize_seconds,
+        green_wave_width, direction, plan_cycle, speed_high, speed_down, road_direction, sturation
+
     </sql>
 
     <select id="selectById" resultType="net.wanji.databus.dao.entity.GreenwaveRealtimePO">
@@ -43,7 +59,11 @@
             (#{entity.id}, #{entity.greenId}, #{entity.status}, #{entity.type}, #{entity.trafficIndex}, #{entity.speed},
             #{entity.trvalTime}, #{entity.stopTimes}, #{entity.queueLength}, #{entity.congRate},
             #{entity.delayTime}, #{entity.noparkPassRate}, #{entity.cordReliability}, #{entity.cordQueueRatio},
-            #{entity.uncoordinatePhaseQueue}, #{entity.startTime}, #{entity.gmtCreate}, #{entity.gmtModified})
+            #{entity.uncoordinatePhaseQueue}, #{entity.startTime}, #{entity.gmtCreate}, #{entity.gmtModified},
+            #{entity.strategy}, #{entity.strategyDuration}, #{entity.optimizeCount}, #{entity.optimizeSeconds},
+            #{entity.greenWaveWidth}, #{entity.direction}, #{entity.planCycle}, #{entity.speedHigh},
+            #{entity.speedDown}, #{entity.roadDirection}, #{entity.sturation}
+            )
         </foreach>
     </insert>