王勇 / station_manage · 提交

转到一个项目

作者 唐俊升
提交 c08010597abf32dfa5b68a91b48efbe4aee86a3b 1 个父辈 f934e37d

yard、bayonet新增字段

内嵌 并排对比
正在显示 6 个修改的文件 包含 91 行增加 和 11 行删除
  1 +# 0.0.2-SNAPSHOT
  2 +- 数据库yard新增stationIdG2（金二场站编码）字段
  3 +- 数据库bayonet新增channel_g2（金二通道编号）、type_io（通道内部通道、主通道类型 I 内 O 主）字段
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 </parent> 10 </parent>
11 <groupId>com.sunyo.wlpt.station.manage</groupId> 11 <groupId>com.sunyo.wlpt.station.manage</groupId>
12 <artifactId>station-manage</artifactId> 12 <artifactId>station-manage</artifactId>
13 - <version>0.0.1-SNAPSHOT</version> 13 + <version>0.0.2-SNAPSHOT</version>
14 <name>station-manage</name> 14 <name>station-manage</name>
15 <description>场站管理</description> 15 <description>场站管理</description>
16 16
@@ -98,6 +98,18 @@ public class Bayonet implements Serializable { @@ -98,6 +98,18 @@ public class Bayonet implements Serializable {
98 private String stationName; 98 private String stationName;
99 99
100 /** 100 /**
  101 + * 金二通道编号
  102 + */
  103 + @ApiModelProperty(value = "金二通道编号")
  104 + private String channelG2;
  105 +
  106 + /**
  107 + * 通道内部通道、主通道类型 I 内 O 主
  108 + */
  109 + @ApiModelProperty(value = "通道内部通道、主通道类型 I 内 O 主")
  110 + private String typeIo;
  111 +
  112 + /**
101 * 场站与卡口的关系 1：n 113 * 场站与卡口的关系 1：n
102 * <p> 114 * <p>
103 * 一个卡口，对应一个场站 115 * 一个卡口，对应一个场站
@@ -99,6 +99,12 @@ public class Yard implements Serializable { @@ -99,6 +99,12 @@ public class Yard implements Serializable {
99 private String delFlag; 99 private String delFlag;
100 100
101 /** 101 /**
  102 + * 金二场站编码
  103 + */
  104 + @ApiModelProperty(value = "金二场站编码")
  105 + private String stationIdG2;
  106 +
  107 + /**
102 * 场站与卡口的关系 1：n 108 * 场站与卡口的关系 1：n
103 * 一个场站对应多个卡口 109 * 一个场站对应多个卡口
104 */ 110 */
@@ -15,20 +15,33 @@ @@ -15,20 +15,33 @@
15 <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> 15 <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
16 <result column="remarks" jdbcType="VARCHAR" property="remarks"/> 16 <result column="remarks" jdbcType="VARCHAR" property="remarks"/>
17 <result column="del_flag" jdbcType="CHAR" property="delFlag"/> 17 <result column="del_flag" jdbcType="CHAR" property="delFlag"/>
  18 + <result column="channel_g2" jdbcType="VARCHAR" property="channelG2"/>
  19 + <result column="type_io" jdbcType="VARCHAR" property="typeIo"/>
18 </resultMap> 20 </resultMap>
19 <!-- 该Mapper映射关系的作用，是卡口与场站的1:1的关系映射 --> 21 <!-- 该Mapper映射关系的作用，是卡口与场站的1:1的关系映射 -->
20 <resultMap id="BayonetAndYardMap" extends="BaseResultMap" 22 <resultMap id="BayonetAndYardMap" extends="BaseResultMap"
21 type="com.sunyo.wlpt.station.manage.domain.Bayonet"> 23 type="com.sunyo.wlpt.station.manage.domain.Bayonet">
22 <association property="yard" javaType="com.sunyo.wlpt.station.manage.domain.Yard"> 24 <association property="yard" javaType="com.sunyo.wlpt.station.manage.domain.Yard">
23 <id column="id" property="id"/> 25 <id column="id" property="id"/>
  26 + <result column="yard_area_code" property="areaCode"/>
  27 + <result column="yard_stationId" property="stationId"/>
24 <result column="yard_name" property="name"/> 28 <result column="yard_name" property="name"/>
  29 + <result column="yard_customs_code" property="customsCode"/>
  30 + <result column="yard_create_by" property="createBy"/>
  31 + <result column="yard_create_date" property="createDate"/>
  32 + <result column="yard_update_by" property="updateBy"/>
  33 + <result column="yard_update_date" property="updateDate"/>
  34 + <result column="yard_remarks" property="remarks"/>
  35 + <result column="yard_del_flag" property="delFlag"/>
  36 + <result column="yard_org_id" property="orgId"/>
  37 + <result column="yard_stationIdG2" property="stationIdG2"/>
25 </association> 38 </association>
26 </resultMap> 39 </resultMap>
27 40
28 <sql id="Base_Column_List"> 41 <sql id="Base_Column_List">
29 <!--@mbg.generated--> 42 <!--@mbg.generated-->
30 id, yard_id, `name`, channel, `type`, create_by, create_date, update_by, update_date, 43 id, yard_id, `name`, channel, `type`, create_by, create_date, update_by, update_date,
31 - remarks, del_flag 44 + remarks, del_flag, channel_g2, type_io
32 </sql> 45 </sql>
33 <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap"> 46 <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
34 <!--@mbg.generated--> 47 <!--@mbg.generated-->
@@ -49,7 +62,20 @@ @@ -49,7 +62,20 @@
49 b.update_date, 62 b.update_date,
50 b.remarks, 63 b.remarks,
51 b.del_flag, 64 b.del_flag,
52 - y.name as yard_name 65 + b.channel_g2,
  66 + b.type_io,
  67 + y.area_code as yard_area_code,
  68 + y.stationId as yard_stationId,
  69 + y.name as yard_name,
  70 + y.customs_code as yard_customs_code,
  71 + y.create_by as yard_create_by,
  72 + y.create_date as yard_create_date,
  73 + y.update_by as yard_update_by,
  74 + y.update_date as yard_update_date,
  75 + y.remarks as yard_remarks,
  76 + y.del_flag as yard_del_flag,
  77 + y.org_id as yard_org_id,
  78 + y.stationIdG2 as yard_stationIdG2
53 from bayonet b, 79 from bayonet b,
54 yard y 80 yard y
55 <where> 81 <where>
@@ -65,7 +91,7 @@ @@ -65,7 +91,7 @@
65 <if test="stationName != null and stationName != ''"> 91 <if test="stationName != null and stationName != ''">
66 and y.name = #{stationName,jdbcType=VARCHAR} 92 and y.name = #{stationName,jdbcType=VARCHAR}
67 </if> 93 </if>
68 - and b.yard_id = y.id 94 + and b.yard_id = y.stationId
69 </where> 95 </where>
70 </select> 96 </select>
71 97
@@ -80,11 +106,12 @@ @@ -80,11 +106,12 @@
80 insert into bayonet (id, yard_id, `name`, 106 insert into bayonet (id, yard_id, `name`,
81 channel, `type`, create_by, 107 channel, `type`, create_by,
82 create_date, update_by, update_date, 108 create_date, update_by, update_date,
83 - remarks, del_flag) 109 + remarks, del_flag, channel_g2, type_io)
84 values (#{id,jdbcType=VARCHAR}, #{yardId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 110 values (#{id,jdbcType=VARCHAR}, #{yardId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
85 #{channel,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, 111 #{channel,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR},
86 #{createDate,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateDate,jdbcType=TIMESTAMP}, 112 #{createDate,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateDate,jdbcType=TIMESTAMP},
87 - #{remarks,jdbcType=VARCHAR}, #{delFlag,jdbcType=CHAR}) 113 + #{remarks,jdbcType=VARCHAR}, #{delFlag,jdbcType=CHAR}, #{channelG2,jdbcType=VARCHAR},
  114 + #{typeIo,jdbcType=VARCHAR})
88 </insert> 115 </insert>
89 <insert id="insertSelective" parameterType="com.sunyo.wlpt.station.manage.domain.Bayonet"> 116 <insert id="insertSelective" parameterType="com.sunyo.wlpt.station.manage.domain.Bayonet">
90 <!--@mbg.generated--> 117 <!--@mbg.generated-->
@@ -123,6 +150,12 @@ @@ -123,6 +150,12 @@
123 <if test="delFlag != null"> 150 <if test="delFlag != null">
124 del_flag, 151 del_flag,
125 </if> 152 </if>
  153 + <if test="channelG2 != null">
  154 + channel_g2,
  155 + </if>
  156 + <if test="typeIo != null">
  157 + type_io,
  158 + </if>
126 </trim> 159 </trim>
127 <trim prefix="values (" suffix=")" suffixOverrides=","> 160 <trim prefix="values (" suffix=")" suffixOverrides=",">
128 <if test="id != null"> 161 <if test="id != null">
@@ -158,6 +191,12 @@ @@ -158,6 +191,12 @@
158 <if test="delFlag != null"> 191 <if test="delFlag != null">
159 #{delFlag,jdbcType=CHAR}, 192 #{delFlag,jdbcType=CHAR},
160 </if> 193 </if>
  194 + <if test="channelG2 != null">
  195 + #{channelG2,jdbcType=VARCHAR},
  196 + </if>
  197 + <if test="typeIo != null">
  198 + #{typeIo,jdbcType=VARCHAR},
  199 + </if>
161 </trim> 200 </trim>
162 </insert> 201 </insert>
163 <update id="updateByPrimaryKeySelective" parameterType="com.sunyo.wlpt.station.manage.domain.Bayonet"> 202 <update id="updateByPrimaryKeySelective" parameterType="com.sunyo.wlpt.station.manage.domain.Bayonet">
@@ -194,6 +233,12 @@ @@ -194,6 +233,12 @@
194 <if test="delFlag != null"> 233 <if test="delFlag != null">
195 del_flag = #{delFlag,jdbcType=CHAR}, 234 del_flag = #{delFlag,jdbcType=CHAR},
196 </if> 235 </if>
  236 + <if test="channelG2 != null">
  237 + channel_g2 = #{channelG2,jdbcType=VARCHAR},
  238 + </if>
  239 + <if test="typeIo != null">
  240 + type_io = #{typeIo,jdbcType=VARCHAR},
  241 + </if>
197 </set> 242 </set>
198 where id = #{id,jdbcType=VARCHAR} 243 where id = #{id,jdbcType=VARCHAR}
199 </update> 244 </update>
@@ -209,7 +254,9 @@ @@ -209,7 +254,9 @@
209 update_by = #{updateBy,jdbcType=VARCHAR}, 254 update_by = #{updateBy,jdbcType=VARCHAR},
210 update_date = #{updateDate,jdbcType=TIMESTAMP}, 255 update_date = #{updateDate,jdbcType=TIMESTAMP},
211 remarks = #{remarks,jdbcType=VARCHAR}, 256 remarks = #{remarks,jdbcType=VARCHAR},
212 - del_flag = #{delFlag,jdbcType=CHAR} 257 + del_flag = #{delFlag,jdbcType=CHAR},
  258 + channel_g2 = #{channelG2,jdbcType=VARCHAR},
  259 + type_io = #{typeIo,jdbcType=VARCHAR}
213 where id = #{id,jdbcType=VARCHAR} 260 where id = #{id,jdbcType=VARCHAR}
214 </update> 261 </update>
215 </mapper> 262 </mapper>
@@ -16,11 +16,12 @@ @@ -16,11 +16,12 @@
16 <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> 16 <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
17 <result column="remarks" jdbcType="VARCHAR" property="remarks"/> 17 <result column="remarks" jdbcType="VARCHAR" property="remarks"/>
18 <result column="del_flag" jdbcType="CHAR" property="delFlag"/> 18 <result column="del_flag" jdbcType="CHAR" property="delFlag"/>
  19 + <result column="stationIdG2" jdbcType="VARCHAR" property="stationIdG2"/>
19 </resultMap> 20 </resultMap>
20 <sql id="Base_Column_List"> 21 <sql id="Base_Column_List">
21 <!--@mbg.generated--> 22 <!--@mbg.generated-->
22 id, area_code, stationId, `name`, customs_code, org_id, create_by, create_date, update_by, 23 id, area_code, stationId, `name`, customs_code, org_id, create_by, create_date, update_by,
23 - update_date, remarks, del_flag 24 + update_date, remarks, del_flag, stationIdG2
24 </sql> 25 </sql>
25 <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap"> 26 <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
26 <!--@mbg.generated--> 27 <!--@mbg.generated-->
@@ -69,11 +70,12 @@ @@ -69,11 +70,12 @@
69 insert into yard (id, area_code, stationId, 70 insert into yard (id, area_code, stationId,
70 `name`, customs_code, org_id, 71 `name`, customs_code, org_id,
71 create_by, create_date, update_by, 72 create_by, create_date, update_by,
72 - update_date, remarks, del_flag) 73 + update_date, remarks, del_flag, stationIdG2)
73 values (#{id,jdbcType=VARCHAR}, #{areaCode,jdbcType=VARCHAR}, #{stationId,jdbcType=VARCHAR}, 74 values (#{id,jdbcType=VARCHAR}, #{areaCode,jdbcType=VARCHAR}, #{stationId,jdbcType=VARCHAR},
74 #{name,jdbcType=VARCHAR}, #{customsCode,jdbcType=INTEGER}, #{orgId,jdbcType=VARCHAR}, 75 #{name,jdbcType=VARCHAR}, #{customsCode,jdbcType=INTEGER}, #{orgId,jdbcType=VARCHAR},
75 #{createBy,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, 76 #{createBy,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR},
76 - #{updateDate,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, #{delFlag,jdbcType=CHAR}) 77 + #{updateDate,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, #{delFlag,jdbcType=CHAR},
  78 + #{stationIdG2,jdbcType=VARCHAR})
77 </insert> 79 </insert>
78 <insert id="insertSelective" parameterType="com.sunyo.wlpt.station.manage.domain.Yard"> 80 <insert id="insertSelective" parameterType="com.sunyo.wlpt.station.manage.domain.Yard">
79 <!--@mbg.generated--> 81 <!--@mbg.generated-->
@@ -115,6 +117,9 @@ @@ -115,6 +117,9 @@
115 <if test="delFlag != null"> 117 <if test="delFlag != null">
116 del_flag, 118 del_flag,
117 </if> 119 </if>
  120 + <if test="stationIdG2 != null">
  121 + stationIdG2,
  122 + </if>
118 </trim> 123 </trim>
119 <trim prefix="values (" suffix=")" suffixOverrides=","> 124 <trim prefix="values (" suffix=")" suffixOverrides=",">
120 <if test="id != null"> 125 <if test="id != null">
@@ -153,6 +158,9 @@ @@ -153,6 +158,9 @@
153 <if test="delFlag != null"> 158 <if test="delFlag != null">
154 #{delFlag,jdbcType=CHAR}, 159 #{delFlag,jdbcType=CHAR},
155 </if> 160 </if>
  161 + <if test="stationIdG2 != null">
  162 + #{stationIdG2,jdbcType=VARCHAR},
  163 + </if>
156 </trim> 164 </trim>
157 </insert> 165 </insert>
158 <update id="updateByPrimaryKeySelective" parameterType="com.sunyo.wlpt.station.manage.domain.Yard"> 166 <update id="updateByPrimaryKeySelective" parameterType="com.sunyo.wlpt.station.manage.domain.Yard">
@@ -192,6 +200,9 @@ @@ -192,6 +200,9 @@
192 <if test="delFlag != null"> 200 <if test="delFlag != null">
193 del_flag = #{delFlag,jdbcType=CHAR}, 201 del_flag = #{delFlag,jdbcType=CHAR},
194 </if> 202 </if>
  203 + <if test="stationIdG2 != null">
  204 + stationIdG2 = #{stationIdG2,jdbcType=VARCHAR}
  205 + </if>
195 </set> 206 </set>
196 where id = #{id,jdbcType=VARCHAR} 207 where id = #{id,jdbcType=VARCHAR}
197 </update> 208 </update>
@@ -208,7 +219,8 @@ @@ -208,7 +219,8 @@
208 update_by = #{updateBy,jdbcType=VARCHAR}, 219 update_by = #{updateBy,jdbcType=VARCHAR},
209 update_date = #{updateDate,jdbcType=TIMESTAMP}, 220 update_date = #{updateDate,jdbcType=TIMESTAMP},
210 remarks = #{remarks,jdbcType=VARCHAR}, 221 remarks = #{remarks,jdbcType=VARCHAR},
211 - del_flag = #{delFlag,jdbcType=CHAR} 222 + del_flag = #{delFlag,jdbcType=CHAR},
  223 + stationIdG2 = #{stationIdG2,jdbcType=VARCHAR}
212 where id = #{id,jdbcType=VARCHAR} 224 where id = #{id,jdbcType=VARCHAR}
213 </update> 225 </update>
214 </mapper> 226 </mapper>