测试修改健康管理相关功能模块接口

src/main/java/com/gyee/frame/common/base/BaseController.java

@@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.model.custom.TitleVo;
 import com.gyee.frame.service.*;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;

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

@@ -2,8 +2,7 @@ package com.gyee.frame.common.conf;
 
 public enum  AjaxStatus {
     success(200),
-    error(500),
-    emptyresultset(300);
+    error(500);
     public int code;
     AjaxStatus(int c) {
         code = c;

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

@@ -1,6 +1,5 @@
 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;
@@ -13,6 +12,8 @@ import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
+import javax.annotation.Resource;
+
 /**
 * Swagger 配置文件
 * @ClassName: Swagger

src/main/java/com/gyee/frame/common/log/LogAspect.java

@@ -12,7 +12,7 @@ import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Component;

src/main/java/com/gyee/frame/common/quartz/QuartzSchedulerUtil.java

@@ -24,9 +24,9 @@ import java.util.Set;
 @Configuration
 public class QuartzSchedulerUtil {
 
-    @Resource
+    @Autowired
     private  Scheduler scheduler;
-    @Resource
+    @Autowired
     private SysQuartzJobService sysQuartzJobService; 
 
     //这个东西可以放在配置文件中

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

@@ -2,7 +2,7 @@ package com.gyee.frame.common.quartz.task;
 
 
 import com.gyee.frame.service.websocket.BraceletService;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Component;
 
 @Component("braceletPushTask")

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

@@ -1,7 +1,7 @@
 package com.gyee.frame.common.quartz.task;
 import java.util.List;
 import cn.hutool.core.date.DateUtil;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Component;
 import com.gyee.frame.mapper.auto.TsysUserMapper;
 import com.gyee.frame.model.auto.TsysUser;

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

@@ -2,7 +2,7 @@ package com.gyee.frame.common.quartz.task;
 
 
 import com.gyee.frame.service.websocket.BraceletService;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Component;
 
 @Component("wtTestTask")

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

@@ -1,7 +1,7 @@
 package com.gyee.frame.common.websocket;
 
 import com.alibaba.fastjson.JSON;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.stereotype.Component;
 

src/main/java/com/gyee/frame/controller/AdminController.java

@@ -10,6 +10,7 @@ import com.gyee.frame.model.custom.BootstrapTree;
 import com.gyee.frame.model.custom.TitleVo;
 import com.gyee.frame.shiro.util.ShiroUtils;
 import com.gyee.frame.util.StringUtils;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.*;
@@ -39,6 +40,7 @@ import java.util.List;
  */
 @Controller
 @RequestMapping("/admin")
+@Api(value = "后台管理接口" ,tags="后台管理接口")
 public class AdminController extends BaseController {
 	private static Logger logger = LoggerFactory.getLogger(AdminController.class);
 

src/main/java/com/gyee/frame/controller/FanStatusQueryExportController/FanStatusQueryExportController.java

@@ -1,12 +1,9 @@
 package com.gyee.frame.controller.FanStatusQueryExportController;
 
 import com.gyee.frame.service.FanStatusQueryExportService.FanStatusQueryExportService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.Date;
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/gyee/frame/controller/StandardPointTable/StandardPointTableController.java

@@ -2,9 +2,9 @@ package com.gyee.frame.controller.StandardPointTable;
 
 
 import com.gyee.frame.service.StandardPointTable.StandardPointTableService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

src/main/java/com/gyee/frame/controller/admin/AutoCodeController.java

@@ -18,7 +18,7 @@ import com.gyee.frame.service.SysPermissionService;
 import com.gyee.frame.service.SysUtilService;
 import com.gyee.frame.util.AutoCode.AutoCodeUtil;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.ui.ModelMap;

src/main/java/com/gyee/frame/controller/admin/CaptchaController.java

@@ -13,7 +13,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;

src/main/java/com/gyee/frame/controller/admin/DictDataController.java

@@ -5,7 +5,7 @@ import com.gyee.frame.service.SysDictDataService;
 import com.gyee.frame.service.SysDictTypeService;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.ui.ModelMap;

src/main/java/com/gyee/frame/controller/admin/DictTypeController.java

@@ -1,7 +1,7 @@
 package com.gyee.frame.controller.admin;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.ui.ModelMap;

src/main/java/com/gyee/frame/controller/admin/EmailController.java

@@ -1,7 +1,7 @@
 package com.gyee.frame.controller.admin;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.ui.ModelMap;

src/main/java/com/gyee/frame/controller/admin/ProvinceLinkageController.java

@@ -1,7 +1,7 @@
 package com.gyee.frame.controller.admin;
 
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/gyee/frame/controller/admin/QiNiuCloudController.java

@@ -8,7 +8,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/gyee/frame/controller/admin/QuartzJobController.java

@@ -2,7 +2,7 @@ package com.gyee.frame.controller.admin;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.quartz.SchedulerException;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/gyee/frame/controller/admin/QuartzJobLogController.java

@@ -1,7 +1,7 @@
 package com.gyee.frame.controller.admin;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/gyee/frame/controller/admin/SysAreaController.java

@@ -1,7 +1,7 @@
 package com.gyee.frame.controller.admin;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/gyee/frame/controller/admin/SysCityController.java

@@ -1,7 +1,7 @@
 package com.gyee.frame.controller.admin;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/gyee/frame/controller/admin/SysDepartmentController.java

@@ -2,7 +2,7 @@ package com.gyee.frame.controller.admin;
 
 import java.util.List;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/gyee/frame/controller/admin/SysNoticeController.java

@@ -1,7 +1,7 @@
  package com.gyee.frame.controller.admin;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/gyee/frame/controller/admin/SysPositionController.java

@@ -1,7 +1,7 @@
 package com.gyee.frame.controller.admin;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/gyee/frame/controller/admin/SysProvinceController.java

@@ -1,7 +1,7 @@
 package com.gyee.frame.controller.admin;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/gyee/frame/controller/admin/SysStreetController.java

@@ -1,7 +1,7 @@
 package com.gyee.frame.controller.admin;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/gyee/frame/controller/admin/TestController.java

@@ -11,7 +11,7 @@ import com.gyee.frame.service.SysCityService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;

src/main/java/com/gyee/frame/controller/admin/UeditorController.java

@@ -2,7 +2,7 @@ package com.gyee.frame.controller.admin;
 
 import java.io.IOException;
 import javax.servlet.http.HttpServletRequest;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;

src/main/java/com/gyee/frame/controller/admin/UserController.java

@@ -2,7 +2,7 @@ package com.gyee.frame.controller.admin;
 
 import java.util.List;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.ui.ModelMap;

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

@@ -13,13 +13,13 @@ 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;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -27,7 +27,7 @@ import java.util.Map;
 
 @Controller
 @RequestMapping("/benchmarking")
-@Api(value = "等级评估功能")
+@Api(value = "等级评估功能",tags =  "等级评估功能")
 public class BenchmarkingController {
 //    @Resource
 //    private Windturbineinfodaytop3Service windturbineinfodaytop2Service;
@@ -58,7 +58,7 @@ public class BenchmarkingController {
             return	AjaxResult.successData(AjaxStatus.success.code,ls);
         }else
         {
-            return	AjaxResult.successData(AjaxStatus.emptyresultset.code,ls);
+            return	AjaxResult.successData(AjaxStatus.success.code,ls);
         }
 
     }

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

@@ -8,17 +8,17 @@ 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;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import java.util.Date;
 
 @Controller
 @RequestMapping("/compare")
-@Api(value = "单机横向对比功能")
+@Api(value = "单机横向对比功能",tags =  "单机横向对比功能")
 public class CompareController {
     @Resource
     private CompareService compareService;

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

@@ -28,7 +28,7 @@ import java.util.*;
 
 @Controller
 @RequestMapping("/contrast")
-@Api(value = "对标管理管理")
+@Api(value = "对标管理管理",tags =  "对标管理管理")
 public class ContrastController {
 
     @Resource
@@ -72,7 +72,7 @@ public class ContrastController {
                 }
                 return AjaxResult.successData(AjaxStatus.success.code, vos);
             } else {
-                return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+                return AjaxResult.successData(AjaxStatus.success.code, vos);
             }
 
     }
@@ -107,7 +107,7 @@ public class ContrastController {
             }
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }
@@ -141,7 +141,7 @@ public class ContrastController {
             }
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }
@@ -178,7 +178,7 @@ public class ContrastController {
             }
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }
@@ -221,7 +221,7 @@ public class ContrastController {
         if (vos != null && !vos.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
     }
 
@@ -258,7 +258,7 @@ public class ContrastController {
             }
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }
@@ -286,7 +286,7 @@ public class ContrastController {
         if (vos != null && !vos.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
     }
 
@@ -323,7 +323,7 @@ public class ContrastController {
             }
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }
@@ -350,7 +350,7 @@ public class ContrastController {
         if (vos != null && !vos.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
     }
     /**
@@ -380,7 +380,7 @@ public class ContrastController {
             }
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }
@@ -426,7 +426,7 @@ public class ContrastController {
             }
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }
@@ -461,7 +461,7 @@ public class ContrastController {
             }
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }
@@ -519,7 +519,7 @@ public class ContrastController {
             }
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }

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

@@ -25,7 +25,7 @@ import java.util.*;
  */
 @Controller
 @RequestMapping("/goodness")
-@Api(value = "风场风资源图表")
+@Api(value = "风场风资源图表" ,tags =  "风场风资源图表")
 public class WindpowerDetailChartController {
     @Resource
     private WindturbinegoodnessService windturbinegoodnessService;
@@ -284,7 +284,7 @@ public class WindpowerDetailChartController {
         if (map != null) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, map);
+            return AjaxResult.successData(AjaxStatus.success.code, map);
         }
     }
 
@@ -472,7 +472,7 @@ public class WindpowerDetailChartController {
         if (map != null) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, map);
+            return AjaxResult.successData(AjaxStatus.success.code, map);
         }
     }
 
@@ -669,7 +669,7 @@ public class WindpowerDetailChartController {
         if (map != null) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, map);
+            return AjaxResult.successData(AjaxStatus.success.code, map);
         }
     }
 
@@ -866,7 +866,7 @@ public class WindpowerDetailChartController {
         if (map != null) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, map);
+            return AjaxResult.successData(AjaxStatus.success.code, map);
         }
     }
 
@@ -1063,7 +1063,7 @@ public class WindpowerDetailChartController {
         if (map != null) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, map);
+            return AjaxResult.successData(AjaxStatus.success.code, map);
         }
     }
 
@@ -1258,7 +1258,7 @@ public class WindpowerDetailChartController {
         if (map != null) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, map);
+            return AjaxResult.successData(AjaxStatus.success.code, map);
         }
     }
 

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

@@ -25,7 +25,7 @@ import java.util.*;
  */
 @Controller
 @RequestMapping("/goodness")
-@Api(value = "风机风资源图表")
+@Api(value = "风机风资源图表",tags =  "风机风资源图表")
 public class WindturbineDetailChartController {
     @Resource
     private WindturbinegoodnessService windturbinegoodnessService;
@@ -276,7 +276,7 @@ public class WindturbineDetailChartController {
         if (map != null) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, map);
+            return AjaxResult.successData(AjaxStatus.success.code, map);
         }
     }
 
@@ -467,7 +467,7 @@ public class WindturbineDetailChartController {
         if (map != null) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, map);
+            return AjaxResult.successData(AjaxStatus.success.code, map);
         }
     }
 
@@ -658,7 +658,7 @@ public class WindturbineDetailChartController {
         if (map != null) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, map);
+            return AjaxResult.successData(AjaxStatus.success.code, map);
         }
     }
 
@@ -850,7 +850,7 @@ public class WindturbineDetailChartController {
         if (map != null) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, map);
+            return AjaxResult.successData(AjaxStatus.success.code, map);
         }
     }
 
@@ -1041,7 +1041,7 @@ public class WindturbineDetailChartController {
         if (map != null) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, map);
+            return AjaxResult.successData(AjaxStatus.success.code, map);
         }
     }
 
@@ -1232,7 +1232,7 @@ public class WindturbineDetailChartController {
         if (map != null) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, map);
+            return AjaxResult.successData(AjaxStatus.success.code, map);
         }
     }
 }

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

@@ -32,7 +32,7 @@ import java.util.*;
  */
 @Controller
 @RequestMapping("/goodness")
-@Api(value = "单机信息总览风机区间图表")
+@Api(value = "单机信息总览风机区间图表",tags =  "单机信息总览风机区间图表")
 public class WindturbineDetailLineChartController {
     @Resource
     private WindturbinegoodnessService windturbinegoodnessService;
@@ -83,7 +83,7 @@ public class WindturbineDetailLineChartController {
         if (result != null) {
             return AjaxResult.successData(AjaxStatus.success.code, result);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, result);
+            return AjaxResult.successData(AjaxStatus.success.code, result);
         }
     }
     /**
@@ -111,7 +111,7 @@ public class WindturbineDetailLineChartController {
         if (result != null) {
             return AjaxResult.successData(AjaxStatus.success.code, result);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, result);
+            return AjaxResult.successData(AjaxStatus.success.code, result);
         }
     }
 
@@ -174,7 +174,7 @@ public class WindturbineDetailLineChartController {
         if (resultList != null) {
             return AjaxResult.successData(AjaxStatus.success.code, resultList);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, resultList);
+            return AjaxResult.successData(AjaxStatus.success.code, resultList);
         }
     }
 
@@ -211,7 +211,7 @@ public class WindturbineDetailLineChartController {
         if (resultList != null) {
             return AjaxResult.successData(AjaxStatus.success.code, resultList);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, resultList);
+            return AjaxResult.successData(AjaxStatus.success.code, resultList);
         }
     }
 
@@ -247,7 +247,7 @@ public class WindturbineDetailLineChartController {
         if (resultList != null) {
             return AjaxResult.successData(AjaxStatus.success.code, resultList);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, resultList);
+            return AjaxResult.successData(AjaxStatus.success.code, resultList);
         }
     }
 
@@ -284,7 +284,7 @@ public class WindturbineDetailLineChartController {
         if (resultList != null) {
             return AjaxResult.successData(AjaxStatus.success.code, resultList);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, resultList);
+            return AjaxResult.successData(AjaxStatus.success.code, resultList);
         }
     }
 
@@ -313,7 +313,7 @@ public class WindturbineDetailLineChartController {
                     if (map != null) {
                         return AjaxResult.successData(AjaxStatus.success.code, map);
                     } else {
-                        return AjaxResult.successData(AjaxStatus.emptyresultset.code, map);
+                        return AjaxResult.successData(AjaxStatus.success.code, map);
                     }
 
             }

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

@@ -26,7 +26,7 @@ import java.util.List;
  */
 @Controller
 @RequestMapping("/goodness")
-@Api(value = "单机信息总览饼图")
+@Api(value = "单机信息总览饼图",tags =  "单机信息总览饼图")
 public class WindturbineDetailPieChartAController {
     @Resource
     private Inputoroutputspeedtotal2Service inputoroutputspeedtotal2Service;
@@ -266,7 +266,7 @@ public class WindturbineDetailPieChartAController {
         if (vos != null) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
     }
 

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

@@ -29,7 +29,7 @@ import java.util.*;
  */
 @Controller
 @RequestMapping("/goodness")
-@Api(value = "单机信息总览详细信息")
+@Api(value = "单机信息总览详细信息",tags =  "单机信息总览详细信息")
 public class WindturbineGoodnessDetailController {
     @Resource
     private WindturbinegoodnessService windturbinegoodnessService;
@@ -103,7 +103,7 @@ public class WindturbineGoodnessDetailController {
         if (null != wtday) {
             return AjaxResult.successData(AjaxStatus.success.code, wtday);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, wtday);
+            return AjaxResult.successData(AjaxStatus.success.code, wtday);
         }
 
     }
@@ -178,7 +178,7 @@ public class WindturbineGoodnessDetailController {
         if (resultList != null) {
             return AjaxResult.successData(AjaxStatus.success.code, resultList);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, resultList);
+            return AjaxResult.successData(AjaxStatus.success.code, resultList);
         }
     }
 
@@ -237,7 +237,7 @@ public class WindturbineGoodnessDetailController {
         if (datavos != null) {
             return AjaxResult.successData(AjaxStatus.success.code, datavos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, datavos);
+            return AjaxResult.successData(AjaxStatus.success.code, datavos);
         }
     }
 
@@ -370,7 +370,7 @@ public class WindturbineGoodnessDetailController {
         if (map != null) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, map);
+            return AjaxResult.successData(AjaxStatus.success.code, map);
         }
     }
 

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

@@ -28,7 +28,7 @@ import java.util.List;
  */
 @Controller
 @RequestMapping("/goodness")
-@Api(value = "单机信息总览首页")
+@Api(value = "单机信息总览首页",tags =  "单机信息总览首页")
 public class WindturbinegoodnessController {
     @Resource
     private WindturbinegoodnessService windturbinegoodnessService;
@@ -58,7 +58,7 @@ public class WindturbinegoodnessController {
         if (resultList != null) {
             return AjaxResult.successData(AjaxStatus.success.code, resultList);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, resultList);
+            return AjaxResult.successData(AjaxStatus.success.code, resultList);
         }
     }
 
@@ -90,7 +90,7 @@ public class WindturbinegoodnessController {
         if (resultList != null) {
             return AjaxResult.successData(AjaxStatus.success.code, resultList);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, resultList);
+            return AjaxResult.successData(AjaxStatus.success.code, resultList);
         }
     }
 

src/main/java/com/gyee/frame/controller/health/LossPowerRateHealthController.java

@@ -0,0 +1,80 @@
+package com.gyee.frame.controller.health;
+
+import com.gyee.frame.common.conf.AjaxStatus;
+import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.model.auto.LossPowerRate;
+import com.gyee.frame.service.LossPowerRateService;
+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;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Controller
+@RequestMapping("/losspowerratehealth")
+@Api(value = "性能损失走势" ,tags =  "性能损失走势")
+public class LossPowerRateHealthController {
+
+    @Resource
+    private LossPowerRateService lossPowerRateService;
+
+    /**性能损失走势列表**/
+    @PostMapping("/losspowerrateList")
+    @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 losspowerrateList(String wtId,String beginDate,String endDate) throws Exception {
+
+       List<LossPowerRate>  vos = new ArrayList<LossPowerRate>();
+        if (StringUtils.notEmp(wtId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate))
+        {
+            vos=lossPowerRateService.getLossPowerRateListBywtId(wtId, DateUtils.parseStrtoDate(beginDate), DateUtils.parseStrtoDate(endDate));
+        }
+
+        if (null!=vos) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        }
+
+    }
+
+    /**性能损失走势图表**/
+    @PostMapping("/getChartlist")
+    @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 getChartlist(String wtId,String beginDate,String endDate) throws Exception {
+
+        List<List<List<Object>>>  vos = new ArrayList<>();
+        if (StringUtils.notEmp(wtId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate))
+        {
+            vos=lossPowerRateService.getChartlist(wtId, DateUtils.parseStrtoDate(beginDate), DateUtils.parseStrtoDate(endDate));
+        }
+
+        if (null!=vos) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        }
+
+    }
+
+}

src/main/java/com/gyee/frame/controller/health/PartBjController.java

@@ -0,0 +1,79 @@
+package com.gyee.frame.controller.health;
+
+import com.gyee.frame.common.conf.AjaxStatus;
+import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.model.custom.PartbjcountVo;
+import com.gyee.frame.model.custom.WindturbinebjCountVo;
+import com.gyee.frame.service.health.PartBjService;
+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;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Controller
+@RequestMapping("/partbj")
+@Api(value = "批次报警分析" ,tags =  "批次报警分析")
+public class PartBjController {
+
+    @Resource
+    private PartBjService partBjService;
+
+    /**批次报警分析**/
+    @PostMapping("/partbjList")
+    @ResponseBody
+    @ApiOperation(value = "批次报警分析主列表", notes = "批次报警分析主列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult partbjList(String recorddate) throws Exception {
+
+        List<PartbjcountVo> vos = new ArrayList<PartbjcountVo>();
+        if (StringUtils.notEmp(recorddate))
+        {
+            vos=partBjService.getPartBjCountList(DateUtils.parseStrtoDate(recorddate));
+        }
+
+        if (null!=vos) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        }
+
+    }
+
+    /**批次报警分析**/
+    @PostMapping("/partbjsubList")
+    @ResponseBody
+    @ApiOperation(value = "批次报警分析明细列表", notes = "批次报警分析明细列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "lnid", value = "线路编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "part", value = "部件编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult partbjsubList(String lnid, String part, String recorddate) throws Exception {
+
+        List<WindturbinebjCountVo> vos = new ArrayList<WindturbinebjCountVo>();
+        if (StringUtils.notEmp(recorddate))
+        {
+            vos=partBjService.getWindturbinebjCountVoList(lnid,  part,DateUtils.parseStrtoDate(recorddate));
+        }
+
+        if (null!=vos) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        }
+
+    }
+
+}

src/main/java/com/gyee/frame/controller/health/WindTurbineCurveController.java

@@ -30,7 +30,7 @@ import java.util.*;
 
 @Controller
 @RequestMapping("/wtcurve")
