Browse Source

增加注释

shiyue 1 năm trước cách đây
mục cha
commit
5d26eed5cc
34 tập tin đã thay đổi với 224 bổ sung16 xóa
  1. 7 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerCreateDto.java
  2. 4 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerDelDto.java
  3. 6 1
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerDto.java
  4. 8 1
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerHeightDto.java
  5. 5 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerPageDto.java
  6. 5 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerRelationDto.java
  7. 6 1
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerStateDto.java
  8. 3 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/company/WindCompanyCustomDto.java
  9. 2 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/company/WindCompanyDelDto.java
  10. 2 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/company/WindCompanyDto.java
  11. 2 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/company/WindCompanyStateDto.java
  12. 2 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/company/WindCompanyUpdateDto.java
  13. 2 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/dict/DictConstantsQueryDto.java
  14. 9 2
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/powerwordcontract/PowerWordContractDelDto.java
  15. 2 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/powerwordcontract/PowerWordContractDto.java
  16. 5 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/powerwordcontract/PowerWordContractExcelDto.java
  17. 5 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/powerwordcontract/PowerWordContractPageDto.java
  18. 4 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/powerwordcriterion/PowerWordCriterionDelDto.java
  19. 8 1
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/powerwordcriterion/PowerWordCriterionExcelDto.java
  20. 4 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginegroup/WindEngineGroupCodeDto.java
  21. 14 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginegroup/WindEngineGroupCreateDto.java
  22. 9 1
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginegroup/WindEngineGroupPageDto.java
  23. 9 1
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginegroup/WindEngineGroupStateDto.java
  24. 8 1
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginemill/WindEngineMillCodeDto.java
  25. 1 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginemill/WindEngineMillCreateDto.java
  26. 4 1
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginemill/WindEngineMillPageDto.java
  27. 4 1
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfield/WindFieldCodeDto.java
  28. 21 1
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfield/WindFieldDto.java
  29. 9 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfield/WindFieldImportDataDto.java
  30. 14 1
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfield/WindFieldPageDto.java
  31. 20 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfield/WindFieldUpdateDto.java
  32. 9 1
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windrelation/WindRelationDelDto.java
  33. 11 1
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windrelation/WindRelationDto.java
  34. 0 1
      energy-manage-service/src/main/java/com/energy/manage/service/service/windfield/impl/WindFieldResourceServiceImpl.java

+ 7 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerCreateDto.java

@@ -1,5 +1,7 @@
 package com.energy.manage.service.domain.dto.anemometertower;
 package com.energy.manage.service.domain.dto.anemometertower;
 
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
@@ -9,24 +11,29 @@ import lombok.Setter;
  */
  */
 @Getter
 @Getter
 @Setter
 @Setter
