From edb3d6cded4db1c8a2886f6bdc39c2fe4c69b67a Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 29 五月 2024 10:28:01 +0800
Subject: [PATCH] 优化升级，去除痕迹
---
Yw.Dto.Bimface.Core/01-bimface-file/BimfaceFileDto.cs | 36 ------
Yw.Application.Bimface.Core/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
Yw.Service.Bimface.Core/02-model/BimfaceFile.cs | 8 -
Yw.Application.Bimface.Core/04-bimface-file-relation-label/BimfaceFileRelationLabel_Controller.cs | 2
Yw.Service.Bimface.Core/05-service/01-bimface-file/BimfaceFile.cs | 59 +++++++--
Yw.Dto.Bimface.Core/Yw.Dto.Bimface.Core.csproj | 4
Yw.Service.Bimface.Core/03-settings/01-paras/01-database/Paras_Bimface_DataBase.cs | 0
Yw.Service.Bimface.Core/04-dal/02-postgresql/BimfaceFile.cs | 9 -
Yw.Service.Bimface.Core/04-dal/03-sqlite/BimfaceFile.cs | 8 -
Yw.Application.Bimface.Core/Yw.Application.Bimface.Core.csproj | 4
Yw.Service.Bimface.Core/01-entity/BimfaceFile.cs | 8 -
Yw.Service.Bimface.Core/03-settings/01-paras/02-cal/Paras_Bimface_CAL_LocalClient.cs | 0
Yw.Service.Bimface.Core/05-service/04-bimface-relation-label/BimfaceFileRelationLabel.cs | 16 ++
Yw.Service.Bimface.Core/03-settings/00-core/BimfaceParasHelper.cs | 0
Yw.Application.Bimface.Core/00-core/Mapper.cs | 36 ++++-
Yw.Application.Bimface.Core/02-bimface-file-label/BimfaceFileLabel_StdController.cs | 4
Yw.Dto.Bimface.Core/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
Yw.Service.Bimface.Core/04-dal/01-interface/IBimfaceFile.cs | 3
Yw.Service.Bimface.Core/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
Yw.Service.Bimface.Core/03-settings/01-paras/00-core/BimfaceParas.cs | 0
Yw.Service.Bimface.Core/05-service/00-core/CacheHelper.cs | 0
Yw.Application.Bimface.Core/01-bimface-file/BimfaceFile_Controller.cs | 2
Yw.Service.Bimface.Core/03-settings/01-paras/02-cal/Paras_Bimface_CAL_HttpClient.cs | 0
Yw.Service.Bimface.Core/03-settings/01-paras/01-database/Paras_Bimface_DataBase_SQLite.cs | 0
Yw.Service.Bimface.Core/04-dal/01-interface/IBimfaceFileRelation.cs | 1
Yw.Service.Bimface.Core/05-service/00-core/DALCreateHelper.cs | 0
Yw.Service.Bimface.Core/05-service/03-bimface-file-relation/BimfaceFileRelation.cs | 40 +++++
Yw.Service.Bimface.Core/03-settings/01-paras/00-core/Paras_Bimface.cs | 0
Yw.Application.Bimface.Core/02-bimface-file-label/BimfaceFileLabel_Controller.cs | 4
Yw.Service.Bimface.Core/00-core/DataType.cs | 17 ++
Yw.Dto.Bimface.Core/99-model/purpose/UpdatePurposeInput.cs | 1
Yw.Service.Bimface.Core/03-settings/01-paras/01-database/Paras_Bimface_DataBase_PostgreSql.cs | 0
Yw.Service.Bimface.Core/03-settings/00-core/BimfaceFileHelper.cs | 0
Yw.Service.Bimface.Core/05-service/02-bimface-file-label/BimfaceFileLabel.cs | 12 +
Yw.Service.Bimface.Core/03-settings/01-paras/01-database/Paras_Bimface_DataBase_Factory.cs | 0
Yw.Service.Bimface.Core/Yw.Service.Bimface.Core.csproj | 2
Yw.Dto.Bimface.Core/01-bimface-file/BimfaceFileStdDto.cs | 36 ------
Yw.Service.Bimface.Core/03-settings/01-paras/02-cal/Paras_Bimface_CAL.cs | 0
Yw.Application.Bimface.Core/03-bimface-file-relation/BimfaceFileRelation_Controller.cs | 2
Yw.Service.Bimface.Core/05-service/00-core/Extensions.cs | 0
40 files changed, 172 insertions(+), 148 deletions(-)
diff --git a/Yw.Application.Bimface.Core/00-core/Mapper.cs b/Yw.Application.Bimface.Core/00-core/Mapper.cs
index cbca697..56c9a45 100644
--- a/Yw.Application.Bimface.Core/00-core/Mapper.cs
+++ b/Yw.Application.Bimface.Core/00-core/Mapper.cs
@@ -15,17 +15,11 @@
config.ForType<AddBimfaceFileInput, Model.BimfaceFile>()
.Map(dest => dest.Paras, src => src.Paras)
- .Map(dest => dest.Flags, src => src.Flags)
- .Map(dest => dest.CreateTime, src => DateTime.Now)
- .Map(dest => dest.CreateUserID, src => UserManager.UserID)
- .Map(dest => dest.CreateUserName, src => UserManager.UserName);
+ .Map(dest => dest.Flags, src => src.Flags);
config.ForType<UpdateBimfaceFileInput, Model.BimfaceFile>()
.Map(dest => dest.Paras, src => src.Paras)
- .Map(dest => dest.Flags, src => src.Flags)
- .Map(dest => dest.UpdateTime, src => DateTime.Now)
- .Map(dest => dest.UpdateUserID, src => UserManager.UserID)
- .Map(dest => dest.UpdateUserName, src => UserManager.UserName);
+ .Map(dest => dest.Flags, src => src.Flags);
config.ForType<Model.BimfaceFile, BimfaceFileDto>()
.Map(dest => dest.Paras, src => src.Paras)
@@ -33,7 +27,19 @@
#endregion
- #region 2-bimface-file-relation
+ #region 2-bimface-file-label
+
+ config.ForType<AddBimfaceFileLabelInput, Model.BimfaceFileLabel>();
+
+ config.ForType<UpdateBimfaceFileLabelInput, Model.BimfaceFileLabel>();
+
+ config.ForType<Model.BimfaceFileLabel, BimfaceFileLabelDto>();
+
+ config.ForType<SaveBimfaceFileLabelItemInput, Model.BimfaceFileLabel>();
+
+ #endregion
+
+ #region 3-bimface-file-relation
config.ForType<AddBimfaceFileRelationInput, Model.BimfaceFileRelation>();
@@ -43,6 +49,18 @@
#endregion
+ #region 4-bimface-file-relation-label
+
+ config.ForType<AddBimfaceFileRelationLabelInput, Model.BimfaceFileRelationLabel>();
+
+ config.ForType<UpdateBimfaceFileRelationLabelInput, Model.BimfaceFileRelationLabel>();
+
+ config.ForType<Model.BimfaceFileRelationLabel, BimfaceFileRelationLabelDto>();
+
+ config.ForType<SaveBimfaceFileRelationLabelItemInput, Model.BimfaceFileRelationLabel>();
+
+ #endregion
+
}
}
diff --git a/Yw.Application.Bimface.Core/01-bimface-file/BimfaceFile_Controller.cs b/Yw.Application.Bimface.Core/01-bimface-file/BimfaceFile_Controller.cs
index 5eb3587..f27e190 100644
--- a/Yw.Application.Bimface.Core/01-bimface-file/BimfaceFile_Controller.cs
+++ b/Yw.Application.Bimface.Core/01-bimface-file/BimfaceFile_Controller.cs
@@ -8,7 +8,7 @@
public class BimfaceFile_Controller : IDynamicApiController
{
- private readonly Service.BimfaceFile _service = new();
+ private readonly Yw.Service.BimfaceFile _service = new();
#region Query
diff --git a/Yw.Application.Bimface.Core/02-bimface-file-label/BimfaceFileLabel_Controller.cs b/Yw.Application.Bimface.Core/02-bimface-file-label/BimfaceFileLabel_Controller.cs
index 217a382..2f8ccb8 100644
--- a/Yw.Application.Bimface.Core/02-bimface-file-label/BimfaceFileLabel_Controller.cs
+++ b/Yw.Application.Bimface.Core/02-bimface-file-label/BimfaceFileLabel_Controller.cs
@@ -7,7 +7,7 @@
[ApiDescriptionSettings("Bimface", Name = "Bimface鏂囦欢鏍囩", Order = 90000)]
public class BimfaceFileLabel_Controller : IDynamicApiController
{
- private readonly Service.BimfaceFileLabel _service = new();
+ private readonly Yw.Service.BimfaceFileLabel _service = new();
#region Query
@@ -32,7 +32,9 @@
{
var model = _service.GetByID(input.ID);
if (model == null)
+ {
return default;
+ }
return new BimfaceFileLabelDto(model);
}
diff --git a/Yw.Application.Bimface.Core/02-bimface-file-label/BimfaceFileLabel_StdController.cs b/Yw.Application.Bimface.Core/02-bimface-file-label/BimfaceFileLabel_StdController.cs
index acfbbfe..5619dca 100644
--- a/Yw.Application.Bimface.Core/02-bimface-file-label/BimfaceFileLabel_StdController.cs
+++ b/Yw.Application.Bimface.Core/02-bimface-file-label/BimfaceFileLabel_StdController.cs
@@ -19,8 +19,8 @@
var vm_list = MemoryCacheHelper.GetSet(cacheKey, () =>
{
- var all = new Service.BimfaceFileLabel().GetAll();
- Service.BimfaceFileLabel.PublishCache(cacheKey);
+ var all = new Yw.Service.BimfaceFileLabel().GetAll();
+ Yw.Service.BimfaceFileLabel.PublishCache(cacheKey);
var vmList = all?.Select(x => new BimfaceFileLabelStdDto(x)).ToList();
return vmList;
}, Yw.Service.ConfigHelper.CacheLevel5);
diff --git a/Yw.Application.Bimface.Core/03-bimface-file-relation/BimfaceFileRelation_Controller.cs b/Yw.Application.Bimface.Core/03-bimface-file-relation/BimfaceFileRelation_Controller.cs
index d2a3153..db5c67b 100644
--- a/Yw.Application.Bimface.Core/03-bimface-file-relation/BimfaceFileRelation_Controller.cs
+++ b/Yw.Application.Bimface.Core/03-bimface-file-relation/BimfaceFileRelation_Controller.cs
@@ -8,7 +8,7 @@
public class BimfaceFileRelation_Controller : IDynamicApiController
{
- private readonly Service.BimfaceFileRelation _service = new();
+ private readonly Yw.Service.BimfaceFileRelation _service = new();
#region Query
diff --git a/Yw.Application.Bimface.Core/04-bimface-file-relation-label/BimfaceFileRelationLabel_Controller.cs b/Yw.Application.Bimface.Core/04-bimface-file-relation-label/BimfaceFileRelationLabel_Controller.cs
index 44a8eba..cf71d75 100644
--- a/Yw.Application.Bimface.Core/04-bimface-file-relation-label/BimfaceFileRelationLabel_Controller.cs
+++ b/Yw.Application.Bimface.Core/04-bimface-file-relation-label/BimfaceFileRelationLabel_Controller.cs
@@ -32,7 +32,9 @@
{
var model = _service.GetByID(input.ID);
if (model == null)
+ {
return default;
+ }
return new BimfaceFileRelationLabelDto(model);
}
diff --git a/Yw.Application.Bimface.Core/Properties/PublishProfiles/FolderProfile.pubxml.user b/Yw.Application.Bimface.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
index 7437f39..6a1ff5b 100644
--- a/Yw.Application.Bimface.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/Yw.Application.Bimface.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project>
<PropertyGroup>
- <History>True|2024-05-13T01:56:26.5764615Z;True|2024-03-30T15:58:57.0562769+08:00;True|2024-03-26T13:36:10.2897546+08:00;True|2024-03-08T15:59:55.5907811+08:00;True|2024-01-27T11:10:13.2471580+08:00;True|2024-01-21T15:28:08.5978203+08:00;True|2023-12-19T21:23:58.5068063+08:00;True|2023-12-16T12:51:56.7900544+08:00;True|2023-12-04T19:19:23.0447363+08:00;True|2023-12-04T19:18:52.6801105+08:00;True|2023-12-01T15:50:53.6079593+08:00;True|2023-12-01T15:50:44.8578963+08:00;True|2023-11-30T15:54:23.5609269+08:00;True|2023-11-30T15:39:50.5144968+08:00;True|2023-11-15T09:23:23.1277615+08:00;True|2023-11-13T11:14:23.7047654+08:00;True|2023-11-07T15:28:54.3174797+08:00;True|2023-10-27T13:22:55.8696581+08:00;True|2023-10-21T18:17:31.4681547+08:00;True|2023-10-18T17:29:57.6963038+08:00;True|2023-09-15T12:09:34.4888678+08:00;True|2023-09-14T15:15:33.6113596+08:00;True|2023-08-21T13:09:54.7440181+08:00;True|2023-07-25T15:08:42.3375388+08:00;True|2023-07-17T10:31:53.5181752+08:00;True|2023-07-17T10:31:44.6652344+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-05-29T02:26:53.6778257Z;True|2024-05-13T09:56:26.5764615+08:00;True|2024-03-30T15:58:57.0562769+08:00;True|2024-03-26T13:36:10.2897546+08:00;True|2024-03-08T15:59:55.5907811+08:00;True|2024-01-27T11:10:13.2471580+08:00;True|2024-01-21T15:28:08.5978203+08:00;True|2023-12-19T21:23:58.5068063+08:00;True|2023-12-16T12:51:56.7900544+08:00;True|2023-12-04T19:19:23.0447363+08:00;True|2023-12-04T19:18:52.6801105+08:00;True|2023-12-01T15:50:53.6079593+08:00;True|2023-12-01T15:50:44.8578963+08:00;True|2023-11-30T15:54:23.5609269+08:00;True|2023-11-30T15:39:50.5144968+08:00;True|2023-11-15T09:23:23.1277615+08:00;True|2023-11-13T11:14:23.7047654+08:00;True|2023-11-07T15:28:54.3174797+08:00;True|2023-10-27T13:22:55.8696581+08:00;True|2023-10-21T18:17:31.4681547+08:00;True|2023-10-18T17:29:57.6963038+08:00;True|2023-09-15T12:09:34.4888678+08:00;True|2023-09-14T15:15:33.6113596+08:00;True|2023-08-21T13:09:54.7440181+08:00;True|2023-07-25T15:08:42.3375388+08:00;True|2023-07-17T10:31:53.5181752+08:00;True|2023-07-17T10:31:44.6652344+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.Bimface.Core/Yw.Application.Bimface.Core.csproj b/Yw.Application.Bimface.Core/Yw.Application.Bimface.Core.csproj
index 93330fe..8489b25 100644
--- a/Yw.Application.Bimface.Core/Yw.Application.Bimface.Core.csproj
+++ b/Yw.Application.Bimface.Core/Yw.Application.Bimface.Core.csproj
@@ -7,7 +7,7 @@
<RootNamespace>Yw.Application</RootNamespace>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
- <Version>3.0.2</Version>
+ <Version>3.0.3</Version>
<Description>寮曠敤鍗囩骇</Description>
</PropertyGroup>
@@ -31,7 +31,7 @@
<ItemGroup>
<PackageReference Include="Yw.Application.Core" Version="3.0.7" />
- <PackageReference Include="Yw.Dto.Bimface.Core" Version="3.0.2" />
+ <PackageReference Include="Yw.Dto.Bimface.Core" Version="3.0.3" />
</ItemGroup>
</Project>
diff --git a/Yw.Dto.Bimface.Core/01-bimface-file/BimfaceFileDto.cs b/Yw.Dto.Bimface.Core/01-bimface-file/BimfaceFileDto.cs
index e04584e..9412ede 100644
--- a/Yw.Dto.Bimface.Core/01-bimface-file/BimfaceFileDto.cs
+++ b/Yw.Dto.Bimface.Core/01-bimface-file/BimfaceFileDto.cs
@@ -28,12 +28,6 @@
this.Paras = rhs.Paras;
this.Flags = rhs.Flags;
this.TagName = rhs.TagName;
- this.CreateUserID = rhs.CreateUserID;
- this.CreateTime = rhs.CreateTime;
- this.CreateUserName = rhs.CreateUserName;
- this.UpdateUserID = rhs.UpdateUserID;
- this.UpdateTime = rhs.UpdateTime;
- this.UpdateUserName = rhs.UpdateUserName;
this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
}
@@ -102,36 +96,6 @@
/// 鏍囪
/// </summary>
public string TagName { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜篿d
- /// </summary>
- public long CreateUserID { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- public DateTime CreateTime { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜哄悕绉�
- /// </summary>
- public string CreateUserName { get; set; }
-
- /// <summary>
- /// 鏇存柊浜篿d
- /// </summary>
- public long? UpdateUserID { get; set; }
-
- /// <summary>
- /// 鏇存柊鏃堕棿
- /// </summary>
- public DateTime? UpdateTime { get; set; }
-
- /// <summary>
- /// 鏇存柊浜哄悕绉�
- /// </summary>
- public string UpdateUserName { get; set; }
/// <summary>
/// 鎺掑簭鐮�
diff --git a/Yw.Dto.Bimface.Core/01-bimface-file/BimfaceFileStdDto.cs b/Yw.Dto.Bimface.Core/01-bimface-file/BimfaceFileStdDto.cs
index eb99da3..b1b3bb0 100644
--- a/Yw.Dto.Bimface.Core/01-bimface-file/BimfaceFileStdDto.cs
+++ b/Yw.Dto.Bimface.Core/01-bimface-file/BimfaceFileStdDto.cs
@@ -28,12 +28,6 @@
this.Paras = rhs.Paras;
this.Flags = rhs.Flags;
this.TagName = rhs.TagName;
- this.CreateUserID = rhs.CreateUserID;
- this.CreateTime = rhs.CreateTime;
- this.CreateUserName = rhs.CreateUserName;
- this.UpdateUserID = rhs.UpdateUserID;
- this.UpdateTime = rhs.UpdateTime;
- this.UpdateUserName = rhs.UpdateUserName;
this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
}
@@ -102,36 +96,6 @@
/// 鏍囪
/// </summary>
public string TagName { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜篿d
- /// </summary>
- public long CreateUserID { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- public DateTime CreateTime { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜哄悕绉�
- /// </summary>
- public string CreateUserName { get; set; }
-
- /// <summary>
- /// 鏇存柊浜篿d
- /// </summary>
- public long? UpdateUserID { get; set; }
-
- /// <summary>
- /// 鏇存柊鏃堕棿
- /// </summary>
- public DateTime? UpdateTime { get; set; }
-
- /// <summary>
- /// 鏇存柊浜哄悕绉�
- /// </summary>
- public string UpdateUserName { get; set; }
/// <summary>
/// 鎺掑簭鐮�
diff --git a/Yw.Dto.Bimface.Core/99-model/purpose/UpdatePurposeInput.cs b/Yw.Dto.Bimface.Core/99-model/purpose/UpdatePurposeInput.cs
index 5941f63..27f5e47 100644
--- a/Yw.Dto.Bimface.Core/99-model/purpose/UpdatePurposeInput.cs
+++ b/Yw.Dto.Bimface.Core/99-model/purpose/UpdatePurposeInput.cs
@@ -8,7 +8,6 @@
/// <summary>
///
/// </summary>
- [Required]
public string Purpose { get; set; }
}
}
diff --git a/Yw.Dto.Bimface.Core/Properties/PublishProfiles/FolderProfile.pubxml.user b/Yw.Dto.Bimface.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
index da00572..cedcee8 100644
--- a/Yw.Dto.Bimface.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/Yw.Dto.Bimface.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project>
<PropertyGroup>
- <History>True|2024-05-13T01:55:49.0381011Z;True|2024-05-13T09:55:33.3101267+08:00;True|2024-03-30T15:57:20.3638057+08:00;True|2024-03-26T13:30:20.8534150+08:00;</History>
+ <History>True|2024-05-29T02:16:55.9139463Z;True|2024-05-13T09:55:49.0381011+08:00;True|2024-05-13T09:55:33.3101267+08:00;True|2024-03-30T15:57:20.3638057+08:00;True|2024-03-26T13:30:20.8534150+08:00;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/Yw.Dto.Bimface.Core/Yw.Dto.Bimface.Core.csproj b/Yw.Dto.Bimface.Core/Yw.Dto.Bimface.Core.csproj
index 4bbb24e..232d966 100644
--- a/Yw.Dto.Bimface.Core/Yw.Dto.Bimface.Core.csproj
+++ b/Yw.Dto.Bimface.Core/Yw.Dto.Bimface.Core.csproj
@@ -4,13 +4,13 @@
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
- <Version>3.0.2</Version>
+ <Version>3.0.3</Version>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Yw.Dto.Core" Version="3.0.7" />
- <PackageReference Include="Yw.Service.Bimface.Core" Version="3.0.2" />
+ <PackageReference Include="Yw.Service.Bimface.Core" Version="3.0.3" />
</ItemGroup>
</Project>
diff --git a/Yw.Service.Bimface.Core/00-core/DataType.cs b/Yw.Service.Bimface.Core/00-core/DataType.cs
index 3490ec8..1fdf166 100644
--- a/Yw.Service.Bimface.Core/00-core/DataType.cs
+++ b/Yw.Service.Bimface.Core/00-core/DataType.cs
@@ -5,8 +5,25 @@
/// </summary>
public class DataType
{
+ /// <summary>
+ /// BIMFACE 鏂囦欢
+ /// </summary>
+ public const string BimfaceFile = "bimface-file";
+ /// <summary>
+ /// BIMFACE 鏂囦欢鏍囩
+ /// </summary>
+ public const string BimfaceFileLabel = "bimface-file-label";
+ /// <summary>
+ /// BIMFACE 鏂囦欢鍏宠仈
+ /// </summary>
+ public const string BimfaceFileRelation = "bimface-file-relation";
+
+ /// <summary>
+ /// BIMFACE 鏂囦欢鍏宠仈鏍囩
+ /// </summary>
+ public const string BimfaceFileRelationLabel = "bimface-file-relation-label";
}
}
diff --git a/Yw.Service.Bimface.Core/01-entity/BimfaceFile.cs b/Yw.Service.Bimface.Core/01-entity/BimfaceFile.cs
index 9de18cb..6d99f74 100644
--- a/Yw.Service.Bimface.Core/01-entity/BimfaceFile.cs
+++ b/Yw.Service.Bimface.Core/01-entity/BimfaceFile.cs
@@ -4,7 +4,7 @@
/// Bimface鏂囦欢
/// </summary>
[SugarTable("bimface_file")]
- public class BimfaceFile : BaseTraceEntity, IParas, IFlags, ITagName, ISorter, System.ICloneable
+ public class BimfaceFile : BaseEntity, IParas, IFlags, ITagName, ISorter, System.ICloneable
{
/// <summary>
///
@@ -28,12 +28,6 @@
this.Paras = rhs.Paras;
this.Flags = rhs.Flags;
this.TagName = rhs.TagName;
- this.CreateUserID = rhs.CreateUserID;
- this.CreateTime = rhs.CreateTime;
- this.CreateUserName = rhs.CreateUserName;
- this.UpdateUserID = rhs.UpdateUserID;
- this.UpdateTime = rhs.UpdateTime;
- this.UpdateUserName = rhs.UpdateUserName;
this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
}
diff --git a/Yw.Service.Bimface.Core/02-model/BimfaceFile.cs b/Yw.Service.Bimface.Core/02-model/BimfaceFile.cs
index 63d332b..9646fe0 100644
--- a/Yw.Service.Bimface.Core/02-model/BimfaceFile.cs
+++ b/Yw.Service.Bimface.Core/02-model/BimfaceFile.cs
@@ -3,7 +3,7 @@
/// <summary>
/// Bimface鏂囦欢
/// </summary>
- public class BimfaceFile : BaseTraceModel, IParas, IFlags, ITagName, ISorter, System.ICloneable
+ public class BimfaceFile : BaseModel, IParas, IFlags, ITagName, ISorter, System.ICloneable
{
/// <summary>
///
@@ -50,12 +50,6 @@
this.Paras = rhs.Paras == null ? null : new Dictionary<string, string>(rhs.Paras);
this.Flags = rhs.Flags?.ToList();
this.TagName = rhs.TagName;
- this.CreateUserID = rhs.CreateUserID;
- this.CreateTime = rhs.CreateTime;
- this.CreateUserName = rhs.CreateUserName;
- this.UpdateUserID = rhs.UpdateUserID;
- this.UpdateTime = rhs.UpdateTime;
- this.UpdateUserName = rhs.UpdateUserName;
this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
}
diff --git a/Yw.Service.Bimface.Core/03-settings/helper/BimfaceFileHelper.cs b/Yw.Service.Bimface.Core/03-settings/00-core/BimfaceFileHelper.cs
similarity index 100%
rename from Yw.Service.Bimface.Core/03-settings/helper/BimfaceFileHelper.cs
rename to Yw.Service.Bimface.Core/03-settings/00-core/BimfaceFileHelper.cs
diff --git a/Yw.Service.Bimface.Core/03-settings/helper/BimfaceParasHelper.cs b/Yw.Service.Bimface.Core/03-settings/00-core/BimfaceParasHelper.cs
similarity index 100%
rename from Yw.Service.Bimface.Core/03-settings/helper/BimfaceParasHelper.cs
rename to Yw.Service.Bimface.Core/03-settings/00-core/BimfaceParasHelper.cs
diff --git a/Yw.Service.Bimface.Core/03-settings/paras/BimfaceParas.cs b/Yw.Service.Bimface.Core/03-settings/01-paras/00-core/BimfaceParas.cs
similarity index 100%
rename from Yw.Service.Bimface.Core/03-settings/paras/BimfaceParas.cs
rename to Yw.Service.Bimface.Core/03-settings/01-paras/00-core/BimfaceParas.cs
diff --git a/Yw.Service.Bimface.Core/03-settings/paras/Paras_Bimface.cs b/Yw.Service.Bimface.Core/03-settings/01-paras/00-core/Paras_Bimface.cs
similarity index 100%
rename from Yw.Service.Bimface.Core/03-settings/paras/Paras_Bimface.cs
rename to Yw.Service.Bimface.Core/03-settings/01-paras/00-core/Paras_Bimface.cs
diff --git a/Yw.Service.Bimface.Core/03-settings/paras/Paras_Bimface_DataBase.cs b/Yw.Service.Bimface.Core/03-settings/01-paras/01-database/Paras_Bimface_DataBase.cs
similarity index 100%
rename from Yw.Service.Bimface.Core/03-settings/paras/Paras_Bimface_DataBase.cs
rename to Yw.Service.Bimface.Core/03-settings/01-paras/01-database/Paras_Bimface_DataBase.cs
diff --git a/Yw.Service.Bimface.Core/03-settings/paras/Paras_Bimface_DataBase_Factory.cs b/Yw.Service.Bimface.Core/03-settings/01-paras/01-database/Paras_Bimface_DataBase_Factory.cs
similarity index 100%
rename from Yw.Service.Bimface.Core/03-settings/paras/Paras_Bimface_DataBase_Factory.cs
rename to Yw.Service.Bimface.Core/03-settings/01-paras/01-database/Paras_Bimface_DataBase_Factory.cs
diff --git a/Yw.Service.Bimface.Core/03-settings/paras/Paras_Bimface_DataBase_PostgreSql.cs b/Yw.Service.Bimface.Core/03-settings/01-paras/01-database/Paras_Bimface_DataBase_PostgreSql.cs
similarity index 100%
rename from Yw.Service.Bimface.Core/03-settings/paras/Paras_Bimface_DataBase_PostgreSql.cs
rename to Yw.Service.Bimface.Core/03-settings/01-paras/01-database/Paras_Bimface_DataBase_PostgreSql.cs
diff --git a/Yw.Service.Bimface.Core/03-settings/paras/Paras_Bimface_DataBase_SQLite.cs b/Yw.Service.Bimface.Core/03-settings/01-paras/01-database/Paras_Bimface_DataBase_SQLite.cs
similarity index 100%
rename from Yw.Service.Bimface.Core/03-settings/paras/Paras_Bimface_DataBase_SQLite.cs
rename to Yw.Service.Bimface.Core/03-settings/01-paras/01-database/Paras_Bimface_DataBase_SQLite.cs
diff --git a/Yw.Service.Bimface.Core/03-settings/paras/Paras_Bimface_CAL.cs b/Yw.Service.Bimface.Core/03-settings/01-paras/02-cal/Paras_Bimface_CAL.cs
similarity index 100%
rename from Yw.Service.Bimface.Core/03-settings/paras/Paras_Bimface_CAL.cs
rename to Yw.Service.Bimface.Core/03-settings/01-paras/02-cal/Paras_Bimface_CAL.cs
diff --git a/Yw.Service.Bimface.Core/03-settings/paras/Paras_Bimface_CAL_HttpClient.cs b/Yw.Service.Bimface.Core/03-settings/01-paras/02-cal/Paras_Bimface_CAL_HttpClient.cs
similarity index 100%
rename from Yw.Service.Bimface.Core/03-settings/paras/Paras_Bimface_CAL_HttpClient.cs
rename to Yw.Service.Bimface.Core/03-settings/01-paras/02-cal/Paras_Bimface_CAL_HttpClient.cs
diff --git a/Yw.Service.Bimface.Core/03-settings/paras/Paras_Bimface_CAL_LocalClient.cs b/Yw.Service.Bimface.Core/03-settings/01-paras/02-cal/Paras_Bimface_CAL_LocalClient.cs
similarity index 100%
rename from Yw.Service.Bimface.Core/03-settings/paras/Paras_Bimface_CAL_LocalClient.cs
rename to Yw.Service.Bimface.Core/03-settings/01-paras/02-cal/Paras_Bimface_CAL_LocalClient.cs
diff --git a/Yw.Service.Bimface.Core/04-dal/01-interface/IBimfaceFile.cs b/Yw.Service.Bimface.Core/04-dal/01-interface/IBimfaceFile.cs
index cc7c9fc..0d2a3b6 100644
--- a/Yw.Service.Bimface.Core/04-dal/01-interface/IBimfaceFile.cs
+++ b/Yw.Service.Bimface.Core/04-dal/01-interface/IBimfaceFile.cs
@@ -3,9 +3,8 @@
/// <summary>
///
/// </summary>
- public interface IBimfaceFile : IBaseTraceDAL<Entity.BimfaceFile>, IUpdateParas, IUpdateFlags, IUpdateTagName, IUpdateSorter
+ public interface IBimfaceFile : IBaseDAL<Entity.BimfaceFile>, IUpdateParas, IUpdateFlags, IUpdateTagName, IUpdateSorter
{
-
/// <summary>
/// 鏇存柊 FileStatus
diff --git a/Yw.Service.Bimface.Core/04-dal/01-interface/IBimfaceFileRelation.cs b/Yw.Service.Bimface.Core/04-dal/01-interface/IBimfaceFileRelation.cs
index feecf37..3276521 100644
--- a/Yw.Service.Bimface.Core/04-dal/01-interface/IBimfaceFileRelation.cs
+++ b/Yw.Service.Bimface.Core/04-dal/01-interface/IBimfaceFileRelation.cs
@@ -6,7 +6,6 @@
public interface IBimfaceFileRelation : IBaseDAL<Entity.BimfaceFileRelation>, IUpdateSorter
{
-
/// <summary>
/// 鏇存柊 Purpose
/// </summary>
diff --git a/Yw.Service.Bimface.Core/04-dal/02-postgresql/BimfaceFile.cs b/Yw.Service.Bimface.Core/04-dal/02-postgresql/BimfaceFile.cs
index fe041e6..ca67aec 100644
--- a/Yw.Service.Bimface.Core/04-dal/02-postgresql/BimfaceFile.cs
+++ b/Yw.Service.Bimface.Core/04-dal/02-postgresql/BimfaceFile.cs
@@ -3,7 +3,7 @@
/// <summary>
///
/// </summary>
- public partial class BimfaceFile : BaseTraceDAL_Paras_Flags_TagName_Sorter<Entity.BimfaceFile>, IBimfaceFile
+ public partial class BimfaceFile : BaseDAL_Paras_Flags_TagName_Sorter<Entity.BimfaceFile>, IBimfaceFile
{
/// <summary>
///
@@ -11,7 +11,6 @@
public override ConnectionConfig ConnectionConfig
{
get { return ConfigHelper.PostgreSqlConnectionConfig; }
-
}
/// <summary>
@@ -23,9 +22,6 @@
{
return db.Updateable<Entity.BimfaceFile>()
.SetColumns(x => x.FileStatus == FileStatus)
- .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
- .SetColumns(x => x.UpdateTime == DateTime.Now)
- .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
.Where(x => x.ID == ID)
.ExecuteCommandHasChange();
}
@@ -40,9 +36,6 @@
{
return db.Updateable<Entity.BimfaceFile>()
.SetColumns(x => x.Content == Content)
- .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
- .SetColumns(x => x.UpdateTime == DateTime.Now)
- .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
.Where(x => x.ID == ID)
.ExecuteCommandHasChange();
}
diff --git a/Yw.Service.Bimface.Core/04-dal/03-sqlite/BimfaceFile.cs b/Yw.Service.Bimface.Core/04-dal/03-sqlite/BimfaceFile.cs
index 6ae5d36..9ca99d6 100644
--- a/Yw.Service.Bimface.Core/04-dal/03-sqlite/BimfaceFile.cs
+++ b/Yw.Service.Bimface.Core/04-dal/03-sqlite/BimfaceFile.cs
@@ -3,7 +3,7 @@
/// <summary>
///
/// </summary>
- public partial class BimfaceFile : BaseTraceDAL_Paras_Flags_TagName_Sorter<Entity.BimfaceFile>, IBimfaceFile
+ public partial class BimfaceFile : BaseDAL_Paras_Flags_TagName_Sorter<Entity.BimfaceFile>, IBimfaceFile
{
/// <summary>
///
@@ -23,9 +23,6 @@
{
return db.Updateable<Entity.BimfaceFile>()
.SetColumns(x => x.FileStatus == FileStatus)
- .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
- .SetColumns(x => x.UpdateTime == DateTime.Now)
- .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
.Where(x => x.ID == ID)
.ExecuteCommandHasChange();
}
@@ -40,9 +37,6 @@
{
return db.Updateable<Entity.BimfaceFile>()
.SetColumns(x => x.Content == Content)
- .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
- .SetColumns(x => x.UpdateTime == DateTime.Now)
- .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
.Where(x => x.ID == ID)
.ExecuteCommandHasChange();
}
diff --git a/Yw.Service.Bimface.Core/05-service/00-helper/CacheHelper.cs b/Yw.Service.Bimface.Core/05-service/00-core/CacheHelper.cs
similarity index 100%
rename from Yw.Service.Bimface.Core/05-service/00-helper/CacheHelper.cs
rename to Yw.Service.Bimface.Core/05-service/00-core/CacheHelper.cs
diff --git a/Yw.Service.Bimface.Core/05-service/00-helper/DALCreateHelper.cs b/Yw.Service.Bimface.Core/05-service/00-core/DALCreateHelper.cs
similarity index 100%
rename from Yw.Service.Bimface.Core/05-service/00-helper/DALCreateHelper.cs
rename to Yw.Service.Bimface.Core/05-service/00-core/DALCreateHelper.cs
diff --git a/Yw.Service.Bimface.Core/05-service/00-helper/Extensions.cs b/Yw.Service.Bimface.Core/05-service/00-core/Extensions.cs
similarity index 100%
rename from Yw.Service.Bimface.Core/05-service/00-helper/Extensions.cs
rename to Yw.Service.Bimface.Core/05-service/00-core/Extensions.cs
diff --git a/Yw.Service.Bimface.Core/05-service/01-bimface-file/BimfaceFile.cs b/Yw.Service.Bimface.Core/05-service/01-bimface-file/BimfaceFile.cs
index f857edb..256cde8 100644
--- a/Yw.Service.Bimface.Core/05-service/01-bimface-file/BimfaceFile.cs
+++ b/Yw.Service.Bimface.Core/05-service/01-bimface-file/BimfaceFile.cs
@@ -106,7 +106,9 @@
public List<Model.BimfaceFile> GetByIds(List<long> Ids)
{
if (Ids == null || Ids.Count < 1)
+ {
return default;
+ }
var all = GetAll();
return all.Where(x => Ids.Contains(x.ID)).OrderBy(x => x.SortCode).ToList();
}
@@ -157,7 +159,7 @@
return default;
}
var dal = DALCreateHelper.CreateDAL<Yw.DAL.IBimfaceFile>();
- var entity_list = Model2Entities(list.ToList());
+ var entity_list = Model2Entities(list);
var ids = dal.InsertsR(entity_list);
if (ids != null && ids.Count > 0)
{
@@ -178,7 +180,11 @@
{
if (model == null)
{
- return default;
+ return false;
+ }
+ if (model.ID < 1)
+ {
+ return false;
}
var entity = Model2Entity(model);
var dal = DALCreateHelper.CreateDAL<Yw.DAL.IBimfaceFile>();
@@ -197,9 +203,13 @@
{
if (list == null || list.Count < 1)
{
- return default;
+ return false;
}
- var entity_list = Model2Entities(list.ToList());
+ if (list.Exists(x => x.ID < 1))
+ {
+ return false;
+ }
+ var entity_list = Model2Entities(list);
var dal = DALCreateHelper.CreateDAL<Yw.DAL.IBimfaceFile>();
var bol = dal.Updates(entity_list);
if (bol)
@@ -214,6 +224,10 @@
/// </summary>
public bool UpdateSortCode(long ID, int SortCode)
{
+ if (ID < 1)
+ {
+ return false;
+ }
var dal = DALCreateHelper.CreateDAL<Yw.DAL.IBimfaceFile>();
var bol = dal.UpdateSortCode(ID, SortCode);
if (bol)
@@ -230,7 +244,11 @@
{
if (sorters == null || sorters.Count < 1)
{
- return default;
+ return false;
+ }
+ if (sorters.Exists(x => x.ID < 1))
+ {
+ return false;
}
var dal = DALCreateHelper.CreateDAL<Yw.DAL.IBimfaceFile>();
var bol = dal.UpdateSorter(sorters.ToEntityList());
@@ -246,6 +264,10 @@
/// </summary>
public bool UpdateParas(long ID, Dictionary<string, string> Paras)
{
+ if (ID < 1)
+ {
+ return false;
+ }
var dal = DALCreateHelper.CreateDAL<Yw.DAL.IBimfaceFile>();
var bol = dal.UpdateParas(ID, ParasHelper.ToString(Paras));
if (bol)
@@ -261,7 +283,9 @@
public bool UpdateFlags(long ID, List<string> Flags)
{
if (ID < 1)
- return default;
+ {
+ return false;
+ }
var dal = DALCreateHelper.CreateDAL<Yw.DAL.IBimfaceFile>();
var bol = dal.UpdateFlags(ID, FlagsHelper.ToString(Flags));
if (bol)
@@ -277,7 +301,9 @@
public bool UpdateTagName(long ID, string TagName)
{
if (ID < 1)
- return default;
+ {
+ return false;
+ }
var dal = DALCreateHelper.CreateDAL<Yw.DAL.IBimfaceFile>();
var bol = dal.UpdateTagName(ID, TagName);
if (bol)
@@ -292,6 +318,10 @@
/// </summary>
public bool UpdateFileStatus(long ID, int FileStatus)
{
+ if (ID < 1)
+ {
+ return false;
+ }
var dal = DALCreateHelper.CreateDAL<Yw.DAL.IBimfaceFile>();
var bol = dal.UpdateFileStatus(ID, FileStatus);
if (bol)
@@ -306,6 +336,10 @@
/// </summary>
public bool UpdateContent(long ID, string Content)
{
+ if (ID < 1)
+ {
+ return false;
+ }
var dal = DALCreateHelper.CreateDAL<Yw.DAL.IBimfaceFile>();
var bol = dal.UpdateContent(ID, Content);
if (bol)
@@ -362,16 +396,17 @@
Msg = "鏁版嵁涓嶅瓨鍦�";
return false;
}
- if (new BimfaceFileRelation().IsExistByBimfaceFileID(ID))
- {
- Msg = "瀛樺湪鍏宠仈鍏崇郴锛岃鍒犻櫎鍚庨噸璇�";
- return false;
- }
if (new BimfaceFileLabel().IsExistByBimfaceFileID(ID))
{
Msg = "瀛樺湪鏍囩淇℃伅";
return false;
}
+ if (new BimfaceFileRelation().IsExistByBimfaceFileID(ID))
+ {
+ Msg = "瀛樺湪鍏宠仈鍏崇郴锛岃鍒犻櫎鍚庨噸璇�";
+ return false;
+ }
+
var dal = DALCreateHelper.CreateDAL<Yw.DAL.IBimfaceFile>();
var bol = dal.DeleteByID(ID);
if (bol)
diff --git a/Yw.Service.Bimface.Core/05-service/02-bimface-file-label/BimfaceFileLabel.cs b/Yw.Service.Bimface.Core/05-service/02-bimface-file-label/BimfaceFileLabel.cs
index f5db579..bcc5e8c 100644
--- a/Yw.Service.Bimface.Core/05-service/02-bimface-file-label/BimfaceFileLabel.cs
+++ b/Yw.Service.Bimface.Core/05-service/02-bimface-file-label/BimfaceFileLabel.cs
@@ -197,7 +197,7 @@
{
if (model == null)
{
- return default;
+ return false;
}
var entity = Model2Entity(model);
var dal = DALCreateHelper.CreateDAL<Yw.DAL.IBimfaceFileLabel>();
@@ -216,7 +216,11 @@
{
if (list == null || !list.Any())
{
- return default;
+ return false;
+ }
+ if (list.Exists(x => x.ID < 1))
+ {
+ return false;
}
var entityList = Model2Entities(list);
var dal = DALCreateHelper.CreateDAL<Yw.DAL.IBimfaceFileLabel>();
@@ -233,6 +237,10 @@
/// </summary>
public bool UpdateContent(long ID, string Content)
{
+ if (ID < 1)
+ {
+ return false;
+ }
var dal = DALCreateHelper.CreateDAL<Yw.DAL.IBimfaceFileLabel>();
var bol = dal.UpdateContent(ID, Content);
if (bol)
diff --git a/Yw.Service.Bimface.Core/05-service/03-bimface-file-relation/BimfaceFileRelation.cs b/Yw.Service.Bimface.Core/05-service/03-bimface-file-relation/BimfaceFileRelation.cs
index aeb8204..376acda 100644
--- a/Yw.Service.Bimface.Core/05-service/03-bimface-file-relation/BimfaceFileRelation.cs
+++ b/Yw.Service.Bimface.Core/05-service/03-bimface-file-relation/BimfaceFileRelation.cs
@@ -106,7 +106,9 @@
public List<Model.BimfaceFileRelation> GetByIds(List<long> Ids)
{
if (Ids == null || Ids.Count < 1)
+ {
return default;
+ }
var all = GetAll();
return all.Where(x => Ids.Contains(x.ID)).OrderBy(x => x.SortCode).ToList();
}
@@ -217,10 +219,14 @@
{
if (list == null || list.Count < 1)
{
- return default;
+ return false;
+ }
+ if (list.Exists(x => x.ID < 1))
+ {
+ return false;
}
var dal = DALCreateHelper.CreateDAL<Yw.DAL.IBimfaceFileRelation>();
- var entity_list = Model2Entities(list.ToList());
+ var entity_list = Model2Entities(list);
var ids = dal.InsertsR(entity_list);
if (ids != null && ids.Count > 0)
{
@@ -241,7 +247,11 @@
{
if (model == null)
{
- return default;
+ return false;
+ }
+ if (model.ID < 1)
+ {
+ return false;
}
var entity = Model2Entity(model);
var dal = DALCreateHelper.CreateDAL<Yw.DAL.IBimfaceFileRelation>();
@@ -260,7 +270,11 @@
{
if (list == null || list.Count < 1)
{
- return default;
+ return false;
+ }
+ if (list.Exists(x => x.ID < 1))
+ {
+ return false;
}
var entity_list = Model2Entities(list.ToList());
var dal = DALCreateHelper.CreateDAL<Yw.DAL.IBimfaceFileRelation>();
@@ -277,6 +291,10 @@
/// </summary>
public bool UpdateSortCode(long ID, int SortCode)
{
+ if (ID < 1)
+ {
+ return false;
+ }
var dal = DALCreateHelper.CreateDAL<Yw.DAL.IBimfaceFileRelation>();
var bol = dal.UpdateSortCode(ID, SortCode);
if (bol)
@@ -293,7 +311,11 @@
{
if (sorters == null || sorters.Count < 1)
{
- return default;
+ return false;
+ }
+ if (sorters.Exists(x => x.ID < 1))
+ {
+ return false;
}
var dal = DALCreateHelper.CreateDAL<Yw.DAL.IBimfaceFileRelation>();
var bol = dal.UpdateSorter(sorters.ToEntityList());
@@ -309,6 +331,10 @@
/// </summary>
public bool UpdatePurpose(long ID, string Purpose)
{
+ if (ID < 1)
+ {
+ return false;
+ }
var dal = DALCreateHelper.CreateDAL<Yw.DAL.IBimfaceFileRelation>();
var bol = dal.UpdatePurpose(ID, Purpose);
if (bol)
@@ -323,6 +349,10 @@
/// </summary>
public bool UpdateContent(long ID, string Content)
{
+ if (ID < 1)
+ {
+ return false;
+ }
var dal = DALCreateHelper.CreateDAL<Yw.DAL.IBimfaceFileRelation>();
var bol = dal.UpdateContent(ID, Content);
if (bol)
diff --git a/Yw.Service.Bimface.Core/05-service/04-bimface-relation-label/BimfaceFileRelationLabel.cs b/Yw.Service.Bimface.Core/05-service/04-bimface-relation-label/BimfaceFileRelationLabel.cs
index ca54efd..9405b96 100644
--- a/Yw.Service.Bimface.Core/05-service/04-bimface-relation-label/BimfaceFileRelationLabel.cs
+++ b/Yw.Service.Bimface.Core/05-service/04-bimface-relation-label/BimfaceFileRelationLabel.cs
@@ -197,7 +197,11 @@
{
if (model == null)
{
- return default;
+ return false;
+ }
+ if (model.ID < 1)
+ {
+ return false;
}
var entity = Model2Entity(model);
var dal = DALCreateHelper.CreateDAL<Yw.DAL.IBimfaceFileRelationLabel>();
@@ -216,7 +220,11 @@
{
if (list == null || !list.Any())
{
- return default;
+ return false;
+ }
+ if (list.Exists(x => x.ID < 1))
+ {
+ return false;
}
var entityList = Model2Entities(list);
var dal = DALCreateHelper.CreateDAL<Yw.DAL.IBimfaceFileRelationLabel>();
@@ -233,6 +241,10 @@
/// </summary>
public bool UpdateContent(long ID, string Content)
{
+ if (ID < 1)
+ {
+ return false;
+ }
var dal = DALCreateHelper.CreateDAL<Yw.DAL.IBimfaceFileRelationLabel>();
var bol = dal.UpdateContent(ID, Content);
if (bol)
diff --git a/Yw.Service.Bimface.Core/Properties/PublishProfiles/FolderProfile.pubxml.user b/Yw.Service.Bimface.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
index d7973dc..d84314a 100644
--- a/Yw.Service.Bimface.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/Yw.Service.Bimface.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project>
<PropertyGroup>
- <History>True|2024-05-13T01:54:44.0143996Z;True|2024-03-30T15:56:02.1286253+08:00;True|2024-03-26T13:14:41.0228396+08:00;True|2024-03-08T15:59:03.9347848+08:00;True|2024-01-21T15:24:10.4761424+08:00;True|2023-12-19T21:22:17.3259489+08:00;True|2023-12-16T12:50:52.1208136+08:00;True|2023-12-04T19:10:10.0862917+08:00;True|2023-12-04T19:03:22.1382800+08:00;True|2023-12-04T18:45:47.2344462+08:00;True|2023-12-04T18:43:17.3052814+08:00;True|2023-12-01T15:50:02.2518271+08:00;True|2023-11-30T15:37:07.6925176+08:00;True|2023-11-30T15:35:38.6518588+08:00;True|2023-11-13T11:13:38.2876503+08:00;True|2023-11-07T15:26:15.8664916+08:00;True|2023-10-27T13:21:57.8245827+08:00;True|2023-10-21T18:15:57.8975745+08:00;True|2023-10-18T17:28:42.7347523+08:00;True|2023-09-15T12:08:33.6892307+08:00;True|2023-09-14T15:13:47.6095636+08:00;True|2023-08-21T13:08:28.2298969+08:00;True|2023-07-17T10:30:15.0370305+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-05-29T02:11:59.5788332Z;True|2024-05-13T09:54:44.0143996+08:00;True|2024-03-30T15:56:02.1286253+08:00;True|2024-03-26T13:14:41.0228396+08:00;True|2024-03-08T15:59:03.9347848+08:00;True|2024-01-21T15:24:10.4761424+08:00;True|2023-12-19T21:22:17.3259489+08:00;True|2023-12-16T12:50:52.1208136+08:00;True|2023-12-04T19:10:10.0862917+08:00;True|2023-12-04T19:03:22.1382800+08:00;True|2023-12-04T18:45:47.2344462+08:00;True|2023-12-04T18:43:17.3052814+08:00;True|2023-12-01T15:50:02.2518271+08:00;True|2023-11-30T15:37:07.6925176+08:00;True|2023-11-30T15:35:38.6518588+08:00;True|2023-11-13T11:13:38.2876503+08:00;True|2023-11-07T15:26:15.8664916+08:00;True|2023-10-27T13:21:57.8245827+08:00;True|2023-10-21T18:15:57.8975745+08:00;True|2023-10-18T17:28:42.7347523+08:00;True|2023-09-15T12:08:33.6892307+08:00;True|2023-09-14T15:13:47.6095636+08:00;True|2023-08-21T13:08:28.2298969+08:00;True|2023-07-17T10:30:15.0370305+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.Bimface.Core/Yw.Service.Bimface.Core.csproj b/Yw.Service.Bimface.Core/Yw.Service.Bimface.Core.csproj
index 06f22c8..e9431a0 100644
--- a/Yw.Service.Bimface.Core/Yw.Service.Bimface.Core.csproj
+++ b/Yw.Service.Bimface.Core/Yw.Service.Bimface.Core.csproj
@@ -7,7 +7,7 @@
<RootNamespace>Yw</RootNamespace>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
- <Version>3.0.2</Version>
+ <Version>3.0.3</Version>
<Description>寮曠敤鍗囩骇</Description>
</PropertyGroup>
--
Gitblit v1.9.3