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

feat:提交标注代码

This commit is contained in:
gyb 2026-03-12 16:25:40 +08:00
parent 755cd26ddb
commit 395397fedc
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/com/ruoyi/airline/service/impl/AirlineMarkerServiceImpl.java
View File

@ -32,17 +32,17 @@ public class AirlineMarkerServiceImpl implements IAirlineMarkerService {
private IAirlineMarkerGroupInfoService iAirlineMarkerGroupInfoService;
@Override
public int insertMarker(AirlineMarkerDTO marker) {
AirlineMarker model = AirlineMarkerServiceConvert.to(marker);
public int insertMarker(AirlineMarkerDTO dto) {
AirlineMarker model = AirlineMarkerServiceConvert.to(dto);
int result = iAirlineMarkerDomain.insertMarker(model);
// 处理分组关系
if (result > 0 && marker.getGroupId() != null) {
if (result > 0 && dto.getGroupId() != null) {
AirlineMarkerGroupInfoDTO groupInfo = new AirlineMarkerGroupInfoDTO();
groupInfo.setGroupId(marker.getGroupId());
groupInfo.setGroupId(dto.getGroupId());
groupInfo.setMarkerId(model.getId());
groupInfo.setCreateBy(marker.getCreateBy());
groupInfo.setUpdateBy(marker.getUpdateBy());
groupInfo.setCreateBy(dto.getCreateBy());
groupInfo.setUpdateBy(dto.getUpdateBy());
iAirlineMarkerGroupInfoService.insertMarkerGroupInfo(groupInfo);
}
@ -50,20 +50,20 @@ public class AirlineMarkerServiceImpl implements IAirlineMarkerService {
}
@Override
public int updateMarker(AirlineMarkerDTO marker) {
AirlineMarker model = AirlineMarkerServiceConvert.to(marker);
public int updateMarker(AirlineMarkerDTO dto) {
AirlineMarker model = AirlineMarkerServiceConvert.to(dto);
int result = iAirlineMarkerDomain.updateMarker(model);
// 处理分组关系
if (result > 0 && marker.getGroupId() != null) {
if (result > 0 && dto.getGroupId() != null) {
// 先删除旧的关系
iAirlineMarkerGroupInfoService.deleteMarkerGroupInfo(0L, null, marker.getId());
iAirlineMarkerGroupInfoService.deleteMarkerGroupInfo(0L, null, dto.getId());
// 再创建新的关系
AirlineMarkerGroupInfoDTO groupInfo = new AirlineMarkerGroupInfoDTO();
groupInfo.setGroupId(marker.getGroupId());
groupInfo.setMarkerId(marker.getId());
groupInfo.setCreateBy(marker.getUpdateBy());
groupInfo.setUpdateBy(marker.getUpdateBy());
groupInfo.setGroupId(dto.getGroupId());
groupInfo.setMarkerId(dto.getId());
groupInfo.setCreateBy(dto.getUpdateBy());
groupInfo.setUpdateBy(dto.getUpdateBy());
iAirlineMarkerGroupInfoService.insertMarkerGroupInfo(groupInfo);
}
@ -88,7 +88,21 @@ public class AirlineMarkerServiceImpl implements IAirlineMarkerService {
@Override
public List<AirlineMarkerDTO> selectMarkerList(AirlineMarkerDTO dto) {
AirlineMarker model = AirlineMarkerServiceConvert.to(dto);
return AirlineMarkerServiceConvert.fromList(iAirlineMarkerDomain.selectMarkerList(model));
List<AirlineMarker> markers = iAirlineMarkerDomain.selectMarkerList(model);
List<AirlineMarkerDTO> dtos = AirlineMarkerServiceConvert.fromList(markers);
// 为每个标注设置分组ID
for (AirlineMarkerDTO markerDto : dtos) {
// 查询分组关系
AirlineMarkerGroupInfoDTO groupInfoDTO = new AirlineMarkerGroupInfoDTO();
groupInfoDTO.setMarkerId(markerDto.getId());
List<AirlineMarkerGroupInfoDTO> groupInfos = iAirlineMarkerGroupInfoService.selectMarkerGroupInfoList(groupInfoDTO);
if (!groupInfos.isEmpty()) {
markerDto.setGroupId(groupInfos.get(0).getGroupId());
}
}
return dtos;
}
@Override