diff --git a/config/env.py b/config/env.py index 6e5050c..521fb8a 100644 --- a/config/env.py +++ b/config/env.py @@ -15,8 +15,10 @@ class HaiKangSettings: """ 海康平台配置 """ - HAIKANG_URL = 'http://localhost' + # HAIKANG_URL = 'http://localhost' + HAIKANG_URL = 'https://localhost' # HAIKANG_PORT = 443 + HAIKANG_PORT = 9919 HAIKANG_AK = '' HAIKANG_SK = '' diff --git a/util/haikang_util.py b/util/haikang_util.py index f14e51b..c806956 100644 --- a/util/haikang_util.py +++ b/util/haikang_util.py @@ -110,7 +110,7 @@ class HaikangUtil: _type_: json """ - url = f"{HaiKangConfig.HAIKANG_URL}:{HaiKangConfig.HAIKANG_PORT}{HaiKangConfig.HAIKANG_ACCESS_TOKEN_URL}" + url = f"{HaiKangConfig.HAIKANG_URL}:{HaiKangConfig.HAIKANG_PORT}/artemis{HaiKangConfig.HAIKANG_ACCESS_TOKEN_URL}" headers = cls.build_signed_headers( "POST", url, None, HaiKangConfig.HAIKANG_AK, HaiKangConfig.HAIKANG_SK ) @@ -136,7 +136,7 @@ class HaikangUtil: Returns: _type_: _description_ """ - url = f"{HaiKangConfig.HAIKANG_URL}:{HaiKangConfig.HAIKANG_PORT}{HaiKangConfig.HAIKANG_DOOR_SEARCH}" + url = f"{HaiKangConfig.HAIKANG_URL}:{HaiKangConfig.HAIKANG_PORT}/artemis{HaiKangConfig.HAIKANG_DOOR_SEARCH}" body_dict = { "pageNo": max(pageNo, 1), "pageSize": min(pageSize, 999), @@ -164,7 +164,7 @@ class HaikangUtil: Args: door_index_codes (list): 门禁点唯一标识 """ - url = f"{HaiKangConfig.HAIKANG_URL}:{HaiKangConfig.HAIKANG_PORT}{HaiKangConfig.HAIKANG_DOOR_STATES_URL}" + url = f"{HaiKangConfig.HAIKANG_URL}:{HaiKangConfig.HAIKANG_PORT}/artemis{HaiKangConfig.HAIKANG_DOOR_STATES_URL}" body_dict = {"doorIndexCodes": door_index_codes} body_json = json.dumps(body_dict, separators=(",", ":")) @@ -199,7 +199,7 @@ class HaikangUtil: # logger.error("control_type参数错误 ", control_type) return [False, 400, "control_type参数错误"] - url = f"{HaiKangConfig.HAIKANG_URL}:{HaiKangConfig.HAIKANG_PORT}{HaiKangConfig.HAIKANG_DOOR_DOCONTROL_URL}" + url = f"{HaiKangConfig.HAIKANG_URL}:{HaiKangConfig.HAIKANG_PORT}/artemis{HaiKangConfig.HAIKANG_DOOR_DOCONTROL_URL}" body_dict = {"doorIndexCodes": door_index_code, "controlType": control_type} body_json = json.dumps(body_dict, separators=(",", ":")) @@ -241,7 +241,7 @@ class HaikangUtil: door_index_code (str): 门禁唯一标识 """ - url = f"{HaiKangConfig.HAIKANG_URL}:{HaiKangConfig.HAIKANG_PORT}{HaiKangConfig.HAIKANG_DOOR_ENVENTS_URL}" + url = f"{HaiKangConfig.HAIKANG_URL}:{HaiKangConfig.HAIKANG_PORT}/artemis{HaiKangConfig.HAIKANG_DOOR_ENVENTS_URL}" # current_time = datetime.now(timezone.utc) # three_months_ago = current_time - relativedelta(months=3) @@ -287,7 +287,7 @@ class HaikangUtil: # 查看门禁在线状态 @classmethod async def door_online_status(cls, indexCodes: list): - url = f"{HaiKangConfig.HAIKANG_URL}:{HaiKangConfig.HAIKANG_PORT}{HaiKangConfig.HAIKANG_DOOR_ONLINE_STATUS}" + url = f"{HaiKangConfig.HAIKANG_URL}:{HaiKangConfig.HAIKANG_PORT}/artemis{HaiKangConfig.HAIKANG_DOOR_ONLINE_STATUS}" body_dict = { "indexCodes": indexCodes @@ -331,7 +331,7 @@ class HaikangUtil: Returns: _type_: _description_ """ - url = f"{HaiKangConfig.HAIKANG_URL}:{HaiKangConfig.HAIKANG_PORT}{HaiKangConfig.HAIKANG_APPLICATION_ONETOMANY_URL}" + url = f"{HaiKangConfig.HAIKANG_URL}:{HaiKangConfig.HAIKANG_PORT}/artemis{HaiKangConfig.HAIKANG_APPLICATION_ONETOMANY_URL}" body_dict = { "facePicBinaryData": facePicBinaryData, @@ -371,7 +371,7 @@ class HaikangUtil: Returns: _type_: _description_ """ - url = f"{HaiKangConfig.HAIKANG_URL}:{HaiKangConfig.HAIKANG_PORT}{HaiKangConfig.HAIKANG_PICTURE_CHECK_URL}" + url = f"{HaiKangConfig.HAIKANG_URL}:{HaiKangConfig.HAIKANG_PORT}/artemis{HaiKangConfig.HAIKANG_PICTURE_CHECK_URL}" body_dict = {"facePicBinaryData": facePicBinaryData} @@ -404,7 +404,7 @@ class HaikangUtil: # 按条件查询人脸分组 @classmethod async def get_face_group(cls): - url = f"{HaiKangConfig.HAIKANG_URL}:{HaiKangConfig.HAIKANG_PORT}{HaiKangConfig.HAIKANG_FACE_GROUP_URL}" + url = f"{HaiKangConfig.HAIKANG_URL}:{HaiKangConfig.HAIKANG_PORT}/artemis{HaiKangConfig.HAIKANG_FACE_GROUP_URL}" headers = cls.build_signed_headers( "POST", url, None, HaiKangConfig.HAIKANG_AK, HaiKangConfig.HAIKANG_SK @@ -434,7 +434,7 @@ class HaikangUtil: Returns: _type_: _description_ """ - url = f"{HaiKangConfig.HAIKANG_URL}:{HaiKangConfig.HAIKANG_PORT}{HaiKangConfig.HAIKANG_VISITOR_RECORD_SEARCH}" + url = f"{HaiKangConfig.HAIKANG_URL}:{HaiKangConfig.HAIKANG_PORT}/artemis{HaiKangConfig.HAIKANG_VISITOR_RECORD_SEARCH}" body_dict = args body_json = json.dumps(body_dict, separators=(",", ":"))