修改资产命名空间,修改vmo引用

duheng

2024-08-19 6ae670780041c98a82cb11bbe5fe2f82e1c82154

修改资产命名空间,修改vmo引用

 BLL/HStation.BLL.Assets.Core/00-core/ConfigHelper.cs

@@ -1,4 +1,4 @@
namespace HStation.BLL.Xhs.Assets
namespace HStation.BLL
{
    internal class ConfigHelper
    {

 BLL/HStation.BLL.Assets.Core/00-core/Mapper.cs

@@ -1,4 +1,4 @@
namespace HStation.BLL.Xhs
namespace HStation.BLL
{
    /// <summary>
    ///

 HStation.Xhs.Core.sln

@@ -111,8 +111,6 @@
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.Vmo.Assets.Core", "Vmo\HStation.Vmo.Assets.Core\HStation.Vmo.Assets.Core.csproj", "{3F682666-7578-47E7-8E1D-020AB5B75678}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yw.Vmo.Core", "Vmo\Yw.Vmo.Core\Yw.Vmo.Core.csproj", "{E49E50CC-2B68-4D67-BB80-C40E7F78D750}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.Vmo.Organize.Core", "Vmo\HStation.Vmo.Organize.Core\HStation.Vmo.Organize.Core.csproj", "{68588934-269E-4ADB-B0CB-7C48B0F08130}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Yw.Hydraulic.Core", "Hydro\Yw.Hydraulic.Core\Yw.Hydraulic.Core.vcxproj", "{0A0F9D7E-87C9-4276-823D-495355A01E8C}"
@@ -121,7 +119,7 @@
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
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yw.WinFrmUI.Hydro.L2d.Core", "WinFrmUI\Yw.WinFrmUI.Hydro.L2d.Core\Yw.WinFrmUI.Hydro.L2d.Core.csproj", "{AE2775AE-3C2D-49CB-BD3C-2FF5D4AE5B53}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yw.WinFrmUI.Hydro.L2d.Core", "WinFrmUI\Yw.WinFrmUI.Hydro.L2d.Core\Yw.WinFrmUI.Hydro.L2d.Core.csproj", "{AE2775AE-3C2D-49CB-BD3C-2FF5D4AE5B53}"
EndProject
Global
    GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -910,24 +908,6 @@
        {3F682666-7578-47E7-8E1D-020AB5B75678}.Release|x64.Build.0 = Release|Any CPU
        {3F682666-7578-47E7-8E1D-020AB5B75678}.Release|x86.ActiveCfg = Release|Any CPU
        {3F682666-7578-47E7-8E1D-020AB5B75678}.Release|x86.Build.0 = Release|Any CPU
        {E49E50CC-2B68-4D67-BB80-C40E7F78D750}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {E49E50CC-2B68-4D67-BB80-C40E7F78D750}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {E49E50CC-2B68-4D67-BB80-C40E7F78D750}.Debug|x64.ActiveCfg = Debug|Any CPU
        {E49E50CC-2B68-4D67-BB80-C40E7F78D750}.Debug|x64.Build.0 = Debug|Any CPU
        {E49E50CC-2B68-4D67-BB80-C40E7F78D750}.Debug|x86.ActiveCfg = Debug|Any CPU
        {E49E50CC-2B68-4D67-BB80-C40E7F78D750}.Debug|x86.Build.0 = Debug|Any CPU
        {E49E50CC-2B68-4D67-BB80-C40E7F78D750}.dll_test|Any CPU.ActiveCfg = Debug|Any CPU
        {E49E50CC-2B68-4D67-BB80-C40E7F78D750}.dll_test|Any CPU.Build.0 = Debug|Any CPU
        {E49E50CC-2B68-4D67-BB80-C40E7F78D750}.dll_test|x64.ActiveCfg = Debug|Any CPU
        {E49E50CC-2B68-4D67-BB80-C40E7F78D750}.dll_test|x64.Build.0 = Debug|Any CPU
        {E49E50CC-2B68-4D67-BB80-C40E7F78D750}.dll_test|x86.ActiveCfg = Debug|Any CPU
        {E49E50CC-2B68-4D67-BB80-C40E7F78D750}.dll_test|x86.Build.0 = Debug|Any CPU
        {E49E50CC-2B68-4D67-BB80-C40E7F78D750}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {E49E50CC-2B68-4D67-BB80-C40E7F78D750}.Release|Any CPU.Build.0 = Release|Any CPU
        {E49E50CC-2B68-4D67-BB80-C40E7F78D750}.Release|x64.ActiveCfg = Release|Any CPU
        {E49E50CC-2B68-4D67-BB80-C40E7F78D750}.Release|x64.Build.0 = Release|Any CPU
        {E49E50CC-2B68-4D67-BB80-C40E7F78D750}.Release|x86.ActiveCfg = Release|Any CPU
        {E49E50CC-2B68-4D67-BB80-C40E7F78D750}.Release|x86.Build.0 = Release|Any CPU
        {68588934-269E-4ADB-B0CB-7C48B0F08130}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {68588934-269E-4ADB-B0CB-7C48B0F08130}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {68588934-269E-4ADB-B0CB-7C48B0F08130}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1066,7 +1046,6 @@
        {AD2925B6-8E46-4B16-99F9-C0FD1F145B6B} = {E956660D-6E09-417B-9A3C-27888AF69266}
        {E6D1F549-1604-4F6B-856C-C8268F6D30BA} = {E956660D-6E09-417B-9A3C-27888AF69266}
        {3F682666-7578-47E7-8E1D-020AB5B75678} = {E956660D-6E09-417B-9A3C-27888AF69266}
        {E49E50CC-2B68-4D67-BB80-C40E7F78D750} = {E956660D-6E09-417B-9A3C-27888AF69266}
        {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}

