Commit e8bec16f authored by caotao's avatar caotao

地图接口新增场站id信息

parent 50e7c5a3
...@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.context.annotation.Primary;
import javax.ws.rs.DefaultValue; import javax.ws.rs.DefaultValue;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -23,7 +24,8 @@ import java.util.List; ...@@ -23,7 +24,8 @@ import java.util.List;
public class StationInfoDto { public class StationInfoDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value ="场站id")
private Long stationId;
@ApiModelProperty(value = "场站名称") @ApiModelProperty(value = "场站名称")
private String stationName; private String stationName;
......
...@@ -10,7 +10,8 @@ import java.util.List; ...@@ -10,7 +10,8 @@ import java.util.List;
public class StationRecordInfo { public class StationRecordInfo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "场站id")
private Long stationId;
@ApiModelProperty(value = "场站名称") @ApiModelProperty(value = "场站名称")
private String stationName; private String stationName;
......
...@@ -107,6 +107,7 @@ ...@@ -107,6 +107,7 @@
</select> </select>
<select id="getStationList" resultType="com.yeejoin.amos.boot.module.jxiop.api.dto.StationRecordInfo"> <select id="getStationList" resultType="com.yeejoin.amos.boot.module.jxiop.api.dto.StationRecordInfo">
select select
station_basic.sequence_nbr stationId,
station_basic.station_name stationName , station_basic.station_name stationName ,
station_basic.station_type stationType, station_basic.station_type stationType,
station_basic.station_flag stationFlag, station_basic.station_flag stationFlag,
......
...@@ -310,6 +310,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto, Statio ...@@ -310,6 +310,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto, Statio
//便利返回给地图的数据并对数据进行处理 //便利返回给地图的数据并对数据进行处理
list.forEach(stationRecordInfo -> { list.forEach(stationRecordInfo -> {
StationInfoDto stationInfoDto = new StationInfoDto(); StationInfoDto stationInfoDto = new StationInfoDto();
stationInfoDto.setStationId(stationInfoDto.getStationId());
stationInfoDto.setStationName(stationRecordInfo.getStationName()); stationInfoDto.setStationName(stationRecordInfo.getStationName());
stationInfoDto.setType(stationRecordInfo.getStationType()); stationInfoDto.setType(stationRecordInfo.getStationType());
//url 暂时写死 //url 暂时写死
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment