From ec4b8e389c5e211e203a50e3c798b86b0ab55286 Mon Sep 17 00:00:00 2001 From: yanghongwei Date: Sat, 13 Jul 2024 01:16:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=96=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- langguanApi.xml | 130 +++++++++++++++++++- langguanApi/Controllers/LedgerController.cs | 2 +- langguanApi/Model/Entity/Ledger.cs | 99 +++++++++++++++ langguanApi/Service/LedgerService.cs | 13 +- 4 files changed, 240 insertions(+), 4 deletions(-) diff --git a/langguanApi.xml b/langguanApi.xml index e9c28e8..15bc4bf 100644 --- a/langguanApi.xml +++ b/langguanApi.xml @@ -237,6 +237,12 @@ + + + 构造函数 + + + 获取指定设备的历史数据 @@ -261,7 +267,7 @@ - + Add a new ledger @@ -1060,6 +1066,11 @@ 出场日期 + + + 进场方向 + + 车型 @@ -1075,6 +1086,121 @@ 国几排放量 + + + 车牌颜色 + + + + + 车牌类型 + + + + + base64图片 出入场图片 url + + + + + vin + + + + + 发动机号 + + + + + 注册日期 + + + + + base64图片 驾驶证图片 url + + + + + 驾驶人姓名 + + + + + 有效期限 + + + + + 三方系统入参 + + + + + 车牌号 + + + + + 进场方向 + + + + + 出入场时间 + + + + + 排放等级 + + + + + 车牌颜色 + + + + + 车牌类型 + + + + + base64图片 出入场图片 url + + + + + vin + + + + + 发动机号 + + + + + 注册日期 + + + + + base64图片 驾驶证图片 url + + + + + 驾驶人姓名 + + + + + 有效期限 + + 进场日期 @@ -2163,7 +2289,7 @@ - + 新增数据 diff --git a/langguanApi/Controllers/LedgerController.cs b/langguanApi/Controllers/LedgerController.cs index a0a4c20..cc441f3 100644 --- a/langguanApi/Controllers/LedgerController.cs +++ b/langguanApi/Controllers/LedgerController.cs @@ -35,7 +35,7 @@ namespace langguanApi.Controllers /// /// [HttpPost("add")] - public async Task add(LedgerDTO input) + public async Task add(AddLedgerDto input) { await _ledgerService.AddLedger(input); return Ok(new ApiResult { code = 0 }); diff --git a/langguanApi/Model/Entity/Ledger.cs b/langguanApi/Model/Entity/Ledger.cs index 9004e2e..2d6373a 100644 --- a/langguanApi/Model/Entity/Ledger.cs +++ b/langguanApi/Model/Entity/Ledger.cs @@ -15,6 +15,10 @@ /// public DateTime OutTime { get; set; } /// + /// 进场方向 + /// + public int EntryDirection { get; set; } + /// /// 车型 /// public string CarModel { get; set; } @@ -26,6 +30,101 @@ /// 国几排放量 /// public string Emissions { get; set; } + /// + /// 车牌颜色 + /// + public int CarColor { get; set; } + /// + /// 车牌类型 + /// + public string CarType { get; set; } + /// + /// base64图片 出入场图片 url + /// + public string EntryExitPictureUrl { get; set; } + /// + /// vin + /// + public string VIN { get; set; } + /// + /// 发动机号 + /// + public string EngineNumber { get; set; } + /// + /// 注册日期 + /// + public string RegistrationDate { get; set; } + /// + /// base64图片 驾驶证图片 url + /// + public string DriverLicenseUrl { get; set; } + /// + /// 驾驶人姓名 + /// + public string DriverName { get; set; } + /// + /// 有效期限 + /// + public string ValidityPeriod { get; set; } + } + + /// + /// 三方系统入参 + /// + public class AddLedgerDto + { + /// + /// 车牌号 + /// + public string CarNumber { get; set; } + /// + /// 进场方向 + /// + public int EntryDirection{ get; set; } + /// + /// 出入场时间 + /// + public DateTime Time { get; set; } + /// + /// 排放等级 + /// + public string EmissionLevel { get; set; } + /// + /// 车牌颜色 + /// + public int CarColor { get; set; } + /// + /// 车牌类型 + /// + public string CarType { get; set; } + /// + /// base64图片 出入场图片 url + /// + public string EntryExitPictureUrl { get; set; } + /// + /// vin + /// + public string VIN { get; set; } + /// + /// 发动机号 + /// + public string EngineNumber { get; set; } + /// + /// 注册日期 + /// + public string RegistrationDate { get; set; } + /// + /// base64图片 驾驶证图片 url + /// + public string DriverLicenseUrl { get; set; } + /// + /// 驾驶人姓名 + /// + public string DriverName { get; set; } + /// + /// 有效期限 + /// + public string ValidityPeriod { get; set; } } public class LedgerDTO { diff --git a/langguanApi/Service/LedgerService.cs b/langguanApi/Service/LedgerService.cs index 1f18d0c..fe0b4be 100644 --- a/langguanApi/Service/LedgerService.cs +++ b/langguanApi/Service/LedgerService.cs @@ -6,6 +6,7 @@ using MathNet.Numerics.Distributions; using Npoi.Mapper; using Org.BouncyCastle.Asn1.IsisMtt.X509; using System.Linq.Expressions; +using System.Security.Cryptography.X509Certificates; namespace langguanApi.Service { @@ -23,9 +24,19 @@ namespace langguanApi.Service /// /// /// - public async Task AddLedger(LedgerDTO input) + public async Task AddLedger(AddLedgerDto input) { var enity = input.Adapt(); + enity.CarNum = input.CarNumber; + if (input.EntryDirection == 1) + { + enity.InTime = input.Time; + } + else + { + enity.OutTime = input.Time; + } + enity.Emissions = input.EmissionLevel; await base.CreateAsync(enity); } public async Task HeaderCount()