更改bug

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

@@ -41,8 +41,7 @@ public class WindEngineGroupController {
     @PostMapping(value = "/windEngineGroupImportData")
     @ApiOperation(value = "导入风机信息")
     public ResultResp windEngineGroupImportData(@RequestPart MultipartFile file, @RequestParam("fieldCode") String fieldCode) {
-        boolean flg = windEngineGroupService.windEngineGroupImportData(file, fieldCode);
-        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+        return  windEngineGroupService.windEngineGroupImportData(file, fieldCode);
     }
 
     @Deprecated
@@ -51,7 +50,7 @@ public class WindEngineGroupController {
     @ApiOperation(value = "重新上传风机信息")
     public ResultResp afreshWindEngineGroupImportData(@RequestPart MultipartFile file, @RequestParam("fieldCode") String fieldCode) {
 //        boolean flg = windEngineGroupService.afreshWindEngineGroupImportData(file,fieldCode);
-        return null;
+        return ResultResp.FAIL("不可使用");
     }
 
 

energy-manage-service/src/main/java/com/energy/manage/service/controller/windenginemill/WindEngineMillController.java

@@ -8,6 +8,7 @@ import com.energy.manage.service.domain.dto.windenginemill.WindEngineMillCreateD
 import com.energy.manage.service.domain.dto.windenginemill.WindEngineMillDto;
 import com.energy.manage.service.domain.dto.windenginemill.WindEngineMillPageDto;
 import com.energy.manage.service.domain.vo.windenginemill.WindEngineMillPageVo;
+import com.energy.manage.service.domain.vo.windenginemill.WindEngineMillVo;
 import com.energy.manage.service.service.windenginemill.WindEngineMillService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
+import java.util.List;
 
 @Slf4j
 @RestController
@@ -79,6 +81,14 @@ public class WindEngineMillController {
         return  ResultResp.SUCCESS(windEngineMillPageVo) ;
     }
 
+    @UserLoginToken
+    @PostMapping(value = "/getWindEngineMillList")
+    @ApiOperation(value = "查询机型集合")
+    public ResultResp<List<WindEngineMillVo>> getWindEngineMillList() {
+        List<WindEngineMillVo> list = windEngineMillService.getWindEngineMillList();
+        return  ResultResp.SUCCESS(list) ;
+    }
+
 
     @UserLoginToken
     @PostMapping(value = "/updateWindEngineMill")

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

@@ -8,6 +8,7 @@ import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.config.annotations.UserLoginToken;
 import com.energy.manage.service.domain.dto.windfield.*;
 import com.energy.manage.service.domain.vo.company.WindCompanyPageVo;
+import com.energy.manage.service.domain.vo.windfield.WindFieldNameVo;
 import com.energy.manage.service.domain.vo.windfield.WindFieldPageVo;
 import com.energy.manage.service.domain.vo.windfield.WindFieldVo;
 import com.energy.manage.service.domain.vo.windrelation.WindRelationVo;
@@ -155,7 +156,13 @@ public class WindFieldController {
     }
 
 
-
+    @UserLoginToken
+    @PostMapping(value = "/getWindFieldNames")
+    @ApiOperation(value = "查询风场集合")
+    public ResultResp<List<WindFieldNameVo>> getWindFieldNames() {
+        List<WindFieldNameVo>  list = windFieldService.getWindFieldNames();
+        return  ResultResp.SUCCESS(list);
+    }
 
 
 

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

@@ -10,52 +10,59 @@ import lombok.Data;
 @Data
 public class WindEngineGroupExcelVo {
 
+
     /**
-     * 风场编号
+     * 机型编号
      */
-    @ExcelProperty(value = "风场编号", index = 1)
-    private String fieldCode;
-
+    @ExcelProperty(value = "风机机型", index = 0)
+    private String millTypeCode;
     /**
      * 风机名称
      */
-    @ExcelProperty(value = "风机名称", index = 2)
+    @ExcelProperty(value = "风机编号", index = 1)
     private String engineName;
+
     /**
-     * 机型编号
-     */
-    @ExcelProperty(value = "机型编号", index = 3)
-    private String millTypeCode;
-    /**
-     * 额定容量
+     * 轮毂高度
      */
-    @ExcelProperty(value = "额定容量", index = 4)
-    private String ratedCapacity;
+    @ExcelProperty(value = "轮毂高度", index = 2)
+    private String hubHeight;
     /**
      * 海拔高度
      */
-    @ExcelProperty(value = "海拔高度", index = 5)
+    @ExcelProperty(value = "海拔高度", index = 3)
     private String elevationHeight;
     /**
-     * 轮毂高度
+     * 额定容量
      */
-    @ExcelProperty(value = "轮毂高度", index = 6)
-    private String hubHeight;
+    @ExcelProperty(value = "额定容量", index = 4)
+    private String ratedCapacity;
     /**
      * 经度
      */
-    @ExcelProperty(value = "经度", index = 7)
+    @ExcelProperty(value = "经度", index = 5)
     private String longitude;
     /**
      * 维度
      */
-    @ExcelProperty(value = "维度", index = 8)
+    @ExcelProperty(value = "维度", index = 6)
     private String latitude;
+
     /**
-     * 状态
+     * 额定风速 （m/s）
      */
-    @ExcelProperty(value = "状态", index = 9)
-    private Integer state;
+    @ExcelProperty(value = "维度", index = 7)
+    private Double rated_wind_speed;
+    /**
+     * 切入风速 （m/s）
+     */
+    @ExcelProperty(value = "维度", index = 8)
+    private Double ratedCutInWindspeed;
+    /**
+     * 切出风速 （m/s）
+     */
+    @ExcelProperty(value = "维度", index = 9)
+    private Double ratedCutOutWindspeed;
     /**
      * 是否标杆风机
      */
@@ -63,5 +70,4 @@ public class WindEngineGroupExcelVo {
     private Integer sightcing;
 
 
-
 }

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

@@ -0,0 +1,23 @@
+package com.energy.manage.service.domain.vo.windenginemill;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class WindEngineMillVo {
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty(value = "编号")
+    private String millTypeCode;
+    /**
+     * 机型型号
+     */
+    @ApiModelProperty(value = "机型型号")
+    private String machineTypeCode;
+
+
+}

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/windfield/WindFieldNameVo.java

@@ -0,0 +1,25 @@
+package com.energy.manage.service.domain.vo.windfield;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@ApiModel
+public class WindFieldNameVo {
+
+    /**
+     * 风场编号
+     */
+    @ApiModelProperty("风场编号")
+    private String fieldCode;
+    /**
+     * 风场名称
+     */
+    @ApiModelProperty("风场名称")
+    private String fieldName;
+
+
+}

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

@@ -2,8 +2,8 @@ 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.dto.windfield.WindFieldImportDataDto;
 import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupPageVo;
 import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupVo;
 import org.springframework.web.multipart.MultipartFile;
@@ -24,22 +24,12 @@ public interface WindEngineGroupService {
 
 
     /**
-     * 同步风机
+     * 导入风机数据
      *
      * @param file,fieldCode
      * @return
      */
-    boolean windEngineGroupImportData(MultipartFile file, String fieldCode);
-
-
-    /**
-     * 重新上传风机信息
-     *
-     * @param file
-     * @param fieldCode
-     * @return
-     */
-    boolean afreshWindEngineGroupImportData(MultipartFile file, String fieldCode);
+    ResultResp windEngineGroupImportData(MultipartFile file, String fieldCode);
 
 
     /**

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

@@ -11,18 +11,15 @@ import com.energy.manage.common.enums.DeleteStatusEnum;
 import com.energy.manage.common.enums.IdPrefixEnum;
 import com.energy.manage.common.po.windenginegroup.WindEngineGroupPO;
 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.windenginegroup.*;
 import com.energy.manage.service.domain.dto.windfield.WindFieldCodeDto;
-import com.energy.manage.service.domain.dto.windfield.WindFieldImportDataDto;
 import com.energy.manage.service.domain.dto.windfield.WindFieldUpdateDto;
 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.windenginemill.WindEngineMillPageVo;
-import com.energy.manage.service.domain.vo.windfield.WindFieldPageVo;
 import com.energy.manage.service.domain.vo.windfield.WindFieldVo;
 import com.energy.manage.service.mappers.windenginegroup.WindEngineGroupMapper;
 import com.energy.manage.service.service.cache.CacheService;
@@ -33,6 +30,7 @@ import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -40,9 +38,9 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 import tk.mybatis.mapper.entity.Example;
 
-import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 @Slf4j
@@ -108,51 +106,50 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
     @SneakyThrows
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean windEngineGroupImportData(MultipartFile file, String fieldCode) {
+    public ResultResp windEngineGroupImportData(MultipartFile file, String fieldCode) {
         List<WindEngineGroupExcelVo> windEngineGroupExcelVos = EasyExcel.read(file.getInputStream()).head(WindFieldExceVo.class).sheet().doReadSync();
         if (CollectionUtils.isEmpty(windEngineGroupExcelVos)) {
-            return false;
+            return ResultResp.FAIL("未读取到文件数据，请核对数据准确性！");
+        }
+        // 过滤空数据
+        List<WindEngineGroupExcelVo> windFieldExceVoList = windEngineGroupExcelVos.stream().filter(item ->
+                !StringUtils.isEmpty(item.getEngineName())&&!StringUtils.isEmpty(item.getMillTypeCode())).collect(Collectors.toList());
+
+        // 校验数据非空
+        for (WindEngineGroupExcelVo exceVo : windFieldExceVoList) {
+            if (exceVo.getLongitude() == null || exceVo.getLatitude() == null) {
+                return ResultResp.FAIL("当前导入风机数据未填写经纬度，请核查导入数据！");
+            }
         }
+
+
+
+
+
         WindEngineGroupPO windEngineGroupPO = null;
         List<WindEngineGroupPO> list = Lists.newArrayList();
-
-        for (WindEngineGroupExcelVo windFieldExceVos : windEngineGroupExcelVos) {
-            windEngineGroupPO = this.createWindEngineGroupPO(fieldCode);
+        for (WindEngineGroupExcelVo windFieldExceVos : windFieldExceVoList) {
+            windEngineGroupPO = new WindEngineGroupPO();
             BeanUtil.copyProperties(windFieldExceVos, windEngineGroupPO);
+            String number = IdPrefixEnum.WIND_GROUP_NUMBER.getCode().concat(IdGeneratorUtil.zeroFillUtil(cacheService.incr(ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_CONSTANTS_KEY, IdPrefixEnum.WIND_GROUP_NUMBER.getCode()))));
+            windEngineGroupPO.setEngineCode(number);
+            windEngineGroupPO.setFieldCode(fieldCode);
+            windEngineGroupPO.setCreateTime(new Date());
+            windEngineGroupPO.setUpdateTime(new Date());
+            windEngineGroupPO.setState(Constants.GLOBAL_IN_USE);
+            windEngineGroupPO.setDelState(DeleteStatusEnum.NODELETE.getCode());
+
             list.add(windEngineGroupPO);
         }
         if (CollectionUtils.isEmpty(list)) {
-            return false;
+            return ResultResp.FAIL("数据处理异常！");
         }
-        return windEngineGroupMapper.insertList(list) > 0;
-    }
-
-    @Override
-    public boolean afreshWindEngineGroupImportData(MultipartFile file, String fieldCode) {
-        // 删除企业下所有风场
-        if (!delFieldWindEngineGroup(fieldCode)) {
-            return false;
+        if (windEngineGroupMapper.insertList(list) <= 0) {
+            return ResultResp.FAIL();
         }
-        return windEngineGroupImportData(file, fieldCode);
+        return ResultResp.SUCCESS();
     }
 
-    /**
-     * 创建对象
-     *
-     * @param fieldCode
-     * @return
-     */
-    private WindEngineGroupPO createWindEngineGroupPO(String fieldCode) {
-        WindEngineGroupPO windEngineGroupPO = new WindEngineGroupPO();
-        String number = IdPrefixEnum.WIND_GROUP_NUMBER.getCode().concat(IdGeneratorUtil.zeroFillUtil(cacheService.incr(ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_CONSTANTS_KEY, IdPrefixEnum.WIND_GROUP_NUMBER.getCode()))));
-        windEngineGroupPO.setEngineCode(number);
-        windEngineGroupPO.setFieldCode(fieldCode);
-        windEngineGroupPO.setCreateTime(new Date());
-        windEngineGroupPO.setUpdateTime(new Date());
-        windEngineGroupPO.setState(Constants.GLOBAL_IN_USE);
-        windEngineGroupPO.setDelState(DeleteStatusEnum.NODELETE.getCode());
-        return windEngineGroupPO;
-    }
 
 
     @Override

energy-manage-service/src/main/java/com/energy/manage/service/service/windenginemill/WindEngineMillService.java

@@ -7,8 +7,11 @@ import com.energy.manage.service.domain.dto.windenginemill.WindEngineMillCreateD
 import com.energy.manage.service.domain.dto.windenginemill.WindEngineMillDto;
 import com.energy.manage.service.domain.dto.windenginemill.WindEngineMillPageDto;
 import com.energy.manage.service.domain.vo.windenginemill.WindEngineMillPageVo;
+import com.energy.manage.service.domain.vo.windenginemill.WindEngineMillVo;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
 /**
  * 机型管理
  */
@@ -54,6 +57,12 @@ public interface WindEngineMillService  {
     WindEngineMillPageVo getWindEngineMillPageVo(WindEngineMillCodeDto windEngineMillCodeDto);
 
     /**
+     * 所有机型集合
+     * @return
+     */
+    List<WindEngineMillVo> getWindEngineMillList();
+
+    /**
      * 修改机型信息
      * @param windEngineMillDto
      * @return

energy-manage-service/src/main/java/com/energy/manage/service/service/windenginemill/impl/WindEngineMillServiceImpl.java

@@ -17,6 +17,7 @@ import com.energy.manage.service.domain.dto.windenginemill.WindEngineMillDto;
 import com.energy.manage.service.domain.dto.windenginemill.WindEngineMillPageDto;
 import com.energy.manage.service.domain.vo.excel.WindEngineMillExcelVo;
 import com.energy.manage.service.domain.vo.windenginemill.WindEngineMillPageVo;
+import com.energy.manage.service.domain.vo.windenginemill.WindEngineMillVo;
 import com.energy.manage.service.mappers.windenginemill.WindEngineMillMapper;
 import com.energy.manage.service.service.cache.CacheService;
 import com.energy.manage.service.service.windenginemill.WindEngineMillService;
@@ -176,6 +177,19 @@ public class WindEngineMillServiceImpl extends BaseServiceImpl<com.energy.manage
     }
 
     @Override
+    public List<WindEngineMillVo> getWindEngineMillList() {
+        List<WindEngineMillPO> list = windEngineMillMapper.selectAll();
+        WindEngineMillVo windEngineMillVo = null;
+        List<WindEngineMillVo> windEngineMillVos = Lists.newArrayList();
+        for(WindEngineMillPO windEngineMillPO : list){
+            windEngineMillVo = new WindEngineMillVo();
+            BeanUtil.copyProperties(windEngineMillPO,windEngineMillVo);
+            windEngineMillVos.add(windEngineMillVo);
+        }
+        return windEngineMillVos;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean updateWindEngineMill(WindEngineMillDto dto) {
         WindEngineMillPO po = new WindEngineMillPO();

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

@@ -4,6 +4,7 @@ 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.WindFieldNameVo;
 import com.energy.manage.service.domain.vo.windfield.WindFieldPageVo;
 import com.energy.manage.service.domain.vo.windfield.WindFieldVo;
 import com.energy.manage.service.domain.vo.windrelation.WindRelationVo;
@@ -94,6 +95,12 @@ public interface WindFieldService {
      */
     List<WindFieldVo> getWindFieldVos(String companyCode);
 
+    /**
+     * 查询风场集合
+     * @return
+     */
+    List<WindFieldNameVo> getWindFieldNames();
+
 
     /**
      * 整体树结构

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

@@ -24,6 +24,8 @@ import com.energy.manage.service.domain.dto.windfield.*;
 import com.energy.manage.service.domain.dto.windrelation.WindRelationDto;
 import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerByFieldVo;
 import com.energy.manage.service.domain.vo.excel.WindFieldExceVo;
+import com.energy.manage.service.domain.vo.windenginemill.WindEngineMillVo;
+import com.energy.manage.service.domain.vo.windfield.WindFieldNameVo;
 import com.energy.manage.service.domain.vo.windfield.WindFieldPageVo;
 import com.energy.manage.service.domain.vo.windfield.WindFieldResourceVo;
 import com.energy.manage.service.domain.vo.windfield.WindFieldVo;
@@ -140,7 +142,7 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
 
         // 校验数据非空
         for (WindFieldExceVo exceVo : windFieldExceVoList) {
-            if (StringUtils.isEmpty(exceVo.getCityName()) || StringUtils.isEmpty(exceVo.getProvinceName())) {
+            if (StringUtils.isEmpty(exceVo.getCityName()) || StringUtils.isEmpty(exceVo.getProvinceName())||StringUtils.isEmpty(exceVo.getAreaCode())) {
                 return ResultResp.FAIL("当前导入风场数据未填写区域，请核查导入数据！");
             }
             if (exceVo.getLongitude() == null || exceVo.getLatitude() == null) {
@@ -377,6 +379,19 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
     }
 
     @Override
+    public List<WindFieldNameVo> getWindFieldNames() {
+        List<WindFieldPO> list = windFieldMapper.selectAll();
+        WindFieldNameVo windFieldNameVo = null;
+        List<WindFieldNameVo> windFieldNameVos = Lists.newArrayList();
+        for(WindFieldPO po : list){
+            windFieldNameVo = new WindFieldNameVo();
+            BeanUtil.copyProperties(po,windFieldNameVo);
+            windFieldNameVos.add(windFieldNameVo);
+        }
+        return windFieldNameVos;
+    }
+
+    @Override
     public List<Map<String, Object>> getWindFieldTree() {
         return windRelationServic.getWindRelationTree();
     }

energy-manage-service/src/main/resources/mybatis/windenginegroup/WindEngineGroupMapper.xml

@@ -15,6 +15,7 @@
         weg.longitude,
         weg.latitude,
         weg.sightcing,
+        weg.state,
         wem.machine_type_code as machineTypeCode,
         wem.manufacturer_name as manufacturerName,
         weg.create_time as createTime