diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java index 2c640bf3..8648bae7 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java @@ -2494,7 +2494,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(file.getAbsolutePath()); String stationName = struct.site_code; //根据台站id查询台站名称 - Map stationMap = (Map)redisUtil.get("stationMap"); + Map stationMap = (Map)redisUtil.get("stationMap"); if (CollectionUtils.isEmpty(stationMap)){ result.error500("The station cache information is empty!"); return result; @@ -2505,7 +2505,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { result.error500("The station information does not exist!"); return result; } - List stationIds = stationMap.keySet().stream().collect(Collectors.toList()); + List stationIds = stationMap.keySet().stream().collect(Collectors.toList()); String stationId = String.valueOf(stationIds.get(index)); map.put("stationId", stationId); map.put("stationName", stationName); @@ -2546,7 +2546,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { Result result = new Result(); Map map = new HashMap<>(); //根据台站id查询台站名称 - Map stationMap = (Map)redisUtil.get("stationMap"); + Map stationMap = (Map)redisUtil.get("stationMap"); if (CollectionUtils.isEmpty(stationMap)){ result.error500("The station cache information is empty!"); return result; @@ -2557,7 +2557,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { result.error500("The station information does not exist!"); return result; } - List stationIds = stationMap.keySet().stream().collect(Collectors.toList()); + List stationIds = stationMap.keySet().stream().collect(Collectors.toList()); String stationId = String.valueOf(stationIds.get(index)); map.put("stationId", stationId); map.put("stationName", stationName); diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/DataProvisionEfficiencyManager.java b/jeecg-module-station-operation/src/main/java/org/jeecg/DataProvisionEfficiencyManager.java index 28ac462e..1a4bb92f 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/DataProvisionEfficiencyManager.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/DataProvisionEfficiencyManager.java @@ -46,7 +46,7 @@ public class DataProvisionEfficiencyManager { //获取机器可用核心数 int systemCores = Runtime.getRuntime().availableProcessors(); //初始化线程池 - ThreadFactory threadFactory = new CustomizableThreadFactory("undeal-file-parsing-"); + ThreadFactory threadFactory = new CustomizableThreadFactory("provision-efficiency-"); poolExecutor = new ThreadPoolExecutor(systemCores-1,systemCores,5, TimeUnit.SECONDS, new LinkedBlockingQueue<>(),threadFactory); } @@ -58,7 +58,7 @@ public class DataProvisionEfficiencyManager { HashMap stationInfoMap = (HashMap) redisUtil.get("stationInfoMap"); List detectorsUsedList = (List) redisUtil.get("detectorsUsedList"); // 获取所有的台站信息 - List stations = stationInfoMap.values().stream().sorted(Comparator.comparing(GardsStations::getStationId)).collect(Collectors.toList()); + List stations = stationInfoMap.values().stream().filter(item-> item.getLon()!=null && item.getLat()!=null).sorted(Comparator.comparing(GardsStations::getStationId)).collect(Collectors.toList()); List stationInfos = new ArrayList<>(); for (GardsStations gardsStations : stations) { StationInfo stationInfo = new StationInfo(); diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/DataReceivingStatusManager.java b/jeecg-module-station-operation/src/main/java/org/jeecg/DataReceivingStatusManager.java index 348e1bcc..75cfd78b 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/DataReceivingStatusManager.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/DataReceivingStatusManager.java @@ -1,19 +1,16 @@ package org.jeecg; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.CacheName; +import org.jeecg.common.config.mqtoken.UserTokenContext; import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.base.entity.configuration.GardsStations; import org.jeecg.modules.base.entity.original.GardsMetData; import org.jeecg.modules.base.entity.original.GardsSampleData; import org.jeecg.modules.base.entity.original.GardsSohData; -import org.jeecg.modules.base.entity.postgre.SysUserFocusStation; -import org.jeecg.modules.entity.SysUserFocusStationStation; import org.jeecg.modules.entity.data.*; import org.jeecg.modules.mapper.StationMetDataMapper; import org.jeecg.modules.mapper.StationSampleDataMapper; @@ -32,6 +29,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import static org.jeecg.common.util.TokenUtils.getTempToken; + @Slf4j @Component @RequiredArgsConstructor @@ -72,7 +71,8 @@ public class DataReceivingStatusManager { public void run() { for(;;){ long start = System.currentTimeMillis(); - + // start:生成临时Token到线程中 + UserTokenContext.setToken(getTempToken()); //获取四项缓存数据的对应内容 List> cacheList = cacheTimeService.findCacheTime(); //缓存时间 @@ -84,12 +84,12 @@ public class DataReceivingStatusManager { } } //从redis中获取台站信息 - Map stationInfoMap = (Map)redisUtil.get("stationMap"); - List stationIds = stationInfoMap.keySet().stream().collect(Collectors.toList()); + Map stationInfoMap = (Map)redisUtil.get("stationMap"); + List stationIds = stationInfoMap.keySet().stream().collect(Collectors.toList()); //从redis中获取探测器信息 Map detectorInfoMap = (Map)redisUtil.get("detectorsMap"); //声明存储所有台站id对应的数据信息的集合 - List stationDataList = Objects.nonNull(redisUtil.get("stationDataList"))? (List) redisUtil.get("stationDataList") : new LinkedList<>(); + Map stationDataMap = Objects.nonNull(redisUtil.get("stationDataMap"))?(Map) redisUtil.get("stationDataMap"):new HashMap<>(); //遍历台站id if (CollectionUtils.isNotEmpty(stationIds)) { //获取当前日期时间 作为结束查询时间 @@ -103,10 +103,10 @@ public class DataReceivingStatusManager { Map> stationDetectors = cacheTimeService.findStationDetectors(stationIds); //遍历台站id 获取台站下的探测器数据 if (CollectionUtils.isNotEmpty(stationDetectors)) { - for (Integer stationId : stationIds) { + for (String stationId : stationIds) { Map>> stationMap = new HashMap<>(); //获取台站下对应的探测器数据 - List detectors = stationDetectors.get(String.valueOf(stationId)); + List detectors = stationDetectors.get(stationId); if (CollectionUtils.isNotEmpty(detectors)) { StationData stationData = new StationData(); //stream流获取探测器id @@ -207,17 +207,17 @@ public class DataReceivingStatusManager { detectorDataList.add(detectorMap); } - stationMap.put(String.valueOf(stationId), detectorDataList); - stationData.setStationId(String.valueOf(stationId)); + stationMap.put(stationId, detectorDataList); + stationData.setStationId(stationId); if (CollectionUtils.isNotEmpty(stationInfoMap)) { if (StringUtils.isNotBlank(stationInfoMap.get(stationId))) { stationData.setStationCode(stationInfoMap.get(stationId)); } } stationData.setDetectors(stationMap); - stationDataList.add(stationData); - redisUtil.set("stationDataList", stationDataList); + stationDataMap.put(stationData.getStationId(), stationData); } + redisUtil.set("stationDataMap", stationDataMap); } } } diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/common/CalculateDataRateThread.java b/jeecg-module-station-operation/src/main/java/org/jeecg/common/CalculateDataRateThread.java index ef44aed5..417e0ff0 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/common/CalculateDataRateThread.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/common/CalculateDataRateThread.java @@ -36,14 +36,11 @@ public class CalculateDataRateThread implements Runnable{ @Override public void run() { - long start = System.currentTimeMillis(); try { this.calCulStationInfo(); }catch (Exception e){ e.printStackTrace(); } finally { - long end = System.currentTimeMillis(); - System.out.println("单线程时长:"+(end-start)); // CountDownLatch 计数器减 1 countDownLatch.countDown(); } diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationMetDataMapper.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationMetDataMapper.java index 7f237f99..83822d7c 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationMetDataMapper.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationMetDataMapper.java @@ -13,6 +13,6 @@ import java.util.List; @Mapper public interface StationMetDataMapper extends BaseMapper { - List findMetDataList(@Param("stationIds") List stationIds, @Param("startDate") String startDate); + List findMetDataList(@Param("stationIds") List stationIds, @Param("startDate") String startDate); } diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationSohDataMapper.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationSohDataMapper.java index b249c1cf..7b5779e2 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationSohDataMapper.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationSohDataMapper.java @@ -13,5 +13,5 @@ import java.util.List; @Mapper public interface StationSohDataMapper extends BaseMapper { - List findSohDataList(@Param("stationId") Integer stationId, @Param("detectorIds") List detectorIds, @Param("startDate") String startDate); + List findSohDataList(@Param("stationId") String stationId, @Param("detectorIds") List detectorIds, @Param("startDate") String startDate); } diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ICacheTimeService.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ICacheTimeService.java index 4c5c7d55..65657c2e 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ICacheTimeService.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ICacheTimeService.java @@ -20,7 +20,7 @@ public interface ICacheTimeService { List> findCacheTime(); @RequestMapping("/gardsDetectors/findStationDetectors") - Map> findStationDetectors(@RequestBody List stationIds); + Map> findStationDetectors(@RequestBody List stationIds); @RequestMapping("/sys/user/findUserByName") SysUser findUserByName(@RequestParam String userName); diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java index 3718df1f..7f76dba1 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java @@ -386,7 +386,7 @@ public class StationOperationServiceImpl extends ServiceImpl stationDataList = (List) redisUtil.get("stationDataList"); + Map stationDataMap = (Map) redisUtil.get("stationDataMap"); // //获取四项缓存数据的对应内容 // List> cacheList = cacheTimeService.findCacheTime(); // //缓存时间 @@ -407,7 +407,12 @@ public class StationOperationServiceImpl extends ServiceImpl userFocusStations = sysUserFocusStationMapper.selectList(userFocusStationQueryWrapper); List stationIds = userFocusStations.stream().map(SysUserFocusStation::getStationId).collect(Collectors.toList()); //过滤出当前用户关注的台站信息 - stationDataList = stationDataList.stream().filter(item-> stationIds.equals(item.getStationId())).collect(Collectors.toList()); + List stationDataList = new LinkedList<>(); + for (String stationId:stationIds) { + if (Objects.nonNull(stationDataMap.get(stationId))) { + stationDataList.add(stationDataMap.get(stationId)); + } + } // //从redis中获取台站信息 // Map stationInfoMap = (Map)redisUtil.get("stationMap"); // //从redis中获取探测器信息 @@ -553,7 +558,7 @@ public class StationOperationServiceImpl extends ServiceImpl stationInfoMap = (Map) redisUtil.get("dataStationInfoList"); - List stationInfoList = stationInfoMap.values().stream().collect(Collectors.toList()); + List stationInfoList = stationInfoMap.values().stream().filter(Objects::nonNull).collect(Collectors.toList()); // // 获取所有的台站信息 // HashMap stationInfoMap = (HashMap) redisUtil.get("stationInfoMap"); // List detectorsUsedList = (List) redisUtil.get("detectorsUsedList"); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsDetectorsController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsDetectorsController.java index 027f0def..f986567f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsDetectorsController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsDetectorsController.java @@ -67,7 +67,7 @@ public class GardsDetectorsController { } @RequestMapping("findStationDetectors") - public Map> findStationDetectors(@RequestBody List stationIds){ + public Map> findStationDetectors(@RequestBody List stationIds){ return gardsDetectorsService.findStationDetectors(stationIds); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsSampleDataController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsSampleDataController.java index 2ac1d1e2..b5aae5ad 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsSampleDataController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsSampleDataController.java @@ -35,8 +35,8 @@ public class GardsSampleDataController { @GetMapping("findStations") @ApiOperation(value = "查询台站相关信息", notes = "查询台站相关信息") - public Map findStations(){ - Map stationMap = (Map)redisUtil.get("stationMap"); + public Map findStations(){ + Map stationMap = (Map)redisUtil.get("stationMap"); return stationMap; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsDetectorsService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsDetectorsService.java index 7fa12fce..e2e30219 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsDetectorsService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsDetectorsService.java @@ -63,6 +63,6 @@ public interface IGardsDetectorsService extends IService { * @param stationIds * @return */ - Map> findStationDetectors(List stationIds); + Map> findStationDetectors(List stationIds); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java index 2ee51c3c..fa9f4668 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java @@ -143,15 +143,15 @@ public class GardsDetectorsServiceImpl extends ServiceImpl> findStationDetectors(List stationIds) { + public Map> findStationDetectors(List stationIds) { Map> map = new HashMap<>(); if (CollectionUtils.isNotEmpty(stationIds)){ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.in(GardsDetectorsSystem::getStationId, stationIds); List detectorsList = this.baseMapper.selectList(queryWrapper); - for (Integer stationId:stationIds) { - List detectors = detectorsList.stream().filter(item -> item.getStationId()!=null && item.getStationId().equals(stationId) && item.getStatus()!=null && item.getStatus().trim().equals("Operating")).collect(Collectors.toList()); - map.put(String.valueOf(stationId), detectors); + for (String stationId:stationIds) { + List detectors = detectorsList.stream().filter(item -> item.getStationId()!=null && item.getStationId().equals(Integer.valueOf(stationId)) && item.getStatus()!=null && item.getStatus().trim().equals("Operating")).collect(Collectors.toList()); + map.put(stationId, detectors); } } return map; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java index 81770801..64da4204 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java @@ -29,7 +29,7 @@ public class GardsSampleDataServiceImpl extends ServiceImpl> findPage(QueryRequest queryRequest, GardsSampleDataSystem gardsSampleData) { //查询全部台站信息 - HashMap stationMap = (HashMap) redisUtil.get("stationMap"); + HashMap stationMap = (HashMap) redisUtil.get("stationMap"); //查询全部监测器信息 HashMap detectorsMap = (HashMap) redisUtil.get("detectorsMap"); Result> result = new Result<>(); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsStationsServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsStationsServiceImpl.java index 07c2b2fb..dd13d206 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsStationsServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsStationsServiceImpl.java @@ -175,7 +175,8 @@ public class GardsStationsServiceImpl extends ServiceImpl gardsStations = this.baseMapper.selectList(new LambdaQueryWrapper<>()); - Map stationMap = gardsStations.stream().collect(Collectors.toMap(GardsStations::getStationId, GardsStations::getStationCode)); + Map stationMap = gardsStations.stream().collect(Collectors.toMap(GardsStations::getStationId, GardsStations::getStationCode)).entrySet().stream() + .collect(Collectors.toMap(entry -> entry.getKey().toString(), Map.Entry::getValue));; HashMap stationInfoMap = new HashMap<>(); if (CollectionUtils.isNotEmpty(gardsStations)){ for (GardsStations station:gardsStations) { diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskServiceImpl.java index 8f76cec7..01214798 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskServiceImpl.java @@ -62,7 +62,7 @@ public class SysTaskServiceImpl extends ServiceImpl>> result = new Result(); Map> map = new LinkedHashMap<>(); //获取全部台站信息 - HashMap stationMap = (HashMap)redisUtil.get("stationMap"); + HashMap stationMap = (HashMap)redisUtil.get("stationMap"); try { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); String yearMonthStr = DateUtils.formatDate(yearMonth, "yyyy-MM"); @@ -138,7 +138,7 @@ public class SysTaskServiceImpl extends ServiceImpl> findInfo(Date day) { Result> result = new Result(); //获取全部台站信息 - HashMap stationMap = (HashMap)redisUtil.get("stationMap"); + HashMap stationMap = (HashMap)redisUtil.get("stationMap"); try { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Calendar cal = Calendar.getInstance(); diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/AutoServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/AutoServiceImpl.java index 4b62acf6..a47f5cae 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/AutoServiceImpl.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/AutoServiceImpl.java @@ -47,7 +47,7 @@ public class AutoServiceImpl extends ServiceImpl stationMap = (Map)redisUtil.get("stationMap"); + Map stationMap = (Map)redisUtil.get("stationMap"); if (Objects.isNull(startTime)){ result.error500("The start time cannot be empty"); return result; diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java index a6b79fac..04e49b1d 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java @@ -72,7 +72,7 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl stationMap = (Map)redisUtil.get("stationMap"); + Map stationMap = (Map)redisUtil.get("stationMap"); if (StringUtils.isBlank(dataType)) { result.error500("The data type cannot be empty"); return result; @@ -174,7 +174,7 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl stationMap = (Map)redisUtil.get("stationMap"); + Map stationMap = (Map)redisUtil.get("stationMap"); //根据sample_id查询sample_data内容 LambdaQueryWrapper sampleDataQueryWrapper = new LambdaQueryWrapper<>(); sampleDataQueryWrapper.eq(GardsSampleDataWeb::getSampleId, sampleId); @@ -695,7 +695,7 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl sampleData = this.list(wrapper); // 获取redis中缓存的台站信息 - Map stationMap = (Map)redisUtil.get("stationMap"); + Map stationMap = (Map)redisUtil.get("stationMap"); int no = 1; boolean emptyMap = MapUtil.isEmpty(stationMap); for (GardsSampleDataWeb sampleDatum : sampleData) { diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/ReviewedServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/ReviewedServiceImpl.java index 99ef7a48..fa7bda6d 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/ReviewedServiceImpl.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/ReviewedServiceImpl.java @@ -47,7 +47,7 @@ public class ReviewedServiceImpl extends ServiceImpl stationMap = (Map)redisUtil.get("stationMap"); + Map stationMap = (Map)redisUtil.get("stationMap"); if (Objects.isNull(startTime)){ result.error500("The start time cannot be empty"); return result; diff --git a/jeecg-server-cloud/armd-station-operation-start/src/main/java/org/jeecg/JeecgStationOperationApplication.java b/jeecg-server-cloud/armd-station-operation-start/src/main/java/org/jeecg/JeecgStationOperationApplication.java index 87ed7deb..444da5cc 100644 --- a/jeecg-server-cloud/armd-station-operation-start/src/main/java/org/jeecg/JeecgStationOperationApplication.java +++ b/jeecg-server-cloud/armd-station-operation-start/src/main/java/org/jeecg/JeecgStationOperationApplication.java @@ -49,6 +49,6 @@ public class JeecgStationOperationApplication extends SpringBootServletInitializ @Override public void run(String... args) throws Exception { dataProvisionEfficiencyManager.start(); -// dataReceivingStatusManager.start(); + dataReceivingStatusManager.start(); } } \ No newline at end of file