diff --git a/langguanApi.xml b/langguanApi.xml
index e227f9c..a539827 100644
--- a/langguanApi.xml
+++ b/langguanApi.xml
@@ -29,6 +29,11 @@
缓存天气信息
+
+
+ 缓存ARI数据
+
+
缓存清洁数据
@@ -2228,6 +2233,67 @@
+
+
+ 爬空气质量数据
+
+
+
+
+
+ 空气质量key
+
+
+
+
+ 空气质量指数数值
+
+
+
+
+ 空气质量指数级别
+
+
+
+
+ 空气质量指数标准
+
+
+
+
+ 空气质量数据
+
+
+
+
+ 一氧化碳
+
+
+
+
+ 二氧化氮
+
+
+
+
+ 臭氧
+
+
+
+
+ PM10
+
+
+
+
+ PM25
+
+
+
+
+ 二氧化硫
+
+
54511
diff --git a/langguanApi/Common/Redis/RedisKeylist.cs b/langguanApi/Common/Redis/RedisKeylist.cs
index e1364a6..a3a3b77 100644
--- a/langguanApi/Common/Redis/RedisKeylist.cs
+++ b/langguanApi/Common/Redis/RedisKeylist.cs
@@ -8,6 +8,10 @@
///
public static string Weather = "weather";
///
+ /// 缓存ARI数据
+ ///
+ public static string AriQuality = "arqulaty";
+ ///
/// 缓存清洁数据
///
public static string CleanData = "cleandata";
diff --git a/langguanApi/Service/Hj212Service.cs b/langguanApi/Service/Hj212Service.cs
index 80cb919..8d00e74 100644
--- a/langguanApi/Service/Hj212Service.cs
+++ b/langguanApi/Service/Hj212Service.cs
@@ -40,7 +40,7 @@ namespace langguanApi.Service
///
///
///
- public async Task> GetViewTop(int hours = -10)
+ public async Task> GetViewTop(int hours = -5)
{
var date = DateTime.Now.AddHours(-8).AddHours(hours);
Expression> exp = filter => filter.CreateDateTime >= date;
diff --git a/langguanApi/Service/HomeService.cs b/langguanApi/Service/HomeService.cs
index f95816a..f9550a8 100644
--- a/langguanApi/Service/HomeService.cs
+++ b/langguanApi/Service/HomeService.cs
@@ -41,7 +41,6 @@ namespace langguanApi.Service
public async Task View()
{
var devices = await _deviceService.GetAsync();
- var ariQuality = "";
var cleanData = new
{
Yesterday = 0.8,
@@ -55,6 +54,8 @@ namespace langguanApi.Service
// 获取天气信息,缓存1小时,如果不存在,则调用WeatherService获取
Func> getWeatherFunc = async () => await _weatherService.GetWeather();
var weather = await _cacheManager.GetConvertVale(RedisKeylist.Weather, getWeatherFunc, 60 * 60);
+ Func> getAriQualityFunc= async () => await _weatherService.GetAirQuality();
+ var ariQuality = await _cacheManager.GetConvertVale(RedisKeylist.AriQuality, getAriQualityFunc, 60 * 120);
return new ApiResult
{
code = 0,
diff --git a/langguanApi/Service/WeatherService.cs b/langguanApi/Service/WeatherService.cs
index f5400aa..d3e0a8f 100644
--- a/langguanApi/Service/WeatherService.cs
+++ b/langguanApi/Service/WeatherService.cs
@@ -1,5 +1,7 @@
using langguanApi.Extensions.AutoDI;
using Newtonsoft.Json;
+using NPOI.SS.Formula.Functions;
+using System.Reflection;
namespace langguanApi.Service
{
@@ -14,7 +16,7 @@ namespace langguanApi.Service
{
_httpClientFactory = httpClientFactory;
_configuration = configuration;
- _logger=logger;
+ _logger = logger;
}
///
/// 爬气象局的天气数据%
@@ -50,6 +52,203 @@ namespace langguanApi.Service
}
return null;
}
+ ///
+ /// 爬空气质量数据
+ ///
+ ///
+ public async Task