diff --git a/apps/third/dahua.py b/apps/third/dahua.py index f36ef640..137fe6ac 100644 --- a/apps/third/dahua.py +++ b/apps/third/dahua.py @@ -15,7 +15,6 @@ from apps.utils.my_rsa import encrypt_data from apps.utils.tools import convert_to_base64, print_roundtrip from django.utils.timezone import now from apps.third.tapis import dhapis -from apps.utils.snowflake import idWorker requests.packages.urllib3.disable_warnings() myLogger = logging.getLogger('log') @@ -149,10 +148,7 @@ class DhClient: if '$' in code: d_code = code.split('$')[0] json_data['deviceCode'] = d_code - # json_data['params'] = '{\"method\":\"dev.snap\",\"id\":'+str(idWorker.get_id())+',\"params\":{\"DevID\":\"' + \ - # str(d_code) + '\",\"DevChannel\":\"' + code + '\",\"PicNum\":1,\"SnapType\":1,\"CmdSrc\":0}}' - - json_data['params'] = '{\"method\":\"dev.snap\",\"id\":'+str(idWorker.get_id())+',\"params\":{\"DevID\":\"' + \ + json_data['params'] = '{\"method\":\"dev.snap\",\"id\":123,\"params\":{\"DevID\":\"' + \ str(d_code) + '\",\"DevChannel\":0,\"PicNum\":1,\"SnapType\":1,\"CmdSrc\":0}}' _, res = self.request(**dhapis['dev_snap'], json=json_data) res = json.loads(res)