+@ApiModel("创建功率曲线参数")
 public class AnemometerTowerCreateDto {
 public class AnemometerTowerCreateDto {
 
 
 
 
     /**
     /**
      * 测风塔编号
      * 测风塔编号
      */
      */
+    @ApiModelProperty("测风塔编号")
     private String anemometerCode;
     private String anemometerCode;
     /**
     /**
      * 测风塔名称
      * 测风塔名称
      */
      */
+    @ApiModelProperty("测风塔名称")
     private String anemometerName;
     private String anemometerName;
     /**
     /**
      * 经度
      * 经度
      */
      */
+    @ApiModelProperty("经度")
     private String longitude;
     private String longitude;
     /**
     /**
      * 纬度
      * 纬度
      */
      */
+    @ApiModelProperty("纬度")
     private String latitude;
     private String latitude;
 
 
 
 

+ 4 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerDelDto.java

@@ -1,5 +1,7 @@
 package com.energy.manage.service.domain.dto.anemometertower;
 package com.energy.manage.service.domain.dto.anemometertower;
 
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
@@ -9,11 +11,13 @@ import lombok.Setter;
  */
  */
 @Getter
 @Getter
 @Setter
 @Setter
+@ApiModel("删除测风塔")
 public class AnemometerTowerDelDto {
 public class AnemometerTowerDelDto {
 
 
     /**
     /**
      * 测风塔编号
      * 测风塔编号
      */
      */
+    @ApiModelProperty("测风塔编号")
     private String anemometerCode;
     private String anemometerCode;
 
 
 
 

+ 6 - 1
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerDto.java

@@ -1,18 +1,23 @@
 package com.energy.manage.service.domain.dto.anemometertower;
 package com.energy.manage.service.domain.dto.anemometertower;
 
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 
 /**
 /**
- * 删除测风塔
+ * 测风塔
  */
  */
 @Getter
 @Getter
 @Setter
 @Setter
+@ApiModel("测风塔")
 public class AnemometerTowerDto {
 public class AnemometerTowerDto {
 
 
     /**
     /**
      * 测风塔编号
      * 测风塔编号
      */
      */
+    @ApiModelProperty("测风塔编号")
     private String anemometerCode;
     private String anemometerCode;
 
 
 
 

+ 8 - 1
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerHeightDto.java

@@ -1,5 +1,7 @@
 package com.energy.manage.service.domain.dto.anemometertower;
 package com.energy.manage.service.domain.dto.anemometertower;
 
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
@@ -7,13 +9,16 @@ import lombok.Setter;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
- *
+ *
  * 测风塔高度参数
  * 测风塔高度参数
  */
  */
 @Getter
 @Getter
 @Setter
 @Setter
+@ApiModel("测风塔高度参数")
 public class AnemometerTowerHeightDto {
 public class AnemometerTowerHeightDto {
 
 
+
+    @ApiModelProperty("测风塔高度")
     private List<AnemometerTowerHeightDto> list;
     private List<AnemometerTowerHeightDto> list;
 
 
 
 
@@ -24,10 +29,12 @@ public class AnemometerTowerHeightDto {
         /**
         /**
          * 测风塔编号
          * 测风塔编号
          */
          */
+        @ApiModelProperty("测风塔编号")
         private String anemometerCode;
         private String anemometerCode;
         /**
         /**
          * 测风塔高度
          * 测风塔高度
          */
          */
+        @ApiModelProperty("测风塔高度")
         private String anemometerHeight;
         private String anemometerHeight;
 
 
 
 

+ 5 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerPageDto.java

@@ -1,6 +1,8 @@
 package com.energy.manage.service.domain.dto.anemometertower;
 package com.energy.manage.service.domain.dto.anemometertower;
 
 
 import com.energy.manage.service.domain.dto.BaseDto;
 import com.energy.manage.service.domain.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
@@ -10,17 +12,20 @@ import lombok.Setter;
  */
  */
 @Getter
 @Getter
 @Setter
 @Setter
+@ApiModel("查询测风塔分页信息")
 public class AnemometerTowerPageDto extends BaseDto {
 public class AnemometerTowerPageDto extends BaseDto {
 
 
     /**
     /**
      * 测风塔名称
      * 测风塔名称
      */
      */
+    @ApiModelProperty("测风塔名称")
     private String anemometerName;
     private String anemometerName;
 
 
 
 
     /**
     /**
      * 状态
      * 状态
      */
      */
+    @ApiModelProperty("状态")
     private Integer state;
     private Integer state;
 
 
 }
 }

+ 5 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerRelationDto.java

@@ -1,20 +1,25 @@
 package com.energy.manage.service.domain.dto.anemometertower;
 package com.energy.manage.service.domain.dto.anemometertower;
 
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 
 @Getter
 @Getter
 @Setter
 @Setter
+@ApiModel("功率曲线关系参数")
 public class AnemometerTowerRelationDto {
 public class AnemometerTowerRelationDto {
 
 
 
 
     /**
     /**
      * 测风塔编号
      * 测风塔编号
      */
      */
+    @ApiModelProperty("测风塔编号")
     private String towerCode;
     private String towerCode;
     /**
     /**
      * 风场编号
      * 风场编号
      */
      */
+    @ApiModelProperty("风场编号")
     private String fieldCode;
     private String fieldCode;
 
 
 }
 }

+ 6 - 1
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerStateDto.java

@@ -1,5 +1,7 @@
 package com.energy.manage.service.domain.dto.anemometertower;
 package com.energy.manage.service.domain.dto.anemometertower;
 
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
@@ -9,17 +11,20 @@ import lombok.Setter;
  */
  */
 @Getter
 @Getter
 @Setter
 @Setter
+@ApiModel("修改测风塔状态")
 public class AnemometerTowerStateDto {
 public class AnemometerTowerStateDto {
 
 
     /**
     /**
      * 测风塔编号
      * 测风塔编号
      */
      */
+    @ApiModelProperty("测风塔编号")
     private String anemometerCode;
     private String anemometerCode;
 
 
 
 
     /**
     /**
-     * 状态
+     *
      */
      */
+    @ApiModelProperty("状态")
     private Integer state;
     private Integer state;
 
 
 
 

+ 3 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/company/WindCompanyCustomDto.java

@@ -44,16 +44,19 @@ public class WindCompanyCustomDto {
         /**
         /**
          * 主键id
          * 主键id
          */
          */
+        @ApiModelProperty("主键id")
         private Integer id;
         private Integer id;
 
 
         /**
         /**
          * 父类编号,最新父id
          * 父类编号,最新父id
          */
          */
+        @ApiModelProperty("父类编号,最新父id")
         private Integer parentId;
         private Integer parentId;
 
 
         /**
         /**
          * 排序(父类排序和子类排序)
          * 排序(父类排序和子类排序)
          */
          */
+        @ApiModelProperty("排序(父类排序和子类排序)")
         private Integer sort;
         private Integer sort;
 
 
 
 

+ 2 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/company/WindCompanyDelDto.java

@@ -1,11 +1,13 @@
 package com.energy.manage.service.domain.dto.company;
 package com.energy.manage.service.domain.dto.company;
 
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 
 @Getter
 @Getter
 @Setter
 @Setter
+@ApiModel("删除企业参数")
 public class WindCompanyDelDto {
 public class WindCompanyDelDto {
 
 
     @ApiModelProperty("企业编号")
     @ApiModelProperty("企业编号")

+ 2 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/company/WindCompanyDto.java

@@ -1,11 +1,13 @@
 package com.energy.manage.service.domain.dto.company;
 package com.energy.manage.service.domain.dto.company;
 
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 
 @Getter
 @Getter
 @Setter
 @Setter
+@ApiModel("风场企业信息")
 public class WindCompanyDto {
 public class WindCompanyDto {
 
 
     /**
     /**

+ 2 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/company/WindCompanyStateDto.java

@@ -1,11 +1,13 @@
 package com.energy.manage.service.domain.dto.company;
 package com.energy.manage.service.domain.dto.company;
 
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 
 @Getter
 @Getter
 @Setter
 @Setter
+@ApiModel("修改企业信息状态")
 public class WindCompanyStateDto {
 public class WindCompanyStateDto {
 
 
     @ApiModelProperty("企业编号")
     @ApiModelProperty("企业编号")

+ 2 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/company/WindCompanyUpdateDto.java

@@ -1,11 +1,13 @@
 package com.energy.manage.service.domain.dto.company;
 package com.energy.manage.service.domain.dto.company;
 
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 
 @Getter
 @Getter
 @Setter
 @Setter
+@ApiModel("修改企业信息")
 public class WindCompanyUpdateDto {
 public class WindCompanyUpdateDto {
 
 
     @ApiModelProperty("企业编号")
     @ApiModelProperty("企业编号")

+ 2 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/dict/DictConstantsQueryDto.java

@@ -1,6 +1,7 @@
 package com.energy.manage.service.domain.dto.dict;
 package com.energy.manage.service.domain.dto.dict;
 
 
 
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
@@ -9,6 +10,7 @@ import javax.validation.constraints.NotNull;
 
 
 @Getter
 @Getter
 @Setter
 @Setter
+@ApiModel("字典信息")
 public class DictConstantsQueryDto {
 public class DictConstantsQueryDto {
 
 
 
 

+ 9 - 2
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/powerwordcontract/PowerWordContractDelDto.java

@@ -1,16 +1,23 @@
 package com.energy.manage.service.domain.dto.powerwordcontract;
 package com.energy.manage.service.domain.dto.powerwordcontract;
 
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 
 /**
 /**
- *  导入合同功率曲线
+ *  合同功率曲线
  */
  */
-@Data
+@Getter
+@Setter
+@ApiModel("删除合同功能曲线参数")
 public class PowerWordContractDelDto {
 public class PowerWordContractDelDto {
 
 
     /**
     /**
      * 主键
      * 主键
      */
      */
+    @ApiModelProperty("主键编号")
     private Integer id;
     private Integer id;
 
 
 
 

+ 2 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/powerwordcontract/PowerWordContractDto.java

@@ -1,8 +1,10 @@
 package com.energy.manage.service.domain.dto.powerwordcontract;
 package com.energy.manage.service.domain.dto.powerwordcontract;
 
 
 import com.energy.manage.common.po.powerwordcontract.PowerWordContractPO;
 import com.energy.manage.common.po.powerwordcontract.PowerWordContractPO;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.Data;
 
 
 @Data
 @Data
+@ApiModel("合同功率曲线")
 public class PowerWordContractDto extends PowerWordContractPO {
 public class PowerWordContractDto extends PowerWordContractPO {
 }
 }

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

@@ -1,21 +1,26 @@
 package com.energy.manage.service.domain.dto.powerwordcontract;
 package com.energy.manage.service.domain.dto.powerwordcontract;
 
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
 /**
 /**
  *  导入合同功率曲线
  *  导入合同功率曲线
  */
  */
 @Data
 @Data
+@ApiModel("导入功率曲线")
 public class PowerWordContractExcelDto {
 public class PowerWordContractExcelDto {
 
 
     /**
     /**
      * 风场编号
      * 风场编号
      */
      */
+    @ApiModelProperty("风场编号")
     private String fieldCode;
     private String fieldCode;
 
 
     /**
     /**
      * 机型编号
      * 机型编号
      */
      */
+    @ApiModelProperty("机型编号")
     private String millTypeCode;
     private String millTypeCode;
 
 
 
 

+ 5 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/powerwordcontract/PowerWordContractPageDto.java

@@ -1,22 +1,27 @@
 package com.energy.manage.service.domain.dto.powerwordcontract;
 package com.energy.manage.service.domain.dto.powerwordcontract;
 
 
 import com.energy.manage.service.domain.dto.BaseDto;
 import com.energy.manage.service.domain.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
 /**
 /**
  *  分页参数
  *  分页参数
  */
  */
 @Data
 @Data
+@ApiModel("合同功率曲线分页参数")
 public class PowerWordContractPageDto extends BaseDto {
 public class PowerWordContractPageDto extends BaseDto {
 
 
 
 
     /**
     /**
      * 风场编号
      * 风场编号
      */
      */
+    @ApiModelProperty("风场编号")
     private String fieldCode;
     private String fieldCode;
     /**
     /**
      * 机型编号
      * 机型编号
      */
      */
+    @ApiModelProperty("机型编号")
     private String millTypeCode;
     private String millTypeCode;
 
 
 
 

+ 4 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/powerwordcriterion/PowerWordCriterionDelDto.java

@@ -1,13 +1,17 @@
 package com.energy.manage.service.domain.dto.powerwordcriterion;
 package com.energy.manage.service.domain.dto.powerwordcriterion;
 
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
 @Data
 @Data
+@ApiModel("标准功率曲线")
 public class PowerWordCriterionDelDto {
 public class PowerWordCriterionDelDto {
 
 
     /**
     /**
      * 主键
      * 主键
      */
      */
+    @ApiModelProperty("主键编号")
     private Integer id;
     private Integer id;
 
 
 }
 }

+ 8 - 1
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/powerwordcriterion/PowerWordCriterionExcelDto.java

@@ -1,13 +1,20 @@
 package com.energy.manage.service.domain.dto.powerwordcriterion;
 package com.energy.manage.service.domain.dto.powerwordcriterion;
 
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 
-@Data
+@Getter
+@Setter
+@ApiModel("标准功率曲线")
 public class PowerWordCriterionExcelDto {
 public class PowerWordCriterionExcelDto {
 
 
     /**
     /**
      * 机型编号
      * 机型编号
      */
      */
+    @ApiModelProperty("机型编号")
     private String millTypeCode;
     private String millTypeCode;
 
 
 }
 }

+ 4 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginegroup/WindEngineGroupCodeDto.java

@@ -1,18 +1,22 @@
 package com.energy.manage.service.domain.dto.windenginegroup;
 package com.energy.manage.service.domain.dto.windenginegroup;
 
 
 import com.energy.manage.service.domain.dto.BaseDto;
 import com.energy.manage.service.domain.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
 /**
 /**
  * 风机分页参数
  * 风机分页参数
  */
  */
 @Data
 @Data
+@ApiModel("风机参数")
 public class WindEngineGroupCodeDto {
 public class WindEngineGroupCodeDto {
 
 
 
 
     /**
     /**
      * 风机编号
      * 风机编号
      */
      */
+    @ApiModelProperty("风机编号")
     private String engineCode;
     private String engineCode;
 
 
 
 

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

@@ -2,6 +2,8 @@ package com.energy.manage.service.domain.dto.windenginegroup;
 
 
 import com.energy.manage.common.po.windenginegroup.WindEngineGroupPO;
 import com.energy.manage.common.po.windenginegroup.WindEngineGroupPO;
 import com.energy.manage.service.domain.dto.BaseDto;
 import com.energy.manage.service.domain.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
@@ -11,51 +13,63 @@ import lombok.Setter;
  */
  */
 @Getter
 @Getter
 @Setter
 @Setter
+@ApiModel
 public class WindEngineGroupCreateDto {
 public class WindEngineGroupCreateDto {
 
 
     /**
     /**
      * 风场编号
      * 风场编号
      */
      */
+    @ApiModelProperty("风场编号")
     private String fieldCode;
     private String fieldCode;
     /**
     /**
      * 风机名称
      * 风机名称
      */
      */
+    @ApiModelProperty("风机名称")
     private String engineName;
     private String engineName;
     /**
     /**
      * 风机编号
      * 风机编号
      */
      */
+    @ApiModelProperty("风机编号")
     private String engineCode;
     private String engineCode;
     /**
     /**
      * 机型编号uuid
      * 机型编号uuid
      */
      */
+    @ApiModelProperty("机型编号uuid")
     private String millTypeCode;
     private String millTypeCode;
     /**
     /**
      * 额定容量
      * 额定容量
      */
      */
+    @ApiModelProperty("额定容量")
     private String ratedCapacity;
     private String ratedCapacity;
     /**
     /**
      * 海拔高度
      * 海拔高度
      */
      */
+    @ApiModelProperty("海拔高度")
     private String elevationHeight;
     private String elevationHeight;
     /**
     /**
      * 轮毂高度
      * 轮毂高度
      */
      */
+    @ApiModelProperty("轮毂高度")
     private String hubHeight;
     private String hubHeight;
     /**
     /**
      * 经度
      * 经度
      */
      */
+    @ApiModelProperty("经度")
     private String longitude;
     private String longitude;
     /**
     /**
      * 维度
      * 维度
      */
      */
+    @ApiModelProperty("维度")
     private String latitude;
     private String latitude;
     /**
     /**
      * 状态
      * 状态
      */
      */
+    @ApiModelProperty("状态")
     private Integer state;
     private Integer state;
     /**
     /**
      * 是否标杆风机
      * 是否标杆风机
      */
      */
+    @ApiModelProperty("是否标杆风机")
     private Integer sightcing;
     private Integer sightcing;
 
 
 
 

+ 9 - 1
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginegroup/WindEngineGroupPageDto.java

@@ -1,29 +1,37 @@
 package com.energy.manage.service.domain.dto.windenginegroup;
 package com.energy.manage.service.domain.dto.windenginegroup;
 
 
 import com.energy.manage.service.domain.dto.BaseDto;
 import com.energy.manage.service.domain.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 
 /**
 /**
  * 风机分页参数
  * 风机分页参数
  */
  */
-@Data
+@Getter
+@Setter
+@ApiModel
 public class WindEngineGroupPageDto extends BaseDto {
 public class WindEngineGroupPageDto extends BaseDto {
 
 
 
 
     /**
     /**
      * 风机名称
      * 风机名称
      */
      */
+    @ApiModelProperty("风机名称")
     private String engineName;
     private String engineName;
 
 
     /**
     /**
      * 风场名称
      * 风场名称
      */
      */
+    @ApiModelProperty("风场名称")
     private String fieldName;
     private String fieldName;
 
 
     /**
     /**
      * 风场code
      * 风场code
      */
      */
+    @ApiModelProperty("风场code")
     private String fieldCode;
     private String fieldCode;
 
 
 
 

+ 9 - 1
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginegroup/WindEngineGroupStateDto.java

@@ -1,12 +1,18 @@
 package com.energy.manage.service.domain.dto.windenginegroup;
 package com.energy.manage.service.domain.dto.windenginegroup;
 
 
 import com.energy.manage.service.domain.dto.BaseDto;
 import com.energy.manage.service.domain.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 
 /**
 /**
  * 风机分页参数
  * 风机分页参数
  */
  */
-@Data
+@Getter
+@Setter
+@ApiModel
 public class WindEngineGroupStateDto extends BaseDto {
 public class WindEngineGroupStateDto extends BaseDto {
 
 
 
 
@@ -14,12 +20,14 @@ public class WindEngineGroupStateDto extends BaseDto {
     /**
     /**
      * 风机编号
      * 风机编号
      */
      */
+    @ApiModelProperty("是否风机编号标杆风机")
     private String engineCode;
     private String engineCode;
 
 
 
 
     /**
     /**
      * 状态
      * 状态
      */
      */
+    @ApiModelProperty("状态")
     private Integer state;
     private Integer state;
 
 
 
 

+ 8 - 1
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginemill/WindEngineMillCodeDto.java

@@ -1,13 +1,20 @@
 package com.energy.manage.service.domain.dto.windenginemill;
 package com.energy.manage.service.domain.dto.windenginemill;
 
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 
-@Data
+@Getter
+@Setter
+@ApiModel
 public class WindEngineMillCodeDto {
 public class WindEngineMillCodeDto {
 
 
     /**
     /**
      * 机型编号
      * 机型编号
      */
      */
+    @ApiModelProperty("机型编号")
     private String millTypeCode;
     private String millTypeCode;
 
 
 }
 }

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

@@ -12,6 +12,7 @@ public class WindEngineMillCreateDto {
     /**
     /**
      * 编号
      * 编号
      */
      */
+
     private String millTypeCode;
     private String millTypeCode;
     /**
     /**
      * 机型型号
      * 机型型号

+ 4 - 1
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginemill/WindEngineMillPageDto.java

@@ -3,13 +3,16 @@ package com.energy.manage.service.domain.dto.windenginemill;
 import com.energy.manage.service.domain.dto.BaseDto;
 import com.energy.manage.service.domain.dto.BaseDto;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 
 import java.util.Date;
 import java.util.Date;
 
 
 /**
 /**
  * 机型分页参数
  * 机型分页参数
  */
  */
-@Data
+@Getter
+@Setter
 public class WindEngineMillPageDto extends BaseDto {
 public class WindEngineMillPageDto extends BaseDto {
 
 
     @ApiModelProperty("机型名称")
     @ApiModelProperty("机型名称")

+ 4 - 1
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfield/WindFieldCodeDto.java

@@ -2,11 +2,14 @@ package com.energy.manage.service.domain.dto.windfield;
 
 
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 
 /**
 /**
  * 风场code参数
  * 风场code参数
  */
  */
-@Data
+@Getter
+@Setter
 public class WindFieldCodeDto {
 public class WindFieldCodeDto {
 
 
 
 

+ 21 - 1
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfield/WindFieldDto.java

@@ -2,81 +2,101 @@ package com.energy.manage.service.domain.dto.windfield;
 
 
 import com.energy.manage.common.po.anemometertower.AnemometerTowerHeightPO;
 import com.energy.manage.common.po.anemometertower.AnemometerTowerHeightPO;
 import com.energy.manage.service.domain.dto.anemometertower.AnemometerTowerHeightDto;
 import com.energy.manage.service.domain.dto.anemometertower.AnemometerTowerHeightDto;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
  * 风场code参数
  * 风场code参数
  */
  */
-@Data
+@Getter
+@Setter
+@ApiModel("")
 public class WindFieldDto {
 public class WindFieldDto {
 
 
     /**
     /**
      * 企业编号
      * 企业编号
      */
      */
+    @ApiModelProperty("企业编号")
     private String companyCode;
     private String companyCode;
     /**
     /**
      * 风场编号
      * 风场编号
      */
      */
+    @ApiModelProperty("风场编号")
     private String fieldCode;
     private String fieldCode;
     /**
     /**
      * 风场名称
      * 风场名称
      */
      */
+    @ApiModelProperty("风场名称")
     private String fieldName;
     private String fieldName;
     /**
     /**
      * 空气密度 - 合同
      * 空气密度 - 合同
      */
      */
+    @ApiModelProperty("空气密度 - 合同")
     private String density;
     private String density;
 
 
     /**
     /**
      * 总额定容量
      * 总额定容量
      */
      */
+    @ApiModelProperty("总额定容量")
     private Integer ratedCapacityNumber;
     private Integer ratedCapacityNumber;
 
 
     /**
     /**
      * 启用状态
      * 启用状态
      */
      */
+    @ApiModelProperty("启用状态")
     private Integer state;
     private Integer state;
     /**
     /**
      * 省编号
      * 省编号
      */
      */
+    @ApiModelProperty("省编号")
     private Integer provinceId;
     private Integer provinceId;
     /**
     /**
      * 省名字
      * 省名字
      */
      */
+    @ApiModelProperty("省名字")
     private String provinceName;
     private String provinceName;
     /**
     /**
      * 市编号
      * 市编号
      */
      */
+    @ApiModelProperty("市编号")
     private Integer cityId;
     private Integer cityId;
     /**
     /**
      * 市名字
      * 市名字
      */
      */
+    @ApiModelProperty("市名字")
     private String cityName;
     private String cityName;
 
 
     /**
     /**
      * 区号
      * 区号
      */
      */
+    @ApiModelProperty("区号")
     private String areaCode;
     private String areaCode;
     /**
     /**
      * 经度
      * 经度
      */
      */
+    @ApiModelProperty("经度")
     private String longitude;
     private String longitude;
     /**
     /**
      * 纬度
      * 纬度
      */
      */
+    @ApiModelProperty("纬度")
     private String latitude;
     private String latitude;
     /**
     /**
      * 海拔高度
      * 海拔高度
      */
      */
+    @ApiModelProperty("海拔高度")
     private String elevationHeight;
     private String elevationHeight;
 
 
 
 
     /**
     /**
      * 测风塔
      * 测风塔
      */
      */
+    @ApiModelProperty("测风塔")
     private List<AnemometerTowerRelationDto> anemometerTowerRelationDtos;
     private List<AnemometerTowerRelationDto> anemometerTowerRelationDtos;
 
 
 
 

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

@@ -1,38 +1,47 @@
 package com.energy.manage.service.domain.dto.windfield;
 package com.energy.manage.service.domain.dto.windfield;
 
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
 /**
 /**
  * 导入参数
  * 导入参数
  */
  */
 @Data
 @Data
+@ApiModel("导入参数")
 public class WindFieldImportDataDto {
 public class WindFieldImportDataDto {
 
 
 
 
     /**
     /**
      * 企业编号
      * 企业编号
      */
      */
+    @ApiModelProperty("企业编号")
     private String companyCode;
     private String companyCode;
     /**
     /**
      * 省编号
      * 省编号
      */
      */
+    @ApiModelProperty("省编号")
     private Integer provinceId;
     private Integer provinceId;
     /**
     /**
      * 省名字
      * 省名字
      */
      */
+    @ApiModelProperty("省名字")
     private String provinceName;
     private String provinceName;
     /**
     /**
      * 市编号
      * 市编号
      */
      */
+    @ApiModelProperty("市编号")
     private Integer cityId;
     private Integer cityId;
     /**
     /**
      * 市名字
      * 市名字
      */
      */
+    @ApiModelProperty("市名字")
     private String cityName;
     private String cityName;
 
 
     /**
     /**
      * 区号
      * 区号
      */
      */
+    @ApiModelProperty("区号")
     private String areaCode;
     private String areaCode;
 
 
 
 

+ 14 - 1
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfield/WindFieldPageDto.java

@@ -1,44 +1,57 @@
 package com.energy.manage.service.domain.dto.windfield;
 package com.energy.manage.service.domain.dto.windfield;
 
 
 import com.energy.manage.service.domain.dto.BaseDto;
 import com.energy.manage.service.domain.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 
 /**
 /**
  * 导入参数
  * 导入参数
  */
  */
-@Data
+@Getter
+@Setter
+@ApiModel("导入参数")
 public class WindFieldPageDto extends BaseDto {
 public class WindFieldPageDto extends BaseDto {
 
 
 
 
     /**
     /**
      * 企业编号
      * 企业编号
      */
      */
+    @ApiModelProperty("企业编号")
     private String companyCode;
     private String companyCode;
     /**
     /**
      * 省编号
      * 省编号
      */
      */
+    @ApiModelProperty("省编号")
     private Integer provinceId;
     private Integer provinceId;
     /**
     /**
      * 省名字
      * 省名字
      */
      */
+    @ApiModelProperty("省名字")
     private String provinceName;
     private String provinceName;
     /**
     /**
      * 市编号
      * 市编号
      */
      */
+    @ApiModelProperty("市编号")
     private Integer cityId;
     private Integer cityId;
     /**
     /**
      * 市名字
      * 市名字
      */
      */
+    @ApiModelProperty("市名字")
     private String cityName;
     private String cityName;
 
 
     /**
     /**
      * 风场名称
      * 风场名称
      */
      */
+    @ApiModelProperty("风场名称")
     private String fieldName;
     private String fieldName;
 
 
     /**
     /**
      * 风场编号
      * 风场编号
      */
      */
+    @ApiModelProperty("风场编号")
     private String fieldCode;
     private String fieldCode;
 
 
 
 

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

@@ -1,5 +1,7 @@
 package com.energy.manage.service.domain.dto.windfield;
 package com.energy.manage.service.domain.dto.windfield;
 
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 
@@ -7,71 +9,87 @@ import java.util.List;
 
 
 @Getter
 @Getter
 @Setter
 @Setter
+@ApiModel("")
 public class WindFieldUpdateDto {
 public class WindFieldUpdateDto {
 
 
     /**
     /**
      * 企业编号
      * 企业编号
      */
      */
+    @ApiModelProperty("企业编号")
     private String companyCode;
     private String companyCode;
     /**
     /**
      * 风场编号
      * 风场编号
      */
      */
+    @ApiModelProperty("风场编号")
     private String fieldCode;
     private String fieldCode;
     /**
     /**
      * 风场名称
      * 风场名称
      */
      */
+    @ApiModelProperty("风场名称")
     private String fieldName;
     private String fieldName;
     /**
     /**
      * 空气密度 - 合同
      * 空气密度 - 合同
      */
      */
+    @ApiModelProperty(" 空气密度 - 合同")
     private String density;
     private String density;
 
 
     /**
     /**
      * 风机数量
      * 风机数量
      */
      */
+    @ApiModelProperty("风机数量")
     private Integer engineNumber;
     private Integer engineNumber;
 
 
     /**
     /**
      * 总额定容量
      * 总额定容量
      */
      */
+    @ApiModelProperty("总额定容量")
     private Integer ratedCapacityNumber;
     private Integer ratedCapacityNumber;
 
 
     /**
     /**
      * 启用状态
      * 启用状态
      */
      */
+    @ApiModelProperty("启用状态")
     private Integer state;
     private Integer state;
     /**
     /**
      * 省编号
      * 省编号
      */
      */
+    @ApiModelProperty("省编号")
     private Integer provinceId;
     private Integer provinceId;
     /**
     /**
      * 省名字
      * 省名字
      */
      */
+    @ApiModelProperty("省名字")
     private String provinceName;
     private String provinceName;
     /**
     /**
      * 市编号
      * 市编号
      */
      */
+    @ApiModelProperty("市编号")
     private Integer cityId;
     private Integer cityId;
     /**
     /**
      * 市名字
      * 市名字
      */
      */
+    @ApiModelProperty("市名字")
     private String cityName;
     private String cityName;
     /**
     /**
      * 经度
      * 经度
      */
      */
+    @ApiModelProperty("经度")
     private String longitude;
     private String longitude;
     /**
     /**
      * 纬度
      * 纬度
      */
      */
+    @ApiModelProperty("纬度")
     private String latitude;
     private String latitude;
     /**
     /**
      * 海拔高度
      * 海拔高度
      */
      */
+    @ApiModelProperty("海拔高度")
     private String elevationHeight;
     private String elevationHeight;
 
 
     /**
     /**
      * 测风塔
      * 测风塔
      */
      */
+    @ApiModelProperty("测风塔")
     private List<WindFieldDto.AnemometerTowerRelationDto> anemometerTowerRelationDtos;
     private List<WindFieldDto.AnemometerTowerRelationDto> anemometerTowerRelationDtos;
 
 
 
 
@@ -81,10 +99,12 @@ public class WindFieldUpdateDto {
         /**
         /**
          * 测风塔编号
          * 测风塔编号
          */
          */
+        @ApiModelProperty("测风塔编号")
         private String towerCode;
         private String towerCode;
         /**
         /**
          * 风场编号
          * 风场编号
          */
          */
+        @ApiModelProperty("风场编号")
         private String fieldCode;
         private String fieldCode;
 
 
     }
     }

+ 9 - 1
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windrelation/WindRelationDelDto.java

@@ -1,18 +1,26 @@
 package com.energy.manage.service.domain.dto.windrelation;
 package com.energy.manage.service.domain.dto.windrelation;
 
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 
-@Data
+@Getter
+@Setter
+@ApiModel
 public class WindRelationDelDto {
 public class WindRelationDelDto {
 
 
 
 
     /**
     /**
      * 对象编号
      * 对象编号
      */
      */
+    @ApiModelProperty("对象编号")
     private String codeNumber;
     private String codeNumber;
     /**
     /**
      * 类型
      * 类型
      */
      */
+    @ApiModelProperty("类型")
     private String type;
     private String type;
 
 
 
 

+ 11 - 1
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windrelation/WindRelationDto.java

@@ -1,28 +1,38 @@
 package com.energy.manage.service.domain.dto.windrelation;
 package com.energy.manage.service.domain.dto.windrelation;
 
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 
 import java.util.Date;
 import java.util.Date;
 
 
-@Data
+@Getter
+@Setter
+@ApiModel
 public class WindRelationDto {
 public class WindRelationDto {
 
 
 
 
     /**
     /**
      * 对象编号
      * 对象编号
      */
      */
+    @ApiModelProperty("对象编号")
     private String codeNumber;
     private String codeNumber;
     /**
     /**
      * 编号名称
      * 编号名称
      */
      */
+    @ApiModelProperty("编号名称")
     private String codeName;
     private String codeName;
     /**
     /**
      * 父级编号
      * 父级编号
      */
      */
+    @ApiModelProperty("父级编号")
     private String parentCode;
     private String parentCode;
     /**
     /**
      * 类型
      * 类型
      */
      */
+    @ApiModelProperty("类型")
     private String type;
     private String type;
 
 
 
 

+ 0 - 1
energy-manage-service/src/main/java/com/energy/manage/service/service/windfield/impl/WindFieldResourceServiceImpl.java

@@ -40,7 +40,6 @@ public class WindFieldResourceServiceImpl extends BaseServiceImpl<WindFieldResou
         windFieldResourcePO.setCreateTime(new Date());
         windFieldResourcePO.setCreateTime(new Date());
         windFieldResourcePO.setUpdateTime(new Date());
         windFieldResourcePO.setUpdateTime(new Date());
         return windFieldResourceMapper.insertUseGeneratedKeys(windFieldResourcePO) > 0;
         return windFieldResourceMapper.insertUseGeneratedKeys(windFieldResourcePO) > 0;
-
     }
     }
 
 
     @Override
     @Override