THENG
/
a-tuoheng-airline
6
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'feat:标注接口返回groupid' (#6) from main-空域查询接口新增groupid into dev 

Reviewed-on: http://th.local.t-aaron.com:13000/THENG/a-tuoheng-airline/pulls/6
This commit is contained in:
gaoyb 2026-03-28 14:45:12 +08:00
parent 5b5814d8e8 9839ec5d21
commit c6ca0ebd55
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/ruoyi/airline/service/impl/AirlineMarkerGroupInfoServiceImpl.java
View File

@ -197,8 +197,26 @@ public class AirlineMarkerGroupInfoServiceImpl implements IAirlineMarkerGroupInf
return List.of();
}
// 转换为 DTO 并返回
return AirlineMarkerServiceConvert.fromList(markers);
// 获取所有标注分组关系，建立 markerId -> groupId 的映射
AirlineMarkerGroupInfo groupInfoQuery = new AirlineMarkerGroupInfo();
List<AirlineMarkerGroupInfo> groupInfos = iAirlineMarkerGroupInfoDomain.selectMarkerGroupInfoList(groupInfoQuery);
java.util.Map<Long, Long> markerGroupMap = new java.util.HashMap<>();
if (groupInfos != null) {
for (AirlineMarkerGroupInfo info : groupInfos) {
markerGroupMap.put(info.getMarkerId(), info.getGroupId());
}
}
// 转换为 DTO 并设置 groupId
java.util.List<AirlineMarkerDTO> result = new java.util.ArrayList<>();
for (AirlineMarker marker : markers) {
AirlineMarkerDTO dto = AirlineMarkerServiceConvert.from(marker);
if (markerGroupMap.containsKey(marker.getId())) {
dto.setGroupId(markerGroupMap.get(marker.getId()));
}
result.add(dto);
}
return result;
}
@Override