report加入sawagger对controller说明

ipfcst/ipfcst-common/ipfcst-common-data/src/main/java/com/jiayue/ipfcst/common/data/abst/AbstractBaseEntity.java

@@ -1,5 +1,6 @@
 package com.jiayue.ipfcst.common.data.abst;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.core.annotation.Order;
 import org.springframework.data.annotation.CreatedBy;
@@ -34,6 +35,7 @@ class AbstractBaseEntity implements Serializable {
 	 */
 	@Order(200)
 	@Column
+	@ApiModelProperty("备用字段A")
 	private String backupA;
 
 	/**
@@ -41,6 +43,7 @@ class AbstractBaseEntity implements Serializable {
 	 */
 	@Order(201)
 	@Column
+	@ApiModelProperty("备用字段B")
 	private String backupB;
 
 	/**
@@ -48,6 +51,7 @@ class AbstractBaseEntity implements Serializable {
 	 */
 	@Order(202)
 	@Column
+	@ApiModelProperty("备用字段C")
 	private String backupC;
 
 	/**
@@ -55,6 +59,7 @@ class AbstractBaseEntity implements Serializable {
 	 */
 	@Order(203)
 	@Column
+	@ApiModelProperty("备用字段D")
 	private String backupD;
 
 	/**
@@ -62,6 +67,7 @@ class AbstractBaseEntity implements Serializable {
 	 */
 	@Order(204)
 	@Column
+	@ApiModelProperty("备用字段E")
 	private String backupE;
 
 	/**
@@ -69,6 +75,7 @@ class AbstractBaseEntity implements Serializable {
 	 */
 	@Order(205)
 	@Column
+	@ApiModelProperty("备用字段F")
 	private String backupF;
 
 
@@ -78,6 +85,7 @@ class AbstractBaseEntity implements Serializable {
 	@Order(206)
 	@CreatedBy
 	@Column(updatable = false)
+	@ApiModelProperty("创建人")
 	private String creator;
 
 	/**
@@ -86,6 +94,7 @@ class AbstractBaseEntity implements Serializable {
 	@Order(207)
 	@CreatedDate
 	@Column(updatable = true)
+	@ApiModelProperty("创建时间")
 	private Date createTime;
 
 	/**
@@ -94,6 +103,7 @@ class AbstractBaseEntity implements Serializable {
 	@Order(208)
 	@LastModifiedBy
 	@Column(insertable = false)
+	@ApiModelProperty("修改人")
 	private String lastModifier;
 	/**
 	 * 最后修改时间
@@ -101,5 +111,6 @@ class AbstractBaseEntity implements Serializable {
 	@Order(209)
 	@LastModifiedDate
 	@Column(insertable = false)
+	@ApiModelProperty("修改时间")
 	private Date lastModifyTime;
 }

ipfcst/ipfcst-common/ipfcst-common-data/src/main/java/com/jiayue/ipfcst/common/data/abst/equipmentinfo/AbstractEquipmentInfo.java

@@ -2,6 +2,7 @@ package com.jiayue.ipfcst.common.data.abst.equipmentinfo;
 
 import com.jiayue.ipfcst.common.data.abst.AbstractBaseEntity;
 import com.jiayue.ipfcst.common.data.constant.enums.EquipmentTypeEnum;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.GenericGenerator;
@@ -32,12 +33,14 @@ public class AbstractEquipmentInfo extends AbstractBaseEntity {
     /**
      * 设备类型
      */
+    @ApiModelProperty("设备类型")
     protected EquipmentTypeEnum equipmentType;
 
     /**
      * 名称
      */
     @Column
+    @ApiModelProperty("名称11")
     private String name;
 
     /**

ipfcst/ipfcst-common/ipfcst-common-data/src/main/java/com/jiayue/ipfcst/common/data/entity/AGC_AVCInfo.java

@@ -2,6 +2,7 @@ package com.jiayue.ipfcst.common.data.entity;
 
 import com.jiayue.ipfcst.common.data.abst.equipmentinfo.AbstractEquipmentInfo;
 import com.jiayue.ipfcst.common.data.constant.enums.EquipmentTypeEnum;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -16,6 +17,7 @@ import javax.persistence.Entity;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @Entity
+@ApiModel("AGC_AVC实体类")
 public class AGC_AVCInfo extends AbstractEquipmentInfo {
 	public AGC_AVCInfo() {
 		super.setEquipmentType(EquipmentTypeEnum.AGC_AVC);

ipfcst/ipfcst-common/ipfcst-common-data/src/main/java/com/jiayue/ipfcst/common/data/entity/AccuracyPassRate.java

@@ -1,6 +1,8 @@
 package com.jiayue.ipfcst.common.data.entity;
 
 import com.jiayue.ipfcst.common.data.abst.AbstractBaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.GenericGenerator;
@@ -18,31 +20,38 @@ import javax.persistence.*;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @Entity
+@ApiModel("光伏准确率合格率实体类")
 public class AccuracyPassRate extends AbstractBaseEntity {
     @Id
     @Order(1)
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "myid")
     @GenericGenerator(name = "myid", strategy = "com.jiayue.ipfcst.common.data.entity.id.CustomIDGenerator")
+    @ApiModelProperty("主键")
     private Integer id;
 
     //时间
     @Column
+    @ApiModelProperty("统计时间")
     private Long time;
 
     //短期准确率
     @Column
+    @ApiModelProperty("短期准确率")
     private String shortTermAccuracy;
 
     //短期合格率
     @Column
+    @ApiModelProperty("短期合格率")
     private String shortTermPassRate;
 
     //超短期准确率
     @Column
+    @ApiModelProperty("超短期准确率")
     private String ultraShortTermAccuracy;
 
     //超短期合格率
     @Column
+    @ApiModelProperty("超短期合格率")
     private String ultraShortTermPassRate;
 
     //中期准确率

ipfcst/ipfcst-common/ipfcst-common-data/src/main/java/com/jiayue/ipfcst/common/data/entity/DisplayConfig.java

@@ -1,6 +1,8 @@
 package com.jiayue.ipfcst.common.data.entity;
 
 import com.jiayue.ipfcst.common.data.abst.AbstractBaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.GenericGenerator;
@@ -17,6 +19,7 @@ import javax.persistence.*;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @Entity
+@ApiModel("展示配置实体")
 public class DisplayConfig extends AbstractBaseEntity {
 
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "myid")
@@ -29,18 +32,21 @@ public class DisplayConfig extends AbstractBaseEntity {
      * 展示配置编码
      */
     @Column
+    @ApiModelProperty("展示配置编码")
     private String displayCode;
 
     /**
      * 展示字段
      */
     @Column(columnDefinition = "varchar(2000) default 'LTD' not null")
+    @ApiModelProperty("展示字段")
     private String showCode;
 
     /**
      * 隐藏字段
      */
     @Column(columnDefinition = "varchar(2000) default 'LTD' not null")
+    @ApiModelProperty("隐藏字段")
     private String hiddenCode;
 
 }

ipfcst/ipfcst-common/ipfcst-common-data/src/main/java/com/jiayue/ipfcst/common/data/strategy/ApiMyResponse.java

@@ -0,0 +1,21 @@
+package com.jiayue.ipfcst.common.data.strategy;
+
+import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+@ApiResponses({
+        @ApiResponse(code = 200, message = "成功", response = ResponseVO.class),
+        @ApiResponse(code = 401, message = "权限失败", response = ResponseVO.class),
+        @ApiResponse(code = 403, message = "超时登录", response = ResponseVO.class),
+        @ApiResponse(code = 500, message = "服务器错误", response = ResponseVO.class)
+})
+public @interface ApiMyResponse {
+    // 可以添加自定义属性
+}

ipfcst/ipfcst-common/ipfcst-common-security/src/main/java/com/jiayue/ipfcst/common/security/config/SwaggerConfig.java

@@ -0,0 +1,59 @@
+package com.jiayue.ipfcst.common.security.config;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig {
+    @Bean
+    public Docket createConsoleApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .groupName("console")
+                .apiInfo(consoleInfo())
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.jiayue.ipfcst.console.controller"))
+                .paths(PathSelectors.any())
+                .build();
+    }
+
+    @Bean
+    public Docket createReportqueryApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .groupName("reportquery")
+                .apiInfo(reportqueryInfo())
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.jiayue.ipfcst.controller"))
+                .paths(PathSelectors.any())
+                .build();
+    }
+
+    private ApiInfo consoleInfo() {
+        return new ApiInfoBuilder()
+                .title("功率预测系统")
+                .description("console接口详细信息......")
+                //服务条款网址
+                .version("3.0")
+                .build();
+    }
+
+    private ApiInfo reportqueryInfo() {
+        return new ApiInfoBuilder()
+                .title("功率预测系统")
+                .description("reportquery接口详细信息......")
+                //服务条款网址
+                .version("3.0")
+                .build();
+    }
+}

ipfcst/ipfcst-common/ipfcst-common-security/src/main/java/com/jiayue/ipfcst/common/security/config/WebSecurityConfig.java

@@ -77,6 +77,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter implements A
                 .csrf().disable()
                 .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS)
                 .and().authorizeRequests()
+                .antMatchers("/swagger-ui.html", "/webjars/**",
+                        "/v2/**", "/swagger-resources/**").permitAll()
                 .antMatchers(HttpMethod.OPTIONS, "/**").permitAll()
                 .antMatchers("/pushSocket/**").permitAll()
                 .antMatchers("/druid/**").permitAll()

ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/AGC_AVCInfoController.java

@@ -4,6 +4,10 @@ import com.jiayue.ipfcst.common.core.exception.BusinessException;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.AGC_AVCInfo;
 import com.jiayue.ipfcst.console.service.AGC_AVCInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -17,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("agcAvcInfo")
 @Slf4j
