From a395817028cd181fb69189ef79426873452ff24c Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 8 May 2023 18:14:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20while=20=E5=BE=AA=E7=8E=AF=E5=81=9Acard?=
 =?UTF-8?q?=5Fdoor=5Fauthority=E7=9A=84=E8=A1=A5=E5=81=BF=E6=9C=BA?=
 =?UTF-8?q?=E5=88=B62?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/hrm/services.py | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/apps/hrm/services.py b/apps/hrm/services.py
index ea7e75db..2f160345 100755
--- a/apps/hrm/services.py
+++ b/apps/hrm/services.py
@@ -193,18 +193,30 @@ class HrmService:
                 "cardPrivilegeDetails": details
             }
             ind = 0
+            exception = None
             while ind < 6:
-                time.sleep(5)
-                is_ok, res = dhClient.request(**dhapis['card_door_authority'], json=json_data, raise_exception=False)
-                if is_ok == 'success':
-                    break
-                elif is_ok == 'fail' and '44999999' in res['code']:
+                time.sleep(6)
+                try:
+                    dhClient.request(**dhapis['card_door_authority'], json=json_data)
+                    exception = None
+                except Exception as e:
+                    exception = e
                     ind = ind + 1
-                    continue
-                elif is_ok == 'fail':
-                    raise ParseError(**res)
-                elif is_ok == 'error':
-                    raise APIException(**DH_REQUEST_ERROR)
+            if exception:
+                raise exception
+            # while ind < 6:
+            #     time.sleep(5)
+            #     is_ok, res = dhClient.request(**dhapis['card_door_authority'], json=json_data, raise_exception=False)
+            #     if is_ok == 'success':
+            #         break
+            #     elif is_ok == 'fail' and '44999999' in res['code']:
+            #         if ind
+            #         ind = ind + 1
+            #         continue
+            #     elif is_ok == 'fail':
+            #         raise ParseError(**res)
+            #     elif is_ok == 'error':
+            #         raise APIException(**DH_REQUEST_ERROR)
             cls.save(ep, data={'dh_dchannels': dh_dchannels})
         return dh_dchannels