增加检查测试项图像的接口
This commit is contained in:
parent
1a77bb1708
commit
a2231a2456
|
@ -29,26 +29,26 @@
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
<PlatformToolset>v142</PlatformToolset>
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
<PlatformToolset>v142</PlatformToolset>
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
<PlatformToolset>v142</PlatformToolset>
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
<PlatformToolset>v142</PlatformToolset>
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
|
@ -374,6 +374,17 @@ HGResult HGAPI HGPdtToolDb_DownloadDeviceEntryImage(HGPdtToolDbDevice device, HG
|
||||||
return deviceImpl->DownloadEntryImage(entryName, ftpHost, ftpPort, fileName);
|
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,
|
HGResult HGAPI HGPdtToolDb_UploadDeviceEntryImage(HGPdtToolDbDevice device, HGUInt entryName,
|
||||||
const HGChar* ftpHost, HGUShort ftpPort, const HGChar* fileName)
|
const HGChar* ftpHost, HGUShort ftpPort, const HGChar* fileName)
|
||||||
{
|
{
|
||||||
|
|
|
@ -34,4 +34,5 @@ HGPdtToolDb_GetDeviceEntryExcepDesc
|
||||||
HGPdtToolDb_SetDeviceEntryStatus
|
HGPdtToolDb_SetDeviceEntryStatus
|
||||||
HGPdtToolDb_SetDeviceEntryExcepDesc
|
HGPdtToolDb_SetDeviceEntryExcepDesc
|
||||||
HGPdtToolDb_DownloadDeviceEntryImage
|
HGPdtToolDb_DownloadDeviceEntryImage
|
||||||
|
HGPdtToolDb_CheckDeviceEntryImage
|
||||||
HGPdtToolDb_UploadDeviceEntryImage
|
HGPdtToolDb_UploadDeviceEntryImage
|
||||||
|
|
|
@ -202,6 +202,9 @@ HGEXPORT HGResult HGAPI HGPdtToolDb_SetDeviceEntryExcepDesc(HGPdtToolDbDevice de
|
||||||
HGEXPORT HGResult HGAPI HGPdtToolDb_DownloadDeviceEntryImage(HGPdtToolDbDevice device, HGUInt entryName,
|
HGEXPORT HGResult HGAPI HGPdtToolDb_DownloadDeviceEntryImage(HGPdtToolDbDevice device, HGUInt entryName,
|
||||||
const HGChar* ftpHost, HGUShort ftpPort, const HGChar* fileName);
|
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,
|
HGEXPORT HGResult HGAPI HGPdtToolDb_UploadDeviceEntryImage(HGPdtToolDbDevice device, HGUInt entryName,
|
||||||
const HGChar* ftpHost, HGUShort ftpPort, const HGChar* fileName);
|
const HGChar* ftpHost, HGUShort ftpPort, const HGChar* fileName);
|
||||||
|
|
|
@ -1565,6 +1565,36 @@ HGResult HGPdtToolDbDeviceImpl::DownloadEntryImage(HGUInt entryName, const HGCha
|
||||||
return DownloadFile(ftpHost, ftpPort, remotePath.c_str(), fileName);
|
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)
|
HGResult HGPdtToolDbDeviceImpl::UploadEntryImage(HGUInt entryName, const HGChar* ftpHost, HGUShort ftpPort, const HGChar* fileName)
|
||||||
{
|
{
|
||||||
if (NULL == m_userMgr->m_sql)
|
if (NULL == m_userMgr->m_sql)
|
||||||
|
|
|
@ -87,6 +87,7 @@ public:
|
||||||
HGResult GetEntryExcepDesc(HGUInt entryName, HGChar* excepDesc, HGUInt maxLen);
|
HGResult GetEntryExcepDesc(HGUInt entryName, HGChar* excepDesc, HGUInt maxLen);
|
||||||
HGResult SetEntryExcepDesc(HGUInt entryName, const HGChar* excepDesc);
|
HGResult SetEntryExcepDesc(HGUInt entryName, const HGChar* excepDesc);
|
||||||
HGResult DownloadEntryImage(HGUInt entryName, const HGChar *ftpHost, HGUShort ftpPort, const HGChar* fileName);
|
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);
|
HGResult UploadEntryImage(HGUInt entryName, const HGChar* ftpHost, HGUShort ftpPort, const HGChar *fileName);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
Loading…
Reference in New Issue