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

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

@@ -60,6 +60,11 @@ public class WindEngineMillPO {
      * 组合字段
      */
     private String combination;
+
+    /**
+     * 标注功率曲线地址
+     */
+    private String powerCriterionUrl;
     /**
      * 创建人
      */

energy-manage-common/src/main/java/com/energy/manage/common/po/windfield/WindFieldPO.java

@@ -82,5 +82,10 @@ public class WindFieldPO extends NewBaseDomain {
      */
     private Integer delState;
 
+    /**
+     * 合同功率曲线地址
+     */
+    private String powerContractUrl;
+
 
 }

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

@@ -37,6 +37,7 @@ public class WindEngineMillController {
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
 
+    @Deprecated
     @UserLoginToken
     @PostMapping(value = "/windEngineMillImportData")
     @ApiOperation(value = "导入机型信息")

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/powerwordcontract/PowerWordContractExcelDto.java

@@ -17,11 +17,6 @@ public class PowerWordContractExcelDto {
     @ApiModelProperty("风场编号")
     private String fieldCode;
 
-    /**
-     * 机型编号
-     */
-    @ApiModelProperty("机型编号")
-    private String millTypeCode;
 
 
 

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

@@ -87,6 +87,12 @@ public class WindFieldUpdateDto {
     private String elevationHeight;
 
     /**
+     * 合同功率曲线地址
+     */
+    @ApiModelProperty("合同功率曲线地址")
+    private String powerContractUrl;
+
+    /**
      * 测风塔
      */
     @ApiModelProperty("测风塔")

energy-manage-service/src/main/java/com/energy/manage/service/service/powerwordcontract/impl/PowerWordContractServiceImpl.java

@@ -13,11 +13,14 @@ import com.energy.manage.service.domain.dto.powerwordcontract.PowerWordContractD
 import com.energy.manage.service.domain.dto.powerwordcontract.PowerWordContractDto;
 import com.energy.manage.service.domain.dto.powerwordcontract.PowerWordContractExcelDto;
 import com.energy.manage.service.domain.dto.powerwordcontract.PowerWordContractPageDto;
+import com.energy.manage.service.domain.dto.windfield.WindFieldUpdateDto;
 import com.energy.manage.service.domain.vo.excel.PowerWordContractExcelVo;
 import com.energy.manage.service.domain.vo.excel.PowerWordCriterionExcelVo;
 import com.energy.manage.service.domain.vo.powerwordcontract.PowerWordContractPageVo;
 import com.energy.manage.service.mappers.powerwordcontract.PowerWordContractMapper;
 import com.energy.manage.service.service.powerwordcontract.PowerWordContractService;
+import com.energy.manage.service.service.windfield.WindFieldService;
+import com.energy.manage.service.util.MinioUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
@@ -38,15 +41,21 @@ import java.util.List;
 @Service
 public class PowerWordContractServiceImpl extends BaseServiceImpl<PowerWordContractPO> implements PowerWordContractService {
 
+    @Autowired
+    private MinioUtils minioUtils;
 
     @Autowired
     private PowerWordContractMapper powerWordContractMapper;
 
+    @Autowired
+    private WindFieldService windFieldService;
+
+
     @SneakyThrows
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResultResp powerWordContractImportData(MultipartFile file, PowerWordContractExcelDto powerWordContractExcelDto) {
-        if (StringUtils.isEmpty(powerWordContractExcelDto.getMillTypeCode())) {
+        if (StringUtils.isEmpty(powerWordContractExcelDto.getFieldCode())) {
             return ResultResp.FAIL("未填写机型！");
         }
         List<PowerWordContractExcelVo> powerWordContractExcelVos = EasyExcel.read(file.getInputStream()).head(PowerWordContractExcelVo.class).sheet().doReadSync();
@@ -59,10 +68,9 @@ public class PowerWordContractServiceImpl extends BaseServiceImpl<PowerWordContr
         po.setDelState(DeleteStatusEnum.DELETE.getCode());
         Example queryExample = new Example(PowerWordContractPO.class);
         Example.Criteria criteria = queryExample.createCriteria();
-        criteria.andEqualTo("fieldCode", powerWordContractExcelDto.getMillTypeCode());
+        criteria.andEqualTo("fieldCode", powerWordContractExcelDto.getFieldCode());
         powerWordContractMapper.updateByExampleSelective(po, queryExample);
 
-
         PowerWordContractPO powerWordContractPO = null;
         List<PowerWordContractPO> list = Lists.newArrayList();
 
@@ -77,6 +85,17 @@ public class PowerWordContractServiceImpl extends BaseServiceImpl<PowerWordContr
 
         }
         if (powerWordContractMapper.insertList(list) > 0) {
+
+            // 更新风场功率曲线地址
+            String path = minioUtils.upload(file);
+            log.info(" 合同功率曲线minio上传地址 ====> " + path);
+
+            if(!StringUtils.isEmpty(path)){
+                WindFieldUpdateDto windFieldUpdateDto = new WindFieldUpdateDto();
+                windFieldUpdateDto.setFieldCode(powerWordContractExcelDto.getFieldCode());
+                windFieldUpdateDto.setPowerContractUrl(path);
+                windFieldService.updateWindField(windFieldUpdateDto);
+            }
             return ResultResp.SUCCESS();
         }
         return ResultResp.FAIL();

energy-manage-service/src/main/java/com/energy/manage/service/service/powerwordcriterion/impl/PowerWordCriterionServiceImpl.java

@@ -13,12 +13,16 @@ import com.energy.manage.service.domain.dto.powerwordcriterion.PowerWordCriterio
 import com.energy.manage.service.domain.dto.powerwordcriterion.PowerWordCriterionDto;
 import com.energy.manage.service.domain.dto.powerwordcriterion.PowerWordCriterionExcelDto;
 import com.energy.manage.service.domain.dto.powerwordcriterion.PowerWordCriterionPageDto;
+import com.energy.manage.service.domain.dto.windenginemill.WindEngineMillDto;
+import com.energy.manage.service.domain.dto.windfield.WindFieldUpdateDto;
 import com.energy.manage.service.domain.vo.excel.PowerWordContractExcelVo;
 import com.energy.manage.service.domain.vo.excel.PowerWordCriterionExcelVo;
 import com.energy.manage.service.domain.vo.powerwordcontract.PowerWordContractPageVo;
 import com.energy.manage.service.domain.vo.powerwordcriterion.PowerWordCriterionPageVo;
 import com.energy.manage.service.mappers.powerwordcriterion.PowerWordCriterionMapper;
 import com.energy.manage.service.service.powerwordcriterion.PowerWordCriterionService;
+import com.energy.manage.service.service.windenginemill.WindEngineMillService;
+import com.energy.manage.service.util.MinioUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
@@ -43,6 +47,12 @@ public class PowerWordCriterionServiceImpl extends BaseServiceImpl<PowerWordCrit
 
 
     @Autowired
+    private MinioUtils minioUtils;
+
+    @Autowired
+    private WindEngineMillService windEngineMillService;
+
+    @Autowired
     private PowerWordCriterionMapper powerWordCriterionMapper;
 
 
@@ -80,6 +90,16 @@ public class PowerWordCriterionServiceImpl extends BaseServiceImpl<PowerWordCrit
 
         }
         if (powerWordCriterionMapper.insertList(list) > 0) {
+            // 更新风场功率曲线地址
+            String path = minioUtils.upload(file);
+            log.info(" 标准功率曲线minio上传地址 ====> " + path);
+
+            if(!StringUtils.isEmpty(path)){
+                WindEngineMillDto dto = new WindEngineMillDto();
+                dto.setMillTypeCode(dto.getMillTypeCode());
+                dto.setPowerCriterionUrl(dto.getPowerCriterionUrl());
+                windEngineMillService.updateWindEngineMill(dto);
+            }
             return ResultResp.SUCCESS();
         }
         return ResultResp.FAIL();

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

@@ -20,6 +20,7 @@ import com.energy.manage.service.domain.vo.windenginemill.WindEngineMillPageVo;
 import com.energy.manage.service.mappers.windenginemill.WindEngineMillMapper;
 import com.energy.manage.service.service.cache.CacheService;
 import com.energy.manage.service.service.windenginemill.WindEngineMillService;
+import com.energy.manage.service.util.MinioUtils;
 import com.energy.manage.service.util.UUIDUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -68,7 +69,7 @@ public class WindEngineMillServiceImpl extends BaseServiceImpl<com.energy.manage
 
         Integer count = windEngineMillMapper.selectWindEngineMillCount(stringList);
         if (count > 0) {
-            log.warn("复合主键不能重复！！!");
+            log.warn("=============== 机型编号+厂商编号已存在！！! =============== ");
             return false;
         }
 

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

@@ -36,6 +36,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.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -287,18 +288,24 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
         Example.Criteria criteria = queryExample.createCriteria();
         criteria.andEqualTo("fieldCode", windFieldPO.getFieldCode());
 
+        boolean flg = true;
         if (windFieldMapper.updateByExampleSelective(windFieldPO, queryExample) <= 0) {
             return false;
         }
 
-        WindRelationDto windRelationDto = new WindRelationDto();
-        windRelationDto.setCodeName(windFieldUpdateDto.getFieldName());
-        windRelationDto.setCodeNumber(windFieldUpdateDto.getFieldCode());
+        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){
+                log.warn("修改风场关系树表失败！");
+            }
+        }
 
         // 处理测风塔数据
         if (!CollectionUtils.isEmpty(windFieldUpdateDto.getAnemometerTowerRelationDtos())) {
             anemometerTowerService.deltAnemometerTowerRelationByField(windFieldUpdateDto.getFieldCode());
-
             // 处理测风塔数据
             if (!CollectionUtils.isEmpty(windFieldUpdateDto.getAnemometerTowerRelationDtos())) {
                 AnemometerTowerRelationDto anemometerTowerRelationDto = null;
@@ -309,11 +316,14 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
                     anemometerTowerRelationDto.setFieldCode(windFieldUpdateDto.getFieldCode());
                     anemometerTowerDtos.add(anemometerTowerRelationDto);
                 }
-                anemometerTowerService.bathAnemometerTowerRelation(anemometerTowerDtos);
+                flg = anemometerTowerService.bathAnemometerTowerRelation(anemometerTowerDtos);
+                if(!flg){
+                    log.warn("修改测风塔关系表失败！");
+                }
             }
         }
 
-        return windRelationServic.updateWindRelationName(windRelationDto);
+        return true;
     }
 
     @Override