Commit d769d545 authored by caotao's avatar caotao

1.大屏三维地图跳转预警分析修改

parent e8c2b830
...@@ -33,6 +33,8 @@ public class StationInfoDto { ...@@ -33,6 +33,8 @@ public class StationInfoDto {
@ApiModelProperty(value = "场站名称") @ApiModelProperty(value = "场站名称")
private String stationName; private String stationName;
@ApiModelProperty(value = "场站code")
private String stationCode;
@ApiModelProperty(value = "场站类型") @ApiModelProperty(value = "场站类型")
private String type; private String type;
......
...@@ -43,4 +43,8 @@ public class StationRecordInfo { ...@@ -43,4 +43,8 @@ public class StationRecordInfo {
@ApiModelProperty(value = "场站坐标偏移量") @ApiModelProperty(value = "场站坐标偏移量")
private String titlePos; private String titlePos;
@ApiModelProperty(value = "场站code")
private String stationCode;
} }
...@@ -113,6 +113,7 @@ ...@@ -113,6 +113,7 @@
station_basic.station_type stationType, station_basic.station_type stationType,
station_basic.station_flag stationFlag, station_basic.station_flag stationFlag,
station_basic.area_code areaCode, station_basic.area_code areaCode,
station_basic.project_org_code stationCode,
station_basic.jump_path, station_basic.jump_path,
station_basic.title_pos titlePos, station_basic.title_pos titlePos,
station_basic.risk_level riskLevel, station_basic.risk_level riskLevel,
......
...@@ -311,7 +311,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto, Statio ...@@ -311,7 +311,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto, Statio
list.addAll(stationBasicMapper.getStationList(null)); list.addAll(stationBasicMapper.getStationList(null));
} }
List<StationRecordInfo> stationRecordInfoList = list.stream().filter(stationRecordInfo -> !org.springframework.util.ObjectUtils.isEmpty(stationRecordInfo.getTitlePos())).collect(Collectors.toList()); List<StationRecordInfo> stationRecordInfoList = list.stream().filter(stationRecordInfo -> !org.springframework.util.ObjectUtils.isEmpty(stationRecordInfo.getTitlePos())).collect(Collectors.toList());
//便利返回给地图的数据并对数据进行处理 //遍历返回给地图的数据并对数据进行处理
stationRecordInfoList.forEach(stationRecordInfo -> { stationRecordInfoList.forEach(stationRecordInfo -> {
StationInfoDto stationInfoDto = new StationInfoDto(); StationInfoDto stationInfoDto = new StationInfoDto();
stationInfoDto.setStationId(stationRecordInfo.getStationId()); stationInfoDto.setStationId(stationRecordInfo.getStationId());
...@@ -330,6 +330,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto, Statio ...@@ -330,6 +330,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto, Statio
for (String s : original) { for (String s : original) {
doubleList.add(Double.parseDouble(s)); doubleList.add(Double.parseDouble(s));
} }
stationInfoDto.setStationCode(stationRecordInfo.getStationCode());
stationInfoDto.setTitlePos(doubleList); stationInfoDto.setTitlePos(doubleList);
stationInfoDto.setIndicatorData(indicatorList); stationInfoDto.setIndicatorData(indicatorList);
stationInfoDto.setRiskLevel(stationRecordInfo.getRiskLevel()); stationInfoDto.setRiskLevel(stationRecordInfo.getRiskLevel());
......
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