Commit d0285615 by 李定达

1.修改数据库操作

parent d49be36a
...@@ -80,10 +80,7 @@ bool FMPDataBase::insert(QString table, QVariantHash data) ...@@ -80,10 +80,7 @@ bool FMPDataBase::insert(QString table, QVariantHash data)
QStringList columnnamelist; QStringList columnnamelist;
QStringList columnvaluelist; QStringList columnvaluelist;
if(!getSql(table, data, columnnamelist, columnvaluelist)) getSql(table, data, columnnamelist, columnvaluelist);
{
return false;
}
QSqlQuery query(_db); QSqlQuery query(_db);
...@@ -110,10 +107,7 @@ bool FMPDataBase::update(QString table, QVariantHash data, QString condition) ...@@ -110,10 +107,7 @@ bool FMPDataBase::update(QString table, QVariantHash data, QString condition)
QString sql; QString sql;
if(!getSql(table, data, sql)) getSql(table, data, sql);
{
return false;
}
QSqlQuery query(_db); QSqlQuery query(_db);
...@@ -209,7 +203,7 @@ bool FMPDataBase::getSql(QString table, QVariantHash data, QStringList& columnna ...@@ -209,7 +203,7 @@ bool FMPDataBase::getSql(QString table, QVariantHash data, QStringList& columnna
if(columnnamelist.size() == 0) if(columnnamelist.size() == 0)
return false; return true;
return true; return true;
} }
......
...@@ -78,8 +78,10 @@ void RollBack::RollWiteQuery(QSqlDatabase &_db, QSqlQuery &query) ...@@ -78,8 +78,10 @@ void RollBack::RollWiteQuery(QSqlDatabase &_db, QSqlQuery &query)
if(FMNetWork::HttpPost(url, array, data, "application/json;charset=utf-8","application/json", error, 12)) if(FMNetWork::HttpPost(url, array, data, "application/json;charset=utf-8","application/json", error, 12))
{ {
QString sql = QString("delete from orderlist where orderid='%1'").arg(parnetid); QString sql = QString("delete from orderlist where orderid='%1'").arg(parnetid);
QLOG_ERROR() << sql; QLOG_INFO() << sql;
query.exec(sql); if(!query.exec(sql))
QLOG_ERROR() << query.lastError() << query.lastError().text();
} }
QLOG_WARN() << "rollback resulte " << QThread::currentThreadId() << ":" << array; QLOG_WARN() << "rollback resulte " << QThread::currentThreadId() << ":" << array;
...@@ -92,10 +94,6 @@ void RollBack::run() ...@@ -92,10 +94,6 @@ void RollBack::run()
QString path; QString path;
ToolS::GetPath(path); ToolS::GetPath(path);
QSqlDatabase _db = QSqlDatabase::addDatabase("QSQLITE", QString("backup"));
_db.setDatabaseName(path + DB_ORDER);
_db.open();
while(!isInterruptionRequested()) while(!isInterruptionRequested())
{ {
int timeout = QSettings(path + "\\" + USERCONFIG_NAME, QSettings::IniFormat).value(VALUE_TIMEOUT).toInt(); int timeout = QSettings(path + "\\" + USERCONFIG_NAME, QSettings::IniFormat).value(VALUE_TIMEOUT).toInt();
...@@ -105,6 +103,10 @@ void RollBack::run() ...@@ -105,6 +103,10 @@ void RollBack::run()
do do
{ {
QSqlDatabase _db = QSqlDatabase::addDatabase("QSQLITE", QString("backup"));
_db.setDatabaseName(path + DB_ORDER);
_db.open();
QSqlQuery query(_db); QSqlQuery query(_db);
QLOG_WARN() << "find sql : " << "select * from orderlist"; QLOG_WARN() << "find sql : " << "select * from orderlist";
...@@ -117,6 +119,8 @@ void RollBack::run() ...@@ -117,6 +119,8 @@ void RollBack::run()
RollWiteQuery(_db, query); RollWiteQuery(_db, query);
_db.close();
}while(0); }while(0);
QEventLoop loop; QEventLoop loop;
......
...@@ -53,8 +53,8 @@ BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpvReserved*/ ...@@ -53,8 +53,8 @@ BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpvReserved*/
/* 配置输出定向器 */ /* 配置输出定向器 */
QsLogging::DestinationPtr fileDestination(QsLogging::DestinationFactory::MakeFileDestination( QsLogging::DestinationPtr fileDestination(QsLogging::DestinationFactory::MakeFileDestination(
str, str,
QsLogging::EnableLogRotation, QsLogging::MaxSizeBytes(1024*1024), QsLogging::EnableLogRotation, QsLogging::MaxSizeBytes(2*1024*1024),
QsLogging::MaxOldLogCount(5))); QsLogging::MaxOldLogCount(20)));
logger.addDestination(fileDestination); logger.addDestination(fileDestination);
QsLogging::DestinationPtr consleDest(QsLogging::DestinationFactory::MakeDebugOutputDestination()); QsLogging::DestinationPtr consleDest(QsLogging::DestinationFactory::MakeDebugOutputDestination());
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.5.1, 2017-09-12T19:05:05. --> <!-- Written by QtCreator 3.5.1, 2017-09-14T11:59:12. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment