diff --git a/jeecg-module-transport/src/main/java/org/jeecg/controller/StationDataController.java b/jeecg-module-transport/src/main/java/org/jeecg/controller/StationDataController.java index f07b03b..59e0def 100644 --- a/jeecg-module-transport/src/main/java/org/jeecg/controller/StationDataController.java +++ b/jeecg-module-transport/src/main/java/org/jeecg/controller/StationDataController.java @@ -32,4 +32,11 @@ public class StationDataController { return Result.OK(stationDataService.getAllNuclearfacility()); } + @AutoLog(value = "查询所有反应堆") + @Operation(summary = "查询所有反应堆") + @GetMapping("getAllResearchReactors") + public Result getAllResearchReactors(){ + return Result.OK(stationDataService.getAllResearchReactors()); + } + } diff --git a/jeecg-module-transport/src/main/java/org/jeecg/service/StationDataService.java b/jeecg-module-transport/src/main/java/org/jeecg/service/StationDataService.java index 020003d..4ddff7b 100644 --- a/jeecg-module-transport/src/main/java/org/jeecg/service/StationDataService.java +++ b/jeecg-module-transport/src/main/java/org/jeecg/service/StationDataService.java @@ -45,4 +45,10 @@ public interface StationDataService { * @return */ List> getAllNuclearFacilitiesAndReactors(); + + /** + * 查询所有反应堆 + * @return + */ + List> getAllResearchReactors(); } diff --git a/jeecg-module-transport/src/main/java/org/jeecg/service/impl/StationDataServiceImpl.java b/jeecg-module-transport/src/main/java/org/jeecg/service/impl/StationDataServiceImpl.java index d0296cb..9a881c2 100644 --- a/jeecg-module-transport/src/main/java/org/jeecg/service/impl/StationDataServiceImpl.java +++ b/jeecg-module-transport/src/main/java/org/jeecg/service/impl/StationDataServiceImpl.java @@ -9,11 +9,9 @@ import org.jeecg.common.util.CoordinateTransformUtil; import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.base.entity.configuration.GardsNuclearReactors; import org.jeecg.modules.base.entity.configuration.GardsNuclearfacility; +import org.jeecg.modules.base.entity.configuration.GardsResearchReactors; import org.jeecg.modules.base.entity.configuration.GardsStations; -import org.jeecg.modules.base.mapper.GardsNuclearReactorsMapper; -import org.jeecg.modules.base.mapper.GardsNuclearfacilityMapper; -import org.jeecg.modules.base.mapper.GardsStationsMapper; -import org.jeecg.modules.base.mapper.GardsXeResultMapper; +import org.jeecg.modules.base.mapper.*; import org.jeecg.service.StationDataService; import org.springframework.stereotype.Service; import java.math.BigDecimal; @@ -30,6 +28,7 @@ public class StationDataServiceImpl implements StationDataService { private final GardsStationsMapper stationsMapper; private final GardsNuclearReactorsMapper nuclearReactorsMapper; + private final GardsResearchReactorsMapper researchReactorsMapper; private final GardsXeResultMapper gardsXeResultMapper; private final RedisUtil redisUtil; @@ -125,4 +124,33 @@ public class StationDataServiceImpl implements StationDataService { return stationsMapper.getAllNuclearFacilitiesAndReactors(); } + /** + * 查询所有反应堆 + * + * @return + */ + @Override + public List> getAllResearchReactors() { + List researchReactors; + if(redisUtil.hasKey(CommonConstant.ALL_RESEARCH_REACTORS)){ + researchReactors = (List) redisUtil.get(CommonConstant.ALL_RESEARCH_REACTORS); + }else { + researchReactors = researchReactorsMapper.selectList(new LambdaQueryWrapper<>()); + redisUtil.set(CommonConstant.ALL_RESEARCH_REACTORS,researchReactors); + } + if (CollUtil.isNotEmpty(researchReactors)) { + List> result = new ArrayList<>(); + researchReactors.forEach(researchReactor -> { + Map map = new HashMap<>(); + map.put("id",researchReactor.getId()); + map.put("unitName",researchReactor.getFacilityName()); + map.put("lonValue",researchReactor.getLongitude()); + map.put("latValue",researchReactor.getLatitude()); + result.add(map); + }); + return result; + } + return List.of(); + } + } diff --git a/jeecg-module-transport/src/main/java/org/jeecg/service/impl/TransportTaskServiceImpl.java b/jeecg-module-transport/src/main/java/org/jeecg/service/impl/TransportTaskServiceImpl.java index c8ab05f..d14075c 100644 --- a/jeecg-module-transport/src/main/java/org/jeecg/service/impl/TransportTaskServiceImpl.java +++ b/jeecg-module-transport/src/main/java/org/jeecg/service/impl/TransportTaskServiceImpl.java @@ -846,19 +846,25 @@ public class TransportTaskServiceImpl extends ServiceImpl