Merge remote-tracking branch 'origin/master'

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

@@ -66,6 +66,8 @@ public class LaneInfoPO {
      */
     @ApiModelProperty(value = "车道宽度", notes = "")
     private Double width = 0.0;
+    @ApiModelProperty(value = "wkt", notes = "")
+    private String wkt = "";
     /**
      * 创建时间
      */

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

@@ -15,15 +15,16 @@
         <result property="rid" column="rid"/>
         <result property="length" column="length"/>
         <result property="width" column="width"/>
+        <result property="wkt" column="wkt"/>
         <result property="gmtCreate" column="gmt_create"/>
         <result property="gmtModified" column="gmt_modified"/>
     </resultMap>
 
     <insert id="insertBatch">
-        insert into t_base_lane_info(id,code,sort,type,dir,turn,category,cross_id,rid,length,width)
+        insert into t_base_lane_info(id,code,sort,type,dir,turn,category,cross_id,rid,length,width,wkt)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.id},#{entity.code},#{entity.sort},#{entity.type},#{entity.dir},#{entity.turn},#{entity.category},#{entity.crossId},#{entity.rid},#{entity.length},#{entity.width})
+            (#{entity.id},#{entity.code},#{entity.sort},#{entity.type},#{entity.dir},#{entity.turn},#{entity.category},#{entity.crossId},#{entity.rid},#{entity.length},#{entity.width},#{entity.wkt})
         </foreach>
     </insert>
 
@@ -34,21 +35,21 @@
 
     <select id="selectByCrossIdAndDir" resultMap="BaseResultMap">
         select
-            id,code,sort,type,dir,turn,category,cross_id,rid,length,width,gmt_create,gmt_modified
+            id,code,sort,type,dir,turn,category,cross_id,rid,length,width,wkt,gmt_create,gmt_modified
         from t_base_lane_info
         where cross_id = #{crossId} and dir = #{dir} and type = 2
     </select>
 
     <select id="selectBycrossId" resultMap="BaseResultMap">
         select
-            id,code,sort,type,dir,turn,category,cross_id,rid,length,width,gmt_create,gmt_modified
+            id,code,sort,type,dir,turn,category,cross_id,rid,length,width,wkt,gmt_create,gmt_modified
         from t_base_lane_info
         where cross_id = #{crossId} and type = 2
     </select>
 
     <select id="selectByCrossIdDirCode" resultMap="BaseResultMap">
         select
-            id,code,sort,type,dir,turn,category,cross_id,rid,length,width,gmt_create,gmt_modified
+            id,code,sort,type,dir,turn,category,cross_id,rid,length,width,wkt,gmt_create,gmt_modified
         from t_base_lane_info
         where cross_id = #{crossId} and dir = #{dir} and code = #{code} and type = 2
     </select>
@@ -61,7 +62,7 @@
     </select>
 
     <select id="selectByLaneIds" resultMap="BaseResultMap">
-        select id,code,sort,type,dir,turn,category,cross_id,rid,length,width,gmt_create,gmt_modified
+        select id,code,sort,type,dir,turn,category,cross_id,rid,length,width,wkt,gmt_create,gmt_modified
         from t_base_lane_info
         where id in
             <foreach collection="laneIds" item="laneId" separator="," open="(" close=")">

signal-optimize-service/pom.xml

@@ -250,7 +250,7 @@
                         <!--配置jvm虚拟机参数-->
                         <jvmFlags>
                             <jvmFlag>-Xms512m</jvmFlag>
-                            <jvmFlag>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=15116</jvmFlag>
+                            <jvmFlag>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=15117</jvmFlag>
                         </jvmFlags>
                         <!--配置使用的时区-->
                         <environment>
@@ -259,8 +259,8 @@
                         </environment>
                         <!--要暴露的端口-->
                         <ports>
-                            <port>32001</port>
-                            <port>15116</port>
+                            <port>39001</port>
+                            <port>15117</port>
                         </ports>
                         <!--                        <creationTime>2022-10-14T10:08:59.304+08:00</creationTime>-->
                         <creationTime>${maven.build.timestamp}</creationTime>