GZHM/HM-SPMS
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ref]同步711

Browse Source
This commit is contained in:
shi_jq 2025-03-17 11:13:50 +08:00
parent e031f71989
commit 246c448e39
18 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
product/src/gui/plugin/AssetWidget/CAssetCommon.h
View File

@ -1,4 +1,4 @@
#ifndef CASSETCOMMON_H
#ifndef CASSETCOMMON_H
#define CASSETCOMMON_H
#include <QString>

48
product/src/gui/plugin/AssetWidget/CAssetDataMng.cpp
View File

@ -1,4 +1,4 @@
#include "CAssetDataMng.h"
#include "CAssetDataMng.h"
#include "Common.h"
#include "pub_logger_api/logger.h"
#include <QDebug>
@ -170,7 +170,7 @@ int CAssetDataMng::readLocIdByDevg(const QString &devg,int &loc)
{
if(!m_pWriteDb->isOpen())
{
return kbdFailed;
return iotFailed;
}
QSqlQuery query;
QString sqlQuery = QString("select LOCATION_ID from dev_group where TAG_NAME='%1'").arg(devg);
@ -180,9 +180,9 @@ int CAssetDataMng::readLocIdByDevg(const QString &devg,int &loc)
while(query.next())
{
loc = query.value(0).toInt();
return kbdSuccess;
return iotSuccess;
}
return kbdFailed;
return iotFailed;
}
QList<AssetInfo> CAssetDataMng::getAssetInfoByDevg(const QStringList &devgList)
@ -357,7 +357,7 @@ int CAssetDataMng::addAsset(const AssetInfo &info)
if(!m_pWriteDb->isOpen())
{
m_error = m_pWriteDb->getLastErrorString();
return kbdFailed;
return iotFailed;
}
QString sqlQuery= QString("insert into asset_info(dev_id,dev_name,dev_type,dev_param,setup_date,dev_status,contact,backup,dev_group,maintain_period) values('%1','%2','%3','%4',%5,'%6','%7','%8','%9',%10)").arg(getRandomId()).arg(info.name).arg(info.type).arg(info.param).arg(info.setUpTime)
@ -366,9 +366,9 @@ int CAssetDataMng::addAsset(const AssetInfo &info)
if(m_pWriteDb->execute(sqlQuery) == false)
{
m_error = m_pWriteDb->getLastErrorString();
return kbdFailed;
return iotFailed;
}
return kbdSuccess;
return iotSuccess;
}
void CAssetDataMng::importAsset(const QMap<QString,AssetInfo> &infoMap,QString &mess)
@ -442,7 +442,7 @@ int CAssetDataMng::updateAsset(const AssetInfo &info)
if(!m_pWriteDb->isOpen())
{
m_error = m_pWriteDb->getLastErrorString();
return kbdFailed;
return iotFailed;
}
QSqlQuery query;
QString sqlQuery =QString("update asset_info set dev_name='%1',dev_type='%2',dev_param='%3',setup_date=%4,dev_status='%5',contact='%6',backup='%7',dev_group='%8',maintain_period= %9 "
@ -452,9 +452,9 @@ int CAssetDataMng::updateAsset(const AssetInfo &info)
if(m_pWriteDb->execute(sqlQuery, query) == false)
{
m_error = m_pWriteDb->getLastErrorString();
return kbdFailed;
return iotFailed;
}
return kbdSuccess;
return iotSuccess;
}
int CAssetDataMng::delAsset(const QList<QString> &idList)
@ -462,16 +462,16 @@ int CAssetDataMng::delAsset(const QList<QString> &idList)
if(!m_pWriteDb->isOpen())
{
m_error = m_pWriteDb->getLastErrorString();
return kbdFailed;
return iotFailed;
}
if(idList.isEmpty())
{
return kbdSuccess;
return iotSuccess;
}
if(m_pWriteDb->transaction() == false)
{
m_error = m_pWriteDb->getLastErrorString();
return kbdFailed;
return iotFailed;
}
QString con = QString("dev_id in (");
for(int index(0);index<idList.count();index++)
@ -494,16 +494,16 @@ int CAssetDataMng::delAsset(const QList<QString> &idList)
{
m_error = m_pWriteDb->getLastErrorString();
m_pWriteDb->rollback();
return kbdFailed;
return iotFailed;
}
return kbdSuccess;
return iotSuccess;
}
int CAssetDataMng::addRecord(const AssetRecord &info)
{
if(!m_pWriteDb->isOpen())
{
return kbdFailed;
return iotFailed;
}
QString sqlQuery= QString("insert into asset_records(record_id,dev_id,record_name,opt_user,start_time,end_time,content) values('%1','%2','%3','%4',%5,%6,'%7')").arg(getRandomId()).arg(info.dev_id).arg(info.record_name).arg(info.opt_user).arg(info.startTime)
.arg(info.endTime).arg(info.content);
@ -511,9 +511,9 @@ int CAssetDataMng::addRecord(const AssetRecord &info)
if(m_pWriteDb->execute(sqlQuery) == false)
{
m_error = m_pWriteDb->getLastErrorString();
return kbdFailed;
return iotFailed;
}
return kbdSuccess;
return iotSuccess;
}
void CAssetDataMng::importRecord(const QMap<QString, AssetRecord> &infoMap, QString &mess)
@ -583,7 +583,7 @@ int CAssetDataMng::updateRecord(const AssetRecord &info)
{
if(!m_pWriteDb->isOpen())
{
return kbdFailed;
return iotFailed;
}
QSqlQuery query;
QString sqlQuery =QString("update asset_records set dev_id='%1',record_name='%2',opt_user='%3',start_time=%4,end_time=%5,content='%6' "
@ -592,20 +592,20 @@ int CAssetDataMng::updateRecord(const AssetRecord &info)
LOGDEBUG("updateRecord():sql[%s]",sqlQuery.toStdString().c_str());
if(m_pWriteDb->execute(sqlQuery, query) == false)
{
return kbdFailed;
return iotFailed;
}
return kbdSuccess;
return iotSuccess;
}
int CAssetDataMng::delRecord(const QList<QString> &intList)
{
if(!m_pWriteDb->isOpen())
{
return kbdFailed;
return iotFailed;
}
if(intList.isEmpty())
{
return kbdSuccess;
return iotSuccess;
}
QString con = QString("record_id in (");
for(int index(0);index<intList.count();index++)
@ -621,7 +621,7 @@ int CAssetDataMng::delRecord(const QList<QString> &intList)
QString sqlQuery =QString("delete from asset_records where %1 ").arg(con);
LOGDEBUG("delRecord():sql[%s]",sqlQuery.toStdString().c_str());
m_pWriteDb->execute(sqlQuery);
return kbdSuccess;
return iotSuccess;
}
int CAssetDataMng::getCount()

2
product/src/gui/plugin/AssetWidget/CAssetDataMng.h
View File

@ -1,4 +1,4 @@
#ifndef CASSETDATAMNG_H
#ifndef CASSETDATAMNG_H
#define CASSETDATAMNG_H
#include "db_api_ex/CDbApi.h"

4
product/src/gui/plugin/AssetWidget/CAssetDelegate.cpp
View File

@ -1,4 +1,4 @@
#include "CAssetDelegate.h"
#include "CAssetDelegate.h"
#include <QPainter>
#include <QApplication>
#include <QMouseEvent>
@ -64,7 +64,7 @@ bool CAssetDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, const
return false;
}
AssetInfo info;
if(m_pModel->getAssetInfo(index,info) != kbdSuccess)
if(m_pModel->getAssetInfo(index,info) != iotSuccess)
{
return false;
}

