Merge branch 'wyp/1014-data-export' of Server/long-article-recommend into master

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/aigc/AigcBaseMapper.java

@@ -20,7 +20,7 @@ public interface AigcBaseMapper {
 
     List<CrawlerPlan> getCrawlerPlanByPlanIds(List<String> planIds);
 
-    List<NotPublishPlan> getNotPublishPlan();
+    List<NotPublishPlan> getNotPublishPlan(Long todayStart);
 
     Integer getPublishPlanPushType(String planId);
 

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

@@ -552,6 +552,10 @@ public class DataDashboardService {
             ResponseEntity<String> response = restTemplate.exchange(String.format("https://open.feishu.cn/open-apis/sheets/v2/spreadsheets/%s/values_prepend",
                             sheetToken),
                     HttpMethod.POST, postEntity, String.class);
+            JSONObject responseJSON = JSONObject.parseObject(response.getBody());
+            if(0 != responseJSON.getInteger("code")) {
+                log.error("doSendFeishuSheet write error :{}", responseJSON.getString("msg"));
+            }
             startRow += partition.size();
         }
 //        // 合并单元格

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

@@ -28,9 +28,10 @@ public class XxlJobService {
 
     @XxlJob("checkPublishPlan")
     public ReturnT<String> checkPublishPlan(String param) {
-        List<NotPublishPlan> notPublishPlan = aigcBaseMapper.getNotPublishPlan();
+        Long todayStart = DateUtils.getTodayStart();
+        List<NotPublishPlan> notPublishPlan = aigcBaseMapper.getNotPublishPlan(todayStart);
         for (NotPublishPlan publishPlan : notPublishPlan) {
-            Long now = System.currentTimeMillis();
+            long now = System.currentTimeMillis();
             int nowHour = DateUtils.getHourByTimestamp(now / 1000);
             int nowMinute = DateUtils.getMinuteByTimestamp(now / 1000);
             if (!StringUtils.hasText(publishPlan.getPublishPushTime())) {

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

@@ -72,14 +72,14 @@
             stat.today_expect_publish_count as expectCount,
             stat.today_publish_count as publishCount,
             setting.publish_push_time as publishPushTime
-        FROM
-            publish_plan plan
+        FROM publish_plan plan
         JOIN publish_plan_stat stat ON plan.id = stat.plan_id
         JOIN publish_plan_setting setting ON plan.id = setting.plan_id
         WHERE
             stat.today_expect_publish_count > stat.today_publish_count
           AND plan.plan_status = 1
           AND setting.push_type = 2
+          and plan.create_timestamp < #{todayStart}
     </select>
 
     <select id="getPublishPlanPushType" resultType="java.lang.Integer">
@@ -105,6 +105,7 @@
                record.plan_id as producePlanId
         from produce_plan_exe_record record
         join produce_plan_module_output output on record.plan_exe_id = output.plan_exe_id and output.produce_module_type = 3
+        join publish_content pc on pc.source_id = record.plan_exe_id and pc.status = 2
         where output.output in
         <foreach collection="titleList" item="item" open="(" close=")" separator=",">
             #{item}