删除冗余

duheng

2024-09-27 2cb855ba2e7c4cb9002cf0a4a7f6b11d4a587acd

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/00-core/ImportXhsProjectFileHelper.cs

@@ -73,7 +73,7 @@
                return false;
            }

            var revitModel = HStation.Service.RevitParseHelper.FromJsonFile(jsonFileInfo.FullName, out msg);
            var revitModel = HStation.Service.RevitParseHelper.FromJsonFile(jsonFileInfo.FullName, null, out msg);
            if (revitModel == null)
            {
                feedBackMsg?.Invoke($"{msg}！！！", Color.Red);
@@ -105,8 +105,7 @@

            #region 第六步 关联水力结构模型（进度 40%）

            var bllXhsProjectSite = new BLL.XhsProjectSiteStd();
            var projectSite = await bllXhsProjectSite.GetDefaultByProjectID((long)vm.ProjectID);
            var projectSite = await BLLFactory<HStation.BLL.XhsProjectSite>.Instance.GetDefaultByProjectID((long)vm.ProjectID);
            if (projectSite == null)
            {
                feedBackMsg?.Invoke("项目站信息错误...", Color.Red);
@@ -118,7 +117,7 @@

            feedBackMsg?.Invoke("正在关联水力结构模型...", Color.Black);

            var hydroRelation = new Yw.Dto.AddHydroModelRelationInput();
            var hydroRelation = new Yw.Vmo.HydroModelRelationVmo();
            hydroRelation.ObjectType = HStation.Xhs.DataType.XhsProjectSite;
            hydroRelation.ObjectID = projectSiteId;
            hydroRelation.ModelID = hydroId;
@@ -126,8 +125,9 @@
            hydroRelation.Content = null;
            hydroRelation.Description = null;


            var bllHydroRelation = new Yw.BLL.HydroModelRelation();
            var hydroRelationId = await bllHydroRelation.Insert(hydroRelation);
            var hydroRelationId = await BLLFactory<Yw.BLL.HydroModelRelation>.Instance.Insert(hydroRelation);
            if (hydroRelationId < 1)
            {
                feedBackMsg?.Invoke("关联水力结构模型失败！！！", Color.Red);
@@ -174,7 +174,7 @@

            feedBackMsg?.Invoke("正在保存Bimface文件...", Color.Black);

            var bimfaceFile = new Yw.Dto.AddBimfaceFileInput();
            var bimfaceFile = new Yw.Vmo.BimfaceFileVmo();
            bimfaceFile.BimfaceId = bimfaceId.ToString();
            bimfaceFile.Name = vm.Name;
            bimfaceFile.ModelType = (int)Yw.Bimface.eModelType.File;
@@ -203,7 +203,7 @@

            feedBackMsg?.Invoke("正在关联Bimface文件...", Color.Black);

            var bimfaceRelation = new Yw.Dto.AddBimfaceFileRelationInput();
            var bimfaceRelation = new Yw.Vmo.BimfaceFileRelationVmo();
            bimfaceRelation.ObjectType = HStation.Xhs.DataType.XhsProjectSite;
            bimfaceRelation.ObjectID = projectSiteId;
            bimfaceRelation.BimfaceFileID = bimfaceFileId;