From dd5adf6383819915967b2a76b18ca6e4d88d60cd Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 30 一月 2019 09:59:31 +0800
Subject: [PATCH] 添加布控等级。对比暂未添加本字段。
---
QiaoJiaSystem/DataManagerServer/web-server接口.txt | 352 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 258 insertions(+), 94 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..80a81db 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"
@@ -1,3 +1,13 @@
+/***
+ * DataWebServer鎺ュ彛鏂囨。
+ *
+ * 2019.01.23 鏂板updatePerson鎺ュ彛锛屼慨鏀筩reateDatabase锛寀pdateDatabase锛宒eleteDatabase鎺ュ彛
+ *
+ *
+ *
+ ***/
+
+
鏍囧噯杩斿洖鍊硷細
{"ret_status": "鍐呭鏈夎锛岃妫�鏌ワ紒"}锛氬唴瀹归敊璇�
{"ret_status": "浼犺緭閿欒锛岃妫�鏌ワ紒"}锛歫son鏍煎紡閿欒
@@ -164,10 +174,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 +194,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 +291,14 @@
杩斿洖锛�
{
"cut_max_duration" : 4
+ "cut_min_duration" : 4
}
//瑙嗛鏃堕暱璁剧疆 cut_dura_edit
涓嬪彂锛�
{
"cut_max_duration" : 3
+ "cut_min_duration" : 3
}
杩斿洖锛氭爣鍑嗚繑鍥炲��
@@ -380,29 +393,36 @@
"error": ["erlang is null"]
}
+#TODO 甯冩帶
鍒涘缓搴曞簱 createDatabase
涓嬪彂锛�
{
+ "createBy","", //鍒涘缓鑰�/鍒嗘瀽璁惧analyDev.甯冩帶骞冲彴conCemter
"TableType": "person", //琛ㄧ被鍨媝erson/car
"TableName": "test", //琛ㄥ悕
- "SyncType": "1", //鍚屾绫诲瀷1鍚屾/0鏈湴搴�
- "BwType": "1", //榛戠櫧鍚嶅崟1榛戝悕鍗�/0鐧藉悕鍗�
+ "SyncType": "1", //鍚屾绫诲瀷 1鍚屾/0鏈湴搴�
+ "BwType": "1", //榛戠櫧鍚嶅崟 1榛戝悕鍗�/0鐧藉悕鍗�
"StartTime": "2018-01-01 01:02:00", //寮�濮嬫椂闂�
"EndTime": "2018-12-31 01:02:00" //缁撴潫鏃堕棿
+ "IsSync":"", // 鏄惁鍚屾鍒板悗鍙颁复鏃跺簱 1 鏄� 0 涓嶆槸
+ "threshold":0-100, // 鍥剧墖闃堝�� 0-100
+ "enabled":"1", // 鏄惁鍚敤 1鍚敤 0鏈惎鐢�
+ "uuid":"uuid-搴曞簱id"
}
杩斿洖锛�
{
- "results": "1" //0澶辫触1鎴愬姛
+ "results": "1", //0澶辫触1鎴愬姛
}
閿欒锛�
{
- "error": ["erlang is null"||"err_json"]
+ "error": "erlang is null/err_json/搴曞簱宸插瓨鍦�"
}
-
+#TODO 甯冩帶
鏇存柊搴曞簱 updateDatabase
涓嬪彂锛�
{
+ "createBy","", //鍒涘缓鑰�/鍒嗘瀽璁惧analyDev.甯冩帶骞冲彴conCemter
"uuid":"", //琛╱uid
"TableType": "person", //琛ㄧ被鍨媝erson/car
"TableName": "test", //琛ㄥ悕
@@ -410,19 +430,26 @@
"BwType": "1", //榛戠櫧鍚嶅崟1榛戝悕鍗�/0鐧藉悕鍗�
"StartTime": "2018-01-01 01:02:00", //寮�濮嬫椂闂�
"EndTime": "2018-12-31 01:02:00" //缁撴潫鏃堕棿
+ "IsSync":"", //鏄惁鍚屾鍒板悗鍙颁复鏃跺簱 1 鏄� 0 涓嶆槸
+ "threshold":0-100, // 鍥剧墖闃堝�� 0-100
+ "enabled":"1" // 鏄惁鍚敤 1鍚敤 0鏈惎鐢�
}
+// 鏇存柊 闈� null 瀛楁鍊�
+// 鍋滄鍚敤鏃讹紝杩欒竟 鍙細浼� {"enabled":"0","uuid":""}锛屾墍浠ラ渶瑕佷笂闈㈢殑鏉′欢
杩斿洖锛�
{
"results": "1" //0澶辫触1鎴愬姛
}
閿欒锛�
{
- "error": ["erlang is null"||"err_json"]
+ "error": "erlang is null/err_json"
}
+#TODO 甯冩帶
鍒犻櫎搴曞簱 deleteDatabase
涓嬪彂锛�
{
+ "createBy","", //鍒涘缓鑰�/鍒嗘瀽璁惧analyDev.甯冩帶骞冲彴conCemter
"uuid":"", //琛╱uid
"TableType": "car", //琛ㄧ被鍨媝erson/car
"TableName": "test2", //琛ㄥ悕
@@ -434,87 +461,26 @@
}
閿欒锛�
{
- "error": ["erlang is null"||"err_json"]
+ "error": "erlang is null/err_json/搴曞簱宸插瓨鍦�"
}
-
#鍒犻櫎淇敼琛ㄦ椂,琛ㄥ悕涓嶅姞 lt_;闇�瑕佷紶SyncType 瀛楁
+#鍒犻櫎淇敼娣诲姞鏌ヨ搴曞簱浜哄憳鏁版嵁鏃�,闇�瑕佸簳搴撳悕绉板姞 lt_
-# 鍒犻櫎淇敼娣诲姞鏌ヨ搴曞簱浜哄憳鏁版嵁鏃�,闇�瑕佸簳搴撳悕绉板姞 lt_
-
-
-鏌ユ壘鍚屾搴曞簱 findAllDatabase
-涓嬪彂锛�
-杩斿洖锛�
-[{
- "uuid": "e92a005e-fc19-56b5-8a23-53570bc270ae", //琛╱uid
- "tableName": "test", //琛ㄥ悕
- "tableType": "person", //琛ㄧ被鍨�
- "bwType": "1", //榛戠櫧鍚嶅崟绫诲瀷
- "start_time": "2018-01-01 01:02:00", //寮�濮嬫椂闂�
- "end_time": "2018-12-31 01:02:00" //缁撴潫鏃堕棿
-}]
-閿欒锛�
-{
- "error": "erlang is null"
-}
-
-鏌ユ壘鍚屾搴曞簱 findLocalDatabase
-涓嬪彂锛氭棤
-杩斿洖锛�
-[{
- "uuid": "e92a005e-fc19-56b5-8a23-53570bc270ae", //琛╱uid
- "tableName": "test", //琛ㄥ悕
- "tableType": "person", //琛ㄧ被鍨�
- "bwType": "1", //榛戠櫧鍚嶅崟绫诲瀷
- "start_time": "2018-01-01 01:02:00", //寮�濮嬫椂闂�
- "end_time": "2018-12-31 01:02:00" //缁撴潫鏃堕棿
-}]
-閿欒锛�
-{
- "error": "erlang is null"
-}
-
-#d
-
-鍔犺浇搴曞簱鏁版嵁 loadFaceFeaData
+#TODO 甯冩帶
+娣诲姞浜哄憳 addPerson 锛坕mg_url鍜宨mg_base64浜岄�変竴锛�
涓嬪彂锛�
{
- "TableName":"test" //琛ㄥ悕
-}
-杩斿洖锛�
-[{
- "uuid": "00b429d6-3746-57b9-8123-0dbf134731d2", //UUID
- "tableName": "test", //琛ㄥ悕
- "idcard": "123456789012345678", //韬唤璇佸彿
- "imgUrl": "http://192.168.1.188/group1/M00/00/01/wKgBvFuOcuCAbYeQAB86k1llhSw841.jpg"
- },
- {
- "uuid": "0148cb5c-2232-5b02-9a00-f1f9a6b71de7",
- "tableName": "test",
- "idcard": "123456789012345678",
- "imgUrl": "http://192.168.1.188/group1/M00/00/01/wKgBvFuOcuCADeQUABVsWlPEN7w947.jpg"
- },
- {
- "uuid": "01f20455-32bf-5c6e-b7b8-dea1395049a0",
- "tableName": "test",
- "idcard": "123456789012345678",
- "imgUrl": "http://192.168.1.188/group1/M00/00/01/wKgBvFuOct-Aaz39ACP45aaRJUY002.jpg"
- }
-]
-閿欒锛�
-{
- "error": ["erlang is null"||"err_json"]
-}
-
-
-娣诲姞鎴栬�呮洿鏂颁汉鍛� addPerson
-涓嬪彂锛�
-{
+ "createBy","", //鍒涘缓鑰�/鍒嗘瀽璁惧analyDev.甯冩帶骞冲彴conCemter
+ "enabled":"1", // 鏄惁鍚敤 1鍚敤 0鏈惎鐢�
"uuid": "", //娣诲姞浜哄憳鏃惰涓虹┖""
- "TableName": "test", //琛ㄥ悕
- "img_url ": "http: //192.168.1.188/group1/M00/00/01/wKgBvFuOcuGADRA_ABzanOgXxUE975.jpg",
- "idcard : 123456789012345678", //韬唤璇乮d
- "img_base64 ": "" //鍥剧墖base64
+ "TableId": "test", //琛╥d
+ "TableName":"", //琛ㄥ悕
+ "TableType":"person", //person
+ "BwType":"", //榛戠櫧鍚嶅崟1榛戝悕鍗�/0鐧藉悕鍗�
+ "SyncType":"1", //鍚屾绫诲瀷1鍚屾/0鏈湴搴�
+ "img_url":"http: //192.168.1.188/group1/M00/00/01/wKgBvFuOcuGADRA_ABzanOgXxUE975.jpg",
+ "idcard":"123456789012345678", //韬唤璇佹弿杩�
+ "img_base64": "" //鍥剧墖base64鐮�
}
杩斿洖锛�
{
@@ -526,12 +492,116 @@
"error": ["erlang is null"||"err_json"]
}
+#TODO 甯冩帶
+鏇存柊浜哄憳 updatePerson
+涓嬪彂锛�
+{
+ "createBy","", //鍒涘缓鑰�/鍒嗘瀽璁惧analyDev.甯冩帶骞冲彴conCemter
+ "enabled":"1", // 鏄惁鍚敤 1鍚敤 0鏈惎鐢�
+ "uuid": "",
+ "TableId": "test", //琛╥d
+ "TableName":"", //琛ㄥ悕
+ "TableType":"person",
+ "BwType":"", //榛戠櫧鍚嶅崟1榛戝悕鍗�/0鐧藉悕鍗�
+ "SyncType":"1", //鍚屾绫诲瀷1鍚屾/0鏈湴搴�
+ "img_url":"http: //192.168.1.188/group1/M00/00/01/wKgBvFuOcuGADRA_ABzanOgXxUE975.jpg",
+ "idcard":"123456789012345678", //韬唤璇乮d
+ "img_base64": "" //鍥剧墖base64鐮�
+}
+杩斿洖锛�
+{
+ "uuid": "82ee3b83-da2c-5d18-8cfa-f15e3ec4c9d4",
+ "img_url": "http://192.168.1.188/group1/M00/00/01/wKgBvFuOcuGADRA_ABzanOgXxUE975.jpg"
+}
+閿欒锛�
+{
+ "error": ["erlang is null"||"err_json"]
+}
+#TODO 甯冩帶
+鏌ユ壘鍚屾搴曞簱 findAllDatabase
+涓嬪彂锛�
+杩斿洖锛�
+[{
+ "uuid": "e92a005e-fc19-56b5-8a23-53570bc270ae", //琛╱uid
+ "tableName": "test", //琛ㄥ悕
+ "tableType": "person", //琛ㄧ被鍨�
+ "bwType": "1", //榛戠櫧鍚嶅崟绫诲瀷
+ "start_time": "2018-01-01 01:02:00", //寮�濮嬫椂闂�
+ "end_time": "2018-12-31 01:02:00", //缁撴潫鏃堕棿
+ "IsSync":"", //鏄惁鍚屾鍒板悗鍙颁复鏃跺簱 1 鏄� 0 涓嶆槸
+ "threshold":0-100, // 鍥剧墖闃堝�� 0-100
+ "enabled":"1", // 鏄惁鍚敤 1鍚敤 0鏈惎鐢�
+ "createBy","" //鍒涘缓鑰�/鍒嗘瀽璁惧analyDev.甯冩帶骞冲彴conCemter
+}]
+閿欒锛�
+{
+ "error": "erlang is null"
+}
+
+#TODO 甯冩帶
+鏌ユ壘鍚屾搴曞簱 findLocalDatabase
+涓嬪彂锛氭棤
+杩斿洖锛�
+[{
+ "uuid": "e92a005e-fc19-56b5-8a23-53570bc270ae", //琛╱uid
+ "tableName": "test", //琛ㄥ悕
+ "tableType": "person", //琛ㄧ被鍨�
+ "bwType": "1", //榛戠櫧鍚嶅崟绫诲瀷
+ "start_time": "2018-01-01 01:02:00", //寮�濮嬫椂闂�
+ "end_time": "2018-12-31 01:02:00", //缁撴潫鏃堕棿
+ "IsSync":"", //鏄惁鍚屾鍒板悗鍙颁复鏃跺簱 1 鏄� 0 涓嶆槸
+ "threshold":0-100, // 鍥剧墖闃堝�� 0-100
+ "enabled":"1", // 鏄惁鍚敤 1鍚敤 0鏈惎鐢�
+ "createBy","" //鍒涘缓鑰�/鍒嗘瀽璁惧analyDev.甯冩帶骞冲彴conCemter
+}]
+閿欒锛�
+{
+ "error": "erlang is null"
+}
+
+#TODO 甯冩帶
+鍔犺浇搴曞簱鏁版嵁 loadFaceFeaData
+涓嬪彂锛�
+{
+ "TableName":"test" //琛ㄥ悕
+}
+杩斿洖锛�
+[{
+ "uuid": "00b429d6-3746-57b9-8123-0dbf134731d2", //UUID
+ "tableName": "test", //琛ㄥ悕
+ "idcard": "123456789012345678", //韬唤璇佸彿
+ "enabled":"1", // 鏄惁鍚敤 1鍚敤 0鏈惎鐢�
+ "imgUrl": "http://192.168.1.188/group1/M00/00/01/wKgBvFuOcuCAbYeQAB86k1llhSw841.jpg"
+ },
+ {
+ "uuid": "0148cb5c-2232-5b02-9a00-f1f9a6b71de7",
+ "tableName": "test",
+ "idcard": "123456789012345678",
+ "enabled":"1", // 鏄惁鍚敤 1鍚敤 0鏈惎鐢�
+ "imgUrl": "http://192.168.1.188/group1/M00/00/01/wKgBvFuOcuCADeQUABVsWlPEN7w947.jpg"
+ },
+ {
+ "uuid": "01f20455-32bf-5c6e-b7b8-dea1395049a0",
+ "tableName": "test",
+ "idcard": "123456789012345678",
+ "enabled":"1", // 鏄惁鍚敤 1鍚敤 0鏈惎鐢�
+ "imgUrl": "http://192.168.1.188/group1/M00/00/01/wKgBvFuOct-Aaz39ACP45aaRJUY002.jpg"
+ }
+]
+閿欒锛�
+{
+ "error": ["erlang is null"||"err_json"]
+}
+
+#TODO 甯冩帶
娣诲姞鎴栬�呮洿鏂颁汉鍛� delPerson
涓嬪彂锛�
{
+ "TableId": "test", //琛╥d
"uuid": "",
"TableName": "test" //琛ㄥ悕
+ "createBy","", //鍒涘缓鑰�/鍒嗘瀽璁惧analyDev.甯冩帶骞冲彴conCemter
}
杩斿洖锛�
{
@@ -602,4 +672,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