风机绩效表明细风能利用率修改

pom.xml

@@ -51,15 +51,43 @@
 		</dependency>
 		<!-- 添加swagger2 -->
 		<dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>2.9.2</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.9.2</version>
-        </dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger2</artifactId>
+			<version>2.9.2</version>
+			<exclusions>
+				<exclusion>
+					<groupId>io.swagger</groupId>
+					<artifactId>swagger-annotations</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>io.swagger</groupId>
+					<artifactId>swagger-models</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger-ui</artifactId>
+			<version>2.9.2</version>
+		</dependency>
+		<dependency>
+			<groupId>io.swagger</groupId>
+			<artifactId>swagger-annotations</artifactId>
+			<version>1.5.21</version>
+		</dependency>
+		<dependency>
+			<groupId>io.swagger</groupId>
+			<artifactId>swagger-models</artifactId>
+			<version>1.5.21</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/io.github.swagger2markup/swagger2markup -->
+
+		<dependency>
+			<groupId>io.swagger</groupId>
+			<artifactId>swagger-core</artifactId>
+			<version>1.6.2</version>
+		</dependency>
 		<!--GSON -->
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
@@ -264,6 +292,12 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-redis</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>org.pegdown</groupId>
+			<artifactId>pegdown</artifactId>
+			<version>1.4.2</version>
+		</dependency>
 	</dependencies>
 
 
@@ -281,6 +315,10 @@
 					<skip>true</skip>
 				</configuration>
 			</plugin>
+
+
+
+
 			<!-- generator 配置-->
 			<plugin>
 				<groupId>org.mybatis.generator</groupId>

src/docs/asciidoc/generated/all.adoc

@@ -0,0 +1,80 @@
+= Gyee_Frame_NX API文档
+
+
+[[_overview]]
+== 概览
+Gyee_Frame_NX项目
+
+
+=== 版本信息
+[%hardbreaks]
+__版本__ : 版本号:3.9
+
+
+=== URI scheme
+[%hardbreaks]
+__域名__ : 192.168.10.14:8082
+__基础路径__ : /
+
+
+=== 标签
+
+* admin-controller : Admin Controller
+* api-controller : Api Controller
+* api-controller-2 : Api Controller 2
+* auto-code-controller : Auto Code Controller
+* benchmarking-controller : Benchmarking Controller
+* captcha-controller : Captcha Controller
+* compare-controller : Compare Controller
+* contrast-controller : Contrast Controller
+* dict-data-controller : Dict Data Controller
+* dict-type-controller : Dict Type Controller
+* email-controller : Email Controller
+* fan-status-query-export-controller : Fan Status Query Export Controller
+* file-controller : File Controller
+* index-controller : Index Controller
+* json-controller : Json Controller
+* leaderboard-controller : Leaderboard Controller
+* log-controller : Log Controller
+* output-speed-controller : Output Speed Controller
+* permission-controller : Permission Controller
+* power-compare-controller : Power Compare Controller
+* power-compare-detail-controller : Power Compare Detail Controller
+* power-saturation-amonut-controller : Power Saturation Amonut Controller
+* power-saturation-controller : Power Saturation Controller
+* power-saturation-month-controller : Power Saturation Month Controller
+* project-plan-controller : Project Plan Controller
+* province-linkage-controller : Province Linkage Controller
+* qi-niu-cloud-controller : Qi Niu Cloud Controller
+* quartz-controller : Quartz Controller
+* quartz-job-controller : Quartz Job Controller
+* quartz-job-log-controller : Quartz Job Log Controller
+* recommen-controller : Recommen Controller
+* role-controller : Role Controller
+* scatter-controller : Scatter Controller
+* service-controller : Service Controller
+* single-analysis-controller : Single Analysis Controller
+* standard-point-table-controller : Standard Point Table Controller
+* swagger-controller : Swagger Controller
+* sys-area-controller : Sys Area Controller
+* sys-city-controller : Sys City Controller
+* sys-department-controller : Sys Department Controller
+* sys-notice-controller : Sys Notice Controller
+* sys-position-controller : Sys Position Controller
+* sys-province-controller : Sys Province Controller
+* sys-street-controller : Sys Street Controller
+* test-controller : Test Controller
+* tool-controller : Tool Controller
+* ueditor-controller : Ueditor Controller
+* user-controller : User Controller
+* windpower-detail-chart-controller : Windpower Detail Chart Controller
+* windturbine-detail-chart-controller : Windturbine Detail Chart Controller
+* windturbine-detail-line-chart-controller : Windturbine Detail Line Chart Controller
+* windturbine-detail-pie-chart-a-controller : Windturbine Detail Pie Chart A Controller
+* windturbine-goodness-detail-controller : Windturbine Goodness Detail Controller
+* windturbinegoodness-controller : Windturbinegoodness Controller
+* wt-health-report-controller : Wt Health Report Controller
+* wt-health-report-month-controller : Wt Health Report Month Controller
+
+
+

src/main/java/com/gyee/frame/common/conf/Swagger.java

@@ -3,6 +3,8 @@ package com.gyee.frame.common.conf;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
@@ -19,15 +21,18 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 * @date 2018年6月3日
 *
  */
-@Configuration(value="false")
-@EnableSwagger2 //启动swagger注解 启动服务，浏览器输入"http://服务名:8080/swagger-ui.html"
-public class Swagger {
+@Configuration(value="true")
+@EnableSwagger2 //启动swagger注解 启动服务，浏览器输入"http://localhost:8080/swagger-ui.html"
+public class Swagger  implements WebMvcConfigurer {
+
+
 	@Autowired
 	private V2Config v2Config;
-	
+
 	@Bean
 	public Docket createRestApi() {
 		return new Docket(DocumentationType.SWAGGER_2)
+				.host("192.168.10.14:8082")
 				// 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息）
 				.apiInfo(apiInfo())
 				// 设置哪些接口暴露给Swagger展示
@@ -46,7 +51,7 @@ public class Swagger {
 				//设置标题
 				.title("Gyee_Frame_NX API文档")
 				//描述
-				.description("Gyee_Frame_NX项目是努力打造springboot框架的极致细腻的脚手架")
+				.description("Gyee_Frame_NX项目")
 				 //作者信息
                 //.contact(new Contact(v2Config.getName(), null, V2Config.getEmail_account()))
                 //服务条款URL
@@ -56,4 +61,22 @@ public class Swagger {
 				.build();
 	}
 
+	@Override
+
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+
+		// 解决静态资源无法访问
+
+		registry.addResourceHandler("/**").addResourceLocations("classpath:/static/");
+
+		// 解决swagger无法访问
+
+		registry.addResourceHandler("/swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
+
+		// 解决swagger的js文件无法访问
+
+		registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+
+	}
+
 }

src/main/java/com/gyee/frame/common/conf/V2Config.java

@@ -39,7 +39,15 @@ public class V2Config
     /** 实时数据库 **/
     private  static String realtimedataBase;
     private static String baseurl;
+    private  static  String swaggerip;
 
+    public   String getSwaggerip() {
+        return swaggerip;
+    }
+
+    public  void setSwaggerip(String swaggerip) {
+        this.swaggerip = swaggerip;
+    }
 
     public String getName()
     {

src/main/java/com/gyee/frame/common/quartz/task/SocketTaskUtil.java

@@ -6,6 +6,7 @@ import com.gyee.frame.common.spring.SpringUtils;
 import com.gyee.frame.model.auto.SysQuartzJob;
 import com.gyee.frame.model.auto.SysQuartzJobExample;
 import com.gyee.frame.service.SysQuartzJobService;
+import com.gyee.frame.util.StringUtils;
 import org.quartz.SchedulerException;
 import org.springframework.context.annotation.Configuration;
 
@@ -19,6 +20,7 @@ public class SocketTaskUtil {
     private QuartzSchedulerUtil quartzSchedulerUtil = SpringUtils.getBean(QuartzSchedulerUtil.class);
     private SysQuartzJobService sysQuartzJobService = SpringUtils.getBean(SysQuartzJobService.class);
 
+    String template="*";
 
     public void pauseJob(SysQuartzJob sysQuartzJob){
         quartzSchedulerUtil.pauseJob(sysQuartzJob);
@@ -35,7 +37,6 @@ public class SocketTaskUtil {
         quartzSchedulerUtil.deleteJob(sysQuartzJob);
     }
     /**
-     *@author:Wang Jiawen
      *
      *@description: 该方法通过计算jobid来找到job，通过job的对象来进一步控制job任务，用来重启某一具体的任务
      *
@@ -62,6 +63,40 @@ public class SocketTaskUtil {
            // //System.out.println(sysQuartzJob1.getJobName());
 
             sysQuartzJob1.setStatus(0);//开启任务
+
+            quartzSchedulerUtil.createSchedule(sysQuartzJob1);
+
+            //startJob(sysQuartzJob1);
+        } catch (SchedulerException e) {
+            e.printStackTrace();
+        }
+        //this.startJob(sysQuartzJob1);
+    }
+
+
+    public void restartJob(String jobid,String params){
+
+        List<SysQuartzJob> quartzJobs=sysQuartzJobService.selectByExample(new SysQuartzJobExample());
+        SysQuartzJob sysQuartzJob1 = null;
+        //找到具体的任务
+        for(SysQuartzJob sysQuartzJob:quartzJobs){
+            if(sysQuartzJob.getId().equalsIgnoreCase(jobid)){
+                sysQuartzJob1=sysQuartzJob;
+                break;
+            }
+        }
+        this.deleteJob(sysQuartzJob1);//符合标准步骤删除-创建-启动流程
+        try {
+            // //System.out.println(sysQuartzJob1.getJobName());
+
+            sysQuartzJob1.setStatus(0);//开启任务
+
+            if(StringUtils.notEmp(params))
+            {
+                String temp=sysQuartzJob1.getInvokeTarget().replace(template,params);
+                sysQuartzJob1.setInvokeTarget(temp);
+            }
+
             quartzSchedulerUtil.createSchedule(sysQuartzJob1);
 
             //startJob(sysQuartzJob1);

src/main/java/com/gyee/frame/common/quartz/task/WtTestTask.java

@@ -0,0 +1,18 @@
+package com.gyee.frame.common.quartz.task;
+
+
+import com.gyee.frame.service.websocket.BraceletService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component("wtTestTask")
+public class WtTestTask {
+    @Autowired
+    private BraceletService braceletService;
+
+
+    public void braceletPushTask(String destination,String wtId) throws Exception {
+
+        braceletService.braceletPushTask(destination,wtId);
+    }
+}

src/main/java/com/gyee/frame/common/websocket/WebSocketCache.java

@@ -75,6 +75,9 @@ public class WebSocketCache  extends SocketTaskUtil {
                         this.deleteJob(topic);
                     }
                 }
+
+
+
                 sessionIdset.remove(topic);
             }
             WebSocketConfig.sessioncacheMap.remove(sessionId);

src/main/java/com/gyee/frame/controller/benchmarking/BenchmarkingController.java

@@ -9,6 +9,10 @@ import com.gyee.frame.model.custom.ValueVo;
 import com.gyee.frame.service.Windturbineinfodaytop2Service;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
+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.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -23,6 +27,7 @@ import java.util.Map;
 
 @Controller
 @RequestMapping("/benchmarking")
+@Api(value = "等级评估功能")
 public class BenchmarkingController {
 //    @Autowired
 //    private Windturbineinfodaytop3Service windturbineinfodaytop2Service;
@@ -31,8 +36,14 @@ public class BenchmarkingController {
     
 
     /**查询等级评估日所有信息**/
+
     @GetMapping("/gadaylist")
     @ResponseBody
+    @ApiOperation(value = "查询等级评估日所有信息", notes = "查询等级评估日所有信息")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
     public AjaxResult gadaylist(String wpId, String recorddate) {
 
         Date tempDate=null;
@@ -54,6 +65,11 @@ public class BenchmarkingController {
     /**按页查询等级评估日所有信息**/
     @PostMapping("/gadaylistByPage")
     @ResponseBody
+    @ApiOperation(value = "按页查询等级评估日所有信息", notes = "按页查询等级评估日所有信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "Tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
     public AjaxResult gadaylistByPage(Tablepar tablepar,String wpId, String recorddate) {
 
         Date tempDate=null;
@@ -70,6 +86,13 @@ public class BenchmarkingController {
     /**按页查询等级评估月所有信息**/
     @PostMapping("/gamonthlistByPage")
     @ResponseBody
+    @ApiOperation(value = "按页查询等级评估月所有信息", notes = "按页查询等级评估月所有信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "Tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult gamonthlistByPage(Tablepar tablepar,String wpId, String year,String month) {
 
 
@@ -81,6 +104,11 @@ public class BenchmarkingController {
     /**按页查询等级评估年所有信息**/
     @PostMapping("/gayearlistByPage")
     @ResponseBody
+    @ApiOperation(value = "按页查询等级评估年所有信息", notes = "按页查询等级评估年所有信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "Tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年", required = true, dataType = "string", paramType = "query")})
     public AjaxResult gayearlistByPage(Tablepar tablepar,String wpId, String year) {
 
 
@@ -92,6 +120,10 @@ public class BenchmarkingController {
     /**按等级评估ID查询相应信息返回玫瑰图**/
     @GetMapping("/wtchart")
     @ResponseBody
+    @ApiOperation(value = "按等级评估ID查询相应信息返回玫瑰图", notes = "按等级评估ID查询相应信息返回玫瑰图")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "gaid1", value = "等级评估对象编号1", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "gaid2", value = "等级评估对象编号2", required = true, dataType = "string", paramType = "query")})
     public AjaxResult wtchart(String gaid1,String gaid2) {
 
 
@@ -114,6 +146,10 @@ public class BenchmarkingController {
     /**按等级评估ID查询相应详细信息**/
     @GetMapping("/wtinfo")
     @ResponseBody
+    @ApiOperation(value = "按等级评估ID查询相应详细信息", notes = "按等级评估ID查询相应详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "gaid1", value = "等级评估对象编号1", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "gaid2", value = "等级评估对象编号2", required = true, dataType = "string", paramType = "query")})
     public AjaxResult wtinfo(String gaid1,String gaid2) {
 
 

src/main/java/com/gyee/frame/controller/compare/CompareController.java

@@ -4,6 +4,10 @@ import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.service.compare.CompareService;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
+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.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,6 +18,7 @@ import java.util.Date;
 
 @Controller
 @RequestMapping("/compare")
+@Api(value = "单机横向对比功能")
 public class CompareController {
     @Autowired
     private CompareService compareService;
@@ -21,10 +26,14 @@ public class CompareController {
     /**查询日横向对比列表**/
     @GetMapping("/compareDayList")
     @ResponseBody
-    public AjaxResult compareDayList(String windturbineid,String date) {
+    @ApiOperation(value = "查询日横向对比列表", notes = "查询日横向对比列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "windturbineid", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult compareDayList(String windturbineid,String recorddate) {
 
 
-        AjaxResult ajaxResult=compareService.compareDayList(windturbineid, DateUtils.parseStrtoDate(date)) ;
+        AjaxResult ajaxResult=compareService.compareDayList(windturbineid, DateUtils.parseStrtoDate(recorddate)) ;
 
         return ajaxResult;
 
@@ -32,12 +41,16 @@ public class CompareController {
     /**创建日风资源图表**/
     @GetMapping("/fzyDay")
     @ResponseBody
-    public AjaxResult fzyDay(String windturbineid,String date) {
+    @ApiOperation(value = "创建日风资源图表", notes = "创建日风资源图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "windturbineid", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult fzyDay(String windturbineid,String recorddate) {
 
         Date beginDate_d=null;
-        if (StringUtils.isNotEmpty(date))
+        if (StringUtils.isNotEmpty(recorddate))
         {
-            beginDate_d= DateUtils.parseDate(date);
+            beginDate_d= DateUtils.parseDate(recorddate);
         }
         AjaxResult ajaxResult=compareService.fzyDay(windturbineid,beginDate_d) ;
 
@@ -47,11 +60,15 @@ public class CompareController {
     /**查询日横向对比下方图表**/
     @GetMapping("/compareDayChat")
     @ResponseBody
-    public AjaxResult compareDayChat(String windturbineid,String date) {
+    @ApiOperation(value = "查询日横向对比下方图表", notes = "查询日横向对比下方图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "windturbineid", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult compareDayChat(String windturbineid,String recorddate) {
         Date beginDate_d=null;
-        if (StringUtils.isNotEmpty(date))
+        if (StringUtils.isNotEmpty(recorddate))
         {
-            beginDate_d= DateUtils.parseDate(date);
+            beginDate_d= DateUtils.parseDate(recorddate);
         }
 
         AjaxResult ajaxResult=compareService.compareDayChat(windturbineid,beginDate_d) ;
@@ -64,11 +81,15 @@ public class CompareController {
     /**查询月横向对比列表**/
     @GetMapping("/compareMonthList")
     @ResponseBody
-    public AjaxResult compareMonthList(String windturbineid,String date) {
+    @ApiOperation(value = "查询月横向对比列表", notes = "查询月横向对比列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "windturbineid", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult compareMonthList(String windturbineid,String recorddate) {
         Date beginDate_d=null;
-        if (StringUtils.isNotEmpty(date))
+        if (StringUtils.isNotEmpty(recorddate))
         {
-            beginDate_d= DateUtils.parseDate(date);
+            beginDate_d= DateUtils.parseDate(recorddate);
         }
 
         AjaxResult ajaxResult=compareService.compareMonthList(windturbineid,beginDate_d) ;
@@ -79,11 +100,15 @@ public class CompareController {
     /**创建月风资源图表**/
     @GetMapping("/fzyMonth")
     @ResponseBody
-    public AjaxResult fzyMonth(String windturbineid,String date) {
+    @ApiOperation(value = "创建月风资源图表", notes = "创建月风资源图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "windturbineid", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult fzyMonth(String windturbineid,String recorddate) {
         Date beginDate_d=null;
-        if (StringUtils.isNotEmpty(date))
+        if (StringUtils.isNotEmpty(recorddate))
         {
-            beginDate_d= DateUtils.parseDate(date);
+            beginDate_d= DateUtils.parseDate(recorddate);
         }
 
         AjaxResult ajaxResult=compareService.fzyMonth(windturbineid,beginDate_d) ;
@@ -94,12 +119,16 @@ public class CompareController {
     /**查询月横向对比下方图表**/
     @GetMapping("/compareMonthChat")
     @ResponseBody
-    public AjaxResult compareMonthChat(String windturbineid,String date) {
+    @ApiOperation(value = "查询月横向对比下方图表", notes = "查询月横向对比下方图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "windturbineid", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult compareMonthChat(String windturbineid,String recorddate) {
 
         Date beginDate_d=null;
-        if (StringUtils.isNotEmpty(date))
+        if (StringUtils.isNotEmpty(recorddate))
         {
-            beginDate_d= DateUtils.parseDate(date);
+            beginDate_d= DateUtils.parseDate(recorddate);
         }
         AjaxResult ajaxResult=compareService.compareMonthChat(windturbineid,beginDate_d) ;
 
@@ -113,12 +142,16 @@ public class CompareController {
     /**查询年横向对比列表**/
     @GetMapping("/compareYearList")
     @ResponseBody
-    public AjaxResult compareYearList(String windturbineid,String date) {
+    @ApiOperation(value = "查询年横向对比列表", notes = "查询年横向对比列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "windturbineid", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult compareYearList(String windturbineid,String recorddate) {
 
         Date beginDate_d=null;
-        if (StringUtils.isNotEmpty(date))
+        if (StringUtils.isNotEmpty(recorddate))
         {
-            beginDate_d= DateUtils.parseDate(date);
+            beginDate_d= DateUtils.parseDate(recorddate);
         }
         AjaxResult ajaxResult=compareService.compareYearList(windturbineid,beginDate_d) ;
 
@@ -128,12 +161,16 @@ public class CompareController {
     /**创建年风资源图表**/
     @GetMapping("/fzyYear")
     @ResponseBody
-    public AjaxResult fzyYear(String windturbineid,String date) {
+    @ApiOperation(value = "创建年风资源图表", notes = "创建年风资源图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "windturbineid", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult fzyYear(String windturbineid,String recorddate) {
 
         Date beginDate_d=null;
-        if (StringUtils.isNotEmpty(date))
+        if (StringUtils.isNotEmpty(recorddate))
         {
-            beginDate_d= DateUtils.parseDate(date);
+            beginDate_d= DateUtils.parseDate(recorddate);
         }
         AjaxResult ajaxResult=compareService.fzyYear(windturbineid,beginDate_d) ;
 
@@ -143,11 +180,15 @@ public class CompareController {
     /**查询年横向对比下方图表**/
     @GetMapping("/compareYearChat")
     @ResponseBody
-    public AjaxResult compareYearChat(String windturbineid,String date) {
+    @ApiOperation(value = "查询年横向对比下方图表", notes = "查询年横向对比下方图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "windturbineid", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult compareYearChat(String windturbineid,String recorddate) {
         Date beginDate_d=null;
-        if (StringUtils.isNotEmpty(date))
+        if (StringUtils.isNotEmpty(recorddate))
         {
-            beginDate_d= DateUtils.parseDate(date);
+            beginDate_d= DateUtils.parseDate(recorddate);
         }
 
         AjaxResult ajaxResult=compareService.compareYearChat(windturbineid,beginDate_d) ;

src/main/java/com/gyee/frame/controller/contrast/ContrastController.java

@@ -10,6 +10,10 @@ import com.gyee.frame.service.contrast.*;
 import com.gyee.frame.util.BenchmarkUtil;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -24,6 +28,7 @@ import java.util.*;
 
 @Controller
 @RequestMapping("/contrast")
+@Api(value = "对标管理管理")
 public class ContrastController {
 
     @Resource
@@ -38,10 +43,17 @@ public class ContrastController {
     private ContrastLnService contrastLnService;
 
     /**
-     * 查询风机列表信息
+     * 查询性能对标列表
      **/
     @PostMapping("/benchmarkLossList")
     @ResponseBody
+    @ApiOperation(value = "查询性能对标列表", notes = "查询性能对标列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult benchmarkLossList(Tablepar tablepar, String wpId, String beginDate, String endDate) {
 
         List<BenchMarkVo> vos =new ArrayList<>();
@@ -70,6 +82,13 @@ public class ContrastController {
      **/
     @PostMapping("/benchmarkWpList")
     @ResponseBody
+    @ApiOperation(value = "查询场内对标列表", notes = "查询场内对标列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult benchmarkWpList(Tablepar tablepar, String wpId, String beginDate, String endDate) {
 
         List<BenchMarkVo> vos =new ArrayList<>();
@@ -97,6 +116,14 @@ public class ContrastController {
      **/
     @PostMapping("/benchmarkWpInWtList")
     @ResponseBody
+    @ApiOperation(value = "查询场内对标风机对标列表", notes = "查询场内对标风机对标列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult benchmarkWpInWtList(Tablepar tablepar, String wpId,String wtId, String beginDate, String endDate) {
 
         List<BenchMarkVo> vos =new ArrayList<>();
@@ -124,6 +151,13 @@ public class ContrastController {
      **/
     @PostMapping("/benchmarkWpOutList")
     @ResponseBody
+    @ApiOperation(value = "查询场际对标列表", notes = "查询场际对标列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult benchmarkWpOutList(Tablepar tablepar, String wpId, String beginDate, String endDate) {
 
 
@@ -154,6 +188,12 @@ public class ContrastController {
      **/
     @GetMapping("/findWpPowerOutChat")
     @ResponseBody
+    @ApiOperation(value = "查询场际对标图表", notes = "查询场际对标图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult findWpPowerOutChat(String wpId, String beginDate, String endDate) throws Exception {
         List<String> wpids = new ArrayList<String>();
         if (StringUtils.notEmp(wpId)) {
@@ -191,6 +231,14 @@ public class ContrastController {
      **/
     @PostMapping("/benchmarkPjList")
     @ResponseBody
+    @ApiOperation(value = "查询项目对标列表", notes = "查询项目对标列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "pjId", value = "项目编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult benchmarkPjList(Tablepar tablepar, String wpId,String pjId, String beginDate, String endDate) {
 
           List<BenchMarkVo> vos =new ArrayList<>();
@@ -220,6 +268,13 @@ public class ContrastController {
      **/
     @GetMapping("/findPjPowerChat")
     @ResponseBody
+    @ApiOperation(value = "查询项目对标图表", notes = "查询项目对标图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "pjId", value = "项目编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult findPjPowerChat(String wpId,String pjId, String beginDate, String endDate) throws Exception {
 
         List<DataVo> vos =new ArrayList<>();
@@ -240,6 +295,14 @@ public class ContrastController {
      **/
     @PostMapping("/benchmarkLnList")
     @ResponseBody
+    @ApiOperation(value = "查询线路对标列表", notes = "查询线路对标列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "lnId", value = "线路编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult benchmarkLnList(Tablepar tablepar, String wpId,String lnId, String beginDate, String endDate) {
 
 
@@ -270,6 +333,13 @@ public class ContrastController {
      **/
     @GetMapping("/findLnPowerChat")
     @ResponseBody
+    @ApiOperation(value = "查询线路对标列表", notes = "查询线路对标列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "lnId", value = "线路编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult findLnPowerChat(String wpId,String lnId, String beginDate, String endDate) throws Exception {
 
         List<DataVo> vos =new ArrayList<>();
@@ -288,6 +358,14 @@ public class ContrastController {
      **/
     @PostMapping("/benchmarkWtList")
     @ResponseBody
+    @ApiOperation(value = "查询风机对标列表", notes = "查询风机对标列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult benchmarkWtList(Tablepar tablepar, String wpId,String wtId, String beginDate, String endDate) {
 
         List<BenchMarkVo> vos =contrastWtService.benchmarkWtList(wpId,wtId, beginDate,  endDate);
@@ -315,6 +393,14 @@ public class ContrastController {
      **/
     @PostMapping("/addBenchmarkZj")
     @ResponseBody
+    @ApiOperation(value = "新增值际对标", notes = "新增值际对标")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "zjs", value = "值际类型 1:上旬,2:中旬,3:下旬", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult addBenchmarkZj(HttpServletRequest request,Tablepar tablepar, String wpId, String year, String month, String zjs) {
 
         List<BenchMarkVo> vos=null;
@@ -350,6 +436,10 @@ public class ContrastController {
      **/
     @PostMapping("/benchmarkZjList")
     @ResponseBody
+    @ApiOperation(value = "查询值际对标列表", notes = "查询值际对标列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "tablepar", paramType = "query")})
+
     public AjaxResult benchmarkZjList(HttpServletRequest request,Tablepar tablepar) {
 
         List<BenchMarkVo> vos=null;
@@ -382,6 +472,11 @@ public class ContrastController {
      **/
     @PostMapping("/benchmarkZjWtList")
     @ResponseBody
+    @ApiOperation(value = "查询风机对标列表", notes = "查询风机对标列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "cid", value = "值际对标编号", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult benchmarkZjWtList(HttpServletRequest request,Tablepar tablepar, String cid) {
         List<BenchMarkVo> vos=new ArrayList<>();
         Map<String, List<ConditionVo>> ctmap = null;

src/main/java/com/gyee/frame/controller/goodness/WindpowerDetailChartController.java

@@ -8,6 +8,10 @@ import com.gyee.frame.service.*;
 import com.gyee.frame.service.goodness.WindturbinegoodnessService;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,6 +25,7 @@ import java.util.*;
  */
 @Controller
 @RequestMapping("/goodness")
+@Api(value = "风场风资源图表")
 public class WindpowerDetailChartController {
     @Resource
     private WindturbinegoodnessService windturbinegoodnessService;
@@ -55,6 +60,11 @@ public class WindpowerDetailChartController {
      */
     @PostMapping("/wprzdfs")
     @ResponseBody
+    @ApiOperation(value = "风场日最大风速", notes = "风场日最大风速")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult wprzdfs(String wpId, String recorddate) {
         Map<String, Object> map = new HashMap<String, Object>();
         List<ValueVo> vos = new ArrayList<ValueVo>();
@@ -283,6 +293,11 @@ public class WindpowerDetailChartController {
      */
     @PostMapping("/wpyzdfs")
     @ResponseBody
+    @ApiOperation(value = "风场月最大风速", notes = "风场月最大风速")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult wpyzdfs(String wpId, String recorddate) {
         Map<String, Object> map = new HashMap<String, Object>();
         List<ValueVo> vos = new ArrayList<ValueVo>();
@@ -468,6 +483,11 @@ public class WindpowerDetailChartController {
      */
     @PostMapping("/wpnzdfs")
     @ResponseBody
+    @ApiOperation(value = "风场年最大风速", notes = "风场年最大风速")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult wpnzdfs(String wpId, String recorddate) {
         Map<String, Object> map = new HashMap<String, Object>();
         List<ValueVo> vos = new ArrayList<ValueVo>();
@@ -660,6 +680,11 @@ public class WindpowerDetailChartController {
      */
     @PostMapping("/wprfxpl")
     @ResponseBody
+    @ApiOperation(value = "风场日风向频率", notes = "风场日风向频率")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult wprfxpl(String wpId, String recorddate) {
         Map<String, Object> map = new HashMap<String, Object>();
         List<ValueVo> vos = new ArrayList<ValueVo>();
@@ -851,6 +876,11 @@ public class WindpowerDetailChartController {
      */
     @PostMapping("/wpyfxpl")
     @ResponseBody
+    @ApiOperation(value = "风场月风向频率", notes = "风场月风向频率")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult wpyfxpl(String wpId, String recorddate) {
         Map<String, Object> map = new HashMap<String, Object>();
         List<ValueVo> vos = new ArrayList<ValueVo>();
@@ -1042,6 +1072,11 @@ public class WindpowerDetailChartController {
      */
     @PostMapping("/wpnfxpl")
     @ResponseBody
+    @ApiOperation(value = "风场年风向频率", notes = "风场年风向频率")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult wpnfxpl(String wpId, String recorddate) {
         Map<String, Object> map = new HashMap<String, Object>();
         List<ValueVo> vos = new ArrayList<ValueVo>();

src/main/java/com/gyee/frame/controller/goodness/WindturbineDetailChartController.java

@@ -8,6 +8,10 @@ import com.gyee.frame.service.*;
 import com.gyee.frame.service.goodness.WindturbinegoodnessService;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,6 +25,7 @@ import java.util.*;
  */
 @Controller
 @RequestMapping("/goodness")
+@Api(value = "风机风资源图表")
 public class WindturbineDetailChartController {
     @Resource
     private WindturbinegoodnessService windturbinegoodnessService;
@@ -54,6 +59,11 @@ public class WindturbineDetailChartController {
      */
     @PostMapping("/wtrzdfs")
     @ResponseBody
+    @ApiOperation(value = "风机日最大风速", notes = "风机日最大风速")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult wtrzdfs(String wtId, String recorddate) {
         Map<String, Object> map = new HashMap<String, Object>();
         List<ValueVo> vos = new ArrayList<ValueVo>();
@@ -276,6 +286,11 @@ public class WindturbineDetailChartController {
      */
     @PostMapping("/wtyzdfs")
     @ResponseBody
+    @ApiOperation(value = "风机月最大风速", notes = "风机月最大风速")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult wtyzdfs(String wtId, String recorddate) {
         Map<String, Object> map = new HashMap<String, Object>();
         List<ValueVo> vos = new ArrayList<ValueVo>();
@@ -461,6 +476,11 @@ public class WindturbineDetailChartController {
      */
     @PostMapping("/wtnzdfs")
     @ResponseBody
+    @ApiOperation(value = "风机年最大风速", notes = "风机年最大风速")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult wtnzdfs(String wtId, String recorddate) {
         Map<String, Object> map = new HashMap<String, Object>();
         List<ValueVo> vos = new ArrayList<ValueVo>();
@@ -648,6 +668,11 @@ public class WindturbineDetailChartController {
      */
     @PostMapping("/wtrfxpl")
     @ResponseBody
+    @ApiOperation(value = "风机日风向频率", notes = "风机日风向频率")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult wtrfxpl(String wtId, String recorddate) {
         Map<String, Object> map = new HashMap<String, Object>();
         List<ValueVo> vos = new ArrayList<ValueVo>();
@@ -835,6 +860,11 @@ public class WindturbineDetailChartController {
      */
     @PostMapping("/wtyfxpl")
     @ResponseBody
+    @ApiOperation(value = "风机月风向频率", notes = "风机月风向频率")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult wtyfxpl(String wtId, String recorddate) {
         Map<String, Object> map = new HashMap<String, Object>();
         List<ValueVo> vos = new ArrayList<ValueVo>();
@@ -1021,6 +1051,11 @@ public class WindturbineDetailChartController {
      */
     @PostMapping("/wtnfxpl")
     @ResponseBody
+    @ApiOperation(value = "风机年风向频率", notes = "风机年风向频率")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult wtnfxpl(String wtId, String recorddate) {
         Map<String, Object> map = new HashMap<String, Object>();
         List<ValueVo> vos = new ArrayList<ValueVo>();

src/main/java/com/gyee/frame/controller/goodness/WindturbineDetailLineChartController.java

@@ -15,6 +15,10 @@ import com.gyee.frame.service.*;
 import com.gyee.frame.service.goodness.WindturbinegoodnessService;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,6 +32,7 @@ import java.util.*;
  */
 @Controller
 @RequestMapping("/goodness")
+@Api(value = "单机信息总览风机区间图表")
 public class WindturbineDetailLineChartController {
     @Resource
     private WindturbinegoodnessService windturbinegoodnessService;
@@ -63,6 +68,11 @@ public class WindturbineDetailLineChartController {
      */
     @PostMapping("/findWtRealPowerChar")
     @ResponseBody
+    @ApiOperation(value = "查询功率曲线数据信息", notes = "查询功率曲线数据信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult findWtRealPowerChar(String wtId, String recorddate) throws Exception {
         Date date = DateUtils.parseStrtoDate(recorddate);
         List<DataVo> result = windturbinegoodnessService.findWtRealPowerChar(wtId, date);
@@ -86,6 +96,11 @@ public class WindturbineDetailLineChartController {
      */
     @PostMapping("/getplotBands")
     @ResponseBody
+    @ApiOperation(value = "获得曲线区间区分功能数据", notes = "获得曲线区间区分功能数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult getplotBands(String wtId, String recorddate) throws Exception {
         Date date = DateUtils.parseStrtoDate(recorddate);
         List<List<EchartDataVo>> result = windturbinegoodnessService.getplotBands(wtId, date);
@@ -110,6 +125,11 @@ public class WindturbineDetailLineChartController {
      */
     @PostMapping("/getInputSmall")
     @ResponseBody
+    @ApiOperation(value = "获取切入风速", notes = "获取切入风速")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult getInputSmall(String wtId, String recorddate) throws Exception {
         Date date = DateUtils.parseStrtoDate(recorddate);
         double inputsmall=0.0;
@@ -139,6 +159,11 @@ public class WindturbineDetailLineChartController {
      */
     @PostMapping("/findRealPowerCharBy24")
     @ResponseBody
+    @ApiOperation(value = "获取24小时功率曲线", notes = "获取24小时功率曲线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult findRealPowerCharBy24(String wtId, String recorddate) throws Exception {
         List<DataVo> resultList = new ArrayList<>();
         if (StringUtils.notEmp(recorddate) && StringUtils.notEmp(wtId)) {
@@ -159,6 +184,12 @@ public class WindturbineDetailLineChartController {
      */
     @PostMapping("/bjjllist")
     @ResponseBody
+    @ApiOperation(value = "单台风机当日报警记录", notes = "单台风机当日报警记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult bjjllist(Tablepar tablepar, String wtId, String recorddate) {
 
         PageInfo<WarningRecords> resultList =new PageInfo<>();
@@ -189,6 +220,12 @@ public class WindturbineDetailLineChartController {
      */
     @PostMapping("/gzjllist")
     @ResponseBody
+    @ApiOperation(value = "单台风机当日停机记录", notes = "单台风机当日停机记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult gzjllist(Tablepar tablepar, String wtId, String recorddate) {
 
         PageInfo<ShutdowneventVo> resultList =new PageInfo<>();
@@ -219,6 +256,12 @@ public class WindturbineDetailLineChartController {
      */
     @PostMapping("/xdjllist")
     @ResponseBody
+    @ApiOperation(value = "单台风机当日限电记录", notes = "单台风机当日限电记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult xdjllist(Tablepar tablepar, String wtId, String recorddate) {
 
         PageInfo<Brownoutsevent2> resultList = new PageInfo<>();
@@ -252,6 +295,13 @@ public class WindturbineDetailLineChartController {
      */
     @PostMapping("/plotBandAjax")
     @ResponseBody
+    @ApiOperation(value = "获取区域弹出列表信息", notes = "获取区域弹出列表信息")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始时间", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束时间", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult plotBandAjax(String wtId,String beginDate,String endDate) throws Exception {
 
         Map<String, String> map = new HashMap<>();

src/main/java/com/gyee/frame/controller/goodness/WindturbineDetailPieChartAController.java

@@ -7,6 +7,10 @@ import com.gyee.frame.model.custom.DataVo;
 import com.gyee.frame.service.Inputoroutputspeedtotal2Service;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,6 +26,7 @@ import java.util.List;
  */
 @Controller
 @RequestMapping("/goodness")
+@Api(value = "单机信息总览饼图")
 public class WindturbineDetailPieChartAController {
     @Resource
     private Inputoroutputspeedtotal2Service inputoroutputspeedtotal2Service;
@@ -35,6 +40,12 @@ public class WindturbineDetailPieChartAController {
      */
     @PostMapping("/pieChart")
     @ResponseBody
+    @ApiOperation(value = "查询等级评估日所有信息", notes = "查询等级评估日所有信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "类型 1:日小风切入，2：月小风切入，3：月小风切入,4:日小风停机，5：月小风停机，6：年小风停机", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult pieChart( String wtId, String recorddate,String type) {
 
         List<DataVo> vos=new ArrayList<>();

src/main/java/com/gyee/frame/controller/goodness/WindturbineGoodnessDetailController.java

@@ -12,6 +12,10 @@ import com.gyee.frame.service.*;
 import com.gyee.frame.service.goodness.WindturbinegoodnessService;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,6 +29,7 @@ import java.util.*;
  */
 @Controller
 @RequestMapping("/goodness")
+@Api(value = "单机信息总览详细信息")
 public class WindturbineGoodnessDetailController {
     @Resource
     private WindturbinegoodnessService windturbinegoodnessService;
@@ -61,6 +66,11 @@ public class WindturbineGoodnessDetailController {
      */
     @PostMapping("/wadAjax")
     @ResponseBody
+    @ApiOperation(value = "查询明细页面显示信息", notes = "查询明细页面显示信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult wadAjax(String wtId, String recorddate) {
 
         Windturbineanalysisday wtday = new Windturbineanalysisday();
@@ -142,6 +152,12 @@ public class WindturbineGoodnessDetailController {
      */
     @PostMapping("/bjphlist")
     @ResponseBody
+    @ApiOperation(value = "单台风机当月报警排行", notes = "单台风机当月报警排行")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult bjphlist(Tablepar tablepar, String wtId, String recorddate) {
         List<SawVo> resultList =new ArrayList<>();
         if(StringUtils.notEmp(wtId) && StringUtils.notEmp(recorddate))
@@ -171,6 +187,11 @@ public class WindturbineGoodnessDetailController {
      */
     @PostMapping("/glchat")
     @ResponseBody
+    @ApiOperation(value = "获取明细页面功率曲线", notes = "获取明细页面功率曲线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult glchat(String wtId, String recorddate) {
 
         List<DataVo> datavos = new ArrayList<>();
@@ -225,6 +246,11 @@ public class WindturbineGoodnessDetailController {
      */
     @PostMapping("/fjfzy")
     @ResponseBody
+    @ApiOperation(value = "获取风机风资源", notes = "获取风机风资源")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult fjfzy(String wtId, String recorddate) {
         Map<String, Object> map = new HashMap<String, Object>();
         List<ValueVo> vos = new ArrayList<ValueVo>();

src/main/java/com/gyee/frame/controller/goodness/WindturbinegoodnessController.java

@@ -10,6 +10,10 @@ import com.gyee.frame.service.WindturbineanalysisdayService;
 import com.gyee.frame.service.goodness.WindturbinegoodnessService;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,6 +28,7 @@ import java.util.List;
  */
 @Controller
 @RequestMapping("/goodness")
+@Api(value = "单机信息总览首页")
 public class WindturbinegoodnessController {
     @Resource
     private WindturbinegoodnessService windturbinegoodnessService;
@@ -41,6 +46,12 @@ public class WindturbinegoodnessController {
      */
     @PostMapping("/windturbinegoodness")
     @ResponseBody
+    @ApiOperation(value = "获得单机性能总览列表信息", notes = "获得单机性能总览列表信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult windturbinegoodness(Tablepar tablepar, String wpId, String recorddate) {
 
         PageInfo<Windturbinegoodness> resultList = windturbinegoodnessService.windturbinegoodnessList(tablepar, wpId, recorddate);
@@ -63,6 +74,13 @@ public class WindturbinegoodnessController {
      */
     @PostMapping("/goodhistorylist")
     @ResponseBody
+    @ApiOperation(value = "获得单机性能总览历史列表信息", notes = "获得单机性能总览历史列表信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult goodhistorylist(Tablepar tablepar, String wtId, String beginDate, String endDate) {
         List<Windturbineanalysisday> resultList =new ArrayList<>();
         if(StringUtils.notEmp(wtId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate) )

src/main/java/com/gyee/frame/controller/leaderboard/LeaderboardController.java

@@ -5,12 +5,16 @@ import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.model.auto.Curvefittingmain;
 import com.gyee.frame.model.auto.Curvefittingmonthmain;
 import com.gyee.frame.model.auto.Windturbineinfoday3;
-import com.gyee.frame.model.custom.StatisticalAnalysisTopVo;
 import com.gyee.frame.model.custom.SawVo;
+import com.gyee.frame.model.custom.StatisticalAnalysisTopVo;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.service.leaderboard.LeaderboardService;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
+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.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -22,6 +26,7 @@ import java.util.*;
 
 @Controller
 @RequestMapping("/leaderboard")
+@Api(value = "排行榜功能")
 public class LeaderboardController {
     @Autowired
     private LeaderboardService leaderboardService;
@@ -29,6 +34,13 @@ public class LeaderboardController {
     /**查询拟合优度列表**/
     @GetMapping("/fittingtoplist")
     @ResponseBody
+    @ApiOperation(value = "查询拟合优度列表", notes = "查询拟合优度列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpIps", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult fittingtoplist(Tablepar tablepar, String wpIps, String beginDate, String endDate) {
 
         Date beginDate_d=null;
@@ -97,6 +109,12 @@ public class LeaderboardController {
     /**查询拟合优度图表**/
     @GetMapping("/fittingtopchart")
     @ResponseBody
+    @ApiOperation(value = "查询拟合优度图表", notes = "查询拟合优度图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtIds", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult fittingtopchart(String wtIds, String beginDate, String endDate) throws Exception {
         Date beginDate_d=null;
         Date endDate_d=null;
@@ -123,6 +141,13 @@ public class LeaderboardController {
     /**查询总发电量排行列表**/
     @GetMapping("/totalPowerCapacityTopList")
     @ResponseBody
+    @ApiOperation(value = "查询总发电量排行列表", notes = "查询总发电量排行列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpIps", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult totalPowerCapacityTopList(Tablepar tablepar, String wpIps, String beginDate, String endDate) {
 
         Date beginDate_d=null;
@@ -203,6 +228,14 @@ public class LeaderboardController {
     /**查询利用率排行榜列表**/
     @PostMapping("/utilizationList")
     @ResponseBody
+    @ApiOperation(value = "查询总发电量排行列表", notes = "查询总发电量排行列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "类型 0:风场,1:项目,2:线路,3:风机,", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult utilizationList(Tablepar tablepar, String wpId, String beginDate, String endDate,String type) {
 
         Date beginDate_d=null;
@@ -230,6 +263,14 @@ public class LeaderboardController {
     /**查询损失率排行榜列表**/
     @GetMapping("/lossList")
     @ResponseBody
+    @ApiOperation(value = "查询损失率排行榜列表", notes = "查询损失率排行榜列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "类型 0:风场,1:项目,2:线路,3:风机,", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult lossList(Tablepar tablepar, String wpId, String beginDate, String endDate,String type) {
 
         Date beginDate_d=null;
@@ -256,6 +297,13 @@ public class LeaderboardController {
     /**查询负荷率排行榜列表**/
     @PostMapping("/loadfactortoplist")
     @ResponseBody
+    @ApiOperation(value = "查询负荷率排行榜列表", notes = "查询负荷率排行榜列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult loadfactortoplist(Tablepar tablepar, String wpId, String beginDate, String endDate) {
 
 
@@ -336,6 +384,13 @@ public class LeaderboardController {
     /**查询报警排行榜列表**/
     @PostMapping("/querywarningStatistical")
     @ResponseBody
+    @ApiOperation(value = "查询报警排行榜列表", notes = "查询报警排行榜列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "类型 1报警:,2:报警类型,3:厂家", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult querywarningStatistical(Tablepar tablepar, String type, String beginDate, String endDate) {
 
         Date beginDate_d=null;
@@ -362,6 +417,13 @@ public class LeaderboardController {
     /**查询报警排行榜图表**/
     @PostMapping("/querywarningStatisticalPie")
     @ResponseBody
+    @ApiOperation(value = "查询报警排行榜列表", notes = "查询报警排行榜列表")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "type", value = "类型 1报警:,2:报警类型,3:厂家", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult querywarningStatisticalPie(String type,  String beginDate, String endDate) {
 
         Date beginDate_d=null;
@@ -389,6 +451,12 @@ public class LeaderboardController {
     /**查询日曲线偏差率列表**/
     @PostMapping("/curvefittingmainList")
     @ResponseBody
+    @ApiOperation(value = "查询日曲线偏差率列表", notes = "查询日曲线偏差率列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult curvefittingmainList(Tablepar tablepar, String wpId, String recorddate) {
         List<Curvefittingmain> vos=new ArrayList<>();
         if (StringUtils.isNotEmpty(recorddate))
@@ -408,6 +476,12 @@ public class LeaderboardController {
     /**查询日曲线（实际/保证 实际/最优 最优/保证）图表**/
     @PostMapping("/getCurvechatAjax")
     @ResponseBody
+    @ApiOperation(value = "查询日曲线", notes = "查询日曲线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "类型 sjbz:实际/保证,sjzy:实际/最优,zybz:最优/保证", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult getCurvechatAjax(String type,String wtId,  String recorddate) {
         Map<String, Object> vos=new HashMap<>();
         if (StringUtils.isNotEmpty(recorddate))
@@ -427,6 +501,12 @@ public class LeaderboardController {
     /**查询日曲线同比图表**/
     @GetMapping("/curvechatAjaxtb")
     @ResponseBody
+    @ApiOperation(value = "查询日曲线同比图表", notes = "查询日曲线同比图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "类型 tb:同比,hb:环比,bg:标杆", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult curvechatAjaxtb(String type,String wtId,  String recorddate) {
 
         Map<String, Object> vos=new HashMap<>();
@@ -446,6 +526,12 @@ public class LeaderboardController {
     /**查询日曲线环比图表**/
     @GetMapping("/curvechatAjaxhb")
     @ResponseBody
+    @ApiOperation(value = "查询日曲线环比图表", notes = "查询日曲线环比图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "类型 tb:同比,hb:环比,bg:标杆", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult curvechatAjaxhb(String type,String wtId,  String recorddate) {
         Map<String, Object> vos=new HashMap<>();
         if (StringUtils.isNotEmpty(recorddate))
@@ -464,6 +550,12 @@ public class LeaderboardController {
     /**查询日曲线标杆图表**/
     @GetMapping("/curvechatAjaxbg")
     @ResponseBody
+    @ApiOperation(value = "查询日曲线标杆图表", notes = "查询日曲线标杆图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "类型 tb:同比,hb:环比,bg:标杆", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult curvechatAjaxbg(String type,String wtId,  String recorddate) {
         Map<String, Object> vos=new HashMap<>();
         if (StringUtils.isNotEmpty(recorddate))
@@ -484,6 +576,13 @@ public class LeaderboardController {
     /**查询月曲线偏差率列表**/
     @PostMapping("/curvefittingmonthmainList")
     @ResponseBody
+    @ApiOperation(value = "查询月曲线偏差率列表", notes = "查询月曲线偏差率列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult curvefittingmonthmainList(Tablepar tablepar, String wpId, String year,String month) {
 
         List<Curvefittingmonthmain> vos= leaderboardService.curvefittingmonthmainList( tablepar, wpId, year, month);
@@ -498,6 +597,13 @@ public class LeaderboardController {
     /**查询月曲线（实际/保证 实际/最优 最优/保证）图表**/
     @PostMapping("/curveMonthchatAjax")
     @ResponseBody
+    @ApiOperation(value = "查询月曲线偏差率", notes = "查询月曲线偏差率")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "类型 sjbz:实际/保证,sjzy:实际/最优,zybz:最优/保证", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult curveMonthchatAjax(String type,String wtId,  String year,String month) {
 
         Map<String, Object> vos= leaderboardService.curveMonthchatAjax( type,wtId, year, month);
@@ -512,6 +618,13 @@ public class LeaderboardController {
     /**查询月曲线同比图表**/
     @GetMapping("/curveMonthchatAjaxtb")
     @ResponseBody
+    @ApiOperation(value = "查询月曲线同比图表", notes = "查询月曲线同比图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "类型 tb:同比,hb:环比,bg:标杆", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult curveMonthchatAjaxtb(String type,String wtId, String year,String month) {
 
         Map<String, Object> vos= leaderboardService.curveMonthchatAjaxtb( type,wtId, year, month);
@@ -525,6 +638,13 @@ public class LeaderboardController {
     /**查询月曲线环比图表**/
     @GetMapping("/curveMonthchatAjaxhb")
     @ResponseBody
+    @ApiOperation(value = "查询月曲线环比图表", notes = "查询月曲线环比图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "类型 tb:同比,hb:环比,bg:标杆", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult curveMonthchatAjaxhb(String type,String wtId,  String year,String month) {
 
         Map<String, Object> vos= leaderboardService.curveMonthchatAjaxhb( type,wtId, year, month);
@@ -538,6 +658,13 @@ public class LeaderboardController {
     /**查询月曲线标杆图表**/
     @GetMapping("/curveMonthchatAjaxbg")
     @ResponseBody
+    @ApiOperation(value = "查询月曲线标杆图表", notes = "查询月曲线标杆图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "类型 tb:同比,hb:环比,bg:标杆", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult curveMonthchatAjaxbg(String type,String wtId,  String year,String month) {
 
         Map<String, Object> vos= leaderboardService.curveMonthchatAjaxbg( type,wtId, year, month);

src/main/java/com/gyee/frame/controller/outputspeed/OutputSpeedController.java

@@ -7,6 +7,10 @@ import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.service.InputoroutputspeedtotalService;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
+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.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -19,6 +23,7 @@ import java.util.List;
 
 @Controller
 @RequestMapping("/outputspeed")
+@Api(value = "切入切出管理")
 public class OutputSpeedController {
 
     @Autowired
@@ -27,6 +32,12 @@ public class OutputSpeedController {
     /**切入切出列表**/
     @PostMapping("/outputSpeedlist")
     @ResponseBody
+    @ApiOperation(value = "切入切出列表", notes = "切入切出列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "Tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult outputSpeedlist(Tablepar tablepar, String wpId, String recorddate) {
 
         List<Inputoroutputspeedtotal> vos=new ArrayList<>();
@@ -47,6 +58,14 @@ public class OutputSpeedController {
     /**切入切出历史列表**/
     @PostMapping("/outputspeedhistorylist")
     @ResponseBody
+    @ApiOperation(value = "切入切出历史列表", notes = "切入切出历史列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "Tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult outputspeedhistorylist(Tablepar tablepar, String wpId,String wtId, String beginDate,String endDate) {
 
         List<Inputoroutputspeedtotal> vos=new ArrayList<>();

src/main/java/com/gyee/frame/controller/powercompare/PowerCompareController.java

@@ -9,6 +9,10 @@ import com.gyee.frame.service.Windpowerinfoday3Service;
 import com.gyee.frame.service.Windturbineinfoday3Service;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -21,6 +25,7 @@ import java.util.stream.Collectors;
 
 @Controller
 @RequestMapping("/powercompare")
+@Api(value = "风机绩效榜功能")
 public class PowerCompareController {
 
     @Resource
@@ -36,6 +41,7 @@ public class PowerCompareController {
     @GetMapping("/windfarmAjax")
     @ResponseBody
     @CrossOrigin
+    @ApiOperation(value = "查询风电场数据列表", notes = "查询风电场数据列表")
     public AjaxResult windfarmAjax() {
         List<StopTypeTreeVo> vos = new ArrayList<StopTypeTreeVo>();
         for (Windpowerstation station : InitialRunner.wpls) {
@@ -63,7 +69,8 @@ public class PowerCompareController {
     @GetMapping("/windfarmAllAjax")
     @ResponseBody
     @CrossOrigin
-    public AjaxResult windfarmAllAjax() {
+    @ApiOperation(value = "查询风电场(光伏)数据列表", notes = "查询风电场(光伏)数据列表")
+      public AjaxResult windfarmAllAjax() {
         List<StopTypeTreeVo> vos = new ArrayList<StopTypeTreeVo>();
         for (Windpowerstation station : InitialRunner.wpallls) {
             StopTypeTreeVo vo = new StopTypeTreeVo();
@@ -88,6 +95,10 @@ public class PowerCompareController {
     @GetMapping("/projectAjax")
     @ResponseBody
     @CrossOrigin
+    @ApiOperation(value = "通过风场编号查询项目数据列表", notes = "通过风场编号查询项目数据列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpIds", value = "风场编号", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult projectAjax(String wpIds) {
         List<StopTypeTreeVo> vos = new ArrayList<StopTypeTreeVo>();
         if (StringUtils.notEmp(wpIds)) {
@@ -122,6 +133,7 @@ public class PowerCompareController {
     @GetMapping("/projectAllAjax")
     @ResponseBody
     @CrossOrigin
+    @ApiOperation(value = "查询风电项目数据列表", notes = "查询风电项目数据列表")
     public AjaxResult projectAllAjax() {
         List<StopTypeTreeVo> vos = new ArrayList<StopTypeTreeVo>();
         for (Project project : InitialRunner.pjls) {
@@ -147,6 +159,10 @@ public class PowerCompareController {
     @GetMapping("/lineAjax")
     @ResponseBody
     @CrossOrigin
+    @ApiOperation(value = "通过项目编号查询项目数据列表", notes = "通过项目编号查询项目数据列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pjIds", value = "项目编号", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult lineAjax(String pjIds) {
         List<StopTypeTreeVo> vos = new ArrayList<StopTypeTreeVo>();
         if (StringUtils.notEmp(pjIds)) {
@@ -173,12 +189,14 @@ public class PowerCompareController {
         }
     }
     /**
-     * 风电场线路下拉接口
+     * 线路下拉接口
      * @return
      */
     @GetMapping("/lineAllAjax")
     @ResponseBody
     @CrossOrigin
+    @ApiOperation(value = "查询风电线路数据列表", notes = "查询风电线路数据列表")
+
     public AjaxResult lineAllAjax() {
         List<StopTypeTreeVo> vos = new ArrayList<StopTypeTreeVo>();
         for (Line line : InitialRunner.linels) {
@@ -204,6 +222,10 @@ public class PowerCompareController {
     @GetMapping("/windturbineAjax")
     @ResponseBody
     @CrossOrigin
+    @ApiOperation(value = "通过风场编号查询风机数据列表", notes = "通过风场编号查询风机数据列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult windturbineAjax(String wpId) {
 
         List<StopTypeTreeVo> vos = new ArrayList<StopTypeTreeVo>();
@@ -238,6 +260,8 @@ public class PowerCompareController {
     @GetMapping("/windturbineAllAjax")
     @ResponseBody
     @CrossOrigin
+    @ApiOperation(value = "查询风机数据列表", notes = "查询风机数据列表")
+
     public AjaxResult windturbineAllAjax() {
 
         List<StopTypeTreeVo> vos = new ArrayList<StopTypeTreeVo>();
@@ -263,6 +287,15 @@ public class PowerCompareController {
     @GetMapping("/queryPower")
     @ResponseBody
     @CrossOrigin
+    @ApiOperation(value = "查询风机图表数据结果", notes = "查询风机图表数据结果")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "wpIds", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "pjIds", value = "项目编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "lineIds", value = "线路编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult queryPower(String wpIds, String pjIds, String lineIds, String beginDate,
                              String endDate)  {
         Date beginDate_d=null;
@@ -290,6 +323,14 @@ public class PowerCompareController {
     @GetMapping("/queryPowerAll")
     @ResponseBody
     @CrossOrigin
+    @ApiOperation(value = "查询风场、项目、线路图表数据结果", notes = "查询风场、项目、线路图表数据结果")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "wpIds", value = "风场编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "queryType", value = "查询类型 fc:风场,pj:项目,xl:线路", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult queryPowerAll(String wpIds,  String beginDate,
                                  String endDate,String  queryType)  {
         Date beginDate_d=null;
@@ -325,6 +366,17 @@ public class PowerCompareController {
     @GetMapping("/powerAjax")
     @ResponseBody
     @CrossOrigin
+
+    @ApiOperation(value = "查询风机图表数据结果", notes = "查询风机图表数据结果")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "wpIds", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "pjIds", value = "项目编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "lineIds", value = "线路编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "sortName", value = "排序字段", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "sortOrder", value = "排序顺序 asc,desc", required = true, dataType = "string", paramType = "query")})
     public AjaxResult powerAjax(String wpIds, String pjIds, String lineIds, String beginDate,
                                 String endDate, String sortName, String sortOrder)  {
         Date beginDate_d=null;
@@ -413,6 +465,16 @@ public class PowerCompareController {
     @GetMapping("/powerAjaxAll")
     @ResponseBody
     @CrossOrigin
+    @ApiOperation(value = "查询风场、项目、线路列表数据结果", notes = "查询风场、项目、线路列表数据结果")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "wpIds", value = "风场编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "queryType", value = "查询类型 fc:风场,pj:项目,xl:线路", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "sortName", value = "排序字段", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "sortOrder", value = "排序顺序 asc,desc", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult powerAjaxAll(String wpIds,  String beginDate,
                                     String endDate,String  queryType, String sortName, String sortOrder)  {
         Date beginDate_d=null;

src/main/java/com/gyee/frame/controller/powercompare/PowerCompareDetailController.java

@@ -5,6 +5,10 @@ import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.model.benchmarking.PowerCompareDetail;
 import com.gyee.frame.service.benchmarking.PowerCompareDetailService;
 import com.gyee.frame.util.DateUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -14,14 +18,10 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import javax.annotation.Resource;
 import java.util.*;
 
-/**
- * @ClassName : PowerCompareDetailController
- * @Author : xieshengjie
- * @Date: 2021/1/30 19:15
- * @Description : 风机绩效榜明细Controller
- */
+
 @Controller
 @RequestMapping("/powercomparedetail")
+@Api(value = "风机绩效榜明细")
 public class PowerCompareDetailController {
 
     @Resource
@@ -33,6 +33,15 @@ public class PowerCompareDetailController {
     /**查询风机列表数据结果**/
     @GetMapping("/powerAjaxDetail")
     @ResponseBody
+    @ApiOperation(value = "查询风机绩效榜明细信息", notes = "查询风机绩效榜明细信息")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "pjId", value = "项目编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "xlId", value = "线路编号", required = false, dataType = "string", paramType = "query")})
+
     public AjaxResult powerAjaxDetail(@RequestParam(value = "beginDate",required = true) String beginDate,
                                       @RequestParam(value = "endDate",required = true) String endDate,
                                       @RequestParam(value = "wpId",required = false) String  wpId,
@@ -108,6 +117,14 @@ public class PowerCompareDetailController {
     /**查询风场、项目、线路列表数据结果**/
     @GetMapping("/powerAjaxDetailAll")
     @ResponseBody
+    @ApiOperation(value = "查询风场、项目、线路列表数据结果", notes = "查询风场、项目、线路列表数据结果")
+    @ApiImplicitParams({
+
+
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "queryType", value = "查询类型 fc:风场,pj:项目,xl:线路", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult powerAjaxDetailAll(@RequestParam(value = "beginDate",required = true) String beginDate,
                                          @RequestParam(value = "endDate",required = true) String endDate,
                                          @RequestParam(value = "queryType",required = true) String  queryType)  {

src/main/java/com/gyee/frame/controller/powersaturation/PowerSaturationAmonutController.java

@@ -11,6 +11,10 @@ import com.gyee.frame.model.custom.DataVo;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.service.WindturbinecurvefittingService;
 import com.gyee.frame.util.StringUtils;
+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.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,6 +27,7 @@ import java.util.Map;
 
 @Controller
 @RequestMapping("/powersaturation")
+@Api(value = "总单机饱和度统计")
 public class PowerSaturationAmonutController {
     @Autowired
     private WindturbinecurvefittingService windturbinecurvefittingService;
@@ -30,6 +35,12 @@ public class PowerSaturationAmonutController {
     /**总功率饱和列表**/
     @PostMapping("/powersaturationamonutlist")
     @ResponseBody
+    @ApiOperation(value = "查询总功率饱和列表", notes = "查询总功率饱和列表")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult powersaturationamonutlist(Tablepar tablepar, String wtId) {
 
         PageInfo<Windturbinecurvefitting> vos=new PageInfo<>();
@@ -48,6 +59,11 @@ public class PowerSaturationAmonutController {
     /**总功率饱和图表**/
     @PostMapping("/powersaturationamonutchart")
     @ResponseBody
+    @ApiOperation(value = "查询总功率饱和图表", notes = "查询总功率饱和图表")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult powersaturationamonutchart(String wtId) {
 
         List<DataVo> vos = new ArrayList<DataVo>();

src/main/java/com/gyee/frame/controller/powersaturation/PowerSaturationController.java

@@ -12,6 +12,10 @@ import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.service.WindturbinecurvefittingService;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
+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.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -25,6 +29,7 @@ import java.util.Map;
 
 @Controller
 @RequestMapping("/powersaturation")
+@Api(value = "日单机饱和度统计")
 public class PowerSaturationController {
 
     @Autowired
@@ -33,6 +38,13 @@ public class PowerSaturationController {
     /**日功率饱和列表**/
     @PostMapping("/powersaturationlist")
     @ResponseBody
+    @ApiOperation(value = "日功率饱和列表", notes = "日功率饱和列表")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult powersaturationlist(Tablepar tablepar, String wtId, String recorddate) {
 
         PageInfo<Windturbinecurvefitting> vos=new PageInfo<>();
@@ -52,6 +64,11 @@ public class PowerSaturationController {
     /**日功率饱和图表**/
     @PostMapping("/powersaturationchart")
     @ResponseBody
+    @ApiOperation(value = "日功率饱和图表", notes = "日功率饱和图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult powersaturationchart(String wtId,String recorddate) {
 
         List<DataVo> vos = new ArrayList<DataVo>();

src/main/java/com/gyee/frame/controller/powersaturation/PowerSaturationMonthController.java

@@ -11,6 +11,10 @@ import com.gyee.frame.model.custom.DataVo;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.service.WindturbinecurvefittingmonthService;
 import com.gyee.frame.util.StringUtils;
+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.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,6 +27,7 @@ import java.util.Map;
 
 @Controller
 @RequestMapping("/powersaturation")
+@Api(value = "月单机饱和度统计")
 public class PowerSaturationMonthController {
 
     @Autowired
@@ -31,6 +36,14 @@ public class PowerSaturationMonthController {
     /**月功率饱和列表**/
     @PostMapping("/powersaturationmonthlist")
     @ResponseBody
+    @ApiOperation(value = "月功率饱和列表", notes = "月功率饱和列表")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult powersaturationmonthlist(Tablepar tablepar, String wtId, String year, String month) {
 
         PageInfo<Windturbinecurvefittingmonth> vos=new PageInfo<>();
@@ -50,6 +63,12 @@ public class PowerSaturationMonthController {
     /**月功率饱和图表**/
     @PostMapping("/powersaturationmonthchart")
     @ResponseBody
+    @ApiOperation(value = "月功率饱和图表", notes = "月功率饱和图表")
+    @ApiImplicitParams({
+             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult powersaturationmonthchart(String wtId, String year, String month) {
 
         List<DataVo> vos = new ArrayList<DataVo>();

src/main/java/com/gyee/frame/controller/projectplan/ProjectPlanController.java

@@ -2,10 +2,13 @@ package com.gyee.frame.controller.projectplan;
 
 import com.gyee.frame.common.conf.AjaxStatus;
 import com.gyee.frame.common.domain.AjaxResult;
-import com.gyee.frame.model.auto.Inputoroutputspeedtotal;
 import com.gyee.frame.model.custom.ProjectPlanVo;
 import com.gyee.frame.service.ProjectPlanService;
 import com.gyee.frame.util.StringUtils;
+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.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -17,6 +20,7 @@ import java.util.List;
 
 @Controller
 @RequestMapping("/projectplan")
+@Api(value = "计划发电量")
 public class ProjectPlanController {
 
     @Autowired
@@ -25,6 +29,13 @@ public class ProjectPlanController {
     /**计划发电量列表**/
     @PostMapping("/getProjectPlanVo")
     @ResponseBody
+    @ApiOperation(value = "计划发电量列表", notes = "计划发电量列表")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "pjId", value = "项目编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult getProjectPlanVo(String wpId, String pjId, String year)  {
 
         List<ProjectPlanVo> vos=new ArrayList<>();
@@ -44,6 +55,11 @@ public class ProjectPlanController {
     /**返回计划发电量修改对象**/
     @PostMapping("/getSingleProjectPlan")
     @ResponseBody
+    @ApiOperation(value = "查询计划发电量修改对象", notes = "查询计划发电量修改对象")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pjId", value = "项目编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult getSingleProjectPlan(String projectid, String year) {
 
         if (StringUtils.notEmp(projectid) && StringUtils.notEmp(year))
@@ -60,17 +76,21 @@ public class ProjectPlanController {
     /**计划发电量添加和修改**/
     @PostMapping("/saveData")
     @ResponseBody
+    @ApiOperation(value = "查询计划发电量修改对象", notes = "查询计划发电量修改对象")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "vo", value = "项目VO对象", required = true, dataType = "ProjectPlanVo", paramType = "query")})
+
     public AjaxResult saveData(ProjectPlanVo vo) {
 
-        List<Inputoroutputspeedtotal> vos=new ArrayList<>();
+        int value=0;
         if (StringUtils.notEmp(vo))
         {
 
-           int value=projectPlanService.saveData(vo);
+            value=projectPlanService.saveData(vo);
             return AjaxResult.successData(AjaxStatus.success.code, value);
         }
 
-        return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+        return AjaxResult.successData(AjaxStatus.emptyresultset.code, value);
 
     }
 

src/main/java/com/gyee/frame/controller/recommen/RecommenController.java

@@ -11,6 +11,10 @@ import com.gyee.frame.model.custom.WoBugEqVo;
 import com.gyee.frame.service.recommen.RecommenService;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
+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.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -21,6 +25,7 @@ import java.util.*;
 
 @Controller
 @RequestMapping("/recommen")
+@Api(value = "健康风机推荐")
 public class RecommenController {
 
     @Autowired
@@ -32,7 +37,8 @@ public class RecommenController {
      */
     @PostMapping("/getRecommenmainDay1")
     @ResponseBody
-    public AjaxResult getRecommenmainDay1() {
+    @ApiOperation(value = "获得当日健康推荐检修风机", notes = "获得当日健康推荐检修风机")
+     public AjaxResult getRecommenmainDay1() {
 
         List<Recommenmain> vos=new ArrayList<>();
 
@@ -51,6 +57,7 @@ public class RecommenController {
      */
     @PostMapping("/getRecommenmainDay3")
     @ResponseBody
+    @ApiOperation(value = "获得3日健康推荐检修风机", notes = "获得3日健康推荐检修风机")
     public AjaxResult getRecommenmainDay3() {
 
         List<Recommenmain> vos=new ArrayList<>();
@@ -70,6 +77,7 @@ public class RecommenController {
      */
     @PostMapping("/getRecommenmainDay7")
     @ResponseBody
+    @ApiOperation(value = "获得7日健康推荐检修风机", notes = "获得7日健康推荐检修风机")
     public AjaxResult getRecommenmainDay7() {
 
         List<Recommenmain> vos=new ArrayList<>();
@@ -89,6 +97,11 @@ public class RecommenController {
      */
     @PostMapping("/confirpush")
     @ResponseBody
+    @ApiOperation(value = "确认推荐检修风机，并添加记录到生产系统", notes = "确认推荐检修风机，并添加记录到生产系统")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "rid", value = "推荐记录编号", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult confirpush(String rid)
     {
         int result=0;
@@ -106,6 +119,11 @@ public class RecommenController {
      */
     @PostMapping("/confirpushAll")
     @ResponseBody
+    @ApiOperation(value = "全部确认不同时间段的推荐检修风机", notes = "全部确认不同时间段的推荐检修风机")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "typeid", value = "类型编号 1代表全部确认当日推荐  2 代表全部确认三天推荐 3 代表全部确认未来七天推荐", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult confirpushAll(String typeid)
     {
 
@@ -156,6 +174,11 @@ public class RecommenController {
      */
     @PostMapping("/ignorepush")
     @ResponseBody
+    @ApiOperation(value = "取消推荐检修风机", notes = "取消推荐检修风机")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "rid", value = "推荐记录编号", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult ignorepush(String rid)
     {
         int result=0;
@@ -173,6 +196,11 @@ public class RecommenController {
      */
     @PostMapping("/ignorepushAll")
     @ResponseBody
+    @ApiOperation(value = "全部取消不同时间段的推荐检修风机", notes = "全部取消不同时间段的推荐检修风机")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "typeid", value = "类型编号 1代表全部取消当日推荐  2 代表全部取消三天推荐 3 代表全部取消未来七天推荐", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult ignorepushAll(String typeid)
     {
 
@@ -224,6 +252,8 @@ public class RecommenController {
      */
     @PostMapping("/recommenConfirmedList")
     @ResponseBody
+    @ApiOperation(value = "获得已经确认检修风机", notes = "获得已经确认检修风机")
+
     public AjaxResult recommenConfirmedList() {
 
         List<Recommenmain> vos=new ArrayList<>();
@@ -252,6 +282,11 @@ public class RecommenController {
      */
     @PostMapping("/findAllChartjz")
     @ResponseBody
+    @ApiOperation(value = "获得健康状态预测", notes = "获得健康状态预测")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "类型编号 1 表示24小时健康趋势，2 表示七天健康趋势 3 表示30天健康趋势", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult findAllChartjz(String wpId,  String type) throws Exception {
 
         Map<String, Object[]> map = new HashMap<String, Object[]>();
@@ -277,6 +312,11 @@ public class RecommenController {
      */
     @PostMapping("/findMainTrack")
     @ResponseBody
+    @ApiOperation(value = "通过消缺单获得详细信息", notes = "通过消缺单获得详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "rid", value = "推荐检修编号", required = true, dataType = "string", paramType = "query")
+        })
+
     public AjaxResult findMainTrack(String rid) {
 
         MainTrackVo vo = new MainTrackVo();
@@ -296,6 +336,14 @@ public class RecommenController {
      */
     @PostMapping("/unfinishedList")
     @ResponseBody
+    @ApiOperation(value = "获得未完成消缺单列表", notes = "获得未完成消缺单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")
+    })
+
     public AjaxResult unfinishedList(String wpId, String wtId, String beginDate, String endDate) {
 
         List<WoBugEqVo> vos=new ArrayList<>();
@@ -318,6 +366,14 @@ public class RecommenController {
      */
     @PostMapping("/finishedList")
     @ResponseBody
+    @ApiOperation(value = "获得完成消缺单列表", notes = "获得完成消缺单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")
+    })
+
     public AjaxResult finishedList(String wpId, String wtId, String beginDate, String endDate) {
 
         List<WoBugEqVo> vos=new ArrayList<>();
@@ -346,6 +402,13 @@ public class RecommenController {
      */
     @PostMapping("/findShbraceletList")
     @ResponseBody
+    @ApiOperation(value = "通过用户姓名和开始检修时间和结束检修时间获取手环实时和历史数据", notes = "通过用户姓名和开始检修时间和结束检修时间获取手环实时和历史数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "name", value = "名称", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")
+    })
+
     public AjaxResult findShbraceletList(String name,String beginDate,String endDate) throws Exception {
 
         Map<String,Map<String,Object>> result=new HashMap<>();
@@ -370,6 +433,11 @@ public class RecommenController {
      */
     @PostMapping("/findLocationTreeByWtId")
     @ResponseBody
+    @ApiOperation(value = "获取部件结构树", notes = "获取部件结构树")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = false, dataType = "string", paramType = "query")
+    })
+
     public AjaxResult findLocationTreeByWtId(String wtId) throws Exception {
 
         String result="";
@@ -390,6 +458,11 @@ public class RecommenController {
      */
     @PostMapping("/findWobugeqByLocation")
     @ResponseBody
+    @ApiOperation(value = "通过位置编号获得缺陷单信息", notes = "通过位置编号获得缺陷单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = false, dataType = "Tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "location", value = "位置", required = true, dataType = "string", paramType = "query")
+    })
     public AjaxResult findWobugeqByLocation(Tablepar tablepar, String location) throws Exception {
 
         PageInfo<Wobugeq> pageInfo=new PageInfo<>();

src/main/java/com/gyee/frame/controller/report/WtHealthReportController.java

@@ -8,6 +8,10 @@ import com.gyee.frame.model.auto.WtTragetReportChart;
 import com.gyee.frame.service.report.WtHealthReportService;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
@@ -24,6 +28,7 @@ import java.util.Map;
 
 @Controller
 @RequestMapping("/report")
+@Api(value = "日健康报告")
 public class WtHealthReportController extends BaseController {
 	private static Logger logger = LoggerFactory.getLogger(WtHealthReportController.class);
 
@@ -39,6 +44,12 @@ public class WtHealthReportController extends BaseController {
 	 */
 	@PostMapping("/healthReport")
 	@ResponseBody
+	@ApiOperation(value = "查询健康报告主表和子表数据", notes = "查询健康报告主表和子表数据")
+	@ApiImplicitParams({
+
+			@ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+			@ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
 	public AjaxResult healthReport(String wtId, String recorddate) throws Exception {
 
 		Map<String,Object> map=new HashMap<>();
@@ -66,6 +77,12 @@ public class WtHealthReportController extends BaseController {
 	 */
 	@PostMapping("/healthReportChart")
 	@ResponseBody
+	@ApiOperation(value = "查询健康包括部件健康指数的历史图表", notes = "查询健康包括部件健康指数的历史图表")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+			@ApiImplicitParam(name = "partId", value = "部件编号 zk:主控,clx:齿轮箱,fdj:发电机,bj:变桨", required = true, dataType = "string", paramType = "query"),
+			@ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
 	public AjaxResult healthReportChart(String wtId,String partId, String recorddate)  {
 
 		List<WtTragetReportChart> vos=new ArrayList<>();
@@ -96,6 +113,13 @@ public class WtHealthReportController extends BaseController {
 	 */
 	@PostMapping("/getReportList")
 	@ResponseBody
+	@ApiOperation(value = "获得健康报表相关列表信息", notes = "获得健康报表相关列表信息")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+			@ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+			@ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+			@ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
 	public AjaxResult getReportList(String wpId,String wtId, String beginDate,String endDate) throws Exception {
 
 		List<WtReportMain> wtrmls=new ArrayList<>();

src/main/java/com/gyee/frame/controller/report/WtHealthReportMonthController.java

@@ -8,6 +8,10 @@ import com.gyee.frame.model.auto.Wobugeq;
 import com.gyee.frame.model.auto.WtTragetReportChart;
 import com.gyee.frame.service.report.WtHealthReportMonthService;
 import com.gyee.frame.util.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
@@ -24,6 +28,7 @@ import java.util.Map;
 
 @Controller
 @RequestMapping("/reportmonth")
+@Api(value = "月度健康报告")
 public class WtHealthReportMonthController extends BaseController {
 	private static Logger logger = LoggerFactory.getLogger(WtHealthReportMonthController.class);
 
@@ -45,6 +50,12 @@ public class WtHealthReportMonthController extends BaseController {
 	 */
 	@PostMapping("/healthReportChart")
 	@ResponseBody
+	@ApiOperation(value = "查询健康包括部件健康指数的历史图表", notes = "查询健康包括部件健康指数的历史图表")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+			@ApiImplicitParam(name = "partId", value = "部件编号 zk:主控,clx:齿轮箱,fdj:发电机,bj:变桨", required = true, dataType = "string", paramType = "query"),
+			@ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
 	public AjaxResult healthReportChart(String wtId,String partId, String recorddate)  {
 
 		List<WtTragetReportChart> vos=new ArrayList<>();
@@ -73,6 +84,11 @@ public class WtHealthReportMonthController extends BaseController {
 	 */
 	@PostMapping("/getWobugeqList")
 	@ResponseBody
+	@ApiOperation(value = "查询生产系统月度风机检修情况", notes = "查询生产系统月度风机检修情况")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+			@ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
 	public AjaxResult getWobugeqList(String wtId, String recorddate)  {
 
 		List<Wobugeq> vos=new ArrayList<>();
@@ -99,6 +115,11 @@ public class WtHealthReportMonthController extends BaseController {
 	 */
 	@PostMapping("/getRecommenmainList")
 	@ResponseBody
+	@ApiOperation(value = "查询推荐月度风机检修情况", notes = "查询推荐月度风机检修情况")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+			@ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
 	public AjaxResult getRecommenmainList(String wtId, String recorddate)  {
 
 		List<Recommenmain> vos=new ArrayList<>();
@@ -130,6 +151,11 @@ public class WtHealthReportMonthController extends BaseController {
 	 */
 	@PostMapping("/gamonthlistByWtId")
 	@ResponseBody
+	@ApiOperation(value = "获得风机月度等级评估数据", notes = "获得风机月度等级评估数据")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+			@ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
 	public AjaxResult gamonthlistByWtId(String wtId, String recorddate)  {
 
 		Map<String,Object> map=new HashMap<>();

src/main/java/com/gyee/frame/controller/scatter/ScatterController.java

@@ -14,6 +14,10 @@ import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.IRealTimeDataBaseUtil;
 import com.gyee.frame.util.StringUtils;
 import com.gyee.frame.util.golden.EdosUtil;
+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.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -25,6 +29,7 @@ import java.util.*;
 
 @Controller
 @RequestMapping("/scatter")
+@Api(value = "风场、项目、线路功率风速散点图")
 public class ScatterController {
 
     @Autowired
@@ -44,6 +49,14 @@ public class ScatterController {
      */
     @PostMapping("/scatterAjax")
     @ResponseBody
+    @ApiOperation(value = "获得选择场站、项目、线路、年份、月份相关散点图", notes = "获得选择场站、项目、线路、年份、月份相关散点图")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "pjId", value = "项目编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "lnId", value = "线路编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult scatterAjax(String wpId, String pjId,String lnId, String year, String month) throws Exception {
 
         List<List<Double>> vos = new ArrayList<List<Double>>();
@@ -119,6 +132,12 @@ public class ScatterController {
      */
     @PostMapping("/scatterWtAjax")
     @ResponseBody
+    @ApiOperation(value = "获得选择风机、年份、月份相关散点图", notes = "获得选择风机、年份、月份相关散点图")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult scatterWtAjax(String wtId, String year, String month) throws Exception {
 
         Map<String, List<List<Double>>> result = new HashMap<String, List<List<Double>>>();

src/main/java/com/gyee/frame/controller/singleanalysis/SingleAnalysisController.java

@@ -6,6 +6,10 @@ import com.gyee.frame.model.custom.SingleAnalysisVo;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.service.singleanalysis.SingleAnalysisService;
 import com.gyee.frame.util.StringUtils;
+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.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -16,6 +20,7 @@ import java.util.*;
 
 @Controller
 @RequestMapping("/singleanalysis")
+@Api(value = "单机性能分析")
 public class SingleAnalysisController {
 
     @Autowired
@@ -32,6 +37,13 @@ public class SingleAnalysisController {
      */
     @PostMapping("/singleanalysisMain")
     @ResponseBody
+    @ApiOperation(value = "查询单机性能分析首页", notes = "查询单机性能分析首页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "Tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult singleanalysisMain(Tablepar tablepar, String wpId, String year, String month) throws Exception {
 
         List<SingleAnalysisVo> vos =new ArrayList<>();
@@ -73,6 +85,13 @@ public class SingleAnalysisController {
      */
     @PostMapping("/singleanalysisSub")
     @ResponseBody
+    @ApiOperation(value = "查询单机性能分析子页面", notes = "查询单机性能分析子页面")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult singleanalysisSub(String wtId, String year, String month) throws Exception {
 
         Map<String,Object> map=new HashMap<>();
@@ -150,6 +169,13 @@ public class SingleAnalysisController {
      */
     @PostMapping("/singleanalysisChart")
     @ResponseBody
+    @ApiOperation(value = "单机信息总览图表接口(3个) 发电量和风速、五项损失、静风频率和待机时间", notes = "单机信息总览图表接口(3个) 发电量和风速、五项损失、静风频率和待机时间")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+
     public AjaxResult singleanalysisChart(String wtId, String year, String month) throws Exception {
 
         Map<String,List<SingleAnalysisVo>> map =new HashMap<>();

src/main/java/com/gyee/frame/service/recommen/RecommenService.java

@@ -552,7 +552,7 @@ public class RecommenService {
 							PointData pd=realApiUtil.getRealData(po.getPointkey());
 
 							map1.put(key,pd.getPointValueInDouble());
-							long count = (end.getTime() / 1000 - begin.getTime()) / 600;
+							long count = (end.getTime() / 1000 - begin.getTime()/1000) / 600;
 							List<PointData> ls = realApiUtil.getHistoryDatasSnap(pointkey, begin.getTime() / 1000, end.getTime() / 1000, count, INTERVAL);
 							if(!ls.isEmpty())
 							{

src/main/java/com/gyee/frame/service/websocket/BraceletService.java

@@ -258,7 +258,245 @@ public class BraceletService  {
         websocketMessageService.SendAlertToAll(destination,ls);
 //        websocketMessageService.SendAlertToAll(destination,"testy");
     }
+    public void braceletPushTask(String destination,String wtId) throws Exception {
 
+
+        List<String> pointids=new ArrayList<>();
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0002");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0133");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0009");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0012");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0013");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0001");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0014");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0130");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0131");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0132");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0133");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0134");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0135");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0009");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0011");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0003");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0005");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0013");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0001");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0007");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0165");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0169");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0167");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0173");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0163");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0161");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0171");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0175");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0325");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0321");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0323");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0076");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0077");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0073");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0562");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0080");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0146");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0149");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0147");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0150");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0148");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0151");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0971");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0976");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1035");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1040");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1163");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1168");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1227");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1232");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1355");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1360");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0329");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0332");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0333");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0361");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0364");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0365");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0313");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0316");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0317");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0281");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0284");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0285");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0265");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0268");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0002");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0133");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0009");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0012");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0013");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0001");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0014");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0130");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0131");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0132");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0133");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0134");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0135");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0009");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0011");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0003");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0005");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0013");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0001");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0007");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0165");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0169");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0167");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0173");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0163");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0161");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0171");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0175");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0325");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0321");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0323");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0076");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0077");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0073");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0562");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0080");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0146");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0149");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0147");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0150");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0148");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0151");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0971");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0976");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1035");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1040");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1163");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1168");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1227");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1232");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1355");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1360");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0329");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0332");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0333");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0361");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0364");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0365");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0313");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0316");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0317");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0281");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0284");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0285");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0265");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0268");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0269");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI2310");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1358");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1230");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1166");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1038");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0974");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0292");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1678");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1486");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1614");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1678");
+        pointids.add("SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI2310");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI2544");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI2608");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI2672");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI3046");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI3280");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI3344");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI3408");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI3472");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0034");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0037");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0041");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0044");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0045");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0033");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0046");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0108");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0109");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0105");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0563");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0441");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0444");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0445");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0425");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0428");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0429");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0393");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0396");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0397");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0377");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0380");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0381");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0588");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0589");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0585");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0564");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0578");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0579");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0580");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0581");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0582");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0583");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0665");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0668");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0669");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0633");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0636");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0637");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0649");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0652");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0653");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0085");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0083");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0087");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0081");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0091");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0089");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0093");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0145");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0243");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0241");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0249");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0247");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0251");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0253");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0255");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1670");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1678");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1478");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1414");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1680");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1616");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1488");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI1424");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI0515");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI2263");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI2261");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI2259");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI2267");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI2265");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI2269");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI2273");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI2697");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI2633");
+        pointids.add("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI2569");
+
+        List<PointData> ls= realApiUtil.getRealData(pointids);
+
+        websocketMessageService.SendAlertToAll(destination,ls);
+//        websocketMessageService.SendAlertToAll(destination,"testy");
+    }
 }
 
 

src/main/resources/META-INF/MANIFEST.MF

@@ -0,0 +1,71 @@
+Manifest-Version: 1.0
+Main-Class: com.gyee.SpringbootStart
+Class-Path: tomcat-embed-el-9.0.35.jar commons-configuration2-2.1.jar sp
+ ring-context-support-5.2.12.RELEASE.jar springfox-spi-2.9.2.jar spring-
+ aop-5.2.12.RELEASE.jar markdown_to_asciidoc-1.0.jar lombok-1.18.12.jar 
+ json-schema-validator-2.2.8.jar thymeleaf-extras-shiro-2.0.0.jar netty-
+ handler-4.1.55.Final.jar thymeleaf-spring5-3.0.11.RELEASE.jar mybatis-s
+ pring-boot-starter-1.3.2.jar thymeleaf-extras-java8time-3.0.4.RELEASE.j
+ ar validation-api-2.0.1.Final.jar tomcat-embed-websocket-9.0.35.jar swa
+ gger-annotations-1.6.2.jar spring-boot-starter-websocket-2.3.7.RELEASE.
+ jar reactor-core-3.3.12.RELEASE.jar mybatis-3.4.6.jar mysql-connector-j
+ ava-8.0.22.jar logback-classic-1.2.3.jar asm-util-4.1.jar pagehelper-sp
+ ring-boot-autoconfigure-1.2.5.jar jakarta.el-3.0.3.jar jedis-3.2.0.jar 
+ attoparser-2.0.5.RELEASE.jar httpclient-4.5.13.jar springfox-swagger2-2
+ .9.2.jar commons-pool2-2.8.1.jar druid-spring-boot-starter-1.1.10.jar a
+ sm-analysis-4.1.jar parboiled-core-1.1.6.jar jackson-core-2.11.3.jar ms
+ g-simple-1.1.jar netty-resolver-4.1.55.Final.jar activation-1.1.jar mai
+ lapi-1.4.3.jar spring-boot-starter-2.3.7.RELEASE.jar unbescape-1.1.6.RE
+ LEASE.jar gson-2.8.6.jar vavr-match-0.9.1.jar spring-plugin-metadata-1.
+ 2.0.RELEASE.jar asm-5.0.4.jar springfox-swagger-common-2.9.2.jar jackso
+ n-annotations-2.11.3.jar jackson-datatype-jdk8-2.11.3.jar spring-boot-s
+ tarter-logging-2.3.7.RELEASE.jar commons-collections4-4.1.jar ojdbc6-11
+ .2.0.3.jar log4j-to-slf4j-2.13.3.jar commons-io-2.5.jar spring-websocke
+ t-5.2.12.RELEASE.jar shiro-core-1.4.0.jar spring-boot-starter-data-redi
+ s-2.3.7.RELEASE.jar commons-lang-2.4.jar pegdown-1.4.2.jar spring-boot-
+ starter-tomcat-2.3.7.RELEASE.jar aspectjweaver-1.9.6.jar swagger-parser
+ -1.0.35.jar fastjson-1.2.7.jar spring-boot-starter-web-2.3.7.RELEASE.ja
+ r thymeleaf-3.0.11.RELEASE.jar tomcat-juli-9.0.35.jar springfox-schema-
+ 2.9.2.jar guava-20.0.jar jackson-datatype-jsr310-2.11.3.jar commons-col
+ lections-3.2.1.jar mail-1.4.7.jar jackson-databind-2.11.3.jar hutool-al
+ l-4.1.12.jar commons-fileupload-1.3.3.jar sqljdbc4-4.0.jar netty-transp
+ ort-4.1.55.Final.jar vavr-0.9.1.jar shiro-crypto-core-1.4.0.jar lettuce
+ -core-5.3.5.RELEASE.jar jul-to-slf4j-1.7.30.jar pagehelper-5.1.4.jar sh
+ iro-crypto-hash-1.4.0.jar parboiled-java-1.1.6.jar commons-codec-1.14.j
+ ar spring-jdbc-5.2.12.RELEASE.jar spring-boot-starter-aop-2.3.7.RELEASE
+ .jar jakarta.annotation-api-1.3.5.jar shiro-cache-1.4.0.jar mapstruct-1
+ .2.0.Final.jar asm-tree-4.1.jar spring-data-keyvalue-2.3.6.RELEASE.jar 
+ quartz-2.3.2.jar spring-plugin-core-1.2.0.RELEASE.jar javax.servlet-api
+ -4.0.1.jar spring-boot-2.3.7.RELEASE.jar snakeyaml-1.26.jar shiro-crypt
+ o-cipher-1.4.0.jar spring-boot-starter-thymeleaf-2.3.7.RELEASE.jar jack
+ son-coreutils-1.6.jar shiro-lang-1.4.0.jar shiro-spring-1.4.0.jar kaptc
+ ha-2.3.2.jar logback-core-1.2.3.jar httpcore-4.4.14.jar spring-boot-aut
+ oconfigure-2.3.7.RELEASE.jar spring-jcl-5.2.12.RELEASE.jar classmate-1.
+ 5.1.jar mybatis-spring-boot-autoconfigure-1.3.2.jar json-schema-core-1.
+ 2.8.jar swagger-core-1.6.2.jar springfox-core-2.9.2.jar spring-data-com
+ mons-2.3.6.RELEASE.jar spring-core-5.2.12.RELEASE.jar spring-webmvc-5.2
+ .12.RELEASE.jar commons-logging-1.1.1.jar jopt-simple-5.0.3.jar springf
+ ox-spring-web-2.9.2.jar spring-web-5.2.12.RELEASE.jar commons-beanutils
+ -1.9.2.jar spring-expression-5.2.12.RELEASE.jar shiro-config-ogdl-1.4.0
+ .jar swagger-models-1.6.2.jar paleo-core-0.11.0.jar btf-1.2.jar rhino-1
+ .7R4.jar jsqlparser-1.0.jar okhttp-3.14.9.jar spring-data-redis-2.3.6.R
+ ELEASE.jar okio-1.17.2.jar ueditor-1.1.2.jar swagger-compat-spec-parser
+ -1.0.35.jar tomcat-embed-core-9.0.35.jar shiro-web-1.4.0.jar HikariCP-3
+ .4.5.jar byte-buddy-1.10.18.jar spring-context-5.2.12.RELEASE.jar veloc
+ ity-1.7.jar mybatis-spring-1.3.2.jar jsoup-1.8.1.jar netty-common-4.1.5
+ 5.Final.jar mchange-commons-java-0.2.15.jar reactive-streams-1.0.3.jar 
+ filters-2.0.235-1.jar commons-configuration-1.10.jar spring-boot-config
+ uration-processor-2.3.7.RELEASE.jar commons-lang3-3.10.jar slf4j-api-1.
+ 7.30.jar swagger2markup-1.3.3.jar netty-codec-4.1.55.Final.jar netty-bu
+ ffer-4.1.55.Final.jar springfox-swagger-ui-2.9.2.jar qiniu-java-sdk-7.2
+ .29.jar log4j-api-2.13.3.jar joda-time-2.9.7.jar druid-1.1.10.jar shiro
+ -config-core-1.4.0.jar jsr305-3.0.1.jar libphonenumber-8.0.0.jar json-p
+ atch-1.6.jar spring-boot-starter-json-2.3.7.RELEASE.jar slf4j-ext-1.7.3
+ 0.jar uri-template-0.9.jar spring-tx-5.2.12.RELEASE.jar spring-boot-sta
+ rter-jdbc-2.3.7.RELEASE.jar spring-boot-devtools-2.3.7.RELEASE.jar mark
+ up-document-builder-1.1.2.jar spring-beans-5.2.12.RELEASE.jar spring-me
+ ssaging-5.2.12.RELEASE.jar tomcat-annotations-api-9.0.35.jar spring-oxm
+ -5.2.12.RELEASE.jar jackson-module-parameter-names-2.11.3.jar jackson-d
+ ataformat-yaml-2.11.3.jar shiro-event-1.4.0.jar json-20180813.jar pageh
+ elper-spring-boot-starter-1.2.5.jar
+

src/main/resources/application.yml

@@ -27,6 +27,8 @@ gyee:
   rollVerification: true
   #实时数据库Url
   baseurl: http://10.155.32.4:8011/ts
+  #实时数据库Url
+  swaggerip: 192.168.10.14:8082
 #tomcat config
 server :
   port : 8082

src/test/java/test/ProjectPlanTest.java

@@ -6,10 +6,7 @@ import com.gyee.frame.common.spring.SpringUtils;
 import com.gyee.frame.controller.projectplan.ProjectPlanController;
 import lombok.SneakyThrows;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 
-@SpringBootApplication(exclude = DataSourceAutoConfiguration.class)
 public class ProjectPlanTest {
 
 

src/test/java/test/RecommenTest.java

@@ -5,8 +5,8 @@ import com.gyee.SpringbootStart;
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.common.spring.SpringUtils;
 import com.gyee.frame.controller.recommen.RecommenController;
-import com.gyee.frame.model.auto.Wobugeq;
 import com.gyee.frame.model.custom.Tablepar;
+import com.gyee.frame.model.custom.WoBugEqVo;
 import lombok.SneakyThrows;
 import org.springframework.boot.SpringApplication;
 
@@ -155,13 +155,23 @@ public class RecommenTest {
         Tablepar tablepar = new Tablepar();
         tablepar.setPageNum(1);
         tablepar.setPageSize(10);
-       AjaxResult ajaxResult2 = recommenController.findWobugeqByLocation(tablepar,"010101020101");
-
-        PageInfo<Wobugeq> value=(PageInfo<Wobugeq>)ajaxResult2.get("data");
-        List<Wobugeq> test2=value.getList();
-        for(Wobugeq wtd:test2)
+//       AjaxResult ajaxResult2 = recommenController.findWobugeqByLocation(tablepar,"010101020101");
+////
+////        PageInfo<Wobugeq> value=(PageInfo<Wobugeq>)ajaxResult2.get("data");
+////        List<Wobugeq> test2=value.getList();
+////        for(Wobugeq wtd:test2)
+////        {
+////            System.out.println(wtd.getBugnum()+"----------------"+wtd.getArrivaltime()+"----------------"+wtd.getProdtdeptopinion());
+////        }
+////        System.out.println("**********************************************************************************");
+
+        AjaxResult ajaxResult2 = recommenController.unfinishedList(null,null,"2016-08-22","2020-08-22");
+
+        PageInfo<WoBugEqVo> value=(PageInfo<WoBugEqVo>)ajaxResult2.get("data");
+        List<WoBugEqVo> test2=value.getList();
+        for(WoBugEqVo wtd:test2)
         {
-            System.out.println(wtd.getBugnum()+"----------------"+wtd.getArrivaltime()+"----------------"+wtd.getProdtdeptopinion());
+            System.out.println(wtd.getOperationdate()+"----------------"+wtd.getRepairedcomment()+"----------------"+wtd.getWfname());
         }
         System.out.println("**********************************************************************************");
     }