Skip to content

周伟奇 / bmw-ocr

Go to a project
Toggle navigation
Toggle navigation pinning
99a36e6d by 冯轩
Options

Merge branch 'feature/CHINARPA-5504' into feature/uat-tmp

2 parents fb5d0282 267fc2bb
Inline Side-by-side
Showing 4 changed files with 19 additions and 16 deletions
src/apps/doc/management/commands/ocr_process.py
...@@ -1344,8 +1344,8 @@ class Command(BaseCommand, LoggerMixin): ...@@ -1344,8 +1344,8 @@ class Command(BaseCommand, LoggerMixin):
1344 except Exception as e: 1344 except Exception as e:
1345 self.online_log.error('{0} [process error (get doc info out)] [error={1}]'.format( 1345 self.online_log.error('{0} [process error (get doc info out)] [error={1}]'.format(
1346 self.log_base, traceback.format_exc())) 1346 self.log_base, traceback.format_exc()))
1347 error_list.append(1) 1347 # error_list.append(1)
1348 return 1348 # return
1349 else: 1349 else:
1350 doc_data_path = os.path.join(self.data_dir, business_type, consts.TMP_DIR_NAME, str(doc.id)) 1350 doc_data_path = os.path.join(self.data_dir, business_type, consts.TMP_DIR_NAME, str(doc.id))
1351 os.makedirs(doc_data_path, exist_ok=True) 1351 os.makedirs(doc_data_path, exist_ok=True)
...@@ -1502,8 +1502,8 @@ class Command(BaseCommand, LoggerMixin): ...@@ -1502,8 +1502,8 @@ class Command(BaseCommand, LoggerMixin):
1502 except Exception as e: 1502 except Exception as e:
1503 self.online_log.error('{0} [process error (db save)] [error={1}]'.format( 1503 self.online_log.error('{0} [process error (db save)] [error={1}]'.format(
1504 self.log_base, traceback.format_exc())) 1504 self.log_base, traceback.format_exc()))
1505 error_list.append(1) 1505 # error_list.append(1)
1506 return 1506 # return
1507 else: # e-contract or or e-fsm-contract or e-hmh 1507 else: # e-contract or or e-fsm-contract or e-hmh
1508 try: 1508 try:
1509 # pdf下载 处理 图片存储 识别 1509 # pdf下载 处理 图片存储 识别
...@@ -1645,8 +1645,8 @@ class Command(BaseCommand, LoggerMixin): ...@@ -1645,8 +1645,8 @@ class Command(BaseCommand, LoggerMixin):
1645 except Exception as e: 1645 except Exception as e:
1646 self.online_log.error('{0} [process error (db save)] [error={1}]'.format( 1646 self.online_log.error('{0} [process error (db save)] [error={1}]'.format(
1647 self.e_log_base, traceback.format_exc())) 1647 self.e_log_base, traceback.format_exc()))
1648 error_list.append(1) 1648 # error_list.append(1)
1649 return 1649 # return
1650 1650
1651 def img_2_ocr_1(self, img_queue, todo_count_dict, res_dict, finish_queue, lock, url, error_list): 1651 def img_2_ocr_1(self, img_queue, todo_count_dict, res_dict, finish_queue, lock, url, error_list):
1652 while len(error_list) == 0 or not img_queue.empty(): 1652 while len(error_list) == 0 or not img_queue.empty():
......
src/celery_compare/tasks.py
...@@ -1576,9 +1576,10 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d ...@@ -1576,9 +1576,10 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d
1576 if not is_find and is_force: 1576 if not is_find and is_force:
1577 afc_contract_input.append((key, empty_str)) 1577 afc_contract_input.append((key, empty_str))
1578 1578
1579 if online_sign and data_source == 'ECONTRACT': 1579 # CHINARPA-5504 去掉见证人签字及日期
1580 afc_contract_input.append((consts.SE_AFC_CON_FIELD[18], consts.SE_STAMP_VALUE)) 1580 # if online_sign and data_source == 'ECONTRACT':
1581 afc_contract_input.append((consts.SE_AFC_CON_FIELD[19], empty_str)) 1581 # afc_contract_input.append((consts.SE_AFC_CON_FIELD[18], consts.SE_STAMP_VALUE))
1582 # afc_contract_input.append((consts.SE_AFC_CON_FIELD[19], empty_str))
1582 1583
1583 contract_info[consts.AFC_CONTRACT_EN] = afc_contract_input 1584 contract_info[consts.AFC_CONTRACT_EN] = afc_contract_input
1584 1585
...@@ -2233,9 +2234,10 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect ...@@ -2233,9 +2234,10 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect
2233 if not is_find and is_force: 2234 if not is_find and is_force:
2234 afc_contract_input.append((key, empty_str)) 2235 afc_contract_input.append((key, empty_str))
2235 2236
2236 if online_sign and data_source == 'ECONTRACT': 2237 # CHINARPA-5504 去掉见证人签字及日期
2237 afc_contract_input.append((consts.SE_AFC_CON_FIELD[18], consts.SE_STAMP_VALUE)) 2238 # if online_sign and data_source == 'ECONTRACT':
2238 afc_contract_input.append((consts.SE_AFC_CON_FIELD[19], empty_str)) 2239 # afc_contract_input.append((consts.SE_AFC_CON_FIELD[18], consts.SE_STAMP_VALUE))
2240 # afc_contract_input.append((consts.SE_AFC_CON_FIELD[19], empty_str))
2239 2241
2240 contract_info[consts.AFC_CONTRACT_EN] = afc_contract_input 2242 contract_info[consts.AFC_CONTRACT_EN] = afc_contract_input
2241 2243
......
src/common/tools/aes_util.py
...@@ -10,7 +10,7 @@ def aes_decrypt_cbc(data, key, iv): ...@@ -10,7 +10,7 @@ def aes_decrypt_cbc(data, key, iv):
10 try: 10 try:
11 cipher = AES.new(key.encode(), AES.MODE_CBC, iv.encode()) 11 cipher = AES.new(key.encode(), AES.MODE_CBC, iv.encode())
12 res = cipher.decrypt(b64decode(data)) 12 res = cipher.decrypt(b64decode(data))
13 res = res.decode('utf-8').replace('\x0e', '') 13 res = res.decode('utf-8').replace(r'\x0e', '').replace(r'\u007', '')
14 except Exception as e: 14 except Exception as e:
15 res = '' 15 res = ''
16 return res 16 return res
......
src/prese/compare.py
...@@ -175,9 +175,10 @@ def get_pos_compare_info(pos_info, data_source): ...@@ -175,9 +175,10 @@ def get_pos_compare_info(pos_info, data_source):
175 afc_contract_input.append((consts.AFC_CON_FIELDS[8], asp_list)) 175 afc_contract_input.append((consts.AFC_CON_FIELDS[8], asp_list))
176 afc_contract_input.append((consts.AFC_CON_FIELDS[9], asp_list)) 176 afc_contract_input.append((consts.AFC_CON_FIELDS[9], asp_list))
177 177
178 if data_source == 'ECONTRACT': 178 # CHINARPA-5504 去掉见证人签字及日期
179 afc_contract_input.append((consts.AFC_CON_FIELDS[10], consts.HAVE_CN)) 179 # if data_source == 'ECONTRACT':
180 afc_contract_input.append((consts.AFC_CON_FIELDS[11], empty_str)) 180 # afc_contract_input.append((consts.AFC_CON_FIELDS[10], consts.HAVE_CN))
181 # afc_contract_input.append((consts.AFC_CON_FIELDS[11], empty_str))
181 182
182 compare_info.setdefault(consts.AFC_CONTRACT_EN, []).append(afc_contract_input) 183 compare_info.setdefault(consts.AFC_CONTRACT_EN, []).append(afc_contract_input)
183 184
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!