|
@@ -9,10 +9,7 @@ import lombok.AllArgsConstructor;
|
|
import org.springframework.data.mongodb.core.MongoTemplate;
|
|
import org.springframework.data.mongodb.core.MongoTemplate;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
|
-import java.util.HashMap;
|
|
|
|
-import java.util.List;
|
|
|
|
-import java.util.Map;
|
|
|
|
|
|
+import java.util.*;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -32,9 +29,9 @@ public class FengJiInfoServiceImpl extends ServiceImpl<WindTowerDataParentTableM
|
|
//查询项目风机
|
|
//查询项目风机
|
|
public List<FanTowerDto> getFanTowerForProject(String id) {
|
|
public List<FanTowerDto> getFanTowerForProject(String id) {
|
|
List<ProjectInfo> projectInfoList = new ArrayList<>();
|
|
List<ProjectInfo> projectInfoList = new ArrayList<>();
|
|
- if(id.equals("")){
|
|
|
|
|
|
+ if (id.equals("")) {
|
|
projectInfoList = projectInfoService.getProjectInfoList();
|
|
projectInfoList = projectInfoService.getProjectInfoList();
|
|
- }else{
|
|
|
|
|
|
+ } else {
|
|
projectInfoList.add(projectInfoService.getOneProjectInfoById(id));
|
|
projectInfoList.add(projectInfoService.getOneProjectInfoById(id));
|
|
}
|
|
}
|
|
ArrayList<FanTowerDto> list = new ArrayList<>();
|
|
ArrayList<FanTowerDto> list = new ArrayList<>();
|
|
@@ -68,12 +65,12 @@ public class FengJiInfoServiceImpl extends ServiceImpl<WindTowerDataParentTableM
|
|
//查询场站风机
|
|
//查询场站风机
|
|
public List<FanTowerDto> getFanTowerForStation(String id) {
|
|
public List<FanTowerDto> getFanTowerForStation(String id) {
|
|
List<StationInfo> stationInfos = new ArrayList<>();
|
|
List<StationInfo> stationInfos = new ArrayList<>();
|
|
- if(id.equals("")){
|
|
|
|
|
|
+ if (id.equals("")) {
|
|
stationInfos = stationInfoService.selectStationInfo();
|
|
stationInfos = stationInfoService.selectStationInfo();
|
|
- }else{
|
|
|
|
|
|
+ } else {
|
|
stationInfos.add(stationInfoService.getOneStationInfo(id));
|
|
stationInfos.add(stationInfoService.getOneStationInfo(id));
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
ArrayList<FanTowerDto> list = new ArrayList<>();
|
|
ArrayList<FanTowerDto> list = new ArrayList<>();
|
|
for (StationInfo stationInfo : stationInfos) {
|
|
for (StationInfo stationInfo : stationInfos) {
|
|
if (stationInfo.getFanTowerList() != null) {
|
|
if (stationInfo.getFanTowerList() != null) {
|
|
@@ -101,7 +98,7 @@ public class FengJiInfoServiceImpl extends ServiceImpl<WindTowerDataParentTableM
|
|
}
|
|
}
|
|
|
|
|
|
//项目风机更新
|
|
//项目风机更新
|
|
- public void updateFanTowerForProjectInfo(FanTowerDto fanTowerDto){
|
|
|
|
|
|
+ public void updateFanTowerForProjectInfo(FanTowerDto fanTowerDto) {
|
|
ProjectInfo projectInfoById = projectInfoService.getOneProjectInfoById(fanTowerDto.getId());
|
|
ProjectInfo projectInfoById = projectInfoService.getOneProjectInfoById(fanTowerDto.getId());
|
|
List<FanTower> fanTowerList = projectInfoById.getFanTowerList().stream().peek(s -> {
|
|
List<FanTower> fanTowerList = projectInfoById.getFanTowerList().stream().peek(s -> {
|
|
if (s.getId().equals(fanTowerDto.getFanId())) {
|
|
if (s.getId().equals(fanTowerDto.getFanId())) {
|
|
@@ -114,7 +111,7 @@ public class FengJiInfoServiceImpl extends ServiceImpl<WindTowerDataParentTableM
|
|
|
|
|
|
|
|
|
|
//场站风机更新
|
|
//场站风机更新
|
|
- public void updateFanTowerForStationInfo(FanTowerDto fanTowerDto){
|
|
|
|
|
|
+ public void updateFanTowerForStationInfo(FanTowerDto fanTowerDto) {
|
|
StationInfo oneStationInfo = stationInfoService.getOneStationInfo(fanTowerDto.getId());
|
|
StationInfo oneStationInfo = stationInfoService.getOneStationInfo(fanTowerDto.getId());
|
|
List<FanTower> fanTowerList = oneStationInfo.getFanTowerList().stream().peek(s -> {
|
|
List<FanTower> fanTowerList = oneStationInfo.getFanTowerList().stream().peek(s -> {
|
|
if (s.getId().equals(fanTowerDto.getFanId())) {
|
|
if (s.getId().equals(fanTowerDto.getFanId())) {
|
|
@@ -127,9 +124,9 @@ public class FengJiInfoServiceImpl extends ServiceImpl<WindTowerDataParentTableM
|
|
}
|
|
}
|
|
|
|
|
|
//项目新增风机信息
|
|
//项目新增风机信息
|
|
- public void saveFanTowerForProjectInfo(FanTowerDto fanTowerDto){
|
|
|
|
|
|
+ public void saveFanTowerForProjectInfo(FanTowerDto fanTowerDto) {
|
|
ProjectInfo projectInfoById = projectInfoService.getOneProjectInfoById(fanTowerDto.getId());
|
|
ProjectInfo projectInfoById = projectInfoService.getOneProjectInfoById(fanTowerDto.getId());
|
|
- if(projectInfoById.getFanTowerList() == null){
|
|
|
|
|
|
+ if (projectInfoById.getFanTowerList() == null) {
|
|
projectInfoById.setFanTowerList(new ArrayList<>());
|
|
projectInfoById.setFanTowerList(new ArrayList<>());
|
|
}
|
|
}
|
|
FanTower fanTower = new FanTower();
|
|
FanTower fanTower = new FanTower();
|
|
@@ -139,10 +136,11 @@ public class FengJiInfoServiceImpl extends ServiceImpl<WindTowerDataParentTableM
|
|
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
+
|
|
//场站新增风机信息
|
|
//场站新增风机信息
|
|
- public void saveFanTowerForStationInfo(FanTowerDto fanTowerDto){
|
|
|
|
|
|
+ public void saveFanTowerForStationInfo(FanTowerDto fanTowerDto) {
|
|
StationInfo oneStationInfo = stationInfoService.getOneStationInfo(fanTowerDto.getId());
|
|
StationInfo oneStationInfo = stationInfoService.getOneStationInfo(fanTowerDto.getId());
|
|
- if(oneStationInfo.getFanTowerList() == null){
|
|
|
|
|
|
+ if (oneStationInfo.getFanTowerList() == null) {
|
|
oneStationInfo.setFanTowerList(new ArrayList<>());
|
|
oneStationInfo.setFanTowerList(new ArrayList<>());
|
|
}
|
|
}
|
|
FanTower fanTower = new FanTower();
|
|
FanTower fanTower = new FanTower();
|
|
@@ -154,7 +152,7 @@ public class FengJiInfoServiceImpl extends ServiceImpl<WindTowerDataParentTableM
|
|
}
|
|
}
|
|
|
|
|
|
//项目删除风机信息
|
|
//项目删除风机信息
|
|
- public void deleteFanTowerForProjectInfo(FanTowerDto fanTowerDto){
|
|
|
|
|
|
+ public void deleteFanTowerForProjectInfo(FanTowerDto fanTowerDto) {
|
|
ProjectInfo projectInfoById = projectInfoService.getOneProjectInfoById(fanTowerDto.getId());
|
|
ProjectInfo projectInfoById = projectInfoService.getOneProjectInfoById(fanTowerDto.getId());
|
|
List<FanTower> fanTowerList = projectInfoById.getFanTowerList().stream().peek(s -> {
|
|
List<FanTower> fanTowerList = projectInfoById.getFanTowerList().stream().peek(s -> {
|
|
if (s.getId().equals(fanTowerDto.getFanId())) {
|
|
if (s.getId().equals(fanTowerDto.getFanId())) {
|
|
@@ -167,7 +165,7 @@ public class FengJiInfoServiceImpl extends ServiceImpl<WindTowerDataParentTableM
|
|
|
|
|
|
|
|
|
|
//场站删除风机信息
|
|
//场站删除风机信息
|
|
- public void deleteFanTowerForStationInfo(FanTowerDto fanTowerDto){
|
|
|
|
|
|
+ public void deleteFanTowerForStationInfo(FanTowerDto fanTowerDto) {
|
|
StationInfo oneStationInfo = stationInfoService.getOneStationInfo(fanTowerDto.getId());
|
|
StationInfo oneStationInfo = stationInfoService.getOneStationInfo(fanTowerDto.getId());
|
|
List<FanTower> fanTowerList = oneStationInfo.getFanTowerList().stream().peek(s -> {
|
|
List<FanTower> fanTowerList = oneStationInfo.getFanTowerList().stream().peek(s -> {
|
|
if (s.getId().equals(fanTowerDto.getFanId())) {
|
|
if (s.getId().equals(fanTowerDto.getFanId())) {
|
|
@@ -189,9 +187,10 @@ public class FengJiInfoServiceImpl extends ServiceImpl<WindTowerDataParentTableM
|
|
fanTowerDto.setLongitudeFan(fanTower.getLongitudeFan());
|
|
fanTowerDto.setLongitudeFan(fanTower.getLongitudeFan());
|
|
fanTowerDto.setHubHeight(fanTower.getHubHeight());
|
|
fanTowerDto.setHubHeight(fanTower.getHubHeight());
|
|
}
|
|
}
|
|
|
|
+
|
|
//重组组风机信息
|
|
//重组组风机信息
|
|
public void getFanTower(FanTowerDto fanTowerDto, FanTower fanTower) {
|
|
public void getFanTower(FanTowerDto fanTowerDto, FanTower fanTower) {
|
|
- fanTower.setId(fanTowerDto.getFanId());
|
|
|
|
|
|
+ fanTower.setId(fanTowerDto.getFanId() == null ? UUID.randomUUID().toString() : fanTowerDto.getFanId());
|
|
fanTower.setFanModel(fanTowerDto.getFanModel());
|
|
fanTower.setFanModel(fanTowerDto.getFanModel());
|
|
fanTower.setFanName(fanTowerDto.getFanName());
|
|
fanTower.setFanName(fanTowerDto.getFanName());
|
|
fanTower.setLatitudeFan(fanTowerDto.getLatitudeFan());
|
|
fanTower.setLatitudeFan(fanTowerDto.getLatitudeFan());
|