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-19 14:52:56 +08:00
parent 3ab65cbc74
commit 9e66797d4f
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/ruoyi/airline/controller/convert/AirlineAreaControllerConvert.java
View File

@ -77,6 +77,9 @@ public class AirlineAreaControllerConvert extends BaseConvert<AirlineAreaDTO, Ai
} }
} }
// 复制创建者名称
vo.setCreateByName(dto.getCreateByName());
return vo; return vo;
} }

5
src/main/java/com/ruoyi/airline/service/dto/AirlineAreaDTO.java
View File

@ -81,6 +81,11 @@ public class AirlineAreaDTO extends BaseEntity {
*/ */
private String remark; private String remark;
/**
* 创建者名称
*/
private String createByName;
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

20
src/main/java/com/ruoyi/airline/service/impl/AirlineAreaGroupServiceImpl.java
View File

@ -15,6 +15,8 @@ import com.ruoyi.airline.service.convert.AirlineAreaServiceConvert;
import com.ruoyi.airline.service.dto.AirlineAreaDTO; import com.ruoyi.airline.service.dto.AirlineAreaDTO;
import com.ruoyi.airline.service.dto.AirlineAreaGroupDTO; import com.ruoyi.airline.service.dto.AirlineAreaGroupDTO;
import com.ruoyi.airline.service.dto.AirlineAreaGroupInfoDTO; import com.ruoyi.airline.service.dto.AirlineAreaGroupInfoDTO;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.system.api.RemoteUserService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -45,6 +47,9 @@ public class AirlineAreaGroupServiceImpl implements IAirlineAreaGroupService {
@Autowired @Autowired
private IAirlineAreaTimeRuleService iAirlineAreaTimeRuleService; private IAirlineAreaTimeRuleService iAirlineAreaTimeRuleService;
@Autowired
private RemoteUserService remoteUserService;
@Override @Override
public int deletegroupById(Long userId, Long groupId) { public int deletegroupById(Long userId, Long groupId) {
// 1、删除空域分组明细 // 1、删除空域分组明细
@ -121,6 +126,21 @@ public class AirlineAreaGroupServiceImpl implements IAirlineAreaGroupService {
areaDTO.setTimeRules(timeRules); areaDTO.setTimeRules(timeRules);
} }
// 转换createBy为用户名称
for (AirlineAreaDTO areaDTO : areaDTOs) {
if (areaDTO.getCreateBy() != null && !areaDTO.getCreateBy().isEmpty()) {
try {
Long createByUserId = Long.parseLong(areaDTO.getCreateBy());
com.ruoyi.common.core.domain.R<String> userNameResult = remoteUserService.getUserName(createByUserId, SecurityConstants.INNER);
if (userNameResult != null && userNameResult.getCode() == 200) {
areaDTO.setCreateByName(userNameResult.getData());
}
} catch (NumberFormatException e) {
log.warn("无法解析用户ID: {}", areaDTO.getCreateBy());
}
}
}
dto.setGroupInfos(areaDTOs); dto.setGroupInfos(areaDTOs);
} }
return dto; return dto;