 Service/HStation.Service.Assets.Core/00-core/ConfigHelper.cs

@@ -1,6 +1,4 @@
using HStation.Settings.Assets;

namespace HStation.Xhs
namespace HStation.Assets
{
    internal class ConfigHelper
    {

 Service/HStation.Service.Assets.Core/00-core/DataType.cs

@@ -1,4 +1,4 @@
namespace HStation.Xhs
namespace HStation.Assets
{
    /// <summary>
    ///

 Service/HStation.Service.Assets.Core/00-core/DbType.cs

@@ -1,9 +1,9 @@
namespace HStation.Xhs
namespace HStation.Assets
{
    /// <summary>
    ///
    /// </summary>
    public class DbType
    internal class DbType
    {
        /// <summary>
        ///

 Service/HStation.Service.Assets.Core/00-core/Flags.cs

@@ -1,19 +1,18 @@
namespace HStation.Xhs
namespace HStation.Assets
{
    /// <summary>
    /// 
    ///
    /// </summary>
    public class Flags
    internal class Flags
    {
        /// <summary>
        /// 
        ///
        /// </summary>
        public const string é»˜è®¤ = "默认";

        /// <summary>
        /// 
        ///
        /// </summary>
        public const string ä¸šåŠ¡ = "业务";

    }
}
}

 Service/HStation.Service.Assets.Core/00-core/MemoryCacheKey.cs

@@ -1,9 +1,9 @@
namespace HStation.Xhs
namespace HStation.Assets
{
    /// <summary>
    /// å†…存缓存键-为以后增加清除缓存做准备
    /// </summary>
    public class MemoryCacheKey
    internal class MemoryCacheKey
    {
        /// <summary>
        /// æœåŠ¡å±‚级
@@ -24,8 +24,5 @@
        /// æ¨¡å—
        /// </summary>
        public const string Module = "Xhs";



    }
}
}

 Service/HStation.Service.Assets.Core/00-core/Prop.cs

ÎļþÒÑɾ³ý

 Service/HStation.Service.Assets.Core/03-settings/01-paras/00-core/Paras_Xhs.cs

@@ -1,4 +1,4 @@
namespace HStation.Assets.Settings
namespace HStation.Settings.Assets
{
    /// <summary>
    ///

 Service/HStation.Service.Assets.Core/03-settings/01-paras/00-core/XhsParas.cs

@@ -1,4 +1,4 @@
namespace HStation.Assets.Settings
namespace HStation.Settings.Assets
{
    /// <summary>
    ///

 Service/HStation.Service.Assets.Core/03-settings/01-paras/01-database/Paras_Xhs_DataBase.cs

@@ -1,4 +1,4 @@
namespace HStation.Assets.Settings
namespace HStation.Settings.Assets
{
    /// <summary>
    ///

 Service/HStation.Service.Assets.Core/03-settings/01-paras/01-database/Paras_Xhs_DataBase_Factory.cs

@@ -1,4 +1,4 @@
namespace HStation.Assets.Settings
namespace HStation.Settings.Assets
{
    /// <summary>
    ///

