From 4e7a10f46e8a4b84ce5f5c08b9ed1a98767d6c89 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Mon, 13 Jul 2026 16:35:48 +0800 Subject: [PATCH] =?UTF-8?q?feat(device):=20=E6=9B=B4=E6=96=B0=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=8F=B0=E8=B4=A6=E5=92=8C=E4=BA=8B=E4=BB=B6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加AppProjectService依赖以获取项目信息 - 修改项目数量获取逻辑，直接从接口获取项目信息而非设备关联数 - 在事件查询接口中添加线路ID参数支持 - 更新XML映射文件，添加线路ID过滤条件 - 修复便携式设备树结构中的固定ID分配 - 更新便携式工程和项目的固定ID为"1"和"2" - 优化事件查询服务中的设备和线路ID处理逻辑 --- .../impl/CsDeviceUserPOServiceImpl.java | 13 +++++++++--- .../service/impl/CsLedgerServiceImpl.java | 17 +++++++-------- .../mapper/CsEventUserPOMapper.java | 2 +- .../mapper/mapping/CsEventUserPOMapper.xml | 6 ++++++ .../impl/CsEventUserPOServiceImpl.java | 21 +++++++++++++------ 5 files changed, 40 insertions(+), 19 deletions(-) diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java index b39a255..ba7881d 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java @@ -60,6 +60,7 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl projectInfoList = appProjectService.getProjectByEngineering(Collections.singletonList(id)); + if (CollectionUtil.isNotEmpty(projectInfoList)) { + vo.setCurrentProjectCount(projectInfoList.size()); + } else { + vo.setCurrentProjectCount(0); } //获取设备总数、在线设备、离线设备 if (CollectionUtil.isNotEmpty(currentDevIds)) { diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java index 883449d..3eb7788 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java @@ -300,7 +300,7 @@ public class CsLedgerServiceImpl extends ServiceImpl i List portables = ledger.stream() .peek(c -> { CsEquipmentDeliveryPO po = poMap2.get(c.getId()); - c.setPid(portable.getId()); + c.setPid("2"); c.setComFlag(po.getRunStatus()); c.setNDId(po.getNdid()); c.setType("device"); @@ -365,13 +365,13 @@ public class CsLedgerServiceImpl extends ServiceImpl i portable1.setLevel(0); portable1.setName("便携式工程"); portable1.setPid("0"); - portable1.setId(id); + portable1.setId("1"); CsLedgerVO portable2 = new CsLedgerVO(); portable2.setLevel(1); portable2.setName("便携式项目"); - portable2.setPid(id); - portable2.setId(IdUtil.simpleUUID()); + portable2.setPid("1"); + portable2.setId("2"); portable2.setChildren(portables); portable1.setChildren(Collections.singletonList(portable2)); @@ -719,7 +719,7 @@ public class CsLedgerServiceImpl extends ServiceImpl i List portables = ledger.stream() .peek(c -> { CsEquipmentDeliveryPO po = poMap2.get(c.getId()); - c.setPid(portable.getId()); + c.setPid("2"); c.setComFlag(po.getRunStatus()); c.setNDId(po.getNdid()); c.setType("device"); @@ -776,18 +776,17 @@ public class CsLedgerServiceImpl extends ServiceImpl i tree.addAll(new ArrayList<>(engineeringMap.values())); if (CollUtil.isNotEmpty(portables)) { - String id = IdUtil.simpleUUID(); CsLedgerVO portable1 = new CsLedgerVO(); portable1.setLevel(0); portable1.setName("便携式工程"); portable1.setPid("0"); - portable1.setId(id); + portable1.setId("1"); CsLedgerVO portable2 = new CsLedgerVO(); portable2.setLevel(1); portable2.setName("便携式项目"); - portable2.setPid(id); - portable2.setId(IdUtil.simpleUUID()); + portable2.setPid("1"); + portable2.setId("2"); portable2.setChildren(portables); List portable2List = new ArrayList<>(); diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsEventUserPOMapper.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsEventUserPOMapper.java index caa3f44..d1f56f3 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsEventUserPOMapper.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsEventUserPOMapper.java @@ -36,7 +36,7 @@ public interface CsEventUserPOMapper extends BaseMapper { Page queryEventpage(Page returnpage, @Param("csEventUserQueryPage") CsEventUserQueryPage csEventUserQueryPage, @Param("devIds") List devIds); - Page queryEventPageWeb(Page returnpage,@Param("csEventUserQueryPage") CsEventUserQueryPage csEventUserQueryPage,@Param("devIds") List collect); + Page queryEventPageWeb(Page returnpage,@Param("csEventUserQueryPage") CsEventUserQueryPage csEventUserQueryPage,@Param("devIds") List collect,@Param("lineIds") List collect2); Page queryEventPageWebDvr(Page returnpage,@Param("csEventUserQueryPage") CsEventUserQueryPage csEventUserQueryPage,@Param("lineIds") List collect); diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml index 88aae5f..313e310 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml @@ -267,6 +267,12 @@ #{item} + + AND b.line_id IN + + #{item} + + AND b.type in (2,3) and b.level in (1,2,3,6,7) diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java index 2c47d37..7945ce8 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java @@ -415,11 +415,17 @@ public class CsEventUserPOServiceImpl extends ServiceImpl portableDevIds = portableDevTree.stream().filter( - temp -> StringUtils.isEmpty(csEventUserQueryPage.getDeviceId()) || - Objects.equals(temp.getId(), csEventUserQueryPage.getDeviceId()) - ).map(CsLedgerVO::getId).collect(Collectors.toList()); + //便携式就1层下边就是设备 这边给便携式设备添加了假的工程和项目，id是写死的 + List portableDevIds = new ArrayList<>(); + if (Objects.equals(csEventUserQueryPage.getEngineeringid(),"1") + || Objects.equals(csEventUserQueryPage.getProjectId(),"2") + || !ObjectUtil.isNull(csEventUserQueryPage.getLineId()) + || !StringUtils.isEmpty(csEventUserQueryPage.getLineId())) { + portableDevIds = portableDevTree.stream().map(CsLedgerVO::getId).filter( + id -> StringUtils.isEmpty(csEventUserQueryPage.getDeviceId()) || + Objects.equals(id, csEventUserQueryPage.getDeviceId()) + ).collect(Collectors.toList()); + } List governmentDevIds = governmentDevTree.stream().filter(temp->StringUtils.isEmpty(csEventUserQueryPage.getEngineeringid())|| Objects.equals(temp.getId(), csEventUserQueryPage.getEngineeringid())) .map(CsLedgerVO::getChildren).flatMap(Collection::stream).filter( @@ -454,6 +460,9 @@ public class CsEventUserPOServiceImpl extends ServiceImpl{ CsLineDTO dto = map.get(temp.getLineId());