diff --git a/apps/ecm/service.py b/apps/ecm/service.py index 0ad114c4..ce1167fb 100644 --- a/apps/ecm/service.py +++ b/apps/ecm/service.py @@ -657,7 +657,6 @@ def snap_and_analyse(vchannel: TDevice, algo_codes: list, opl: Opl): global_img_o = dhClient.snap(vchannel.code) happen_time = timezone.now() ec_codes = ai_analyse(algo_codes, global_img=global_img_o) # 算法处理返回的事件结果 - myLogger.info('触发事件:' + str(ec_codes)) if ec_codes: # 获取本次所有发生事件种类 ecs = EventCate.objects.filter(code__in=ec_codes.keys()) diff --git a/apps/third/dahua.py b/apps/third/dahua.py index 137fe6ac..c6ddc062 100644 --- a/apps/third/dahua.py +++ b/apps/third/dahua.py @@ -149,7 +149,7 @@ class DhClient: d_code = code.split('$')[0] json_data['deviceCode'] = d_code json_data['params'] = '{\"method\":\"dev.snap\",\"id\":123,\"params\":{\"DevID\":\"' + \ - str(d_code) + '\",\"DevChannel\":0,\"PicNum\":1,\"SnapType\":1,\"CmdSrc\":0}}' + str(d_code) + '\",\"DevChannel\":' + code + ',\"PicNum\":1,\"SnapType\":1,\"CmdSrc\":0}}' _, res = self.request(**dhapis['dev_snap'], json=json_data) res = json.loads(res) return self.get_full_pic(res['params']['PicInfo']) diff --git a/apps/third/views.py b/apps/third/views.py index 0d101d78..528f52aa 100755 --- a/apps/third/views.py +++ b/apps/third/views.py @@ -31,7 +31,7 @@ class DahuaTestView(MyLoggingMixin, APIView): def get(self, request, *args, **kwargs): # res = dhClient.face_search(path='/media/2022/07/13/three.jpg') - res = dhClient.face_deploy() + res = dhClient.snap(code='1000038$1$0$31') return Response(res)