Merge branch 'dev' of lmstack/data_analyze_platform into master

CONFIGURE/PathSetting.py

@@ -1,6 +1,6 @@
 __author__ = 'Wang Liming'
 
-base_path = 'F:\work\QX\data_analyze_platform'
+base_path = 'D:\WORK\QX\PROJECT\data_analyze_platform'
 
 backend_path = base_path + '\LIB\BACKEND'
 middle_path = base_path + '\LIB\MIDDLE'

LIB/BACKEND/DBManager.py

@@ -98,6 +98,7 @@ class DBManager():
         OtherT_Num = 0
         CellU_Num = len(data['ffBatteryStatus']['cellVoltageList'])
         CellT_Num = len(data['ffBatteryStatus']['cellTempList'])
+
         try:
             OtherT_Num = len(data['ffBatteryStatus']['otherTempList'])
         except:
@@ -207,7 +208,14 @@ class DBManager():
                     data_block,CellUNum,CellTNum,OtherTNumm = DBManager._convert_to_dataframe_bms(line, mode)
                 except:
                     continue
-                data_blocks = np.concatenate((data_blocks,data_block),axis=0)
+                try:
+                    data_blocks = np.concatenate((data_blocks,data_block),axis=0)
+                except Exception as e: 
+                    if 'all the input array dimensions except for the concatenation axis must match exactly' in str(e):
+                        pass
+                    else:
+                        raise e
+  
                 # print('\r'+str(i),end=" ")
                 # print(data_block)
                 # print(urls)