diff --git a/CounterAcq/CounterAcq.pro b/CounterAcq/CounterAcq.pro index 2758128..72407cd 100644 --- a/CounterAcq/CounterAcq.pro +++ b/CounterAcq/CounterAcq.pro @@ -28,7 +28,7 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target -#unix:!macx: LIBS += -L$$PWD/lib/librdkafka/ -lrdkafka -lrdkafka++ +unix:!macx: LIBS += -L$$PWD/lib/librdkafka/ -lrdkafka -lrdkafka++ -#INCLUDEPATH += $$PWD/include/librdkafka -#DEPENDPATH += $$PWD/include/librdkafka +INCLUDEPATH += $$PWD/include/librdkafka +DEPENDPATH += $$PWD/include/librdkafka diff --git a/CounterAcq/CounterAcq.pro b/CounterAcq/CounterAcq.pro index 2758128..72407cd 100644 --- a/CounterAcq/CounterAcq.pro +++ b/CounterAcq/CounterAcq.pro @@ -28,7 +28,7 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target -#unix:!macx: LIBS += -L$$PWD/lib/librdkafka/ -lrdkafka -lrdkafka++ +unix:!macx: LIBS += -L$$PWD/lib/librdkafka/ -lrdkafka -lrdkafka++ -#INCLUDEPATH += $$PWD/include/librdkafka -#DEPENDPATH += $$PWD/include/librdkafka +INCLUDEPATH += $$PWD/include/librdkafka +DEPENDPATH += $$PWD/include/librdkafka diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp index a6f0bd1..ad19c60 100644 --- a/CounterAcq/CounterDevice.cpp +++ b/CounterAcq/CounterDevice.cpp @@ -12,9 +12,9 @@ connect(this, &CounterDevice::successDataCalculate, this, &CounterDevice::afterFramePhase); -// kafkaUtil.setBrokers(SettingConfig::getInstance().KAFKA_BROKERS); -// kafkaUtil.setTopic(SettingConfig::getInstance().KAFKA_DATA_TOPIC); -// kafkaUtil.createProducer(); + kafkaUtil.setBrokers(SettingConfig::getInstance().KAFKA_BROKERS); + kafkaUtil.setTopic(SettingConfig::getInstance().KAFKA_DATA_TOPIC); + kafkaUtil.createProducer(); } CounterDevice::~CounterDevice() @@ -123,7 +123,7 @@ QJsonObject jsonObj = counterData->toJSON(); jsonObj.insert("clientId", SettingConfig::getInstance().CLIENT_ID); jsonObj.insert("deviceId", deviceId); -// kafkaUtil.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact))); + kafkaUtil.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact))); } // 4. 在界面上简单显示相差数据结果 diff --git a/CounterAcq/CounterAcq.pro b/CounterAcq/CounterAcq.pro index 2758128..72407cd 100644 --- a/CounterAcq/CounterAcq.pro +++ b/CounterAcq/CounterAcq.pro @@ -28,7 +28,7 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target -#unix:!macx: LIBS += -L$$PWD/lib/librdkafka/ -lrdkafka -lrdkafka++ +unix:!macx: LIBS += -L$$PWD/lib/librdkafka/ -lrdkafka -lrdkafka++ -#INCLUDEPATH += $$PWD/include/librdkafka -#DEPENDPATH += $$PWD/include/librdkafka +INCLUDEPATH += $$PWD/include/librdkafka +DEPENDPATH += $$PWD/include/librdkafka diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp index a6f0bd1..ad19c60 100644 --- a/CounterAcq/CounterDevice.cpp +++ b/CounterAcq/CounterDevice.cpp @@ -12,9 +12,9 @@ connect(this, &CounterDevice::successDataCalculate, this, &CounterDevice::afterFramePhase); -// kafkaUtil.setBrokers(SettingConfig::getInstance().KAFKA_BROKERS); -// kafkaUtil.setTopic(SettingConfig::getInstance().KAFKA_DATA_TOPIC); -// kafkaUtil.createProducer(); + kafkaUtil.setBrokers(SettingConfig::getInstance().KAFKA_BROKERS); + kafkaUtil.setTopic(SettingConfig::getInstance().KAFKA_DATA_TOPIC); + kafkaUtil.createProducer(); } CounterDevice::~CounterDevice() @@ -123,7 +123,7 @@ QJsonObject jsonObj = counterData->toJSON(); jsonObj.insert("clientId", SettingConfig::getInstance().CLIENT_ID); jsonObj.insert("deviceId", deviceId); -// kafkaUtil.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact))); + kafkaUtil.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact))); } // 4. 在界面上简单显示相差数据结果 diff --git a/CounterAcq/CounterDevice.h b/CounterAcq/CounterDevice.h index b15e44f..654a96d 100644 --- a/CounterAcq/CounterDevice.h +++ b/CounterAcq/CounterDevice.h @@ -4,7 +4,7 @@ #include #include "common/utils/QSerialPortUtil.h" -//#include "common/utils/QKafkaUtil.h" +#include "common/utils/QKafkaUtil.h" #include "common/utils/QByteUtil.h" #include "common/utils/QLogUtil.h" #include "common/utils/SettingConfig.h" @@ -34,7 +34,7 @@ int baudRate; QSerialPortUtil serialUtil; -// QKafkaUtil kafkaUtil; + QKafkaUtil kafkaUtil; QByteArray dataBuff; QMap bench; diff --git a/CounterAcq/CounterAcq.pro b/CounterAcq/CounterAcq.pro index 2758128..72407cd 100644 --- a/CounterAcq/CounterAcq.pro +++ b/CounterAcq/CounterAcq.pro @@ -28,7 +28,7 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target -#unix:!macx: LIBS += -L$$PWD/lib/librdkafka/ -lrdkafka -lrdkafka++ +unix:!macx: LIBS += -L$$PWD/lib/librdkafka/ -lrdkafka -lrdkafka++ -#INCLUDEPATH += $$PWD/include/librdkafka -#DEPENDPATH += $$PWD/include/librdkafka +INCLUDEPATH += $$PWD/include/librdkafka +DEPENDPATH += $$PWD/include/librdkafka diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp index a6f0bd1..ad19c60 100644 --- a/CounterAcq/CounterDevice.cpp +++ b/CounterAcq/CounterDevice.cpp @@ -12,9 +12,9 @@ connect(this, &CounterDevice::successDataCalculate, this, &CounterDevice::afterFramePhase); -// kafkaUtil.setBrokers(SettingConfig::getInstance().KAFKA_BROKERS); -// kafkaUtil.setTopic(SettingConfig::getInstance().KAFKA_DATA_TOPIC); -// kafkaUtil.createProducer(); + kafkaUtil.setBrokers(SettingConfig::getInstance().KAFKA_BROKERS); + kafkaUtil.setTopic(SettingConfig::getInstance().KAFKA_DATA_TOPIC); + kafkaUtil.createProducer(); } CounterDevice::~CounterDevice() @@ -123,7 +123,7 @@ QJsonObject jsonObj = counterData->toJSON(); jsonObj.insert("clientId", SettingConfig::getInstance().CLIENT_ID); jsonObj.insert("deviceId", deviceId); -// kafkaUtil.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact))); + kafkaUtil.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact))); } // 4. 在界面上简单显示相差数据结果 diff --git a/CounterAcq/CounterDevice.h b/CounterAcq/CounterDevice.h index b15e44f..654a96d 100644 --- a/CounterAcq/CounterDevice.h +++ b/CounterAcq/CounterDevice.h @@ -4,7 +4,7 @@ #include #include "common/utils/QSerialPortUtil.h" -//#include "common/utils/QKafkaUtil.h" +#include "common/utils/QKafkaUtil.h" #include "common/utils/QByteUtil.h" #include "common/utils/QLogUtil.h" #include "common/utils/SettingConfig.h" @@ -34,7 +34,7 @@ int baudRate; QSerialPortUtil serialUtil; -// QKafkaUtil kafkaUtil; + QKafkaUtil kafkaUtil; QByteArray dataBuff; QMap bench; diff --git a/CounterAcq/CounterWindow.cpp b/CounterAcq/CounterWindow.cpp index f8278f6..80035a9 100644 --- a/CounterAcq/CounterWindow.cpp +++ b/CounterAcq/CounterWindow.cpp @@ -192,9 +192,6 @@ void CounterWindow::drawCounterDataOnPage(CounterDataDto * counterData) { - // 1. 判断数据属于哪个设备,显示在不同的widget上 -// qDebug() << counterData->toJSON() << counterData->devCode << "---" << counterData->frameId; - // 当前显示的设备编号 QString currentDevCode = ui->devSelect->currentData().toString(); @@ -204,6 +201,9 @@ return; } + // 1. 判断数据属于哪个设备,显示在不同的widget上 +// qDebug() << counterData->toJSON() << counterData->devCode << "---" << counterData->frameId; + // 获取对应的通道BOX QGroupBox * channelBox = (QGroupBox *)ui->scrollContents->children().at(counterData->channelId); diff --git a/CounterAcq/CounterAcq.pro b/CounterAcq/CounterAcq.pro index 2758128..72407cd 100644 --- a/CounterAcq/CounterAcq.pro +++ b/CounterAcq/CounterAcq.pro @@ -28,7 +28,7 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target -#unix:!macx: LIBS += -L$$PWD/lib/librdkafka/ -lrdkafka -lrdkafka++ +unix:!macx: LIBS += -L$$PWD/lib/librdkafka/ -lrdkafka -lrdkafka++ -#INCLUDEPATH += $$PWD/include/librdkafka -#DEPENDPATH += $$PWD/include/librdkafka +INCLUDEPATH += $$PWD/include/librdkafka +DEPENDPATH += $$PWD/include/librdkafka diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp index a6f0bd1..ad19c60 100644 --- a/CounterAcq/CounterDevice.cpp +++ b/CounterAcq/CounterDevice.cpp @@ -12,9 +12,9 @@ connect(this, &CounterDevice::successDataCalculate, this, &CounterDevice::afterFramePhase); -// kafkaUtil.setBrokers(SettingConfig::getInstance().KAFKA_BROKERS); -// kafkaUtil.setTopic(SettingConfig::getInstance().KAFKA_DATA_TOPIC); -// kafkaUtil.createProducer(); + kafkaUtil.setBrokers(SettingConfig::getInstance().KAFKA_BROKERS); + kafkaUtil.setTopic(SettingConfig::getInstance().KAFKA_DATA_TOPIC); + kafkaUtil.createProducer(); } CounterDevice::~CounterDevice() @@ -123,7 +123,7 @@ QJsonObject jsonObj = counterData->toJSON(); jsonObj.insert("clientId", SettingConfig::getInstance().CLIENT_ID); jsonObj.insert("deviceId", deviceId); -// kafkaUtil.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact))); + kafkaUtil.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact))); } // 4. 在界面上简单显示相差数据结果 diff --git a/CounterAcq/CounterDevice.h b/CounterAcq/CounterDevice.h index b15e44f..654a96d 100644 --- a/CounterAcq/CounterDevice.h +++ b/CounterAcq/CounterDevice.h @@ -4,7 +4,7 @@ #include #include "common/utils/QSerialPortUtil.h" -//#include "common/utils/QKafkaUtil.h" +#include "common/utils/QKafkaUtil.h" #include "common/utils/QByteUtil.h" #include "common/utils/QLogUtil.h" #include "common/utils/SettingConfig.h" @@ -34,7 +34,7 @@ int baudRate; QSerialPortUtil serialUtil; -// QKafkaUtil kafkaUtil; + QKafkaUtil kafkaUtil; QByteArray dataBuff; QMap bench; diff --git a/CounterAcq/CounterWindow.cpp b/CounterAcq/CounterWindow.cpp index f8278f6..80035a9 100644 --- a/CounterAcq/CounterWindow.cpp +++ b/CounterAcq/CounterWindow.cpp @@ -192,9 +192,6 @@ void CounterWindow::drawCounterDataOnPage(CounterDataDto * counterData) { - // 1. 判断数据属于哪个设备,显示在不同的widget上 -// qDebug() << counterData->toJSON() << counterData->devCode << "---" << counterData->frameId; - // 当前显示的设备编号 QString currentDevCode = ui->devSelect->currentData().toString(); @@ -204,6 +201,9 @@ return; } + // 1. 判断数据属于哪个设备,显示在不同的widget上 +// qDebug() << counterData->toJSON() << counterData->devCode << "---" << counterData->frameId; + // 获取对应的通道BOX QGroupBox * channelBox = (QGroupBox *)ui->scrollContents->children().at(counterData->channelId); diff --git a/CounterAcq/CounterWindow.h b/CounterAcq/CounterWindow.h index 3273433..8d5e4a6 100644 --- a/CounterAcq/CounterWindow.h +++ b/CounterAcq/CounterWindow.h @@ -7,7 +7,7 @@ #include #include "common/utils/SettingConfig.h" -//#include "common/utils/QKafkaUtil.h" +#include "common/utils/QKafkaUtil.h" #include "common/HttpRequestController.h" #include "CounterDevice.h" diff --git a/CounterAcq/CounterAcq.pro b/CounterAcq/CounterAcq.pro index 2758128..72407cd 100644 --- a/CounterAcq/CounterAcq.pro +++ b/CounterAcq/CounterAcq.pro @@ -28,7 +28,7 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target -#unix:!macx: LIBS += -L$$PWD/lib/librdkafka/ -lrdkafka -lrdkafka++ +unix:!macx: LIBS += -L$$PWD/lib/librdkafka/ -lrdkafka -lrdkafka++ -#INCLUDEPATH += $$PWD/include/librdkafka -#DEPENDPATH += $$PWD/include/librdkafka +INCLUDEPATH += $$PWD/include/librdkafka +DEPENDPATH += $$PWD/include/librdkafka diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp index a6f0bd1..ad19c60 100644 --- a/CounterAcq/CounterDevice.cpp +++ b/CounterAcq/CounterDevice.cpp @@ -12,9 +12,9 @@ connect(this, &CounterDevice::successDataCalculate, this, &CounterDevice::afterFramePhase); -// kafkaUtil.setBrokers(SettingConfig::getInstance().KAFKA_BROKERS); -// kafkaUtil.setTopic(SettingConfig::getInstance().KAFKA_DATA_TOPIC); -// kafkaUtil.createProducer(); + kafkaUtil.setBrokers(SettingConfig::getInstance().KAFKA_BROKERS); + kafkaUtil.setTopic(SettingConfig::getInstance().KAFKA_DATA_TOPIC); + kafkaUtil.createProducer(); } CounterDevice::~CounterDevice() @@ -123,7 +123,7 @@ QJsonObject jsonObj = counterData->toJSON(); jsonObj.insert("clientId", SettingConfig::getInstance().CLIENT_ID); jsonObj.insert("deviceId", deviceId); -// kafkaUtil.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact))); + kafkaUtil.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact))); } // 4. 在界面上简单显示相差数据结果 diff --git a/CounterAcq/CounterDevice.h b/CounterAcq/CounterDevice.h index b15e44f..654a96d 100644 --- a/CounterAcq/CounterDevice.h +++ b/CounterAcq/CounterDevice.h @@ -4,7 +4,7 @@ #include #include "common/utils/QSerialPortUtil.h" -//#include "common/utils/QKafkaUtil.h" +#include "common/utils/QKafkaUtil.h" #include "common/utils/QByteUtil.h" #include "common/utils/QLogUtil.h" #include "common/utils/SettingConfig.h" @@ -34,7 +34,7 @@ int baudRate; QSerialPortUtil serialUtil; -// QKafkaUtil kafkaUtil; + QKafkaUtil kafkaUtil; QByteArray dataBuff; QMap bench; diff --git a/CounterAcq/CounterWindow.cpp b/CounterAcq/CounterWindow.cpp index f8278f6..80035a9 100644 --- a/CounterAcq/CounterWindow.cpp +++ b/CounterAcq/CounterWindow.cpp @@ -192,9 +192,6 @@ void CounterWindow::drawCounterDataOnPage(CounterDataDto * counterData) { - // 1. 判断数据属于哪个设备,显示在不同的widget上 -// qDebug() << counterData->toJSON() << counterData->devCode << "---" << counterData->frameId; - // 当前显示的设备编号 QString currentDevCode = ui->devSelect->currentData().toString(); @@ -204,6 +201,9 @@ return; } + // 1. 判断数据属于哪个设备,显示在不同的widget上 +// qDebug() << counterData->toJSON() << counterData->devCode << "---" << counterData->frameId; + // 获取对应的通道BOX QGroupBox * channelBox = (QGroupBox *)ui->scrollContents->children().at(counterData->channelId); diff --git a/CounterAcq/CounterWindow.h b/CounterAcq/CounterWindow.h index 3273433..8d5e4a6 100644 --- a/CounterAcq/CounterWindow.h +++ b/CounterAcq/CounterWindow.h @@ -7,7 +7,7 @@ #include #include "common/utils/SettingConfig.h" -//#include "common/utils/QKafkaUtil.h" +#include "common/utils/QKafkaUtil.h" #include "common/HttpRequestController.h" #include "CounterDevice.h" diff --git a/CounterAcq/common/common.pri b/CounterAcq/common/common.pri index 8f0aeae..6280f64 100644 --- a/CounterAcq/common/common.pri +++ b/CounterAcq/common/common.pri @@ -3,17 +3,16 @@ SOURCES += $$PWD/utils/QByteUtil.cpp SOURCES += $$PWD/utils/QSerialPortUtil.cpp SOURCES += $$PWD/utils/QLogUtil.cpp -#SOURCES += $$PWD/utils/QKafkaUtil.cpp +SOURCES += $$PWD/utils/QKafkaUtil.cpp SOURCES += $$PWD/utils/HttpRequestUtil.cpp SOURCES += $$PWD/utils/MD5.cpp SOURCES += $$PWD/HttpRequestController.cpp -SOURCES += HEADERS += $$PWD/utils/SettingConfig.h HEADERS += $$PWD/utils/QByteUtil.h HEADERS += $$PWD/utils/QSerialPortUtil.h HEADERS += $$PWD/utils/QLogUtil.h -#HEADERS += $$PWD/utils/QKafkaUtil.h +HEADERS += $$PWD/utils/QKafkaUtil.h HEADERS += $$PWD/utils/HttpRequestUtil.h HEADERS += $$PWD/utils/DefHead.h HEADERS += $$PWD/utils/MD5.h diff --git a/CounterAcq/CounterAcq.pro b/CounterAcq/CounterAcq.pro index 2758128..72407cd 100644 --- a/CounterAcq/CounterAcq.pro +++ b/CounterAcq/CounterAcq.pro @@ -28,7 +28,7 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target -#unix:!macx: LIBS += -L$$PWD/lib/librdkafka/ -lrdkafka -lrdkafka++ +unix:!macx: LIBS += -L$$PWD/lib/librdkafka/ -lrdkafka -lrdkafka++ -#INCLUDEPATH += $$PWD/include/librdkafka -#DEPENDPATH += $$PWD/include/librdkafka +INCLUDEPATH += $$PWD/include/librdkafka +DEPENDPATH += $$PWD/include/librdkafka diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp index a6f0bd1..ad19c60 100644 --- a/CounterAcq/CounterDevice.cpp +++ b/CounterAcq/CounterDevice.cpp @@ -12,9 +12,9 @@ connect(this, &CounterDevice::successDataCalculate, this, &CounterDevice::afterFramePhase); -// kafkaUtil.setBrokers(SettingConfig::getInstance().KAFKA_BROKERS); -// kafkaUtil.setTopic(SettingConfig::getInstance().KAFKA_DATA_TOPIC); -// kafkaUtil.createProducer(); + kafkaUtil.setBrokers(SettingConfig::getInstance().KAFKA_BROKERS); + kafkaUtil.setTopic(SettingConfig::getInstance().KAFKA_DATA_TOPIC); + kafkaUtil.createProducer(); } CounterDevice::~CounterDevice() @@ -123,7 +123,7 @@ QJsonObject jsonObj = counterData->toJSON(); jsonObj.insert("clientId", SettingConfig::getInstance().CLIENT_ID); jsonObj.insert("deviceId", deviceId); -// kafkaUtil.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact))); + kafkaUtil.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact))); } // 4. 在界面上简单显示相差数据结果 diff --git a/CounterAcq/CounterDevice.h b/CounterAcq/CounterDevice.h index b15e44f..654a96d 100644 --- a/CounterAcq/CounterDevice.h +++ b/CounterAcq/CounterDevice.h @@ -4,7 +4,7 @@ #include #include "common/utils/QSerialPortUtil.h" -//#include "common/utils/QKafkaUtil.h" +#include "common/utils/QKafkaUtil.h" #include "common/utils/QByteUtil.h" #include "common/utils/QLogUtil.h" #include "common/utils/SettingConfig.h" @@ -34,7 +34,7 @@ int baudRate; QSerialPortUtil serialUtil; -// QKafkaUtil kafkaUtil; + QKafkaUtil kafkaUtil; QByteArray dataBuff; QMap bench; diff --git a/CounterAcq/CounterWindow.cpp b/CounterAcq/CounterWindow.cpp index f8278f6..80035a9 100644 --- a/CounterAcq/CounterWindow.cpp +++ b/CounterAcq/CounterWindow.cpp @@ -192,9 +192,6 @@ void CounterWindow::drawCounterDataOnPage(CounterDataDto * counterData) { - // 1. 判断数据属于哪个设备,显示在不同的widget上 -// qDebug() << counterData->toJSON() << counterData->devCode << "---" << counterData->frameId; - // 当前显示的设备编号 QString currentDevCode = ui->devSelect->currentData().toString(); @@ -204,6 +201,9 @@ return; } + // 1. 判断数据属于哪个设备,显示在不同的widget上 +// qDebug() << counterData->toJSON() << counterData->devCode << "---" << counterData->frameId; + // 获取对应的通道BOX QGroupBox * channelBox = (QGroupBox *)ui->scrollContents->children().at(counterData->channelId); diff --git a/CounterAcq/CounterWindow.h b/CounterAcq/CounterWindow.h index 3273433..8d5e4a6 100644 --- a/CounterAcq/CounterWindow.h +++ b/CounterAcq/CounterWindow.h @@ -7,7 +7,7 @@ #include #include "common/utils/SettingConfig.h" -//#include "common/utils/QKafkaUtil.h" +#include "common/utils/QKafkaUtil.h" #include "common/HttpRequestController.h" #include "CounterDevice.h" diff --git a/CounterAcq/common/common.pri b/CounterAcq/common/common.pri index 8f0aeae..6280f64 100644 --- a/CounterAcq/common/common.pri +++ b/CounterAcq/common/common.pri @@ -3,17 +3,16 @@ SOURCES += $$PWD/utils/QByteUtil.cpp SOURCES += $$PWD/utils/QSerialPortUtil.cpp SOURCES += $$PWD/utils/QLogUtil.cpp -#SOURCES += $$PWD/utils/QKafkaUtil.cpp +SOURCES += $$PWD/utils/QKafkaUtil.cpp SOURCES += $$PWD/utils/HttpRequestUtil.cpp SOURCES += $$PWD/utils/MD5.cpp SOURCES += $$PWD/HttpRequestController.cpp -SOURCES += HEADERS += $$PWD/utils/SettingConfig.h HEADERS += $$PWD/utils/QByteUtil.h HEADERS += $$PWD/utils/QSerialPortUtil.h HEADERS += $$PWD/utils/QLogUtil.h -#HEADERS += $$PWD/utils/QKafkaUtil.h +HEADERS += $$PWD/utils/QKafkaUtil.h HEADERS += $$PWD/utils/HttpRequestUtil.h HEADERS += $$PWD/utils/DefHead.h HEADERS += $$PWD/utils/MD5.h diff --git a/CounterAcq/common/utils/QLogUtil.cpp b/CounterAcq/common/utils/QLogUtil.cpp index 6ec3d80..43d8655 100644 --- a/CounterAcq/common/utils/QLogUtil.cpp +++ b/CounterAcq/common/utils/QLogUtil.cpp @@ -37,7 +37,7 @@ void QLogUtil::writeRawDataLogByDate(QString date, QString filename, QString content) { QString basePath = SettingConfig::getInstance().BASE_LOG_PATH; - QString datePath = basePath + date + "\\"; + QString datePath = basePath + date + "/"; QStringList pathList; pathList.append(basePath); @@ -57,7 +57,7 @@ void QLogUtil::writeChannelDataLogByDate(QString date, QString filename, QString content) { QString basePath = SettingConfig::getInstance().BASE_LOG_PATH; - QString datePath = basePath + date + "\\"; + QString datePath = basePath + date + "/"; QStringList pathList; pathList.append(basePath); diff --git a/CounterAcq/CounterAcq.pro b/CounterAcq/CounterAcq.pro index 2758128..72407cd 100644 --- a/CounterAcq/CounterAcq.pro +++ b/CounterAcq/CounterAcq.pro @@ -28,7 +28,7 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target -#unix:!macx: LIBS += -L$$PWD/lib/librdkafka/ -lrdkafka -lrdkafka++ +unix:!macx: LIBS += -L$$PWD/lib/librdkafka/ -lrdkafka -lrdkafka++ -#INCLUDEPATH += $$PWD/include/librdkafka -#DEPENDPATH += $$PWD/include/librdkafka +INCLUDEPATH += $$PWD/include/librdkafka +DEPENDPATH += $$PWD/include/librdkafka diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp index a6f0bd1..ad19c60 100644 --- a/CounterAcq/CounterDevice.cpp +++ b/CounterAcq/CounterDevice.cpp @@ -12,9 +12,9 @@ connect(this, &CounterDevice::successDataCalculate, this, &CounterDevice::afterFramePhase); -// kafkaUtil.setBrokers(SettingConfig::getInstance().KAFKA_BROKERS); -// kafkaUtil.setTopic(SettingConfig::getInstance().KAFKA_DATA_TOPIC); -// kafkaUtil.createProducer(); + kafkaUtil.setBrokers(SettingConfig::getInstance().KAFKA_BROKERS); + kafkaUtil.setTopic(SettingConfig::getInstance().KAFKA_DATA_TOPIC); + kafkaUtil.createProducer(); } CounterDevice::~CounterDevice() @@ -123,7 +123,7 @@ QJsonObject jsonObj = counterData->toJSON(); jsonObj.insert("clientId", SettingConfig::getInstance().CLIENT_ID); jsonObj.insert("deviceId", deviceId); -// kafkaUtil.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact))); + kafkaUtil.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact))); } // 4. 在界面上简单显示相差数据结果 diff --git a/CounterAcq/CounterDevice.h b/CounterAcq/CounterDevice.h index b15e44f..654a96d 100644 --- a/CounterAcq/CounterDevice.h +++ b/CounterAcq/CounterDevice.h @@ -4,7 +4,7 @@ #include #include "common/utils/QSerialPortUtil.h" -//#include "common/utils/QKafkaUtil.h" +#include "common/utils/QKafkaUtil.h" #include "common/utils/QByteUtil.h" #include "common/utils/QLogUtil.h" #include "common/utils/SettingConfig.h" @@ -34,7 +34,7 @@ int baudRate; QSerialPortUtil serialUtil; -// QKafkaUtil kafkaUtil; + QKafkaUtil kafkaUtil; QByteArray dataBuff; QMap bench; diff --git a/CounterAcq/CounterWindow.cpp b/CounterAcq/CounterWindow.cpp index f8278f6..80035a9 100644 --- a/CounterAcq/CounterWindow.cpp +++ b/CounterAcq/CounterWindow.cpp @@ -192,9 +192,6 @@ void CounterWindow::drawCounterDataOnPage(CounterDataDto * counterData) { - // 1. 判断数据属于哪个设备,显示在不同的widget上 -// qDebug() << counterData->toJSON() << counterData->devCode << "---" << counterData->frameId; - // 当前显示的设备编号 QString currentDevCode = ui->devSelect->currentData().toString(); @@ -204,6 +201,9 @@ return; } + // 1. 判断数据属于哪个设备,显示在不同的widget上 +// qDebug() << counterData->toJSON() << counterData->devCode << "---" << counterData->frameId; + // 获取对应的通道BOX QGroupBox * channelBox = (QGroupBox *)ui->scrollContents->children().at(counterData->channelId); diff --git a/CounterAcq/CounterWindow.h b/CounterAcq/CounterWindow.h index 3273433..8d5e4a6 100644 --- a/CounterAcq/CounterWindow.h +++ b/CounterAcq/CounterWindow.h @@ -7,7 +7,7 @@ #include #include "common/utils/SettingConfig.h" -//#include "common/utils/QKafkaUtil.h" +#include "common/utils/QKafkaUtil.h" #include "common/HttpRequestController.h" #include "CounterDevice.h" diff --git a/CounterAcq/common/common.pri b/CounterAcq/common/common.pri index 8f0aeae..6280f64 100644 --- a/CounterAcq/common/common.pri +++ b/CounterAcq/common/common.pri @@ -3,17 +3,16 @@ SOURCES += $$PWD/utils/QByteUtil.cpp SOURCES += $$PWD/utils/QSerialPortUtil.cpp SOURCES += $$PWD/utils/QLogUtil.cpp -#SOURCES += $$PWD/utils/QKafkaUtil.cpp +SOURCES += $$PWD/utils/QKafkaUtil.cpp SOURCES += $$PWD/utils/HttpRequestUtil.cpp SOURCES += $$PWD/utils/MD5.cpp SOURCES += $$PWD/HttpRequestController.cpp -SOURCES += HEADERS += $$PWD/utils/SettingConfig.h HEADERS += $$PWD/utils/QByteUtil.h HEADERS += $$PWD/utils/QSerialPortUtil.h HEADERS += $$PWD/utils/QLogUtil.h -#HEADERS += $$PWD/utils/QKafkaUtil.h +HEADERS += $$PWD/utils/QKafkaUtil.h HEADERS += $$PWD/utils/HttpRequestUtil.h HEADERS += $$PWD/utils/DefHead.h HEADERS += $$PWD/utils/MD5.h diff --git a/CounterAcq/common/utils/QLogUtil.cpp b/CounterAcq/common/utils/QLogUtil.cpp index 6ec3d80..43d8655 100644 --- a/CounterAcq/common/utils/QLogUtil.cpp +++ b/CounterAcq/common/utils/QLogUtil.cpp @@ -37,7 +37,7 @@ void QLogUtil::writeRawDataLogByDate(QString date, QString filename, QString content) { QString basePath = SettingConfig::getInstance().BASE_LOG_PATH; - QString datePath = basePath + date + "\\"; + QString datePath = basePath + date + "/"; QStringList pathList; pathList.append(basePath); @@ -57,7 +57,7 @@ void QLogUtil::writeChannelDataLogByDate(QString date, QString filename, QString content) { QString basePath = SettingConfig::getInstance().BASE_LOG_PATH; - QString datePath = basePath + date + "\\"; + QString datePath = basePath + date + "/"; QStringList pathList; pathList.append(basePath); diff --git a/CounterAcq/common/utils/QSerialPortUtil.cpp b/CounterAcq/common/utils/QSerialPortUtil.cpp index 7af0555..2da13b2 100644 --- a/CounterAcq/common/utils/QSerialPortUtil.cpp +++ b/CounterAcq/common/utils/QSerialPortUtil.cpp @@ -63,7 +63,7 @@ QByteArray buffer; QString channel = QString("%1").arg(i); - QString channelRef = "3"; + QString channelRef = "1"; QString dataValue = QString("%1").arg(qrand() % 400); QString level = QString("%1").arg(qrand() % 4 / (double) 10); QString frameId = QString("%1").arg(now.toSecsSinceEpoch() % 10000);