src/main/java/com/gkhy/fourierSpecialGasMonitor/commons/enums/SystemCacheKeyEnum.java
@@ -4,10 +4,11 @@ * 系统缓存KEY */ public enum SystemCacheKeyEnum { KEY_SYSTEM_PROP("gkhy-fourier-sys","系统配置"), KEY_SYSTEM_LICENSE_INFO("license","授权证书"), KEY_USER_TOKEN("gkhy-fourier-token","登录用户TOKEN"), KEY_CACHE_USER("gkhy-fourier-cache-user","用户信息缓存") KEY_SYSTEM_PROP("fourier:gkhy-fourier-sys","系统配置"), KEY_SYSTEM_LICENSE_INFO("fourier:license","授权证书"), KEY_USER_TOKEN("fourier:gkhy-fourier-token","登录用户TOKEN"), KEY_GAS_CATEGORY("fourier:gas_category_cache_info","气体信息"), KEY_CACHE_USER("fourier:gkhy-fourier-cache-user","用户信息缓存") ; private String key; private String desc; src/main/java/com/gkhy/fourierSpecialGasMonitor/controller/GasCategoryController.java
@@ -3,6 +3,7 @@ import com.gkhy.fourierSpecialGasMonitor.annotation.RepeatedClick; import com.gkhy.fourierSpecialGasMonitor.api.controller.common.BaseController; import com.gkhy.fourierSpecialGasMonitor.commons.domain.Result; import com.gkhy.fourierSpecialGasMonitor.commons.enums.SystemCacheKeyEnum; import com.gkhy.fourierSpecialGasMonitor.commons.model.PageQuery; import com.gkhy.fourierSpecialGasMonitor.entity.query.FindGasCategoryPageQuery; import com.gkhy.fourierSpecialGasMonitor.entity.query.FindRegionPageQuery; @@ -75,7 +76,7 @@ @PostConstruct private void gasCategoryListCache(){ //清除redis缓存 RBucket<Object> bucket = redissonClient.getBucket("gas_category_cache_info"); RBucket<Object> bucket = redissonClient.getBucket(SystemCacheKeyEnum.KEY_GAS_CATEGORY.getKey()); if (bucket.isExists()) { bucket.delete(); } src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/DailyReportSchedule.java
@@ -4,6 +4,7 @@ import com.gkhy.fourierSpecialGasMonitor.Application; import com.gkhy.fourierSpecialGasMonitor.commons.enums.ForeignResultCode; import com.gkhy.fourierSpecialGasMonitor.commons.enums.ResultCode; import com.gkhy.fourierSpecialGasMonitor.commons.enums.SystemCacheKeyEnum; import com.gkhy.fourierSpecialGasMonitor.commons.exception.BusinessException; import com.gkhy.fourierSpecialGasMonitor.commons.exception.DataReceiveException; import com.gkhy.fourierSpecialGasMonitor.config.file.ReportFilePathConfig; @@ -92,12 +93,12 @@ @Autowired private MonitorDailyReportService monitorDailyReportService; //@Scheduled(cron = "0 0 2 * * ?") //每天两点执行一次 // @Scheduled(cron = "0 0 2 * * ?") //每天两点执行一次 @Async(value = "SocketTaskExecutor") public void generateDailyReport() { LocalDateTime now = LocalDateTime.now(); String startTime = now.format(execformatter); RBucket<List<GasCategory>> bucket = redissonClient.getBucket("gas_category_cache_info"); RBucket<List<GasCategory>> bucket = redissonClient.getBucket(SystemCacheKeyEnum.KEY_GAS_CATEGORY.getKey()); List<GasCategory> gasCategories = bucket.get(); serialNumber = 4; logger.info("【##】开始生成日报 ,时间："+startTime); src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/DataReceiveServiceImpl.java
@@ -5,6 +5,7 @@ import com.gkhy.fourierSpecialGasMonitor.commons.domain.Result; import com.gkhy.fourierSpecialGasMonitor.commons.enums.ForeignResultCode; import com.gkhy.fourierSpecialGasMonitor.commons.enums.ResultCode; import com.gkhy.fourierSpecialGasMonitor.commons.enums.SystemCacheKeyEnum; import com.gkhy.fourierSpecialGasMonitor.commons.exception.DataReceiveException; import com.gkhy.fourierSpecialGasMonitor.decorator.WarningThresholdUpdateEvent; import com.gkhy.fourierSpecialGasMonitor.entity.*; @@ -274,7 +275,7 @@ private void execDataCountAndPush(UploadGasConcentrationReqDTO reqDto){ RBucket<List<GasCategory>> bucket = redissonClient.getBucket("gas_category_cache_info"); RBucket<List<GasCategory>> bucket = redissonClient.getBucket(SystemCacheKeyEnum.KEY_GAS_CATEGORY.getKey()); List<GasCategory> gasCategoryCache = bucket.get(); if (CollectionUtils.isEmpty(gasCategoryCache)){ gasCategoryCache = gasCategoryService.list(); src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/GasCategoryServiceImpl.java
@@ -3,6 +3,7 @@ import com.gkhy.fourierSpecialGasMonitor.commons.domain.Result; import com.gkhy.fourierSpecialGasMonitor.commons.domain.SearchResult; import com.gkhy.fourierSpecialGasMonitor.commons.enums.ResultCode; import com.gkhy.fourierSpecialGasMonitor.commons.enums.SystemCacheKeyEnum; import com.gkhy.fourierSpecialGasMonitor.commons.exception.BusinessException; import com.gkhy.fourierSpecialGasMonitor.commons.model.PageQuery; import com.gkhy.fourierSpecialGasMonitor.domain.account.entity.User; @@ -107,7 +108,7 @@ gasCategoryMolecularFormulaRepeatlock.unlock(); } //清除redis缓存 RBucket<List<GasCategory>> bucket = redissonClient.getBucket("gas_category_cache_info"); RBucket<List<GasCategory>> bucket = redissonClient.getBucket(SystemCacheKeyEnum.KEY_GAS_CATEGORY.getKey()); if (bucket.isExists()) { bucket.delete(); } @@ -147,7 +148,7 @@ gasCategoryMolecularFormulaRepeatlock.unlock(); } //清除redis缓存 RBucket<List<GasCategory>> bucket = redissonClient.getBucket("gas_category_cache_info"); RBucket<List<GasCategory>> bucket = redissonClient.getBucket(SystemCacheKeyEnum.KEY_GAS_CATEGORY.getKey()); if (bucket.isExists()) { bucket.delete(); } @@ -179,7 +180,7 @@ @Override public Result gasCategoryList() { Result success = Result.success(); RBucket<List<GasCategory>> bucket = redissonClient.getBucket("gas_category_cache_info"); RBucket<List<GasCategory>> bucket = redissonClient.getBucket(SystemCacheKeyEnum.KEY_GAS_CATEGORY.getKey()); List<GasCategory> categories = bucket.get(); if (CollectionUtils.isEmpty(categories)){ categories = gasCategoryRepository.findAll();
