wangkun 2 년 전
부모
커밋
5d8060b9d5
3개의 변경된 파일31개의 추가작업 그리고 6개의 파일을 삭제
  1. 4 4
      main/demo.py
  2. 11 1
      main/feishu_lib.py
  3. 16 1
      main/run_bot.py

+ 4 - 4
main/demo.py

@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 # @Author: wangkun
 # @Time: 2022/8/10
-import datetime
 from main.feishu_lib import Feishu
 
 
 class Demo:
     @classmethod
     def demo1(cls):
-        sheet = Feishu.get_values_batch("bot", "weiqun", "3cd128")
+        Feishu.update_values('demo', 'kdjsfq', 'ad3b6d', 'F2:F2', [['2022/12/28 00:05:48']])
+        sheet = Feishu.get_values_batch("bot", "kdjsfq", "ad3b6d")
         # print(sheet[1])
         # 已下载表,最新一条视频抓取时间
         first_download_time = sheet[1][5]
@@ -16,5 +16,5 @@ class Demo:
 
 
 if __name__ == "__main__":
-    # Demo.demo1()
-    print(3600 * (24-datetime.datetime.now().hour))
+    Demo.demo1()
+    # print(3600 * (24-datetime.datetime.now().hour))

+ 11 - 1
main/feishu_lib.py

@@ -48,6 +48,8 @@ class Feishu:
     crawler_zongjiao = 'https://w42nne6hzg.feishu.cn/sheets/shtcn73NW0CyoOeF21HWO15KBsb?'
     # 好看视频
     crawler_haokan = 'https://w42nne6hzg.feishu.cn/sheets/shtcnaYz8Nhv8q6DbWtlL6rMEBd'
+    # 看到就是福气
+    crawler_kandaojiushifuqi = 'https://w42nne6hzg.feishu.cn/sheets/shtcnEokBkIjOUPAk8vbbPKnXgb'
 
     # 飞书路径token
     @classmethod
@@ -91,6 +93,8 @@ class Feishu:
             return 'shtcn73NW0CyoOeF21HWO15KBsb'
         elif crawler == 'haokan':
             return 'shtcnaYz8Nhv8q6DbWtlL6rMEBd'
+        elif crawler == 'kdjsfq':
+            return 'shtcnEokBkIjOUPAk8vbbPKnXgb'
 
     # 获取飞书api token
     @classmethod
@@ -497,6 +501,12 @@ class Feishu:
                 users = "\n<at id=" + str(cls.get_userid(log_type, "wangkun")) + "></at> <at id=" + str(
                     cls.get_userid(log_type, "xinxin")) + "></at>\n"
 
+            elif crawler == "kdjsfq":
+                content = "看到就是福气_已下载表"
+                sheet_url = "https://w42nne6hzg.feishu.cn/sheets/shtcnEokBkIjOUPAk8vbbPKnXgb?sheet=ad3b6d"
+                users = "\n<at id=" + str(cls.get_userid(log_type, "wangkun")) + "></at> <at id=" + str(
+                    cls.get_userid(log_type, "xinxin")) + "></at>\n"
+
             elif crawler == "gzh":
                 content = "公众号爬虫表"
                 sheet_url = "https://w42nne6hzg.feishu.cn/sheets/shtcnexNXnpDLHhARw0QdiwbYuA"
@@ -579,7 +589,7 @@ class Feishu:
 
 
 if __name__ == "__main__":
-    Feishu.bot("bot", "shipinhao_follow", "别紧张,还是我,测试一下")
+    Feishu.bot("bot", "kdjsfq", "别紧张,还是我,测试一下")
     # print(Feishu.get_userid("shipinhao", "lijinchao"))
     
     pass

+ 16 - 1
main/run_bot.py

@@ -90,6 +90,12 @@ class Bot:
                 first_download_time = sheet[1][5]
                 first_download_time = int(time.mktime(time.strptime(first_download_time, "%Y/%m/%d %H:%M:%S")))
 
+            elif crawler == 'kdjsfq':
+                sheet = Feishu.get_values_batch(log_type, "kdjsfq", "ad3b6d")
+                # 已下载表,最新一条视频抓取时间
+                first_download_time = sheet[1][5]
+                first_download_time = int(time.mktime(time.strptime(first_download_time, "%Y/%m/%d %H:%M:%S")))
+
             elif crawler == "kanyikan":
                 sheet = Feishu.get_values_batch(log_type, "kanyikan", "20ce0c")
                 # 已下载表,最新一条视频抓取时间
@@ -244,6 +250,12 @@ class Bot:
                 Feishu.bot(log_type, crawler, "岁岁年年迎福气_已下载表,超过24小时没有新视频入库了😤")
                 Common.logger(log_type).warning("岁岁年年迎福气_已下载表,超过24小时没有新视频入库了😤\n")
 
+            # 看到就是福气
+            elif crawler == "kdjsfq" and (
+                    int(time.time()) - int(cls.get_first_time(log_type, crawler)) > int(duration)):
+                Feishu.bot(log_type, crawler, "看到就是福气_已下载表,超过24小时没有新视频入库了😤")
+                Common.logger(log_type).warning("看到就是福气_已下载表,超过24小时没有新视频入库了😤\n")
+
             # 音乐相册爬虫报警
             elif crawler == "music_album" and (
                     int(time.time()) - cls.get_first_time(log_type, crawler) > int(duration)):
@@ -340,6 +352,9 @@ class Bot:
                 Common.logger("bot").info("监控岁岁年年迎福气已下载表")
                 Bot.robot_download_sheet("bot", "ssnnyfq", duration)
 
+                Common.logger("bot").info("监控看到就是福气已下载表")
+                Bot.robot_download_sheet("bot", "kdjsfq", duration)
+
                 Common.logger("bot").info("监控本山祝福已下载表")
                 Bot.robot_download_sheet("bot", "bszf", duration)
 
@@ -375,7 +390,7 @@ class Bot:
 
 if __name__ == "__main__":
 
-    # Bot.robot_download_sheet("bot", "shipinhao_follow", 1)
+    # Bot.robot_download_sheet("bot", "kdjsfq", 1)
     Bot.main()
 
     pass