From 366c867c373a4328588bdb02fb3e61f362409953 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 14 十二月 2021 15:30:12 +0800
Subject: [PATCH] GetAllCamerasAndGroupsByDevID ret nil []DomainUnit

---
 entites.go |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/entites.go b/entites.go
index 5406f40..c97ae32 100644
--- a/entites.go
+++ b/entites.go
@@ -8,7 +8,21 @@
 	RtspServrPort  int    `json:"rtspservrport"`  //RTSP鏈嶅姟鐨勭鍙�
 	HTTPClientIP   string `json:"httpclientip"`   //HTTP瀹㈡埛绔殑ip锛堢敤浜庢姤璀﹂�氱煡锛屼竴鑸笉璁剧疆锛�
 	HTTPClientPort int    `json:"httpclientport"` //HTTP瀹㈡埛绔殑绔彛锛堢敤浜庢姤璀﹂�氱煡锛屼竴鑸笉璁剧疆锛�
+	RegisterAuth   bool   `json:"registerauth"`   //鏄惁鍚敤娉ㄥ唽閴存潈 榛樿鍚敤
+	Md5Auth        bool   `json:"md5auth"`        //鏄惁鍚敤MD5閴存潈  榛樿鍚敤
+	DbAuth         bool   `json:"dbauth"`         //鏄惁鍚敤鏁版嵁搴撻壌鏉�  榛樿涓嶅惎鐢�
+	GbUsername     string `json:"gbusername"`     //鍥芥爣閴存潈鐢ㄦ埛鍚�
+	GbPasswd       string `json:"gbpasswd"`       //鍥芥爣閴存潈瀵嗙爜
+	NatIP          string `json:"natip"`          //绌跨綉ip
+	TotalDevNum    string `json:"totalnum"`       //鎵�鏈夎澶囨�绘暟
+	AliveDevNum    string `json:"onlinenum"`      //鍦ㄧ嚎璁惧鎬绘暟
+	Version        string `json:"version"`        //鍥芥爣杞欢鐗堟湰
 }
+
+//{"errcode":0,"errdesc":"OK","name":"璐濇�濈鍥芥爣鏈嶅姟","ipaddr":"172.16.50.51","httpserverport":8060,
+// "publicid":"44120000002000000013","gbserverport":7060,"rtspservrport":7554,"httpclientip":"",
+// "httpclientport":0,"registerauth":true,"md5auth":true,"dbauth":false,"gbusername":"44120000002000000013",
+// "gbpasswd":"123456","natip":"","totalnum":438,"onlinenum":425,"version":"v2.7.1.20191022"}
 
 //GbResult 杩斿洖鍊间俊鎭�
 type GbResult struct {
@@ -66,12 +80,13 @@
 //CamerasInOnePage 涓�椤电殑鎽勫儚鏈轰俊鎭�
 type CamerasInOnePage struct {
 	GbResult
-	TotalSize   int          `json:"totalsize"`   //(鏁板瓧)   璁惧鎬绘暟  锛堜笅鍚岋級
-	OnePageSize int          `json:"onepagesize"` //(鏁板瓧)   姣忛〉澶у皬  锛堜笅鍚岋級
-	TotalPage   int          `json:"totalpage"`   //(鏁板瓧)   鎬诲垎椤垫暟  锛堜笅鍚岋級
-	PageNO      int          `json:"pageno"`      //(鏁板瓧)   褰撳墠绗嚑椤碉紙涓嬪悓锛�
-	Count       int          `json:"count"`       //(鏁板瓧)   褰撳墠鏈夊嚑鏉℃暟鎹紙涓嬪悓锛�
-	Data        []CameraInfo `json:"data"`        //璁惧淇℃伅锛屽弬鐓р��1.璁惧绠$悊鈥濆畾涔�
+	TotalSize   int         		 `json:"totalsize"`   //(鏁板瓧)   璁惧鎬绘暟  锛堜笅鍚岋級
+	OnePageSize int         		 `json:"onepagesize"` //(鏁板瓧)   姣忛〉澶у皬  锛堜笅鍚岋級
+	TotalPage   int         		 `json:"totalpage"`   //(鏁板瓧)   鎬诲垎椤垫暟  锛堜笅鍚岋級
+	PageNO      int         		 `json:"pageno"`      //(鏁板瓧)   褰撳墠绗嚑椤碉紙涓嬪悓锛�
+	Count       int         		 `json:"count"`       //(鏁板瓧)   褰撳墠鏈夊嚑鏉℃暟鎹紙涓嬪悓锛�
+	Data        []CameraInfo		 `json:"data"`        //璁惧淇℃伅锛屽弬鐓р��1.璁惧绠$悊鈥濆畾涔�
+	Groups 		[]DomainUnit		 `json:"groups"`      //璧勬簮缁勪俊鎭�,resType=2
 }
 
 //DomainUnit 璁惧鐨勮鏀垮尯鍩� (璁惧鏄钩鍙版墠浼氬幓鑾峰彇琛屾斂鍖哄煙-涓棿涓変綅缂栫爜涓�200)

--
Gitblit v1.8.0