设备管理-20240913

modules/equipment/src/main/java/com/thing/eq/eqmanager/service/impl/IotThingsServiceImpl.java

@@ -195,7 +195,7 @@ public class IotThingsServiceImpl implements IotThingsService {
         //保存设备的关系
 
         List<IotThingRelationDetailDTO> 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());

modules/thing/src/main/java/com/thing/thing/relation/detail/service/IotThingRelationDetailService.java

@@ -75,4 +75,5 @@ public interface IotThingRelationDetailService extends IBaseService<IotThingRela
 
     void saveRelationNodes(ThingRelationDTO relationDTO);
 
+    List<IotThingRelationDetailDTO> findRootDetailChildNodeByRootIdAndToIdAndRootThingId(Long relationTypeId, Long id, Long relationTopId);
 }

modules/thing/src/main/java/com/thing/thing/relation/detail/service/impl/IotThingRelationDetailServiceImpl.java

@@ -708,6 +708,15 @@ public class IotThingRelationDetailServiceImpl extends BaseServiceImpl<IotThingR
                 , IotThingRelationDetailDTO.class);
     }
 
+    @Override
+    public List<IotThingRelationDetailDTO> 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()