添加
This commit is contained in:
@@ -46,6 +46,9 @@ public class AppTopologyDiagramVO extends BaseEntity {
|
|||||||
@ApiModelProperty(value = "项目名称")
|
@ApiModelProperty(value = "项目名称")
|
||||||
private String projectName;
|
private String projectName;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "设备名称")
|
||||||
|
private String devName;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 拓扑图文件路径
|
* 拓扑图文件路径
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.njcn.common.pojo.exception.BusinessException;
|
import com.njcn.common.pojo.exception.BusinessException;
|
||||||
import com.njcn.csdevice.mapper.AppLineTopologyDiagramMapper;
|
import com.njcn.csdevice.mapper.AppLineTopologyDiagramMapper;
|
||||||
|
import com.njcn.csdevice.mapper.CsLedgerMapper;
|
||||||
import com.njcn.csdevice.pojo.param.AppTopologyDiagramQueryParm;
|
import com.njcn.csdevice.pojo.param.AppTopologyDiagramQueryParm;
|
||||||
import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO;
|
import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO;
|
||||||
|
import com.njcn.csdevice.pojo.po.CsLedger;
|
||||||
import com.njcn.csdevice.pojo.po.CsLinePO;
|
import com.njcn.csdevice.pojo.po.CsLinePO;
|
||||||
import com.njcn.csdevice.pojo.vo.AppLineTopologyDiagramVO;
|
import com.njcn.csdevice.pojo.vo.AppLineTopologyDiagramVO;
|
||||||
import com.njcn.csdevice.pojo.vo.AppTopologyDiagramVO;
|
import com.njcn.csdevice.pojo.vo.AppTopologyDiagramVO;
|
||||||
@@ -14,6 +16,7 @@ import com.njcn.csdevice.pojo.vo.CsLineTopologyTemplateVO;
|
|||||||
import com.njcn.csdevice.service.AppLineTopologyDiagramService;
|
import com.njcn.csdevice.service.AppLineTopologyDiagramService;
|
||||||
import com.njcn.csdevice.service.AppTopologyDiagramService;
|
import com.njcn.csdevice.service.AppTopologyDiagramService;
|
||||||
import com.njcn.csdevice.service.CsLinePOService;
|
import com.njcn.csdevice.service.CsLinePOService;
|
||||||
|
import com.njcn.csdevice.service.ICsLedgerService;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
@@ -36,8 +39,10 @@ import java.util.stream.Collectors;
|
|||||||
public class AppLineTopologyDiagramServiceImpl extends ServiceImpl<AppLineTopologyDiagramMapper, AppLineTopologyDiagramPO> implements AppLineTopologyDiagramService {
|
public class AppLineTopologyDiagramServiceImpl extends ServiceImpl<AppLineTopologyDiagramMapper, AppLineTopologyDiagramPO> implements AppLineTopologyDiagramService {
|
||||||
private final CsLinePOService csLinePOService;
|
private final CsLinePOService csLinePOService;
|
||||||
private final AppTopologyDiagramService appTopologyDiagramService;
|
private final AppTopologyDiagramService appTopologyDiagramService;
|
||||||
|
private final ICsLedgerService iCsLedgerService;
|
||||||
@Override
|
@Override
|
||||||
public AppTopologyDiagramVO query(String devId) {
|
public AppTopologyDiagramVO query(String devId) {
|
||||||
|
CsLedger one = iCsLedgerService.lambdaQuery().eq(CsLedger::getId, devId).one();
|
||||||
List<CsLinePO> csLinePOList = csLinePOService.queryByDevId(devId);
|
List<CsLinePO> csLinePOList = csLinePOService.queryByDevId(devId);
|
||||||
List<String> collect = csLinePOList.stream().map(CsLinePO::getLineId).collect(Collectors.toList());
|
List<String> collect = csLinePOList.stream().map(CsLinePO::getLineId).collect(Collectors.toList());
|
||||||
if(CollectionUtil.isEmpty(collect)){
|
if(CollectionUtil.isEmpty(collect)){
|
||||||
@@ -54,6 +59,7 @@ public class AppLineTopologyDiagramServiceImpl extends ServiceImpl<AppLineTopolo
|
|||||||
}
|
}
|
||||||
AppTopologyDiagramVO appTopologyDiagramVO = appTopologyDiagramVOS.get(0);
|
AppTopologyDiagramVO appTopologyDiagramVO = appTopologyDiagramVOS.get(0);
|
||||||
appTopologyDiagramVO.setAppsLineTopologyDiagramPO(this.queryByTopoId(appTopologyDiagramVO.getId()));
|
appTopologyDiagramVO.setAppsLineTopologyDiagramPO(this.queryByTopoId(appTopologyDiagramVO.getId()));
|
||||||
|
appTopologyDiagramVO.setDevName(one.getName());
|
||||||
return appTopologyDiagramVO;
|
return appTopologyDiagramVO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user