优化升级

lixiaojun

2024-03-30 0f7975cfd6857826f28e0cb72b9935489c13868c

优化升级

 Yw.Application.DMA.Core/01-dma_area/DmaArea_Controller.cs

@@ -62,14 +62,14 @@
            {
                if (_service.IsExistCode(input.Code))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code}", "编码已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code}", "编码已存在");
                }
            }
            if (!string.IsNullOrEmpty(input.TagName))
            {
                if (_service.IsExistTagName(input.TagName))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                }
            }
            var model = input.Adapt<AddDmaAreaInput, Model.DmaArea>();
@@ -92,20 +92,20 @@
            var model = _service.GetByID(input.ID);
            if (model == null)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
            }
            if (!string.IsNullOrEmpty(input.Code))
            {
                if (_service.IsExistCodeExceptID(input.Code, input.ID))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code}", "编码已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code}", "编码已存在");
                }
            }
            if (!string.IsNullOrEmpty(input.TagName))
            {
                if (_service.IsExistTagNameExceptID(input.TagName, input.ID))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                }
            }
            var rhs = new Model.DmaArea(model);
@@ -170,7 +170,7 @@
            {
                if (_service.IsExistTagNameExceptID(input.TagName, input.ID))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                }
            }
            var bol = _service.UpdateTagName(input.ID, input.TagName);
@@ -239,7 +239,7 @@
            var bol = _service.DeleteByID(input.ID, out string Msg);
            if (!bol)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, Msg);
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, Msg);
            }
            return bol;
        }

 Yw.Application.DMA.Core/02-dma_site/DmaSite_Controller.cs

@@ -62,14 +62,14 @@
            {
                if (_service.IsExistCode(input.Code))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code}", "编码已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code}", "编码已存在");
                }
            }
            if (!string.IsNullOrEmpty(input.TagName))
            {
                if (_service.IsExistTagName(input.TagName))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                }
            }
            var model = input.Adapt<AddDmaSiteInput, Model.DmaSite>();
@@ -92,20 +92,20 @@
            var model = _service.GetByID(input.ID);
            if (model == null)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
            }
            if (!string.IsNullOrEmpty(input.Code))
            {
                if (_service.IsExistCodeExceptID(input.Code, input.ID))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code}", "编码已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code}", "编码已存在");
                }
            }
            if (!string.IsNullOrEmpty(input.TagName))
            {
                if (_service.IsExistTagNameExceptID(input.TagName, input.ID))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                }
            }
            var rhs = new Model.DmaSite(model);
@@ -170,7 +170,7 @@
            {
                if (_service.IsExistTagNameExceptID(input.TagName, input.ID))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                }
            }
            var bol = _service.UpdateTagName(input.ID, input.TagName);
@@ -239,7 +239,7 @@
            var bol = _service.DeleteByID(input.ID, out string Msg);
            if (!bol)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, Msg);
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, Msg);
            }
            return bol;
        }

 Yw.Application.DMA.Core/03-dma_site_binding/DmaSiteBinding_Controller.cs

@@ -66,11 +66,11 @@
            var model = new Service.DmaSite().GetByID(input.SiteID);
            if (model == null)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"SiteID:{input.SiteID} æ•°æ®ä¸å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"SiteID:{input.SiteID} æ•°æ®ä¸å­˜åœ¨");
            }
            if (_service.IsExistValidBySiteID(input.SiteID))
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"SiteID:{input.SiteID} å·²ç»‘定，请解除绑定后重试！");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"SiteID:{input.SiteID} å·²ç»‘定，请解除绑定后重试！");
            }
            var binding = new Model.DmaSiteBinding()
            {
@@ -91,7 +91,7 @@
            var binding = _service.GetValidBySiteID(input.SiteID);
            if (binding == null)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"SiteID:{input.SiteID} æœªç»‘定，无法解绑！");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"SiteID:{input.SiteID} æœªç»‘定，无法解绑！");
            }
            var rhs = new Model.DmaSiteBinding(binding)
            {
@@ -114,7 +114,7 @@
            var bol = _service.DeleteByID(input.ID, out string Msg);
            if (!bol)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, Msg);
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, Msg);
            }
            return bol;
        }

 Yw.Application.DMA.Core/04-dma_site_mapping/DmaSiteMapping_Controller.cs

@@ -86,12 +86,12 @@
            var area = new Yw.Service.DmaArea().GetByID(input.AreaID);
            if (area == null)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"AreaID:{input.AreaID} æ•°æ®ä¸å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"AreaID:{input.AreaID} æ•°æ®ä¸å­˜åœ¨");
            }
            var site = new Yw.Service.DmaSite().GetByID(input.SiteID);
            if (site == null)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"SiteID:{input.SiteID} æ•°æ®ä¸å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"SiteID:{input.SiteID} æ•°æ®ä¸å­˜åœ¨");
            }
            var model = input.Adapt<AddDmaSiteMappingInput, Model.DmaSiteMapping>();
            var id = _service.Insert(model);
@@ -112,12 +112,12 @@
                var area = serviceArea.GetByID(item.AreaID);
                if (area == null)
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"AreaID:{item.AreaID} æ•°æ®ä¸å­˜åœ¨");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"AreaID:{item.AreaID} æ•°æ®ä¸å­˜åœ¨");
                }
                var site = serviceSite.GetByID(item.SiteID);
                if (site == null)
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"SiteID:{item.SiteID} æ•°æ®ä¸å­˜åœ¨");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"SiteID:{item.SiteID} æ•°æ®ä¸å­˜åœ¨");
                }
            }
            var list = inputList.Select(x => x.Adapt<AddDmaSiteMappingInput, Model.DmaSiteMapping>()).ToList();
@@ -139,7 +139,7 @@
            var model = _service.GetByID(input.ID);
            if (model == null)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
            }
            var rhs = new Model.DmaSiteMapping(model);
            input.Adapt(rhs);
@@ -230,7 +230,7 @@
            var bol = _service.DeleteByID(input.ID, out string Msg);
            if (!bol)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, Msg);
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, Msg);
            }
            return bol;
        }

 Yw.Application.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,6 +4,6 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2024-03-26T07:12:13.3294744Z;True|2024-03-08T16:18:57.0565373+08:00;True|2024-01-27T11:12:36.5624841+08:00;True|2024-01-21T15:11:49.7807954+08:00;True|2023-12-14T16:15:09.1175216+08:00;True|2023-12-14T16:03:02.7254674+08:00;True|2023-12-14T11:25:21.0608059+08:00;True|2023-12-14T09:22:56.3156463+08:00;True|2023-12-05T17:05:07.9898436+08:00;True|2023-12-05T17:04:51.8319435+08:00;True|2023-07-13T12:10:11.2591498+08:00;True|2023-05-25T18:02:16.3580168+08:00;True|2023-05-25T15:44:32.4909866+08:00;</History>
    <History>True|2024-03-30T09:09:28.4169533Z;True|2024-03-30T17:08:43.0412281+08:00;True|2024-03-30T17:07:25.2289052+08:00;True|2024-03-26T15:12:13.3294744+08:00;True|2024-03-08T16:18:57.0565373+08:00;True|2024-01-27T11:12:36.5624841+08:00;True|2024-01-21T15:11:49.7807954+08:00;True|2023-12-14T16:15:09.1175216+08:00;True|2023-12-14T16:03:02.7254674+08:00;True|2023-12-14T11:25:21.0608059+08:00;True|2023-12-14T09:22:56.3156463+08:00;True|2023-12-05T17:05:07.9898436+08:00;True|2023-12-05T17:04:51.8319435+08:00;True|2023-07-13T12:10:11.2591498+08:00;True|2023-05-25T18:02:16.3580168+08:00;True|2023-05-25T15:44:32.4909866+08:00;</History>
  </PropertyGroup>
</Project>

 Yw.Application.DMA.Core/Yw.Application.DMA.Core.csproj

@@ -7,7 +7,7 @@
    <RootNamespace>Yw.Application</RootNamespace>
    <GenerateDocumentationFile>True</GenerateDocumentationFile>
    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
    <Version>3.0.0</Version>
    <Version>3.0.2</Version>
  </PropertyGroup>

  <ItemGroup>
@@ -32,8 +32,8 @@
  </ItemGroup>

  <ItemGroup>
    <PackageReference Include="Yw.Application.Core" Version="3.0.1" />
    <PackageReference Include="Yw.Dto.DMA.Core" Version="3.0.0" />
    <PackageReference Include="Yw.Application.Core" Version="3.0.5" />
    <PackageReference Include="Yw.Dto.DMA.Core" Version="3.0.1" />
  </ItemGroup>

</Project>

 Yw.Dto.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,6 +4,6 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2024-03-26T07:05:50.1066628Z;</History>
    <History>True|2024-03-30T09:05:48.8170927Z;True|2024-03-26T15:05:50.1066628+08:00;</History>
  </PropertyGroup>
</Project>

 Yw.Dto.DMA.Core/Yw.Dto.DMA.Core.csproj

@@ -4,12 +4,12 @@
    <TargetFramework>net6.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>disable</Nullable>
    <Version>3.0.0</Version>
    <Version>3.0.1</Version>
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="Yw.Dto.Core" Version="3.0.1" />
    <PackageReference Include="Yw.Service.DMA.Core" Version="3.0.0" />
    <PackageReference Include="Yw.Dto.Core" Version="3.0.5" />
    <PackageReference Include="Yw.Service.DMA.Core" Version="3.0.1" />
  </ItemGroup>

</Project>

 Yw.Service.DMA.Core/02-model/DmaArea.cs

@@ -3,7 +3,7 @@
    /// <summary>
    /// Dma分区
    /// </summary>    
    public partial class DmaArea : BaseModel, System.ICloneable
    public partial class DmaArea : BaseTraceModel, ICode, IParas, IFlags, ITagName, ISorter, System.ICloneable
    {
        /// <summary>
        /// 
@@ -24,12 +24,6 @@
            this.TagName = rhs.TagName;
            this.SortCode = rhs.SortCode;
            this.Description = rhs.Description;
            this.CreateUserID = rhs.CreateUserID;
            this.CreateTime = rhs.CreateTime;
            this.CreateUserName = rhs.CreateUserName;
            this.UpdateUserID = rhs.UpdateUserID;
            this.UpdateTime = rhs.UpdateTime;
            this.UpdateUserName = rhs.UpdateUserName;
        }

        /// <summary>
@@ -101,36 +95,6 @@
        /// è¯´æ˜Ž
        /// </summary>    
        public string Description { get; set; }

        /// <summary>
        /// åˆ›å»ºç”¨æˆ·id
        /// </summary>
        public long CreateUserID { get; set; }

        /// <summary>
        /// åˆ›å»ºæ—¶é—´
        /// </summary>
        public DateTime CreateTime { get; set; }

        /// <summary>
        /// åˆ›å»ºç”¨æˆ·åç§°
        /// </summary>
        public string CreateUserName { get; set; }

        /// <summary>
        /// æ›´æ–°ç”¨æˆ·id
        /// </summary>
        public long? UpdateUserID { get; set; }

        /// <summary>
        /// æ›´æ–°æ—¶é—´
        /// </summary>
        public DateTime? UpdateTime { get; set; }

        /// <summary>
        /// æ›´æ–°ç”¨æˆ·åç§°
        /// </summary>
        public string UpdateUserName { get; set; }

        /// <summary>
        /// 

 Yw.Service.DMA.Core/02-model/DmaSite.cs

@@ -3,7 +3,7 @@
    /// <summary>
    /// Dma点位
    /// </summary>    
    public partial class DmaSite : BaseModel, System.ICloneable
    public partial class DmaSite : BaseTraceModel, ICode, IParas, IFlags, ITagName, ISorter, System.ICloneable
    {
        /// <summary>
        /// 
@@ -24,12 +24,6 @@
            this.TagName = rhs.TagName;
            this.SortCode = rhs.SortCode;
            this.Description = rhs.Description;
            this.CreateUserID = rhs.CreateUserID;
            this.CreateTime = rhs.CreateTime;
            this.CreateUserName = rhs.CreateUserName;
            this.UpdateUserID = rhs.UpdateUserID;
            this.UpdateTime = rhs.UpdateTime;
            this.UpdateUserName = rhs.UpdateUserName;
        }

        /// <summary>
@@ -99,36 +93,6 @@
        /// è¯´æ˜Ž
        /// </summary>    
        public string Description { get; set; }

        /// <summary>
        /// åˆ›å»ºç”¨æˆ·id
        /// </summary>
        public long CreateUserID { get; set; }

        /// <summary>
        /// åˆ›å»ºæ—¶é—´
        /// </summary>
        public DateTime CreateTime { get; set; }

        /// <summary>
        /// åˆ›å»ºç”¨æˆ·åç§°
        /// </summary>
        public string CreateUserName { get; set; }

        /// <summary>
        /// æ›´æ–°ç”¨æˆ·id
        /// </summary>
        public long? UpdateUserID { get; set; }

        /// <summary>
        /// æ›´æ–°æ—¶é—´
        /// </summary>
        public DateTime? UpdateTime { get; set; }

        /// <summary>
        /// æ›´æ–°ç”¨æˆ·åç§°
        /// </summary>
        public string UpdateUserName { get; set; }

        /// <summary>
        /// 

 Yw.Service.DMA.Core/03-settings/paras/Paras_DMA.cs

@@ -10,5 +10,10 @@
        /// æ•°æ®åº“
        /// </summary>
        public Paras_DMA_DataBase DataBase { get; set; }

        /// <summary>
        /// CAL
        /// </summary>
        public Paras_DMA_CAL CAL { get; set; }
    }
}

 Yw.Service.DMA.Core/03-settings/paras/Paras_DMA_CAL.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
namespace Yw.Settings
{
    /// <summary>
    /// 
    /// </summary>
    public class Paras_DMA_CAL
    {
        /// <summary>
        /// CAL类型
        /// </summary>
        public string CALType { get; set; }

        /// <summary>
        /// HttpClient
        /// </summary>
        public Paras_DMA_CAL_HttpClient HttpClient { get; set; }

        /// <summary>
        /// LocalClient
        /// </summary>
        public Paras_DMA_CAL_LocalClient LocalClient { get; set; }


    }

}

 Yw.Service.DMA.Core/03-settings/paras/Paras_DMA_CAL_HttpClient.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
namespace Yw.Settings
{
    /// <summary>
    /// 
    /// </summary>
    public class Paras_DMA_CAL_HttpClient
    {
        /// <summary>
        /// 
        /// </summary>
        public string HttpUrl { get; set; }
    }
}

 Yw.Service.DMA.Core/03-settings/paras/Paras_DMA_CAL_LocalClient.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
namespace Yw.Settings
{
    /// <summary>
    /// 
    /// </summary>
    public class Paras_DMA_CAL_LocalClient
    {

    }
}

 Yw.Service.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,6 +4,6 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2024-03-26T06:58:52.6917193Z;True|2024-03-08T16:18:18.3780160+08:00;True|2024-01-21T15:08:21.6456363+08:00;True|2023-12-14T16:14:15.6493020+08:00;True|2023-12-14T16:02:00.2140184+08:00;True|2023-12-14T16:01:54.5715660+08:00;True|2023-12-14T11:24:08.6483638+08:00;True|2023-12-14T09:18:59.7684854+08:00;True|2023-12-05T17:01:08.6045358+08:00;True|2023-12-05T17:00:59.6449800+08:00;True|2023-07-13T11:54:33.7989040+08:00;True|2023-07-13T11:54:23.3967174+08:00;True|2023-07-06T09:49:52.7407983+08:00;True|2023-05-25T15:37:23.5406830+08:00;False|2023-05-25T15:36:09.3589239+08:00;</History>
    <History>True|2024-03-30T08:12:07.8965954Z;True|2024-03-26T14:58:52.6917193+08:00;True|2024-03-08T16:18:18.3780160+08:00;True|2024-01-21T15:08:21.6456363+08:00;True|2023-12-14T16:14:15.6493020+08:00;True|2023-12-14T16:02:00.2140184+08:00;True|2023-12-14T16:01:54.5715660+08:00;True|2023-12-14T11:24:08.6483638+08:00;True|2023-12-14T09:18:59.7684854+08:00;True|2023-12-05T17:01:08.6045358+08:00;True|2023-12-05T17:00:59.6449800+08:00;True|2023-07-13T11:54:33.7989040+08:00;True|2023-07-13T11:54:23.3967174+08:00;True|2023-07-06T09:49:52.7407983+08:00;True|2023-05-25T15:37:23.5406830+08:00;False|2023-05-25T15:36:09.3589239+08:00;</History>
  </PropertyGroup>
</Project>

 Yw.Service.DMA.Core/Yw.Service.DMA.Core.csproj

@@ -7,7 +7,7 @@
        <RootNamespace>Yw</RootNamespace>
        <GenerateDocumentationFile>True</GenerateDocumentationFile>
        <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
        <Version>3.0.0</Version>
        <Version>3.0.1</Version>
        <Description>引用升级</Description>
    </PropertyGroup>

@@ -30,8 +30,7 @@
      <PackageReference Include="Yw.DAL.PostgreSql.Core" Version="3.0.0" />
      <PackageReference Include="Yw.DAL.SQLite.Core" Version="3.0.0" />
      <PackageReference Include="Yw.DALFactory.Core" Version="3.0.0" />
      <PackageReference Include="Yw.IDAL.Core" Version="3.0.0" />
      <PackageReference Include="Yw.Service.Core" Version="3.0.0" />
      <PackageReference Include="Yw.Service.Core" Version="3.0.2" />
    </ItemGroup>

    <ItemGroup>

 Yw.Service.DMA.Core/paras_dma_settings.json

@@ -15,6 +15,14 @@
      "SQLite": {
        "ConnectString": "Data Source=yw_dma.db;"
      }
    },
    "CAL": {
      "CALType": "HttpClient", //HttpClient、LocalClient
      "HttpClient": {
        "HttpUrl": "http://101.133.133.173:97"
      },
      "LocalClient": {
      }
    }
  }