健康管理区间曲线查询等接口开发

pom.xml

@@ -333,16 +333,16 @@
 					<configurationFile>src/main/resources/mybatis-generator.xml</configurationFile>
 				</configuration>
 				<dependencies>
-<!--					<dependency>-->
-<!--						<groupId>mysql</groupId>-->
-<!--						<artifactId>mysql-connector-java</artifactId>-->
-<!--						<version>${mysql.version}</version>-->
-<!--					</dependency>-->
-			<dependency>
-                <groupId>com.oracle</groupId>
-                <artifactId>ojdbc6</artifactId>
-                <version>11.2.0.3</version>
-            </dependency>
+					<dependency>
+						<groupId>mysql</groupId>
+						<artifactId>mysql-connector-java</artifactId>
+						<version>${mysql.version}</version>
+					</dependency>
+<!--			<dependency>-->
+<!--                <groupId>com.oracle</groupId>-->
+<!--                <artifactId>ojdbc6</artifactId>-->
+<!--                <version>11.2.0.3</version>-->
+<!--            </dependency>-->
 
 <!--					<dependency>-->
 <!--					<groupId>com.microsoft.sqlserver</groupId>-->

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

@@ -25,46 +25,46 @@ import java.util.Date;
 public class BaseController
 {
 	//系统用户
-	@Autowired
+	@Resource
 	public SysUserService sysUserService; 
 	
 	//系统角色
-	@Autowired
+	@Resource
 	public SysRoleService sysRoleService; 
 	
 	//权限
-	@Autowired
+	@Resource
 	public SysPermissionService sysPermissionService;
 
 
     //VUE系统角色
-    @Autowired
+    @Resource
     public VueRoleService vueRoleService;
 
     //VUE权限
-    @Autowired
+    @Resource
     public VuePermissionService vuePermissionService;
 	//文件上传
-	@Autowired
+	@Resource
 	public SysFileService sysFileService;
 	
 	//文件存储
-	@Autowired
+	@Resource
 	public SysDatasService sysDatasService;
 	
 	//文件存储管理表
-	@Autowired
+	@Resource
 	public SysFileDatasService sysFileDatasService;
 	
 	//日志操作
-	@Autowired
+	@Resource
 	public SysOperLogService sysOperLogService;
 	//公告
-	@Autowired
+	@Resource
 	public SysNoticeService sysNoticeService;
 
 	/*文件上传云库*/
-    @Autowired
+    @Resource
     public QiNiuCloudService qiNiuCloudService;
     /**
      * 将前台传递过来的日期格式的字符串，自动转化为Date类型

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

@@ -26,7 +26,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 public class Swagger  implements WebMvcConfigurer {
 
 
-	@Autowired
+	@Resource
 	private V2Config v2Config;
 
 	@Bean

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

@@ -38,10 +38,22 @@ public class V2Config
     private static Boolean rollVerification;
     /** 实时数据库 **/
     private  static String realtimedataBase;
+    /**数据适配器网址 **/
     private static String baseurl;
+    /** swaggerip指定IP **/
     private  static  String swaggerip;
+    /** 小数位数 **/
+    private  static  Integer digit;
 
-    public   String getSwaggerip() {
+    public static  Integer getDigit() {
+        return digit;
+    }
+
+    public  void setDigit(Integer digit) {
+        this.digit = digit;
+    }
+
+    public  static String getSwaggerip() {
         return swaggerip;
     }
 

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

@@ -36,7 +36,7 @@ public class LogAspect
 {
     private static final Logger log = LoggerFactory.getLogger(LogAspect.class);
 
-    @Autowired
+    @Resource
     private SysOperLogService operLogService;
 
     // 配置织入点

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

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

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

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
 
 @Component("braceletPushTask")
 public class BraceletPushTask {
-    @Autowired
+    @Resource
     private BraceletService braceletService;
 
 

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

@@ -16,7 +16,7 @@ import com.gyee.frame.model.auto.TsysUserExample;
  */
 @Component("v2Task")
 public class V2Task {
-	@Autowired
+	@Resource
 	private TsysUserMapper tsysUserMapper;
     /**
      * 无参的任务

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

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
 
 @Component("wtTestTask")
 public class WtTestTask {
-    @Autowired
+    @Resource
     private BraceletService braceletService;
 
 

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

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Component;
 public class WebsocketMessageService
 {
 
-    @Autowired
+    @Resource
     private SimpMessagingTemplate simpMessagingTemplate;
 
 

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

@@ -14,7 +14,7 @@ import java.util.Map;
 @RequestMapping("/FanStatusQueryExport")
 public class FanStatusQueryExportController {
 
-    @Autowired
+    @Resource
     FanStatusQueryExportService fanStatusQueryExportService;
 
     //获取所有风机

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

@@ -23,7 +23,7 @@ public class StandardPointTableController {
 
     List<Map<String,Object>> unionData= new ArrayList<>();
 
-    @Autowired
+    @Resource
     private StandardPointTableService standardPointTableService;
 
     /**

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

@@ -40,11 +40,11 @@ import org.springframework.web.bind.annotation.ResponseBody;
 public class AutoCodeController extends BaseController {
 
 	private String prefix = "admin/auto_code";
-	@Autowired
+	@Resource
 	private GeneratorService generatorService;
-	@Autowired
+	@Resource
 	private SysUtilService sysUtilService;
-	@Autowired
+	@Resource
 	private SysPermissionService sysPermissionService;
 
 	/**

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

@@ -35,10 +35,10 @@ import com.google.code.kaptcha.Producer;
 @RequestMapping("/captcha")
 public class CaptchaController extends BaseController
 {
-	@Autowired
+	@Resource
     private Producer captchaProducer;
     
-    @Autowired
+    @Resource
     private Producer captchaProducerMath;
 
     /**

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

@@ -35,9 +35,9 @@ import io.swagger.annotations.ApiOperation;
 public class DictDataController extends BaseController{
 	
 	private String prefix = "admin/dict_data";
-	@Autowired
+	@Resource
 	private SysDictDataService tSysDictDataService;
-	@Autowired
+	@Resource
 	private SysDictTypeService sysDictTypeService;
 	
 	/**

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

@@ -33,7 +33,7 @@ import io.swagger.annotations.ApiOperation;
 public class DictTypeController extends BaseController{
 	
 	private String prefix = "admin/dict_type";
-	@Autowired
+	@Resource
 	private SysDictTypeService tSysDictTypeService;
 	
 	/**

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

@@ -38,7 +38,7 @@ public class EmailController extends BaseController{
 		
 	private String prefix = "admin/email";
 	
-	@Autowired
+	@Resource
 	private TSysEmailService tSysEmailService;
 	
 	/**

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

@@ -34,14 +34,14 @@ import io.swagger.annotations.ApiOperation;
 @Controller
 @RequestMapping("/ProvinceLinkageController")
 public class ProvinceLinkageController  extends BaseController{
-	@Autowired
+	@Resource
 	private SysProvinceService sysProvinceService;
-	@Autowired
+	@Resource
 	private SysCityService sysCityService;
-	@Autowired
+	@Resource
 	private SysAreaService sysAreaService;
 	
-	@Autowired
+	@Resource
 	private SysStreetService sysStreetService;
 	
 	private String prefix = "admin/province";

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

@@ -26,7 +26,7 @@ import java.io.IOException;
 @RequestMapping("/QiNiuCloudController")
 public class QiNiuCloudController extends BaseController {
 
-    @Autowired
+    @Resource
     private QiNiuCloudService qiNiuCloudService;
 
     //跳转页面参数

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

@@ -33,7 +33,7 @@ import io.swagger.annotations.ApiOperation;
 public class QuartzJobController extends BaseController{
 	
 	private String prefix = "admin/sysQuartzJob";
-	@Autowired
+	@Resource
 	private SysQuartzJobService sysQuartzJobService;
 	
 	/**

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

@@ -32,7 +32,7 @@ import io.swagger.annotations.ApiOperation;
 public class QuartzJobLogController extends BaseController{
 	
 	private String prefix = "admin/sysQuartzJobLog";
-	@Autowired
+	@Resource
 	private SysQuartzJobLogService sysQuartzJobLogService;
 	
 	/**

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

@@ -32,7 +32,7 @@ import io.swagger.annotations.ApiOperation;
 public class SysAreaController extends BaseController{
 	
 	private String prefix = "admin/province/sysArea";
-	@Autowired
+	@Resource
 	private SysAreaService sysAreaService;
 	
 	/**

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

@@ -32,7 +32,7 @@ import io.swagger.annotations.ApiOperation;
 public class SysCityController extends BaseController{
 	
 	private String prefix = "admin/province/sysCity";
-	@Autowired
+	@Resource
 	private SysCityService sysCityService;
 	
 	/**

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

@@ -27,7 +27,7 @@ import io.swagger.annotations.ApiOperation;
 public class SysDepartmentController extends BaseController{
 	
 	private String prefix = "admin/sysDepartment";
-	@Autowired
+	@Resource
 	private SysDepartmentService sysDepartmentService;
 	
 	/**

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

@@ -34,7 +34,7 @@ import io.swagger.annotations.ApiOperation;
 public class SysNoticeController extends BaseController{
 	
 	private String prefix = "admin/sysNotice";
-	@Autowired
+	@Resource
 	private SysNoticeService sysNoticeService;
 	
 	

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

@@ -26,7 +26,7 @@ import io.swagger.annotations.ApiOperation;
 public class SysPositionController extends BaseController{
 	
 	private String prefix = "admin/sysPosition";
-	@Autowired
+	@Resource
 	private SysPositionService sysPositionService;
 	
 	/**

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

@@ -32,7 +32,7 @@ import io.swagger.annotations.ApiOperation;
 public class SysProvinceController extends BaseController{
 	
 	private String prefix = "admin/province/sysProvince";
-	@Autowired
+	@Resource
 	private SysProvinceService sysProvinceService;
 	/**
 	 * 展示页面跳转

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

@@ -32,7 +32,7 @@ import io.swagger.annotations.ApiOperation;
 public class SysStreetController extends BaseController{
 	
 	private String prefix = "admin/province/sysStreet";
-	@Autowired
+	@Resource
 	private SysStreetService sysStreetService;
 	
 	/**

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

@@ -24,7 +24,7 @@ import java.util.List;
 @Controller
 @RequestMapping("/gyee-query/area")
 public class TestController {
-    @Autowired
+    @Resource
     private SysAreaService sysAreaService;
 
     @ApiOperation(value = "列表", notes = "区域列表")

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

@@ -26,7 +26,7 @@ import io.swagger.annotations.ApiOperation;
 @Controller
 @RequestMapping("/UeditorController")
 public class UeditorController extends BaseController {
-	@Autowired
+	@Resource
 	private UeditorService ueditorService;
 
 	@ApiOperation(value = "百度编辑器配置", notes = "百度编辑器配置")

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

@@ -45,10 +45,10 @@ public class UserController extends BaseController{
 	
 	private String prefix = "admin/user";
 	//部门
-	@Autowired
+	@Resource
 	private SysDepartmentService departmentService;
 	//岗位
-	@Autowired
+	@Resource
 	private SysPositionService positionService;
 	
 	/**

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

@@ -29,9 +29,9 @@ import java.util.Map;
 @RequestMapping("/benchmarking")
 @Api(value = "等级评估功能")
 public class BenchmarkingController {
-//    @Autowired
+//    @Resource
 //    private Windturbineinfodaytop3Service windturbineinfodaytop2Service;
-    @Autowired
+    @Resource
     private Windturbineinfodaytop2Service windturbineinfodaytop2Service;
     
 

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

@@ -20,7 +20,7 @@ import java.util.Date;
 @RequestMapping("/compare")
 @Api(value = "单机横向对比功能")
 public class CompareController {
-    @Autowired
+    @Resource
     private CompareService compareService;
 
     /**查询日横向对比列表**/

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

@@ -0,0 +1,162 @@
+package com.gyee.frame.controller.health;
+
+import com.gyee.frame.common.conf.AjaxStatus;
+import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.common.spring.Constant;
+import com.gyee.frame.model.auto.WindTurbineTestingPointAi2;
+import com.gyee.frame.model.auto.Windturbinecurvefittingmonth;
+import com.gyee.frame.model.custom.PointData;
+import com.gyee.frame.model.custom.QxpcVo;
+import com.gyee.frame.model.custom.Tablepar;
+import com.gyee.frame.service.CurvefittingsubService;
+import com.gyee.frame.service.WindTurbineTestingPointAiService;
+import com.gyee.frame.service.WindturbinecurvefittingmonthService;
+import com.gyee.frame.util.DateUtils;
+import com.gyee.frame.util.IRealTimeDataBaseUtil;
+import com.gyee.frame.util.StringUtils;
+import com.gyee.frame.util.golden.EdosUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.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.text.DecimalFormat;
+import java.util.*;
+
+@Controller
+@RequestMapping("/wtcurve")
+@Api(value = "单机区间曲线偏差率")
+public class WindTurbineCurveController {
+
+    @Resource
+    private CurvefittingsubService curvefittingsubService;
+    @Resource
+    private WindturbinecurvefittingmonthService windturbinecurvefittingmonthService;
+
+    @Resource
+    private WindTurbineTestingPointAiService windTurbineTestingPointAiService;
+
+
+    IRealTimeDataBaseUtil realApiUtil = new EdosUtil();
+    /**单机区间曲线偏差率**/
+    @PostMapping("/windTurbineCurveList")
+    @ResponseBody
+    @ApiOperation(value = "单机区间曲线偏差率", notes = "单机区间曲线偏差率")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablwtIdepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult windTurbineCurveList(Tablepar tablepar, String wpId, String recorddate) throws Exception {
+
+        List<QxpcVo> vos = new ArrayList<QxpcVo>();
+        if (StringUtils.notEmp(wpId) && StringUtils.notEmp(recorddate))
+        {
+            Date date= DateUtils.parseDate(recorddate);
+            vos=curvefittingsubService.getCurvefittingsubList(tablepar, wpId, date);
+        }
+
+        if (null!=vos) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+        }
+
+    }
+
+    /**
+     * @throws
+     * @Title: scatterWtByDayAjax
+     * @Description: 获得选择风机、年份、月份相关散点图
+     */
+    @PostMapping("/scatterWtByDayAjax")
+    @ResponseBody
+    @ApiOperation(value = "获得选择风机、年份、月份相关散点图", notes = "获得选择风机、年份、月份相关散点图")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult scatterWtByDayAjax(String wtId, String recorddate) throws Exception {
+
+        Map<String, List<List<Double>>> result = new HashMap<String, List<List<Double>>>();
+        if (StringUtils.notEmp(recorddate)) {
+
+
+            Date date = DateUtils.parseDate(recorddate);
+            Calendar cal = Calendar.getInstance();
+            cal.setTime(date);
+            cal.set(Calendar.HOUR_OF_DAY, 0);
+            cal.set(Calendar.MINUTE, 0);
+            cal.set(Calendar.SECOND, 0);
+            Date endDate = cal.getTime();
+            cal.add(Calendar.DAY_OF_MONTH, -7);
+            Date beginDate = cal.getTime();
+
+
+            WindTurbineTestingPointAi2 gl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.TPOINT_WT_FJGL);
+            int daynum = DateUtils.daysDiff(beginDate, endDate);
+            long pried = 300;
+            long count = 12 * 24 * daynum;
+            DecimalFormat dcmFmt = new DecimalFormat("0.00");
+            List<PointData> gls = realApiUtil.getHistoryDatasSnap(gl, beginDate.getTime() / 1000, endDate.getTime() / 1000, count, pried);
+            WindTurbineTestingPointAi2 fs = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.TPOINT_WT_FJSSFS);
+            List<PointData> fss = realApiUtil.getHistoryDatasSnap(fs, beginDate.getTime() / 1000, endDate.getTime() / 1000, count, pried);
+
+            List<List<Double>> vos = new ArrayList<List<Double>>();
+            if (!gls.isEmpty() && !fss.isEmpty()) {
+                for (int i = 0; i < fss.size(); i++) {
+
+                    List<Double> ds = new ArrayList<Double>();
+
+                    double f = fss.get(i).getPointValueInDouble();
+                    ds.add(Double.valueOf(dcmFmt.format(f)));
+                    f = gls.get(i).getPointValueInDouble();
+                    ds.add(Double.valueOf(dcmFmt.format(f)));
+                    vos.add(ds);
+                }
+            }
+
+            cal = Calendar.getInstance();
+            cal.setTime(date);
+            List<List<Double>> vos2 = new ArrayList<List<Double>>();
+
+            int year = cal.get(Calendar.YEAR);
+            int month = cal.get(Calendar.MONTH) + 1;
+
+            List<Windturbinecurvefittingmonth> wcls = windturbinecurvefittingmonthService.getWindturbinecurvefittingmonthList(wtId, String.valueOf(year), String.valueOf(month));
+
+            for (Windturbinecurvefittingmonth wc : wcls) {
+
+                List<Double> ds = new ArrayList<Double>();
+                int c = (int) wc.getSpeed().intValue();
+
+                if (c == wc.getSpeed()) {
+                    ds.add(wc.getSpeed());
+                    ds.add(wc.getOptimalpower());
+                    // vo.setValue1(wc.getSpeed());// 风速
+                    // vo.setValue2(wc.getActualpower());// 实际拟合功率
+                    // vo.setValue3(wc.getOptimalpower());// 最优拟合功率
+                    vos2.add(ds);
+                }
+            }
+
+            result.put("line", vos2);
+
+            result.put("scatter", vos);
+
+
+        }
+        if (null != result) {
+            return AjaxResult.successData(AjaxStatus.success.code, result);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, result);
+        }
+
+    }
+
+}

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

@@ -0,0 +1,54 @@
+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.HealthmodelrecordsVo;
+import com.gyee.frame.service.health.WindTurbineHealthListService;
+import com.gyee.frame.util.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Controller
+@RequestMapping("/wtHealthList")
+@Api(value = "风机健康列表")
+public class WindTurbineHealthListController {
+
+    @Resource
+    private WindTurbineHealthListService windTurbineHealthListService;
+
+    /**风机健康列表**/
+    @PostMapping("/windTurbineHealthList")
+    @ResponseBody
+    @ApiOperation(value = "风机健康列表", notes = "风机健康列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult windTurbineHealthList(String wpId) throws Exception {
+
+        List<HealthmodelrecordsVo> vos = new ArrayList<HealthmodelrecordsVo>();
+        if (StringUtils.notEmp(wpId))
+        {
+            vos=windTurbineHealthListService.windTurbineHealthList(wpId);
+        }
+
+        if (null!=vos) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+        }
+
+    }
+
+
+
+}

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

