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

台账添加设备类型区分

Browse Source
This commit is contained in:
xy
2026-03-26 09:33:48 +08:00
parent 720afd42df
commit 33da822317
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsLedgerVO.java
View File

@@ -72,6 +72,9 @@ public class CsLedgerVO implements Serializable {
@ApiModelProperty(name = "isTop",value = "是否置顶,默认不置顶")
private Integer isTop = 0;
@ApiModelProperty(name = "devConType",value = "设备连接方式 MQTT || CLD")
private String devConType;
@ApiModelProperty(name = "children",value = "子节点")
private List<CsLedgerVO> children = new ArrayList<>();

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

@@ -133,6 +133,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
item.setNDId(po.getNdid());
item.setType("device");
item.setProcess(po.getProcess());
item.setDevConType(po.getDevAccessMethod());
})
.filter(item -> Objects.equals(poMap.get(item.getId()).getUsageStatus(), 1))
.sorted(Comparator.comparing(CsLedgerVO::getSort))
@@ -146,6 +147,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
item.setNDId(po.getNdid());
item.setType("device");
item.setProcess(po.getProcess());
item.setDevConType(po.getDevAccessMethod());
})
.filter(item -> Objects.equals(poMap.get(item.getId()).getUsageStatus(), 1))
.sorted(Comparator.comparing(CsLedgerVO::getSort))
@@ -472,6 +474,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
item.setNDId(po.getNdid());
item.setType("device");
item.setProcess(po.getProcess());
item.setDevConType(po.getDevAccessMethod());
})
.filter(item -> Objects.equals(poMap.get(item.getId()).getUsageStatus(), 1))
.sorted(Comparator.comparing(CsLedgerVO::getSort))
@@ -499,6 +502,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
item.setNDId(po.getNdid());
item.setType("device");
item.setProcess(po.getProcess());
item.setDevConType(po.getDevAccessMethod());
})
.filter(item -> Objects.equals(poMap.get(item.getId()).getUsageStatus(), 1))
.sorted(Comparator.comparing(CsLedgerVO::getSort))