|
@@ -5,9 +5,8 @@ import cn.com.ctop.common.module.utils.QueryGenerator;
|
|
|
import cn.com.ctop.kuaishou.modules.report.entity.EtlKuaiShouGroupDailyReport;
|
|
|
import cn.com.ctop.kuaishou.modules.report.service.IEtlKuaiShouGroupDailyReportService;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
+import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
-import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -19,7 +18,15 @@ import org.jeecgframework.poi.excel.entity.ExportParams;
|
|
|
import org.jeecgframework.poi.excel.entity.ImportParams;
|
|
|
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.web.bind.annotation.*;
|
|
|
+import org.springframework.web.bind.annotation.DeleteMapping;
|
|
|
+import org.springframework.web.bind.annotation.GetMapping;
|
|
|
+import org.springframework.web.bind.annotation.PostMapping;
|
|
|
+import org.springframework.web.bind.annotation.PutMapping;
|
|
|
+import org.springframework.web.bind.annotation.RequestBody;
|
|
|
+import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
+import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
+import org.springframework.web.bind.annotation.RequestParam;
|
|
|
+import org.springframework.web.bind.annotation.RestController;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
@@ -43,7 +50,7 @@ import java.util.Map;
|
|
|
@Slf4j
|
|
|
@Api(tags = "快手组日报数据清洗")
|
|
|
@RestController
|
|
|
-@RequestMapping("/group/etlKuaiShouGroupDailyReport")
|
|
|
+@RequestMapping("/etl/kuaiShouGroupDailyReport")
|
|
|
public class EtlKuaiShouGroupDailyReportController {
|
|
|
@Autowired
|
|
|
private IEtlKuaiShouGroupDailyReportService etlKuaiShouGroupDailyReportService;
|
|
@@ -59,18 +66,15 @@ public class EtlKuaiShouGroupDailyReportController {
|
|
|
*/
|
|
|
@AutoLog(value = "快手组日报数据清洗-分页列表查询")
|
|
|
@ApiOperation(value = "快手组日报数据清洗-分页列表查询", notes = "快手组日报数据清洗-分页列表查询")
|
|
|
- @GetMapping(value = "/list")
|
|
|
- public Result<IPage<EtlKuaiShouGroupDailyReport>> queryPageList(EtlKuaiShouGroupDailyReport etlKuaiShouGroupDailyReport,
|
|
|
- @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
|
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
|
- HttpServletRequest req) {
|
|
|
- Result<IPage<EtlKuaiShouGroupDailyReport>> result = new Result<>();
|
|
|
- QueryWrapper<EtlKuaiShouGroupDailyReport> queryWrapper = QueryGenerator.initQueryWrapper(etlKuaiShouGroupDailyReport, req.getParameterMap());
|
|
|
- Page<EtlKuaiShouGroupDailyReport> page = new Page<EtlKuaiShouGroupDailyReport>(pageNo, pageSize);
|
|
|
- IPage<EtlKuaiShouGroupDailyReport> pageList = etlKuaiShouGroupDailyReportService.page(page, queryWrapper);
|
|
|
- result.setSuccess(true);
|
|
|
- result.setResult(pageList);
|
|
|
- return result;
|
|
|
+ @PostMapping(value = "/list")
|
|
|
+ public Result<Object> queryPageList(@RequestBody JSONObject request) {
|
|
|
+ try {
|
|
|
+ return etlKuaiShouGroupDailyReportService.queryPageList(request);
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.error("查询异常,", e.getMessage());
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ return Result.error("查询失败");
|
|
|
}
|
|
|
|
|
|
/**
|