Commit 3350d07b authored by tangwei's avatar tangwei

修改接口参数

parent ce84d7a6
...@@ -196,9 +196,8 @@ public interface EquipFeignClient { ...@@ -196,9 +196,8 @@ public interface EquipFeignClient {
@RequestMapping(value = "/monitorView/video/page", method = RequestMethod.GET) @RequestMapping(value = "/monitorView/video/page", method = RequestMethod.GET)
ResponseModel<Page<Map<String, Object>>> queryUncheckedVideoList( ResponseModel<Page<Map<String, Object>>> queryUncheckedVideoList(
@RequestParam(value = "viewId") Long viewId, @RequestParam(value = "nodeId") Long nodeId,
@RequestParam(value = "videoName" ,required =false) String videoName, @RequestParam(value = "nodeType" ,required =false) String nodeType,
@RequestParam(value = "videoCode" ,required =false) String videoCode,
@RequestParam(value = "current") int current, @RequestParam(value = "current") int current,
@RequestParam(value = "size") int size @RequestParam(value = "size") int size
); );
......
...@@ -351,13 +351,13 @@ public class CommandController extends BaseController { ...@@ -351,13 +351,13 @@ public class CommandController extends BaseController {
@ApiOperation(value = "分页查询视图下的视频列表") @ApiOperation(value = "分页查询视图下的视频列表")
@RequestMapping(value = "monitorView/video/page", method = RequestMethod.GET) @RequestMapping(value = "monitorView/video/page", method = RequestMethod.GET)
public ResponseModel<Page<Map<String, Object>>> queryUncheckedVideoList( public ResponseModel<Page<Map<String, Object>>> queryUncheckedVideoList(
@RequestParam(value = "viewId") Long viewId, @RequestParam(value = "nodeId") Long nodeId,
@RequestParam(value = "videoName" ,required =false) String videoName, @RequestParam(value = "nodeType" ,required =false) String nodeType,
@RequestParam(value = "videoCode" ,required =false) String videoCode,
@RequestParam(value = "current") int current, @RequestParam(value = "current") int current,
@RequestParam(value = "size") int size) throws Exception @RequestParam(value = "size") int size
) throws Exception
{ {
ResponseModel<Page<Map<String, Object>>> data = equipFeignClient.queryUncheckedVideoList(viewId,videoName, videoCode,current,size); ResponseModel<Page<Map<String, Object>>> data = equipFeignClient.queryUncheckedVideoList(nodeId,nodeType,current,size);
Page<Map<String, Object>> pag = data != null ? data.getResult() : null; Page<Map<String, Object>> pag = data != null ? data.getResult() : null;
List<Map<String, Object>> records = pag != null ? pag.getRecords() : null; List<Map<String, Object>> records = pag != null ? pag.getRecords() : null;
if (records != null && records.size() > 0) { if (records != null && records.size() > 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment