Commit 4db623ad authored by tangwei's avatar tangwei

增加排序

parent 3478af19
...@@ -140,6 +140,6 @@ public interface EquipFeignClient { ...@@ -140,6 +140,6 @@ public interface EquipFeignClient {
* @return * @return
*/ */
@RequestMapping(value = "//building/video/page", method = RequestMethod.GET) @RequestMapping(value = "//building/video/page", method = RequestMethod.GET)
ResponseModel<Page<Map<String, Object>>> getVideo( @RequestParam int current, @RequestParam int size, @RequestParam Long buildingId); ResponseModel<Page<Map<String, Object>>> getVideo( @RequestParam Page page, @RequestParam Long buildingId);
} }
...@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; ...@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService; import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;
...@@ -809,8 +810,13 @@ public class CommandController extends BaseController { ...@@ -809,8 +810,13 @@ public class CommandController extends BaseController {
@TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY) @TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/getVideo", method = RequestMethod.GET) @RequestMapping(value = "/getVideo", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "分页获取视频", notes = "分页获取视频") @ApiOperation(httpMethod = "GET", value = "分页获取视频", notes = "分页获取视频")
public ResponseModel<Object> getVideo(Integer current, Integer size)throws Exception { public ResponseModel<Object> getVideo(long current, long size)throws Exception {
ResponseModel<Page<Map<String, Object>>> date= equipFeignClient.getVideo(current,size,0l);
Page page = new Page(current, size);
List<OrderItem> list= OrderItem.ascs("id");
page.setOrders(list);
ResponseModel<Page<Map<String, Object>>> date= equipFeignClient.getVideo(page,0l);
return ResponseHelper.buildResponse(date!=null?date.getResult():null); return ResponseHelper.buildResponse(date!=null?date.getResult():null);
} }
......
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