Merge branch 'feature/license' into feature/mssql

@@ -159,6 +159,7 @@ class Command(BaseCommand, LoggerMixin):
                     ed_list.append(summary[6])
                     ed_list.append(summary[6])
 
 
     def license1_process(self, ocr_data, license_summary, classify, skip_img, img_path):
     def license1_process(self, ocr_data, license_summary, classify, skip_img, img_path):
+        # 类别：'0'身份证， '1'居住证
         license_data = ocr_data.get('data', [])
         license_data = ocr_data.get('data', [])
         if not license_data:
         if not license_data:
             skip_img.append(self.parse_img_path(img_path))
             skip_img.append(self.parse_img_path(img_path))
@@ -174,7 +175,7 @@ class Command(BaseCommand, LoggerMixin):
                 #     res_dict[chn_key] = ocr_res_2.get(en_key, '')
                 #     res_dict[chn_key] = ocr_res_2.get(en_key, '')
                 license_summary.setdefault(classify, []).append(ocr_res_2)
                 license_summary.setdefault(classify, []).append(ocr_res_2)
             else:
             else:
-                # 营业执照、行驶证等
+                # 营业执照等
                 for result_dict in ocr_res_2.get('ResultList', []):
                 for result_dict in ocr_res_2.get('ResultList', []):
                     res_dict = {}
                     res_dict = {}
                     for field_dict in result_dict.get('FieldList', []):
                     for field_dict in result_dict.get('FieldList', []):
@@ -224,7 +225,7 @@ class Command(BaseCommand, LoggerMixin):
                 elif classify in consts.LICENSE_CLASSIFY_SET_1:  # 证件1
                 elif classify in consts.LICENSE_CLASSIFY_SET_1:  # 证件1
                     self.license1_process(ocr_data, license_summary, classify, skip_img, img_path)
                     self.license1_process(ocr_data, license_summary, classify, skip_img, img_path)
                 elif classify in consts.LICENSE_CLASSIFY_SET_2:  # 证件2
                 elif classify in consts.LICENSE_CLASSIFY_SET_2:  # 证件2
-                    pid, _, _ = consts.LICENSE_CLASSIFY_MAPPING.get(classify)
+                    pid, _, _, _, _ = consts.LICENSE_CLASSIFY_MAPPING.get(classify)
                     json_data_2 = {
                     json_data_2 = {
                         "pid": str(pid),
                         "pid": str(pid),
                         "key": conf.OCR_KEY,
                         "key": conf.OCR_KEY,
@@ -490,8 +491,7 @@ class Command(BaseCommand, LoggerMixin):
     # 识别失败：普通异常，如PDF异常、构建过程异常
     # 识别失败：普通异常，如PDF异常、构建过程异常
     # EDMS异常：下载异常-->回队列-->邮件；上传异常-->重新上传队列-->邮件
     # EDMS异常：下载异常-->回队列-->邮件；上传异常-->重新上传队列-->邮件
     # 算法异常：第一道异常-->识别失败-->邮件；第二道异常-->识别失败-->邮件
     # 算法异常：第一道异常-->识别失败-->邮件；第二道异常-->识别失败-->邮件
-    # TODO 协程异步发送OCR请求
-    # TODO 调用接口重试
+    # TODO OCR接口调用重试
     # TODO 数据库断联问题
     # TODO 数据库断联问题
     def handle(self, *args, **kwargs):
     def handle(self, *args, **kwargs):
         sleep_second = int(conf.SLEEP_SECOND)
         sleep_second = int(conf.SLEEP_SECOND)

@@ -360,15 +360,20 @@ class BSWorkbook(Workbook):
                 self.remove(self.get_sheet_by_name(sheet))
                 self.remove(self.get_sheet_by_name(sheet))
 
 
     def license_rebuild(self, license_summary, document_scheme):
     def license_rebuild(self, license_summary, document_scheme):
-        for classify, (_, name, field_order) in consts.LICENSE_ORDER:
-            # 机动车登记证：CA和SE不同顺序
-            if classify == consts.MVC_CLASSIFY and document_scheme == consts.DOC_SCHEME_LIST[1]:
-                field_order = consts.MVC_SE_FIELD_ORDER
+        for classify, (_, name, field_order, side_diff, scheme_diff) in consts.LICENSE_ORDER:
             license_list = license_summary.get(classify)
             license_list = license_summary.get(classify)
-            if license_list is None:
+            if not license_list:
                 continue
                 continue
             ws = self.create_sheet(name)
             ws = self.create_sheet(name)
+            if scheme_diff and document_scheme == consts.DOC_SCHEME_LIST[1]:
+                classify = consts.MVC_CLASSIFY_SE
             for license_dict in license_list:
             for license_dict in license_list:
+                if classify == consts.IC_CLASSIFY and license_dict.get('类别') == '1':
+                    license_summary.setdefault(consts.RP_CLASSIFY, []).append(license_dict)
+                    continue
+                if side_diff:
+                    key, field_order_yes, field_order_no = consts.FIELD_ORDER_MAP.get(classify)
+                    field_order = field_order_yes if key in license_dict else field_order_no
                 for search_field, write_field in field_order:
                 for search_field, write_field in field_order:
                     ws.append((write_field, license_dict.get(search_field, '')))
                     ws.append((write_field, license_dict.get(search_field, '')))
                 ws.append((None, ))
                 ws.append((None, ))