【CHG】修改stationId实际ID

railway-business/src/main/java/com/railway/business/baseinfo/domain/BaseDeptStation.java

@@ -3,6 +3,7 @@ package com.railway.business.baseinfo.domain;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
@@ -31,18 +32,20 @@ public class BaseDeptStation extends BaseEntity {
   @ApiModelProperty(value = "线路id")
   private Long lineId;
 
-  @ApiModelProperty(value = "行别")
-  @Length(max = 4, message = "【行别】长度必须介于 {min} 和 {max} 之间")
-  private String xingbie;
-
   @ApiModelProperty(value = "区间里程")
-  private Integer qjlc;
+  private BigDecimal qjlc;
+
+  @ApiModelProperty(value = "上行起始公里标")
+  private BigDecimal upStartMarker;
+
+  @ApiModelProperty(value = "上行结束公里标")
+  private BigDecimal upEndMarker;
 
-  @ApiModelProperty(value = "起始公里标")
-  private Integer startMarker;
+  @ApiModelProperty(value = "下行起始公里标")
+  private BigDecimal downStartMarker;
 
-  @ApiModelProperty(value = "结束公里标")
-  private Integer endMarker;
+  @ApiModelProperty(value = "下行结束公里标")
+  private BigDecimal downEndMarker;
 
   @ApiModelProperty(value = "电化股道数")
   private Integer dhgds;

railway-business/src/main/resources/mapper/baseinfo/BaseDeptStationMapper.xml

@@ -8,10 +8,11 @@
     <result column="station_id" property="stationId"/>
     <result column="dept_id" property="deptId"/>
     <result column="line_id" property="lineId"/>
-    <result column="xingbie" property="xingbie"/>
     <result column="qjlc" property="qjlc"/>
-    <result column="start_marker" property="startMarker"/>
-    <result column="end_marker" property="endMarker"/>
+    <result column="up_start_marker" property="upStartMarker"/>
+    <result column="up_end_marker" property="upEndMarker"/>
+    <result column="down_start_marker" property="downStartMarker"/>
+    <result column="down_end_marker" property="downEndMarker"/>
     <result column="dhgds" property="dhgds"/>
     <result column="del_flag" property="delFlag"/>
     <result column="create_by" property="createBy"/>
@@ -25,10 +26,11 @@
     station_id,
     dept_id,
     line_id,
-    xingbie,
     qjlc,
-    start_marker,
-    end_marker,
+    up_start_marker,
+    up_end_marker,
+    down_start_marker,
+    down_end_marker,
     dhgds,
     del_flag,
     create_by,
@@ -46,17 +48,20 @@
       <if test='null != lineId'>
         line_id,
       </if>
-      <if test='null != xingbie'>
-        xingbie,
-      </if>
       <if test='null != qjlc'>
         qjlc,
       </if>
-      <if test='null != startMarker'>
-        start_marker,
+      <if test='null != upStartMarker'>
+        up_start_marker,
+      </if>
+      <if test='null != upEndMarker'>
+        up_end_marker,
+      </if>
+      <if test='null != downStartMarker'>
+        down_start_marker,
       </if>
-      <if test='null != endMarker'>
-        end_marker,
+      <if test='null != downEndMarker'>
+        down_end_marker,
       </if>
       <if test='null != dhgds'>
         dhgds,
@@ -84,17 +89,20 @@
       <if test='null != lineId'>
         #{lineId},
       </if>
-      <if test='null != xingbie'>
-        #{xingbie},
-      </if>
       <if test='null != qjlc'>
         #{qjlc},
       </if>
-      <if test='null != startMarker'>
-        #{startMarker},
+      <if test='null != upStartMarker'>
+        #{upStartMarker},
+      </if>
+      <if test='null != upEndMarker'>
+        #{upEndMarker},
+      </if>
+      <if test='null != downStartMarker'>
+        #{downStartMarker},
       </if>
-      <if test='null != endMarker'>
-        #{endMarker},
+      <if test='null != downEndMarker'>
+        #{downEndMarker},
       </if>
       <if test='null != dhgds'>
         #{dhgds},