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/feign/EquipFeignClient.java

@@ -150,6 +150,14 @@ public interface EquipFeignClient {
      */
     @RequestMapping(value = "/video/pageVideo", method = RequestMethod.GET)
     ResponseModel<Page<Map<String, Object>>> pageVideo( @RequestParam Integer pageNum, @RequestParam Integer pageSize, @RequestParam Double longitude,@RequestParam Double latitude,@RequestParam Double distance);
+    /**
+     *
+     *获取视频列表
+     * @param
+     * @return
+     */
+    @RequestMapping(value = "/video/getByid", method = RequestMethod.GET)
+    ResponseModel<Map<String, Object>> getByid( @RequestParam Long id);
 
 
 }

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

@@ -256,7 +256,18 @@ public class CommandController extends BaseController {
     }
 
 
-
+    /**
+     * 水源列表分页查询
+     *
+     * @return
+     */
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "video/{id}")
+    @ApiOperation(httpMethod = "GET", value = " 视频详情88", notes = "视频详情88")
+    public ResponseModel<Object> getVideoByid(@PathVariable Long id) {
+        ResponseModel<Map<String, Object>> data=  equipFeignClient.getByid(id);
+        return ResponseHelper.buildResponse(data!=null?data.getResult():null);
+    }
 
     /**
      * 水源列表分页查询