|
@@ -29,8 +29,13 @@ public class FengJiInfoServiceImpl extends ServiceImpl<WindTowerDataParentTableM
|
|
|
private final StationInfoService stationInfoService;
|
|
|
|
|
|
//查询项目风机
|
|
|
- public List<FanTowerDto> getFanTowerForProject() {
|
|
|
- List<ProjectInfo> projectInfoList = projectInfoService.getProjectInfoList();
|
|
|
+ public List<FanTowerDto> getFanTowerForProject(String id) {
|
|
|
+ List<ProjectInfo> projectInfoList = new ArrayList<>();
|
|
|
+ if(id.equals("")){
|
|
|
+ projectInfoList = projectInfoService.getProjectInfoList();
|
|
|
+ }else{
|
|
|
+ projectInfoList.add(projectInfoService.getOneProjectInfoById(id));
|
|
|
+ }
|
|
|
ArrayList<FanTowerDto> list = new ArrayList<>();
|
|
|
for (ProjectInfo projectInfo : projectInfoList) {
|
|
|
if (projectInfo.getFanTowerList() != null) {
|
|
@@ -60,8 +65,14 @@ public class FengJiInfoServiceImpl extends ServiceImpl<WindTowerDataParentTableM
|
|
|
}
|
|
|
|
|
|
//查询场站风机
|
|
|
- public List<FanTowerDto> getFanTowerForStation() {
|
|
|
- List<StationInfo> stationInfos = stationInfoService.selectStationInfo();
|
|
|
+ public List<FanTowerDto> getFanTowerForStation(String id) {
|
|
|
+ List<StationInfo> stationInfos = new ArrayList<>();
|
|
|
+ if(id.equals("")){
|
|
|
+ stationInfos = stationInfoService.selectStationInfo();
|
|
|
+ }else{
|
|
|
+ stationInfos.add(stationInfoService.getOneStationInfo(id));
|
|
|
+ }
|
|
|
+
|
|
|
ArrayList<FanTowerDto> list = new ArrayList<>();
|
|
|
for (StationInfo stationInfo : stationInfos) {
|
|
|
if (stationInfo.getFanTowerList() != null) {
|