 Service/HStation.Service.Assets.Core/03-settings/01-paras/01-database/Paras_Xhs_DataBase_PostgreSql.cs

@@ -1,4 +1,4 @@
namespace HStation.Assets.Settings
namespace HStation.Settings.Assets
{
    /// <summary>
    ///

 Service/HStation.Service.Assets.Core/03-settings/01-paras/01-database/Paras_Xhs_DataBase_SQLite.cs

@@ -1,4 +1,4 @@
namespace HStation.Assets.Settings
namespace HStation.Settings.Assets
{
    /// <summary>
    ///

 Service/HStation.Service.Assets.Core/03-settings/01-paras/02-cal/Paras_Xhs_CAL.cs

@@ -1,7 +1,7 @@
namespace HStation.Settings
namespace HStation.Settings.Assets
{
    /// <summary>
    /// 
    ///
    /// </summary>
    public class Paras_Xhs_CAL
    {
@@ -19,8 +19,5 @@
        /// LocalClient
        /// </summary>
        public Paras_Xhs_CAL_LocalClient LocalClient { get; set; }


    }

}
}

 Service/HStation.Service.Assets.Core/03-settings/01-paras/02-cal/Paras_Xhs_CAL_HttpClient.cs

@@ -1,13 +1,13 @@
namespace HStation.Settings
namespace HStation.Settings.Assets
{
    /// <summary>
    /// 
    ///
    /// </summary>
    public class Paras_Xhs_CAL_HttpClient
    {
        /// <summary>
        /// 
        ///
        /// </summary>
        public string HttpUrl { get; set; }
    }
}
}

 Service/HStation.Service.Assets.Core/03-settings/01-paras/02-cal/Paras_Xhs_CAL_LocalClient.cs

@@ -1,10 +1,9 @@
namespace HStation.Settings
namespace HStation.Settings.Assets
{
    /// <summary>
    /// 
    ///
    /// </summary>
    public class Paras_Xhs_CAL_LocalClient
    {

    }
}
}

 Service/HStation.Service.Assets.Core/04-dal/02-postgresql/PumpGroup.cs

@@ -12,7 +12,7 @@
        /// </summary>
        public override ConnectionConfig ConnectionConfig
        {
            get { return Xhs.ConfigHelper.PostgreSqlConnectionConfig; }
            get { return Assets.ConfigHelper.PostgreSqlConnectionConfig; }
        }

        //删除拓展

 Service/HStation.Service.Assets.Core/04-dal/02-postgresql/PumpMain.cs

@@ -12,7 +12,7 @@
        /// </summary>
        public override ConnectionConfig ConnectionConfig
        {
            get { return Xhs.ConfigHelper.PostgreSqlConnectionConfig; }
            get { return Assets.ConfigHelper.PostgreSqlConnectionConfig; }
        }

        //删除拓展

 Service/HStation.Service.Assets.Core/04-dal/02-postgresql/PumpMainAndPartMap.cs

@@ -12,7 +12,7 @@
        /// </summary>
        public override ConnectionConfig ConnectionConfig
        {
            get { return Xhs.ConfigHelper.PostgreSqlConnectionConfig; }
            get { return Assets.ConfigHelper.PostgreSqlConnectionConfig; }
        }
    }
}

 Service/HStation.Service.Assets.Core/04-dal/02-postgresql/PumpMapGroupAndMain.cs

@@ -12,7 +12,7 @@
        /// </summary>
        public override ConnectionConfig ConnectionConfig
        {
            get { return Xhs.ConfigHelper.PostgreSqlConnectionConfig; }
            get { return Assets.ConfigHelper.PostgreSqlConnectionConfig; }
        }
    }
}

 Service/HStation.Service.Assets.Core/04-dal/02-postgresql/PumpPart.cs

@@ -12,7 +12,7 @@
        /// </summary>
        public override ConnectionConfig ConnectionConfig
        {
            get { return Xhs.ConfigHelper.PostgreSqlConnectionConfig; }
            get { return Assets.ConfigHelper.PostgreSqlConnectionConfig; }
        }

        //插入拓展

 Service/HStation.Service.Assets.Core/04-dal/02-postgresql/PumpPropContent.cs

@@ -12,7 +12,7 @@
        /// </summary>
        public override ConnectionConfig ConnectionConfig
        {
            get { return Xhs.ConfigHelper.PostgreSqlConnectionConfig; }
            get { return Assets.ConfigHelper.PostgreSqlConnectionConfig; }
        }
    }
}

