Merge branch 'wyp/1010-feishu-publish' of Server/long-article-recommend into master

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/dto/NotPublishPlan.java

@@ -11,5 +11,5 @@ public class NotPublishPlan {
 
     private String planName;
 
-    private String publishWindowStart;
+    private String publishPushTime;
 }

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/XxlJobService.java

@@ -28,10 +28,10 @@ public class XxlJobService {
             Long now = System.currentTimeMillis();
             int nowHour = DateUtils.getHourByTimestamp(now / 1000);
             int nowMinute = DateUtils.getMinuteByTimestamp(now / 1000);
-            if (!StringUtils.hasText(publishPlan.getPublishWindowStart())) {
+            if (!StringUtils.hasText(publishPlan.getPublishPushTime())) {
                 continue;
             }
-            LocalTime time = LocalTime.parse(publishPlan.getPublishWindowStart());
+            LocalTime time = LocalTime.parse(publishPlan.getPublishPushTime());
             int planHour = time.getHour();
             int planMinute = time.getMinute();
             if (nowHour - planHour == 1 && nowMinute > planMinute) {
@@ -48,7 +48,7 @@ public class XxlJobService {
                 "发布计划超1H未发送完成\n"
                         + "发布计划ID: " + publishPlan.getPlanId() + "\n"
                         + "发布计划名称: " + publishPlan.getPlanName() + "\n"
-                        + "发布时间: " + publishPlan.getPublishWindowStart() + "\n"
+                        + "发布时间: " + publishPlan.getPublishPushTime() + "\n"
                         + "<at user_id=\"all\">所有人</at> ");
     }
 

long-article-recommend-service/src/main/resources/mapper/aigc/AigcBaseMapper.xml

@@ -68,7 +68,7 @@
         SELECT
             plan.id as planId,
             plan.NAME as planName,
-            setting.publish_window_start
+            setting.publish_push_time
         FROM
             publish_plan plan
                 JOIN publish_plan_stat stat ON plan.id = stat.plan_id