diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java index d220bf7..442a3ce 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.constant.CacheConstants; import org.jeecg.common.constant.IotConstants; import org.jeecg.common.constant.PollutionConstants; import org.jeecg.common.constant.enums.ScreenIndexSummaryEnum; @@ -39,6 +40,7 @@ import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAdjusters; import java.util.*; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @Api(tags="大屏接口") @@ -505,6 +507,14 @@ public class BigScreenController { @ApiOperation("大屏首页统计") public Result> getIndexSummry (@RequestBody ScreenSummaryVo screenSummaryVo){ List results = new ArrayList<>(); + if(StringUtils.isBlank(screenSummaryVo.getSummrayMode())){//不传模式,默认为天数据 + screenSummaryVo.setSummrayMode(IotConstants.month_days); + } + String cache = oConvertUtils.getString(redisTemplate.opsForValue().get(CacheConstants.BS_INDEX_STATISTIC_CACHE)); + if(StringUtils.isNotBlank(cache)){ + results = JSONArray.parseArray(cache,ScreenIndexSummaryDetailVo.class); + return Result.ok(results); + } List stationList = survStationInfoService.getAllStationAndDevice(screenSummaryVo.getStationCode(),"","token"); Integer intYear = LocalDateTime.now().getYear(); @@ -774,6 +784,7 @@ public class BigScreenController { // JSONObject datajob = new JSONObject(); // datajob.put("dataStr",wholeTime); // returnArrs.add(datajob); + redisTemplate.opsForValue().set(CacheConstants.BS_INDEX_STATISTIC_CACHE,JSONArray.parseArray(JSONObject.toJSONString(results)),5, TimeUnit.MINUTES);//增加缓存机制 return Result.ok(results); } diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/constant/CacheConstants.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/constant/CacheConstants.java index b79001f..cf7feba 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/constant/CacheConstants.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/constant/CacheConstants.java @@ -75,4 +75,8 @@ public interface CacheConstants { * 移动端主题配置缓存 */ String MALL_THEME_MOBILE_CACHE = "mall:theme_mobile"; + /** + * 大屏首页统计缓存 + */ + String BS_INDEX_STATISTIC_CACHE="bs:indexstatistic:"; }