修改部分风场管理部分问题

energy-manage-service/src/main/java/com/energy/manage/service/controller/anemometertower/AnemometerTowerController.java

@@ -6,6 +6,7 @@ import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.config.annotations.UserLoginToken;
 import com.energy.manage.service.domain.dto.anemometertower.*;
 import com.energy.manage.service.domain.dto.windfield.WindFieldPageDto;
+import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerByFieldVo;
 import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerHeightVo;
 import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerPageVo;
 import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerVo;
@@ -16,6 +17,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @Slf4j
 @RestController
 @CrossOrigin
@@ -58,7 +61,7 @@ public class AnemometerTowerController {
     @UserLoginToken
     @PostMapping(value = "/getAnemometerTowerPage")
     @ApiOperation(value = "查询测风塔分页信息")
-    public ResultResp<Page<AnemometerTowerPageVo> > getAnemometerTowerPage(@RequestBody AnemometerTowerPageDto anemometerTowerPageDto) {
+    public ResultResp<Page<AnemometerTowerPageVo>> getAnemometerTowerPage(@RequestBody AnemometerTowerPageDto anemometerTowerPageDto) {
         Page<AnemometerTowerPageVo>  page = anemometerTowerService.getAnemometerTowerPage(anemometerTowerPageDto);
         return ResultResp.SUCCESS(page);
     }
@@ -81,6 +84,18 @@ public class AnemometerTowerController {
         return ResultResp.SUCCESS(vo);
     }
 
+
+
+    @UserLoginToken
+    @PostMapping(value = "/getAnemometerTowerByField")
+    @ApiOperation(value = "通过风场编号查询测风塔信息")
+    public ResultResp<List<AnemometerTowerByFieldVo>> getAnemometerTowerByField(@RequestBody AnemometerTowerByFieldDto anemometerTowerByFieldDto) {
+        List<AnemometerTowerByFieldVo> anemometerTowerByField  = anemometerTowerService.getAnemometerTowerByField(anemometerTowerByFieldDto.getFieldCode());
+        return ResultResp.SUCCESS(anemometerTowerByField);
+    }
+
+
+
     @UserLoginToken
     @PostMapping(value = "/updateAnemometerTower")
     @ApiOperation(value = "修改测风塔数据")

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerByFieldDto.java

@@ -0,0 +1,14 @@
+package com.energy.manage.service.domain.dto.anemometertower;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class AnemometerTowerByFieldDto {
+
+    @ApiModelProperty("风场编号")
+    private  String fieldCode;
+
+}

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/anemometertower/AnemometerTowerByFieldVo.java

@@ -26,6 +26,18 @@ public class AnemometerTowerByFieldVo {
     @ApiModelProperty("测风塔名称")
     private String anemometerName;
 
+    @ApiModelProperty("经度")
+    private String longitude;
+
+
+    @ApiModelProperty("纬度")
+    private String latitude;
+
+    /**
+     * 测风塔高度集合字符串
+     */
+    @ApiModelProperty("测风塔高度集合字符串")
+    private String anemometerHeightStrings;
 
 
 

energy-manage-service/src/main/java/com/energy/manage/service/service/anemometertower/impl/AnemometerTowerServiceImpl.java

@@ -240,7 +240,7 @@ public class AnemometerTowerServiceImpl extends BaseServiceImpl<AnemometerTowerP
         if (StringUtils.isEmpty(fieldCode)) {
             return null;
         }
-        return anemometerTowerMapper.selectAnemometerTowerByfieldCode(fieldCode);
+       return anemometerTowerMapper.selectAnemometerTowerByfieldCode(fieldCode);
     }
 
     @Override

energy-manage-service/src/main/resources/mybatis/anemometertower/AnemometerTowerMapper.xml

@@ -43,11 +43,16 @@
     <select id="selectAnemometerTowerByfieldCode" resultType="com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerByFieldVo">
         select
         ato.anemometer_code,
-        ato.anemometer_name
+        ato.anemometer_name,
+        ato.longitude,
+        ato.latitude,
+        ah.anemometerHeightStrings
         FROM
         anemometer_tower_relation atr
         left join
         anemometer_tower ato on atr.tower_code = ato.anemometer_code
+        left join
+        (select anemometer_code,group_concat(anemometer_height SEPARATOR '/') as anemometerHeightStrings from anemometer_tower_height group by anemometer_code) as  ah on ato.anemometer_code = ah.anemometer_code
         where 1=1
         AND
         atr.field_code = #{fieldCode}