Merge remote-tracking branch 'origin/master'

ruoyi-api/property-api/src/main/java/org/dromara/property/api/RemoteBuildingService.java

@@ -0,0 +1,13 @@
+package org.dromara.property.api;
+
+import org.dromara.property.api.domain.vo.RemoteBuildingVo;
+
+/**
+ * 物业楼层远程服务
+ * @author lxj
+ */
+public interface RemoteBuildingService {
+
+    RemoteBuildingVo queryBuildingById(Long id);
+
+}

ruoyi-api/property-api/src/main/java/org/dromara/property/api/RemoteUnitService.java

@@ -1,13 +0,0 @@
-package org.dromara.property.api;
-
-import org.dromara.property.api.domain.vo.RemoteUnitVo;
-
-/**
- * 物业楼层远程服务
- * @author lxj
- */
-public interface RemoteUnitService {
-
-    RemoteUnitVo queryUnitById(Long id);
-
-}

ruoyi-api/property-api/src/main/java/org/dromara/property/api/domain/vo/RemoteBuildingVo.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @author lxj
  */
 @Data
-public class RemoteUnitVo implements Serializable {
+public class RemoteBuildingVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -11L;
@@ -21,31 +21,19 @@ public class RemoteUnitVo implements Serializable {
      */
     private Long id;
 
+    /**
+     * 园区id
+     */
     private Long communityId;
 
     /**
      * 建筑名称
      */
-    private Long buildingId;
+    private String buildingName;
 
     /**
-     * 单元名称
+     * 总层数
      */
-    private String unitName;
-
-    /**
-     * 单元层数
-     */
-    private Integer floorCount;
-
-    /**
-     * 单元户数
-     */
-    private Integer householdCount;
-
-    /**
-     * 楼梯数量
-     */
-    private Integer stairCount;
+    private Long floorCount;
 
 }

ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteFileService.java

@@ -27,7 +27,7 @@ public interface RemoteFileService {
      * @return 结果
      * @throws ServiceException
      */
-    RemoteFile upload(byte[] file) throws ServiceException;
+    RemoteFile uploadImg(byte[] file) throws ServiceException;
 
     /**
      * 通过ossId查询对应的url

ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteFileServiceMock.java

@@ -2,6 +2,7 @@ package org.dromara.resource.api;
 
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.resource.api.domain.RemoteFile;
 
@@ -28,6 +29,18 @@ public class RemoteFileServiceMock implements RemoteFileService {
         return null;
     }
 
+    /**
+     * 文件上传
+     *
+     * @param file 文件信息
+     * @return 结果
+     */
+    @Override
+    public RemoteFile uploadImg(byte[] file) {
+        log.warn("服务调用异常 -> 降级处理");
+        return null;
+    }
+
     /**
      * 通过ossId查询对应的url
      *
@@ -55,7 +68,7 @@ public class RemoteFileServiceMock implements RemoteFileService {
     /**
      * 文件下载方法，支持一次性下载完整文件
      *
-     * @param ossId    OSS对象ID
+     * @param ossId OSS对象ID
      * @return byte[] 返回下载的字节数组
      */
     public byte[] downloadToByteArray(Long ossId) throws IOException {