2
product/src/gui/plugin/AssetWidget/CAssetDelegate.h
View File

@ -1,4 +1,4 @@
#ifndef CASSETDELEGATE_H
#ifndef CASSETDELEGATE_H
#define CASSETDELEGATE_H
#include <QStyledItemDelegate>

2
product/src/gui/plugin/AssetWidget/CAssetPluginWidget.cpp
View File

@ -1,4 +1,4 @@
#include "CAssetPluginWidget.h"
#include "CAssetPluginWidget.h"
#include <QWidget>
#include "CAssetWidget.h"
#include "pub_logger_api/logger.h"

4
product/src/gui/plugin/AssetWidget/CAssetPluginWidget.h
View File

@ -1,4 +1,4 @@
#ifndef CASSETPLUGINWIDGET_H
#ifndef CASSETPLUGINWIDGET_H
#define CASSETPLUGINWIDGET_H
#include <QObject>
@ -7,7 +7,7 @@
class CAssetPluginWidget : public QObject, public CPluginWidgetInterface
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0")
Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
Q_INTERFACES(CPluginWidgetInterface)
public:

6
product/src/gui/plugin/AssetWidget/CAssetTableModel.cpp
View File

@ -1,4 +1,4 @@
#include "CAssetTableModel.h"
#include "CAssetTableModel.h"
#include <QDate>
#include "Common.h"
CAssetTableModel::CAssetTableModel(QObject *parent)
@ -146,10 +146,10 @@ int CAssetTableModel::getAssetInfo(const QModelIndex &index,AssetInfo &info)
if(index.row() < m_listShowInfo.size())
{
info = m_listShowInfo.at(index.row());
return kbdSuccess;
return iotSuccess;
}else
{
return kbdFailed;
return iotFailed;
}
}

