From 2d9b4836f44f8398cd79cba813c35ad1d974c012 Mon Sep 17 00:00:00 2001 From: lxw Date: Fri, 17 May 2024 10:27:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E8=A6=81=E6=8E=A5=E5=8F=A3=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Entity/Api/Req/ModifyChargeOrderReq.cs | 210 ++++++++++++++++++ Entity/Api/Req/QueryChargeOrderReq.cs | 139 ++++++++++++ Entity/Api/Resp/ChargeOrderResp.cs | 208 +++++++++++++++++ .../Controllers/ChargeOrderController.cs | 48 ++-- 4 files changed, 581 insertions(+), 24 deletions(-) create mode 100644 Entity/Api/Req/ModifyChargeOrderReq.cs create mode 100644 Entity/Api/Req/QueryChargeOrderReq.cs create mode 100644 Entity/Api/Resp/ChargeOrderResp.cs diff --git a/Entity/Api/Req/ModifyChargeOrderReq.cs b/Entity/Api/Req/ModifyChargeOrderReq.cs new file mode 100644 index 0000000..404d329 --- /dev/null +++ b/Entity/Api/Req/ModifyChargeOrderReq.cs @@ -0,0 +1,210 @@ +using System.ComponentModel.DataAnnotations; +using SqlSugar; + +namespace Entity.Api.Req +{ + /// + ///修改充电订单 + /// + public class ModifyChargeOrderReq + { + + /// + /// Desc:id + /// Default: + /// Nullable:False + /// + [Required] + public int Id {get;set;} + + /// + /// Desc:订单编号 + /// Default: + /// Nullable:True + /// + public string Sn {get;set;} + + /// + /// Desc:电池编号 + /// Default: + /// Nullable:True + /// + public string BatteryNo {get;set;} + + /// + /// Desc:启动报文状态;0-初始化;1-启动成功 + /// Default:0 + /// Nullable:True + /// + public int? CmdStatus {get;set;} + + /// + /// Desc:充电机编号 + /// Default: + /// Nullable:True + /// + public string ChargerNo {get;set;} + + /// + /// Desc:充电枪编号 + /// Default: + /// Nullable:True + /// + public string ChargerGunNo {get;set;} + + /// + /// Desc:充电开始时间 + /// Default: + /// Nullable:True + /// + public DateTime? StartTime {get;set;} + + /// + /// Desc:充电结束时间 + /// Default: + /// Nullable:True + /// + public DateTime? EndTime {get;set;} + + /// + /// Desc:充电开始soc + /// Default: + /// Nullable:True + /// + public int? StartSoc {get;set;} + + /// + /// Desc:充电结束soc + /// Default: + /// Nullable:True + /// + public int? StopSoc {get;set;} + + /// + /// Desc:充电时长 + /// Default: + /// Nullable:True + /// + public string ChargeTimeCount {get;set;} + + /// + /// Desc:充电电量 + /// Default: + /// Nullable:True + /// + public decimal? ElecCount {get;set;} + + /// + /// Desc:充电开始交流表电量 + /// Default: + /// Nullable:True + /// + public decimal? StartAcElec {get;set;} + + /// + /// Desc:充电结束交流表电量 + /// Default: + /// Nullable:True + /// + public decimal? StopAcElec {get;set;} + + /// + /// Desc:充电开始直流表电量 + /// Default: + /// Nullable:True + /// + public decimal? StartDcElec {get;set;} + + /// + /// Desc:充电结束直流表电量 + /// Default: + /// Nullable:True + /// + public decimal? StopDcElec {get;set;} + + /// + /// Desc:停止原因;0:满电自动停止;1-人工停止 + /// Default:0 + /// Nullable:True + /// + public int? StopReason {get;set;} + + /// + /// Desc:尖时段电量 + /// Default: + /// Nullable:True + /// + public decimal? SharpElecCount {get;set;} + + /// + /// Desc:峰时段电量 + /// Default: + /// Nullable:True + /// + public decimal? PeakElecCount {get;set;} + + /// + /// Desc:平时段电量 + /// Default: + /// Nullable:True + /// + public decimal? FlatElecCount {get;set;} + + /// + /// Desc:谷时段电量 + /// Default: + /// Nullable:True + /// + public decimal? ValleyElecCount {get;set;} + + /// + /// Desc:电价版本号 + /// Default: + /// Nullable:True + /// + public string ElecPriceModelVersion {get;set;} + + /// + /// Desc:换电订单编号 + /// Default: + /// Nullable:True + /// + public string SwapOrderSn {get;set;} + + /// + /// Desc:上传云平台状态;0-未上传;1-已上传 + /// Default:0 + /// Nullable:True + /// + public int? CloudReportStatus {get;set;} + + /// + /// Desc:创建人 + /// Default: + /// Nullable:True + /// + public string CreatedBy {get;set;} + + /// + /// Desc:创建时间 + /// Default:CURRENT_TIMESTAMP + /// Nullable:True + /// + public DateTime? CreatedTime {get;set;} + + /// + /// Desc:更新人 + /// Default: + /// Nullable:True + /// + public string UpdatedBy {get;set;} + + /// + /// Desc:更新时间 + /// Default:CURRENT_TIMESTAMP + /// Nullable:True + /// + public DateTime? UpdatedTime {get;set;} + + } +} diff --git a/Entity/Api/Req/QueryChargeOrderReq.cs b/Entity/Api/Req/QueryChargeOrderReq.cs new file mode 100644 index 0000000..2811f15 --- /dev/null +++ b/Entity/Api/Req/QueryChargeOrderReq.cs @@ -0,0 +1,139 @@ +using System.ComponentModel.DataAnnotations; +using SqlSugar; + +namespace Entity.Api.Req +{ + /// + ///查询充电订单 + /// + public class QueryChargeOrderReq + { + + + + /// + /// Desc:订单编号 + /// Default: + /// Nullable:True + /// + public string Sn {get;set;} + + /// + /// Desc:电池编号 + /// Default: + /// Nullable:True + /// + public string BatteryNo {get;set;} + + + + /// + /// Desc:充电机编号 + /// Default: + /// Nullable:True + /// + public string ChargerNo {get;set;} + + /// + /// Desc:充电枪编号 + /// Default: + /// Nullable:True + /// + public string ChargerGunNo {get;set;} + + /// + /// Desc:充电开始时间 + /// Default: + /// Nullable:True + /// + public DateTime? StartTime {get;set;} + + /// + /// Desc:充电结束时间 + /// Default: + /// Nullable:True + /// + public DateTime? EndTime {get;set;} + + /// + /// Desc:充电开始soc + /// Default: + /// Nullable:True + /// + public int? StartSoc {get;set;} + + /// + /// Desc:充电结束soc + /// Default: + /// Nullable:True + /// + public int? StopSoc {get;set;} + + /// + /// Desc:充电时长 + /// Default: + /// Nullable:True + /// + public string ChargeTimeCount {get;set;} + + /// + /// Desc:充电电量 + /// Default: + /// Nullable:True + /// + public decimal? ElecCount {get;set;} + + /// + /// Desc:充电开始交流表电量 + /// Default: + /// Nullable:True + /// + public decimal? StartAcElec {get;set;} + + /// + /// Desc:充电结束交流表电量 + /// Default: + /// Nullable:True + /// + public decimal? StopAcElec {get;set;} + + /// + /// Desc:充电开始直流表电量 + /// Default: + /// Nullable:True + /// + public decimal? StartDcElec {get;set;} + + /// + /// Desc:充电结束直流表电量 + /// Default: + /// Nullable:True + /// + public decimal? StopDcElec {get;set;} + + + + /// + /// Desc:电价版本号 + /// Default: + /// Nullable:True + /// + public string ElecPriceModelVersion {get;set;} + + /// + /// Desc:换电订单编号 + /// Default: + /// Nullable:True + /// + public string SwapOrderSn {get;set;} + + /// + /// Desc:上传云平台状态;0-未上传;1-已上传 + /// Default:0 + /// Nullable:True + /// + public int? CloudReportStatus {get;set;} + + + } +} diff --git a/Entity/Api/Resp/ChargeOrderResp.cs b/Entity/Api/Resp/ChargeOrderResp.cs new file mode 100644 index 0000000..981a0dc --- /dev/null +++ b/Entity/Api/Resp/ChargeOrderResp.cs @@ -0,0 +1,208 @@ +using SqlSugar; + +namespace Entity.Api.Resp +{ + /// + ///充电订单; + /// + public partial class ChargeOrderResp + { + + /// + /// Desc:id + /// Default: + /// Nullable:False + /// + public int Id {get;set;} + + /// + /// Desc:订单编号 + /// Default: + /// Nullable:True + /// + public string Sn {get;set;} + + /// + /// Desc:电池编号 + /// Default: + /// Nullable:True + /// + public string BatteryNo {get;set;} + + /// + /// Desc:启动报文状态;0-初始化;1-启动成功 + /// Default:0 + /// Nullable:True + /// + public int? CmdStatus {get;set;} + + /// + /// Desc:充电机编号 + /// Default: + /// Nullable:True + /// + public string ChargerNo {get;set;} + + /// + /// Desc:充电枪编号 + /// Default: + /// Nullable:True + /// + public string ChargerGunNo {get;set;} + + /// + /// Desc:充电开始时间 + /// Default: + /// Nullable:True + /// + public DateTime? StartTime {get;set;} + + /// + /// Desc:充电结束时间 + /// Default: + /// Nullable:True + /// + public DateTime? EndTime {get;set;} + + /// + /// Desc:充电开始soc + /// Default: + /// Nullable:True + /// + public int? StartSoc {get;set;} + + /// + /// Desc:充电结束soc + /// Default: + /// Nullable:True + /// + public int? StopSoc {get;set;} + + /// + /// Desc:充电时长 + /// Default: + /// Nullable:True + /// + public string ChargeTimeCount {get;set;} + + /// + /// Desc:充电电量 + /// Default: + /// Nullable:True + /// + public decimal? ElecCount {get;set;} + + /// + /// Desc:充电开始交流表电量 + /// Default: + /// Nullable:True + /// + public decimal? StartAcElec {get;set;} + + /// + /// Desc:充电结束交流表电量 + /// Default: + /// Nullable:True + /// + public decimal? StopAcElec {get;set;} + + /// + /// Desc:充电开始直流表电量 + /// Default: + /// Nullable:True + /// + public decimal? StartDcElec {get;set;} + + /// + /// Desc:充电结束直流表电量 + /// Default: + /// Nullable:True + /// + public decimal? StopDcElec {get;set;} + + /// + /// Desc:停止原因;0:满电自动停止;1-人工停止 + /// Default:0 + /// Nullable:True + /// + public int? StopReason {get;set;} + + /// + /// Desc:尖时段电量 + /// Default: + /// Nullable:True + /// + public decimal? SharpElecCount {get;set;} + + /// + /// Desc:峰时段电量 + /// Default: + /// Nullable:True + /// + public decimal? PeakElecCount {get;set;} + + /// + /// Desc:平时段电量 + /// Default: + /// Nullable:True + /// + public decimal? FlatElecCount {get;set;} + + /// + /// Desc:谷时段电量 + /// Default: + /// Nullable:True + /// + public decimal? ValleyElecCount {get;set;} + + /// + /// Desc:电价版本号 + /// Default: + /// Nullable:True + /// + public string ElecPriceModelVersion {get;set;} + + /// + /// Desc:换电订单编号 + /// Default: + /// Nullable:True + /// + public string SwapOrderSn {get;set;} + + /// + /// Desc:上传云平台状态;0-未上传;1-已上传 + /// Default:0 + /// Nullable:True + /// + public int? CloudReportStatus {get;set;} + + /// + /// Desc:创建人 + /// Default: + /// Nullable:True + /// + public string CreatedBy {get;set;} + + /// + /// Desc:创建时间 + /// Default:CURRENT_TIMESTAMP + /// Nullable:True + /// + public DateTime? CreatedTime {get;set;} + + /// + /// Desc:更新人 + /// Default: + /// Nullable:True + /// + public string UpdatedBy {get;set;} + + /// + /// Desc:更新时间 + /// Default:CURRENT_TIMESTAMP + /// Nullable:True + /// + public DateTime? UpdatedTime {get;set;} + + } +} diff --git a/WebStarter/Controllers/ChargeOrderController.cs b/WebStarter/Controllers/ChargeOrderController.cs index 4f9baea..89b7485 100644 --- a/WebStarter/Controllers/ChargeOrderController.cs +++ b/WebStarter/Controllers/ChargeOrderController.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc; namespace WebStarter.Controllers; /** - * 换电订单 + * 充电订单 */ [ApiController] [Route("api/[controller]")] @@ -18,57 +18,57 @@ public class ChargeOrderController : ControllerBase /// /// [HttpPost("QueryPage")] - public async Task>> QueryPage([FromBody] QuerySwapOrderPageReq req) + public async Task>> QueryPage([FromBody] QueryChargeOrderReq req) { - return Result>.Success(null); + return Result>.Success(null); } - + /// - /// 修改换电订单 + /// 导出 /// - /// /// - [HttpGet("Modify")] - public async Task> Modify([FromBody] ModifySwapOrderReq req) + [HttpPost("Export")] + public async void Export([FromBody] QueryChargeOrderReq req,HttpRequest httpRequest) { - - return Result.Success(null); + } /// - /// 删除 + /// 获取列表 /// - /// ids 订单列表 /// - [HttpGet("DeleteByIds")] - public async Task> DeleteByIds(List ids) + [HttpPost("GetList")] + public async Task>> GetList([FromBody] QueryChargeOrderReq req) { - return Result.Success(null); + return Result>.Success(null); } - + /// - /// 换电订单上报云端 + /// 修改充电订单 /// + /// /// - [HttpGet("UploadCloud/{id}")] - public async Task> UploadCloud(long id) + [HttpGet("Modify")] + public async Task> Modify([FromBody] ModifyChargeOrderReq req) { return Result.Success(null); } - - + /// - /// 换电订单上报云端 + /// 充电订单上报云端 /// /// - [HttpPost("Add")] - public async Task> Add([FromBody] AddSwapOrderReq req) + [HttpGet("UploadCloud/{id}")] + public async Task> UploadCloud(long id) { return Result.Success(null); } + + + } \ No newline at end of file