zy 2 роки тому
батько
коміт
4775d4523b

+ 14 - 4
neim-biz/src/main/java/com/jiayue/biz/controller/FengJiInfoController.java

@@ -61,9 +61,19 @@ public class FengJiInfoController extends BaseController {
         }
         return AjaxResult.success(list);
     }
-
-
-
-
+    /**
+     * 查询项目风机
+     */
+    @GetMapping("/getFanTowerForProject")
+    public AjaxResult getFanTowerForProject(String id) {
+        return AjaxResult.success(fengJiInfoService.getFanTowerForProject(id));
+    }
+    /**
+     * 查询场站风机
+     */
+    @GetMapping("/getFanTowerForStation")
+    public AjaxResult getFanTowerForStation(String id) {
+        return AjaxResult.success(fengJiInfoService.getFanTowerForStation(id));
+    }
 
 }

+ 2 - 2
neim-biz/src/main/java/com/jiayue/biz/service/FengJiInfoService.java

@@ -17,10 +17,10 @@ import java.util.Map;
 public interface FengJiInfoService extends IService<WindTowerDataParentTable> {
 
     //查询项目风机
-    List<FanTowerDto> getFanTowerForProject();
+    List<FanTowerDto> getFanTowerForProject(String id);
 
 
     //查询场站风机
-    List<FanTowerDto> getFanTowerForStation();
+    List<FanTowerDto> getFanTowerForStation(String id);
 
 }

+ 2 - 1
neim-biz/src/main/java/com/jiayue/biz/service/StationInfoService.java

@@ -8,7 +8,8 @@ import java.util.List;
 public interface StationInfoService {
     //查询场站信息
     List<StationInfo> selectStationInfo();
-
+    // 根据id查询场站信息
+    StationInfo getOneStationInfo(String id);
     //场站管理---查询
     List<StationInfoDto> selectStationInfoDto();
 

+ 15 - 4
neim-biz/src/main/java/com/jiayue/biz/service/impl/FengJiInfoServiceImpl.java

@@ -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) {

+ 16 - 0
neim-ui/src/api/biz/dataQuery/fengjiInfo.js

@@ -15,4 +15,20 @@ export function getStationInfo() {
     method: 'get'
   })
 }
+// 获取场站风机
+export function getFanTowerForStation(query) {
+  return request({
+    url: '/dataQuery/fengjiInfo/getFanTowerForStation',
+    method: 'get',
+    params: query
+  })
+}
+// 获取项目风机
+export function getFanTowerForProject(query) {
+  return request({
+    url: '/dataQuery/fengjiInfo/getFanTowerForProject',
+    method: 'get',
+    params: query
+  })
+}