From c7b4801d89d9869deae22bbc8ecfcbeae231a4c5 Mon Sep 17 00:00:00 2001
From: yanghongwei <hongwei7458@163.com>
Date: Wed, 26 Jun 2024 00:07:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A9=BC=E5=B3=B0=E5=A4=A7=E5=B0=8F=E5=86=99?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=EF=BC=8C=E9=A6=96=E9=A1=B5=E5=AF=B9=E5=A4=96?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 langguanApi.xml                           | 7 +++++++
 langguanApi/Controllers/RoleController.cs | 2 +-
 langguanApi/Program.cs                    | 4 ++++
 langguanApi/Service/EnvGovService.cs      | 6 +++++-
 langguanApi/Service/HomeService.cs        | 4 ++--
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/langguanApi.xml b/langguanApi.xml
index a694e41..8f8f704 100644
--- a/langguanApi.xml
+++ b/langguanApi.xml
@@ -1973,6 +1973,13 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:langguanApi.Service.EnvGovService.ConvertDeviceType(System.Int32)">
+            <summary>
+            转换设备类型
+            </summary>
+            <param name="deviceType"></param>
+            <returns></returns>
+        </member>
         <member name="M:langguanApi.Service.EnvGovService.DeviceStatu(System.String)">
             <summary>
             获取设备状态
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<IActionResult> List([FromQuery] reqpage input)
         {
-            var roles = await _roleService.GetPager(input);
+            var roles = await _roleService.GetPage(input);
             return Ok(roles);
         }
         /// <summary>
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<CustomerExceptionFilter>();
 }).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
             };
         }
-
+        /// <summary>
+        /// 转换设备类型
+        /// </summary>
+        /// <param name="deviceType"></param>
+        /// <returns></returns>
         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<RespModel<List<Rate>>>(null, _configuration.GetValue<string>("Apis:RateUrl"));
-            var rate = rateResp.data.ToList();
+            var rate = rateResp.data.ToList().Take(6);
             var AlermResp = await _httpProxy.Get<RespModel<alarmList>>(null, _configuration.GetValue<string>("Apis:AlertUrl"));
             //  alerts += await _httpProxy.Get<string>(null, _configuration.GetValue<string>("Apis:AlertUrl"));
             //    alerts += await _httpProxy.Get<string>(null, _configuration.GetValue<string>("Apis:RateUrl"));
@@ -104,7 +104,7 @@ namespace langguanApi.Service
                     ariQuality,
                     rate,
                     trend,
-                    alerts,
+                    alerts= AlermResp.data.List,
                     cleanData,
                     today,
                     getViewTop = "",