Merge remote-tracking branch 'origin/developer' into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/PageDto.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2021/8/9
+ */
+@Data
+public class PageDto {
+    private int current;
+    private int size;
+
+    public PageDto(int current, int size) {
+        this.current = current;
+        this.size = size;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java

 package com.yeejoin.amos.boot.module.common.api.feign;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.PageDto;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -130,4 +131,15 @@ public interface EquipFeignClient {
      */
     @RequestMapping(value = "/building/BuildingtreeAndEquip", method = RequestMethod.GET)
     ResponseModel<Object> getBuildingTreeAndEquip();
+
+
+    /**
+     *
+     *获取视频信息
+     * @param
+     * @return
+     */
+    @RequestMapping(value = "//building/video/page", method = RequestMethod.GET)
+    ResponseModel<Page<Map<String, Object>>> getVideo( @RequestParam int current,  @RequestParam int size, @RequestParam Long buildingId);
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -51,10 +51,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * *指挥资源Api
@@ -803,6 +800,19 @@ public class CommandController extends BaseController {
         return ResponseHelper.buildResponse(li);
     }
 
+    /**
+     * 分页获取视频
+     *
+     * @param
+     * @return
+     */
+    @TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/getVideo", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "分页获取视频", notes = "分页获取视频")
+    public ResponseModel<Object> getVideo(Integer current, Integer size)throws Exception {
+       ResponseModel<Page<Map<String, Object>>>  date= equipFeignClient.getVideo(current,size,0l);
+        return ResponseHelper.buildResponse(date!=null?date.getResult():null);
+    }