修改功率曲线

energy-manage-service/src/main/java/com/energy/manage/service/controller/powerwordcontract/PowerWordContractController.java

@@ -31,17 +31,13 @@ public class PowerWordContractController {
 
     @UserLoginToken
     @PostMapping(value = "/powerWordContractImportData")
-    @ApiOperation(value = " 同步合同功率,（选择风场编号，机型编号导入功率曲线）")
+    @ApiOperation(value = " 同步合同功率,（选择风场编号，导入功率曲线）")
     public ResultResp powerWordContractImportData(@RequestPart("file") MultipartFile file,
-                                                  @RequestParam("fieldCode") String fieldCode,
-                                                  @RequestParam("millTypeCode") String millTypeCode) {
+                                                  @RequestParam("fieldCode") String fieldCode) {
 
         PowerWordContractExcelDto powerWordContractExcelDto = new PowerWordContractExcelDto();
         powerWordContractExcelDto.setFieldCode(fieldCode);
-        powerWordContractExcelDto.setMillTypeCode(millTypeCode);
-
-        boolean flg = powerWordContractService.powerWordContractImportData(file, powerWordContractExcelDto);
-        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+        return powerWordContractService.powerWordContractImportData(file, powerWordContractExcelDto);
     }
 
 

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

@@ -51,7 +51,6 @@ public class WindEngineMillController {
     @PostMapping(value = "/windEngineMillPage")
     @ApiOperation(value = "分页查询机型信息")
     public ResultResp<Page<WindEngineMillPageVo>> windEngineMillPage(@RequestBody WindEngineMillPageDto windEngineMillPageDto) {
-
         Page<WindEngineMillPageVo> page = windEngineMillService.windEngineMillPage(windEngineMillPageDto);
         return  ResultResp.SUCCESS(page);
     }

energy-manage-service/src/main/java/com/energy/manage/service/service/powerwordcontract/PowerWordContractService.java

@@ -1,6 +1,7 @@
 package com.energy.manage.service.service.powerwordcontract;
 
 import com.energy.manage.common.base.Page;
+import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.domain.dto.powerwordcontract.PowerWordContractDelDto;
 import com.energy.manage.service.domain.dto.powerwordcontract.PowerWordContractDto;
 import com.energy.manage.service.domain.dto.powerwordcontract.PowerWordContractExcelDto;
@@ -20,7 +21,7 @@ public interface PowerWordContractService {
      * @param file,fieldCode
      * @return
      */
-    boolean powerWordContractImportData(MultipartFile file, PowerWordContractExcelDto powerWordContractExcelDto);
+    ResultResp powerWordContractImportData(MultipartFile file, PowerWordContractExcelDto powerWordContractExcelDto);
 
 
     /**

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

@@ -7,11 +7,14 @@ import com.energy.manage.common.base.BaseServiceImpl;
 import com.energy.manage.common.base.Page;
 import com.energy.manage.common.enums.DeleteStatusEnum;
 import com.energy.manage.common.po.powerwordcontract.PowerWordContractPO;
+import com.energy.manage.common.po.powerwordcriterion.PowerWordCriterionPO;
+import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.domain.dto.powerwordcontract.PowerWordContractDelDto;
 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.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;
@@ -42,23 +45,41 @@ public class PowerWordContractServiceImpl extends BaseServiceImpl<PowerWordContr
     @SneakyThrows
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean powerWordContractImportData(MultipartFile file, PowerWordContractExcelDto powerWordContractExcelDto) {
+    public ResultResp powerWordContractImportData(MultipartFile file, PowerWordContractExcelDto powerWordContractExcelDto) {
+        if (StringUtils.isEmpty(powerWordContractExcelDto.getMillTypeCode())) {
+            return ResultResp.FAIL("未填写机型！");
+        }
         List<PowerWordContractExcelVo> powerWordContractExcelVos = EasyExcel.read(file.getInputStream()).head(PowerWordContractExcelVo.class).sheet().doReadSync();
         if (CollectionUtils.isEmpty(powerWordContractExcelVos)) {
-            return false;
+            return ResultResp.FAIL("未读取到文件数据，请核对数据准确性！");
         }
+
+        // 删除风场对应机型的功率曲线
+        PowerWordContractPO po = new PowerWordContractPO();
+        po.setDelState(DeleteStatusEnum.DELETE.getCode());
+        Example queryExample = new Example(PowerWordContractPO.class);
+        Example.Criteria criteria = queryExample.createCriteria();
+        criteria.andEqualTo("fieldCode", powerWordContractExcelDto.getMillTypeCode());
+        powerWordContractMapper.updateByExampleSelective(po, queryExample);
+
+
         PowerWordContractPO powerWordContractPO = null;
         List<PowerWordContractPO> list = Lists.newArrayList();
 
         for (PowerWordContractExcelVo powerWordContractExcelVo : powerWordContractExcelVos) {
             powerWordContractPO = this.createPowerWordContractPO();
             BeanUtil.copyProperties(powerWordContractExcelVo, powerWordContractPO);
+            powerWordContractPO.setFieldCode(powerWordContractExcelDto.getFieldCode());
             list.add(powerWordContractPO);
         }
         if (CollectionUtils.isEmpty(list)) {
-            return false;
+            return ResultResp.FAIL("标准功率曲线处理异常");
+
+        }
+        if (powerWordContractMapper.insertList(list) > 0) {
+            return ResultResp.SUCCESS();
         }
-        return powerWordContractMapper.insertList(list) > 0;
+        return ResultResp.FAIL();
     }
 
     /**