diff --git a/services/distributeddataservice/service/test/BUILD.gn b/services/distributeddataservice/service/test/BUILD.gn index 6aeafae0633eb5e16040b28572a03c99e03a9c3b..710d0bceeb67d3939b12df7aca375484e8dceae0 100644 --- a/services/distributeddataservice/service/test/BUILD.gn +++ b/services/distributeddataservice/service/test/BUILD.gn @@ -1373,6 +1373,7 @@ ohos_unittest("UdmfServiceStubMockTest") { "bundle_framework:appexecfwk_core", "c_utils:utils", "device_manager:devicemanagersdk", + "dfs_service:distributed_file_daemon_kit_inner", "googletest:gtest_main", "hilog:libhilog", "hisysevent:libhisysevent", @@ -1461,6 +1462,7 @@ ohos_unittest("UdmfPreProcessUtilsMockTest") { "bundle_framework:appexecfwk_core", "c_utils:utils", "device_manager:devicemanagersdk", + "dfs_service:distributed_file_daemon_kit_inner", "googletest:gmock_main", "googletest:gtest_main", "hisysevent:libhisysevent", diff --git a/services/distributeddataservice/service/udmf/BUILD.gn b/services/distributeddataservice/service/udmf/BUILD.gn index 6180f01b6998dca381c6afa7f69b5783460ccb7f..f8a62d82cdcbc1c4ba80d63277642373c1fae49a 100644 --- a/services/distributeddataservice/service/udmf/BUILD.gn +++ b/services/distributeddataservice/service/udmf/BUILD.gn @@ -74,6 +74,7 @@ ohos_source_set("udmf_server") { "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "device_manager:devicemanagersdk", + "dfs_service:distributed_file_daemon_kit_inner", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", diff --git a/services/distributeddataservice/service/udmf/preprocess/preprocess_utils.cpp b/services/distributeddataservice/service/udmf/preprocess/preprocess_utils.cpp index 8141886bae498abdc6e804acf86e3f80cfda7241..93840dd7dbb9e63ebee1c2266aae5f6dff1f4244 100644 --- a/services/distributeddataservice/service/udmf/preprocess/preprocess_utils.cpp +++ b/services/distributeddataservice/service/udmf/preprocess/preprocess_utils.cpp @@ -23,12 +23,12 @@ #include "udmf_radar_reporter.h" #include "accesstoken_kit.h" #include "device_manager_adapter.h" +#include "file_mount_manager.h" #include "iservice_registry.h" #include "log_print.h" #include "system_ability_definition.h" #include "udmf_radar_reporter.h" #include "udmf_utils.h" -#include "remote_file_share.h" #include "utils/crypto.h" #include "uri_permission_manager_client.h" namespace OHOS { @@ -240,7 +240,7 @@ int32_t PreProcessUtils::GetDfsUrisFromLocal(const std::vector &uri RadarReporterAdapter::ReportNormal(std::string(__FUNCTION__), BizScene::SET_DATA, SetDataStage::GERERATE_DFS_URI, StageRes::IDLE); std::unordered_map dfsUris; - int ret = RemoteFileShare::GetDfsUrisFromLocal(uris, userId, dfsUris); + int32_t ret = Storage::DistributedFile::FileMountManager::GetDfsUrisDirFromLocal(uris, userId, dfsUris); if (ret != 0 || dfsUris.empty()) { RadarReporterAdapter::ReportFail(std::string(__FUNCTION__), BizScene::SET_DATA, SetDataStage::GERERATE_DFS_URI, StageRes::FAILED, E_FS_ERROR, BizState::DFX_END);