|
@@ -4,16 +4,15 @@ import cn.com.ctop.common.module.utils.*;
|
|
import cn.com.ctop.kuaishou.modules.report.service.IDuanJUReportService;
|
|
import cn.com.ctop.kuaishou.modules.report.service.IDuanJUReportService;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
+import com.github.pagehelper.PageHelper;
|
|
|
|
+import com.github.pagehelper.PageInfo;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
|
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.util.DateUtils;
|
|
import org.jeecg.common.util.DateUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
-import org.springframework.web.bind.annotation.GetMapping;
|
|
|
|
-import org.springframework.web.bind.annotation.PostMapping;
|
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
@@ -96,7 +95,7 @@ public class DuanJUReportController {
|
|
}
|
|
}
|
|
|
|
|
|
@GetMapping("/getViodeoList")
|
|
@GetMapping("/getViodeoList")
|
|
- public Result<Object> getViodeoList(String startDate, String endDate, String videoName) {
|
|
|
|
|
|
+ public Result<Object> getViodeoList(String startDate, String endDate, String videoName, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
|
|
try {
|
|
try {
|
|
Long start = DateUtils.dateToLong(startDate);
|
|
Long start = DateUtils.dateToLong(startDate);
|
|
Long end = DateUtils.dateToLong(endDate);
|
|
Long end = DateUtils.dateToLong(endDate);
|
|
@@ -106,8 +105,7 @@ public class DuanJUReportController {
|
|
if (!Check.isNull(videoName)) {
|
|
if (!Check.isNull(videoName)) {
|
|
requestMap.put("videoName", videoName);
|
|
requestMap.put("videoName", videoName);
|
|
}
|
|
}
|
|
- List<JSONObject> data = duanJUReportService.getViodeoList(requestMap);
|
|
|
|
- return Result.OK(data);
|
|
|
|
|
|
+ return duanJUReportService.getViodeoListByPage(requestMap, pageNo, pageSize);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
}
|
|
}
|