【CHG】修改线路下拉查询接口

railway-admin/src/main/java/com/railway/web/controller/business/baseinfo/BaseLineController.java

@@ -14,6 +14,7 @@ import javax.validation.Valid;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -72,8 +73,8 @@ public class BaseLineController extends BaseController {
   }
 
   @ApiOperation(value = "下拉列表")
-  @GetMapping(value = {"/getListByDeptId", "/{deptId}"})
-  public TableDataInfo getListByDeptId(Long deptId) {
+  @GetMapping(value = "/getListByDeptId/{deptId}")
+  public TableDataInfo getListByDeptId(@PathVariable Long deptId) {
     startPage();
     List<BaseLine> list = busLineService.getListByDeptId(deptId);
     return getDataTable(list);

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

@@ -16,7 +16,7 @@ import org.hibernate.validator.constraints.Length;
 @EqualsAndHashCode(callSuper = true)
 public class BaseLine extends BaseEntity {
 
-  @ApiModelProperty(value = "主键", hidden = true)
+  @ApiModelProperty(value = "主键")
   private Long lineId;
 
   @ApiModelProperty(value = "线路名称")

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

@@ -101,7 +101,7 @@ public class BaseStationServiceImpl implements IBaseStationService {
     if(null == station){
       return null;
     }
-    return setBaseLine(station);
+    return setBaseStation(station);
   }
 
   /**
@@ -132,12 +132,12 @@ public class BaseStationServiceImpl implements IBaseStationService {
     List<BaseStation> stations = baseStationMapper.getList(query);
     List<BaseStationVo> stationVos = new ArrayList<>(stations.size());
     for(BaseStation station : stations){
-      stationVos.add(setBaseLine(station));
+      stationVos.add(setBaseStation(station));
     }
     return stationVos;
   }
 
-  private BaseStationVo setBaseLine(BaseStation station){
+  private BaseStationVo setBaseStation(BaseStation station){
     List<BaseDeptStation> deptStations = deptStationMapper.getList(station.getStationId());
     BaseStationVo baseStationVo = new BaseStationVo();
     BeanUtils.copyBeanProp(baseStationVo, station);

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

@@ -131,7 +131,7 @@
     WHERE station_id = #{stationId}
   </delete>
 
-  <select id="getInfo" resultType="com.railway.business.baseinfo.domain.BaseDeptStation">
+  <select id="getInfo" resultMap="BaseResultMap">
     SELECT
     <include refid="Base_Column_List"/>
     FROM base_dept_station t
@@ -149,7 +149,7 @@
     </where>
   </select>
 
-  <select id="getList" resultType="com.railway.business.baseinfo.domain.BaseDeptStation">
+  <select id="getList" resultMap="BaseResultMap">
     SELECT
     <include refid="Base_Column_List"/>
     FROM base_dept_station