车道表增加type字段

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

@@ -26,6 +26,9 @@ public class LaneInfoPO {
      */
     @ApiModelProperty(name = "车道序号", notes = "从左车道开始编号11、12、13...")
     private Integer sort;
+    /** 车道类型：1路段车道；2进口车道；3出口车道；4左转弯待转区；6直行待行区 */
+    @ApiModelProperty(name = "车道类型：1路段车道；2进口车道；3出口车道；4左转弯待转区；6直行待行区",notes = "")
+    private Integer type = 2 ; // todo 信控只用到进口车道
     /**
      * 车道方向：1北；2东北；3东；4东南；5南；6西南；7西；8西北
      */

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

@@ -106,9 +106,8 @@ public class CrossConfigServiceImpl implements CrossConfigService {
     }
 
     private static String getId(String crossId, DirListElement dirListElement) {
-        CrossDirInfoPO crossDirInfoPO = new CrossDirInfoPO();
         Integer dir = dirListElement.getDir();
-        String id = crossId + dir + 1 + 0;// todo 暂无主辅路序号，赋值0
+        String id = crossId + "_" + dir + "_" + 1 + "_" + 0;// todo 暂无主辅路序号，赋值0
         return id;
     }
 

signal-control-service/src/main/resources/mapper/LaneInfoMapper.xml

@@ -7,6 +7,7 @@
         <result property="id" column="id"/>
         <result property="code" column="code"/>
         <result property="sort" column="sort"/>
+        <result property="type" column="type"/>
         <result property="dir" column="dir"/>
         <result property="turn" column="turn"/>
         <result property="category" column="category"/>
@@ -19,10 +20,10 @@
     </resultMap>
 
     <insert id="insertBatch">
-        insert into t_base_lane_info(id,code,sort,dir,turn,category,cross_id)
+        insert into t_base_lane_info(id,code,sort,type,dir,turn,category,cross_id)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.id},#{entity.code},#{entity.sort},#{entity.dir},#{entity.turn},#{entity.category},#{entity.crossId})
+            (#{entity.id},#{entity.code},#{entity.sort},#{entity.type},#{entity.dir},#{entity.turn},#{entity.category},#{entity.crossId})
         </foreach>
     </insert>
 
@@ -33,14 +34,14 @@
 
     <select id="selectByCrossIdAndDir" resultMap="BaseResultMap">
         select
-            id,code,sort,dir,turn,category,cross_id,rid,length,width,gmt_create,gmt_modified
+            id,code,sort,type,dir,turn,category,cross_id,rid,length,width,gmt_create,gmt_modified
         from t_base_lane_info
         where cross_id = #{crossId} and dir = #{dir}
     </select>
 
     <select id="selectBycrossId" resultMap="BaseResultMap">
         select
-            id,code,sort,dir,turn,category,cross_id,rid,length,width,gmt_create,gmt_modified
+            id,code,sort,type,dir,turn,category,cross_id,rid,length,width,gmt_create,gmt_modified
         from t_base_lane_info
         where cross_id = #{crossId}
     </select>