Browse Source

修改时间限制,增加制定账号

xueyiming 7 months ago
parent
commit
7e389419c0

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/job/PlanAccountJob.java

@@ -41,7 +41,7 @@ public class PlanAccountJob {
     @XxlJob("corePlanAccountJob")
     public ReturnT<String> corePlanAccount(String param) {
         try {
-            coreService.core();
+            coreService.core(param);
         } catch (Exception e) {
             LarkRobotUtil.sendMessage("长文系统核心流程异常,请及时查看,@薛一鸣");
             log.error("corePlanAccountJob error", e);

+ 1 - 1
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/CoreService.java

@@ -6,7 +6,7 @@ public interface CoreService {
 
     void matchContent();
 
-    void core();
+    void core(String param);
 
     void getPushStatus();
 }

+ 2 - 0
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/PlanAccountService.java

@@ -15,6 +15,8 @@ public interface PlanAccountService {
 
     List<PlanAccount> getNormalPlanAccount();
 
+    List<PlanAccount> getPlanAccount(String accountId);
+
     List<Plan> getPlanList();
 
     void delPlan(String planId);

+ 9 - 4
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/CoreServiceImpl.java

@@ -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

+ 7 - 0
long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/PlanAccountServiceImpl.java

@@ -67,6 +67,13 @@ public class PlanAccountServiceImpl implements PlanAccountService {
         return planAccountMapper.selectByExample(example);
     }
 
+    public List<PlanAccount> getPlanAccount(String accountId) {
+        PlanAccountExample example = new PlanAccountExample();
+        example.createCriteria().andCreateTimeGreaterThan(DateUtil.getThatDayDate())
+                .andAccountIdEqualTo(accountId);
+        return planAccountMapper.selectByExample(example);
+    }
+
     public List<Plan> getPlanList() {
         PlanExample example = new PlanExample();
         List<Plan> plans = planMapper.selectByExample(example);