From 6f7122d26270d9a830ab55e4034aaecbe68f8700 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 29 二月 2024 15:09:52 +0800
Subject: [PATCH] 优化代码
---
IStation.Application.SqiAirp/03-certificate/1-mgr/dto/CertificateDto.cs | 60 ++++---
IStation.Application.SqiAirp/03-certificate/2-std/AirpSite_StdController.cs | 24 +++
IStation.Service.SqiAirp/02-model/03-certificate/Certificate.cs | 75 +++++----
IStation.Entry.SqiAirp/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
IStation.Application.SqiAirp/03-certificate/1-mgr/dto/AddCertificateInput.cs | 45 +++--
IStation.Service.SqiAirp/01-entity/03-certificate/Certificate.cs | 60 ++++---
IStation.Application.SqiAirp/03-certificate/1-mgr/Certificate_Controller.cs | 2
IStation.Application.SqiAirp/03-certificate/1-mgr/dto/UpdateCertificateInput.cs | 45 +++--
IStation.Application.SqiAirp/03-certificate/2-std/dto/CertificateStdDto.cs | 60 ++++---
9 files changed, 215 insertions(+), 158 deletions(-)
diff --git a/IStation.Application.SqiAirp/03-certificate/1-mgr/Certificate_Controller.cs b/IStation.Application.SqiAirp/03-certificate/1-mgr/Certificate_Controller.cs
index d058e86..3a12e69 100644
--- a/IStation.Application.SqiAirp/03-certificate/1-mgr/Certificate_Controller.cs
+++ b/IStation.Application.SqiAirp/03-certificate/1-mgr/Certificate_Controller.cs
@@ -54,7 +54,7 @@
#region Insert
/// <summary>
- /// 鎻掑叆涓�鏉� 鈽�
+ /// 鎻掑叆涓�鏉�
/// </summary>
[Route("Insert@V1.0")]
[HttpPost]
diff --git a/IStation.Application.SqiAirp/03-certificate/1-mgr/dto/AddCertificateInput.cs b/IStation.Application.SqiAirp/03-certificate/1-mgr/dto/AddCertificateInput.cs
index 4985b8d..5dc5017 100644
--- a/IStation.Application.SqiAirp/03-certificate/1-mgr/dto/AddCertificateInput.cs
+++ b/IStation.Application.SqiAirp/03-certificate/1-mgr/dto/AddCertificateInput.cs
@@ -7,14 +7,24 @@
{
/// <summary>
- /// 鐢熶骇浼佷笟鍚嶇О
+ /// 绌哄帇绔欏悕绉�
/// </summary>
- public string ManufacturerName { get; set; }
+ public string AirpSiteName { get; set; }
/// <summary>
- /// 鐢ㄦ埛鍚嶇О
+ /// 绌哄帇绔欏缓璁惧崟浣�
/// </summary>
- public string UseName { get; set; }
+ public string BuilderName { get; set; }
+
+ /// <summary>
+ /// 绌哄帇绔欒璁″崟浣�
+ /// </summary>
+ public string DesignerName { get; set; }
+
+ /// <summary>
+ /// 绌哄帇绔欐墍灞炲崟浣�
+ /// </summary>
+ public string UserName { get; set; }
/// <summary>
/// 璇佷功缂栧彿
@@ -22,9 +32,14 @@
public string CertificateNO { get; set; }
/// <summary>
- /// 鍘嬬缉绌烘皵绔欏悕绉�
+ /// 鑳芥晥绛夌骇
/// </summary>
- public string CertificateName { get; set; }
+ public string EtaLevel { get; set; }
+
+ /// <summary>
+ /// 璁ゅ畾鏃堕棿
+ /// </summary>
+ public DateTime IssuanceTime { get; set; }
/// <summary>
/// 涓昏璁惧鍨嬪彿
@@ -32,24 +47,14 @@
public string MainEquipmentModels { get; set; }
/// <summary>
- /// 鑳芥晥绛夌骇
+ /// 妫�娴嬪崟浣�
/// </summary>
- public string EtaLevel { get; set; }
+ public string TestingName { get; set; }
/// <summary>
- /// 妫�娴嬪崟浣嶅悕绉�
+ /// 鍙戣瘉鍗曚綅
/// </summary>
- public string TestingUnitName { get; set; }
-
- /// <summary>
- /// 鍙戣瘉鍗曚綅鍚嶇О
- /// </summary>
- public string IssuingUnitName { get; set; }
-
- /// <summary>
- /// 鍙戣瘉鏃ユ湡
- /// </summary>
- public DateTime IssuanceDay { get; set; }
+ public string IssuingName { get; set; }
/// <summary>
/// 璇存槑
diff --git a/IStation.Application.SqiAirp/03-certificate/1-mgr/dto/CertificateDto.cs b/IStation.Application.SqiAirp/03-certificate/1-mgr/dto/CertificateDto.cs
index e778d84..4d89464 100644
--- a/IStation.Application.SqiAirp/03-certificate/1-mgr/dto/CertificateDto.cs
+++ b/IStation.Application.SqiAirp/03-certificate/1-mgr/dto/CertificateDto.cs
@@ -16,15 +16,16 @@
public CertificateDto(Model.Certificate rhs)
{
this.ID = rhs.ID;
- this.ManufacturerName = rhs.ManufacturerName;
- this.UseName = rhs.UseName;
- this.CertificateNO = rhs.CertificateNO;
this.AirpSiteName = rhs.AirpSiteName;
- this.MainEquipmentModels = rhs.MainEquipmentModels;
+ this.BuilderName = rhs.BuilderName;
+ this.DesignerName = rhs.DesignerName;
+ this.UserName = rhs.UserName;
+ this.CertificateNO = rhs.CertificateNO;
this.EtaLevel = rhs.EtaLevel;
- this.TestingUnitName = rhs.TestingUnitName;
- this.IssuingUnitName = rhs.IssuingUnitName;
- this.IssuanceDay = rhs.IssuanceDay;
+ this.IssuanceTime = rhs.IssuanceTime;
+ this.MainEquipmentModels = rhs.MainEquipmentModels;
+ this.TestingName = rhs.TestingName;
+ this.IssuingName = rhs.IssuingName;
this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
}
@@ -35,14 +36,24 @@
public long ID { get; set; }
/// <summary>
- /// 鐢熶骇浼佷笟鍚嶇О
+ /// 绌哄帇绔欏悕绉�
/// </summary>
- public string ManufacturerName { get; set; }
+ public string AirpSiteName { get; set; }
/// <summary>
- /// 鐢ㄦ埛鍚嶇О
+ /// 绌哄帇绔欏缓璁惧崟浣�
/// </summary>
- public string UseName { get; set; }
+ public string BuilderName { get; set; }
+
+ /// <summary>
+ /// 绌哄帇绔欒璁″崟浣�
+ /// </summary>
+ public string DesignerName { get; set; }
+
+ /// <summary>
+ /// 绌哄帇绔欐墍灞炲崟浣�
+ /// </summary>
+ public string UserName { get; set; }
/// <summary>
/// 璇佷功缂栧彿
@@ -50,9 +61,14 @@
public string CertificateNO { get; set; }
/// <summary>
- /// 鍘嬬缉绌烘皵绔欏悕绉�
+ /// 鑳芥晥绛夌骇
/// </summary>
- public string AirpSiteName { get; set; }
+ public string EtaLevel { get; set; }
+
+ /// <summary>
+ /// 璁ゅ畾鏃堕棿
+ /// </summary>
+ public DateTime IssuanceTime { get; set; }
/// <summary>
/// 涓昏璁惧鍨嬪彿
@@ -60,24 +76,14 @@
public string MainEquipmentModels { get; set; }
/// <summary>
- /// 鑳芥晥绛夌骇
+ /// 妫�娴嬪崟浣�
/// </summary>
- public string EtaLevel { get; set; }
+ public string TestingName { get; set; }
/// <summary>
- /// 妫�娴嬪崟浣嶅悕绉�
+ /// 鍙戣瘉鍗曚綅
/// </summary>
- public string TestingUnitName { get; set; }
-
- /// <summary>
- /// 鍙戣瘉鍗曚綅鍚嶇О
- /// </summary>
- public string IssuingUnitName { get; set; }
-
- /// <summary>
- /// 鍙戣瘉鏃ユ湡
- /// </summary>
- public DateTime IssuanceDay { get; set; }
+ public string IssuingName { get; set; }
/// <summary>
/// 鎺掑簭鐮�
diff --git a/IStation.Application.SqiAirp/03-certificate/1-mgr/dto/UpdateCertificateInput.cs b/IStation.Application.SqiAirp/03-certificate/1-mgr/dto/UpdateCertificateInput.cs
index acd4fce..7766ba6 100644
--- a/IStation.Application.SqiAirp/03-certificate/1-mgr/dto/UpdateCertificateInput.cs
+++ b/IStation.Application.SqiAirp/03-certificate/1-mgr/dto/UpdateCertificateInput.cs
@@ -12,14 +12,24 @@
public long ID { get; set; }
/// <summary>
- /// 鐢熶骇浼佷笟鍚嶇О
+ /// 绌哄帇绔欏悕绉�
/// </summary>
- public string ManufacturerName { get; set; }
+ public string AirpSiteName { get; set; }
/// <summary>
- /// 鐢ㄦ埛鍚嶇О
+ /// 绌哄帇绔欏缓璁惧崟浣�
/// </summary>
- public string UseName { get; set; }
+ public string BuilderName { get; set; }
+
+ /// <summary>
+ /// 绌哄帇绔欒璁″崟浣�
+ /// </summary>
+ public string DesignerName { get; set; }
+
+ /// <summary>
+ /// 绌哄帇绔欐墍灞炲崟浣�
+ /// </summary>
+ public string UserName { get; set; }
/// <summary>
/// 璇佷功缂栧彿
@@ -27,9 +37,14 @@
public string CertificateNO { get; set; }
/// <summary>
- /// 鍘嬬缉绌烘皵绔欏悕绉�
+ /// 鑳芥晥绛夌骇
/// </summary>
- public string CertificateName { get; set; }
+ public string EtaLevel { get; set; }
+
+ /// <summary>
+ /// 璁ゅ畾鏃堕棿
+ /// </summary>
+ public DateTime IssuanceTime { get; set; }
/// <summary>
/// 涓昏璁惧鍨嬪彿
@@ -37,24 +52,14 @@
public string MainEquipmentModels { get; set; }
/// <summary>
- /// 鑳芥晥绛夌骇
+ /// 妫�娴嬪崟浣�
/// </summary>
- public string EtaLevel { get; set; }
+ public string TestingName { get; set; }
/// <summary>
- /// 妫�娴嬪崟浣嶅悕绉�
+ /// 鍙戣瘉鍗曚綅
/// </summary>
- public string TestingUnitName { get; set; }
-
- /// <summary>
- /// 鍙戣瘉鍗曚綅鍚嶇О
- /// </summary>
- public string IssuingUnitName { get; set; }
-
- /// <summary>
- /// 鍙戣瘉鏃ユ湡
- /// </summary>
- public DateTime IssuanceDay { get; set; }
+ public string IssuingName { get; set; }
/// <summary>
/// 璇存槑
diff --git a/IStation.Application.SqiAirp/03-certificate/2-std/AirpSite_StdController.cs b/IStation.Application.SqiAirp/03-certificate/2-std/AirpSite_StdController.cs
index c09d9d7..e4c051f 100644
--- a/IStation.Application.SqiAirp/03-certificate/2-std/AirpSite_StdController.cs
+++ b/IStation.Application.SqiAirp/03-certificate/2-std/AirpSite_StdController.cs
@@ -1,4 +1,6 @@
-锘縩amespace IStation.Application
+锘縰sing Microsoft.AspNetCore.Authorization;
+
+namespace IStation.Application
{
/// <summary>
/// Certificate
@@ -27,6 +29,26 @@
return vm_list;
}
+ /// <summary>
+ /// 鑾峰彇鎵�鏈� (涓嶉渶瑕乀oken楠岃瘉)
+ /// </summary>
+ [AllowAnonymous]
+ [Route("GetAll@V2.0")]
+ [HttpGet]
+ public List<CertificateStdDto> GetAll_V2_0()
+ {
+ var keyContent = $"SQI_Certificate_Std_GetAll_V2_0";
+ var cacheKey = $"{MemoryCacheKeyHelper.GetPrefix(MemoryCacheKey.WebApiLevel, MemoryCacheKey.Module)}_{keyContent}";
+ var vm_list = MemoryCacheHelper.GetSet(cacheKey, () =>
+ {
+ var allList = new Service.Certificate().GetAll();
+ Service.Certificate.PublishCache(cacheKey);
+ var vmList = allList?.Select(x => new CertificateStdDto(x)).ToList();
+ return vmList;
+ }, CacheHelper.CacheLevel5);
+ return vm_list;
+ }
+
diff --git a/IStation.Application.SqiAirp/03-certificate/2-std/dto/CertificateStdDto.cs b/IStation.Application.SqiAirp/03-certificate/2-std/dto/CertificateStdDto.cs
index faac6cf..d459840 100644
--- a/IStation.Application.SqiAirp/03-certificate/2-std/dto/CertificateStdDto.cs
+++ b/IStation.Application.SqiAirp/03-certificate/2-std/dto/CertificateStdDto.cs
@@ -16,15 +16,16 @@
public CertificateStdDto(Model.Certificate rhs)
{
this.ID = rhs.ID;
- this.ManufacturerName = rhs.ManufacturerName;
- this.UseName = rhs.UseName;
- this.CertificateNO = rhs.CertificateNO;
this.AirpSiteName = rhs.AirpSiteName;
- this.MainEquipmentModels = rhs.MainEquipmentModels;
+ this.BuilderName = rhs.BuilderName;
+ this.DesignerName = rhs.DesignerName;
+ this.UserName = rhs.UserName;
+ this.CertificateNO = rhs.CertificateNO;
this.EtaLevel = rhs.EtaLevel;
- this.TestingUnitName = rhs.TestingUnitName;
- this.IssuingUnitName = rhs.IssuingUnitName;
- this.IssuanceDay = rhs.IssuanceDay;
+ this.IssuanceTime = rhs.IssuanceTime;
+ this.MainEquipmentModels = rhs.MainEquipmentModels;
+ this.TestingName = rhs.TestingName;
+ this.IssuingName = rhs.IssuingName;
this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
}
@@ -35,14 +36,24 @@
public long ID { get; set; }
/// <summary>
- /// 鐢熶骇浼佷笟鍚嶇О
+ /// 绌哄帇绔欏悕绉�
/// </summary>
- public string ManufacturerName { get; set; }
+ public string AirpSiteName { get; set; }
/// <summary>
- /// 鐢ㄦ埛鍚嶇О
+ /// 绌哄帇绔欏缓璁惧崟浣�
/// </summary>
- public string UseName { get; set; }
+ public string BuilderName { get; set; }
+
+ /// <summary>
+ /// 绌哄帇绔欒璁″崟浣�
+ /// </summary>
+ public string DesignerName { get; set; }
+
+ /// <summary>
+ /// 绌哄帇绔欐墍灞炲崟浣�
+ /// </summary>
+ public string UserName { get; set; }
/// <summary>
/// 璇佷功缂栧彿
@@ -50,9 +61,14 @@
public string CertificateNO { get; set; }
/// <summary>
- /// 鍘嬬缉绌烘皵绔欏悕绉�
+ /// 鑳芥晥绛夌骇
/// </summary>
- public string AirpSiteName { get; set; }
+ public string EtaLevel { get; set; }
+
+ /// <summary>
+ /// 璁ゅ畾鏃堕棿
+ /// </summary>
+ public DateTime IssuanceTime { get; set; }
/// <summary>
/// 涓昏璁惧鍨嬪彿
@@ -60,24 +76,14 @@
public string MainEquipmentModels { get; set; }
/// <summary>
- /// 鑳芥晥绛夌骇
+ /// 妫�娴嬪崟浣�
/// </summary>
- public string EtaLevel { get; set; }
+ public string TestingName { get; set; }
/// <summary>
- /// 妫�娴嬪崟浣嶅悕绉�
+ /// 鍙戣瘉鍗曚綅
/// </summary>
- public string TestingUnitName { get; set; }
-
- /// <summary>
- /// 鍙戣瘉鍗曚綅鍚嶇О
- /// </summary>
- public string IssuingUnitName { get; set; }
-
- /// <summary>
- /// 鍙戣瘉鏃ユ湡
- /// </summary>
- public DateTime IssuanceDay { get; set; }
+ public string IssuingName { get; set; }
/// <summary>
/// 鎺掑簭鐮�
diff --git a/IStation.Entry.SqiAirp/Properties/PublishProfiles/FolderProfile.pubxml.user b/IStation.Entry.SqiAirp/Properties/PublishProfiles/FolderProfile.pubxml.user
index a59c441..43dafeb 100644
--- a/IStation.Entry.SqiAirp/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/IStation.Entry.SqiAirp/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,6 +5,6 @@
<Project>
<PropertyGroup>
<_PublishTargetUrl>D:\WorkData\git\istation\SqiAirp\IStation.Entry.SqiAirp\bin\Release\net6.0\publish\</_PublishTargetUrl>
- <History>True|2024-02-21T06:40:55.9508436Z;True|2024-02-21T14:40:13.7727713+08:00;True|2024-02-21T11:20:58.4119952+08:00;False|2024-02-21T11:20:08.5756638+08:00;True|2023-11-09T16:14:24.5690632+08:00;True|2023-11-09T13:31:14.1854587+08:00;True|2023-10-21T18:34:49.7814859+08:00;True|2023-10-21T10:11:24.4036360+08:00;False|2023-10-21T10:06:43.5864769+08:00;True|2023-10-20T19:00:14.6068195+08:00;True|2023-10-20T18:36:10.4611497+08:00;True|2023-10-19T09:56:48.5150728+08:00;True|2023-10-18T14:59:01.0684811+08:00;True|2023-10-17T16:12:58.7322358+08:00;True|2023-10-07T12:25:54.8757007+08:00;True|2023-10-07T12:13:15.0880517+08:00;True|2023-10-07T12:12:39.1803333+08:00;True|2023-10-07T12:02:22.4047422+08:00;True|2023-09-26T15:07:05.5606369+08:00;True|2023-09-25T16:53:00.5107971+08:00;True|2023-09-25T16:49:56.9145285+08:00;True|2023-09-25T14:28:29.4414039+08:00;True|2023-09-25T11:19:00.8735501+08:00;True|2023-09-21T13:54:19.1780900+08:00;True|2023-09-21T13:16:00.2957740+08:00;True|2023-09-21T11:28:36.3091944+08:00;True|2023-09-21T11:18:20.1060798+08:00;True|2023-09-13T16:00:49.4080881+08:00;True|2023-09-11T13:53:38.8582724+08:00;True|2023-09-01T10:32:37.4923361+08:00;True|2023-08-30T16:52:43.1952609+08:00;True|2023-08-30T13:41:35.0430741+08:00;True|2023-08-28T14:53:24.2454140+08:00;True|2023-08-28T13:50:55.9362462+08:00;True|2023-08-28T10:00:17.0366755+08:00;True|2023-08-25T15:41:23.8727088+08:00;True|2023-08-24T16:47:54.1391198+08:00;True|2023-08-24T16:40:29.0473991+08:00;True|2023-08-22T15:02:27.5312918+08:00;True|2023-08-22T11:18:43.6918732+08:00;True|2023-08-21T15:10:42.9223597+08:00;True|2023-08-21T14:21:08.1887373+08:00;True|2023-08-21T11:56:07.5304445+08:00;True|2023-08-18T16:57:57.0506312+08:00;True|2023-08-18T13:51:54.9145260+08:00;True|2023-08-17T14:52:44.6557301+08:00;True|2023-08-17T14:15:19.8255432+08:00;True|2023-08-17T14:03:01.1586247+08:00;True|2023-08-17T11:46:51.6685579+08:00;True|2023-08-16T11:12:27.1684542+08:00;True|2023-08-15T16:59:09.4901359+08:00;True|2023-08-10T14:08:04.8032876+08:00;True|2023-08-10T13:55:01.9698355+08:00;True|2023-08-10T10:43:44.0440039+08:00;True|2023-08-10T10:12:03.9359243+08:00;True|2023-08-09T15:07:46.6906781+08:00;True|2023-08-09T13:12:06.7912004+08:00;True|2023-08-09T10:23:24.5864225+08:00;True|2023-08-08T17:38:10.4753030+08:00;True|2023-08-08T12:56:08.9783211+08:00;True|2023-08-06T09:18:33.3703637+08:00;True|2023-08-03T11:01:58.9814864+08:00;True|2023-08-03T10:26:08.4681748+08:00;True|2023-08-02T20:33:35.0425049+08:00;True|2023-08-02T17:31:18.4675932+08:00;True|2023-08-02T16:04:16.8761862+08:00;True|2023-08-02T13:48:38.9129192+08:00;True|2023-08-02T13:45:00.6546267+08:00;True|2023-08-01T15:26:25.0389689+08:00;True|2023-08-01T14:08:10.9121758+08:00;True|2023-07-31T13:35:10.1220213+08:00;True|2023-07-31T09:20:11.2607880+08:00;True|2023-07-28T13:44:35.4317136+08:00;True|2023-07-27T10:40:46.5453757+08:00;True|2023-07-27T09:16:57.7421426+08:00;True|2023-07-26T17:10:56.0976913+08:00;True|2023-07-26T12:01:33.5766311+08:00;True|2023-07-25T18:07:38.5726960+08:00;True|2023-07-25T17:42:39.3625959+08:00;True|2023-07-25T17:04:09.8723273+08:00;True|2023-07-25T16:28:14.1819137+08:00;True|2023-07-24T14:11:28.2113907+08:00;True|2023-07-24T12:05:09.0376032+08:00;True|2023-07-24T09:36:39.6541522+08:00;True|2023-07-19T12:25:56.9887829+08:00;True|2023-07-17T13:00:04.0123733+08:00;True|2023-07-13T12:13:14.7927242+08:00;True|2023-07-13T11:46:24.1368807+08:00;True|2023-07-13T10:24:33.1684712+08:00;True|2023-06-26T11:38:29.6648988+08:00;True|2023-06-21T16:17:40.6226554+08:00;True|2023-06-21T13:30:18.8163322+08:00;True|2023-06-21T13:19:43.9290154+08:00;True|2023-06-21T11:35:28.3376504+08:00;</History>
+ <History>True|2024-02-22T03:36:32.2663381Z;False|2024-02-22T11:35:33.9895827+08:00;True|2024-02-21T14:40:55.9508436+08:00;True|2024-02-21T14:40:13.7727713+08:00;True|2024-02-21T11:20:58.4119952+08:00;False|2024-02-21T11:20:08.5756638+08:00;True|2023-11-09T16:14:24.5690632+08:00;True|2023-11-09T13:31:14.1854587+08:00;True|2023-10-21T18:34:49.7814859+08:00;True|2023-10-21T10:11:24.4036360+08:00;False|2023-10-21T10:06:43.5864769+08:00;True|2023-10-20T19:00:14.6068195+08:00;True|2023-10-20T18:36:10.4611497+08:00;True|2023-10-19T09:56:48.5150728+08:00;True|2023-10-18T14:59:01.0684811+08:00;True|2023-10-17T16:12:58.7322358+08:00;True|2023-10-07T12:25:54.8757007+08:00;True|2023-10-07T12:13:15.0880517+08:00;True|2023-10-07T12:12:39.1803333+08:00;True|2023-10-07T12:02:22.4047422+08:00;True|2023-09-26T15:07:05.5606369+08:00;True|2023-09-25T16:53:00.5107971+08:00;True|2023-09-25T16:49:56.9145285+08:00;True|2023-09-25T14:28:29.4414039+08:00;True|2023-09-25T11:19:00.8735501+08:00;True|2023-09-21T13:54:19.1780900+08:00;True|2023-09-21T13:16:00.2957740+08:00;True|2023-09-21T11:28:36.3091944+08:00;True|2023-09-21T11:18:20.1060798+08:00;True|2023-09-13T16:00:49.4080881+08:00;True|2023-09-11T13:53:38.8582724+08:00;True|2023-09-01T10:32:37.4923361+08:00;True|2023-08-30T16:52:43.1952609+08:00;True|2023-08-30T13:41:35.0430741+08:00;True|2023-08-28T14:53:24.2454140+08:00;True|2023-08-28T13:50:55.9362462+08:00;True|2023-08-28T10:00:17.0366755+08:00;True|2023-08-25T15:41:23.8727088+08:00;True|2023-08-24T16:47:54.1391198+08:00;True|2023-08-24T16:40:29.0473991+08:00;True|2023-08-22T15:02:27.5312918+08:00;True|2023-08-22T11:18:43.6918732+08:00;True|2023-08-21T15:10:42.9223597+08:00;True|2023-08-21T14:21:08.1887373+08:00;True|2023-08-21T11:56:07.5304445+08:00;True|2023-08-18T16:57:57.0506312+08:00;True|2023-08-18T13:51:54.9145260+08:00;True|2023-08-17T14:52:44.6557301+08:00;True|2023-08-17T14:15:19.8255432+08:00;True|2023-08-17T14:03:01.1586247+08:00;True|2023-08-17T11:46:51.6685579+08:00;True|2023-08-16T11:12:27.1684542+08:00;True|2023-08-15T16:59:09.4901359+08:00;True|2023-08-10T14:08:04.8032876+08:00;True|2023-08-10T13:55:01.9698355+08:00;True|2023-08-10T10:43:44.0440039+08:00;True|2023-08-10T10:12:03.9359243+08:00;True|2023-08-09T15:07:46.6906781+08:00;True|2023-08-09T13:12:06.7912004+08:00;True|2023-08-09T10:23:24.5864225+08:00;True|2023-08-08T17:38:10.4753030+08:00;True|2023-08-08T12:56:08.9783211+08:00;True|2023-08-06T09:18:33.3703637+08:00;True|2023-08-03T11:01:58.9814864+08:00;True|2023-08-03T10:26:08.4681748+08:00;True|2023-08-02T20:33:35.0425049+08:00;True|2023-08-02T17:31:18.4675932+08:00;True|2023-08-02T16:04:16.8761862+08:00;True|2023-08-02T13:48:38.9129192+08:00;True|2023-08-02T13:45:00.6546267+08:00;True|2023-08-01T15:26:25.0389689+08:00;True|2023-08-01T14:08:10.9121758+08:00;True|2023-07-31T13:35:10.1220213+08:00;True|2023-07-31T09:20:11.2607880+08:00;True|2023-07-28T13:44:35.4317136+08:00;True|2023-07-27T10:40:46.5453757+08:00;True|2023-07-27T09:16:57.7421426+08:00;True|2023-07-26T17:10:56.0976913+08:00;True|2023-07-26T12:01:33.5766311+08:00;True|2023-07-25T18:07:38.5726960+08:00;True|2023-07-25T17:42:39.3625959+08:00;True|2023-07-25T17:04:09.8723273+08:00;True|2023-07-25T16:28:14.1819137+08:00;True|2023-07-24T14:11:28.2113907+08:00;True|2023-07-24T12:05:09.0376032+08:00;True|2023-07-24T09:36:39.6541522+08:00;True|2023-07-19T12:25:56.9887829+08:00;True|2023-07-17T13:00:04.0123733+08:00;True|2023-07-13T12:13:14.7927242+08:00;True|2023-07-13T11:46:24.1368807+08:00;True|2023-07-13T10:24:33.1684712+08:00;True|2023-06-26T11:38:29.6648988+08:00;True|2023-06-21T16:17:40.6226554+08:00;True|2023-06-21T13:30:18.8163322+08:00;True|2023-06-21T13:19:43.9290154+08:00;True|2023-06-21T11:35:28.3376504+08:00;</History>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/IStation.Service.SqiAirp/01-entity/03-certificate/Certificate.cs b/IStation.Service.SqiAirp/01-entity/03-certificate/Certificate.cs
index e2d2d72..712d34e 100644
--- a/IStation.Service.SqiAirp/01-entity/03-certificate/Certificate.cs
+++ b/IStation.Service.SqiAirp/01-entity/03-certificate/Certificate.cs
@@ -16,28 +16,39 @@
/// </summary>
public Certificate(Certificate rhs) : base(rhs)
{
- this.ManufacturerName = rhs.ManufacturerName;
- this.UseName = rhs.UseName;
- this.CertificateNO = rhs.CertificateNO;
this.AirpSiteName = rhs.AirpSiteName;
- this.MainEquipmentModels = rhs.MainEquipmentModels;
+ this.BuilderName = rhs.BuilderName;
+ this.DesignerName = rhs.DesignerName;
+ this.UserName = rhs.UserName;
+ this.CertificateNO = rhs.CertificateNO;
this.EtaLevel = rhs.EtaLevel;
- this.TestingUnitName = rhs.TestingUnitName;
- this.IssuingUnitName = rhs.IssuingUnitName;
- this.IssuanceDay = rhs.IssuanceDay;
+ this.IssuanceTime = rhs.IssuanceTime;
+ this.MainEquipmentModels = rhs.MainEquipmentModels;
+ this.TestingName = rhs.TestingName;
+ this.IssuingName = rhs.IssuingName;
this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
}
/// <summary>
- /// 鐢熶骇浼佷笟鍚嶇О=銆嬬┖鍘嬬珯寤鸿鍗曚綅
+ /// 绌哄帇绔欏悕绉�
/// </summary>
- public string ManufacturerName { get; set; }
+ public string AirpSiteName { get; set; }
/// <summary>
- /// 鐢ㄦ埛鍚嶇О=銆嬬┖鍘嬬珯鎵�灞炲崟浣�
+ /// 绌哄帇绔欏缓璁惧崟浣�
/// </summary>
- public string UseName { get; set; }
+ public string BuilderName { get; set; }
+
+ /// <summary>
+ /// 绌哄帇绔欒璁″崟浣�
+ /// </summary>
+ public string DesignerName { get; set; }
+
+ /// <summary>
+ /// 绌哄帇绔欐墍灞炲崟浣�
+ /// </summary>
+ public string UserName { get; set; }
/// <summary>
/// 璇佷功缂栧彿
@@ -45,9 +56,14 @@
public string CertificateNO { get; set; }
/// <summary>
- /// 鍘嬬缉绌烘皵绔欏悕绉�
+ /// 鑳芥晥绛夌骇
/// </summary>
- public string AirpSiteName { get; set; }
+ public string EtaLevel { get; set; }
+
+ /// <summary>
+ /// 璁ゅ畾鏃堕棿
+ /// </summary>
+ public DateTime IssuanceTime { get; set; }
/// <summary>
/// 涓昏璁惧鍨嬪彿
@@ -55,24 +71,14 @@
public string MainEquipmentModels { get; set; }
/// <summary>
- /// 鑳芥晥绛夌骇
+ /// 妫�娴嬪崟浣�
/// </summary>
- public string EtaLevel { get; set; }
+ public string TestingName { get; set; }
/// <summary>
- /// 妫�娴嬪崟浣嶅悕绉�
+ /// 鍙戣瘉鍗曚綅
/// </summary>
- public string TestingUnitName { get; set; }
-
- /// <summary>
- /// 鍙戣瘉鍗曚綅鍚嶇О
- /// </summary>
- public string IssuingUnitName { get; set; }
-
- /// <summary>
- /// 鍙戣瘉鏃ユ湡=銆嬭瀹氭椂闂�
- /// </summary>
- public DateTime IssuanceDay { get; set; }
+ public string IssuingName { get; set; }
/// <summary>
/// 鎺掑簭鐮�
diff --git a/IStation.Service.SqiAirp/02-model/03-certificate/Certificate.cs b/IStation.Service.SqiAirp/02-model/03-certificate/Certificate.cs
index 673057e..0300155 100644
--- a/IStation.Service.SqiAirp/02-model/03-certificate/Certificate.cs
+++ b/IStation.Service.SqiAirp/02-model/03-certificate/Certificate.cs
@@ -15,15 +15,16 @@
/// </summary>
public Certificate(Certificate rhs) : base(rhs)
{
- this.ManufacturerName = rhs.ManufacturerName;
- this.UseName = rhs.UseName;
- this.CertificateNO = rhs.CertificateNO;
this.AirpSiteName = rhs.AirpSiteName;
- this.MainEquipmentModels = rhs.MainEquipmentModels;
+ this.BuilderName = rhs.BuilderName;
+ this.DesignerName = rhs.DesignerName;
+ this.UserName = rhs.UserName;
+ this.CertificateNO = rhs.CertificateNO;
this.EtaLevel = rhs.EtaLevel;
- this.TestingUnitName = rhs.TestingUnitName;
- this.IssuingUnitName = rhs.IssuingUnitName;
- this.IssuanceDay = rhs.IssuanceDay;
+ this.IssuanceTime = rhs.IssuanceTime;
+ this.MainEquipmentModels = rhs.MainEquipmentModels;
+ this.TestingName = rhs.TestingName;
+ this.IssuingName = rhs.IssuingName;
this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
}
@@ -34,28 +35,39 @@
public void Reset(Certificate rhs)
{
this.ID = rhs.ID;
- this.ManufacturerName = rhs.ManufacturerName;
- this.UseName = rhs.UseName;
- this.CertificateNO = rhs.CertificateNO;
this.AirpSiteName = rhs.AirpSiteName;
- this.MainEquipmentModels = rhs.MainEquipmentModels;
+ this.BuilderName = rhs.BuilderName;
+ this.DesignerName = rhs.DesignerName;
+ this.UserName = rhs.UserName;
+ this.CertificateNO = rhs.CertificateNO;
this.EtaLevel = rhs.EtaLevel;
- this.TestingUnitName = rhs.TestingUnitName;
- this.IssuingUnitName = rhs.IssuingUnitName;
- this.IssuanceDay = rhs.IssuanceDay;
+ this.IssuanceTime = rhs.IssuanceTime;
+ this.MainEquipmentModels = rhs.MainEquipmentModels;
+ this.TestingName = rhs.TestingName;
+ this.IssuingName = rhs.IssuingName;
this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
}
/// <summary>
- /// 鐢熶骇浼佷笟鍚嶇О=銆嬬┖鍘嬬珯寤鸿鍗曚綅
+ /// 绌哄帇绔欏悕绉�
/// </summary>
- public string ManufacturerName { get; set; }
+ public string AirpSiteName { get; set; }
/// <summary>
- /// 鐢ㄦ埛鍚嶇О=銆嬬┖鍘嬬珯鎵�灞炲崟浣�
+ /// 绌哄帇绔欏缓璁惧崟浣�
/// </summary>
- public string UseName { get; set; }
+ public string BuilderName { get; set; }
+
+ /// <summary>
+ /// 绌哄帇绔欒璁″崟浣�
+ /// </summary>
+ public string DesignerName { get; set; }
+
+ /// <summary>
+ /// 绌哄帇绔欐墍灞炲崟浣�
+ /// </summary>
+ public string UserName { get; set; }
/// <summary>
/// 璇佷功缂栧彿
@@ -63,9 +75,14 @@
public string CertificateNO { get; set; }
/// <summary>
- /// 鍘嬬缉绌烘皵绔欏悕绉�
+ /// 鑳芥晥绛夌骇
/// </summary>
- public string AirpSiteName { get; set; }
+ public string EtaLevel { get; set; }
+
+ /// <summary>
+ /// 璁ゅ畾鏃堕棿
+ /// </summary>
+ public DateTime IssuanceTime { get; set; }
/// <summary>
/// 涓昏璁惧鍨嬪彿
@@ -73,24 +90,14 @@
public string MainEquipmentModels { get; set; }
/// <summary>
- /// 鑳芥晥绛夌骇
+ /// 妫�娴嬪崟浣�
/// </summary>
- public string EtaLevel { get; set; }
+ public string TestingName { get; set; }
/// <summary>
- /// 妫�娴嬪崟浣嶅悕绉�
+ /// 鍙戣瘉鍗曚綅
/// </summary>
- public string TestingUnitName { get; set; }
-
- /// <summary>
- /// 鍙戣瘉鍗曚綅鍚嶇О
- /// </summary>
- public string IssuingUnitName { get; set; }
-
- /// <summary>
- /// 鍙戣瘉鏃ユ湡=銆嬭瀹氭椂闂�
- /// </summary>
- public DateTime IssuanceDay { get; set; }
+ public string IssuingName { get; set; }
/// <summary>
/// 鎺掑簭鐮�
--
Gitblit v1.9.3