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

阵地json

This commit is contained in:
yanghongwei 2025-03-28 23:36:56 +08:00
parent a863d3772c
commit 272b8c9142
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Controllers/DeviceController.cs
View File

@ -25,7 +25,7 @@ namespace LY.App.Controllers
[HttpPost("add")] [HttpPost("add")]
public async Task<IActionResult> Add(AddDevice input) public async Task<IActionResult> Add(AddDevice input)
{ {
var result =await _deviceService.Add(input); var result = await _deviceService.Add(input);
return Ok(result); return Ok(result);
} }
/// <summary> /// <summary>
@ -36,7 +36,7 @@ namespace LY.App.Controllers
/// <param name="key"></param> /// <param name="key"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("list")] [HttpGet("list")]
public async Task<IActionResult> List(int pageNum, int pageSize, string key) public async Task<IActionResult> List(int pageNum = 1, int pageSize = 10, string key = null)
{ {
var result = await _deviceService.List(pageNum, pageSize, key); var result = await _deviceService.List(pageNum, pageSize, key);
return Ok(result); return Ok(result);

4
Controllers/PositionController.cs
View File

@ -21,9 +21,9 @@ namespace LY.App.Controllers
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("list")] [HttpGet("list")]
public async Task<IActionResult> Get(PositionQueryInput input) public async Task<IActionResult> Get([FromQuery] PositionQueryInput input)
{ {
var positions = _positionService.GetList(input); var positions =await _positionService.GetList(input);
return Ok(positions); return Ok(positions);
} }
/// <summary> /// <summary>

5
Service/PositionService.cs
View File

@ -118,6 +118,10 @@ namespace LY.App.Service
.WhereIF(!string.IsNullOrWhiteSpace(input.Name), a => a.Name.Contains(input.Name)) .WhereIF(!string.IsNullOrWhiteSpace(input.Name), a => a.Name.Contains(input.Name))
.OrderBy(a => a.Id, OrderByType.Desc); .OrderBy(a => a.Id, OrderByType.Desc);
var result = await query.ToPageListAsync(input.pageNum, input.pageSize); var result = await query.ToPageListAsync(input.pageNum, input.pageSize);
result.ForEach(a =>
{
a.SetRegionJson();
});
return new ApiResult() return new ApiResult()
{ {
data = new data = new
@ -144,6 +148,7 @@ namespace LY.App.Service
List<PositionDeviceDto> result = query.Adapt<List<PositionDeviceDto>>(); List<PositionDeviceDto> result = query.Adapt<List<PositionDeviceDto>>();
foreach (var item in result) foreach (var item in result)
{ {
item.SetRegionJson();
item.Devices = deviceList.Where(s => s.PositionId == item.Id).ToList()?.Adapt<List<DeviceItem>>() ?? new List<DeviceItem>(); item.Devices = deviceList.Where(s => s.PositionId == item.Id).ToList()?.Adapt<List<DeviceItem>>() ?? new List<DeviceItem>();
} }
return result; return result;