diff --git a/langguanApi.xml b/langguanApi.xml index a694e41..8f8f704 100644 --- a/langguanApi.xml +++ b/langguanApi.xml @@ -1973,6 +1973,13 @@ + + + 转换设备类型 + + + + 获取设备状态 diff --git a/langguanApi/Controllers/RoleController.cs b/langguanApi/Controllers/RoleController.cs index 49fbede..2e57045 100644 --- a/langguanApi/Controllers/RoleController.cs +++ b/langguanApi/Controllers/RoleController.cs @@ -72,7 +72,7 @@ namespace langguanApi.Controllers [HttpGet("list")] public async Task List([FromQuery] reqpage input) { - var roles = await _roleService.GetPager(input); + var roles = await _roleService.GetPage(input); return Ok(roles); } /// diff --git a/langguanApi/Program.cs b/langguanApi/Program.cs index 9a14adf..cf916ff 100644 --- a/langguanApi/Program.cs +++ b/langguanApi/Program.cs @@ -3,6 +3,7 @@ using langguanApi.Extensions; using langguanApi.Extensions.AutoDI; using langguanApi.Middleware; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Options; using Microsoft.OpenApi.Models; using System.Text.Json; @@ -16,8 +17,11 @@ builder.Services.AddControllers(options => options.Filters.Add(); }).AddNewtonsoftJson(option => { + option.SerializerSettings.ContractResolver = new Newtonsoft.Json.Serialization.DefaultContractResolver(); option.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss"; + //շ + option.SerializerSettings.ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver(); }).AddJsonOptions(option => { diff --git a/langguanApi/Service/EnvGovService.cs b/langguanApi/Service/EnvGovService.cs index 997a548..5f2eec6 100644 --- a/langguanApi/Service/EnvGovService.cs +++ b/langguanApi/Service/EnvGovService.cs @@ -60,7 +60,11 @@ namespace langguanApi.Service data = deviceList }; } - + /// + /// 转换设备类型 + /// + /// + /// private string ConvertDeviceType(int deviceType) { switch (deviceType) diff --git a/langguanApi/Service/HomeService.cs b/langguanApi/Service/HomeService.cs index 2aef934..5921405 100644 --- a/langguanApi/Service/HomeService.cs +++ b/langguanApi/Service/HomeService.cs @@ -69,7 +69,7 @@ namespace langguanApi.Service var trend = await _cacheManager.GetConvertVale(RedisKeylist.Trend, getTrendFunc, 60 * new Random().Next(70)); // 获取远程接口污染物排放率 var rateResp = await _httpProxy.Get>>(null, _configuration.GetValue("Apis:RateUrl")); - var rate = rateResp.data.ToList(); + var rate = rateResp.data.ToList().Take(6); var AlermResp = await _httpProxy.Get>(null, _configuration.GetValue("Apis:AlertUrl")); // alerts += await _httpProxy.Get(null, _configuration.GetValue("Apis:AlertUrl")); // alerts += await _httpProxy.Get(null, _configuration.GetValue("Apis:RateUrl")); @@ -104,7 +104,7 @@ namespace langguanApi.Service ariQuality, rate, trend, - alerts, + alerts= AlermResp.data.List, cleanData, today, getViewTop = "",