Merge branch 'dev-xym-update-message' of Server/long-article-recommend into master

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

@@ -50,18 +50,12 @@ public class MessageCallbackCustomer implements MessageListener {
             insertPushMessageCallback.setVideoId(replyInfo.getMiniVideoId());
             insertList.add(insertPushMessageCallback);
         }
-        try {
-            pushMessageCallbackMapper.insertList(insertList);
-        } catch (Exception e) {
-            log.error("PushMessageCallback pushMessageCallbackMapper insert pushMessageCallback={}, error={}", pushMessageCallback, e.getMessage());
-            return Action.ReconsumeLater;
-        }
         try {
             newPushMessageCallbackMapper.insertList(insertList);
         } catch (Exception e) {
             log.error("PushMessageCallback newPushMessageCallbackMapper insert pushMessageCallback={}, error={}", pushMessageCallback, e.getMessage());
+            return Action.ReconsumeLater;
         }
         return Action.CommitMessage;
-
     }
 }

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

@@ -11,6 +11,7 @@ import com.tzld.longarticle.recommend.server.common.enums.recommend.FeishuRobotI
 import com.tzld.longarticle.recommend.server.mapper.aigc.AigcBaseMapper;
 import com.tzld.longarticle.recommend.server.mapper.crawler.CrawlerBaseMapper;
 import com.tzld.longarticle.recommend.server.mapper.crawler.PushMessageCallbackMapper;
+import com.tzld.longarticle.recommend.server.mapper.growth.NewPushMessageCallbackMapper;
 import com.tzld.longarticle.recommend.server.model.dto.AccountTypeFansDTO;
 import com.tzld.longarticle.recommend.server.model.dto.NotPublishPlan;
 import com.tzld.longarticle.recommend.server.model.entity.aigc.PublishAccount;
@@ -71,7 +72,7 @@ public class XxlJobService {
     @Autowired
     private LongArticlesRootSourceIdRepository longArticlesRootSourceIdRepository;
     @Autowired
-    private PushMessageCallbackMapper pushMessageCallbackMapper;
+    private NewPushMessageCallbackMapper newPushMessageCallbackMapper;
     @Autowired
     private ODPSManager odpsManager;
     @Autowired
@@ -330,13 +331,13 @@ public class XxlJobService {
         long ytdEndTimestamp = endTimestamp - MILLISECOND_DAY;
         PushMessageCallbackExample example = new PushMessageCallbackExample();
         example.createCriteria().andCreateTimeBetween(new Date(startTimestamp), new Date(endTimestamp));
-        long nowCount = pushMessageCallbackMapper.countByExample(example);
+        long nowCount = newPushMessageCallbackMapper.countByExample(example);
         if (nowCount == 0) {
             LarkRobotUtil.sendMessage("最近一小时回调消息为0");
         }
         PushMessageCallbackExample ytdExample = new PushMessageCallbackExample();
         ytdExample.createCriteria().andCreateTimeBetween(new Date(ytdStartTimestamp), new Date(ytdEndTimestamp));
-        long ydtCount = pushMessageCallbackMapper.countByExample(example);
+        long ydtCount = newPushMessageCallbackMapper.countByExample(example);
         if (nowCount + 1000 < ydtCount) {
             if (ydtCount == 0) {
                 ydtCount = 1L;
@@ -372,7 +373,7 @@ public class XxlJobService {
 
             PushMessageCallbackExample example = new PushMessageCallbackExample();
             example.createCriteria().andCreateTimeBetween(startTime, endTime);
-            long mysqlCount = pushMessageCallbackMapper.countByExample(example);
+            long mysqlCount = newPushMessageCallbackMapper.countByExample(example);
             if (mysqlCount == 0) {
                 break;
             }
@@ -388,7 +389,7 @@ public class XxlJobService {
                 LarkRobotUtil.sendMessage("数量异常" + pt + "\n mysql数量：" + mysqlCount + "\n hive数量：" + hiveCount);
                 return ReturnT.FAIL;
             }
-            pushMessageCallbackMapper.deleteByExample(example);
+            newPushMessageCallbackMapper.deleteByExample(example);
         }
         return ReturnT.SUCCESS;
     }