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 c3f8a8e3..badead00 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 @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.system.entity.GardsSampleData; import org.jeecg.modules.system.service.IGardsSampleDataService; import org.springframework.beans.factory.annotation.Autowired; @@ -13,6 +14,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + @RestController @RequestMapping("gardsSampleData") @Api(value = "DATA BASE管理", tags = "DATA BASE管理") @@ -20,6 +23,8 @@ public class GardsSampleDataController { @Autowired private IGardsSampleDataService gardsSampleDataService; + @Autowired + private RedisUtil redisUtil; @GetMapping("findPage") @ApiOperation(value = "分页查询DATA_BASE数据", notes = "分页查询DATA_BASE数据") @@ -28,6 +33,20 @@ public class GardsSampleDataController { return result; } + @GetMapping("findStations") + @ApiOperation(value = "查询台站相关信息", notes = "查询台站相关信息") + public Map findStations(){ + Map stationMap = (Map)redisUtil.get("stationMap"); + return stationMap; + } + + @GetMapping("findDetectors") + @ApiOperation(value = "查询台站相关信息", notes = "查询台站相关信息") + public Map findDetectors(){ + Map detectorsMap = (Map)redisUtil.get("detectorsMap"); + return detectorsMap; + } + @DeleteMapping("deleteById") @ApiOperation(value = "删除DATA_BASE数据", notes = "删除DATA_BASE数据") public Result deleteById(Integer sampleId){ 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 546aa282..5b6bec28 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 @@ -138,6 +138,13 @@ public class GardsDetectorsServiceImpl extends ServiceImpl findDetectors(){ List gardsDetectors = this.baseMapper.selectList(new LambdaQueryWrapper<>()); + HashMap map = new HashMap<>(); + if (CollectionUtils.isNotEmpty(gardsDetectors)){ + for (GardsDetectors detectors:gardsDetectors) { + map.put(detectors.getDetectorId(),detectors.getDetectorCode()); + } + } + redisUtil.set("detectorsMap",map); return gardsDetectors; } } 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 eddbf13d..31c6d7ba 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 @@ -3,6 +3,7 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -155,11 +156,12 @@ public class GardsStationsServiceImpl extends ServiceImpl getGardsStations() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - List gardsStations = this.baseMapper.selectList(queryWrapper); + List gardsStations = this.baseMapper.selectList(new LambdaQueryWrapper<>()); HashMap map = new HashMap<>(); - for (GardsStations station:gardsStations) { - map.put(station.getStationId(),station.getStationCode()); + if (CollectionUtils.isNotEmpty(gardsStations)){ + for (GardsStations station:gardsStations) { + map.put(station.getStationId(),station.getStationCode()); + } } redisUtil.set("stationMap",map); return gardsStations; diff --git a/jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java b/jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java index 4e37d4d8..27965275 100644 --- a/jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java +++ b/jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java @@ -4,6 +4,8 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.base.BaseMap; import org.jeecg.common.constant.GlobalConstants; import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.system.service.IGardsDetectorsService; +import org.jeecg.modules.system.service.IGardsStationsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; @@ -33,6 +35,11 @@ public class JeecgSystemCloudApplication extends SpringBootServletInitializer im @Autowired private RedisTemplate redisTemplate; + @Autowired + private IGardsStationsService gardsStationsService; + @Autowired + private IGardsDetectorsService gardsDetectorsService; + @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { return application.sources(JeecgSystemCloudApplication.class); @@ -65,5 +72,9 @@ public class JeecgSystemCloudApplication extends SpringBootServletInitializer im params.put(GlobalConstants.HANDLER_NAME, GlobalConstants.LODER_ROUDER_HANDLER); //刷新网关 redisTemplate.convertAndSend(GlobalConstants.REDIS_TOPIC_NAME, params); + //触发缓存一下台站信息 + gardsStationsService.getGardsStations(); + //触发缓存一下探测器信息 + gardsDetectorsService.findDetectors(); } } \ No newline at end of file