迭代功率曲线

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

@@ -1,6 +1,7 @@
 package com.energy.manage.common.po.windfield;
 
 import com.energy.manage.common.base.NewBaseDomain;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -21,6 +22,8 @@ public class WindFieldContractPO extends NewBaseDomain {
      */
     private String millTypeCode;
 
+    private String machineTypeCode;
+
     /**
      * 风场code
      */

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

@@ -44,7 +44,8 @@ public class PowerWordContractController extends BaseServiceController {
     @ApiOperation(value = " 同步合同功率,（选择风场编号，导入功率曲线）")
     public ResultResp powerWordContractImportData(@RequestPart("file") MultipartFile file,
                                                   @RequestParam("fieldCode") String fieldCode,
-                                                  @RequestParam("millTypeCode") String millTypeCode) {
+                                                  @RequestParam("millTypeCode") String millTypeCode,
+                                                  @RequestParam("machineTypeCode") String machineTypeCode) {
         if(!fieldCode.contains(IdPrefixEnum.WIND_FIELD_NUMBER.getCode())){
             return ResultResp.FAIL("风场编号不正确，请确认数据！");
         }
@@ -52,6 +53,7 @@ public class PowerWordContractController extends BaseServiceController {
         powerWordContractExcelDto.setFieldCode(fieldCode);
         powerWordContractExcelDto.setMillTypeCode(millTypeCode);
         powerWordContractExcelDto.setCreateBy(getUserId());
+        powerWordContractExcelDto.setMachineTypeCode(machineTypeCode);
         return powerWordContractService.powerWordContractImportData(file, powerWordContractExcelDto);
     }
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/WindFieldContract/WindFieldContractAddDto.java

@@ -18,6 +18,9 @@ public class WindFieldContractAddDto {
     @ApiModelProperty(value = "风场code")
     private String fieldCode;
 
+    @ApiModelProperty(value = "机型")
+    private String machineTypeCode;
+
     /**
      * 资源地址
      */

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

@@ -20,6 +20,9 @@ public class PowerWordContractExcelDto {
     @ApiModelProperty(value = "机型code")
     private String millTypeCode;
 
+    @ApiModelProperty(value = "机型名称")
+    private String machineTypeCode;
+
     @ApiModelProperty(value = "创建人")
     private Integer createBy;
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/WindFieldContract/WindFieldContractPageVo.java

@@ -18,6 +18,15 @@ public class WindFieldContractPageVo {
     private String fieldCode;
 
     /**
+     * 机型code
+     */
+    private String millTypeCode;
+
+
+    @ApiModelProperty(value = "机型名称")
+    private String machineTypeCode;
+
+    /**
      * 资源地址
      */
     @ApiModelProperty(value = "资源地址")

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

@@ -10,28 +10,23 @@ import lombok.Data;
 public class PowerWordContractExcelVo {
 
 
-    /**
-     * 机型编号
-     */
-    @ExcelProperty(value = "系统生成机型编号",index = 0)
-    private String millTypeCode;
 
     /**
      * 风速
      */
-    @ExcelProperty(value = "风速",index = 1)
+    @ExcelProperty(value = "风速",index = 0)
     private Double windSpeed;
 
     /**
      * 有功功率
      */
-    @ExcelProperty(value = "有功功率",index = 2)
+    @ExcelProperty(value = "有功功率",index = 1)
     private Double activePower;
 
     /**
      * 空气密度
      */
-    @ExcelProperty(value = "当地空气密度",index = 3)
+    @ExcelProperty(value = "当地空气密度",index = 2)
     private Double density;
 
 }

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

@@ -78,6 +78,7 @@ public class PowerWordContractServiceImpl extends BaseServiceImpl<PowerWordContr
         windFieldContractAddDto.setContractSource(path);
         windFieldContractAddDto.setFieldCode(powerWordContractExcelDto.getFieldCode());
         windFieldContractAddDto.setMillTypeCode(powerWordContractExcelDto.getMillTypeCode());
+        windFieldContractAddDto.setMachineTypeCode(powerWordContractExcelDto.getMachineTypeCode());
 
         WindFieldContractPO windFieldContractPO = windFieldContractService.addWindFieldContract(windFieldContractAddDto);
         if (windFieldContractPO.getId() == null) {

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

@@ -42,6 +42,9 @@ public class WindFieldContractServiceImpl extends BaseServiceImpl<WindFieldContr
     private PowerWordContractService powerWordContractService;
 
 
+
+
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public WindFieldContractPO addWindFieldContract(WindFieldContractAddDto WindFieldContractAddDto) {
@@ -63,9 +66,6 @@ public class WindFieldContractServiceImpl extends BaseServiceImpl<WindFieldContr
             windFieldContractDelDto.setWindFieldContractId(po.getId());
             this.delWindFieldContract(windFieldContractDelDto);
 
-            // 删除合同功率曲线数据
-            powerWordContractService.delPowerWordContractData(po.getId());
-
             // 赋值覆盖id
             windFieldContractPO.setCoverId(po.getId());
         }
@@ -84,6 +84,7 @@ public class WindFieldContractServiceImpl extends BaseServiceImpl<WindFieldContr
         Example.Criteria criteria = queryExample.createCriteria();
         criteria.andEqualTo("fieldCode", fieldCode);
         criteria.andEqualTo("millTypeCode", millTypecode);
+        criteria.andEqualTo("delState", DeleteStatusEnum.NODELETE.getCode());
         return windFieldContractMapper.selectOneByExample(queryExample);
 
     }
@@ -97,6 +98,11 @@ public class WindFieldContractServiceImpl extends BaseServiceImpl<WindFieldContr
         Example queryExample = new Example(WindFieldContractPO.class);
         Example.Criteria criteria = queryExample.createCriteria();
         criteria.andEqualTo("id", windFieldContractDelDto.getWindFieldContractId());
+
+        // 物理删除功率曲线数据
+        powerWordContractService.delPowerWordContractData(windFieldContractDelDto.getWindFieldContractId());
+
+        // 逻辑删除关系
         return windFieldContractMapper.updateByExampleSelective(po, queryExample) > 0;
     }