2
product/src/gui/plugin/AssetWidget/CAssetUuid.cpp
View File

@ -1,4 +1,4 @@
#include "CAssetUuid.h"
#include "CAssetUuid.h"
#include "boost/typeof/typeof.hpp"
#include "boost/algorithm/string/replace.hpp"

2
product/src/gui/plugin/AssetWidget/CAssetUuid.h
View File

@ -1,4 +1,4 @@
#ifndef CASSETUUID_H
#ifndef CASSETUUID_H
#define CASSETUUID_H
#include <QString>

2
product/src/gui/plugin/AssetWidget/CAssetView.cpp
View File

@ -1,4 +1,4 @@
#include "CAssetView.h"
#include "CAssetView.h"
#include <QHeaderView>
#include <QMouseEvent>
#include <QScrollBar>

26
product/src/gui/plugin/AssetWidget/CAssetWidget.cpp
View File

@ -1,4 +1,4 @@
#include "CAssetWidget.h"
#include "CAssetWidget.h"
#include "ui_CAssetWidget.h"
#include "pub_logger_api/logger.h"
#include <CAssetDataMng.h>
@ -246,7 +246,7 @@ bool CAssetWidget::containsFilterText(const AssetInfo &info, const QString &filt
void CAssetWidget::inAssetInfo()
{
QString fileName= QString();
if(kbdSuccess !=getOpenFileName(fileName))
if(iotSuccess !=getOpenFileName(fileName))
{
return ;
}
@ -258,7 +258,7 @@ void CAssetWidget::inRecordInfo()
{
QString fileName= QString();
if(kbdSuccess !=getOpenFileName(fileName))
if(iotSuccess !=getOpenFileName(fileName))
{
return ;
}
@ -269,7 +269,7 @@ void CAssetWidget::inRecordInfo()
void CAssetWidget::outAssetInfo()
{
QString fileName= QString();
if(kbdSuccess !=getSaveFileName(fileName))
if(iotSuccess !=getSaveFileName(fileName))
{
return ;
}
@ -283,7 +283,7 @@ void CAssetWidget::outAssetInfo()
void CAssetWidget::outRecordInfo()
{
QString fileName= QString();
if(kbdSuccess !=getSaveFileName(fileName))
if(iotSuccess !=getSaveFileName(fileName))
{
return ;
}
@ -307,13 +307,13 @@ int CAssetWidget::getSaveFileName(QString &fileName)
fileName = QFileDialog::getSaveFileName(this,tr("Save File"),QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation),"Excel 文件(*.xlsx)");//获取保存路径*.xls
if(fileName.isEmpty())
{
return kbdFailed;
return iotFailed;
}
if(!fileName.endsWith(".xlsx",Qt::CaseInsensitive))
{
fileName = fileName+".xlsx";
}
return kbdSuccess;
return iotSuccess;
}
int CAssetWidget::getOpenFileName(QString &fileName)
@ -321,9 +321,9 @@ int CAssetWidget::getOpenFileName(QString &fileName)
fileName = QFileDialog::getOpenFileName(this,tr("Open File"),"","Excel(*.xlsx)");
if(fileName.isEmpty())
{
return kbdFailed;
return iotFailed;
}
return kbdSuccess;
return iotSuccess;
}
void CAssetWidget::filterText(QList<AssetInfo> &assetList)
@ -473,7 +473,7 @@ void CAssetWidget::addAsset()
}
if(loc == -1 && !devg.isEmpty())
{
if(kbdFailed == CAssetDataMng::instance()->readLocIdByDevg(devg,loc))
if(iotFailed == CAssetDataMng::instance()->readLocIdByDevg(devg,loc))
{
return ;
}
@ -505,7 +505,7 @@ void CAssetWidget::delAsset()
{
return ;
}
if(CAssetDataMng::instance()->delAsset(idList) == kbdFailed)
if(CAssetDataMng::instance()->delAsset(idList) == iotFailed)
{
messBox(tr("删除失败!"));
}else
@ -568,12 +568,12 @@ void CAssetWidget::assetDoubleClicked(const QModelIndex &index)
return ;
}
AssetInfo info;
if(m_pModel->getAssetInfo(index,info) != kbdSuccess)
if(m_pModel->getAssetInfo(index,info) != iotSuccess)
{
return ;
}
int loc = 0;
if(CAssetDataMng::instance()->readLocIdByDevg(info.dev_group,loc) == kbdFailed)
if(CAssetDataMng::instance()->readLocIdByDevg(info.dev_group,loc) == iotFailed)
{
return ;
}

2
product/src/gui/plugin/AssetWidget/CAssetWidget.h
View File

@ -1,4 +1,4 @@
#ifndef CASSETWIDGET_H
#ifndef CASSETWIDGET_H
#define CASSETWIDGET_H
#include <QWidget>

6
product/src/gui/plugin/AssetWidget/CPropertyDialog.cpp
View File

@ -1,4 +1,4 @@
#include "CPropertyDialog.h"
#include "CPropertyDialog.h"
#include "ui_CPropertyDialog.h"
#include "CAssetDataMng.h"
#include <QDate>
@ -171,7 +171,7 @@ void CPropertyDialog::okClicked()
m_assetInfo.dev_group = ui->cDevG->currentData().toString();
m_assetInfo.backup = ui->tBackup->toPlainText();
if(save() == kbdSuccess)
if(save() == iotSuccess)
{
accept();
}else
@ -194,5 +194,5 @@ int CPropertyDialog::save()
{
return CAssetDataMng::instance()->updateAsset(m_assetInfo);
}
return kbdFailed;
return iotFailed;
}

