修改项目bll方法

duheng

2024-08-13 473c09c6fd3dd3c566e45b5ab8264d0c25cd4f0d

修改项目bll方法

 BLL/HStation.BLL.Xhs.Core/04-bll/01-project/XhsProjectExtensions.cs

@@ -1,4 +1,5 @@
using AutoMapper;
using Yw.Basic;

namespace HStation.BLL
{
@@ -9,19 +10,25 @@
    {
        private readonly HStation.CAL.IXhsProjectExtensions _cal = CALCreateHelper.CreateCAL<HStation.CAL.IXhsProjectExtensions>();

        public async Task<bool> BulkInserts(List<Vmo.Xhs.XhsProjectSite> list)
        public async Task<bool> BulkInserts(List<Vmo.Xhs.XhsProjectExtensions> list)
        {
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Vmo.Xhs.XhsProjectSite, AddXhsProjectExtensionsInput>()
        ).CreateMapper();
            var vmoList = mapper.Map<List<Vmo.Xhs.XhsProjectSite>, List<AddXhsProjectExtensionsInput>>(list);
            var mapper = new MapperConfiguration(cfg =>
            {
                cfg.CreateMap<Vmo.Xhs.XhsProjectSite, AddXhsProjectSiteExtensionsInput>();
                cfg.CreateMap<Vmo.Xhs.XhsProjectExtensions, AddXhsProjectExtensionsInput>();
            }).CreateMapper();
            var vmoList = mapper.Map<List<Vmo.Xhs.XhsProjectExtensions>, List<AddXhsProjectExtensionsInput>>(list);
            return await _cal.BulkInserts(vmoList); ;
        }

        public Task<bool> BulkUpdates(List<Vmo.Xhs.XhsProjectSite> list)
        public Task<bool> BulkUpdates(List<Vmo.Xhs.XhsProjectExtensions> list)
        {
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Vmo.Xhs.XhsProjectSite, UpdateXhsProjectExtensionsInput>()
).CreateMapper();
            var vmoList = mapper.Map<List<Vmo.Xhs.XhsProjectSite>, List<UpdateXhsProjectExtensionsInput>>(list);
            var mapper = new MapperConfiguration(cfg =>
            {
                cfg.CreateMap<Vmo.Xhs.XhsProjectSite, UpdateXhsProjectSiteInput>();
                cfg.CreateMap<Vmo.Xhs.XhsProjectExtensions, UpdateXhsProjectExtensionsInput>();
            }).CreateMapper();
            var vmoList = mapper.Map<List<Vmo.Xhs.XhsProjectExtensions>, List<UpdateXhsProjectExtensionsInput>>(list);

            return _cal.BulkUpdates(vmoList);
        }
