yanghongwei
/
lg_backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

细节修改

This commit is contained in:
yanghongwei 2024-06-29 18:04:44 +08:00
parent c7b4801d89
commit edeeaeff1c
6 changed files with 72 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
langguanApi.xml
View File

@ -261,7 +261,20 @@
</summary>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.LedgerController.Export(System.DateTime,System.DateTime)">
<member name="M:langguanApi.Controllers.LedgerController.add(langguanApi.Model.Entity.LedgerDTO)">
<summary>
Add a new ledger
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.LedgerController.HeaderCount">
<summary>
头部统计
</summary>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.LedgerController.Export(System.Nullable{System.DateTime},System.Nullable{System.DateTime})">
<summary>
Export all ledgers
</summary>
@ -411,6 +424,13 @@
</summary>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.TransportController.Add(langguanApi.Model.Transport)">
<summary>
新增清洁运输
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.UserController.Login(langguanApi.Model.Dto.UserLogin)">
<summary>
登陆
@ -2145,7 +2165,7 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.LedgerService.Export(System.DateTime,System.DateTime)">
<member name="M:langguanApi.Service.LedgerService.Export(System.Nullable{System.DateTime},System.Nullable{System.DateTime})">
<summary>
导出数据
</summary>

26
langguanApi/Controllers/LedgerController.cs
View File

@ -1,4 +1,5 @@
using langguanApi.Model;
using langguanApi.Model.Entity;
using langguanApi.Service;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
@ -23,19 +24,40 @@ namespace langguanApi.Controllers
/// </summary>
/// <returns></returns>
[HttpGet("list")]
public async Task<IActionResult> list([FromQuery]reqpage input)
public async Task<IActionResult> list([FromQuery] reqpage input)
{
var result = await _ledgerService.GetPage(input);
return Ok(result);
}
/// <summary>
/// Add a new ledger
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost("add")]
public async Task<IActionResult> add(LedgerDTO input)
{
await _ledgerService.AddLedger(input);
return Ok(new ApiResult { code = 0 });
}
/// <summary>
/// 头部统计
/// </summary>
/// <returns></returns>
[HttpGet("HeaderCount")]
public async Task<IActionResult> HeaderCount()
{
var result = await _ledgerService.HeaderCount();
return Ok(new ApiResult { code = 0, data = result });
}
/// <summary>
/// Export all ledgers
/// </summary>
/// <param name="start"></param>
/// <param name="end"></param>
/// <returns></returns>
[HttpGet("export")]
public async Task<IActionResult> Export(DateTime start, DateTime end)
public async Task<IActionResult> Export(DateTime? start, DateTime? end)
{
var result = await _ledgerService.Export(start, end);
return File(result, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "台账.xlsx");

11
langguanApi/Controllers/TransportController.cs
View File

@ -38,5 +38,16 @@ namespace langguanApi.Controllers
var result = await _transportService.GetCount();
return Ok(result);
}
/// <summary>
/// 新增清洁运输
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPatch("add")]
public async Task<IActionResult> Add(Transport input)
{
await _transportService.addTransport(input);
return Ok(new ApiResult() { code = 0 });
}
}
}

4
langguanApi/Model/Transport.cs
View File

@ -30,5 +30,9 @@
/// 注册日期
/// </summary>
public DateTime Registered { get; set; }
/// <summary>
/// 货物类型
/// </summary>
public string Goods { get; set; }
}
}

1
langguanApi/Service/HomeService.cs
View File

@ -80,7 +80,6 @@ namespace langguanApi.Service
yesterday = 0.8,
lastWeek = 0.6
};
var d1 = await _hj212Service.GetTodayData();
Func<Task<object>> getTodayFunc = async () => await _hj212Service.GetTodayData();
var today = await _cacheManager.GetConvertVale(RedisKeylist.Today, getTodayFunc, 60 * 30);
return new ApiResult

16
langguanApi/Service/LedgerService.cs
View File

@ -28,28 +28,34 @@ namespace langguanApi.Service
var enity = input.Adapt<Ledger>();
await base.CreateAsync(enity);
}
public async Task<object> HeaderCount()
{
return new { t1 = 100, t2 = 200, t3 = 300, t4 = 400 };
}
/// <summary>
/// 导出数据
/// </summary>
/// <param name="start"></param>
/// <param name="end"></param>
/// <returns></returns>
public async Task<byte[]> Export(DateTime start, DateTime end)
public async Task<byte[]> Export(DateTime? start, DateTime? end)
{
start = start.HasValue ? start.Value : DateTime.Now.AddDays(-7);
end = end.HasValue ? end : DateTime.Now.AddDays(1);
Expression<Func<Ledger, bool>> exp = filter =>
filter.CreateDateTime >= start && filter.CreateDateTime <= end && filter.IsDelete == false;
var list = await base.GetListWithExp(exp);
filter.CreateDateTime >= start.Value && filter.CreateDateTime <= end.Value && filter.IsDelete == false;
var list = (await base.GetListWithExp(exp)).ToList();
var mapper = new Mapper();
mapper.Map<Ledger>("进场时间", s => s.InTime)
.Map<Ledger>("车牌号", s => s.CarNum)
.Map<Ledger>("车型", s => s.CarModel)
.Map<Ledger>("新能源", s => s.NewCar ? "是" : "否")
.Map<Ledger>("是否新能源", s => s.NewCar)
.Map<Ledger>("燃油车", s => s.Emissions)
.Map<Ledger>("出厂日间 ", s => s.OutTime)
.Format<Ledger>("yyyy-MM-dd HH:mm:ss", s => s.InTime)
.Format<Ledger>("yyyy-MM-dd HH:mm:ss", s => s.OutTime);
MemoryStream stream = new MemoryStream();
mapper.Save(stream, list.ToList(), sheetName: "sheet1", leaveOpen: true);
mapper.Save(stream, list, sheetName: "sheet1", leaveOpen: true);
return stream.ToArray();
}