lixiaojun
2024-01-21 7d7591e33633ab1d369ef041fc62973ff2cfe9d7
引用升级,代码微调
已重命名61个文件
已修改4个文件
35 ■■■■ 文件已修改
Yw.Application.DMA.Core/00-core/1-mapper/Mapper.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/00-core/2-extensions/Extensions.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/00-core/3-dto/areaid/AreaIDInput.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/00-core/3-dto/direction/UpdateDirectionInput.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/00-core/3-dto/siteid/SiteIDInput.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/00-core/3-dto/siteid/SiteIdsInput.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/01-dma_area/1-mgr/DmaArea_Controller.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/01-dma_area/1-mgr/dto/AddDmaAreaInput.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/01-dma_area/1-mgr/dto/DmaAreaDto.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/01-dma_area/1-mgr/dto/UpdateDmaAreaInput.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/01-dma_area/2-std/DmaArea_StdController.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/01-dma_area/2-std/dto/DmaAreaStdDto.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/02-dma_site/1-mgr/DmaSite_Controller.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/02-dma_site/1-mgr/dto/AddDmaSiteInput.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/02-dma_site/1-mgr/dto/DmaSiteDto.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/02-dma_site/1-mgr/dto/UpdateDmaSiteInput.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/02-dma_site/2-std/DmaSite_StdController.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/02-dma_site/2-std/dto/DmaSiteStdDto.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/03-dma_site_binding/1-mgr/DmaSiteBinding_Controller.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/03-dma_site_binding/1-mgr/dto/BindingDmaSiteInput.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/03-dma_site_binding/1-mgr/dto/DmaSiteBindingDto.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/03-dma_site_binding/1-mgr/dto/UnBindingDmaSiteInput.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/04-dma_site_mapping/1-mgr/DmaSiteMapping_Controller.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/04-dma_site_mapping/1-mgr/dto/AddDmaSiteMappingInput.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/04-dma_site_mapping/1-mgr/dto/DmaSiteMappingDto.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/04-dma_site_mapping/1-mgr/dto/UpdateDmaSiteMappingInput.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/Yw.Application.DMA.Core.csproj 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/00-core/ConfigHelper.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/00-core/DataType.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/00-core/MemoryCacheKey.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/00-core/eDirection.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/01-entity/DmaArea.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/01-entity/DmaSite.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/01-entity/DmaSiteBinding.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/01-entity/DmaSiteMapping.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/02-model/DmaArea.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/02-model/DmaSite.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/02-model/DmaSiteBinding.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/02-model/DmaSiteMapping.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/03-settings/helper/DMAFileHelper.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/03-settings/helper/DMAParasHelper.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/03-settings/paras/DMAParas.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/03-settings/paras/Paras_DMA.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/03-settings/paras/Paras_DMA_DataBase.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/04-dal/DmaArea.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/04-dal/DmaSite.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/04-dal/DmaSiteBinding.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/04-dal/DmaSiteMapping.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/05-service/00-helper/CacheHelper.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/05-service/00-helper/Extensions.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/05-service/01-dma_area/Cache/DmaAreaCacheHelper.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/05-service/01-dma_area/DmaArea.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/05-service/01-dma_area/DmaArea_Instance.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/05-service/02-dma_site/Cache/DmaSiteCacheHelper.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/05-service/02-dma_site/DmaSite.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/05-service/02-dma_site/DmaSite_Instance.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/05-service/03-dma_site_binding/Cache/DmaSiteBindingCacheHelper.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/05-service/03-dma_site_binding/DmaSiteBinding.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/05-service/03-dma_site_binding/DmaSiteBinding_Instance.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/05-service/04-dma_site_mapping/Cache/DmaSiteMappingCacheHelper.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/05-service/04-dma_site_mapping/DmaSiteMapping.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/05-service/04-dma_site_mapping/DmaSiteMapping_Instance.cs 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Service.DMA.Core/Yw.Service.DMA.Core.csproj 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Yw.Application.DMA.Core/00-core/1-mapper/Mapper.cs
Yw.Application.DMA.Core/00-core/2-extensions/Extensions.cs
Yw.Application.DMA.Core/00-core/3-dto/areaid/AreaIDInput.cs
Yw.Application.DMA.Core/00-core/3-dto/direction/UpdateDirectionInput.cs
Yw.Application.DMA.Core/00-core/3-dto/siteid/SiteIDInput.cs
Yw.Application.DMA.Core/00-core/3-dto/siteid/SiteIdsInput.cs
Yw.Application.DMA.Core/01-dma_area/1-mgr/DmaArea_Controller.cs
ÎļþÃû´Ó Yw.Application.DMA.Core/1-dma_area/1-mgr/DmaArea_Controller.cs ÐÞ¸Ä
@@ -73,7 +73,7 @@
                }
            }
            var model = input.Adapt<AddDmaAreaInput, Model.DmaArea>();
            model.SortCode = _service.GetMaxSortCodeByBelongTypeAndBelongID(input.BelongType, input.BelongID) + 1;
            model.SortCode = _service.GetMaxSortCode(input.BelongType, input.BelongID) + 1;
            var id = _service.Insert(model);
            return id;
        }