+@Api(value = "AGC_AVCInfoController", tags = "AGC_AVC接口")
 public class AGC_AVCInfoController {
   final AGC_AVCInfoService agcAvcInfoService;
 
@@ -29,6 +34,7 @@ public class AGC_AVCInfoController {
   * 查询
   * */
   @GetMapping
+  @ApiOperation(value = "查询", httpMethod = "GET")
   public ResponseVO getALL() {
     return ResponseVO.success(agcAvcInfoService.getAll());
   }
@@ -37,6 +43,8 @@ public class AGC_AVCInfoController {
   * 保存
   * */
   @PostMapping
+  @ApiOperation(value = "保存", httpMethod = "POST")
+  @ApiImplicitParam(name="agc_avcInfo",value="AGC_AVCInfo实体")
   public ResponseVO save(@RequestBody AGC_AVCInfo agc_avcInfo){
     agcAvcInfoService.save(agc_avcInfo);
     return ResponseVO.success(1);

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/AccuracyPassRateController.java

@@ -2,13 +2,16 @@ package com.jiayue.ipfcst.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.AccuracyPassRate;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.AccuracyPassRateService;
+import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -25,6 +28,7 @@ import java.util.Map;
 @RestController
 @Slf4j
 @RequestMapping("accuracyPassRate")
+@Api(value = "AccuracyPassRateController", tags = "光伏准确率合格率controller")
 public class AccuracyPassRateController {
   private final AccuracyPassRateService accuracyPassRateService;
 
@@ -33,32 +37,6 @@ public class AccuracyPassRateController {
     this.accuracyPassRateService = accuracyPassRateService;
   }
 
- /* *//**
-   * 根据时间查询准确合格率
-   * @param startTime 开始时间
-   * @param endTime 结束时间
-   * @param page 页码
-   * @param size 条数
-   * @param sortOrder 排序
-   * @return result
-   *//*
-  @GetMapping(value="accuracyPassRate/{startTime}/{endTime}/{page}/{size}")
-  public ResponseVO findByTimeBetweenAndNoForPaging(@PathVariable("startTime") Long startTime,
-                                       @PathVariable("endTime") Long endTime,
-                                       @PathVariable("page") Integer page,
-                                       @PathVariable("size") Integer size,
-                                       String sortOrder) {
-    Map<String,Object> map = new HashMap<>();
-    try{
-      map = accuracyPassRateService.findByTimeBetweenAndNoForPaging(startTime,endTime,page,size,sortOrder);
-      return ResponseVO.success(map);
-    }catch(Exception e){
-      e.printStackTrace();
-      log.error("查询准确合格率错误");
-      return ResponseVO.fail(e.toString());
-    }
-  }*/
-
   /**
    * 根据时间查询准确合格率
    * @param startTime 开始时间
@@ -67,6 +45,16 @@ public class AccuracyPassRateController {
    * @return result
    */
   @GetMapping(value="table/{startTime}/{endTime}/{showCode}/{sortOrder}")
+  @ApiOperation(value = "日统计查询", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入Map&ltString, Object&gt</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "showCode",value = "展示列表字段",dataType="String"),
+    @ApiImplicitParam(name= "sortOrder",value = "列表排序",dataType="String")
+  })
+  @ApiMyResponse
   public ResponseVO findByTimeBetween(@PathVariable("startTime") Long startTime,
                                       @PathVariable("endTime") Long endTime,
                                       @PathVariable("showCode") String showCode,
@@ -91,6 +79,7 @@ public class AccuracyPassRateController {
    * @author zcl
    * @return result
    */
+  @ApiIgnore
   @GetMapping(value="tableDay/{startTime}/{endTime}/{showCode}/{sortOrder}")
   public ResponseVO findByTimeBetweenDay(@PathVariable("startTime") Long startTime,
                                       @PathVariable("endTime") Long endTime,
@@ -116,6 +105,16 @@ public class AccuracyPassRateController {
    * @return result
    */
   @GetMapping(value="tableMonth/{startTime}/{endTime}/{showCode}/{sortOrder}")
+  @ApiOperation(value = "月统计查询", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入Map&ltString, Object&gt</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "showCode",value = "展示列表字段",dataType="String"),
+    @ApiImplicitParam(name= "sortOrder",value = "列表排序",dataType="String")
+  })
+  @ApiMyResponse
   public ResponseVO findByTimeBetweenMonth(@PathVariable("startTime") Long startTime,
                                       @PathVariable("endTime") Long endTime,
                                       @PathVariable("showCode") String showCode,
@@ -140,6 +139,15 @@ public class AccuracyPassRateController {
    * @return result
    */
   @GetMapping(value="realTimeCharts/{startTime}/{endTime}/{showCode}")
+  @ApiOperation(value = "实时查询准确合格率（用于图表）", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入Map&ltString, Object&gt</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "showCode",value = "展示列表字段",dataType="String")
+  })
+  @ApiMyResponse
   public ResponseVO accuracyPassRateQueryForCharts(@PathVariable("startTime") Long startTime,
                                                    @PathVariable("endTime") Long endTime,
                                                    @PathVariable("showCode") String showCode) {
@@ -161,6 +169,7 @@ public class AccuracyPassRateController {
    * @return result
    */
   @GetMapping(value="realTimeChartsDay/{startTime}/{endTime}/{showCode}")
+  @ApiIgnore
   public ResponseVO accuracyPassRateQueryForChartsDay(@PathVariable("startTime") Long startTime,
                                                    @PathVariable("endTime") Long endTime,
                                                    @PathVariable("showCode") String showCode) {

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/AccuracyPassRateOneController.java

@@ -1,14 +1,20 @@
 package com.jiayue.ipfcst.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.AccuracyPassRateOneService;
 import com.jiayue.ipfcst.service.AccuracyPassRateService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -23,6 +29,7 @@ import java.util.Map;
 @RestController
 @Slf4j
 @RequestMapping("accuracyPassRateOne")
+@Api(value = "AccuracyPassRateOneController", tags = "风电准确率合格率controller")
 public class AccuracyPassRateOneController {
   private final AccuracyPassRateOneService accuracyPassRateOneService;
 
@@ -31,32 +38,6 @@ public class AccuracyPassRateOneController {
     this.accuracyPassRateOneService = accuracyPassRateOneService;
   }
 
- /* *//**
-   * 根据时间查询准确合格率
-   * @param startTime 开始时间
-   * @param endTime 结束时间
-   * @param page 页码
-   * @param size 条数
-   * @param sortOrder 排序
-   * @return result
-   *//*
-  @GetMapping(value="accuracyPassRate/{startTime}/{endTime}/{page}/{size}")
-  public ResponseVO findByTimeBetweenAndNoForPaging(@PathVariable("startTime") Long startTime,
-                                       @PathVariable("endTime") Long endTime,
-                                       @PathVariable("page") Integer page,
-                                       @PathVariable("size") Integer size,
-                                       String sortOrder) {
-    Map<String,Object> map = new HashMap<>();
-    try{
-      map = accuracyPassRateService.findByTimeBetweenAndNoForPaging(startTime,endTime,page,size,sortOrder);
-      return ResponseVO.success(map);
-    }catch(Exception e){
-      e.printStackTrace();
-      log.error("查询准确合格率错误");
-      return ResponseVO.fail(e.toString());
-    }
-  }*/
-
   /**
    * 根据时间查询准确合格率
    * @param startTime 开始时间
@@ -65,6 +46,16 @@ public class AccuracyPassRateOneController {
    * @return result
    */
   @GetMapping(value="table/{startTime}/{endTime}/{showCode}/{sortOrder}")
+  @ApiOperation(value = "日统计查询", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入Map&ltString, Object&gt</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "showCode",value = "展示列表字段",dataType="String"),
+    @ApiImplicitParam(name= "sortOrder",value = "列表排序",dataType="String")
+  })
+  @ApiMyResponse
   public ResponseVO findByTimeBetween(@PathVariable("startTime") Long startTime,
                                       @PathVariable("endTime") Long endTime,
                                       @PathVariable("showCode") String showCode,
@@ -90,6 +81,7 @@ public class AccuracyPassRateOneController {
    * @return result
    */
   @GetMapping(value="tableDay/{startTime}/{endTime}/{showCode}/{sortOrder}")
+  @ApiIgnore
   public ResponseVO findByTimeBetweenDay(@PathVariable("startTime") Long startTime,
                                       @PathVariable("endTime") Long endTime,
                                       @PathVariable("showCode") String showCode,
@@ -114,6 +106,16 @@ public class AccuracyPassRateOneController {
    * @return result
    */
   @GetMapping(value="tableMonth/{startTime}/{endTime}/{showCode}/{sortOrder}")
+  @ApiOperation(value = "月统计查询", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入Map&ltString, Object&gt</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "showCode",value = "展示列表字段",dataType="String"),
+    @ApiImplicitParam(name= "sortOrder",value = "列表排序",dataType="String")
+  })
+  @ApiMyResponse
   public ResponseVO findByTimeBetweenMonth(@PathVariable("startTime") Long startTime,
                                       @PathVariable("endTime") Long endTime,
                                       @PathVariable("showCode") String showCode,
@@ -138,6 +140,15 @@ public class AccuracyPassRateOneController {
    * @return result
    */
   @GetMapping(value="realTimeCharts/{startTime}/{endTime}/{showCode}")
+  @ApiOperation(value = "实时查询准确合格率（用于图表）", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入Map&ltString, Object&gt</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "showCode",value = "展示列表字段",dataType="String")
+  })
+  @ApiMyResponse
   public ResponseVO accuracyPassRateQueryForCharts(@PathVariable("startTime") Long startTime,
                                                    @PathVariable("endTime") Long endTime,
                                                    @PathVariable("showCode") String showCode) {
@@ -159,6 +170,7 @@ public class AccuracyPassRateOneController {
    * @return result
    */
   @GetMapping(value="realTimeChartsDay/{startTime}/{endTime}/{showCode}")
+  @ApiIgnore
   public ResponseVO accuracyPassRateQueryForChartsDay(@PathVariable("startTime") Long startTime,
                                                    @PathVariable("endTime") Long endTime,
                                                    @PathVariable("showCode") String showCode) {

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/ComprehensiveContrastController.java

@@ -3,12 +3,18 @@ package com.jiayue.ipfcst.controller;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.*;
 import com.jiayue.ipfcst.common.data.repository.SysParameterRepository;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.BufferedOutputStream;
@@ -26,6 +32,7 @@ import java.util.*;
  */
 @RestController
 @Slf4j
+@Api(value = "ComprehensiveContrastController", tags = "上报综合数据controller")
 public class ComprehensiveContrastController {
   private final ComprehensiveContrastService comprehensiveContrastService;
   private final DisplayConfigService displayConfigService;
@@ -53,6 +60,20 @@ public class ComprehensiveContrastController {
    * @return
    */
   @GetMapping(value = "comprehensiveContrast/{startTime}/{endTime}/{no}/{otherType}/{dqAgo}/{cdqAgo}/{nwpAgo}/{jgTime}")
+  @ApiOperation(value = "上报数据查询", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入Map&ltString, Object&gt,封装实际功率、短期、超短期、nwp、环境数据</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "no",value = "设备编号",dataType="Integer"),
+    @ApiImplicitParam(name= "otherType",value = "场站类型E1光伏、E2风电",dataType="String"),
+    @ApiImplicitParam(name= "dqAgo",value = "短期提前点位",dataType="Integer"),
+    @ApiImplicitParam(name= "cdqAgo",value = "超短期提前点位",dataType="Integer"),
+    @ApiImplicitParam(name= "nwpAgo",value = "nwp提前点位",dataType="Integer"),
+    @ApiImplicitParam(name= "jgTime",value = "时间间隔",dataType="Long"),
+  })
+  @ApiMyResponse
   public ResponseVO comprehensiveQueryForcharts(@PathVariable("startTime") Long startTime,
                                                 @PathVariable("endTime") Long endTime,
                                                 @PathVariable("no") Integer no,
@@ -67,6 +88,7 @@ public class ComprehensiveContrastController {
   }
 
   @GetMapping("/comprehensiveContrast/getSpeedColumn")
+  @ApiIgnore
   public ResponseVO getSpeedColumn() {
 
     SysParameter sysParameter = sysParameterRepository.findBySysKeyEquals("NWP_CHANGE_WIND");
@@ -119,6 +141,20 @@ public class ComprehensiveContrastController {
    * @return
    */
   @GetMapping(value = "comprehensiveContrastExport/{startTime}/{endTime}/{no}/{otherType}/{dqAgo}/{cdqAgo}/{nwpAgo}/{jgTime}")
+  @ApiOperation(value = "列表导出", httpMethod = "GET",
+    notes = "<p>返回字节流</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "no",value = "设备编号",dataType="no"),
+    @ApiImplicitParam(name= "otherType",value = "场站类型E1光伏、E2风电",dataType="String"),
+    @ApiImplicitParam(name= "dqAgo",value = "短期提前点位",dataType="Integer"),
+    @ApiImplicitParam(name= "cdqAgo",value = "超短期提前点位",dataType="Integer"),
+    @ApiImplicitParam(name= "nwpAgo",value = "nwp提前点位",dataType="Integer"),
+    @ApiImplicitParam(name= "jgTime",value = "时间间隔",dataType="Long"),
+  })
+  @ApiMyResponse
   public ResponseVO export(@PathVariable("startTime") Long startTime,
                            @PathVariable("endTime") Long endTime,
                            @PathVariable("no") Integer no,
@@ -437,6 +473,7 @@ public class ComprehensiveContrastController {
   }
 
   @GetMapping("/comprehensiveContrast/getSelects")
+  @ApiIgnore
   public ResponseVO getSelects() {
 
     Map<String, List<Map<String, String>>> selects = comprehensiveContrastService.getSelects();

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/CustomReportFormController.java

@@ -7,11 +7,13 @@ import com.jiayue.ipfcst.common.data.entity.EquipmentAttribute;
 import com.jiayue.ipfcst.service.CustomReportFormService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 
 @RestController
 @RequestMapping("customReportForm")
+@ApiIgnore
 public class CustomReportFormController {
   @Autowired
   private CustomReportFormService customReportFormService;

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/DashboardController.java

@@ -5,10 +5,14 @@ import com.jiayue.ipfcst.common.data.constant.enums.ChannelStatusEnum;
 import com.jiayue.ipfcst.common.data.constant.enums.FileStatusEnum;
 import com.jiayue.ipfcst.common.data.constant.enums.FileTypeEnum;
 import com.jiayue.ipfcst.common.data.entity.*;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.DashboardService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.*;
 
@@ -21,6 +25,7 @@ import java.util.*;
 @RestController
 @RequestMapping("/dashboard")
 @Slf4j
+@Api(value = "DashboardController", tags = "首页controller")
 public class DashboardController {
   private final DashboardService dashboardService;
 
@@ -34,6 +39,15 @@ public class DashboardController {
    * @return
    */
   @GetMapping(value = "/getChannelStatus")
+  @ApiOperation(value = "获取上报对象状态", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象,data属性存入Map</p>"+
+      "<p>key:uploadList=>上报对象状态</p>"+
+      "<p>key:analysisList=>解析状态</p>"+
+      "<p>key:callBackList=>回传通道状态</p>"+
+      "<p>key:dataexchangeList=>接入通道状态</p>"+
+      "<p>key:dataexchangeList=>接入通道状态</p>"
+  )
+  @ApiMyResponse
   public ResponseVO getChannelStatus() {
     return ResponseVO.success(dashboardService.getChannelStatus());
   }
@@ -44,6 +58,12 @@ public class DashboardController {
    * @return
    */
   @GetMapping(value = "/getUploadFileInfo")
+  @ApiOperation(value = "获取上报文件信息", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象,data属性存入Map</p>"+
+      "<p>key:uploadObjectRateList=>上报率</p>"+
+      "<p>key:notUploadSortResultList=>未上报文件集</p>"
+  )
+  @ApiMyResponse
   public ResponseVO getUploadFileInfo() {
     return ResponseVO.success(dashboardService.getDashboardUploadFileInfo());
   }
@@ -54,6 +74,12 @@ public class DashboardController {
    * @return
    */
   @GetMapping(value = "/getEquipmentInfo")
+  @ApiOperation(value = "获取环境设备信息", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象,data属性存入Map</p>"+
+      "<p>key:uploadObjectRateList=>上报率</p>"+
+      "<p>key:notUploadSortResultList=>未上报文件集</p>"
+  )
+  @ApiMyResponse
   public ResponseVO getEquipmentInfo() {
     return ResponseVO.success(dashboardService.getEquipmentInfo());
   }
@@ -64,6 +90,10 @@ public class DashboardController {
    * @return
    */
   @RequestMapping(value = "/getEquipmentDataType/{equipmentId}")
+  @ApiOperation(value = "根据设备ID获取在首页显示的数据类型", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象,data属性存入List<DashboardEquipmentDto></p>"
+  )
+  @ApiMyResponse
   public ResponseVO getEquipmentDataType(@PathVariable final String equipmentId) {
     return ResponseVO.success(dashboardService.getEquipmentDataType(equipmentId));
   }
@@ -73,6 +103,14 @@ public class DashboardController {
    * @return
    */
   @RequestMapping(value = "/getCompositeData/{efiType}")
+  @ApiOperation(value = "获取首页短期、超短期、实际功率数据", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象,data属性存入Map&ltString, List&gt</p>"+
+      "<p>key:sjList=>实际功率</p>"+
+      "<p>key:dqList=>短期</p>"+
+      "<p>key:cdqList=>超短期</p>"+
+      "<p>key:timeList=>时间</p>"
+  )
+  @ApiMyResponse
   public ResponseVO getCompositeData(@PathVariable final String efiType) {
     if ("E1".equals(efiType)){
       return ResponseVO.success(dashboardService.getCompositeData());
@@ -87,6 +125,10 @@ public class DashboardController {
    * @return
    */
   @GetMapping("/getFileStatusEnum")
+  @ApiOperation(value = "获取上报文件状态枚举", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象,data属性存入List,对FileStatusEnum枚举的name和message获取</p>"
+  )
+  @ApiMyResponse
   public ResponseVO getFileStatusEnum(){
     List list = new ArrayList<>();
     for (FileStatusEnum fileStatusEnum : FileStatusEnum.values()) {
@@ -103,6 +145,10 @@ public class DashboardController {
    * @return
    */
   @GetMapping("/getFileTypeEnum")
+  @ApiOperation(value = "上报文件类型枚举", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象,data属性存入List,对FileTypeEnum枚举的name和message获取</p>"
+  )
+  @ApiMyResponse
   public ResponseVO getFileTypeEnum(){
     List list = new ArrayList<>();
     for (FileTypeEnum fileTypeEnum : FileTypeEnum.values()) {
@@ -118,6 +164,10 @@ public class DashboardController {
    * @return 结果集
    */
   @GetMapping(value = "/getChannelDisconLog")
+  @ApiOperation(value = "获取首页当天通道断开日志", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象,data属性存入List&ltChannelDisconLog&gt</p>"
+  )
+  @ApiMyResponse
   public ResponseVO getChannelDisconLog(){
     List<ChannelDisconLog> list = new ArrayList<>();
     try{
@@ -133,6 +183,7 @@ public class DashboardController {
    * @return 结果集
    */
   @GetMapping(value = "/getPowerLimitPlanSign")
+  @ApiIgnore
   public ResponseVO getPowerLimitPlanSign(){
     try{
       return ResponseVO.success(dashboardService.getPowerLimitPlanSign());
@@ -149,6 +200,7 @@ public class DashboardController {
    * @return 执行结果
    */
   @PostMapping(value = "/savePowerLimitPlanSign")
+  @ApiIgnore
   public ResponseVO savePowerLimitPlanSign(@RequestBody PowerLimitPlanSign powerLimitPlanSign) {
     try {
       this.dashboardService.savePowerLimitPlanSign(powerLimitPlanSign);
@@ -163,6 +215,7 @@ public class DashboardController {
    * 获取首页通道告警不提示
    */
   @GetMapping(value = "/getChannelAlarmInfo")
+  @ApiIgnore
   public ResponseVO getChannelAlarmInfo(){
     try{
       return ResponseVO.success(dashboardService.getChannelAlarmInfo());
@@ -178,6 +231,7 @@ public class DashboardController {
    *
    */
   @PostMapping(value = "/saveAllChannelAlarmInfo")
+  @ApiIgnore
   public ResponseVO saveChannelAlarmInfo(@RequestBody List<ChannelAlarmInfo> channelAlarmInfos){
     try{
       dashboardService.saveChannelAlarmInfoAll(channelAlarmInfos);
@@ -191,6 +245,7 @@ public class DashboardController {
    * 获取系统版本号
    */
   @GetMapping(value = "/getSysVersion")
+  @ApiIgnore
   public ResponseVO getSysVersion(){
     try{
       return ResponseVO.success(dashboardService.getSysVersion());
@@ -204,6 +259,7 @@ public class DashboardController {
    * 获取系统版本号
    */
   @GetMapping(value = "/getIsAbnormal")
+  @ApiIgnore
   public ResponseVO getIsAbnormal(){
     try{
       return ResponseVO.success(dashboardService.getIsAbnormal());
@@ -217,6 +273,7 @@ public class DashboardController {
    * @return 结果集
    */
   @GetMapping(value = "/getServerTime")
+  @ApiIgnore
   public ResponseVO getServerTime(){
     try{
       Date d = new Date();
@@ -231,6 +288,10 @@ public class DashboardController {
    *获取上报对象中的上报文件类型
    */
   @GetMapping(value = "/getUploadFileType")
+  @ApiOperation(value = "获取上报对象中的上报文件类型", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象,data属性存入FileTypeEnum的list</p>"
+  )
+  @ApiMyResponse
   public ResponseVO getUploadFileType() {
     return ResponseVO.success(dashboardService.getUploadFileType());
   }
@@ -243,6 +304,10 @@ public class DashboardController {
    */
   @SneakyThrows
   @GetMapping(value = "/sysParameterKey/{sysKey}")
+  @ApiOperation(value = "根据参数标识获取系统参数", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象,data属性存入SysParameter实体</p>"
+  )
+  @ApiMyResponse
   public ResponseVO getById(@PathVariable("sysKey") String sysKey) {
     return ResponseVO.success(dashboardService.getParameterBySysKey(sysKey));
   }

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/DisplayConfigController.java

@@ -3,7 +3,12 @@ package com.jiayue.ipfcst.controller;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.constant.enums.EquipmentTypeEnum;
 import com.jiayue.ipfcst.common.data.entity.DisplayConfig;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -17,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @Slf4j
+@Api(value = "DisplayConfigController", tags = "展示配置controller")
 public class DisplayConfigController {
   private final DisplayConfigService displayConfigService;
 
@@ -33,6 +39,13 @@ public class DisplayConfigController {
    * @return result
    */
   @GetMapping(value="displayConfig/{displayCode}")
+  @ApiOperation(value = "展示编码查询", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入DisplayConfig实体</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "displayCode",value = "展示编码",dataType="String"),
+  })
+  @ApiMyResponse
   public ResponseVO displayConfigQuery(@PathVariable("displayCode") String displayCode) {
     DisplayConfig displayConfig;
     try{
@@ -50,6 +63,13 @@ public class DisplayConfigController {
    * @return result
    */
   @PostMapping(value="displayConfig")
+  @ApiOperation(value = "保存展示编码查询", httpMethod = "POST",
+    notes = "<p>返回ResponseVO对象，data属性存入DisplayConfig实体</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "displayCode",value = "展示配置实体",dataType="DisplayConfig"),
+  })
+  @ApiMyResponse
   public ResponseVO displayConfigSave(@RequestBody DisplayConfig displayCode) {
     DisplayConfig displayConfig;
     try {
@@ -69,6 +89,10 @@ public class DisplayConfigController {
    * 查询数据时间间隔设置
    */
   @GetMapping("displayConfig/timeInterval")
+  @ApiOperation(value = "查询数据时间间隔设置", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入DisplayConfig实体</p>"
+  )
+  @ApiMyResponse
   public ResponseVO displayConfigTimeInterval() {
     DisplayConfig displayConfig;
     try {
@@ -86,6 +110,10 @@ public class DisplayConfigController {
    * 查询分页固定设置
    */
   @GetMapping("displayConfig/pageSize")
+  @ApiOperation(value = "查询分页固定设置", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入DisplayConfig实体</p>"
+  )
+  @ApiMyResponse
   public ResponseVO displayConfigPageSize() {
     DisplayConfig displayConfig;
     try {
@@ -99,6 +127,10 @@ public class DisplayConfigController {
   }
 
   @GetMapping("displayConfig/eqTimeInterval")
+  @ApiOperation(value = "查询设备数据时间间隔设置", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入DisplayConfig实体</p>"
+  )
+  @ApiMyResponse
   public ResponseVO displayConfigEqTimeInterval(){
     DisplayConfig displayConfig;
     try {
@@ -113,6 +145,13 @@ public class DisplayConfigController {
 
 
   @DeleteMapping("displayConfig/deleteById/{id}")
+  @ApiOperation(value = "删除显示设置信息", httpMethod = "DELETE",
+    notes = "<p>返回ResponseVO对象</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "id",value = "配置主键ID",dataType="Integer"),
+  })
+  @ApiMyResponse
   public ResponseVO displayConfigEqTimeInterval(@PathVariable Integer id){
     try {
       displayConfigService.deleteById(id);

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/ElectricFieldController.java

@@ -4,11 +4,15 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.ElectricField;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.ElectricFieldService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -22,6 +26,7 @@ import java.util.Date;
  */
 @RestController
 @Slf4j
+@Api(value = "ElectricFieldController", tags = "场站信息controller")
 public class ElectricFieldController {
   private final ElectricFieldService electricFieldService;
 
@@ -37,6 +42,10 @@ public class ElectricFieldController {
    * @return result
    */
   @GetMapping(value="electricField")
+  @ApiOperation(value = "场站信息查询", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入ElectricField实体</p>"
+  )
+  @ApiMyResponse
   public ResponseVO displayConfigQuery() {
     ElectricField electricField;
     try{
@@ -54,6 +63,7 @@ public class ElectricFieldController {
    * @return result
    */
   @GetMapping(value="getExpirationTime")
+  @ApiIgnore
   public ResponseVO contractEndTime() {
     String contractEndTimeStr;
     try{

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/EnvironmentalDataController.java

@@ -5,7 +5,12 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.EnvironmentalDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -26,6 +31,7 @@ import java.util.Map;
 @Slf4j
 @RestController
 @RequestMapping("environmentalData")
+@Api(value = "EnvironmentalDataController", tags = "光伏环境数据controller")
 public class EnvironmentalDataController {
   private final EnvironmentalDataService environmentalDataService;
 
@@ -35,6 +41,20 @@ public class EnvironmentalDataController {
   }
 
   @GetMapping("/findEnvironmentalData/{startTime}/{endTime}/{eqId}")
+  @ApiOperation(value = "查询环境数据", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入map&ltString,Object&gt</p>" +
+      "<p>key：footerData,value: 提取表格底部统计数据</p>" +
+      "<p>key：tableColumn,value:按照数据类型分配表头名以及查询数据</p>"+
+      "<p>key：dayList,value:提取日统计数据</p>"+
+      "<p>key：monthList,value:提取月统计数据</p>"+
+      "<p>key：yearList,value:提取年统计数据</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "eqId",value = "设备ID",dataType="Integer")
+  })
+  @ApiMyResponse
   public ResponseVO findEnvironmentalData(@PathVariable Long startTime, @PathVariable Long endTime, @PathVariable Integer eqId) {
     Map<String, Object> byRealTime = environmentalDataService.getData(startTime, endTime, eqId,1);
     return ResponseVO.success(byRealTime);
@@ -42,11 +62,23 @@ public class EnvironmentalDataController {
 
 
   @GetMapping("/findEnvironmentalData")
+  @ApiOperation(value = "查询设备信息", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入List&ltMap&ltString, String&gt&gt</p>" +
+      "<p>map存入key:key属性的定义=>value:value属性所对应的的类的属性/p>"
+  )
+  @ApiMyResponse
   public ResponseVO getEqAttribute() {
     return ResponseVO.success(environmentalDataService.eqAttribute());
   }
 
   @GetMapping("/findEnvironmentalData/{eqId}")
+  @ApiOperation(value = "根据设备ID获取设备属性", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入List<EquipmentAttribute></p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "eqId",value = "开始时间",dataType="Integer")
+  })
+  @ApiMyResponse
   public ResponseVO getEqAttributeById(@PathVariable Integer eqId) {
     return ResponseVO.success(environmentalDataService.getEqAttributeById(eqId));
   }
@@ -57,6 +89,15 @@ public class EnvironmentalDataController {
    * @param response
    */
   @RequestMapping(value = "/export")
+  @ApiOperation(value = "环境数据导出", httpMethod = "GET",
+    notes = "<p>返回字节流</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "eqId",value = "设备ID",dataType="Integer")
+  })
+  @ApiMyResponse
   public void export(HttpServletResponse response, Long startTime, Long endTime, Integer eqId) {
     try {
       Map<String, Object> maps = environmentalDataService.getData(startTime, endTime, eqId,1);

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/EnvironmentalDataOneController.java

@@ -5,8 +5,13 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.EnvironmentalDataOneService;
 import com.jiayue.ipfcst.service.EnvironmentalDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -27,6 +32,7 @@ import java.util.Map;
 @Slf4j
 @RestController
 @RequestMapping("environmentalDataOne")
+@Api(value = "EnvironmentalDataController", tags = "风电环境数据controller")
 public class EnvironmentalDataOneController {
   private final EnvironmentalDataOneService environmentalDataOneService;
 
@@ -36,6 +42,20 @@ public class EnvironmentalDataOneController {
   }
 
   @GetMapping("/findEnvironmentalData/{startTime}/{endTime}/{eqId}")
+  @ApiOperation(value = "查询环境数据", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入map&ltString,Object&gt</p>" +
+      "<p>key：footerData,value: 提取表格底部统计数据</p>" +
+      "<p>key：tableColumn,value:按照数据类型分配表头名以及查询数据</p>"+
+      "<p>key：dayList,value:提取日统计数据</p>"+
+      "<p>key：monthList,value:提取月统计数据</p>"+
+      "<p>key：yearList,value:提取年统计数据</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "eqId",value = "设备ID",dataType="Integer")
+  })
+  @ApiMyResponse
   public ResponseVO findEnvironmentalData(@PathVariable Long startTime, @PathVariable Long endTime, @PathVariable Integer eqId) {
     Map<String, Object> byRealTime = environmentalDataOneService.getData(startTime, endTime, eqId,2);
     return ResponseVO.success(byRealTime);
@@ -43,11 +63,23 @@ public class EnvironmentalDataOneController {
 
 
   @GetMapping("/findEnvironmentalData")
+  @ApiOperation(value = "查询设备信息", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入List&ltMap&ltString, String&gt&gt</p>" +
+      "<p>map存入key:key属性的定义=>value:value属性所对应的的类的属性/p>"
+  )
+  @ApiMyResponse
   public ResponseVO getEqAttribute() {
     return ResponseVO.success(environmentalDataOneService.eqAttribute());
   }
 
   @GetMapping("/findEnvironmentalData/{eqId}")
+  @ApiOperation(value = "根据设备ID获取设备属性", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入List<EquipmentAttribute></p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "eqId",value = "开始时间",dataType="Integer")
+  })
+  @ApiMyResponse
   public ResponseVO getEqAttributeById(@PathVariable Integer eqId) {
     return ResponseVO.success(environmentalDataOneService.getEqAttributeById(eqId));
   }
@@ -58,6 +90,15 @@ public class EnvironmentalDataOneController {
    * @param response
    */
   @RequestMapping(value = "/export")
+  @ApiOperation(value = "环境数据导出", httpMethod = "GET",
+    notes = "<p>返回字节流</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "eqId",value = "设备ID",dataType="Integer")
+  })
+  @ApiMyResponse
   public void export(HttpServletResponse response, Long startTime, Long endTime, Integer eqId) {
     try {
       Map<String, Object> maps = environmentalDataOneService.getData(startTime, endTime, eqId,2);

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/EquipmentAttributeController.java

@@ -1,7 +1,12 @@
 package com.jiayue.ipfcst.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.EquipmentAttributeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -19,11 +24,18 @@ import java.util.Map;
 @Slf4j
 @RestController
 @RequestMapping("EquipmentAttribute")
+@Api(value = "EquipmentAttributeController", tags = "接入数据属性获取controller")
 public class EquipmentAttributeController {
   @Autowired
   private EquipmentAttributeService equipmentAttributeService;
 
   @GetMapping("/findWindtower")
+  @ApiOperation(value = "查询测风塔设备属性", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入map&ltString,String&gt</p>" +
+      "<p>key：value,value: 超短期历史数据</p>" +
+      "<p>key：capacity,value:装机容量</p>"
+  )
+  @ApiMyResponse
   public ResponseVO findByWindtowerAttribute(){
     Map<String, String> byEquipmentTypeforWINDTOWER = equipmentAttributeService.findByEquipmentTypeforWINDTOWER();
     return ResponseVO.success(byEquipmentTypeforWINDTOWER);

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/ExportFileController.java

@@ -6,6 +6,7 @@ import com.jiayue.ipfcst.service.ForecastPowerShortTermService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
@@ -20,6 +21,7 @@ import java.util.Map;
 @Slf4j
 @RestController
 @RequestMapping("exportFile")
+@ApiIgnore
 public class ExportFileController {
   private final ForecastPowerShortTermService forecastPowerShortTermService;
   private final ExportFileService exportFileService;

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/ForecastPowerShortTermController.java

@@ -5,14 +5,20 @@ import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.ElectricField;
 import com.jiayue.ipfcst.common.data.entity.ForecastPowerShortTerm;
 import com.jiayue.ipfcst.common.data.entity.Nwp;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.ElectricFieldService;
 import com.jiayue.ipfcst.service.ForecastPowerShortTermService;
 import com.jiayue.ipfcst.service.NwpService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
@@ -27,6 +33,7 @@ import java.util.*;
  */
 @RestController
 @Slf4j
+@Api(value = "ForecastPowerShortTermController", tags = "光伏短期实时controller")
 public class ForecastPowerShortTermController {
   private final ForecastPowerShortTermService forecastPowerShortTermService;
   private final ElectricFieldService electricFieldService;
@@ -45,6 +52,16 @@ public class ForecastPowerShortTermController {
    * @return 结果集
    */
   @GetMapping(value = "/forecastPowerShortTerm/{startTime}/{endTime}")
+  @ApiOperation(value = "上报数据查询", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入map&ltString,Object&gt</p>" +
+      "<p>key：datas,value: List&ltFloat&gt</p>" +
+      "<p>key：times,value:时间</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long")
+  })
+  @ApiMyResponse
   public ResponseVO findByForecastTimeBetween(@PathVariable("startTime") Long startTime,
                                           @PathVariable("endTime") Long endTime){
     Map<String,Object> map = new HashMap<>();
@@ -67,6 +84,18 @@ public class ForecastPowerShortTermController {
    * @return
    */
   @GetMapping(value = "/forecastPowerShortTerm/{startTime}/{endTime}/{page}/{size}")
+  @ApiOperation(value = "分页查询实时短期预测", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入map&ltString,Object&gt</p>" +
+      "<p>key：content,value: List&ltForecastPowerShortTerm&gt</p>" +
+      "<p>key：count,value:条数</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
+    @ApiImplicitParam(name= "size",value = "条数",dataType="Integer")
+  })
+  @ApiMyResponse
   public ResponseVO findByTimeBetweenForPaging(@PathVariable("startTime") Long startTime,
                                                @PathVariable("endTime") Long endTime,
                                                @PathVariable("page") Integer page,
@@ -87,6 +116,7 @@ public class ForecastPowerShortTermController {
    * @return map
    */
   @GetMapping(value = "/forecastPowerShortTerm/getElectricEnergyTotal/{startTimeStr}")
+  @ApiIgnore
   public ResponseVO getElectricEnergyTotal(@PathVariable("startTimeStr") Long startTimeStr) throws BusinessException {
 
     Map<String,Map<String,String>> map = new HashMap<>();

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/ForecastPowerShortTermHisController.java

@@ -2,12 +2,17 @@ package com.jiayue.ipfcst.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.service.ForecastPowerShortTermHisService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
@@ -25,6 +30,7 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
+@ApiIgnore
 public class ForecastPowerShortTermHisController {
   private final ForecastPowerShortTermHisService forecastPowerShortTermHisService;
 

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/ForecastPowerShortTermOneController.java

@@ -6,15 +6,21 @@ import com.jiayue.ipfcst.common.data.entity.ElectricField;
 import com.jiayue.ipfcst.common.data.entity.ForecastPowerShortTerm;
 import com.jiayue.ipfcst.common.data.entity.ForecastPowerShortTermOne;
 import com.jiayue.ipfcst.common.data.entity.Nwp;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.ElectricFieldService;
 import com.jiayue.ipfcst.service.ForecastPowerShortTermOneService;
 import com.jiayue.ipfcst.service.ForecastPowerShortTermService;
 import com.jiayue.ipfcst.service.NwpService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
@@ -32,6 +38,7 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
+@Api(value = "ForecastPowerShortTermOneController", tags = "风电短期实时controller")
 public class ForecastPowerShortTermOneController {
   private final ForecastPowerShortTermOneService forecastPowerShortTermOneService;
   private final ElectricFieldService electricFieldService;
@@ -50,6 +57,16 @@ public class ForecastPowerShortTermOneController {
    * @return 结果集
    */
   @GetMapping(value = "/forecastPowerShortTermOne/{startTime}/{endTime}")
+  @ApiOperation(value = "上报数据查询", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入map&ltString,Object&gt</p>" +
+      "<p>key：datas,value: List&ltFloat&gt</p>" +
+      "<p>key：times,value:时间</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long")
+  })
+  @ApiMyResponse
   public ResponseVO findByForecastTimeBetween(@PathVariable("startTime") Long startTime,
                                           @PathVariable("endTime") Long endTime){
     Map<String,Object> map = new HashMap<>();
@@ -72,6 +89,18 @@ public class ForecastPowerShortTermOneController {
    * @return
    */
   @GetMapping(value = "/forecastPowerShortTermOne/{startTime}/{endTime}/{page}/{size}")
+  @ApiOperation(value = "分页查询实时短期预测", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入map&ltString,Object&gt</p>" +
+      "<p>key：content,value: List&ltForecastPowerShortTermOne&gt</p>" +
+      "<p>key：count,value:条数</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
+    @ApiImplicitParam(name= "size",value = "条数",dataType="Integer")
+  })
+  @ApiMyResponse
   public ResponseVO findByTimeBetweenForPaging(@PathVariable("startTime") Long startTime,
                                                @PathVariable("endTime") Long endTime,
                                                @PathVariable("page") Integer page,
@@ -92,6 +121,7 @@ public class ForecastPowerShortTermOneController {
    * @return map
    */
   @GetMapping(value = "/forecastPowerShortTermOne/getElectricEnergyTotal/{startTimeStr}")
+  @ApiIgnore
   public ResponseVO getElectricEnergyTotal(@PathVariable("startTimeStr") Long startTimeStr) throws BusinessException {
 
     Map<String,Map<String,String>> map = new HashMap<>();

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/ForecastPowerThroughoutTheYearController.java

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
@@ -29,6 +30,7 @@ import java.util.*;
 @RestController
 @Slf4j
 @RequiredArgsConstructor
+@ApiIgnore
 public class ForecastPowerThroughoutTheYearController {
   private final ForecastPowerThroughoutTheYearService forecastPowerThroughoutTheYearService;
   private final ElectricFieldService electricFieldService;

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/ForecastPowerUltraShortTermController.java

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -21,6 +22,7 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
+@ApiIgnore
 public class ForecastPowerUltraShortTermController {
   private final ForecastPowerUltraShortTermService forecastPowerUltraShortTermService;
   @Autowired

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/ForecastPowerUltraShortTermHisController.java

@@ -1,13 +1,19 @@
 package com.jiayue.ipfcst.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.ForecastPowerShortTermHisService;
 import com.jiayue.ipfcst.service.ForecastPowerUltraShortTermHisService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -21,6 +27,7 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
+@Api(value = "ForecastPowerUltraShortTermHisController", tags = "光伏超短期16时刻controller")
 public class ForecastPowerUltraShortTermHisController {
   private final ForecastPowerUltraShortTermHisService forecastPowerUltraShortTermHisService;
   @Autowired
@@ -35,6 +42,7 @@ public class ForecastPowerUltraShortTermHisController {
    * @return 结果集
    */
   @GetMapping(value = "/forecastUltraPowerShortTermHis/{startTime}/{endTime}/{ago}")
+  @ApiIgnore
   public ResponseVO findByForecastTimeBetween(@PathVariable("startTime") Long startTime,
                                               @PathVariable("endTime") Long endTime,
                                               @PathVariable("endTime") Integer ago){
@@ -55,6 +63,15 @@ public class ForecastPowerUltraShortTermHisController {
    * @return 结果集
    */
   @GetMapping(value = "/findByForecastRealTimeUltraShortTerm16/{startTime}")
+  @ApiOperation(value = "查询超短期16个点的信息", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入map&ltString,Object&gt</p>" +
+      "<p>key：value,value: 超短期历史数据</p>" +
+      "<p>key：capacity,value:装机容量</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "时间",dataType="Long")
+  })
+  @ApiMyResponse
   public ResponseVO findByForecastRealTimeUltraShortTerm16(@PathVariable("startTime") Long startTime){
     Map<String,Object> map = new HashMap<>();
     try{

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/ForecastPowerUltraShortTermOneHisController.java

@@ -1,13 +1,16 @@
 package com.jiayue.ipfcst.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.ForecastPowerUltraShortTermHisService;
 import com.jiayue.ipfcst.service.ForecastPowerUltraShortTermOneHisService;
+import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -21,6 +24,7 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
+@Api(value = "ForecastPowerUltraShortTermOneHisController", tags = "风电超短期16时刻controller")
 public class ForecastPowerUltraShortTermOneHisController {
   private final ForecastPowerUltraShortTermOneHisService forecastPowerUltraShortTermOneHisService;
   @Autowired
@@ -35,6 +39,7 @@ public class ForecastPowerUltraShortTermOneHisController {
    * @return 结果集
    */
   @GetMapping(value = "/forecastUltraPowerShortTermOneHis/{startTime}/{endTime}/{ago}")
+  @ApiIgnore
   public ResponseVO findByForecastTimeBetween(@PathVariable("startTime") Long startTime,
                                               @PathVariable("endTime") Long endTime,
                                               @PathVariable("endTime") Integer ago){
@@ -55,6 +60,14 @@ public class ForecastPowerUltraShortTermOneHisController {
    * @return 结果集
    */
   @GetMapping(value = "/findByForecastRealTimeUltraShortTerm16One/{startTime}")
+  @ApiOperation(value = "查询超短期16个点的信息", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入map&ltString,Object&gt</p>" +
+      "<p>key：属性名,value: 属性单位</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "时间",dataType="Long")
+  })
+  @ApiMyResponse
   public ResponseVO findByForecastRealTimeUltraShortTerm16One(@PathVariable("startTime") Long startTime){
     Map<String,Object> map = new HashMap<>();
     try{

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/InverterInfoController.java

@@ -2,7 +2,12 @@ package com.jiayue.ipfcst.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.InverterInfo;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.InverterInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,6 +25,7 @@ import java.util.List;
  */
 @RestController
 @Slf4j
+@Api(value = "InverterInfoController", tags = "逆变器信息controller")
 public class InverterInfoController {
   private final InverterInfoService inverterInfoService;
   @Autowired
@@ -32,6 +38,10 @@ public class InverterInfoController {
    * @return 结果集
    */
   @GetMapping(value = "/inverterInfos")
+  @ApiOperation(value = "查询所有逆变器设备信息按ID排序", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入List&ltInverterInfo&gt</p>"
+  )
+  @ApiMyResponse
   public ResponseVO findAllByOrderByIdAsc(){
     List<InverterInfo> list = new ArrayList<>();
     try{

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/InverterStatusDataController.java

@@ -6,8 +6,10 @@ import com.jiayue.ipfcst.common.data.entity.InverterInfo;
 import com.jiayue.ipfcst.common.data.entity.InverterStatusData;
 import com.jiayue.ipfcst.common.data.entity.PowerStationStatusData;
 import com.jiayue.ipfcst.common.data.entity.SysParameter;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.InverterInfoService;
 import com.jiayue.ipfcst.service.InverterStatusDataService;
+import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +27,7 @@ import java.util.stream.Collectors;
 
 @RestController
 @Slf4j
+@Api(value = "InverterStatusDataController", tags = "逆变器数据controller")
 public class InverterStatusDataController {
 
   private final InverterStatusDataService inverterStatusDataService;
@@ -49,6 +52,20 @@ public class InverterStatusDataController {
    * @return
    */
   @GetMapping(value = "/inverterStatusData/{startTime}/{endTime}/{page}/{size}")
+  @ApiOperation(value = "分页查询所有逆变器功率状态", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入map&ltString,Object&gt</p>" +
+      "<p>key：content,value: List&ltInverterStatusData&gt</p>" +
+      "<p>key：count,value:条数</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
+    @ApiImplicitParam(name= "size",value = "条数",dataType="Integer"),
+    @ApiImplicitParam(name= "timeSortOrder",value = "时间排序",dataType="String"),
+    @ApiImplicitParam(name= "noSortOrder",value = "设备编号排序",dataType="String"),
+  })
+  @ApiMyResponse
   public ResponseVO findByTimeBetweenForPaging(@PathVariable("startTime") Long startTime,
                                                @PathVariable("endTime") Long endTime,
                                                @PathVariable("page") Integer page,
@@ -76,6 +93,21 @@ public class InverterStatusDataController {
    * @return
    */
   @GetMapping(value = "/inverterStatusData/{startTime}/{endTime}/{page}/{size}/{no}")
+  @ApiOperation(value = "分页查询按设备编号查询逆变器状态", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入map&ltString,Object&gt</p>" +
+      "<p>key：content,value: List&ltInverterStatusData&gt</p>" +
+      "<p>key：count,value:条数</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
+    @ApiImplicitParam(name= "size",value = "条数",dataType="Integer"),
+    @ApiImplicitParam(name= "no",value = "设备编号",dataType="Integer"),
+    @ApiImplicitParam(name= "timeSortOrder",value = "时间排序",dataType="String"),
+    @ApiImplicitParam(name= "noSortOrder",value = "设备编号排序",dataType="String"),
+  })
+  @ApiMyResponse
   public ResponseVO findByTimeBetweenForPaging(@PathVariable("startTime") Long startTime,
                                                @PathVariable("endTime") Long endTime,
                                                @PathVariable("page") Integer page,
@@ -103,6 +135,15 @@ public class InverterStatusDataController {
    * @return
    */
   @GetMapping(value = "/export/inverterStatusData/{startTime}/{endTime}/{no}")
+  @ApiOperation(value = "按设备编号导出逆变器状态", httpMethod = "GET",
+    notes = "<p>返回application/x-msdownload字节流</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "no",value = "设备编号",dataType="Integer")
+  })
+  @ApiMyResponse
   public ResponseVO findByTimeBetweenAndNo(@PathVariable("startTime") Long startTime,
                                            @PathVariable("endTime") Long endTime,
                                            @PathVariable("no") Integer[] no,

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/NwpController.java

@@ -4,8 +4,13 @@ import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.Nwp;
 import com.jiayue.ipfcst.common.data.entity.PowerStationStatusData;
 import com.jiayue.ipfcst.common.data.entity.SysParameter;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.ForecastPowerShortTermService;
 import com.jiayue.ipfcst.service.NwpService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -31,6 +36,7 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
+@Api(value = "NwpController", tags = "光伏nwp-controller")
 public class NwpController {
   private final NwpService nwpService;
   @Autowired
@@ -45,6 +51,17 @@ public class NwpController {
    * @return 结果集
    */
   @GetMapping(value = "/nwp/{startTime}/{endTime}")
+  @ApiOperation(value = "按时间查询实时nwp", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入map&ltString,Object&gt</p>" +
+      "<p>key：cName => 风速信息</p>" +
+      "<p>key：times => 时间</p>"+
+      "<p>key：datas => 气象站数值</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long")
+  })
+  @ApiMyResponse
   public ResponseVO findByForecastTimeBetween(@PathVariable("startTime") Long startTime,
                                           @PathVariable("endTime") Long endTime){
     Map<String,Object> map = new HashMap<>();
@@ -68,6 +85,18 @@ public class NwpController {
    * @return
    */
   @GetMapping(value = "/nwp/{startTime}/{endTime}/{page}/{size}")
+  @ApiOperation(value = "分页查询实时nwp", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入map&ltString,Object&gt</p>" +
+      "<p>key：content,value: List&ltNwp&gt</p>" +
+      "<p>key：count,value:条数</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
+    @ApiImplicitParam(name= "size",value = "条数",dataType="Integer")
+  })
+  @ApiMyResponse
   public ResponseVO findByTimeBetweenForPaging(@PathVariable("startTime") Long startTime,
                                                @PathVariable("endTime") Long endTime,
                                                @PathVariable("page") Integer page,
@@ -92,6 +121,14 @@ public class NwpController {
    * @return
    */
   @GetMapping(value = "export/nwp/{startTime}/{endTime}")
+  @ApiOperation(value = "nwp数据表格导出", httpMethod = "GET",
+    notes = "<p>返回字节流</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long")
+  })
+  @ApiMyResponse
   public ResponseVO export(@PathVariable("startTime") Long startTime,
                            @PathVariable("endTime") Long endTime,
                            HttpServletResponse response
@@ -142,6 +179,10 @@ public class NwpController {
   }
 
   @GetMapping(value = "nwp/getNwpDay")
+  @ApiOperation(value = "获取nwp初始天数", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入int</p>"
+  )
+  @ApiMyResponse
   public ResponseVO getNwpDay(){
     return ResponseVO.success(nwpService.getNwpDay());
   }

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/NwpOneController.java

@@ -2,7 +2,12 @@ package com.jiayue.ipfcst.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.NwpOne;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.NwpOneService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -27,6 +32,7 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
+@Api(value = "NwpController", tags = "风电nwp-controller")
 public class NwpOneController {
   private final NwpOneService nwpOneService;
 
@@ -42,6 +48,17 @@ public class NwpOneController {
    * @return 结果集
    */
   @GetMapping(value = "/nwpOne/{startTime}/{endTime}")
+  @ApiOperation(value = "按时间查询实时nwp", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入map&ltString,Object&gt</p>" +
+      "<p>key：cName => 风速信息</p>" +
+      "<p>key：times => 时间</p>"+
+      "<p>key：datas => 气象站数值</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long")
+  })
+  @ApiMyResponse
   public ResponseVO findByForecastTimeBetween(@PathVariable("startTime") Long startTime,
                                           @PathVariable("endTime") Long endTime){
     Map<String,Object> map = new HashMap<>();
@@ -65,6 +82,18 @@ public class NwpOneController {
    * @return
    */
   @GetMapping(value = "/nwpOne/{startTime}/{endTime}/{page}/{size}")
+  @ApiOperation(value = "分页查询实时nwp", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入map&ltString,Object&gt</p>" +
+      "<p>key：content,value: List&ltNwp&gt</p>" +
+      "<p>key：count,value:条数</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
+    @ApiImplicitParam(name= "size",value = "条数",dataType="Integer")
+  })
+  @ApiMyResponse
   public ResponseVO findByTimeBetweenForPaging(@PathVariable("startTime") Long startTime,
                                                @PathVariable("endTime") Long endTime,
                                                @PathVariable("page") Integer page,
@@ -89,6 +118,14 @@ public class NwpOneController {
    * @return
    */
   @GetMapping(value = "export/nwpOne/{startTime}/{endTime}")
+  @ApiOperation(value = "nwp数据表格导出", httpMethod = "GET",
+    notes = "<p>返回字节流</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long")
+  })
+  @ApiMyResponse
   public ResponseVO export(@PathVariable("startTime") Long startTime,
                            @PathVariable("endTime") Long endTime,
                            HttpServletResponse response
@@ -139,6 +176,10 @@ public class NwpOneController {
   }
 
   @GetMapping(value = "nwpOne/getNwpDay")
+  @ApiOperation(value = "获取nwp初始天数", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入int</p>"
+  )
+  @ApiMyResponse
   public ResponseVO getNwpDay(){
     return ResponseVO.success(nwpOneService.getNwpDay());
   }

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/NwpTwoController.java

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.BufferedOutputStream;
@@ -27,6 +28,7 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
+@ApiIgnore
 public class NwpTwoController {
   private final NwpTwoService nwpTwoService;
 

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/PowerStationStatusDataController.java

@@ -4,13 +4,19 @@ import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.PowerStationStatusData;
 import com.jiayue.ipfcst.common.data.entity.SysParameter;
 import com.jiayue.ipfcst.common.data.repository.SysParameterRepository;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.PowerStationStatusDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.BufferedOutputStream;
@@ -31,6 +37,7 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
+@Api(value = "PowerStationStatusDataController", tags = "光伏实际功率controller")
 public class PowerStationStatusDataController {
 
   private final PowerStationStatusDataService powerStationStatusDataService;
@@ -50,6 +57,14 @@ public class PowerStationStatusDataController {
    * @return 结果集
    */
   @GetMapping(value = "/powerStationStatus/{startTime}/{endTime}")
+  @ApiOperation(value = "根据开始时间和结束时间查询场站功率状态", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入map&ltString,Object&gt包括实际功率、可用功率、理论功率</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long")
+  })
+  @ApiMyResponse
   public ResponseVO findByTimeBetween(@PathVariable("startTime") Long startTime,
                                       @PathVariable("endTime") Long endTime) {
     Map<String, Object> map = new HashMap<>();
@@ -74,6 +89,18 @@ public class PowerStationStatusDataController {
    * @return
    */
   @GetMapping(value = "/powerStationStatus/{startTime}/{endTime}/{page}/{size}")
+  @ApiOperation(value = "分页查询实时nwp", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入map&ltString,Object&gt</p>" +
+      "<p>key：content => 实际功率集合</p>" +
+      "<p>key：count => 条数</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
+    @ApiImplicitParam(name= "size",value = "条数",dataType="Integer")
+  })
+  @ApiMyResponse
   public ResponseVO findByTimeBetweenForPaging(@PathVariable("startTime") Long startTime,
                                                @PathVariable("endTime") Long endTime,
                                                @PathVariable("page") Integer page,
@@ -88,8 +115,6 @@ public class PowerStationStatusDataController {
       log.error("场站功率状态分页查询错误");
       return ResponseVO.fail(e.toString());
     }
-
-
   }
 
   /**
@@ -100,6 +125,7 @@ public class PowerStationStatusDataController {
    * @return
    */
   @GetMapping(value = "/balkPower/{startTime}/{endTime}")
+  @ApiIgnore
   public ResponseVO findBalkPower(@PathVariable("startTime") Long startTime,
                                   @PathVariable("endTime") Long endTime) {
     try {
@@ -110,8 +136,6 @@ public class PowerStationStatusDataController {
       log.error("受阻电量查询错误");
       return ResponseVO.fail(e.toString());
     }
-
-
   }
 
 
@@ -123,10 +147,10 @@ public class PowerStationStatusDataController {
    * @return
    */
   @GetMapping(value = "export/powerStationStatus/{startTime}/{endTime}")
+  @ApiIgnore
   public ResponseVO export(@PathVariable("startTime") Long startTime,
                            @PathVariable("endTime") Long endTime,
                            HttpServletResponse response
-
   ) {
     BufferedOutputStream bos = null;
     try {
@@ -188,8 +212,6 @@ public class PowerStationStatusDataController {
         }
       }
     }
-
-
     return ResponseVO.success();
   }
 }

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/PowerStationStatusDataOneController.java

@@ -5,14 +5,20 @@ import com.jiayue.ipfcst.common.data.entity.PowerStationStatusData;
 import com.jiayue.ipfcst.common.data.entity.PowerStationStatusDataOne;
 import com.jiayue.ipfcst.common.data.entity.SysParameter;
 import com.jiayue.ipfcst.common.data.repository.SysParameterRepository;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.PowerStationStatusDataOneService;
 import com.jiayue.ipfcst.service.PowerStationStatusDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.BufferedOutputStream;
@@ -33,6 +39,7 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
+@Api(value = "PowerStationStatusDataController", tags = "风电实际功率controller")
 public class PowerStationStatusDataOneController {
 
   private final PowerStationStatusDataOneService powerStationStatusDataOneService;
@@ -52,6 +59,14 @@ public class PowerStationStatusDataOneController {
    * @return 结果集
    */
   @GetMapping(value = "/powerStationStatusOne/{startTime}/{endTime}")
+  @ApiOperation(value = "根据开始时间和结束时间查询场站功率状态", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入map&ltString,Object&gt包括实际功率、可用功率、理论功率</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long")
+  })
+  @ApiMyResponse
   public ResponseVO findByTimeBetween(@PathVariable("startTime") Long startTime,
                                       @PathVariable("endTime") Long endTime) {
     Map<String, Object> map = new HashMap<>();
@@ -76,6 +91,18 @@ public class PowerStationStatusDataOneController {
    * @return
    */
   @GetMapping(value = "/powerStationStatusOne/{startTime}/{endTime}/{page}/{size}")
+  @ApiOperation(value = "分页查询实时nwp", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入map&ltString,Object&gt</p>" +
+      "<p>key：content => 实际功率集合</p>" +
+      "<p>key：count => 条数</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
+    @ApiImplicitParam(name= "size",value = "条数",dataType="Integer")
+  })
+  @ApiMyResponse
   public ResponseVO findByTimeBetweenForPaging(@PathVariable("startTime") Long startTime,
                                                @PathVariable("endTime") Long endTime,
                                                @PathVariable("page") Integer page,
@@ -90,8 +117,6 @@ public class PowerStationStatusDataOneController {
       log.error("场站功率状态分页查询错误");
       return ResponseVO.fail(e.toString());
     }
-
-
   }
 
   /**
@@ -102,6 +127,7 @@ public class PowerStationStatusDataOneController {
    * @return
    */
   @GetMapping(value = "/balkPowerOne/{startTime}/{endTime}")
+  @ApiIgnore
   public ResponseVO findBalkPower(@PathVariable("startTime") Long startTime,
                                   @PathVariable("endTime") Long endTime) {
     try {
@@ -125,6 +151,7 @@ public class PowerStationStatusDataOneController {
    * @return
    */
   @GetMapping(value = "export/powerStationStatusOne/{startTime}/{endTime}")
+  @ApiIgnore
   public ResponseVO export(@PathVariable("startTime") Long startTime,
                            @PathVariable("endTime") Long endTime,
                            HttpServletResponse response
@@ -190,8 +217,6 @@ public class PowerStationStatusDataOneController {
         }
       }
     }
-
-
     return ResponseVO.success();
   }
 }

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/PrValueController.java

@@ -5,7 +5,12 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.PrValueService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,6 +37,7 @@ import java.util.Map;
 @RestController
 @Slf4j
 @RequestMapping("prValue")
+@Api(value = "PrValueController", tags = "pr值controller")
 public class PrValueController {
 
   private final PrValueService prValueService;
@@ -42,6 +48,14 @@ public class PrValueController {
   }
 
   @GetMapping("/findPrValueData/{startTime}/{endTime}")
+  @ApiOperation(value = "根据开始时间和结束时间查询场站功率状态", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入pr值日、月、年统计值</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long")
+  })
+  @ApiMyResponse
   public ResponseVO findPrValueData(@PathVariable Long startTime, @PathVariable Long endTime) {
     Map<String, Object> byRealTime = prValueService.getData(startTime, endTime);
     return ResponseVO.success(byRealTime);
@@ -53,6 +67,14 @@ public class PrValueController {
    * @param response
    */
   @RequestMapping(value = "/export")
+  @ApiOperation(value = "Pr值数据导出", httpMethod = "GET",
+    notes = "<p>返回字节流</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long")
+  })
+  @ApiMyResponse
   public void export(HttpServletResponse response, Long startTime, Long endTime) {
     try {
       Map<String, Object> maps = prValueService.getData(startTime, endTime);

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/ProtocolGatherDataPointController.java

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.*;
 
@@ -20,6 +21,7 @@ import java.util.*;
  */
 @RestController
 @Slf4j
+@ApiIgnore
 public class ProtocolGatherDataPointController {
 
   private final ProtocolGatherDataPointService protocolGatherDataPointService;

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/QrCodeController.java

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -24,6 +25,7 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
+@ApiIgnore
 public class QrCodeController {
   private final QrCodeService qrCodeService;
   @Autowired

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/RealTimeComprehensiveContrastController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 import sun.misc.BASE64Decoder;
 
 import javax.imageio.ImageIO;
@@ -34,6 +35,7 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
+@ApiIgnore
 public class RealTimeComprehensiveContrastController {
   private final PowerStationStatusDataService powerStationStatusDataService;
   private final WeatherStationStatusDataService weatherStationStatusDataService;

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/RealTimeComprehensiveContrastOneController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 import sun.misc.BASE64Decoder;
 
 import javax.imageio.ImageIO;
@@ -34,6 +35,7 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
+@ApiIgnore
 public class RealTimeComprehensiveContrastOneController {
   private final DisplayConfigService displayConfigService;
   private final RealTimeComprehensiveContrastOneService realTimeComprehensiveContrastOneService;

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/RealTimeComprehensiveContrastTwoController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 import sun.misc.BASE64Decoder;
 
 import javax.imageio.ImageIO;
@@ -34,6 +35,7 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
+@ApiIgnore
 public class RealTimeComprehensiveContrastTwoController {
   private final DisplayConfigService displayConfigService;
   private final RealTimeComprehensiveContrastTwoService realTimeComprehensiveContrastTwoService;

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/ReportVersionController.java

@@ -11,6 +11,7 @@ import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 /**
  * 统计查询系统版本
@@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("reportVersion")
 @Slf4j
 @PropertySource(value = {"classpath:META-INF\\build-info.properties"})
+@ApiIgnore
 public class ReportVersionController {
 
   @Autowired

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/ReportWindTowerStatusDataController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 import sun.misc.BASE64Decoder;
 
 import javax.imageio.ImageIO;
@@ -34,6 +35,7 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
+@ApiIgnore
 public class ReportWindTowerStatusDataController {
 
   private final ReportWindTowerStatusDataService reportWindTowerStatusDataService;

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/SysMenuController.java

@@ -7,8 +7,13 @@ import com.jiayue.ipfcst.common.data.entity.ChannelAlarmInfo;
 import com.jiayue.ipfcst.common.data.entity.ChannelDisconLog;
 import com.jiayue.ipfcst.common.data.entity.PowerLimitPlanSign;
 import com.jiayue.ipfcst.common.data.entity.SysMenu;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.DashboardService;
 import com.jiayue.ipfcst.service.SysMenuService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -24,6 +29,7 @@ import java.util.*;
 @RestController
 @Slf4j
 @RequestMapping(value = "sysMenu")
+@Api(value = "SysMenuController", tags = "系统菜单controller")
 public class SysMenuController {
   private final SysMenuService sysMenuService;
 
@@ -39,6 +45,14 @@ public class SysMenuController {
    */
 
   @GetMapping("/getMenufindByName/{user}/{url}")
+  @ApiOperation(value = "获取菜单信息", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入List&ltSysMenu&gt</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "user",value = "账号",dataType="String"),
+    @ApiImplicitParam(name= "url",value = "访问url",dataType="String")
+  })
+  @ApiMyResponse
   public ResponseVO getMenufindByName(@PathVariable("user") String user,@PathVariable("url") String url) {
 
     try {

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/UploadFileCountController.java

@@ -1,7 +1,12 @@
 package com.jiayue.ipfcst.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.UploadFileCountService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,6 +25,7 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
+@Api(value = "UploadFileCountController", tags = "上报统计controller")
 public class UploadFileCountController {
   private final UploadFileCountService uploadFileCountService;
   @Autowired
@@ -28,10 +34,15 @@ public class UploadFileCountController {
   }
 
   @GetMapping(value = "/uploadFileCount/{queryTime}")
+  @ApiOperation(value = "获取菜单信息", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入Map&ltString, Object&gt上报率计算</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "queryTime",value = "时间",dataType="Long")
+  })
+  @ApiMyResponse
   public ResponseVO getUploadFileRate(@PathVariable("queryTime")Long queryTime){
-
     try {
-
       Map<String, Object> map = uploadFileCountService.reportingRateCount(queryTime);
       return ResponseVO.success(map);
     }catch (Exception e){
@@ -39,8 +50,5 @@ public class UploadFileCountController {
       log.error("查询场站信息错误");
       return ResponseVO.fail(e.toString());
     }
-
   }
-
-
 }

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/WeatherStationInfoController.java

@@ -2,7 +2,12 @@ package com.jiayue.ipfcst.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.WeatherStationInfo;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.WeatherStationInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,6 +25,7 @@ import java.util.List;
  */
 @RestController
 @Slf4j
+@Api(value = "WeatherStationInfoController", tags = "气象站信息controller")
 public class WeatherStationInfoController {
 
   private final WeatherStationInfoService weatherStationInfoService;
@@ -34,6 +40,10 @@ public class WeatherStationInfoController {
    * @return 结果集
    */
   @GetMapping(value = "/weatherStationInfos")
+  @ApiOperation(value = "查询所有气象设备信息按ID排序", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入List&ltWeatherStationInfo&gt所有气象设备信息</p>"
+  )
+  @ApiMyResponse
   public ResponseVO findAllByOrderByIdAsc(){
     List<WeatherStationInfo> list = new ArrayList<>();
     try{
@@ -44,7 +54,5 @@ public class WeatherStationInfoController {
       log.error("气象设备查询错误");
       return ResponseVO.fail(e.toString());
     }
-
   }
-
 }

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/WeatherStationStatusDataController.java

@@ -2,7 +2,12 @@ package com.jiayue.ipfcst.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.WeatherStationStatusData;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.WeatherStationStatusDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -25,6 +30,7 @@ import java.util.*;
  */
 @RestController
 @Slf4j
+@Api(value = "WeatherStationStatusDataController", tags = "气象站数据controller")
 public class WeatherStationStatusDataController {
 
   private final WeatherStationStatusDataService weatherStationStatusDataService;
@@ -41,6 +47,15 @@ public class WeatherStationStatusDataController {
    * @return 结果集
    */
   @GetMapping(value = "/weatherStationStatusData/{startTime}/{endTime}/{no}")
+  @ApiOperation(value = "根据开始时间和结束时间查询气象站", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入Map&ltString, Object&gt气象站数据结果</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "no",value = "设备号",dataType="Integer")
+  })
+  @ApiMyResponse
   public ResponseVO findByTimeBetweenAndEquipmentNo(@PathVariable("startTime") Long startTime,
                                       @PathVariable("endTime") Long endTime,
                                       @PathVariable("no") Integer no){
@@ -57,7 +72,7 @@ public class WeatherStationStatusDataController {
   }
 
   /**
-   * 分页查询 场站功率状态
+   * 分页查询气象站列表数据
    * @param startTime 开始时间
    * @param endTime 结束时间
    * @param page 页码
@@ -66,6 +81,17 @@ public class WeatherStationStatusDataController {
    * @return
    */
   @GetMapping(value = "/weatherStationStatusData/{startTime}/{endTime}/{page}/{size}/{no}")
+  @ApiOperation(value = "分页查询气象站列表数据", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入Map&ltString, Object&gt气象站数据结果</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
+    @ApiImplicitParam(name= "size",value = "条数",dataType="Integer"),
+    @ApiImplicitParam(name= "no",value = "设备号",dataType="Integer"),
+  })
+  @ApiMyResponse
   public ResponseVO findByTimeBetweenForPaging(@PathVariable("startTime") Long startTime,
                                                @PathVariable("endTime") Long endTime,
                                                @PathVariable("page") Integer page,
@@ -84,6 +110,17 @@ public class WeatherStationStatusDataController {
   }
 
   @GetMapping(value = "/weatherStationStatusData/{startTime}/{endTime}/{no}/{jgTime}")
+  @ApiOperation(value = "按时间间隔查询气象站数据", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入Map&ltString, Object&gt气象站数据结果</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "no",value = "设备号",dataType="Integer"),
+    @ApiImplicitParam(name= "jgTime",value = "时间间隔",dataType="Long"),
+    @ApiImplicitParam(name= "sortOrder",value = "排序",dataType="String"),
+  })
+  @ApiMyResponse
   public ResponseVO findByTimeBetweenAndNoAndTimeStep(@PathVariable("startTime") Long startTime,
                                                @PathVariable("endTime") Long endTime,
                                                @PathVariable("no") Integer no,
@@ -107,6 +144,17 @@ public class WeatherStationStatusDataController {
    * @return
    */
   @GetMapping(value = "/weatherData/{startTime}/{endTime}/{no}/{dateType}/{dataType}")
+  @ApiOperation(value = "统计查询气象站数据", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入List&ltMap&ltString, Object&gt&gt气象站数据结果</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "no",value = "设备号",dataType="Integer"),
+    @ApiImplicitParam(name= "dateType",value = "日期类型",dataType="String"),
+    @ApiImplicitParam(name= "dataType",value = "数据类型",dataType="String"),
+  })
+  @ApiMyResponse
   public ResponseVO findWeatherData(@PathVariable("startTime") Long startTime,
                                                @PathVariable("endTime") Long endTime,
                                                @PathVariable("no") Integer no,
@@ -131,6 +179,17 @@ public class WeatherStationStatusDataController {
    * @return
    */
   @GetMapping(value = "export/weatherStationStatusData/{startTime}/{endTime}/{no}/{jgTime}")
+  @ApiOperation(value = "气象站数据表格导出", httpMethod = "GET",
+    notes = "<p>返回字节流</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "no",value = "设备号",dataType="Integer"),
+    @ApiImplicitParam(name= "jgTime",value = "时间间隔",dataType="Long"),
+    @ApiImplicitParam(name= "sortOrder",value = "排序",dataType="String"),
+  })
+  @ApiMyResponse
   public ResponseVO export(@PathVariable("startTime") Long startTime,
                            @PathVariable("endTime") Long endTime,
                            @PathVariable("no") Integer no,

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/WindTowerInfoController.java

@@ -2,7 +2,10 @@ package com.jiayue.ipfcst.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.WindTowerInfo;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.WindTowerInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,6 +23,7 @@ import java.util.List;
  */
 @RestController
 @Slf4j
+@Api(value = "WindTowerInfoController", tags = "测风塔信息controller")
 public class WindTowerInfoController {
 
   private final WindTowerInfoService windTowerInfoService;
@@ -34,6 +38,10 @@ public class WindTowerInfoController {
    * @return 结果集
    */
   @GetMapping(value = "/windTowerInfos")
+  @ApiOperation(value = "查询所有测风塔设备信息按ID排序", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入List&ltWindTowerInfo&gt所有测风塔设备信息</p>"
+  )
+  @ApiMyResponse
   public ResponseVO findAllByOrderByIdAsc(){
     List<WindTowerInfo> list = new ArrayList<>();
     try{

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/WindTowerStatusDataController.java

@@ -2,8 +2,13 @@ package com.jiayue.ipfcst.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.Nwp;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.EquipmentAttributeService;
 import com.jiayue.ipfcst.service.WindTowerStatusDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -26,6 +31,7 @@ import java.util.*;
  */
 @RestController
 @Slf4j
+@Api(value = "WindTowerStatusDataController", tags = "气象站数据controller")
 public class WindTowerStatusDataController {
 
   private final WindTowerStatusDataService windTowerStatusDataService;
@@ -48,6 +54,17 @@ public class WindTowerStatusDataController {
    * @return
    */
   @GetMapping(value = "/windTowerStatusData/{startTime}/{endTime}/{page}/{size}/{no}")
+  @ApiOperation(value = "分页查询测风塔数据", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入Map&ltString, Object&gt测风塔数据结果</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
+    @ApiImplicitParam(name= "size",value = "条数",dataType="Integer"),
+    @ApiImplicitParam(name= "no",value = "设备号",dataType="Integer"),
+  })
+  @ApiMyResponse
   public ResponseVO findByTimeBetweenForPaging(@PathVariable("startTime") Long startTime,
                                                @PathVariable("endTime") Long endTime,
                                                @PathVariable("page") Integer page,
@@ -74,6 +91,15 @@ public class WindTowerStatusDataController {
    * @return
    */
   @GetMapping(value = "/windTowerStatusData/{startTime}/{endTime}/{no}")
+  @ApiOperation(value = "时间查询测风塔数据", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入Map&ltString, Object&gt测风塔数据结果</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "no",value = "设备号",dataType="Integer")
+  })
+  @ApiMyResponse
   public ResponseVO queryCharts(@PathVariable("startTime") Long startTime,
                                 @PathVariable("endTime") Long endTime,
                                 @PathVariable("no") Integer no) {
@@ -90,6 +116,17 @@ public class WindTowerStatusDataController {
   }
 
   @GetMapping(value = "/windTowerStatusData/{startTime}/{endTime}/{no}/{jgTime}")
+  @ApiOperation(value = "按时间间隔查询测风塔数据", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入Map&ltString, Object&gt测风塔数据结果</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "no",value = "设备号",dataType="Integer"),
+    @ApiImplicitParam(name= "jgTime",value = "时间间隔",dataType="Long"),
+    @ApiImplicitParam(name= "sortOrder",value = "排序",dataType="String"),
+  })
+  @ApiMyResponse
   public ResponseVO findByTimeBetweenAndNoAndTimeStep(@PathVariable("startTime") Long startTime,
                                                       @PathVariable("endTime") Long endTime,
                                                       @PathVariable("no") Integer no,
@@ -118,6 +155,17 @@ public class WindTowerStatusDataController {
    * @return 数据集合
    */
   @GetMapping(value = "queryAnemometerSpeed/{startTime}/{endTime}/{no}/{dateType}/{dataType}")
+  @ApiOperation(value = "测风塔风速统计", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入List&ltMap&ltString, Object&gt&gt测风塔数据结果</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "no",value = "设备号",dataType="Integer"),
+    @ApiImplicitParam(name= "dateType",value = "日期类型",dataType="String"),
+    @ApiImplicitParam(name= "dataType",value = "数据类型",dataType="String"),
+  })
+  @ApiMyResponse
   public ResponseVO queryAnemometerSpeed(@PathVariable Long startTime,
                                          @PathVariable Long endTime,
                                          @PathVariable Integer no,
@@ -138,6 +186,17 @@ public class WindTowerStatusDataController {
    * @return
    */
   @GetMapping(value = "export/windTowerStatusData/{startTime}/{endTime}/{no}/{jgTime}")
+  @ApiOperation(value = "测风塔数据表格导出", httpMethod = "GET",
+    notes = "<p>返回字节流</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "no",value = "设备号",dataType="Integer"),
+    @ApiImplicitParam(name= "jgTime",value = "时间间隔",dataType="Long"),
+    @ApiImplicitParam(name= "sortOrder",value = "排序",dataType="String"),
+  })
+  @ApiMyResponse
   public ResponseVO export(@PathVariable("startTime") Long startTime,
                            @PathVariable("endTime") Long endTime,
                            @PathVariable("no") Integer no,

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/WindTurbineInfoController.java

@@ -2,7 +2,10 @@ package com.jiayue.ipfcst.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.WindTurbineInfo;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.WindTurbineInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,6 +23,7 @@ import java.util.List;
  */
 @RestController
 @Slf4j
+@Api(value = "WindTurbineInfoController", tags = "风机信息controller")
 public class WindTurbineInfoController {
 
   private final WindTurbineInfoService windTurbineInfoService;
@@ -34,6 +38,10 @@ public class WindTurbineInfoController {
    * @return 结果集
    */
   @GetMapping(value = "/windTurbineInfos")
+  @ApiOperation(value = "查询所有风机设备信息按ID排序", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入List&ltWindTurbineInfo&gt</p>"
+  )
+  @ApiMyResponse
   public ResponseVO findAllByOrderByIdAsc(){
     List<WindTurbineInfo> list = new ArrayList<>();
     try{

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/WindTurbineStatusDataController.java

@@ -2,8 +2,13 @@ package com.jiayue.ipfcst.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.*;
+import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.service.WindTurbineInfoService;
 import com.jiayue.ipfcst.service.WindTurbineStatusDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +26,7 @@ import java.util.stream.Collectors;
 
 @RestController
 @Slf4j
+@Api(value = "WindTurbineStatusDataController", tags = "风机数据controller")
 public class WindTurbineStatusDataController {
 
   private final WindTurbineStatusDataService windTurbineStatusDataService;
@@ -43,6 +49,20 @@ public class WindTurbineStatusDataController {
    * @return
    */
   @GetMapping(value = "/windTurbineStatusData/{startTime}/{endTime}/{page}/{size}")
+  @ApiOperation(value = "分页查询所有风机功率状态", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入map&ltString,Object&gt</p>" +
+      "<p>key：content,value: List&ltWindTurbineStatusData&gt</p>" +
+      "<p>key：count,value:条数</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
+    @ApiImplicitParam(name= "size",value = "条数",dataType="Integer"),
+    @ApiImplicitParam(name= "timeSortOrder",value = "时间排序",dataType="String"),
+    @ApiImplicitParam(name= "noSortOrder",value = "设备编号排序",dataType="String"),
+  })
+  @ApiMyResponse
   public ResponseVO findByTimeBetweenForPaging(@PathVariable("startTime") Long startTime,
                                                @PathVariable("endTime") Long endTime,
                                                @PathVariable("page") Integer page,
@@ -68,6 +88,21 @@ public class WindTurbineStatusDataController {
    * @return
    */
   @GetMapping(value = "/windTurbineStatusData/{startTime}/{endTime}/{page}/{size}/{no}")
+  @ApiOperation(value = "分页查询按设备编号查询风机状态", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象，data属性存入map&ltString,Object&gt</p>" +
+      "<p>key：content,value: List&ltWindTurbineStatusData&gt</p>" +
+      "<p>key：count,value:条数</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
+    @ApiImplicitParam(name= "size",value = "条数",dataType="Integer"),
+    @ApiImplicitParam(name= "no",value = "设备编号",dataType="Integer"),
+    @ApiImplicitParam(name= "timeSortOrder",value = "时间排序",dataType="String"),
+    @ApiImplicitParam(name= "noSortOrder",value = "设备编号排序",dataType="String"),
+  })
+  @ApiMyResponse
   public ResponseVO findByTimeBetweenForPaging(@PathVariable("startTime") Long startTime,
                                                @PathVariable("endTime") Long endTime,
                                                @PathVariable("page") Integer page,
@@ -88,6 +123,15 @@ public class WindTurbineStatusDataController {
 
 
   @GetMapping(value = "/export/windTurbineStatusData/{startTime}/{endTime}/{no}")
+  @ApiOperation(value = "按设备编号导出风机状态", httpMethod = "GET",
+    notes = "<p>返回application/x-msdownload字节流</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
+    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
+    @ApiImplicitParam(name= "no",value = "设备编号",dataType="Integer")
+  })
+  @ApiMyResponse
   public ResponseVO findByTimeBetweenAndNoIn(@PathVariable("startTime") Long startTime,
                                              @PathVariable("endTime") Long endTime,
                                              @PathVariable("no") Integer[] no,

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/service/NwpService.java

@@ -54,10 +54,6 @@ public class NwpService extends BaseService {
    */
   @Transactional(propagation = Propagation.NOT_SUPPORTED, readOnly = true)
   public Map<String,Object> findByForecastTimeBetween(Long startTime, Long endTime) throws BusinessException {
-
-
-
-
     Map<String,Object> map = new HashMap<>();
     List<Nwp> list = new ArrayList<>();
     List<Nwp> checkList = new ArrayList<>();