驾驶舱

energy-manage-service/src/main/java/com/energy/manage/service/controller/windenginegroup/WindEngineGroupController.java

@@ -11,6 +11,7 @@ import com.energy.manage.service.domain.dto.windenginegroup.WindEngineGroupCodeD
 import com.energy.manage.service.domain.dto.windenginegroup.WindEngineGroupCreateDto;
 import com.energy.manage.service.domain.dto.windenginegroup.WindEngineGroupPageDto;
 import com.energy.manage.service.domain.dto.windenginegroup.WindEngineGroupStateDto;
+import com.energy.manage.service.domain.vo.cockpit.WindFieldGroupTowerVo;
 import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupPageVo;
 import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupVo;
 import com.energy.manage.service.service.windenginegroup.WindEngineGroupService;
@@ -80,9 +81,9 @@ public class WindEngineGroupController extends BaseServiceController {
     @UserLoginToken
     @PostMapping(value = "/getWindEngineGroupByFieldCode")
     @ApiOperation(value = "通过风场code查询风机集合(jsc)")
-    public ResultResp<List<WindEngineGroupVo>> getWindEngineGroupByFieldCode(@RequestBody WindEngineGroupFieldCodeDto windEngineGroupFieldCodeDto) {
-        List<WindEngineGroupVo> list = windEngineGroupService.getWindEngineGroupByFieldCode(windEngineGroupFieldCodeDto.getFieldCode());
-        return ResultResp.SUCCESS(list);
+    public ResultResp<WindFieldGroupTowerVo> getWindEngineGroupByFieldCode(@RequestBody WindEngineGroupFieldCodeDto windEngineGroupFieldCodeDto) {
+        WindFieldGroupTowerVo vo = windEngineGroupService.getWindEngineGroupByFieldCode(windEngineGroupFieldCodeDto.getFieldCode());
+        return ResultResp.SUCCESS(vo);
     }
 
     @UserLoginToken

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/cockpit/WindFieldGroupTowerVo.java

@@ -0,0 +1,25 @@
+package com.energy.manage.service.domain.vo.cockpit;
+
+import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerByFieldVo;
+import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerVo;
+import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+@ApiModel
+public class WindFieldGroupTowerVo {
+
+    @ApiModelProperty("风机信息")
+    List<WindEngineGroupVo> windEngineGroupVoList;
+
+    @ApiModelProperty("测风塔信息")
+    List<AnemometerTowerByFieldVo> anemometerTowerList;
+
+
+}

energy-manage-service/src/main/java/com/energy/manage/service/service/windenginegroup/WindEngineGroupService.java

@@ -4,6 +4,7 @@ package com.energy.manage.service.service.windenginegroup;
 import com.energy.manage.common.base.Page;
 import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.domain.dto.windenginegroup.*;
+import com.energy.manage.service.domain.vo.cockpit.WindFieldGroupTowerVo;
 import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupPageVo;
 import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupVo;
 import org.springframework.web.multipart.MultipartFile;
@@ -47,7 +48,7 @@ public interface WindEngineGroupService {
      * @param fieldCode
      * @return
      */
-    List<WindEngineGroupVo> getWindEngineGroupByFieldCode(String fieldCode);
+    WindFieldGroupTowerVo getWindEngineGroupByFieldCode(String fieldCode);
 
 
     /**

energy-manage-service/src/main/java/com/energy/manage/service/service/windenginegroup/impl/WindEngineGroupServiceImpl.java

@@ -17,12 +17,15 @@ import com.energy.manage.common.util.IdGeneratorUtil;
 import com.energy.manage.service.domain.dto.windenginegroup.*;
 import com.energy.manage.service.domain.dto.windfield.WindFieldCodeDto;
 import com.energy.manage.service.domain.dto.windfield.WindFieldUpdateDto;
+import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerByFieldVo;
+import com.energy.manage.service.domain.vo.cockpit.WindFieldGroupTowerVo;
 import com.energy.manage.service.domain.vo.excel.WindEngineGroupExcelVo;
 import com.energy.manage.service.domain.vo.excel.WindFieldExceVo;
 import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupPageVo;
 import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupVo;
 import com.energy.manage.service.domain.vo.windfield.WindFieldVo;
 import com.energy.manage.service.mappers.windenginegroup.WindEngineGroupMapper;
+import com.energy.manage.service.service.anemometertower.AnemometerTowerService;
 import com.energy.manage.service.service.cache.CacheService;
 import com.energy.manage.service.service.windenginegroup.WindEngineGroupService;
 import com.energy.manage.service.service.windfield.WindFieldService;
@@ -52,6 +55,9 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
     @Autowired
     private CacheService cacheService;
 
+    @Autowired
+    private AnemometerTowerService anemometerTowerService;
+
 
     @Autowired
     private WindEngineGroupMapper windEngineGroupMapper;
@@ -168,7 +174,11 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
     }
 
     @Override
-    public List<WindEngineGroupVo> getWindEngineGroupByFieldCode(String fieldCode) {
+    public WindFieldGroupTowerVo getWindEngineGroupByFieldCode(String fieldCode) {
+
+        WindFieldGroupTowerVo windFieldGroupTowerVo = new WindFieldGroupTowerVo();
+
+        // 处理风机信息
         Example queryExample = new Example(WindEngineGroupPO.class);
         Example.Criteria criteria = queryExample.createCriteria();
         criteria.andEqualTo("fieldCode", fieldCode);
@@ -178,13 +188,19 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
             return null;
         }
         WindEngineGroupVo windEngineGroupVo = null;
-        List<WindEngineGroupVo> list = Lists.newArrayList();
+        List<WindEngineGroupVo> engineGroupVoArrayList = Lists.newArrayList();
         for (WindEngineGroupPO po : engineGroupPOS) {
             windEngineGroupVo = new WindEngineGroupVo();
             BeanUtil.copyProperties(po,windEngineGroupVo);
-            list.add(windEngineGroupVo);
+            engineGroupVoArrayList.add(windEngineGroupVo);
         }
-        return list;
+
+        // 处理测风塔信息
+        List<AnemometerTowerByFieldVo> anemometerTowerByFields = anemometerTowerService.getAnemometerTowerByField(fieldCode);
+        windFieldGroupTowerVo.setWindEngineGroupVoList(engineGroupVoArrayList);
+        windFieldGroupTowerVo.setAnemometerTowerList(anemometerTowerByFields);
+
+        return windFieldGroupTowerVo;
     }