@@ -170,7 +170,7 @@
            {
                if (_service.IsExistTagNameExceptID(input.TagName, input.ID))
                {
                    throw Oops.Oh(ErrorCodes.V001, $"TagName:{input.TagName}", "标记名称已存在");
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                }
            }
            var bol = _service.UpdateTagName(input.ID, input.TagName, UserManager.UserID, DateTime.Now, UserManager.UserName);
Yw.Application.DMA.Core/01-dma_area/1-mgr/dto/AddDmaAreaInput.cs
Yw.Application.DMA.Core/01-dma_area/1-mgr/dto/DmaAreaDto.cs
Yw.Application.DMA.Core/01-dma_area/1-mgr/dto/UpdateDmaAreaInput.cs
Yw.Application.DMA.Core/01-dma_area/2-std/DmaArea_StdController.cs
Yw.Application.DMA.Core/01-dma_area/2-std/dto/DmaAreaStdDto.cs
Yw.Application.DMA.Core/02-dma_site/1-mgr/DmaSite_Controller.cs
ÎļþÃû´Ó Yw.Application.DMA.Core/2-dma_site/1-mgr/DmaSite_Controller.cs ÐÞ¸Ä
@@ -73,7 +73,7 @@
                }
            }
            var model = input.Adapt<AddDmaSiteInput, Model.DmaSite>();
            model.SortCode = _service.GetMaxSortCodeByBelongTypeAndBelongID(input.BelongType, input.BelongID) + 1;
            model.SortCode = _service.GetMaxSortCode(input.BelongType, input.BelongID) + 1;
            var id = _service.Insert(model);
            return id;
        }
@@ -170,7 +170,7 @@
            {
                if (_service.IsExistTagNameExceptID(input.TagName, input.ID))
                {
                    throw Oops.Oh(ErrorCodes.V001, $"TagName:{input.TagName}", "标记名称已存在");
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                }
            }
            var bol = _service.UpdateTagName(input.ID, input.TagName, UserManager.UserID, DateTime.Now, UserManager.UserName);
Yw.Application.DMA.Core/02-dma_site/1-mgr/dto/AddDmaSiteInput.cs
Yw.Application.DMA.Core/02-dma_site/1-mgr/dto/DmaSiteDto.cs
Yw.Application.DMA.Core/02-dma_site/1-mgr/dto/UpdateDmaSiteInput.cs
Yw.Application.DMA.Core/02-dma_site/2-std/DmaSite_StdController.cs
Yw.Application.DMA.Core/02-dma_site/2-std/dto/DmaSiteStdDto.cs
Yw.Application.DMA.Core/03-dma_site_binding/1-mgr/DmaSiteBinding_Controller.cs
Yw.Application.DMA.Core/03-dma_site_binding/1-mgr/dto/BindingDmaSiteInput.cs
Yw.Application.DMA.Core/03-dma_site_binding/1-mgr/dto/DmaSiteBindingDto.cs
Yw.Application.DMA.Core/03-dma_site_binding/1-mgr/dto/UnBindingDmaSiteInput.cs
Yw.Application.DMA.Core/04-dma_site_mapping/1-mgr/DmaSiteMapping_Controller.cs
Yw.Application.DMA.Core/04-dma_site_mapping/1-mgr/dto/AddDmaSiteMappingInput.cs
Yw.Application.DMA.Core/04-dma_site_mapping/1-mgr/dto/DmaSiteMappingDto.cs
Yw.Application.DMA.Core/04-dma_site_mapping/1-mgr/dto/UpdateDmaSiteMappingInput.cs
Yw.Application.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,6 +4,6 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2023-12-14T08:15:09.1175216Z;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-01-21T07:11:49.7807954Z;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>1.0.4</Version>
    <Version>1.0.5</Version>
  </PropertyGroup>
  <ItemGroup>
@@ -32,13 +32,13 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Yw.Application.Core" Version="1.2.9" />
    <PackageReference Include="Yw.Service.DMA.Core" Version="1.0.4" />
    <PackageReference Include="Yw.Application.Core" Version="1.3.8" />
    <PackageReference Include="Yw.Service.DMA.Core" Version="1.0.5" />
  </ItemGroup>
  <ItemGroup>
    <Folder Include="3-dma_site_binding\2-std\dto\" />
    <Folder Include="4-dma_site_mapping\2-std\dto\" />
    <Folder Include="03-dma_site_binding\2-std\dto\" />
    <Folder Include="04-dma_site_mapping\2-std\dto\" />
  </ItemGroup>
</Project>
Yw.Service.DMA.Core/00-core/ConfigHelper.cs
ÎļþÃû´Ó Yw.Service.DMA.Core/0-core/ConfigHelper.cs ÐÞ¸Ä
@@ -25,6 +25,7 @@
                    {
                        OnLogExecuting = (sql, p) =>
                        {
                            LogHelper.Debug(sql);
                            // Console.WriteLine(sql);
                        }
                    }
