zhangyong 4 ماه پیش
والد
کامیت
26d8d89302
7فایلهای تغییر یافته به همراه38 افزوده شده و 10 حذف شده
  1. 8 8
      common/sql_help.py
  2. 7 0
      job_keyword_dy.py
  3. 7 0
      job_keyword_ks.py
  4. 7 0
      job_keyword_sph.py
  5. 1 1
      job_pl_dy.py
  6. 1 1
      job_pl_ks.py
  7. 7 0
      job_sph.py

+ 8 - 8
common/sql_help.py

@@ -79,7 +79,7 @@ class sqlCollect():
 
     @classmethod
     def get_feed_count(cls, channel):
-        sql = """SELECT count(0) FROM machine_making_data where channel = %s and  DATE(data_time) = CURRENT_DATE AND HOUR(data_time) < HOUR(NOW());"""
+        sql = """SELECT count(0) FROM machine_making_data where channel = %s and  DATE(data_time) = CURRENT_DATE AND HOUR(data_time) <= HOUR(NOW());"""
         count = MysqlHelper.get_values(sql, (str(channel)))
         return count
 
@@ -98,43 +98,43 @@ class sqlCollect():
 
     @classmethod
     def get_bygj_count(cls, name):
-        sql = """SELECT count(0) FROM machine_making_data where name = %s and task_mark = "搬运工具" and  DATE(data_time) = CURRENT_DATE AND HOUR(data_time) < HOUR(NOW());"""
+        sql = """SELECT count(0) FROM machine_making_data where name = %s and task_mark = "搬运工具" and  DATE(data_time) = CURRENT_DATE AND HOUR(data_time) <= HOUR(NOW());"""
         count = MysqlHelper.get_values(sql, (str(name)))
         return count
 
     @classmethod
     def get_bygj_all_count(cls):
-        sql = """SELECT count(0) FROM machine_making_data where task_mark = %s  and  DATE(data_time) = CURRENT_DATE AND HOUR(data_time) < HOUR(NOW());"""
+        sql = """SELECT count(0) FROM machine_making_data where task_mark = %s  and  DATE(data_time) = CURRENT_DATE AND HOUR(data_time) <= HOUR(NOW());"""
         count = MysqlHelper.get_values(sql, (str("搬运工具")))
         return count
 
     @classmethod
     def get_ytd_bygj_count(cls, name):
-        sql = """SELECT count(0) FROM machine_making_data where name = %s and task_mark = "搬运工具" and data_time >= CURRENT_DATE - INTERVAL 1 DAY AND data_time < CURRENT_DATE - INTERVAL 1 DAY + INTERVAL HOUR(NOW()) HOUR;"""
+        sql = """SELECT count(0) FROM machine_making_data where name = %s and task_mark = "搬运工具" and data_time >= CURRENT_DATE - INTERVAL 1 DAY AND data_time <= CURRENT_DATE - INTERVAL 1 DAY + INTERVAL HOUR(NOW()) HOUR;"""
         count = MysqlHelper.get_values(sql, (str(name)))
         return count
 
     @classmethod
     def get_channel_count(cls, channel, name):
-        sql = """SELECT count(0) FROM machine_making_data where channel = %s and name = %s and  DATE(data_time) = CURRENT_DATE AND HOUR(data_time) < HOUR(NOW());"""
+        sql = """SELECT count(0) FROM machine_making_data where channel = %s and name = %s and  DATE(data_time) = CURRENT_DATE AND HOUR(data_time) <= HOUR(NOW());"""
         count = MysqlHelper.get_values(sql, (str(channel),name))
         return count
 
     @classmethod
     def get_ytd_channel_count(cls, channel, name):
-        sql = """SELECT count(0) FROM machine_making_data where channel = %s and name = %s and data_time >= CURRENT_DATE - INTERVAL 1 DAY AND data_time < CURRENT_DATE - INTERVAL 1 DAY + INTERVAL HOUR(NOW()) HOUR;"""
+        sql = """SELECT count(0) FROM machine_making_data where channel = %s and name = %s and data_time >= CURRENT_DATE - INTERVAL 1 DAY AND data_time <= CURRENT_DATE - INTERVAL 1 DAY + INTERVAL HOUR(NOW()) HOUR;"""
         count = MysqlHelper.get_values(sql, (str(channel), name))
         return count
 
     @classmethod
     def get_name_count(cls, name):
