【CHG】调整线路和区间的查询方法

railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BaseLineServiceImpl.java

@@ -98,7 +98,12 @@ public class BaseLineServiceImpl implements IBaseLineService {
    */
   @Override
   public BaseLineVo getInfo(Long lineId) {
-    return baseLineMapper.getInfo(lineId);
+    BaseLineVo line = baseLineMapper.getInfo(lineId);
+    if(null == line){
+      return null;
+    }
+    setBaseLine(line);
+    return line;
   }
 
   /**
@@ -106,7 +111,16 @@ public class BaseLineServiceImpl implements IBaseLineService {
    */
   @Override
   public List<BaseLineVo> getDetailList(BaseLineQuery query) {
-    return baseLineMapper.getList(query);
+    List<BaseLineVo> lines = baseLineMapper.getList(query);
+    for(BaseLineVo line : lines){
+      setBaseLine(line);
+    }
+    return lines;
+  }
+
+  private void setBaseLine(BaseLineVo line){
+    List<BaseDeptLine> deptLines = deptLineMapper.getList(line.getLineId());
+    line.setDeptLines(deptLines);
   }
 
   /**

railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BaseStationServiceImpl.java

@@ -98,7 +98,12 @@ public class BaseStationServiceImpl implements IBaseStationService {
    */
   @Override
   public BaseStationVo getInfo(Long stationId) {
-    return baseStationMapper.getInfo(stationId);
+    BaseStationVo station = baseStationMapper.getInfo(stationId);
+    if(null == station){
+      return null;
+    }
+    setBaseStation(station);
+    return station;
   }
 
   /**
@@ -126,7 +131,16 @@ public class BaseStationServiceImpl implements IBaseStationService {
    */
   @Override
   public List<BaseStationVo> getDetailList(BaseStationQuery query) {
-    return baseStationMapper.getList(query);
+    List<BaseStationVo> stations = baseStationMapper.getList(query);
+    for(BaseStationVo station : stations){
+      setBaseStation(station);
+    }
+    return stations;
+  }
+
+  private void setBaseStation(BaseStationVo station){
+    List<BaseDeptStation> deptStations = deptStationMapper.getList(station.getStationId());
+    station.setDeptStations(deptStations);
   }
 
   /**

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

@@ -18,12 +18,6 @@
     <result column="create_time" property="createTime"/>
     <result column="update_by" property="updateBy"/>
     <result column="update_time" property="updateTime"/>
-    <collection property="deptLines" ofType="com.railway.business.baseinfo.domain.BaseDeptLine" column="line_id">
-      <result property="id" column="id"/>
-      <result property="lineId" column="line_id"/>
-      <result property="deptName" column="dept_name"/>
-      <result property="deptId" column="dept_id"/>
-    </collection>
   </resultMap>
 
   <sql id="Base_Column_List">
@@ -41,7 +35,6 @@
     t.create_time,
     t.update_by,
     t.update_time,
-    v.id,
     v.dept_name,
     v.dept_id
   </sql>
@@ -185,9 +178,9 @@
     </where>
   </select>
 
-  <select id="getListByDeptId" resultMap="BaseLineResultMap">
+  <select id="getListByDeptId" resultMap="BaseResultMap">
     SELECT DISTINCT
-    <include refid="Base_Line_Column_List"/>
+    <include refid="Base_Column_List"/>
     FROM base_line t
     left join v_line v on t.line_id = v.line_id
     <where>
@@ -198,38 +191,4 @@
     </where>
   </select>
 
-  <resultMap id="BaseLineResultMap" type="com.railway.business.baseinfo.domain.BaseLine">
-    <result column="line_id" property="lineId"/>
-    <result column="line_name" property="lineName"/>
-    <result column="line_sddj" property="lineSddj"/>
-    <result column="line_type" property="lineType"/>
-    <result column="line_dj" property="lineDj"/>
-    <result column="line_yylc" property="lineYylc"/>
-    <result column="start_marker" property="startMarker"/>
-    <result column="end_marker" property="endMarker"/>
-    <result column="order_num" property="orderNum"/>
-    <result column="del_flag" property="delFlag"/>
-    <result column="create_by" property="createBy"/>
-    <result column="create_time" property="createTime"/>
-    <result column="update_by" property="updateBy"/>
-    <result column="update_time" property="updateTime"/>
-  </resultMap>
-
-  <sql id="Base_Line_Column_List">
-    t.line_id,
-    t.line_name,
-    t.line_sddj,
-    t.line_type,
-    t.line_dj,
-    t.line_yylc,
-    t.start_marker,
-    t.end_marker,
-    t.order_num,
-    t.del_flag,
-    t.create_by,
-    t.create_time,
-    t.update_by,
-    t.update_time
-  </sql>
-
 </mapper>

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

@@ -18,36 +18,6 @@
     <result column="create_time" property="createTime"/>
     <result column="update_by" property="updateBy"/>
     <result column="update_time" property="updateTime"/>
-    <collection property="deptStations" ofType="com.railway.business.baseinfo.domain.BaseDeptStation" column="station_id">
-      <result property="id" column="dept_station_id"/>
-      <result property="stationId" column="station_id"/>
-      <result property="deptName" column="dept_name"/>
-      <result property="deptId" column="dept_id"/>
-      <result property="qjlc" column="qjlc"/>
-      <result property="upEndMarker" column="up_end_marker"/>
-      <result property="upStartMarker" column="up_start_marker"/>
-      <result property="downEndMarker" column="down_end_marker"/>
-      <result property="downStartMarker" column="down_start_marker"/>
-      <result property="dhgds" column="dhgds"/>
-      <result property="delFlag" column="del_flag"/>
-    </collection>
-  </resultMap>
-
-  <resultMap id="BaseStationResultMap" type="com.railway.business.baseinfo.domain.BaseStation">
-    <result column="station_id" property="stationId"/>
-    <result column="line_id" property="lineId"/>
-    <result column="line_name" property="lineName"/>
-    <result column="station_name" property="stationName"/>
-    <result column="station_type" property="stationType"/>
-    <result column="station_type_text" property="stationTypeText"/>
-    <result column="order_num" property="orderNum"/>
-    <result column="start_marker" property="startMarker"/>
-    <result column="end_marker" property="endMarker"/>
-    <result column="del_flag" property="delFlag"/>
-    <result column="create_by" property="createBy"/>
-    <result column="create_time" property="createTime"/>
-    <result column="update_by" property="updateBy"/>
-    <result column="update_time" property="updateTime"/>
   </resultMap>
 
   <sql id="Base_Column_List">
@@ -62,16 +32,7 @@
     t.create_by,
     t.create_time,
     t.update_by,
-    t.update_time,
-    v.dept_name,
-    v.dept_id,
-    v.dept_station_id,
-    v.qjlc,
-    v.up_end_marker,
-    v.up_start_marker,
-    v.down_end_marker,
-    v.down_start_marker,
-    v.dhgds
+    t.update_time
   </sql>
 
   <insert id="insert" parameterType="com.railway.business.baseinfo.domain.BaseStation">
@@ -213,26 +174,10 @@
     </where>
   </select>
 
-  <sql id="Base_Station_Column_List">
-    t.station_id,
-    t.line_id,
-    t.station_name,
-    t.station_type,
-    t.order_num,
-    t.start_marker,
-    t.end_marker,
-    t.del_flag,
-    t.create_by,
-    t.create_time,
-    t.update_by,
-    t.update_time
-  </sql>
-
-  <select id="getStationList" resultMap="BaseStationResultMap">
+  <select id="getStationList" resultMap="BaseResultMap">
     SELECT DISTINCT
-    <include refid="Base_Station_Column_List"/>, v.line_name, dict.dict_label as station_type_text
+    <include refid="Base_Column_List"/>, v.line_name, dict.dict_label as station_type_text
     FROM base_station t
-    left join base_line l on t.line_id = l.line_id
     left join sys_dict_data dict on t.station_type = dict.dict_value and dict.dict_type = 'station_type'
     left join v_station v on t.station_id = v.station_id
     <where>