diff --git a/Controllers/DeviceController.cs b/Controllers/DeviceController.cs index b8bfae2..a14ebfd 100644 --- a/Controllers/DeviceController.cs +++ b/Controllers/DeviceController.cs @@ -25,7 +25,7 @@ namespace LY.App.Controllers [HttpPost("add")] public async Task Add(AddDevice input) { - var result =await _deviceService.Add(input); + var result = await _deviceService.Add(input); return Ok(result); } /// @@ -36,7 +36,7 @@ namespace LY.App.Controllers /// /// [HttpGet("list")] - public async Task List(int pageNum, int pageSize, string key) + public async Task List(int pageNum = 1, int pageSize = 10, string key = null) { var result = await _deviceService.List(pageNum, pageSize, key); return Ok(result); diff --git a/Controllers/PositionController.cs b/Controllers/PositionController.cs index 220f87b..9f9a345 100644 --- a/Controllers/PositionController.cs +++ b/Controllers/PositionController.cs @@ -21,9 +21,9 @@ namespace LY.App.Controllers /// /// [HttpGet("list")] - public async Task Get(PositionQueryInput input) + public async Task Get([FromQuery] PositionQueryInput input) { - var positions = _positionService.GetList(input); + var positions =await _positionService.GetList(input); return Ok(positions); } /// diff --git a/Service/PositionService.cs b/Service/PositionService.cs index 19337c7..b669f0c 100644 --- a/Service/PositionService.cs +++ b/Service/PositionService.cs @@ -118,6 +118,10 @@ namespace LY.App.Service .WhereIF(!string.IsNullOrWhiteSpace(input.Name), a => a.Name.Contains(input.Name)) .OrderBy(a => a.Id, OrderByType.Desc); var result = await query.ToPageListAsync(input.pageNum, input.pageSize); + result.ForEach(a => + { + a.SetRegionJson(); + }); return new ApiResult() { data = new @@ -144,6 +148,7 @@ namespace LY.App.Service List result = query.Adapt>(); foreach (var item in result) { + item.SetRegionJson(); item.Devices = deviceList.Where(s => s.PositionId == item.Id).ToList()?.Adapt>() ?? new List(); } return result;