From a198e0c720d44330a42c726b51be59b1b61f9c22 Mon Sep 17 00:00:00 2001
From: zcxlsm <patrickstarlsm@163.com>
Date: Sun, 20 Jul 2025 19:23:22 +0800
Subject: [PATCH] fix(property):

---
 .../dubbo/RemoteFloorServiceImpl.java         |  5 ++-
 .../sis/mapper/SisAuthRecordMapper.java       |  2 +
 .../impl/SisAuthRecordServiceImpl.java        | 40 +++++++++++++++----
 3 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteFloorServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteFloorServiceImpl.java
index 9ff7100..f5b660f 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteFloorServiceImpl.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteFloorServiceImpl.java
@@ -114,7 +114,10 @@ public class RemoteFloorServiceImpl implements RemoteFloorService {
         List<RemoteFloorVo> remoteFloorVos = new ArrayList<>();
 
         tbFloorVo.forEach(item -> {
-            RemoteFloorVo remoteFloorVo = MapstructUtils.convert(item, RemoteFloorVo.class);
+            RemoteFloorVo remoteFloorVo = new RemoteFloorVo();
+            remoteFloorVo.setId(item.getId());
+            remoteFloorVo.setFloorName(item.getFloorName());
+            remoteFloorVo.setFloorNumber(item.getFloorNumber());
             remoteFloorVos.add(remoteFloorVo);
         });
 
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAuthRecordMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAuthRecordMapper.java
index da91c0c..3277528 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAuthRecordMapper.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAuthRecordMapper.java
@@ -1,5 +1,6 @@
 package org.dromara.sis.mapper;
 
+import org.apache.ibatis.annotations.Mapper;
 import org.dromara.sis.domain.SisAuthRecord;
 import org.dromara.sis.domain.vo.SisAuthRecordVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -12,6 +13,7 @@ import java.util.List;
  * @author lsm
  * @since 2025-07-14
  */
+@Mapper
 public interface SisAuthRecordMapper extends BaseMapperPlus<SisAuthRecord, SisAuthRecordVo> {
         List<SisAuthRecordVo> checkAuth(Long personId);
 }
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java
index e5736ad..d443c86 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java
@@ -2,6 +2,7 @@ package org.dromara.sis.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.common.core.domain.TreeNode;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -11,6 +12,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.api.RemoteFloorService;
+import org.dromara.property.api.domain.vo.RemoteFloorVo;
 import org.dromara.sis.domain.bo.SisAccessControlBo;
 import org.dromara.sis.domain.bo.SisElevatorInfoBo;
 import org.dromara.sis.domain.vo.SisAccessControlVo;
@@ -25,6 +28,7 @@ import org.dromara.sis.mapper.SisAuthRecordMapper;
 import org.dromara.sis.service.ISisAuthRecordService;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -45,6 +49,9 @@ public class SisAuthRecordServiceImpl implements ISisAuthRecordService {
     private final ISisAccessControlService accessControlService;
     private final ISisElevatorInfoService elevatorInfoService;
 
+    @DubboReference
+    private RemoteFloorService remoteFloorService;
+
     /**
      * 查询授权记录
      *
@@ -247,19 +254,36 @@ public class SisAuthRecordServiceImpl implements ISisAuthRecordService {
             return node;
         }).toList();
 
-        List<TreeNode<Long>> eleChildrenList = eleVoList.stream().map(item -> {
-            TreeNode<Long> node = new TreeNode<>();
-            node.setLevel(2);
-            node.setCode(item.getElevatorId());
-            node.setParentCode(2L);
-            node.setLabel(item.getElevatorName());
-            return node;
-        }).toList();
+        List<TreeNode<Long>> eleChildrenList = new ArrayList<>();
+        eleVoList.forEach(item -> {
+            // 电梯子节点
+            TreeNode<Long> eleNode = new TreeNode<>();
+            eleNode.setLevel(2);
+            eleNode.setParentCode(2L);
+            eleNode.setCode(item.getElevatorId());
+            eleNode.setLabel(item.getElevatorName());
+
+            // 楼层节点
+            List<TreeNode<Long>> floorTree = new ArrayList<>();
+            // 获取楼层
+            List<RemoteFloorVo> floorInfoList = remoteFloorService.queryByUnitId(item.getUnitId());
+            floorInfoList.forEach(floor -> {
+                TreeNode<Long> floorNode = new TreeNode<>();
+                floorNode.setLevel(3);
+                floorNode.setCode(floor.getId());
+                floorNode.setLabel(floor.getFloorName());
+                floorNode.setParentCode(item.getElevatorId());
+                floorTree.add(floorNode);
+            });
+            eleNode.setChildren(floorTree);
+            eleChildrenList.add(eleNode);
+        });
 
         // 将子节点列表分别添加到对应的父节点
         accessNode.setChildren(acChildrenList);
         elevatorNode.setChildren(eleChildrenList);
 
+
         // 最后将两个父节点添加到根节点
         root.setChildren(List.of(accessNode, elevatorNode));
         return List.of(root);