|
|
@@ -87,11 +87,12 @@ if __name__ == '__main__':
|
|
|
merged_prefix = '/'.join(merged_bag_object_key_split[:-1])
|
|
|
parse_prefix = merged_prefix.replace('data_merge', 'data_parse')
|
|
|
parse_prefix_full = merged_bag_object_key.replace('data_merge', 'data_parse')[:-4] + '/'
|
|
|
+ callback_undone = False
|
|
|
csv1_done = False
|
|
|
csv2_done = False
|
|
|
csv3_done = False
|
|
|
csv4_done = False
|
|
|
- callback_undone = False
|
|
|
+ pdf_done = False
|
|
|
for obj2 in oss2.ObjectIterator(bucket, prefix=parse_prefix_full):
|
|
|
if '/callback.json' in str(obj2.key):
|
|
|
callback_undone = True
|
|
|
@@ -103,9 +104,11 @@ if __name__ == '__main__':
|
|
|
csv3_done = True
|
|
|
if '/objects_pji.csv' in str(obj2.key):
|
|
|
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:
|
|
|
+ if csv1_done and csv2_done and csv3_done and csv4_done and pdf_done:
|
|
|
continue
|
|
|
|
|
|
logging.info("开始生成场景还原csv: %s" % str(obj1.key))
|
