|
@@ -306,7 +306,7 @@ public class CoreServiceImpl implements CoreService {
|
|
|
if (currentTime.isBefore(pushTime.minusMinutes(20))) {
|
|
|
return false;
|
|
|
}
|
|
|
- if (currentTime.isAfter(pushTime.plusMinutes(600))) {
|
|
|
+ if (currentTime.isAfter(pushTime.plusMinutes(360))) {
|
|
|
return false;
|
|
|
}
|
|
|
} else if (StringUtils.isNotEmpty(planAccount.getPublishWindowStart())
|
|
@@ -405,14 +405,19 @@ public class CoreServiceImpl implements CoreService {
|
|
|
|
|
|
|
|
|
@Override
|
|
|
- public void core() {
|
|
|
- List<PlanAccount> planAccounts = planAccountService.getNormalPlanAccount();
|
|
|
+ public void core(String param) {
|
|
|
+ List<PlanAccount> planAccounts;
|
|
|
+ if (StringUtils.isEmpty(param)) {
|
|
|
+ planAccounts = planAccountService.getNormalPlanAccount();
|
|
|
+ } else {
|
|
|
+ planAccounts = planAccountService.getPlanAccount(param);
|
|
|
+ }
|
|
|
if (CollectionUtils.isEmpty(planAccounts)) {
|
|
|
return;
|
|
|
}
|
|
|
for (PlanAccount planAccount : planAccounts) {
|
|
|
boolean flag = checkPlanAccount(planAccount);
|
|
|
- if (!flag) {
|
|
|
+ if (!flag && StringUtils.isEmpty(param)) {
|
|
|
continue;
|
|
|
}
|
|
|
//获取待排序数据 数量不足会返回空list
|