Skip to content

周伟奇 / bmw-ocr

Go to a project
Toggle navigation
Toggle navigation pinning
862a3a8c by 周伟奇
Options

fix bug

1 parent d6fe9c9d
Inline Side-by-side
Showing 2 changed files with 41 additions and 6 deletions
src/apps/doc/consts.py
...@@ -1069,11 +1069,10 @@ ITHKM_ITTID = [ ...@@ -1069,11 +1069,10 @@ ITHKM_ITTID = [
1069 1069
1070 # 居住证 1070 # 居住证
1071 ITRES = [ 1071 ITRES = [
1072 ('customerChineseName', '姓名', 'common_compare', {}, 'customerChineseName'), 1072 ('customerChineseName', '姓名', 'common_compare', {}, 'customerChineseNameResult'),
1073 ('idNum', '公民身份号码', 'common_compare', {}, 'idNum'), 1073 ('idNum', '公民身份号码', 'common_compare', {}, 'idNumResult'),
1074 ('secondIdNum', '通行证号码', 'common_compare', {}, 'secondIdNum'), 1074 ('idExpiryDate', '有效期限', 'date_compare', {'ocr_split': True, 'input_replace': ''}, 'idExpiryDateResult'), # 20200410-20250410
1075 ('idExpiryDate', '有效期限', 'date_compare', {'ocr_split': True, 'input_replace': ''}, 'idExpiryDate'), # 20200410-20250410 1075 ('dateOfBirth', '出生年月', 'date_compare', {'input_replace': ''}, 'dateOfBirthResult'), # 20231023
1076 ('dateOfBirth', '出生年月', 'date_compare', {'input_replace': ''}, 'dateOfBirth'), # 20231023
1077 ] 1076 ]
1078 1077
1079 ID_TYPE_COMPARE = { 1078 ID_TYPE_COMPARE = {
...@@ -1084,6 +1083,33 @@ ID_TYPE_COMPARE = { ...@@ -1084,6 +1083,33 @@ ID_TYPE_COMPARE = {
1084 'ITRES': [RP_OCR_FIELD, ITRES], 1083 'ITRES': [RP_OCR_FIELD, ITRES],
1085 } 1084 }
1086 1085
1086 SECOND_ITPRC = [
1087 ('secondIdNum', '公民身份号码', 'common_compare', {}, 'secondIdNumResult'),
1088 ]
1089
1090 # 护照
1091 SECOND_ITPSP = [
1092 ('secondIdNum', '护照号码', 'common_compare', {}, 'secondIdNumResult'),
1093 ]
1094
1095 # 港澳台通行证
1096 SECOND_ITHKM_ITTID = [
1097 ('secondIdNum', '证件号码', 'common_compare', {}, 'secondIdNumResult'),
1098 ]
1099
1100 # 居住证
1101 SECOND_ITRES = [
1102 ('secondIdNum', '公民身份号码', 'common_compare', {}, 'secondIdNumResult'),
1103 ]
1104
1105 SECOND_ID_TYPE_COMPARE = {
1106 'ITPRC': [IC_OCR_FIELD, SECOND_ITPRC],
1107 'ITPSP': [PP_OCR_FIELD, SECOND_ITPSP],
1108 'ITHKM': [EEP_OCR_FIELD, SECOND_ITHKM_ITTID],
1109 'ITTID': [EEP_OCR_FIELD, SECOND_ITHKM_ITTID],
1110 'ITRES': [RP_OCR_FIELD, SECOND_ITRES],
1111 }
1112
1087 # 1. 分别对比 POS车架号 vs 车辆登记正，POS车架号 vs 行驶证 1113 # 1. 分别对比 POS车架号 vs 车辆登记正，POS车架号 vs 行驶证
1088 # a）两种比对 均一致：Y 1114 # a）两种比对 均一致：Y
1089 # b）其中一个 不一致：N，向GCAP发送：不一致的OCR识别结果 1115 # b）其中一个 不一致：N，向GCAP发送：不一致的OCR识别结果
......
src/celery_compare/tasks.py
...@@ -38,6 +38,7 @@ def field_compare(info_dict, ocr_res_dict, ocr_field, compare_list, res_set): ...@@ -38,6 +38,7 @@ def field_compare(info_dict, ocr_res_dict, ocr_field, compare_list, res_set):
38 ocr_str = ocr_res.get(compare_tuple[1]) 38 ocr_str = ocr_res.get(compare_tuple[1])
39 compare_res, ocr_output = getattr(cp, compare_tuple[2])( 39 compare_res, ocr_output = getattr(cp, compare_tuple[2])(
40 input_str, ocr_str, idx, **compare_tuple[3]) 40 input_str, ocr_str, idx, **compare_tuple[3])
41 print('type: {0}, idx: {1}, field: {2}, input: {3}, ocr: {4}, res: {5}, out: {6}'.format(ocr_field, idx, compare_tuple[0], input_str, ocr_str, compare_res, ocr_output))
41 if idx == 0 and compare_res in [consts.RESULT_N, consts.RESULT_NA]: 42 if idx == 0 and compare_res in [consts.RESULT_N, consts.RESULT_NA]:
42 break 43 break
43 is_find = True 44 is_find = True
...@@ -70,6 +71,7 @@ def usedcar_info_compare(info_dict, ocr_res_dict, ocr_field, compare_list, res_s ...@@ -70,6 +71,7 @@ def usedcar_info_compare(info_dict, ocr_res_dict, ocr_field, compare_list, res_s
70 ocr_str = ocr_res.get(compare_tuple[1]) 71 ocr_str = ocr_res.get(compare_tuple[1])
71 compare_res, ocr_output = getattr(cp, compare_tuple[2])( 72 compare_res, ocr_output = getattr(cp, compare_tuple[2])(
72 input_str, ocr_str, idx, **compare_tuple[3]) 73 input_str, ocr_str, idx, **compare_tuple[3])
74 print('type: {0}, idx: {1}, field: {2}, input: {3}, ocr: {4}, res: {5}, out: {6}'.format(ocr_field, idx, compare_tuple[0], input_str, ocr_str, compare_res, ocr_output))
73 if idx == 0 and compare_res in [consts.RESULT_N, consts.RESULT_NA]: 75 if idx == 0 and compare_res in [consts.RESULT_N, consts.RESULT_NA]:
74 if ocr_str is not None: 76 if ocr_str is not None:
75 no_match_vino.append(ocr_str) 77 no_match_vino.append(ocr_str)
...@@ -132,7 +134,7 @@ def compare(application_id, application_entity, uniq_seq, ocr_res_id): ...@@ -132,7 +134,7 @@ def compare(application_id, application_entity, uniq_seq, ocr_res_id):
132 'vehicleStatus': last_obj.vehicle_status, 134 'vehicleStatus': last_obj.vehicle_status,
133 'wholeResult': 'Y', 135 'wholeResult': 'Y',
134 'wholeResultMessage': '', 136 'wholeResultMessage': '',
135 'applicationLink': r'\\china.bmw.corp\WINFS\SF-CN-data\SF3-CN-S\SF3-CN-S-1-New Business\CA\OCR II test', 137 'applicationLink': r'file://china.bmw.corp/WINFS/SF-CN-data/SF3-CN-S/SF3-CN-S-1-New Business/CA/OCR II test',
136 } 138 }
137 }) 139 })
138 140
...@@ -152,6 +154,13 @@ def compare(application_id, application_entity, uniq_seq, ocr_res_id): ...@@ -152,6 +154,13 @@ def compare(application_id, application_entity, uniq_seq, ocr_res_id):
152 continue 154 continue
153 field_compare(order_individual_cus_info, ocr_res_dict, compare_info_list[0], compare_info_list[1], res_set) 155 field_compare(order_individual_cus_info, ocr_res_dict, compare_info_list[0], compare_info_list[1], res_set)
154 156
157 # 第二证件
158 second_id_type = order_individual_cus_info.get('secondIdType')
159 second_compare_info_list = consts.SECOND_ID_TYPE_COMPARE.get(second_id_type)
160 if second_compare_info_list is None:
161 continue
162 field_compare(order_individual_cus_info, ocr_res_dict, second_compare_info_list[0], second_compare_info_list[1], res_set)
163
155 # sep营业执照 164 # sep营业执照
156 if order_individual_cus_info.get('customerType') == consts.CUSTOMER_TYPE[5]: 165 if order_individual_cus_info.get('customerType') == consts.CUSTOMER_TYPE[5]:
157 field_compare(order_individual_cus_info, ocr_res_dict, consts.BL_OCR_FIELD, consts.TCSEP, res_set) 166 field_compare(order_individual_cus_info, ocr_res_dict, consts.BL_OCR_FIELD, consts.TCSEP, res_set)
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!