增加视频接口

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

@@ -328,9 +328,9 @@ public class CommandController extends BaseController {
      * @return
      */
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "video/list")
+    @GetMapping(value = "video/listNew")
     @ApiOperation(httpMethod = "GET", value = " 视频分页查询88", notes = "视频分页查询88")
-    public ResponseModel<Object> getVideo(Integer pageNum, Integer pageSize, RequestData par) {
+    public ResponseModel<Object> getVideoNew(Integer pageNum, Integer pageSize, RequestData par) {
         par.setDistance(500D);
         ResponseModel<Map<String, Object>> result = null;
         if (par.getAlertId() != null) {
@@ -408,6 +408,30 @@ public class CommandController extends BaseController {
     }
 
 
+
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "video/list")
+    @ApiOperation(httpMethod = "GET", value = " 视频分页查询88", notes = "视频分页查询88")
+    public ResponseModel<Object> getVideo(Integer pageNum, Integer pageSize, RequestData par) {
+        if (par.getAlertId() != null) {
+            AlertCalled alertCalled = iAlertCalledService.getAlertCalledById(par.getAlertId());
+            par.setLatitude(alertCalled.getCoordinateX());
+            par.setLongitude(alertCalled.getCoordinateY());
+        }
+        ResponseModel<Page<Map<String, Object>>> data = equipFeignClient.pageVideo(pageNum == 0 ? 1 : pageNum, pageSize, par.getLongitude(), par.getLatitude(), par.getDistance());
+        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);
+    }
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/video/page", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "分页获取视频", notes = "分页获取视频")