~chenshijun/c++.git

parent: dd5adf63 | 补丁 | 提交 | ignore whitespace

pansen

2019-01-30 a89689b92b07cf1830ad8b46521eda92e7f927c0

修改bug

# <body>

# <footer>

# type 字段包含:
# feat：新功能（feature）
# fix：修补bug
# docs：文档（documentation）
# style： 格式（不影响代码运行的变动）
# refactor：重构（即不是新增功能，也不是修改bug的代码变动）
# test：增加测试
# chore：构建过程或辅助工具的变动
# scope用于说明 commit 影响的范围，比如数据层、控制层、视图层等等。
# subject是 commit 目的的简短描述，不超过50个字符
# Body 部分是对本次 commit 的详细描述，可以分成多行
# Footer用来关闭 Issue或以BREAKING CHANGE开头，后面是对变动的描述、
#       以及变动理由和迁移方法

# 英文版详细例子，请看这里
# https://github.com/sparkbox/how_to/tree/master/style/git
# 中文版介绍，请看这里
# http://www.ruanyifeng.com/blog/2016/01/commit_message_change_log.html

1个文件已添加

6个文件已修改

	QiaoJiaSystem/DataManagerServer/HttpAPiDoc.md	41 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	QiaoJiaSystem/DataManagerServer/http_configserver.cpp	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	QiaoJiaSystem/DataManagerServer/web-server接口.txt	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	QiaoJiaSystem/build/DataWebServer	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	QiaoJiaSystem/build/LocalDataDB	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	QiaoJiaSystem/build/config.json	56 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 QiaoJiaSystem/DataManagerServer/HttpAPiDoc.md

New file
@@ -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

 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;

 QiaoJiaSystem/DataManagerServer/web-server½Ó¿Ú.txt

@@ -422,14 +422,14 @@
æ´æ°åºåº updateDatabase
ä¸åï¼
{
    "createBy","",                        //åå»ºè/åæè®¾å¤analyDev.å¸æ§å¹³å°conCemter
    "createBy":"",                        //åå»ºè/åæè®¾å¤analyDev.å¸æ§å¹³å°conCemter
    "uuid":"",                          //è¡¨uuid
    "TableType": "person",              //è¡¨ç±»åperson/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æªå¯ç¨

 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() + "'");

 QiaoJiaSystem/build/DataWebServer

Binary files differ

 QiaoJiaSystem/build/LocalDataDB

Binary files differ

 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
}

New file
			@@ -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

			@@ -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;

			@@ -422,14 +422,14 @@
			æ´æ°åºåº updateDatabase
			ä¸åï¼
			{
			"createBy","", //åå»ºè/åæè®¾å¤analyDev.å¸æ§å¹³å°conCemter
			"createBy":"", //åå»ºè/åæè®¾å¤analyDev.å¸æ§å¹³å°conCemter
			"uuid":"", //è¡¨uuid
			"TableType": "person", //è¡¨ç±»åperson/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æªå¯ç¨

			@@ -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() + "'");

			@@ -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
			}