mdbq 0.2.8__py3-none-any.whl → 0.3.0__py3-none-any.whl

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/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/mysql/mysql.py

@@ -1,6 +1,7 @@
 # -*- coding:utf-8 -*-
 import datetime
 import platform
+import getpass
 import re
 import time
 from functools import wraps
@@ -189,7 +190,12 @@ class MysqlUpload:
         2. json 文件中没有或者缺失部分列信息(利用 convert_dtype_to_sql 函数按指定规则转换缺失列)
         """
         cols = df.columns.tolist()
-        path = '/Users/xigua/数据中心/自动0备份/py/数据更新/support'
+        if platform.system() == 'Darwin':
+            path = os.path.join('/Users', getpass.getuser(), '数据中心/自动0备份/py/数据更新/support')
+        elif platform.system() == 'Windows':
+            path = os.path.join('C:\\同步空间\\BaiduSyncdisk\\自动0备份\\py\\数据更新\\support')
+        else:
+            path = os.path.join('/Users', getpass.getuser(), 'support')
         # json_file = os.path.join(path, 'df_dtypes.json')
         # if os.path.isfile(json_file):
         d = data_types.DataTypes()

{mdbq-0.2.8.dist-info → mdbq-0.3.0.dist-info}/METADATA

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

{mdbq-0.2.8.dist-info → mdbq-0.3.0.dist-info}/RECORD

@@ -3,13 +3,13 @@ mdbq/__version__.py,sha256=y9Mp_8x0BCZSHsdLT_q5tX9wZwd5QgqrSIENLrb6vXA,62
 mdbq/aggregation/__init__.py,sha256=EeDqX2Aml6SPx8363J-v1lz0EcZtgwIBYyCJV6CcEDU,40
 mdbq/aggregation/aggregation.py,sha256=TkxyIBowTuoNrhVkrgnYNXwNQXCX_xjh7wcYXdP65-E,58496
 mdbq/aggregation/optimize_data.py,sha256=jLAWtxPUuhpo4XTVrhKtT4xK3grs7r73ePQfLhxlu1I,779
-mdbq/aggregation/query_data.py,sha256=13RA6DTHt3Hz8K9Jgv--XOy19dz6QTtu_VFJBPDuyu0,23353
+mdbq/aggregation/query_data.py,sha256=yxNFUOHo5I4f1cdSqRCR27wft93QhQLjszPhxa69das,23377
 mdbq/bdup/__init__.py,sha256=AkhsGk81SkG1c8FqDH5tRq-8MZmFobVbN60DTyukYTY,28
 mdbq/bdup/bdup.py,sha256=LAV0TgnQpc-LB-YuJthxb0U42_VkPidzQzAagan46lU,4234
 mdbq/clean/__init__.py,sha256=A1d6x3L27j4NtLgiFV5TANwEkLuaDfPHDQNrPBbNWtU,41
 mdbq/clean/data_clean.py,sha256=33OmeQFl9AW21P5EOay52W_S8DF96H5oHwCg4fSuBxA,85359
 mdbq/company/__init__.py,sha256=qz8F_GsP_pMB5PblgJAUAMjasuZbOEp3qQOCB39E8f0,21
-mdbq/company/copysh.py,sha256=G1DFkGtR02i4yKcWGOaFHZG2ZkzRPxo4cDl9x5eqHXk,15980
+mdbq/company/copysh.py,sha256=ANpwPLtw1PLH9U2EdzQAavA83QHPmAcSbtrbot4I1MQ,17024
 mdbq/config/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/config/get_myconf.py,sha256=9v3xebfcS1tptxpvk3_tGxfXjAehGVCveYe4iRUzLQQ,6372
 mdbq/config/products.py,sha256=tFqSfFSXyZXcof0gAeHq0Ftn4F5i9ucoMyIqZ1H_D2Q,4260
@@ -22,7 +22,7 @@ mdbq/mongo/__init__.py,sha256=SILt7xMtQIQl_m-ik9WLtJSXIVf424iYgCfE_tnQFbw,13
 mdbq/mongo/mongo.py,sha256=q0B4wXDSTtXg_vMN7MPh6zdxl6tT68tM74LmdVNQQek,31892
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
 mdbq/mysql/data_types.py,sha256=JhKhSoj1FihCl_8yfjVqWOlISJ0hx6tBQR0qE7n-Z3U,11153
-mdbq/mysql/mysql.py,sha256=BNKICpMCFskg8Zk8iR1tmDmOTvtNbOf8_lORPgHBdWs,33570
+mdbq/mysql/mysql.py,sha256=42IJOAWiSoic4m_u3_875F2IzKHIW-2dNWx7OYZ0Ub4,33901
 mdbq/mysql/s_query.py,sha256=6-8O9MHhi3-7n3isJ7t2kTCYL2mSBC_HrxSQmXM5UtI,7901
 mdbq/mysql/year_month_day.py,sha256=VgewoE2pJxK7ErjfviL_SMTN77ki8GVbTUcao3vFUCE,1523
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
@@ -33,7 +33,7 @@ mdbq/pbix/__init__.py,sha256=Trtfaynu9RjoTyLLYBN2xdRxTvm_zhCniUkVTAYwcjo,24
 mdbq/pbix/pbix_refresh.py,sha256=JUjKW3bNEyoMVfVfo77UhguvS5AWkixvVhDbw4_MHco,2396
 mdbq/pbix/refresh_all.py,sha256=wulHs4rivf4Mi0Pii2QR5Nk9-TBcvSwnCB_WH9QULKE,5939
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq-0.2.8.dist-info/METADATA,sha256=123G4bsoCq6AufU8IBtbmXj2tMQFa_oHw8IMmev9N24,245
-mdbq-0.2.8.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-mdbq-0.2.8.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-0.2.8.dist-info/RECORD,,
+mdbq-0.3.0.dist-info/METADATA,sha256=1nERCa62ViHGsLxs6A0SLbhAGCAqA7JlKG0JxhTNc0M,245
+mdbq-0.3.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+mdbq-0.3.0.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-0.3.0.dist-info/RECORD,,