xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

台站运行管理查询台站，核设施列表排序问题修改，台站内容放置在核设施前并分别排序

Browse Source
This commit is contained in:
qiaoqinzheng 2024-01-17 14:03:10 +08:00
parent c647bc52ca
commit 3f0b7137f1
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java
View File

@ -1,6 +1,7 @@
package org.jeecg.modules.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@ -14,6 +15,7 @@ import org.jeecg.common.CalculateStationData;
import org.jeecg.common.PointUtil;
import org.jeecg.common.StationTypeUtil;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.modules.base.entity.configuration.GardsDetectors;
import org.jeecg.modules.base.entity.configuration.GardsNuclearfacility;
@ -66,6 +68,7 @@ public class StationOperationServiceImpl extends ServiceImpl<StationOperationMap
HashMap<String, Object> stationInfoMap = (HashMap<String, Object>) redisUtil.get("stationInfoMap");
//查询全部核设施信息
HashMap<String, Object> nuclearFacilityMap = (HashMap<String, Object>) redisUtil.get("nuclearFacilityMap");
List<StationOperation> stationList = new LinkedList<>();
//遍历台站信息
if (CollectionUtils.isNotEmpty(stationInfoMap)){
for (Map.Entry<String, Object> gardsStations:stationInfoMap.entrySet()) {
@ -78,9 +81,14 @@ public class StationOperationServiceImpl extends ServiceImpl<StationOperationMap
stationOperation.setLon(String.valueOf(gardsStation.getLon()));
stationOperation.setLat(String.valueOf(gardsStation.getLat()));
stationOperation.setStatus(gardsStation.getStatus());
result.add(stationOperation);
stationList.add(stationOperation);
}
if (CollectionUtils.isNotEmpty(stationList)) {
// 根据StationId排序
stationList = stationList.stream().sorted(Comparator.comparingInt(StationOperation::getStationId)).collect(Collectors.toList());
}
}
List<StationOperation> nuclearFacilityList = new LinkedList<>();
if (CollectionUtils.isNotEmpty(nuclearFacilityMap)){
//遍历核设施信息
for (Map.Entry<String, Object> nuclearfacilities:nuclearFacilityMap.entrySet()) {
@ -93,9 +101,15 @@ public class StationOperationServiceImpl extends ServiceImpl<StationOperationMap
stationOperation.setLon(PointUtil.calculate(nuclearfacility.getLatitude()));
stationOperation.setLat(PointUtil.calculate(nuclearfacility.getLongitude()));
stationOperation.setStatus(nuclearfacility.getStatus());
result.add(stationOperation);
nuclearFacilityList.add(stationOperation);
}
if (CollectionUtils.isNotEmpty(nuclearFacilityList)) {
// 根据StationId排序
nuclearFacilityList = nuclearFacilityList.stream().sorted(Comparator.comparingInt(StationOperation::getStationId)).collect(Collectors.toList());
}
}
result.addAll(stationList);
result.addAll(nuclearFacilityList);
//如果状态不为空
if (StringUtils.isNotBlank(status)){
result = result.stream().filter(item-> StringUtils.isNotBlank(item.getStatus()) && item.getStatus().equalsIgnoreCase(status)).collect(Collectors.toList());
@ -104,10 +118,6 @@ public class StationOperationServiceImpl extends ServiceImpl<StationOperationMap
if (StringUtils.isNotBlank(stationType)){
result = result.stream().filter(item-> StringUtils.isNotBlank(item.getStationType()) && item.getStationType().equalsIgnoreCase(stationType)).collect(Collectors.toList());
}
// 根据StationId排序
result = result.stream()
.sorted(Comparator.comparingInt(StationOperation::getStationId))
.collect(Collectors.toList());
return result;
}