Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan

wj-databus/src/main/java/net/wanji/databus/po/CrossDataRealtimePO.java

@@ -83,9 +83,9 @@ public class CrossDataRealtimePO {
     private Double congestionIndex;
     /**
      * 空放指数
-     */
     @ApiModelProperty(value = "空放指数", notes = "")
     private Double emptyReleaseIndex;
+     */
     /**
      * 路口失衡方向：1，2，3...
      */

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

@@ -13,12 +13,14 @@
         <result column="is_unbalance" property="isUnbalance"></result>
         <result column="is_spillover" property="isSpillover"></result>
         <result column="is_congestion" property="isCongestion"></result>
+        <result column="is_emptyrelease" property="isEmptyRelease"></result>
         <result column="unbalance_index" property="unbalanceIndex"></result>
         <result column="spillover_index" property="spilloverIndex"></result>
         <result column="congestion_index" property="congestionIndex"></result>
         <result column="unbalance_dirs" property="unbalanceDirs"></result>
         <result column="spillover_dirs" property="spilloverDirs"></result>
         <result column="congestion_dirs" property="congestionDirs"></result>
+        <result column="emptyrelease_dirs" property="emptyReleaseDirs"></result>
         <result column="flow" property="flow"></result>
         <result column="flow_rate" property="flowRate"></result>
         <result column="speed" property="speed"></result>
@@ -61,8 +63,8 @@
              (<include refid="Base_Column_List"></include>)
         values
         <foreach collection="list" item="entity" separator=",">
-            (#{entity.crossId},#{entity.status},#{entity.type},#{entity.trafficIndex},#{entity.startTime},#{entity.endTime},#{entity.duration},#{entity.isUnbalance},#{entity.isSpillover},#{entity.isCongestion},
-            #{entity.unbalanceIndex},#{entity.spilloverIndex},#{entity.congestionIndex},#{entity.unbalanceDirs},#{entity.spilloverDirs},#{entity.congestionDirs},
+            (#{entity.crossId},#{entity.status},#{entity.type},#{entity.trafficIndex},#{entity.startTime},#{entity.endTime},#{entity.duration},#{entity.isUnbalance},#{entity.isSpillover},#{entity.isCongestion},#{entity.isEmptyRelease},
+            #{entity.unbalanceIndex},#{entity.spilloverIndex},#{entity.congestionIndex},#{entity.unbalanceDirs},#{entity.spilloverDirs},#{entity.congestionDirs},#{entity.emptyReleaseDirs},
             #{entity.flow},#{entity.flowRate},#{entity.speed},#{entity.queueLength},#{entity.stopTimes},#{entity.delayTime},#{entity.sturation},#{entity.batchTime},#{entity.gmtCreate},#{entity.gmtModified},
              #{entity.clearRate},#{entity.loadBalance},#{entity.notClearCarNums},#{entity.greenLightEfficiency},#{entity.effusionRate},
             #{entity.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate},

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

@@ -13,13 +13,14 @@
         <result column="is_unbalance" property="isUnbalance"></result>
         <result column="is_spillover" property="isSpillover"></result>
         <result column="is_congestion" property="isCongestion"></result>
-        <result column="is_emptyrelease" property="isEmptyRelease"></result>
+        <result column="is_empty_release" property="isEmptyRelease"></result>
         <result column="unbalance_index" property="unbalanceIndex"></result>
         <result column="spillover_index" property="spilloverIndex"></result>
         <result column="congestion_index" property="congestionIndex"></result>
         <result column="unbalance_dirs" property="unbalanceDirs"></result>
         <result column="spillover_dirs" property="spilloverDirs"></result>
         <result column="congestion_dirs" property="congestionDirs"></result>
+        <result column="empty_release_dirs" property="emptyReleaseDirs"></result>
         <result column="flow" property="flow"></result>
         <result column="flow_rate" property="flowRate"></result>
         <result column="speed" property="speed"></result>
@@ -49,8 +50,8 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        cross_id,status,type,traffic_index,start_time,duration,is_unbalance,is_spillover,is_congestion, is_emptyrelease,unbalance_index,
-            spillover_index,congestion_index,unbalance_dirs,spillover_dirs,congestion_dirs,flow,flow_rate,speed,
+        cross_id,status,type,traffic_index,start_time,duration,is_unbalance,is_spillover,is_congestion, is_empty_release,unbalance_index,
+            spillover_index,congestion_index,unbalance_dirs,spillover_dirs,congestion_dirs,empty_release_dirs,flow,flow_rate,speed,
             queue_length,stop_times,delay_time,sturation,batch_time,gmt_create,gmt_modified,clear_rate,end_time,
             load_balance,not_clear_car_nums,green_light_efficiency,effusion_rate,
             no_stop_rate,one_stop_rate,two_stop_rate,three_stop_rate,non_motor_flow,v_85,
@@ -62,8 +63,8 @@
              (<include refid="Base_Column_List"></include>)
         values
         <foreach collection="list" item="entity" separator=",">
-            (#{entity.crossId},#{entity.status},#{entity.type},#{entity.trafficIndex},#{entity.startTime},#{entity.duration},#{entity.isSpillover},#{entity.isSpillover},#{entity.isCongestion},
-            #{entity.unbalanceIndex},#{entity.spilloverIndex},#{entity.congestionIndex},#{entity.unbalanceDirs},#{entity.spilloverDirs},#{entity.congestionDirs},
+            (#{entity.crossId},#{entity.status},#{entity.type},#{entity.trafficIndex},#{entity.startTime},#{entity.duration},#{entity.isSpillover},#{entity.isSpillover},#{entity.isCongestion},#{entity.isCongestion},
+            #{entity.unbalanceIndex},#{entity.spilloverIndex},#{entity.congestionIndex},#{entity.unbalanceDirs},#{entity.spilloverDirs},#{entity.congestionDirs},#{entity.emptyReleaseDirs},
             #{entity.flow},#{entity.flowRate},#{entity.speed},#{entity.queueLength},#{entity.stopTimes},#{entity.delayTime},#{entity.sturation},#{entity.batchTime},#{entity.gmtCreate},#{entity.gmtModified},
              #{entity.clearRate},#{entity.endTime},#{entity.loadBalance},#{entity.notClearCarNums},#{entity.greenLightEfficiency},#{entity.effusionRate},
             #{entity.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate},