阵地json

Controllers/DeviceController.cs

@@ -25,7 +25,7 @@ namespace LY.App.Controllers
         [HttpPost("add")]
         public async Task<IActionResult> Add(AddDevice input)
         {
-            var result =await _deviceService.Add(input);
+            var result = await _deviceService.Add(input);
             return Ok(result);
         }
         /// <summary>
@@ -36,7 +36,7 @@ namespace LY.App.Controllers
         /// <param name="key"></param>
         /// <returns></returns>
         [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);
             return Ok(result);

Controllers/PositionController.cs

@@ -21,9 +21,9 @@ namespace LY.App.Controllers
         /// <param name="input"></param>
         /// <returns></returns>
         [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);
         }
         /// <summary>

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<PositionDeviceDto> result = query.Adapt<List<PositionDeviceDto>>();
             foreach (var item in result)
             {
+                item.SetRegionJson();
                 item.Devices = deviceList.Where(s => s.PositionId == item.Id).ToList()?.Adapt<List<DeviceItem>>() ?? new List<DeviceItem>();
             }
             return result;