diff --git a/apps/hrm/views.py b/apps/hrm/views.py index 8ea342e9..52a696bc 100755 --- a/apps/hrm/views.py +++ b/apps/hrm/views.py @@ -165,35 +165,30 @@ class EmployeeViewSet(CustomModelViewSet): 全部人脸库 """ # 获取设备 - json_data = { - "pageNum": 1, - "pageSize": 1000, - "ownerCodes": ['001'], - "showChildNodeData": 1, - # "isOnline":1 - } - _, res = dhClient.request(**dhapis['dev_page'], json=json_data) - devs = [] - if res['pageData']: - for i in res['pageData']: - devs.append(i['deviceCode']) + # json_data = { + # "pageNum": 1, + # "pageSize": 1000, + # "ownerCodes": ['001'], + # "showChildNodeData": 1, + # # "isOnline":1 + # } + # _, res = dhClient.request(**dhapis['dev_page'], json=json_data) + # devs = [] + # if res['pageData']: + # for i in res['pageData']: + # devs.append(i['deviceCode']) # 编辑人像库 json_data = { "groupid": settings.DAHUA_FACEGROUPID_1, "groupname": "全体人员", "groupdetail": "全体人员", "grouptype": 3, - "deviceCodeList": devs, + "deviceCodeList": [settings.DAHUA_IVSS_CODE], "syncState": 0 } dhClient.request(**dhapis['face_group_update'], json=json_data) # 人像绑定 - json_data = { - "deptId": 1, - "groupIdList": [settings.DAHUA_FACEGROUPID_1], - "cascade": True - } - dhClient.request(**dhapis['face_bind'], json=json_data) + dhClient.face_bind() return Response() @action(methods=['get'], detail=False, perms_map={'get': 'employee.face_bind_1'}, diff --git a/apps/system/services.py b/apps/system/services.py index 88eef832..42db914a 100644 --- a/apps/system/services.py +++ b/apps/system/services.py @@ -25,3 +25,4 @@ def sync_dahua_dept(dept: Dept): "name": dept.name } dhClient.request(**dhapis['dept_update'], json=data) + dhClient.face_bind() diff --git a/apps/third/dahua.py b/apps/third/dahua.py index fc7b56ba..47a19722 100644 --- a/apps/third/dahua.py +++ b/apps/third/dahua.py @@ -263,3 +263,12 @@ class DhClient: } ] """ + + def face_bind(self): + # 人像绑定到主库 + json_data = { + "deptId": 1, + "groupIdList": [settings.DAHUA_FACEGROUPID_1], + "cascade": True + } + self.request(**dhapis['face_bind'], json=json_data) diff --git a/server/settings.py b/server/settings.py index 7edb9a17..1ba8258b 100755 --- a/server/settings.py +++ b/server/settings.py @@ -357,6 +357,7 @@ DAHUA_CLIENTID = conf.DAHUA_CLIENTID DAHUA_SECRET = conf.DAHUA_SECRET DAHUA_FACEGROUPID_1 = conf.DAHUA_FACEGROUPID_1 DAHUA_SUBSCRIBE = conf.DAHUA_SUBSCRIBE +DAHUA_IVSS_CODE = conf.DAHUA_IVSS_CODE # 寻息定位 XX_ENABLED = conf.XX_ENABLED