Reits专题

REITs专题数据/BaseCore.py

-# REITs专题核心工具包
+# REITs专题核心工具包
@@ -5,6 +5,7 @@ import random
 import socket
 import sys
 import time
+import uuid
 
 import fitz
 import logbook
@@ -252,7 +253,7 @@ class BaseCore:
                                charset='utf8mb4')
         self.cursor_ = self.cnx_.cursor()
         # 连接到Redis
-        self.r = redis.Redis(host="114.115.236.206", port=6379, password='clbzzsn', db=6)
+        self.r = redis.Redis(host="114.115.236.206", port=6379, password='clbzzsn', db=0)
 
         self.pool_caiji = PooledDB(
             creator=pymysql,
@@ -451,6 +452,7 @@ class BaseCore:
     # def doc_page(self,file_path):
     #     doc = Document(file_path)
     #     return len(doc.sections)
+
     def deliteATT(self,id):
         delitesql = f"delete from clb_sys_attachment where id = '{id}' "
         self.cursor_.execute(delitesql)
@@ -492,6 +494,9 @@ class BaseCore:
             id = selects[0]
             return id,full_path
 
+    def getuuid(self):
+        get_timestamp_uuid = uuid.uuid1()  # 根据 时间戳生成 uuid , 保证全球唯一
+        return get_timestamp_uuid
 
     # 获取文件大小
     def convert_size(self,size_bytes):
@@ -520,37 +525,25 @@ class BaseCore:
             except:
                 time.sleep(3)
                 continue
-        page_size = 0
         for i in range(0, 3):
             try:
-                # name = file_name
-                if category in file_name:
-                    pass
-                else:
-                    file_name = file_name + category
-                result = obsClient.putContent('zzsn', 'PolicyDocuments/' + file_name, content=response.content)
+                file_name = str(self.getuuid()) + category
+                result = obsClient.putContent('zzsn', 'PolicyDocument/' + file_name, content=response.content)
                 break
             except:
                 time.sleep(3)
                 continue
-
-        if page_size < 1:
-            # pdf解析失败
-            # print(f'======pdf解析失败=====')
-            return retData
-        else:
-            try:
-                time_now = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
-                retData['state'] = True
-                retData['path'] = result['body']['objectUrl'].split('.com')[1]
-                retData['full_path'] = unquote(result['body']['objectUrl'])
-                retData['file_size'] = self.convert_size(file_size)
-                retData['create_time'] = time_now
-            except Exception as e:
-                print(f'error:{e}')
-                return retData
-
+        try:
+            time_now = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
+            retData['state'] = True
+            retData['path'] = result['body']['objectUrl'].split('.com')[1]
+            retData['full_path'] = unquote(result['body']['objectUrl'])
+            retData['file_size'] = self.convert_size(file_size)
+            retData['create_time'] = time_now
+        except Exception as e:
+            print(f'error:{e}')
             return retData
+        return retData
 
     def sendkafka(self, post_data, topic):
         try: