From dad0c33f18a3175d1235512673c6fc71d0d87dcc Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 07 六月 2024 16:07:36 +0800
Subject: [PATCH] Trace bug修复
---
Yw.Service.DMA.Core/01-entity/DmaSite.cs | 8
Yw.Service.DMA.Core/04-dal/01-interface/IDmaSite.cs | 2
Yw.Dto.DMA.Core/01-dma-area/UpdateDmaAreaInput.cs | 5
Yw.Dto.DMA.Core/02-dma-site/DmaSiteDto.cs | 42 -----
Yw.Service.DMA.Core/05-service/04-dma_site_mapping/DmaSiteMapping_Instance.cs | 10
Yw.Service.DMA.Core/02-model/DmaSite.cs | 15 -
Yw.Service.DMA.Core/04-dal/03-sqlite/DmaArea.cs | 2
Yw.Service.DMA.Core/Yw.Service.DMA.Core.csproj | 6
Yw.Service.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
Yw.Dto.DMA.Core/01-dma-area/DmaAreaDto.cs | 42 -----
Yw.Service.DMA.Core/04-dal/02-postgresql/DmaSite.cs | 2
Yw.Application.DMA.Core/02-dma_site/DmaSite_Controller.cs | 36 ----
Yw.Application.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
Yw.Application.DMA.Core/01-dma_area/DmaArea_Controller.cs | 36 ----
Yw.Service.DMA.Core/05-service/01-dma_area/DmaArea.cs | 26 ---
Yw.Dto.DMA.Core/01-dma-area/AddDmaAreaInput.cs | 5
Yw.Service.DMA.Core/02-model/DmaArea.cs | 15 -
Yw.Service.DMA.Core/04-dal/02-postgresql/DmaArea.cs | 2
Yw.Dto.DMA.Core/01-dma-area/DmaAreaStdDto.cs | 41 -----
Yw.Dto.DMA.Core/02-dma-site/UpdateDmaSiteInput.cs | 5
Yw.Service.DMA.Core/05-service/03-dma_site_binding/DmaSiteBinding_Instance.cs | 10
Yw.Service.DMA.Core/04-dal/01-interface/IDmaArea.cs | 2
Yw.Service.DMA.Core/01-entity/DmaArea.cs | 8
Yw.Dto.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
Yw.Dto.DMA.Core/02-dma-site/AddDmaSiteInput.cs | 5
Yw.Service.DMA.Core/05-service/01-dma_area/DmaArea_Instance.cs | 10
Yw.Service.DMA.Core/05-service/02-dma_site/DmaSite.cs | 26 ---
Yw.Service.DMA.Core/05-service/02-dma_site/DmaSite_Instance.cs | 10
Yw.Application.DMA.Core/00-core/Mapper.cs | 21 --
Yw.Service.DMA.Core/00-core/DataType.cs | 9 +
Yw.Dto.DMA.Core/02-dma-site/DmaSiteStdDto.cs | 42 -----
Yw.Dto.DMA.Core/Yw.Dto.DMA.Core.csproj | 4
Yw.Service.DMA.Core/04-dal/03-sqlite/DmaSite.cs | 2
Yw.Application.DMA.Core/03-dma_site_binding/DmaSiteBinding_Controller.cs | 1
Yw.Application.DMA.Core/Yw.Application.DMA.Core.csproj | 4
35 files changed, 53 insertions(+), 407 deletions(-)
diff --git a/Yw.Application.DMA.Core/00-core/Mapper.cs b/Yw.Application.DMA.Core/00-core/Mapper.cs
index 92c360a..2c9523b 100644
--- a/Yw.Application.DMA.Core/00-core/Mapper.cs
+++ b/Yw.Application.DMA.Core/00-core/Mapper.cs
@@ -13,15 +13,9 @@
{
#region 1-area
- config.ForType<AddDmaAreaInput, Model.DmaArea>()
- .Map(dest => dest.CreateUserName, src => UserManager.UserName)
- .Map(dest => dest.CreateTime, src => DateTime.Now)
- .Map(dest => dest.CreateUserID, src => UserManager.UserID);
+ config.ForType<AddDmaAreaInput, Model.DmaArea>();
- config.ForType<UpdateDmaAreaInput, Model.DmaArea>()
- .Map(dest => dest.UpdateUserName, src => UserManager.UserName)
- .Map(dest => dest.UpdateTime, src => DateTime.Now)
- .Map(dest => dest.UpdateUserID, src => UserManager.UserID);
+ config.ForType<UpdateDmaAreaInput, Model.DmaArea>();
config.ForType<Model.DmaArea, DmaAreaDto>();
@@ -29,15 +23,9 @@
#region 2-site
- config.ForType<AddDmaSiteInput, Model.DmaSite>()
- .Map(dest => dest.CreateUserName, src => UserManager.UserName)
- .Map(dest => dest.CreateTime, src => DateTime.Now)
- .Map(dest => dest.CreateUserID, src => UserManager.UserID);
+ config.ForType<AddDmaSiteInput, Model.DmaSite>();
- config.ForType<UpdateDmaSiteInput, Model.DmaSite>()
- .Map(dest => dest.UpdateUserName, src => UserManager.UserName)
- .Map(dest => dest.UpdateTime, src => DateTime.Now)
- .Map(dest => dest.UpdateUserID, src => UserManager.UserID);
+ config.ForType<UpdateDmaSiteInput, Model.DmaSite>();
config.ForType<Model.DmaSite, DmaSiteDto>();
@@ -50,7 +38,6 @@
config.ForType<UnBindingDmaSiteInput, Model.DmaSiteBinding>()
.Map(dest => dest.UnBindingTime, src => DateTime.Now);
-
#endregion
diff --git a/Yw.Application.DMA.Core/01-dma_area/DmaArea_Controller.cs b/Yw.Application.DMA.Core/01-dma_area/DmaArea_Controller.cs
index 20c0fe5..7c9ab92 100644
--- a/Yw.Application.DMA.Core/01-dma_area/DmaArea_Controller.cs
+++ b/Yw.Application.DMA.Core/01-dma_area/DmaArea_Controller.cs
@@ -58,13 +58,6 @@
[HttpPost]
public long Insert([Required] AddDmaAreaInput input)
{
- if (!string.IsNullOrEmpty(input.Code))
- {
- if (_service.IsExistCode(input.Code))
- {
- throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code}", "缂栫爜宸插瓨鍦�");
- }
- }
if (!string.IsNullOrEmpty(input.TagName))
{
if (_service.IsExistTagName(input.TagName))
@@ -93,13 +86,6 @@
if (model == null)
{
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, InternalErrorCodes.V001, $"Code:{input.Code}", "缂栫爜宸插瓨鍦�");
- }
}
if (!string.IsNullOrEmpty(input.TagName))
{
@@ -180,28 +166,6 @@
#endregion
#region Exist
-
- /// <summary>
- /// 鍒ゆ柇 Code 鏄惁瀛樺湪
- /// </summary>
- [Route("IsExistCode@V1.0")]
- [HttpGet]
- public bool IsExistCode([FromQuery][Required] CodeInput input)
- {
- var bol = _service.IsExistCode(input.Code);
- return bol;
- }
-
- /// <summary>
- /// 鍒ゆ柇 Code 鏄惁瀛樺湪 ExceptID
- /// </summary>
- [Route("IsExistCodeExceptID@V1.0")]
- [HttpGet]
- public bool IsExistCodeExceptID([FromQuery][Required] CodeExceptInput input)
- {
- var bol = _service.IsExistCodeExceptID(input.Code, input.ExceptID);
- return bol;
- }
/// <summary>
/// 鍒ゆ柇TagName鏄惁瀛樺湪
diff --git a/Yw.Application.DMA.Core/02-dma_site/DmaSite_Controller.cs b/Yw.Application.DMA.Core/02-dma_site/DmaSite_Controller.cs
index 8534af5..beb4ca6 100644
--- a/Yw.Application.DMA.Core/02-dma_site/DmaSite_Controller.cs
+++ b/Yw.Application.DMA.Core/02-dma_site/DmaSite_Controller.cs
@@ -58,13 +58,6 @@
[HttpPost]
public long Insert([Required] AddDmaSiteInput input)
{
- if (!string.IsNullOrEmpty(input.Code))
- {
- if (_service.IsExistCode(input.Code))
- {
- throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code}", "缂栫爜宸插瓨鍦�");
- }
- }
if (!string.IsNullOrEmpty(input.TagName))
{
if (_service.IsExistTagName(input.TagName))
@@ -93,13 +86,6 @@
if (model == null)
{
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, InternalErrorCodes.V001, $"Code:{input.Code}", "缂栫爜宸插瓨鍦�");
- }
}
if (!string.IsNullOrEmpty(input.TagName))
{
@@ -180,28 +166,6 @@
#endregion
#region Exist
-
- /// <summary>
- /// 鍒ゆ柇 Code 鏄惁瀛樺湪
- /// </summary>
- [Route("IsExistCode@V1.0")]
- [HttpGet]
- public bool IsExistCode([FromQuery][Required] CodeInput input)
- {
- var bol = _service.IsExistCode(input.Code);
- return bol;
- }
-
- /// <summary>
- /// 鍒ゆ柇 Code 鏄惁瀛樺湪 ExceptID
- /// </summary>
- [Route("IsExistCodeExceptID@V1.0")]
- [HttpGet]
- public bool IsExistCodeExceptID([FromQuery][Required] CodeExceptInput input)
- {
- var bol = _service.IsExistCodeExceptID(input.Code, input.ExceptID);
- return bol;
- }
/// <summary>
/// 鍒ゆ柇TagName鏄惁瀛樺湪
diff --git a/Yw.Application.DMA.Core/03-dma_site_binding/DmaSiteBinding_Controller.cs b/Yw.Application.DMA.Core/03-dma_site_binding/DmaSiteBinding_Controller.cs
index 0402d20..ed61bcd 100644
--- a/Yw.Application.DMA.Core/03-dma_site_binding/DmaSiteBinding_Controller.cs
+++ b/Yw.Application.DMA.Core/03-dma_site_binding/DmaSiteBinding_Controller.cs
@@ -36,7 +36,6 @@
}
-
#endregion
#region Exist
diff --git a/Yw.Application.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user b/Yw.Application.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
index 2177c8b..a23fb3b 100644
--- a/Yw.Application.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/Yw.Application.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project>
<PropertyGroup>
- <History>True|2024-05-31T07:00:55.7539416Z;True|2024-05-13T09:59:07.1591054+08:00;True|2024-05-10T10:29:18.3677390+08:00;True|2024-03-30T17:09:28.4169533+08:00;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>
+ <History>True|2024-06-07T08:07:02.0529395Z;True|2024-05-31T15:00:55.7539416+08:00;True|2024-05-13T09:59:07.1591054+08:00;True|2024-05-10T10:29:18.3677390+08:00;True|2024-03-30T17:09:28.4169533+08:00;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>
<LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/Yw.Application.DMA.Core/Yw.Application.DMA.Core.csproj b/Yw.Application.DMA.Core/Yw.Application.DMA.Core.csproj
index b03e383..bf033f7 100644
--- a/Yw.Application.DMA.Core/Yw.Application.DMA.Core.csproj
+++ b/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.6</Version>
+ <Version>3.0.7</Version>
</PropertyGroup>
<ItemGroup>
@@ -33,7 +33,7 @@
<ItemGroup>
<PackageReference Include="Yw.Application.Core" Version="3.0.7" />
- <PackageReference Include="Yw.Dto.DMA.Core" Version="3.0.5" />
+ <PackageReference Include="Yw.Dto.DMA.Core" Version="3.0.6" />
</ItemGroup>
</Project>
diff --git a/Yw.Dto.DMA.Core/01-dma-area/AddDmaAreaInput.cs b/Yw.Dto.DMA.Core/01-dma-area/AddDmaAreaInput.cs
index 970c1ee..a5dfc9a 100644
--- a/Yw.Dto.DMA.Core/01-dma-area/AddDmaAreaInput.cs
+++ b/Yw.Dto.DMA.Core/01-dma-area/AddDmaAreaInput.cs
@@ -22,11 +22,6 @@
public string Name { get; set; }
/// <summary>
- /// 缂栫爜
- /// </summary>
- public string Code { get; set; }
-
- /// <summary>
/// 鍙傛暟
/// </summary>
public Dictionary<string, string> Paras { get; set; }
diff --git a/Yw.Dto.DMA.Core/01-dma-area/DmaAreaDto.cs b/Yw.Dto.DMA.Core/01-dma-area/DmaAreaDto.cs
index ebfdb67..11a5d5e 100644
--- a/Yw.Dto.DMA.Core/01-dma-area/DmaAreaDto.cs
+++ b/Yw.Dto.DMA.Core/01-dma-area/DmaAreaDto.cs
@@ -19,18 +19,11 @@
this.BelongType = rhs.BelongType;
this.BelongID = rhs.BelongID;
this.Name = rhs.Name;
- this.Code = rhs.Code;
this.Paras = rhs.Paras;
this.Flags = rhs.Flags;
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>
@@ -52,11 +45,6 @@
/// 鍚嶇О
/// </summary>
public string Name { get; set; }
-
- /// <summary>
- /// 缂栫爜
- /// </summary>
- public string Code { get; set; }
/// <summary>
/// 鍙傛暟
@@ -82,36 +70,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; }
}
}
diff --git a/Yw.Dto.DMA.Core/01-dma-area/DmaAreaStdDto.cs b/Yw.Dto.DMA.Core/01-dma-area/DmaAreaStdDto.cs
index 5ae9793..c00465c 100644
--- a/Yw.Dto.DMA.Core/01-dma-area/DmaAreaStdDto.cs
+++ b/Yw.Dto.DMA.Core/01-dma-area/DmaAreaStdDto.cs
@@ -19,18 +19,11 @@
this.BelongType = rhs.BelongType;
this.BelongID = rhs.BelongID;
this.Name = rhs.Name;
- this.Code = rhs.Code;
this.Paras = rhs.Paras;
this.Flags = rhs.Flags;
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>
@@ -52,11 +45,6 @@
/// 鍚嶇О
/// </summary>
public string Name { get; set; }
-
- /// <summary>
- /// 缂栫爜
- /// </summary>
- public string Code { get; set; }
/// <summary>
/// 鍙傛暟
@@ -83,35 +71,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; }
}
}
diff --git a/Yw.Dto.DMA.Core/01-dma-area/UpdateDmaAreaInput.cs b/Yw.Dto.DMA.Core/01-dma-area/UpdateDmaAreaInput.cs
index 3aeb799..00f51c1 100644
--- a/Yw.Dto.DMA.Core/01-dma-area/UpdateDmaAreaInput.cs
+++ b/Yw.Dto.DMA.Core/01-dma-area/UpdateDmaAreaInput.cs
@@ -18,11 +18,6 @@
public string Name { get; set; }
/// <summary>
- /// 缂栫爜
- /// </summary>
- public string Code { get; set; }
-
- /// <summary>
/// 鍙傛暟
/// </summary>
public Dictionary<string, string> Paras { get; set; }
diff --git a/Yw.Dto.DMA.Core/02-dma-site/AddDmaSiteInput.cs b/Yw.Dto.DMA.Core/02-dma-site/AddDmaSiteInput.cs
index df14b25..20bbe2a 100644
--- a/Yw.Dto.DMA.Core/02-dma-site/AddDmaSiteInput.cs
+++ b/Yw.Dto.DMA.Core/02-dma-site/AddDmaSiteInput.cs
@@ -22,11 +22,6 @@
public string Name { get; set; }
/// <summary>
- /// 缂栫爜
- /// </summary>
- public string Code { get; set; }
-
- /// <summary>
/// 鍙傛暟
/// </summary>
public Dictionary<string, string> Paras { get; set; }
diff --git a/Yw.Dto.DMA.Core/02-dma-site/DmaSiteDto.cs b/Yw.Dto.DMA.Core/02-dma-site/DmaSiteDto.cs
index 48e4b8b..154b769 100644
--- a/Yw.Dto.DMA.Core/02-dma-site/DmaSiteDto.cs
+++ b/Yw.Dto.DMA.Core/02-dma-site/DmaSiteDto.cs
@@ -19,18 +19,11 @@
this.BelongType = rhs.BelongType;
this.BelongID = rhs.BelongID;
this.Name = rhs.Name;
- this.Code = rhs.Code;
this.Paras = rhs.Paras;
this.Flags = rhs.Flags;
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>
@@ -52,11 +45,6 @@
/// 鍚嶇О
/// </summary>
public string Name { get; set; }
-
- /// <summary>
- /// 缂栫爜
- /// </summary>
- public string Code { get; set; }
/// <summary>
/// 鍙傛暟
@@ -82,36 +70,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; }
}
}
diff --git a/Yw.Dto.DMA.Core/02-dma-site/DmaSiteStdDto.cs b/Yw.Dto.DMA.Core/02-dma-site/DmaSiteStdDto.cs
index bd029a3..37be78b 100644
--- a/Yw.Dto.DMA.Core/02-dma-site/DmaSiteStdDto.cs
+++ b/Yw.Dto.DMA.Core/02-dma-site/DmaSiteStdDto.cs
@@ -19,18 +19,11 @@
this.BelongType = rhs.BelongType;
this.BelongID = rhs.BelongID;
this.Name = rhs.Name;
- this.Code = rhs.Code;
this.Paras = rhs.Paras;
this.Flags = rhs.Flags;
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>
@@ -52,11 +45,6 @@
/// 鍚嶇О
/// </summary>
public string Name { get; set; }
-
- /// <summary>
- /// 缂栫爜
- /// </summary>
- public string Code { get; set; }
/// <summary>
/// 鍙傛暟
@@ -82,36 +70,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; }
}
}
diff --git a/Yw.Dto.DMA.Core/02-dma-site/UpdateDmaSiteInput.cs b/Yw.Dto.DMA.Core/02-dma-site/UpdateDmaSiteInput.cs
index 243fb14..87bc3d6 100644
--- a/Yw.Dto.DMA.Core/02-dma-site/UpdateDmaSiteInput.cs
+++ b/Yw.Dto.DMA.Core/02-dma-site/UpdateDmaSiteInput.cs
@@ -18,11 +18,6 @@
public string Name { get; set; }
/// <summary>
- /// 缂栫爜
- /// </summary>
- public string Code { get; set; }
-
- /// <summary>
/// 鍙傛暟
/// </summary>
public Dictionary<string, string> Paras { get; set; }
diff --git a/Yw.Dto.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user b/Yw.Dto.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
index 241dd08..789469e 100644
--- a/Yw.Dto.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/Yw.Dto.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project>
<PropertyGroup>
- <History>True|2024-05-31T07:00:13.3635038Z;True|2024-05-13T09:58:31.1869310+08:00;True|2024-05-10T10:28:26.2058407+08:00;True|2024-05-10T10:28:01.5997409+08:00;True|2024-03-30T17:05:48.8170927+08:00;True|2024-03-26T15:05:50.1066628+08:00;</History>
+ <History>True|2024-06-07T08:04:30.3367441Z;True|2024-05-31T15:00:13.3635038+08:00;True|2024-05-13T09:58:31.1869310+08:00;True|2024-05-10T10:28:26.2058407+08:00;True|2024-05-10T10:28:01.5997409+08:00;True|2024-03-30T17:05:48.8170927+08:00;True|2024-03-26T15:05:50.1066628+08:00;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/Yw.Dto.DMA.Core/Yw.Dto.DMA.Core.csproj b/Yw.Dto.DMA.Core/Yw.Dto.DMA.Core.csproj
index 89bf1c2..cea78bb 100644
--- a/Yw.Dto.DMA.Core/Yw.Dto.DMA.Core.csproj
+++ b/Yw.Dto.DMA.Core/Yw.Dto.DMA.Core.csproj
@@ -4,13 +4,13 @@
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
- <Version>3.0.5</Version>
+ <Version>3.0.6</Version>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Yw.Dto.Core" Version="3.0.7" />
- <PackageReference Include="Yw.Service.DMA.Core" Version="3.0.3" />
+ <PackageReference Include="Yw.Service.DMA.Core" Version="3.0.5" />
</ItemGroup>
</Project>
diff --git a/Yw.Service.DMA.Core/00-core/DataType.cs b/Yw.Service.DMA.Core/00-core/DataType.cs
index efc79e0..ae279fd 100644
--- a/Yw.Service.DMA.Core/00-core/DataType.cs
+++ b/Yw.Service.DMA.Core/00-core/DataType.cs
@@ -15,6 +15,15 @@
/// </summary>
public const string DmaSite = "dma-site";
+ /// <summary>
+ /// 鐐逛綅缁戝畾
+ /// </summary>
+ public const string DmaSiteBinding = "dma-site-binding";
+
+ /// <summary>
+ /// 鐐逛綅鏄犲皠
+ /// </summary>
+ public const string DmaSiteMapping = "dma-site-mapping";
}
}
diff --git a/Yw.Service.DMA.Core/01-entity/DmaArea.cs b/Yw.Service.DMA.Core/01-entity/DmaArea.cs
index a3c8e91..19683cf 100644
--- a/Yw.Service.DMA.Core/01-entity/DmaArea.cs
+++ b/Yw.Service.DMA.Core/01-entity/DmaArea.cs
@@ -4,7 +4,7 @@
/// Dma鍒嗗尯
/// </summary>
[SugarTable("dma_area")]
- public class DmaArea : BaseTraceEntity, ICode, IParas, IFlags, ITagName, ISorter, System.ICloneable
+ public class DmaArea : BaseEntity, IParas, IFlags, ITagName, ISorter, System.ICloneable
{
/// <summary>
///
@@ -19,7 +19,6 @@
this.BelongType = rhs.BelongType;
this.BelongID = rhs.BelongID;
this.Name = rhs.Name;
- this.Code = rhs.Code;
this.Paras = rhs.Paras;
this.Flags = rhs.Flags;
this.TagName = rhs.TagName;
@@ -41,11 +40,6 @@
/// 鍚嶇О
/// </summary>
public string Name { get; set; }
-
- /// <summary>
- /// 缂栫爜
- /// </summary>
- public string Code { get; set; }
/// <summary>
/// 鍙傛暟
diff --git a/Yw.Service.DMA.Core/01-entity/DmaSite.cs b/Yw.Service.DMA.Core/01-entity/DmaSite.cs
index ff6866b..8d168fb 100644
--- a/Yw.Service.DMA.Core/01-entity/DmaSite.cs
+++ b/Yw.Service.DMA.Core/01-entity/DmaSite.cs
@@ -4,7 +4,7 @@
/// Dma鐐逛綅
/// </summary>
[SugarTable("dma_site")]
- public class DmaSite : BaseTraceEntity, ICode, IParas, IFlags, ITagName, ISorter, System.ICloneable
+ public class DmaSite : BaseEntity, IParas, IFlags, ITagName, ISorter, System.ICloneable
{
/// <summary>
///
@@ -19,7 +19,6 @@
this.BelongType = rhs.BelongType;
this.BelongID = rhs.BelongID;
this.Name = rhs.Name;
- this.Code = rhs.Code;
this.Paras = rhs.Paras;
this.Flags = rhs.Flags;
this.TagName = rhs.TagName;
@@ -41,11 +40,6 @@
/// 鍚嶇О
/// </summary>
public string Name { get; set; }
-
- /// <summary>
- /// 缂栫爜
- /// </summary>
- public string Code { get; set; }
/// <summary>
/// 鍙傛暟
diff --git a/Yw.Service.DMA.Core/02-model/DmaArea.cs b/Yw.Service.DMA.Core/02-model/DmaArea.cs
index 4da6636..754bb46 100644
--- a/Yw.Service.DMA.Core/02-model/DmaArea.cs
+++ b/Yw.Service.DMA.Core/02-model/DmaArea.cs
@@ -3,7 +3,7 @@
/// <summary>
/// Dma鍒嗗尯
/// </summary>
- public partial class DmaArea : BaseTraceModel, ICode, IParas, IFlags, ITagName, ISorter, System.ICloneable
+ public partial class DmaArea : BaseModel, IParas, IFlags, ITagName, ISorter, System.ICloneable
{
/// <summary>
///
@@ -18,7 +18,6 @@
this.BelongType = rhs.BelongType;
this.BelongID = rhs.BelongID;
this.Name = rhs.Name;
- this.Code = rhs.Code;
this.Paras = rhs.Paras == null ? null : new Dictionary<string, string>(rhs.Paras);
this.Flags = rhs.Flags?.ToList();
this.TagName = rhs.TagName;
@@ -35,18 +34,11 @@
this.BelongType = rhs.BelongType;
this.BelongID = rhs.BelongID;
this.Name = rhs.Name;
- this.Code = rhs.Code;
this.Paras = rhs.Paras == null ? null : new Dictionary<string, string>(rhs.Paras);
this.Flags = rhs.Flags?.ToList();
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;
}
@@ -65,11 +57,6 @@
/// 鍚嶇О
/// </summary>
public string Name { get; set; }
-
- /// <summary>
- /// 缂栫爜
- /// </summary>
- public string Code { get; set; }
/// <summary>
/// 鍙傛暟
diff --git a/Yw.Service.DMA.Core/02-model/DmaSite.cs b/Yw.Service.DMA.Core/02-model/DmaSite.cs
index eefe683..c313568 100644
--- a/Yw.Service.DMA.Core/02-model/DmaSite.cs
+++ b/Yw.Service.DMA.Core/02-model/DmaSite.cs
@@ -3,7 +3,7 @@
/// <summary>
/// Dma鐐逛綅
/// </summary>
- public partial class DmaSite : BaseTraceModel, ICode, IParas, IFlags, ITagName, ISorter, System.ICloneable
+ public partial class DmaSite : BaseModel, IParas, IFlags, ITagName, ISorter, System.ICloneable
{
/// <summary>
///
@@ -18,7 +18,6 @@
this.BelongType = rhs.BelongType;
this.BelongID = rhs.BelongID;
this.Name = rhs.Name;
- this.Code = rhs.Code;
this.Paras = rhs.Paras == null ? null : new Dictionary<string, string>(rhs.Paras);
this.Flags = rhs.Flags?.ToList();
this.TagName = rhs.TagName;
@@ -35,18 +34,11 @@
this.BelongType = rhs.BelongType;
this.BelongID = rhs.BelongID;
this.Name = rhs.Name;
- this.Code = rhs.Code;
this.Paras = rhs.Paras == null ? null : new Dictionary<string, string>(rhs.Paras);
this.Flags = rhs.Flags?.ToList();
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>
@@ -63,11 +55,6 @@
/// 鍚嶇О
/// </summary>
public string Name { get; set; }
-
- /// <summary>
- /// 缂栫爜
- /// </summary>
- public string Code { get; set; }
/// <summary>
/// 鍙傛暟
diff --git a/Yw.Service.DMA.Core/04-dal/01-interface/IDmaArea.cs b/Yw.Service.DMA.Core/04-dal/01-interface/IDmaArea.cs
index bb18906..3b06269 100644
--- a/Yw.Service.DMA.Core/04-dal/01-interface/IDmaArea.cs
+++ b/Yw.Service.DMA.Core/04-dal/01-interface/IDmaArea.cs
@@ -3,7 +3,7 @@
/// <summary>
/// Dma鍒嗗尯
/// </summary>
- public interface IDmaArea : IBaseTraceDAL<Entity.DmaArea>, IUpdateCode, IUpdateParas, IUpdateFlags, IUpdateTagName, IUpdateSorter
+ public interface IDmaArea : IBaseDAL<Entity.DmaArea>, IUpdateParas, IUpdateFlags, IUpdateTagName, IUpdateSorter
{
/// <summary>
diff --git a/Yw.Service.DMA.Core/04-dal/01-interface/IDmaSite.cs b/Yw.Service.DMA.Core/04-dal/01-interface/IDmaSite.cs
index 92bf9fd..bb58753 100644
--- a/Yw.Service.DMA.Core/04-dal/01-interface/IDmaSite.cs
+++ b/Yw.Service.DMA.Core/04-dal/01-interface/IDmaSite.cs
@@ -3,7 +3,7 @@
/// <summary>
/// Dma鐐逛綅
/// </summary>
- public interface IDmaSite : IBaseTraceDAL<Entity.DmaSite>, IUpdateCode, IUpdateParas, IUpdateFlags, IUpdateTagName, IUpdateSorter
+ public interface IDmaSite : IBaseDAL<Entity.DmaSite>, IUpdateParas, IUpdateFlags, IUpdateTagName, IUpdateSorter
{
/// <summary>
diff --git a/Yw.Service.DMA.Core/04-dal/02-postgresql/DmaArea.cs b/Yw.Service.DMA.Core/04-dal/02-postgresql/DmaArea.cs
index 69fcaa8..6690de0 100644
--- a/Yw.Service.DMA.Core/04-dal/02-postgresql/DmaArea.cs
+++ b/Yw.Service.DMA.Core/04-dal/02-postgresql/DmaArea.cs
@@ -3,7 +3,7 @@
/// <summary>
/// Dma鍒嗗尯
/// </summary>
- public partial class DmaArea : BaseTraceDAL_Code_Paras_Flags_TagName_Sorter<Entity.DmaArea>, IDmaArea
+ public partial class DmaArea : BaseDAL_Paras_Flags_TagName_Sorter<Entity.DmaArea>, IDmaArea
{
/// <summary>
///
diff --git a/Yw.Service.DMA.Core/04-dal/02-postgresql/DmaSite.cs b/Yw.Service.DMA.Core/04-dal/02-postgresql/DmaSite.cs
index e2d529b..a83df62 100644
--- a/Yw.Service.DMA.Core/04-dal/02-postgresql/DmaSite.cs
+++ b/Yw.Service.DMA.Core/04-dal/02-postgresql/DmaSite.cs
@@ -3,7 +3,7 @@
/// <summary>
/// Dma鐐逛綅
/// </summary>
- public partial class DmaSite : BaseTraceDAL_Code_Paras_Flags_TagName_Sorter<Entity.DmaSite>, IDmaSite
+ public partial class DmaSite : BaseDAL_Paras_Flags_TagName_Sorter<Entity.DmaSite>, IDmaSite
{
/// <summary>
///
diff --git a/Yw.Service.DMA.Core/04-dal/03-sqlite/DmaArea.cs b/Yw.Service.DMA.Core/04-dal/03-sqlite/DmaArea.cs
index 83ab8cf..ed03323 100644
--- a/Yw.Service.DMA.Core/04-dal/03-sqlite/DmaArea.cs
+++ b/Yw.Service.DMA.Core/04-dal/03-sqlite/DmaArea.cs
@@ -3,7 +3,7 @@
/// <summary>
/// Dma鍒嗗尯
/// </summary>
- public partial class DmaArea : BaseTraceDAL_Code_Paras_Flags_TagName_Sorter<Entity.DmaArea>, IDmaArea
+ public partial class DmaArea : BaseDAL_Paras_Flags_TagName_Sorter<Entity.DmaArea>, IDmaArea
{
/// <summary>
///
diff --git a/Yw.Service.DMA.Core/04-dal/03-sqlite/DmaSite.cs b/Yw.Service.DMA.Core/04-dal/03-sqlite/DmaSite.cs
index 339863b..297db6e 100644
--- a/Yw.Service.DMA.Core/04-dal/03-sqlite/DmaSite.cs
+++ b/Yw.Service.DMA.Core/04-dal/03-sqlite/DmaSite.cs
@@ -3,7 +3,7 @@
/// <summary>
/// Dma鐐逛綅
/// </summary>
- public partial class DmaSite : BaseTraceDAL_Code_Paras_Flags_TagName_Sorter<Entity.DmaSite>, IDmaSite
+ public partial class DmaSite : BaseDAL_Paras_Flags_TagName_Sorter<Entity.DmaSite>, IDmaSite
{
/// <summary>
///
diff --git a/Yw.Service.DMA.Core/05-service/01-dma_area/DmaArea.cs b/Yw.Service.DMA.Core/05-service/01-dma_area/DmaArea.cs
index e53beb1..ca8139e 100644
--- a/Yw.Service.DMA.Core/05-service/01-dma_area/DmaArea.cs
+++ b/Yw.Service.DMA.Core/05-service/01-dma_area/DmaArea.cs
@@ -304,32 +304,6 @@
#region Exist
/// <summary>
- /// 判断 Code 是否存在
- /// </summary>
- public bool IsExistCode(string Code)
- {
- if (string.IsNullOrEmpty(Code))
- {
- return false;
- }
- var all = GetAll();
- return all.Exists(x => x.Code == Code);
- }
-
- /// <summary>
- /// 判断 Code 是否存在 ExceptID
- /// </summary>
- public bool IsExistCodeExceptID(string Code, long ExceptID)
- {
- if (string.IsNullOrEmpty(Code))
- {
- return false;
- }
- var all = GetAll();
- return all.Exists(x => x.Code == Code && x.ID != ExceptID);
- }
-
- /// <summary>
/// 判断 TagName 是否存在
/// </summary>
public bool IsExistTagName(string TagName)
diff --git a/Yw.Service.DMA.Core/05-service/01-dma_area/DmaArea_Instance.cs b/Yw.Service.DMA.Core/05-service/01-dma_area/DmaArea_Instance.cs
index 5406f13..855410f 100644
--- a/Yw.Service.DMA.Core/05-service/01-dma_area/DmaArea_Instance.cs
+++ b/Yw.Service.DMA.Core/05-service/01-dma_area/DmaArea_Instance.cs
@@ -4,7 +4,7 @@
{
//Entity to GetModel
- private static Model.DmaArea Entity2Model(Entity.DmaArea entity)
+ internal static Model.DmaArea Entity2Model(Entity.DmaArea entity)
{
if (entity == null)
return default;
@@ -17,7 +17,7 @@
}
//Entities to GetModels
- private static List<Model.DmaArea> Entity2Models(List<Entity.DmaArea> entities)
+ internal static List<Model.DmaArea> Entity2Models(List<Entity.DmaArea> entities)
{
if (entities == null || entities.Count < 1)
return default;
@@ -30,7 +30,7 @@
}
//Model to Entity
- private static Entity.DmaArea Model2Entity(Model.DmaArea model)
+ internal static Entity.DmaArea Model2Entity(Model.DmaArea model)
{
if (model == null)
return default;
@@ -43,7 +43,7 @@
}
//Models to Entities
- private static List<Entity.DmaArea> Model2Entities(List<Model.DmaArea> models)
+ internal static List<Entity.DmaArea> Model2Entities(List<Model.DmaArea> models)
{
if (models == null || models.Count < 1)
return default;
@@ -56,7 +56,7 @@
}
//Model to Entity
- private static void Model2Entity(Model.DmaArea model, Entity.DmaArea entity)
+ internal static void Model2Entity(Model.DmaArea model, Entity.DmaArea entity)
{
if (model == null || entity == null)
return;
diff --git a/Yw.Service.DMA.Core/05-service/02-dma_site/DmaSite.cs b/Yw.Service.DMA.Core/05-service/02-dma_site/DmaSite.cs
index bf53d5b..f81d1a2 100644
--- a/Yw.Service.DMA.Core/05-service/02-dma_site/DmaSite.cs
+++ b/Yw.Service.DMA.Core/05-service/02-dma_site/DmaSite.cs
@@ -301,32 +301,6 @@
#region Exist
/// <summary>
- /// 判断 Code 是否存在
- /// </summary>
- public bool IsExistCode(string Code)
- {
- if (string.IsNullOrEmpty(Code))
- {
- return false;
- }
- var all = GetAll();
- return all.Exists(x => x.Code == Code);
- }
-
- /// <summary>
- /// 判断 Code 是否存在 ExceptID
- /// </summary>
- public bool IsExistCodeExceptID(string Code, long ExceptID)
- {
- if (string.IsNullOrEmpty(Code))
- {
- return false;
- }
- var all = GetAll();
- return all.Exists(x => x.Code == Code && x.ID != ExceptID);
- }
-
- /// <summary>
/// 判断 TagName 是否存在
/// </summary>
public bool IsExistTagName(string TagName)
diff --git a/Yw.Service.DMA.Core/05-service/02-dma_site/DmaSite_Instance.cs b/Yw.Service.DMA.Core/05-service/02-dma_site/DmaSite_Instance.cs
index b096b2d..3747055 100644
--- a/Yw.Service.DMA.Core/05-service/02-dma_site/DmaSite_Instance.cs
+++ b/Yw.Service.DMA.Core/05-service/02-dma_site/DmaSite_Instance.cs
@@ -4,7 +4,7 @@
{
//Entity to GetModel
- private static Model.DmaSite Entity2Model(Entity.DmaSite entity)
+ internal static Model.DmaSite Entity2Model(Entity.DmaSite entity)
{
if (entity == null)
return default;
@@ -17,7 +17,7 @@
}
//Entities to GetModels
- private static List<Model.DmaSite> Entity2Models(List<Entity.DmaSite> entities)
+ internal static List<Model.DmaSite> Entity2Models(List<Entity.DmaSite> entities)
{
if (entities == null || entities.Count() < 1)
return default;
@@ -30,7 +30,7 @@
}
//Model to Entity
- private static Entity.DmaSite Model2Entity(Model.DmaSite model)
+ internal static Entity.DmaSite Model2Entity(Model.DmaSite model)
{
if (model == null)
return default;
@@ -43,7 +43,7 @@
}
//Models to Entities
- private static List<Entity.DmaSite> Model2Entities(List<Model.DmaSite> models)
+ internal static List<Entity.DmaSite> Model2Entities(List<Model.DmaSite> models)
{
if (models == null || models.Count < 1)
return default;
@@ -56,7 +56,7 @@
}
//Model to Entity
- private static void Model2Entity(Model.DmaSite model, Entity.DmaSite entity)
+ internal static void Model2Entity(Model.DmaSite model, Entity.DmaSite entity)
{
if (model == null || entity == null)
return;
diff --git a/Yw.Service.DMA.Core/05-service/03-dma_site_binding/DmaSiteBinding_Instance.cs b/Yw.Service.DMA.Core/05-service/03-dma_site_binding/DmaSiteBinding_Instance.cs
index 01572d0..8a4a39b 100644
--- a/Yw.Service.DMA.Core/05-service/03-dma_site_binding/DmaSiteBinding_Instance.cs
+++ b/Yw.Service.DMA.Core/05-service/03-dma_site_binding/DmaSiteBinding_Instance.cs
@@ -3,7 +3,7 @@
public partial class DmaSiteBinding
{
//Entity to Model
- private static Model.DmaSiteBinding Entity2Model(Entity.DmaSiteBinding entity)
+ internal static Model.DmaSiteBinding Entity2Model(Entity.DmaSiteBinding entity)
{
if (entity == null)
return default;
@@ -13,7 +13,7 @@
}
//Entities to Models
- private static List<Model.DmaSiteBinding> Entity2Models(List<Entity.DmaSiteBinding> entities)
+ internal static List<Model.DmaSiteBinding> Entity2Models(List<Entity.DmaSiteBinding> entities)
{
if (entities == null || entities.Count() < 1)
return default;
@@ -23,7 +23,7 @@
}
//Model to Entity
- private static Entity.DmaSiteBinding Model2Entity(Model.DmaSiteBinding model)
+ internal static Entity.DmaSiteBinding Model2Entity(Model.DmaSiteBinding model)
{
if (model == null)
return default;
@@ -33,7 +33,7 @@
}
//Models to Entities
- private static List<Entity.DmaSiteBinding> Model2Entities(List<Model.DmaSiteBinding> models)
+ internal static List<Entity.DmaSiteBinding> Model2Entities(List<Model.DmaSiteBinding> models)
{
if (models == null || models.Count < 1)
return default;
@@ -43,7 +43,7 @@
}
//Model to Entity
- private static void Model2Entity(Model.DmaSiteBinding model, Entity.DmaSiteBinding entity)
+ internal static void Model2Entity(Model.DmaSiteBinding model, Entity.DmaSiteBinding entity)
{
if (model == null || entity == null)
return;
diff --git a/Yw.Service.DMA.Core/05-service/04-dma_site_mapping/DmaSiteMapping_Instance.cs b/Yw.Service.DMA.Core/05-service/04-dma_site_mapping/DmaSiteMapping_Instance.cs
index dbaea92..333c0d0 100644
--- a/Yw.Service.DMA.Core/05-service/04-dma_site_mapping/DmaSiteMapping_Instance.cs
+++ b/Yw.Service.DMA.Core/05-service/04-dma_site_mapping/DmaSiteMapping_Instance.cs
@@ -3,7 +3,7 @@
public partial class DmaSiteMapping
{
//Entity to Model
- private static Model.DmaSiteMapping Entity2Model(Entity.DmaSiteMapping entity)
+ internal static Model.DmaSiteMapping Entity2Model(Entity.DmaSiteMapping entity)
{
if (entity == null)
return default;
@@ -13,7 +13,7 @@
}
//Entities to Models
- private static List<Model.DmaSiteMapping> Entity2Models(List<Entity.DmaSiteMapping> entities)
+ internal static List<Model.DmaSiteMapping> Entity2Models(List<Entity.DmaSiteMapping> entities)
{
if (entities == null || entities.Count() < 1)
return default;
@@ -23,7 +23,7 @@
}
//Model to Entity
- private static Entity.DmaSiteMapping Model2Entity(Model.DmaSiteMapping model)
+ internal static Entity.DmaSiteMapping Model2Entity(Model.DmaSiteMapping model)
{
if (model == null)
return default;
@@ -33,7 +33,7 @@
}
//Models to Entities
- private static List<Entity.DmaSiteMapping> Model2Entities(List<Model.DmaSiteMapping> models)
+ internal static List<Entity.DmaSiteMapping> Model2Entities(List<Model.DmaSiteMapping> models)
{
if (models == null || models.Count < 1)
return default;
@@ -43,7 +43,7 @@
}
//Model to Entity
- private static void Model2Entity(Model.DmaSiteMapping model, Entity.DmaSiteMapping entity)
+ internal static void Model2Entity(Model.DmaSiteMapping model, Entity.DmaSiteMapping entity)
{
if (model == null || entity == null)
return;
diff --git a/Yw.Service.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user b/Yw.Service.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
index ffb9d74..6a932c6 100644
--- a/Yw.Service.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/Yw.Service.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project>
<PropertyGroup>
- <History>True|2024-05-31T06:59:35.3794334Z;True|2024-05-10T10:26:34.1160186+08:00;True|2024-03-30T16:12:07.8965954+08:00;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>
+ <History>True|2024-06-07T08:01:25.5832225Z;True|2024-05-31T14:59:35.3794334+08:00;True|2024-05-10T10:26:34.1160186+08:00;True|2024-03-30T16:12:07.8965954+08:00;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>
<LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/Yw.Service.DMA.Core/Yw.Service.DMA.Core.csproj b/Yw.Service.DMA.Core/Yw.Service.DMA.Core.csproj
index 14f1089..efbef17 100644
--- a/Yw.Service.DMA.Core/Yw.Service.DMA.Core.csproj
+++ b/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.3</Version>
+ <Version>3.0.5</Version>
<Description>寮曠敤鍗囩骇</Description>
</PropertyGroup>
@@ -27,8 +27,8 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Yw.DAL.PostgreSql.Core" Version="3.0.5" />
- <PackageReference Include="Yw.DAL.SQLite.Core" Version="3.0.5" />
+ <PackageReference Include="Yw.DAL.PostgreSql.Core" Version="3.0.6" />
+ <PackageReference Include="Yw.DAL.SQLite.Core" Version="3.0.6" />
<PackageReference Include="Yw.DALFactory.Core" Version="3.0.0" />
<PackageReference Include="Yw.Service.Core" Version="3.0.2" />
</ItemGroup>
--
Gitblit v1.9.3