[update] control模块依赖databus

signal-control-service/src/main/java/net/wanji/web/mapper/scheme/CrossDirDataRealtimeMapper.java

-package net.wanji.web.mapper.scheme;
-
-import org.springframework.stereotype.Repository;
-
-/**
- * @author Kent HAN
- * @date 2023/1/11 17:25
- */
-@Repository
-public interface CrossDirDataRealtimeMapper {
-
-    CrossDirDataRealtimePO selectByCrossIdAndDirType(String crossId, Integer key);
-}

signal-control-service/src/main/java/net/wanji/web/mapper/scheme/CrossTurnDataHistMapper.java

-package net.wanji.web.mapper.scheme;
-
-import net.wanji.web.po.scheme.CrossTurnDataHistPO;
-import org.springframework.stereotype.Repository;
-
-/**
- * @author Kent HAN
- * @date 2023/1/11 17:25
- */
-@Repository
-public interface CrossTurnDataHistMapper {
-
-    CrossTurnDataHistPO selectByLane(String crossId, Integer key, String turn);
-}

signal-control-service/src/main/java/net/wanji/web/po/scheme/CrossTurnDataHistPO.java

-package net.wanji.web.po.scheme;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author Kent HAN
- * @date 2022/12/29 9:17
- */
-@Data
-public class CrossTurnDataHistPO {
-    /** 转向ID（路口ID_驶入方向_转向类型） */
-    @ApiModelProperty(name = "转向ID（路口ID_驶入方向_转向类型）",notes = "")
-    private String id ;
-    /** 转向类型：u掉头；l左转；s直行；r右转； */
-    @ApiModelProperty(name = "转向类型：u掉头；l左转；s直行；r右转；",notes = "")
-    private String turnType ;
-    /** 驶入方向：1北；2东北；3东；4东南；5南；6西南；7西；8西北 */
-    @ApiModelProperty(name = "驶入方向：1北；2东北；3东；4东南；5南；6西南；7西；8西北",notes = "")
-    private Integer inDir ;
-    /** 驶出方向：1北；2东北；3东；4东南；5南；6西南；7西；8西北 */
-    @ApiModelProperty(name = "驶出方向：1北；2东北；3东；4东南；5南；6西南；7西；8西北",notes = "")
-    private Integer outDir ;
-    /** 路口ID */
-    @ApiModelProperty(name = "路口ID",notes = "")
-    private String crossId ;
-    /** 交通流量（辆） */
-    @ApiModelProperty(name = "交通流量（辆）",notes = "")
-    private Integer flow ;
-    /** 交通状态：1畅通；2缓行；3拥堵；4严重拥堵；5未知 */
-    @ApiModelProperty(name = "交通状态：1畅通；2缓行；3拥堵；4严重拥堵；5未知",notes = "")
-    private Integer status ;
-    /** 交通指数 */
-    @ApiModelProperty(name = "交通指数",notes = "")
-    private Double trafficIndex ;
-    /** 平均速度（km/h） */
-    @ApiModelProperty(name = "平均速度（km/h）",notes = "")
-    private Double speed ;
-    /** 驶入速度（km/h） */
-    @ApiModelProperty(name = "驶入速度（km/h）",notes = "")
-    private Double inSpeed ;
-    /** 驶出速度（km/h） */
-    @ApiModelProperty(name = "驶出速度（km/h）",notes = "")
-    private Double outSpeed ;
-    /** 排队长度（米） */
-    @ApiModelProperty(name = "排队长度（米）",notes = "")
-    private Double queueLength ;
-    /** 停车次数（次） */
-    @ApiModelProperty(name = "停车次数（次）",notes = "")
-    private Double stopTimes ;
-    /** 延误时间（秒） */
-    @ApiModelProperty(name = "延误时间（秒）",notes = "")
-    private Integer delayTime ;
-    /** 饱和度 */
-    @ApiModelProperty(name = "饱和度",notes = "")
-    private Double sturation ;
-    /** 车头间距（米） */
-    @ApiModelProperty(name = "车头间距（米）",notes = "")
-    private Double vehheadDist ;
-    /** 车头时距（秒） */
-    @ApiModelProperty(name = "车头时距（秒）",notes = "")
-    private Double vehheadTime ;
-    /** 可信度：0~1 */
-    @ApiModelProperty(name = "可信度：0~1",notes = "")
-    private Double quality ;
-    /** 采集时间（10位时间戳） */
-    @ApiModelProperty(name = "采集时间（10位时间戳）",notes = "")
-    private Integer batchTime ;
-    /** 创建时间 */
-    @ApiModelProperty(name = "创建时间",notes = "")
-    private Date gmtCreate ;
-    /** 修改时间 */
-    @ApiModelProperty(name = "修改时间",notes = "")
-    private Date gmtModified ;
-}