12
product/src/gui/plugin/AssetWidget/CRecordDialog.cpp
View File

@ -1,4 +1,4 @@
#include "CRecordDialog.h"
#include "CRecordDialog.h"
#include "ui_CRecordDialog.h"
#include <QMessageBox>
#include "CAssetDataMng.h"
@ -132,7 +132,7 @@ void CRecordDialog::delRecord()
{
return ;
}
if(CAssetDataMng::instance()->delRecord(idList) == kbdFailed)
if(CAssetDataMng::instance()->delRecord(idList) == iotFailed)
{
messBox(tr("删除失败!"));
}else
@ -145,7 +145,7 @@ void CRecordDialog::delRecord()
void CRecordDialog::outRecord()
{
QString fileName= QString();
if(kbdSuccess !=getFileName(fileName))
if(iotSuccess !=getFileName(fileName))
{
return ;
}
@ -186,7 +186,7 @@ void CRecordDialog::recordDoubleClicked(const QModelIndex &index)
return ;
}
AssetRecord info;
if(m_pModel->getRecordInfo(index,info) != kbdSuccess)
if(m_pModel->getRecordInfo(index,info) != iotSuccess)
{
return ;
}
@ -287,11 +287,11 @@ int CRecordDialog::getFileName(QString &fileName)
fileName = QFileDialog::getSaveFileName(this,tr("Save File"),QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation),"Excel 文件(*.xlsx)");//获取保存路径*.xls
if(fileName.isEmpty())
{
return kbdFailed;
return iotFailed;
}
if(!fileName.endsWith(".xlsx",Qt::CaseInsensitive))
{
fileName = fileName+".xlsx";
}
return kbdSuccess;
return iotSuccess;
}

6
product/src/gui/plugin/AssetWidget/CRecordPropertyDialog.cpp
View File

@ -1,4 +1,4 @@
#include "CRecordPropertyDialog.h"
#include "CRecordPropertyDialog.h"
#include "ui_CRecordPropertyDialog.h"
#include <QMessageBox>
#include "Common.h"
@ -98,7 +98,7 @@ void CRecordPropertyDialog::okClicked()
messBox(tr("开始时间不能大于结束时间!"));
return ;
}
if(save() == kbdSuccess)
if(save() == iotSuccess)
{
accept();
}else
@ -121,5 +121,5 @@ int CRecordPropertyDialog::save()
{
return CAssetDataMng::instance()->updateRecord(m_assetRecord);
}
return kbdFailed;
return iotFailed;
}

6
product/src/gui/plugin/AssetWidget/CRecordTablModel.cpp
View File

@ -1,4 +1,4 @@
#include "CRecordTablModel.h"
#include "CRecordTablModel.h"
#include <QDate>
#include "Common.h"
@ -107,10 +107,10 @@ int CRecordTablModel::getRecordInfo(const QModelIndex &index, AssetRecord &info)
if(index.row() < m_listShowInfo.size())
{
info = m_listShowInfo.at(index.row());
return kbdSuccess;
return iotSuccess;
}else
{
return kbdFailed;
return iotFailed;
}
}

2
product/src/gui/plugin/AssetWidget/CWorker.cpp
View File

@ -1,4 +1,4 @@
#include "CWorker.h"
#include "CWorker.h"
#include "model_excel/xlsx/xlsxdocument.h"
#include "model_excel/xlsx/xlsxformat.h"
#include <QDate>