建筑模型数据结构调整

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseBuildServiceImpl.java

@@ -195,9 +195,14 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
     @Override
     public List<Object> buildFacilityInfo(Integer id) {
         List<Object> list = new ArrayList<>();
+        List<Object> list2 = new ArrayList<>();
         LambdaQueryWrapper<BaseBuildFacilityRelate> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(BaseBuildFacilityRelate::getBuildId,id);
         List<BaseBuildFacilityRelate> baseBuildFacilityList = baseBuildFacilityRelateService.list(queryWrapper);
+        BaseBuild baseBuild = this.getById(id);
+        Map<String, Object> map = new HashMap<>();
+        map.put("aboveFloor", baseBuild.getAboveFloor());
+        map.put("underFloor", baseBuild.getUnderFloor());
         if (CollectionUtils.isNotEmpty(baseBuildFacilityList)) {
             List<Integer> facilityIdList = new ArrayList<>();
             for (int i = 0; i < baseBuildFacilityList.size(); i++) {
@@ -258,7 +263,9 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
                 }
             }
         }
-        return list;
+        map.put("floorList", list);
+        list2.add(map);
+        return list2;
     }
 
     @Override