 Service/HStation.Service.Assets.Core/04-dal/02-postgresql/PumpSeries.cs

@@ -12,7 +12,7 @@
        /// </summary>
        public override ConnectionConfig ConnectionConfig
        {
            get { return Xhs.ConfigHelper.PostgreSqlConnectionConfig; }
            get { return Assets.ConfigHelper.PostgreSqlConnectionConfig; }
        }

        //删除拓展

 Service/HStation.Service.Assets.Core/05-service/00-core/02-cache/CacheHelper.cs

@@ -12,7 +12,7 @@
        /// </summary>
        public static string GetCacheKey(string keyContent)
        {
            return MemoryCacheKeyHelper.GetKey(MemoryCacheKey.ServiceLevel, MemoryCacheKey.Module, $"*{_cacheKeyPrefix}*_{keyContent}");
            return MemoryCacheKeyHelper.GetKey(HStation.Assets.MemoryCacheKey.ServiceLevel, HStation.Assets.MemoryCacheKey.Module, $"*{_cacheKeyPrefix}*_{keyContent}");
        }

        /// <summary>
@@ -22,7 +22,7 @@
        {
            Yw.MemoryCacheHelper.Remove((key) =>
            {
                var prefix = MemoryCacheKeyHelper.GetKey(MemoryCacheKey.ServiceLevel, MemoryCacheKey.Module, $"*{_cacheKeyPrefix}*");
                var prefix = MemoryCacheKeyHelper.GetKey(HStation.Assets.MemoryCacheKey.ServiceLevel, HStation.Assets.MemoryCacheKey.Module, $"*{_cacheKeyPrefix}*");
                return key.StartsWith(prefix);
            });
        }

 Service/HStation.Service.Assets.Core/05-service/00-core/03-helper/DbFirstHelper.cs

@@ -13,7 +13,7 @@
            msg = string.Empty;
            try
            {
                var connectConfig = HStation.Xhs.ConfigHelper.PostgreSqlConnectionConfig;
                var connectConfig = HStation.Assets.ConfigHelper.PostgreSqlConnectionConfig;
                if (connectConfig == null)
                {
                    msg = "连接配置初始化失败";
@@ -31,7 +31,7 @@
                        }
                        if (column.DataType == StaticConfig.CodeFirst_BigString)
                        {
                            if (Settings.Assets.XhsParasHelper.Xhs.DataBase.DbType == Xhs.DbType.PostgreSql)
                            if (Settings.Assets.XhsParasHelper.Xhs.DataBase.DbType == HStation.Assets.DbType.PostgreSql)
                            {
                                column.DataType = "character varying";
                            }

 Service/HStation.Service.Assets.Core/GlobalUsings.cs

@@ -1,9 +1,7 @@
global using AutoMapper;
global using HStation.Settings;
global using HStation.Xhs;
global using SqlSugar;
global using System.Data;
global using Yw;
global using Yw.Service;
global using Yw.Untity;
global using HStation.Assets.Settings;
global using HStation.Settings.Assets;

 Vmo/HStation.Vmo.Assets.Core/HStation.Vmo.Assets.Core.csproj

@@ -7,7 +7,7 @@
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="Yw.Vmo.Core" Version="1.0.0" />
    <ProjectReference Include="..\HStation.Vmo.Core\HStation.Vmo.Core.csproj" />
  </ItemGroup>

</Project>

 Vmo/HStation.Vmo.Core/HStation.Vmo.Core.csproj

@@ -7,7 +7,7 @@
  </PropertyGroup>

  <ItemGroup>
    <ProjectReference Include="..\Yw.Vmo.Core\Yw.Vmo.Core.csproj" />
    <PackageReference Include="Yw.Vmo.Core" Version="3.0.1" />
  </ItemGroup>

</Project>

 Vmo/HStation.Vmo.Xhs.Core/HStation.Vmo.Xhs.Core.csproj

@@ -7,7 +7,7 @@
  </PropertyGroup>

  <ItemGroup>
    <ProjectReference Include="..\Yw.Vmo.Core\Yw.Vmo.Core.csproj" />
    <PackageReference Include="Yw.Vmo.Core" Version="3.0.1" />
  </ItemGroup>

</Project>