feat:空域详情直接返回用户名
This commit is contained in:
parent
3ab65cbc74
commit
9e66797d4f
|
|
@ -76,7 +76,10 @@ public class AirlineAreaControllerConvert extends BaseConvert<AirlineAreaDTO, Ai
|
||||||
log.error("转换坐标点信息失败: {}", e.getMessage());
|
log.error("转换坐标点信息失败: {}", e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 复制创建者名称
|
||||||
|
vo.setCreateByName(dto.getCreateByName());
|
||||||
|
|
||||||
return vo;
|
return vo;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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)
|
||||||
|
|
|
||||||
|
|
@ -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、删除空域分组明细
|
||||||
|
|
@ -120,7 +125,22 @@ public class AirlineAreaGroupServiceImpl implements IAirlineAreaGroupService {
|
||||||
List<com.ruoyi.airline.service.dto.AirlineAreaTimeRuleDTO> timeRules = iAirlineAreaTimeRuleService.selectTimeRuleListByAreaId(areaDTO.getId());
|
List<com.ruoyi.airline.service.dto.AirlineAreaTimeRuleDTO> timeRules = iAirlineAreaTimeRuleService.selectTimeRuleListByAreaId(areaDTO.getId());
|
||||||
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;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue