Bladeren bron

console加入swagger注解

xusl 1 jaar geleden
bovenliggende
commit
7121140acb
34 gewijzigde bestanden met toevoegingen van 849 en 27 verwijderingen
  1. 28 8
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/AGC_AVCInfoController.java
  2. 31 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/BoosterStationInfoController.java
  3. 35 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/CommunicationEquipmentController.java
  4. 3 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/ConsoleDsbController.java
  5. 12 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/ConsoleOpenInterfaceController.java
  6. 2 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/ConsoleVersionController.java
  7. 2 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/DataLimitationController.java
  8. 2 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/DataLimitationLogController.java
  9. 48 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/ElectricFieldController.java
  10. 13 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/FileAnalysisRecordController.java
  11. 39 2
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/HolidayCalendarController.java
  12. 2 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/InitJobClassController.java
  13. 2 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/InspectionReportController.java
  14. 49 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/InverterInfoController.java
  15. 2 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/ManualInterventionController.java
  16. 2 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/ManualInterventionLogController.java
  17. 2 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/ManualInterventionRatioController.java
  18. 41 2
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/OverHaulOlanController.java
  19. 41 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/OverHaulOlanOneController.java
  20. 2 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/PowerPlanSDController.java
  21. 46 3
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/PvModuleModelController.java
  22. 2 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/QREnvironmentDataController.java
  23. 38 2
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/QuartzController.java
  24. 31 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/SubsidiaryEquipmentInfoController.java
  25. 42 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/SysAlarmController.java
  26. 58 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/SysFileController.java
  27. 18 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/SysMenuController.java
  28. 64 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/SysParameterController.java
  29. 31 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/SysUserController.java
  30. 2 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/UploadFileTypeController.java
  31. 2 0
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/UploadInfoController.java
  32. 47 3
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/WeatherStationInfoController.java
  33. 46 5
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/WindTowerInfoController.java
  34. 64 2
      ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/WindTurbineInfoController.java

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

@@ -3,11 +3,9 @@ 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.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -21,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("agcAvcInfo")
 @Slf4j
-@Api(value = "AGC_AVCInfoController", tags = "AGC_AVC接口")
+@Api(value = "AGC_AVCInfoController", tags = "AGC_AVC信息controller")
 public class AGC_AVCInfoController {
   final AGC_AVCInfoService agcAvcInfoService;
 
@@ -34,7 +32,10 @@ public class AGC_AVCInfoController {
   * 查询
   * */
   @GetMapping
-  @ApiOperation(value = "查询", httpMethod = "GET")
+  @ApiOperation(value = "查询", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象,data属性存入List&ltAGC_AVCInfo&gt</p>"
+  )
+  @ApiMyResponse
   public ResponseVO getALL() {
     return ResponseVO.success(agcAvcInfoService.getAll());
   }
@@ -43,8 +44,13 @@ public class AGC_AVCInfoController {
   * 保存
   * */
   @PostMapping
-  @ApiOperation(value = "保存", httpMethod = "POST")
-  @ApiImplicitParam(name="agc_avcInfo",value="AGC_AVCInfo实体")
+  @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);
@@ -54,6 +60,13 @@ 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);
@@ -63,6 +76,13 @@ 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);

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

@@ -3,7 +3,12 @@ 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.*;
@@ -17,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("boosterStationInfo")
 @Slf4j
+@Api(value = "BoosterStationInfoController", tags = "升压站信息controller")
 public class BoosterStationInfoController {
   final BoosterStationInfoService boosterStationInfoService;
   @Autowired
@@ -29,6 +35,10 @@ 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());
   }
@@ -37,6 +47,13 @@ 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);
@@ -46,6 +63,13 @@ 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);
@@ -55,6 +79,13 @@ 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);

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

@@ -9,6 +9,7 @@ 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;
@@ -16,6 +17,10 @@ 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.*;
@@ -38,6 +43,7 @@ import java.util.List;
 @RestController
 @RequestMapping("communicationEquipment")
 @Slf4j
+@Api(value = "CommunicationEquipmentController", tags = "通信设备controller")
 public class CommunicationEquipmentController {
   @Autowired CommunicationEquipmentService communicationEquipmentService;
   @Autowired InverterInfoService inverterInfoService;
@@ -55,6 +61,10 @@ 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());
@@ -67,6 +77,13 @@ 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));
@@ -76,6 +93,13 @@ 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));
@@ -85,6 +109,13 @@ 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);
@@ -96,6 +127,10 @@ public class CommunicationEquipmentController {
   }
 
   @RequestMapping("/export")
+  @ApiOperation(value = "导出", httpMethod = "GET",
+    notes = "<p>返回字节流</p>"
+  )
+  @ApiMyResponse
   public void export(HttpServletResponse response) {
     try {
       ElectricField electricField = electricFieldService.get();

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

@@ -5,10 +5,12 @@ 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;
@@ -21,6 +23,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("consoleDsb")
+@ApiIgnore
 public class ConsoleDsbController {
 
   private final WindTowerInfoService windTowerInfoService;

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

@@ -1,8 +1,11 @@
 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;
@@ -20,6 +23,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("consoleOpenInterface")
 @Slf4j
+@Api(value = "ConsoleOpenInterfaceController", tags = "给reportquery应用提供接口controller")
 public class ConsoleOpenInterfaceController {
   @Autowired
   FileParseTunnelService fileParseTunnelService;
@@ -30,6 +34,14 @@ 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<>();
 

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

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

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

@@ -7,6 +7,7 @@ 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;
@@ -15,6 +16,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("/dataLimitationController/")
 @Slf4j
+@ApiIgnore
 public class DataLimitationController {
   @Autowired
   private DataLimitationService dataLimitationService;

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

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -19,6 +20,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/dataLimitationLogController/")
 @Slf4j
+@ApiIgnore
 public class DataLimitationLogController {
   @Autowired
   private DataLimitationLogService dataLimitationLogService;

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

@@ -14,6 +14,7 @@ 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;
@@ -23,10 +24,15 @@ 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;
@@ -48,6 +54,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("/electricField")
 @Slf4j
+@Api(value = "ElectricFieldController", tags = "场站信息controller")
 public class ElectricFieldController {
 
     @Autowired
@@ -121,6 +128,13 @@ 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);
@@ -142,6 +156,13 @@ 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);
@@ -161,6 +182,10 @@ 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();
@@ -176,6 +201,7 @@ public class ElectricFieldController {
 
     @DeleteMapping(value = "/{stationCode}")
     @SaveValidate
+    @ApiIgnore
     public ResponseVO deleteElectricField(@PathVariable String stationCode) {
         try {
             electricFieldService.delete(stationCode);
@@ -198,6 +224,10 @@ 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;
@@ -229,6 +259,10 @@ 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;
@@ -255,6 +289,10 @@ 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;
@@ -277,6 +315,7 @@ public class ElectricFieldController {
 
 
     @GetMapping(value = "/getElectricFieldStatrsEnum")
+    @ApiIgnore
     public ResponseVO getElectricFieldStatrsEnum() {
         List<Map<String, Object>> list = new ArrayList<>();
         Map<String, Object> map;
@@ -298,6 +337,7 @@ public class ElectricFieldController {
     }
 
     @PostMapping(value = "/dataDownload")
+    @ApiIgnore
     public void dataDownload(HttpServletRequest request,
                              HttpServletResponse response) {
         BufferedOutputStream bos = null;
@@ -349,6 +389,10 @@ 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<>();
@@ -645,6 +689,10 @@ public class ElectricFieldController {
 
 
   @RequestMapping(value = "/export")
+  @ApiOperation(value = "导出场站信息", httpMethod = "GET",
+    notes = "<p>返回字节流</p>"
+  )
+  @ApiMyResponse
     public void export(HttpServletResponse response) {
         BufferedOutputStream bos = null;
         try {

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

@@ -2,7 +2,12 @@ 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;
@@ -12,11 +17,19 @@ 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);

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

@@ -3,7 +3,12 @@ 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;
@@ -22,6 +27,7 @@ import java.util.List;
 @RestController
 @RequestMapping(value = "holidayCalendar")
 @Slf4j
+@Api(value = "HolidayCalendarController", tags = "假期日历controller")
 public class HolidayCalendarController {
   private final HolidayCalendarService holidayCalendarService;
 
@@ -38,6 +44,13 @@ 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);
@@ -52,6 +65,13 @@ 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);
@@ -66,10 +86,15 @@ 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) {
-
-    System.out.println(holidayCalendar);
     this.holidayCalendarService.delete(holidayCalendar.getId());
     return ResponseVO.success(1);
   }
@@ -83,6 +108,14 @@ 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);
@@ -96,6 +129,10 @@ 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);

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

@@ -8,6 +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;
@@ -23,6 +24,7 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
+@ApiIgnore
 public class InitJobClassController {
 
     @Autowired

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

@@ -7,12 +7,14 @@ 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;

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

@@ -4,7 +4,12 @@ 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;
@@ -21,6 +26,7 @@ import java.util.List;
  */
 @RestController
 @Slf4j
+@Api(value = "InverterInfoController", tags = "逆变器信息controller")
 public class InverterInfoController {
 
     private final InverterInfoService inverterInfoService;
@@ -36,6 +42,15 @@ 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) {
@@ -50,6 +65,10 @@ 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);
@@ -63,6 +82,13 @@ 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);
@@ -83,6 +109,15 @@ 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);
@@ -103,6 +138,13 @@ 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);
@@ -124,6 +166,13 @@ 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);

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

@@ -6,6 +6,7 @@ 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;
@@ -21,6 +22,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("/manualInterventionController/")
 @Slf4j
+@ApiIgnore
 public class ManualInterventionController {
     private final ManualInterventionService manualInterventionService;
 

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

@@ -8,6 +8,7 @@ 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;
@@ -25,6 +26,7 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/manualInterventionLogController/")
 @Slf4j
+@ApiIgnore
 class ManualInterventionLogController {
   private final ManualInterventionLogService manualInterventionLogService;
 

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

@@ -7,6 +7,7 @@ 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;
@@ -21,6 +22,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/manualInterventionRatioController/")
 @Slf4j
+@ApiIgnore
 public class ManualInterventionRatioController {
     private final ManualInterventionRatioService manualInterventionRatioService;
 

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

@@ -1,15 +1,19 @@
 package com.jiayue.ipfcst.console.controller;
 
-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.entity.OverhaulPlan;
-import com.jiayue.ipfcst.console.dto.OpGroup;
+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;
@@ -23,6 +27,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("overHaulPlan")
+@Api(value = "OverHaulOlanController", tags = "光伏检修计划controller")
 public class OverHaulOlanController {
   final private OverHaulPlanService overHaulPlanService;
   @Autowired
@@ -37,6 +42,13 @@ 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);
@@ -46,6 +58,13 @@ 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);
@@ -57,6 +76,13 @@ 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);
@@ -70,6 +96,14 @@ 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);
@@ -82,6 +116,10 @@ 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();
@@ -89,6 +127,7 @@ public class OverHaulOlanController {
   }
 
   @GetMapping("/generateOverHaulPlanCodeContent")
+  @ApiIgnore
   public ResponseVO generateOverHaulPlanCodeContent() throws IOException, BusinessException {
     OverhaulPlan overhaulPlan = new OverhaulPlan();
     List<String> list = this.overHaulPlanService.generateOverHaulPlanCodeContent();

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

@@ -3,11 +3,17 @@ 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;
@@ -21,6 +27,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("overHaulPlanOne")
+@Api(value = "OverHaulOlanOneController", tags = "风电检修计划controller")
 public class OverHaulOlanOneController {
   final private OverHaulPlanOneService overHaulPlanOneService;
   @Autowired
@@ -35,6 +42,13 @@ 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);
@@ -44,6 +58,13 @@ 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);
@@ -55,6 +76,13 @@ 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);
@@ -68,6 +96,14 @@ 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);
@@ -80,12 +116,17 @@ 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);

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

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.Date;
 import java.util.List;
@@ -24,6 +25,7 @@ import java.util.List;
  */
 @RestController
 @Slf4j
+@ApiIgnore
 public class PowerPlanSDController {
 
     private final PowerPlanSDService powerPlanSDService;

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

@@ -4,7 +4,12 @@ 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.*;
@@ -23,6 +28,7 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
+@Api(value = "PvModuleModelController", tags = "光伏组件信息controller")
 public class PvModuleModelController {
 
     private final PvModuleModelService pvModuleModelService;
@@ -40,6 +46,14 @@ 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<>();
@@ -63,6 +77,10 @@ public class PvModuleModelController {
      */
 
     @GetMapping(value="pvModuleModel/")
+    @ApiOperation(value = "查询所有光伏组件信息", httpMethod = "GET",
+      notes = "<p>返回ResponseVO对象,data属性存入List&ltPvModuleModel&gt</p>"
+    )
+    @ApiMyResponse
     public ResponseVO getAll() {
 
         try{
@@ -85,6 +103,13 @@ 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);
@@ -105,6 +130,13 @@ 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);
@@ -125,6 +157,13 @@ 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);
@@ -143,6 +182,13 @@ 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;
@@ -160,8 +206,5 @@ public class PvModuleModelController {
             log.error(" 获取光伏组件旋转类型异常");
             return ResponseVO.fail(provinceType);
         }
-
     }
-
-
 }

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

@@ -8,6 +8,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 javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -17,6 +18,7 @@ import java.io.IOException;
  * @CreateTime 2021/9/14 9:36
  */
 @RestController
+@ApiIgnore
 public class QREnvironmentDataController {
 
   @Autowired

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

@@ -3,9 +3,14 @@ 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;
@@ -23,6 +28,7 @@ import java.util.Map;
  */
 @RestController
 @Slf4j
+@Api(value = "QuartzController", tags = "定时任务controller")
 public class QuartzController {
 
     @Autowired
@@ -43,6 +49,13 @@ 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) {
@@ -67,6 +80,13 @@ 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) {
@@ -84,6 +104,13 @@ 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("删除成功!");
@@ -101,6 +128,13 @@ 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) {
@@ -117,13 +151,15 @@ 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){
       return ResponseVO.fail("初始化失败,请检查sql文件是否存在");
     }
     return ResponseVO.success("初始化成功!");
-
   }
-
 }

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

@@ -4,8 +4,13 @@ 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.*;
@@ -19,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("subsidiaryEquipmentInfo")
 @Slf4j
+@Api(value = "SubsidiaryEquipmentInfoController", tags = "附属设备信息controller")
 public class SubsidiaryEquipmentInfoController {
   final SubsidiaryEquipmentInfoService subsidiaryEquipmentInfoService;
 
@@ -31,6 +37,10 @@ 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());
   }
@@ -39,6 +49,13 @@ 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);
@@ -48,6 +65,13 @@ 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);
@@ -57,6 +81,13 @@ 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);

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

@@ -5,7 +5,12 @@ 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;
@@ -27,6 +32,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("SysAlarm")
 @Slf4j
+@Api(value = "SysAlarmController", tags = "系统告警信息controller")
 public class SysAlarmController {
   private final SysAlarmService sysAlarmService;
 
@@ -44,6 +50,14 @@ 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);
@@ -59,6 +73,15 @@ 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);
@@ -73,6 +96,10 @@ 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);
@@ -85,6 +112,13 @@ 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);
@@ -101,6 +135,10 @@ 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;
@@ -127,6 +165,10 @@ 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;

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

@@ -2,9 +2,14 @@ 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;
@@ -12,6 +17,7 @@ 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;
@@ -33,6 +39,7 @@ import java.util.zip.ZipOutputStream;
 @RestController
 @RequestMapping("sysFile")
 @Slf4j
+@Api(value = "SysFileController", tags = "系统文件controller")
 public class SysFileController {
   /**
    * 获取文件夹下的所有文件
@@ -41,6 +48,13 @@ 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>();//新建一个文件集合
@@ -121,6 +135,15 @@ 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,
@@ -184,6 +207,14 @@ 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(",");
@@ -212,6 +243,7 @@ public class SysFileController {
    *
    * @param dir 将要删除的目录路径
    */
+  @ApiIgnore
   private static void doDeleteEmptyDir(String dir) {
     boolean success = (new File(dir)).delete();
     if (success) {
@@ -227,6 +259,7 @@ public class SysFileController {
    * @param dir 将要删除的文件目录
    * @return boolean
    */
+  @ApiIgnore
   private ResponseVO deleteDir(File dir) {
     if (dir.isDirectory()) {
       String[] children = dir.list();
@@ -250,6 +283,14 @@ 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();
@@ -269,6 +310,14 @@ 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<>();
@@ -311,6 +360,15 @@ 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,

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

@@ -3,9 +3,14 @@ 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.*;
@@ -22,6 +27,7 @@ import java.util.List;
 @RestController
 @Slf4j
 @RequestMapping(value = "sysMenu")
+@Api(value = "SysMenuController", tags = "系统菜单controller")
 public class SysMenuController {
 
     private final SysMenuService sysMenuService;
@@ -38,6 +44,10 @@ public class SysMenuController {
      */
 
     @GetMapping()
+    @ApiOperation(value = "查询", httpMethod = "GET",
+      notes = "<p>返回ResponseVO对象,data属性存入List&ltSysMenu&gt</p>"
+    )
+    @ApiMyResponse
     public ResponseVO getAll() {
 
         try {
@@ -57,6 +67,14 @@ public class SysMenuController {
    */
 
   @GetMapping("/getMenufindByName/{user}/{url}")
+  @ApiOperation(value = "获取菜单信息", httpMethod = "GET",
+    notes = "<p>返回ResponseVO对象,data属性存入List&ltSysMenu&gt</p>"
+  )
+  @ApiImplicitParams(value={
+    @ApiImplicitParam(name= "user",value = "账号",dataType="String"),
+    @ApiImplicitParam(name= "url",value = "访问url",dataType="String")
+  })
+  @ApiMyResponse
   public ResponseVO getMenufindByName(@PathVariable("user") String user,@PathVariable("url") String url) {
 
     try {

+ 64 - 0
ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/SysParameterController.java

@@ -4,13 +4,19 @@ 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;
 
@@ -24,6 +30,7 @@ import java.util.List;
 @RestController
 @RequestMapping(value = "sysParameter")
 @Slf4j
+@Api(value = "SysParameterController", tags = "系统参数controller")
 public class SysParameterController {
 
     private final SysParameterService sysParameterService;
@@ -42,6 +49,13 @@ 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);
@@ -62,6 +76,13 @@ 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);
@@ -76,6 +97,13 @@ 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);
@@ -89,6 +117,10 @@ 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);
@@ -104,6 +136,14 @@ 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);
@@ -120,6 +160,15 @@ 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);
@@ -134,6 +183,13 @@ 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));
     }
@@ -146,6 +202,13 @@ 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));
   }
@@ -159,6 +222,7 @@ public class SysParameterController {
    */
   @SneakyThrows
   @PostMapping("/noSaveValidate")
+  @ApiIgnore
   public ResponseVO save(@RequestBody SysParameter sysParameter) {
     try {
       this.sysParameterService.update(sysParameter);

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

@@ -2,8 +2,13 @@ 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.*;
@@ -19,6 +24,7 @@ import java.util.List;
  */
 @RestController
 @Slf4j
+@Api(value = "SysUserController", tags = "用户信息controller")
 public class SysUserController {
 
     private final SysUserService sysUserService;
@@ -35,6 +41,10 @@ public class SysUserController {
      */
 
     @GetMapping(value = "sysUser/")
+    @ApiOperation(value = "获取用户信息", httpMethod = "GET",
+      notes = "<p>返回ResponseVO对象,data属性存入List&ltSysUser&gt</p>"
+    )
+    @ApiMyResponse
     public ResponseVO getAll() {
 
         try {
@@ -56,6 +66,13 @@ 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);
@@ -75,6 +92,13 @@ 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);
@@ -94,6 +118,13 @@ 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);

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

@@ -5,8 +5,10 @@ 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;

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

@@ -7,8 +7,10 @@ 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

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

@@ -4,7 +4,12 @@ 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;
@@ -23,6 +28,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/weatherStationInfo")
 @Slf4j
+@Api(value = "WeatherStationInfoController", tags = "气象站信息controller")
 public class WeatherStationInfoController {
 
     private final WeatherStationInfoService weatherStationInfoService;
@@ -41,6 +47,13 @@ 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);
@@ -49,8 +62,6 @@ public class WeatherStationInfoController {
         log.error("系统错误" + ex);
         return ResponseVO.error(ex);
       }
-
-
     }
 
     /**
@@ -62,6 +73,13 @@ 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);
@@ -81,6 +99,13 @@ 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());
@@ -95,12 +120,19 @@ public class WeatherStationInfoController {
     /**
      * 删除环境监测仪
      *
-     * @param weatherStationInfo 参数
+     * @param id 参数
      * @return 执行结果
      */
     @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);
@@ -119,6 +151,14 @@ 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();
@@ -137,6 +177,10 @@ 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();

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

@@ -4,7 +4,12 @@ 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;
@@ -22,6 +27,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("windTowerInfo")
+@Api(value = "WindTowerInfoController", tags = "测风塔信息controller")
 @Slf4j public class WindTowerInfoController {
 
     private final WindTowerInfoService windTowerInfoService;
@@ -38,7 +44,15 @@ import java.util.List;
      */
     @SneakyThrows
     @SaveValidate
-    @PostMapping() public ResponseVO add(@RequestBody WindTowerInfo windTowerInfo) {
+    @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);
             return ResponseVO.success(1);
@@ -57,7 +71,15 @@ import java.util.List;
      */
     @SneakyThrows
     @SaveValidate
-    @PutMapping() public ResponseVO update(@RequestBody WindTowerInfo windTowerInfo) {
+    @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);
     }
@@ -65,12 +87,20 @@ import java.util.List;
     /**
      * 删除测风塔
      *
-     * @param windTowerInfo 参数
+     * @param id 参数
      * @return 执行结果
      */
     @SneakyThrows
     @SaveValidate
-    @DeleteMapping("/{id}") public ResponseVO delete(@PathVariable Integer id) {
+    @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);
     }
@@ -83,6 +113,14 @@ 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);
@@ -97,8 +135,11 @@ 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);
     }

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

@@ -6,7 +6,12 @@ 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;
@@ -25,6 +30,7 @@ import java.util.List;
 @RestController
 @RequestMapping("windTurbineInfo")
 @Slf4j
+@Api(value = "WindTurbineInfoController", tags = "风机信息controller")
 public class WindTurbineInfoController {
 
     private final WindTurbineInfoService windTurbineInfoService;
@@ -43,6 +49,13 @@ 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);
@@ -57,6 +70,13 @@ 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);
@@ -70,6 +90,13 @@ 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());
@@ -84,6 +111,13 @@ 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);
@@ -98,6 +132,14 @@ 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);
@@ -113,19 +155,32 @@ 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);
     }
 
   /**
-   * 批量保存逆变器信息
+   * 批量保存风机信息
    *
    * @param windTurbineInfo 风机实体
    * @return 执行结果
    */
   @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);
@@ -138,13 +193,20 @@ public class WindTurbineInfoController {
   }
 
   /**
-   * 删除逆变器信息
+   * 删除风机信息
    *
    * @param ids 删除id
    * @return 执行结果
    */
   @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);