修改bug

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

@@ -185,6 +185,13 @@ public interface EquipFeignClient {
      */
     @RequestMapping(value = "/building/video/page", method = RequestMethod.GET)
     ResponseModel<Page<Map<String, Object>>> getVideo( @RequestParam long current, @RequestParam long size, @RequestParam Long buildingId);
+    @RequestMapping(value = "/building/video/page", method = RequestMethod.GET)
+    ResponseModel<Page<Map<String, Object>>> getVideopag( @RequestParam String current,
+                                                          @RequestParam String size,
+                                                          @RequestParam String buildingId,
+                                                          @RequestParam String code,
+                                                          @RequestParam String equipmentName
+    );
 
     /**
      *
@@ -203,6 +210,12 @@ public interface EquipFeignClient {
                                            @RequestParam String name,
                                            @RequestParam String typeCode);
 
+    @RequestMapping(value = "/building/video/page", method = RequestMethod.GET)
+    ResponseModel<Page<Map<String, Object>>> getVideoList( @RequestParam(value = "viewId") Long viewId,
+                                                       @RequestParam(value = "videoName" ,required =false) String videoName,
+                                                       @RequestParam(value = "videoCode" ,required =false) String videoCode,
+                                                       @RequestParam(value = "current") int current,
+                                                       @RequestParam(value = "size") int size);
 
 
     /**

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

@@ -300,6 +300,33 @@ public class CommandController extends BaseController {
 
 
 
+
+
+
+    @TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/video/page", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "分页获取视频", notes = "分页获取视频")
+    public ResponseModel<Object> getVideopage(String current,
+                                              String size,
+                                              String equipmentName,
+                                              String code,
+                                              String buildingId
+    )throws Exception {
+
+        ResponseModel<Page<Map<String, Object>>>  data= equipFeignClient.getVideopag(current,size,buildingId,code,equipmentName);
+        Page<Map<String, Object>>  pag=  data!=null?data.getResult():null;
+        List<Map<String, Object>> records =pag!=null?pag.getRecords():null;
+        if(records!=null&&records.size()>0){
+            for (Map<String, Object> record : records) {
+                ResponseModel<String> da=videoFeignClient.videoUrlByIndexCode(record.get("code")+"");
+                String url=  da!=null?da.getResult().substring(da.getResult().indexOf("openUrl")):null;
+                record.put("url",url);
+            }
+            pag.setRecords(records);
+        }
+        return ResponseHelper.buildResponse(pag);
+    }
+
     /**
      * 水源列表分页查询
      *