增加字段

energy-manage-common/src/main/java/com/energy/manage/common/po/area/AreaPO.java

@@ -16,13 +16,14 @@ import java.io.Serializable;
 @Setter
 public class AreaPO implements Serializable {
 
-  private Integer areaId;
+    private Integer areaId;
 
-  private String province;
+    private String province;
 
-  private String city;
+    private String city;
 
-  private String area;
+    private String area;
+
+    private String areaCode;
 
-  private String areaCode;
 }

energy-manage-common/src/main/java/com/energy/manage/common/po/windenginegroup/WindEngineGroupPO.java

@@ -59,6 +59,18 @@ public class WindEngineGroupPO extends NewBaseDomain {
      */
     private Integer sightcing;
     /**
+     * 额定风速 （m/s）
+     */
+    private Double rated_wind_speed;
+    /**
+     * 切入风速 （m/s）
+     */
+    private Double ratedCutInWindspeed;
+    /**
+     * 切出风速 （m/s）
+     */
+    private Double ratedCutOutWindspeed;
+    /**
      * 删除状态
      */
     private Integer delState;

energy-manage-common/src/main/java/com/energy/manage/common/po/windenginemill/WindEngineMillPO.java

@@ -65,6 +65,17 @@ public class WindEngineMillPO {
      * 标注功率曲线地址
      */
     private String powerCriterionUrl;
+
+    /**
+     * 叶轮直径（m）
+     */
+    private Double rotorDiameter;
+
+    /**
+     *传动比-转速比（无单位）
+     */
+    private Double rotationalSpeedRatio;
+
     /**
      * 创建人
      */

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

@@ -40,8 +40,8 @@ public class WindEngineGroupController {
     @UserLoginToken
     @PostMapping(value = "/windEngineGroupImportData")
     @ApiOperation(value = "导入风机信息")
-    public ResultResp windEngineGroupImportData(@RequestPart MultipartFile file,@RequestParam("fieldCode") String fieldCode) {
-        boolean flg = windEngineGroupService.windEngineGroupImportData(file,fieldCode);
+    public ResultResp windEngineGroupImportData(@RequestPart MultipartFile file, @RequestParam("fieldCode") String fieldCode) {
+        boolean flg = windEngineGroupService.windEngineGroupImportData(file, fieldCode);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
 
@@ -49,16 +49,16 @@ public class WindEngineGroupController {
     @UserLoginToken
     @PostMapping(value = "/afreshWindEngineGroupImportData")
     @ApiOperation(value = "重新上传风机信息")
-    public ResultResp afreshWindEngineGroupImportData(@RequestPart MultipartFile file,@RequestParam("fieldCode") String fieldCode) {
-        boolean flg = windEngineGroupService.afreshWindEngineGroupImportData(file,fieldCode);
-        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+    public ResultResp afreshWindEngineGroupImportData(@RequestPart MultipartFile file, @RequestParam("fieldCode") String fieldCode) {
+//        boolean flg = windEngineGroupService.afreshWindEngineGroupImportData(file,fieldCode);
+        return null;
     }
 
 
     @UserLoginToken
     @PostMapping(value = "/windEngineGrouPage")
     @ApiOperation(value = "风机分页查询")
-    public ResultResp< Page<WindEngineGroupPageVo>> windEngineGrouPage (@RequestBody WindEngineGroupPageDto windEngineGroupPageDto) {
+    public ResultResp<Page<WindEngineGroupPageVo>> windEngineGrouPage(@RequestBody WindEngineGroupPageDto windEngineGroupPageDto) {
         Page<WindEngineGroupPageVo> page = windEngineGroupService.windEngineGrouPage(windEngineGroupPageDto);
         return ResultResp.SUCCESS(page);
     }
@@ -98,6 +98,4 @@ public class WindEngineGroupController {
     }
 
 
-
-
 }

energy-manage-service/src/main/java/com/energy/manage/service/controller/windfield/WindFieldController.java

@@ -58,23 +58,12 @@ public class WindFieldController {
     @PostMapping(value = "/windFieldImportData")
     @ApiOperation(value = "导入风场信息")
     public ResultResp windFieldImportData(@RequestPart MultipartFile file,
-                                          @RequestParam(required = true) String companyCode,
-                                          @RequestParam(required = true) Integer provinceId,
-                                          @RequestParam(required = true) String provinceName,
-                                          @RequestParam(required = true) Integer cityId,
-                                          @RequestParam(required = true) String cityName,
-                                          @RequestParam(required = true) String areaCode) {
+                                          @RequestParam(required = true) String companyCode) {
 
         WindFieldImportDataDto windFieldImportDataDto = new WindFieldImportDataDto();
         windFieldImportDataDto.setCompanyCode(companyCode);
-        windFieldImportDataDto.setProvinceId(provinceId);
-        windFieldImportDataDto.setProvinceName(provinceName);
-        windFieldImportDataDto.setCityId(cityId);
-        windFieldImportDataDto.setCityName(cityName);
-        windFieldImportDataDto.setAreaCode(areaCode);
 
-        boolean flg = windFieldService.windFieldImportData(file, windFieldImportDataDto);
-        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+        return  windFieldService.windFieldImportData(file, windFieldImportDataDto);
     }
 
     @Deprecated
@@ -82,24 +71,9 @@ public class WindFieldController {
     @PostMapping(value = "/afreshWindFieldImportData")
     @ApiOperation(value = "重新导入风场信息")
     public ResultResp afreshWindFieldImportData(@RequestPart MultipartFile file,
-                                                @RequestParam(required = true) String companyCode,
-                                                @RequestParam(required = true) Integer provinceId,
-                                                @RequestParam(required = true) String provinceName,
-                                                @RequestParam(required = true) Integer cityId,
-                                                @RequestParam(required = true) String cityName,
-                                                @RequestParam(required = true) String areaCode) {
-
-//        WindFieldImportDataDto windFieldImportDataDto = new WindFieldImportDataDto();
-//        windFieldImportDataDto.setCompanyCode(companyCode);
-//        windFieldImportDataDto.setProvinceId(provinceId);
-//        windFieldImportDataDto.setProvinceName(provinceName);
-//        windFieldImportDataDto.setCityId(cityId);
-//        windFieldImportDataDto.setCityName(cityName);
-//        windFieldImportDataDto.setAreaCode(areaCode);
-//
-//        boolean flg = windFieldService.afreshWindFieldImportData(file, windFieldImportDataDto);
-//        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
-        return null;
+                                                @RequestParam(required = true) String companyCode) {
+
+        return ResultResp.FAIL("此接口已作废！");
     }
 
     @UserLoginToken

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginegroup/WindEngineGroupCreateDto.java

@@ -79,5 +79,21 @@ public class WindEngineGroupCreateDto {
     @ApiModelProperty("是否标杆风机")
     private Integer sightcing;
 
+    /**
+     * 额定风速 （m/s）
+     */
+    @ApiModelProperty("额定风速")
+    private Double rated_wind_speed;
+    /**
+     * 切入风速 （m/s）
+     */
+    @ApiModelProperty("切入风速")
+    private Double ratedCutInWindspeed;
+    /**
+     * 切出风速 （m/s）
+     */
+    @ApiModelProperty("切出风速")
+    private Double ratedCutOutWindspeed;
+
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginegroup/WindEngineGroupUpdateDto.java

@@ -72,5 +72,19 @@ public class WindEngineGroupUpdateDto {
      */
     @ApiModelProperty("是否标杆风机")
     private Integer sightcing;
-
+    /**
+     * 额定风速 （m/s）
+     */
+    @ApiModelProperty("额定风速")
+    private Double rated_wind_speed;
+    /**
+     * 切入风速 （m/s）
+     */
+    @ApiModelProperty("切入风速")
+    private Double ratedCutInWindspeed;
+    /**
+     * 切出风速 （m/s）
+     */
+    @ApiModelProperty("切出风速")
+    private Double ratedCutOutWindspeed;
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginemill/WindEngineMillCreateDto.java

@@ -57,4 +57,16 @@ public class WindEngineMillCreateDto {
     @ApiModelProperty("驱动类型")
     private Integer curvedMotionType;
 
+    /**
+     * 叶轮直径（m）
+     */
+    @ApiModelProperty("叶轮直径（m）")
+    private Double rotorDiameter;
+
+    /**
+     *传动比-转速比（无单位）
+     */
+    @ApiModelProperty("传动比-转速比（无单位）")
+    private Double rotationalSpeedRatio;
+
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfield/WindFieldImportDataDto.java

@@ -17,32 +17,6 @@ public class WindFieldImportDataDto {
      */
     @ApiModelProperty("企业编号")
     private String companyCode;
-    /**
-     * 省编号
-     */
-    @ApiModelProperty("省编号")
-    private Integer provinceId;
-    /**
-     * 省名字
-     */
-    @ApiModelProperty("省名字")
-    private String provinceName;
-    /**
-     * 市编号
-     */
-    @ApiModelProperty("市编号")
-    private Integer cityId;
-    /**
-     * 市名字
-     */
-    @ApiModelProperty("市名字")
-    private String cityName;
-
-    /**
-     * 区号
-     */
-    @ApiModelProperty("区号")
-    private String areaCode;
 
 
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/excel/WindFieldExceVo.java

@@ -8,31 +8,57 @@ import lombok.Data;
  */
 @Data
 public class WindFieldExceVo {
-
     /**
      * 风场名称
      */
-    @ExcelProperty(value = "风场名称", index = 1)
+    @ExcelProperty(value = "风场名称", index = 0)
     private String fieldName;
+
     /**
-     * 空气密度
+     * 省id
      */
-    @ExcelProperty(value = "空气密度", index = 2)
-    private Double density;
+    private Integer provinceId;
+    /**
+     * 省
+     */
+    @ExcelProperty(value = "省", index = 1)
+    private String provinceName;
+
+    /**
+     * 市id
+     */
+    private Integer cityId;
+    /**
+     * 市
+     */
+    @ExcelProperty(value = "市", index = 2)
+    private String cityName;
+
+    /**
+     * 区号
+     */
+    @ExcelProperty(value = "区号", index = 3)
+    private String areaCode;
+
     /**
      * 经度
      */
-    @ExcelProperty(value = "经度", index = 3)
+    @ExcelProperty(value = "经度", index = 4)
     private Double longitude;
     /**
      * 纬度
      */
-    @ExcelProperty(value = "纬度", index = 4)
+    @ExcelProperty(value = "纬度", index = 5)
     private Double latitude;
     /**
+     * 空气密度
+     */
+    @ExcelProperty(value = "空气密度", index = 6)
+    private Double density;
+    /**
      * 海拔高度
      */
-    @ExcelProperty(value = "海拔高度", index = 5)
+    @ExcelProperty(value = "海拔高度", index = 7)
     private Double elevationHeight;
 
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/windenginegroup/WindEngineGroupPageVo.java

@@ -84,5 +84,20 @@ public class WindEngineGroupPageVo {
     @ApiModelProperty(value = "厂商名字")
     private String manufacturerName;
 
+    /**
+     * 额定风速 （m/s）
+     */
+    @ApiModelProperty("额定风速")
+    private Double rated_wind_speed;
+    /**
+     * 切入风速 （m/s）
+     */
+    @ApiModelProperty("切入风速")
+    private Double ratedCutInWindspeed;
+    /**
+     * 切出风速 （m/s）
+     */
+    @ApiModelProperty("切出风速")
+    private Double ratedCutOutWindspeed;
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/windenginegroup/WindEngineGroupVo.java

@@ -70,6 +70,20 @@ public class WindEngineGroupVo {
     @ApiModelProperty("是否标杆风机")
     private Integer sightcing;
 
-
+    /**
+     * 额定风速 （m/s）
+     */
+    @ApiModelProperty("额定风速")
+    private Double rated_wind_speed;
+    /**
+     * 切入风速 （m/s）
+     */
+    @ApiModelProperty("切入风速")
+    private Double ratedCutInWindspeed;
+    /**
+     * 切出风速 （m/s）
+     */
+    @ApiModelProperty("切出风速")
+    private Double ratedCutOutWindspeed;
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/windenginemill/WindEngineMillPageVo.java

@@ -77,6 +77,7 @@ public class WindEngineMillPageVo {
     @ApiModelProperty(value = "标注功率曲线地址")
     private String powerCriterionUrl;
 
+    
 
     /**
      * 创建时间
@@ -85,6 +86,17 @@ public class WindEngineMillPageVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
 
+    /**
+     * 叶轮直径（m）
+     */
+    @ApiModelProperty("叶轮直径（m）")
+    private Double rotorDiameter;
+
+    /**
+     *传动比-转速比（无单位）
+     */
+    @ApiModelProperty("传动比-转速比（无单位）")
+    private Double rotationalSpeedRatio;
 
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/mappers/area/AreaMapper.java

@@ -56,4 +56,10 @@ public interface AreaMapper extends MyMapper<AreaPO> {
     List<AreaPO> finaProvinceByRegionId(@Param("regionId") int regionId);
 
     int updateAreaCodes(@Param("list") List<AreaPO> list);
+
+
+    List<AreaPO> selectAreaByNames(@Param("type")Integer type,@Param("list")List<String> names);
+
+
+
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/area/AreaApiService.java

@@ -16,6 +16,15 @@ public interface AreaApiService extends BaseService<AreaPO> {
    */
   List<AreaPO> findAllProvince();
 
+
+  /**
+   * 通过类型和名字查询区域数据集合
+   * @param type
+   * @param names
+   * @return
+   */
+  List<AreaPO> getAllProvinceByName(Integer type,List<String> names);
+
   /**
    * 根据省份信息获取对应的城市信息
    *

energy-manage-service/src/main/java/com/energy/manage/service/service/area/impl/AreaApiServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSONObject;
 import com.energy.manage.common.base.BaseServiceImpl;
 import com.energy.manage.common.po.area.AreaPO;
+import com.energy.manage.common.po.windfield.WindFieldPO;
 import com.energy.manage.common.reponse.RespMsg;
 import com.energy.manage.service.domain.vo.area.ProvinceVo;
 import com.energy.manage.service.domain.vo.excel.AreaCodeExcelVo;
@@ -16,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import tk.mybatis.mapper.entity.Example;
 
 import java.io.File;
 import java.util.List;
@@ -41,6 +43,12 @@ public class AreaApiServiceImpl extends BaseServiceImpl<AreaPO> implements AreaA
         return areaMapper.findAllProvince();
     }
 
+    @Override
+    public List<AreaPO> getAllProvinceByName(Integer type,List<String> names) {
+        return areaMapper.selectAreaByNames(type,names);
+    }
+
+
     /**
      * 根据省份信息获取对应的城市信息
      *

energy-manage-service/src/main/java/com/energy/manage/service/service/windfield/WindFieldService.java

@@ -2,6 +2,7 @@ package com.energy.manage.service.service.windfield;
 
 import com.energy.manage.common.base.Page;
 import com.energy.manage.common.po.windfield.WindFieldPO;
+import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.domain.dto.windfield.*;
 import com.energy.manage.service.domain.vo.windfield.WindFieldPageVo;
 import com.energy.manage.service.domain.vo.windfield.WindFieldVo;
@@ -29,15 +30,7 @@ public interface WindFieldService {
      * @param windFieldImportDataDto
      * @return
      */
-    boolean windFieldImportData(MultipartFile file, WindFieldImportDataDto windFieldImportDataDto);
-
-    /**
-     * 重新上传风场信息
-     * @param file
-     * @param windFieldImportDataDto
-     * @return
-     */
-    boolean afreshWindFieldImportData(MultipartFile file, WindFieldImportDataDto windFieldImportDataDto);
+    ResultResp windFieldImportData(MultipartFile file, WindFieldImportDataDto windFieldImportDataDto);
 
 
     /**

energy-manage-service/src/main/java/com/energy/manage/service/service/windfield/impl/WindFieldServiceImpl.java

@@ -11,9 +11,11 @@ import com.energy.manage.common.constant.redis.ManagerRedisKeyConstant;
 import com.energy.manage.common.enums.DeleteStatusEnum;
 import com.energy.manage.common.enums.IdPrefixEnum;
 import com.energy.manage.common.enums.TypeRelationEnum;
+import com.energy.manage.common.po.area.AreaPO;
 import com.energy.manage.common.po.company.WindCompanyPO;
 import com.energy.manage.common.po.windenginemill.WindEngineMillPO;
 import com.energy.manage.common.po.windfield.WindFieldPO;
+import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.common.util.IdGeneratorUtil;
 import com.energy.manage.service.domain.dto.anemometertower.AnemometerTowerDto;
 import com.energy.manage.service.domain.dto.anemometertower.AnemometerTowerRelationDto;
@@ -28,6 +30,7 @@ import com.energy.manage.service.domain.vo.windfield.WindFieldVo;
 import com.energy.manage.service.domain.vo.windrelation.WindRelationVo;
 import com.energy.manage.service.mappers.windfield.WindFieldMapper;
 import com.energy.manage.service.service.anemometertower.AnemometerTowerService;
+import com.energy.manage.service.service.area.AreaApiService;
 import com.energy.manage.service.service.cache.CacheService;
 import com.energy.manage.service.service.windfield.WindFieldResourceService;
 import com.energy.manage.service.service.windfield.WindFieldService;
@@ -49,12 +52,15 @@ import tk.mybatis.mapper.entity.Example;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 @Slf4j
 @Service
 public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implements WindFieldService {
 
+    @Autowired
+    private AreaApiService areaApiService;
 
     @Autowired
     private CacheService cacheService;
@@ -93,7 +99,7 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
         if (!CollectionUtils.isEmpty(windFieldDto.getAnemometerTowerRelationDtos())) {
             AnemometerTowerRelationDto anemometerTowerRelationDto = null;
             List<AnemometerTowerRelationDto> anemometerTowerDtos = Lists.newArrayList();
-            for(WindFieldDto.AnemometerTowerRelationDto anemometerTowerRelationDto1 : windFieldDto.getAnemometerTowerRelationDtos()){
+            for (WindFieldDto.AnemometerTowerRelationDto anemometerTowerRelationDto1 : windFieldDto.getAnemometerTowerRelationDtos()) {
                 anemometerTowerRelationDto = new AnemometerTowerRelationDto();
                 BeanUtils.copyProperties(anemometerTowerRelationDto1, anemometerTowerRelationDto);
                 anemometerTowerRelationDto.setFieldCode(windFieldDto.getFieldCode());
@@ -125,31 +131,44 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
     @SneakyThrows
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean windFieldImportData(MultipartFile file, WindFieldImportDataDto windFieldImportDataDto) {
+    public ResultResp windFieldImportData(MultipartFile file, WindFieldImportDataDto windFieldImportDataDto) {
+        ;
         List<WindFieldExceVo> windFieldExceVos = EasyExcel.read(file.getInputStream()).head(WindFieldExceVo.class).sheet().doReadSync();
         if (CollectionUtils.isEmpty(windFieldExceVos)) {
-            return false;
+            return ResultResp.FAIL("未读取到文件数据，请核对数据准确性！");
         }
+
+        // Todo 获取区域信息
+        List<String> provinceNames = windFieldExceVos.stream().map(WindFieldExceVo::getProvinceName).distinct().collect(Collectors.toList());
+        List<AreaPO> areaProvinces = areaApiService.getAllProvinceByName(1,provinceNames);
+
+
+        List<String> cityNames = windFieldExceVos.stream().map(WindFieldExceVo::getCityName).distinct().collect(Collectors.toList());
+        List<AreaPO> areacitys = areaApiService.getAllProvinceByName(2,cityNames);
+
+
+
         WindFieldPO windFieldPO = null;
         List<WindFieldPO> list = Lists.newArrayList();
 
         for (WindFieldExceVo windFieldExceVo : windFieldExceVos) {
-            windFieldPO = this.createWindFieldPO(windFieldImportDataDto);
-            windFieldPO.setFieldName(windFieldExceVo.getFieldName());
-            windFieldPO.setDensity(windFieldExceVo.getDensity());
-            windFieldPO.setLatitude(windFieldExceVo.getLatitude());
-            windFieldPO.setLongitude(windFieldExceVo.getLongitude());
-            windFieldPO.setElevationHeight(windFieldExceVo.getElevationHeight());
+            windFieldPO = new WindFieldPO();
+            BeanUtil.copyProperties(windFieldExceVo, windFieldPO);
+            String number = IdPrefixEnum.WIND_FIELD_NUMBER.getCode().concat(windFieldExceVo.getAreaCode() + IdGeneratorUtil.zeroFillUtil(cacheService.incr(ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_CONSTANTS_KEY, IdPrefixEnum.WIND_FIELD_NUMBER.getCode()))));
+            windFieldPO.setFieldCode(number);
+            windFieldPO.setCreateTime(new Date());
+            windFieldPO.setUpdateTime(new Date());
+            windFieldPO.setState(Constants.GLOBAL_IN_USE);
+            windFieldPO.setDelState(DeleteStatusEnum.NODELETE.getCode());
             list.add(windFieldPO);
         }
         if (CollectionUtils.isEmpty(list)) {
-            return false;
+            return ResultResp.FAIL("数据处理异常！");
         }
         if (windFieldMapper.insertList(list) <= 0) {
-            return false;
+            return ResultResp.FAIL();
         }
-
-        return bathCreateWindRelation(list);
+        return bathCreateWindRelation(list) ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
 
     /**
@@ -175,34 +194,6 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
 
 
     @Override
-    public boolean afreshWindFieldImportData(MultipartFile file, WindFieldImportDataDto windFieldImportDataDto) {
-        // 删除企业下所有风场
-        if (!delWindFieldByCompanyCode(windFieldImportDataDto.getCompanyCode())) {
-            return false;
-        }
-        return windFieldImportData(file, windFieldImportDataDto);
-    }
-
-    /**
-     * 创建对象
-     *
-     * @param windFieldImportDataDto
-     * @return
-     */
-    private WindFieldPO createWindFieldPO(WindFieldImportDataDto windFieldImportDataDto) {
-        WindFieldPO windFieldPO = new WindFieldPO();
-        BeanUtil.copyProperties(windFieldImportDataDto, windFieldPO);
-        String number = IdPrefixEnum.WIND_FIELD_NUMBER.getCode().concat(windFieldImportDataDto.getAreaCode() + IdGeneratorUtil.zeroFillUtil(cacheService.incr(ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_CONSTANTS_KEY, IdPrefixEnum.WIND_FIELD_NUMBER.getCode()))));
-        windFieldPO.setFieldCode(number);
-        windFieldPO.setCreateTime(new Date());
-        windFieldPO.setUpdateTime(new Date());
-        windFieldPO.setState(Constants.GLOBAL_IN_USE);
-        windFieldPO.setDelState(DeleteStatusEnum.NODELETE.getCode());
-        return windFieldPO;
-    }
-
-
-    @Override
     public Page<WindFieldPageVo> WindFieldListPage(WindFieldPageDto windFieldPageDto) {
         PageHelper.startPage(windFieldPageDto.getPageNum(), windFieldPageDto.getPageSize());
         List<WindFieldPageVo> list = windFieldMapper.selectWindFieldPageByfield(windFieldPageDto);
@@ -295,12 +286,12 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
         }
 
         // 修改树关系表
-        if(!StringUtils.isEmpty(windFieldUpdateDto.getFieldCode())&&!StringUtils.isEmpty(windFieldUpdateDto.getFieldName())){
+        if (!StringUtils.isEmpty(windFieldUpdateDto.getFieldCode()) && !StringUtils.isEmpty(windFieldUpdateDto.getFieldName())) {
             WindRelationDto windRelationDto = new WindRelationDto();
             windRelationDto.setCodeName(windFieldUpdateDto.getFieldName());
             windRelationDto.setCodeNumber(windFieldUpdateDto.getFieldCode());
-            flg =  windRelationServic.updateWindRelationName(windRelationDto);
-            if(!flg){
+            flg = windRelationServic.updateWindRelationName(windRelationDto);
+            if (!flg) {
                 log.warn("修改风场关系树表失败！");
             }
         }
@@ -312,14 +303,14 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
             if (!CollectionUtils.isEmpty(windFieldUpdateDto.getAnemometerTowerRelationDtos())) {
                 AnemometerTowerRelationDto anemometerTowerRelationDto = null;
                 List<AnemometerTowerRelationDto> anemometerTowerDtos = Lists.newArrayList();
-                for(WindFieldUpdateDto.AnemometerTowerRelationDto anemometerTowerRelationDto1 : windFieldUpdateDto.getAnemometerTowerRelationDtos()){
+                for (WindFieldUpdateDto.AnemometerTowerRelationDto anemometerTowerRelationDto1 : windFieldUpdateDto.getAnemometerTowerRelationDtos()) {
                     anemometerTowerRelationDto = new AnemometerTowerRelationDto();
                     BeanUtils.copyProperties(anemometerTowerRelationDto1, anemometerTowerRelationDto);
                     anemometerTowerRelationDto.setFieldCode(windFieldUpdateDto.getFieldCode());
                     anemometerTowerDtos.add(anemometerTowerRelationDto);
                 }
                 flg = anemometerTowerService.bathAnemometerTowerRelation(anemometerTowerDtos);
-                if(!flg){
+                if (!flg) {
                     log.warn("修改测风塔关系表失败！");
                 }
             }
@@ -336,9 +327,9 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
 
         WindFieldVo windFieldVo = null;
         List<WindFieldVo> windFieldVos = Lists.newArrayList();
-        for(WindFieldPO windFieldPO1 : list){
+        for (WindFieldPO windFieldPO1 : list) {
             windFieldVo = new WindFieldVo();
-            BeanUtil.copyProperties(windFieldPO1,windFieldVo);
+            BeanUtil.copyProperties(windFieldPO1, windFieldVo);
             windFieldVos.add(windFieldVo);
         }
         return windFieldVos;
@@ -355,10 +346,9 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
         Example queryExample = new Example(WindFieldPO.class);
         Example.Criteria criteria = queryExample.createCriteria();
         criteria.andEqualTo("fieldName", fieldName);
-        return  windFieldMapper.selectOneByExample(queryExample);
+        return windFieldMapper.selectOneByExample(queryExample);
 
     }
 
 
-
 }

energy-manage-service/src/main/resources/mybatis/area/AreaMapper.xml

@@ -206,4 +206,32 @@
             and id = #{item.areaId}
         </foreach>
     </update>
+
+
+    <select id="selectAreaByNames" resultType="com.energy.manage.common.po.area.AreaPO">
+        select
+        <include refid="BASE_AREA_SQL"/>
+        from sys_areas_info
+        where
+        1=1
+        and type = #{type}
+
+       <if test="type == 1">
+            and province in
+            <foreach item="item" index="index" collection="list" open="("
+                     separator="," close=")">
+                #{item}
+            </foreach>
+       </if>
+
+       <if test="type == 2">
+           and city in
+        <foreach item="item" index="index" collection="list" open="("
+                 separator="," close=")">
+            #{item}
+        </foreach>
+       </if>
+
+    </select>
+
 </mapper>