合并分支 'dev_yard_bayonet_G2' 到 'master'

yard、bayonet新增字段



查看合并请求 !1

+# 0.0.2-SNAPSHOT
+- 数据库yard新增stationIdG2（金二场站编码）字段
+- 数据库bayonet新增channel_g2（金二通道编号）、type_io（通道内部通道、主通道类型 I 内 O 主）字段
\ No newline at end of file

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.sunyo.wlpt.station.manage</groupId>
 	<artifactId>station-manage</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>0.0.2-SNAPSHOT</version>
 	<name>station-manage</name>
 	<description>场站管理</description>
 

@@ -98,6 +98,18 @@ public class Bayonet implements Serializable {
     private String stationName;
 
     /**
+     * 金二通道编号
+     */
+    @ApiModelProperty(value = "金二通道编号")
+    private String channelG2;
+
+    /**
+     * 通道内部通道、主通道类型 I 内 O 主
+     */
+    @ApiModelProperty(value = "通道内部通道、主通道类型 I 内 O 主")
+    private String typeIo;
+
+    /**
      * 场站与卡口的关系  1：n
      * <p>
      * 一个卡口，对应一个场站

@@ -99,6 +99,12 @@ public class Yard implements Serializable {
     private String delFlag;
 
     /**
+     * 金二场站编码
+     */
+    @ApiModelProperty(value = "金二场站编码")
+    private String stationIdG2;
+
+    /**
      * 场站与卡口的关系  1：n
      * 一个场站对应多个卡口
      */

@@ -15,20 +15,33 @@
     <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
     <result column="remarks" jdbcType="VARCHAR" property="remarks"/>
     <result column="del_flag" jdbcType="CHAR" property="delFlag"/>
+    <result column="channel_g2" jdbcType="VARCHAR" property="channelG2"/>
+    <result column="type_io" jdbcType="VARCHAR" property="typeIo"/>
     </resultMap>
     <!-- 该Mapper映射关系的作用，是卡口与场站的1:1的关系映射 -->
     <resultMap id="BayonetAndYardMap" extends="BaseResultMap"
                type="com.sunyo.wlpt.station.manage.domain.Bayonet">
         <association property="yard" javaType="com.sunyo.wlpt.station.manage.domain.Yard">
             <id column="id" property="id"/>
+            <result column="yard_area_code" property="areaCode"/>
+            <result column="yard_stationId" property="stationId"/>
             <result column="yard_name" property="name"/>
+            <result column="yard_customs_code" property="customsCode"/>
+            <result column="yard_create_by" property="createBy"/>
+            <result column="yard_create_date" property="createDate"/>
+            <result column="yard_update_by" property="updateBy"/>
+            <result column="yard_update_date" property="updateDate"/>
+            <result column="yard_remarks" property="remarks"/>
+            <result column="yard_del_flag" property="delFlag"/>
+            <result column="yard_org_id" property="orgId"/>
+            <result column="yard_stationIdG2" property="stationIdG2"/>
         </association>
     </resultMap>
 
   <sql id="Base_Column_List">
       <!--@mbg.generated-->
       id, yard_id, `name`, channel, `type`, create_by, create_date, update_by, update_date,
-    remarks, del_flag
+    remarks, del_flag, channel_g2, type_io
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
       <!--@mbg.generated-->
@@ -49,7 +62,20 @@
              b.update_date,
              b.remarks,
              b.del_flag,
-             y.name as yard_name
+             b.channel_g2,
+             b.type_io,
+             y.area_code as yard_area_code,
+             y.stationId as yard_stationId,
+             y.name as yard_name,
+             y.customs_code as yard_customs_code,
+             y.create_by as yard_create_by,
+             y.create_date as yard_create_date,
+             y.update_by as yard_update_by,
+             y.update_date as yard_update_date,
+             y.remarks as yard_remarks,
+             y.del_flag as yard_del_flag,
+             y.org_id as yard_org_id,
+             y.stationIdG2 as yard_stationIdG2
       from bayonet b,
            yard y
       <where>
@@ -65,7 +91,7 @@
           <if test="stationName != null and stationName != ''">
               and y.name = #{stationName,jdbcType=VARCHAR}
           </if>
-          and b.yard_id = y.id
+          and b.yard_id = y.stationId
       </where>
   </select>
 
@@ -80,11 +106,12 @@
       insert into bayonet (id, yard_id, `name`,
                            channel, `type`, create_by,
                            create_date, update_by, update_date,
-                           remarks, del_flag)
+                           remarks, del_flag, channel_g2, type_io)
       values (#{id,jdbcType=VARCHAR}, #{yardId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
               #{channel,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR},
               #{createDate,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateDate,jdbcType=TIMESTAMP},
-              #{remarks,jdbcType=VARCHAR}, #{delFlag,jdbcType=CHAR})
+              #{remarks,jdbcType=VARCHAR}, #{delFlag,jdbcType=CHAR}, #{channelG2,jdbcType=VARCHAR},
+              #{typeIo,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.sunyo.wlpt.station.manage.domain.Bayonet">
       <!--@mbg.generated-->
@@ -123,6 +150,12 @@
       <if test="delFlag != null">
           del_flag,
       </if>
+      <if test="channelG2 != null">
+          channel_g2,
+      </if>
+      <if test="typeIo != null">
+          type_io,
+      </if>
       </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
         <if test="id != null">
@@ -158,6 +191,12 @@
       <if test="delFlag != null">
           #{delFlag,jdbcType=CHAR},
       </if>
+      <if test="channelG2 != null">
+          #{channelG2,jdbcType=VARCHAR},
+      </if>
+      <if test="typeIo != null">
+          #{typeIo,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.sunyo.wlpt.station.manage.domain.Bayonet">
@@ -194,6 +233,12 @@
       <if test="delFlag != null">
           del_flag = #{delFlag,jdbcType=CHAR},
       </if>
+      <if test="channelG2 != null">
+          channel_g2 = #{channelG2,jdbcType=VARCHAR},
+      </if>
+      <if test="typeIo != null">
+          type_io = #{typeIo,jdbcType=VARCHAR},
+      </if>
       </set>
       where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -209,7 +254,9 @@
           update_by   = #{updateBy,jdbcType=VARCHAR},
           update_date = #{updateDate,jdbcType=TIMESTAMP},
           remarks     = #{remarks,jdbcType=VARCHAR},
-          del_flag    = #{delFlag,jdbcType=CHAR}
+          del_flag    = #{delFlag,jdbcType=CHAR},
+          channel_g2  = #{channelG2,jdbcType=VARCHAR},
+          type_io     = #{typeIo,jdbcType=VARCHAR}
       where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>
\ No newline at end of file

@@ -16,11 +16,12 @@
     <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
     <result column="remarks" jdbcType="VARCHAR" property="remarks"/>
     <result column="del_flag" jdbcType="CHAR" property="delFlag"/>
+    <result column="stationIdG2" jdbcType="VARCHAR" property="stationIdG2"/>
     </resultMap>
   <sql id="Base_Column_List">
       <!--@mbg.generated-->
       id, area_code, stationId, `name`, customs_code, org_id, create_by, create_date, update_by,
-    update_date, remarks, del_flag
+    update_date, remarks, del_flag, stationIdG2
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
       <!--@mbg.generated-->
@@ -69,11 +70,12 @@
       insert into yard (id, area_code, stationId,
                         `name`, customs_code, org_id,
                         create_by, create_date, update_by,
-                        update_date, remarks, del_flag)
+                        update_date, remarks, del_flag, stationIdG2)
       values (#{id,jdbcType=VARCHAR}, #{areaCode,jdbcType=VARCHAR}, #{stationId,jdbcType=VARCHAR},
               #{name,jdbcType=VARCHAR}, #{customsCode,jdbcType=INTEGER}, #{orgId,jdbcType=VARCHAR},
               #{createBy,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR},
-              #{updateDate,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, #{delFlag,jdbcType=CHAR})
+              #{updateDate,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, #{delFlag,jdbcType=CHAR},
+              #{stationIdG2,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.sunyo.wlpt.station.manage.domain.Yard">
       <!--@mbg.generated-->
@@ -115,6 +117,9 @@
       <if test="delFlag != null">
           del_flag,
       </if>
+      <if test="stationIdG2 != null">
+          stationIdG2,
+      </if>
       </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
         <if test="id != null">
@@ -153,6 +158,9 @@
       <if test="delFlag != null">
           #{delFlag,jdbcType=CHAR},
       </if>
+      <if test="stationIdG2 != null">
+          #{stationIdG2,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.sunyo.wlpt.station.manage.domain.Yard">
@@ -192,6 +200,9 @@
       <if test="delFlag != null">
           del_flag = #{delFlag,jdbcType=CHAR},
       </if>
+      <if test="stationIdG2 != null">
+          stationIdG2 = #{stationIdG2,jdbcType=VARCHAR}
+      </if>
       </set>
       where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -208,7 +219,8 @@
           update_by    = #{updateBy,jdbcType=VARCHAR},
           update_date  = #{updateDate,jdbcType=TIMESTAMP},
           remarks      = #{remarks,jdbcType=VARCHAR},
-          del_flag     = #{delFlag,jdbcType=CHAR}
+          del_flag     = #{delFlag,jdbcType=CHAR},
+          stationIdG2  = #{stationIdG2,jdbcType=VARCHAR}
       where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>
\ No newline at end of file