From 9a0afe1ccce6fd3a6882b4c19b72cee579a54dd1 Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 08 三月 2019 12:57:51 +0800
Subject: [PATCH] find channel list bug
---
QiaoJiaSystem/DataManagerServer/web-server接口.txt | 125 +++++++++++++++++++++++++++++++++++++----
1 files changed, 111 insertions(+), 14 deletions(-)
diff --git "a/QiaoJiaSystem/DataManagerServer/web-server\346\216\245\345\217\243.txt" "b/QiaoJiaSystem/DataManagerServer/web-server\346\216\245\345\217\243.txt"
index 99682e8..64c52f1 100644
--- "a/QiaoJiaSystem/DataManagerServer/web-server\346\216\245\345\217\243.txt"
+++ "b/QiaoJiaSystem/DataManagerServer/web-server\346\216\245\345\217\243.txt"
@@ -164,10 +164,11 @@
"str_username" : "admin",
"str_password" : "123456",
"str_brand" : "dahua",
- "str_sdks": "1,2,4",
- "str_det_thr": "90,80,95",
- "str_cmp_thr": "80,85,90",
- "str_reserved": ""
+ //"str_sdks": "1,2,4",
+ //"str_det_thr": "90,80,95",
+ //"str_cmp_thr": "80,85,90",
+ "str_reserved": "",//鍙紶鍙笉浼�
+ "n_type" : 0 //0娣诲姞 1缂栬緫
}
杩斿洖锛�
{
@@ -183,30 +184,30 @@
"str_addr" : "鏈涗含soho澶у帵濉�3 b搴�2005",
"str_brand" : "dahua",
"str_cam_dev_id" : "dahua:ca:me:ra:22:22:22",
- "str_cmp_thr" : "80,92",
- "str_det_thr" : "90,92",
+ //"str_cmp_thr" : "80,92",
+ // "str_det_thr" : "90,92",
"str_ip" : 8080,
"str_latitude" : "116.457092",
"str_longitude" : "39.994827",
"str_name" : "澶у崕鎽勫儚鏈�2",
"str_password" : "123456",
- "str_reserved" : "",
- "str_sdks" : "1,2",
+ "str_reserved" : "group2/M00/02/7F/wKgBnFw1whWAT5DbAALrl1a_A04988.jpg", //瀹炴椂娴佹埅鍥�
+ // "str_sdks" : "1,2",
"str_username" : "admin"
},
{
"str_addr" : "鏈涗含soho澶у帵濉�3 b搴�33",
"str_brand" : "dahua",
"str_cam_dev_id" : "dahua:ca:me:ra:33:33:33",
- "str_cmp_thr" : "80,85,93",
- "str_det_thr" : "90,80,93",
+ // "str_cmp_thr" : "80,85,93",
+ // "str_det_thr" : "90,80,93",
"str_ip" : 8080,
"str_latitude" : "116.457033",
"str_longitude" : "39.994833",
"str_name" : "澶у崕鎽勫儚鏈�3",
"str_password" : "123433",
- "str_reserved" : "",
- "str_sdks" : "1,2,3",
+ "str_reserved" : "group2/M00/02/7F/wKgBnFw1whWAT5DbAALrl1a_A04988.jpg",//瀹炴椂娴佹埅鍥�
+ //"str_sdks" : "1,2,3",
"str_username" : "admin"
}
]
@@ -280,12 +281,14 @@
杩斿洖锛�
{
"cut_max_duration" : 4
+ "cut_min_duration" : 4
}
//瑙嗛鏃堕暱璁剧疆 cut_dura_edit
涓嬪彂锛�
{
"cut_max_duration" : 3
+ "cut_min_duration" : 3
}
杩斿洖锛氭爣鍑嗚繑鍥炲��
@@ -458,7 +461,7 @@
"error": "erlang is null"
}
-鏌ユ壘鍚屾搴曞簱 findLocalDatabase
+鏌ユ壘鏈湴搴曞簱 findLocalDatabase
涓嬪彂锛氭棤
杩斿洖锛�
[{
@@ -602,4 +605,98 @@
}
閿欒:
鏍囧噯杩斿洖鍊�
-
+淇敼鍗曚釜sdk瑙勫垯 editSdkRule
+author:寮犵户鏂�
+涓嬪彂锛�
+{
+ "nAlarmNumLowerLimit": 3, //鎶ヨ浜烘暟涓嬮檺 娌″惎鐢ㄤ娇鐢ㄨ礋鏁�
+ "nAlarmNumUpperLimit": 6, //鎶ヨ浜烘暟涓婇檺 娌″惎鐢ㄤ娇鐢ㄨ礋鏁�
+ "nIsBroadcast": "瀛︽牎,椋熷爞,瀹胯垗", //ip骞挎挱
+ "nIsRun": 1, //鏄惁鍚敤 鍚敤濉�1
+ "nSdkType": 1,//sdk绫诲瀷
+ "nTriggerDelay": 5,//鎶ヨ寤惰繜
+ "nTriggerTolerance": 20,//鏆備笉浣跨敤
+ "nQuality": 90, //鍥剧墖璐ㄩ噺
+ "nThreshold": 90,//鍥剧墖闃堝�煎拰鐏垫晱搴﹂兘鐢ㄨ繖涓�
+ "strAreas": "[{\"x\":100,\"y\":6},{\"x\":100,\"y\":1200},{\"x\":1800,\"y\":1200},{\"x\":1800,\"y\":6}]",//鐢绘鍖哄煙鍧愭爣锛屾槸 鎵�鏈� 绫诲瀷鐨勫敮涓�妗嗭紝涔熸槸闈犲彸琛岀殑绗竴妗嗭紝鏁扮粍闀垮害涓哄杈瑰舰杈规暟
+ "strCamId": "1",//camId 鐩告満id 鍞竴鏍囩ず
+ "strExAreas": "",//闈犲彸琛岀浜屼釜妗嗗潗鏍� 锛屽悓涓�
+ "strExLine": "",//闈犲彸琛岀浜屾潯绾垮潗鏍� 鏁扮粍闀垮害涓�2
+ "strLine": "[{\"x\":100,\"y\":6},{\"x\":100,\"y\":1200}]",//绾挎潯鍧愭爣锛屾暟缁勫厓绱犵敱璧峰鍧愭爣 鍒扮粨鏉熷潗鏍囷紝鏁扮粍闀垮害涓�2
+ "weekRuleArray": [ //鍛ㄨ鍒欐椂闂�
+ {
+ "nSdkType": 1, // 鍚屼笂 淇濇寔涓�鑷达紝鍙互涓嶇┛
+ "nType": 1, //鍛�1
+ "strBegin": "00:00",//寮�濮嬫椂闂� HH:mm
+ "strCamId": "1",//鍚屼笂 淇濇寔涓�鑷达紝鍙互涓嶇┛
+ "strEnd": "23:59"//缁撴潫鏃堕棿 HH:mm
+ },
+ {
+ "nSdkType": 1,
+ "nType": 2,
+ "strBegin": "00:00",
+ "strCamId": "1",
+ "strEnd": "23:59"
+ }
+ ]
+}
+杩斿洖锛�
+{
+ "ret_status": "ok_ack"
+}
+鏌ヨ鎵�鏈塻dk瑙勫垯 findSdkRule
+author:寮犵户鏂�
+涓嬪彂锛�
+{"strCamId": "1"}
+杩斿洖锛�
+[
+ {
+ "nAlarmNumLowerLimit" : 0,
+ "nAlarmNumUpperLimit" : 0,
+ "nIsBroadcast" : "",
+ "nIsRun" : 0,
+ "nQuality" : 0,
+ "nSdkType" : 1,
+ "nThreshold" : 0,
+ "nTriggerDelay" : 0,
+ "nTriggerTolerance" : 0,
+ "strAreas" : "",
+ "strCamId" : "1",
+ "strExAreas" : "",
+ "strExLine" : "",
+ "strLine" : "",
+ "weekRuleArray" : [
+
+ {
+ "nSdkType" : 1,
+ "nType" : 1,
+ "strBegin" : "00:00",
+ "strCamId" : "1",
+ "strEnd" : "23:59"
+ },
+ {
+ "nSdkType" : 1,
+ "nType" : 2,
+ "strBegin" : "00:00",
+ "strCamId" : "1",
+ "strEnd" : "23:59"
+ }
+
+
+ ]
+
+ }
+]
+鑾峰彇瀹炴椂娴佹埅鍥� getSnapshot
+涓嬪彂锛�
+{
+ "str_ip":"192.168.1.215",
+ "n_port":554,
+ "str_username":"admin",
+ "str_password":"a1234567",
+ "str_brand":"haikang"
+}
+杩斿洖锛�
+{
+ "imgUrl" : "group2/M00/02/7F/wKgBnFw1whWAT5DbAALrl1a_A04988.jpg"
+}
--
Gitblit v1.8.0