@@ -41,66 +48,92 @@
            return _cal.DeleteByIds(Ids);
        }

        public async Task<List<Vmo.Xhs.XhsProjectSite>> GetAll()
        public async Task<List<Vmo.Xhs.XhsProjectExtensions>> GetAll()
        {
            var DtoList = await _cal.GetAll();
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<XhsProjectExtensionsDto, Vmo.Xhs.XhsProjectSite>()
            var mapper = new MapperConfiguration(
                cfg =>
                {
                    cfg.CreateMap<XhsProjectExtensionsDto, Vmo.Xhs.XhsProjectExtensions>();
                    cfg.CreateMap<XhsProjectSiteDto, Vmo.Xhs.XhsProjectSite>();
                }
).CreateMapper();
            var vmoList = mapper.Map<List<XhsProjectExtensionsDto>, List<Vmo.Xhs.XhsProjectSite>>(DtoList);
            var vmoList = mapper.Map<List<XhsProjectExtensionsDto>, List<Vmo.Xhs.XhsProjectExtensions>>(DtoList);
            return vmoList;
        }

        public async Task<Vmo.Xhs.XhsProjectSite> GetByID(long ID)
        public async Task<Vmo.Xhs.XhsProjectExtensions> GetByID(long ID)
        {
            var Dto = await _cal.GetByID(ID);
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<XhsProjectExtensionsDto, Vmo.Xhs.XhsProjectSite>()
            var mapper = new MapperConfiguration(
                cfg =>
                {
                    cfg.CreateMap<XhsProjectExtensionsDto, Vmo.Xhs.XhsProjectExtensions>();
                    cfg.CreateMap<XhsProjectSiteDto, Vmo.Xhs.XhsProjectSite>();
                }
).CreateMapper();
            var vmo = mapper.Map<XhsProjectExtensionsDto, Vmo.Xhs.XhsProjectSite>(Dto);
            var vmo = mapper.Map<XhsProjectExtensionsDto, Vmo.Xhs.XhsProjectExtensions>(Dto);
            return vmo;
        }

        public async Task<List<Vmo.Xhs.XhsProjectSite>> GetByIds(List<long> Ids)
        public async Task<List<Vmo.Xhs.XhsProjectExtensions>> GetByIds(List<long> Ids)
        {
            var DtoList = await _cal.GetByIds(Ids);
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<XhsProjectExtensionsDto, Vmo.Xhs.XhsProjectSite>()
            var mapper = new MapperConfiguration(
                cfg =>
                {
                    cfg.CreateMap<XhsProjectExtensionsDto, Vmo.Xhs.XhsProjectExtensions>();
                    cfg.CreateMap<XhsProjectSiteDto, Vmo.Xhs.XhsProjectSite>();
                }
).CreateMapper();
            var vmoList = mapper.Map<List<XhsProjectExtensionsDto>, List<Vmo.Xhs.XhsProjectSite>>(DtoList);
            var vmoList = mapper.Map<List<XhsProjectExtensionsDto>, List<Vmo.Xhs.XhsProjectExtensions>>(DtoList);

            return vmoList;
        }

        public Task<long> Insert(Vmo.Xhs.XhsProjectSite model)
        public Task<long> Insert(Vmo.Xhs.XhsProjectExtensions model)
        {
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Vmo.Xhs.XhsProjectSite, AddXhsProjectExtensionsInput>()
).CreateMapper();
            var vmo = mapper.Map<Vmo.Xhs.XhsProjectSite, AddXhsProjectExtensionsInput>(model);

            var mapper = new MapperConfiguration(cfg =>
           {
               cfg.CreateMap<Vmo.Xhs.XhsProjectSite, AddXhsProjectSiteExtensionsInput>();
               cfg.CreateMap<Vmo.Xhs.XhsProjectExtensions, AddXhsProjectExtensionsInput>();
           }).CreateMapper();
            var vmo = mapper.Map<Vmo.Xhs.XhsProjectExtensions, AddXhsProjectExtensionsInput>(model);
            return _cal.Insert(vmo);
        }

        public Task<bool> Inserts(List<Vmo.Xhs.XhsProjectSite> list)
        public Task<bool> Inserts(List<Vmo.Xhs.XhsProjectExtensions> list)
        {
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Vmo.Xhs.XhsProjectSite, AddXhsProjectExtensionsInput>()
).CreateMapper();
            var vmoList = mapper.Map<List<Vmo.Xhs.XhsProjectSite>, List<AddXhsProjectExtensionsInput>>(list);
            var mapper = new MapperConfiguration(cfg =>
            {
                cfg.CreateMap<Vmo.Xhs.XhsProjectSite, AddXhsProjectSiteExtensionsInput>();
                cfg.CreateMap<Vmo.Xhs.XhsProjectExtensions, AddXhsProjectExtensionsInput>();
            }).CreateMapper();
            var vmoList = mapper.Map<List<Vmo.Xhs.XhsProjectExtensions>, List<AddXhsProjectExtensionsInput>>(list);

            return _cal.Inserts(vmoList);
        }

        public Task<bool> Update(Vmo.Xhs.XhsProjectSite model)
        public Task<bool> Update(Vmo.Xhs.XhsProjectExtensions model)
        {
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Vmo.Xhs.XhsProjectSite, UpdateXhsProjectExtensionsInput>()
).CreateMapper();
            var vmo = mapper.Map<Vmo.Xhs.XhsProjectSite, UpdateXhsProjectExtensionsInput>(model);
            var mapper = new MapperConfiguration(cfg =>
            {
                cfg.CreateMap<Vmo.Xhs.XhsProjectSite, UpdateXhsProjectSiteInput>();
                cfg.CreateMap<Vmo.Xhs.XhsProjectExtensions, UpdateXhsProjectExtensionsInput>();
            }).CreateMapper();
            var vmo = mapper.Map<Vmo.Xhs.XhsProjectExtensions, UpdateXhsProjectExtensionsInput>(model);

            return _cal.Update(vmo);
        }

        public Task<bool> Updates(List<Vmo.Xhs.XhsProjectSite> list)
        public Task<bool> Updates(List<Vmo.Xhs.XhsProjectExtensions> list)
        {
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Vmo.Xhs.XhsProjectSite, UpdateXhsProjectExtensionsInput>()
).CreateMapper();
            var vmoList = mapper.Map<List<Vmo.Xhs.XhsProjectSite>, List<UpdateXhsProjectExtensionsInput>>(list);
            var mapper = new MapperConfiguration(cfg =>
            {
                cfg.CreateMap<Vmo.Xhs.XhsProjectSite, UpdateXhsProjectSiteInput>();
                cfg.CreateMap<Vmo.Xhs.XhsProjectExtensions, UpdateXhsProjectExtensionsInput>();
            }).CreateMapper();
            var vmoList = mapper.Map<List<Vmo.Xhs.XhsProjectExtensions>, List<UpdateXhsProjectExtensionsInput>>(list);

            return _cal.Updates(vmoList);
        }

 HStation.Xhs.Core.sln

