diff --git a/PhaseCompAcq/PhaseWindow.cpp b/PhaseCompAcq/PhaseWindow.cpp index 03e77c6..d2dd196 100644 --- a/PhaseCompAcq/PhaseWindow.cpp +++ b/PhaseCompAcq/PhaseWindow.cpp @@ -199,7 +199,7 @@ } QJsonObject PhaseWindow::initDeviceList() { - QJsonObject response = httpReq->initDeviceList("比相仪"); + QJsonObject response = httpReq->initDeviceList(SettingConfig::getInstance().DEV_TYPES, SettingConfig::getInstance().SYSTEM); return response; } diff --git a/PhaseCompAcq/PhaseWindow.cpp b/PhaseCompAcq/PhaseWindow.cpp index 03e77c6..d2dd196 100644 --- a/PhaseCompAcq/PhaseWindow.cpp +++ b/PhaseCompAcq/PhaseWindow.cpp @@ -199,7 +199,7 @@ } QJsonObject PhaseWindow::initDeviceList() { - QJsonObject response = httpReq->initDeviceList("比相仪"); + QJsonObject response = httpReq->initDeviceList(SettingConfig::getInstance().DEV_TYPES, SettingConfig::getInstance().SYSTEM); return response; } diff --git a/PhaseCompAcq/common/HttpRequestController.cpp b/PhaseCompAcq/common/HttpRequestController.cpp index 6abb5af..0a9f3b5 100644 --- a/PhaseCompAcq/common/HttpRequestController.cpp +++ b/PhaseCompAcq/common/HttpRequestController.cpp @@ -153,3 +153,37 @@ return resultObj; } + +QJsonObject HttpRequestController::initDeviceList(QString devType, QString system) +{ + QJsonObject resultObj; + + // 获取设备列表的接口地址 + QUrl url = baseUrl + "/device/list"; + QUrlQuery query; + query.addQueryItem("type", devType); + url.setQuery(query); + + QNetworkRequest request; + request.setUrl(url); + request.setRawHeader("Content-type", "application/json"); + request.setRawHeader("token", token.toLocal8Bit()); + request.setRawHeader("system", system.toLocal8Bit()); + + qDebug() << url; + + QNetworkReply * reply = httpUtil->sendGetRequest(request); + const QByteArray reply_data = reply->readAll(); + QJsonDocument jsonDocument = QJsonDocument::fromJson(reply_data); + if(jsonDocument.isNull() == false) + { + resultObj = jsonDocument.object(); + } else + { + resultObj.insert("code", -1); + } + + qDebug() << resultObj; + + return resultObj; +} diff --git a/PhaseCompAcq/PhaseWindow.cpp b/PhaseCompAcq/PhaseWindow.cpp index 03e77c6..d2dd196 100644 --- a/PhaseCompAcq/PhaseWindow.cpp +++ b/PhaseCompAcq/PhaseWindow.cpp @@ -199,7 +199,7 @@ } QJsonObject PhaseWindow::initDeviceList() { - QJsonObject response = httpReq->initDeviceList("比相仪"); + QJsonObject response = httpReq->initDeviceList(SettingConfig::getInstance().DEV_TYPES, SettingConfig::getInstance().SYSTEM); return response; } diff --git a/PhaseCompAcq/common/HttpRequestController.cpp b/PhaseCompAcq/common/HttpRequestController.cpp index 6abb5af..0a9f3b5 100644 --- a/PhaseCompAcq/common/HttpRequestController.cpp +++ b/PhaseCompAcq/common/HttpRequestController.cpp @@ -153,3 +153,37 @@ return resultObj; } + +QJsonObject HttpRequestController::initDeviceList(QString devType, QString system) +{ + QJsonObject resultObj; + + // 获取设备列表的接口地址 + QUrl url = baseUrl + "/device/list"; + QUrlQuery query; + query.addQueryItem("type", devType); + url.setQuery(query); + + QNetworkRequest request; + request.setUrl(url); + request.setRawHeader("Content-type", "application/json"); + request.setRawHeader("token", token.toLocal8Bit()); + request.setRawHeader("system", system.toLocal8Bit()); + + qDebug() << url; + + QNetworkReply * reply = httpUtil->sendGetRequest(request); + const QByteArray reply_data = reply->readAll(); + QJsonDocument jsonDocument = QJsonDocument::fromJson(reply_data); + if(jsonDocument.isNull() == false) + { + resultObj = jsonDocument.object(); + } else + { + resultObj.insert("code", -1); + } + + qDebug() << resultObj; + + return resultObj; +} diff --git a/PhaseCompAcq/common/HttpRequestController.h b/PhaseCompAcq/common/HttpRequestController.h index 77fc3db..2610548 100644 --- a/PhaseCompAcq/common/HttpRequestController.h +++ b/PhaseCompAcq/common/HttpRequestController.h @@ -19,6 +19,7 @@ QJsonObject getTokenByClientId(QString clientId, QString key); QJsonObject initDictDeviceType(); QJsonObject initDeviceList(QString devType); + QJsonObject initDeviceList(QString devType, QString system); private: HttpRequestUtil * httpUtil; diff --git a/PhaseCompAcq/PhaseWindow.cpp b/PhaseCompAcq/PhaseWindow.cpp index 03e77c6..d2dd196 100644 --- a/PhaseCompAcq/PhaseWindow.cpp +++ b/PhaseCompAcq/PhaseWindow.cpp @@ -199,7 +199,7 @@ } QJsonObject PhaseWindow::initDeviceList() { - QJsonObject response = httpReq->initDeviceList("比相仪"); + QJsonObject response = httpReq->initDeviceList(SettingConfig::getInstance().DEV_TYPES, SettingConfig::getInstance().SYSTEM); return response; } diff --git a/PhaseCompAcq/common/HttpRequestController.cpp b/PhaseCompAcq/common/HttpRequestController.cpp index 6abb5af..0a9f3b5 100644 --- a/PhaseCompAcq/common/HttpRequestController.cpp +++ b/PhaseCompAcq/common/HttpRequestController.cpp @@ -153,3 +153,37 @@ return resultObj; } + +QJsonObject HttpRequestController::initDeviceList(QString devType, QString system) +{ + QJsonObject resultObj; + + // 获取设备列表的接口地址 + QUrl url = baseUrl + "/device/list"; + QUrlQuery query; + query.addQueryItem("type", devType); + url.setQuery(query); + + QNetworkRequest request; + request.setUrl(url); + request.setRawHeader("Content-type", "application/json"); + request.setRawHeader("token", token.toLocal8Bit()); + request.setRawHeader("system", system.toLocal8Bit()); + + qDebug() << url; + + QNetworkReply * reply = httpUtil->sendGetRequest(request); + const QByteArray reply_data = reply->readAll(); + QJsonDocument jsonDocument = QJsonDocument::fromJson(reply_data); + if(jsonDocument.isNull() == false) + { + resultObj = jsonDocument.object(); + } else + { + resultObj.insert("code", -1); + } + + qDebug() << resultObj; + + return resultObj; +} diff --git a/PhaseCompAcq/common/HttpRequestController.h b/PhaseCompAcq/common/HttpRequestController.h index 77fc3db..2610548 100644 --- a/PhaseCompAcq/common/HttpRequestController.h +++ b/PhaseCompAcq/common/HttpRequestController.h @@ -19,6 +19,7 @@ QJsonObject getTokenByClientId(QString clientId, QString key); QJsonObject initDictDeviceType(); QJsonObject initDeviceList(QString devType); + QJsonObject initDeviceList(QString devType, QString system); private: HttpRequestUtil * httpUtil; diff --git a/PhaseCompAcq/common/utils/SettingConfig.cpp b/PhaseCompAcq/common/utils/SettingConfig.cpp index da8a3df..6273b6d 100644 --- a/PhaseCompAcq/common/utils/SettingConfig.cpp +++ b/PhaseCompAcq/common/utils/SettingConfig.cpp @@ -17,6 +17,8 @@ CLIENT_ID = getProperty("client", "clientId").toString(); APP_KEY = getProperty("client", "appKey").toString(); + DEV_TYPES = getProperty("client", "devTypes").toString(); + SYSTEM = getProperty("client", "system").toString(); WORK_TYPE = getProperty("client", "workMode").toString(); BASE_URL = getProperty("http", "baseUrl").toString(); diff --git a/PhaseCompAcq/PhaseWindow.cpp b/PhaseCompAcq/PhaseWindow.cpp index 03e77c6..d2dd196 100644 --- a/PhaseCompAcq/PhaseWindow.cpp +++ b/PhaseCompAcq/PhaseWindow.cpp @@ -199,7 +199,7 @@ } QJsonObject PhaseWindow::initDeviceList() { - QJsonObject response = httpReq->initDeviceList("比相仪"); + QJsonObject response = httpReq->initDeviceList(SettingConfig::getInstance().DEV_TYPES, SettingConfig::getInstance().SYSTEM); return response; } diff --git a/PhaseCompAcq/common/HttpRequestController.cpp b/PhaseCompAcq/common/HttpRequestController.cpp index 6abb5af..0a9f3b5 100644 --- a/PhaseCompAcq/common/HttpRequestController.cpp +++ b/PhaseCompAcq/common/HttpRequestController.cpp @@ -153,3 +153,37 @@ return resultObj; } + +QJsonObject HttpRequestController::initDeviceList(QString devType, QString system) +{ + QJsonObject resultObj; + + // 获取设备列表的接口地址 + QUrl url = baseUrl + "/device/list"; + QUrlQuery query; + query.addQueryItem("type", devType); + url.setQuery(query); + + QNetworkRequest request; + request.setUrl(url); + request.setRawHeader("Content-type", "application/json"); + request.setRawHeader("token", token.toLocal8Bit()); + request.setRawHeader("system", system.toLocal8Bit()); + + qDebug() << url; + + QNetworkReply * reply = httpUtil->sendGetRequest(request); + const QByteArray reply_data = reply->readAll(); + QJsonDocument jsonDocument = QJsonDocument::fromJson(reply_data); + if(jsonDocument.isNull() == false) + { + resultObj = jsonDocument.object(); + } else + { + resultObj.insert("code", -1); + } + + qDebug() << resultObj; + + return resultObj; +} diff --git a/PhaseCompAcq/common/HttpRequestController.h b/PhaseCompAcq/common/HttpRequestController.h index 77fc3db..2610548 100644 --- a/PhaseCompAcq/common/HttpRequestController.h +++ b/PhaseCompAcq/common/HttpRequestController.h @@ -19,6 +19,7 @@ QJsonObject getTokenByClientId(QString clientId, QString key); QJsonObject initDictDeviceType(); QJsonObject initDeviceList(QString devType); + QJsonObject initDeviceList(QString devType, QString system); private: HttpRequestUtil * httpUtil; diff --git a/PhaseCompAcq/common/utils/SettingConfig.cpp b/PhaseCompAcq/common/utils/SettingConfig.cpp index da8a3df..6273b6d 100644 --- a/PhaseCompAcq/common/utils/SettingConfig.cpp +++ b/PhaseCompAcq/common/utils/SettingConfig.cpp @@ -17,6 +17,8 @@ CLIENT_ID = getProperty("client", "clientId").toString(); APP_KEY = getProperty("client", "appKey").toString(); + DEV_TYPES = getProperty("client", "devTypes").toString(); + SYSTEM = getProperty("client", "system").toString(); WORK_TYPE = getProperty("client", "workMode").toString(); BASE_URL = getProperty("http", "baseUrl").toString(); diff --git a/PhaseCompAcq/common/utils/SettingConfig.h b/PhaseCompAcq/common/utils/SettingConfig.h index fe8d070..6add4de 100644 --- a/PhaseCompAcq/common/utils/SettingConfig.h +++ b/PhaseCompAcq/common/utils/SettingConfig.h @@ -39,6 +39,8 @@ QString CLIENT_ID; QString APP_KEY; + QString DEV_TYPES; + QString SYSTEM; QString WORK_TYPE; QString BASE_URL; diff --git a/PhaseCompAcq/PhaseWindow.cpp b/PhaseCompAcq/PhaseWindow.cpp index 03e77c6..d2dd196 100644 --- a/PhaseCompAcq/PhaseWindow.cpp +++ b/PhaseCompAcq/PhaseWindow.cpp @@ -199,7 +199,7 @@ } QJsonObject PhaseWindow::initDeviceList() { - QJsonObject response = httpReq->initDeviceList("比相仪"); + QJsonObject response = httpReq->initDeviceList(SettingConfig::getInstance().DEV_TYPES, SettingConfig::getInstance().SYSTEM); return response; } diff --git a/PhaseCompAcq/common/HttpRequestController.cpp b/PhaseCompAcq/common/HttpRequestController.cpp index 6abb5af..0a9f3b5 100644 --- a/PhaseCompAcq/common/HttpRequestController.cpp +++ b/PhaseCompAcq/common/HttpRequestController.cpp @@ -153,3 +153,37 @@ return resultObj; } + +QJsonObject HttpRequestController::initDeviceList(QString devType, QString system) +{ + QJsonObject resultObj; + + // 获取设备列表的接口地址 + QUrl url = baseUrl + "/device/list"; + QUrlQuery query; + query.addQueryItem("type", devType); + url.setQuery(query); + + QNetworkRequest request; + request.setUrl(url); + request.setRawHeader("Content-type", "application/json"); + request.setRawHeader("token", token.toLocal8Bit()); + request.setRawHeader("system", system.toLocal8Bit()); + + qDebug() << url; + + QNetworkReply * reply = httpUtil->sendGetRequest(request); + const QByteArray reply_data = reply->readAll(); + QJsonDocument jsonDocument = QJsonDocument::fromJson(reply_data); + if(jsonDocument.isNull() == false) + { + resultObj = jsonDocument.object(); + } else + { + resultObj.insert("code", -1); + } + + qDebug() << resultObj; + + return resultObj; +} diff --git a/PhaseCompAcq/common/HttpRequestController.h b/PhaseCompAcq/common/HttpRequestController.h index 77fc3db..2610548 100644 --- a/PhaseCompAcq/common/HttpRequestController.h +++ b/PhaseCompAcq/common/HttpRequestController.h @@ -19,6 +19,7 @@ QJsonObject getTokenByClientId(QString clientId, QString key); QJsonObject initDictDeviceType(); QJsonObject initDeviceList(QString devType); + QJsonObject initDeviceList(QString devType, QString system); private: HttpRequestUtil * httpUtil; diff --git a/PhaseCompAcq/common/utils/SettingConfig.cpp b/PhaseCompAcq/common/utils/SettingConfig.cpp index da8a3df..6273b6d 100644 --- a/PhaseCompAcq/common/utils/SettingConfig.cpp +++ b/PhaseCompAcq/common/utils/SettingConfig.cpp @@ -17,6 +17,8 @@ CLIENT_ID = getProperty("client", "clientId").toString(); APP_KEY = getProperty("client", "appKey").toString(); + DEV_TYPES = getProperty("client", "devTypes").toString(); + SYSTEM = getProperty("client", "system").toString(); WORK_TYPE = getProperty("client", "workMode").toString(); BASE_URL = getProperty("http", "baseUrl").toString(); diff --git a/PhaseCompAcq/common/utils/SettingConfig.h b/PhaseCompAcq/common/utils/SettingConfig.h index fe8d070..6add4de 100644 --- a/PhaseCompAcq/common/utils/SettingConfig.h +++ b/PhaseCompAcq/common/utils/SettingConfig.h @@ -39,6 +39,8 @@ QString CLIENT_ID; QString APP_KEY; + QString DEV_TYPES; + QString SYSTEM; QString WORK_TYPE; QString BASE_URL; diff --git a/PhaseCompAcq/conf/config.ini b/PhaseCompAcq/conf/config.ini index a65af8b..5aed46c 100644 --- a/PhaseCompAcq/conf/config.ini +++ b/PhaseCompAcq/conf/config.ini @@ -13,6 +13,8 @@ [client] clientId="phase" appKey="bd593bdd20943d2db8af217c3712a460" +devTypes="02" +system="phase" workMode="mock" [http]