-@Api(value = "单机区间曲线偏差率")
+@Api(value = "单机区间曲线偏差率" ,tags =  "单机区间曲线偏差率")
 public class WindTurbineCurveController {
 
     @Resource
@@ -64,7 +64,7 @@ public class WindTurbineCurveController {
         if (null!=vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }
@@ -154,7 +154,7 @@ public class WindTurbineCurveController {
         if (null != result) {
             return AjaxResult.successData(AjaxStatus.success.code, result);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, result);
+            return AjaxResult.successData(AjaxStatus.success.code, result);
         }
 
     }

src/main/java/com/gyee/frame/controller/health/WindTurbineHealthListController.java

@@ -9,18 +9,18 @@ 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;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
 @Controller
 @RequestMapping("/wtHealthList")
-@Api(value = "风机健康列表")
+@Api(value = "风机健康列表" ,tags =  "风机健康列表")
 public class WindTurbineHealthListController {
 
     @Resource
@@ -44,7 +44,7 @@ public class WindTurbineHealthListController {
         if (null!=vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }

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

@@ -15,18 +15,18 @@ 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;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import java.util.*;
 
 @Controller
 @RequestMapping("/leaderboard")
-@Api(value = "排行榜功能")
+@Api(value = "排行榜功能",tags =  "排行榜功能")
 public class LeaderboardController {
     @Resource
     private LeaderboardService leaderboardService;
@@ -100,7 +100,7 @@ public class LeaderboardController {
         if (vos != null && !vos.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }
@@ -134,7 +134,7 @@ public class LeaderboardController {
         if (map != null && !map.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, map);
+            return AjaxResult.successData(AjaxStatus.success.code, map);
         }
     }
 
@@ -219,7 +219,7 @@ public class LeaderboardController {
         if (vos != null && !vos.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }
@@ -255,7 +255,7 @@ public class LeaderboardController {
         if (vos != null && !vos.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }
@@ -289,7 +289,7 @@ public class LeaderboardController {
         if (vos != null && !vos.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }
@@ -376,7 +376,7 @@ public class LeaderboardController {
         if (vos != null && !vos.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }
@@ -409,7 +409,7 @@ public class LeaderboardController {
         if (vos != null && !vos.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }
@@ -443,7 +443,7 @@ public class LeaderboardController {
         if (vos != null && !vos.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }
@@ -469,7 +469,7 @@ public class LeaderboardController {
         if (vos != null && !vos.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
     }
 
@@ -494,7 +494,7 @@ public class LeaderboardController {
         if (vos != null && !vos.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
     }
 
@@ -520,7 +520,7 @@ public class LeaderboardController {
         if (vos != null && !vos.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
     }
     /**查询日曲线环比图表**/
@@ -544,7 +544,7 @@ public class LeaderboardController {
         if (vos != null && !vos.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
     }
     /**查询日曲线标杆图表**/
@@ -568,7 +568,7 @@ public class LeaderboardController {
         if (vos != null && !vos.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
     }
 
@@ -590,7 +590,7 @@ public class LeaderboardController {
         if (vos != null && !vos.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
     }
 
@@ -611,7 +611,7 @@ public class LeaderboardController {
         if (vos != null && !vos.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
     }
 
@@ -632,7 +632,7 @@ public class LeaderboardController {
         if (vos != null && !vos.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
     }
     /**查询月曲线环比图表**/
@@ -652,7 +652,7 @@ public class LeaderboardController {
         if (vos != null && !vos.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
     }
     /**查询月曲线标杆图表**/
@@ -672,7 +672,7 @@ public class LeaderboardController {
         if (vos != null && !vos.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
     }
 }

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

@@ -11,19 +11,19 @@ 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;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
 @Controller
 @RequestMapping("/outputspeed")
-@Api(value = "切入切出管理")
+@Api(value = "切入切出管理",tags =  "切入切出管理")
 public class OutputSpeedController {
 
     @Resource
@@ -50,7 +50,7 @@ public class OutputSpeedController {
         if (null!=vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }
@@ -78,7 +78,7 @@ public class OutputSpeedController {
         if (null!=vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }

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

@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
 
 @Controller
 @RequestMapping("/powercompare")
-@Api(value = "风机绩效榜功能")
+@Api(value = "风机绩效榜功能",tags =  "风机绩效榜功能")
 public class PowerCompareController {
 
     @Resource
@@ -58,7 +58,7 @@ public class PowerCompareController {
             return	AjaxResult.successData(AjaxStatus.success.code,vos);
         }else
         {
-            return	AjaxResult.successData(AjaxStatus.emptyresultset.code,vos);
+            return	AjaxResult.successData(AjaxStatus.success.code,vos);
         }
     }
 
@@ -84,7 +84,7 @@ public class PowerCompareController {
             return	AjaxResult.successData(AjaxStatus.success.code,vos);
         }else
         {
-            return	AjaxResult.successData(AjaxStatus.emptyresultset.code,vos);
+            return	AjaxResult.successData(AjaxStatus.success.code,vos);
         }
     }
 
@@ -121,7 +121,7 @@ public class PowerCompareController {
             return	AjaxResult.successData(AjaxStatus.success.code,vos);
         }else
         {
-            return	AjaxResult.successData(AjaxStatus.emptyresultset.code,vos);
+            return	AjaxResult.successData(AjaxStatus.success.code,vos);
         }
     }
 
@@ -149,7 +149,7 @@ public class PowerCompareController {
             return	AjaxResult.successData(AjaxStatus.success.code,vos);
         }else
         {
-            return	AjaxResult.successData(AjaxStatus.emptyresultset.code,vos);
+            return	AjaxResult.successData(AjaxStatus.success.code,vos);
         }
     }
 
@@ -186,7 +186,7 @@ public class PowerCompareController {
             return	AjaxResult.successData(AjaxStatus.success.code,vos);
         }else
         {
-            return	AjaxResult.successData(AjaxStatus.emptyresultset.code,vos);
+            return	AjaxResult.successData(AjaxStatus.success.code,vos);
         }
     }
     /**
@@ -230,7 +230,7 @@ public class PowerCompareController {
             return	AjaxResult.successData(AjaxStatus.success.code,vos);
         }else
         {
-            return	AjaxResult.successData(AjaxStatus.emptyresultset.code,vos);
+            return	AjaxResult.successData(AjaxStatus.success.code,vos);
         }
     }
     /**
@@ -257,7 +257,7 @@ public class PowerCompareController {
             return	AjaxResult.successData(AjaxStatus.success.code,vos);
         }else
         {
-            return	AjaxResult.successData(AjaxStatus.emptyresultset.code,vos);
+            return	AjaxResult.successData(AjaxStatus.success.code,vos);
         }
     }
     /**
@@ -294,7 +294,7 @@ public class PowerCompareController {
             return	AjaxResult.successData(AjaxStatus.success.code,vos);
         }else
         {
-            return	AjaxResult.successData(AjaxStatus.emptyresultset.code,vos);
+            return	AjaxResult.successData(AjaxStatus.success.code,vos);
         }
     }
 
@@ -325,7 +325,7 @@ public class PowerCompareController {
             return	AjaxResult.successData(AjaxStatus.success.code,vos);
         }else
         {
-            return	AjaxResult.successData(AjaxStatus.emptyresultset.code,vos);
+            return	AjaxResult.successData(AjaxStatus.success.code,vos);
         }
     }
     /**查询风机图表数据结果**/
@@ -360,7 +360,7 @@ public class PowerCompareController {
             return	AjaxResult.successData(AjaxStatus.success.code,resultmap);
         }else
         {
-            return	AjaxResult.successData(AjaxStatus.emptyresultset.code,resultmap);
+            return	AjaxResult.successData(AjaxStatus.success.code,resultmap);
         }
     }
 
@@ -403,7 +403,7 @@ public class PowerCompareController {
             return	AjaxResult.successData(AjaxStatus.success.code,resultmap);
         }else
         {
-            return	AjaxResult.successData(AjaxStatus.emptyresultset.code,resultmap);
+            return	AjaxResult.successData(AjaxStatus.success.code,resultmap);
         }
     }
 
@@ -441,7 +441,7 @@ public class PowerCompareController {
 //            return	AjaxResult.successData(AjaxStatus.success.code,vos);
 //        }else
 //        {
-//            return	AjaxResult.successData(AjaxStatus.emptyresultset.code,vos);
+//            return	AjaxResult.successData(AjaxStatus.success.code,vos);
 //        }
 
 
@@ -502,7 +502,7 @@ public class PowerCompareController {
         {
             result.put("list",vos);
             result.put("lyl",lylls);
-            return	AjaxResult.successData(AjaxStatus.emptyresultset.code,result);
+            return	AjaxResult.successData(AjaxStatus.success.code,result);
         }
     }
 
@@ -603,7 +603,7 @@ public class PowerCompareController {
             return	AjaxResult.successData(AjaxStatus.success.code,result);
         }else
         {
-            return	AjaxResult.successData(AjaxStatus.emptyresultset.code,result);
+            return	AjaxResult.successData(AjaxStatus.success.code,result);
         }
     }
 }

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

@@ -21,7 +21,7 @@ import java.util.*;
 
 @Controller
 @RequestMapping("/powercomparedetail")
-@Api(value = "风机绩效榜明细")
+@Api(value = "风机绩效榜明细",tags =  "风机绩效榜明细")
 public class PowerCompareDetailController {
 
     @Resource
@@ -56,7 +56,7 @@ public class PowerCompareDetailController {
 //            return	AjaxResult.successData(AjaxStatus.success.code,vos);
 //        }else
 //        {
-//            return	AjaxResult.successData(AjaxStatus.emptyresultset.code,vos);
+//            return	AjaxResult.successData(AjaxStatus.success.code,vos);
 //        }
 
         List<Map<String,Object>> lylls=new ArrayList<>();
@@ -110,7 +110,7 @@ public class PowerCompareDetailController {
         {
             result.put("list",vos);
             result.put("lyl",lylls);
-            return	AjaxResult.successData(AjaxStatus.emptyresultset.code,result);
+            return	AjaxResult.successData(AjaxStatus.success.code,result);
         }
     }
 
@@ -145,7 +145,7 @@ public class PowerCompareDetailController {
 //            return	AjaxResult.successData(AjaxStatus.success.code,vos);
 //        }else
 //        {
-//            return	AjaxResult.successData(AjaxStatus.emptyresultset.code,vos);
+//            return	AjaxResult.successData(AjaxStatus.success.code,vos);
 //        }
 
         List<Map<String,Object>> lylls=new ArrayList<>();
@@ -199,7 +199,7 @@ public class PowerCompareDetailController {
         {
             result.put("list",vos);
             result.put("lyl",lylls);
-            return	AjaxResult.successData(AjaxStatus.emptyresultset.code,result);
+            return	AjaxResult.successData(AjaxStatus.success.code,result);
         }
     }
 }

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

@@ -15,19 +15,19 @@ 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;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 @Controller
 @RequestMapping("/powersaturation")
-@Api(value = "总单机饱和度统计")
+@Api(value = "总单机饱和度统计",tags =  "总单机饱和度统计")
 public class PowerSaturationAmonutController {
     @Resource
     private WindturbinecurvefittingService windturbinecurvefittingService;
@@ -52,7 +52,7 @@ public class PowerSaturationAmonutController {
         if (null!=vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }
@@ -123,7 +123,7 @@ public class PowerSaturationAmonutController {
         if (null!=vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
     }
 }

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

@@ -16,12 +16,12 @@ 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;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -29,7 +29,7 @@ import java.util.Map;
 
 @Controller
 @RequestMapping("/powersaturation")
-@Api(value = "日单机饱和度统计")
+@Api(value = "日单机饱和度统计",tags =  "日单机饱和度统计")
 public class PowerSaturationController {
 
     @Resource
@@ -57,7 +57,7 @@ public class PowerSaturationController {
         if (null!=vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }
@@ -119,7 +119,7 @@ public class PowerSaturationController {
         if (null!=vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
     }
 }

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

@@ -15,19 +15,19 @@ 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;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 @Controller
 @RequestMapping("/powersaturation")
-@Api(value = "月单机饱和度统计")
+@Api(value = "月单机饱和度统计",tags =  "月单机饱和度统计")
 public class PowerSaturationMonthController {
 
     @Resource
@@ -56,7 +56,7 @@ public class PowerSaturationMonthController {
         if (null!=vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }
@@ -127,7 +127,7 @@ public class PowerSaturationMonthController {
         if (null!=vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
     }
 }

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

@@ -9,18 +9,18 @@ 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;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
 @Controller
 @RequestMapping("/projectplan")
-@Api(value = "计划发电量")
+@Api(value = "计划发电量",tags =  "计划发电量")
 public class ProjectPlanController {
 
     @Resource
@@ -47,7 +47,7 @@ public class ProjectPlanController {
         if (null!=vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }
@@ -70,7 +70,7 @@ public class ProjectPlanController {
         }
 
 
-        return AjaxResult.successData(AjaxStatus.emptyresultset.code, new ProjectPlanVo());
+        return AjaxResult.successData(AjaxStatus.success.code, new ProjectPlanVo());
     }
 
     /**计划发电量添加和修改**/
@@ -90,7 +90,7 @@ public class ProjectPlanController {
             return AjaxResult.successData(AjaxStatus.success.code, value);
         }
 
-        return AjaxResult.successData(AjaxStatus.emptyresultset.code, value);
+        return AjaxResult.successData(AjaxStatus.success.code, value);
 
     }
 

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

@@ -15,17 +15,17 @@ 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;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import java.util.*;
 
 @Controller
 @RequestMapping("/recommen")
-@Api(value = "健康风机推荐")
+@Api(value = "健康风机推荐",tags =  "健康风机推荐")
 public class RecommenController {
 
     @Resource
@@ -47,7 +47,7 @@ public class RecommenController {
         if (null!=vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
     }
 
@@ -67,7 +67,7 @@ public class RecommenController {
         if (null!=vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
     }
 
@@ -87,7 +87,7 @@ public class RecommenController {
         if (null!=vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
     }
 
@@ -263,7 +263,7 @@ public class RecommenController {
         if (null!=vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
 
@@ -299,7 +299,7 @@ public class RecommenController {
         if (null!=map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, map);
+            return AjaxResult.successData(AjaxStatus.success.code, map);
         }
 
     }
@@ -356,7 +356,7 @@ public class RecommenController {
         if (null!=vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }
@@ -386,7 +386,7 @@ public class RecommenController {
         if (null!=vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }
@@ -421,7 +421,7 @@ public class RecommenController {
         if (null!=result) {
             return AjaxResult.successData(AjaxStatus.success.code, result);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, result);
+            return AjaxResult.successData(AjaxStatus.success.code, result);
         }
 
     }
@@ -486,7 +486,7 @@ public class RecommenController {
         if (null!=pageInfo) {
             return AjaxResult.successData(AjaxStatus.success.code, pageInfo);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, pageInfo);
+            return AjaxResult.successData(AjaxStatus.success.code, pageInfo);
         }
 
     }
@@ -516,7 +516,7 @@ public class RecommenController {
         if (null!=result) {
             return AjaxResult.successData(AjaxStatus.success.code, result);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, result);
+            return AjaxResult.successData(AjaxStatus.success.code, result);
         }
 
     }

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

@@ -28,7 +28,7 @@ import java.util.Map;
 
 @Controller
 @RequestMapping("/report")
-@Api(value = "日健康报告")
+@Api(value = "日健康报告",tags =  "日健康报告")
 public class WtHealthReportController extends BaseController {
 	private static Logger logger = LoggerFactory.getLogger(WtHealthReportController.class);
 
@@ -97,7 +97,7 @@ public class WtHealthReportController extends BaseController {
 		if (null!=vos) {
 			return AjaxResult.successData(AjaxStatus.success.code, vos);
 		} else {
-			return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+			return AjaxResult.successData(AjaxStatus.success.code, vos);
 		}
 
 
@@ -133,7 +133,7 @@ public class WtHealthReportController extends BaseController {
 		if (null!=wtrmls) {
 			return AjaxResult.successData(AjaxStatus.success.code, wtrmls);
 		} else {
-			return AjaxResult.successData(AjaxStatus.emptyresultset.code, wtrmls);
+			return AjaxResult.successData(AjaxStatus.success.code, wtrmls);
 		}
 
 	}

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

@@ -28,7 +28,7 @@ import java.util.Map;
 
 @Controller
 @RequestMapping("/reportmonth")
-@Api(value = "月度健康报告")
+@Api(value = "月度健康报告",tags =  "月度健康报告")
 public class WtHealthReportMonthController extends BaseController {
 	private static Logger logger = LoggerFactory.getLogger(WtHealthReportMonthController.class);
 
@@ -70,7 +70,7 @@ public class WtHealthReportMonthController extends BaseController {
 		if (null!=vos) {
 			return AjaxResult.successData(AjaxStatus.success.code, vos);
 		} else {
-			return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+			return AjaxResult.successData(AjaxStatus.success.code, vos);
 		}
 
 	}
@@ -101,7 +101,7 @@ public class WtHealthReportMonthController extends BaseController {
 		if (null!=vos) {
 			return AjaxResult.successData(AjaxStatus.success.code, vos);
 		} else {
-			return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+			return AjaxResult.successData(AjaxStatus.success.code, vos);
 		}
 
 	}
@@ -134,7 +134,7 @@ public class WtHealthReportMonthController extends BaseController {
 		if (null!=vos) {
 			return AjaxResult.successData(AjaxStatus.success.code, vos);
 		} else {
-			return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+			return AjaxResult.successData(AjaxStatus.success.code, vos);
 		}
 
 	}
@@ -170,7 +170,7 @@ public class WtHealthReportMonthController extends BaseController {
 		if (null!=map) {
 			return AjaxResult.successData(AjaxStatus.success.code, map);
 		} else {
-			return AjaxResult.successData(AjaxStatus.emptyresultset.code, map);
+			return AjaxResult.successData(AjaxStatus.success.code, map);
 		}
 
 	}

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

@@ -29,7 +29,7 @@ import java.util.*;
 
 @Controller
 @RequestMapping("/scatter")
-@Api(value = "风场、项目、线路功率风速散点图")
+@Api(value = "风场、项目、线路功率风速散点图",tags =  "风场、项目、线路功率风速散点图")
 public class ScatterController {
 
     @Resource
@@ -121,7 +121,7 @@ public class ScatterController {
         if (null != vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }
@@ -207,7 +207,7 @@ public class ScatterController {
         if (null != result) {
             return AjaxResult.successData(AjaxStatus.success.code, result);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, result);
+            return AjaxResult.successData(AjaxStatus.success.code, result);
         }
 
     }

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

@@ -10,17 +10,17 @@ 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;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import java.util.*;
 
 @Controller
 @RequestMapping("/singleanalysis")
-@Api(value = "单机性能分析")
+@Api(value = "单机性能分析" ,tags="单机性能分析")
 public class SingleAnalysisController {
 
     @Resource
@@ -70,7 +70,7 @@ public class SingleAnalysisController {
         if (null!=vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
 
     }
@@ -153,7 +153,7 @@ public class SingleAnalysisController {
         if (null!=map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, map);
+            return AjaxResult.successData(AjaxStatus.success.code, map);
         }
 
     }
@@ -206,7 +206,7 @@ public class SingleAnalysisController {
         if (null!=map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
-            return AjaxResult.successData(AjaxStatus.emptyresultset.code, map);
+            return AjaxResult.successData(AjaxStatus.success.code, map);
         }
 
     }

src/main/java/com/gyee/frame/mapper/auto/LossPowerRateMapper.java

@@ -0,0 +1,65 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.LossPowerRate;
+import com.gyee.frame.model.auto.LossPowerRateExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface LossPowerRateMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table losspowerrate
+     *
+     * @mbg.generated
+     */
+    long countByExample(LossPowerRateExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table losspowerrate
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(LossPowerRateExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table losspowerrate
+     *
+     * @mbg.generated
+     */
+    int insert(LossPowerRate record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table losspowerrate
+     *
+     * @mbg.generated
+     */
+    int insertSelective(LossPowerRate record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table losspowerrate
+     *
+     * @mbg.generated
+     */
+    List<LossPowerRate> selectByExample(LossPowerRateExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table losspowerrate
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") LossPowerRate record, @Param("example") LossPowerRateExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table losspowerrate
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") LossPowerRate record, @Param("example") LossPowerRateExample example);
+}

src/main/java/com/gyee/frame/mapper/auto/PartBjCountMapper.java

@@ -0,0 +1,65 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.PartBjCount;
+import com.gyee.frame.model.auto.PartBjCountExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface PartBjCountMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcount
+     *
+     * @mbg.generated
+     */
+    long countByExample(PartBjCountExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcount
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(PartBjCountExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcount
+     *
+     * @mbg.generated
+     */
+    int insert(PartBjCount record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcount
+     *
+     * @mbg.generated
+     */
+    int insertSelective(PartBjCount record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcount
+     *
+     * @mbg.generated
+     */
+    List<PartBjCount> selectByExample(PartBjCountExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcount
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") PartBjCount record, @Param("example") PartBjCountExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcount
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") PartBjCount record, @Param("example") PartBjCountExample example);
+}

src/main/java/com/gyee/frame/mapper/auto/PartBjCountSubMapper.java

@@ -0,0 +1,69 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.PartBjCountSub;
+import com.gyee.frame.model.auto.PartBjCountSubExample;
+import com.gyee.frame.model.custom.WindturbinebjCountVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+public interface PartBjCountSubMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcountsub
+     *
+     * @mbg.generated
+     */
+    long countByExample(PartBjCountSubExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcountsub
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(PartBjCountSubExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcountsub
+     *
+     * @mbg.generated
+     */
+    int insert(PartBjCountSub record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcountsub
+     *
+     * @mbg.generated
+     */
+    int insertSelective(PartBjCountSub record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcountsub
+     *
+     * @mbg.generated
+     */
+    List<PartBjCountSub> selectByExample(PartBjCountSubExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcountsub
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") PartBjCountSub record, @Param("example") PartBjCountSubExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcountsub
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") PartBjCountSub record, @Param("example") PartBjCountSubExample example);
+
+    List<WindturbinebjCountVo> getWindturbinebjCountVoList(@Param("lnid") String lnid, @Param("part") String part, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+}

src/main/java/com/gyee/frame/model/auto/LossPowerRate.java

@@ -0,0 +1,211 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class LossPowerRate implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column losspowerrate.time
+     *
+     * @mbg.generated
+     */
+    private String time;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column losspowerrate.wtid
+     *
+     * @mbg.generated
+     */
+    private String wtid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column losspowerrate.realpower
+     *
+     * @mbg.generated
+     */
+    private Double realpower;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column losspowerrate.losspower
+     *
+     * @mbg.generated
+     */
+    private Double losspower;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column losspowerrate.rate
+     *
+     * @mbg.generated
+     */
+    private Double rate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column losspowerrate.wpid
+     *
+     * @mbg.generated
+     */
+    private String wpid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table losspowerrate
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column losspowerrate.time
+     *
+     * @return the value of losspowerrate.time
+     *
+     * @mbg.generated
+     */
+    public String getTime() {
+        return time;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column losspowerrate.time
+     *
+     * @param time the value for losspowerrate.time
+     *
+     * @mbg.generated
+     */
+    public void setTime(String time) {
+        this.time = time == null ? null : time.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column losspowerrate.wtid
+     *
+     * @return the value of losspowerrate.wtid
+     *
+     * @mbg.generated
+     */
+    public String getWtid() {
+        return wtid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column losspowerrate.wtid
+     *
+     * @param wtid the value for losspowerrate.wtid
+     *
+     * @mbg.generated
+     */
+    public void setWtid(String wtid) {
+        this.wtid = wtid == null ? null : wtid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column losspowerrate.realpower
+     *
+     * @return the value of losspowerrate.realpower
+     *
+     * @mbg.generated
+     */
+    public Double getRealpower() {
+        return realpower;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column losspowerrate.realpower
+     *
+     * @param realpower the value for losspowerrate.realpower
+     *
+     * @mbg.generated
+     */
+    public void setRealpower(Double realpower) {
+        this.realpower = realpower;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column losspowerrate.losspower
+     *
+     * @return the value of losspowerrate.losspower
+     *
+     * @mbg.generated
+     */
+    public Double getLosspower() {
+        return losspower;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column losspowerrate.losspower
+     *
+     * @param losspower the value for losspowerrate.losspower
+     *
+     * @mbg.generated
+     */
+    public void setLosspower(Double losspower) {
+        this.losspower = losspower;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column losspowerrate.rate
+     *
+     * @return the value of losspowerrate.rate
+     *
+     * @mbg.generated
+     */
+    public Double getRate() {
+        return rate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column losspowerrate.rate
+     *
+     * @param rate the value for losspowerrate.rate
+     *
+     * @mbg.generated
+     */
+    public void setRate(Double rate) {
+        this.rate = rate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column losspowerrate.wpid
+     *
+     * @return the value of losspowerrate.wpid
+     *
+     * @mbg.generated
+     */
+    public String getWpid() {
+        return wpid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column losspowerrate.wpid
+     *
+     * @param wpid the value for losspowerrate.wpid
+     *
+     * @mbg.generated
+     */
+    public void setWpid(String wpid) {
+        this.wpid = wpid == null ? null : wpid.trim();
+    }
+}

src/main/java/com/gyee/frame/model/auto/LossPowerRateExample.java

@@ -0,0 +1,692 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LossPowerRateExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table losspowerrate
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table losspowerrate
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table losspowerrate
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table losspowerrate
+     *
+     * @mbg.generated
+     */
+    public LossPowerRateExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table losspowerrate
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table losspowerrate
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table losspowerrate
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table losspowerrate
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table losspowerrate
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table losspowerrate
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table losspowerrate
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table losspowerrate
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table losspowerrate
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table losspowerrate
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table losspowerrate
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andTimeIsNull() {
+            addCriterion("time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeIsNotNull() {
+            addCriterion("time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeEqualTo(String value) {
+            addCriterion("time =", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeNotEqualTo(String value) {
+            addCriterion("time <>", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeGreaterThan(String value) {
+            addCriterion("time >", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("time >=", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeLessThan(String value) {
+            addCriterion("time <", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeLessThanOrEqualTo(String value) {
+            addCriterion("time <=", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeLike(String value) {
+            addCriterion("time like", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeNotLike(String value) {
+            addCriterion("time not like", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeIn(List<String> values) {
+            addCriterion("time in", values, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeNotIn(List<String> values) {
+            addCriterion("time not in", values, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeBetween(String value1, String value2) {
+            addCriterion("time between", value1, value2, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeNotBetween(String value1, String value2) {
+            addCriterion("time not between", value1, value2, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIsNull() {
+            addCriterion("wtid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIsNotNull() {
+            addCriterion("wtid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidEqualTo(String value) {
+            addCriterion("wtid =", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotEqualTo(String value) {
+            addCriterion("wtid <>", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidGreaterThan(String value) {
+            addCriterion("wtid >", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidGreaterThanOrEqualTo(String value) {
+            addCriterion("wtid >=", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLessThan(String value) {
+            addCriterion("wtid <", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLessThanOrEqualTo(String value) {
+            addCriterion("wtid <=", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLike(String value) {
+            addCriterion("wtid like", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotLike(String value) {
+            addCriterion("wtid not like", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIn(List<String> values) {
+            addCriterion("wtid in", values, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotIn(List<String> values) {
+            addCriterion("wtid not in", values, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidBetween(String value1, String value2) {
+            addCriterion("wtid between", value1, value2, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotBetween(String value1, String value2) {
+            addCriterion("wtid not between", value1, value2, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealpowerIsNull() {
+            addCriterion("realpower is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealpowerIsNotNull() {
+            addCriterion("realpower is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealpowerEqualTo(Double value) {
+            addCriterion("realpower =", value, "realpower");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealpowerNotEqualTo(Double value) {
+            addCriterion("realpower <>", value, "realpower");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealpowerGreaterThan(Double value) {
+            addCriterion("realpower >", value, "realpower");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealpowerGreaterThanOrEqualTo(Double value) {
+            addCriterion("realpower >=", value, "realpower");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealpowerLessThan(Double value) {
+            addCriterion("realpower <", value, "realpower");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealpowerLessThanOrEqualTo(Double value) {
+            addCriterion("realpower <=", value, "realpower");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealpowerIn(List<Double> values) {
+            addCriterion("realpower in", values, "realpower");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealpowerNotIn(List<Double> values) {
+            addCriterion("realpower not in", values, "realpower");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealpowerBetween(Double value1, Double value2) {
+            addCriterion("realpower between", value1, value2, "realpower");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealpowerNotBetween(Double value1, Double value2) {
+            addCriterion("realpower not between", value1, value2, "realpower");
+            return (Criteria) this;
+        }
+
+        public Criteria andLosspowerIsNull() {
+            addCriterion("losspower is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLosspowerIsNotNull() {
+            addCriterion("losspower is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLosspowerEqualTo(Double value) {
+            addCriterion("losspower =", value, "losspower");
+            return (Criteria) this;
+        }
+
+        public Criteria andLosspowerNotEqualTo(Double value) {
+            addCriterion("losspower <>", value, "losspower");
+            return (Criteria) this;
+        }
+
+        public Criteria andLosspowerGreaterThan(Double value) {
+            addCriterion("losspower >", value, "losspower");
+            return (Criteria) this;
+        }
+
+        public Criteria andLosspowerGreaterThanOrEqualTo(Double value) {
+            addCriterion("losspower >=", value, "losspower");
+            return (Criteria) this;
+        }
+
+        public Criteria andLosspowerLessThan(Double value) {
+            addCriterion("losspower <", value, "losspower");
+            return (Criteria) this;
+        }
+
+        public Criteria andLosspowerLessThanOrEqualTo(Double value) {
+            addCriterion("losspower <=", value, "losspower");
+            return (Criteria) this;
+        }
+
+        public Criteria andLosspowerIn(List<Double> values) {
+            addCriterion("losspower in", values, "losspower");
+            return (Criteria) this;
+        }
+
+        public Criteria andLosspowerNotIn(List<Double> values) {
+            addCriterion("losspower not in", values, "losspower");
+            return (Criteria) this;
+        }
+
+        public Criteria andLosspowerBetween(Double value1, Double value2) {
+            addCriterion("losspower between", value1, value2, "losspower");
+            return (Criteria) this;
+        }
+
+        public Criteria andLosspowerNotBetween(Double value1, Double value2) {
+            addCriterion("losspower not between", value1, value2, "losspower");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateIsNull() {
+            addCriterion("rate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateIsNotNull() {
+            addCriterion("rate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateEqualTo(Double value) {
+            addCriterion("rate =", value, "rate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateNotEqualTo(Double value) {
+            addCriterion("rate <>", value, "rate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateGreaterThan(Double value) {
+            addCriterion("rate >", value, "rate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateGreaterThanOrEqualTo(Double value) {
+            addCriterion("rate >=", value, "rate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateLessThan(Double value) {
+            addCriterion("rate <", value, "rate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateLessThanOrEqualTo(Double value) {
+            addCriterion("rate <=", value, "rate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateIn(List<Double> values) {
+            addCriterion("rate in", values, "rate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateNotIn(List<Double> values) {
+            addCriterion("rate not in", values, "rate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateBetween(Double value1, Double value2) {
+            addCriterion("rate between", value1, value2, "rate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateNotBetween(Double value1, Double value2) {
+            addCriterion("rate not between", value1, value2, "rate");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidIsNull() {
+            addCriterion("wpid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidIsNotNull() {
+            addCriterion("wpid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidEqualTo(String value) {
+            addCriterion("wpid =", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidNotEqualTo(String value) {
+            addCriterion("wpid <>", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidGreaterThan(String value) {
+            addCriterion("wpid >", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidGreaterThanOrEqualTo(String value) {
+            addCriterion("wpid >=", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidLessThan(String value) {
+            addCriterion("wpid <", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidLessThanOrEqualTo(String value) {
+            addCriterion("wpid <=", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidLike(String value) {
+            addCriterion("wpid like", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidNotLike(String value) {
+            addCriterion("wpid not like", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidIn(List<String> values) {
+            addCriterion("wpid in", values, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidNotIn(List<String> values) {
+            addCriterion("wpid not in", values, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidBetween(String value1, String value2) {
+            addCriterion("wpid between", value1, value2, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidNotBetween(String value1, String value2) {
+            addCriterion("wpid not between", value1, value2, "wpid");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table losspowerrate
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table losspowerrate
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/gyee/frame/model/auto/PartBjCount.java

@@ -0,0 +1,179 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class PartBjCount implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column partbjcount.id
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column partbjcount.lnid
+     *
+     * @mbg.generated
+     */
+    private String lnid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column partbjcount.alertruleid
+     *
+     * @mbg.generated
+     */
+    private String alertruleid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column partbjcount.part
+     *
+     * @mbg.generated
+     */
+    private String part;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column partbjcount.recodedate
+     *
+     * @mbg.generated
+     */
+    private Date recodedate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table partbjcount
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column partbjcount.id
+     *
+     * @return the value of partbjcount.id
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column partbjcount.id
+     *
+     * @param id the value for partbjcount.id
+     *
+     * @mbg.generated
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column partbjcount.lnid
+     *
+     * @return the value of partbjcount.lnid
+     *
+     * @mbg.generated
+     */
+    public String getLnid() {
+        return lnid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column partbjcount.lnid
+     *
+     * @param lnid the value for partbjcount.lnid
+     *
+     * @mbg.generated
+     */
+    public void setLnid(String lnid) {
+        this.lnid = lnid == null ? null : lnid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column partbjcount.alertruleid
+     *
+     * @return the value of partbjcount.alertruleid
+     *
+     * @mbg.generated
+     */
+    public String getAlertruleid() {
+        return alertruleid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column partbjcount.alertruleid
+     *
+     * @param alertruleid the value for partbjcount.alertruleid
+     *
+     * @mbg.generated
+     */
+    public void setAlertruleid(String alertruleid) {
+        this.alertruleid = alertruleid == null ? null : alertruleid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column partbjcount.part
+     *
+     * @return the value of partbjcount.part
+     *
+     * @mbg.generated
+     */
+    public String getPart() {
+        return part;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column partbjcount.part
+     *
+     * @param part the value for partbjcount.part
+     *
+     * @mbg.generated
+     */
+    public void setPart(String part) {
+        this.part = part == null ? null : part.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column partbjcount.recodedate
+     *
+     * @return the value of partbjcount.recodedate
+     *
+     * @mbg.generated
+     */
+    public Date getRecodedate() {
+        return recodedate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column partbjcount.recodedate
+     *
+     * @param recodedate the value for partbjcount.recodedate
+     *
+     * @mbg.generated
+     */
+    public void setRecodedate(Date recodedate) {
+        this.recodedate = recodedate;
+    }
+}

src/main/java/com/gyee/frame/model/auto/PartBjCountExample.java

@@ -0,0 +1,643 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class PartBjCountExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table partbjcount
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table partbjcount
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table partbjcount
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcount
+     *
+     * @mbg.generated
+     */
+    public PartBjCountExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcount
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcount
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcount
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcount
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcount
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcount
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcount
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcount
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcount
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcount
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table partbjcount
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andLnidIsNull() {
+            addCriterion("lnid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLnidIsNotNull() {
+            addCriterion("lnid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLnidEqualTo(String value) {
+            addCriterion("lnid =", value, "lnid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLnidNotEqualTo(String value) {
+            addCriterion("lnid <>", value, "lnid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLnidGreaterThan(String value) {
+            addCriterion("lnid >", value, "lnid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLnidGreaterThanOrEqualTo(String value) {
+            addCriterion("lnid >=", value, "lnid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLnidLessThan(String value) {
+            addCriterion("lnid <", value, "lnid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLnidLessThanOrEqualTo(String value) {
+            addCriterion("lnid <=", value, "lnid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLnidLike(String value) {
+            addCriterion("lnid like", value, "lnid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLnidNotLike(String value) {
+            addCriterion("lnid not like", value, "lnid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLnidIn(List<String> values) {
+            addCriterion("lnid in", values, "lnid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLnidNotIn(List<String> values) {
+            addCriterion("lnid not in", values, "lnid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLnidBetween(String value1, String value2) {
+            addCriterion("lnid between", value1, value2, "lnid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLnidNotBetween(String value1, String value2) {
+            addCriterion("lnid not between", value1, value2, "lnid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAlertruleidIsNull() {
+            addCriterion("alertruleid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAlertruleidIsNotNull() {
+            addCriterion("alertruleid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAlertruleidEqualTo(String value) {
+            addCriterion("alertruleid =", value, "alertruleid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAlertruleidNotEqualTo(String value) {
+            addCriterion("alertruleid <>", value, "alertruleid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAlertruleidGreaterThan(String value) {
+            addCriterion("alertruleid >", value, "alertruleid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAlertruleidGreaterThanOrEqualTo(String value) {
+            addCriterion("alertruleid >=", value, "alertruleid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAlertruleidLessThan(String value) {
+            addCriterion("alertruleid <", value, "alertruleid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAlertruleidLessThanOrEqualTo(String value) {
+            addCriterion("alertruleid <=", value, "alertruleid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAlertruleidLike(String value) {
+            addCriterion("alertruleid like", value, "alertruleid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAlertruleidNotLike(String value) {
+            addCriterion("alertruleid not like", value, "alertruleid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAlertruleidIn(List<String> values) {
+            addCriterion("alertruleid in", values, "alertruleid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAlertruleidNotIn(List<String> values) {
+            addCriterion("alertruleid not in", values, "alertruleid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAlertruleidBetween(String value1, String value2) {
+            addCriterion("alertruleid between", value1, value2, "alertruleid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAlertruleidNotBetween(String value1, String value2) {
+            addCriterion("alertruleid not between", value1, value2, "alertruleid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartIsNull() {
+            addCriterion("part is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartIsNotNull() {
+            addCriterion("part is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartEqualTo(String value) {
+            addCriterion("part =", value, "part");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartNotEqualTo(String value) {
+            addCriterion("part <>", value, "part");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartGreaterThan(String value) {
+            addCriterion("part >", value, "part");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartGreaterThanOrEqualTo(String value) {
+            addCriterion("part >=", value, "part");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartLessThan(String value) {
+            addCriterion("part <", value, "part");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartLessThanOrEqualTo(String value) {
+            addCriterion("part <=", value, "part");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartLike(String value) {
+            addCriterion("part like", value, "part");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartNotLike(String value) {
+            addCriterion("part not like", value, "part");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartIn(List<String> values) {
+            addCriterion("part in", values, "part");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartNotIn(List<String> values) {
+            addCriterion("part not in", values, "part");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartBetween(String value1, String value2) {
+            addCriterion("part between", value1, value2, "part");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartNotBetween(String value1, String value2) {
+            addCriterion("part not between", value1, value2, "part");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecodedateIsNull() {
+            addCriterion("recodedate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecodedateIsNotNull() {
+            addCriterion("recodedate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecodedateEqualTo(Date value) {
+            addCriterion("recodedate =", value, "recodedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecodedateNotEqualTo(Date value) {
+            addCriterion("recodedate <>", value, "recodedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecodedateGreaterThan(Date value) {
+            addCriterion("recodedate >", value, "recodedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecodedateGreaterThanOrEqualTo(Date value) {
+            addCriterion("recodedate >=", value, "recodedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecodedateLessThan(Date value) {
+            addCriterion("recodedate <", value, "recodedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecodedateLessThanOrEqualTo(Date value) {
+            addCriterion("recodedate <=", value, "recodedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecodedateIn(List<Date> values) {
+            addCriterion("recodedate in", values, "recodedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecodedateNotIn(List<Date> values) {
+            addCriterion("recodedate not in", values, "recodedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecodedateBetween(Date value1, Date value2) {
+            addCriterion("recodedate between", value1, value2, "recodedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecodedateNotBetween(Date value1, Date value2) {
+            addCriterion("recodedate not between", value1, value2, "recodedate");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table partbjcount
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table partbjcount
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/gyee/frame/model/auto/PartBjCountSub.java

@@ -0,0 +1,178 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class PartBjCountSub implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column partbjcountsub.id
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column partbjcountsub.wtid
+     *
+     * @mbg.generated
+     */
+    private String wtid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column partbjcountsub.count
+     *
+     * @mbg.generated
+     */
+    private Integer count;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column partbjcountsub.reference
+     *
+     * @mbg.generated
+     */
+    private Double reference;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column partbjcountsub.rid
+     *
+     * @mbg.generated
+     */
+    private String rid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table partbjcountsub
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column partbjcountsub.id
+     *
+     * @return the value of partbjcountsub.id
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column partbjcountsub.id
+     *
+     * @param id the value for partbjcountsub.id
+     *
+     * @mbg.generated
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column partbjcountsub.wtid
+     *
+     * @return the value of partbjcountsub.wtid
+     *
+     * @mbg.generated
+     */
+    public String getWtid() {
+        return wtid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column partbjcountsub.wtid
+     *
+     * @param wtid the value for partbjcountsub.wtid
+     *
+     * @mbg.generated
+     */
+    public void setWtid(String wtid) {
+        this.wtid = wtid == null ? null : wtid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column partbjcountsub.count
+     *
+     * @return the value of partbjcountsub.count
+     *
+     * @mbg.generated
+     */
+    public Integer getCount() {
+        return count;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column partbjcountsub.count
+     *
+     * @param count the value for partbjcountsub.count
+     *
+     * @mbg.generated
+     */
+    public void setCount(Integer count) {
+        this.count = count;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column partbjcountsub.reference
+     *
+     * @return the value of partbjcountsub.reference
+     *
+     * @mbg.generated
+     */
+    public Double getReference() {
+        return reference;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column partbjcountsub.reference
+     *
+     * @param reference the value for partbjcountsub.reference
+     *
+     * @mbg.generated
+     */
+    public void setReference(Double reference) {
+        this.reference = reference;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column partbjcountsub.rid
+     *
+     * @return the value of partbjcountsub.rid
+     *
+     * @mbg.generated
+     */
+    public String getRid() {
+        return rid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column partbjcountsub.rid
+     *
+     * @param rid the value for partbjcountsub.rid
+     *
+     * @mbg.generated
+     */
+    public void setRid(String rid) {
+        this.rid = rid == null ? null : rid.trim();
+    }
+}

src/main/java/com/gyee/frame/model/auto/PartBjCountSubExample.java

@@ -0,0 +1,632 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PartBjCountSubExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table partbjcountsub
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table partbjcountsub
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table partbjcountsub
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcountsub
+     *
+     * @mbg.generated
+     */
+    public PartBjCountSubExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcountsub
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcountsub
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcountsub
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcountsub
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcountsub
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcountsub
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcountsub
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcountsub
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcountsub
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table partbjcountsub
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table partbjcountsub
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIsNull() {
+            addCriterion("wtid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIsNotNull() {
+            addCriterion("wtid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidEqualTo(String value) {
+            addCriterion("wtid =", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotEqualTo(String value) {
+            addCriterion("wtid <>", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidGreaterThan(String value) {
+            addCriterion("wtid >", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidGreaterThanOrEqualTo(String value) {
+            addCriterion("wtid >=", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLessThan(String value) {
+            addCriterion("wtid <", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLessThanOrEqualTo(String value) {
+            addCriterion("wtid <=", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLike(String value) {
+            addCriterion("wtid like", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotLike(String value) {
+            addCriterion("wtid not like", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIn(List<String> values) {
+            addCriterion("wtid in", values, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotIn(List<String> values) {
+            addCriterion("wtid not in", values, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidBetween(String value1, String value2) {
+            addCriterion("wtid between", value1, value2, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotBetween(String value1, String value2) {
+            addCriterion("wtid not between", value1, value2, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountIsNull() {
+            addCriterion("count is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountIsNotNull() {
+            addCriterion("count is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountEqualTo(Integer value) {
+            addCriterion("count =", value, "count");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountNotEqualTo(Integer value) {
+            addCriterion("count <>", value, "count");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountGreaterThan(Integer value) {
+            addCriterion("count >", value, "count");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountGreaterThanOrEqualTo(Integer value) {
+            addCriterion("count >=", value, "count");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountLessThan(Integer value) {
+            addCriterion("count <", value, "count");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountLessThanOrEqualTo(Integer value) {
+            addCriterion("count <=", value, "count");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountIn(List<Integer> values) {
+            addCriterion("count in", values, "count");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountNotIn(List<Integer> values) {
+            addCriterion("count not in", values, "count");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountBetween(Integer value1, Integer value2) {
+            addCriterion("count between", value1, value2, "count");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountNotBetween(Integer value1, Integer value2) {
+            addCriterion("count not between", value1, value2, "count");
+            return (Criteria) this;
+        }
+
+        public Criteria andReferenceIsNull() {
+            addCriterion("reference is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReferenceIsNotNull() {
+            addCriterion("reference is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReferenceEqualTo(Double value) {
+            addCriterion("reference =", value, "reference");
+            return (Criteria) this;
+        }
+
+        public Criteria andReferenceNotEqualTo(Double value) {
+            addCriterion("reference <>", value, "reference");
+            return (Criteria) this;
+        }
+
+        public Criteria andReferenceGreaterThan(Double value) {
+            addCriterion("reference >", value, "reference");
+            return (Criteria) this;
+        }
+
+        public Criteria andReferenceGreaterThanOrEqualTo(Double value) {
+            addCriterion("reference >=", value, "reference");
+            return (Criteria) this;
+        }
+
+        public Criteria andReferenceLessThan(Double value) {
+            addCriterion("reference <", value, "reference");
+            return (Criteria) this;
+        }
+
+        public Criteria andReferenceLessThanOrEqualTo(Double value) {
+            addCriterion("reference <=", value, "reference");
+            return (Criteria) this;
+        }
+
+        public Criteria andReferenceIn(List<Double> values) {
+            addCriterion("reference in", values, "reference");
+            return (Criteria) this;
+        }
+
+        public Criteria andReferenceNotIn(List<Double> values) {
+            addCriterion("reference not in", values, "reference");
+            return (Criteria) this;
+        }
+
+        public Criteria andReferenceBetween(Double value1, Double value2) {
+            addCriterion("reference between", value1, value2, "reference");
+            return (Criteria) this;
+        }
+
+        public Criteria andReferenceNotBetween(Double value1, Double value2) {
+            addCriterion("reference not between", value1, value2, "reference");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidIsNull() {
+            addCriterion("rid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidIsNotNull() {
+            addCriterion("rid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidEqualTo(String value) {
+            addCriterion("rid =", value, "rid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidNotEqualTo(String value) {
+            addCriterion("rid <>", value, "rid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidGreaterThan(String value) {
+            addCriterion("rid >", value, "rid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidGreaterThanOrEqualTo(String value) {
+            addCriterion("rid >=", value, "rid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidLessThan(String value) {
+            addCriterion("rid <", value, "rid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidLessThanOrEqualTo(String value) {
+            addCriterion("rid <=", value, "rid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidLike(String value) {
+            addCriterion("rid like", value, "rid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidNotLike(String value) {
+            addCriterion("rid not like", value, "rid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidIn(List<String> values) {
+            addCriterion("rid in", values, "rid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidNotIn(List<String> values) {
+            addCriterion("rid not in", values, "rid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidBetween(String value1, String value2) {
+            addCriterion("rid between", value1, value2, "rid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidNotBetween(String value1, String value2) {
+            addCriterion("rid not between", value1, value2, "rid");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table partbjcountsub
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table partbjcountsub
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/gyee/frame/model/custom/PartbjcountVo.java

@@ -0,0 +1,70 @@
+package com.gyee.frame.model.custom;
+
+import java.util.Date;
+
+public class PartbjcountVo {
+	private Integer num;
+	private String id;
+	private String lnid;
+	private String lnname;
+	private String part;
+	private String partname;
+	private Date date;
+
+	public Integer getNum() {
+		return num;
+	}
+
+	public void setNum(Integer num) {
+		this.num = num;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getLnid() {
+		return lnid;
+	}
+
+	public void setLnid(String lnid) {
+		this.lnid = lnid;
+	}
+
+	public String getLnname() {
+		return lnname;
+	}
+
+	public void setLnname(String lnname) {
+		this.lnname = lnname;
+	}
+
+	public String getPart() {
+		return part;
+	}
+
+	public void setPart(String part) {
+		this.part = part;
+	}
+
+	public String getPartname() {
+		return partname;
+	}
+
+	public void setPartname(String partname) {
+		this.partname = partname;
+	}
+
+	public Date getDate() {
+		return date;
+	}
+
+	public void setDate(Date date) {
+		this.date = date;
+	}
+
+}

src/main/java/com/gyee/frame/model/custom/TotalNumVo.java

@@ -11,18 +11,18 @@ public class TotalNumVo  implements Serializable{
 	
 	private String wtId;
 	private String typeId;
-	private Integer number;
+	private Integer numbers;
 	public String getWtId() {
 		return wtId;
 	}
 	public void setWtId(String wtId) {
 		this.wtId = wtId;
 	}
-	public Integer getNumber() {
-		return number;
+	public Integer getNumbers() {
+		return numbers;
 	}
-	public void setNumber(Integer number) {
-		this.number = number;
+	public void setNumbers(Integer numbers) {
+		this.numbers = numbers;
 	}
 	public String getTypeId() {
 		return typeId;

src/main/java/com/gyee/frame/model/custom/WindturbinebjCountVo.java

@@ -0,0 +1,96 @@
+package com.gyee.frame.model.custom;
+
+import java.util.Date;
+
+public class WindturbinebjCountVo {
+	private String id;
+	private String wtid;
+	private String lnid;
+	private String wpid;
+	private String alertruleid;
+	private String alertrulename;
+	private String part;
+	private Integer count;
+	private Double reference;
+	private Date recodedate;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getWtid() {
+		return wtid;
+	}
+
+	public void setWtid(String wtid) {
+		this.wtid = wtid;
+	}
+
+	public String getLnid() {
+		return lnid;
+	}
+
+	public void setLnid(String lnid) {
+		this.lnid = lnid;
+	}
+
+	public String getWpid() {
+		return wpid;
+	}
+
+	public void setWpid(String wpid) {
+		this.wpid = wpid;
+	}
+
+	public String getAlertrulename() {
+		return alertrulename;
+	}
+
+	public void setAlertrulename(String alertrulename) {
+		this.alertrulename = alertrulename;
+	}
+
+	public String getPart() {
+		return part;
+	}
+
+	public void setPart(String part) {
+		this.part = part;
+	}
+
+	public Integer getCount() {
+		return count;
+	}
+
+	public void setCount(Integer count) {
+		this.count = count;
+	}
+
+	public Double getReference() {
+		return reference;
+	}
+
+	public void setReference(Double reference) {
+		this.reference = reference;
+	}
+
+	public Date getRecodedate() {
+		return recodedate;
+	}
+
+	public void setRecodedate(Date recodedate) {
+		this.recodedate = recodedate;
+	}
+
+	public String getAlertruleid() {
+		return alertruleid;
+	}
+
+	public void setAlertruleid(String alertruleid) {
+		this.alertruleid = alertruleid;
+	}
+}

src/main/java/com/gyee/frame/service/ActivePowerDataService.java

@@ -9,7 +9,7 @@ import com.gyee.frame.model.auto.ActivePowerDataExample;
 import com.gyee.frame.model.auto.Windturbine;
 import com.gyee.frame.model.custom.StatisticalAnalysisRnewTopVo;
 import com.gyee.frame.util.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.util.*;

src/main/java/com/gyee/frame/service/Brownoutsevent2Service.java

@@ -10,9 +10,9 @@ import com.gyee.frame.model.auto.Brownoutsevent2Example;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.util.SnowflakeIdWorker;
 import com.gyee.frame.util.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
 

src/main/java/com/gyee/frame/service/CurvefittingmainService.java

@@ -9,9 +9,9 @@ import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.SnowflakeIdWorker;
 import com.gyee.frame.util.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.*;
 
 

src/main/java/com/gyee/frame/service/DictService.java

@@ -3,7 +3,7 @@ package com.gyee.frame.service;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import com.gyee.frame.mapper.auto.TSysDictDataMapper;

src/main/java/com/gyee/frame/service/EquipmentSqlService.java

@@ -8,7 +8,7 @@ import com.gyee.frame.mapper.auto.EquipmentSqlMapper;
 import com.gyee.frame.model.auto.EquipmentSql;
 import com.gyee.frame.model.auto.EquipmentSqlExample;
 import com.gyee.frame.util.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;

src/main/java/com/gyee/frame/service/EquipmentmodelService.java

@@ -6,7 +6,7 @@ import com.gyee.frame.mapper.auto.EquipmentmodelMapper;
 import com.gyee.frame.model.auto.Equipmentmodel;
 import com.gyee.frame.model.auto.EquipmentmodelExample;
 import com.gyee.frame.util.SnowflakeIdWorker;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

src/main/java/com/gyee/frame/service/GeneratorService.java

@@ -1,7 +1,7 @@
 package com.gyee.frame.service;
 
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 import com.gyee.frame.mapper.auto.GeneratorMapper;
 import com.gyee.frame.model.custom.Tablepar;

src/main/java/com/gyee/frame/service/Inputoroutputspeedtotal2Service.java

@@ -7,7 +7,7 @@ import com.gyee.frame.model.auto.Inputoroutputspeedtotal2;
 import com.gyee.frame.model.auto.Inputoroutputspeedtotal2Example;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;

src/main/java/com/gyee/frame/service/InputoroutputspeedtotalService.java

@@ -9,7 +9,7 @@ import com.gyee.frame.model.custom.SingleAnalysisVo;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;

src/main/java/com/gyee/frame/service/LineService.java

@@ -9,7 +9,7 @@ import com.gyee.frame.model.auto.Line;
 import com.gyee.frame.model.auto.LineExample;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.util.SnowflakeIdWorker;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

src/main/java/com/gyee/frame/service/LossPowerRateService.java

@@ -0,0 +1,221 @@
+package com.gyee.frame.service;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.spring.InitialRunner;
+import com.gyee.frame.mapper.auto.LossPowerRateMapper;
+import com.gyee.frame.model.auto.LossPowerRate;
+import com.gyee.frame.model.auto.LossPowerRateExample;
+import com.gyee.frame.model.auto.Windturbineinfoday3;
+import com.gyee.frame.util.DateUtils;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 线路 LossPowerRateService
+ *
+ * @author gyee_自动生成
+ * @Title: LossPowerRateService.java 
+ * @Package com.gyee.frame.service 
+ * @email 1@qq.com
+ * @date 2019-12-31 14:58:09  
+ **/
+@Service
+public class LossPowerRateService implements BaseService<LossPowerRate, LossPowerRateExample> {
+    @Resource
+    private LossPowerRateMapper lossPowerRateMapper;
+	@Resource
+	private Windturbineinfoday3Service windturbineinfoday3Service;
+
+    @Override
+    public int deleteByPrimaryKey(String ids) {
+
+        return -1;
+
+    }
+
+
+    @Override
+    public LossPowerRate selectByPrimaryKey(String id) {
+
+        return new LossPowerRate();
+
+    }
+
+
+    @Override
+    public int updateByPrimaryKeySelective(LossPowerRate record) {
+        return -1;
+    }
+
+
+    /**
+     * 添加
+     */
+    @Override
+    public int insertSelective(LossPowerRate record) {
+
+
+        return lossPowerRateMapper.insertSelective(record);
+    }
+
+
+    @Override
+    public int updateByExampleSelective(LossPowerRate record, LossPowerRateExample example) {
+
+        return lossPowerRateMapper.updateByExampleSelective(record, example);
+    }
+
+
+    @Override
+    public int updateByExample(LossPowerRate record, LossPowerRateExample example) {
+
+        return lossPowerRateMapper.updateByExample(record, example);
+    }
+
+    @Override
+    public List<LossPowerRate> selectByExample(LossPowerRateExample example) {
+
+        return lossPowerRateMapper.selectByExample(example);
+    }
+
+
+    @Override
+    public long countByExample(LossPowerRateExample example) {
+
+        return lossPowerRateMapper.countByExample(example);
+    }
+
+
+    @Override
+    public int deleteByExample(LossPowerRateExample example) {
+
+        return lossPowerRateMapper.deleteByExample(example);
+    }
+
+	public List<LossPowerRate> getLossPowerRateListBywtId(String wtId,Date beginDate,Date endDate) throws ParseException {
+
+
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+
+		List<Windturbineinfoday3> list=windturbineinfoday3Service.getWindturbineinfoday3ListBywtId(wtId, beginDate, endDate);
+		List<List<Object>> llit=new ArrayList<>();
+		List<LossPowerRate> listlosspowerrate=new ArrayList<>();
+		for(Windturbineinfoday3 w3:list){
+			if(w3.getDaydl2()==null||w3.getDaynhqfdl2()==null){
+				continue;
+			}
+			LossPowerRate losspowerrate =new LossPowerRate();
+
+			double dou=0.0;
+			if((w3.getDaydl2()+w3.getDaynhqfdl2())!=0.0){
+				dou=StringUtils.round(w3.getDaynhqfdl2()/(w3.getDaydl2()+w3.getDaynhqfdl2()),4)*100;
+			}
+
+			losspowerrate.setRealpower(w3.getDaydl2());
+			losspowerrate.setLosspower(w3.getDaynhqfdl2());
+			losspowerrate.setRate(StringUtils.round(dou,2));
+			losspowerrate.setTime(sdf.format(w3.getRecorddate().getTime()));
+			losspowerrate.setWtid(wtId);
+			listlosspowerrate.add(losspowerrate);
+		}
+
+
+		return listlosspowerrate;
+
+	}
+
+
+	public List<List<Object>> getLossPowerRateListBywtId(List<List<Object>> lli,String wtId) {
+
+
+		List<List<Object>> ls=new ArrayList<>();
+
+		if (StringUtils.notEmp(wtId) ) {
+
+			LossPowerRateExample example=new LossPowerRateExample();
+			example.setOrderByClause("wtid asc");
+
+			LossPowerRateExample.Criteria criteria =example.createCriteria();
+
+			criteria.andWtidEqualTo(wtId);
+			List<LossPowerRate>  list= lossPowerRateMapper.selectByExample(example);
+
+			if(!list.isEmpty())
+			{
+				double rate= list.get(0).getRate();
+
+				for(List<Object> li:lli){
+					List<Object> lo=new ArrayList<>();
+					lo.add(li.get(0));
+					lo.add(rate);
+					ls.add(lo);
+				}
+			}
+
+		}
+		return ls;
+
+	}
+
+
+	public List<List<Object>> getHistorySpline(List<List<Object>> lli,String wtid,String isinsert) throws Exception{
+		SimpleDateFormat sdf1=new SimpleDateFormat("yyyy-MM");
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		Date begin=DateUtils.addMonths(sdf.parse(DateUtils.getCurrtenFirstDay()),-1);
+		Date end=sdf.parse(DateUtils.getCurrtenFirstDay());
+		List<Windturbineinfoday3> list=windturbineinfoday3Service.getWindturbineinfoday3ListBywtId(wtid,begin,end);
+		double sumxn=0.0;
+		double sumsj=0.0;
+		for(Windturbineinfoday3 w3:list){
+			if(w3.getDaydl2()==null||w3.getDaynhqfdl2()==null){
+				continue;
+			}
+			sumxn+=w3.getDaynhqfdl2();
+			sumsj+=w3.getDaydl2();
+		}
+		Double dou=0.0;
+		if((sumxn+sumsj)!=0.0){
+			dou= StringUtils.round(sumxn/(sumxn+sumsj)*100,2);
+		}
+		List<List<Object>> llo=new ArrayList<>();
+		for(List<Object> li:lli){
+			List<Object> lo=new ArrayList<>();
+			lo.add(li.get(0));
+			lo.add(dou);
+			llo.add(lo);
+		}
+		String time=sdf1.format(begin);
+		String wpid= InitialRunner.wtmap.get(wtid).getWindpowerstationid();
+//		if(isinsert.equalsIgnoreCase("1")){
+//			if(wpid.split("_")[1].equalsIgnoreCase("FDC")){
+//				String sql="insert into losspowerrate values('"+time+"','"+wtid+"','"+sumsj+"','"+sumxn+"','"+dou+"','"+wpid+"')";
+//				System.out.println(sql);
+//				operate.update(sql);
+//			}
+//		}
+		return llo;
+	}
+
+
+	public List<List<List<Object>>>  getChartlist(String wtId,Date beginDate,Date endDate) throws Exception{
+		List<List<List<Object>>> llld=new ArrayList<>();
+
+		if(StringUtils.notEmp(wtId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate))
+		{
+			List<List<Object>> real=windturbineinfoday3Service.getWtDay3ListBywtId(wtId,beginDate,endDate);
+			List<List<Object>> nihe=getLossPowerRateListBywtId(real,wtId);
+
+			llld.add(real);
+			llld.add(nihe);
+		}
+
+		return llld;
+	}
+}

src/main/java/com/gyee/frame/service/ManufacturerService.java

@@ -6,7 +6,7 @@ import com.gyee.frame.mapper.auto.ManufacturerMapper;
 import com.gyee.frame.model.auto.Manufacturer;
 import com.gyee.frame.model.auto.ManufacturerExample;
 import com.gyee.frame.util.SnowflakeIdWorker;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

src/main/java/com/gyee/frame/service/MismapSqlService.java

@@ -6,7 +6,7 @@ import com.gyee.frame.mapper.auto.MismapSqlMapper;
 import com.gyee.frame.model.auto.MismapSql;
 import com.gyee.frame.model.auto.MismapSqlExample;
 import com.gyee.frame.util.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

src/main/java/com/gyee/frame/service/ModelPowerService.java

@@ -6,7 +6,7 @@ import com.gyee.frame.mapper.auto.ModelPowerMapper;
 import com.gyee.frame.model.auto.ModelPower;
 import com.gyee.frame.model.auto.ModelPowerExample;
 import com.gyee.frame.util.SnowflakeIdWorker;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

src/main/java/com/gyee/frame/service/ModelpowerRdService.java

@@ -6,7 +6,7 @@ import com.gyee.frame.mapper.auto.ModelpowerRdMapper;
 import com.gyee.frame.model.auto.ModelpowerRd;
 import com.gyee.frame.model.auto.ModelpowerRdExample;
 import com.gyee.frame.util.SnowflakeIdWorker;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.util.*;

src/main/java/com/gyee/frame/service/PartBjCountService.java

@@ -0,0 +1,149 @@
+package com.gyee.frame.service;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.spring.InitialRunner;
+import com.gyee.frame.mapper.auto.PartBjCountMapper;
+import com.gyee.frame.model.auto.PartBjCount;
+import com.gyee.frame.model.auto.PartBjCountExample;
+import com.gyee.frame.model.custom.PartbjcountVo;
+import com.gyee.frame.util.DateUtils;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * PartBjCountService
+ *
+ * @author gyee_自动生成
+ * @Title: PartBjCountService.java 
+ * @Package com.gyee.frame.service 
+ * @email 1@qq.com
+ * @date 2019-12-31 14:58:09  
+ **/
+@Service
+public class PartBjCountService implements BaseService<PartBjCount, PartBjCountExample> {
+    @Resource
+    private PartBjCountMapper partBjCountMapper;
+
+
+    @Override
+    public int deleteByPrimaryKey(String ids) {
+
+        return -1;
+
+    }
+
+
+    @Override
+    public PartBjCount selectByPrimaryKey(String id) {
+
+        return new PartBjCount();
+
+    }
+
+
+    @Override
+    public int updateByPrimaryKeySelective(PartBjCount record) {
+        return -1;
+    }
+
+
+    /**
+     * 添加
+     */
+    @Override
+    public int insertSelective(PartBjCount record) {
+
+
+        return partBjCountMapper.insertSelective(record);
+    }
+
+
+    @Override
+    public int updateByExampleSelective(PartBjCount record, PartBjCountExample example) {
+
+        return partBjCountMapper.updateByExampleSelective(record, example);
+    }
+
+
+    @Override
+    public int updateByExample(PartBjCount record, PartBjCountExample example) {
+
+        return partBjCountMapper.updateByExample(record, example);
+    }
+
+    @Override
+    public List<PartBjCount> selectByExample(PartBjCountExample example) {
+
+        return partBjCountMapper.selectByExample(example);
+    }
+
+
+    @Override
+    public long countByExample(PartBjCountExample example) {
+
+        return partBjCountMapper.countByExample(example);
+    }
+
+
+    @Override
+    public int deleteByExample(PartBjCountExample example) {
+
+        return partBjCountMapper.deleteByExample(example);
+    }
+
+    public List<PartbjcountVo> getPartBjCountList(Date recorddate) {
+
+        List<PartbjcountVo> vos = new ArrayList<>();
+        PartBjCountExample example = new PartBjCountExample();
+
+        example.setDistinct(true);
+        PartBjCountExample.Criteria criteria = example.createCriteria();
+        if (StringUtils.notEmp(recorddate)) {
+            Date endDate = DateUtils.addDays(recorddate, 1);
+            criteria.andRecodedateGreaterThanOrEqualTo(recorddate).andRecodedateGreaterThan(endDate);
+
+        }
+
+        List<PartBjCount> list = partBjCountMapper.selectByExample(example);
+
+        if (!list.isEmpty()) {
+            for (PartBjCount po : list) {
+                PartbjcountVo vo = new PartbjcountVo();
+                vo.setId(po.getId());
+                vo.setLnid(po.getLnid());
+                vo.setPart(po.getPart());
+                vo.setDate(po.getRecodedate());
+                vo.setPartname(getPartnamebyid(po.getPart()));
+                if(InitialRunner.lnmap.containsKey(po.getLnid()))
+                {
+                    vo.setLnname(InitialRunner.lnmap.get(po.getLnid()).getName());
+                }
+
+                vos.add(vo);
+            }
+
+        }
+
+        return vos;
+    }
+
+    private String getPartnamebyid(String part) {
+        if (part.equals("ZK")) {
+            return "主控";
+        } else if (part.equals("FDJ")) {
+            return "发电机";
+        } else if (part.equals("ZZ")) {
+            return "主轴";
+        } else if (part.equals("CLX")) {
+            return "齿轮箱";
+        } else {
+            return "机舱";
+        }
+
+    }
+}

src/main/java/com/gyee/frame/service/PartBjCountSubService.java

@@ -0,0 +1,283 @@
+package com.gyee.frame.service;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.mapper.auto.PartBjCountSubMapper;
+import com.gyee.frame.model.auto.Alertrule2;
+import com.gyee.frame.model.auto.Alertrule2Example;
+import com.gyee.frame.model.auto.PartBjCountSub;
+import com.gyee.frame.model.auto.PartBjCountSubExample;
+import com.gyee.frame.model.custom.WindturbinebjCountVo;
+import com.gyee.frame.util.DateUtils;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * PartBjCountSubService
+ * @Title: PartBjCountSubService.java 
+ * @Package com.gyee.frame.service 
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2019-12-31 14:58:09  
+ **/
+@Service
+public class PartBjCountSubService implements BaseService<PartBjCountSub, PartBjCountSubExample> {
+	@Resource
+	private PartBjCountSubMapper partBjCountSubMapper;
+	@Resource
+	private Alertrule2ervice alertrule2ervice;
+
+
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+
+		return -1;
+
+	}
+	
+	
+	@Override
+	public PartBjCountSub selectByPrimaryKey(String id) {
+				
+			return new PartBjCountSub();
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(PartBjCountSub record) {
+		return -1;
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(PartBjCountSub record) {
+
+				
+		return partBjCountSubMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(PartBjCountSub record, PartBjCountSubExample example) {
+		
+		return partBjCountSubMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(PartBjCountSub record, PartBjCountSubExample example) {
+		
+		return partBjCountSubMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<PartBjCountSub> selectByExample(PartBjCountSubExample example) {
+		
+		return partBjCountSubMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(PartBjCountSubExample example) {
+		
+		return partBjCountSubMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(PartBjCountSubExample example) {
+		
+		return partBjCountSubMapper.deleteByExample(example);
+	}
+
+
+
+	public List<WindturbinebjCountVo>  getWindturbinebjCountVoList(String lnid, String part,Date recorddate) throws Exception{
+
+		List<WindturbinebjCountVo> vos=new ArrayList<>();
+
+		if( StringUtils.notEmp(recorddate))
+		{
+			Map<String,Alertrule2> map=new HashMap<>();
+			Alertrule2Example example=new Alertrule2Example();
+			List<Alertrule2> alertrule2ls=alertrule2ervice.selectByExample(example);
+			if(!alertrule2ls.isEmpty())
+			{
+				for(Alertrule2 ar:alertrule2ls)
+				{
+					map.put(ar.getId(),ar);
+				}
+			}
+
+
+			Date endDate= DateUtils.addDays(recorddate,1);
+			List<WindturbinebjCountVo> ls=partBjCountSubMapper.getWindturbinebjCountVoList(lnid, part,recorddate,endDate);
+			if(!ls.isEmpty())
+			{
+				for(WindturbinebjCountVo vo:ls)
+				{
+					if(map.containsKey(vo.getAlertruleid()))
+					{
+						vo.setAlertrulename(map.get(vo.getAlertruleid()).getName());
+					}
+
+				}
+			}
+
+
+			for (WindturbinebjCountVo wc : ls) {
+				if (isExceedingStandard(wc) == true) {
+					vos.add(wc);
+				}
+			}
+
+		}
+
+		return vos;
+	}
+
+
+	private Boolean isExceedingStandard(WindturbinebjCountVo wb) {
+		if (wb.getCount() == 0 || wb.getCount() <= wb.getReference()) {
+			return false;
+		}
+		if (("" + wb.getReference()).length() == 1) {
+			if (wb.getReference() == 0 && wb.getCount() >= 8) {
+				return true;
+			} else if (wb.getReference() == 1 && wb.getCount() >= 20) {
+				return true;
+			} else if (wb.getReference() == 2 && wb.getCount() >= 30) {
+				return true;
+			} else if (wb.getReference() == 3 && wb.getCount() >= 30) {
+				return true;
+			} else if (wb.getReference() == 4 && wb.getCount() >= 30) {
+				return true;
+			} else if (wb.getReference() == 5 && wb.getCount() >= 30) {
+				return true;
+			} else if (wb.getReference() == 6 && wb.getCount() >= 30) {
+				return true;
+			} else if (wb.getReference() == 7 && wb.getCount() >= 30) {
+				return true;
+			} else if (wb.getReference() == 8 && wb.getCount() >= 30) {
+				return true;
+			} else if (wb.getReference() == 9 && wb.getCount() >= 30) {
+				return true;
+			} else {
+				return false;
+			}
+		} else if (("" + wb.getReference()).length() == 2) {
+			if (getFirstDigit(wb.getReference().intValue()) == 1
+					&& wb.getCount() >= (wb.getReference() * 3)) {
+				return true;
+			} else if (getFirstDigit(wb.getReference().intValue()) == 2
+					&& wb.getCount() >= (wb.getReference() * 2)) {
+				return true;
+			} else if (getFirstDigit(wb.getReference().intValue()) == 3
+					&& wb.getCount() >= (wb.getReference() * 1.5)) {
+				return true;
+			} else if (getFirstDigit(wb.getReference().intValue()) == 4
+					&& wb.getCount() >= (wb.getReference() * 1.4)) {
+				return true;
+			} else if (getFirstDigit(wb.getReference().intValue()) == 5
+					&& wb.getCount() >= (wb.getReference() * 1.3)) {
+				return true;
+			} else if (getFirstDigit(wb.getReference().intValue()) == 6
+					&& wb.getCount() >= (wb.getReference() * 1.3)) {
+				return true;
+			} else if (getFirstDigit(wb.getReference().intValue()) == 7
+					&& wb.getCount() >= (wb.getReference() * 1.3)) {
+				return true;
+			} else if (getFirstDigit(wb.getReference().intValue()) == 8
+					&& wb.getCount() >= (wb.getReference() * 1.3)) {
+				return true;
+			} else if (getFirstDigit(wb.getReference().intValue()) == 9
+					&& wb.getCount() >= (wb.getReference() * 1.3)) {
+				return true;
+			} else {
+				return false;
+			}
+		} else if (("" + wb.getReference()).length() == 3) {
+			if (getFirstDigit(wb.getReference().intValue()) == 1
+					&& wb.getCount() >= (wb.getReference() * 2)) {
+				return true;
+			} else if (getFirstDigit(wb.getReference().intValue()) == 2
+					&& wb.getCount() >= (wb.getReference() * 1.5)) {
+				return true;
+			} else if (getFirstDigit(wb.getReference().intValue()) == 3
+					&& wb.getCount() >= (wb.getReference() * 1.4)) {
+				return true;
+			} else if (getFirstDigit(wb.getReference().intValue()) == 4
+					&& wb.getCount() >= (wb.getReference() * 1.3)) {
+				return true;
+			} else if (getFirstDigit(wb.getReference().intValue()) == 5
+					&& wb.getCount() >= (wb.getReference() * 1.3)) {
+				return true;
+			} else if (getFirstDigit(wb.getReference().intValue()) == 6
+					&& wb.getCount() >= (wb.getReference() * 1.3)) {
+				return true;
+			} else if (getFirstDigit(wb.getReference().intValue()) == 7
+					&& wb.getCount() >= (wb.getReference() * 1.3)) {
+				return true;
+			} else if (getFirstDigit(wb.getReference().intValue()) == 8
+					&& wb.getCount() >= (wb.getReference() * 1.3)) {
+				return true;
+			} else if (getFirstDigit(wb.getReference().intValue()) == 9
+					&& wb.getCount() >= (wb.getReference() * 1.3)) {
+				return true;
+			} else {
+				return false;
+			}
+		} else {
+			if (getFirstDigit(wb.getReference().intValue()) == 1
+					&& wb.getCount() >= (wb.getReference() * 1.9)) {
+				return true;
+			} else if (getFirstDigit(wb.getReference().intValue()) == 2
+					&& wb.getCount() >= (wb.getReference() * 1.5)) {
+				return true;
+			} else if (getFirstDigit(wb.getReference().intValue()) == 3
+					&& wb.getCount() >= (wb.getReference() * 1.4)) {
+				return true;
+			} else if (getFirstDigit(wb.getReference().intValue()) == 4
+					&& wb.getCount() >= (wb.getReference() * 1.3)) {
+				return true;
+			} else if (getFirstDigit(wb.getReference().intValue()) == 5
+					&& wb.getCount() >= (wb.getReference() * 1.2)) {
+				return true;
+			} else if (getFirstDigit(wb.getReference().intValue()) == 6
+					&& wb.getCount() >= (wb.getReference() * 1.2)) {
+				return true;
+			} else if (getFirstDigit(wb.getReference().intValue()) == 7
+					&& wb.getCount() >= (wb.getReference() * 1.2)) {
+				return true;
+			} else if (getFirstDigit(wb.getReference().intValue()) == 8
+					&& wb.getCount() >= (wb.getReference() * 1.2)) {
+				return true;
+			} else if (getFirstDigit(wb.getReference().intValue()) == 9
+					&& wb.getCount() >= (wb.getReference() * 1.2)) {
+				return true;
+			} else {
+				return false;
+			}
+		}
+
+	}
+
+	private int getFirstDigit(int number) {
+
+		number = Math.abs(number);
+
+		if (number < 10) {
+
+			return number;
+		}
+		return getFirstDigit((number - (number % 10)) / 10);
+
+	}
+}

src/main/java/com/gyee/frame/service/ProjectPlanService.java

@@ -10,9 +10,9 @@ import com.gyee.frame.model.auto.ProjectPlanExample;
 import com.gyee.frame.model.custom.ProjectPlanVo;
 import com.gyee.frame.util.SnowflakeIdWorker;
 import com.gyee.frame.util.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

src/main/java/com/gyee/frame/service/RecommenmainMsSqlService.java

@@ -9,7 +9,7 @@ import com.gyee.frame.model.auto.RecommenmainMsSql;
 import com.gyee.frame.model.auto.RecommenmainMsSqlExample;
 import com.gyee.frame.model.custom.WoBugEqVo;
 import com.gyee.frame.util.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;

src/main/java/com/gyee/frame/service/RecommenmainService.java

@@ -6,7 +6,7 @@ import com.gyee.frame.mapper.auto.RecommenmainMapper;
 import com.gyee.frame.model.auto.Recommenmain;
 import com.gyee.frame.model.auto.RecommenmainExample;
 import com.gyee.frame.util.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;

src/main/java/com/gyee/frame/service/ShbrUserService.java

@@ -6,7 +6,7 @@ import com.gyee.frame.mapper.auto.ShbrUserMapper;
 import com.gyee.frame.model.auto.ShbrUser;
 import com.gyee.frame.model.auto.ShbrUserExample;
 import com.gyee.frame.util.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

src/main/java/com/gyee/frame/service/ShbraceletPointkeyService.java

@@ -6,7 +6,7 @@ import com.gyee.frame.mapper.auto.ShbraceletPointkeyMapper;
 import com.gyee.frame.model.auto.ShbraceletPointkey;
 import com.gyee.frame.model.auto.ShbraceletPointkeyExample;
 import com.gyee.frame.util.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;

src/main/java/com/gyee/frame/service/ShbraceletUserService.java

@@ -6,7 +6,7 @@ import com.gyee.frame.mapper.auto.ShbraceletUserMapper;
 import com.gyee.frame.model.auto.ShbraceletUser;
 import com.gyee.frame.model.auto.ShbraceletUserExample;
 import com.gyee.frame.util.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

src/main/java/com/gyee/frame/service/Shutdownevent2Service.java

@@ -11,7 +11,7 @@ import com.gyee.frame.model.custom.ShutdowneventVo;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.util.SnowflakeIdWorker;
 import com.gyee.frame.util.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;

src/main/java/com/gyee/frame/service/ShutdowneventService.java

@@ -9,7 +9,7 @@ import com.gyee.frame.model.auto.ShutdowneventExample;
 import com.gyee.frame.model.custom.ShutdowneventVo;
 import com.gyee.frame.util.SnowflakeIdWorker;
 import com.gyee.frame.util.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;

src/main/java/com/gyee/frame/service/SysAreaService.java

@@ -2,7 +2,7 @@ package com.gyee.frame.service;
 
 import java.util.Arrays;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;

src/main/java/com/gyee/frame/service/SysCityService.java

@@ -2,7 +2,7 @@ package com.gyee.frame.service;
 
 import java.util.Arrays;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;

src/main/java/com/gyee/frame/service/SysDatasService.java

@@ -2,7 +2,7 @@ package com.gyee.frame.service;
 
 import java.io.IOException;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import com.gyee.frame.common.base.BaseService;

src/main/java/com/gyee/frame/service/SysDepartmentService.java

@@ -1,13 +1,8 @@
 package com.gyee.frame.service;
 
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Arrays;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import cn.hutool.core.util.StrUtil;
 import com.gyee.frame.common.base.BaseService;
 import com.gyee.frame.common.support.ConvertUtil;
 import com.gyee.frame.mapper.auto.SysDepartmentMapper;
@@ -16,6 +11,12 @@ import com.gyee.frame.model.auto.SysDepartmentExample;
 import com.gyee.frame.model.custom.BootstrapTree;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * 部门表 SysDepartmentService
@@ -56,7 +57,7 @@ public class SysDepartmentService implements BaseService<SysDepartment, SysDepar
 
 	public List<SysDepartment> list2(String searchText) {
 		SysDepartmentExample testExample = new SysDepartmentExample();
-		testExample.setOrderByClause("order_num  is null  ASC,order_num  ASC");
+		testExample.setOrderByClause("order_num   ASC,order_num  ASC");
 		if (searchText != null && !"".equals(searchText)) {
 			testExample.createCriteria().andDeptNameLike("%" + searchText + "%");
 		}

src/main/java/com/gyee/frame/service/SysDictDataService.java

@@ -1,22 +1,22 @@
 package com.gyee.frame.service;
 
-import java.util.Date;
-import java.util.List;
-
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.gyee.frame.common.base.BaseService;
 import com.gyee.frame.common.support.ConvertUtil;
 import com.gyee.frame.mapper.auto.TSysDictDataMapper;
 import com.gyee.frame.mapper.auto.TSysDictTypeMapper;
 import com.gyee.frame.model.auto.TSysDictData;
 import com.gyee.frame.model.auto.TSysDictDataExample;
 import com.gyee.frame.model.auto.TSysDictType;
-import com.gyee.frame.shiro.util.ShiroUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.gyee.frame.common.base.BaseService;
 import com.gyee.frame.model.custom.Tablepar;
+import com.gyee.frame.shiro.util.ShiroUtils;
 import com.gyee.frame.util.SnowflakeIdWorker;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 字典数据表Service