diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/AppTopologyDiagramVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/AppTopologyDiagramVO.java index d50e10f..6eca922 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/AppTopologyDiagramVO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/AppTopologyDiagramVO.java @@ -46,6 +46,9 @@ public class AppTopologyDiagramVO extends BaseEntity { @ApiModelProperty(value = "项目名称") private String projectName; + @ApiModelProperty(value = "设备名称") + private String devName; + /** * 拓扑图文件路径 */ diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppLineTopologyDiagramServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppLineTopologyDiagramServiceImpl.java index 3214c2b..2c56d7d 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppLineTopologyDiagramServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppLineTopologyDiagramServiceImpl.java @@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.csdevice.mapper.AppLineTopologyDiagramMapper; +import com.njcn.csdevice.mapper.CsLedgerMapper; import com.njcn.csdevice.pojo.param.AppTopologyDiagramQueryParm; 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.vo.AppLineTopologyDiagramVO; 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.AppTopologyDiagramService; import com.njcn.csdevice.service.CsLinePOService; +import com.njcn.csdevice.service.ICsLedgerService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,8 +39,10 @@ import java.util.stream.Collectors; public class AppLineTopologyDiagramServiceImpl extends ServiceImpl implements AppLineTopologyDiagramService { private final CsLinePOService csLinePOService; private final AppTopologyDiagramService appTopologyDiagramService; + private final ICsLedgerService iCsLedgerService; @Override public AppTopologyDiagramVO query(String devId) { + CsLedger one = iCsLedgerService.lambdaQuery().eq(CsLedger::getId, devId).one(); List csLinePOList = csLinePOService.queryByDevId(devId); List collect = csLinePOList.stream().map(CsLinePO::getLineId).collect(Collectors.toList()); if(CollectionUtil.isEmpty(collect)){ @@ -54,6 +59,7 @@ public class AppLineTopologyDiagramServiceImpl extends ServiceImpl