mdbq 0.2.8__tar.gz → 0.2.9__tar.gz

{mdbq-0.2.8 → mdbq-0.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mdbq
-Version: 0.2.8
+Version: 0.2.9
 Home-page: https://pypi.org/project/mdbsql
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-0.2.8 → mdbq-0.2.9}/mdbq/aggregation/query_data.py

@@ -466,7 +466,7 @@ def data_aggregation(service_databases=[{}]):
     for service_database in service_databases:
         for service_name, database in service_database.items():
             sdq = MysqlDatasQuery(target_service=service_name)  # 实例化数据处理类
-            sdq.months = 0  # 设置数据周期
+            sdq.months = 1  # 设置数据周期， 1 表示近 2 个月
             g = GroupBy()  # 实例化数据聚合类
             # 实例化数据库连接
             username, password, host, port = get_myconf.select_config_values(target_service=service_name, database=database)
@@ -516,4 +516,4 @@ def data_aggregation(service_databases=[{}]):
 
 
 if __name__ == '__main__':
-    data_aggregation(service_databases=[{'home_lx': 'mysql'}])
+    data_aggregation(service_databases=[{'company': 'mysql'}])

{mdbq-0.2.8 → mdbq-0.2.9}/mdbq/company/copysh.py

@@ -9,11 +9,14 @@ import datetime
 import shutil
 import time
 import re
-
+import socket
 from dateutil.utils import today
 from mdbq.bdup import bdup
 from mdbq.aggregation import aggregation
+from mdbq.aggregation import query_data
+from mdbq.aggregation import optimize_data
 from mdbq.config import update_conf
+from mdbq.config import get_myconf
 warnings.filterwarnings('ignore')
 
 
@@ -293,6 +296,33 @@ class UpdateMysql:
             return False, self.d_path
 
 
+def op_data(days: int =3650):
+
+    # 清理数据库， 除了 聚合数据
+    if socket.gethostname() == 'company':  # 公司台式机自身运行
+        # Mysql
+        username, password, host, port = get_myconf.select_config_values(
+            target_service='company',
+            database='mysql',
+        )
+        s = mysql.OptimizeDatas(username=username, password=password, host=host, port=port)
+        s.db_name_lists = [
+            '京东数据2',
+            '天猫数据2',
+            '市场数据2',
+            '生意参谋数据2',
+            '生意经2',
+            '属性设置2',
+            # '聚合数据',
+        ]
+        s.days = days
+        s.optimize_list()
+
+    # 聚合数据，并清理聚合数据
+    query_data.data_aggregation(service_databases=[{'company': 'mysql'}])
+
+
+
 def main():
     t = TbFiles()
     u = UpdateMysql()
@@ -308,10 +338,11 @@ def main():
             dp.cleaning(is_move=True)  # 公司台式机需要移除
             dp.upload_df(service_databases=[{'company': 'mysql'}])
 
-            # 此操作修改 .copysh_conf 文件，更新完成之后将 ch_record 改为 false
+            # 此操作用于修改 .copysh_conf 文件，将 ch_record 改为 false (更新完成)
             w = update_conf.UpdateConf(filename='.copysh_conf')
             w.update_config(option='ch_record', new_value='False')
             time.sleep(60)
+            op_data(days=3650)  # 数据清理和聚合
 
         t.sleep_minutes = 30  # 同步前休眠时间
         t.tb_file()

{mdbq-0.2.8 → mdbq-0.2.9}/mdbq.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mdbq
-Version: 0.2.8
+Version: 0.2.9
 Home-page: https://pypi.org/project/mdbsql
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-0.2.8 → mdbq-0.2.9}/setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(name='mdbq',
-      version='0.2.8',
+      version='0.2.9',
       author='xigua, ',
       author_email="2587125111@qq.com",
       url='https://pypi.org/project/mdbsql',