修改功率曲线

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-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/resources/mybatis/windrelation/WindRelationMapper.xml

@@ -8,13 +8,14 @@
       wc.id AS id,
       wc.company_code AS companyCode,
       wc.company_name AS companyName,
-
 	  wr.code_number as codeNumber,
 	  wr.code_name as codeName,
 	  wr.parent_code as parentCode,
-
       wc.state AS state,
       wc.province_id AS provinceId,
+      wc.province_name as provinceName,
+      wc.city_id as cityId,
+      wc.city_name as cityName,
       wc.described as described,
       wc.sort AS sort,
       wc.del_state AS delState,
@@ -22,7 +23,6 @@
       wc.create_time AS createTime,
       wc.update_by AS updateBy,
       wc.update_time AS updateTime,
-
       wf.fieldCount as fieldCount,
       wf.engineNumber as engineNumber
     </sql>