Yw.Service.DMA.Core/00-core/DataType.cs
Yw.Service.DMA.Core/00-core/MemoryCacheKey.cs
Yw.Service.DMA.Core/00-core/eDirection.cs
Yw.Service.DMA.Core/01-entity/DmaArea.cs
Yw.Service.DMA.Core/01-entity/DmaSite.cs
Yw.Service.DMA.Core/01-entity/DmaSiteBinding.cs
Yw.Service.DMA.Core/01-entity/DmaSiteMapping.cs
Yw.Service.DMA.Core/02-model/DmaArea.cs
Yw.Service.DMA.Core/02-model/DmaSite.cs
Yw.Service.DMA.Core/02-model/DmaSiteBinding.cs
Yw.Service.DMA.Core/02-model/DmaSiteMapping.cs
Yw.Service.DMA.Core/03-settings/helper/DMAFileHelper.cs
Yw.Service.DMA.Core/03-settings/helper/DMAParasHelper.cs
Yw.Service.DMA.Core/03-settings/paras/DMAParas.cs
Yw.Service.DMA.Core/03-settings/paras/Paras_DMA.cs
Yw.Service.DMA.Core/03-settings/paras/Paras_DMA_DataBase.cs
Yw.Service.DMA.Core/04-dal/DmaArea.cs
Yw.Service.DMA.Core/04-dal/DmaSite.cs
Yw.Service.DMA.Core/04-dal/DmaSiteBinding.cs
Yw.Service.DMA.Core/04-dal/DmaSiteMapping.cs
Yw.Service.DMA.Core/05-service/00-helper/CacheHelper.cs
Yw.Service.DMA.Core/05-service/00-helper/Extensions.cs
Yw.Service.DMA.Core/05-service/01-dma_area/Cache/DmaAreaCacheHelper.cs
Yw.Service.DMA.Core/05-service/01-dma_area/DmaArea.cs
ÎļþÃû´Ó Yw.Service.DMA.Core/5-service/1-dma_area/DmaArea.cs ÐÞ¸Ä
@@ -121,9 +121,9 @@
        }
        /// <summary>
        /// é€šè¿‡ BelongType å’Œ BelongID èŽ·å–æœ€å¤§æŽ’åºç 
        /// èŽ·å–æœ€å¤§æŽ’åºç 
        /// </summary>
        public int GetMaxSortCodeByBelongTypeAndBelongID(string BelongType, long BelongID)
        public int GetMaxSortCode(string BelongType, long BelongID)
        {
            var all = GetByBelongTypeAndBelongID(BelongType, BelongID);
            if (all == null || all.Count < 1)
Yw.Service.DMA.Core/05-service/01-dma_area/DmaArea_Instance.cs
Yw.Service.DMA.Core/05-service/02-dma_site/Cache/DmaSiteCacheHelper.cs
Yw.Service.DMA.Core/05-service/02-dma_site/DmaSite.cs
ÎļþÃû´Ó Yw.Service.DMA.Core/5-service/2-dma_site/DmaSite.cs ÐÞ¸Ä
@@ -121,9 +121,9 @@
        }
        /// <summary>
        /// é€šè¿‡ BelongType å’Œ BelongID èŽ·å–æœ€å¤§æŽ’åºç 
        /// èŽ·å–æœ€å¤§æŽ’åºç 
        /// </summary>
        public int GetMaxSortCodeByBelongTypeAndBelongID(string BelongType, long BelongID)
        public int GetMaxSortCode(string BelongType, long BelongID)
        {
            var all = GetByBelongTypeAndBelongID(BelongType, BelongID);
            if (all == null || all.Count < 1)
Yw.Service.DMA.Core/05-service/02-dma_site/DmaSite_Instance.cs
Yw.Service.DMA.Core/05-service/03-dma_site_binding/Cache/DmaSiteBindingCacheHelper.cs
Yw.Service.DMA.Core/05-service/03-dma_site_binding/DmaSiteBinding.cs
Yw.Service.DMA.Core/05-service/03-dma_site_binding/DmaSiteBinding_Instance.cs
Yw.Service.DMA.Core/05-service/04-dma_site_mapping/Cache/DmaSiteMappingCacheHelper.cs
Yw.Service.DMA.Core/05-service/04-dma_site_mapping/DmaSiteMapping.cs
Yw.Service.DMA.Core/05-service/04-dma_site_mapping/DmaSiteMapping_Instance.cs
Yw.Service.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,6 +4,6 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2023-12-14T08:14:15.6493020Z;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-01-21T07:08:21.6456363Z;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>1.0.4</Version>
        <Version>1.0.5</Version>
        <Description>引用升级</Description>
    </PropertyGroup>
@@ -27,7 +27,7 @@
    </ItemGroup>
    <ItemGroup>
      <PackageReference Include="Yw.Service.Core" Version="1.1.4" />
      <PackageReference Include="Yw.Service.Core" Version="1.1.6" />
    </ItemGroup>
    <ItemGroup>