diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp index ae2ccd4..9de69d6 100644 --- a/CounterAcq/CounterDevice.cpp +++ b/CounterAcq/CounterDevice.cpp @@ -6,22 +6,15 @@ CounterDevice::CounterDevice(QObject *parent) : QObject(parent) { - this->udpClient = new QUdpSocket(this); -// udpClient->bind(QHostAddress("192.168.1.213"), 8089, QUdpSocket::ShareAddress); - udpClient->writeDatagram("hello", QHostAddress("192.168.1.213"), 8089); - - connect(udpClient, &QUdpSocket::readyRead, - this, &CounterDevice::dataReceivedHandlerByUDP); - connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &CounterDevice::dataReceivedHandler); 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() @@ -66,6 +59,8 @@ { this->dataBuff.append(data); + std::cout << dataBuff.toStdString() << std::endl; + CounterDataDto * counterData = new CounterDataDto(this); if (CounterProtocolXH::checkFrame(this->dataBuff) == true) { @@ -147,7 +142,7 @@ QJsonObject jsonObj = counterData->toJSON(i - 1); 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))); } } } diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp index ae2ccd4..9de69d6 100644 --- a/CounterAcq/CounterDevice.cpp +++ b/CounterAcq/CounterDevice.cpp @@ -6,22 +6,15 @@ CounterDevice::CounterDevice(QObject *parent) : QObject(parent) { - this->udpClient = new QUdpSocket(this); -// udpClient->bind(QHostAddress("192.168.1.213"), 8089, QUdpSocket::ShareAddress); - udpClient->writeDatagram("hello", QHostAddress("192.168.1.213"), 8089); - - connect(udpClient, &QUdpSocket::readyRead, - this, &CounterDevice::dataReceivedHandlerByUDP); - connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &CounterDevice::dataReceivedHandler); 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() @@ -66,6 +59,8 @@ { this->dataBuff.append(data); + std::cout << dataBuff.toStdString() << std::endl; + CounterDataDto * counterData = new CounterDataDto(this); if (CounterProtocolXH::checkFrame(this->dataBuff) == true) { @@ -147,7 +142,7 @@ QJsonObject jsonObj = counterData->toJSON(i - 1); 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))); } } } diff --git a/CounterAcq/CounterDevice.h b/CounterAcq/CounterDevice.h index 4db2f79..3776042 100644 --- a/CounterAcq/CounterDevice.h +++ b/CounterAcq/CounterDevice.h @@ -5,7 +5,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" @@ -35,7 +35,7 @@ int baudRate; QSerialPortUtil serialUtil; - QKafkaUtil kafkaUtil; +// QKafkaUtil kafkaUtil; QByteArray dataBuff; QUdpSocket * udpClient; diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp index ae2ccd4..9de69d6 100644 --- a/CounterAcq/CounterDevice.cpp +++ b/CounterAcq/CounterDevice.cpp @@ -6,22 +6,15 @@ CounterDevice::CounterDevice(QObject *parent) : QObject(parent) { - this->udpClient = new QUdpSocket(this); -// udpClient->bind(QHostAddress("192.168.1.213"), 8089, QUdpSocket::ShareAddress); - udpClient->writeDatagram("hello", QHostAddress("192.168.1.213"), 8089); - - connect(udpClient, &QUdpSocket::readyRead, - this, &CounterDevice::dataReceivedHandlerByUDP); - connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &CounterDevice::dataReceivedHandler); 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() @@ -66,6 +59,8 @@ { this->dataBuff.append(data); + std::cout << dataBuff.toStdString() << std::endl; + CounterDataDto * counterData = new CounterDataDto(this); if (CounterProtocolXH::checkFrame(this->dataBuff) == true) { @@ -147,7 +142,7 @@ QJsonObject jsonObj = counterData->toJSON(i - 1); 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))); } } } diff --git a/CounterAcq/CounterDevice.h b/CounterAcq/CounterDevice.h index 4db2f79..3776042 100644 --- a/CounterAcq/CounterDevice.h +++ b/CounterAcq/CounterDevice.h @@ -5,7 +5,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" @@ -35,7 +35,7 @@ int baudRate; QSerialPortUtil serialUtil; - QKafkaUtil kafkaUtil; +// QKafkaUtil kafkaUtil; QByteArray dataBuff; QUdpSocket * udpClient; diff --git a/CounterAcq/CounterWindow.cpp b/CounterAcq/CounterWindow.cpp index 1dc37bf..0840fb2 100644 --- a/CounterAcq/CounterWindow.cpp +++ b/CounterAcq/CounterWindow.cpp @@ -55,7 +55,7 @@ // 4. 将获取到的设备添加到下拉列表框中 QJsonArray devArray = devListRes.find("data")->toArray(); - for (int i =0; i < 1; i++) + for (int i =0; i < devArray.size(); i++) { QJsonObject devItem = devArray.at(i).toObject(); ui->devSelect->addItem(devItem.find("deviceName")->toString(), devItem.find("deviceNo")->toString()); @@ -71,7 +71,7 @@ connect(device, &CounterDevice::sendDataToDraw, this, &CounterWindow::drawCounterDataOnPage); -// device->initSerialPort(); + device->initSerialPort(); QThread::msleep(200); } diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp index ae2ccd4..9de69d6 100644 --- a/CounterAcq/CounterDevice.cpp +++ b/CounterAcq/CounterDevice.cpp @@ -6,22 +6,15 @@ CounterDevice::CounterDevice(QObject *parent) : QObject(parent) { - this->udpClient = new QUdpSocket(this); -// udpClient->bind(QHostAddress("192.168.1.213"), 8089, QUdpSocket::ShareAddress); - udpClient->writeDatagram("hello", QHostAddress("192.168.1.213"), 8089); - - connect(udpClient, &QUdpSocket::readyRead, - this, &CounterDevice::dataReceivedHandlerByUDP); - connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &CounterDevice::dataReceivedHandler); 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() @@ -66,6 +59,8 @@ { this->dataBuff.append(data); + std::cout << dataBuff.toStdString() << std::endl; + CounterDataDto * counterData = new CounterDataDto(this); if (CounterProtocolXH::checkFrame(this->dataBuff) == true) { @@ -147,7 +142,7 @@ QJsonObject jsonObj = counterData->toJSON(i - 1); 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))); } } } diff --git a/CounterAcq/CounterDevice.h b/CounterAcq/CounterDevice.h index 4db2f79..3776042 100644 --- a/CounterAcq/CounterDevice.h +++ b/CounterAcq/CounterDevice.h @@ -5,7 +5,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" @@ -35,7 +35,7 @@ int baudRate; QSerialPortUtil serialUtil; - QKafkaUtil kafkaUtil; +// QKafkaUtil kafkaUtil; QByteArray dataBuff; QUdpSocket * udpClient; diff --git a/CounterAcq/CounterWindow.cpp b/CounterAcq/CounterWindow.cpp index 1dc37bf..0840fb2 100644 --- a/CounterAcq/CounterWindow.cpp +++ b/CounterAcq/CounterWindow.cpp @@ -55,7 +55,7 @@ // 4. 将获取到的设备添加到下拉列表框中 QJsonArray devArray = devListRes.find("data")->toArray(); - for (int i =0; i < 1; i++) + for (int i =0; i < devArray.size(); i++) { QJsonObject devItem = devArray.at(i).toObject(); ui->devSelect->addItem(devItem.find("deviceName")->toString(), devItem.find("deviceNo")->toString()); @@ -71,7 +71,7 @@ connect(device, &CounterDevice::sendDataToDraw, this, &CounterWindow::drawCounterDataOnPage); -// device->initSerialPort(); + device->initSerialPort(); QThread::msleep(200); } diff --git a/CounterAcq/common/common.pri b/CounterAcq/common/common.pri index 6280f64..84f57ae 100644 --- a/CounterAcq/common/common.pri +++ b/CounterAcq/common/common.pri @@ -3,7 +3,7 @@ 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 @@ -12,7 +12,7 @@ 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/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp index ae2ccd4..9de69d6 100644 --- a/CounterAcq/CounterDevice.cpp +++ b/CounterAcq/CounterDevice.cpp @@ -6,22 +6,15 @@ CounterDevice::CounterDevice(QObject *parent) : QObject(parent) { - this->udpClient = new QUdpSocket(this); -// udpClient->bind(QHostAddress("192.168.1.213"), 8089, QUdpSocket::ShareAddress); - udpClient->writeDatagram("hello", QHostAddress("192.168.1.213"), 8089); - - connect(udpClient, &QUdpSocket::readyRead, - this, &CounterDevice::dataReceivedHandlerByUDP); - connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &CounterDevice::dataReceivedHandler); 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() @@ -66,6 +59,8 @@ { this->dataBuff.append(data); + std::cout << dataBuff.toStdString() << std::endl; + CounterDataDto * counterData = new CounterDataDto(this); if (CounterProtocolXH::checkFrame(this->dataBuff) == true) { @@ -147,7 +142,7 @@ QJsonObject jsonObj = counterData->toJSON(i - 1); 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))); } } } diff --git a/CounterAcq/CounterDevice.h b/CounterAcq/CounterDevice.h index 4db2f79..3776042 100644 --- a/CounterAcq/CounterDevice.h +++ b/CounterAcq/CounterDevice.h @@ -5,7 +5,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" @@ -35,7 +35,7 @@ int baudRate; QSerialPortUtil serialUtil; - QKafkaUtil kafkaUtil; +// QKafkaUtil kafkaUtil; QByteArray dataBuff; QUdpSocket * udpClient; diff --git a/CounterAcq/CounterWindow.cpp b/CounterAcq/CounterWindow.cpp index 1dc37bf..0840fb2 100644 --- a/CounterAcq/CounterWindow.cpp +++ b/CounterAcq/CounterWindow.cpp @@ -55,7 +55,7 @@ // 4. 将获取到的设备添加到下拉列表框中 QJsonArray devArray = devListRes.find("data")->toArray(); - for (int i =0; i < 1; i++) + for (int i =0; i < devArray.size(); i++) { QJsonObject devItem = devArray.at(i).toObject(); ui->devSelect->addItem(devItem.find("deviceName")->toString(), devItem.find("deviceNo")->toString()); @@ -71,7 +71,7 @@ connect(device, &CounterDevice::sendDataToDraw, this, &CounterWindow::drawCounterDataOnPage); -// device->initSerialPort(); + device->initSerialPort(); QThread::msleep(200); } diff --git a/CounterAcq/common/common.pri b/CounterAcq/common/common.pri index 6280f64..84f57ae 100644 --- a/CounterAcq/common/common.pri +++ b/CounterAcq/common/common.pri @@ -3,7 +3,7 @@ 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 @@ -12,7 +12,7 @@ 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/QSerialPortUtil.cpp b/CounterAcq/common/utils/QSerialPortUtil.cpp index 1710f93..5c800ce 100644 --- a/CounterAcq/common/utils/QSerialPortUtil.cpp +++ b/CounterAcq/common/utils/QSerialPortUtil.cpp @@ -23,8 +23,8 @@ // if (open == true) // { // 绑定信号与槽 - connect(&serial, &QSerialPort::readyRead, - this, &QSerialPortUtil::readData); +// connect(&serial, &QSerialPort::readyRead, +// this, &QSerialPortUtil::readData); // mock data received per second QTimer * timer = new QTimer(this); @@ -77,7 +77,7 @@ for (int i = 1; i < 16; i++) { - int valid = validStr.mid(i, 1).toInt(); + int valid = validStr.mid(16 - i, 1).toInt(); int zero = qrand() % 2; double data = qrand() % 200 * 1e-12; @@ -94,6 +94,9 @@ buffer.append(statusBuff).append(dataBuff).append("0"); + buffer.clear(); + buffer.append("$XHTSXHPT0001160101002806276|1000000000000001101|+0.000000000000|+0.033835598754|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000^"); + emit dataRecieved(buffer); // for (int i = 1; i <= 8; i++) // { diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp index ae2ccd4..9de69d6 100644 --- a/CounterAcq/CounterDevice.cpp +++ b/CounterAcq/CounterDevice.cpp @@ -6,22 +6,15 @@ CounterDevice::CounterDevice(QObject *parent) : QObject(parent) { - this->udpClient = new QUdpSocket(this); -// udpClient->bind(QHostAddress("192.168.1.213"), 8089, QUdpSocket::ShareAddress); - udpClient->writeDatagram("hello", QHostAddress("192.168.1.213"), 8089); - - connect(udpClient, &QUdpSocket::readyRead, - this, &CounterDevice::dataReceivedHandlerByUDP); - connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &CounterDevice::dataReceivedHandler); 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() @@ -66,6 +59,8 @@ { this->dataBuff.append(data); + std::cout << dataBuff.toStdString() << std::endl; + CounterDataDto * counterData = new CounterDataDto(this); if (CounterProtocolXH::checkFrame(this->dataBuff) == true) { @@ -147,7 +142,7 @@ QJsonObject jsonObj = counterData->toJSON(i - 1); 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))); } } } diff --git a/CounterAcq/CounterDevice.h b/CounterAcq/CounterDevice.h index 4db2f79..3776042 100644 --- a/CounterAcq/CounterDevice.h +++ b/CounterAcq/CounterDevice.h @@ -5,7 +5,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" @@ -35,7 +35,7 @@ int baudRate; QSerialPortUtil serialUtil; - QKafkaUtil kafkaUtil; +// QKafkaUtil kafkaUtil; QByteArray dataBuff; QUdpSocket * udpClient; diff --git a/CounterAcq/CounterWindow.cpp b/CounterAcq/CounterWindow.cpp index 1dc37bf..0840fb2 100644 --- a/CounterAcq/CounterWindow.cpp +++ b/CounterAcq/CounterWindow.cpp @@ -55,7 +55,7 @@ // 4. 将获取到的设备添加到下拉列表框中 QJsonArray devArray = devListRes.find("data")->toArray(); - for (int i =0; i < 1; i++) + for (int i =0; i < devArray.size(); i++) { QJsonObject devItem = devArray.at(i).toObject(); ui->devSelect->addItem(devItem.find("deviceName")->toString(), devItem.find("deviceNo")->toString()); @@ -71,7 +71,7 @@ connect(device, &CounterDevice::sendDataToDraw, this, &CounterWindow::drawCounterDataOnPage); -// device->initSerialPort(); + device->initSerialPort(); QThread::msleep(200); } diff --git a/CounterAcq/common/common.pri b/CounterAcq/common/common.pri index 6280f64..84f57ae 100644 --- a/CounterAcq/common/common.pri +++ b/CounterAcq/common/common.pri @@ -3,7 +3,7 @@ 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 @@ -12,7 +12,7 @@ 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/QSerialPortUtil.cpp b/CounterAcq/common/utils/QSerialPortUtil.cpp index 1710f93..5c800ce 100644 --- a/CounterAcq/common/utils/QSerialPortUtil.cpp +++ b/CounterAcq/common/utils/QSerialPortUtil.cpp @@ -23,8 +23,8 @@ // if (open == true) // { // 绑定信号与槽 - connect(&serial, &QSerialPort::readyRead, - this, &QSerialPortUtil::readData); +// connect(&serial, &QSerialPort::readyRead, +// this, &QSerialPortUtil::readData); // mock data received per second QTimer * timer = new QTimer(this); @@ -77,7 +77,7 @@ for (int i = 1; i < 16; i++) { - int valid = validStr.mid(i, 1).toInt(); + int valid = validStr.mid(16 - i, 1).toInt(); int zero = qrand() % 2; double data = qrand() % 200 * 1e-12; @@ -94,6 +94,9 @@ buffer.append(statusBuff).append(dataBuff).append("0"); + buffer.clear(); + buffer.append("$XHTSXHPT0001160101002806276|1000000000000001101|+0.000000000000|+0.033835598754|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000^"); + emit dataRecieved(buffer); // for (int i = 1; i <= 8; i++) // { diff --git a/CounterAcq/protocol/CounterProtocolXH.cpp b/CounterAcq/protocol/CounterProtocolXH.cpp index dd09067..45d164c 100644 --- a/CounterAcq/protocol/CounterProtocolXH.cpp +++ b/CounterAcq/protocol/CounterProtocolXH.cpp @@ -1,4 +1,4 @@ -#include "CounterProtocolXH.h" +#include "CounterProtocolXH.h" CounterProtocolXH::CounterProtocolXH(QObject *parent) : QObject(parent) { @@ -25,34 +25,17 @@ for (int i = 0; i < COUNTER_MESSURE_CHANNEL; i++) { - if (channelRefNo - 1 == i) + // 通道1的有效性在最后 + counterData->channelActiveArray.append(channelStatus.mid(COUNTER_MESSURE_CHANNEL - i, 1)); + if (channelStatus.mid(COUNTER_MESSURE_CHANNEL - i, 1) == "0") { - // ref channel - counterData->channelActiveArray.append("1"); counterData->channelDataArray.append(0.00); } else { - // not ref channel - counterData->channelActiveArray.append(channelStatus.mid(i, 1)); - if (channelStatus.mid(i, 1) == "0") - { - counterData->channelDataArray.append(0.00); - } else - { - counterData->channelDataArray.append(subList.at(i + 1).toDouble()); - } + counterData->channelDataArray.append(subList.at(i + 1).toDouble()); } } -// counterData->type = subList.at(0).toUInt(); -// counterData->channelId = subList.at(1).toUInt(); -// counterData->channelActive = subList.at(2).toUInt(); -// counterData->channelRefId = subList.at(3).toUInt(); -// counterData->channelData = subList.at(4).toLongLong(); -// counterData->load = subList.at(5); -// counterData->level = subList.at(6).toDouble(); -// counterData->frameId = subList.at(7); - return true; } diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp index ae2ccd4..9de69d6 100644 --- a/CounterAcq/CounterDevice.cpp +++ b/CounterAcq/CounterDevice.cpp @@ -6,22 +6,15 @@ CounterDevice::CounterDevice(QObject *parent) : QObject(parent) { - this->udpClient = new QUdpSocket(this); -// udpClient->bind(QHostAddress("192.168.1.213"), 8089, QUdpSocket::ShareAddress); - udpClient->writeDatagram("hello", QHostAddress("192.168.1.213"), 8089); - - connect(udpClient, &QUdpSocket::readyRead, - this, &CounterDevice::dataReceivedHandlerByUDP); - connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &CounterDevice::dataReceivedHandler); 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() @@ -66,6 +59,8 @@ { this->dataBuff.append(data); + std::cout << dataBuff.toStdString() << std::endl; + CounterDataDto * counterData = new CounterDataDto(this); if (CounterProtocolXH::checkFrame(this->dataBuff) == true) { @@ -147,7 +142,7 @@ QJsonObject jsonObj = counterData->toJSON(i - 1); 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))); } } } diff --git a/CounterAcq/CounterDevice.h b/CounterAcq/CounterDevice.h index 4db2f79..3776042 100644 --- a/CounterAcq/CounterDevice.h +++ b/CounterAcq/CounterDevice.h @@ -5,7 +5,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" @@ -35,7 +35,7 @@ int baudRate; QSerialPortUtil serialUtil; - QKafkaUtil kafkaUtil; +// QKafkaUtil kafkaUtil; QByteArray dataBuff; QUdpSocket * udpClient; diff --git a/CounterAcq/CounterWindow.cpp b/CounterAcq/CounterWindow.cpp index 1dc37bf..0840fb2 100644 --- a/CounterAcq/CounterWindow.cpp +++ b/CounterAcq/CounterWindow.cpp @@ -55,7 +55,7 @@ // 4. 将获取到的设备添加到下拉列表框中 QJsonArray devArray = devListRes.find("data")->toArray(); - for (int i =0; i < 1; i++) + for (int i =0; i < devArray.size(); i++) { QJsonObject devItem = devArray.at(i).toObject(); ui->devSelect->addItem(devItem.find("deviceName")->toString(), devItem.find("deviceNo")->toString()); @@ -71,7 +71,7 @@ connect(device, &CounterDevice::sendDataToDraw, this, &CounterWindow::drawCounterDataOnPage); -// device->initSerialPort(); + device->initSerialPort(); QThread::msleep(200); } diff --git a/CounterAcq/common/common.pri b/CounterAcq/common/common.pri index 6280f64..84f57ae 100644 --- a/CounterAcq/common/common.pri +++ b/CounterAcq/common/common.pri @@ -3,7 +3,7 @@ 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 @@ -12,7 +12,7 @@ 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/QSerialPortUtil.cpp b/CounterAcq/common/utils/QSerialPortUtil.cpp index 1710f93..5c800ce 100644 --- a/CounterAcq/common/utils/QSerialPortUtil.cpp +++ b/CounterAcq/common/utils/QSerialPortUtil.cpp @@ -23,8 +23,8 @@ // if (open == true) // { // 绑定信号与槽 - connect(&serial, &QSerialPort::readyRead, - this, &QSerialPortUtil::readData); +// connect(&serial, &QSerialPort::readyRead, +// this, &QSerialPortUtil::readData); // mock data received per second QTimer * timer = new QTimer(this); @@ -77,7 +77,7 @@ for (int i = 1; i < 16; i++) { - int valid = validStr.mid(i, 1).toInt(); + int valid = validStr.mid(16 - i, 1).toInt(); int zero = qrand() % 2; double data = qrand() % 200 * 1e-12; @@ -94,6 +94,9 @@ buffer.append(statusBuff).append(dataBuff).append("0"); + buffer.clear(); + buffer.append("$XHTSXHPT0001160101002806276|1000000000000001101|+0.000000000000|+0.033835598754|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000^"); + emit dataRecieved(buffer); // for (int i = 1; i <= 8; i++) // { diff --git a/CounterAcq/protocol/CounterProtocolXH.cpp b/CounterAcq/protocol/CounterProtocolXH.cpp index dd09067..45d164c 100644 --- a/CounterAcq/protocol/CounterProtocolXH.cpp +++ b/CounterAcq/protocol/CounterProtocolXH.cpp @@ -1,4 +1,4 @@ -#include "CounterProtocolXH.h" +#include "CounterProtocolXH.h" CounterProtocolXH::CounterProtocolXH(QObject *parent) : QObject(parent) { @@ -25,34 +25,17 @@ for (int i = 0; i < COUNTER_MESSURE_CHANNEL; i++) { - if (channelRefNo - 1 == i) + // 通道1的有效性在最后 + counterData->channelActiveArray.append(channelStatus.mid(COUNTER_MESSURE_CHANNEL - i, 1)); + if (channelStatus.mid(COUNTER_MESSURE_CHANNEL - i, 1) == "0") { - // ref channel - counterData->channelActiveArray.append("1"); counterData->channelDataArray.append(0.00); } else { - // not ref channel - counterData->channelActiveArray.append(channelStatus.mid(i, 1)); - if (channelStatus.mid(i, 1) == "0") - { - counterData->channelDataArray.append(0.00); - } else - { - counterData->channelDataArray.append(subList.at(i + 1).toDouble()); - } + counterData->channelDataArray.append(subList.at(i + 1).toDouble()); } } -// counterData->type = subList.at(0).toUInt(); -// counterData->channelId = subList.at(1).toUInt(); -// counterData->channelActive = subList.at(2).toUInt(); -// counterData->channelRefId = subList.at(3).toUInt(); -// counterData->channelData = subList.at(4).toLongLong(); -// counterData->load = subList.at(5); -// counterData->level = subList.at(6).toDouble(); -// counterData->frameId = subList.at(7); - return true; } diff --git a/PhaseCompAcq/protocol/PhaseProtocolBM.cpp b/PhaseCompAcq/protocol/PhaseProtocolBM.cpp index 79bcaa5..da69694 100644 --- a/PhaseCompAcq/protocol/PhaseProtocolBM.cpp +++ b/PhaseCompAcq/protocol/PhaseProtocolBM.cpp @@ -1,10 +1,6 @@ #include "PhaseProtocolBM.h" #include -#if _MSC_VER >= 1600 -#pragma execution_character_set("utf-8") -#endif - PhaseProtocolBM::PhaseProtocolBM(QObject *parent) : QObject(parent) { diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp index ae2ccd4..9de69d6 100644 --- a/CounterAcq/CounterDevice.cpp +++ b/CounterAcq/CounterDevice.cpp @@ -6,22 +6,15 @@ CounterDevice::CounterDevice(QObject *parent) : QObject(parent) { - this->udpClient = new QUdpSocket(this); -// udpClient->bind(QHostAddress("192.168.1.213"), 8089, QUdpSocket::ShareAddress); - udpClient->writeDatagram("hello", QHostAddress("192.168.1.213"), 8089); - - connect(udpClient, &QUdpSocket::readyRead, - this, &CounterDevice::dataReceivedHandlerByUDP); - connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &CounterDevice::dataReceivedHandler); 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() @@ -66,6 +59,8 @@ { this->dataBuff.append(data); + std::cout << dataBuff.toStdString() << std::endl; + CounterDataDto * counterData = new CounterDataDto(this); if (CounterProtocolXH::checkFrame(this->dataBuff) == true) { @@ -147,7 +142,7 @@ QJsonObject jsonObj = counterData->toJSON(i - 1); 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))); } } } diff --git a/CounterAcq/CounterDevice.h b/CounterAcq/CounterDevice.h index 4db2f79..3776042 100644 --- a/CounterAcq/CounterDevice.h +++ b/CounterAcq/CounterDevice.h @@ -5,7 +5,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" @@ -35,7 +35,7 @@ int baudRate; QSerialPortUtil serialUtil; - QKafkaUtil kafkaUtil; +// QKafkaUtil kafkaUtil; QByteArray dataBuff; QUdpSocket * udpClient; diff --git a/CounterAcq/CounterWindow.cpp b/CounterAcq/CounterWindow.cpp index 1dc37bf..0840fb2 100644 --- a/CounterAcq/CounterWindow.cpp +++ b/CounterAcq/CounterWindow.cpp @@ -55,7 +55,7 @@ // 4. 将获取到的设备添加到下拉列表框中 QJsonArray devArray = devListRes.find("data")->toArray(); - for (int i =0; i < 1; i++) + for (int i =0; i < devArray.size(); i++) { QJsonObject devItem = devArray.at(i).toObject(); ui->devSelect->addItem(devItem.find("deviceName")->toString(), devItem.find("deviceNo")->toString()); @@ -71,7 +71,7 @@ connect(device, &CounterDevice::sendDataToDraw, this, &CounterWindow::drawCounterDataOnPage); -// device->initSerialPort(); + device->initSerialPort(); QThread::msleep(200); } diff --git a/CounterAcq/common/common.pri b/CounterAcq/common/common.pri index 6280f64..84f57ae 100644 --- a/CounterAcq/common/common.pri +++ b/CounterAcq/common/common.pri @@ -3,7 +3,7 @@ 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 @@ -12,7 +12,7 @@ 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/QSerialPortUtil.cpp b/CounterAcq/common/utils/QSerialPortUtil.cpp index 1710f93..5c800ce 100644 --- a/CounterAcq/common/utils/QSerialPortUtil.cpp +++ b/CounterAcq/common/utils/QSerialPortUtil.cpp @@ -23,8 +23,8 @@ // if (open == true) // { // 绑定信号与槽 - connect(&serial, &QSerialPort::readyRead, - this, &QSerialPortUtil::readData); +// connect(&serial, &QSerialPort::readyRead, +// this, &QSerialPortUtil::readData); // mock data received per second QTimer * timer = new QTimer(this); @@ -77,7 +77,7 @@ for (int i = 1; i < 16; i++) { - int valid = validStr.mid(i, 1).toInt(); + int valid = validStr.mid(16 - i, 1).toInt(); int zero = qrand() % 2; double data = qrand() % 200 * 1e-12; @@ -94,6 +94,9 @@ buffer.append(statusBuff).append(dataBuff).append("0"); + buffer.clear(); + buffer.append("$XHTSXHPT0001160101002806276|1000000000000001101|+0.000000000000|+0.033835598754|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000|+0.000000000000^"); + emit dataRecieved(buffer); // for (int i = 1; i <= 8; i++) // { diff --git a/CounterAcq/protocol/CounterProtocolXH.cpp b/CounterAcq/protocol/CounterProtocolXH.cpp index dd09067..45d164c 100644 --- a/CounterAcq/protocol/CounterProtocolXH.cpp +++ b/CounterAcq/protocol/CounterProtocolXH.cpp @@ -1,4 +1,4 @@ -#include "CounterProtocolXH.h" +#include "CounterProtocolXH.h" CounterProtocolXH::CounterProtocolXH(QObject *parent) : QObject(parent) { @@ -25,34 +25,17 @@ for (int i = 0; i < COUNTER_MESSURE_CHANNEL; i++) { - if (channelRefNo - 1 == i) + // 通道1的有效性在最后 + counterData->channelActiveArray.append(channelStatus.mid(COUNTER_MESSURE_CHANNEL - i, 1)); + if (channelStatus.mid(COUNTER_MESSURE_CHANNEL - i, 1) == "0") { - // ref channel - counterData->channelActiveArray.append("1"); counterData->channelDataArray.append(0.00); } else { - // not ref channel - counterData->channelActiveArray.append(channelStatus.mid(i, 1)); - if (channelStatus.mid(i, 1) == "0") - { - counterData->channelDataArray.append(0.00); - } else - { - counterData->channelDataArray.append(subList.at(i + 1).toDouble()); - } + counterData->channelDataArray.append(subList.at(i + 1).toDouble()); } } -// counterData->type = subList.at(0).toUInt(); -// counterData->channelId = subList.at(1).toUInt(); -// counterData->channelActive = subList.at(2).toUInt(); -// counterData->channelRefId = subList.at(3).toUInt(); -// counterData->channelData = subList.at(4).toLongLong(); -// counterData->load = subList.at(5); -// counterData->level = subList.at(6).toDouble(); -// counterData->frameId = subList.at(7); - return true; } diff --git a/PhaseCompAcq/protocol/PhaseProtocolBM.cpp b/PhaseCompAcq/protocol/PhaseProtocolBM.cpp index 79bcaa5..da69694 100644 --- a/PhaseCompAcq/protocol/PhaseProtocolBM.cpp +++ b/PhaseCompAcq/protocol/PhaseProtocolBM.cpp @@ -1,10 +1,6 @@ #include "PhaseProtocolBM.h" #include -#if _MSC_VER >= 1600 -#pragma execution_character_set("utf-8") -#endif - PhaseProtocolBM::PhaseProtocolBM(QObject *parent) : QObject(parent) { diff --git a/PhaseCompAcq/protocol/PhaseProtocolBM.h b/PhaseCompAcq/protocol/PhaseProtocolBM.h index 048a9c2..234525a 100644 --- a/PhaseCompAcq/protocol/PhaseProtocolBM.h +++ b/PhaseCompAcq/protocol/PhaseProtocolBM.h @@ -15,7 +15,7 @@ PHASE_MESSURE_CHANNEL * PHASE_MESSURE_SIZE; static const qulonglong CALCULATE_OFFSET = 0X0080000000000000; -static const double CALCULATE_FACTOR = 1.6810E-15; +static const double CALCULATE_FACTOR = 1.6810E-15 * 10E9; class PhaseProtocolBM : public QObject {