Merge remote-tracking branch 'origin/dev' into pro

LIB/MIDDLE/SaftyCenter/DataDiag_Static/DiagDataMerge.py

@@ -25,5 +25,5 @@ class DiagDataMerge():
         df_Diag_Ram_add = pd.concat([df_Diag_Cal_Update,df_Diag_Ram_sn,df_Diag_Ram_sn]).drop_duplicates(subset=['start_time','code'],keep=False)#此次判断中新增故障
         df_Diag_Ram_Update_old = pd.concat([df_Diag_Cal_Update,df_Diag_Ram_add,df_Diag_Ram_add]).drop_duplicates(subset=['start_time','code'],keep=False)#此次判断中新增故障
         df_Diag_Ram_Update_change = pd.concat([df_Diag_Ram_Update_old,df_Diag_Ram_sn,df_Diag_Ram_sn]).drop_duplicates(subset=['start_time','code','Batpos'],keep=False)#此次判断中新增故障
-        df_Diag_Ram = pd.concat([df_Diag_Ram_sn_else,df_Diag_Cal_unfinish])    
-        return df_Diag_Ram,df_Diag_Ram_add,df_Diag_Ram_Update_change
+        # df_Diag_Ram = pd.concat([df_Diag_Ram_sn_else,df_Diag_Cal_unfinish])    
+        return df_Diag_Ram_add,df_Diag_Ram_Update_change

LIB/MIDDLE/SaftyCenter/DataDiag_Static/main.py

@@ -19,7 +19,6 @@ from DiagDataMerge import DiagDataMerge
 def diag_cal():
     task_on=1
     global SNnums
-    global df_Diag_Ram
     global start
     #..................................设置时间..........................................................  
     start=time.time()
@@ -27,6 +26,18 @@ def diag_cal():
     start_time=end_time-datetime.timedelta(seconds=900)#10分钟跑一次，一次取10分钟数据
     start_time=start_time.strftime('%Y-%m-%d %H:%M:%S')
     end_time=end_time.strftime('%Y-%m-%d %H:%M:%S')
+    
+    host='rm-bp10j10qy42bzy0q77o.mysql.rds.aliyuncs.com'
+    port=3306
+    db='safety_platform'
+    user='qx_algo_readonly'
+    password='qx@123456'
+    mode=2
+    tablename2='all_fault_info'
+    DBRead = DBDw.DBDownload(host, port, db, user, password,mode)
+    with DBRead as DBRead:
+        df_Diag_Ram = DBRead.getdata('start_time','end_time','product_id','code','level','info','advice','Batpos',tablename=tablename2,factory='骑享',sn='',timename='',st='',sp='')
+    
 
     print('起',len(df_Diag_Ram))
     for sn in SNnums:#SN遍历
@@ -55,8 +66,8 @@ def diag_cal():
         host='rm-bp10j10qy42bzy0q77o.mysql.rds.aliyuncs.com'
         port=3306
         db='qx_cas'
-        user='qx_read'
-        password='Qx@123456'
+        user='qx_algo_readonly'
+        password='qx@123456'
         mode=1
         tablename1='cellstateestimation_soh'
         tablename2='cellstateestimation_uniform_socvoltdiff'       
@@ -96,9 +107,8 @@ def diag_cal():
         else:
             df_Diag_Batdiag_update_xq=DataFrame(columns=['start_time','end_time','product_id','code','level','info','advice','Batpos'])
             df_Diag_Batdiag_update=DataFrame(columns=['start_time','end_time','product_id','code','level','info','advice','Batpos'])
-        df_Diag_Ram,df_Diag_Ram_add,df_Diag_Ram_Update=DiagDataMerge.DetaMerge(df_Diag_Ram_sn,df_Diag_Batdiag_update,df_OprtnSta,df_Diag_Ram_sn_else)
+        df_Diag_Ram_add,df_Diag_Ram_Update=DiagDataMerge.DetaMerge(df_Diag_Ram_sn,df_Diag_Batdiag_update,df_OprtnSta,df_Diag_Ram_sn_else)
     task_on=0
-    print('止',len(df_Diag_Ram))
 #.................................统计程序...............................
 def DaTa_Sta_Week_Task():
     task_on=1
@@ -108,8 +118,8 @@ def DaTa_Sta_Week_Task():
     host='rm-bp10j10qy42bzy0q77o.mysql.rds.aliyuncs.com'
     port=3306
     db='safety_platform'
-    user='qx_read'
-    password='Qx@123456'
+    user='qx_algo_readonly'
+    password='qx@123456'
     mode=2
     tablename1='all_fault_info'
     DBRead=DBDw.DBDownload(host, port, db, user, password,mode)
@@ -154,8 +164,8 @@ def DaTa_Sta_Minutes_Task():
     host='rm-bp10j10qy42bzy0q77o.mysql.rds.aliyuncs.com'
     port=3306
     db='qx_cas'
-    user='qx_read'
-    password='Qx@123456'
+    user='qx_algo_readonly'
+    password='qx@123456'
     mode=3
     tablename2='bat_first_data_time'
     DBRead=DBDw.DBDownload(host, port, db, user, password,mode)
@@ -166,8 +176,8 @@ def DaTa_Sta_Minutes_Task():
     host='rm-bp10j10qy42bzy0q77o.mysql.rds.aliyuncs.com'
     port=3306
     db='safety_platform'
-    user='qx_read'
-    password='Qx@123456'
+    user='qx_algo_readonly'
+    password='qx@123456'
     mode=2
     tablename1='all_fault_info'
     DBRead=DBDw.DBDownload(host, port, db, user, password,mode)
@@ -253,8 +263,8 @@ if __name__ == "__main__":
     host='rm-bp10j10qy42bzy0q77o.mysql.rds.aliyuncs.com'
     port=3306
     db='safety_platform'
-    user='qx_read'
-    password='Qx@123456'
+    user='qx_algo_readonly'
+    password='qx@123456'
     mode=2
     tablename2='all_fault_info'
     DBRead = DBDw.DBDownload(host, port, db, user, password,mode)