signal-control-service/src/main/java/net/wanji/web/service/scheme/impl/CrossConfigServiceImpl.java

@@ -3,6 +3,9 @@ package net.wanji.web.service.scheme.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import net.wanji.common.dto.CrossIdDTO;
+import net.wanji.databus.dao.mapper.CrossDirDataRealtimeMapper;
+import net.wanji.databus.dao.mapper.CrossTurnDataHistMapper;
+import net.wanji.databus.po.CrossDirDataRealtimePO;
 import net.wanji.web.common.enums.LightsAddressEnum;
 import net.wanji.web.common.exception.LightLaneConflictException;
 import net.wanji.web.common.exception.RidInfoException;
@@ -10,12 +13,10 @@ import net.wanji.web.dto.DirListElement;
 import net.wanji.web.dto.LaneListElement;
 import net.wanji.web.dto.LedConfigListElement;
 import net.wanji.web.dto.SaveLaneInfoDTO;
-import net.wanji.web.mapper.scheme.CrossDirDataRealtimeMapper;
 import net.wanji.web.mapper.scheme.CrossDirInfoMapper;
 import net.wanji.web.mapper.scheme.CrossLaneLightsMapper;
 import net.wanji.web.mapper.scheme.CrossLightsMapper;
 import net.wanji.web.mapper.scheme.CrossPhaseLightsMapper;
-import net.wanji.web.mapper.scheme.CrossTurnDataHistMapper;
 import net.wanji.web.mapper.scheme.LaneInfoMapper;
 import net.wanji.web.mapper.scheme.LaneSegmentMapper;
 import net.wanji.web.po.scheme.CrossDirInfoPO;

signal-control-service/src/main/resources/mapper/scheme/CrossDirDataRealtimeMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="net.wanji.web.mapper.scheme.CrossDirDataRealtimeMapper">
-
-    <sql id="baseColumnList">
-        id,dir_type,in_out_type,cross_id,length,status,traffic_index,start_time,capacity,duration,flow,speed,queue_length,
-        stop_times,delay_time,sturation,batch_time,gmt_create,gmt_modified,effusion_time
-    </sql>
-
-    <select id="selectByCrossIdAndDirType" resultType="net.wanji.common.po.CrossDirDataRealtimePO">
-        select
-            <include refid="baseColumnList"/>
-        from t_cross_dir_data_realtime
-        where cross_id = #{crossId} and dir_type = #{key} and in_out_type = 1
-    </select>
-</mapper>

signal-control-service/src/main/resources/mapper/scheme/CrossTurnDataHistMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="net.wanji.web.mapper.scheme.CrossTurnDataHistMapper">
-
-
-    <select id="selectByLane" resultType="net.wanji.web.po.scheme.CrossTurnDataHistPO">
-        select
-            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
-        from t_cross_turn_data_realtime
-        where cross_id = #{crossId} and in_dir = #{key} and turn_type = #{turn}
-    </select>
-
-</mapper>

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

@@ -17,4 +17,6 @@ public interface CrossTurnDataHistMapper extends BaseMapper<CrossTurnDataHistPO>
     void insertBatch(@Param("list") List<CrossTurnDataHistPO> list);
     void deleteBatch(@Param("list") Collection<String> crossIds);
 
+    CrossTurnDataHistPO selectByLane(String crossId, Integer key, String turn);
+
 }

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

@@ -48,4 +48,11 @@
             (#{crossId})
         </foreach>
     </delete>
+
+    <select id="selectByLane" resultType="net.wanji.databus.po.CrossTurnDataRealtimePO">
+        select <include refid="Base_Column_List"></include>
+        from t_cross_turn_data_realtime
+        where cross_id = #{crossId} and in_dir = #{key} and turn_type = #{turn}
+    </select>
+
 </mapper>
\ No newline at end of file