From 979be9ed8d1ee4d315a7947829dc4c0c4c7474b3 Mon Sep 17 00:00:00 2001 From: xiezw Date: Fri, 13 Sep 2024 16:55:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86-20240913?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eq/eqmanager/service/impl/IotThingsServiceImpl.java | 2 +- .../detail/service/IotThingRelationDetailService.java | 1 + .../service/impl/IotThingRelationDetailServiceImpl.java | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/equipment/src/main/java/com/thing/eq/eqmanager/service/impl/IotThingsServiceImpl.java b/modules/equipment/src/main/java/com/thing/eq/eqmanager/service/impl/IotThingsServiceImpl.java index 26c4a25..a7dde67 100644 --- a/modules/equipment/src/main/java/com/thing/eq/eqmanager/service/impl/IotThingsServiceImpl.java +++ b/modules/equipment/src/main/java/com/thing/eq/eqmanager/service/impl/IotThingsServiceImpl.java @@ -195,7 +195,7 @@ public class IotThingsServiceImpl implements IotThingsService { //保存设备的关系 List relationDetailDTOS = - iotThingRelationDetailService.findRootDetailChildNodeByRootIdAndFromIdAndRootThingId(dto.getRelationTypeId(), parentThing.getId(), dto.getRelationTopId()); + iotThingRelationDetailService.findRootDetailChildNodeByRootIdAndToIdAndRootThingId(dto.getRelationTypeId(), parentThing.getId(), dto.getRelationTopId()); IotThingRelationDetailParamDTO relationDTO = new IotThingRelationDetailParamDTO(); relationDTO.setRootId(dto.getRelationTypeId()); diff --git a/modules/thing/src/main/java/com/thing/thing/relation/detail/service/IotThingRelationDetailService.java b/modules/thing/src/main/java/com/thing/thing/relation/detail/service/IotThingRelationDetailService.java index c46e08d..a6a5047 100644 --- a/modules/thing/src/main/java/com/thing/thing/relation/detail/service/IotThingRelationDetailService.java +++ b/modules/thing/src/main/java/com/thing/thing/relation/detail/service/IotThingRelationDetailService.java @@ -75,4 +75,5 @@ public interface IotThingRelationDetailService extends IBaseService findRootDetailChildNodeByRootIdAndToIdAndRootThingId(Long relationTypeId, Long id, Long relationTopId); } diff --git a/modules/thing/src/main/java/com/thing/thing/relation/detail/service/impl/IotThingRelationDetailServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/relation/detail/service/impl/IotThingRelationDetailServiceImpl.java index 1cb9d58..dbfb1ed 100644 --- a/modules/thing/src/main/java/com/thing/thing/relation/detail/service/impl/IotThingRelationDetailServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/thing/relation/detail/service/impl/IotThingRelationDetailServiceImpl.java @@ -708,6 +708,15 @@ public class IotThingRelationDetailServiceImpl extends BaseServiceImpl findRootDetailChildNodeByRootIdAndToIdAndRootThingId(Long rootId, Long toId, Long rootThingId) { + return mapper.selectListByQueryAs(QueryWrapper.create() + .eq(IotThingRelationDetailEntity::getRootId, rootId) + .eq(IotThingRelationDetailEntity::getToId, toId) + .eq(IotThingRelationDetailEntity::getRootThingId, rootThingId, ObjectUtil.isNotNull(rootThingId)) + , IotThingRelationDetailDTO.class); + } + @Override public IotThingRelationDetailDTO findRootDetailParentNodeByRootIdAndToIdAndRootThingId(Long rootId, Long toId, Long rootThingId) { return mapper.selectOneByQueryAs(QueryWrapper.create()