23dffcc7 by 冯轩

init:文件名前加'关注'

1 parent 4398d1df
...@@ -1874,7 +1874,8 @@ class Command(BaseCommand, LoggerMixin): ...@@ -1874,7 +1874,8 @@ class Command(BaseCommand, LoggerMixin):
1874 # 重构Excel文件 1874 # 重构Excel文件
1875 # src_excel_path = os.path.join(doc_data_path, 'src.xlsx') 1875 # src_excel_path = os.path.join(doc_data_path, 'src.xlsx')
1876 # wb.save(src_excel_path) 1876 # wb.save(src_excel_path)
1877 count_list = wb.rebuild(merged_bs_summary, license_summary, res_list, doc.document_scheme, contract_result, doc.metadata) 1877 #need_follow表示在上传edms时文件名是否要添加"关注"两字
1878 count_list, need_follow = wb.rebuild(merged_bs_summary, license_summary, res_list, doc.document_scheme, contract_result, doc.metadata)
1878 wb.save(excel_path) 1879 wb.save(excel_path)
1879 1880
1880 except Exception as e: 1881 except Exception as e:
...@@ -1895,7 +1896,7 @@ class Command(BaseCommand, LoggerMixin): ...@@ -1895,7 +1896,7 @@ class Command(BaseCommand, LoggerMixin):
1895 # 上传至EDMS 1896 # 上传至EDMS
1896 for times in range(consts.RETRY_TIMES): 1897 for times in range(consts.RETRY_TIMES):
1897 try: 1898 try:
1898 self.edms.upload(excel_path, doc, business_type) 1899 self.edms.upload(excel_path, doc, business_type, need_follow)
1899 except Exception as e: 1900 except Exception as e:
1900 self.online_log.warn( 1901 self.online_log.warn(
1901 '{0} [edms upload failed] [times={1}] [task={2}] [error={3}]'.format( 1902 '{0} [edms upload failed] [times={1}] [task={2}] [error={3}]'.format(
......
...@@ -110,15 +110,16 @@ class ECM: ...@@ -110,15 +110,16 @@ class ECM:
110 return '{0}{1}'.format(self.prefix, name) 110 return '{0}{1}'.format(self.prefix, name)
111 return '{0}{1}'.format(self.prefix, doc_name) 111 return '{0}{1}'.format(self.prefix, doc_name)
112 112
113 def upload(self, file_path, doc, business_type): 113 def upload(self, file_path, doc, business_type, need_follow):
114 doc_type, folder_afc, folder_hil = self.doc_type_map.get(doc.document_scheme) 114 doc_type, folder_afc, folder_hil = self.doc_type_map.get(doc.document_scheme)
115 folder = folder_afc if business_type == 'AFC' else folder_hil 115 folder = folder_afc if business_type == 'AFC' else folder_hil
116 object_name = '关注' + self.get_doc_file_name(doc.document_name) if need_follow else self.get_doc_file_name(doc.document_name)
116 args = { 117 args = {
117 "username": self.username, 118 "username": self.username,
118 "password": self.pwd, 119 "password": self.pwd,
119 "docbase": self.doc_base_map.get(business_type), 120 "docbase": self.doc_base_map.get(business_type),
120 "documentType": doc_type, 121 "documentType": doc_type,
121 "object_name": self.get_doc_file_name(doc.document_name), 122 "object_name": object_name,
122 "folder": folder, 123 "folder": folder,
123 "format": "excel12book", 124 "format": "excel12book",
124 "r_content_type": "excel12book", 125 "r_content_type": "excel12book",
......
...@@ -37,6 +37,7 @@ class BSWorkbook(Workbook): ...@@ -37,6 +37,7 @@ class BSWorkbook(Workbook):
37 # self.bd = Side(style='thin', color="000000") 37 # self.bd = Side(style='thin', color="000000")
38 # self.border = Border(left=self.bd, top=self.bd, right=self.bd, bottom=self.bd) 38 # self.border = Border(left=self.bd, top=self.bd, right=self.bd, bottom=self.bd)
39 self.MAX_MEAN = 31 39 self.MAX_MEAN = 31
40 self.need_follow = False
40 41
41 @staticmethod 42 @staticmethod
42 def replace_newline(queryset_value): 43 def replace_newline(queryset_value):
...@@ -322,6 +323,8 @@ class BSWorkbook(Workbook): ...@@ -322,6 +323,8 @@ class BSWorkbook(Workbook):
322 verify_res = '疑似伪造' if len(verify_list) > 0 else '正常' 323 verify_res = '疑似伪造' if len(verify_list) > 0 else '正常'
323 else: 324 else:
324 verify_res = '' 325 verify_res = ''
326 if verify_res == '疑似伪造':
327 self.need_follow = True
325 metadata_rows.append(('流水检测结果', verify_res)) 328 metadata_rows.append(('流水检测结果', verify_res))
326 metadata_rows.append(('图片总数', res_count_tuple[0])) 329 metadata_rows.append(('图片总数', res_count_tuple[0]))
327 metadata_rows.append(('识别成功', res_count_tuple[1])) 330 metadata_rows.append(('识别成功', res_count_tuple[1]))
...@@ -333,6 +336,8 @@ class BSWorkbook(Workbook): ...@@ -333,6 +336,8 @@ class BSWorkbook(Workbook):
333 metadata_dict = json.loads(metadata) 336 metadata_dict = json.loads(metadata)
334 author = metadata_dict.pop('author', '') 337 author = metadata_dict.pop('author', '')
335 producer = metadata_dict.pop('producer', '') 338 producer = metadata_dict.pop('producer', '')
339 if author != '' or 'iText' not in producer or 'Qt' not in producer or 'Haru Free' not in producer:
340 self.need_follow = True
336 metadata_rows.append(('Author', author)) 341 metadata_rows.append(('Author', author))
337 metadata_rows.append(('Producer', producer)) 342 metadata_rows.append(('Producer', producer))
338 if len(author) > 0: 343 if len(author) > 0:
...@@ -908,4 +913,4 @@ class BSWorkbook(Workbook): ...@@ -908,4 +913,4 @@ class BSWorkbook(Workbook):
908 self.license_rebuild(license_summary, document_scheme, count_list) 913 self.license_rebuild(license_summary, document_scheme, count_list)
909 self.move_res_sheet() 914 self.move_res_sheet()
910 self.remove_base_sheet() 915 self.remove_base_sheet()
911 return count_list 916 return count_list, self.need_follow
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!