commit

src/python2/pjibot_delivery/2csv-pjibot_delivery.py

@@ -118,15 +118,12 @@ if __name__ == '__main__':
                     parse_prefix = merged_prefix.replace('data_merge', 'data_parse')
                     parse_prefix_full = merged_bag_object_key.replace('data_merge', 'data_parse').replace('.bag',
                                                                                                           '/')  # data_parse 目录
-                    callback_undone = False
                     csv1_done = False
                     csv2_done = False
                     csv3_done = False
                     csv4_done = False
                     pdf_done = False
                     for obj2 in oss2.ObjectIterator(bucket, prefix=parse_prefix_full):  # 判断 data_parse 目录下是否有解析后的文件
-                        if '/callback.json' in str(obj2.key):
-                            callback_undone = True
                         if '/trajectory_pji.csv' in str(obj2.key):
                             csv1_done = True
                         if '/ego_pji.csv' in str(obj2.key):
@@ -137,8 +134,6 @@ if __name__ == '__main__':
                             csv4_done = True
                         if '/report.pdf' in str(obj2.key):
                             pdf_done = True
-                    if not callback_undone:  # 没有 callback.json
-                        continue
                     if csv1_done and csv2_done and csv3_done and csv4_done and pdf_done:
                         continue
 

src/python2/pjibot_delivery/csv-pjibot_delivery.py

@@ -119,15 +119,12 @@ if __name__ == '__main__':
                     parse_prefix = merged_prefix.replace('data_merge', 'data_parse')
                     parse_prefix_full = merged_bag_object_key.replace('data_merge', 'data_parse').replace('.bag',
                                                                                                           '/')  # data_parse 目录
-                    callback_undone = False
                     csv1_done = False
                     csv2_done = False
                     csv3_done = False
                     csv4_done = False
                     pdf_done = False
                     for obj2 in oss2.ObjectIterator(bucket, prefix=parse_prefix_full): # 判断 data_parse 目录下是否有解析后的文件
-                        if '/callback.json' in str(obj2.key):
-                            callback_undone = True
                         if '/trajectory_pji.csv' in str(obj2.key):
                             csv1_done = True
                         if '/ego_pji.csv' in str(obj2.key):
@@ -138,8 +135,6 @@ if __name__ == '__main__':
                             csv4_done = True
                         if '/report.pdf' in str(obj2.key):
                             pdf_done = True
-                    if not callback_undone:  # 没有 callback.json
-                        continue
                     if csv1_done and csv2_done and csv3_done and csv4_done and pdf_done:
                         continue
 

src/python2/pjibot_patrol/csv-pjibot_patrol.py

@@ -118,15 +118,12 @@ if __name__ == '__main__':
                     parse_prefix = merged_prefix.replace('data_merge', 'data_parse')
                     parse_prefix_full = merged_bag_object_key.replace('data_merge', 'data_parse').replace('.bag',
                                                                                                           '/')  # data_parse 目录
-                    callback_undone = False
                     csv1_done = False
                     csv2_done = False
                     csv3_done = False
                     csv4_done = False
                     pdf_done = False
                     for obj2 in oss2.ObjectIterator(bucket, prefix=parse_prefix_full): # 判断 data_parse 目录下是否有解析后的文件
-                        if '/callback.json' in str(obj2.key):
-                            callback_undone = True
                         if '/trajectory_pji.csv' in str(obj2.key):
                             csv1_done = True
                         if '/ego_pji.csv' in str(obj2.key):
@@ -137,8 +134,6 @@ if __name__ == '__main__':
                             csv4_done = True
                         if '/report.pdf' in str(obj2.key):
                             pdf_done = True
-                    if not callback_undone:  # 没有 callback.json
-                        continue
                     if csv1_done and csv2_done and csv3_done and csv4_done and pdf_done:
                         continue