diff --git a/code/base/test.vcxproj b/code/base/test.vcxproj index a1c42c9..ea9003d 100644 --- a/code/base/test.vcxproj +++ b/code/base/test.vcxproj @@ -29,26 +29,26 @@ DynamicLibrary true - v143 + v142 Unicode DynamicLibrary false - v143 + v142 true Unicode DynamicLibrary true - v143 + v142 Unicode DynamicLibrary false - v143 + v142 true Unicode diff --git a/db/HGPdtToolDb/HGPdtToolDb.cpp b/db/HGPdtToolDb/HGPdtToolDb.cpp index 9d9e897..fbad352 100644 --- a/db/HGPdtToolDb/HGPdtToolDb.cpp +++ b/db/HGPdtToolDb/HGPdtToolDb.cpp @@ -374,6 +374,17 @@ HGResult HGAPI HGPdtToolDb_DownloadDeviceEntryImage(HGPdtToolDbDevice device, HG return deviceImpl->DownloadEntryImage(entryName, ftpHost, ftpPort, fileName); } +HGResult HGAPI HGPdtToolDb_CheckDeviceEntryImage(HGPdtToolDbDevice device, HGUInt entryName) +{ + if (NULL == device) + { + return HGBASE_ERR_INVALIDARG; + } + + HGPdtToolDbDeviceImpl* deviceImpl = (HGPdtToolDbDeviceImpl*)device; + return deviceImpl->CheckEntryImage(entryName); +} + HGResult HGAPI HGPdtToolDb_UploadDeviceEntryImage(HGPdtToolDbDevice device, HGUInt entryName, const HGChar* ftpHost, HGUShort ftpPort, const HGChar* fileName) { diff --git a/db/HGPdtToolDb/HGPdtToolDb.def b/db/HGPdtToolDb/HGPdtToolDb.def index ef70870..54fce4e 100644 --- a/db/HGPdtToolDb/HGPdtToolDb.def +++ b/db/HGPdtToolDb/HGPdtToolDb.def @@ -34,4 +34,5 @@ HGPdtToolDb_GetDeviceEntryExcepDesc HGPdtToolDb_SetDeviceEntryStatus HGPdtToolDb_SetDeviceEntryExcepDesc HGPdtToolDb_DownloadDeviceEntryImage +HGPdtToolDb_CheckDeviceEntryImage HGPdtToolDb_UploadDeviceEntryImage diff --git a/db/HGPdtToolDb/HGPdtToolDb.h b/db/HGPdtToolDb/HGPdtToolDb.h index 4e912b9..584818a 100644 --- a/db/HGPdtToolDb/HGPdtToolDb.h +++ b/db/HGPdtToolDb/HGPdtToolDb.h @@ -202,6 +202,9 @@ HGEXPORT HGResult HGAPI HGPdtToolDb_SetDeviceEntryExcepDesc(HGPdtToolDbDevice de HGEXPORT HGResult HGAPI HGPdtToolDb_DownloadDeviceEntryImage(HGPdtToolDbDevice device, HGUInt entryName, const HGChar* ftpHost, HGUShort ftpPort, const HGChar* fileName); +/* 检查某个测试项关联的图像 */ +HGEXPORT HGResult HGAPI HGPdtToolDb_CheckDeviceEntryImage(HGPdtToolDbDevice device, HGUInt entryName); + /* 上传/更新某个测试项关联的图像 */ HGEXPORT HGResult HGAPI HGPdtToolDb_UploadDeviceEntryImage(HGPdtToolDbDevice device, HGUInt entryName, const HGChar* ftpHost, HGUShort ftpPort, const HGChar* fileName); diff --git a/db/HGPdtToolDb/HGPdtToolDbImpl.cpp b/db/HGPdtToolDb/HGPdtToolDbImpl.cpp index f22bcb4..0785dbf 100644 --- a/db/HGPdtToolDb/HGPdtToolDbImpl.cpp +++ b/db/HGPdtToolDb/HGPdtToolDbImpl.cpp @@ -1565,6 +1565,36 @@ HGResult HGPdtToolDbDeviceImpl::DownloadEntryImage(HGUInt entryName, const HGCha return DownloadFile(ftpHost, ftpPort, remotePath.c_str(), fileName); } +HGResult HGPdtToolDbDeviceImpl::CheckEntryImage(HGUInt entryName) +{ + if (NULL == m_userMgr->m_sql) + { + return HGBASE_ERR_FAIL; + } + + const HGChar* entryNameStr = NULL; + if (entryName >= HGPDTTOOLDB_ENTRYNAME_CONFIGURE_SPEED_MODE && entryName <= HGPDTTOOLDB_ENTRYNAME_MECH_PAPER_FEEDING_INCLINATION) + entryNameStr = IMAGE_INSPECTION[entryName - HGPDTTOOLDB_ENTRYNAME_CONFIGURE_SPEED_MODE]; + if (NULL == entryNameStr) + { + return HGBASE_ERR_INVALIDARG; + } + + std::string remotePath; + HGResult res = GetEntryImageRemotePath(entryNameStr, remotePath); + if (HGBASE_ERR_OK != res) + { + return res; + } + + if (remotePath.empty()) + { + return HGBASE_ERR_FAIL; + } + + return HGBASE_ERR_OK; +} + HGResult HGPdtToolDbDeviceImpl::UploadEntryImage(HGUInt entryName, const HGChar* ftpHost, HGUShort ftpPort, const HGChar* fileName) { if (NULL == m_userMgr->m_sql) diff --git a/db/HGPdtToolDb/HGPdtToolDbImpl.hpp b/db/HGPdtToolDb/HGPdtToolDbImpl.hpp index d0c3fc9..ca35cc8 100644 --- a/db/HGPdtToolDb/HGPdtToolDbImpl.hpp +++ b/db/HGPdtToolDb/HGPdtToolDbImpl.hpp @@ -87,6 +87,7 @@ public: HGResult GetEntryExcepDesc(HGUInt entryName, HGChar* excepDesc, HGUInt maxLen); HGResult SetEntryExcepDesc(HGUInt entryName, const HGChar* excepDesc); HGResult DownloadEntryImage(HGUInt entryName, const HGChar *ftpHost, HGUShort ftpPort, const HGChar* fileName); + HGResult CheckEntryImage(HGUInt entryName); HGResult UploadEntryImage(HGUInt entryName, const HGChar* ftpHost, HGUShort ftpPort, const HGChar *fileName); private: