Merge remote-tracking branch 'origin/master'

# Conflicts:
#	base/RedisPPData.py

base/BaseCore.py

@@ -241,7 +241,6 @@ class BaseCore:
         except :
             pass
 
-
     # 计算耗时
     def getTimeCost(self,start, end):
         seconds = int(end - start)
@@ -393,7 +392,7 @@ class BaseCore:
 
     # 从Redis的List中获取并移除一个元素
     def redicPullData(self,key):
-        item = self.r.lpop(key)
+        item = self.r.rpop(key)
         return item.decode() if item else None
 
     # 获得脚本进程PID
@@ -494,4 +493,27 @@ class BaseCore:
     def rePutIntoR(self,item):
         self.r.rpush('NewsEnterprise:gwqy_socialCode', item)
 
+    #增加计数器的值并返回增加后的值
+    def incrSet(self,key):
+        # 增加计数器的值并返回增加后的值
+        new_value = self.r.incr(key)
+        print("增加后的值：", new_value)
+        return new_value
+
+    #获取key剩余的过期时间
+    def getttl(self,key):
+        # 获取key的剩余过期时间
+        ttl = self.r.ttl(key)
+        print("剩余过期时间：", ttl)
+        # 判断key是否已过期
+        if ttl < 0:
+            # key已过期，将key的值重置为0
+            self.r.set(key, 0)
+            self.r.expire(key, 3600)
+            time.sleep(2)
+
+
+
+
+
 

base/RedisPPData.py

@@ -72,7 +72,7 @@ def NewsEnterprise_task():
 #企业公告
 def NoticeEnterprise():
     # 获取国内企业
-    gn_query = "select SocialCode from EnterpriseInfo where Place = '1' and SecuritiesCode is not null limit 10 "
+    gn_query = "select SocialCode from EnterpriseInfo where Place = '1' and SecuritiesCode is not null limit 1 "
     cursor.execute(gn_query)
     gn_result = cursor.fetchall()
     gn_social_list = [item[0] for item in gn_result]
@@ -95,14 +95,13 @@ def NoticeEnterprise_task():
 #企业年报
 def AnnualEnterprise():
     # 获取国内企业
-    gn_query = "select SocialCode from EnterpriseInfo where Place = '1' and SecuritiesCode is not null limit 10"
+    gn_query = "select SocialCode from EnterpriseInfo where Place = '1' and SecuritiesCode is not null"
     cursor.execute(gn_query)
     gn_result = cursor.fetchall()
     gn_social_list = [item[0] for item in gn_result]
     print('=======')
     for item in gn_social_list:
         r.rpush('AnnualEnterprise:gnqy_socialCode', item)
-
 #企业年报定时任务
 def AnnualEnterprise_task():
     # 实例化一个调度器
@@ -119,7 +118,7 @@ def AnnualEnterprise_task():
 #企业基本信息
 def BaseInfoEnterprise():
     # 获取国内企业
-    gn_query = "select SocialCode from EnterpriseInfo where Place = '1' limit 1 "
+    gn_query = "select SocialCode from EnterpriseInfo where Place = '1' limit 10 "
     cursor.execute(gn_query)
     gn_result = cursor.fetchall()
     gn_social_list = [item[0] for item in gn_result]
@@ -163,63 +162,38 @@ def weixin_task():
         print('定时采集异常', e)
         pass
 
-# 企业年报——雪球网
-def AnnualEnterpriseIPO():
-    # 获取国内上市企业
-    gn_query = "select SocialCode from EnterpriseInfo where Place = '1' and SecuritiesCode is not null and isIPO = 1 limit 10"
-    cursor.execute(gn_query)
-    gn_result = cursor.fetchall()
-    gn_social_list = [item[0] for item in gn_result]
-    print('=======')
-    for item in gn_social_list:
-        r.rpush('AnnualEnterprise:gnshqy_socialCode', item)
-
-
 ##福布斯=====从数据库中读取信息放入redis
 def FBS():
     # todo:调整为获取福布斯的数据库
-    gw_query = "select SocialCode from EnterpriseInfo where Place = '2'"
-    cursor.execute(gw_query)
-    gw_result = cursor.fetchall()
+    # gw_query = "select id from EnterpriseInfo where ext1='fbs2000' and ext2='1' and Place=2"
+    # cursor.execute(gw_query)
+    # gw_result = cursor.fetchall()
 
-    # #获取国内企业
-    gn_query = "select SocialCode from EnterpriseInfo where Place = '1'"
+    #获取国内企业
+    gn_query = "select id from EnterpriseInfo where ext1='fbs2000' and ext2='1' and Place=1"
     cursor.execute(gn_query)
     gn_result = cursor.fetchall()
 
     gn_social_list = [item[0] for item in gn_result]
-    gw_social_list = [item[0] for item in gw_result]
-
-    for item in gw_social_list:
-        r.rpush('NewsEnterprise:gwqy_socialCode', item)
-
-    for item in gn_social_list:
-        r.rpush('NewsEnterprise:gnqy_socialCode', item)
+    # gw_social_list = [item[0] for item in gw_result]
+    #
+    # for item in gw_social_list:
+    #     r.rpush('NewsEnterpriseFbs:gwqy_socialCode', item)
 
-
-#国外企业基本信息
-def BaseInfoEnterpriseAbroad():
-    # 获取国外企业
-    gn_query = "select id from EnterpriseInfo where Place = '2' limit 10 "
-    cursor.execute(gn_query)
-    gn_result = cursor.fetchall()
-    gn_social_list = [item[0] for item in gn_result]
-    print('=======')
     for item in gn_social_list:
-        r.rpush('BaseInfoEnterprise:gwqy_socialCode', item)
+        if not r.exists(item):
+            r.rpush('NewsEnterpriseFbs:gnqy_socialCode', item)
 
 
 if __name__ == "__main__":
     start = time.time()
-    # NoticeEnterprise()
-    # AnnualEnterpriseIPO()
-    # AnnualEnterprise()
-    # BaseInfoEnterpriseAbroad()
     # NewsEnterprise_task()
     # NewsEnterprise()
+    # BaseInfoEnterprise()
     # FBS()
     # NoticeEnterprise_task()
     # AnnualEnterprise_task()
+    NoticeEnterprise()
     log.info(f'====={basecore.getNowTime(1)}=====添加数据成功======耗时：{basecore.getTimeCost(start,time.time())}===')
     # cnx.close()
     # cursor.close()