Merge branch 'feature/luojunhui-20250708-fans-stat' of luojunhui/LongArticlesJob into master

fwh_data_manager.py

@@ -8,10 +8,11 @@ if __name__ == '__main__':
     fwh_group_publish_record_manager = FwhGroupPublishRecordManager()
     fwh_group_publish_record_manager.deal()
 
-    # 2. 保存数据到数据库
+    # 2. 监测报警
+    fwh_group_publish_monitor = FwhGroupPublishMonitor()
+    fwh_group_publish_monitor.deal()
+
+    # 3. 保存数据到数据库
     save_fwh_data_to_database = SaveFwhDataToDatabase()
     save_fwh_data_to_database.deal()
 
-    # 3. 监测报警
-    fwh_group_publish_monitor = FwhGroupPublishMonitor()
-    fwh_group_publish_monitor.deal()

tasks/data_tasks/fwh_data_recycle.py

@@ -429,6 +429,7 @@ class FwhGroupPublishMonitor(FwhDataRecycle):
         fetch_response = self.piaoquan_client.fetch(
             fetch_query, cursor_type=DictCursor, params=(gh_id, date_string)
         )
+        print(fetch_response[0])
         return fetch_response[0] if fetch_response else None
 
     def deal(self, date_string: str = datetime.today().strftime("%Y-%m-%d")):
@@ -483,12 +484,13 @@ class FwhGroupPublishMonitor(FwhDataRecycle):
             # # 获取剩余可发文次数
             # remain_publish_times = self.get_remain_publish_times(gh_id)
 
-            remain_fans, remain_publish_times = self.get_remain_fans_and_publish_times(
+            detail = self.get_remain_fans_and_publish_times(
                 gh_id, date_string
             )
+            remain_fans, remain_publish_times = detail['fans_before_publish'], detail['publish_times_before_publish']
             temp = {
                 "account_name": account_name,
-                "rest_publish_times": int(remain_publish_times + sent_fans),
+                "rest_publish_times": int(int(remain_publish_times) + sent_fans),
                 "rest_publish_fans": int(remain_fans),
                 "remain_days": int(remain_days),
                 "sent_fans": int(sent_fans),