-        sql = """SELECT count(0) FROM machine_making_data where name = %s and  DATE(data_time) = CURRENT_DATE AND HOUR(data_time) < HOUR(NOW());"""
+        sql = """SELECT count(0) FROM machine_making_data where name = %s and  DATE(data_time) = CURRENT_DATE AND HOUR(data_time) <= HOUR(NOW());"""
         count = MysqlHelper.get_values(sql, (str(name)))
         return count
 
     @classmethod
     def get_ytd_name_count(cls, name):
-        sql = """SELECT count(0) FROM machine_making_data where name = %s and  data_time >= CURRENT_DATE - INTERVAL 1 DAY AND data_time < CURRENT_DATE - INTERVAL 1 DAY + INTERVAL HOUR(NOW()) HOUR;"""
+        sql = """SELECT count(0) FROM machine_making_data where name = %s and  data_time >= CURRENT_DATE - INTERVAL 1 DAY AND data_time <= CURRENT_DATE - INTERVAL 1 DAY + INTERVAL HOUR(NOW()) HOUR;"""
         count = MysqlHelper.get_values(sql, (str(name)))
         return count
 

+ 7 - 0
job_keyword_dy.py

@@ -1,6 +1,7 @@
 
 import time
 from common import Material
+from common.sql_help import sqlCollect
 
 from video_rewriting.video_processor import VideoProcessor
 def video_task_start():
@@ -8,6 +9,12 @@ def video_task_start():
     data = Material.feishu_list()[14]
     while True:
         try:
+            count = sqlCollect.get_channel_count("抖音搜索", "品类关键词搜索")
+            count = int(count[0][0])
+            if count >= 860:
+                print(f"到了限制数{count}")
+                time.sleep(3600)
+                continue
             print("开始执行任务")
             mark = VideoProcessor.main(data)
             print(f"返回用户名: {mark}")

+ 7 - 0
job_keyword_ks.py

@@ -1,6 +1,7 @@
 
 import time
 from common import Material
+from common.sql_help import sqlCollect
 
 from video_rewriting.video_processor import VideoProcessor
 def video_task_start():
@@ -8,6 +9,12 @@ def video_task_start():
     data = Material.feishu_list()[15]
     while True:
         try:
+            count = sqlCollect.get_channel_count("快手搜索", "品类关键词搜索")
+            count = int(count[0][0])
+            if count >= 590:
+                print(f"到了限制数{count}")
+                time.sleep(3600)
+                continue
             print("开始执行任务")
             mark = VideoProcessor.main(data)
             print(f"返回用户名: {mark}")

+ 7 - 0
job_keyword_sph.py

@@ -1,6 +1,7 @@
 
 import time
 from common import Material
+from common.sql_help import sqlCollect
 
 from video_rewriting.video_processor import VideoProcessor
 def video_task_start():
@@ -8,6 +9,12 @@ def video_task_start():
     data = Material.feishu_list()[16]
     while True:
         try:
+            count = sqlCollect.get_channel_count("视频号搜索", "品类关键词搜索")
+            count = int(count[0][0])
+            if count >= 100:
+                print(f"到了限制数{count}")
+                time.sleep(3600)
+                continue
             print("开始执行任务")
             mark = VideoProcessor.main(data)
             print(f"返回用户名: {mark}")

+ 1 - 1
job_pl_dy.py

@@ -9,7 +9,7 @@ def video_task_start():
     data = Material.feishu_list()[10]
     while True:
         try:
-            count = sqlCollect.get_feed_count("抖音品类账号")
+            count =  sqlCollect.get_name_count("抖音品类账号")
             count = int(count[0][0])
             if count >= 470:
                 print(f"到了限制数{count}")

+ 1 - 1
job_pl_ks.py

@@ -9,7 +9,7 @@ def video_task_start():
     data = Material.feishu_list()[13]
     while True:
         try:
-            count = sqlCollect.get_feed_count("快手品类账号")
+            count = sqlCollect.get_name_count("快手品类账号")
             count = int(count[0][0])
             if count >= 560:
                 print(f"到了限制数{count}")

+ 7 - 0
job_sph.py

@@ -1,6 +1,7 @@
 
 import time
 from common import Material
+from common.sql_help import sqlCollect
 
 from video_rewriting.video_processor import VideoProcessor
 def video_task_start():
@@ -8,6 +9,12 @@ def video_task_start():
     data = Material.feishu_list()[11]
     while True:
         try:
+            count = sqlCollect.get_name_count("视频号品类账号")
+            count = int(count[0][0])
+            if count >= 80:
+                print(f"到了限制数{count}")
+                time.sleep(3600)
+                continue
             print("开始执行任务")
             mark = VideoProcessor.main(data)
             print(f"返回用户名: {mark}")