From 5281047649343e4425577bc3bd39648da6f5d9ac Mon Sep 17 00:00:00 2001
From: "bob.pan" <bob.pan@hzleaper.com>
Date: Sun, 19 Dec 2021 16:24:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=99=E5=AE=9A=E4=BD=8D=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=20=E6=97=B6=E9=97=B4=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=8C=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4wheelhubwf.db=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=90=AF=E5=8A=A8=E6=A3=80=E6=B5=8B=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/tpMain/DetectDataDB.cpp      | 8 ++++----
 tpvs17/lpReport/lpReport.vcxproj | 5 +++--
 tpvs17/tpMain/tpMain.vcxproj     | 3 +--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/tpMain/DetectDataDB.cpp b/src/tpMain/DetectDataDB.cpp
index 95835c2..8fed1e3 100644
--- a/src/tpMain/DetectDataDB.cpp
+++ b/src/tpMain/DetectDataDB.cpp
@@ -285,7 +285,7 @@ bool DetectDataDB::InitDatabase()
 		const QString strValueTable = \
 		"CREATE TABLE IF NOT EXISTS `valueTable`( \
 		 uid INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, \
-		`create_time`  timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, \
+		`create_time`  DATETIME(32), \
 		`modeName` VARCHAR(256) NOT NULL, \
 		`runState` TEXT, \
 		`ImagePath` TEXT, \
@@ -398,10 +398,10 @@ void DetectDataDB::InsertValueRlt(const ValueResult &rlt)
 	if (db) {
 		QString strCenterPix = QString("(%1,%2)").arg(rlt.centerPix.x()).arg(rlt.centerPix.y());//圆心像素坐标
 		QString strCenter = QString("(%1,%2)").arg(rlt.center.x()).arg(rlt.center.y());//圆心物理坐标 经过相关数据转换
-		QString strVal = QString("'%1','%2','%3','%4','%5',%6,%7,%8,%9")
+		QString strVal = QString("'%1','%2','%3','%4','%5',%6,%7,%8,%9,'%10'")
 			.arg(rlt.strModel).arg(rlt.strRunState).arg(rlt.strImagePath)
-			.arg(strCenterPix).arg(strCenter).arg(rlt.errorCode).arg(rlt.score).arg(rlt.angle).arg(rlt.runtime);
-		QString strSql = QString("INSERT INTO valueTable (modeName,runState,ImagePath,centerPix,center,errorCode,score,angle,runtime) VALUES (%1);").arg(strVal);
+			.arg(strCenterPix).arg(strCenter).arg(rlt.errorCode).arg(rlt.score).arg(rlt.angle).arg(rlt.runtime).arg(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss zzz"));
+		QString strSql = QString("INSERT INTO valueTable (modeName,runState,ImagePath,centerPix,center,errorCode,score,angle,runtime,create_time) VALUES (%1);").arg(strVal);
 	
 		QSqlQuery sql = db->exec(strSql);
 		QSqlError err = sql.lastError();
diff --git a/tpvs17/lpReport/lpReport.vcxproj b/tpvs17/lpReport/lpReport.vcxproj
index 9a1920e..9e490b0 100644
--- a/tpvs17/lpReport/lpReport.vcxproj
+++ b/tpvs17/lpReport/lpReport.vcxproj
@@ -87,15 +87,16 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;QT_SQL_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DebugInformationFormat />
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <Optimization>Disabled</Optimization>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <OutputFile>$(SolutionDir)..\runner17\$(ProjectName).exe</OutputFile>
       <AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Sql.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <QtMoc>
diff --git a/tpvs17/tpMain/tpMain.vcxproj b/tpvs17/tpMain/tpMain.vcxproj
index 7804f2e..fdc5f34 100644
--- a/tpvs17/tpMain/tpMain.vcxproj
+++ b/tpvs17/tpMain/tpMain.vcxproj
@@ -1389,8 +1389,7 @@
     <ClCompile>
       <PreprocessorDefinitions>UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;TPMAIN_LIB;TPMAIN_EXPORTS;QT_GUI_LIB;QT_WIDGETS_LIB;QT_SQL_LIB;QT_PRINTSUPPORT_LIB;QT_NETWORK_LIB;QT_SERIALPORT_LIB;QT_WEBSOCKETS_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>.;.\GeneratedFiles;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\ActiveQt;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtPrintSupport;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWebSockets;..\..\src\algorithm;..\..\src\tpMain;..\..\src\tpMain\thread;..\..\src\tpMain\splashScreen;..\..\src\tpMain\LightBoxwidget;..\..\src\tpMain\QDiskCleanThread;..\..\src\tpMain\QPixmapListBar;..\..\src\userCtrl;..\..\src\NetWheel;..\..\3part\libzkq\include;..\..\3part\tadpole\include\tpBase;..\..\3part\opencv3.4.1\include;..\..\3part\opencv3.4.1\include\opencv;..\..\3part\opencv3.4.1\include\opencv2;..\..\3part\edcircle\include;..\..\3part\lpCoreCtrl\include;..\..\src\tpMain\algela;..\..\src\ImageCompare;..\..\src\interface;.\lpRawTcp;..\..\src\tpMain\cryptokey;..\..\3part\RsaCrypto\include;..\..\3part\openssl-1.0.2n\vs13\include;..\..\src\libtcp\include;..\..\src\libtcp\common;..\..\src\libtcp\libServer;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <Optimization>Disabled</Optimization>