浏览代码

数据查看-折线图时间点排序

yangzian 4 年之前
父节点
当前提交
cc76170075

+ 3 - 0
jeecg-boot-bytedance/src/main/java/org/jeecg/modules/bytedance/advertise/service/impl/AiBytedanceAdvertiserStrategyServiceImpl.java

@@ -1385,6 +1385,9 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
        CtopOauthToken token = tokenService.getOauthTokenByAccountId(accountId);
        CtopOauthToken token = tokenService.getOauthTokenByAccountId(accountId);
         //查询定向包信息
         //查询定向包信息
        Result list = marketingService.getAudiencePackage(token,landingType,deliveryRange);
        Result list = marketingService.getAudiencePackage(token,landingType,deliveryRange);
+       if (!list.isSuccess()){
+           return Result.errorMsg(list.getMessage());
+       }
        //处理返回结果
        //处理返回结果
        JSONObject jsonObject = (JSONObject)list.getResult();
        JSONObject jsonObject = (JSONObject)list.getResult();
        JSONArray array = jsonObject.getJSONArray("audience_packages");
        JSONArray array = jsonObject.getJSONArray("audience_packages");

+ 7 - 1
jeecg-boot-bytedance/src/main/java/org/jeecg/modules/bytedance/report/service/impl/BytedanceAdvertiserHourlyReportServiceImpl.java

@@ -11,6 +11,7 @@ import org.jeecg.modules.bytedance.advertise.entity.ByteDanceAdvertisePlan;
 import org.jeecg.modules.bytedance.advertise.entity.RuleDataAccount;
 import org.jeecg.modules.bytedance.advertise.entity.RuleDataAccount;
 import org.jeecg.modules.bytedance.advertise.mapper.AiBytedanceAdvertiserStrategyMapper;
 import org.jeecg.modules.bytedance.advertise.mapper.AiBytedanceAdvertiserStrategyMapper;
 import org.jeecg.modules.bytedance.advertise.mapper.ByteDanceAdvertisePlanMapper;
 import org.jeecg.modules.bytedance.advertise.mapper.ByteDanceAdvertisePlanMapper;
+import org.jeecg.modules.bytedance.advertise.vo.IndustryVo;
 import org.jeecg.modules.bytedance.common.utils.Check;
 import org.jeecg.modules.bytedance.common.utils.Check;
 import org.jeecg.modules.bytedance.report.entity.BytedanceAdvertiserHourlyReport;
 import org.jeecg.modules.bytedance.report.entity.BytedanceAdvertiserHourlyReport;
 import org.jeecg.modules.bytedance.report.entity.vo.ReportCostVo;
 import org.jeecg.modules.bytedance.report.entity.vo.ReportCostVo;
@@ -206,7 +207,12 @@ public class BytedanceAdvertiserHourlyReportServiceImpl extends ServiceImpl<Byte
                 list.add(vo);
                 list.add(vo);
             });
             });
         }
         }
-         Collections.sort(list,Comparator.comparing(ReportCostVo::getTime));
+        //排序
+        if ("0".equals(daysBetween)){
+            list.sort((ReportCostVo vo1, ReportCostVo vo2) -> Integer.valueOf(vo1.getTime()).compareTo(Integer.valueOf(vo2.getTime())));
+        }else {
+            Collections.sort(list,Comparator.comparing(ReportCostVo::getTime));
+        }
         return list;
         return list;
     }
     }