1

config/db_config.yaml

@@ -8,4 +8,10 @@ zx:
   host: rm-bp145mi6r24ik50z5xo.mysql.rds.aliyuncs.com
   user: readonly
   passwd: toDataOfReadOnly$2020
-  db: zx_prod
+  db: zx_prod
+
+dm:
+  host: rm-bp10mvfktc9o41ir91o.mysql.rds.aliyuncs.com
+  user: qucheng
+  passwd: qucheng_123
+  db: dm

data_manage/pitcher_panel.py

@@ -54,13 +54,13 @@ def get_pitcher_panel_daily(pitcher, start, end, page, page_size, order_by, orde
     sql=f"""
             select dt date,
             pitcher,cost,
-            first_reg_amount first_order_amount,
+            first_order_amount,
             reg_amount,
             round(if(cost=0,0,first_reg_amount/cost),4) first_roi,
             amount order_amount,
             round(if(cost=0,0,reg_amount/cost),4)  today_roi,
             reg_amount-cost profit
-            from dw_pitcher_daily where 1=1 {op1} {op2} {op3} {op4}
+            from dw_pitcher_trend where 1=1 {op1} {op2} {op3} {op4}
 """
     print(sql)
 
@@ -75,7 +75,7 @@ def get_pitcher_panel_daily(pitcher, start, end, page, page_size, order_by, orde
 
     print(sumSql)
 
-    return getLimitSumData(db.quchen_text,sql,sumSql,page,page_size)
+    return getLimitSumData(db.dm,sql,sumSql,page,page_size)
 
 
 def get_pitcher_panel_overview(pitcher):
@@ -105,7 +105,7 @@ select sum(cost) total_cost,sum(reg_amount) total_amount,pitcher pitcher2 from d
 where 1=1 {op1}
     """
     print(sql)
-    return db.quchen_text.getData_json(sql)
+    return db.dm.getData_json(sql)
 
 
 def get_channel_overview(channel,pitcher,start,end,page,page_size,order_by,order):
@@ -187,7 +187,7 @@ from ({sql}) a
     """
 
 
-    return getLimitSumData(db.quchen_text,sql,sumsql,page,page_size)
+    return getLimitSumData(db.dm,sql,sumsql,page,page_size)
 
 
 def get_channel_again_order_trend(channel,date,pitcher):
@@ -814,7 +814,7 @@ def get_channel_summary(channel,pitcher,page,page_size,order_by,order,state,loca
             
     """
 
-    return getLimitSumData(db.quchen_text,sql,sumsql,page,page_size)
+    return getLimitSumData(db.dm,sql,sumsql,page,page_size)
 
 
 def get_pitcher_trend(pitcher,start=None,end=None,page=None,page_size=None,order_by=None,order=None):
@@ -881,7 +881,7 @@ def get_pitcher_trend(pitcher,start=None,end=None,page=None,page_size=None,order
     from ({sql}) a
     """
 
-    data,total,total_data=getLimitSumData(db.quchen_text,sql,sumSql,page,page_size)
+    data,total,total_data=getLimitSumData(db.dm,sql,sumSql,page,page_size)
     print(data)
     def parse(str):
         li=str.split(',')

model/DataBaseUtils.py

@@ -15,6 +15,7 @@ log = logger()
 class MysqlUtils:
     _quchen_text = None
     _zx=None
+    _dm=None
 
     def __init__(self):
         p_path =os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir))
@@ -41,6 +42,15 @@ class MysqlUtils:
                                            db=conf['db'])
         return self._zx
 
+    @property
+    def dm(self):
+        conf = self.config['dm']
+        self._dm = MysqlOperation(host=conf['host'],
+                                  user=conf['user'],
+                                  passwd=conf['passwd'],
+                                  db=conf['db'])
+        return self._dm
+
     def find_db(self, db):
 
         if db == "quchen_text":
@@ -57,7 +67,9 @@ class MysqlUtils:
         if self._zx:
             self._zx.cursor.close()
             self._zx.conn.close()
-
+        if self._dm:
+            self._dm.cursor.close()
+            self._dm.conn.close()
 
 class CkUtils: