|
@@ -98,19 +98,20 @@ class Hik_iSecure():
|
|
|
post = self.post(self.host + url, data, headers)
|
|
|
return post
|
|
|
|
|
|
- def person_list(self,person_list,url):
|
|
|
+ def person_list(self,person_list,pageNo,url):
|
|
|
headers = {
|
|
|
"access_token": self.token,
|
|
|
"Content-Type": "application/json"
|
|
|
}
|
|
|
data = {
|
|
|
- "pageNo": "1",
|
|
|
+ "pageNo": pageNo,
|
|
|
"pageSize": "999"
|
|
|
}
|
|
|
resp = self.post(self.host + url, data, headers)
|
|
|
resp = json.loads(resp)
|
|
|
totalsize = resp["data"]["total"]
|
|
|
- pageSize = resp["data"]["pageSize"]
|
|
|
+
|
|
|
+
|
|
|
page = math.ceil(int(totalsize) / 999)
|
|
|
data_list = resp["data"]["list"]
|
|
|
|
|
@@ -124,15 +125,20 @@ class Hik_iSecure():
|
|
|
|
|
|
picture_base64 = self.get_picture(personPhoto)
|
|
|
person_list[personId] = [personName,picture_base64]
|
|
|
- return pageSize,page
|
|
|
+ return page,totalsize
|
|
|
|
|
|
def get_personlist(self):
|
|
|
url = "/artemis/api/resource/v2/person/personList"
|
|
|
person_list = {}
|
|
|
- pageSize,page = self.person_list(person_list,url)
|
|
|
- while pageSize < page:
|
|
|
- pageSize = pageSize + 1
|
|
|
- self.person_list(person_list,url)
|
|
|
+ pageNo = 1
|
|
|
+ page,totalsize = self.person_list(person_list,pageNo,url)
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ while pageNo < page:
|
|
|
+ pageNo = pageNo + 1
|
|
|
+ self.person_list(person_list,pageNo,url)
|
|
|
return person_list
|
|
|
|
|
|
def get_picture(self,personPhoto):
|
|
@@ -165,22 +171,28 @@ class Hik_iSecure():
|
|
|
"access_token": self.token,
|
|
|
"Content-Type": "application/json"
|
|
|
}
|
|
|
+ pageNo = 1
|
|
|
data = {
|
|
|
- "pageNo": "1",
|
|
|
+ "pageNo": pageNo,
|
|
|
"pageSize": "999"
|
|
|
}
|
|
|
resp = self.post(self.host + url, data, headers)
|
|
|
resp = json.loads(resp)
|
|
|
totalsize = resp["data"]["total"]
|
|
|
- pageSize = resp["data"]["pageSize"]
|
|
|
+
|
|
|
page = math.ceil(int(totalsize) / 999)
|
|
|
cards = []
|
|
|
self.get_card_post(resp,cards,diff_value)
|
|
|
- while pageSize < page:
|
|
|
- pageSize = pageSize + 1
|
|
|
+ while pageNo < page:
|
|
|
+ pageNo = pageNo + 1
|
|
|
+ data = {
|
|
|
+ "pageNo": pageNo,
|
|
|
+ "pageSize": "999"
|
|
|
+ }
|
|
|
resp = self.post(self.host + url,data,headers)
|
|
|
resp = json.loads(resp)
|
|
|
self.get_card_post(resp, cards,diff_value)
|
|
|
+
|
|
|
return cards
|
|
|
|
|
|
|