lixiaojun
2024-09-27 ce1cc10e518ddac71cfefd433f8a6af9fb46ed40
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs
@@ -157,8 +157,9 @@
                feedBackProgress?.Invoke(100, 100);
                return true;
            }
            var structOthersFileInfo = allFileInfoList.Find(x => x.Name == HStation.Revit.ConstParas.StructOthersFileName);
            var structRevitModel = HStation.Service.RevitParseHelper.FromJsonFile(structFileInfo.FullName, out msg);
            var structRevitModel = HStation.Service.RevitParseHelper.FromJsonFile(structFileInfo.FullName, structOthersFileInfo?.FullName, out msg);
            if (structRevitModel == null)
            {
                feedBackMsg?.Invoke($"{msg}!!!", Color.Red);
@@ -185,6 +186,25 @@
                return true;
            }
            //feedBackMsg?.Invoke("正在进行产品匹配...", Color.Black);
            //hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(hydroId);
            //var matchingParas = AssetsMatchingParasHelper.Create(hydroInfo);
            //if (await AssetsMatchingHelper.Matching(matchingParas))
            //{
            //    if (AssetsMatchingParasHelper.Apply(hydroInfo, matchingParas))
            //    {
            //        feedBackMsg?.Invoke("产品匹配成功。。。", Color.Green);
            //    }
            //    else
            //    {
            //        feedBackMsg?.Invoke("产品匹配失败!!!", Color.Red);
            //    }
            //}
            //else
            //{
            //    feedBackMsg?.Invoke("产品匹配失败!!!", Color.Red);
            //}
            feedBackMsg?.Invoke("水力结构文件解析成功。。。", Color.Green);
            feedBackProgress?.Invoke(100, 30);
            vm.HydroID = hydroId;