From 51b79bde5d185b5ab7b54199c07199d899ccb13d Mon Sep 17 00:00:00 2001
From: yanghongwei <hongwei7458@163.com>
Date: Tue, 30 Jul 2024 22:48:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=A4=AA=E4=BD=8E=EF=BC=8C=E9=A6=96=E9=A1=B5=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E4=B8=80=E4=B8=AA=E6=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 langguanApi.xml                     | 2 +-
 langguanApi/Service/Hj212Service.cs | 2 +-
 langguanApi/Service/HomeService.cs  | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/langguanApi.xml b/langguanApi.xml
index 79d9892..adaa7b4 100644
--- a/langguanApi.xml
+++ b/langguanApi.xml
@@ -2244,7 +2244,7 @@
         </member>
         <member name="T:langguanApi.Model.GetWasherDto">
             <summary>
-            添加洗车机
+            获取洗车机
             </summary>
         </member>
         <member name="P:langguanApi.Model.GetWasherDto.Name">
diff --git a/langguanApi/Service/Hj212Service.cs b/langguanApi/Service/Hj212Service.cs
index 3cd4b5b..f766762 100644
--- a/langguanApi/Service/Hj212Service.cs
+++ b/langguanApi/Service/Hj212Service.cs
@@ -85,7 +85,7 @@ namespace langguanApi.Service
          //   Expression<Func<Model.HJ212, bool>> exp = filter => filter.CreateDateTime >= DateTime.Now.AddDays(-7);
 
             var filter = Builders<Model.HJ212>.Filter.In(s => s.deviceMN, vocList.Concat(cemsList))
-                & Builders<Model.HJ212>.Filter.Gte(s => s.CreateDateTime, DateTime.Now.AddDays(-7));
+                & Builders<Model.HJ212>.Filter.Gte(s => s.CreateDateTime, DateTime.Now.AddDays(-3));
             var result = await base.FindListyFilter(filter);
             var voc = result.Where(s => vocList.Contains(s.deviceMN)).Select(s => new
             {
diff --git a/langguanApi/Service/HomeService.cs b/langguanApi/Service/HomeService.cs
index 669e058..f8a7869 100644
--- a/langguanApi/Service/HomeService.cs
+++ b/langguanApi/Service/HomeService.cs
@@ -61,12 +61,12 @@ namespace langguanApi.Service
             var detections = await _detectionService.GetIndexData();
             // 获取天气信息，缓存1小时，如果不存在，则调用WeatherService获取
             Func<Task<object>> getWeatherFunc = async () => await _weatherService.GetWeather();
-            var weather = await _cacheManager.GetConvertVale(RedisKeylist.Weather, getWeatherFunc, 60 * 60);
+            var weather = await _cacheManager.GetConvertVale(RedisKeylist.Weather, getWeatherFunc, 60 * 60*24*30);
             // 获取空气质量，缓存2小时，如果不存在，则调用WeatherService获取
             Func<Task<object>> getAriQualityFunc = async () => await _weatherService.GetAirQuality();
-            var ariQuality = await _cacheManager.GetConvertVale(RedisKeylist.AriQuality, getAriQualityFunc, 60 * 120);
+            var ariQuality = await _cacheManager.GetConvertVale(RedisKeylist.AriQuality, getAriQualityFunc, 60 * 60 * 24 * 30);
             Func<Task<object>> getTrendFunc = async () => await _hj212Service.GetIndexData();
-            var trend = await _cacheManager.GetConvertVale(RedisKeylist.Trend, getTrendFunc, 60 * new Random().Next(70));
+            var trend = await _cacheManager.GetConvertVale(RedisKeylist.Trend, getTrendFunc, 60 * 60 * 24 * 30);
             // 获取远程接口污染物排放率
             var rateResp = await _httpProxy.Get<RespModel<List<Rate>>>(null, _configuration.GetValue<string>("Apis:RateUrl"));
             var rate = rateResp.data.ToList().Take(6);
@@ -85,7 +85,7 @@ namespace langguanApi.Service
                 lastWeek = 0.6
             };
             Func<Task<object>> getTodayFunc = async () => await _hj212Service.GetTodayData();
-            var today = await _cacheManager.GetConvertVale(RedisKeylist.Today, getTodayFunc, 60 * 30);
+            var today = await _cacheManager.GetConvertVale(RedisKeylist.Today, getTodayFunc, 60 * 60 * 24 * 30);
             return new ApiResult
             {
                 code = 0,