|
@@ -285,7 +285,7 @@ public class CoreServiceImpl implements CoreService {
|
|
|
return currentTime.isAfter(LocalTime.parse(startWindow)) && currentTime.isBefore(LocalTime.parse(endWindow));
|
|
|
}
|
|
|
|
|
|
- private boolean checkPlanAccount(PlanAccount planAccount) {
|
|
|
+ public boolean checkPlanAccount(PlanAccount planAccount) {
|
|
|
boolean isGzhGroupPushPlan = Objects.nonNull(planAccount.getPushType())
|
|
|
&& (PublishGzhPushTypeEnum.auto_group_publish.getVal().equals(planAccount.getPushType())
|
|
|
|| PublishGzhPushTypeEnum.batch_group_publish.getVal().equals(planAccount.getPushType()));
|
|
@@ -306,9 +306,9 @@ public class CoreServiceImpl implements CoreService {
|
|
|
if (currentTime.isBefore(pushTime.minusMinutes(120))) {
|
|
|
return false;
|
|
|
}
|
|
|
- if (currentTime.isAfter(pushTime.plusMinutes(780))) {
|
|
|
- return false;
|
|
|
- }
|
|
|
+// if (currentTime.isAfter(pushTime.plusMinutes(780))) {
|
|
|
+// return false;
|
|
|
+// }
|
|
|
} else if (StringUtils.isNotEmpty(planAccount.getPublishWindowStart())
|
|
|
&& StringUtils.isNotEmpty(planAccount.getPublishWindowEnd())) {
|
|
|
if (!effectiveTime(planAccount.getPublishWindowStart(), planAccount.getPublishWindowEnd(),
|