From a89689b92b07cf1830ad8b46521eda92e7f927c0 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 30 一月 2019 16:37:45 +0800
Subject: [PATCH] 修改bug
---
QiaoJiaSystem/build/DataWebServer | 0
QiaoJiaSystem/build/LocalDataDB | 0
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 6 +-
QiaoJiaSystem/DataManagerServer/HttpAPiDoc.md | 41 ++++++++++++++++++++
QiaoJiaSystem/DataManagerServer/web-server接口.txt | 4 +-
QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp | 6 +++
QiaoJiaSystem/build/config.json | 56 ++++++++++++++--------------
7 files changed, 80 insertions(+), 33 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/HttpAPiDoc.md b/QiaoJiaSystem/DataManagerServer/HttpAPiDoc.md
new file mode 100644
index 0000000..1271698
--- /dev/null
+++ b/QiaoJiaSystem/DataManagerServer/HttpAPiDoc.md
@@ -0,0 +1,41 @@
+#HttpApiDoc
+
+C鏈嶅姟瀵瑰鎻愪緵鎺ュ彛
+
+---
+##璁惧绠＄悊绫绘帴鍙�
+* dev_edit
+
+ 璁惧绠＄悊
+
+ ---
+ | 鍙傛暟鍚� | 鍙傛暟绫诲瀷 | 鍙傛暟鍊� | 鍙傛暟鎰忎箟 | 澶囨敞 |
+ |:---:|:---:|:---:|:---:|:---:|
+ | n_duration | int | 2 | | |
+ | n_port | int | 8000 | 绔彛 | |
+ | str_addr | string | "鏈涗含sohoT3" | 璁惧鍦板潃 | |
+ | str_brand | string | "haikang" | 璁惧鍝佺墝 | |
+ | str_dev_name | string | "鏈涗含soho娴峰悍纾佺洏闃靛垪1" | 璁惧鍚嶇О | |
+ | str_ip | string | "192.168.1.4" | 璁惧IP | |
+ | str_username | string | "admin" | 鐢ㄦ埛鍚� | |
+ | str_password | string | "basic123" | 瀵嗙爜 | |
+ | str_latitude | string | "116.45755" | 缁忓害 | |
+ | str_longitude | string | "39.994445" | 缁村害 | |
+ | str_reserved | string | | | |
+ | str_storage_dev_id | string | "DS-7808N-SN0820161208AARR691369356WCVU" | 璁惧id | |
+ ---
+
+* 璁惧鏌ヨ dev_show
+
+* 閫氶亾鎽勫儚鏈虹紪杈� devchn_edit
+* 閫氶亾鎽勫儚鏈虹紪杈� devchn_edit
+* 閫氶亾鎽勫儚鏈虹紪杈� devchn_edit
+* 閫氶亾鎽勫儚鏈虹紪杈� devchn_edit
+* 閫氶亾鎽勫儚鏈虹紪杈� devchn_edit
+* 閫氶亾鎽勫儚鏈虹紪杈� devchn_edit
+* 閫氶亾鎽勫儚鏈虹紪杈� devchn_edit
+* 閫氶亾鎽勫儚鏈虹紪杈� devchn_edit
+* 閫氶亾鎽勫儚鏈虹紪杈� devchn_edit
+* 閫氶亾鎽勫儚鏈虹紪杈� devchn_edit
+* 閫氶亾鎽勫儚鏈虹紪杈� devchn_edit
+* 閫氶亾鎽勫儚鏈虹紪杈� devchn_edit
\ No newline at end of file
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index f781e87..b793b61 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -2040,7 +2040,7 @@
subJson.append("\"IsSync\":\"" + item.second.uploadFlag + "\",");
subJson.append("\"threshold\":\"" + item.second.cmpThreshold + "\",");
- subJson.append("\"create_by\":\"" + item.second.create_by + "\",");
+ subJson.append("\"createBy\":\"" + item.second.create_by + "\",");
subJson.append("\"enabled\":\"" + item.second.enabled + "\"");
subJson.append("},");
json.append(subJson);
@@ -2086,7 +2086,7 @@
subJson.append("\"end_time\":\"" + item.endTime + "\",");
subJson.append("\"IsSync\":\"" + item.uploadFlag + "\",");
subJson.append("\"threshold\":\"" + item.cmpThreshold + "\",");
- subJson.append("\"create_by\":\"" + item.createBy + "\",");
+ subJson.append("\"createBy\":\"" + item.createBy + "\",");
subJson.append("\"enabled\":\"" + item.enabled + "\"");
subJson.append("},");
json.append(subJson);
@@ -2590,7 +2590,7 @@
perInfo["StartTime"] = StartTime;
perInfo["EndTime"] = EndTime;
perInfo["IsSync"] = UploadFlag;
- perInfo["threshold"] = CmpThreshold;
+ perInfo["threshold"] = atoi(CmpThreshold.c_str());
perInfo["enabled"] = Enabled;
perInfo["distributionIds"] = m_cluster_id;
perInfo["distributionNames"] = m_cluster_name;
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 80a81db..0743bb8 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"
@@ -422,14 +422,14 @@
鏇存柊搴曞簱 updateDatabase
涓嬪彂锛�
{
- "createBy","", //鍒涘缓鑰�/鍒嗘瀽璁惧analyDev.甯冩帶骞冲彴conCemter
+ "createBy":"", //鍒涘缓鑰�/鍒嗘瀽璁惧analyDev.甯冩帶骞冲彴conCemter
"uuid":"", //琛╱uid
"TableType": "person", //琛ㄧ被鍨媝erson/car
"TableName": "test", //琛ㄥ悕
"SyncType": "1", //鍚屾绫诲瀷1鍚屾/0鏈湴搴�
"BwType": "1", //榛戠櫧鍚嶅崟1榛戝悕鍗�/0鐧藉悕鍗�
"StartTime": "2018-01-01 01:02:00", //寮�濮嬫椂闂�
- "EndTime": "2018-12-31 01:02:00" //缁撴潫鏃堕棿
+ "EndTime": "2018-12-31 01:02:00" , //缁撴潫鏃堕棿
"IsSync":"", //鏄惁鍚屾鍒板悗鍙颁复鏃跺簱 1 鏄� 0 涓嶆槸
"threshold":0-100, // 鍥剧墖闃堝�� 0-100
"enabled":"1" // 鏄惁鍚敤 1鍚敤 0鏈惎鐢�
diff --git a/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp b/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp
index d59bc75..7495c9d 100644
--- a/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp
+++ b/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp
@@ -204,6 +204,9 @@
* @return sql
*/
std::string getInitDBSql() {
+// %% ALTER TABLE sys_o_tables ADD COLUMN uploadFlag varchar(255) DEFAULT 0;
+// %% ALTER TABLE sys_o_tables ADD COLUMN cmpThreshold varchar(255) DEFAULT 60;
+// %% ALTER TABLE sys_o_tables ADD COLUMN enabled varchar(255) DEFAULT 1;
std::string sql = "CREATE TABLE \"main\".\"sys_o_tables\" (";
sql.append(" uuid varchar(255) PRIMARY KEY, ");
// sql.append(" ClusterName varchar(255) DEFAULT NULL,");//鏈湴搴撲笉闇�瑕�
@@ -284,6 +287,9 @@
std::string sql = "update '";
sql.append(tableName + "' set ");
for (auto &item :fieldValues) {
+ if (item.second.size() == 0) {
+ continue;
+ }
sql.append(item.first + " = '" + item.second + "',");
}
sql.append(" update_time ='" + AppUtil::getTimeSecString() + "'");
diff --git a/QiaoJiaSystem/build/DataWebServer b/QiaoJiaSystem/build/DataWebServer
index 2cd6ac0..a263146 100755
--- a/QiaoJiaSystem/build/DataWebServer
+++ b/QiaoJiaSystem/build/DataWebServer
Binary files differ
diff --git a/QiaoJiaSystem/build/LocalDataDB b/QiaoJiaSystem/build/LocalDataDB
index da85e28..12e058b 100644
--- a/QiaoJiaSystem/build/LocalDataDB
+++ b/QiaoJiaSystem/build/LocalDataDB
Binary files differ
diff --git a/QiaoJiaSystem/build/config.json b/QiaoJiaSystem/build/config.json
index 6c399a3..1763288 100755
--- a/QiaoJiaSystem/build/config.json
+++ b/QiaoJiaSystem/build/config.json
@@ -1,30 +1,30 @@
{
- "DEV_ID": "DSVAD010120181119",
- "ES_IP": "192.168.1.182",
- "ES_PORT": 9200,
- "FaceDetectionSampleSize": 720,
- "FaceSeachSleepTime": 60,
- "TotalLoadSize": "500",
- "buildAddr": "/home/bsk/Apps/QiaoJiaSystem/build/",
- "clusterID": "",
- "cutPath": "/home/bsk/work/qiaojia/cut",
- "encode_thread_num": 3,
- "erlCookie": "123",
- "erlFatherNode": " ",
- "erlNode": "f6d7d984-858e-4235-a657-644927b3a628@192.168.1.148",
- "erlPath": "/opt/erlang/f6d7d984-858e-4235-a657-644927b3a628",
- "loadPath": "/home/bsk/work/qiaojia/load",
- "localPasswd": "123456",
- "logPath": "/home/bsk/work/log/",
- "mainServerIp": "192.168.1.182",
- "mainServerPort": "3697",
- "mainServerrUrl": "/addPerson/uploadToTemporary",
- "addFromAnalyUrl":"192.168.1.182:3699/data/api-c/taskUser/addFromAnaly",
- "updateFromAnalyUrl":"192.168.1.182::3699/data/api-c/taskUser/updateFromC",
- "addTaskAnalyUrl":"192.168.1.182:3699/addTaskByNode",
- "netIfName": "enp3s0",
- "redis_buf_len": 750,
- "redis_ip": "127.0.0.1",
- "srsAddr": "rtmp://192.168.1.122:1934/live/",
- "webPort": 11111
+ "DEV_ID" : "DSVAD010120181119",
+ "ES_IP" : "192.168.1.182",
+ "ES_PORT" : 9200,
+ "FaceDetectionSampleSize" : 720,
+ "FaceSeachSleepTime" : 60,
+ "TotalLoadSize" : "500",
+ "addFromAnalyUrl" : "192.168.1.184:3699/data/api-c/taskUser/addFromAnaly",
+ "addTaskAnalyUrl" : "192.168.1.184:3699/data/api-c/task/addTaskByNode",
+ "buildAddr" : "/home/bsk/Apps/QiaoJiaSystem/build/",
+ "clusterID" : "d26c8fdd-bcdc-4819-990f-d7b44068cd88",
+ "cutPath" : "/home/bsk/work/qiaojia/cut",
+ "encode_thread_num" : 3,
+ "erlCookie" : "123",
+ "erlFatherNode" : " ",
+ "erlNode" : "a3d59031-0207-4475-be75-f22a5fe83d43@192.168.1.148",
+ "erlPath" : "/opt/erlang/a3d59031-0207-4475-be75-f22a5fe83d43",
+ "loadPath" : "/home/bsk/work/qiaojia/load",
+ "localPasswd" : "123456",
+ "logPath" : "/home/bsk/work/log/",
+ "mainServerIp" : "192.168.1.182",
+ "mainServerPort" : "3697",
+ "mainServerrUrl" : "/addPerson/uploadToTemporary",
+ "netIfName" : "enp3s0",
+ "redis_buf_len" : 750,
+ "redis_ip" : "127.0.0.1",
+ "srsAddr" : "rtmp://192.168.1.122:1934/live/",
+ "updateFromAnalyUrl" : "192.168.1.182::3699/data/api-c/taskUser/updateFromC",
+ "webPort" : 11111
}
--
Gitblit v1.8.0