diff --git a/doc/webservice/新版websdk接口说明.doc b/doc/webservice/新版websdk接口说明.doc index 065f1786..60beca8e 100644 Binary files a/doc/webservice/新版websdk接口说明.doc and b/doc/webservice/新版websdk接口说明.doc differ diff --git a/doc/webservice/新版websdk接口说明.pdf b/doc/webservice/新版websdk接口说明.pdf index c3df2511..899d10cb 100644 Binary files a/doc/webservice/新版websdk接口说明.pdf and b/doc/webservice/新版websdk接口说明.pdf differ diff --git a/sdk/webservice/ManagerV2.cpp b/sdk/webservice/ManagerV2.cpp index 7cf56768..684f5a2d 100644 --- a/sdk/webservice/ManagerV2.cpp +++ b/sdk/webservice/ManagerV2.cpp @@ -64,6 +64,7 @@ namespace ver_2 m_devNameList.clear(); m_openDevice = false; m_devName.clear(); + m_sn.clear(); m_devHandle = NULL; m_devParams.clear(); m_scanBlankCheck = false; @@ -266,7 +267,8 @@ namespace ver_2 if ((mask & GlobalConfig::fileSavePathMask) && cfg.fileSavePath.empty()) return -1; - if ((mask & GlobalConfig::fileNameModeMask) && ("date_time" != cfg.fileNameMode && "random" != cfg.fileNameMode)) + if ((mask & GlobalConfig::fileNameModeMask) && ("date_time" != cfg.fileNameMode && "random" != cfg.fileNameMode + && "sn_date_time" != cfg.fileNameMode)) return -1; if ((mask & GlobalConfig::imageFormatMask) && ("jpg" != cfg.imageFormat && "bmp" != cfg.imageFormat && "png" != cfg.imageFormat && "tif" != cfg.imageFormat && "pdf" != cfg.imageFormat && "ofd" != cfg.imageFormat && "ocr-pdf" != cfg.imageFormat && "ocr-ofd" != cfg.imageFormat)) @@ -1327,6 +1329,9 @@ namespace ver_2 m_devName = deviceName; m_openDevice = true; errInfo.clear(); + + std::string snError; + GetDeviceSN(m_sn, snError); return 0; } @@ -1348,8 +1353,9 @@ namespace ver_2 m_devName.clear(); m_devParams.clear(); m_openDevice = false; - errInfo.clear(); + + m_sn.clear(); return 0; } @@ -3176,6 +3182,13 @@ namespace ver_2 HGBase_GetUuid(uuid, 256); sprintf(filePath, "%s%s%s.%s", savePath, m_globalCfg.fileNamePrefix.c_str(), uuid, suffix.c_str()); } + else if ("sn_date_time" == m_globalCfg.fileNameMode) + { + HGTimeInfo timeInfo; + HGBase_GetLocalTime(&timeInfo); + sprintf(filePath, "%s%s%s_%04d%02d%02d%02d%02d%02d%03d.%s", savePath, m_globalCfg.fileNamePrefix.c_str(), m_sn.c_str(), timeInfo.year, + timeInfo.month, timeInfo.day, timeInfo.hour, timeInfo.minute, timeInfo.second, timeInfo.milliseconds, suffix.c_str()); + } else { HGTimeInfo timeInfo; diff --git a/sdk/webservice/ManagerV2.h b/sdk/webservice/ManagerV2.h index c735c6e0..e543b088 100644 --- a/sdk/webservice/ManagerV2.h +++ b/sdk/webservice/ManagerV2.h @@ -317,6 +317,7 @@ namespace ver_2 bool m_openDevice; SANE_Handle m_devHandle; std::string m_devName; + std::string m_sn; std::vector m_devParams; bool m_scanBlankCheck; bool m_scanTemp;