zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

大华抓图接口修改

This commit is contained in:
曹前明 2022-09-12 16:27:22 +08:00
parent 5d0dfa5deb
commit 522e334903
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/ecm/service.py
View File

@ -657,7 +657,6 @@ def snap_and_analyse(vchannel: TDevice, algo_codes: list, opl: Opl):
global_img_o = dhClient.snap(vchannel.code) global_img_o = dhClient.snap(vchannel.code)
happen_time = timezone.now() happen_time = timezone.now()
ec_codes = ai_analyse(algo_codes, global_img=global_img_o) # 算法处理返回的事件结果 ec_codes = ai_analyse(algo_codes, global_img=global_img_o) # 算法处理返回的事件结果
myLogger.info('触发事件:' + str(ec_codes))
if ec_codes: if ec_codes:
# 获取本次所有发生事件种类 # 获取本次所有发生事件种类
ecs = EventCate.objects.filter(code__in=ec_codes.keys()) ecs = EventCate.objects.filter(code__in=ec_codes.keys())

2
apps/third/dahua.py
View File

@ -149,7 +149,7 @@ class DhClient:
d_code = code.split('$')[0] d_code = code.split('$')[0]
json_data['deviceCode'] = d_code json_data['deviceCode'] = d_code
json_data['params'] = '{\"method\":\"dev.snap\",\"id\":123,\"params\":{\"DevID\":\"' + \ 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 = self.request(**dhapis['dev_snap'], json=json_data)
res = json.loads(res) res = json.loads(res)
return self.get_full_pic(res['params']['PicInfo']) return self.get_full_pic(res['params']['PicInfo'])

2
apps/third/views.py
View File

@ -31,7 +31,7 @@ class DahuaTestView(MyLoggingMixin, APIView):
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
# res = dhClient.face_search(path='/media/2022/07/13/three.jpg') # 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) return Response(res)