[update] 信号优化，态势监测-修改绿波路口指标计算方式

wj-databus/src/main/java/net/wanji/databus/dao/mapper/BaseCrossLaneLightsMapper.java

@@ -36,4 +36,5 @@ public interface BaseCrossLaneLightsMapper {
     List<CrossLaneLightsPO> selectByLightsId(@Param("lightsId") Integer lightsId);
 
 
+    List<CrossLaneLightsPO> selectByLightIds(List<Integer> ids);
 }

wj-databus/src/main/java/net/wanji/databus/dao/mapper/BaseCrossSectionMapper.java

@@ -22,4 +22,6 @@ public interface BaseCrossSectionMapper {
     List<CrossSectionPO> listCrossSectionPO(@Param("entity") CrossSectionPO entity);
 
     List<CrossSectionPO> selectByCrossAndPlan(String crossId, Integer planId);
+
+    CrossSectionPO selectById(Integer id);
 }

wj-databus/src/main/java/net/wanji/databus/dao/mapper/CrossTurnDataHistMapper.java

@@ -17,4 +17,7 @@ public interface CrossTurnDataHistMapper extends BaseMapper<CrossTurnDataHistPO>
     void insertBatch(@Param("list") List<CrossTurnDataHistPO> list);
     void deleteBatch(@Param("list") Collection<String> crossIds);
 
+    CrossTurnDataHistPO selectNoPark(String crossId, Integer dir, String turn, long currentSeconds, long preSeconds);
+
+    List<CrossTurnDataHistPO> selectByCrossId(String crossId, long currentSeconds, long preSeconds);
 }

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

@@ -34,8 +34,6 @@ public class CrossBaseLaneInfoPO {
     @ApiModelProperty(name = "路段编号",notes = "")
     private String rid;
     @ApiModelProperty(name = "渠化编号",notes = "")
-    private String segmentId;
-    @ApiModelProperty(name = "车道长度",notes = "")
     private Double length;
     @ApiModelProperty(name = "车道宽度",notes = "")
     private Double width;

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

@@ -68,6 +68,16 @@ public class CrossTurnDataRealtimePO {
     /** 可信度：0~1 */
     @ApiModelProperty(name = "可信度：0~1",notes = "")
     private Double quality ;
+
+    @ApiModelProperty(name = "不停车率",notes = "")
+    private Double noStopRate;
+    @ApiModelProperty(name = "一次停车率",notes = "")
+    private Double oneStopRate;
+    @ApiModelProperty(name = "二次停车率",notes = "")
+    private Double twoStopRate;
+    @ApiModelProperty(name = "三次停车率",notes = "")
+    private Double threeStopRate;
+
     /** 采集时间（10位时间戳） */
     @ApiModelProperty(name = "采集时间（10位时间戳）",notes = "")
     private Integer batchTime ;

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

@@ -81,5 +81,15 @@
         where lights_id = #{lightsId}
     </select>
 
+    <select id="selectByLightIds" resultType="net.wanji.databus.po.CrossLaneLightsPO">
+        select
+            id,lights_id,lane_id,cross_id,gmt_create,gmt_modified
+        from t_base_cross_lane_lights
+        where lights_id in
+            <foreach collection="ids" item="id" separator="," open="(" close=")">
+                #{id}
+            </foreach>
+    </select>
+
 
 </mapper>

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

@@ -57,5 +57,11 @@
         where cross_id = #{crossId} and plan_id = #{planId}
     </select>
 
+    <select id="selectById" resultType="net.wanji.databus.dao.entity.CrossSectionPO">
+        select <include refid="Base_Column_list"/>
+        from t_base_cross_section
+        where id = #{id}
+    </select>
+
 
 </mapper>

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

@@ -28,7 +28,8 @@
 
     <sql id="Base_Column_List">
         id, turn_type, in_dir, out_dir, cross_id, flow, status, traffic_index, speed, in_speed, out_speed, queue_length,
-        stop_times, delay_time, sturation, vehhead_dist, vehhead_time, quality, batch_time, gmt_create, gmt_modified
+        stop_times, delay_time, sturation, vehhead_dist, vehhead_time, quality,no_stop_rate,one_stop_rate,two_stop_rate,
+        three_stop_rate, batch_time, gmt_create, gmt_modified
     </sql>
 
     <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossTurnDataRealtimePO">
@@ -49,4 +50,20 @@
         </foreach>
     </delete>
 
+    <select id="selectNoPark" resultType="net.wanji.databus.po.CrossTurnDataHistPO">
+        select <include refid="Base_Column_List"/>
+        from t_cross_turn_data_hist
+        where cross_id = #{crossId} and in_dir = #{dir} and turn_type = #{turn}
+            and batch_time <![CDATA[ <= ]]> #{currentSeconds}
+            and batch_time <![CDATA[ >= ]]> #{preSeconds}
+    </select>
+
+    <select id="selectByCrossId" resultType="net.wanji.databus.po.CrossTurnDataHistPO">
+        select <include refid="Base_Column_List"/>
+        from t_cross_turn_data_hist
+        where cross_id = #{crossId}
+            and batch_time <![CDATA[ <= ]]> #{currentSeconds}
+            and batch_time <![CDATA[ >= ]]> #{preSeconds}
+    </select>
+
 </mapper>
\ No newline at end of file