Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码提交

Browse Source
This commit is contained in:
huangzj
2023-10-25 19:08:16 +08:00
parent 9d9813e93b
commit d7582bc431
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml
View File

@@ -42,9 +42,12 @@
c.mac mac, c.mac mac,
c.process process c.process process
FROM FROM
(select * from cs_ledger where LEVEL = 0 ) a, (select * from cs_ledger where LEVEL = 0 and State =1
(select * from cs_ledger where LEVEL = 1 ) b, ) a,
(select * from cs_ledger where LEVEL = 2 ) d, (select * from cs_ledger where LEVEL = 1 and State =1
) b,
(select * from cs_ledger where LEVEL = 2 and State =1
) d,
cs_equipment_delivery c cs_equipment_delivery c
WHERE WHERE
a.LEVEL = 0 a.LEVEL = 0

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppLineTopologyDiagramServiceImpl.java
View File

@@ -43,7 +43,7 @@ public class AppLineTopologyDiagramServiceImpl extends ServiceImpl<AppLineTopolo
private final ICsLedgerService iCsLedgerService; 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(); CsLedger one = iCsLedgerService.lambdaQuery().eq(CsLedger::getId, devId).eq(CsLedger::getState,1).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)){