@@ -119,6 +119,8 @@
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.WinFrmUI.PhartRelation.Core", "WinFrmUI\HStation.WinFrmUI.PhartRelation.Core\HStation.WinFrmUI.PhartRelation.Core.csproj", "{DBC6DC37-8BA8-4CFC-A98C-E6D34EE2E5D7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.Vmo.Xhs.Core", "Vmo\HStation.Vmo.Xhs.Core\HStation.Vmo.Xhs.Core.csproj", "{2F469712-C0AB-405C-BCA3-410612141D49}"
EndProject
Global
    GlobalSection(SolutionConfigurationPlatforms) = preSolution
        Debug|Any CPU = Debug|Any CPU
@@ -978,6 +980,24 @@
        {DBC6DC37-8BA8-4CFC-A98C-E6D34EE2E5D7}.Release|x64.Build.0 = Release|Any CPU
        {DBC6DC37-8BA8-4CFC-A98C-E6D34EE2E5D7}.Release|x86.ActiveCfg = Release|Any CPU
        {DBC6DC37-8BA8-4CFC-A98C-E6D34EE2E5D7}.Release|x86.Build.0 = Release|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.Debug|x64.ActiveCfg = Debug|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.Debug|x64.Build.0 = Debug|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.Debug|x86.ActiveCfg = Debug|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.Debug|x86.Build.0 = Debug|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.dll_test|Any CPU.ActiveCfg = Debug|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.dll_test|Any CPU.Build.0 = Debug|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.dll_test|x64.ActiveCfg = Debug|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.dll_test|x64.Build.0 = Debug|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.dll_test|x86.ActiveCfg = Debug|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.dll_test|x86.Build.0 = Debug|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.Release|Any CPU.Build.0 = Release|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.Release|x64.ActiveCfg = Release|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.Release|x64.Build.0 = Release|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.Release|x86.ActiveCfg = Release|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.Release|x86.Build.0 = Release|Any CPU
    EndGlobalSection
    GlobalSection(SolutionProperties) = preSolution
        HideSolutionNode = FALSE
@@ -1030,6 +1050,7 @@
        {68588934-269E-4ADB-B0CB-7C48B0F08130} = {E956660D-6E09-417B-9A3C-27888AF69266}
        {0A0F9D7E-87C9-4276-823D-495355A01E8C} = {9F4F9ECE-9C4C-4796-91A1-69805F823EA5}
        {DBC6DC37-8BA8-4CFC-A98C-E6D34EE2E5D7} = {4F0A7BA1-6ED6-4F4F-A3B4-B9B3A133D869}
        {2F469712-C0AB-405C-BCA3-410612141D49} = {E956660D-6E09-417B-9A3C-27888AF69266}
    EndGlobalSection
    GlobalSection(ExtensibilityGlobals) = postSolution
        SolutionGuid = {E02989A8-9B6F-43E5-AACA-790328215089}

 Vmo/HStation.Vmo.Xhs.Core/XhsProjectExtensions.cs

@@ -1,4 +1,4 @@
namespace HStation.Vmo.Xhs.Core
namespace HStation.Vmo.Xhs
{
    public class XhsProjectExtensions
    {

 Vmo/HStation.Vmo.Xhs.Core/XhsProjectSite.cs

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Yw.Vmo;
using Yw.Vmo;

namespace HStation.Vmo.Xhs
{

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs

@@ -5,12 +5,11 @@
namespace HStation.WinFrmUI
{
    /// <summary>
    /// 
    ///
    /// </summary>
    public class ImportXhsProjectHelper
    {
        private const string _tempFolder = "ImportProjectTemp";//导入项目临时文件夹


        /// <summary>
        /// 导入
@@ -40,7 +39,7 @@

            feedBackProgress?.Invoke(100, 5);

            #endregion
            #endregion 第一步 临时文件处理（进度5%）

            #region 第二步 压缩文件解析 （进度10%）

@@ -65,7 +64,7 @@

            feedBackProgress?.Invoke(100, 10);

            #endregion
            #endregion 第二步 压缩文件解析 （进度10%）

            #region 第三步 解析水力结构文件 （进度15%）

@@ -105,7 +104,7 @@

            vm.HydroID = hydroId;

            #endregion
            #endregion 第三步 解析水力结构文件 （进度15%）

            #region 第四步 创建项目（进度 20%）

@@ -113,7 +112,7 @@

            var bllXhsProjectExtensions = new Lazy<BLL.XhsProjectExtensions>(() => new BLL.XhsProjectExtensions());

            var project = new AddXhsProjectExtensionsInput();
            var project = new Vmo.Xhs.XhsProjectExtensions();
            project.NO = vm.NO;
            project.Name = vm.Name;
            project.Address = vm.Address;
@@ -122,8 +121,8 @@
            project.TagName = vm.TagName;
            project.Description = vm.Description;

            project.SiteList = new List<AddXhsProjectSiteExtensionsInput>() {
                new AddXhsProjectSiteExtensionsInput(){
            project.SiteList = new List<Vmo.Xhs.XhsProjectSite>() {
                new Vmo.Xhs.XhsProjectSite(){
                    Name=vm.Name,
                    Description=vm.Description
                }
@@ -142,7 +141,7 @@

            feedBackProgress?.Invoke(100, 20);

            #endregion
            #endregion 第四步 创建项目（进度 20%）

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

@@ -181,7 +180,7 @@

            feedBackProgress?.Invoke(100, 25);

            #endregion
            #endregion 第五步 关联水力结构模型（进度 25%）

            #region 第六步 设置地图位置（进度 30%）

@@ -214,10 +213,9 @@
                feedBackMsg?.Invoke("未设置地图位置信息！！！");
            }


            feedBackProgress?.Invoke(100, 30);

            #endregion
            #endregion 第六步 设置地图位置（进度 30%）

            #region 第七步 上传Revit模型文件（进度 45%）

@@ -245,7 +243,7 @@

            feedBackProgress?.Invoke(100, 45);

            #endregion
            #endregion 第七步 上传Revit模型文件（进度 45%）

            #region 第八步 保存Bimface文件 （进度 50%）

@@ -274,7 +272,7 @@

            feedBackProgress?.Invoke(100, 50);

            #endregion
            #endregion 第八步 保存Bimface文件 （进度 50%）

            #region 第九步 关联Bimface文件（进度 55%）

@@ -299,7 +297,7 @@
            feedBackMsg?.Invoke("Bimface文件关联成功。。。");
            feedBackProgress?.Invoke(100, 55);

            #endregion
            #endregion 第九步 关联Bimface文件（进度 55%）

            #region 第九步 发起bimface转换（进度 80%）

@@ -329,7 +327,7 @@

            feedBackProgress?.Invoke(100, 80);

            #endregion
            #endregion 第九步 发起bimface转换（进度 80%）

            #region 第十步 更新Bimface文件状态（进度 90%）

@@ -348,7 +346,7 @@

            feedBackProgress?.Invoke(100, 90);

            #endregion
            #endregion 第十步 更新Bimface文件状态（进度 90%）

            #region 第十一步 项目发布（进度 100%）

@@ -368,12 +366,8 @@
            feedBackProgress?.Invoke(100, 100);
            feedBackMsg?.Invoke("项目导入结束。。。");
            return true;
            #endregion



            #endregion 第十一步 项目发布（进度 100%）
        }


    }
}
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.cs

@@ -1,4 +1,5 @@
using DevExpress.Utils;
using HStation.WinFrmUI.Xhs;

namespace HStation.WinFrmUI
{
@@ -129,7 +130,8 @@
        //添加
        private void barBtnAdd_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
           
            var dlg = new AddProjectDlg();
            dlg.ShowDialog();
        }

        //编辑

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/AddProjectDlg.cs

@@ -14,11 +14,24 @@
        }

        //确定
        private void BtnOk_Click(object sender, EventArgs e)
        private async void BtnOk_Click(object sender, EventArgs e)
        {
            if (!Valid())
                return;
            var bll = new BLL.XhsProjectExtensions();
            var all = await bll.GetAll();
            await bll.Insert(new Vmo.Xhs.XhsProjectExtensions
            {
                Address = "详细地址",
                SiteList = new List<Vmo.Xhs.XhsProjectSite>()
                {
                     new Vmo.Xhs.XhsProjectSite
                     {
                         Name ="测试名称",
                         Description ="测试说明"
                     }
                }
            });
        }
    }
}