@@ -28,7 +28,7 @@ import java.util.*;
 @RequestMapping("/leaderboard")
 @Api(value = "排行榜功能")
 public class LeaderboardController {
-    @Autowired
+    @Resource
     private LeaderboardService leaderboardService;
 
     /**查询拟合优度列表**/

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

@@ -26,7 +26,7 @@ import java.util.List;
 @Api(value = "切入切出管理")
 public class OutputSpeedController {
 
-    @Autowired
+    @Resource
     private InputoroutputspeedtotalService inputoroutputspeedtotalService;
 
     /**切入切出列表**/

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

@@ -29,7 +29,7 @@ import java.util.Map;
 @RequestMapping("/powersaturation")
 @Api(value = "总单机饱和度统计")
 public class PowerSaturationAmonutController {
-    @Autowired
+    @Resource
     private WindturbinecurvefittingService windturbinecurvefittingService;
 
     /**总功率饱和列表**/

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

@@ -32,7 +32,7 @@ import java.util.Map;
 @Api(value = "日单机饱和度统计")
 public class PowerSaturationController {
 
-    @Autowired
+    @Resource
     private WindturbinecurvefittingService windturbinecurvefittingService;
 
     /**日功率饱和列表**/

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

@@ -30,7 +30,7 @@ import java.util.Map;
 @Api(value = "月单机饱和度统计")
 public class PowerSaturationMonthController {
 
-    @Autowired
+    @Resource
     private WindturbinecurvefittingmonthService windturbinecurvefittingmonthService;
 
     /**月功率饱和列表**/

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

@@ -23,7 +23,7 @@ import java.util.List;
 @Api(value = "计划发电量")
 public class ProjectPlanController {
 
-    @Autowired
+    @Resource
     private ProjectPlanService projectPlanService;
 
     /**计划发电量列表**/

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

@@ -28,7 +28,7 @@ import java.util.*;
 @Api(value = "健康风机推荐")
 public class RecommenController {
 
-    @Autowired
+    @Resource
     private RecommenService recommenService;
 
     /**

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

@@ -18,12 +18,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.text.DecimalFormat;
 import java.util.*;
 
@@ -32,20 +32,22 @@ import java.util.*;
 @Api(value = "风场、项目、线路功率风速散点图")
 public class ScatterController {
 
-    @Autowired
+    @Resource
     private WindturbinecurvefittingmonthService windturbinecurvefittingmonthService;
 
-    @Autowired
+    @Resource
     private WindPowerstationTestingPointService windPowerstationTestingPointService;
 
-    @Autowired
-    private WindTurbineTestingPointAiService  windTurbineTestingPointAiService;
+    @Resource
+    private WindTurbineTestingPointAiService windTurbineTestingPointAiService;
+
+
     IRealTimeDataBaseUtil realApiUtil = new EdosUtil();
+
     /**
-     *
+     * @throws
      * @Title: scatterAjax
      * @Description: 获得选择场站、项目、线路、年份、月份相关散点图
-     * @throws
      */
     @PostMapping("/scatterAjax")
     @ResponseBody
@@ -57,7 +59,7 @@ public class ScatterController {
             @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult scatterAjax(String wpId, String pjId,String lnId, String year, String month) throws Exception {
+    public AjaxResult scatterAjax(String wpId, String pjId, String lnId, String year, String month) throws Exception {
 
         List<List<Double>> vos = new ArrayList<List<Double>>();
         if (StringUtils.notEmp(year) && StringUtils.notEmp(month)) {
@@ -75,25 +77,25 @@ public class ScatterController {
             Date endDate = cal.getTime();
 
 
-            WindPowerStationTestingPoint2 gl=null;
-            WindPowerStationTestingPoint2 fs=null;
+            WindPowerStationTestingPoint2 gl = null;
+            WindPowerStationTestingPoint2 fs = null;
 
             if (StringUtils.notEmp(wpId)) {
-                gl=windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId,Constant.TPOINT_WP_SJGL);
-                fs=windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId,Constant.TPOINT_WP_SSFS);
+                gl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
+                fs = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
             } else if (StringUtils.notEmp(pjId)) {
-                gl=windPowerstationTestingPointService.getWindPowerStationTestingPoint2(pjId,Constant.TPOINT_WP_SJGL);
-                fs=windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId,Constant.TPOINT_WP_SSFS);
+                gl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(pjId, Constant.TPOINT_WP_SJGL);
+                fs = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
 
             } else if (StringUtils.notEmp(lnId)) {
-                gl=windPowerstationTestingPointService.getWindPowerStationTestingPoint2(lnId,Constant.TPOINT_WP_SJGL);
-                fs=windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId,Constant.TPOINT_WP_SSFS);
+                gl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(lnId, Constant.TPOINT_WP_SJGL);
+                fs = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
             }
 
 
-            int daynum= DateUtils.daysDiff(beginDate, endDate);
-            long pried=60*10;
-            long count=6*24*daynum;
+            int daynum = DateUtils.daysDiff(beginDate, endDate);
+            long pried = 60 * 10;
+            long count = 6 * 24 * daynum;
 
             DecimalFormat dcmFmt = new DecimalFormat("0.00");
             List<PointData> gls = realApiUtil.getHistoryDatasSnap(gl, beginDate.getTime() / 1000, endDate.getTime() / 1000, count, pried);
@@ -116,7 +118,7 @@ public class ScatterController {
 
         }
 
-        if (null!=vos) {
+        if (null != vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
             return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
@@ -125,10 +127,9 @@ public class ScatterController {
     }
 
     /**
-     *
+     * @throws
      * @Title: scatterAjax
      * @Description: 获得选择风机、年份、月份相关散点图
-     * @throws
      */
     @PostMapping("/scatterWtAjax")
     @ResponseBody
@@ -156,14 +157,13 @@ public class ScatterController {
             Date endDate = cal.getTime();
 
 
-
-            WindTurbineTestingPointAi2 gl =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_FJGL);
-            int daynum=DateUtils.daysDiff(beginDate, endDate);
-            long pried=60*10;
-            long count=6*24*daynum;
+            WindTurbineTestingPointAi2 gl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.TPOINT_WT_FJGL);
+            int daynum = DateUtils.daysDiff(beginDate, endDate);
+            long pried = 60 * 10;
+            long count = 6 * 24 * daynum;
             DecimalFormat dcmFmt = new DecimalFormat("0.00");
             List<PointData> gls = realApiUtil.getHistoryDatasSnap(gl, beginDate.getTime() / 1000, endDate.getTime() / 1000, count, pried);
-            WindTurbineTestingPointAi2 fs = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_FJSSFS);
+            WindTurbineTestingPointAi2 fs = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.TPOINT_WT_FJSSFS);
             List<PointData> fss = realApiUtil.getHistoryDatasSnap(fs, beginDate.getTime() / 1000, endDate.getTime() / 1000, count, pried);
 
 
@@ -183,7 +183,7 @@ public class ScatterController {
 
             List<List<Double>> vos2 = new ArrayList<List<Double>>();
 
-            List<Windturbinecurvefittingmonth> wcls = windturbinecurvefittingmonthService.getWindturbinecurvefittingmonthList(wtId,year,month);
+            List<Windturbinecurvefittingmonth> wcls = windturbinecurvefittingmonthService.getWindturbinecurvefittingmonthList(wtId, year, month);
 
             for (Windturbinecurvefittingmonth wc : wcls) {
 
@@ -204,7 +204,7 @@ public class ScatterController {
 
         }
 
-        if (null!=result) {
+        if (null != result) {
             return AjaxResult.successData(AjaxStatus.success.code, result);
         } else {
             return AjaxResult.successData(AjaxStatus.emptyresultset.code, result);
@@ -213,5 +213,4 @@ public class ScatterController {
     }
 
 
-
 }

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

@@ -23,7 +23,7 @@ import java.util.*;
 @Api(value = "单机性能分析")
 public class SingleAnalysisController {
 
-    @Autowired
+    @Resource
     private SingleAnalysisService singleAnalysisService;
 
     /**

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

@@ -2,8 +2,10 @@ package com.gyee.frame.mapper.auto;
 
 import com.gyee.frame.model.auto.Alarmsnap;
 import com.gyee.frame.model.auto.AlarmsnapExample;
+import com.gyee.frame.model.custom.TotalNumVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 public interface AlarmsnapMapper {
@@ -94,4 +96,10 @@ public interface AlarmsnapMapper {
      * @mbg.generated
      */
     int updateByPrimaryKey(Alarmsnap record);
+
+    List<TotalNumVo> getAlarmhistoryList(@Param("tablename") String tablename, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+
+    List<TotalNumVo> findAlertrulefailuresubMap();
+
+
 }

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

@@ -0,0 +1,97 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.Curvefittingsub;
+import com.gyee.frame.model.auto.CurvefittingsubExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface CurvefittingsubMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingsub
+     *
+     * @mbg.generated
+     */
+    long countByExample(CurvefittingsubExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingsub
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(CurvefittingsubExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingsub
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingsub
+     *
+     * @mbg.generated
+     */
+    int insert(Curvefittingsub record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingsub
+     *
+     * @mbg.generated
+     */
+    int insertSelective(Curvefittingsub record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingsub
+     *
+     * @mbg.generated
+     */
+    List<Curvefittingsub> selectByExample(CurvefittingsubExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingsub
+     *
+     * @mbg.generated
+     */
+    Curvefittingsub selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingsub
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") Curvefittingsub record, @Param("example") CurvefittingsubExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingsub
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") Curvefittingsub record, @Param("example") CurvefittingsubExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingsub
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(Curvefittingsub record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingsub
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(Curvefittingsub record);
+}

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

@@ -0,0 +1,344 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Curvefittingsub implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingsub.id
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingsub.windturbineid
+     *
+     * @mbg.generated
+     */
+    private String windturbineid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingsub.monthdeviationrate
+     *
+     * @mbg.generated
+     */
+    private Double monthdeviationrate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingsub.yeardeviationrate
+     *
+     * @mbg.generated
+     */
+    private Double yeardeviationrate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingsub.standarddeviationrate
+     *
+     * @mbg.generated
+     */
+    private Double standarddeviationrate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingsub.recorddate
+     *
+     * @mbg.generated
+     */
+    private Date recorddate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingsub.deviationrate1
+     *
+     * @mbg.generated
+     */
+    private Double deviationrate1;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingsub.deviationrate2
+     *
+     * @mbg.generated
+     */
+    private Double deviationrate2;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingsub.deviationrate3
+     *
+     * @mbg.generated
+     */
+    private Double deviationrate3;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingsub.speed
+     *
+     * @mbg.generated
+     */
+    private Double speed;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table curvefittingsub
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingsub.id
+     *
+     * @return the value of curvefittingsub.id
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingsub.id
+     *
+     * @param id the value for curvefittingsub.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 curvefittingsub.windturbineid
+     *
+     * @return the value of curvefittingsub.windturbineid
+     *
+     * @mbg.generated
+     */
+    public String getWindturbineid() {
+        return windturbineid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingsub.windturbineid
+     *
+     * @param windturbineid the value for curvefittingsub.windturbineid
+     *
+     * @mbg.generated
+     */
+    public void setWindturbineid(String windturbineid) {
+        this.windturbineid = windturbineid == null ? null : windturbineid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingsub.monthdeviationrate
+     *
+     * @return the value of curvefittingsub.monthdeviationrate
+     *
+     * @mbg.generated
+     */
+    public Double getMonthdeviationrate() {
+        return monthdeviationrate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingsub.monthdeviationrate
+     *
+     * @param monthdeviationrate the value for curvefittingsub.monthdeviationrate
+     *
+     * @mbg.generated
+     */
+    public void setMonthdeviationrate(Double monthdeviationrate) {
+        this.monthdeviationrate = monthdeviationrate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingsub.yeardeviationrate
+     *
+     * @return the value of curvefittingsub.yeardeviationrate
+     *
+     * @mbg.generated
+     */
+    public Double getYeardeviationrate() {
+        return yeardeviationrate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingsub.yeardeviationrate
+     *
+     * @param yeardeviationrate the value for curvefittingsub.yeardeviationrate
+     *
+     * @mbg.generated
+     */
+    public void setYeardeviationrate(Double yeardeviationrate) {
+        this.yeardeviationrate = yeardeviationrate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingsub.standarddeviationrate
+     *
+     * @return the value of curvefittingsub.standarddeviationrate
+     *
+     * @mbg.generated
+     */
+    public Double getStandarddeviationrate() {
+        return standarddeviationrate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingsub.standarddeviationrate
+     *
+     * @param standarddeviationrate the value for curvefittingsub.standarddeviationrate
+     *
+     * @mbg.generated
+     */
+    public void setStandarddeviationrate(Double standarddeviationrate) {
+        this.standarddeviationrate = standarddeviationrate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingsub.recorddate
+     *
+     * @return the value of curvefittingsub.recorddate
+     *
+     * @mbg.generated
+     */
+    public Date getRecorddate() {
+        return recorddate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingsub.recorddate
+     *
+     * @param recorddate the value for curvefittingsub.recorddate
+     *
+     * @mbg.generated
+     */
+    public void setRecorddate(Date recorddate) {
+        this.recorddate = recorddate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingsub.deviationrate1
+     *
+     * @return the value of curvefittingsub.deviationrate1
+     *
+     * @mbg.generated
+     */
+    public Double getDeviationrate1() {
+        return deviationrate1;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingsub.deviationrate1
+     *
+     * @param deviationrate1 the value for curvefittingsub.deviationrate1
+     *
+     * @mbg.generated
+     */
+    public void setDeviationrate1(Double deviationrate1) {
+        this.deviationrate1 = deviationrate1;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingsub.deviationrate2
+     *
+     * @return the value of curvefittingsub.deviationrate2
+     *
+     * @mbg.generated
+     */
+    public Double getDeviationrate2() {
+        return deviationrate2;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingsub.deviationrate2
+     *
+     * @param deviationrate2 the value for curvefittingsub.deviationrate2
+     *
+     * @mbg.generated
+     */
+    public void setDeviationrate2(Double deviationrate2) {
+        this.deviationrate2 = deviationrate2;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingsub.deviationrate3
+     *
+     * @return the value of curvefittingsub.deviationrate3
+     *
+     * @mbg.generated
+     */
+    public Double getDeviationrate3() {
+        return deviationrate3;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingsub.deviationrate3
+     *
+     * @param deviationrate3 the value for curvefittingsub.deviationrate3
+     *
+     * @mbg.generated
+     */
+    public void setDeviationrate3(Double deviationrate3) {
+        this.deviationrate3 = deviationrate3;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingsub.speed
+     *
+     * @return the value of curvefittingsub.speed
+     *
+     * @mbg.generated
+     */
+    public Double getSpeed() {
+        return speed;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingsub.speed
+     *
+     * @param speed the value for curvefittingsub.speed
+     *
+     * @mbg.generated
+     */
+    public void setSpeed(Double speed) {
+        this.speed = speed;
+    }
+}

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

@@ -0,0 +1,923 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class CurvefittingsubExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table curvefittingsub
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table curvefittingsub
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table curvefittingsub
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingsub
+     *
+     * @mbg.generated
+     */
+    public CurvefittingsubExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingsub
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingsub
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingsub
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingsub
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingsub
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingsub
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingsub
+     *
+     * @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 curvefittingsub
+     *
+     * @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 curvefittingsub
+     *
+     * @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 curvefittingsub
+     *
+     * @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 curvefittingsub
+     *
+     * @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 andWindturbineidIsNull() {
+            addCriterion("windturbineid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidIsNotNull() {
+            addCriterion("windturbineid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidEqualTo(String value) {
+            addCriterion("windturbineid =", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidNotEqualTo(String value) {
+            addCriterion("windturbineid <>", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidGreaterThan(String value) {
+            addCriterion("windturbineid >", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidGreaterThanOrEqualTo(String value) {
+            addCriterion("windturbineid >=", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidLessThan(String value) {
+            addCriterion("windturbineid <", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidLessThanOrEqualTo(String value) {
+            addCriterion("windturbineid <=", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidLike(String value) {
+            addCriterion("windturbineid like", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidNotLike(String value) {
+            addCriterion("windturbineid not like", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidIn(List<String> values) {
+            addCriterion("windturbineid in", values, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidNotIn(List<String> values) {
+            addCriterion("windturbineid not in", values, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidBetween(String value1, String value2) {
+            addCriterion("windturbineid between", value1, value2, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidNotBetween(String value1, String value2) {
+            addCriterion("windturbineid not between", value1, value2, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateIsNull() {
+            addCriterion("monthdeviationrate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateIsNotNull() {
+            addCriterion("monthdeviationrate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateEqualTo(Double value) {
+            addCriterion("monthdeviationrate =", value, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateNotEqualTo(Double value) {
+            addCriterion("monthdeviationrate <>", value, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateGreaterThan(Double value) {
+            addCriterion("monthdeviationrate >", value, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateGreaterThanOrEqualTo(Double value) {
+            addCriterion("monthdeviationrate >=", value, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateLessThan(Double value) {
+            addCriterion("monthdeviationrate <", value, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateLessThanOrEqualTo(Double value) {
+            addCriterion("monthdeviationrate <=", value, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateIn(List<Double> values) {
+            addCriterion("monthdeviationrate in", values, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateNotIn(List<Double> values) {
+            addCriterion("monthdeviationrate not in", values, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateBetween(Double value1, Double value2) {
+            addCriterion("monthdeviationrate between", value1, value2, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateNotBetween(Double value1, Double value2) {
+            addCriterion("monthdeviationrate not between", value1, value2, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateIsNull() {
+            addCriterion("yeardeviationrate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateIsNotNull() {
+            addCriterion("yeardeviationrate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateEqualTo(Double value) {
+            addCriterion("yeardeviationrate =", value, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateNotEqualTo(Double value) {
+            addCriterion("yeardeviationrate <>", value, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateGreaterThan(Double value) {
+            addCriterion("yeardeviationrate >", value, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateGreaterThanOrEqualTo(Double value) {
+            addCriterion("yeardeviationrate >=", value, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateLessThan(Double value) {
+            addCriterion("yeardeviationrate <", value, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateLessThanOrEqualTo(Double value) {
+            addCriterion("yeardeviationrate <=", value, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateIn(List<Double> values) {
+            addCriterion("yeardeviationrate in", values, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateNotIn(List<Double> values) {
+            addCriterion("yeardeviationrate not in", values, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateBetween(Double value1, Double value2) {
+            addCriterion("yeardeviationrate between", value1, value2, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateNotBetween(Double value1, Double value2) {
+            addCriterion("yeardeviationrate not between", value1, value2, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateIsNull() {
+            addCriterion("standarddeviationrate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateIsNotNull() {
+            addCriterion("standarddeviationrate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateEqualTo(Double value) {
+            addCriterion("standarddeviationrate =", value, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateNotEqualTo(Double value) {
+            addCriterion("standarddeviationrate <>", value, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateGreaterThan(Double value) {
+            addCriterion("standarddeviationrate >", value, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateGreaterThanOrEqualTo(Double value) {
+            addCriterion("standarddeviationrate >=", value, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateLessThan(Double value) {
+            addCriterion("standarddeviationrate <", value, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateLessThanOrEqualTo(Double value) {
+            addCriterion("standarddeviationrate <=", value, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateIn(List<Double> values) {
+            addCriterion("standarddeviationrate in", values, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateNotIn(List<Double> values) {
+            addCriterion("standarddeviationrate not in", values, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateBetween(Double value1, Double value2) {
+            addCriterion("standarddeviationrate between", value1, value2, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateNotBetween(Double value1, Double value2) {
+            addCriterion("standarddeviationrate not between", value1, value2, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateIsNull() {
+            addCriterion("recorddate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateIsNotNull() {
+            addCriterion("recorddate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateEqualTo(Date value) {
+            addCriterion("recorddate =", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateNotEqualTo(Date value) {
+            addCriterion("recorddate <>", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateGreaterThan(Date value) {
+            addCriterion("recorddate >", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateGreaterThanOrEqualTo(Date value) {
+            addCriterion("recorddate >=", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateLessThan(Date value) {
+            addCriterion("recorddate <", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateLessThanOrEqualTo(Date value) {
+            addCriterion("recorddate <=", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateIn(List<Date> values) {
+            addCriterion("recorddate in", values, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateNotIn(List<Date> values) {
+            addCriterion("recorddate not in", values, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateBetween(Date value1, Date value2) {
+            addCriterion("recorddate between", value1, value2, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateNotBetween(Date value1, Date value2) {
+            addCriterion("recorddate not between", value1, value2, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1IsNull() {
+            addCriterion("deviationrate1 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1IsNotNull() {
+            addCriterion("deviationrate1 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1EqualTo(Double value) {
+            addCriterion("deviationrate1 =", value, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1NotEqualTo(Double value) {
+            addCriterion("deviationrate1 <>", value, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1GreaterThan(Double value) {
+            addCriterion("deviationrate1 >", value, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1GreaterThanOrEqualTo(Double value) {
+            addCriterion("deviationrate1 >=", value, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1LessThan(Double value) {
+            addCriterion("deviationrate1 <", value, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1LessThanOrEqualTo(Double value) {
+            addCriterion("deviationrate1 <=", value, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1In(List<Double> values) {
+            addCriterion("deviationrate1 in", values, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1NotIn(List<Double> values) {
+            addCriterion("deviationrate1 not in", values, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1Between(Double value1, Double value2) {
+            addCriterion("deviationrate1 between", value1, value2, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1NotBetween(Double value1, Double value2) {
+            addCriterion("deviationrate1 not between", value1, value2, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2IsNull() {
+            addCriterion("deviationrate2 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2IsNotNull() {
+            addCriterion("deviationrate2 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2EqualTo(Double value) {
+            addCriterion("deviationrate2 =", value, "deviationrate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2NotEqualTo(Double value) {
+            addCriterion("deviationrate2 <>", value, "deviationrate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2GreaterThan(Double value) {
+            addCriterion("deviationrate2 >", value, "deviationrate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2GreaterThanOrEqualTo(Double value) {
+            addCriterion("deviationrate2 >=", value, "deviationrate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2LessThan(Double value) {
+            addCriterion("deviationrate2 <", value, "deviationrate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2LessThanOrEqualTo(Double value) {
+            addCriterion("deviationrate2 <=", value, "deviationrate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2In(List<Double> values) {
+            addCriterion("deviationrate2 in", values, "deviationrate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2NotIn(List<Double> values) {
+            addCriterion("deviationrate2 not in", values, "deviationrate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2Between(Double value1, Double value2) {
+            addCriterion("deviationrate2 between", value1, value2, "deviationrate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2NotBetween(Double value1, Double value2) {
+            addCriterion("deviationrate2 not between", value1, value2, "deviationrate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3IsNull() {
+            addCriterion("deviationrate3 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3IsNotNull() {
+            addCriterion("deviationrate3 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3EqualTo(Double value) {
+            addCriterion("deviationrate3 =", value, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3NotEqualTo(Double value) {
+            addCriterion("deviationrate3 <>", value, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3GreaterThan(Double value) {
+            addCriterion("deviationrate3 >", value, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3GreaterThanOrEqualTo(Double value) {
+            addCriterion("deviationrate3 >=", value, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3LessThan(Double value) {
+            addCriterion("deviationrate3 <", value, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3LessThanOrEqualTo(Double value) {
+            addCriterion("deviationrate3 <=", value, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3In(List<Double> values) {
+            addCriterion("deviationrate3 in", values, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3NotIn(List<Double> values) {
+            addCriterion("deviationrate3 not in", values, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3Between(Double value1, Double value2) {
+            addCriterion("deviationrate3 between", value1, value2, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3NotBetween(Double value1, Double value2) {
+            addCriterion("deviationrate3 not between", value1, value2, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpeedIsNull() {
+            addCriterion("speed is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpeedIsNotNull() {
+            addCriterion("speed is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpeedEqualTo(Double value) {
+            addCriterion("speed =", value, "speed");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpeedNotEqualTo(Double value) {
+            addCriterion("speed <>", value, "speed");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpeedGreaterThan(Double value) {
+            addCriterion("speed >", value, "speed");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpeedGreaterThanOrEqualTo(Double value) {
+            addCriterion("speed >=", value, "speed");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpeedLessThan(Double value) {
+            addCriterion("speed <", value, "speed");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpeedLessThanOrEqualTo(Double value) {
+            addCriterion("speed <=", value, "speed");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpeedIn(List<Double> values) {
+            addCriterion("speed in", values, "speed");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpeedNotIn(List<Double> values) {
+            addCriterion("speed not in", values, "speed");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpeedBetween(Double value1, Double value2) {
+            addCriterion("speed between", value1, value2, "speed");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpeedNotBetween(Double value1, Double value2) {
+            addCriterion("speed not between", value1, value2, "speed");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table curvefittingsub
+     *
+     * @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 curvefittingsub
+     *
+     * @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/HealthmodelrecordsVo.java

@@ -0,0 +1,148 @@
+package com.gyee.frame.model.custom;
+
+import java.util.Date;
+
+public class HealthmodelrecordsVo  implements java.io.Serializable {
+
+    /** 
+    * @Fields serialVersionUID : TODO
+    */ 
+    
+    
+    private static final long serialVersionUID = 1L;
+    
+    private Integer id;
+    private Date recodedate;
+    private String wpid;
+    private String wpname;
+    private String wtid;
+    private String wtname;
+    private String model;       
+    private Double score;
+    private Double zxd;
+    
+    private String clx;
+    private String fdj;
+    private String bj;
+    private String zk;
+    private String ph;
+    private String zz;
+    private String bpq;
+    private String jc;
+    
+    private Integer[] futureHealth;
+    
+    
+
+    public Integer[] getFutureHealth() {
+        return futureHealth;
+    }
+    public void setFutureHealth(Integer[] futureHealth) {
+        this.futureHealth = futureHealth;
+    }
+    public Integer getId() {
+        return id;
+    }
+    public void setId(Integer id) {
+        this.id = id;
+    }
+    public Date getRecodedate() {
+        return recodedate;
+    }
+    public void setRecodedate(Date recodedate) {
+        this.recodedate = recodedate;
+    }
+    public String getWpid() {
+        return wpid;
+    }
+    public void setWpid(String wpid) {
+        this.wpid = wpid;
+    }
+    public String getWpname() {
+        return wpname;
+    }
+    public void setWpname(String wpname) {
+        this.wpname = wpname;
+    }
+    public String getWtid() {
+        return wtid;
+    }
+    public void setWtid(String wtid) {
+        this.wtid = wtid;
+    }
+    public String getWtname() {
+        return wtname;
+    }
+    public void setWtname(String wtname) {
+        this.wtname = wtname;
+    }
+    public String getModel() {
+        return model;
+    }
+    public void setModel(String model) {
+        this.model = model;
+    }
+    public Double getScore() {
+        return score;
+    }
+    public void setScore(Double score) {
+        this.score = score;
+    }
+    public String getClx() {
+        return clx;
+    }
+    public void setClx(String clx) {
+        this.clx = clx;
+    }
+    public String getFdj() {
+        return fdj;
+    }
+    public void setFdj(String fdj) {
+        this.fdj = fdj;
+    }
+    public String getBj() {
+        return bj;
+    }
+    public void setBj(String bj) {
+        this.bj = bj;
+    }
+    public String getZk() {
+        return zk;
+    }
+    public void setZk(String zk) {
+        this.zk = zk;
+    }
+    public String getPh() {
+        return ph;
+    }
+    public void setPh(String ph) {
+        this.ph = ph;
+    }
+    public String getZz() {
+        return zz;
+    }
+    public void setZz(String zz) {
+        this.zz = zz;
+    }
+    public String getBpq() {
+        return bpq;
+    }
+    public void setBpq(String bpq) {
+        this.bpq = bpq;
+    }
+    public String getJc() {
+        return jc;
+    }
+    public void setJc(String jc) {
+        this.jc = jc;
+    }
+    public Double getZxd() {
+        return zxd;
+    }
+    public void setZxd(Double zxd) {
+        this.zxd = zxd;
+    }
+    
+    
+
+}

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

@@ -0,0 +1,46 @@
+package com.gyee.frame.model.custom;
+
+public class QxpcVo {
+
+	private String wtId;
+	private String rd;
+    private Double qxpc1;
+    private Double qxpc2;
+    private Double qxpc3;
+    
+    
+	public String getWtId() {
+		return wtId;
+	}
+	public void setWtId(String wtId) {
+		this.wtId = wtId;
+	}
+
+	public String getRd() {
+		return rd;
+	}
+	public void setRd(String rd) {
+		this.rd = rd;
+	}
+	public Double getQxpc1() {
+		return qxpc1;
+	}
+	public void setQxpc1(Double qxpc1) {
+		this.qxpc1 = qxpc1;
+	}
+	public Double getQxpc2() {
+		return qxpc2;
+	}
+	public void setQxpc2(Double qxpc2) {
+		this.qxpc2 = qxpc2;
+	}
+	public Double getQxpc3() {
+		return qxpc3;
+	}
+	public void setQxpc3(Double qxpc3) {
+		this.qxpc3 = qxpc3;
+	}
+    
+    
+
+}

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

@@ -0,0 +1,35 @@
+package com.gyee.frame.model.custom;
+
+import java.io.Serializable;
+
+public class TotalNumVo  implements Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	
+	private String wtId;
+	private String typeId;
+	private Integer number;
+	public String getWtId() {
+		return wtId;
+	}
+	public void setWtId(String wtId) {
+		this.wtId = wtId;
+	}
+	public Integer getNumber() {
+		return number;
+	}
+	public void setNumber(Integer number) {
+		this.number = number;
+	}
+	public String getTypeId() {
+		return typeId;
+	}
+	public void setTypeId(String typeId) {
+		this.typeId = typeId;
+	}
+	
+	
+}

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

@@ -17,7 +17,7 @@ import java.util.*;
 
 @Service
 public class ActivePowerDataService implements BaseService<ActivePowerData, ActivePowerDataExample> {
-	@Autowired
+	@Resource
 	private ActivePowerDataMapper activePowerDataMapper;
 	
 

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

@@ -19,7 +19,7 @@ import java.util.List;
 
 @Service
 public class Brownoutsevent2Service implements BaseService<Brownoutsevent2, Brownoutsevent2Example> {
-	@Autowired
+	@Resource
 	private Brownoutsevent2Mapper brownoutsevent2Mapper;
 	
 

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

@@ -17,7 +17,7 @@ import java.util.*;
 
 @Service
 public class CurvefittingmainService implements BaseService<Curvefittingmain, CurvefittingmainExample> {
-	@Autowired
+	@Resource
 	private CurvefittingmainMapper curvefittingmainMapper;
 	
 

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

@@ -8,15 +8,18 @@ import com.gyee.frame.model.auto.CurvefittingmonthmainExample;
 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 java.util.*;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
 
 
 @Service
 public class CurvefittingmonthmainService implements BaseService<Curvefittingmonthmain, CurvefittingmonthmainExample> {
-	@Autowired
+	@Resource
 	private CurvefittingmonthmainMapper curvefittingmonthmainMapper;
 	
 

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

@@ -0,0 +1,228 @@
+package com.gyee.frame.service;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.conf.V2Config;
+import com.gyee.frame.common.spring.InitialRunner;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.CurvefittingsubMapper;
+import com.gyee.frame.model.auto.Curvefittingsub;
+import com.gyee.frame.model.auto.CurvefittingsubExample;
+import com.gyee.frame.model.auto.Windturbine;
+import com.gyee.frame.model.custom.QxpcVo;
+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.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+
+@Service
+public class CurvefittingsubService implements BaseService<Curvefittingsub, CurvefittingsubExample> {
+
+	@Resource
+	private CurvefittingsubMapper curvefittingsubMapper;
+	private SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista=Convert.toListStrArray(ids);
+			CurvefittingsubExample example=new CurvefittingsubExample();
+			example.createCriteria().andIdIn(lista);
+			return curvefittingsubMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public Curvefittingsub selectByPrimaryKey(String id) {
+				
+			return curvefittingsubMapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(Curvefittingsub record) {
+		return curvefittingsubMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Curvefittingsub record) {
+				
+		//添加雪花主键id
+		record.setId(SnowflakeIdWorker.getUUID());
+			
+				
+		return curvefittingsubMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(Curvefittingsub record, CurvefittingsubExample example) {
+		
+		return curvefittingsubMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(Curvefittingsub record, CurvefittingsubExample example) {
+		
+		return curvefittingsubMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Curvefittingsub> selectByExample(CurvefittingsubExample example) {
+		
+		return curvefittingsubMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(CurvefittingsubExample example) {
+		
+		return curvefittingsubMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(CurvefittingsubExample example) {
+		
+		return curvefittingsubMapper.deleteByExample(example);
+	}
+
+
+	public Map<String, List<Curvefittingsub>> findCurvefittingmapByDate(Tablepar tablepar,List<String> wtIds, Date recorddate,Double min,Double max)  {
+
+		Map<String, List<Curvefittingsub>> cfvmap=new HashMap<>();
+
+		CurvefittingsubExample example=new CurvefittingsubExample();
+
+		if(StringUtils.isNotEmpty(tablepar.getOrderByColumn()))
+		{
+			StringBuilder sb=new StringBuilder();
+			sb.append(" ").append(tablepar.getOrderByColumn());
+			if(StringUtils.isNotEmpty(tablepar.getIsAsc()))
+			{
+				sb.append(" ").append(tablepar.getIsAsc());
+			}else
+			{
+				sb.append(" asc ");
+			}
+			example.setOrderByClause(String.valueOf(sb));
+		}else {
+			example.setOrderByClause("deviationrate2 ASC");
+		}
+
+		CurvefittingsubExample.Criteria criteria =example.createCriteria();
+
+		criteria.andWindturbineidIn(wtIds);
+
+		Date endDate= DateUtils.addDays(recorddate,1);
+		criteria.andRecorddateGreaterThanOrEqualTo(recorddate).andRecorddateLessThan(endDate);
+
+		criteria.andSpeedGreaterThanOrEqualTo(min);
+		criteria.andSpeedLessThanOrEqualTo(max);
+		List<Curvefittingsub>  cfvls=curvefittingsubMapper.selectByExample(example);
+
+		if (!cfvls.isEmpty()) {
+
+			for (Curvefittingsub cfv : cfvls) {
+
+				if (cfvmap.containsKey(cfv.getWindturbineid())) {
+					List<Curvefittingsub> ls = cfvmap.get(cfv.getWindturbineid());
+					ls.add(cfv);
+					cfvmap.put(cfv.getWindturbineid(), ls);
+				} else {
+					List<Curvefittingsub> ls = new ArrayList<Curvefittingsub>();
+					ls.add(cfv);
+					cfvmap.put(cfv.getWindturbineid(), ls);
+				}
+			}
+		}
+		return cfvmap;
+
+	}
+
+
+	public List<QxpcVo> getCurvefittingsubList(Tablepar tablepar,String wpId, Date recorddate)
+	{
+		List<QxpcVo> vos=new ArrayList<>();
+		if(StringUtils.notEmp(wpId) && StringUtils.notEmp(wpId) && InitialRunner.wp_wtmap.containsKey(wpId))
+		{
+
+			List<String> wtIds=new ArrayList<>();
+			for (Windturbine wt : InitialRunner.wp_wtmap.get(wpId)) {
+				wtIds.add(wt.getId());
+			}
+
+			Map<String, List<Curvefittingsub>> cfmap1 = findCurvefittingmapByDate(tablepar,wtIds,recorddate, 3.0, 5.0);
+			Map<String, List<Curvefittingsub>> cfmap2 = findCurvefittingmapByDate(tablepar,wtIds,recorddate, 5.0, 11.0);
+			Map<String, List<Curvefittingsub>> cfmap3 = findCurvefittingmapByDate(tablepar,wtIds,recorddate, 11.0, 25.0);
+
+			for (Windturbine wt : InitialRunner.wp_wtmap.get(wpId)) {
+				QxpcVo vo = new QxpcVo();
+
+				vo.setWtId(wt.getId());
+				vo.setRd(df.format(recorddate));
+				if (cfmap1.containsKey(wt.getId())) {
+					double qxpc1 = getNuberValue(cfmap1, wt);
+					vo.setQxpc1(qxpc1);
+				} else {
+					vo.setQxpc1(0.0);
+				}
+
+				if (cfmap2.containsKey(wt.getId())) {
+					double qxpc2 = getNuberValue(cfmap2, wt);
+					vo.setQxpc2(qxpc2);
+				} else {
+					vo.setQxpc2(0.0);
+				}
+
+				if (cfmap3.containsKey(wt.getId())) {
+					double qxpc3 = getNuberValue(cfmap3, wt);
+					vo.setQxpc3(qxpc3);
+				} else {
+					vo.setQxpc3(0.0);
+				}
+				vos.add(vo);
+			}
+		}
+
+
+		return vos;
+	}
+
+	private double getNuberValue(Map<String, List<Curvefittingsub>> daymap, Windturbine wt) {
+
+		if (daymap.containsKey(wt.getId())) {
+
+			List<Curvefittingsub> cfsls = daymap.get(wt.getId());
+			if (!cfsls.isEmpty()) {
+
+				double result = 0.0;
+				for (Curvefittingsub sub : cfsls) {
+					double value = null != sub.getDeviationrate2() ? sub.getDeviationrate2() : 0;
+					result = result + value;
+				}
+
+				result = new BigDecimal(result).divide(new BigDecimal(cfsls.size()), V2Config.getDigit(), RoundingMode.HALF_EVEN).doubleValue();
+				return result;
+			}
+
+		}
+		return 0.0;
+	}
+}

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

@@ -12,7 +12,7 @@ import com.gyee.frame.model.auto.TSysDictDataExample;
 
 @Service("dict")
 public class DictService {
-	@Autowired
+	@Resource
 	private TSysDictDataMapper tSysDictDataMapper;
 
 	/**

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

@@ -24,7 +24,7 @@ import java.util.List;
  **/
 @Service
 public class EquipmentSqlService implements BaseService<EquipmentSql, EquipmentSqlExample> {
-	@Autowired
+	@Resource
 	private EquipmentSqlMapper equipmentSqlMapper;
 
 

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

@@ -14,7 +14,7 @@ import java.util.List;
 
 @Service
 public class EquipmentmodelService implements BaseService<Equipmentmodel, EquipmentmodelExample> {
-	@Autowired
+	@Resource
 	private EquipmentmodelMapper equipmentmodelMapper;
 	
 

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

@@ -22,7 +22,7 @@ import cn.hutool.json.JSONUtil;
  */
 @Service
 public class GeneratorService {
-	@Autowired
+	@Resource
 	private GeneratorMapper generatorMapper;
 	/**
 	 * 分页查询

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

@@ -17,7 +17,7 @@ import java.util.List;
 
 @Service
 public class Inputoroutputspeedtotal2Service implements BaseService<Inputoroutputspeedtotal2, Inputoroutputspeedtotal2Example> {
-	@Autowired
+	@Resource
 	private Inputoroutputspeedtotal2Mapper inputoroutputspeedtotal2Mapper;
 	
 

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

@@ -19,7 +19,7 @@ import java.util.List;
 
 @Service
 public class InputoroutputspeedtotalService implements BaseService<Inputoroutputspeedtotal, InputoroutputspeedtotalExample> {
-	@Autowired
+	@Resource
 	private InputoroutputspeedtotalMapper inputoroutputspeedtotalMapper;
 	
 

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

@@ -24,7 +24,7 @@ import java.util.List;
  **/
 @Service
 public class LineService implements BaseService<Line, LineExample> {
-	@Autowired
+	@Resource
 	private LineMapper lineMapper;
 	
       	   	      	      	      	      	      	      	      	      	      	

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

@@ -14,7 +14,7 @@ import java.util.List;
 
 @Service
 public class ManufacturerService implements BaseService<Manufacturer, ManufacturerExample> {
-	@Autowired
+	@Resource
 	private ManufacturerMapper manufacturerMapper;
 	
 

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

@@ -14,7 +14,7 @@ import java.util.List;
 
 @Service
 public class MismapSqlService implements BaseService<MismapSql, MismapSqlExample> {
-	@Autowired
+	@Resource
 	private MismapSqlMapper mismapSqlMapper;
 	
 

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

@@ -14,7 +14,7 @@ import java.util.List;
 
 @Service
 public class ModelPowerService implements BaseService<ModelPower, ModelPowerExample> {
-	@Autowired
+	@Resource
 	private ModelPowerMapper modelPowerMapper;
 	
 

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

@@ -14,7 +14,7 @@ import java.util.*;
 
 @Service
 public class ModelpowerRdService implements BaseService<ModelpowerRd, ModelpowerRdExample> {
-	@Autowired
+	@Resource
 	private ModelpowerRdMapper modelpowerRdMapper;
 	
 

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

@@ -21,7 +21,7 @@ import java.util.TreeMap;
 
 @Service
 public class ProjectPlanService implements BaseService<ProjectPlan, ProjectPlanExample> {
-    @Autowired
+    @Resource
     private ProjectPlanMapper projectPlanMapper;
 
 

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

@@ -27,7 +27,7 @@ import java.util.List;
 @Service
 
 public class RecommenmainMsSqlService implements BaseService<RecommenmainMsSql, RecommenmainMsSqlExample> {
-	@Autowired
+	@Resource
 	private RecommenmainMsSqlMapper recommenmainMsSqlMapper;
 	
 

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

@@ -23,7 +23,7 @@ import java.util.List;
  **/
 @Service
 public class RecommenmainService implements BaseService<Recommenmain, RecommenmainExample> {
-	@Autowired
+	@Resource
 	private RecommenmainMapper recommenmainMapper;
 	
 

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

@@ -14,7 +14,7 @@ import java.util.List;
 
 @Service
 public class ShbrUserService implements BaseService<ShbrUser, ShbrUserExample> {
-	@Autowired
+	@Resource
 	private ShbrUserMapper shbrUserMapper;
 	
 

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

@@ -15,7 +15,7 @@ import java.util.List;
 
 @Service
 public class ShbraceletPointkeyService implements BaseService<ShbraceletPointkey, ShbraceletPointkeyExample> {
-	@Autowired
+	@Resource
 	private ShbraceletPointkeyMapper shbraceletPointkeyMapper;
 	
 

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

@@ -14,7 +14,7 @@ import java.util.List;
 
 @Service
 public class ShbraceletUserService implements BaseService<ShbraceletUser, ShbraceletUserExample> {
-	@Autowired
+	@Resource
 	private ShbraceletUserMapper shbraceletUserMapper;
 	
 

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

@@ -21,7 +21,7 @@ import java.util.List;
 
 @Service
 public class Shutdownevent2Service implements BaseService<Shutdownevent2, Shutdownevent2Example> {
-	@Autowired
+	@Resource
 	private Shutdownevent2Mapper shutdownevent2Mapper;
 	
 

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

@@ -19,7 +19,7 @@ import java.util.List;
 
 @Service
 public class ShutdowneventService implements BaseService<Shutdownevent, ShutdowneventExample> {
-	@Autowired
+	@Resource
 	private ShutdowneventMapper shutdowneventMapper;
 	
 

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

@@ -22,7 +22,7 @@ import com.gyee.frame.model.custom.Tablepar;
  **/
 @Service
 public class SysAreaService {
-	@Autowired
+	@Resource
 	private SysAreaMapper sysAreaMapper;
 	
       	   	      	      	      	      	      	      	      	      	      	      	      	      	

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

@@ -22,7 +22,7 @@ import com.gyee.frame.model.custom.Tablepar;
  **/
 @Service
 public class SysCityService {
-	@Autowired
+	@Resource
 	private SysCityMapper sysCityMapper;
 	
       	   	      	      	      	      	      	      	      	      	      	      	      	      	

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

@@ -22,7 +22,7 @@ import com.github.pagehelper.PageInfo;
 public class SysDatasService implements BaseService<TsysDatas, TsysDatasExample>{
 	
 	
-	@Autowired
+	@Resource
 	private TsysDatasMapper tsysDatasMapper;
 	
 	/**

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

@@ -28,7 +28,7 @@ import com.gyee.frame.util.StringUtils;
  **/
 @Service
 public class SysDepartmentService implements BaseService<SysDepartment, SysDepartmentExample> {
-	@Autowired
+	@Resource
 	private SysDepartmentMapper sysDepartmentMapper;
 
 	/**

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

@@ -28,9 +28,9 @@ import com.gyee.frame.util.SnowflakeIdWorker;
  */
 @Service
 public class SysDictDataService implements BaseService<TSysDictData, TSysDictDataExample>{
-	@Autowired
+	@Resource
 	private TSysDictDataMapper tSysDictDataMapper;
-	@Autowired
+	@Resource
 	private TSysDictTypeMapper tSysDictTypeMapper;
 	/**
 	 * 分页查询

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

@@ -29,9 +29,9 @@ import com.gyee.frame.util.SnowflakeIdWorker;
  */
 @Service
 public class SysDictTypeService implements BaseService<TSysDictType, TSysDictTypeExample>{
-	@Autowired
+	@Resource
 	private TSysDictTypeMapper tSysDictTypeMapper;
-	@Autowired
+	@Resource
 	private TSysDictDataMapper tSysDictDataMapper;
 	
 	/**

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

@@ -16,9 +16,9 @@ import com.gyee.frame.util.SnowflakeIdWorker;
 @Service
 public class SysFileDatasService implements BaseService<TsysFileData, TsysFileDataExample>{
 	
-	@Autowired
+	@Resource
 	private TsysFileDataMapper tsysFileDataMapper;
-	@Autowired
+	@Resource
 	private TsysDatasMapper tsysDatasMapper;
 	
 	@Override

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

@@ -29,16 +29,16 @@ import cn.hutool.core.io.FileUtil;
 public class SysFileService implements BaseService<TsysFile, TsysFileExample>{
 	
 	//文件信息mapper
-	@Autowired
+	@Resource
 	private TsysFileMapper tsysFileMapper;
 	//文件存储关联mapper
-	@Autowired
+	@Resource
 	private TsysFileDataMapper tsysFileDataMapper;
 	//自定义文件dao
-	@Autowired
+	@Resource
 	private TsysDatasDao tsysDatasDao;
 	//文件存储mapper
-	@Autowired
+	@Resource
 	private TsysDatasMapper tsysDatasMapper;
 	
 	

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

@@ -34,13 +34,13 @@ import com.gyee.frame.util.SnowflakeIdWorker;
  **/
 @Service
 public class SysNoticeService implements BaseService<SysNotice, SysNoticeExample>{
-	@Autowired
+	@Resource
 	private SysNoticeMapper sysNoticeMapper;
-	@Autowired
+	@Resource
 	private SysUserService sysUserService;
-	@Autowired
+	@Resource
 	private SysNoticeUserService sysNoticeUserService;
-	@Autowired
+	@Resource
 	private SysNoticeUserMapper sysNoticeUserMapper;
 	/**
 	 * 分页查询

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

@@ -23,7 +23,7 @@ import com.gyee.frame.util.SnowflakeIdWorker;
  **/
 @Service
 public class SysNoticeUserService implements BaseService<SysNoticeUser, SysNoticeUserExample>{
-	@Autowired
+	@Resource
 	private SysNoticeUserMapper sysNoticeUserMapper;
 	   	   	      	      	      	      	
 	/**

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

@@ -17,7 +17,7 @@ import com.github.pagehelper.PageInfo;
 public class SysOperLogService implements BaseService<TsysOperLog, TsysOperLogExample>{
 	
 	//文件mapper
-	@Autowired
+	@Resource
 	private TsysOperLogMapper tsysOperLogMapper;
 	
 	/**

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

@@ -27,14 +27,14 @@ import org.springframework.stereotype.Service;
 public class SysPermissionService implements BaseService<TsysPermission, TsysPermissionExample>{
 	
 	//权限mapper
-	@Autowired
+	@Resource
 	private TsysPermissionMapper tsysPermissionMapper;
 	
 	//权限自定义dao
-	@Autowired
+	@Resource
 	private PermissionDao permissionDao;
 	//权限角色关联表
-	@Autowired
+	@Resource
 	private TsysPermissionRoleMapper permissionRoleMapper;
 	
 	/**

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

@@ -25,7 +25,7 @@ import com.gyee.frame.util.StringUtils;
  **/
 @Service
 public class SysPositionService implements BaseService<SysPosition, SysPositionExample>{
-	@Autowired
+	@Resource
 	private SysPositionMapper sysPositionMapper;
 	
       	   	      	      	      	      	

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

@@ -22,7 +22,7 @@ import com.gyee.frame.model.custom.Tablepar;
  **/
 @Service
 public class SysProvinceService{
-	@Autowired
+	@Resource
 	private SysProvinceMapper sysProvinceMapper;
 	
       	   	      	      	      	      	      	      	      	      	      	      	      	

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

@@ -23,7 +23,7 @@ import com.gyee.frame.util.SnowflakeIdWorker;
  **/
 @Service
 public class SysQuartzJobLogService implements BaseService<SysQuartzJobLog, SysQuartzJobLogExample>{
-	@Autowired
+	@Resource
 	private SysQuartzJobLogMapper sysQuartzJobLogMapper;
 	
       	   	      	      	      	      	      	      	      	      	      	

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

@@ -27,9 +27,9 @@ import com.gyee.frame.util.SnowflakeIdWorker;
  **/
 @Service
 public class SysQuartzJobService implements BaseService<SysQuartzJob, SysQuartzJobExample>{
-	@Autowired
+	@Resource
 	private SysQuartzJobMapper sysQuartzJobMapper;
-	@Autowired
+	@Resource
 	private QuartzSchedulerUtil scheduler;
       	   	      	      	      	      	      	      	      	      	
 	/**

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

@@ -23,13 +23,13 @@ import com.github.pagehelper.PageInfo;
 @Service
 public class SysRoleService implements BaseService<TsysRole, TsysRoleExample> {
 	//角色mapper
-	@Autowired
+	@Resource
 	private TsysRoleMapper tsysRoleMapper;
 	//自定义角色dao
-	@Autowired
+	@Resource
 	private RoleDao roleDao;
 	//自动生成的权限角色映射mapper
-	@Autowired
+	@Resource
 	private TsysPermissionRoleMapper tsysPermissionRoleMapper;
 	
 	

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

@@ -23,7 +23,7 @@ import com.gyee.frame.model.custom.Tablepar;
  **/
 @Service
 public class SysStreetService implements BaseService<SysStreet, SysStreetExample>{
-	@Autowired
+	@Resource
 	private SysStreetMapper sysStreetMapper;
 	
       	   	      	      	      	      	      	      	      	      	      	      	      	      	

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

@@ -36,23 +36,23 @@ import com.github.pagehelper.PageInfo;
 @Service
 public class SysUserService implements BaseService<TsysUser, TsysUserExample>{
 	//生成的用户dao
-	@Autowired
+	@Resource
 	private TsysUserMapper tsysUserMapper;
 	
 	//生成的角色用户dao
-	@Autowired
+	@Resource
 	private TSysRoleUserMapper tSysRoleUserMapper;
 	
 	//自定义角色dao
-	@Autowired
+	@Resource
 	private RoleDao roleDao;
 	
 	//自动生成的角色dao
-	@Autowired
+	@Resource
 	private TsysRoleMapper tsysRoleMapper;
 	
 	//自定义用户dao
-	@Autowired
+	@Resource
 	private TsysUserDao userDao ;
 	
 	/**

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

@@ -11,7 +11,7 @@ import com.gyee.frame.model.custom.SQLAdapter;
 
 @Service
 public class SysUtilService {
-	@Autowired
+	@Resource
 	private SysUtilDao dao;
 	
 	/**

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

@@ -25,7 +25,7 @@ import com.gyee.frame.util.SnowflakeIdWorker;
  */
 @Service
 public class TSysEmailService implements BaseService<TSysEmail, TSysEmailExample>{
-	@Autowired
+	@Resource
 	private TSysEmailMapper tSysEmailMapper;
 	
 	/**

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

@@ -27,14 +27,14 @@ import com.gyee.frame.util.StringUtils;
  */
 @Service
 public class UeditorService {
-	@Autowired
+	@Resource
 	private TsysFileDataMapper tsysFileDataMapper;
 	
 	//文件存储mapper
-	@Autowired
+	@Resource
 	private TsysDatasMapper tsysDatasMapper;
 	//文件信息mapper
-	@Autowired
+	@Resource
 	private TsysFileMapper tsysFileMapper;
 	
     

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

@@ -14,7 +14,7 @@ import java.util.List;
 
 @Service
 public class Warning2Service implements BaseService<Warning2, Warning2Example> {
-	@Autowired
+	@Resource
 	private Warning2Mapper warning2Mapper;
 	
 

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

@@ -14,7 +14,7 @@ import java.util.List;
 
 @Service
 public class WarningClassifyService implements BaseService<WarningClassify, WarningClassifyExample> {
-	@Autowired
+	@Resource
 	private WarningClassifyMapper warningClassifyMapper;