diff --git a/langguanApi.xml b/langguanApi.xml index 79d9892..adaa7b4 100644 --- a/langguanApi.xml +++ b/langguanApi.xml @@ -2244,7 +2244,7 @@ - 添加洗车机 + 获取洗车机 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> exp = filter => filter.CreateDateTime >= DateTime.Now.AddDays(-7); var filter = Builders.Filter.In(s => s.deviceMN, vocList.Concat(cemsList)) - & Builders.Filter.Gte(s => s.CreateDateTime, DateTime.Now.AddDays(-7)); + & Builders.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> 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> 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> 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>>(null, _configuration.GetValue("Apis:RateUrl")); var rate = rateResp.data.ToList().Take(6); @@ -85,7 +85,7 @@ namespace langguanApi.Service lastWeek = 0.6 }; Func> 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,