去除swagger注释

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

@@ -1,94 +0,0 @@
-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 createDataExchangeApi() {
-        return new Docket(DocumentationType.SWAGGER_2)
-                .groupName("dataexchange")
-                .apiInfo(dataexchangeInfo())
-                .select()
-                .apis(RequestHandlerSelectors.basePackage("com.jiayue.ipfcst.dataexchange.controller"))
-                .paths(PathSelectors.any())
-                .build();
-    }
-    @Bean
-    public Docket createfileuploadApi() {
-        return new Docket(DocumentationType.SWAGGER_2)
-                .groupName("fileupload")
-                .apiInfo(fileuploadInfo())
-                .select()
-                .apis(RequestHandlerSelectors.basePackage("com.jiayue.ipfcst.fileupload.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 dataexchangeInfo() {
-        return new ApiInfoBuilder()
-                .title("功率预测系统")
-                .description("dataexchange接口详细信息......")
-                //服务条款网址
-                .version("3.0")
-                .build();
-    }
-    private ApiInfo fileuploadInfo() {
-        return new ApiInfoBuilder()
-                .title("功率预测系统")
-                .description("fileupload接口详细信息......")
-                //服务条款网址
-                .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,8 +77,6 @@ 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

@@ -3,9 +3,7 @@ package com.jiayue.ipfcst.console.controller;
 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.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.console.service.AGC_AVCInfoService;
-import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -19,7 +17,6 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("agcAvcInfo")
 @Slf4j
-@Api(value = "AGC_AVCInfoController", tags = "AGC_AVC信息controller")
 public class AGC_AVCInfoController {
   final AGC_AVCInfoService agcAvcInfoService;
 
@@ -32,10 +29,6 @@ public class AGC_AVCInfoController {
   * 查询
   * */
   @GetMapping
-  @ApiOperation(value = "查询", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltAGC_AVCInfo&gt</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getALL() {
     return ResponseVO.success(agcAvcInfoService.getAll());
   }
@@ -44,13 +37,6 @@ public class AGC_AVCInfoController {
   * 保存
   * */
   @PostMapping
-  @ApiOperation(value = "保存", httpMethod = "POST",
-    notes = "<p>返回ResponseVO对象，data属性存入AGC_AVCInfo实体</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "agc_avcInfo",value = "AGC_AVCInfo实体",dataType="AGC_AVCInfo")
-  })
-  @ApiMyResponse
   public ResponseVO save(@RequestBody AGC_AVCInfo agc_avcInfo){
     agcAvcInfoService.save(agc_avcInfo);
     return ResponseVO.success(1);
@@ -60,13 +46,6 @@ public class AGC_AVCInfoController {
   * 更新
   * */
   @PutMapping
-  @ApiOperation(value = "更新", httpMethod = "PUT",
-    notes = "<p>返回ResponseVO对象，data属性存入AGC_AVCInfo实体</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "agc_avcInfo",value = "AGC_AVCInfo实体",dataType="AGC_AVCInfo")
-  })
-  @ApiMyResponse
   public ResponseVO update(@RequestBody AGC_AVCInfo agc_avcInfo){
     agcAvcInfoService.save(agc_avcInfo);
     return ResponseVO.success(1);
@@ -76,13 +55,6 @@ public class AGC_AVCInfoController {
   * 删除
   * */
   @DeleteMapping("/{id}")
-  @ApiOperation(value = "删除", httpMethod = "DELETE",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "id",value = "主键ID",dataType="String")
-  })
-  @ApiMyResponse
   public ResponseVO delete(@PathVariable String id) throws BusinessException {
     agcAvcInfoService.delete(Integer.parseInt(id));
     return ResponseVO.success(1);

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

@@ -3,12 +3,7 @@ package com.jiayue.ipfcst.console.controller;
 import com.jiayue.ipfcst.common.core.exception.BusinessException;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.BoosterStationInfo;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.console.service.BoosterStationInfoService;
-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.*;
@@ -22,7 +17,6 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("boosterStationInfo")
 @Slf4j
-@Api(value = "BoosterStationInfoController", tags = "升压站信息controller")
 public class BoosterStationInfoController {
   final BoosterStationInfoService boosterStationInfoService;
   @Autowired
@@ -35,10 +29,6 @@ public class BoosterStationInfoController {
   * 查询
   * */
   @GetMapping
-  @ApiOperation(value = "查询", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltBoosterStationInfo&gt</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getAll(){
     return ResponseVO.success(boosterStationInfoService.getAll());
   }
@@ -47,13 +37,6 @@ public class BoosterStationInfoController {
   * 保存
   * */
   @PostMapping
-  @ApiOperation(value = "保存", httpMethod = "POST",
-    notes = "<p>返回ResponseVO对象，data属性存入BoosterStationInfo实体</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "boosterStationInfo",value = "BoosterStationInfo实体",dataType="BoosterStationInfo")
-  })
-  @ApiMyResponse
   public ResponseVO save(@RequestBody BoosterStationInfo boosterStationInfo){
     boosterStationInfoService.save(boosterStationInfo);
     return ResponseVO.success(1);
@@ -63,13 +46,6 @@ public class BoosterStationInfoController {
   * 更新
   * */
   @PutMapping
-  @ApiOperation(value = "更新", httpMethod = "PUT",
-    notes = "<p>返回ResponseVO对象，data属性存入BoosterStationInfo实体</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "boosterStationInfo",value = "BoosterStationInfo实体",dataType="BoosterStationInfo")
-  })
-  @ApiMyResponse
   public ResponseVO update(@RequestBody BoosterStationInfo boosterStationInfo){
     boosterStationInfoService.save(boosterStationInfo);
     return ResponseVO.success(1);
@@ -79,13 +55,6 @@ public class BoosterStationInfoController {
   * 删除
   * */
   @DeleteMapping("/{id}")
-  @ApiOperation(value = "删除", httpMethod = "DELETE",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "id",value = "主键ID",dataType="String")
-  })
-  @ApiMyResponse
   public ResponseVO delete(@PathVariable String id) throws BusinessException {
     boosterStationInfoService.delete(Integer.parseInt(id));
     return ResponseVO.success(1);

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

@@ -9,7 +9,6 @@ import com.jiayue.ipfcst.common.data.abst.equipmentinfo.AbstractEquipmentInfo;
 import com.jiayue.ipfcst.common.data.constant.enums.ElectricFieldStatrsEnum;
 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.console.service.*;
 import com.jiayue.ipfcst.dataexchange.service.ProtocolGatherDataPointService;
 import com.jiayue.ipfcst.dataexchange.service.ProtocolSenderDataPointService;
@@ -17,10 +16,6 @@ import com.jiayue.ipfcst.dataexchange.service.TunnelInfoService;
 import com.jiayue.ipfcst.dataexchange.service.equipmentstatusdata.EquipmentInfoService;
 import com.jiayue.ipfcst.fileupload.service.UploadFileChannelService;
 import com.jiayue.ipfcst.fileupload.service.UploadObjectService;
-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.*;
@@ -31,7 +26,6 @@ import java.io.IOException;
 import java.net.URLEncoder;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -43,7 +37,6 @@ import java.util.List;
 @RestController
 @RequestMapping("communicationEquipment")
 @Slf4j
-@Api(value = "CommunicationEquipmentController", tags = "通信设备controller")
 public class CommunicationEquipmentController {
   @Autowired CommunicationEquipmentService communicationEquipmentService;
   @Autowired InverterInfoService inverterInfoService;
@@ -61,10 +54,6 @@ public class CommunicationEquipmentController {
    * 查询所有通信设备
    */
   @GetMapping()
-  @ApiOperation(value = "查询所有通信设备", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltCommunicationEquipment&gt</p>"
-  )
-  @ApiMyResponse
   public ResponseVO get(){
     try {
       return ResponseVO.success(communicationEquipmentService.get());
@@ -77,13 +66,6 @@ public class CommunicationEquipmentController {
    * 添加通信设备
    */
   @PostMapping()
-  @ApiOperation(value = "保存", httpMethod = "POST",
-    notes = "<p>返回ResponseVO对象，data属性存入CommunicationEquipment实体</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "communicationEquipment",value = "CommunicationEquipment实体",dataType="CommunicationEquipment")
-  })
-  @ApiMyResponse
   public ResponseVO save(@RequestBody CommunicationEquipment communicationEquipment){
     try {
       return ResponseVO.success(communicationEquipmentService.save(communicationEquipment));
@@ -93,13 +75,6 @@ public class CommunicationEquipmentController {
     }
   }
   @PutMapping()
-  @ApiOperation(value = "更新", httpMethod = "PUT",
-    notes = "<p>返回ResponseVO对象，data属性存入CommunicationEquipment实体</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "communicationEquipment",value = "CommunicationEquipment实体",dataType="CommunicationEquipment")
-  })
-  @ApiMyResponse
   public ResponseVO putCommEq(@RequestBody CommunicationEquipment communicationEquipment){
     try {
       return ResponseVO.success(communicationEquipmentService.save(communicationEquipment));
@@ -109,13 +84,6 @@ public class CommunicationEquipmentController {
     }
   }
   @DeleteMapping("/{id}")
-  @ApiOperation(value = "删除", httpMethod = "DELETE",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "id",value = "主键ID",dataType="Integer")
-  })
-  @ApiMyResponse
   public ResponseVO deleteCommEq(@PathVariable Integer id){
     try {
       communicationEquipmentService.delete(id);
@@ -127,10 +95,6 @@ public class CommunicationEquipmentController {
   }
 
   @RequestMapping("/export")
-  @ApiOperation(value = "导出", httpMethod = "GET",
-    notes = "<p>返回字节流</p>"
-  )
-  @ApiMyResponse
   public void export(HttpServletResponse response) {
     try {
       ElectricField electricField = electricFieldService.get();

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

@@ -3,14 +3,11 @@ package com.jiayue.ipfcst.console.controller;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.HolidayCalendar;
 import com.jiayue.ipfcst.common.data.entity.OverhaulPlan;
-import com.jiayue.ipfcst.common.data.entity.WeatherStationInfo;
 import com.jiayue.ipfcst.console.service.*;
-import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 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;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -23,7 +20,6 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("consoleDsb")
-@ApiIgnore
 public class ConsoleDsbController {
 
   private final WindTowerInfoService windTowerInfoService;

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

@@ -1,11 +1,8 @@
 package com.jiayue.ipfcst.console.controller;
 
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.dataexchange.container.ProtocolTunnelContainer;
 import com.jiayue.ipfcst.dataexchange.service.FileParseTunnelService;
 import com.jiayue.ipfcst.fileupload.util.FileConstant;
-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.RequestMapping;
@@ -23,7 +20,6 @@ import java.util.Map;
 @RestController
 @RequestMapping("consoleOpenInterface")
 @Slf4j
-@Api(value = "ConsoleOpenInterfaceController", tags = "给reportquery应用提供接口controller")
 public class ConsoleOpenInterfaceController {
   @Autowired
   FileParseTunnelService fileParseTunnelService;
@@ -34,14 +30,6 @@ public class ConsoleOpenInterfaceController {
    * @return
    */
   @RequestMapping(value = "/getChannelStatus")
-  @ApiOperation(value = "首页通道状态接口", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入Map</p>"+
-      "<p>dataexchangeMap：接入通道状态</p>"+
-      "<p>callBackMap：回传通道状态</p>"+
-      "<p>analysisMap：解析通道状态</p>"+
-      "<p>uploadFileMap：上报文件通道状态</p>"
-  )
-  @ApiMyResponse
   public Map getChannelStatus() {
     Map channelMap = new HashMap<>();
 

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

@@ -10,7 +10,6 @@ import org.springframework.context.annotation.PropertySource;
 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;
 
 /**
  * ConsoleVersionController
@@ -23,7 +22,6 @@ import springfox.documentation.annotations.ApiIgnore;
 @RequestMapping("consoleVersion")
 @Slf4j
 @PropertySource(value = {"classpath:META-INF\\build-info.properties"})
-@ApiIgnore
 public class ConsoleVersionController {
 
 	@Autowired

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

@@ -2,12 +2,10 @@ package com.jiayue.ipfcst.console.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.DataLimitation;
-import com.jiayue.ipfcst.common.data.entity.ManualInterventionData;
 import com.jiayue.ipfcst.console.service.DataLimitationService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -16,7 +14,6 @@ import java.util.Map;
 @RestController
 @RequestMapping("/dataLimitationController/")
 @Slf4j
-@ApiIgnore
 public class DataLimitationController {
   @Autowired
   private DataLimitationService dataLimitationService;

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

@@ -1,18 +1,14 @@
 package com.jiayue.ipfcst.console.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
-import com.jiayue.ipfcst.common.data.entity.DataLimitation;
 import com.jiayue.ipfcst.common.data.entity.DataLimitationLog;
-import com.jiayue.ipfcst.common.data.entity.ManualInterventionLog;
 import com.jiayue.ipfcst.console.service.DataLimitationLogService;
-import com.jiayue.ipfcst.console.service.DataLimitationService;
 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.List;
@@ -20,7 +16,6 @@ import java.util.List;
 @RestController
 @RequestMapping("/dataLimitationLogController/")
 @Slf4j
-@ApiIgnore
 public class DataLimitationLogController {
   @Autowired
   private DataLimitationLogService dataLimitationLogService;

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

@@ -14,7 +14,6 @@ import com.jiayue.ipfcst.common.data.entity.sendertunnelinfo.Sender104TcpTunnelI
 import com.jiayue.ipfcst.common.data.entity.sendertunnelinfo.SenderCdtRtuTunnelInfo;
 import com.jiayue.ipfcst.common.data.entity.sendertunnelinfo.SenderModbusRtuTunnelInfo;
 import com.jiayue.ipfcst.common.data.entity.sendertunnelinfo.SenderModbusTcpTunnelInfo;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.console.service.*;
 import com.jiayue.ipfcst.dataexchange.service.EquipmentAttributeService;
 import com.jiayue.ipfcst.dataexchange.service.ProtocolGatherDataPointService;
@@ -24,15 +23,10 @@ import com.jiayue.ipfcst.fileupload.service.UploadFileChannelService;
 import com.jiayue.ipfcst.fileupload.service.UploadFileCodeService;
 import com.jiayue.ipfcst.fileupload.service.UploadObjectService;
 import com.jiayue.ipfcst.fileupload.service.UploadURLService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import lombok.SneakyThrows;
 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.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -54,7 +48,6 @@ import java.util.Map;
 @RestController
 @RequestMapping("/electricField")
 @Slf4j
-@Api(value = "ElectricFieldController", tags = "场站信息controller")
 public class ElectricFieldController {
 
     @Autowired
@@ -128,13 +121,6 @@ public class ElectricFieldController {
      */
     @PostMapping(value = "/")
     @SaveValidate
-    @ApiOperation(value = "新增场站信息", httpMethod = "POST",
-      notes = "<p>返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "electricField",value = "ElectricField实体",dataType="ElectricField")
-    })
-    @ApiMyResponse
     public ResponseVO saveElectricField(@RequestBody ElectricField electricField) {
         try {
             electricFieldService.update(electricField);
@@ -156,13 +142,6 @@ public class ElectricFieldController {
      */
     @PutMapping(value = "/")
     @SaveValidate
-    @ApiOperation(value = "更新场站信息", httpMethod = "PUT",
-      notes = "<p>返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "electricField",value = "ElectricField实体",dataType="ElectricField")
-    })
-    @ApiMyResponse
     public ResponseVO updateElectricField(@RequestBody ElectricField electricField) {
         try {
             this.electricFieldService.update(electricField);
@@ -182,10 +161,6 @@ public class ElectricFieldController {
      */
 
     @GetMapping(value = "/")
-    @ApiOperation(value = "查询", httpMethod = "GET",
-      notes = "<p>返回ResponseVO对象，data属性存入ElectricField</p>"
-    )
-    @ApiMyResponse
     public ResponseVO getElectricField() {
         try {
             ElectricField electricField = this.electricFieldService.get();
@@ -201,7 +176,6 @@ public class ElectricFieldController {
 
     @DeleteMapping(value = "/{stationCode}")
     @SaveValidate
-    @ApiIgnore
     public ResponseVO deleteElectricField(@PathVariable String stationCode) {
         try {
             electricFieldService.delete(stationCode);
@@ -224,10 +198,6 @@ public class ElectricFieldController {
      * @Date: 2020/3/3 14:08
      */
     @GetMapping(value = "/getProvince")
-    @ApiOperation(value = "获取省份", httpMethod = "GET",
-      notes = "<p>返回ResponseVO对象，data属性存入ProvinceEnum枚举</p>"
-    )
-    @ApiMyResponse
     public ResponseVO getProvince() {
         List<Map<String, Object>> provinceType = new ArrayList<>();
         Map<String, Object> map;
@@ -259,10 +229,6 @@ public class ElectricFieldController {
      * @Date: 2020/3/3 14:08
      */
     @GetMapping(value = "/getElType")
-    @ApiOperation(value = "获取场站类型", httpMethod = "GET",
-      notes = "<p>返回ResponseVO对象，data属性存入ElectricFieldTypeEnum枚举</p>"
-    )
-    @ApiMyResponse
     public ResponseVO getElType() {
         List<Map<String, Object>> elType = new ArrayList<>();
         Map<String, Object> map;
@@ -289,10 +255,6 @@ public class ElectricFieldController {
      * @return
      */
     @GetMapping(value = "/getEquipmentType")
-    @ApiOperation(value = "获取设备类型", httpMethod = "GET",
-      notes = "<p>返回ResponseVO对象，data属性存入EquipmentTypeEnum枚举</p>"
-    )
-    @ApiMyResponse
     public ResponseVO getEquipmentType() {
         List<Map<String, Object>> equipmentType = new ArrayList<>();
         Map<String, Object> map;
@@ -315,7 +277,6 @@ public class ElectricFieldController {
 
 
     @GetMapping(value = "/getElectricFieldStatrsEnum")
-    @ApiIgnore
     public ResponseVO getElectricFieldStatrsEnum() {
         List<Map<String, Object>> list = new ArrayList<>();
         Map<String, Object> map;
@@ -337,7 +298,6 @@ public class ElectricFieldController {
     }
 
     @PostMapping(value = "/dataDownload")
-    @ApiIgnore
     public void dataDownload(HttpServletRequest request,
                              HttpServletResponse response) {
         BufferedOutputStream bos = null;
@@ -389,10 +349,6 @@ public class ElectricFieldController {
    * @return
    */
     @SneakyThrows
-    @ApiOperation(value = "获取所有配置信息", httpMethod = "GET",
-      notes = "<p>返回ResponseVO对象，data属性存入List&ltString&gt</p>"
-    )
-    @ApiMyResponse
   private List<String> queryAllParamsFromDb(ElectricField electricField) {
       String header = electricField.getStationCode();
       List<String> valList = new ArrayList<>();
@@ -689,10 +645,6 @@ public class ElectricFieldController {
 
 
   @RequestMapping(value = "/export")
-  @ApiOperation(value = "导出场站信息", httpMethod = "GET",
-    notes = "<p>返回字节流</p>"
-  )
-  @ApiMyResponse
     public void export(HttpServletResponse response) {
         BufferedOutputStream bos = null;
         try {

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

@@ -2,12 +2,7 @@ package com.jiayue.ipfcst.console.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.FileAnalysisRecord;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.console.service.FileAnalysisRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -17,19 +12,11 @@ import java.util.Date;
 import java.util.List;
 
 @RestController
-@Api(value = "FileAnalysisRecordController", tags = "解析记录controller")
 public class FileAnalysisRecordController {
   @Autowired
   FileAnalysisRecordService fileAnalysisRecordService;
 
   @GetMapping("/FileAnalysisRecord/{startTime}")
-  @ApiOperation(value = "根据日期查询解析记录", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltFileAnalysisRecord&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "startTime",value = "时间",dataType="Long")
-  })
-  @ApiMyResponse
   public ResponseVO findByCreateTimeBetween(@PathVariable Long startTime) {
     List<FileAnalysisRecord> fileAnalysisRecords = fileAnalysisRecordService.findByCreateTimeBetween(new Date(startTime), new Date(startTime + 86400000l));
     return ResponseVO.success(fileAnalysisRecords);

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

@@ -3,12 +3,7 @@ package com.jiayue.ipfcst.console.controller;
 import com.jiayue.ipfcst.aop.SaveValidate;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.HolidayCalendar;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.console.service.HolidayCalendarService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +22,6 @@ import java.util.List;
 @RestController
 @RequestMapping(value = "holidayCalendar")
 @Slf4j
-@Api(value = "HolidayCalendarController", tags = "假期日历controller")
 public class HolidayCalendarController {
   private final HolidayCalendarService holidayCalendarService;
 
@@ -44,13 +38,6 @@ public class HolidayCalendarController {
   @SneakyThrows
   @PostMapping()
   @SaveValidate
-  @ApiOperation(value = "新增假日日历", httpMethod = "POST",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "holidayCalendar",value = "HolidayCalendar实体",dataType="HolidayCalendar")
-  })
-  @ApiMyResponse
   public ResponseVO add(@RequestBody
                           final HolidayCalendar holidayCalendar) {
     this.holidayCalendarService.save(holidayCalendar);
@@ -65,13 +52,6 @@ public class HolidayCalendarController {
   @SneakyThrows
   @PutMapping()
   @SaveValidate
-  @ApiOperation(value = "修改假期日历", httpMethod = "PUT",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "holidayCalendar",value = "HolidayCalendar实体",dataType="HolidayCalendar")
-  })
-  @ApiMyResponse
   public ResponseVO update(@RequestBody
                              HolidayCalendar holidayCalendar) {
     this.holidayCalendarService.update(holidayCalendar);
@@ -86,13 +66,6 @@ public class HolidayCalendarController {
   @SneakyThrows
   @DeleteMapping()
   @SaveValidate
-  @ApiOperation(value = "删除假期日历", httpMethod = "DELETE",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "holidayCalendar",value = "HolidayCalendar实体",dataType="HolidayCalendar")
-  })
-  @ApiMyResponse
   public ResponseVO delete(@RequestBody
                              HolidayCalendar holidayCalendar) {
     this.holidayCalendarService.delete(holidayCalendar.getId());
@@ -108,14 +81,6 @@ public class HolidayCalendarController {
    */
   @SneakyThrows
   @GetMapping(value = "/{page}/{size}")
-  @ApiOperation(value = "分页获取假期日历", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入Page&ltHolidayCalendar&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
-    @ApiImplicitParam(name= "size",value = "条数",dataType="Integer")
-  })
-  @ApiMyResponse
   public ResponseVO get(@PathVariable("page") Integer page, @PathVariable("size") Integer size) {
     HolidayCalendar holidayCalendar = new HolidayCalendar();
     Page<HolidayCalendar> holidayCalendarPage = this.holidayCalendarService.get(holidayCalendar, page, size);
@@ -129,10 +94,6 @@ public class HolidayCalendarController {
    */
   @SneakyThrows
   @GetMapping()
-  @ApiOperation(value = "获取所有假期日历信息", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入Page&ltHolidayCalendar&gt</p>"
-  )
-  @ApiMyResponse
   public ResponseVO get() {
     List<HolidayCalendar> list = this.holidayCalendarService.getAll();
     return ResponseVO.success(list);

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

@@ -8,9 +8,7 @@ import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
 
-import java.sql.SQLException;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
@@ -24,7 +22,6 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
-@ApiIgnore
 public class InitJobClassController {
 
     @Autowired

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

@@ -3,18 +3,14 @@ package com.jiayue.ipfcst.console.controller;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.console.service.InspectionReportService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 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 javax.transaction.Transactional;
 import java.util.List;
 import java.util.Map;
 
 @RestController
-@ApiIgnore
 public class InspectionReportController {
   @Autowired
   InspectionReportService inspectionReportService;

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

@@ -2,14 +2,8 @@ package com.jiayue.ipfcst.console.controller;
 
 import com.jiayue.ipfcst.aop.SaveValidate;
 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.InverterInfo;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.console.service.InverterInfoService;
-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.data.domain.Page;
@@ -26,7 +20,6 @@ import java.util.List;
  */
 @RestController
 @Slf4j
-@Api(value = "InverterInfoController", tags = "逆变器信息controller")
 public class InverterInfoController {
 
     private final InverterInfoService inverterInfoService;
@@ -42,15 +35,6 @@ public class InverterInfoController {
      * @return 执行结果
      */
     @GetMapping(value = {"inverterInfo/{page}/{size}/{sample}", "inverterInfo/{page}/{size}"})
-    @ApiOperation(value = "分页获取逆变器", httpMethod = "GET",
-      notes = "<p>返回ResponseVO对象，data属性存入Page&ltInverterInfo&gt</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
-      @ApiImplicitParam(name= "size",value = "条数",dataType="Integer"),
-      @ApiImplicitParam(name= "sample",value = "样板",dataType="Boolean"),
-    })
-    @ApiMyResponse
     public ResponseVO getPageAll(@PathVariable("page") Integer page,
                              @PathVariable("size") Integer size,
                              @PathVariable(value = "sample", required = false) Boolean sample) {
@@ -65,10 +49,6 @@ public class InverterInfoController {
      * @return 执行结果
      */
     @GetMapping(value = {"inverterInfo"})
-    @ApiOperation(value = "查询所有逆变器", httpMethod = "GET",
-      notes = "<p>返回ResponseVO对象，data属性存入List&ltInverterInfo&gt</p>"
-    )
-    @ApiMyResponse
     public ResponseVO getAll() {
       List<InverterInfo> list = this.inverterInfoService.getAll();
       return ResponseVO.success(list);
@@ -82,13 +62,6 @@ public class InverterInfoController {
      */
     @SaveValidate
     @PostMapping(value = "inverterInfo/")
-    @ApiOperation(value = "保存逆变器信息", httpMethod = "POST",
-      notes = "<p>返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "inverterInfo",value = "InverterInfo实体",dataType="InverterInfo")
-    })
-    @ApiMyResponse
     public ResponseVO saveInverter(@RequestBody InverterInfo inverterInfo) {
         try {
             inverterInfoService.save(inverterInfo);
@@ -109,15 +82,6 @@ public class InverterInfoController {
      */
     @SaveValidate
     @PostMapping(value = "inverterInfo/saveAll/{startValue}/{endValue}")
-    @ApiOperation(value = "批量保存逆变器信息", httpMethod = "POST",
-      notes = "<p>返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "inverterInfo",value = "InverterInfo实体",dataType="InverterInfo"),
-      @ApiImplicitParam(name= "startValue",value = "起始值",dataType="InverterInfo"),
-      @ApiImplicitParam(name= "endValue",value = "结束值",dataType="InverterInfo"),
-    })
-    @ApiMyResponse
     public ResponseVO allSaveInverter(@RequestBody InverterInfo inverterInfo,@PathVariable("startValue") Integer startValue,@PathVariable("endValue") Integer endValue) {
         try {
           inverterInfoService.addALL(inverterInfo,startValue,endValue);
@@ -138,13 +102,6 @@ public class InverterInfoController {
      */
     @SaveValidate
     @PutMapping(value = "inverterInfo/")
-    @ApiOperation(value = "更新逆变器信息", httpMethod = "PUT",
-      notes = "<p>返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "inverterInfo",value = "InverterInfo实体",dataType="InverterInfo"),
-    })
-    @ApiMyResponse
     public ResponseVO updateInverter(@RequestBody InverterInfo inverterInfo) {
         try {
             inverterInfoService.save(inverterInfo);
@@ -166,13 +123,6 @@ public class InverterInfoController {
      */
     @SaveValidate
     @DeleteMapping(value = "inverterInfo/{ids}")
-    @ApiOperation(value = "删除逆变器信息", httpMethod = "DELETE",
-      notes = "<p>返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "ids",value = "主键ID",dataType="String"),
-    })
-    @ApiMyResponse
     public ResponseVO deleteInverter(@PathVariable("ids") String ids) {
         try {
             inverterInfoService.delete(ids);

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

@@ -6,7 +6,6 @@ import com.jiayue.ipfcst.common.data.entity.ManualInterventionData;
 import com.jiayue.ipfcst.console.service.ManualInterventionService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,7 +21,6 @@ import java.util.Map;
 @RestController
 @RequestMapping("/manualInterventionController/")
 @Slf4j
-@ApiIgnore
 public class ManualInterventionController {
     private final ManualInterventionService manualInterventionService;
 

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

@@ -1,20 +1,15 @@
 package com.jiayue.ipfcst.console.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
-import com.jiayue.ipfcst.common.data.entity.ForecastPowerShortTerm;
 import com.jiayue.ipfcst.common.data.entity.ManualInterventionLog;
 import com.jiayue.ipfcst.console.service.ForecastPowerShortTermService;
 import com.jiayue.ipfcst.console.service.ManualInterventionLogService;
 import com.jiayue.ipfcst.console.util.ForecastPowerAndManualIntervention;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 人工干预数据控制类
@@ -26,7 +21,6 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/manualInterventionLogController/")
 @Slf4j
-@ApiIgnore
 class ManualInterventionLogController {
   private final ManualInterventionLogService manualInterventionLogService;
 

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

@@ -1,13 +1,11 @@
 package com.jiayue.ipfcst.console.controller;
 
 
-import com.jiayue.ipfcst.aop.SaveValidate;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.ManualInterventionRatioData;
 import com.jiayue.ipfcst.console.service.ManualInterventionRatioService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,7 +20,6 @@ import java.util.List;
 @RestController
 @RequestMapping("/manualInterventionRatioController/")
 @Slf4j
-@ApiIgnore
 public class ManualInterventionRatioController {
     private final ManualInterventionRatioService manualInterventionRatioService;
 

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

@@ -3,17 +3,11 @@ package com.jiayue.ipfcst.console.controller;
 import com.jiayue.ipfcst.common.core.exception.BusinessException;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.OverhaulPlan;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.console.service.OverHaulPlanService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
 
 import java.io.IOException;
 import java.util.List;
@@ -27,7 +21,6 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("overHaulPlan")
-@Api(value = "OverHaulOlanController", tags = "光伏检修计划controller")
 public class OverHaulOlanController {
   final private OverHaulPlanService overHaulPlanService;
   @Autowired
@@ -42,13 +35,6 @@ public class OverHaulOlanController {
    */
 
   @PostMapping
-  @ApiOperation(value = "新增检修计划接口", httpMethod = "POST",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "overhaulPlan",value = "OverhaulPlan实体",dataType="OverhaulPlan")
-  })
-  @ApiMyResponse
   public ResponseVO insert(@RequestBody OverhaulPlan overhaulPlan){
     this.overHaulPlanService.add(overhaulPlan);
     return ResponseVO.success(1);
@@ -58,13 +44,6 @@ public class OverHaulOlanController {
    * 修改 检修计划接口
    */
   @PutMapping
-  @ApiOperation(value = "修改检修计划接口", httpMethod = "PUT",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "overhaulPlan",value = "OverhaulPlan实体",dataType="OverhaulPlan")
-  })
-  @ApiMyResponse
   public ResponseVO update(@RequestBody OverhaulPlan overhaulPlan) throws BusinessException {
     this.overHaulPlanService.save(overhaulPlan);
     return ResponseVO.success(1);
@@ -76,13 +55,6 @@ public class OverHaulOlanController {
    * @return 操作结果
    */
   @DeleteMapping
-  @ApiOperation(value = "删除检修计划接口", httpMethod = "DELETE",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "overhaulPlan",value = "OverhaulPlan实体",dataType="OverhaulPlan")
-  })
-  @ApiMyResponse
   public ResponseVO delete(@RequestBody OverhaulPlan overhaulPlan){
     this.overHaulPlanService.delete(overhaulPlan.getId());
     return ResponseVO.success(1);
@@ -96,14 +68,6 @@ public class OverHaulOlanController {
    */
   @SneakyThrows
   @GetMapping(value = "/{page}/{size}")
-  @ApiOperation(value = "分页获取检修计划", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入Page&ltOverhaulPlan&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
-    @ApiImplicitParam(name= "size",value = "条数",dataType="Integer"),
-  })
-  @ApiMyResponse
   public ResponseVO get(@PathVariable("page") Integer page, @PathVariable("size") Integer size) {
     OverhaulPlan overhaulPlan = new OverhaulPlan();
     Page<OverhaulPlan> overhaulPlanCalendarPage = this.overHaulPlanService.get(overhaulPlan, page, size);
@@ -116,10 +80,6 @@ public class OverHaulOlanController {
    */
   @SneakyThrows
   @GetMapping()
-  @ApiOperation(value = "查询所有检修计划", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltOverhaulPlan&gt</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getAll() {
     OverhaulPlan overhaulPlan = new OverhaulPlan();
     List<OverhaulPlan> list = this.overHaulPlanService.getAll();
@@ -127,7 +87,6 @@ public class OverHaulOlanController {
   }
 
   @GetMapping("/generateOverHaulPlanCodeContent")
-  @ApiIgnore
   public ResponseVO generateOverHaulPlanCodeContent() throws IOException, BusinessException {
     OverhaulPlan overhaulPlan = new OverhaulPlan();
     List<String> list = this.overHaulPlanService.generateOverHaulPlanCodeContent();

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

@@ -3,17 +3,11 @@ package com.jiayue.ipfcst.console.controller;
 import com.jiayue.ipfcst.common.core.exception.BusinessException;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.OverhaulPlanOne;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.console.service.OverHaulPlanOneService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
 
 import java.io.IOException;
 import java.util.List;
@@ -27,7 +21,6 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("overHaulPlanOne")
-@Api(value = "OverHaulOlanOneController", tags = "风电检修计划controller")
 public class OverHaulOlanOneController {
   final private OverHaulPlanOneService overHaulPlanOneService;
   @Autowired
@@ -42,13 +35,6 @@ public class OverHaulOlanOneController {
    */
 
   @PostMapping
-  @ApiOperation(value = "新增检修计划接口", httpMethod = "POST",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "overhaulPlan",value = "OverhaulPlan实体",dataType="OverhaulPlan")
-  })
-  @ApiMyResponse
   public ResponseVO insert(@RequestBody OverhaulPlanOne overhaulPlan){
     this.overHaulPlanOneService.add(overhaulPlan);
     return ResponseVO.success(1);
@@ -58,13 +44,6 @@ public class OverHaulOlanOneController {
    * 修改 检修计划接口
    */
   @PutMapping
-  @ApiOperation(value = "修改检修计划接口", httpMethod = "PUT",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "overhaulPlan",value = "OverhaulPlan实体",dataType="OverhaulPlan")
-  })
-  @ApiMyResponse
   public ResponseVO update(@RequestBody OverhaulPlanOne overhaulPlan) throws BusinessException {
     this.overHaulPlanOneService.save(overhaulPlan);
     return ResponseVO.success(1);
@@ -76,13 +55,6 @@ public class OverHaulOlanOneController {
    * @return 操作结果
    */
   @DeleteMapping
-  @ApiOperation(value = "删除检修计划接口", httpMethod = "DELETE",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "overhaulPlan",value = "OverhaulPlan实体",dataType="OverhaulPlan")
-  })
-  @ApiMyResponse
   public ResponseVO delete(@RequestBody OverhaulPlanOne overhaulPlan){
     this.overHaulPlanOneService.delete(overhaulPlan.getId());
     return ResponseVO.success(1);
@@ -96,14 +68,6 @@ public class OverHaulOlanOneController {
    */
   @SneakyThrows
   @GetMapping(value = "/{page}/{size}")
-  @ApiOperation(value = "分页获取检修计划", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入Page&ltOverhaulPlan&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
-    @ApiImplicitParam(name= "size",value = "条数",dataType="Integer"),
-  })
-  @ApiMyResponse
   public ResponseVO get(@PathVariable("page") Integer page, @PathVariable("size") Integer size) {
     OverhaulPlanOne overhaulPlan = new OverhaulPlanOne();
     Page<OverhaulPlanOne> overhaulPlanCalendarPage = this.overHaulPlanOneService.get(overhaulPlan, page, size);
@@ -116,17 +80,12 @@ public class OverHaulOlanOneController {
    */
   @SneakyThrows
   @GetMapping()
-  @ApiOperation(value = "查询所有检修计划", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltOverhaulPlan&gt</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getAll() {
     List<OverhaulPlanOne> list = this.overHaulPlanOneService.getAll();
     return ResponseVO.success(list);
   }
 
   @GetMapping("/generateOverHaulPlanCodeContent")
-  @ApiIgnore
   public ResponseVO generateOverHaulPlanCodeContent() throws IOException, BusinessException {
     List<String> list = this.overHaulPlanOneService.generateOverHaulPlanCodeContent();
     return ResponseVO.success(list);

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

@@ -11,7 +11,6 @@ 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 java.util.Date;
 import java.util.List;
@@ -25,7 +24,6 @@ import java.util.List;
  */
 @RestController
 @Slf4j
-@ApiIgnore
 public class PowerPlanSDController {
 
     private final PowerPlanSDService powerPlanSDService;

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

@@ -4,12 +4,7 @@ import com.jiayue.ipfcst.aop.SaveValidate;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.constant.enums.PvRotationModeEnum;
 import com.jiayue.ipfcst.common.data.entity.PvModuleModel;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.console.service.PvModuleModelService;
-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.*;
@@ -28,7 +23,6 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
-@Api(value = "PvModuleModelController", tags = "光伏组件信息controller")
 public class PvModuleModelController {
 
     private final PvModuleModelService pvModuleModelService;
@@ -46,14 +40,6 @@ public class PvModuleModelController {
      */
 
     @GetMapping(value="pvModuleModel/{page}/{size}")
-    @ApiOperation(value = "分页获取光伏组件信息", httpMethod = "GET",
-      notes = "<p>返回ResponseVO对象，data属性存入Page&ltString, Object&gt</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
-      @ApiImplicitParam(name= "size",value = "条数",dataType="Integer"),
-    })
-    @ApiMyResponse
     public ResponseVO getPvModuleModel(@PathVariable("page")  Integer page,
                                        @PathVariable("size")  Integer size) {
         Map<String, Object> map = new HashMap<>();
@@ -77,10 +63,6 @@ public class PvModuleModelController {
      */
 
     @GetMapping(value="pvModuleModel/")
-    @ApiOperation(value = "查询所有光伏组件信息", httpMethod = "GET",
-      notes = "<p>返回ResponseVO对象，data属性存入List&ltPvModuleModel&gt</p>"
-    )
-    @ApiMyResponse
     public ResponseVO getAll() {
 
         try{
@@ -103,13 +85,6 @@ public class PvModuleModelController {
      */
     @SaveValidate
     @PostMapping(value = "pvModuleModel/")
-    @ApiOperation(value = "保存光伏组件信息", httpMethod = "POST",
-      notes = "<p>返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "pvModuleModel",value = "PvModuleModel实体",dataType="PvModuleModel")
-    })
-    @ApiMyResponse
     public ResponseVO savePvModuleModel(@RequestBody PvModuleModel pvModuleModel) {
         try {
             pvModuleModelService.save(pvModuleModel);
@@ -130,13 +105,6 @@ public class PvModuleModelController {
      */
     @SaveValidate
     @PutMapping(value = "pvModuleModel/")
-    @ApiOperation(value = "更新光伏组件信息", httpMethod = "PUT",
-      notes = "<p>返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "pvModuleModel",value = "PvModuleModel实体",dataType="PvModuleModel")
-    })
-    @ApiMyResponse
     public ResponseVO updatePvModuleModel(@RequestBody PvModuleModel pvModuleModel) {
         try {
             pvModuleModelService.save(pvModuleModel);
@@ -157,13 +125,6 @@ public class PvModuleModelController {
      */
     @SaveValidate
     @DeleteMapping(value="pvModuleModel/{ids}")
-    @ApiOperation(value = "删除光伏组件信息", httpMethod = "DELETE",
-      notes = "<p>返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "ids",value = "主键ID",dataType="String"),
-    })
-    @ApiMyResponse
     public ResponseVO deletePvModuleModel(@PathVariable("ids")String ids){
         try{
             pvModuleModelService.delete(ids);
@@ -182,13 +143,6 @@ public class PvModuleModelController {
    * @return 执行结果
    */
     @GetMapping(value = "getPvRotationMode/")
-    @ApiOperation(value = "删除光伏组件信息", httpMethod = "GET",
-      notes = "<p>返回ResponseVO对象，data属性存入List&ltMap&ltString,Object&gt&gt</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "ids",value = "主键ID",dataType="String"),
-    })
-    @ApiMyResponse
     public ResponseVO getPvRotationMode() {
         List<Map<String, Object>> provinceType = new ArrayList<>();
         Map<String, Object> map;

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

@@ -1,14 +1,11 @@
 package com.jiayue.ipfcst.console.controller;
 
 import com.jiayue.ipfcst.common.core.exception.BusinessException;
-import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.console.service.QREnvironmentDataService;
 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 javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -18,7 +15,6 @@ import java.io.IOException;
  * @CreateTime 2021/9/14 9:36
  */
 @RestController
-@ApiIgnore
 public class QREnvironmentDataController {
 
   @Autowired

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

@@ -3,14 +3,9 @@ package com.jiayue.ipfcst.console.controller;
 import com.jiayue.ipfcst.aop.SaveValidate;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.Quartz;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.console.service.InitJobClassService;
 import com.jiayue.ipfcst.console.service.QuartzService;
 import com.jiayue.ipfcst.console.service.SysParameterService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +23,6 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
-@Api(value = "QuartzController", tags = "定时任务controller")
 public class QuartzController {
 
     @Autowired
@@ -49,13 +43,6 @@ public class QuartzController {
     @SaveValidate
     @SneakyThrows
     @PostMapping(value = "quartzs")
-    @ApiOperation(value = "添加定时任务", httpMethod = "POST",
-      notes = "<p>返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "qt",value = "Quartz实体",dataType="Quartz")
-    })
-    @ApiMyResponse
     public ResponseVO addQuartz(@RequestBody final Quartz qt) {
         final Quartz quartz = quartzService.findByClass(qt.getExecuteClass());
         if (null != quartz) {
@@ -80,13 +67,6 @@ public class QuartzController {
     @SaveValidate
     @SneakyThrows
     @PutMapping(value = "quartzs")
-    @ApiOperation(value = "修改定时任务状态", httpMethod = "PUT",
-      notes = "<p>返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "qt",value = "Quartz实体",dataType="Quartz")
-    })
-    @ApiMyResponse
     public ResponseVO stateQuartz(@RequestBody final Quartz qt) {
         final boolean flag = quartzService.save(qt);
         if (flag) {
@@ -104,13 +84,6 @@ public class QuartzController {
      */
     @SneakyThrows
     @RequestMapping(value = "quartzs/delete/{ids}", method = RequestMethod.DELETE)
-    @ApiOperation(value = "删除定时任务", httpMethod = "DELETE",
-      notes = "<p>返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "ids",value = "主键ID",dataType="String"),
-    })
-    @ApiMyResponse
     public ResponseVO deleteQuartzById(@PathVariable final String ids) {
         if (quartzService.deleteById(ids)) {
             return ResponseVO.success("删除成功!");
@@ -128,13 +101,6 @@ public class QuartzController {
      */
     @SneakyThrows
     @GetMapping(value = "quartzs/{page}/{size}/{jobName}/{jobType}")
-    @ApiOperation(value = "根据jobName模糊查询", httpMethod = "GET",
-      notes = "<p>返回ResponseVO对象，data属性存入总及明细记录</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "ids",value = "主键ID",dataType="String"),
-    })
-    @ApiMyResponse
     public ResponseVO getQuartzs(
             @PathVariable final Integer page, @PathVariable final Integer size, @PathVariable String jobName,
             @PathVariable String jobType) {
@@ -151,10 +117,6 @@ public class QuartzController {
 
   @SneakyThrows
   @GetMapping(value = "initJobClasses/initJob")
-  @ApiOperation(value = "初始化定时", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiMyResponse
   public ResponseVO initJobClass() throws SQLException {
     Boolean b = quartzService.initJobClass();
     if (!b){

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

@@ -2,15 +2,8 @@ package com.jiayue.ipfcst.console.controller;
 
 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.common.data.entity.SubsidiaryEquipmentInfo;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
-import com.jiayue.ipfcst.console.service.AGC_AVCInfoService;
 import com.jiayue.ipfcst.console.service.SubsidiaryEquipmentInfoService;
-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,7 +17,6 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("subsidiaryEquipmentInfo")
 @Slf4j
-@Api(value = "SubsidiaryEquipmentInfoController", tags = "附属设备信息controller")
 public class SubsidiaryEquipmentInfoController {
   final SubsidiaryEquipmentInfoService subsidiaryEquipmentInfoService;
 
@@ -37,10 +29,6 @@ public class SubsidiaryEquipmentInfoController {
   * 查询
   * */
   @GetMapping
-  @ApiOperation(value = "查询所有附属设备信息", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltSubsidiaryEquipmentInfo&gt</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getALL() {
     return ResponseVO.success(subsidiaryEquipmentInfoService.getAll());
   }
@@ -49,13 +37,6 @@ public class SubsidiaryEquipmentInfoController {
   * 保存
   * */
   @PostMapping
-  @ApiOperation(value = "保存", httpMethod = "POST",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "subsidiaryEquipmentInfo",value = "SubsidiaryEquipmentInfo实体",dataType="SubsidiaryEquipmentInfo")
-  })
-  @ApiMyResponse
   public ResponseVO save(@RequestBody SubsidiaryEquipmentInfo subsidiaryEquipmentInfo){
     subsidiaryEquipmentInfoService.save(subsidiaryEquipmentInfo);
     return ResponseVO.success(1);
@@ -65,13 +46,6 @@ public class SubsidiaryEquipmentInfoController {
   * 更新
   * */
   @PutMapping
-  @ApiOperation(value = "更新", httpMethod = "PUT",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "subsidiaryEquipmentInfo",value = "SubsidiaryEquipmentInfo实体",dataType="SubsidiaryEquipmentInfo")
-  })
-  @ApiMyResponse
   public ResponseVO update(@RequestBody SubsidiaryEquipmentInfo subsidiaryEquipmentInfo){
     subsidiaryEquipmentInfoService.save(subsidiaryEquipmentInfo);
     return ResponseVO.success(1);
@@ -81,13 +55,6 @@ public class SubsidiaryEquipmentInfoController {
   * 删除
   * */
   @DeleteMapping("/{id}")
-  @ApiOperation(value = "删除", httpMethod = "DELETE",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "id",value = "主键ID",dataType="String")
-  })
-  @ApiMyResponse
   public ResponseVO delete(@PathVariable String id) throws BusinessException {
     subsidiaryEquipmentInfoService.delete(Integer.parseInt(id));
     return ResponseVO.success(1);

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

@@ -1,16 +1,10 @@
 package com.jiayue.ipfcst.console.controller;
 
-import com.jiayue.ipfcst.common.core.exception.BusinessException;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.constant.enums.AlarmStatusEnum;
 import com.jiayue.ipfcst.common.data.constant.enums.AlarmTypeEnum;
 import com.jiayue.ipfcst.common.data.entity.SysAlarm;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.console.service.SysAlarmService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +26,6 @@ import java.util.Map;
 @RestController
 @RequestMapping("SysAlarm")
 @Slf4j
-@Api(value = "SysAlarmController", tags = "系统告警信息controller")
 public class SysAlarmController {
   private final SysAlarmService sysAlarmService;
 
@@ -50,14 +43,6 @@ public class SysAlarmController {
    */
   @SneakyThrows
   @GetMapping(value = "/{page}/{size}")
-  @ApiOperation(value = "分页获取告警信息", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入Page&ltSysAlarm&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
-    @ApiImplicitParam(name= "size",value = "条数",dataType="Integer")
-  })
-  @ApiMyResponse
   public ResponseVO getAll(@PathVariable("page") Integer page, @PathVariable("size") Integer size) {
     SysAlarm sysAlarm = new SysAlarm();
     Page<SysAlarm> sysParameterPage = this.sysAlarmService.get(sysAlarm, page, size);
@@ -73,15 +58,6 @@ public class SysAlarmController {
    */
   @SneakyThrows
   @GetMapping(value = "/{page}/{size}/{alarmTypeEnum}")
-  @ApiOperation(value = "根据告警类型分页获取告警信息", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入Page&ltSysAlarm&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
-    @ApiImplicitParam(name= "size",value = "条数",dataType="Integer"),
-    @ApiImplicitParam(name= "alarmTypeEnum",value = "告警类型",dataType="AlarmTypeEnum"),
-  })
-  @ApiMyResponse
   public ResponseVO getForNameAndAlarmTypeEnum(@PathVariable("page") Integer page, @PathVariable("size") Integer size,@PathVariable("alarmTypeEnum") AlarmTypeEnum alarmTypeEnum) {
     SysAlarm sysAlarm = new SysAlarm();
     Page<SysAlarm> sysParameterPage = this.sysAlarmService.getForNameAndAlarmTypeEnum(sysAlarm, page, size,alarmTypeEnum);
@@ -96,10 +72,6 @@ public class SysAlarmController {
    */
   @SneakyThrows
   @GetMapping()
-  @ApiOperation(value = "查询所有告警信息", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltSysAlarm&gt</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getAll() {
     List<SysAlarm> list = this.sysAlarmService.getAll();
     return ResponseVO.success(list);
@@ -112,13 +84,6 @@ public class SysAlarmController {
    */
   @SneakyThrows
   @PutMapping()
-  @ApiOperation(value = "修改告警信息", httpMethod = "PUT",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "sysAlarm",value = "SysAlarm实体",dataType="SysAlarm")
-  })
-  @ApiMyResponse
   public ResponseVO update(@RequestBody SysAlarm sysAlarm) {
     try {
       sysAlarmService.save(sysAlarm);
@@ -135,10 +100,6 @@ public class SysAlarmController {
    */
   @SneakyThrows
   @GetMapping("/getAlarmStatusEnum")
-  @ApiOperation(value = "获取告警状态枚举信息", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入AlarmStatusEnum枚举</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getAlarmStatusEnum() {
     List<Map<String, Object>> list = new ArrayList<>();
     Map<String, Object> map;
@@ -165,10 +126,6 @@ public class SysAlarmController {
    */
   @SneakyThrows
   @GetMapping("/getAlarmTypeEnum")
-  @ApiOperation(value = "获取告警类型枚举信息", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入AlarmTypeEnum枚举</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getAlarmTypeEnum() {
     List<Map<String, Object>> list = new ArrayList<>();
     Map<String, Object> map;

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

@@ -1,23 +1,13 @@
 package com.jiayue.ipfcst.console.controller;
 
-import com.jiayue.ipfcst.aop.SaveValidate;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.console.dto.FileLogBean;
 import com.jiayue.ipfcst.console.util.CommonUtil;
 import com.jiayue.ipfcst.fileupload.util.FileUtil;
-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.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
-import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -26,8 +16,6 @@ import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
 
 /**
  * SysFileController
@@ -39,7 +27,6 @@ import java.util.zip.ZipOutputStream;
 @RestController
 @RequestMapping("sysFile")
 @Slf4j
-@Api(value = "SysFileController", tags = "系统文件controller")
 public class SysFileController {
   /**
    * 获取文件夹下的所有文件
@@ -48,13 +35,6 @@ public class SysFileController {
    * @return map
    */
   @GetMapping(value = "/getFileList")
-  @ApiOperation(value = "获取文件夹下的所有文件", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入文件夹下的所有文件</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "path",value = "路径",dataType="String")
-  })
-  @ApiMyResponse
   public ResponseVO getFileList(String path) {
     List<Map<String, Object>> list = new ArrayList<>();
     List<FileLogBean> wjList = new ArrayList<FileLogBean>();//新建一个文件集合
@@ -135,15 +115,6 @@ public class SysFileController {
    * @param type     文件类型
    */
   @PostMapping(value = "/downLoadFile")
-  @ApiOperation(value = "获取文件夹下的所有文件", httpMethod = "POST",
-    notes = "<p>返回字节流</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "path",value = "路径",dataType="String"),
-    @ApiImplicitParam(name= "name",value = "名称",dataType="String"),
-    @ApiImplicitParam(name= "type",value = "类型",dataType="String")
-  })
-  @ApiMyResponse
   public void downLoadFile(HttpServletRequest request,
                            HttpServletResponse response,
                            String path,
@@ -207,14 +178,6 @@ public class SysFileController {
    * @return map
    */
   @PostMapping(value = "/deleteFile")
-  @ApiOperation(value = "文件删除", httpMethod = "POST",
-    notes = "<p>返回getFileList方法内容</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "path",value = "路径",dataType="String"),
-    @ApiImplicitParam(name= "name",value = "名称",dataType="String"),
-  })
-  @ApiMyResponse
   public ResponseVO deleteFile(String path, String name) {
     List<Map<String, Object>> list = new ArrayList<>();
     String[] names = name.split(",");
@@ -243,7 +206,6 @@ public class SysFileController {
    *
    * @param dir 将要删除的目录路径
    */
-  @ApiIgnore
   private static void doDeleteEmptyDir(String dir) {
     boolean success = (new File(dir)).delete();
     if (success) {
@@ -259,7 +221,6 @@ public class SysFileController {
    * @param dir 将要删除的文件目录
    * @return boolean
    */
-  @ApiIgnore
   private ResponseVO deleteDir(File dir) {
     if (dir.isDirectory()) {
       String[] children = dir.list();
@@ -283,14 +244,6 @@ public class SysFileController {
    * @return 返回状态结果
    */
   @PostMapping("/upload")
-  @ApiOperation(value = "上传文件", httpMethod = "POST",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "path",value = "路径",dataType="String"),
-    @ApiImplicitParam(name= "file",value = "文件",dataType="MultipartFile"),
-  })
-  @ApiMyResponse
   public ResponseVO upload(@RequestParam("path") String path,@RequestParam("file") MultipartFile file) {
     try {
       String filepath = path + File.separator + file.getOriginalFilename();
@@ -310,14 +263,6 @@ public class SysFileController {
    * @return map
    */
   @GetMapping(value = "/getFileContent")
-  @ApiOperation(value = "获取文件内容", httpMethod = "GET",
-    notes = "<p>返回map=>key:fileContent的文件内容</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "path",value = "路径",dataType="String"),
-    @ApiImplicitParam(name= "name",value = "名称",dataType="String"),
-  })
-  @ApiMyResponse
   public ResponseVO getFileContent(String path, String name) {
     List<Map<String, Object>> list = new ArrayList<>();
     Map<String, Object> map = new Hashtable<>();
@@ -360,15 +305,6 @@ public class SysFileController {
    * @param type     文件类型
    */
   @PostMapping(value = "/downLoadFolder")
-  @ApiOperation(value = "下载整个文件夹", httpMethod = "POST",
-    notes = "<p>返回zip字节流</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "path",value = "路径",dataType="String"),
-    @ApiImplicitParam(name= "name",value = "名称",dataType="String"),
-    @ApiImplicitParam(name= "type",value = "类型",dataType="String")
-  })
-  @ApiMyResponse
   public void downLoadFolder(HttpServletRequest request,
                            HttpServletResponse response,
                            String path,

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

@@ -3,17 +3,13 @@ package com.jiayue.ipfcst.console.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.SysMenu;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
-import com.jiayue.ipfcst.common.security.user.SysUser;
-import com.jiayue.ipfcst.common.security.user.SysUserService;
 import com.jiayue.ipfcst.console.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.*;
+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 java.util.List;
 
@@ -27,7 +23,6 @@ import java.util.List;
 @RestController
 @Slf4j
 @RequestMapping(value = "sysMenu")
-@Api(value = "SysMenuController", tags = "系统菜单controller")
 public class SysMenuController {
 
     private final SysMenuService sysMenuService;
@@ -44,10 +39,6 @@ public class SysMenuController {
      */
 
     @GetMapping()
-    @ApiOperation(value = "查询", httpMethod = "GET",
-      notes = "<p>返回ResponseVO对象，data属性存入List&ltSysMenu&gt</p>"
-    )
-    @ApiMyResponse
     public ResponseVO getAll() {
 
         try {
@@ -67,14 +58,6 @@ 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-console/src/main/java/com/jiayue/ipfcst/console/controller/SysParameterController.java

@@ -1,22 +1,14 @@
 package com.jiayue.ipfcst.console.controller;
 
 import com.jiayue.ipfcst.aop.SaveValidate;
-import com.jiayue.ipfcst.common.core.web.vo.RequestVO;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.SysParameter;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.console.service.SysParameterService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
-import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 
@@ -30,7 +22,6 @@ import java.util.List;
 @RestController
 @RequestMapping(value = "sysParameter")
 @Slf4j
-@Api(value = "SysParameterController", tags = "系统参数controller")
 public class SysParameterController {
 
     private final SysParameterService sysParameterService;
@@ -49,13 +40,6 @@ public class SysParameterController {
     @SneakyThrows
     @PostMapping()
     @SaveValidate
-    @ApiOperation(value = "新增系统参数", httpMethod = "POST",
-      notes = "<p>返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "sysParameter",value = "SysParameter实体",dataType="SysParameter")
-    })
-    @ApiMyResponse
     public ResponseVO add(@RequestBody SysParameter sysParameter) {
       try {
         this.sysParameterService.add(sysParameter);
@@ -76,13 +60,6 @@ public class SysParameterController {
     @SneakyThrows
     @SaveValidate
     @PutMapping()
-    @ApiOperation(value = "修改系统参数", httpMethod = "PUT",
-      notes = "<p>返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "sysParameter",value = "SysParameter实体",dataType="SysParameter")
-    })
-    @ApiMyResponse
     public ResponseVO update(@RequestBody SysParameter sysParameter) {
       this.sysParameterService.update(sysParameter);
       return ResponseVO.success(1);
@@ -97,13 +74,6 @@ public class SysParameterController {
     @SneakyThrows
     @SaveValidate
     @DeleteMapping()
-    @ApiOperation(value = "删除系统参数", httpMethod = "DELETE",
-      notes = "<p>返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "sysParameter",value = "SysParameter实体",dataType="SysParameter")
-    })
-    @ApiMyResponse
     public ResponseVO delete(@RequestBody SysParameter sysParameter) {
       this.sysParameterService.delete(sysParameter.getId());
       return ResponseVO.success(1);
@@ -117,10 +87,6 @@ public class SysParameterController {
      */
     @SneakyThrows
     @GetMapping()
-    @ApiOperation(value = "获取所有系统参数", httpMethod = "GET",
-      notes = "<p>返回ResponseVO对象，data属性存入List&ltSysParameter&gt</p>"
-    )
-    @ApiMyResponse
     public ResponseVO getAll() {
       List<SysParameter> list = this.sysParameterService.getAll();
       return ResponseVO.success(list);
@@ -136,14 +102,6 @@ public class SysParameterController {
      */
     @SneakyThrows
     @GetMapping(value = "/{page}/{size}")
-    @ApiOperation(value = "分页获取系统参数", httpMethod = "GET",
-      notes = "<p>返回ResponseVO对象，data属性存入Page&ltSysParameter&gt</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
-      @ApiImplicitParam(name= "size",value = "条数",dataType="Integer"),
-    })
-    @ApiMyResponse
     public ResponseVO getAll(@PathVariable("page") Integer page, @PathVariable("size") Integer size) {
       SysParameter sysParameter = new SysParameter();
       Page<SysParameter> sysParameterPage = this.sysParameterService.get(sysParameter, page, size);
@@ -160,15 +118,6 @@ public class SysParameterController {
    */
   @SneakyThrows
   @GetMapping(value = "/{page}/{size}/{keywords}")
-  @ApiOperation(value = "分页获取系统参数", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入Page&ltSysParameter&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
-    @ApiImplicitParam(name= "size",value = "条数",dataType="Integer"),
-    @ApiImplicitParam(name= "keywords",value = "关键字",dataType="String"),
-  })
-  @ApiMyResponse
   public ResponseVO getAForKeywords(@PathVariable("page") Integer page, @PathVariable("size") Integer size,@PathVariable("keywords") String keywords) {
     SysParameter sysParameter = new SysParameter();
     Page<SysParameter> sysParameterPage = this.sysParameterService.getForKeywords(sysParameter, page, size,keywords);
@@ -183,13 +132,6 @@ public class SysParameterController {
      */
     @SneakyThrows
     @GetMapping(value = "/sysParameter/{id}/")
-    @ApiOperation(value = "根据ID获取系统参数值", httpMethod = "GET",
-      notes = "<p>返回ResponseVO对象，data属性存入参数值</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "id",value = "主键ID",dataType="Integer")
-    })
-    @ApiMyResponse
     public ResponseVO getById(@PathVariable("id") Integer id) {
       return ResponseVO.success(sysParameterService.getParameter(id));
     }
@@ -202,13 +144,6 @@ public class SysParameterController {
    */
   @SneakyThrows
   @GetMapping(value = "/sysParameterKey/{sysKey}")
-  @ApiOperation(value = "根据key获取系统参数值", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入参数值</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "sysKey",value = "参数key",dataType="String")
-  })
-  @ApiMyResponse
   public ResponseVO getById(@PathVariable("sysKey") String sysKey) {
     return ResponseVO.success(sysParameterService.getParameterBySysKey(sysKey));
   }
@@ -222,7 +157,6 @@ public class SysParameterController {
    */
   @SneakyThrows
   @PostMapping("/noSaveValidate")
-  @ApiIgnore
   public ResponseVO save(@RequestBody SysParameter sysParameter) {
     try {
       this.sysParameterService.update(sysParameter);

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

@@ -2,13 +2,8 @@ package com.jiayue.ipfcst.console.controller;
 
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.common.security.user.SysUser;
 import com.jiayue.ipfcst.common.security.user.SysUserService;
-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,7 +19,6 @@ import java.util.List;
  */
 @RestController
 @Slf4j
-@Api(value = "SysUserController", tags = "用户信息controller")
 public class SysUserController {
 
     private final SysUserService sysUserService;
@@ -41,10 +35,6 @@ public class SysUserController {
      */
 
     @GetMapping(value = "sysUser/")
-    @ApiOperation(value = "获取用户信息", httpMethod = "GET",
-      notes = "<p>返回ResponseVO对象，data属性存入List&ltSysUser&gt</p>"
-    )
-    @ApiMyResponse
     public ResponseVO getAll() {
 
         try {
@@ -66,13 +56,6 @@ public class SysUserController {
      * @return 执行结果
      */
     @PostMapping(value = "sysUser/")
-    @ApiOperation(value = "保存用户信息", httpMethod = "POST",
-      notes = "<p>返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "sysUser",value = "SysUser实体",dataType="SysUser")
-    })
-    @ApiMyResponse
     public ResponseVO save(@RequestBody SysUser sysUser) {
         try {
             sysUserService.save(sysUser);
@@ -92,13 +75,6 @@ public class SysUserController {
      * @return 执行结果
      */
     @PutMapping(value = "sysUser/")
-    @ApiOperation(value = "更新用户信息", httpMethod = "PUT",
-      notes = "<p>返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "sysUser",value = "SysUser实体",dataType="SysUser")
-    })
-    @ApiMyResponse
     public ResponseVO update(@RequestBody SysUser sysUser) {
         try {
             sysUserService.save(sysUser);
@@ -118,13 +94,6 @@ public class SysUserController {
      * @return 执行结果
      */
     @DeleteMapping(value = "sysUser/{ids}")
-    @ApiOperation(value = "删除用户信息", httpMethod = "DELETE",
-      notes = "<p>返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "ids",value = "主键ID",dataType="String")
-    })
-    @ApiMyResponse
     public ResponseVO delete(@PathVariable("ids") String ids) {
         try {
             sysUserService.delete(ids);

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

@@ -5,10 +5,8 @@ import com.jiayue.ipfcst.console.service.UploadFileTypeService;
 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;
 
 @RestController
-@ApiIgnore
 public class UploadFileTypeController {
   @Autowired
   UploadFileTypeService uploadFileTypeService;

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

@@ -1,16 +1,13 @@
 package com.jiayue.ipfcst.console.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
-import com.jiayue.ipfcst.common.data.constant.enums.ProvinceEnum;
 import com.jiayue.ipfcst.console.service.UploadInfoService;
 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;
 
 @RestController
-@ApiIgnore
 public class UploadInfoController {
 
   @Autowired

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

@@ -2,14 +2,8 @@ package com.jiayue.ipfcst.console.controller;
 
 import com.jiayue.ipfcst.aop.SaveValidate;
 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.WeatherStationInfo;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.console.service.WeatherStationInfoService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +22,6 @@ import java.util.List;
 @RestController
 @RequestMapping("/weatherStationInfo")
 @Slf4j
-@Api(value = "WeatherStationInfoController", tags = "气象站信息controller")
 public class WeatherStationInfoController {
 
     private final WeatherStationInfoService weatherStationInfoService;
@@ -47,13 +40,6 @@ public class WeatherStationInfoController {
     @SneakyThrows
     @SaveValidate
     @PostMapping()
-    @ApiOperation(value = "新增气象站信息", httpMethod = "POST",
-      notes = "返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "weatherStationInfo",value = "WeatherStationInfo实体",dataType="WeatherStationInfo")
-    })
-    @ApiMyResponse
     public ResponseVO add(@RequestBody WeatherStationInfo weatherStationInfo) {
       try {
         this.weatherStationInfoService.add(weatherStationInfo);
@@ -73,13 +59,6 @@ public class WeatherStationInfoController {
     @SneakyThrows
     @SaveValidate
     @PutMapping()
-    @ApiOperation(value = "修改气象站信息", httpMethod = "PUT",
-      notes = "<p>返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "weatherStationInfo",value = "WeatherStationInfo实体",dataType="WeatherStationInfo")
-    })
-    @ApiMyResponse
     public ResponseVO update(@RequestBody WeatherStationInfo weatherStationInfo) {
       try {
         this.weatherStationInfoService.update(weatherStationInfo);
@@ -99,13 +78,6 @@ public class WeatherStationInfoController {
      */
     @SneakyThrows
     @GetMapping("/ById")
-    @ApiOperation(value = "获取气象站信息，用参数实体ID查询", httpMethod = "GET",
-      notes = "<p>返回ResponseVO对象，data属性存入WeatherStationInfo实体</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "weatherStationInfo",value = "WeatherStationInfo实体",dataType="WeatherStationInfo")
-    })
-    @ApiMyResponse
     public ResponseVO get(@RequestBody WeatherStationInfo weatherStationInfo) {
         try {
           weatherStationInfo = this.weatherStationInfoService.get(weatherStationInfo.getId());
@@ -126,13 +98,6 @@ public class WeatherStationInfoController {
     @SneakyThrows
     @SaveValidate
     @DeleteMapping("/{id}")
-    @ApiOperation(value = "删除气象站信息", httpMethod = "DELETE",
-      notes = "<p>返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "id",value = "主键ID",dataType="Integer")
-    })
-    @ApiMyResponse
     public ResponseVO delete(@PathVariable Integer id) {
       try {
         this.weatherStationInfoService.delete(id);
@@ -151,14 +116,6 @@ public class WeatherStationInfoController {
      * @return 执行结果
      */
     @GetMapping(value = "/{page}/{size}")
-    @ApiOperation(value = "分页获取气象站", httpMethod = "GET",
-      notes = "<p>返回ResponseVO对象，data属性存入Page&ltWeatherStationInfo&gt</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
-      @ApiImplicitParam(name= "size",value = "条数",dataType="Integer")
-    })
-    @ApiMyResponse
     public ResponseVO getAll(@PathVariable("page") Integer page, @PathVariable("size") Integer size) {
         try {
           WeatherStationInfo weatherStationInfo = new WeatherStationInfo();
@@ -177,10 +134,6 @@ public class WeatherStationInfoController {
    * @return 执行结果
    */
   @GetMapping()
-  @ApiOperation(value = "获取所有气象站", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltWeatherStationInfo&gt</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getAll() {
     try {
       List<WeatherStationInfo> list = this.weatherStationInfoService.getAll();

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

@@ -2,14 +2,8 @@ package com.jiayue.ipfcst.console.controller;
 
 import com.jiayue.ipfcst.aop.SaveValidate;
 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.WindTowerInfo;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.console.service.WindTowerInfoService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +21,6 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("windTowerInfo")
-@Api(value = "WindTowerInfoController", tags = "测风塔信息controller")
 @Slf4j public class WindTowerInfoController {
 
     private final WindTowerInfoService windTowerInfoService;
@@ -45,13 +38,6 @@ import java.util.List;
     @SneakyThrows
     @SaveValidate
     @PostMapping()
-    @ApiOperation(value = "新增测风塔", httpMethod = "POST",
-      notes = "返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "windTowerInfo",value = "WindTowerInfo实体",dataType="WindTowerInfo")
-    })
-    @ApiMyResponse
     public ResponseVO add(@RequestBody WindTowerInfo windTowerInfo) {
         try {
             this.windTowerInfoService.add(windTowerInfo);
@@ -72,13 +58,6 @@ import java.util.List;
     @SneakyThrows
     @SaveValidate
     @PutMapping()
-    @ApiOperation(value = "修改测风塔", httpMethod = "PUT",
-      notes = "返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "windTowerInfo",value = "WindTowerInfo实体",dataType="WindTowerInfo")
-    })
-    @ApiMyResponse
     public ResponseVO update(@RequestBody WindTowerInfo windTowerInfo) {
         this.windTowerInfoService.update(windTowerInfo);
         return ResponseVO.success(1);
@@ -93,13 +72,6 @@ import java.util.List;
     @SneakyThrows
     @SaveValidate
     @DeleteMapping("/{id}")
-    @ApiOperation(value = "删除测风塔", httpMethod = "DELETE",
-      notes = "返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "id",value = "主键ID",dataType="Integer")
-    })
-    @ApiMyResponse
     public ResponseVO delete(@PathVariable Integer id) {
         this.windTowerInfoService.delete(id);
         return ResponseVO.success(1);
@@ -113,14 +85,6 @@ import java.util.List;
      */
     @SneakyThrows
     @GetMapping(value = "/{page}/{size}")
-    @ApiOperation(value = "分页获取测风塔", httpMethod = "GET",
-      notes = "<p>返回ResponseVO对象，data属性存入Page&ltWindTowerInfo&gt</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
-      @ApiImplicitParam(name= "size",value = "条数",dataType="Integer")
-    })
-    @ApiMyResponse
     public ResponseVO getAll(@PathVariable("page") Integer page, @PathVariable("size") Integer size) {
         WindTowerInfo windTowerInfo = new WindTowerInfo();
         Page<WindTowerInfo> windTowerPage = this.windTowerInfoService.get(windTowerInfo, page, size);
@@ -135,10 +99,6 @@ import java.util.List;
      */
     @SneakyThrows
     @GetMapping(value = "")
-    @ApiOperation(value = "获取所有测风塔", httpMethod = "GET",
-      notes = "<p>返回ResponseVO对象，data属性存入List&ltWindTowerInfo&gt</p>"
-    )
-    @ApiMyResponse
     public ResponseVO getAll() {
       List<WindTowerInfo> list = this.windTowerInfoService.getAll();
       return ResponseVO.success(list);

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

@@ -3,15 +3,8 @@ package com.jiayue.ipfcst.console.controller;
 import com.jiayue.ipfcst.aop.SaveValidate;
 import com.jiayue.ipfcst.common.core.web.vo.RequestVO;
 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.InverterInfo;
 import com.jiayue.ipfcst.common.data.entity.WindTurbineInfo;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.console.service.WindTurbineInfoService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +23,6 @@ import java.util.List;
 @RestController
 @RequestMapping("windTurbineInfo")
 @Slf4j
-@Api(value = "WindTurbineInfoController", tags = "风机信息controller")
 public class WindTurbineInfoController {
 
     private final WindTurbineInfoService windTurbineInfoService;
@@ -49,13 +41,6 @@ public class WindTurbineInfoController {
     @SneakyThrows
     @SaveValidate
     @PostMapping()
-    @ApiOperation(value = "新增风机", httpMethod = "POST",
-      notes = "<p>返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "windTurbineInfo",value = "WindTurbineInfo实体",dataType="WindTurbineInfo")
-    })
-    @ApiMyResponse
     public ResponseVO add(@RequestBody WindTurbineInfo windTurbineInfo) {
         this.windTurbineInfoService.add(windTurbineInfo);
         return ResponseVO.success(1);
@@ -70,13 +55,6 @@ public class WindTurbineInfoController {
     @SneakyThrows
     @SaveValidate
     @PutMapping()
-    @ApiOperation(value = "修改风机", httpMethod = "PUT",
-      notes = "<p>返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "windTurbineInfo",value = "WindTurbineInfo实体",dataType="WindTurbineInfo")
-    })
-    @ApiMyResponse
     public ResponseVO update(@RequestBody WindTurbineInfo windTurbineInfo) {
         this.windTurbineInfoService.update(windTurbineInfo);
         return ResponseVO.success(1);
@@ -90,13 +68,6 @@ public class WindTurbineInfoController {
      */
     @SneakyThrows
     @GetMapping("ById")
-    @ApiOperation(value = "获取气象站信息，用参数实体ID查询", httpMethod = "GET",
-      notes = "<p>返回ResponseVO对象，data属性存入WindTurbineInfo实体</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "requestVO",value = "WindTurbineInfo实体",dataType="WindTurbineInfo")
-    })
-    @ApiMyResponse
     public ResponseVO get(@RequestBody RequestVO<WindTurbineInfo> requestVO) {
       WindTurbineInfo windTurbineInfo = requestVO.getData();
       windTurbineInfo = this.windTurbineInfoService.get(windTurbineInfo.getId());
@@ -111,13 +82,6 @@ public class WindTurbineInfoController {
     @SneakyThrows
     @SaveValidate
     @DeleteMapping("/{id}")
-    @ApiOperation(value = "删除风机", httpMethod = "DELETE",
-      notes = "<p>返回ResponseVO对象</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "id",value = "主键ID",dataType="Integer")
-    })
-    @ApiMyResponse
     public ResponseVO delete(@PathVariable Integer id) {
         this.windTurbineInfoService.delete(id);
         return ResponseVO.success(1);
@@ -132,14 +96,6 @@ public class WindTurbineInfoController {
      */
     @SneakyThrows
     @GetMapping(value = "/{page}/{size}")
-    @ApiOperation(value = "分页获取风机", httpMethod = "GET",
-      notes = "<p>返回ResponseVO对象，data属性存入Page&ltWindTurbineInfo&gt</p>"
-    )
-    @ApiImplicitParams(value={
-      @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
-      @ApiImplicitParam(name= "size",value = "条数",dataType="Integer")
-    })
-    @ApiMyResponse
     public ResponseVO getAll(@PathVariable("page") Integer page, @PathVariable("size") Integer size) {
       WindTurbineInfo windTurbineInfo = new WindTurbineInfo();
       windTurbineInfo.setCorrectState(null);
@@ -155,10 +111,6 @@ public class WindTurbineInfoController {
      */
     @SneakyThrows
     @GetMapping()
-    @ApiOperation(value = "获取所有风机", httpMethod = "GET",
-      notes = "<p>返回ResponseVO对象，data属性存入List&ltWindTurbineInfo&gt</p>"
-    )
-    @ApiMyResponse
     public ResponseVO getAll() {
       List<WindTurbineInfo> list = this.windTurbineInfoService.getAll();
       return ResponseVO.success(list);
@@ -172,15 +124,6 @@ public class WindTurbineInfoController {
    */
   @SaveValidate
   @PostMapping(value = "/saveAll/{startValue}/{endValue}")
-  @ApiOperation(value = "批量保存风机信息", httpMethod = "POST",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "windTurbineInfo",value = "WindTurbineInfo实体",dataType="WindTurbineInfo"),
-    @ApiImplicitParam(name= "startValue",value = "起始值",dataType="InverterInfo"),
-    @ApiImplicitParam(name= "endValue",value = "结束值",dataType="InverterInfo"),
-  })
-  @ApiMyResponse
   public ResponseVO allSaveWindTurbineInfo(@RequestBody WindTurbineInfo windTurbineInfo, @PathVariable("startValue") Integer startValue, @PathVariable("endValue") Integer endValue) {
     try {
       windTurbineInfoService.addALL(windTurbineInfo,startValue,endValue);
@@ -200,13 +143,6 @@ public class WindTurbineInfoController {
    */
   @SaveValidate
   @DeleteMapping(value = "/deleteIds/{ids}")
-  @ApiOperation(value = "删除风机信息", httpMethod = "DELETE",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "ids",value = "主键ID",dataType="String")
-  })
-  @ApiMyResponse
   public ResponseVO deleteWindTurbineInfo(@PathVariable("ids") String ids) {
     try {
       windTurbineInfoService.delete(ids);

ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/dataexchange/controller/EquipmentAttributeController.java

@@ -7,15 +7,10 @@ import com.jiayue.ipfcst.common.data.constant.enums.EquipmentTypeEnum;
 import com.jiayue.ipfcst.common.data.entity.ElectricField;
 import com.jiayue.ipfcst.common.data.entity.EquipmentAttribute;
 import com.jiayue.ipfcst.common.data.entity.ProtocolGatherDataPoint;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.console.service.ElectricFieldService;
 import com.jiayue.ipfcst.dataexchange.service.EquipmentAttributeService;
 import com.jiayue.ipfcst.dataexchange.service.ProtocolGatherDataPointService;
 import com.jiayue.ipfcst.dataexchange.service.equipmentstatusdata.EquipmentInfoService;
-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.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +30,6 @@ import java.util.Map;
 @Slf4j
 @RequestMapping("dataExchange")
 @RestController
-@Api(value = "EquipmentAttributeController", tags = "设备属性类的对外http接口controller")
 public class EquipmentAttributeController {
 
   /**
@@ -59,13 +53,6 @@ public class EquipmentAttributeController {
    * @return ResponseVO 统一返回值
    */
   @GetMapping(value = "equipmentAttribute")
-  @ApiOperation(value = "根据条件查询设备属性", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltEquipmentAttribute&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "equipmentAttribute",value = "EquipmentAttribute实体",dataType="EquipmentAttribute")
-  })
-  @ApiMyResponse
   public ResponseVO get(@RequestBody EquipmentAttribute equipmentAttribute) {
     return ResponseVO.success(equipmentAttributeService.get(equipmentAttribute));
   }
@@ -77,13 +64,6 @@ public class EquipmentAttributeController {
    * @return ResponseVO 统一返回值
    */
   @GetMapping(value = "getByEquipmentType/{equipmentType}")
-  @ApiOperation(value = "根据设备类型查设备属性", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltEquipmentAttribute&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "equipmentType",value = "设备类型",dataType="String")
-  })
-  @ApiMyResponse
   public ResponseVO getByEquipmentType(@PathVariable String equipmentType) throws BusinessException {
     if (!StringUtils.isNotBlank(equipmentType)) {
       throw new BusinessException("必须传入设备类型");
@@ -104,10 +84,6 @@ public class EquipmentAttributeController {
    * @return ResponseVO 统一返回值
    */
   @GetMapping(value = "equipmentInfo")
-  @ApiOperation(value = "获取到所有的设备信息", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入设备信息集合</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getAllEquipmentInfo() {
     List list = new ArrayList();
     List<AbstractEquipmentInfo> info = equipmentInfoService.getAllEquipmentInfo();
@@ -130,10 +106,6 @@ public class EquipmentAttributeController {
    * @return {@link ResponseVO}
    */
   @GetMapping(value = "getAll")
-  @ApiOperation(value = "获取到所有的设备属性", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入设备属性集合</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getAll() {
     try {
       return ResponseVO.success(this.equipmentAttributeService.getAll());
@@ -150,14 +122,6 @@ public class EquipmentAttributeController {
    * @return {@link ResponseVO}
    */
   @GetMapping(value = "getAllByPage/{page}/{size}")
-  @ApiOperation(value = "分页所有设备属性", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入Page&ltEquipmentAttribute&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
-    @ApiImplicitParam(name= "size",value = "条数",dataType="Integer")
-  })
-  @ApiMyResponse
   public ResponseVO getAllByPage(@PathVariable("page") Integer page, @PathVariable("size") Integer size) {
     try {
       return ResponseVO.success(this.equipmentAttributeService.getAllByPage(page,size));
@@ -177,13 +141,6 @@ public class EquipmentAttributeController {
    * @throws BusinessException 业务异常
    */
   @GetMapping(value = "equipmentInfo/{equipmentType}")
-  @ApiOperation(value = "根据设备类型找设备获取设备信息", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltAbstractEquipmentInfo&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "equipmentType",value = "设备类型",dataType="String"),
-  })
-  @ApiMyResponse
   public ResponseVO getEquipmentInfo(@PathVariable String equipmentType) throws BusinessException {
     if (!StringUtils.isNotBlank(equipmentType)) {
       throw new BusinessException("必须传入设备类型");
@@ -209,10 +166,6 @@ public class EquipmentAttributeController {
    * @return
    */
   @GetMapping("/getEquipmentTypeEnum")
-  @ApiOperation(value = "获取设备类型状态枚举", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入EquipmentTypeEnum枚举</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getEquipmentTypeEnum(){
     List list = new ArrayList<>();
     for (EquipmentTypeEnum equipmentTypeEnum : EquipmentTypeEnum.values()) {
@@ -233,10 +186,6 @@ public class EquipmentAttributeController {
    * @return
    */
   @GetMapping("/getSubsidiaryEquipmentTypeEnum")
-  @ApiOperation(value = "获取设备类型状态枚举", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入EquipmentTypeEnum枚举</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getSubsidiaryEquipmentTypeEnum(){
     List list = new ArrayList<>();
     for (EquipmentTypeEnum equipmentTypeEnum : EquipmentTypeEnum.SUBSIDIARY_EQUIPMENT_TYPE) {
@@ -258,27 +207,11 @@ public class EquipmentAttributeController {
    * @return ResponseVO 统一返回值
    */
   @GetMapping(value = "/{equipmentType}/{page}/{size}")
-  @ApiOperation(value = "分页根据设备类型查设备属性", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入Page&ltEquipmentAttribute&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "equipmentType",value = "设备类型",dataType="String"),
-    @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
-    @ApiImplicitParam(name= "size",value = "条数",dataType="Integer")
-  })
-  @ApiMyResponse
   public ResponseVO findByEquipmentType(@PathVariable String equipmentType,@PathVariable Integer page,@PathVariable Integer size) {
     return ResponseVO.success(equipmentAttributeService.findByEquipmentType(equipmentType,page,size));
   }
 
   @GetMapping(value = "/dataPointById/{id}")
-  @ApiOperation(value = "根据ID获取点表", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltProtocolGatherDataPoint&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "id",value = "主键ID",dataType="Integer"),
-  })
-  @ApiMyResponse
   public ResponseVO dataPointById(@PathVariable Integer id) {
     ProtocolGatherDataPoint protocolGatherDataPoint = new ProtocolGatherDataPoint();
     EquipmentAttribute equipmentAttribute = new EquipmentAttribute();
@@ -289,25 +222,11 @@ public class EquipmentAttributeController {
   }
 
   @PostMapping
-  @ApiOperation(value = "保存设备属性", httpMethod = "POST",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "equipmentAttribute",value = "EquipmentAttribute实体",dataType="EquipmentAttribute"),
-  })
-  @ApiMyResponse
   public ResponseVO saveEquipmentAttribute(@RequestBody EquipmentAttribute equipmentAttribute){
     equipmentAttributeService.saveOrUpdateEquipmentAttribute(equipmentAttribute);
     return ResponseVO.success(1);
   }
   @PutMapping
-  @ApiOperation(value = "更新设备属性", httpMethod = "PUT",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "equipmentAttribute",value = "EquipmentAttribute实体",dataType="EquipmentAttribute"),
-  })
-  @ApiMyResponse
   public ResponseVO UpdateEquipmentAttribute(@RequestBody EquipmentAttribute equipmentAttribute){
     equipmentAttributeService.saveOrUpdateEquipmentAttribute(equipmentAttribute);
     return ResponseVO.success(1);
@@ -316,13 +235,6 @@ public class EquipmentAttributeController {
    * 删除
    * */
   @DeleteMapping("/{id}")
-  @ApiOperation(value = "删除设备属性", httpMethod = "DELETE",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "id",value = "主键ID",dataType="String"),
-  })
-  @ApiMyResponse
   public ResponseVO delete(@PathVariable String id) throws BusinessException {
     equipmentAttributeService.delete(Integer.parseInt(id));
     return ResponseVO.success(1);

ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/dataexchange/controller/EquipmentDataTemplateController.java

@@ -4,13 +4,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.jiayue.ipfcst.aop.SaveValidate;
 import com.jiayue.ipfcst.common.core.exception.BusinessException;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.dataexchange.domain.EquipmentDataTemplate;
 import com.jiayue.ipfcst.dataexchange.service.EquipmentDataTemplateService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,7 +19,6 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("dataExchange")
-@Api(value = "EquipmentDataTemplateController", tags = "设备模版的对外http接口controller")
 public class EquipmentDataTemplateController {
 
 
@@ -42,13 +36,6 @@ public class EquipmentDataTemplateController {
    * @return ResponseVO 统一返回值格式
    */
   @GetMapping(value = "/equipmentDataTemplate")
-  @ApiOperation(value = "查询符合条件对应的模版", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltEquipmentDataTemplate&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "equipmentDataTemplate",value = "EquipmentDataTemplate实体",dataType="EquipmentDataTemplate"),
-  })
-  @ApiMyResponse
   public ResponseVO get(@ModelAttribute() EquipmentDataTemplate equipmentDataTemplate) {
     return ResponseVO.success(equipmentDataTemplateService.get(equipmentDataTemplate));
   }
@@ -62,13 +49,6 @@ public class EquipmentDataTemplateController {
    */
   @DeleteMapping(value = "equipmentDataTemplate")
   @SaveValidate
-  @ApiOperation(value = "查询符合条件对应的模版", httpMethod = "DELETE",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "equipmentDataTemplateId",value = "主键ID",dataType="Integer"),
-  })
-  @ApiMyResponse
   public ResponseVO delete(@RequestParam Integer equipmentDataTemplateId) {
     //该操作将会删除该模版下所有的模版点位
     equipmentDataTemplateService.delete(equipmentDataTemplateId);
@@ -84,13 +64,6 @@ public class EquipmentDataTemplateController {
    */
   @PutMapping(value = "equipmentDataTemplate")
   @SaveValidate
-  @ApiOperation(value = "添加或修改模版", httpMethod = "PUT",
-    notes = "<p>返回ResponseVO对象，data属性存入EquipmentDataTemplate实体</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "equipmentDataTemplateId",value = "主键ID",dataType="Integer"),
-  })
-  @ApiMyResponse
   public ResponseVO add(@RequestBody EquipmentDataTemplate equipmentDataTemplate) {
     return ResponseVO.success(equipmentDataTemplateService.saveOrUpdate(equipmentDataTemplate));
   }
@@ -104,13 +77,6 @@ public class EquipmentDataTemplateController {
    */
   @PostMapping(value = "/equipmentDataTemplate/generatePoint4Equipment")
   @SaveValidate
-  @ApiOperation(value = "通过模版生成设备点位", httpMethod = "POST",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "obj",value = "json对象",dataType="JSONObject"),
-  })
-  @ApiMyResponse
   public ResponseVO generatePoint4Equipment(@RequestBody JSONObject obj) throws BusinessException {
     if (obj.containsKey("equipmentDataTemplateId") && obj.containsKey("equipmentIds") && obj.containsKey("findAddressN")) {
       int equipmentDataTemplateId = obj.getInteger("equipmentDataTemplateId");

ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/dataexchange/controller/ForecastForSendAttributeController.java

@@ -2,12 +2,7 @@ package com.jiayue.ipfcst.dataexchange.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.ForecastForSendAttribute;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.dataexchange.repository.ForecastForSendAttributeRepository;
-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,7 +21,6 @@ import java.util.List;
 @Slf4j
 @RestController
 @RequestMapping("/dataExchange/ForecastForSendAttribute")
-@Api(value = "ForecastForSendAttributeController", tags = "转发点表controller")
 public class
 ForecastForSendAttributeController {
   private ForecastForSendAttributeRepository forecastForSendAttributeRepository;
@@ -44,14 +38,6 @@ ForecastForSendAttributeController {
    * @return ResponseVO 统一返回值
    */
   @GetMapping(value = "/{forecastNode}/{forcastType}")
-  @ApiOperation(value = "根据预测功率的类型和预测节点查询点位", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltForecastForSendAttribute&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "forecastNode",value = "预测节点",dataType="Integer"),
-    @ApiImplicitParam(name= "forcastType",value = "预测类型",dataType="String"),
-  })
-  @ApiMyResponse
   public ResponseVO get(@PathVariable("forecastNode") Integer forecastNode, @PathVariable("forcastType") String forcastType1) {
     try {
       ForecastForSendAttribute.ForecastType forcastType = ForecastForSendAttribute.ForecastType.valueOf(forcastType1);
@@ -74,15 +60,6 @@ ForecastForSendAttributeController {
    * @return ResponseVO 统一返回值
    */
   @GetMapping(value = "/getAttributeBypoint/{pointNumber}/{forecastNode}/{forcastType}")
-  @ApiOperation(value = "根据点位和预测功率类型查询预测属性的id", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltForecastForSendAttribute&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "pointNumber",value = "点号",dataType="Integer"),
-    @ApiImplicitParam(name= "forecastNode",value = "预测节点",dataType="Integer"),
-    @ApiImplicitParam(name= "forcastType",value = "预测类型",dataType="String"),
-  })
-  @ApiMyResponse
   public ResponseVO getAttributeByPoint(@PathVariable("pointNumber") Integer pointNumber, @PathVariable("forecastNode") Integer forecastNode, @PathVariable("forcastType") String forcastType1) {
     try {
       ForecastForSendAttribute.ForecastType forcastType = ForecastForSendAttribute.ForecastType.valueOf(forcastType1);

ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/dataexchange/controller/ImpactOnContainerOperationController.java

@@ -1,12 +1,7 @@
 package com.jiayue.ipfcst.dataexchange.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.dataexchange.service.ImpactOnContainerOperation;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,7 +15,6 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("refreshContainer")
-@Api(value = "ImpactOnContainerOperationController", tags = "対池子内数据产生影响的操作触发controller")
 public class ImpactOnContainerOperationController {
 
   @Autowired
@@ -33,10 +27,6 @@ public class ImpactOnContainerOperationController {
    * @return {@link ResponseVO}
    */
   @GetMapping("allDataPoint")
-  @ApiOperation(value = "刷新所有数据点", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiMyResponse
   public ResponseVO refreshAllDataPoint() {
     impactOnContainerOperation.refreshAllDataPoint();
     return ResponseVO.success();
@@ -49,10 +39,6 @@ public class ImpactOnContainerOperationController {
    * @return {@link ResponseVO}
    */
   @GetMapping("allGatherTunnelDataPoint")
-  @ApiOperation(value = "刷新所有采集通道数据点", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiMyResponse
   public ResponseVO refreshAllGatherTunnelDataPoint() {
     impactOnContainerOperation.refreshAllGatherTunnelDataPoint();
     return ResponseVO.success();
@@ -65,10 +51,6 @@ public class ImpactOnContainerOperationController {
    * @return {@link ResponseVO}
    */
   @GetMapping("allSenderTunnelDataPoint")
-  @ApiOperation(value = "刷新所有转发通道数据点", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiMyResponse
   public ResponseVO refreshAllSenderTunnelDataPoint() {
     impactOnContainerOperation.refreshAllSenderTunnelDataPoint();
     return ResponseVO.success();
@@ -81,10 +63,6 @@ public class ImpactOnContainerOperationController {
    * @return {@link ResponseVO}
    */
   @GetMapping("allPackerDataPoint")
-  @ApiOperation(value = "刷新所有数据组装器数据点", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiMyResponse
   public ResponseVO refreshAllEquipmentDataPoint() {
     impactOnContainerOperation.refreshAllEquipmentDataPoint();
     return ResponseVO.success();

ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/dataexchange/controller/PowerStationDataPackerController.java

@@ -3,11 +3,10 @@ package com.jiayue.ipfcst.dataexchange.controller;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.PowerLimitPlanSign;
 import com.jiayue.ipfcst.dataexchange.dataprocesser.datapacker.iml.PowerStationDataPacker;
-import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 审计
@@ -18,7 +17,6 @@ import springfox.documentation.annotations.ApiIgnore;
 @Slf4j
 @RequestMapping("powerStationDataPacker")
 @RestController
-@ApiIgnore
 public class PowerStationDataPackerController {
   @Autowired PowerStationDataPacker powerStationDataPacker;
 

ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/dataexchange/controller/ProtocolDataContainerController.java

@@ -1,35 +1,25 @@
 package com.jiayue.ipfcst.dataexchange.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
-import com.jiayue.ipfcst.common.data.entity.ProtocolGatherDataPoint;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.dataexchange.container.ProtocolDataContainer;
 import com.jiayue.ipfcst.dataexchange.service.ProtocolGatherDataPointService;
-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.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
 import java.util.Map;
 
 @Slf4j
 @RestController
 @RequestMapping("/protocolDataContainer")
-@Api(value = "ProtocolDataContainerController", tags = "点表关联controller")
 public class ProtocolDataContainerController {
 
   ProtocolDataContainer protocolDataContainer = ProtocolDataContainer.getInstance();
   @Autowired ProtocolGatherDataPointService protocolGatherDataPointService;
 
   @GetMapping
-  @ApiOperation(value = "采集点表实时数据列查询", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入点表实时数据</p>"
-  )
-  @ApiMyResponse
   public ResponseVO realTimeData(){
     try {
       Map map = protocolDataContainer.realTimeData();

ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/dataexchange/controller/ProtocolGatherDataPointController.java

@@ -1,19 +1,13 @@
 package com.jiayue.ipfcst.dataexchange.controller;
 
 import com.googlecode.aviator.AviatorEvaluator;
-import com.googlecode.aviator.exception.ExpressionRuntimeException;
 import com.jiayue.ipfcst.aop.SaveValidate;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.ProtocolGatherDataPoint;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.dataexchange.container.ProtocolDataContainer;
 import com.jiayue.ipfcst.dataexchange.repository.ProtocolGatherDataPointRepository;
 import com.jiayue.ipfcst.dataexchange.service.EquipmentAttributeService;
 import com.jiayue.ipfcst.dataexchange.service.ProtocolGatherDataPointService;
-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.*;
@@ -33,7 +27,6 @@ import java.util.regex.Pattern;
 @Slf4j
 @RestController
 @RequestMapping("/dataExchange/protocolDataPoint")
-@Api(value = "ProtocolGatherDataPointController", tags = "协议点位controller")
 public class ProtocolGatherDataPointController {
 
   private static final Pattern expr = Pattern.compile("(?<=P_).*?(?=_P)");
@@ -60,13 +53,6 @@ public class ProtocolGatherDataPointController {
    * @return ResponseVO gather data point
    */
   @GetMapping("/gatherDataPoint")
-  @ApiOperation(value = "查询符合点位实体描述的点位", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltProtocolGatherDataPoint&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "protocolGatherDataPoint",value = "ProtocolGatherDataPoint实体",dataType="ProtocolGatherDataPoint")
-  })
-  @ApiMyResponse
   public ResponseVO getGatherDataPoint(ProtocolGatherDataPoint protocolGatherDataPoint) {
     return ResponseVO.success(protocolGatherDataPointService.get(protocolGatherDataPoint));
   }
@@ -79,13 +65,6 @@ public class ProtocolGatherDataPointController {
    * @return ResponseVO 统一返回值
    */
   @GetMapping("/getByTunnelId/{tunnelId}")
-  @ApiOperation(value = "查询通道下的点位", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltProtocolGatherDataPoint&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "tunnelId",value = "通道ID",dataType="String")
-  })
-  @ApiMyResponse
   public ResponseVO getByTunnelId(@PathVariable("tunnelId") String tunnelId) {
     List<ProtocolGatherDataPoint> list = protocolGatherDataPointService.getByTunnelId(tunnelId);
     return ResponseVO.success(list);
@@ -100,15 +79,6 @@ public class ProtocolGatherDataPointController {
    * @return ResponseVO 统一返回值
    */
   @GetMapping("/getBytunnelAndEquipment/{tunnelId}/{equipmentId}/{equipmentType}")
-  @ApiOperation(value = "根据通道和设备查询", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltProtocolGatherDataPoint&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "tunnelId",value = "通道ID",dataType="String"),
-    @ApiImplicitParam(name= "equipmentId",value = "设备ID",dataType="String"),
-    @ApiImplicitParam(name= "equipmentType",value = "设备类型",dataType="Integer"),
-  })
-  @ApiMyResponse
   public ResponseVO getByTunnelAndEquipment(@PathVariable("tunnelId") String tunnelId, @PathVariable("equipmentId") String equipmentId, @PathVariable("equipmentType") Integer equipmentType) {
     try {
       List<ProtocolGatherDataPoint> list = protocolGatherDataPointService.getProtocolGatherDataPoint(tunnelId, equipmentId, equipmentType);
@@ -128,14 +98,6 @@ public class ProtocolGatherDataPointController {
    * @return ResponseVO gather data point
    */
   @GetMapping("/getProtocolGatherDataPoint/{equipmentId}/{equipmentAttributeId}")
-  @ApiOperation(value = "根据设备id和设备属性查询采集点表", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltProtocolGatherDataPoint&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "equipmentId",value = "设备ID",dataType="Integer"),
-    @ApiImplicitParam(name= "equipmentAttributeId",value = "设备属性ID",dataType="Integer"),
-  })
-  @ApiMyResponse
   public ResponseVO getProtocolGatherDataPoint(@PathVariable("equipmentId") Integer equipmentId, @PathVariable("equipmentAttributeId") Integer equipmentAttributeId) {
     try {
       List<ProtocolGatherDataPoint> list = this.protocolGatherDataPointService.getProtocolGatherDataPoint(equipmentId, equipmentAttributeId);
@@ -154,13 +116,6 @@ public class ProtocolGatherDataPointController {
    * @return ResponseVO gather data point
    */
   @GetMapping("/getDataPointById/{id}")
-  @ApiOperation(value = "根据点表id查询点表", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltProtocolGatherDataPoint&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "id",value = "主键ID",dataType="Integer"),
-  })
-  @ApiMyResponse
   public ResponseVO getDataPointById(@PathVariable("id") Integer id) {
     try {
       List<ProtocolGatherDataPoint> list = new ArrayList();
@@ -182,13 +137,6 @@ public class ProtocolGatherDataPointController {
    */
   @PostMapping("/saveDataPoint")
   @SaveValidate
-  @ApiOperation(value = "储存采集点位", httpMethod = "POST",
-    notes = "<p>返回ResponseVO对象，data属性存入ProtocolGatherDataPoint实体</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "protocolDataPoint",value = "ProtocolGatherDataPoint实体",dataType="ProtocolGatherDataPoint"),
-  })
-  @ApiMyResponse
   public ResponseVO saveGatherDataPoint(@RequestBody ProtocolGatherDataPoint protocolDataPoint) {
     return ResponseVO.success(protocolGatherDataPointService.save(protocolDataPoint));
   }
@@ -201,13 +149,6 @@ public class ProtocolGatherDataPointController {
    * @return ResponseVO response vo
    */
   @GetMapping("/checkFormula")
-  @ApiOperation(value = "校验公式是否可以执行", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "formula",value = "公式",dataType="String"),
-  })
-  @ApiMyResponse
   public ResponseVO checkFormula(String formula) {
     try {
       HashMap<String, Object> calculatingParameters = new HashMap<>();
@@ -244,13 +185,6 @@ public class ProtocolGatherDataPointController {
    */
   @PutMapping("/updateDataPoint")
   @SaveValidate
-  @ApiOperation(value = "储存采集点位", httpMethod = "PUT",
-    notes = "<p>返回ResponseVO对象，data属性存入ProtocolGatherDataPoint实体</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "protocolDataPoint",value = "ProtocolGatherDataPoint实体",dataType="ProtocolGatherDataPoint"),
-  })
-  @ApiMyResponse
   public ResponseVO updateGatherDataPoint(@RequestBody ProtocolGatherDataPoint protocolDataPoint) {
     return ResponseVO.success(protocolGatherDataPointService.save(protocolDataPoint));
   }
@@ -262,13 +196,6 @@ public class ProtocolGatherDataPointController {
    */
   @DeleteMapping("/deleteById/{id}")
   @SaveValidate
-  @ApiOperation(value = "删除采集点表", httpMethod = "DELETE",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "id",value = "主键ID",dataType="Integer"),
-  })
-  @ApiMyResponse
   public ResponseVO deleteById(@PathVariable("id") Integer id) {
     try {
       protocolGatherDataPointService.deleteById(id);
@@ -282,13 +209,6 @@ public class ProtocolGatherDataPointController {
 
   @DeleteMapping("/batchDeleteGatherDataPoint/{pointIds}")
   @SaveValidate
-  @ApiOperation(value = "批量删除采集点表", httpMethod = "DELETE",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "pointIds",value = "主键ID",dataType="Integer[]"),
-  })
-  @ApiMyResponse
   public ResponseVO batchDeleteGatherDataPoint(@PathVariable Integer[] pointIds) {
     try {
       for (int i = 0; i < pointIds.length; i++) {

ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/dataexchange/controller/ProtocolSenderDataPointController.java

@@ -11,7 +11,6 @@ import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.abst.equipmentinfo.AbstractEquipmentInfo;
 import com.jiayue.ipfcst.common.data.constant.enums.DataSourceEnum;
 import com.jiayue.ipfcst.common.data.entity.*;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.dataexchange.container.ProtocolTunnelContainer;
 import com.jiayue.ipfcst.dataexchange.exception.DataExchangeException;
 import com.jiayue.ipfcst.dataexchange.repository.ForecastForSendAttributeRepository;
@@ -21,10 +20,6 @@ import com.jiayue.ipfcst.dataexchange.service.ProtocolSenderDataPointService;
 import com.jiayue.ipfcst.dataexchange.service.TunnelInfoService;
 import com.jiayue.ipfcst.dataexchange.service.equipmentstatusdata.EquipmentInfoService;
 import com.jiayue.ipfcst.dataexchange.tunnelworker.senders.DataSenderInterface;
-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.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,7 +42,6 @@ import java.util.*;
 @Slf4j
 @RestController
 @RequestMapping("/dataExchange/senderProtocolDataPoint")
-@Api(value = "ProtocolGatherDataPointController", tags = "转发点表controller")
 //TODO 路径名未符合驼峰
 public class ProtocolSenderDataPointController {
   @Autowired
@@ -70,10 +64,6 @@ public class ProtocolSenderDataPointController {
    * @return ResponseVO response vo
    */
   @GetMapping("/senderDataPoint")
-  @ApiOperation(value = "查询所有转发点位", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltProtocolSenderDataPoint&gt</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getSenderDataPoint() {
     try {
       return ResponseVO.success(protocolSenderDataPointService.get());
@@ -85,10 +75,6 @@ public class ProtocolSenderDataPointController {
   }
 
   @GetMapping("/DataPoint")
-  @ApiOperation(value = "查询所有转发点位及设备属性", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getDataPoint() {
     try {
       List list = new ArrayList();
@@ -124,13 +110,6 @@ public class ProtocolSenderDataPointController {
 
 
   @GetMapping("/maxProtocolNoInTunnel")
-  @ApiOperation(value = "获取最大协议号", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入Integer协议号</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "tunnelId",value = "通道Id",dataType="String")
-  })
-  @ApiMyResponse
   public ResponseVO getMaxProtocolNoInTunnel(String tunnelId) {
     return ResponseVO.success(protocolSenderDataPointService.getMaxProtocolNoInTunnel(tunnelId));
   }
@@ -142,13 +121,6 @@ public class ProtocolSenderDataPointController {
    * @return ProtocolSenderDataPoint  protocol data  point
    */
   @GetMapping("/findByTunnelId/{tunnelId}")
-  @ApiOperation(value = "通过通道id查询转发点表", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "tunnelId",value = "通道Id",dataType="String")
-  })
-  @ApiMyResponse
   public ResponseVO findByTunnelId(@PathVariable("tunnelId") String tunnelId) {
     try {
       List<Map> list = protocolSenderDataPointService.getPointByTunnelId(tunnelId);
@@ -169,15 +141,6 @@ public class ProtocolSenderDataPointController {
    * @return ProtocolSenderDataPoint  protocol data  point
    */
   @GetMapping("/findByTunnelIdAndGatherPoint/{tunnelId}/{equipmentId}/{equipmentType}")
-  @ApiOperation(value = "通过通道id和采集id查询转发表", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "tunnelId",value = "通道Id",dataType="String"),
-    @ApiImplicitParam(name= "equipmentId",value = "设备Id",dataType="String"),
-    @ApiImplicitParam(name= "equipmentType",value = "设备类型",dataType="Integer"),
-  })
-  @ApiMyResponse
   public ResponseVO findByTunnelIdAndGatherPoint(@PathVariable("tunnelId") String tunnelId, @PathVariable("equipmentId") String equipmentId, @PathVariable("equipmentType") Integer equipmentType) {
     //TODO 代码不合理  需郑媛修改   方法所放置的类也不对   @CreateBy 修唯
     try {
@@ -198,13 +161,6 @@ public class ProtocolSenderDataPointController {
    */
   @PostMapping("/saveDataPoint")
   @SaveValidate
-  @ApiOperation(value = "保存转发点位", httpMethod = "POST",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "protocolSenderDataPoint",value = "ProtocolSenderDataPoint实体",dataType="ProtocolSenderDataPoint"),
-  })
-  @ApiMyResponse
   public ResponseVO saveSenderDataPoint(@RequestBody ProtocolSenderDataPoint protocolSenderDataPoint) {
     try {
       return ResponseVO.success(protocolSenderDataPointService.save(protocolSenderDataPoint));
@@ -223,13 +179,6 @@ public class ProtocolSenderDataPointController {
    */
   @PostMapping("/batchSaveForecastPoint")
   @SaveValidate
-  @ApiOperation(value = "批量保存转发点位", httpMethod = "POST",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "param",value = "json对象",dataType="JSONObject"),
-  })
-  @ApiMyResponse
   public ResponseVO batchSaveSenderDataPoint(@RequestBody JSONObject param) throws BusinessException {
     String tunnelId = param.getString("tunnelId");
     String protocolPointType = param.getString("protocolPointType");
@@ -279,13 +228,6 @@ public class ProtocolSenderDataPointController {
    */
   @PutMapping("/updateDataPoint")
   @SaveValidate
-  @ApiOperation(value = "修改转发点表", httpMethod = "PUT",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "protocolSenderDataPoint",value = "ProtocolSenderDataPoint实体",dataType="ProtocolSenderDataPoint"),
-  })
-  @ApiMyResponse
   public ResponseVO updateSenderDataPoint(@RequestBody ProtocolSenderDataPoint protocolSenderDataPoint) {
     try {
       return ResponseVO.success(protocolSenderDataPointService.save(protocolSenderDataPoint));
@@ -304,13 +246,6 @@ public class ProtocolSenderDataPointController {
    */
   @DeleteMapping("/deleteDataPoint/{id}")
   @SaveValidate
-  @ApiOperation(value = "删除转发点表", httpMethod = "DELETE",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "id",value = "主键ID",dataType="Integer"),
-  })
-  @ApiMyResponse
   public ResponseVO deleteById(@PathVariable("id") Integer id) {
     try {
       protocolSenderDataPointService.deleteById(id);
@@ -324,13 +259,6 @@ public class ProtocolSenderDataPointController {
 
   @DeleteMapping("/batchDeleteSenderDataPoint/{pointIds}")
   @SaveValidate
-  @ApiOperation(value = "批量删除转发点表", httpMethod = "DELETE",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "pointIds",value = "主键ID",dataType="Integer[]"),
-  })
-  @ApiMyResponse
   public ResponseVO batchDeleteGatherDataPoint(@PathVariable Integer[] pointIds) {
     try {
       for (int i = 0; i < pointIds.length; i++) {
@@ -354,14 +282,6 @@ public class ProtocolSenderDataPointController {
    * @return {@link ResponseVO}* @throws DataExchangeException 数据交换异常
    */
   @GetMapping("/setValueByManual/{pointId}/{value}")
-  @ApiOperation(value = "手动置数", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "pointId",value = "点位ID",dataType="Integer"),
-    @ApiImplicitParam(name= "value",value = "置数",dataType="Double"),
-  })
-  @ApiMyResponse
   @SaveValidate
   public ResponseVO setValueByManual(@PathVariable Integer pointId,@PathVariable Double value) throws DataExchangeException {
     ProtocolSenderDataPoint dataPoint=new ProtocolSenderDataPoint();
@@ -384,10 +304,6 @@ public class ProtocolSenderDataPointController {
   */
   @RequestMapping("/export")
   @SaveValidate
-  @ApiOperation(value = "导出", httpMethod = "GET",
-    notes = "<p>返回字节流</p>"
-  )
-  @ApiMyResponse
   public void export(HttpServletResponse response) {
     try{
       ExcelWriter writer = ExcelUtil.getWriter();

ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/dataexchange/controller/SendLogController.java

@@ -1,18 +1,13 @@
 package com.jiayue.ipfcst.dataexchange.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.dataexchange.service.SendLogService;
-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.*;
-
-import java.util.Date;
-import java.util.Map;
+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;
 /**
  * 回传日志的controller
  *
@@ -22,7 +17,6 @@ import java.util.Map;
 @Slf4j
 @RestController
 @RequestMapping("/sendLog")
-@Api(value = "SendLogController", tags = "回传日志controller")
 public class SendLogController {
   @Autowired SendLogService sendLogService;
 
@@ -35,16 +29,6 @@ public class SendLogController {
    * @return
    */
   @GetMapping("/{page}/{size}/{startTime}/{endTime}")
-  @ApiOperation(value = "分页获取数据", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入Page&ltSendLog&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
-    @ApiImplicitParam(name= "size",value = "条数",dataType="Integer"),
-    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
-    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
-  })
-  @ApiMyResponse
   public ResponseVO getAll(@PathVariable("page") Integer page,
     @PathVariable("size") Integer size,
     @PathVariable("startTime") Long startTime,
@@ -68,17 +52,6 @@ public class SendLogController {
    * @return
    */
   @GetMapping("/{page}/{size}/{startTime}/{endTime}/{tunnelId}")
-  @ApiOperation(value = "分页获取数据", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入Page&ltSendLog&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "page",value = "页码",dataType="Integer"),
-    @ApiImplicitParam(name= "size",value = "条数",dataType="Integer"),
-    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
-    @ApiImplicitParam(name= "endTime",value = "结束时间",dataType="Long"),
-    @ApiImplicitParam(name= "tunnelId",value = "通道ID",dataType="String"),
-  })
-  @ApiMyResponse
   public ResponseVO getAll(@PathVariable("page") Integer page,
     @PathVariable("size") Integer size,
     @PathVariable("startTime") Long startTime,
@@ -97,13 +70,6 @@ public class SendLogController {
    * 详细回传信息
    */
   @GetMapping("/{startTime}/{tunnelId}")
-  @ApiOperation(value = "详细回传信息", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "startTime",value = "开始时间",dataType="Long"),
-  })
-  @ApiMyResponse
   public ResponseVO getProDataPoint(@PathVariable("startTime") Long startTime,
     @PathVariable("tunnelId") String tunnelId){
     try {

ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/dataexchange/controller/TemplatePointController.java

@@ -2,13 +2,8 @@ package com.jiayue.ipfcst.dataexchange.controller;
 
 import com.jiayue.ipfcst.aop.SaveValidate;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.dataexchange.domain.TemplatePoint;
 import com.jiayue.ipfcst.dataexchange.service.TemplatePointService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -22,7 +17,6 @@ import java.util.List;
  */
 @RequestMapping("dataExchange")
 @RestController
-@Api(value = "TemplatePointController", tags = "模版点位对外接口controller")
 public class TemplatePointController {
 
 
@@ -41,13 +35,6 @@ public class TemplatePointController {
    */
   @PutMapping(value = "templatePoints")
   @SaveValidate
-  @ApiOperation(value = "批量向模版中添加点位", httpMethod = "PUT",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltTemplatePoint&gt实体</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "templatePoints",value = "TemplatePoint实体",dataType="List<TemplatePoint>")
-  })
-  @ApiMyResponse
   public ResponseVO addAll(@RequestBody List<TemplatePoint> templatePoints) {
     return ResponseVO.success(templatePointService.addAll(templatePoints));
   }
@@ -61,13 +48,6 @@ public class TemplatePointController {
    */
   @SaveValidate
   @PutMapping(value = "templatePoint")
-  @ApiOperation(value = "向模版中添加点位", httpMethod = "PUT",
-    notes = "<p>返回ResponseVO对象，data属性存入TemplatePoint实体</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "templatePoint",value = "TemplatePoint实体",dataType="TemplatePoint")
-  })
-  @ApiMyResponse
   public ResponseVO add(@RequestBody TemplatePoint templatePoint) {
     return ResponseVO.success(templatePointService.add(templatePoint));
   }
@@ -80,13 +60,6 @@ public class TemplatePointController {
    * @return ResponseVO 统一返回值格式
    */
   @GetMapping(value = "templatePoint")
-  @ApiOperation(value = "获取模版信息", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltTemplatePoint&gt实体</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "templatePoint",value = "TemplatePoint实体",dataType="TemplatePoint")
-  })
-  @ApiMyResponse
   public ResponseVO get(@ModelAttribute() TemplatePoint templatePoint) {
     return ResponseVO.success(templatePointService.get(templatePoint));
   }
@@ -100,13 +73,6 @@ public class TemplatePointController {
    */
   @PostMapping(value = "templatePoint")
   @SaveValidate
-  @ApiOperation(value = "修改模版点位", httpMethod = "POST",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "templatePoint",value = "TemplatePoint实体",dataType="TemplatePoint")
-  })
-  @ApiMyResponse
   public ResponseVO update(@RequestBody TemplatePoint templatePoint) {
     return ResponseVO.success(templatePointService.update(templatePoint));
   }
@@ -120,13 +86,6 @@ public class TemplatePointController {
    */
   @DeleteMapping(value = "templatePointById")
   @SaveValidate
-  @ApiOperation(value = "根据ID删除模版点位", httpMethod = "DELETE",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "templatePointId",value = "模板ID",dataType="Integer")
-  })
-  @ApiMyResponse
   public ResponseVO deleteById(@RequestBody Integer templatePointId) {
     templatePointService.deleteById(templatePointId);
     return ResponseVO.success();
@@ -141,13 +100,6 @@ public class TemplatePointController {
    */
   @DeleteMapping(value = "templatePoint")
   @SaveValidate
-  @ApiOperation(value = "删除符合条件的模版点位", httpMethod = "DELETE",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "templatePoint",value = "TemplatePoint实体",dataType="TemplatePoint")
-  })
-  @ApiMyResponse
   public ResponseVO delete(@RequestBody TemplatePoint templatePoint) {
     templatePointService.delete(templatePoint);
     return ResponseVO.success();

ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/dataexchange/controller/TunnelInfoController.java

@@ -6,14 +6,9 @@ import com.jiayue.ipfcst.common.core.exception.BusinessException;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.constant.enums.TunnelType;
 import com.jiayue.ipfcst.common.data.entity.BaseTunnelInfo;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.dataexchange.exception.DataExchangeException;
 import com.jiayue.ipfcst.dataexchange.service.ImpactOnContainerOperation;
 import com.jiayue.ipfcst.dataexchange.service.TunnelInfoService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.json.JSONObject;
@@ -32,7 +27,6 @@ import java.util.*;
 @RequestMapping("/TunnelInfo")
 @RestController
 @Slf4j
-@Api(value = "TunnelInfoController", tags = "通道对外接口controller")
 public class TunnelInfoController {
 
   @Autowired
@@ -47,10 +41,6 @@ public class TunnelInfoController {
    * @return ResponseVO  统一返回值格式
    */
   @GetMapping(value = "/getAllTunnel")
-  @ApiOperation(value = "获取所有的通道信息", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltBaseTunnelInfo&gt</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getAllTunnel() {
     try {
       List<BaseTunnelInfo> list = tunnelInfoService.getAllTunnel();
@@ -67,13 +57,6 @@ public class TunnelInfoController {
    */
   @SneakyThrows
   @GetMapping(value = "/getTunnel/{tunnelType}")
-  @ApiOperation(value = "根据通道类型来查询", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltBaseTunnelInfo&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "tunnelType",value = "通道类型",dataType="String")
-  })
-  @ApiMyResponse
   public ResponseVO getTunnel(@PathVariable String tunnelType) {
     try {
       List list = tunnelInfoService.findByTunnelType(tunnelType);
@@ -90,13 +73,6 @@ public class TunnelInfoController {
    */
   @PostMapping
   @SaveValidate
-  @ApiOperation(value = "保存", httpMethod = "POST",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "baseTunnelInfo",value = "通道信息实体",dataType="JSONObject")
-  })
-  @ApiMyResponse
   public ResponseVO saveTunnelInfo(@RequestBody JSONObject baseTunnelInfo)
     throws DataExchangeException {
     String type = baseTunnelInfo.getString("tunnelType");
@@ -112,13 +88,6 @@ public class TunnelInfoController {
   /*修改*/
   @PutMapping
   @SaveValidate
-  @ApiOperation(value = "修改", httpMethod = "PUT",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "baseTunnelInfo",value = "通道信息实体",dataType="JSONObject")
-  })
-  @ApiMyResponse
   public ResponseVO updateTunnelInfo(@RequestBody JSONObject baseTunnelInfo)
     throws BusinessException {
     String type = baseTunnelInfo.getString("tunnelType");
@@ -135,14 +104,6 @@ public class TunnelInfoController {
   @SneakyThrows
   @DeleteMapping(value = "/{id}/{tunnelType}")
   @SaveValidate
-  @ApiOperation(value = "删除通道及池中信息", httpMethod = "DELETE",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "id",value = "主键ID",dataType="String"),
-    @ApiImplicitParam(name= "tunnelType",value = "通道类型",dataType="String"),
-  })
-  @ApiMyResponse
   public ResponseVO delete(@PathVariable("id") String id, @PathVariable("tunnelType") String tunnelType) {
     try {
       this.tunnelInfoService.delete(id, tunnelType);
@@ -162,14 +123,6 @@ public class TunnelInfoController {
   @SneakyThrows
   @DeleteMapping(value = "/deleteDataPointById/{id}/{tunnelType}")
   @SaveValidate
-  @ApiOperation(value = "删除", httpMethod = "DELETE",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "id",value = "主键ID",dataType="String"),
-    @ApiImplicitParam(name= "tunnelType",value = "通道类型",dataType="String"),
-  })
-  @ApiMyResponse
   public ResponseVO deleteDataPointById(@PathVariable("id") String id, @PathVariable("tunnelType") String tunnelType) {
     try {
       this.tunnelInfoService.deleteDataPointById(id, tunnelType);
@@ -187,10 +140,6 @@ public class TunnelInfoController {
    * @return
    */
   @GetMapping(value = "/getServerSerialPorts")
-  @ApiOperation(value = "获取服务器所有的串口名称", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getServerSerialPorts() {
     List<String> ports = new ArrayList<>();
     Enumeration enumeration = CommPortIdentifier.getPortIdentifiers();
@@ -209,10 +158,6 @@ public class TunnelInfoController {
    * @return
    */
   @GetMapping(value = "/findbyMaster")
-  @ApiOperation(value = "将接入通道封装成映射类型", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getByMaster() {
     List<BaseTunnelInfo> baseTunnelInfos = tunnelInfoService.getAllGatherTunnel();
     List<Map<String, Object>> list = new ArrayList<>();

ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/dataexchange/controller/WindTowerStatusDataController.java

@@ -1,12 +1,8 @@
 package com.jiayue.ipfcst.dataexchange.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.dataexchange.service.equipmentstatusdata.WindTowerStatusDataService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -15,7 +11,6 @@ import java.util.Map;
 
 @RestController
 @RequestMapping("windTowerStatusData")
-@Api(value = "WindTowerStatusDataController", tags = "测风塔数据controller")
 public class WindTowerStatusDataController {
 
   @Autowired
@@ -28,10 +23,6 @@ public class WindTowerStatusDataController {
    * @return {@link ResponseVO}
    */
   @RequestMapping("/isAbnormal")
-  @ApiOperation(value = "获取测风塔数据是否是异常的数据", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiMyResponse
   public Map<String,Object> isAbnormal(){
     Map<String,Object> map = new HashMap<>();
     Boolean isAbnormalData = windTowerStatusDataService.getIsAbnormalData();

ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/controller/FeedbackFileLogController.java

@@ -10,7 +10,6 @@ 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;
@@ -20,7 +19,6 @@ import java.util.Map;
 @RestController
 @RequestMapping("feedbackFileLog")
 @Slf4j
-@ApiIgnore
 public class FeedbackFileLogController {
   @Autowired FeedbackFileLogService feedbackFileLogService;
 

ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/controller/UploadFileChannelController.java

@@ -5,17 +5,11 @@ import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.constant.enums.*;
 import com.jiayue.ipfcst.common.data.entity.UploadFileChannel;
 import com.jiayue.ipfcst.common.data.repository.UploadURLRepository;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.fileupload.service.UploadFileChannelService;
 import com.jiayue.ipfcst.fileupload.service.UploadURLService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,7 +24,6 @@ import java.util.Map;
 @RestController
 @Slf4j
 @RequestMapping("uploadFileChannel")
-@Api(value = "UploadFileChannelController", tags = "上报通道controller")
 public class UploadFileChannelController {
 
   private final UploadFileChannelService uploadFileChannelService;
@@ -53,13 +46,6 @@ public class UploadFileChannelController {
   @SneakyThrows
   @PostMapping
   @SaveValidate
-  @ApiOperation(value = "新增通道", httpMethod = "POST",
-    notes = "<p>返回ResponseVO对象，data属性存入UploadFileChannel实体</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "uploadFileChannel",value = "UploadFileChannel实体",dataType="UploadFileChannel")
-  })
-  @ApiMyResponse
   public ResponseVO add(@RequestBody UploadFileChannel uploadFileChannel) {
     UploadFileChannel save = uploadFileChannelService.save(uploadFileChannel);
     return ResponseVO.success(save);
@@ -75,13 +61,6 @@ public class UploadFileChannelController {
   @PutMapping
   @SaveValidate
   @Transactional
-  @ApiOperation(value = "修改通道", httpMethod = "PUT",
-    notes = "<p>返回ResponseVO对象，data属性存入UploadFileChannel实体</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "uploadFileChannel",value = "UploadFileChannel实体",dataType="UploadFileChannel")
-  })
-  @ApiMyResponse
   public ResponseVO update(@RequestBody UploadFileChannel uploadFileChannel) {
 
     uploadFileChannelService.save(uploadFileChannel);
@@ -104,13 +83,6 @@ public class UploadFileChannelController {
   @SneakyThrows
   @DeleteMapping("/{id}")
   @SaveValidate
-  @ApiOperation(value = "修改通道", httpMethod = "DELETE",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "id",value = "主键ID",dataType="Integer")
-  })
-  @ApiMyResponse
   public ResponseVO delete(@PathVariable Integer id) {
     UploadFileChannel uploadFileChannel = uploadFileChannelService.getById(id);
     uploadFileChannelService.delete(uploadFileChannel);
@@ -125,10 +97,6 @@ public class UploadFileChannelController {
    */
   @SneakyThrows
   @GetMapping
-  @ApiOperation(value = "查询通道", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltUploadFileChannel&gt</p>"
-  )
-  @ApiMyResponse
   public ResponseVO get() {
     List<UploadFileChannel> uploadFileChannels = uploadFileChannelService.get();
     return ResponseVO.success(uploadFileChannels);
@@ -155,10 +123,6 @@ public class UploadFileChannelController {
    */
   @SneakyThrows
   @GetMapping(value = "/getChannelStatusEnum")
-  @ApiOperation(value = "获取通道状态枚举类型", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入ChannelStatusEnum枚举</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getChannelStatusEnum() {
     List<Map<String, Object>> list = new ArrayList<>();
     Map<String, Object> map;
@@ -185,10 +149,6 @@ public class UploadFileChannelController {
    */
   @SneakyThrows
   @GetMapping(value = "/getUploadProtocolEnum")
-  @ApiOperation(value = "获取上报协议枚举类", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入UploadProtocolEnum枚举</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getUploadProtocolEnum() {
     List<Map<String, Object>> list = new ArrayList<>();
     Map<String, Object> map;
@@ -216,10 +176,6 @@ public class UploadFileChannelController {
    */
   @SneakyThrows
   @GetMapping(value = "/getUploadFileCharSetEnum")
-  @ApiOperation(value = "获取上报文件字符集", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入UploadFileCharSetEnum枚举</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getUploadFileCharSetEnum() {
     List<Map<String, Object>> list = new ArrayList<>();
     Map<String, Object> map;
@@ -246,10 +202,6 @@ public class UploadFileChannelController {
    */
   @SneakyThrows
   @GetMapping(value = "/getUploadFileNameLengthEnum")
-  @ApiOperation(value = "获取上报文件名称长度枚举", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入UploadFileNameLengthEnum枚举</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getUploadFileNameLengthEnum() {
     List<Map<String, Object>> list = new ArrayList<>();
     Map<String, Object> map;
@@ -276,10 +228,6 @@ public class UploadFileChannelController {
    */
   @SneakyThrows
   @GetMapping(value = "/getUploadFileSingleByteEnum")
-  @ApiOperation(value = "获取上报文件单次传输字节枚举类型", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入UploadFileSingleByteEnum枚举</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getUploadFileSingleByteEnum() {
     List<Map<String, Object>> list = new ArrayList<>();
     Map<String, Object> map;
@@ -306,10 +254,6 @@ public class UploadFileChannelController {
    */
   @SneakyThrows
   @GetMapping(value = "/getFtpPassiveModeEnum")
-  @ApiOperation(value = "获取ftp模式", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入FtpPassiveModeEnum枚举</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getFtpPassiveModeEnum() {
     List<Map<String, Object>> list = new ArrayList<>();
     Map<String, Object> map;
@@ -336,10 +280,6 @@ public class UploadFileChannelController {
    */
   @SneakyThrows
   @GetMapping(value = "/getChannelFileRuleEnum")
-  @ApiOperation(value = "获取通道文件生成规则", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入ChannelFileRuleEnum枚举</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getChannelFileRuleEnum() {
     List<Map<String, Object>> list = new ArrayList<>();
     Map<String, Object> map;
@@ -367,13 +307,6 @@ public class UploadFileChannelController {
   @SneakyThrows
   @DeleteMapping("/deleteByObjId/{id}")
   @SaveValidate
-  @ApiOperation(value = "根据对象ID删除通道", httpMethod = "DELETE",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "id",value = "主键ID",dataType="Integer")
-  })
-  @ApiMyResponse
   public ResponseVO deleteByObjId(@PathVariable Integer id) {
     try {
       uploadFileChannelService.deleteByObjId(id);

ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/controller/UploadFileCodeController.java

@@ -3,12 +3,7 @@ package com.jiayue.ipfcst.fileupload.controller;
 import com.jiayue.ipfcst.aop.SaveValidate;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.UploadFileCode;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.fileupload.service.UploadFileCodeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -16,7 +11,6 @@ import java.util.List;
 
 @RestController
 @RequestMapping("uploadFileCode")
-@Api(value = "UploadFileCodeController", tags = "上报文件CODE码controller")
 public class UploadFileCodeController {
   @Autowired
   private UploadFileCodeService uploadFileCodeService;
@@ -32,10 +26,6 @@ public class UploadFileCodeController {
    * @return
    */
   @GetMapping
-  @ApiOperation(value = "获取文件类型code数据", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltUploadFileCode&gt</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getAll(){
     List<UploadFileCode> uploadFileCodes = uploadFileCodeService.get();
     return ResponseVO.success(uploadFileCodes);
@@ -49,13 +39,6 @@ public class UploadFileCodeController {
    */
   @PostMapping
   @SaveValidate
-  @ApiOperation(value = "修改文件类型code数据", httpMethod = "POST",
-    notes = "<p>返回ResponseVO对象，data属性存入UploadFileCode实体</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "uploadFileCode",value = "UploadFileCode实体",dataType="UploadFileCode")
-  })
-  @ApiMyResponse
   public ResponseVO update(@RequestBody UploadFileCode uploadFileCode){
     return ResponseVO.success(uploadFileCodeService.save(uploadFileCode));
   }
@@ -68,13 +51,6 @@ public class UploadFileCodeController {
    */
   @PutMapping
   @SaveValidate
-  @ApiOperation(value = "新增文件类型code数据", httpMethod = "PUT",
-    notes = "<p>返回ResponseVO对象，data属性存入UploadFileCode实体</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "uploadFileCode",value = "UploadFileCode实体",dataType="UploadFileCode")
-  })
-  @ApiMyResponse
   public ResponseVO add(@RequestBody UploadFileCode uploadFileCode){
     return ResponseVO.success(uploadFileCodeService.save(uploadFileCode));
   }
@@ -87,13 +63,6 @@ public class UploadFileCodeController {
    */
   @DeleteMapping("/{id}")
   @SaveValidate
-  @ApiOperation(value = "删除文件类型code数据", httpMethod = "DELETE",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "id",value = "主键ID",dataType="Integer")
-  })
-  @ApiMyResponse
   public ResponseVO delete(@PathVariable Integer id){
     UploadFileCode uploadFileCode = new UploadFileCode();
     uploadFileCode.setId(id);

ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/controller/UploadFileLogController.java

@@ -5,12 +5,7 @@ import com.jiayue.ipfcst.common.data.constant.enums.FileStatusEnum;
 import com.jiayue.ipfcst.common.data.constant.enums.FileTypeEnum;
 import com.jiayue.ipfcst.common.data.constant.enums.UploadProtocolEnum;
 import com.jiayue.ipfcst.common.data.entity.UploadFileLog;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.fileupload.service.UploadFileLogService;
-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,7 +19,6 @@ import java.util.Map;
 @RestController
 @RequestMapping("uploadFileLog")
 @Slf4j
-@Api(value = "UploadFileLogController", tags = "上报文件日志controller")
 public class UploadFileLogController {
 
   private final UploadFileLogService uploadFileLogService;
@@ -44,16 +38,6 @@ public class UploadFileLogController {
    * @return
    */
   @GetMapping("getFileLog/{uploadObjectId}/{createTime}/{fileType}/{fileStatus}")
-  @ApiOperation(value = "根据上报对象、时间、文件类型、文件状态查询文件日志", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入Page&ltUploadFileLog&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "uploadObjectId",value = "对象ID",dataType="Integer"),
-    @ApiImplicitParam(name= "createTime",value = "生成时间",dataType="String"),
-    @ApiImplicitParam(name= "fileType",value = "文件类型",dataType="String"),
-    @ApiImplicitParam(name= "fileStatus",value = "文件状态",dataType="String"),
-  })
-  @ApiMyResponse
   public ResponseVO get(@PathVariable("uploadObjectId") Integer uploadObjectId, @PathVariable("createTime") String createTime,
                         @PathVariable("fileType") String fileType, @PathVariable("fileStatus") String fileStatus) {
     List<UploadFileLog> list = uploadFileLogService.queryFileLog(uploadObjectId, createTime, fileType, fileStatus);
@@ -61,10 +45,6 @@ public class UploadFileLogController {
   }
 
   @GetMapping("/getFileStatusEnum")
-  @ApiOperation(value = "获取文件状态类型", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入FileStatusEnum枚举</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getFileStatusEnum() {
     List list = new ArrayList<>();
     for (FileStatusEnum fileStatusEnum : FileStatusEnum.values()) {
@@ -77,10 +57,6 @@ public class UploadFileLogController {
   }
 
   @GetMapping("/getUploadProtocolEnum")
-  @ApiOperation(value = "获取上报协议", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入UploadProtocolEnum枚举</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getUploadProtocolEnum() {
     List list = new ArrayList<>();
     for (UploadProtocolEnum uploadProtocolEnum : UploadProtocolEnum.values()) {
@@ -93,10 +69,6 @@ public class UploadFileLogController {
   }
 
   @GetMapping("/getFileTypeEnum")
-  @ApiOperation(value = "获取文件类型", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入FileTypeEnum枚举</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getFileTypeEnum() {
     List list = new ArrayList<>();
     for (FileTypeEnum fileTypeEnum : FileTypeEnum.values()) {
@@ -109,15 +81,6 @@ public class UploadFileLogController {
   }
 
   @PostMapping("/uploadFile")
-  @ApiOperation(value = "上传文件", httpMethod = "POST",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "file",value = "文件",dataType="MultipartFile"),
-    @ApiImplicitParam(name= "uploadObject",value = "对象ID",dataType="String"),
-    @ApiImplicitParam(name= "FileTypeEnum",value = "文件类型",dataType="String"),
-  })
-  @ApiMyResponse
   public ResponseVO uploadFile(@RequestParam("file") MultipartFile file, @RequestParam("uploadObject") String id, @RequestParam("FileTypeEnum") String fileType) {
     Integer objectId = Integer.parseInt(id);
 
@@ -130,26 +93,12 @@ public class UploadFileLogController {
   }
 
   @DeleteMapping("/{id}")
-  @ApiOperation(value = "根据主键ID删除文件", httpMethod = "DELETE",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "id",value = "主键ID",dataType="Integer")
-  })
-  @ApiMyResponse
   public ResponseVO deleteById(@PathVariable("id") Integer id){
     uploadFileLogService.deleteById(id);
     return ResponseVO.success(1);
   }
 
   @PostMapping("/cleanCache")
-  @ApiOperation(value = "清楚文件缓存", httpMethod = "POST",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "uploadFileLog",value = "UploadFileLog实体",dataType="UploadFileLog")
-  })
-  @ApiMyResponse
   public ResponseVO cleanCache(@RequestBody UploadFileLog uploadFileLog){
     uploadFileLogService.cleanCache(uploadFileLog);
     return ResponseVO.success(1);
@@ -162,13 +111,6 @@ public class UploadFileLogController {
    * @return
    */
   @PostMapping("/report")
-  @ApiOperation(value = "文件补报", httpMethod = "POST",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "uploadFileLog",value = "UploadFileLog实体",dataType="UploadFileLog")
-  })
-  @ApiMyResponse
   public ResponseVO report(@RequestBody UploadFileLog uploadFileLog){
     uploadFileLogService.report(uploadFileLog);
     return ResponseVO.success(1);
@@ -180,13 +122,6 @@ public class UploadFileLogController {
    * @return
    */
   @PostMapping("/quickReport")
-  @ApiOperation(value = "一键文件补报", httpMethod = "POST",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "uploadFileLogList",value = "UploadFileLog实体",dataType="List")
-  })
-  @ApiMyResponse
   public ResponseVO quickReport(@RequestBody List<UploadFileLog> uploadFileLogList){
     uploadFileLogService.quickReport(uploadFileLogList);
     return ResponseVO.success(1);

ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/controller/UploadFileLogDetailController.java

@@ -6,14 +6,12 @@ import com.jiayue.ipfcst.fileupload.service.UploadFileLogDetailService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 
 @RestController
 @RequestMapping("uploadFileLogDetail")
 @Slf4j
-@ApiIgnore
 public class UploadFileLogDetailController {
   private final UploadFileLogDetailService uploadFileLogDetailService;
   @Autowired

ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/controller/UploadFileOpenInterfaceController.java

@@ -2,18 +2,12 @@ package com.jiayue.ipfcst.fileupload.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.UploadFileLog;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.fileupload.service.UploadFileLogService;
 import com.jiayue.ipfcst.fileupload.util.FileConstant;
-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.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.List;
@@ -28,7 +22,6 @@ import java.util.Map;
 @RestController
 @RequestMapping("uploadFileOpenInterface")
 @Slf4j
-@Api(value = "UploadFileOpenInterfaceController", tags = "给reportquery提供接口controller")
 public class UploadFileOpenInterfaceController {
 
   private final UploadFileLogService uploadFileLogService;
@@ -42,10 +35,6 @@ public class UploadFileOpenInterfaceController {
    * @return
    */
   @RequestMapping(value = "/getFileCache")
-  @ApiOperation(value = "查看上报缓存中的文件", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入FileConstant.readyUploadFileMap文件缓存</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getFileCache() {
     log.info("访问上报缓存。。。。。。。");
     List list = new ArrayList<>();
@@ -63,7 +52,6 @@ public class UploadFileOpenInterfaceController {
    * @return
    */
   @RequestMapping(value = "/updateD5000FileStatus/{remoteIp}/{fileName}/{uploadStatus}")
-  @ApiIgnore
   public String updateD5000FileStatus(@PathVariable final String remoteIp, @PathVariable final String fileName, @PathVariable final String uploadStatus) {
     try {
       uploadFileLogService.updateD5000FileStatus(remoteIp, fileName,uploadStatus);
@@ -79,10 +67,6 @@ public class UploadFileOpenInterfaceController {
    * @return
    */
   @RequestMapping(value = "/getUploadObjectStatus")
-  @ApiOperation(value = "获取上报对象状态", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入FileConstant.channelStatusMap上报通道状态</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getUploadObjectStatus() {
     log.info("获取上报对象状态。。。。。。。");
     List list = new ArrayList<>();

ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/controller/UploadObjectController.java

@@ -4,19 +4,14 @@ import com.jiayue.ipfcst.aop.SaveValidate;
 import com.jiayue.ipfcst.common.core.exception.BusinessException;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.constant.enums.FileTypeEnum;
-import com.jiayue.ipfcst.common.data.entity.*;
+import com.jiayue.ipfcst.common.data.entity.UploadFileChannel;
+import com.jiayue.ipfcst.common.data.entity.UploadObject;
 import com.jiayue.ipfcst.common.data.repository.UploadObjectRepository;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.fileupload.service.UploadFileChannelService;
 import com.jiayue.ipfcst.fileupload.service.UploadObjectService;
-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.*;
-import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -27,7 +22,6 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("uploadObject")
 @Slf4j
-@Api(value = "UploadObjectController", tags = "上报对象controller")
 public class UploadObjectController {
   @Autowired
   private final UploadObjectService uploadObjectService;
@@ -44,10 +38,6 @@ public class UploadObjectController {
    * @return
    */
   @GetMapping()
-  @ApiOperation(value = "获取通道对象", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入Page&ltUploadObject&gt</p>"
-  )
-  @ApiMyResponse
   public ResponseVO get() {
     List list = new ArrayList();
     List<UploadObject> uploadObjectList = uploadObjectService.get();
@@ -62,13 +52,6 @@ public class UploadObjectController {
    */
   @PostMapping
   @SaveValidate
-  @ApiOperation(value = "保存通道对象", httpMethod = "POST",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "uploadObject",value = "UploadObject实体",dataType="UploadObject")
-  })
-  @ApiMyResponse
   public ResponseVO add(@RequestBody UploadObject uploadObject) {
     try {
       uploadObjectService.save(uploadObject);
@@ -87,13 +70,6 @@ public class UploadObjectController {
    */
   @PutMapping
   @SaveValidate
-  @ApiOperation(value = "更新通道对象", httpMethod = "PUT",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "uploadObject",value = "UploadObject实体",dataType="UploadObject")
-  })
-  @ApiMyResponse
   public ResponseVO update(@RequestBody UploadObject uploadObject) {
     try {
       uploadObjectService.save(uploadObject);
@@ -113,13 +89,6 @@ public class UploadObjectController {
    */
   @DeleteMapping("/{id}")
   @SaveValidate
-  @ApiOperation(value = "删除通道对象", httpMethod = "DELETE",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "id",value = "主键ID",dataType="Integer")
-  })
-  @ApiMyResponse
   public ResponseVO delete(@PathVariable Integer id) {
     try {
       uploadFileChannelService.deleteByObjId(id);
@@ -136,10 +105,6 @@ public class UploadObjectController {
    * 获取文件上报类型
    */
   @GetMapping("getFileType")
-  @ApiOperation(value = "获取文件上报类型", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入FileTypeEnum枚举</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getFileType() {
     List list = new ArrayList();
     try {
@@ -164,13 +129,6 @@ public class UploadObjectController {
    * @return UploadObject 上报对象
    */
   @GetMapping("getByuploadObjectId/{uploadObjectId}")
-  @ApiOperation(value = "根据上报id查询对象", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltUploadObject&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "uploadObjectId",value = "uploadObjectId对象ID",dataType="Integer"),
-  })
-  @ApiMyResponse
   public ResponseVO getFileTypeByupId(@PathVariable("uploadObjectId") Integer uploadObjectId){
     List list = new ArrayList();
     UploadObject uploadObject = uploadObjectRepository.findById(uploadObjectId).get();
@@ -182,10 +140,6 @@ public class UploadObjectController {
    * 获取对应省份的上报文件类型
    */
   @GetMapping("getFileTypeByProvince")
-  @ApiOperation(value = "获取对应省份的上报文件类型", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入省份所属的文件类型集合</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getFileTypeByProvince(){
     Map<String, String> uploadFileType = uploadObjectService.getUploadFileType();
     List<Map<String, String>> list = new ArrayList<>();
@@ -206,10 +160,6 @@ public class UploadObjectController {
    * 获取所有FTPSFTP通道 whc
    */
   @GetMapping("getFtpSftpChannel")
-  @ApiOperation(value = "获取所有FTPSFTP通道", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltUploadFileChannel&gt</p>"
-  )
-  @ApiMyResponse
   public ResponseVO getAllFtpSftp(){
     //获取所有上报对象
     List<UploadObject> uploadObjectList = uploadObjectService.get();
@@ -238,7 +188,6 @@ public class UploadObjectController {
    * @return Boolean
    */
   @GetMapping("/checkE402")
-  @ApiIgnore
   public ResponseVO checkE402() throws BusinessException {
 
     return ResponseVO.success(uploadObjectService.checkE402());

ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/controller/UploadURLController.java

@@ -2,12 +2,7 @@ package com.jiayue.ipfcst.fileupload.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.UploadURL;
-import com.jiayue.ipfcst.common.data.strategy.ApiMyResponse;
 import com.jiayue.ipfcst.fileupload.service.UploadURLService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -15,20 +10,12 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 @RestController
-@Api(value = "UploadURLController", tags = "sftp/sftp上报路径controller")
 public class UploadURLController {
   @Autowired
   private UploadURLService uploadURLService;
 
   @GetMapping("/uploadURL/{uploadChannelId}")
   @Transactional
-  @ApiOperation(value = "根据通道id获取路径", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入List&ltUploadURL&gt</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "uploadChannelId",value = "通道ID",dataType="Integer")
-  })
-  @ApiMyResponse
   public ResponseVO findByUploadChannelId(@PathVariable Integer uploadChannelId){
     List<UploadURL> byUploadCahnnelId = uploadURLService.findByUploadCahnnelId(uploadChannelId);
 
@@ -37,13 +24,6 @@ public class UploadURLController {
 
   @PostMapping("/uploadURL")
   @Transactional
-  @ApiOperation(value = "保存路径", httpMethod = "POST",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "uploadURL",value = "UploadURL实体",dataType="UploadURL")
-  })
-  @ApiMyResponse
   public ResponseVO save(@RequestBody UploadURL uploadURL){
     uploadURLService.save(uploadURL);
     return ResponseVO.success();
@@ -52,13 +32,6 @@ public class UploadURLController {
 
   @DeleteMapping("/uploadURL/{id}")
   @Transactional
-  @ApiOperation(value = "删除路径", httpMethod = "DELETE",
-    notes = "<p>返回ResponseVO对象</p>"
-  )
-  @ApiImplicitParams(value={
-    @ApiImplicitParam(name= "id",value = "主键ID",dataType="Integer")
-  })
-  @ApiMyResponse
   public ResponseVO delete(@PathVariable Integer id){
 
     uploadURLService.deleteByChannelId(id);

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

@@ -1,8 +1,6 @@
 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;
@@ -11,11 +9,7 @@ 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;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -28,7 +22,6 @@ import java.util.Map;
 @RestController
 @Slf4j
 @RequestMapping("accuracyPassRate")
-@Api(value = "AccuracyPassRateController", tags = "光伏准确率合格率controller")
 public class AccuracyPassRateController {
   private final AccuracyPassRateService accuracyPassRateService;
 
@@ -45,16 +38,6 @@ 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,
@@ -79,7 +62,6 @@ 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,
@@ -105,16 +87,6 @@ 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,
@@ -139,15 +111,6 @@ 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) {
@@ -169,7 +132,6 @@ 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,20 +1,15 @@
 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;
@@ -29,7 +24,6 @@ import java.util.Map;
 @RestController
 @Slf4j
 @RequestMapping("accuracyPassRateOne")
-@Api(value = "AccuracyPassRateOneController", tags = "风电准确率合格率controller")
 public class AccuracyPassRateOneController {
   private final AccuracyPassRateOneService accuracyPassRateOneService;
 
@@ -46,16 +40,6 @@ 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,
@@ -81,7 +65,6 @@ 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,
@@ -106,16 +89,6 @@ 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,
@@ -140,15 +113,6 @@ 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) {
@@ -170,7 +134,6 @@ 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

@@ -1,27 +1,27 @@
 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.entity.DisplayConfig;
+import com.jiayue.ipfcst.common.data.entity.ElectricField;
+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.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import com.jiayue.ipfcst.service.ComprehensiveContrastService;
+import com.jiayue.ipfcst.service.DisplayConfigService;
+import com.jiayue.ipfcst.service.ElectricFieldService;
 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;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 上报对比查询restful接口
@@ -32,7 +32,6 @@ import java.util.*;
  */
 @RestController
 @Slf4j
-@Api(value = "ComprehensiveContrastController", tags = "上报综合数据controller")
 public class ComprehensiveContrastController {
   private final ComprehensiveContrastService comprehensiveContrastService;
   private final DisplayConfigService displayConfigService;
@@ -60,20 +59,6 @@ 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,
@@ -88,7 +73,6 @@ public class ComprehensiveContrastController {
   }
 
   @GetMapping("/comprehensiveContrast/getSpeedColumn")
-  @ApiIgnore
   public ResponseVO getSpeedColumn() {
 
     SysParameter sysParameter = sysParameterRepository.findBySysKeyEquals("NWP_CHANGE_WIND");
@@ -141,20 +125,6 @@ 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,
@@ -473,7 +443,6 @@ 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,13 +7,11 @@ 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

@@ -1,18 +1,15 @@
 package com.jiayue.ipfcst.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
-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.common.data.entity.ChannelAlarmInfo;
+import com.jiayue.ipfcst.common.data.entity.ChannelDisconLog;
+import com.jiayue.ipfcst.common.data.entity.PowerLimitPlanSign;
 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.*;
 
@@ -25,7 +22,6 @@ import java.util.*;
 @RestController
 @RequestMapping("/dashboard")
 @Slf4j
-@Api(value = "DashboardController", tags = "首页controller")
 public class DashboardController {
   private final DashboardService dashboardService;
 
@@ -39,15 +35,6 @@ 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());
   }
@@ -58,12 +45,6 @@ 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());
   }
@@ -74,12 +55,6 @@ 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());
   }
@@ -90,10 +65,6 @@ 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));
   }
@@ -103,14 +74,6 @@ 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());
@@ -125,10 +88,6 @@ 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()) {
@@ -145,10 +104,6 @@ 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()) {
@@ -164,10 +119,6 @@ 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{
@@ -183,7 +134,6 @@ public class DashboardController {
    * @return 结果集
    */
   @GetMapping(value = "/getPowerLimitPlanSign")
-  @ApiIgnore
   public ResponseVO getPowerLimitPlanSign(){
     try{
       return ResponseVO.success(dashboardService.getPowerLimitPlanSign());
@@ -200,7 +150,6 @@ public class DashboardController {
    * @return 执行结果
    */
   @PostMapping(value = "/savePowerLimitPlanSign")
-  @ApiIgnore
   public ResponseVO savePowerLimitPlanSign(@RequestBody PowerLimitPlanSign powerLimitPlanSign) {
     try {
       this.dashboardService.savePowerLimitPlanSign(powerLimitPlanSign);
@@ -215,7 +164,6 @@ public class DashboardController {
    * 获取首页通道告警不提示
    */
   @GetMapping(value = "/getChannelAlarmInfo")
-  @ApiIgnore
   public ResponseVO getChannelAlarmInfo(){
     try{
       return ResponseVO.success(dashboardService.getChannelAlarmInfo());
@@ -231,7 +179,6 @@ public class DashboardController {
    *
    */
   @PostMapping(value = "/saveAllChannelAlarmInfo")
-  @ApiIgnore
   public ResponseVO saveChannelAlarmInfo(@RequestBody List<ChannelAlarmInfo> channelAlarmInfos){
     try{
       dashboardService.saveChannelAlarmInfoAll(channelAlarmInfos);
@@ -245,7 +192,6 @@ public class DashboardController {
    * 获取系统版本号
    */
   @GetMapping(value = "/getSysVersion")
-  @ApiIgnore
   public ResponseVO getSysVersion(){
     try{
       return ResponseVO.success(dashboardService.getSysVersion());
@@ -259,7 +205,6 @@ public class DashboardController {
    * 获取系统版本号
    */
   @GetMapping(value = "/getIsAbnormal")
-  @ApiIgnore
   public ResponseVO getIsAbnormal(){
     try{
       return ResponseVO.success(dashboardService.getIsAbnormal());
@@ -273,7 +218,6 @@ public class DashboardController {
    * @return 结果集
    */
   @GetMapping(value = "/getServerTime")
-  @ApiIgnore
   public ResponseVO getServerTime(){
     try{
       Date d = new Date();
@@ -288,10 +232,6 @@ 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());
   }
@@ -304,10 +244,6 @@ 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

@@ -1,14 +1,8 @@
 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 com.jiayue.ipfcst.service.DisplayConfigService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -22,7 +16,6 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @Slf4j
-@Api(value = "DisplayConfigController", tags = "展示配置controller")
 public class DisplayConfigController {
   private final DisplayConfigService displayConfigService;
 
@@ -39,13 +32,6 @@ 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{
@@ -63,13 +49,6 @@ 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 {
@@ -89,10 +68,6 @@ public class DisplayConfigController {
    * 查询数据时间间隔设置
    */
   @GetMapping("displayConfig/timeInterval")
-  @ApiOperation(value = "查询数据时间间隔设置", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入DisplayConfig实体</p>"
-  )
-  @ApiMyResponse
   public ResponseVO displayConfigTimeInterval() {
     DisplayConfig displayConfig;
     try {
@@ -110,10 +85,6 @@ public class DisplayConfigController {
    * 查询分页固定设置
    */
   @GetMapping("displayConfig/pageSize")
-  @ApiOperation(value = "查询分页固定设置", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入DisplayConfig实体</p>"
-  )
-  @ApiMyResponse
   public ResponseVO displayConfigPageSize() {
     DisplayConfig displayConfig;
     try {
@@ -127,10 +98,6 @@ public class DisplayConfigController {
   }
 
   @GetMapping("displayConfig/eqTimeInterval")
-  @ApiOperation(value = "查询设备数据时间间隔设置", httpMethod = "GET",
-    notes = "<p>返回ResponseVO对象，data属性存入DisplayConfig实体</p>"
-  )
-  @ApiMyResponse
   public ResponseVO displayConfigEqTimeInterval(){
     DisplayConfig displayConfig;
     try {
@@ -145,13 +112,6 @@ 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,15 +4,11 @@ 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;
@@ -26,7 +22,6 @@ import java.util.Date;
  */
 @RestController
 @Slf4j
-@Api(value = "ElectricFieldController", tags = "场站信息controller")
 public class ElectricFieldController {
   private final ElectricFieldService electricFieldService;
 
@@ -42,10 +37,6 @@ 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{
@@ -63,7 +54,6 @@ 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,12 +5,7 @@ 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;
@@ -31,7 +26,6 @@ import java.util.Map;
 @Slf4j
 @RestController
 @RequestMapping("environmentalData")
-@Api(value = "EnvironmentalDataController", tags = "光伏环境数据controller")
 public class EnvironmentalDataController {
   private final EnvironmentalDataService environmentalDataService;
 
@@ -41,20 +35,6 @@ 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);
@@ -62,23 +42,11 @@ 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));
   }
@@ -89,15 +57,6 @@ 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,13 +5,8 @@ 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;
@@ -32,7 +27,6 @@ import java.util.Map;
 @Slf4j
 @RestController
 @RequestMapping("environmentalDataOne")
-@Api(value = "EnvironmentalDataController", tags = "风电环境数据controller")
 public class EnvironmentalDataOneController {
   private final EnvironmentalDataOneService environmentalDataOneService;
 
@@ -42,20 +36,6 @@ 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);
@@ -63,23 +43,11 @@ 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));
   }
@@ -90,15 +58,6 @@ 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,12 +1,7 @@
 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;
@@ -24,18 +19,11 @@ 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

@@ -5,8 +5,10 @@ import com.jiayue.ipfcst.service.ExportFileService;
 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 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 javax.servlet.http.HttpServletResponse;
 import java.util.Map;
@@ -21,7 +23,6 @@ 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,24 +5,21 @@ 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;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 短期预测信息restful接口
@@ -33,7 +30,6 @@ import java.util.*;
  */
 @RestController
 @Slf4j
-@Api(value = "ForecastPowerShortTermController", tags = "光伏短期实时controller")
 public class ForecastPowerShortTermController {
   private final ForecastPowerShortTermService forecastPowerShortTermService;
   private final ElectricFieldService electricFieldService;
@@ -52,16 +48,6 @@ 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<>();
@@ -84,18 +70,6 @@ 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,
@@ -116,7 +90,6 @@ 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,22 +2,13 @@ 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;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -30,7 +21,6 @@ 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

@@ -3,24 +3,17 @@ package com.jiayue.ipfcst.controller;
 import com.jiayue.ipfcst.common.core.exception.BusinessException;
 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.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;
@@ -38,7 +31,6 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
-@Api(value = "ForecastPowerShortTermOneController", tags = "风电短期实时controller")
 public class ForecastPowerShortTermOneController {
   private final ForecastPowerShortTermOneService forecastPowerShortTermOneService;
   private final ElectricFieldService electricFieldService;
@@ -57,16 +49,6 @@ 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<>();
@@ -89,18 +71,6 @@ 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,
@@ -121,7 +91,6 @@ 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

@@ -11,11 +11,9 @@ import com.jiayue.ipfcst.service.ForecastPowerThroughoutTheYearService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.time.DateUtils;
-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;
@@ -30,7 +28,6 @@ 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

@@ -1,14 +1,12 @@
 package com.jiayue.ipfcst.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
-import com.jiayue.ipfcst.service.ForecastPowerShortTermService;
 import com.jiayue.ipfcst.service.ForecastPowerUltraShortTermService;
 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;
@@ -22,7 +20,6 @@ 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,19 +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.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;
@@ -27,7 +20,6 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
-@Api(value = "ForecastPowerUltraShortTermHisController", tags = "光伏超短期16时刻controller")
 public class ForecastPowerUltraShortTermHisController {
   private final ForecastPowerUltraShortTermHisService forecastPowerUltraShortTermHisService;
   @Autowired
@@ -42,7 +34,6 @@ 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){
@@ -63,15 +54,6 @@ 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,16 +1,13 @@
 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;
@@ -24,7 +21,6 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
-@Api(value = "ForecastPowerUltraShortTermOneHisController", tags = "风电超短期16时刻controller")
 public class ForecastPowerUltraShortTermOneHisController {
   private final ForecastPowerUltraShortTermOneHisService forecastPowerUltraShortTermOneHisService;
   @Autowired
@@ -39,7 +35,6 @@ 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){
@@ -60,14 +55,6 @@ 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,12 +2,7 @@ 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;
@@ -25,7 +20,6 @@ import java.util.List;
  */
 @RestController
 @Slf4j
-@Api(value = "InverterInfoController", tags = "逆变器信息controller")
 public class InverterInfoController {
   private final InverterInfoService inverterInfoService;
   @Autowired
@@ -38,10 +32,6 @@ 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

@@ -1,15 +1,10 @@
 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.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;
@@ -27,7 +22,6 @@ import java.util.stream.Collectors;
 
 @RestController
 @Slf4j
-@Api(value = "InverterStatusDataController", tags = "逆变器数据controller")
 public class InverterStatusDataController {
 
   private final InverterStatusDataService inverterStatusDataService;
@@ -52,20 +46,6 @@ 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,
@@ -93,21 +73,6 @@ 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,
@@ -135,15 +100,6 @@ 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

@@ -2,15 +2,7 @@ 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.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;
@@ -22,7 +14,6 @@ import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -36,7 +27,6 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
-@Api(value = "NwpController", tags = "光伏nwp-controller")
 public class NwpController {
   private final NwpService nwpService;
   @Autowired
@@ -51,17 +41,6 @@ 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<>();
@@ -85,18 +64,6 @@ 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,
@@ -121,14 +88,6 @@ 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
@@ -179,10 +138,6 @@ 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,12 +2,7 @@ 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;
@@ -32,7 +27,6 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
-@Api(value = "NwpController", tags = "风电nwp-controller")
 public class NwpOneController {
   private final NwpOneService nwpOneService;
 
@@ -48,17 +42,6 @@ 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<>();
@@ -82,18 +65,6 @@ 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,
@@ -118,14 +89,6 @@ 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
@@ -176,10 +139,6 @@ 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,7 +8,6 @@ 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;
@@ -28,7 +27,6 @@ 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,19 +4,13 @@ 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;
@@ -37,7 +31,6 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
-@Api(value = "PowerStationStatusDataController", tags = "光伏实际功率controller")
 public class PowerStationStatusDataController {
 
   private final PowerStationStatusDataService powerStationStatusDataService;
@@ -57,14 +50,6 @@ 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<>();
@@ -89,18 +74,6 @@ 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,
@@ -125,7 +98,6 @@ public class PowerStationStatusDataController {
    * @return
    */
   @GetMapping(value = "/balkPower/{startTime}/{endTime}")
-  @ApiIgnore
   public ResponseVO findBalkPower(@PathVariable("startTime") Long startTime,
                                   @PathVariable("endTime") Long endTime) {
     try {
@@ -147,7 +119,6 @@ public class PowerStationStatusDataController {
    * @return
    */
   @GetMapping(value = "export/powerStationStatus/{startTime}/{endTime}")
-  @ApiIgnore
   public ResponseVO export(@PathVariable("startTime") Long startTime,
                            @PathVariable("endTime") Long endTime,
                            HttpServletResponse response

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

@@ -1,24 +1,17 @@
 package com.jiayue.ipfcst.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
-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;
@@ -39,7 +32,6 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
-@Api(value = "PowerStationStatusDataController", tags = "风电实际功率controller")
 public class PowerStationStatusDataOneController {
 
   private final PowerStationStatusDataOneService powerStationStatusDataOneService;
@@ -59,14 +51,6 @@ 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<>();
@@ -91,18 +75,6 @@ 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,
@@ -127,7 +99,6 @@ public class PowerStationStatusDataOneController {
    * @return
    */
   @GetMapping(value = "/balkPowerOne/{startTime}/{endTime}")
-  @ApiIgnore
   public ResponseVO findBalkPower(@PathVariable("startTime") Long startTime,
                                   @PathVariable("endTime") Long endTime) {
     try {
@@ -151,7 +122,6 @@ public class PowerStationStatusDataOneController {
    * @return
    */
   @GetMapping(value = "export/powerStationStatusOne/{startTime}/{endTime}")
-  @ApiIgnore
   public ResponseVO export(@PathVariable("startTime") Long startTime,
                            @PathVariable("endTime") Long endTime,
                            HttpServletResponse response

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

@@ -5,12 +5,7 @@ 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;
@@ -37,7 +32,6 @@ import java.util.Map;
 @RestController
 @Slf4j
 @RequestMapping("prValue")
-@Api(value = "PrValueController", tags = "pr值controller")
 public class PrValueController {
 
   private final PrValueService prValueService;
@@ -48,14 +42,6 @@ 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);
@@ -67,14 +53,6 @@ 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,9 +8,9 @@ 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.*;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 接入数据点位restful接口
@@ -21,7 +21,6 @@ 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,7 +8,6 @@ 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;
@@ -25,7 +24,6 @@ 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,7 +12,6 @@ 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;
@@ -35,7 +34,6 @@ 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

@@ -3,8 +3,9 @@ package com.jiayue.ipfcst.controller;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.DisplayConfig;
 import com.jiayue.ipfcst.common.data.entity.ElectricField;
-import com.jiayue.ipfcst.common.data.repository.SysParameterRepository;
-import com.jiayue.ipfcst.service.*;
+import com.jiayue.ipfcst.service.DisplayConfigService;
+import com.jiayue.ipfcst.service.ElectricFieldService;
+import com.jiayue.ipfcst.service.RealTimeComprehensiveContrastOneService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.hssf.usermodel.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,7 +13,6 @@ 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;
@@ -35,7 +35,6 @@ 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

@@ -3,8 +3,9 @@ package com.jiayue.ipfcst.controller;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.DisplayConfig;
 import com.jiayue.ipfcst.common.data.entity.ElectricField;
-import com.jiayue.ipfcst.common.data.repository.SysParameterRepository;
-import com.jiayue.ipfcst.service.*;
+import com.jiayue.ipfcst.service.DisplayConfigService;
+import com.jiayue.ipfcst.service.ElectricFieldService;
+import com.jiayue.ipfcst.service.RealTimeComprehensiveContrastTwoService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.hssf.usermodel.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,7 +13,6 @@ 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;
@@ -35,7 +35,6 @@ 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

@@ -7,11 +7,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.PropertySource;
-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;
 
 /**
  * 统计查询系统版本
@@ -24,7 +22,6 @@ import springfox.documentation.annotations.ApiIgnore;
 @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,7 +14,6 @@ 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;
@@ -35,7 +34,6 @@ 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

@@ -1,24 +1,16 @@
 package com.jiayue.ipfcst.controller;
 
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
-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.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.*;
+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 java.util.*;
+import java.util.List;
 
 /**
  * 菜单
@@ -29,7 +21,6 @@ import java.util.*;
 @RestController
 @Slf4j
 @RequestMapping(value = "sysMenu")
-@Api(value = "SysMenuController", tags = "系统菜单controller")
 public class SysMenuController {
   private final SysMenuService sysMenuService;
 
@@ -45,14 +36,6 @@ 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,19 +1,13 @@
 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;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -25,7 +19,6 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
-@Api(value = "UploadFileCountController", tags = "上报统计controller")
 public class UploadFileCountController {
   private final UploadFileCountService uploadFileCountService;
   @Autowired
@@ -34,13 +27,6 @@ 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);

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

@@ -2,12 +2,7 @@ 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;
@@ -25,7 +20,6 @@ import java.util.List;
  */
 @RestController
 @Slf4j
-@Api(value = "WeatherStationInfoController", tags = "气象站信息controller")
 public class WeatherStationInfoController {
 
   private final WeatherStationInfoService weatherStationInfoService;
@@ -40,10 +34,6 @@ 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{

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

@@ -2,12 +2,7 @@ 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;
@@ -19,7 +14,10 @@ import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 气象站数据restful接口
@@ -30,7 +28,6 @@ import java.util.*;
  */
 @RestController
 @Slf4j
-@Api(value = "WeatherStationStatusDataController", tags = "气象站数据controller")
 public class WeatherStationStatusDataController {
 
   private final WeatherStationStatusDataService weatherStationStatusDataService;
@@ -47,15 +44,6 @@ 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){
@@ -81,17 +69,6 @@ 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,
@@ -110,17 +87,6 @@ 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,
@@ -144,17 +110,6 @@ 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,
@@ -179,17 +134,6 @@ 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,10 +2,7 @@ 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;
@@ -23,7 +20,6 @@ import java.util.List;
  */
 @RestController
 @Slf4j
-@Api(value = "WindTowerInfoController", tags = "测风塔信息controller")
 public class WindTowerInfoController {
 
   private final WindTowerInfoService windTowerInfoService;
@@ -38,10 +34,6 @@ 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

@@ -1,14 +1,8 @@
 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;
@@ -20,7 +14,10 @@ import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 测风塔数据restful接口
@@ -31,7 +28,6 @@ import java.util.*;
  */
 @RestController
 @Slf4j
-@Api(value = "WindTowerStatusDataController", tags = "气象站数据controller")
 public class WindTowerStatusDataController {
 
   private final WindTowerStatusDataService windTowerStatusDataService;
@@ -54,17 +50,6 @@ 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,
@@ -91,15 +76,6 @@ 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) {
@@ -116,17 +92,6 @@ 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,
@@ -155,17 +120,6 @@ 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,
@@ -186,17 +140,6 @@ 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,10 +2,7 @@ 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;
@@ -23,7 +20,6 @@ import java.util.List;
  */
 @RestController
 @Slf4j
-@Api(value = "WindTurbineInfoController", tags = "风机信息controller")
 public class WindTurbineInfoController {
 
   private final WindTurbineInfoService windTurbineInfoService;
@@ -38,10 +34,6 @@ 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

@@ -1,14 +1,10 @@
 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.common.data.entity.WindTurbineInfo;
+import com.jiayue.ipfcst.common.data.entity.WindTurbineStatusData;
 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;
@@ -26,7 +22,6 @@ import java.util.stream.Collectors;
 
 @RestController
 @Slf4j
-@Api(value = "WindTurbineStatusDataController", tags = "风机数据controller")
 public class WindTurbineStatusDataController {
 
   private final WindTurbineStatusDataService windTurbineStatusDataService;
@@ -49,20 +44,6 @@ 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,
@@ -88,21 +69,6 @@ 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,
@@ -123,15 +89,6 @@ 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/pom.xml

@@ -68,16 +68,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.9.2</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>2.9.2</version>
-        </dependency>
     </dependencies>
 
     <dependencyManagement>