Merge branch 'energy-manage-shiyue'

energy-manage-common/src/main/java/com/energy/manage/common/base/NewBaseDomain.java

@@ -1,6 +1,7 @@
 package com.energy.manage.common.base;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -24,9 +25,11 @@ public class NewBaseDomain {
     private Integer id;
 
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
     private Date createTime;
 
     @ApiModelProperty(value = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
     private Date updateTime;
 
     @ApiModelProperty(value = "创建人")

energy-manage-common/src/main/java/com/energy/manage/common/enums/IdPrefixEnum.java

@@ -9,6 +9,7 @@ public enum IdPrefixEnum {
     COMPANY_NUMBER("COM", "企业信息编号"),
     WIND_FIELD_NUMBER("WOF", "风场信息编号"),
     WIND_GROUP_NUMBER("WOG", "风机信息编号"),
+    WIND_EILL_NUMBER("WEM", "风机机型编号"),
     WIND_TOWER_NUMBER("WOT", "测风塔信息编号");
 
     IdPrefixEnum(String code, String name) {

energy-manage-common/src/main/java/com/energy/manage/common/po/anemometertower/AnemometerTowerHeightPO.java

@@ -24,7 +24,7 @@ public class AnemometerTowerHeightPO extends NewBaseDomain {
     /**
      * 测风塔高度
      */
-    private String anemometerHeight;
+    private Double anemometerHeight;
 
 
 

energy-manage-common/src/main/java/com/energy/manage/common/po/anemometertower/AnemometerTowerPO.java

@@ -28,11 +28,11 @@ public class AnemometerTowerPO extends NewBaseDomain {
     /**
      * 经度
      */
-    private String longitude;
+    private Double longitude;
     /**
      * 纬度
      */
-    private String latitude;
+    private Double latitude;
     /**
      * 状态
      */

energy-manage-common/src/main/java/com/energy/manage/common/po/area/AreaPO.java

@@ -16,13 +16,14 @@ import java.io.Serializable;
 @Setter
 public class AreaPO implements Serializable {
 
-  private Integer areaId;
+    private Integer areaId;
 
-  private String province;
+    private String province;
 
-  private String city;
+    private String city;
 
-  private String area;
+    private String area;
+
+    private String areaCode;
 
-  private String areaCode;
 }

energy-manage-common/src/main/java/com/energy/manage/common/po/company/WindCompanyPO.java

@@ -1,6 +1,7 @@
 package com.energy.manage.common.po.company;
 
 import com.energy.manage.common.base.NewBaseDomain;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -21,45 +22,54 @@ public class WindCompanyPO extends NewBaseDomain {
     /**
      * 企业编号
      */
+    @ApiModelProperty("企业编号")
     private String companyCode;
 
     /**
      * 企业名称
      */
+    @ApiModelProperty("企业名称")
     private String companyName;
 
     /**
      * 省
      */
+    @ApiModelProperty("编号")
     private Integer provinceId;
 
     /**
      * 省名字
      */
+    @ApiModelProperty("省名字")
     private String provinceName;
 
     /**
      * 市
      */
+    @ApiModelProperty("市")
     private Integer cityId;
 
     /**
      * 市名字
      */
+    @ApiModelProperty("市名字")
     private String cityName;
 
     /**
      * 企业描述
      */
+    @ApiModelProperty("企业描述")
     private String described;
     /**
      * 状态
      */
+    @ApiModelProperty("状态")
     private Integer state;
 
     /**
      * 删除状态
      */
+    @ApiModelProperty("删除状态")
     private Integer delState;
 
 

energy-manage-common/src/main/java/com/energy/manage/common/po/powerwordcontract/PowerWordContractPO.java

@@ -25,11 +25,11 @@ public class PowerWordContractPO extends NewBaseDomain {
     /**
      * 有功功率
      */
-    private String activePower;
+    private Double activePower;
     /**
      * 风速
      */
-    private String windSpeed;
+    private Double windSpeed;
     /**
      * 删除状态
      */

energy-manage-common/src/main/java/com/energy/manage/common/po/powerwordcriterion/PowerWordCriterionPO.java

@@ -20,15 +20,15 @@ public class PowerWordCriterionPO extends NewBaseDomain {
     /**
      * 风速
      */
-    private String windSpeed;
+    private Double windSpeed;
     /**
      * 有功功率
      */
-    private String activePower;
+    private Double activePower;
     /**
      * 空气密度
      */
-    private String density;
+    private Double density;
     /**
      * 删除状态
      */

energy-manage-common/src/main/java/com/energy/manage/common/po/system/SysPermissionPO.java

@@ -1,6 +1,7 @@
 package com.energy.manage.common.po.system;
 
 import com.energy.manage.common.base.NewBaseDomain;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -23,50 +24,63 @@ public class SysPermissionPO {
     /**
      * 资源表主键id
      */
+    @ApiModelProperty("资源表主键id")
     private Integer permissionId;
 
     /**
      * 资源名称
      */
+    @ApiModelProperty("资源名称")
     private String permissionName;
 
     /**
      * 资源父id
      */
+    @ApiModelProperty("资源父id")
     private Integer parentId;
 
     /**
      * 资源code
      */
+    @ApiModelProperty("资源code")
     private String permissionCode;
 
     /**
      * 资源类型(1 位菜单 2 为功能)
      */
+    @ApiModelProperty("资源类型(1 位菜单 2 为功能)")
     private Integer permissionType;
 
     /**
      * 资源url
      */
+    @ApiModelProperty("资源url")
     private String permissionUrl;
 
     /**
      * 资源状态 0 不可用 1是正常
      */
+    @ApiModelProperty("源状态 0 不可用 1是正常")
     private Integer permissionState;
 
     /**
      * 顺序
      */
+    @ApiModelProperty("顺序")
     private Integer permissionSort;
 
     /**
      * 图标icon Url
      */
+    @ApiModelProperty("图标icon Url")
     private String permissionIconUrl;
 
     /**
      * 所有父id集合
      */
+    @ApiModelProperty("所有父id集合")
     private Integer permissionDepth;
+
+    @ApiModelProperty("是否显示1-显示，2-不显示")
+    private Integer permissionShow;
 }

energy-manage-common/src/main/java/com/energy/manage/common/po/system/SysRolePO.java

@@ -1,6 +1,7 @@
 package com.energy.manage.common.po.system;
 
 import com.energy.manage.common.base.NewBaseDomain;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -24,16 +25,31 @@ public class SysRolePO extends NewBaseDomain {
     /**
      * 角色描述
      */
+    @ApiModelProperty("角色描述")
     private String roleDescription;
 
     /**
      * 角色code
      */
+    @ApiModelProperty("角色code")
     private String roleCode;
 
     /**
+     * 角色类型
+     */
+    @ApiModelProperty("角色类型")
+    private Integer roleType;
+
+    /**
      * 是否可用
      */
+    @ApiModelProperty("是否可用")
     private Integer roleAvailable;
 
+    /**
+     * 来源
+     */
+    @ApiModelProperty("来源0系统1自定义")
+    private Integer source;
+
 }

energy-manage-common/src/main/java/com/energy/manage/common/po/system/SysUserInfoPO.java

@@ -20,7 +20,10 @@ import javax.persistence.Table;
 @Accessors(chain = true)
 public class SysUserInfoPO extends NewBaseDomain {
 
-
+    /**
+     * 登录名
+     */
+    private String loginName;
     /**
      * 用户名称
      */

energy-manage-common/src/main/java/com/energy/manage/common/po/windenginegroup/WindEngineGroupPO.java

@@ -33,23 +33,23 @@ public class WindEngineGroupPO extends NewBaseDomain {
     /**
      * 额定容量
      */
-    private String ratedCapacity;
+    private Double ratedCapacity;
     /**
      * 海拔高度
      */
-    private String elevationHeight;
+    private Double elevationHeight;
     /**
      * 轮毂高度
      */
-    private String hubHeight;
+    private Double hubHeight;
     /**
      * 经度
      */
-    private String longitude;
+    private Double longitude;
     /**
      * 维度
      */
-    private String latitude;
+    private Double latitude;
     /**
      * 状态
      */
@@ -59,6 +59,18 @@ public class WindEngineGroupPO extends NewBaseDomain {
      */
     private Integer sightcing;
     /**
+     * 额定风速 （m/s）
+     */
+    private Double rated_wind_speed;
+    /**
+     * 切入风速 （m/s）
+     */
+    private Double ratedCutInWindspeed;
+    /**
+     * 切出风速 （m/s）
+     */
+    private Double ratedCutOutWindspeed;
+    /**
      * 删除状态
      */
     private Integer delState;

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

@@ -4,6 +4,7 @@ package com.energy.manage.common.po.windenginemill;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import javax.persistence.Table;
 import java.util.Date;
 
@@ -40,11 +41,16 @@ public class WindEngineMillPO {
     /**
      * 塔筒高度
      */
-    private String towerHeight;
+    private Double towerHeight;
     /**
      * 叶片长度
      */
-    private String vaneLong;
+    private Double vaneLong;
+
+    /**
+     * 驱动类型
+     */
+    private Integer curvedMotionType;
     /**
      * 删除状态
      */
@@ -53,7 +59,23 @@ public class WindEngineMillPO {
     /**
      * 组合字段
      */
-    private String combinationc;
+    private String combination;
+
+    /**
+     * 标注功率曲线地址
+     */
+    private String powerCriterionUrl;
+
+    /**
+     * 叶轮直径（m）
+     */
+    private Double rotorDiameter;
+
+    /**
+     *传动比-转速比（无单位）
+     */
+    private Double rotationalSpeedRatio;
+
     /**
      * 创建人
      */

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

@@ -33,7 +33,7 @@ public class WindFieldPO extends NewBaseDomain {
     /**
      * 空气密度 - 合同功率曲线
      */
-    private String density;
+    private Double density;
 
     /**
      * 风机数量
@@ -43,7 +43,7 @@ public class WindFieldPO extends NewBaseDomain {
     /**
      * 总额定容量
      */
-    private String ratedCapacityNumber;
+    private Double ratedCapacityNumber;
 
     /**
      * 启用状态
@@ -68,19 +68,24 @@ public class WindFieldPO extends NewBaseDomain {
     /**
      * 经度
      */
-    private String longitude;
+    private Double longitude;
     /**
      * 纬度
      */
-    private String latitude;
+    private Double latitude;
     /**
      * 海拔高度
      */
-    private String elevationHeight;
+    private Double elevationHeight;
     /**
      * 删除状态
      */
     private Integer delState;
 
+    /**
+     * 合同功率曲线地址
+     */
+    private String powerContractUrl;
+
 
 }

energy-manage-common/src/main/java/com/energy/manage/common/po/windfield/WindFieldResoucePO.java → energy-manage-common/src/main/java/com/energy/manage/common/po/windfield/WindFieldResourcePO.java

@@ -8,10 +8,10 @@ import lombok.experimental.Accessors;
 import javax.persistence.Table;
 
 @Data
-@Table(name = "wind_field_resouce")
+@Table(name = "wind_field_resource")
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class WindFieldResoucePO extends NewBaseDomain {
+public class WindFieldResourcePO extends NewBaseDomain {
 
 
     /**

energy-manage-service/src/main/java/com/energy/manage/service/config/TemplateConfig.java

@@ -0,0 +1,29 @@
+package com.energy.manage.service.config;
+
+
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
+
+@Data
+@Slf4j
+@Component
+@Configuration
+public class TemplateConfig {
+
+    @Value("${template.bzpower}")
+    private String bzPower;
+
+    @Value("${template.htpower}")
+    private String htPower;
+
+    @Value("${template.field}")
+    private String field;
+
+    @Value("${template.draught}")
+    private String draught;
+
+
+}

energy-manage-service/src/main/java/com/energy/manage/service/controller/anemometertower/AnemometerTowerController.java

@@ -2,12 +2,15 @@ package com.energy.manage.service.controller.anemometertower;
 
 
 import com.energy.manage.common.base.Page;
+import com.energy.manage.common.po.anemometertower.AnemometerTowerPO;
 import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.config.annotations.UserLoginToken;
 import com.energy.manage.service.domain.dto.anemometertower.*;
 import com.energy.manage.service.domain.dto.windfield.WindFieldPageDto;
+import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerByFieldVo;
 import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerHeightVo;
 import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerPageVo;
+import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerVo;
 import com.energy.manage.service.service.anemometertower.AnemometerTowerService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -15,6 +18,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
+import java.util.List;
+
 @Slf4j
 @RestController
 @CrossOrigin
@@ -30,17 +36,21 @@ public class AnemometerTowerController {
     @UserLoginToken
     @PostMapping(value = "/createAnemometerTower")
     @ApiOperation(value = "创建测风塔数据")
-    public ResultResp createAnemometerTower(@RequestBody AnemometerTowerCreateDto anemometerTowerCreateDto) {
+    public ResultResp createAnemometerTower(@RequestBody @Valid AnemometerTowerCreateDto anemometerTowerCreateDto) {
+        AnemometerTowerPO po = anemometerTowerService.getAnemometerTowerPOByanemometerTowerName(anemometerTowerCreateDto.getAnemometerName());
+        if (po != null) {
+            return ResultResp.FAIL("测风塔名称已经存在！");
+        }
+
         boolean flg = anemometerTowerService.createAnemometerTower(anemometerTowerCreateDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
 
 
-
     @UserLoginToken
     @PostMapping(value = "/delAnemometerTower")
     @ApiOperation(value = "删除测风塔数据")
-    public ResultResp delAnemometerTower(@RequestBody AnemometerTowerDelDto anemometerTowerDelDto) {
+    public ResultResp delAnemometerTower(@RequestBody @Valid AnemometerTowerDelDto anemometerTowerDelDto) {
         boolean flg = anemometerTowerService.delAnemometerTower(anemometerTowerDelDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
@@ -49,7 +59,7 @@ public class AnemometerTowerController {
     @UserLoginToken
     @PostMapping(value = "/updateAnemometerTowerState")
     @ApiOperation(value = "修改测风塔状态")
-    public ResultResp updateAnemometerTowerState(@RequestBody AnemometerTowerStateDto anemometerTowerStateDto) {
+    public ResultResp updateAnemometerTowerState(@RequestBody @Valid AnemometerTowerStateDto anemometerTowerStateDto) {
         boolean flg = anemometerTowerService.updateAnemometerTowerState(anemometerTowerStateDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
@@ -57,16 +67,17 @@ public class AnemometerTowerController {
     @UserLoginToken
     @PostMapping(value = "/getAnemometerTowerPage")
     @ApiOperation(value = "查询测风塔分页信息")
-    public ResultResp<Page<AnemometerTowerPageVo> > getAnemometerTowerPage(@RequestBody AnemometerTowerPageDto anemometerTowerPageDto) {
-        Page<AnemometerTowerPageVo>  page = anemometerTowerService.getAnemometerTowerPage(anemometerTowerPageDto);
+    public ResultResp<Page<AnemometerTowerPageVo>> getAnemometerTowerPage(@RequestBody AnemometerTowerPageDto anemometerTowerPageDto) {
+        Page<AnemometerTowerPageVo> page = anemometerTowerService.getAnemometerTowerPage(anemometerTowerPageDto);
         return ResultResp.SUCCESS(page);
     }
 
+    @Deprecated
     @UserLoginToken
     @PostMapping(value = "/bathAnemometerTowerHeight")
     @ApiOperation(value = "批量绑定测风塔层高数据")
     public ResultResp bathAnemometerTowerHeight(@RequestBody AnemometerTowerHeightDto anemometerTowerHeightDto) {
-        boolean flg  = anemometerTowerService.bathAnemometerTowerHeight(anemometerTowerHeightDto);
+        boolean flg = anemometerTowerService.bathAnemometerTowerHeight(anemometerTowerHeightDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
 
@@ -74,22 +85,38 @@ public class AnemometerTowerController {
     @UserLoginToken
     @PostMapping(value = "/getAnemometerTower")
     @ApiOperation(value = "查询测风塔数据详情对象")
-    public ResultResp<AnemometerTowerPageVo> getAnemometerTowerVo(@RequestBody AnemometerTowerDto anemometerTowerDto) {
-        AnemometerTowerPageVo vo  = anemometerTowerService.getAnemometerTowerVo(anemometerTowerDto);
+    public ResultResp<AnemometerTowerVo> getAnemometerTowerVo(@RequestBody AnemometerTowerDto anemometerTowerDto) {
+        AnemometerTowerVo vo = anemometerTowerService.getAnemometerTowerVo(anemometerTowerDto);
         return ResultResp.SUCCESS(vo);
     }
 
 
     @UserLoginToken
+    @PostMapping(value = "/getAnemometerTowerByField")
+    @ApiOperation(value = "通过风场编号查询测风塔信息")
+    public ResultResp<List<AnemometerTowerByFieldVo>> getAnemometerTowerByField(@RequestBody @Valid AnemometerTowerByFieldDto anemometerTowerByFieldDto) {
+        List<AnemometerTowerByFieldVo> anemometerTowerByField = anemometerTowerService.getAnemometerTowerByField(anemometerTowerByFieldDto.getFieldCode());
+        return ResultResp.SUCCESS(anemometerTowerByField);
+    }
+
+
+    @UserLoginToken
+    @PostMapping(value = "/updateAnemometerTower")
+    @ApiOperation(value = "修改测风塔数据")
+    public ResultResp updateAnemometerTower(@RequestBody AnemometerTowerUpdateDto anemometerTowerUpdateDto) {
+        boolean flg = anemometerTowerService.updateAnemometerTower(anemometerTowerUpdateDto);
+        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+    }
+
+
+    @Deprecated
+    @UserLoginToken
     @PostMapping(value = "/getAnemometerTowerHeight")
     @ApiOperation(value = "查询测风塔下层高数据")
     public ResultResp<AnemometerTowerHeightVo> getAnemometerTowerHeight(@RequestBody AnemometerTowerDto anemometerTowerDto) {
-        AnemometerTowerHeightVo vo  = anemometerTowerService.getAnemometerTowerHeight(anemometerTowerDto);
+        AnemometerTowerHeightVo vo = anemometerTowerService.getAnemometerTowerHeight(anemometerTowerDto);
         return ResultResp.SUCCESS(vo);
     }
 
 
-
-
-
 }

energy-manage-service/src/main/java/com/energy/manage/service/controller/company/WindCompanyController.java

@@ -1,21 +1,25 @@
 package com.energy.manage.service.controller.company;
 
 
+import com.energy.manage.common.po.company.WindCompanyPO;
 import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.config.annotations.UserLoginToken;
-import com.energy.manage.service.domain.dto.company.WindCompanyDelDto;
-import com.energy.manage.service.domain.dto.company.WindCompanyDto;
-import com.energy.manage.service.domain.dto.company.WindCompanyStateDto;
-import com.energy.manage.service.domain.dto.company.WindCompanyUpdateDto;
+import com.energy.manage.service.domain.dto.company.*;
 import com.energy.manage.service.domain.vo.company.WindCompanyPageVo;
+import com.energy.manage.service.domain.vo.company.WindCompanyVo;
+import com.energy.manage.service.domain.vo.windfield.WindFieldVo;
 import com.energy.manage.service.service.company.WindCompanyService;
+import com.energy.manage.service.service.windfield.WindFieldService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @RestController
@@ -25,13 +29,25 @@ import java.util.List;
 public class WindCompanyController {
 
     @Autowired
-    WindCompanyService windCompanyService;
+    private WindCompanyService windCompanyService;
+
+    @Autowired
+    private WindFieldService windFieldService;
 
 
     @UserLoginToken
     @PostMapping(value = "/addCompany")
     @ApiOperation(value = "创建企业")
-    public ResultResp addCompany(@RequestBody WindCompanyDto dto) {
+    public ResultResp addCompany(@RequestBody @Valid WindCompanyDto dto) {
+
+        // 验证企业名称是否存在
+        WindCompanyPO po = windCompanyService.getWindCompanyPO(dto);
+        if (po != null) {
+            return ResultResp.FAIL("企业名称已存在！");
+        }
+        if (StringUtils.isEmpty(dto.getParentCode()) || StringUtils.isEmpty(dto.getCompanyName())) {
+            return ResultResp.NOTNULLPARAM();
+        }
         boolean flg = windCompanyService.addCompany(dto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
@@ -40,7 +56,12 @@ public class WindCompanyController {
     @UserLoginToken
     @PostMapping(value = "/delCompany")
     @ApiOperation(value = "删除企业")
-    public ResultResp delCompany(@RequestBody WindCompanyDelDto dto) {
+    public ResultResp delCompany(@RequestBody @Valid WindCompanyDelDto dto) {
+
+        List<WindFieldVo> list = windFieldService.getWindFieldVos(dto.getCompanyCode());
+        if (list.size() > 0) {
+            return ResultResp.FAIL("项目公司有绑定风场不可删除！");
+        }
         boolean flg = windCompanyService.delCompany(dto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
@@ -48,16 +69,23 @@ public class WindCompanyController {
     @UserLoginToken
     @PostMapping(value = "/updateStateCompany")
     @ApiOperation(value = "更新企业状态")
-    public ResultResp updateStateCompany(@RequestBody WindCompanyStateDto dto) {
+    public ResultResp updateStateCompany(@RequestBody @Valid WindCompanyStateDto dto) {
         boolean flg = windCompanyService.updateStateCompany(dto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
 
+    @UserLoginToken
+    @PostMapping(value = "/getWindCompany")
+    @ApiOperation(value = "查询企业对象")
+    public ResultResp<WindCompanyVo> getWindCompany(@RequestBody @Valid WindCompanyDelDto dto) {
+        WindCompanyVo vo = windCompanyService.getWindCompany(dto);
+        return ResultResp.SUCCESS(vo);
+    }
 
     @UserLoginToken
     @PostMapping(value = "/updateCompany")
     @ApiOperation(value = "更新企业")
-    public ResultResp updateCompany(@RequestBody WindCompanyUpdateDto dto) {
+    public ResultResp updateCompany(@RequestBody @Valid WindCompanyUpdateDto dto) {
         boolean flg = windCompanyService.updateCompany(dto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
@@ -66,8 +94,8 @@ public class WindCompanyController {
     @UserLoginToken
     @PostMapping(value = "/getAllWindCompany")
     @ApiOperation(value = "查询企业树")
-    public ResultResp<List<WindCompanyPageVo>> getAllWindCompany() {
-        List<WindCompanyPageVo> list = windCompanyService.getAllWindCompany();
+    public ResultResp<List<Map<String, Object>>> getAllWindCompany(@RequestBody WindCompanyPageDto windCompanyPageDto) {
+        List<Map<String, Object>> list = windCompanyService.getAllWindCompany(windCompanyPageDto.getState(), windCompanyPageDto.getCompanyName());
         return ResultResp.SUCCESS(list);
     }
 

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/powerwordcriterion/PowerWordCriterionController.java

@@ -21,6 +21,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.Map;
+
 @Slf4j
 @RestController
 @CrossOrigin
@@ -32,29 +34,24 @@ public class PowerWordCriterionController {
     private PowerWordCriterionService powerWordCriterionService;
 
 
-        @UserLoginToken
-        @PostMapping(value = "/powerWordCriterionImportData")
-        @ApiOperation(value = " 同步标准功率,（机型编号导入功率曲线）")
-        public ResultResp powerWordCriterionImportData(@RequestPart MultipartFile file,
-                                                       @RequestParam("millTypeCode")String millTypeCode) {
-
-            PowerWordCriterionExcelDto powerWordCriterionExcelDto = new PowerWordCriterionExcelDto();
-            powerWordCriterionExcelDto.setMillTypeCode(millTypeCode);
-
-        boolean flg = powerWordCriterionService.powerWordCriterionImportData(file,powerWordCriterionExcelDto);
-        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+    @UserLoginToken
+    @PostMapping(value = "/powerWordCriterionImportData")
+    @ApiOperation(value = " 同步标准功率,（机型编号导入功率曲线）")
+    public ResultResp powerWordCriterionImportData(@RequestPart MultipartFile file,
+                                                   @RequestParam("millTypeCode") String millTypeCode) {
+
+        PowerWordCriterionExcelDto powerWordCriterionExcelDto = new PowerWordCriterionExcelDto();
+        powerWordCriterionExcelDto.setMillTypeCode(millTypeCode);
+        return powerWordCriterionService.powerWordCriterionImportData(file, powerWordCriterionExcelDto);
     }
 
 
-
-
     @UserLoginToken
     @PostMapping(value = "/powerWordCriterionPage")
     @ApiOperation(value = " 同步标准功率曲线分页查询")
     public ResultResp<Page<PowerWordCriterionPageVo>> powerWordCriterionPage(@RequestBody PowerWordCriterionPageDto powerWordCriterionPageDto) {
-
-        Page<PowerWordCriterionPageVo>  page = powerWordCriterionService.powerWordCriterionPage(powerWordCriterionPageDto);
-        return  ResultResp.SUCCESS(page);
+        Page<PowerWordCriterionPageVo> page = powerWordCriterionService.powerWordCriterionPage(powerWordCriterionPageDto);
+        return ResultResp.SUCCESS(page);
     }
 
 
@@ -63,22 +60,18 @@ public class PowerWordCriterionController {
     @ApiOperation(value = " 删除风机标准功率曲线")
     public ResultResp delpowerWordCriterion(@RequestBody PowerWordCriterionDelDto powerWordCriterionDelDto) {
 
-        boolean flg= powerWordCriterionService.delpowerWordCriterion(powerWordCriterionDelDto);
+        boolean flg = powerWordCriterionService.delpowerWordCriterion(powerWordCriterionDelDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
 
 
-
     @UserLoginToken
     @PostMapping(value = "/updatePowerWordCriterion")
     @ApiOperation(value = "编辑标准功率曲线")
     public ResultResp updatePowerWordCriterion(@RequestBody PowerWordCriterionDto powerWordCriterionDto) {
-        boolean flg= powerWordCriterionService.updatePowerWordCriterion(powerWordCriterionDto);
+        boolean flg = powerWordCriterionService.updatePowerWordCriterion(powerWordCriterionDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
 
 
-
-
-
 }

energy-manage-service/src/main/java/com/energy/manage/service/controller/system/SysPermissionController.java

@@ -8,7 +8,9 @@ import com.energy.manage.service.config.annotations.UserLoginToken;
 import com.energy.manage.service.domain.dto.system.PermissionDelDto;
 import com.energy.manage.service.domain.dto.system.PermissionDto;
 import com.energy.manage.service.domain.dto.system.PermissionUpdateDto;
+import com.energy.manage.service.domain.dto.system.SystemPermissionListDto;
 import com.energy.manage.service.domain.vo.system.PermissionVo;
+import com.energy.manage.service.domain.vo.system.SystemPermissionVo;
 import com.energy.manage.service.service.system.SysPermissionService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -41,18 +43,19 @@ public class SysPermissionController {
     @ApiOperation(value = "增加权限")
     @PostMapping(value = "add")
     public ResultResp addPermission(@RequestBody PermissionDto permissionDto) {
-        if (StringUtils.isEmpty(permissionDto.getPName()) || StringUtils.isEmpty(permissionDto.getPCode())) {
+        if (StringUtils.isEmpty(permissionDto.getPname()) || StringUtils.isEmpty(permissionDto.getPcode())) {
             return ResultResp.NOTNULLPARAM();
         }
         SysPermissionPO po = new SysPermissionPO();
         po.setParentId(permissionDto.getParentId());
-        po.setPermissionName(permissionDto.getPName());
-        po.setPermissionUrl(permissionDto.getPUrl());
-        po.setPermissionCode(permissionDto.getPCode());
-        po.setPermissionIconUrl(permissionDto.getPIconUrl());
-        po.setPermissionState(permissionDto.getPStat());
-        po.setPermissionType(permissionDto.getPType());
-        po.setPermissionSort(permissionDto.getPSort());
+        po.setPermissionName(permissionDto.getPname());
+        po.setPermissionUrl(permissionDto.getPurl());
+        po.setPermissionCode(permissionDto.getPcode());
+        po.setPermissionIconUrl(permissionDto.getPiconUrl());
+        po.setPermissionState(permissionDto.getPstat());
+        po.setPermissionType(permissionDto.getPtype());
+        po.setPermissionSort(permissionDto.getPsort());
+        po.setPermissionShow(permissionDto.getPermissionShow());
         boolean flg = sysPermissionService.addPermission(po);
         if (flg) {
             return ResultResp.SUCCESS();
@@ -90,18 +93,19 @@ public class SysPermissionController {
     @PostMapping(value = "update")
     public ResultResp updatePermission(@RequestBody PermissionUpdateDto permissionUpdateDto) {
 
-        if (!Optional.ofNullable(permissionUpdateDto.getPermissionId()).isPresent() || StringUtils.isEmpty(permissionUpdateDto.getPName()) || StringUtils.isEmpty(permissionUpdateDto.getPCode())) {
+        if (!Optional.ofNullable(permissionUpdateDto.getPermissionId()).isPresent()) {
             return ResultResp.NOTNULLPARAM();
         }
         SysPermissionPO po = new SysPermissionPO();
         po.setPermissionId(permissionUpdateDto.getPermissionId());
-        po.setPermissionName(permissionUpdateDto.getPName());
-        po.setPermissionUrl(permissionUpdateDto.getPUrl());
-        po.setPermissionCode(permissionUpdateDto.getPCode());
-        po.setPermissionIconUrl(permissionUpdateDto.getPIconUrl());
-        po.setPermissionState(permissionUpdateDto.getPStat());
-        po.setPermissionType(permissionUpdateDto.getPType());
-        po.setPermissionSort(permissionUpdateDto.getPSort());
+        po.setPermissionName(permissionUpdateDto.getPname());
+        po.setPermissionUrl(permissionUpdateDto.getPurl());
+        po.setPermissionCode(permissionUpdateDto.getPcode());
+        po.setPermissionIconUrl(permissionUpdateDto.getPiconUrl());
+        po.setPermissionState(permissionUpdateDto.getPstat());
+        po.setPermissionType(permissionUpdateDto.getPtype());
+        po.setPermissionSort(permissionUpdateDto.getPsort());
+        po.setPermissionShow(permissionUpdateDto.getPermissionShow());
         boolean flag = sysPermissionService.updatePermission(po);
         if (flag) {
             return ResultResp.SUCCESS();
@@ -117,8 +121,8 @@ public class SysPermissionController {
     @UserLoginToken
     @ApiOperation(value = "获取全部权限")
     @PostMapping(value = "getAll")
-    public ResultResp<List<PermissionVo>> getAll() {
-        List<PermissionVo> list = sysPermissionService.getAllPermission();
+    public ResultResp<List<SystemPermissionVo>> getAll(@RequestBody SystemPermissionListDto systemPermissionListDto) {
+        List<SystemPermissionVo> list = sysPermissionService.getAllPermission(systemPermissionListDto);
         return ResultResp.SUCCESS(list);
     }
 }

energy-manage-service/src/main/java/com/energy/manage/service/controller/system/SysRoleController.java

@@ -10,6 +10,7 @@ import com.energy.manage.service.config.annotations.UserLoginToken;
 import com.energy.manage.service.domain.dto.system.*;
 import com.energy.manage.service.domain.vo.system.PermissionVo;
 import com.energy.manage.service.domain.vo.system.SysRelationVo;
+import com.energy.manage.service.domain.vo.system.SystemPermissionVo;
 import com.energy.manage.service.service.system.SysPermissionService;
 import com.energy.manage.service.service.system.SysRoleService;
 import io.swagger.annotations.Api;
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -61,6 +63,7 @@ public class SysRoleController {
 		rolePO = new SysRolePO();
 		rolePO.setRoleCode(roleAddDto.getRoleCode());
 		rolePO.setRoleDescription(roleAddDto.getRoleName());
+		rolePO.setRoleType(roleAddDto.getRoleType());
 		rolePO.setRoleAvailable(Constants.GLOBAL_IN_USE);
 		rolePO.setCreateTime(new Date());
 		rolePO.setUpdateTime(new Date());
@@ -102,6 +105,7 @@ public class SysRoleController {
 		rolePO.setId(roleUpdateDto.getRoleId());
 		rolePO.setRoleDescription(roleUpdateDto.getRoleName());
 		rolePO.setRoleCode(roleUpdateDto.getRoleCode());
+		rolePO.setRoleType(roleUpdateDto.getRoleType());
 		boolean flag = sysRoleService.updateRole(rolePO);
 		if (flag) {
 			return ResultResp.SUCCESS();
@@ -109,6 +113,18 @@ public class SysRoleController {
 		return ResultResp.FAIL();
 	}
 
+	@UserLoginToken
+	@PostMapping(value = "/updateRoleAvailable")
+	@ApiOperation(value = "更新角色状态")
+	public ResultResp updateRoleAvailable(@RequestBody RoleUpdateStateDto updateStateDto) {
+
+		boolean flag = sysRoleService.updateRoleAvailable(updateStateDto);
+		if (flag) {
+			return ResultResp.SUCCESS();
+		}
+		return ResultResp.FAIL();
+	}
+
 	/**
 	 * 通过角色id ，获取角色详情
 	 * @return
@@ -132,8 +148,9 @@ public class SysRoleController {
 	 */
 	@UserLoginToken
 	@PostMapping(value = "/通过角色名称查询角色列表")
+	@ApiOperation(value = "角色分页列表")
 	public ResultResp<Page<SysRolePO>> getRoleListByName(@RequestBody RoleListDto roleListDto) {
-		Page<SysRolePO> page = sysRoleService.getRoleListByName(roleListDto.getPageNum(), roleListDto.getPageSize(), roleListDto.getRoleName());
+		Page<SysRolePO> page = sysRoleService.getRoleListByName(roleListDto.getPageNum(), roleListDto.getPageSize(), roleListDto.getRoleName(),roleListDto.getRoleAvailable());
 		return ResultResp.SUCCESS(page);
 	}
 
@@ -144,11 +161,11 @@ public class SysRoleController {
 	@UserLoginToken
 	@PostMapping(value = "/getRolePermission")
 	@ApiOperation(value = "通过角色获取权限")
-	public ResultResp<List<PermissionVo> > getRolePermission(@RequestBody RoleDelDto roleDelDto) {
+	public ResultResp<List<SystemPermissionVo> > getRolePermission(@RequestBody RoleDelDto roleDelDto) {
 		if (!Optional.ofNullable(roleDelDto.getRoleId()).isPresent()) {
 			return ResultResp.NOTNULLPARAM();
 		}
-		List<PermissionVo> list = permissionService.getRolePermission(roleDelDto.getRoleId());
+		List<SystemPermissionVo> list = permissionService.getRolePermission(roleDelDto.getRoleId());
 		return ResultResp.SUCCESS(list);
 	}
 
@@ -159,11 +176,11 @@ public class SysRoleController {
 	@UserLoginToken
 	@PostMapping(value = "/getRoleOrganization")
 	@ApiOperation(value = "通过角色获取组织架构权限")
-	public ResultResp<List<SysRelationVo>> getRoleOrganization(@RequestBody RoleDelDto roleDelDto) {
+	public ResultResp<List<Map<String, Object>>> getRoleOrganization(@RequestBody RoleDelDto roleDelDto) {
 		if (!Optional.ofNullable(roleDelDto.getRoleId()).isPresent()) {
 			return ResultResp.NOTNULLPARAM();
 		}
-		List<SysRelationVo> list = permissionService.getRoleOrganization(roleDelDto.getRoleId());
+		List<Map<String, Object>> list = permissionService.getRoleOrganization(roleDelDto.getRoleId());
 		return ResultResp.SUCCESS(list);
 	}
 

energy-manage-service/src/main/java/com/energy/manage/service/controller/system/SysTemplateController.java

@@ -0,0 +1,62 @@
+package com.energy.manage.service.controller.system;
+
+import com.energy.manage.common.reponse.ResultResp;
+import com.energy.manage.service.config.TemplateConfig;
+import com.energy.manage.service.config.annotations.UserLoginToken;
+import com.energy.manage.service.domain.dto.system.SystemPermissionListDto;
+import com.energy.manage.service.domain.vo.system.SystemPermissionVo;
+import com.energy.manage.service.service.system.SysRoleService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @menu: 后台模版管理
+ *
+ * @author sy
+ * @date 2021-10-18 13:32:05
+ */
+@RestController
+@RequestMapping("sysTemplate")
+@CrossOrigin
+@Api(value = "SysTemplateController", tags = "系统模版管理")
+public class SysTemplateController {
+
+	@Autowired
+	private TemplateConfig templateConfig;
+
+	/**
+	 * 获取系统模版
+	 *
+	 * @return
+	 */
+	@UserLoginToken
+	@ApiOperation(value = "获取模版")
+	@PostMapping(value = "getAllTemplate")
+	public ResultResp<Map<String,String>> getAllTemplate() {
+
+		Map<String,String> templateMap = new HashMap<>(4);
+		// 标准功率曲线
+		templateMap.put("bzPower",templateConfig.getBzPower());
+		// 合同功率曲线
+		templateMap.put("htPower",templateConfig.getHtPower());
+		// 风场
+		templateMap.put("field",templateConfig.getField());
+		// 风机
+		templateMap.put("draught",templateConfig.getDraught());
+
+		return ResultResp.SUCCESS(templateMap);
+	}
+}
+
+
+
+

energy-manage-service/src/main/java/com/energy/manage/service/controller/system/SysUserInfoController.java

@@ -66,15 +66,23 @@ public class SysUserInfoController {
             return ResultResp.NOTNULLPARAM();
         }
         SysUserInfoPO userPO = new SysUserInfoPO();
-        userPO.setUserName(userAddDto.getUserName());
+        userPO.setLoginName(userAddDto.getLoginName());
         userPO = sysUserInfoService.selectOne(userPO);
         if (null != userPO) {
-            log.info("用户名已被占用！");
+            log.info("登录名已被占用！");
             return ResultResp.EXISTSUSER();
         }
+        SysUserInfoPO sysUserInfoPO = new SysUserInfoPO();
+        sysUserInfoPO.setUserPhone(userAddDto.getPhone());
+        sysUserInfoPO = sysUserInfoService.selectOne(sysUserInfoPO);
+        if (null != sysUserInfoPO) {
+            log.info("手机号已被占用！");
+            return ResultResp.FAIL("手机号已被占用！");
+        }
         userPO = new SysUserInfoPO();
         userPO.setUserPhone(userAddDto.getPhone());
         userPO.setState(Constants.GLOBAL_IN_USE);
+        userPO.setLoginName(userAddDto.getLoginName());
         userPO.setUserName(userAddDto.getUserName());
         userPO.setUserPassword(BCryptTools.hashpw(userAddDto.getPwd()));
         userPO.setCreateTime(new Date());
@@ -228,6 +236,7 @@ public class SysUserInfoController {
         userPO.setId(userUpdateDto.getUserId());
         userPO.setUserPhone(userUpdateDto.getPhone());
         userPO.setUserName(userUpdateDto.getUserName());
+        userPO.setLoginName(userUpdateDto.getLoginName());
         boolean flag = sysUserInfoService.updateUserRole(userPO, userUpdateDto.getRoleId());
         if (flag) {
             return ResultResp.SUCCESS();
@@ -268,7 +277,7 @@ public class SysUserInfoController {
         }
 
         SysUserInfoPO userPO = new SysUserInfoPO();
-        userPO.setUserName(userName);
+        userPO.setLoginName(userName);
         userPO = sysUserInfoService.selectOne(userPO);
         if (null == userPO || null == userPO.getId()) {
             return ResultResp.NOTEXISTSUSER();
@@ -283,7 +292,7 @@ public class SysUserInfoController {
         }
 
 
-        String token = JwtUtil.getLoginToken(userPO.getId(), userPO.getUserName(), userPO.getUserPhone(), userPO.getUserPassword());
+        String token = JwtUtil.getLoginToken(userPO.getId(), userPO.getLoginName(), userPO.getUserPhone(), userPO.getUserPassword());
         Map<String, Object> map = new HashMap<>(4);
 
         List<PermissionVo> list = permissionService.getRolePermissionByUserId(userPO.getId());
@@ -329,20 +338,6 @@ public class SysUserInfoController {
     }
 
 
-    /**
-     * 获取未绑定过教师的可用状态的用户账号
-     *
-     * @return
-     */
-    @UserLoginToken
-    @GetMapping(value = "getNonBoundTeacherUser")
-    @ApiOperation(value = "获取未绑定老师的账号")
-    public ResultResp<List<UserVo>> getNonBoundTeacherUser(@RequestParam  String userName) {
-        List<UserVo> sysUserInfoPOList = sysUserInfoService.getNonBoundTeacherUser(userName);
-        return ResultResp.SUCCESS(sysUserInfoPOList);
-    }
-
-
 //    public static void main(String[] args) {
 //        System.out.println(BCryptTools.checkpw("123456","$2a$10$t0ZYLlopxXmwpwdQ4xfTr.84sk.U8EpguUeNkAPXdm0MF4I3N5jOa"));
 //    }

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

@@ -4,11 +4,9 @@ package com.energy.manage.service.controller.windenginegroup;
 import com.energy.manage.common.base.Page;
 import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.config.annotations.UserLoginToken;
-import com.energy.manage.service.domain.dto.windenginegroup.WindEngineGroupCodeDto;
-import com.energy.manage.service.domain.dto.windenginegroup.WindEngineGroupCreateDto;
-import com.energy.manage.service.domain.dto.windenginegroup.WindEngineGroupPageDto;
-import com.energy.manage.service.domain.dto.windenginegroup.WindEngineGroupStateDto;
+import com.energy.manage.service.domain.dto.windenginegroup.*;
 import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupPageVo;
+import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupVo;
 import com.energy.manage.service.service.windenginegroup.WindEngineGroupService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -17,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
+
 @Slf4j
 @RestController
 @CrossOrigin
@@ -28,11 +28,10 @@ public class WindEngineGroupController {
     private WindEngineGroupService windEngineGroupService;
 
 
-
     @UserLoginToken
     @PostMapping(value = "/createWindEngineGroup")
     @ApiOperation(value = "创建风机机组")
-    public ResultResp createWindEngineGroup(@RequestBody WindEngineGroupCreateDto windEngineGroupCreateDto) {
+    public ResultResp createWindEngineGroup(@RequestBody @Valid WindEngineGroupCreateDto windEngineGroupCreateDto) {
         boolean flg = windEngineGroupService.createWindEngineGroup(windEngineGroupCreateDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
@@ -40,31 +39,37 @@ public class WindEngineGroupController {
 
     @UserLoginToken
     @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();
+    @ApiOperation(value = "导入风机信息")
+    public ResultResp windEngineGroupImportData(@RequestPart MultipartFile file, @RequestParam("fieldCode") String fieldCode) {
+        return  windEngineGroupService.windEngineGroupImportData(file, fieldCode);
     }
 
-
-
+    @Deprecated
     @UserLoginToken
     @PostMapping(value = "/afreshWindEngineGroupImportData")
     @ApiOperation(value = "重新上传风机信息")
-    public ResultResp afreshWindEngineGroupImportData(@RequestPart MultipartFile file,@RequestParam("fieldCode") String fieldCode) {
-        boolean flg = windEngineGroupService.afreshWindEngineGroupImportData(file,fieldCode);
-        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+    public ResultResp afreshWindEngineGroupImportData(@RequestPart MultipartFile file, @RequestParam("fieldCode") String fieldCode) {
+//        boolean flg = windEngineGroupService.afreshWindEngineGroupImportData(file,fieldCode);
+        return ResultResp.FAIL("不可使用");
     }
 
 
     @UserLoginToken
     @PostMapping(value = "/windEngineGrouPage")
     @ApiOperation(value = "风机分页查询")
-    public ResultResp< Page<WindEngineGroupPageVo>> windEngineGrouPage(WindEngineGroupPageDto windEngineGroupPageDto) {
+    public ResultResp<Page<WindEngineGroupPageVo>> windEngineGrouPage(@RequestBody WindEngineGroupPageDto windEngineGroupPageDto) {
         Page<WindEngineGroupPageVo> page = windEngineGroupService.windEngineGrouPage(windEngineGroupPageDto);
         return ResultResp.SUCCESS(page);
     }
 
+    @UserLoginToken
+    @PostMapping(value = "/getWindEngineGroup")
+    @ApiOperation(value = "查询风机对象")
+    public ResultResp<WindEngineGroupVo> getWindEngineGroup(@RequestBody WindEngineGroupCodeDto windEngineGroupCodeDto) {
+        WindEngineGroupVo vo = windEngineGroupService.getWindEngineGroup(windEngineGroupCodeDto);
+        return ResultResp.SUCCESS(vo);
+    }
+
 
     @UserLoginToken
     @PostMapping(value = "/delWindEngineGroup")
@@ -78,22 +83,18 @@ public class WindEngineGroupController {
     @UserLoginToken
     @PostMapping(value = "/updateStateWindEngineGroup")
     @ApiOperation(value = "更改状态")
-    public ResultResp delFieldWindEngineGroup(@RequestBody WindEngineGroupStateDto windEngineGroupStateDto) {
+    public ResultResp updateStateWindEngineGroup(@RequestBody WindEngineGroupStateDto windEngineGroupStateDto) {
         boolean flg = windEngineGroupService.updateStateWindEngineGroup(windEngineGroupStateDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
 
-
     @UserLoginToken
-    @PostMapping(value = "/getWindEngineGroup")
-    @ApiOperation(value = "更改状态")
-    public ResultResp getWindEngineGroup(@RequestBody WindEngineGroupStateDto windEngineGroupStateDto) {
-        boolean flg = windEngineGroupService.updateStateWindEngineGroup(windEngineGroupStateDto);
+    @PostMapping(value = "/updateWindEngineGroup")
+    @ApiOperation(value = "更改风机数据")
+    public ResultResp updateWindEngineGroup(@RequestBody WindEngineGroupUpdateDto dto) {
+        boolean flg = windEngineGroupService.updateWindEngineGroup(dto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
 
 
-
-
-
 }

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

@@ -8,14 +8,19 @@ 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;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
+import java.util.List;
+
 @Slf4j
 @RestController
 @CrossOrigin
@@ -29,12 +34,15 @@ public class WindEngineMillController {
     @UserLoginToken
     @PostMapping(value = "/createEngineMill")
     @ApiOperation(value = "手动创建机型信息")
-    public ResultResp createEngineMill(@RequestPart WindEngineMillCreateDto windEngineMillCreateDto) {
-
+    public ResultResp createEngineMill(@RequestBody @Valid WindEngineMillCreateDto windEngineMillCreateDto) {
+        if(!windEngineMillService.verificationData(windEngineMillCreateDto.getMachineTypeCode(),windEngineMillCreateDto.getManufacturerCode())){
+            return ResultResp.FAIL("该厂商对应机型已经存在！");
+        }
         boolean flg = windEngineMillService.createEngineMill(windEngineMillCreateDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
 
+    @Deprecated
     @UserLoginToken
     @PostMapping(value = "/windEngineMillImportData")
     @ApiOperation(value = "导入机型信息")
@@ -49,7 +57,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);
     }
@@ -58,7 +65,7 @@ public class WindEngineMillController {
     @UserLoginToken
     @PostMapping(value = "/delWindEngineMill")
     @ApiOperation(value = "删除机型")
-    public ResultResp delWindEngineMill(@RequestBody WindEngineMillCodeDto windEngineMillCodeDto) {
+    public ResultResp delWindEngineMill(@RequestBody @Valid WindEngineMillCodeDto windEngineMillCodeDto) {
 
         boolean flg = windEngineMillService.delWindEngineMill(windEngineMillCodeDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
@@ -68,18 +75,28 @@ public class WindEngineMillController {
     @UserLoginToken
     @PostMapping(value = "/getWindEngineMillPageVo")
     @ApiOperation(value = "查询机型对象")
-    public ResultResp getWindEngineMillPageVo(@RequestBody WindEngineMillCodeDto windEngineMillCodeDto) {
+    public ResultResp<WindEngineMillPageVo> getWindEngineMillPageVo(@RequestBody @Valid WindEngineMillCodeDto windEngineMillCodeDto) {
 
         WindEngineMillPageVo windEngineMillPageVo = windEngineMillService.getWindEngineMillPageVo(windEngineMillCodeDto);
         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")
-    @ApiOperation(value = "查询机型对象")
-    public ResultResp updateWindEngineMill(@RequestBody WindEngineMillDto windEngineMillDto) {
-
+    @ApiOperation(value = "更新机型")
+    public ResultResp updateWindEngineMill(@RequestBody @Valid WindEngineMillDto windEngineMillDto) {
+        if(StringUtils.isEmpty(windEngineMillDto.getMillTypeCode())){
+            return ResultResp.NOTNULLPARAM();
+        }
         boolean flg = windEngineMillService.updateWindEngineMill(windEngineMillDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }

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

@@ -2,13 +2,18 @@ package com.energy.manage.service.controller.windfield;
 
 
 import com.energy.manage.common.base.Page;
+import com.energy.manage.common.po.anemometertower.AnemometerTowerPO;
+import com.energy.manage.common.po.windfield.WindFieldPO;
 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;
+import com.energy.manage.service.service.windenginegroup.WindEngineGroupService;
+import com.energy.manage.service.service.windfield.WindFieldResourceService;
 import com.energy.manage.service.service.windfield.WindFieldService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -17,7 +22,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @RestController
@@ -29,11 +36,24 @@ public class WindFieldController {
     @Autowired
     private WindFieldService windFieldService;
 
+    @Autowired
+    private WindEngineGroupService windEngineGroupService;
+
+    @Autowired
+    private WindFieldResourceService windFieldResourceService;
+
 
     @UserLoginToken
     @PostMapping(value = "/createWindField")
     @ApiOperation(value = "创建风场信息")
-    public ResultResp createWindField(@RequestBody WindFieldDto windFieldDto) {
+    public ResultResp createWindField(@RequestBody @Valid WindFieldDto windFieldDto) {
+
+        // 校验风场名称是否存在
+        WindFieldPO po = windFieldService.getWindFieldPOByFieldName(windFieldDto.getFieldName());
+        if (po != null) {
+            return ResultResp.FAIL("风场名称已经存在！");
+        }
+
         boolean flg = windFieldService.createWindField(windFieldDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
@@ -43,46 +63,22 @@ public class WindFieldController {
     @PostMapping(value = "/windFieldImportData")
     @ApiOperation(value = "导入风场信息")
     public ResultResp windFieldImportData(@RequestPart MultipartFile file,
-                                          @RequestParam(required = true) String companyCode,
-                                          @RequestParam(required = true) Integer provinceId,
-                                          @RequestParam(required = true) String provinceName,
-                                          @RequestParam(required = true) Integer cityId,
-                                          @RequestParam(required = true) String cityName,
-                                          @RequestParam(required = true) String areaCode) {
+                                          @RequestParam(required = true) String companyCode) {
 
         WindFieldImportDataDto windFieldImportDataDto = new WindFieldImportDataDto();
         windFieldImportDataDto.setCompanyCode(companyCode);
-        windFieldImportDataDto.setProvinceId(provinceId);
-        windFieldImportDataDto.setProvinceName(provinceName);
-        windFieldImportDataDto.setCityId(cityId);
-        windFieldImportDataDto.setCityName(cityName);
-        windFieldImportDataDto.setAreaCode(areaCode);
 
-        boolean flg = windFieldService.windFieldImportData(file, windFieldImportDataDto);
-        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+        return windFieldService.windFieldImportData(file, windFieldImportDataDto);
     }
 
+    @Deprecated
     @UserLoginToken
     @PostMapping(value = "/afreshWindFieldImportData")
     @ApiOperation(value = "重新导入风场信息")
     public ResultResp afreshWindFieldImportData(@RequestPart MultipartFile file,
-                                                @RequestParam(required = true) String companyCode,
-                                                @RequestParam(required = true) Integer provinceId,
-                                                @RequestParam(required = true) String provinceName,
-                                                @RequestParam(required = true) Integer cityId,
-                                                @RequestParam(required = true) String cityName,
-                                                @RequestParam(required = true) String areaCode) {
-
-        WindFieldImportDataDto windFieldImportDataDto = new WindFieldImportDataDto();
-        windFieldImportDataDto.setCompanyCode(companyCode);
-        windFieldImportDataDto.setProvinceId(provinceId);
-        windFieldImportDataDto.setProvinceName(provinceName);
-        windFieldImportDataDto.setCityId(cityId);
-        windFieldImportDataDto.setCityName(cityName);
-        windFieldImportDataDto.setAreaCode(areaCode);
+                                                @RequestParam(required = true) String companyCode) {
 
-        boolean flg = windFieldService.afreshWindFieldImportData(file, windFieldImportDataDto);
-        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+        return ResultResp.FAIL("此接口已作废！");
     }
 
     @UserLoginToken
@@ -96,17 +92,28 @@ public class WindFieldController {
 
     @UserLoginToken
     @PostMapping(value = "/delWindFieldById")
-    @ApiOperation(value = "通过风场编号删除风场")
-    public ResultResp delWindFieldById(@RequestParam(required = true) String fieldCode) {
-
-        boolean flg = windFieldService.delWindFieldById(fieldCode);
+    @ApiOperation(value = "删除风场")
+    public ResultResp delWindFieldById(@RequestBody @Valid WindFieldCodeDto windFieldCodeDto) {
+        if (windEngineGroupService.getWindEngineGroupCountByField(windFieldCodeDto.getFieldCode()) <= 0) {
+            return ResultResp.FAIL("风场下有绑定风机，不可删除！");
+        }
+        boolean flg = windFieldService.delWindFieldById(windFieldCodeDto.getFieldCode());
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
 
     @UserLoginToken
+    @PostMapping(value = "/getWindFieldVos")
+    @ApiOperation(value = "通过企业编号查询关联风场")
+    public ResultResp<List<WindFieldVo>> getWindFieldVos(@RequestParam(required = true) String companyCode) {
+
+        List<WindFieldVo> list = windFieldService.getWindFieldVos(companyCode);
+        return ResultResp.SUCCESS(list);
+    }
+
+    @UserLoginToken
     @PostMapping(value = "/updateWindFieldStateById")
     @ApiOperation(value = "修改状态")
-    public ResultResp updateWindFieldStateById(@RequestBody WindFieldUpdateStateDto windFieldUpdateStateDto) {
+    public ResultResp updateWindFieldStateById(@RequestBody @Valid WindFieldUpdateStateDto windFieldUpdateStateDto) {
 
         boolean flg = windFieldService.updateWindFieldStateById(windFieldUpdateStateDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
@@ -115,7 +122,7 @@ public class WindFieldController {
     @UserLoginToken
     @PostMapping(value = "/getWindFieldVo")
     @ApiOperation(value = "查询风场对象")
-    public ResultResp getWindFieldVo(@RequestBody WindFieldCodeDto windFieldCodeDto) {
+    public ResultResp<WindFieldVo> getWindFieldVo(@RequestBody @Valid WindFieldCodeDto windFieldCodeDto) {
         WindFieldVo vo = windFieldService.getWindFieldVo(windFieldCodeDto);
         return ResultResp.SUCCESS(vo);
     }
@@ -123,7 +130,7 @@ public class WindFieldController {
     @UserLoginToken
     @PostMapping(value = "/WindFieldDto")
     @ApiOperation(value = "更新风场信息")
-    public ResultResp updateWindField(@RequestBody WindFieldUpdateDto windFieldUpdateDto) {
+    public ResultResp updateWindField(@RequestBody @Valid WindFieldUpdateDto windFieldUpdateDto) {
         boolean flg = windFieldService.updateWindField(windFieldUpdateDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
@@ -131,8 +138,35 @@ public class WindFieldController {
     @UserLoginToken
     @PostMapping(value = "/getWindFieldTree")
     @ApiOperation(value = "查询风场树")
-    public ResultResp<List<WindRelationVo>> getWindFieldTree() {
-        List<WindRelationVo> list = windFieldService.getWindFieldTree();
+    public ResultResp<List<Map<String, Object>>> getWindFieldTree() {
+        List<Map<String, Object>> list = windFieldService.getWindFieldTree();
+        return ResultResp.SUCCESS(list);
+    }
+
+
+    @UserLoginToken
+    @PostMapping(value = "/saveWindFieldResource")
+    @ApiOperation(value = "保存上传风场资源文件")
+    public ResultResp saveWindFieldResource(@RequestBody @Valid WindFieldResourceCreateDto windFieldResourceCreateDto) {
+        boolean flg = windFieldResourceService.saveWindFieldResource(windFieldResourceCreateDto);
+        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+    }
+
+
+    @UserLoginToken
+    @PostMapping(value = "/delWindFieldResource")
+    @ApiOperation(value = "删除风场资源文件")
+    public ResultResp delWindFieldResource(@RequestBody @Valid WindFieldResourceDelDto windFieldResourceDelDto) {
+        boolean flg = windFieldResourceService.delWindFieldResource(windFieldResourceDelDto);
+        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+    }
+
+
+    @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/dto/anemometertower/AnemometerTowerByFieldDto.java

@@ -0,0 +1,17 @@
+package com.energy.manage.service.domain.dto.anemometertower;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+public class AnemometerTowerByFieldDto {
+
+    @NotNull(message = "风场编号不能为空")
+    @ApiModelProperty("风场编号")
+    private  String fieldCode;
+
+}

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

@@ -1,33 +1,57 @@
 package com.energy.manage.service.domain.dto.anemometertower;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
 /**
  * 添加测风塔
  */
 @Getter
 @Setter
+@ApiModel
 public class AnemometerTowerCreateDto {
 
-
-    /**
-     * 测风塔编号
-     */
-    private String anemometerCode;
     /**
      * 测风塔名称
      */
+    @NotNull(message = "测风塔名称不能为null")
+    @ApiModelProperty("测风塔名称")
     private String anemometerName;
     /**
      * 经度
      */
-    private String longitude;
+    @ApiModelProperty("经度")
+    private Double longitude;
     /**
      * 纬度
      */
-    private String latitude;
+    @ApiModelProperty("纬度")
+    private Double latitude;
+
+
+    @ApiModelProperty("测风塔高度集合")
+    private List<AnemometerTowerHeightListDto> anemometerTowerHeightDtoList;
+
+
+    @Getter
+    @Setter
+    @ApiModel
+    public static class AnemometerTowerHeightListDto {
+
+        /**
+         * 测风塔高度
+         */
+        @ApiModelProperty("测风塔高度")
+        private Double anemometerHeight;
+
+
+    }
 
 
 }

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

@@ -1,19 +1,26 @@
 package com.energy.manage.service.domain.dto.anemometertower;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * 删除测风塔
  */
 @Getter
 @Setter
+@ApiModel("删除测风塔")
 public class AnemometerTowerDelDto {
 
     /**
      * 测风塔编号
      */
+    @NotNull(message = "测风塔名称不能为null")
+    @ApiModelProperty("测风塔编号")
     private String anemometerCode;
 
 

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;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 /**
- * 删除测风塔
+ * 测风塔
  */
 @Getter
 @Setter
+@ApiModel("测风塔")
 public class AnemometerTowerDto {
 
     /**
      * 测风塔编号
      */
+    @ApiModelProperty("测风塔编号")
     private String anemometerCode;
 
 

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;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
@@ -7,13 +9,16 @@ import lombok.Setter;
 import java.util.List;
 
 /**
- * （
+ *
  * 测风塔高度参数
  */
 @Getter
 @Setter
+@ApiModel("测风塔高度参数")
 public class AnemometerTowerHeightDto {
 
+
+    @ApiModelProperty("测风塔高度")
     private List<AnemometerTowerHeightDto> list;
 
 
@@ -24,11 +29,13 @@ public class AnemometerTowerHeightDto {
         /**
          * 测风塔编号
          */
+        @ApiModelProperty("测风塔编号")
         private String anemometerCode;
         /**
          * 测风塔高度
          */
-        private String anemometerHeight;
+        @ApiModelProperty("测风塔高度")
+        private Double anemometerHeight;
 
 
     }

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;
 
 import com.energy.manage.service.domain.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
@@ -10,17 +12,30 @@ import lombok.Setter;
  */
 @Getter
 @Setter
+@ApiModel("查询测风塔分页信息")
 public class AnemometerTowerPageDto extends BaseDto {
 
+
+    @ApiModelProperty("测风塔编号")
+    private String anemometerCode;
+
+
     /**
      * 测风塔名称
      */
+    @ApiModelProperty("测风塔名称")
     private String anemometerName;
 
-
     /**
      * 状态
      */
+    @ApiModelProperty("状态")
     private Integer state;
 
+    @ApiModelProperty("开始时间")
+    private String beginTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+
 }

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;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
+@ApiModel("功率曲线关系参数")
 public class AnemometerTowerRelationDto {
 
 
     /**
      * 测风塔编号
      */
+    @ApiModelProperty("测风塔编号")
     private String towerCode;
     /**
      * 风场编号
      */
+    @ApiModelProperty("风场编号")
     private String fieldCode;
 
 }

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

@@ -1,25 +1,33 @@
 package com.energy.manage.service.domain.dto.anemometertower;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * 修改测风塔状态
  */
 @Getter
 @Setter
+@ApiModel("修改测风塔状态")
 public class AnemometerTowerStateDto {
 
     /**
      * 测风塔编号
      */
+    @NotNull(message = "测风塔编号不能null")
+    @ApiModelProperty("测风塔编号")
     private String anemometerCode;
 
 
     /**
-     * 状态
+     *
      */
+    @ApiModelProperty("状态")
     private Integer state;
 
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerUpdateDto.java

@@ -0,0 +1,58 @@
+package com.energy.manage.service.domain.dto.anemometertower;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 添加测风塔
+ */
+@Getter
+@Setter
+@ApiModel
+public class AnemometerTowerUpdateDto {
+
+    /**
+     * 测风塔编号
+     */
+    @ApiModelProperty("测风塔编号")
+    private String anemometerCode;
+    /**
+     * 测风塔名称
+     */
+    @ApiModelProperty("测风塔名称")
+    private String anemometerName;
+    /**
+     * 经度
+     */
+    @ApiModelProperty("经度")
+    private Double longitude;
+    /**
+     * 纬度
+     */
+    @ApiModelProperty("纬度")
+    private Double latitude;
+
+
+    @ApiModelProperty("测风塔高度")
+    private List<AnemometerTowerHeightListDto> anemometerTowerHeightListDtos;
+
+
+    @Getter
+    @Setter
+    public static class AnemometerTowerHeightListDto {
+
+        /**
+         * 测风塔高度
+         */
+        @ApiModelProperty("测风塔高度")
+        private Double anemometerHeight;
+
+
+    }
+
+
+}

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

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

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

@@ -1,13 +1,18 @@
 package com.energy.manage.service.domain.dto.company;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 @Getter
 @Setter
+@ApiModel("删除企业参数")
 public class WindCompanyDelDto {
 
+    @NotNull(message ="企业编号不能为空")
     @ApiModelProperty("企业编号")
     private String companyCode;
 

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

@@ -1,16 +1,21 @@
 package com.energy.manage.service.domain.dto.company;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 @Getter
 @Setter
+@ApiModel("风场企业信息")
 public class WindCompanyDto {
 
     /**
      * 企业名称
      */
+    @NotNull(message = "企业名称不能为空")
     @ApiModelProperty("企业名称")
     private String companyName;
     /**
@@ -45,6 +50,7 @@ public class WindCompanyDto {
     /**
      * 资源父id （父编号0，子编号为上级编号）
      */
+    @NotNull(message = "父编号不能为空")
     @ApiModelProperty("资源父id （父编号0，子编号为上级编号）")
     private String parentCode;
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/company/WindCompanyPageDto.java

@@ -0,0 +1,31 @@
+package com.energy.manage.service.domain.dto.company;
+
+import com.energy.manage.common.po.company.WindCompanyPO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 企业信息树树展示
+ */
+@Getter
+@Setter
+public class WindCompanyPageDto  {
+
+
+    /**
+     * 企业名称
+     */
+    @ApiModelProperty("企业名称")
+    private String companyName;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private Integer state;
+}

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

@@ -1,16 +1,22 @@
 package com.energy.manage.service.domain.dto.company;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 @Getter
 @Setter
+@ApiModel("修改企业信息状态")
 public class WindCompanyStateDto {
 
+    @NotNull(message ="企业编号不能为空")
     @ApiModelProperty("企业编号")
     private String companyCode;
 
+    @NotNull(message ="状态不能为空")
     @ApiModelProperty("状态")
     private Integer state;
 

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

@@ -1,13 +1,18 @@
 package com.energy.manage.service.domain.dto.company;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 @Getter
 @Setter
+@ApiModel("修改企业信息")
 public class WindCompanyUpdateDto {
 
+    @NotNull(message ="企业编号不能为空")
     @ApiModelProperty("企业编号")
     private String  companyCode;
     /**
@@ -38,7 +43,7 @@ public class WindCompanyUpdateDto {
      * 市名字
      */
     @ApiModelProperty("市名字")
-    private Integer cityName;
+    private String cityName;
     /**
      * 企业描述
      */

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;
 
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -9,10 +10,11 @@ import javax.validation.constraints.NotNull;
 
 @Getter
 @Setter
+@ApiModel("字典信息")
 public class DictConstantsQueryDto {
 
 
-    @ApiModelProperty(value = "字典类型 ")
+    @ApiModelProperty(value = "字典类型 1-双驱类型")
     @NotNull
     private Integer dictType;
 

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;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
- *  导入合同功率曲线
+ *  合同功率曲线
  */
-@Data
+@Getter
+@Setter
+@ApiModel("删除合同功能曲线参数")
 public class PowerWordContractDelDto {
 
     /**
      * 主键
      */
+    @ApiModelProperty("主键编号")
     private Integer id;
 
 

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;
 
 import com.energy.manage.common.po.powerwordcontract.PowerWordContractPO;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
 @Data
+@ApiModel("合同功率曲线")
 public class PowerWordContractDto extends PowerWordContractPO {
 }

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

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

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;
 
 import com.energy.manage.service.domain.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
  *  分页参数
  */
 @Data
+@ApiModel("合同功率曲线分页参数")
 public class PowerWordContractPageDto extends BaseDto {
 
 
     /**
      * 风场编号
      */
+    @ApiModelProperty("风场编号")
     private String fieldCode;
     /**
      * 机型编号
      */
+    @ApiModelProperty("机型编号")
     private String millTypeCode;
 
 

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;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ApiModel("标准功率曲线")
 public class PowerWordCriterionDelDto {
 
     /**
      * 主键
      */
+    @ApiModelProperty("主键编号")
     private Integer id;
 
 }

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;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
-@Data
+@Getter
+@Setter
+@ApiModel("标准功率曲线")
 public class PowerWordCriterionExcelDto {
 
     /**
      * 机型编号
      */
+    @ApiModelProperty("机型编号")
     private String millTypeCode;
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/system/LoginDto.java

@@ -1,11 +1,13 @@
 package com.energy.manage.service.domain.dto.system;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
+@ApiModel("用户登录参数")
 public class LoginDto {
 
     @ApiModelProperty(value = "用户名字")

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/system/PermissionDelDto.java

@@ -1,5 +1,6 @@
 package com.energy.manage.service.domain.dto.system;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -9,6 +10,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
+@ApiModel("删除菜单参数")
 public class PermissionDelDto {
 
     @ApiModelProperty(value = "权限id")

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/system/PermissionDto.java

@@ -1,5 +1,6 @@
 package com.energy.manage.service.domain.dto.system;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -9,24 +10,27 @@ import lombok.Setter;
  */
 @Getter
 @Setter
+@ApiModel
 public class PermissionDto {
 
     @ApiModelProperty(value = "父id")
     private Integer parentId = 0;
     @ApiModelProperty(value = "名称")
-    private String pName;
+    private String pname;
     @ApiModelProperty(value = "code")
-    private String pCode;
+    private String pcode;
     @ApiModelProperty(value = "链接")
-    private String pUrl;
+    private String purl;
     @ApiModelProperty(value = "图标地址")
-    private String pIconUrl;
+    private String piconUrl;
     @ApiModelProperty(value = "状态 资源状态 0 不可用 1是正常")
-    private Integer pStat = 1;
+    private Integer pstat = 1;
     @ApiModelProperty(value = "类型 资源类型(1 位菜单 2 为功能)")
-    private Integer pType = 1;
+    private Integer ptype = 1;
     @ApiModelProperty(value = "权限id")
-    private Integer pSort = 100000;
+    private Integer psort = 100000;
+    @ApiModelProperty("是否显示1-显示，2-不显示")
+    private Integer permissionShow;
 
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/system/PermissionUpdateDto.java

@@ -1,5 +1,6 @@
 package com.energy.manage.service.domain.dto.system;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -9,24 +10,27 @@ import lombok.Setter;
  */
 @Getter
 @Setter
+@ApiModel("更新菜单参数")
 public class PermissionUpdateDto {
 
     @ApiModelProperty(value = "权限id")
     private Integer permissionId;
     @ApiModelProperty(value = "名字")
-    private String pName;
+    private String pname;
     @ApiModelProperty(value = "code")
-    private String pCode;
+    private String pcode;
     @ApiModelProperty(value = "链接")
-    private String pUrl;
+    private String purl;
     @ApiModelProperty(value = "图标地址")
-    private String pIconUrl;
+    private String piconUrl;
     @ApiModelProperty(value = "状态 资源状态 0 不可用 1是正常")
-    private Integer pStat = 1;
+    private Integer pstat = 1;
     @ApiModelProperty(value = "类型 资源类型(1 位菜单 2 为功能)")
-    private Integer pType = 1;
+    private Integer ptype = 1;
     @ApiModelProperty(value = "")
-    private Integer pSort = 100000;
+    private Integer psort = 100000;
+    @ApiModelProperty("是否显示1-显示，2-不显示")
+    private Integer permissionShow;
 
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/system/RoleAddDto.java

@@ -15,6 +15,11 @@ public class RoleAddDto {
     private String roleName;
     @ApiModelProperty(value = "角色code")
     private String roleCode;
+    /**
+     * 角色类型
+     */
+    @ApiModelProperty(value = "角色类型")
+    private Integer roleType;
 
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/system/RoleListDto.java

@@ -15,4 +15,7 @@ public class RoleListDto extends BaseDto {
     @ApiModelProperty(value = "角色名字")
     private String roleName;
 
+    @ApiModelProperty(value = "状态1 启用 0停用")
+    private Integer roleAvailable;
+
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/system/RoleUpdateDto.java

@@ -17,5 +17,10 @@ public class RoleUpdateDto {
     private String roleName;
     @ApiModelProperty(value = "角色code")
     private String roleCode;
+    /**
+     * 角色类型
+     */
+    @ApiModelProperty(value = "角色类型")
+    private Integer roleType;
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/system/RoleUpdateStateDto.java

@@ -0,0 +1,23 @@
+package com.energy.manage.service.domain.dto.system;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ *
+ */
+@Getter
+@Setter
+public class RoleUpdateStateDto {
+
+    @ApiModelProperty(value = "角色id")
+    private Integer roleId;
+
+
+    /**
+     * 是否可用
+     */
+    @ApiModelProperty("是否可用")
+    private Integer roleAvailable;
+}

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/system/SystemPermissionListDto.java

@@ -0,0 +1,18 @@
+package com.energy.manage.service.domain.dto.system;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SystemPermissionListDto {
+
+    @ApiModelProperty(value = "权限id")
+    private Integer permissionId;
+
+    @ApiModelProperty(value = "权限名称")
+    private String permissionName;
+
+    @ApiModelProperty(value = "权限状态")
+    private Integer permissionState;
+
+}

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/system/UserAddDto.java

@@ -14,6 +14,12 @@ public class UserAddDto {
     @ApiModelProperty(value = "用户名字")
     private String userName;
 
+    /**
+     * 登录名
+     */
+    @ApiModelProperty(value = "登录名")
+    private String loginName;
+
     @ApiModelProperty(value = "密码")
     private String pwd = "123456";
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/system/UserUpdateDto.java

@@ -14,9 +14,12 @@ public class UserUpdateDto {
     private String phone;
     @ApiModelProperty("用户名字")
     private String userName;
+    @ApiModelProperty("登录名")
+    private String loginName;
     @ApiModelProperty("密码")
     private String pwd = "123456";
     @ApiModelProperty("角色id")
     private Integer roleId;
 
+
 }

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;
 
 import com.energy.manage.service.domain.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
  * 风机分页参数
  */
 @Data
+@ApiModel("风机参数")
 public class WindEngineGroupCodeDto {
 
 
     /**
      * 风机编号
      */
+    @ApiModelProperty("风机编号")
     private String engineCode;
 
 

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

@@ -2,61 +2,98 @@ package com.energy.manage.service.domain.dto.windenginegroup;
 
 import com.energy.manage.common.po.windenginegroup.WindEngineGroupPO;
 import com.energy.manage.service.domain.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
 /**
  * 创建风机参数
  */
 @Getter
 @Setter
+@ApiModel
 public class WindEngineGroupCreateDto {
 
     /**
      * 风场编号
      */
+    @NotNull(message = "风场编号不能为空")
+    @ApiModelProperty("风场编号")
     private String fieldCode;
     /**
      * 风机名称
      */
+    @NotNull(message = "风机名称不能为空")
+    @ApiModelProperty("风机名称")
     private String engineName;
     /**
      * 风机编号
      */
+    @ApiModelProperty("风机编号系统生成")
     private String engineCode;
     /**
      * 机型编号uuid
      */
+    @NotEmpty(message = "机型编号不能为空")
+    @ApiModelProperty("机型编号uuid")
     private String millTypeCode;
     /**
      * 额定容量
      */
-    private String ratedCapacity;
+    @ApiModelProperty("额定容量")
+    @NotNull(message = "额定容量不能为空")
+    private Double ratedCapacity;
     /**
      * 海拔高度
      */
-    private String elevationHeight;
+    @ApiModelProperty("海拔高度")
+    private Double elevationHeight;
     /**
      * 轮毂高度
      */
-    private String hubHeight;
+    @ApiModelProperty("轮毂高度")
+    private Double hubHeight;
     /**
      * 经度
      */
-    private String longitude;
+    @ApiModelProperty("经度")
+    private Double longitude;
     /**
      * 维度
      */
-    private String latitude;
+    @ApiModelProperty("维度")
+    private Double latitude;
     /**
      * 状态
      */
+    @ApiModelProperty("状态")
     private Integer state;
     /**
      * 是否标杆风机
      */
+    @ApiModelProperty("是否标杆风机")
     private Integer sightcing;
 
+    /**
+     * 额定风速 （m/s）
+     */
+    @ApiModelProperty("额定风速")
+    private Double rated_wind_speed;
+    /**
+     * 切入风速 （m/s）
+     */
+    @ApiModelProperty("切入风速")
+    private Double ratedCutInWindspeed;
+    /**
+     * 切出风速 （m/s）
+     */
+    @ApiModelProperty("切出风速")
+    private Double ratedCutOutWindspeed;
+
 
 }

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

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

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

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

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginegroup/WindEngineGroupUpdateDto.java

@@ -0,0 +1,90 @@
+package com.energy.manage.service.domain.dto.windenginegroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@ApiModel
+public class WindEngineGroupUpdateDto {
+
+    /**
+     * 风场编号
+     */
+    @NotNull(message = "风场编号不能为空")
+    @ApiModelProperty("风场编号")
+    private String fieldCode;
+    /**
+     * 风机名称
+     */
+    @NotNull(message = "风机名称不能为空")
+    @ApiModelProperty("风机名称")
+    private String engineName;
+    /**
+     * 风机编号
+     */
+    @ApiModelProperty("风机编号系统生成")
+    private String engineCode;
+    /**
+     * 机型编号uuid
+     */
+    @NotNull(message = "机型编号不能为空")
+    @ApiModelProperty("机型编号uuid")
+    private String millTypeCode;
+    /**
+     * 额定容量
+     */
+    @ApiModelProperty("额定容量")
+    @NotNull(message = "额定容量不能为空")
+    private Double ratedCapacity;
+    /**
+     * 海拔高度
+     */
+    @ApiModelProperty("海拔高度")
+    private Double elevationHeight;
+    /**
+     * 轮毂高度
+     */
+    @ApiModelProperty("轮毂高度")
+    private Double hubHeight;
+    /**
+     * 经度
+     */
+    @ApiModelProperty("经度")
+    private Double longitude;
+    /**
+     * 维度
+     */
+    @ApiModelProperty("维度")
+    private Double latitude;
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private Integer state;
+    /**
+     * 是否标杆风机
+     */
+    @ApiModelProperty("是否标杆风机")
+    private Integer sightcing;
+    /**
+     * 额定风速 （m/s）
+     */
+    @ApiModelProperty("额定风速")
+    private Double rated_wind_speed;
+    /**
+     * 切入风速 （m/s）
+     */
+    @ApiModelProperty("切入风速")
+    private Double ratedCutInWindspeed;
+    /**
+     * 切出风速 （m/s）
+     */
+    @ApiModelProperty("切出风速")
+    private Double ratedCutOutWindspeed;
+}

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

@@ -1,13 +1,23 @@
 package com.energy.manage.service.domain.dto.windenginemill;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
-@Data
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@ApiModel
 public class WindEngineMillCodeDto {
 
     /**
      * 机型编号
      */
+    @NotNull(message = "机型编号不能为null")
+    @ApiModelProperty("机型编号")
     private String millTypeCode;
 
 }

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

@@ -1,54 +1,72 @@
 package com.energy.manage.service.domain.dto.windenginemill;
 
 import com.energy.manage.common.po.windenginemill.WindEngineMillPO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 @Getter
 @Setter
+@ApiModel
 public class WindEngineMillCreateDto {
 
     /**
      * 编号
      */
+    @ApiModelProperty("编号")
     private String millTypeCode;
     /**
      * 机型型号
      */
+    @ApiModelProperty("机型型号")
+    @NotNull(message = "机型型号不能为null")
     private String machineTypeCode;
     /**
      * 厂商名称
      */
+    @ApiModelProperty("厂商名称")
+    @NotNull(message = "厂商名称不能为null")
     private String manufacturerName;
     /**
      * 厂商编号
      */
+    @ApiModelProperty("厂商编号")
+    @NotNull(message = "厂商编号不能为null")
     private String manufacturerCode;
     /**
      * 品牌名称
      */
+    @ApiModelProperty("品牌名称")
+    @NotNull(message = "品牌名称不能为null")
     private String brand;
     /**
-     * 状态
-     */
-    private Integer state;
-    /**
      * 塔筒高度
      */
-    private String towerHeight;
+    @ApiModelProperty("塔筒高度")
+    private Double towerHeight;
     /**
      * 叶片长度
      */
-    private String vaneLong;
+    @ApiModelProperty("叶片长度")
+    private Double vaneLong;
+
+    @ApiModelProperty("驱动类型")
+    private Integer curvedMotionType;
+
     /**
-     * 删除状态
+     * 叶轮直径（m）
      */
-    private Integer delState;
+    @ApiModelProperty("叶轮直径（m）")
+    private Double rotorDiameter;
 
     /**
-     * 组合字段
+     *传动比-转速比（无单位）
      */
-    private String combinationc;
+    @ApiModelProperty("传动比-转速比（无单位）")
+    private Double rotationalSpeedRatio;
 
 }

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

@@ -3,23 +3,25 @@ package com.energy.manage.service.domain.dto.windenginemill;
 import com.energy.manage.service.domain.dto.BaseDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Date;
 
 /**
  * 机型分页参数
  */
-@Data
+@Getter
+@Setter
 public class WindEngineMillPageDto extends BaseDto {
 
-    @ApiModelProperty("机型名称")
-    private String machineTypeName;
+    @ApiModelProperty("机型型号")
+    private String machineTypeCode;
 
-    @ApiModelProperty("厂商名称")
-    private String manufacturerName;
-
-    @ApiModelProperty("品牌")
-    private String brand;
+    @ApiModelProperty("开始时间")
+    private String beginTime;
 
+    @ApiModelProperty("结束时间")
+    private String endTime;
 
 }

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

@@ -2,14 +2,19 @@ package com.energy.manage.service.domain.dto.windfield;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
 
 /**
  * 风场code参数
  */
-@Data
+@Getter
+@Setter
 public class WindFieldCodeDto {
 
-
+    @NotNull(message = "风场编号不能为空")
     @ApiModelProperty("编号")
     private String fieldCode;
 

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

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

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

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

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

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

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

@@ -0,0 +1,37 @@
+package com.energy.manage.service.domain.dto.windfield;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@ApiModel("创建风场资源参数")
+public class WindFieldResourceCreateDto {
+
+
+    /**
+     * 风场编号
+     */
+    @ApiModelProperty("风场编号")
+    private String fieldCode;
+    /**
+     * 上传文件名称
+     */
+    @ApiModelProperty("上传文件名称")
+    private String fileName;
+    /**
+     * 上传类型
+     */
+    @ApiModelProperty("上传类型")
+    private String type;
+    /**
+     * 上传文件地址
+     */
+    @ApiModelProperty("上传文件地址")
+    private String resourceUrl;
+
+
+
+}

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

@@ -0,0 +1,23 @@
+package com.energy.manage.service.domain.dto.windfield;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@ApiModel("删除风场资源参数")
+public class WindFieldResourceDelDto {
+
+
+    /**
+     * 资源文件id
+     */
+    @NotNull(message = "编号不能为null")
+    @ApiModelProperty("编号")
+    private Integer id;
+
+}

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

@@ -1,91 +1,115 @@
 package com.energy.manage.service.domain.dto.windfield;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 @Getter
 @Setter
+@ApiModel("")
 public class WindFieldUpdateDto {
 
     /**
      * 企业编号
      */
+    @NotNull(message = "企业编号不能为空")
+    @ApiModelProperty("企业编号")
     private String companyCode;
     /**
      * 风场编号
      */
+    @ApiModelProperty("风场编号")
     private String fieldCode;
     /**
      * 风场名称
      */
+    @ApiModelProperty("风场名称")
     private String fieldName;
     /**
      * 空气密度 - 合同
      */
-    private String density;
+    @ApiModelProperty(" 空气密度 - 合同")
+    private Double density;
 
     /**
      * 风机数量
      */
+    @ApiModelProperty("风机数量")
     private Integer engineNumber;
 
     /**
      * 总额定容量
      */
-    private Integer ratedCapacityNumber;
+    @ApiModelProperty("总额定容量")
+    private Double ratedCapacityNumber;
 
     /**
      * 启用状态
      */
+    @ApiModelProperty("启用状态")
     private Integer state;
     /**
      * 省编号
      */
+    @ApiModelProperty("省编号")
     private Integer provinceId;
     /**
      * 省名字
      */
+    @ApiModelProperty("省名字")
     private String provinceName;
     /**
      * 市编号
      */
+    @ApiModelProperty("市编号")
     private Integer cityId;
     /**
      * 市名字
      */
+    @ApiModelProperty("市名字")
     private String cityName;
     /**
      * 经度
      */
-    private String longitude;
+    @ApiModelProperty("经度")
+    private Double longitude;
     /**
      * 纬度
      */
-    private String latitude;
+    @ApiModelProperty("纬度")
+    private Double latitude;
     /**
      * 海拔高度
      */
-    private String elevationHeight;
+    @ApiModelProperty("海拔高度")
+    private Double elevationHeight;
+
+    /**
+     * 合同功率曲线地址
+     */
+    @ApiModelProperty("合同功率曲线地址")
+    private String powerContractUrl;
 
     /**
      * 测风塔
      */
-    private List<WindFieldDto.AnemometerTowerRelationDto> anemometerTowerRelationDtos;
+    @ApiModelProperty("测风塔")
+    private List<AnemometerTowerRelationDto> anemometerTowerRelationDtos;
 
 
+    @Getter
+    @Setter
     public static class AnemometerTowerRelationDto{
 
-
         /**
          * 测风塔编号
          */
+        @ApiModelProperty("测风塔编号")
         private String towerCode;
-        /**
-         * 风场编号
-         */
-        private String fieldCode;
 
     }
 

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

@@ -3,6 +3,8 @@ package com.energy.manage.service.domain.dto.windfield;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * 修改状态
  */
@@ -11,8 +13,10 @@ public class WindFieldUpdateStateDto {
 
 
     @ApiModelProperty("编号")
+    @NotNull(message = "编号不能为null")
     private String fieldCode;
 
+    @NotNull(message = "状态不能为null")
     @ApiModelProperty("状态")
     private Integer state;
 

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;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
-@Data
+@Getter
+@Setter
+@ApiModel
 public class WindRelationDelDto {
 
 
     /**
      * 对象编号
      */
+    @ApiModelProperty("对象编号")
     private String codeNumber;
     /**
      * 类型
      */
+    @ApiModelProperty("类型")
     private String type;
 
 

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;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Date;
 
-@Data
+@Getter
+@Setter
+@ApiModel
 public class WindRelationDto {
 
 
     /**
      * 对象编号
      */
+    @ApiModelProperty("对象编号")
     private String codeNumber;
     /**
      * 编号名称
      */
+    @ApiModelProperty("编号名称")
     private String codeName;
     /**
      * 父级编号
      */
+    @ApiModelProperty("父级编号")
     private String parentCode;
     /**
      * 类型
      */
+    @ApiModelProperty("类型")
     private String type;
 
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/anemometertower/AnemometerTowerByFieldVo.java

@@ -1,5 +1,8 @@
 package com.energy.manage.service.domain.vo.anemometertower;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -8,18 +11,33 @@ import lombok.Setter;
  */
 @Getter
 @Setter
+@ApiModel
 public class AnemometerTowerByFieldVo {
 
 
     /**
      * 测风塔编号
      */
+    @ApiModelProperty("测风塔编号")
     private String anemometerCode;
     /**
      * 测风塔名称
      */
+    @ApiModelProperty("测风塔名称")
     private String anemometerName;
 
+    @ApiModelProperty("经度")
+    private Double longitude;
+
+
+    @ApiModelProperty("纬度")
+    private Double latitude;
+
+    /**
+     * 测风塔高度集合字符串
+     */
+    @ApiModelProperty("测风塔高度集合字符串")
+    private String anemometerHeightStrings;
 
 
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/anemometertower/AnemometerTowerHeightVo.java

@@ -1,6 +1,7 @@
 package com.energy.manage.service.domain.vo.anemometertower;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -13,8 +14,10 @@ import java.util.List;
  */
 @Getter
 @Setter
+@ApiModel
 public class AnemometerTowerHeightVo {
 
+    @ApiModelProperty("测风塔高度")
     private List<AnemometerTowerHeightList> list;
 
 
@@ -25,16 +28,19 @@ public class AnemometerTowerHeightVo {
         /**
          * 测风塔编号
          */
+        @ApiModelProperty("测风塔编号")
         private String anemometerCode;
 
         /**
          * 测风塔高度
          */
-        private String anemometerHeight;
+        @ApiModelProperty("测风塔高度")
+        private Double anemometerHeight;
 
         /**
          * 高度类型
          */
+        @ApiModelProperty("高度类型")
         private String anemometerType;
 
         /**

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/anemometertower/AnemometerTowerPageVo.java

@@ -2,19 +2,57 @@ package com.energy.manage.service.domain.vo.anemometertower;
 
 
 import com.energy.manage.common.po.anemometertower.AnemometerTowerPO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
-@Data
-public class AnemometerTowerPageVo extends AnemometerTowerPO {
+@Getter
+@Setter
+@ApiModel
+public class AnemometerTowerPageVo  {
+
+
+    /**
+     * 测风塔编号
+     */
+    @ApiModelProperty("测风塔编号")
+    private String anemometerCode;
+    /**
+     * 测风塔名称
+     */
+    @ApiModelProperty("测风塔名称")
+    private String anemometerName;
+    /**
+     * 经度
+     */
+    @ApiModelProperty("经度")
+    private Double longitude;
+    /**
+     * 纬度
+     */
+    @ApiModelProperty("纬度")
+    private Double latitude;
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
+    private Date createTime;
 
     /**
      * 风场数量
      */
-    private Integer fieldNumber;
+    @ApiModelProperty("风场数量")
+    private Integer fieldNumber = 0;
 
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/anemometertower/AnemometerTowerVo.java

@@ -0,0 +1,61 @@
+package com.energy.manage.service.domain.vo.anemometertower;
+
+
+import com.energy.manage.common.po.anemometertower.AnemometerTowerPO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+import java.util.List;
+
+@Getter
+@Setter
+@ApiModel
+public class AnemometerTowerVo {
+
+
+    /**
+     * 测风塔编号
+     */
+    @ApiModelProperty("测风塔编号")
+    private String anemometerCode;
+    /**
+     * 测风塔名称
+     */
+    @ApiModelProperty("测风塔名称")
+    private String anemometerName;
+    /**
+     * 经度
+     */
+    @ApiModelProperty("经度")
+    private Double longitude;
+    /**
+     * 纬度
+     */
+    @ApiModelProperty("纬度")
+    private Double latitude;
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private Integer state;
+
+    @ApiModelProperty("测风塔高度")
+    private List<AnemometerTowerHeightList> list;
+
+    @Getter
+    @Setter
+    public static class AnemometerTowerHeightList {
+
+        /**
+         * 测风塔高度
+         */
+        @ApiModelProperty("测风塔高度")
+        private Double anemometerHeight;
+
+
+    }
+}

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/company/WindCompanyPageVo.java

@@ -16,7 +16,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-@ApiModel("企业信息树树展示")
+@ApiModel
 public class WindCompanyPageVo extends WindCompanyPO implements Serializable {
 
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/company/WindCompanyVo.java

@@ -0,0 +1,66 @@
+package com.energy.manage.service.domain.vo.company;
+
+import com.energy.manage.common.po.company.WindCompanyPO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 企业信息树树展示
+ */
+@Getter
+@Setter
+@ApiModel("企业信息查询")
+public class WindCompanyVo  {
+
+
+    /**
+     * 企业编号
+     */
+    @ApiModelProperty("企业编号")
+    private String companyCode;
+
+    /**
+     * 企业名称
+     */
+    @ApiModelProperty("企业名称")
+    private String companyName;
+
+    /**
+     * 省
+     */
+    @ApiModelProperty("省id")
+    private Integer provinceId;
+
+    /**
+     * 省名字
+     */
+    @ApiModelProperty("省名字")
+    private String provinceName;
+
+    /**
+     * 市
+     */
+    @ApiModelProperty("市id")
+    private Integer cityId;
+
+    /**
+     * 市名字
+     */
+    @ApiModelProperty("市名字")
+    private String cityName;
+
+    /**
+     * 企业描述
+     */
+    @ApiModelProperty("企业描述")
+    private String described;
+
+
+
+
+}

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

@@ -4,30 +4,34 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
 /**
- * 合同导入有功功率
+ * 合同功率曲线
  */
 @Data
 public class PowerWordContractExcelVo {
 
-    /**
-     * 风场编号
-     */
-    @ExcelProperty(value = "风场编号",index = 1)
-    private String fieldCode;
+
     /**
      * 机型编号
      */
-    @ExcelProperty(value = "机型编号",index = 2)
+    @ExcelProperty(value = "系统生成机型编号",index = 0)
     private String millTypeCode;
+
+    /**
+     * 风速
+     */
+    @ExcelProperty(value = "风速",index = 1)
+    private Double windSpeed;
+
     /**
      * 有功功率
      */
-    @ExcelProperty(value = "有功功率",index = 3)
-    private String activePower;
+    @ExcelProperty(value = "有功功率",index = 2)
+    private Double activePower;
+
     /**
-     * 风速
+     * 空气密度
      */
-    @ExcelProperty(value = "风速",index = 4)
-    private String windSpeed;
+    @ExcelProperty(value = "当地空气密度",index = 3)
+    private Double density;
 
 }

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

@@ -1,30 +1,31 @@
 package com.energy.manage.service.domain.vo.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
 
+/**
+ * 标准功率曲线
+ */
+@Data
 public class PowerWordCriterionExcelVo {
 
     /**
-     * 机型编号
+     * 风速
      */
-    @ExcelProperty(value = "机型编号",index = 1)
-    private String millTypeCode;
+    @ExcelProperty(value = "风速",index = 0)
+    private Double windSpeed;
     /**
      * 有功功率
      */
-    @ExcelProperty(value = "有功功率",index = 2)
-    private String activePower;
+    @ExcelProperty(value = "有功功率",index = 1)
+    private Double activePower;
 
     /**
      * 空气密度
      */
-    @ExcelProperty(value = "空气密度",index = 3)
-    private String density;
-    /**
-     * 风速
-     */
-    @ExcelProperty(value = "风速",index = 4)
-    private String windSpeed;
+    @ExcelProperty(value = "标准空气密度",index = 2)
+    private Double density;
+
 
 
 

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/excel/WindFieldExceVo.java

@@ -8,32 +8,58 @@ import lombok.Data;
  */
 @Data
 public class WindFieldExceVo {
-
     /**
      * 风场名称
      */
-    @ExcelProperty(value = "风场名称", index = 1)
+    @ExcelProperty(value = "风场名称", index = 0)
     private String fieldName;
+
     /**
-     * 空气密度
+     * 省id
      */
-    @ExcelProperty(value = "空气密度", index = 2)
-    private String density;
+    private Integer provinceId;
+    /**
+     * 省
+     */
+    @ExcelProperty(value = "省", index = 1)
+    private String provinceName;
+
+    /**
+     * 市id
+     */
+    private Integer cityId;
+    /**
+     * 市
+     */
+    @ExcelProperty(value = "市", index = 2)
+    private String cityName;
+
+    /**
+     * 区号
+     */
+    @ExcelProperty(value = "区号", index = 3)
+    private String areaCode;
+
     /**
      * 经度
      */
-    @ExcelProperty(value = "经度", index = 3)
-    private String longitude;
+    @ExcelProperty(value = "经度", index = 4)
+    private Double longitude;
     /**
      * 纬度
      */
-    @ExcelProperty(value = "纬度", index = 4)
-    private String latitude;
+    @ExcelProperty(value = "纬度", index = 5)
+    private Double latitude;
+    /**
+     * 空气密度
+     */
+    @ExcelProperty(value = "空气密度", index = 6)
+    private Double density;
     /**
      * 海拔高度
      */
-    @ExcelProperty(value = "海拔高度", index = 5)
-    private String elevationHeight;
+    @ExcelProperty(value = "海拔高度", index = 7)
+    private Double elevationHeight;
 
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/powerwordcontract/PowerWordContractPageVo.java

@@ -1,29 +1,39 @@
 package com.energy.manage.service.domain.vo.powerwordcontract;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * 有功功率分页信息
  */
-@Data
+@Getter
+@Setter
+@ApiModel
 public class PowerWordContractPageVo {
 
 
     /**
      * 风场编号
      */
+    @ApiModelProperty("风场编号")
     private String fieldCode;
     /**
      * 机型编号
      */
+    @ApiModelProperty("机型编号")
     private String millTypeCode;
     /**
      * 有功功率
      */
-    private String activePower;
+    @ApiModelProperty("有功功率")
+    private Double activePower;
     /**
      * 有功功率
      */
-    private String windSpeed;
+    @ApiModelProperty("有功功率")
+    private Double windSpeed;
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/powerwordcriterion/PowerWordCriterionPageVo.java

@@ -1,35 +1,47 @@
 package com.energy.manage.service.domain.vo.powerwordcriterion;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Date;
 
-@Data
+@Getter
+@Setter
+@ApiModel
 public class PowerWordCriterionPageVo {
 
+    @ApiModelProperty("主键")
     private Integer id;
 
     /**
      * 机型编号
      */
+    @ApiModelProperty("机型编号")
     private String millTypeCode;
     /**
      * 有功功率
      */
-    private String activePower;
+    @ApiModelProperty("有功功率")
+    private Double activePower;
     /**
      * 风速
      */
-    private String windSpeed;
+    @ApiModelProperty("风速")
+    private Double windSpeed;
 
     /**
      * 空气密度
      */
-    private String density;
+    @ApiModelProperty("空气密度")
+    private Double density;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty("创建时间")
     private Date createTime;
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/system/SystemPermissionVo.java

@@ -0,0 +1,63 @@
+package com.energy.manage.service.domain.vo.system;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SystemPermissionVo {
+
+    @ApiModelProperty(value = "权限id")
+    private Integer permissionId;
+
+    @ApiModelProperty(value = "权限名称")
+    private String permissionName;
+
+    @ApiModelProperty(value = "父节点id")
+    private Integer parentId;
+
+    @ApiModelProperty(value = "资源类型(1 为目录 2 为菜单 3为按钮)")
+    private Integer permissionType;
+
+    @ApiModelProperty(value = "是否是外部链接(0 否 1是)")
+    private Integer isExternalLink;
+
+    @ApiModelProperty(value = "外部链接url")
+    private String externalUrl;
+
+    @ApiModelProperty(value = "路由地址")
+    private String permissionUrl;
+
+    @ApiModelProperty(value = "权限标识")
+    private String permissionIdentify;
+
+    @ApiModelProperty(value = "组件路径")
+    private String componentPath;
+
+    @ApiModelProperty(value = "资源状态 0 不可用 1是正常")
+    private Integer permissionState;
+
+    @ApiModelProperty(value = "是否隐藏 0 不隐藏 1隐藏")
+    private Integer isHidden;
+
+    @ApiModelProperty(value = "顺序")
+    private Integer permissionSort;
+
+    @ApiModelProperty(value = "图标icon Url")
+    private String permissionIconUrl;
+
+    @ApiModelProperty(value = "1 选中  0 未选中  2 部分选中")
+    private Integer checked = 0;
+
+    @ApiModelProperty(value = "子节点")
+    private List<SystemPermissionVo> children;
+
+    private Integer permissionDepth;
+
+    @ApiModelProperty("是否显示1-显示，2-不显示")
+    private Integer permissionShow;
+
+    private String permissionCode;
+
+}

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/system/UserRoleVo.java

@@ -20,6 +20,11 @@ public class UserRoleVo implements Serializable {
   private Long roleId;
   @ApiModelProperty("用户名字")
   private String userName;
+  /**
+   * 登录名
+   */
+  @ApiModelProperty(value = "登录名")
+  private String loginName;
   @ApiModelProperty("角色名字")
   private String roleName;
   @ApiModelProperty("用户手机号")

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/system/UserVo.java

@@ -18,6 +18,11 @@ import java.io.Serializable;
 public class UserVo implements Serializable {
   @ApiModelProperty("用户id")
   private Long userId;
+  /**
+   * 登录名
+   */
+  @ApiModelProperty(value = "登录名")
+  private String loginName;
   @ApiModelProperty("用户名字")
   private String userName;
   @ApiModelProperty("用户手机号")

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/windenginegroup/WindEngineGroupPageVo.java

@@ -1,60 +1,103 @@
 package com.energy.manage.service.domain.vo.windenginegroup;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Date;
 
 /**
  * 导入参数
  */
-@Data
+@Getter
+@Setter
+@ApiModel
 public class WindEngineGroupPageVo {
 
     /**
      * 风场编号
      */
+    @ApiModelProperty("风场编号")
     private String fieldCode;
+
+    @ApiModelProperty("风场名称")
+    private String fieldName;
     /**
      * 风机编号
      */
+    @ApiModelProperty("风机编号")
     private String engineCode;
     /**
      * 风机名称
      */
+    @ApiModelProperty("风机名称")
     private String engineName;
     /**
-     * 机型编号
-     */
-    private String millTypeCode;
-    /**
      * 额定容量
      */
-    private String ratedCapacity;
+    @ApiModelProperty("额定容量")
+    private Double ratedCapacity;
     /**
      * 海拔高度
      */
-    private String elevationHeight;
+    @ApiModelProperty("海拔高度")
+    private Double elevationHeight;
     /**
      * 轮毂高度
      */
-    private String hubHeight;
+    @ApiModelProperty("轮毂高度")
+    private Double hubHeight;
     /**
      * 经度
      */
-    private String longitude;
+    @ApiModelProperty("经度")
+    private Double longitude;
     /**
      * 维度
      */
-    private String latitude;
+    @ApiModelProperty("维度")
+    private Double latitude;
     /**
      * 状态
      */
+    @ApiModelProperty("状态")
     private Integer state;
     /**
      * 是否标杆风机
      */
+    @ApiModelProperty("是否标杆风机")
     private Integer sightcing;
 
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date createTime;
+
+    @ApiModelProperty(value = "机型型号")
+    private String machineTypeCode;
+
+    @ApiModelProperty(value = "厂商名字")
+    private String manufacturerName;
 
+    /**
+     * 额定风速 （m/s）
+     */
+    @ApiModelProperty("额定风速")
+    private Double rated_wind_speed;
+    /**
+     * 切入风速 （m/s）
+     */
+    @ApiModelProperty("切入风速")
+    private Double ratedCutInWindspeed;
+    /**
+     * 切出风速 （m/s）
+     */
+    @ApiModelProperty("切出风速")
+    private Double ratedCutOutWindspeed;
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/windenginegroup/WindEngineGroupVo.java

@@ -1,58 +1,89 @@
 package com.energy.manage.service.domain.vo.windenginegroup;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * 风机对象
  */
-@Data
+@Getter
+@Setter
+@ApiModel
 public class WindEngineGroupVo {
 
     /**
      * 风场编号
      */
+    @ApiModelProperty("风场编号")
     private String fieldCode;
     /**
      * 风机编号
      */
+    @ApiModelProperty("风机编号")
     private String engineCode;
     /**
      * 风机名称
      */
+    @ApiModelProperty("风机名称")
     private String engineName;
     /**
      * 机型编号
      */
+    @ApiModelProperty("机型编号")
     private String millTypeCode;
     /**
      * 额定容量
      */
-    private String ratedCapacity;
+    @ApiModelProperty("额定容量")
+    private Double ratedCapacity;
     /**
      * 海拔高度
      */
-    private String elevationHeight;
+    @ApiModelProperty("海拔高度")
+    private Double elevationHeight;
     /**
      * 轮毂高度
      */
-    private String hubHeight;
+    @ApiModelProperty("轮毂高度")
+    private Double hubHeight;
     /**
      * 经度
      */
-    private String longitude;
+    @ApiModelProperty("经度")
+    private Double longitude;
     /**
      * 维度
      */
-    private String latitude;
+    @ApiModelProperty("维度")
+    private Double latitude;
     /**
      * 状态
      */
+    @ApiModelProperty("状态")
     private Integer state;
     /**
      * 是否标杆风机
      */
+    @ApiModelProperty("是否标杆风机")
     private Integer sightcing;
 
-
+    /**
+     * 额定风速 （m/s）
+     */
+    @ApiModelProperty("额定风速")
+    private Double rated_wind_speed;
+    /**
+     * 切入风速 （m/s）
+     */
+    @ApiModelProperty("切入风速")
+    private Double ratedCutInWindspeed;
+    /**
+     * 切出风速 （m/s）
+     */
+    @ApiModelProperty("切出风速")
+    private Double ratedCutOutWindspeed;
 
 }

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

@@ -1,80 +1,102 @@
 package com.energy.manage.service.domain.vo.windenginemill;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Date;
 
 /**
  * 导入参数
  */
-@Data
+@Getter
+@Setter
+@ApiModel
 public class WindEngineMillPageVo {
 
     /**
      * 编号
      */
+    @ApiModelProperty(value = "编号")
     private String millTypeCode;
     /**
-     * 机型编号
+     * 机型型号
      */
+    @ApiModelProperty(value = "机型型号")
     private String machineTypeCode;
     /**
-     * 机型名称
-     */
-    private String machineTypeName;
-    /**
      * 厂商名称
      */
+    @ApiModelProperty(value = "厂商名称")
     private String manufacturerName;
     /**
      * 厂商编号
      */
+    @ApiModelProperty(value = "厂商编号")
     private String manufacturerCode;
     /**
-     * 品牌
+     * 品牌名称
      */
+    @ApiModelProperty(value = "品牌名称")
     private String brand;
     /**
-     * 机型类型
-     */
-    private Integer type;
-    /**
      * 状态
      */
+    @ApiModelProperty(value = "状态")
     private Integer state;
     /**
      * 塔筒高度
      */
-    private String towerHeight;
+    @ApiModelProperty(value = "塔筒高度")
+    private Double towerHeight;
     /**
      * 叶片长度
      */
-    private String vaneLong;
+    @ApiModelProperty(value = "叶片长度")
+    private Double vaneLong;
+
     /**
-     * 删除状态
+     * 驱动类型
      */
-    private Integer delState;
+    @ApiModelProperty(value = "驱动类型")
+    private Integer curvedMotionType;
+
 
     /**
      * 组合字段
      */
-    private String combinationc;
+    @ApiModelProperty(value = "组合字段")
+    private String combination;
+
     /**
-     * 创建人
+     * 标注功率曲线地址
      */
-    private Integer createBy;
+    @ApiModelProperty(value = "标注功率曲线地址")
+    private String powerCriterionUrl;
+
+    
+
     /**
      * 创建时间
      */
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
+
     /**
-     * 更新人
+     * 叶轮直径（m）
      */
-    private Integer updateBy;
+    @ApiModelProperty("叶轮直径（m）")
+    private Double rotorDiameter;
+
     /**
-     * 更新时间
+     *传动比-转速比（无单位）
      */
-    private Date updateTime;
+    @ApiModelProperty("传动比-转速比（无单位）")
+    private Double rotationalSpeedRatio;
 
 
 }

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/domain/vo/windfield/WindFieldPageVo.java

@@ -1,78 +1,116 @@
 package com.energy.manage.service.domain.vo.windfield;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
 
 /**
  * 导入参数
  */
-@Data
+@Getter
+@Setter
+@ApiModel
 public class WindFieldPageVo {
 
     /**
      * 主键
      */
+    @ApiModelProperty("主键")
     private Integer id;
 
     /**
      * 企业编号
      */
-    private Integer companyId;
+    @ApiModelProperty("企业编号")
+    private String companyCode;
+
+    @ApiModelProperty("企业名称")
+    private String windCompany;
+
     /**
      * 风场编号
      */
+    @ApiModelProperty("风场编号")
     private String fieldCode;
     /**
      * 风场名称
      */
+    @ApiModelProperty("风场名称")
     private String fieldName;
     /**
      * 空气密度
      */
-    private String density;
+    @ApiModelProperty("空气密度")
+    private Double density;
     /**
      * 启用状态
      */
+    @ApiModelProperty("启用状态")
     private Integer state;
     /**
      * 省编号
      */
+    @ApiModelProperty("省编号")
     private Integer provinceId;
     /**
      * 省名字
      */
+    @ApiModelProperty("省名字")
     private String provinceName;
     /**
      * 市编号
      */
+    @ApiModelProperty("市编号")
     private Integer cityId;
     /**
      * 市名字
      */
+    @ApiModelProperty("市名字")
     private String cityName;
     /**
      * 经度
      */
-    private String longitude;
+    @ApiModelProperty("经度")
+    private Double longitude;
     /**
      * 纬度
      */
-    private String latitude;
+    @ApiModelProperty("纬度")
+    private Double latitude;
+
+    /**
+     * 总额定容量
+     */
+    @ApiModelProperty("总额定容量")
+    private Double ratedCapacityNumber;
+
+
     /**
      * 海拔高度
      */
-    private String elevationHeight;
+    @ApiModelProperty("海拔高度")
+    private Double elevationHeight;
 
     /**
      * 机组数量
      */
-    private Integer wegNumber;
+    @ApiModelProperty("机组数量")
+    private Integer wegNumber = 0;
 
 
     /**
      * 测风塔数量
      */
-    private Integer atrNumber;
-
+    @ApiModelProperty("测风塔数量")
+    private Integer atrNumber = 0;
 
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
+    private Date createTime;
 
 }

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

@@ -0,0 +1,42 @@
+package com.energy.manage.service.domain.vo.windfield;
+
+import com.energy.manage.common.po.windfield.WindFieldPO;
+import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerByFieldVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 风场对象
+ */
+@Getter
+@Setter
+@ApiModel
+public class WindFieldResourceVo {
+
+    /**
+     * 风场编号
+     */
+    @ApiModelProperty("风场编号")
+    private String fieldCode;
+    /**
+     * 上传文件名称
+     */
+    @ApiModelProperty("上传文件名称")
+    private String fileName;
+    /**
+     * 上传类型
+     */
+    @ApiModelProperty("上传类型")
+    private String type;
+    /**
+     * 上传文件地址
+     */
+    @ApiModelProperty("上传文件地址")
+    private String resourceUrl;
+
+}