소스 검색

首頁,头条 项目列表接口重构

zhaoxian 2 년 전
부모
커밋
06e51b9541

+ 8 - 8
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/controller/KuaiShouMaterialStareController.java

@@ -140,14 +140,14 @@ public class KuaiShouMaterialStareController {
                                                             @RequestParam(name = "endTime") String endTime,
                                                             @RequestParam(name = "userId") String userId) {
 
-        return materialStareService.getKuaiShouOperateProjectInfo(pageNum, pageSize, mediaType, startTime, endTime, userId);
-//        try {
-//            List<KuaiShouOperateProjectVo> list = materialStareService.getOperateProjectInfo(pageNum, pageSize, mediaType, startTime, endTime, userId);
-//            return Result.successMsg("运营项目列表数据查询成功。", new PageInfo<>(list));
-//        } catch (ParseException e) {
-//            e.printStackTrace();
-//        }
-//        return Result.error("查询失败");
+//        return materialStareService.getKuaiShouOperateProjectInfo(pageNum, pageSize, mediaType, startTime, endTime, userId);
+        try {
+            List<KuaiShouOperateProjectVo> list = materialStareService.getOperateProjectInfo(pageNum, pageSize, mediaType, startTime, endTime, userId);
+            return Result.successMsg("运营项目列表数据查询成功。", new PageInfo<>(list));
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return Result.error("查询失败");
     }
 
     /**

+ 6 - 0
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/MaterialStareServiceImpl.java

@@ -1811,6 +1811,9 @@ public class MaterialStareServiceImpl implements MaterialStareService {
             //头条
             if (mediaType.equals("1")) {
                 List<Long> projectIds = materialStareMapper.getBytedanceProjectList(parameterMap);
+                if(Check.isNull(projectIds)){
+                    return listOperate;
+                }
                 parameterMap.put("projectIds", projectIds);
                 PageHelper.startPage(pageNum, pageSize);
                 if (startDate == now || entDate == now) {
@@ -1824,6 +1827,9 @@ public class MaterialStareServiceImpl implements MaterialStareService {
             //快手
             if (mediaType.equals("2")) {
                 List<Long> projectIds = materialStareMapper.getKuaishouProjectList(parameterMap);
+               if(Check.isNull(projectIds)){
+                   return listOperate;
+               }
                 parameterMap.put("projectIds", projectIds);
                 if (startDate == now || entDate == now) {
                     parameterMap.put("tableName", "application.kuaishou_account_report_hourly_dw");