风机接口提交

src/main/java/com/gyee/frame/common/spring/InitialRunner.java

@@ -38,6 +38,15 @@ public class InitialRunner implements CommandLineRunner {
     private WarningService warningService;
     @Resource
     private ModelpowerRdService modelpowerRdService;
+    @Resource
+    private EquipmentmodelService equipmentmodelService;
+    @Resource
+    private WarningClassifyService warningClassifyService;
+    @Resource
+    private ManufacturerService manufacturerService;
+    @Resource
+    private ModelPowerService modelPowerService;
+
 
     public static List<Windpowerstation> wpallls = new ArrayList<Windpowerstation>(); // 风电场LIST集合
     public static List<Windpowerstation> wpls = new ArrayList<Windpowerstation>(); // 风电场LIST集合
@@ -47,6 +56,8 @@ public class InitialRunner implements CommandLineRunner {
 
     public static Map<String, Windpowerstation>  wpmap = new HashMap<String, Windpowerstation>();
     public static Map<String, Warning>  warningmap = new HashMap<String, Warning>();
+    public static Map<String, WarningClassify>  warningClassifymap = new HashMap<String, WarningClassify>();
+    public static Map<String, Manufacturer>  manufacturermap = new HashMap<String, Manufacturer>();
     public static Map<String, Project> pjmap = new HashMap<String, Project>(); // 项目MAP
     public static Map<String, Line> lnmap = new HashMap<String, Line>(); // 线路
     public static Map<String, Windturbine>  wtmap = new HashMap<String, Windturbine>();
@@ -60,6 +71,9 @@ public class InitialRunner implements CommandLineRunner {
     public static Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = new HashMap<String, Map<String, WindPowerStationTestingPoint2>>();//场站测点
     public static Map<String, SysQuartzJob>  jobsmap = new HashMap<String, SysQuartzJob>();
     public static Map<String, Map<Double, Windturbinepowercurvefitting>> wpcmap = new HashMap<String, Map<Double, Windturbinepowercurvefitting>>();
+    public static Map<String, Equipmentmodel> mlmap = new HashMap<String, Equipmentmodel>();// 风电机模型
+    public static Map<String, Map<String, ModelPower>> modelPowermap = new HashMap<String, Map<String, ModelPower>>();// 风电机类型对应功率表
+
 
     @Override
     public void run(String... args) throws Exception {
@@ -165,16 +179,16 @@ public class InitialRunner implements CommandLineRunner {
 //            }
 //        }
 
-//        WarningExample warningExample=new WarningExample();
-//        warningExample.setOrderByClause("id ASC");
-//        List<Warning> warnls= warningService.selectByExample(warningExample);
-//
-//        if(warnls!=null && !warnls.isEmpty()) {
-//            for(int i=0;i<warnls.size();i++){
-//                Warning warning=warnls.get(i);
-//                warningmap.put(warning.getId(),warning);
-//            }
-//        }
+        WarningExample warningExample=new WarningExample();
+        warningExample.setOrderByClause("id ASC");
+        List<Warning> warnls= warningService.selectByExample(warningExample);
+
+        if(warnls!=null && !warnls.isEmpty()) {
+            for(int i=0;i<warnls.size();i++){
+                Warning warning=warnls.get(i);
+                warningmap.put(warning.getId(),warning);
+            }
+        }
             if(wtls!=null && !wtls.isEmpty()){
 
             for(int i=0;i<wtls.size();i++){
@@ -261,6 +275,50 @@ public class InitialRunner implements CommandLineRunner {
 //            }
 //        }
 
+        EquipmentmodelExample example=new EquipmentmodelExample();
+        List<Equipmentmodel> mlls = equipmentmodelService.selectByExample(example);
+        if (!mlls.isEmpty()) {
+            for (Equipmentmodel model : mlls) {
+                mlmap.put(model.getId(), model);
+            }
+        }
+
+        WarningClassifyExample wcexample=new WarningClassifyExample();
+        List<WarningClassify> wcls = warningClassifyService.selectByExample(wcexample);
+        if (!wcls.isEmpty()) {
+            for (WarningClassify model : wcls) {
+                warningClassifymap.put(model.getId(), model);
+            }
+        }
+
+        ManufacturerExample mfexample=new ManufacturerExample();
+        List<Manufacturer> mfls = manufacturerService.selectByExample(mfexample);
+        if (!mfls.isEmpty()) {
+            for (Manufacturer model : mfls) {
+                manufacturermap.put(model.getId(), model);
+            }
+        }
+
+        ModelPowerExample mpexample=new ModelPowerExample();
+        List<ModelPower> mpls = modelPowerService.selectByExample(mpexample);
+        if (!mpls.isEmpty()) {
+
+            Map<String, ModelPower> map = null;
+
+            if(mpls != null && !mpls.isEmpty()){
+                for(ModelPower mp : mpls){
+                    if(modelPowermap.containsKey(mp.getModelid())){
+                        map = modelPowermap.get(mp.getModelid());
+                        map.put(String.valueOf(mp.getSpeed().doubleValue()), mp);
+                    }else{
+                        map = new HashMap<String, ModelPower>();
+                        map.put(String.valueOf(mp.getSpeed().doubleValue()), mp);
+                        modelPowermap.put(mp.getModelid(), map);
+                    }
+                }
+            }
+        }
+
     }
 
 }

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

@@ -2,7 +2,11 @@ package com.gyee.frame.controller.leaderboard;
 
 import com.gyee.frame.common.conf.AjaxStatus;
 import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.model.auto.Curvefittingmain;
+import com.gyee.frame.model.auto.Curvefittingmonthmain;
+import com.gyee.frame.model.auto.Windturbineinfoday3;
 import com.gyee.frame.model.custom.StatisticalAnalysisTopVo;
+import com.gyee.frame.model.custom.StatisticalAnalysisWarningTopVo;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.service.leaderboard.LeaderboardService;
 import com.gyee.frame.util.StringUtils;
@@ -102,7 +106,7 @@ public class LeaderboardController {
     public AjaxResult totalPowerCapacityTopList(Tablepar tablepar, String wpIps, Date beginDate, Date endDate) {
 
 
-        List<StatisticalAnalysisTopVo> vos= leaderboardService.getWindturbineinfo(wpIps, beginDate, endDate);
+        List<StatisticalAnalysisTopVo> vos= leaderboardService.totalPowerCapacityTopList(wpIps, beginDate, endDate);
 
 
         if (tablepar.getOrderByColumn().equals("power")) {
@@ -165,4 +169,280 @@ public class LeaderboardController {
         }
 
     }
+
+
+    /**查询利用率排行榜列表**/
+    @GetMapping("/utilizationList")
+    @ResponseBody
+    public AjaxResult utilizationList(Tablepar tablepar, String wpId, Date beginDate, Date endDate,String type) {
+
+
+        List<Windturbineinfoday3> vos= leaderboardService.utilizationList(tablepar, wpId, beginDate, endDate, type);
+
+
+        if (vos != null && !vos.isEmpty()) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+        }
+
+    }
+
+    /**查询损失率排行榜列表**/
+    @GetMapping("/lossList")
+    @ResponseBody
+    public AjaxResult lossList(Tablepar tablepar, String wpId, Date beginDate, Date endDate,String type) {
+
+
+        List<Windturbineinfoday3> vos= leaderboardService.lossList(tablepar, wpId, beginDate, endDate, type);
+
+
+        if (vos != null && !vos.isEmpty()) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+        }
+
+    }
+
+    /**查询负荷率排行榜列表**/
+    @GetMapping("/loadfactortoplist")
+    @ResponseBody
+    public AjaxResult loadfactortoplist(Tablepar tablepar, String wpId, Date beginDate, Date endDate) {
+
+
+        List<StatisticalAnalysisTopVo> vos= leaderboardService.loadfactortoplist( wpId, beginDate, endDate);
+
+        if (tablepar.getOrderByColumn().equals("power")) {
+            if (tablepar.getIsAsc().equals("asc")) {
+                Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
+                    public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
+                        return arg0.getPower().compareTo(arg1.getPower());
+                    }
+
+                });
+
+            } else {
+                Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
+                    public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
+                        return arg1.getPower().compareTo(arg0.getPower());
+                    }
+
+                });
+            }
+        } else if (tablepar.getOrderByColumn().equals("speed")) {
+            if (tablepar.getIsAsc().equals("asc")) {
+                Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
+                    public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
+                        return arg0.getSpeed().compareTo(arg1.getSpeed());
+                    }
+
+                });
+
+            } else {
+                Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
+                    public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
+                        return arg1.getSpeed().compareTo(arg0.getSpeed());
+                    }
+
+                });
+            }
+        } else if (tablepar.getOrderByColumn().equals("generatingcapacity")) {
+            if (tablepar.getIsAsc().equals("asc")) {
+                Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
+                    public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
+                        return arg0.getSpeed().compareTo(arg1.getSpeed());
+                    }
+
+                });
+
+            } else {
+                Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
+                    public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
+                        return arg1.getSpeed().compareTo(arg0.getSpeed());
+                    }
+
+                });
+            }
+        }
+
+
+        if (vos != null && !vos.isEmpty()) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+        }
+
+    }
+
+    /**查询报警排行榜列表**/
+    @GetMapping("/querywarningStatistical")
+    @ResponseBody
+    public AjaxResult querywarningStatistical(Tablepar tablepar, String type, Date beginDate, Date endDate) {
+
+
+        List<StatisticalAnalysisWarningTopVo> vos= leaderboardService.getWarningTopDate( tablepar, type, beginDate, endDate);
+
+
+        if (vos != null && !vos.isEmpty()) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+        }
+
+    }
+
+    /**查询报警排行榜图表**/
+    @GetMapping("/querywarningStatisticalPie")
+    @ResponseBody
+    public AjaxResult querywarningStatisticalPie(String type,  Date beginDate, Date endDate) {
+
+
+        List<StatisticalAnalysisWarningTopVo> vos= leaderboardService.getWarningTopDatePercentage( type, beginDate, endDate);
+
+
+        if (vos != null && !vos.isEmpty()) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+        }
+
+    }
+/*******************************************************************************************************************************/
+    /**查询日曲线偏差率列表**/
+    @GetMapping("/curvefittingmainList")
+    @ResponseBody
+    public AjaxResult curvefittingmainList(Tablepar tablepar, String wpId, Date recorddate) {
+
+        List<Curvefittingmain> vos= leaderboardService.curvefittingmainList( tablepar, wpId, recorddate);
+
+        if (vos != null && !vos.isEmpty()) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+        }
+    }
+
+    /**查询日曲线（实际/保证 实际/最优 最优/保证）图表**/
+    @GetMapping("/getCurvechatAjax")
+    @ResponseBody
+    public AjaxResult getCurvechatAjax(String type,String wtId,  Date recorddate) {
+
+        Map<String, Object> vos= leaderboardService.getCurvechatAjax( type,wtId, recorddate);
+
+        if (vos != null && !vos.isEmpty()) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+        }
+    }
+
+    /**查询日曲线同比图表**/
+    @GetMapping("/curvechatAjaxtb")
+    @ResponseBody
+    public AjaxResult curvechatAjaxtb(String type,String wtId,  Date recorddate) {
+
+        Map<String, Object> vos= leaderboardService.curvechatAjaxtb( type,wtId, recorddate);
+
+        if (vos != null && !vos.isEmpty()) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+        }
+    }
+    /**查询日曲线环比图表**/
+    @GetMapping("/curvechatAjaxhb")
+    @ResponseBody
+    public AjaxResult curvechatAjaxhb(String type,String wtId,  Date recorddate) {
+
+        Map<String, Object> vos= leaderboardService.curvechatAjaxhb( type,wtId, recorddate);
+
+        if (vos != null && !vos.isEmpty()) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+        }
+    }
+    /**查询日曲线标杆图表**/
+    @GetMapping("/curvechatAjaxbg")
+    @ResponseBody
+    public AjaxResult curvechatAjaxbg(String type,String wtId,  Date recorddate) {
+
+        Map<String, Object> vos= leaderboardService.curvechatAjaxbg( type,wtId, recorddate);
+
+        if (vos != null && !vos.isEmpty()) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+        }
+    }
+
+    /*******************************************************************************************************************************/
+    /**查询月曲线偏差率列表**/
+    @GetMapping("/curvefittingmonthmainList")
+    @ResponseBody
+    public AjaxResult curvefittingmonthmainList(Tablepar tablepar, String wpId, String year,String month) {
+
+        List<Curvefittingmonthmain> vos= leaderboardService.curvefittingmonthmainList( tablepar, wpId, year, month);
+
+        if (vos != null && !vos.isEmpty()) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+        }
+    }
+
+    /**查询月曲线（实际/保证 实际/最优 最优/保证）图表**/
+    @GetMapping("/curveMonthchatAjax")
+    @ResponseBody
+    public AjaxResult curveMonthchatAjax(String type,String wtId,  String year,String month) {
+
+        Map<String, Object> vos= leaderboardService.curveMonthchatAjax( type,wtId, year, month);
+
+        if (vos != null && !vos.isEmpty()) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+        }
+    }
+
+    /**查询月曲线同比图表**/
+    @GetMapping("/curveMonthchatAjaxtb")
+    @ResponseBody
+    public AjaxResult curveMonthchatAjaxtb(String type,String wtId, String year,String month) {
+
+        Map<String, Object> vos= leaderboardService.curveMonthchatAjaxtb( type,wtId, year, month);
+
+        if (vos != null && !vos.isEmpty()) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+        }
+    }
+    /**查询月曲线环比图表**/
+    @GetMapping("/curveMonthchatAjaxhb")
+    @ResponseBody
+    public AjaxResult curveMonthchatAjaxhb(String type,String wtId,  String year,String month) {
+
+        Map<String, Object> vos= leaderboardService.curveMonthchatAjaxhb( type,wtId, year, month);
+
+        if (vos != null && !vos.isEmpty()) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+        }
+    }
+    /**查询月曲线标杆图表**/
+    @GetMapping("/curveMonthchatAjaxbg")
+    @ResponseBody
+    public AjaxResult curveMonthchatAjaxbg(String type,String wtId,  String year,String month) {
+
+        Map<String, Object> vos= leaderboardService.curveMonthchatAjaxbg( type,wtId, year, month);
+
+        if (vos != null && !vos.isEmpty()) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+        }
+    }
 }

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

@@ -119,6 +119,40 @@ public class PowerCompareController {
             return	AjaxResult.successData(AjaxStatus.emptyresultset.code,vos);
         }
     }
+
+    /**
+     * 通过风电场ID获取风机下拉接口
+     * @return
+     */
+    @GetMapping("/windturbineAjax")
+    @ResponseBody
+    @CrossOrigin
+    public AjaxResult windturbineAjax(String wpId) {
+
+        List<StopTypeTreeVo> vos = new ArrayList<StopTypeTreeVo>();
+
+        if (StringUtils.isNotEmpty(wpId) && InitialRunner.wp_wtmap.containsKey(wpId)){
+
+            List<Windturbine> wtls=InitialRunner.wp_wtmap.get(wpId);
+
+            for (Windturbine wt : wtls) {
+                StopTypeTreeVo vo = new StopTypeTreeVo();
+                vo.setId(wt.getId());
+                vo.setName(wt.getName());
+                vo.setpId("0");
+                vos.add(vo);
+            }
+        }
+
+
+        if(vos !=null && !vos.isEmpty())
+        {
+            return	AjaxResult.successData(AjaxStatus.success.code,vos);
+        }else
+        {
+            return	AjaxResult.successData(AjaxStatus.emptyresultset.code,vos);
+        }
+    }
     /**查询风机图表数据结果**/
     @GetMapping("/queryPower")
     @ResponseBody

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

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

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

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

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

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

src/main/java/com/gyee/frame/mapper/auto/WindturbinegoodnessMapper.java.1

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

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

@@ -0,0 +1,442 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class Equipmentmodel implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equipmentmodel.id
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equipmentmodel.code
+     *
+     * @mbg.generated
+     */
+    private String code;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equipmentmodel.name
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equipmentmodel.description
+     *
+     * @mbg.generated
+     */
+    private String description;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equipmentmodel.powerProduction
+     *
+     * @mbg.generated
+     */
+    private Double powerproduction;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equipmentmodel.cutinWindSpeed
+     *
+     * @mbg.generated
+     */
+    private Double cutinwindspeed;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equipmentmodel.ratedWindSpeed
+     *
+     * @mbg.generated
+     */
+    private Double ratedwindspeed;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equipmentmodel.cutoutWindSpeed
+     *
+     * @mbg.generated
+     */
+    private String cutoutwindspeed;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equipmentmodel.windTurbineManufacturerId
+     *
+     * @mbg.generated
+     */
+    private String windturbinemanufacturerid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equipmentmodel.photo
+     *
+     * @mbg.generated
+     */
+    private String photo;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equipmentmodel.unit
+     *
+     * @mbg.generated
+     */
+    private String unit;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equipmentmodel.sweptArea
+     *
+     * @mbg.generated
+     */
+    private Double sweptarea;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equipmentmodel.equipmentCategory
+     *
+     * @mbg.generated
+     */
+    private Integer equipmentcategory;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table equipmentmodel
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column equipmentmodel.id
+     *
+     * @return the value of equipmentmodel.id
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column equipmentmodel.id
+     *
+     * @param id the value for equipmentmodel.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 equipmentmodel.code
+     *
+     * @return the value of equipmentmodel.code
+     *
+     * @mbg.generated
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column equipmentmodel.code
+     *
+     * @param code the value for equipmentmodel.code
+     *
+     * @mbg.generated
+     */
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column equipmentmodel.name
+     *
+     * @return the value of equipmentmodel.name
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column equipmentmodel.name
+     *
+     * @param name the value for equipmentmodel.name
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column equipmentmodel.description
+     *
+     * @return the value of equipmentmodel.description
+     *
+     * @mbg.generated
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column equipmentmodel.description
+     *
+     * @param description the value for equipmentmodel.description
+     *
+     * @mbg.generated
+     */
+    public void setDescription(String description) {
+        this.description = description == null ? null : description.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column equipmentmodel.powerProduction
+     *
+     * @return the value of equipmentmodel.powerProduction
+     *
+     * @mbg.generated
+     */
+    public Double getPowerproduction() {
+        return powerproduction;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column equipmentmodel.powerProduction
+     *
+     * @param powerproduction the value for equipmentmodel.powerProduction
+     *
+     * @mbg.generated
+     */
+    public void setPowerproduction(Double powerproduction) {
+        this.powerproduction = powerproduction;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column equipmentmodel.cutinWindSpeed
+     *
+     * @return the value of equipmentmodel.cutinWindSpeed
+     *
+     * @mbg.generated
+     */
+    public Double getCutinwindspeed() {
+        return cutinwindspeed;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column equipmentmodel.cutinWindSpeed
+     *
+     * @param cutinwindspeed the value for equipmentmodel.cutinWindSpeed
+     *
+     * @mbg.generated
+     */
+    public void setCutinwindspeed(Double cutinwindspeed) {
+        this.cutinwindspeed = cutinwindspeed;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column equipmentmodel.ratedWindSpeed
+     *
+     * @return the value of equipmentmodel.ratedWindSpeed
+     *
+     * @mbg.generated
+     */
+    public Double getRatedwindspeed() {
+        return ratedwindspeed;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column equipmentmodel.ratedWindSpeed
+     *
+     * @param ratedwindspeed the value for equipmentmodel.ratedWindSpeed
+     *
+     * @mbg.generated
+     */
+    public void setRatedwindspeed(Double ratedwindspeed) {
+        this.ratedwindspeed = ratedwindspeed;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column equipmentmodel.cutoutWindSpeed
+     *
+     * @return the value of equipmentmodel.cutoutWindSpeed
+     *
+     * @mbg.generated
+     */
+    public String getCutoutwindspeed() {
+        return cutoutwindspeed;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column equipmentmodel.cutoutWindSpeed
+     *
+     * @param cutoutwindspeed the value for equipmentmodel.cutoutWindSpeed
+     *
+     * @mbg.generated
+     */
+    public void setCutoutwindspeed(String cutoutwindspeed) {
+        this.cutoutwindspeed = cutoutwindspeed == null ? null : cutoutwindspeed.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column equipmentmodel.windTurbineManufacturerId
+     *
+     * @return the value of equipmentmodel.windTurbineManufacturerId
+     *
+     * @mbg.generated
+     */
+    public String getWindturbinemanufacturerid() {
+        return windturbinemanufacturerid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column equipmentmodel.windTurbineManufacturerId
+     *
+     * @param windturbinemanufacturerid the value for equipmentmodel.windTurbineManufacturerId
+     *
+     * @mbg.generated
+     */
+    public void setWindturbinemanufacturerid(String windturbinemanufacturerid) {
+        this.windturbinemanufacturerid = windturbinemanufacturerid == null ? null : windturbinemanufacturerid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column equipmentmodel.photo
+     *
+     * @return the value of equipmentmodel.photo
+     *
+     * @mbg.generated
+     */
+    public String getPhoto() {
+        return photo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column equipmentmodel.photo
+     *
+     * @param photo the value for equipmentmodel.photo
+     *
+     * @mbg.generated
+     */
+    public void setPhoto(String photo) {
+        this.photo = photo == null ? null : photo.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column equipmentmodel.unit
+     *
+     * @return the value of equipmentmodel.unit
+     *
+     * @mbg.generated
+     */
+    public String getUnit() {
+        return unit;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column equipmentmodel.unit
+     *
+     * @param unit the value for equipmentmodel.unit
+     *
+     * @mbg.generated
+     */
+    public void setUnit(String unit) {
+        this.unit = unit == null ? null : unit.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column equipmentmodel.sweptArea
+     *
+     * @return the value of equipmentmodel.sweptArea
+     *
+     * @mbg.generated
+     */
+    public Double getSweptarea() {
+        return sweptarea;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column equipmentmodel.sweptArea
+     *
+     * @param sweptarea the value for equipmentmodel.sweptArea
+     *
+     * @mbg.generated
+     */
+    public void setSweptarea(Double sweptarea) {
+        this.sweptarea = sweptarea;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column equipmentmodel.equipmentCategory
+     *
+     * @return the value of equipmentmodel.equipmentCategory
+     *
+     * @mbg.generated
+     */
+    public Integer getEquipmentcategory() {
+        return equipmentcategory;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column equipmentmodel.equipmentCategory
+     *
+     * @param equipmentcategory the value for equipmentmodel.equipmentCategory
+     *
+     * @mbg.generated
+     */
+    public void setEquipmentcategory(Integer equipmentcategory) {
+        this.equipmentcategory = equipmentcategory;
+    }
+}

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

@@ -0,0 +1,178 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class Manufacturer implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column manufacturer.id
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column manufacturer.name
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column manufacturer.country
+     *
+     * @mbg.generated
+     */
+    private String country;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column manufacturer.address
+     *
+     * @mbg.generated
+     */
+    private String address;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column manufacturer.telephone
+     *
+     * @mbg.generated
+     */
+    private String telephone;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table manufacturer
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column manufacturer.id
+     *
+     * @return the value of manufacturer.id
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column manufacturer.id
+     *
+     * @param id the value for manufacturer.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 manufacturer.name
+     *
+     * @return the value of manufacturer.name
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column manufacturer.name
+     *
+     * @param name the value for manufacturer.name
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column manufacturer.country
+     *
+     * @return the value of manufacturer.country
+     *
+     * @mbg.generated
+     */
+    public String getCountry() {
+        return country;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column manufacturer.country
+     *
+     * @param country the value for manufacturer.country
+     *
+     * @mbg.generated
+     */
+    public void setCountry(String country) {
+        this.country = country == null ? null : country.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column manufacturer.address
+     *
+     * @return the value of manufacturer.address
+     *
+     * @mbg.generated
+     */
+    public String getAddress() {
+        return address;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column manufacturer.address
+     *
+     * @param address the value for manufacturer.address
+     *
+     * @mbg.generated
+     */
+    public void setAddress(String address) {
+        this.address = address == null ? null : address.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column manufacturer.telephone
+     *
+     * @return the value of manufacturer.telephone
+     *
+     * @mbg.generated
+     */
+    public String getTelephone() {
+        return telephone;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column manufacturer.telephone
+     *
+     * @param telephone the value for manufacturer.telephone
+     *
+     * @mbg.generated
+     */
+    public void setTelephone(String telephone) {
+        this.telephone = telephone == null ? null : telephone.trim();
+    }
+}

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

@@ -0,0 +1,652 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ManufacturerExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table manufacturer
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table manufacturer
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table manufacturer
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table manufacturer
+     *
+     * @mbg.generated
+     */
+    public ManufacturerExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table manufacturer
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table manufacturer
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table manufacturer
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table manufacturer
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table manufacturer
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table manufacturer
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table manufacturer
+     *
+     * @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 manufacturer
+     *
+     * @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 manufacturer
+     *
+     * @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 manufacturer
+     *
+     * @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 manufacturer
+     *
+     * @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 andNameIsNull() {
+            addCriterion("name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryIsNull() {
+            addCriterion("country is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryIsNotNull() {
+            addCriterion("country is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryEqualTo(String value) {
+            addCriterion("country =", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryNotEqualTo(String value) {
+            addCriterion("country <>", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryGreaterThan(String value) {
+            addCriterion("country >", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryGreaterThanOrEqualTo(String value) {
+            addCriterion("country >=", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryLessThan(String value) {
+            addCriterion("country <", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryLessThanOrEqualTo(String value) {
+            addCriterion("country <=", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryLike(String value) {
+            addCriterion("country like", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryNotLike(String value) {
+            addCriterion("country not like", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryIn(List<String> values) {
+            addCriterion("country in", values, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryNotIn(List<String> values) {
+            addCriterion("country not in", values, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryBetween(String value1, String value2) {
+            addCriterion("country between", value1, value2, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryNotBetween(String value1, String value2) {
+            addCriterion("country not between", value1, value2, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressIsNull() {
+            addCriterion("address is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressIsNotNull() {
+            addCriterion("address is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressEqualTo(String value) {
+            addCriterion("address =", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressNotEqualTo(String value) {
+            addCriterion("address <>", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressGreaterThan(String value) {
+            addCriterion("address >", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressGreaterThanOrEqualTo(String value) {
+            addCriterion("address >=", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressLessThan(String value) {
+            addCriterion("address <", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressLessThanOrEqualTo(String value) {
+            addCriterion("address <=", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressLike(String value) {
+            addCriterion("address like", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressNotLike(String value) {
+            addCriterion("address not like", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressIn(List<String> values) {
+            addCriterion("address in", values, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressNotIn(List<String> values) {
+            addCriterion("address not in", values, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressBetween(String value1, String value2) {
+            addCriterion("address between", value1, value2, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressNotBetween(String value1, String value2) {
+            addCriterion("address not between", value1, value2, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andTelephoneIsNull() {
+            addCriterion("telephone is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTelephoneIsNotNull() {
+            addCriterion("telephone is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTelephoneEqualTo(String value) {
+            addCriterion("telephone =", value, "telephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andTelephoneNotEqualTo(String value) {
+            addCriterion("telephone <>", value, "telephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andTelephoneGreaterThan(String value) {
+            addCriterion("telephone >", value, "telephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andTelephoneGreaterThanOrEqualTo(String value) {
+            addCriterion("telephone >=", value, "telephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andTelephoneLessThan(String value) {
+            addCriterion("telephone <", value, "telephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andTelephoneLessThanOrEqualTo(String value) {
+            addCriterion("telephone <=", value, "telephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andTelephoneLike(String value) {
+            addCriterion("telephone like", value, "telephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andTelephoneNotLike(String value) {
+            addCriterion("telephone not like", value, "telephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andTelephoneIn(List<String> values) {
+            addCriterion("telephone in", values, "telephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andTelephoneNotIn(List<String> values) {
+            addCriterion("telephone not in", values, "telephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andTelephoneBetween(String value1, String value2) {
+            addCriterion("telephone between", value1, value2, "telephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andTelephoneNotBetween(String value1, String value2) {
+            addCriterion("telephone not between", value1, value2, "telephone");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table manufacturer
+     *
+     * @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 manufacturer
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -0,0 +1,178 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class ModelPower implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column modelpower.id
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column modelpower.modelId
+     *
+     * @mbg.generated
+     */
+    private String modelid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column modelpower.speed
+     *
+     * @mbg.generated
+     */
+    private Double speed;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column modelpower.theoryPower
+     *
+     * @mbg.generated
+     */
+    private Double theorypower;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column modelpower.ensurePower
+     *
+     * @mbg.generated
+     */
+    private Double ensurepower;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table modelpower
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column modelpower.id
+     *
+     * @return the value of modelpower.id
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column modelpower.id
+     *
+     * @param id the value for modelpower.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 modelpower.modelId
+     *
+     * @return the value of modelpower.modelId
+     *
+     * @mbg.generated
+     */
+    public String getModelid() {
+        return modelid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column modelpower.modelId
+     *
+     * @param modelid the value for modelpower.modelId
+     *
+     * @mbg.generated
+     */
+    public void setModelid(String modelid) {
+        this.modelid = modelid == null ? null : modelid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column modelpower.speed
+     *
+     * @return the value of modelpower.speed
+     *
+     * @mbg.generated
+     */
+    public Double getSpeed() {
+        return speed;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column modelpower.speed
+     *
+     * @param speed the value for modelpower.speed
+     *
+     * @mbg.generated
+     */
+    public void setSpeed(Double speed) {
+        this.speed = speed;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column modelpower.theoryPower
+     *
+     * @return the value of modelpower.theoryPower
+     *
+     * @mbg.generated
+     */
+    public Double getTheorypower() {
+        return theorypower;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column modelpower.theoryPower
+     *
+     * @param theorypower the value for modelpower.theoryPower
+     *
+     * @mbg.generated
+     */
+    public void setTheorypower(Double theorypower) {
+        this.theorypower = theorypower;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column modelpower.ensurePower
+     *
+     * @return the value of modelpower.ensurePower
+     *
+     * @mbg.generated
+     */
+    public Double getEnsurepower() {
+        return ensurepower;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column modelpower.ensurePower
+     *
+     * @param ensurepower the value for modelpower.ensurePower
+     *
+     * @mbg.generated
+     */
+    public void setEnsurepower(Double ensurepower) {
+        this.ensurepower = ensurepower;
+    }
+}

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

@@ -0,0 +1,622 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ModelPowerExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table modelpower
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table modelpower
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table modelpower
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table modelpower
+     *
+     * @mbg.generated
+     */
+    public ModelPowerExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table modelpower
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table modelpower
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table modelpower
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table modelpower
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table modelpower
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table modelpower
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table modelpower
+     *
+     * @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 modelpower
+     *
+     * @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 modelpower
+     *
+     * @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 modelpower
+     *
+     * @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 modelpower
+     *
+     * @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 andModelidIsNull() {
+            addCriterion("modelId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidIsNotNull() {
+            addCriterion("modelId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidEqualTo(String value) {
+            addCriterion("modelId =", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidNotEqualTo(String value) {
+            addCriterion("modelId <>", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidGreaterThan(String value) {
+            addCriterion("modelId >", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidGreaterThanOrEqualTo(String value) {
+            addCriterion("modelId >=", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidLessThan(String value) {
+            addCriterion("modelId <", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidLessThanOrEqualTo(String value) {
+            addCriterion("modelId <=", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidLike(String value) {
+            addCriterion("modelId like", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidNotLike(String value) {
+            addCriterion("modelId not like", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidIn(List<String> values) {
+            addCriterion("modelId in", values, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidNotIn(List<String> values) {
+            addCriterion("modelId not in", values, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidBetween(String value1, String value2) {
+            addCriterion("modelId between", value1, value2, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidNotBetween(String value1, String value2) {
+            addCriterion("modelId not between", value1, value2, "modelid");
+            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;
+        }
+
+        public Criteria andTheorypowerIsNull() {
+            addCriterion("theoryPower is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTheorypowerIsNotNull() {
+            addCriterion("theoryPower is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTheorypowerEqualTo(Double value) {
+            addCriterion("theoryPower =", value, "theorypower");
+            return (Criteria) this;
+        }
+
+        public Criteria andTheorypowerNotEqualTo(Double value) {
+            addCriterion("theoryPower <>", value, "theorypower");
+            return (Criteria) this;
+        }
+
+        public Criteria andTheorypowerGreaterThan(Double value) {
+            addCriterion("theoryPower >", value, "theorypower");
+            return (Criteria) this;
+        }
+
+        public Criteria andTheorypowerGreaterThanOrEqualTo(Double value) {
+            addCriterion("theoryPower >=", value, "theorypower");
+            return (Criteria) this;
+        }
+
+        public Criteria andTheorypowerLessThan(Double value) {
+            addCriterion("theoryPower <", value, "theorypower");
+            return (Criteria) this;
+        }
+
+        public Criteria andTheorypowerLessThanOrEqualTo(Double value) {
+            addCriterion("theoryPower <=", value, "theorypower");
+            return (Criteria) this;
+        }
+
+        public Criteria andTheorypowerIn(List<Double> values) {
+            addCriterion("theoryPower in", values, "theorypower");
+            return (Criteria) this;
+        }
+
+        public Criteria andTheorypowerNotIn(List<Double> values) {
+            addCriterion("theoryPower not in", values, "theorypower");
+            return (Criteria) this;
+        }
+
+        public Criteria andTheorypowerBetween(Double value1, Double value2) {
+            addCriterion("theoryPower between", value1, value2, "theorypower");
+            return (Criteria) this;
+        }
+
+        public Criteria andTheorypowerNotBetween(Double value1, Double value2) {
+            addCriterion("theoryPower not between", value1, value2, "theorypower");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnsurepowerIsNull() {
+            addCriterion("ensurePower is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnsurepowerIsNotNull() {
+            addCriterion("ensurePower is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnsurepowerEqualTo(Double value) {
+            addCriterion("ensurePower =", value, "ensurepower");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnsurepowerNotEqualTo(Double value) {
+            addCriterion("ensurePower <>", value, "ensurepower");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnsurepowerGreaterThan(Double value) {
+            addCriterion("ensurePower >", value, "ensurepower");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnsurepowerGreaterThanOrEqualTo(Double value) {
+            addCriterion("ensurePower >=", value, "ensurepower");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnsurepowerLessThan(Double value) {
+            addCriterion("ensurePower <", value, "ensurepower");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnsurepowerLessThanOrEqualTo(Double value) {
+            addCriterion("ensurePower <=", value, "ensurepower");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnsurepowerIn(List<Double> values) {
+            addCriterion("ensurePower in", values, "ensurepower");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnsurepowerNotIn(List<Double> values) {
+            addCriterion("ensurePower not in", values, "ensurepower");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnsurepowerBetween(Double value1, Double value2) {
+            addCriterion("ensurePower between", value1, value2, "ensurepower");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnsurepowerNotBetween(Double value1, Double value2) {
+            addCriterion("ensurePower not between", value1, value2, "ensurepower");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table modelpower
+     *
+     * @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 modelpower
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -1,7 +1,6 @@
 package com.gyee.frame.model.auto;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.Date;
 
 public class WarningInfoDay implements Serializable {
@@ -66,7 +65,7 @@ public class WarningInfoDay implements Serializable {
      *
      * @mbg.generated
      */
-    private BigDecimal totalhoursday;
+    private Double totalhoursday;
 
     /**
      *
@@ -84,7 +83,7 @@ public class WarningInfoDay implements Serializable {
      *
      * @mbg.generated
      */
-    private BigDecimal totalhoursmonth;
+    private Double totalhoursmonth;
 
     /**
      *
@@ -102,7 +101,7 @@ public class WarningInfoDay implements Serializable {
      *
      * @mbg.generated
      */
-    private BigDecimal totalhoursyear;
+    private Double totalhoursyear;
 
     /**
      *
@@ -120,7 +119,7 @@ public class WarningInfoDay implements Serializable {
      *
      * @mbg.generated
      */
-    private BigDecimal totalhours;
+    private Double totalhours;
 
     /**
      * This field was generated by MyBatis Generator.
@@ -282,7 +281,7 @@ public class WarningInfoDay implements Serializable {
      *
      * @mbg.generated
      */
-    public BigDecimal getTotalhoursday() {
+    public Double getTotalhoursday() {
         return totalhoursday;
     }
 
@@ -294,7 +293,7 @@ public class WarningInfoDay implements Serializable {
      *
      * @mbg.generated
      */
-    public void setTotalhoursday(BigDecimal totalhoursday) {
+    public void setTotalhoursday(Double totalhoursday) {
         this.totalhoursday = totalhoursday;
     }
 
@@ -330,7 +329,7 @@ public class WarningInfoDay implements Serializable {
      *
      * @mbg.generated
      */
-    public BigDecimal getTotalhoursmonth() {
+    public Double getTotalhoursmonth() {
         return totalhoursmonth;
     }
 
@@ -342,7 +341,7 @@ public class WarningInfoDay implements Serializable {
      *
      * @mbg.generated
      */
-    public void setTotalhoursmonth(BigDecimal totalhoursmonth) {
+    public void setTotalhoursmonth(Double totalhoursmonth) {
         this.totalhoursmonth = totalhoursmonth;
     }
 
@@ -378,7 +377,7 @@ public class WarningInfoDay implements Serializable {
      *
      * @mbg.generated
      */
-    public BigDecimal getTotalhoursyear() {
+    public Double getTotalhoursyear() {
         return totalhoursyear;
     }
 
@@ -390,7 +389,7 @@ public class WarningInfoDay implements Serializable {
      *
      * @mbg.generated
      */
-    public void setTotalhoursyear(BigDecimal totalhoursyear) {
+    public void setTotalhoursyear(Double totalhoursyear) {
         this.totalhoursyear = totalhoursyear;
     }
 
@@ -426,7 +425,7 @@ public class WarningInfoDay implements Serializable {
      *
      * @mbg.generated
      */
-    public BigDecimal getTotalhours() {
+    public Double getTotalhours() {
         return totalhours;
     }
 
@@ -438,7 +437,7 @@ public class WarningInfoDay implements Serializable {
      *
      * @mbg.generated
      */
-    public void setTotalhours(BigDecimal totalhours) {
+    public void setTotalhours(Double totalhours) {
         this.totalhours = totalhours;
     }
 }

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

@@ -1,6 +1,5 @@
 package com.gyee.frame.model.auto;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -596,52 +595,52 @@ public class WarningInfoDayExample {
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursdayEqualTo(BigDecimal value) {
+        public Criteria andTotalhoursdayEqualTo(Double value) {
             addCriterion("totalhoursDay =", value, "totalhoursday");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursdayNotEqualTo(BigDecimal value) {
+        public Criteria andTotalhoursdayNotEqualTo(Double value) {
             addCriterion("totalhoursDay <>", value, "totalhoursday");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursdayGreaterThan(BigDecimal value) {
+        public Criteria andTotalhoursdayGreaterThan(Double value) {
             addCriterion("totalhoursDay >", value, "totalhoursday");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursdayGreaterThanOrEqualTo(BigDecimal value) {
+        public Criteria andTotalhoursdayGreaterThanOrEqualTo(Double value) {
             addCriterion("totalhoursDay >=", value, "totalhoursday");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursdayLessThan(BigDecimal value) {
+        public Criteria andTotalhoursdayLessThan(Double value) {
             addCriterion("totalhoursDay <", value, "totalhoursday");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursdayLessThanOrEqualTo(BigDecimal value) {
+        public Criteria andTotalhoursdayLessThanOrEqualTo(Double value) {
             addCriterion("totalhoursDay <=", value, "totalhoursday");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursdayIn(List<BigDecimal> values) {
+        public Criteria andTotalhoursdayIn(List<Double> values) {
             addCriterion("totalhoursDay in", values, "totalhoursday");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursdayNotIn(List<BigDecimal> values) {
+        public Criteria andTotalhoursdayNotIn(List<Double> values) {
             addCriterion("totalhoursDay not in", values, "totalhoursday");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursdayBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andTotalhoursdayBetween(Double value1, Double value2) {
             addCriterion("totalhoursDay between", value1, value2, "totalhoursday");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursdayNotBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andTotalhoursdayNotBetween(Double value1, Double value2) {
             addCriterion("totalhoursDay not between", value1, value2, "totalhoursday");
             return (Criteria) this;
         }
@@ -716,52 +715,52 @@ public class WarningInfoDayExample {
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursmonthEqualTo(BigDecimal value) {
+        public Criteria andTotalhoursmonthEqualTo(Double value) {
             addCriterion("totalhoursMonth =", value, "totalhoursmonth");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursmonthNotEqualTo(BigDecimal value) {
+        public Criteria andTotalhoursmonthNotEqualTo(Double value) {
             addCriterion("totalhoursMonth <>", value, "totalhoursmonth");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursmonthGreaterThan(BigDecimal value) {
+        public Criteria andTotalhoursmonthGreaterThan(Double value) {
             addCriterion("totalhoursMonth >", value, "totalhoursmonth");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursmonthGreaterThanOrEqualTo(BigDecimal value) {
+        public Criteria andTotalhoursmonthGreaterThanOrEqualTo(Double value) {
             addCriterion("totalhoursMonth >=", value, "totalhoursmonth");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursmonthLessThan(BigDecimal value) {
+        public Criteria andTotalhoursmonthLessThan(Double value) {
             addCriterion("totalhoursMonth <", value, "totalhoursmonth");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursmonthLessThanOrEqualTo(BigDecimal value) {
+        public Criteria andTotalhoursmonthLessThanOrEqualTo(Double value) {
             addCriterion("totalhoursMonth <=", value, "totalhoursmonth");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursmonthIn(List<BigDecimal> values) {
+        public Criteria andTotalhoursmonthIn(List<Double> values) {
             addCriterion("totalhoursMonth in", values, "totalhoursmonth");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursmonthNotIn(List<BigDecimal> values) {
+        public Criteria andTotalhoursmonthNotIn(List<Double> values) {
             addCriterion("totalhoursMonth not in", values, "totalhoursmonth");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursmonthBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andTotalhoursmonthBetween(Double value1, Double value2) {
             addCriterion("totalhoursMonth between", value1, value2, "totalhoursmonth");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursmonthNotBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andTotalhoursmonthNotBetween(Double value1, Double value2) {
             addCriterion("totalhoursMonth not between", value1, value2, "totalhoursmonth");
             return (Criteria) this;
         }
@@ -836,52 +835,52 @@ public class WarningInfoDayExample {
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursyearEqualTo(BigDecimal value) {
+        public Criteria andTotalhoursyearEqualTo(Double value) {
             addCriterion("totalhoursYear =", value, "totalhoursyear");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursyearNotEqualTo(BigDecimal value) {
+        public Criteria andTotalhoursyearNotEqualTo(Double value) {
             addCriterion("totalhoursYear <>", value, "totalhoursyear");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursyearGreaterThan(BigDecimal value) {
+        public Criteria andTotalhoursyearGreaterThan(Double value) {
             addCriterion("totalhoursYear >", value, "totalhoursyear");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursyearGreaterThanOrEqualTo(BigDecimal value) {
+        public Criteria andTotalhoursyearGreaterThanOrEqualTo(Double value) {
             addCriterion("totalhoursYear >=", value, "totalhoursyear");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursyearLessThan(BigDecimal value) {
+        public Criteria andTotalhoursyearLessThan(Double value) {
             addCriterion("totalhoursYear <", value, "totalhoursyear");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursyearLessThanOrEqualTo(BigDecimal value) {
+        public Criteria andTotalhoursyearLessThanOrEqualTo(Double value) {
             addCriterion("totalhoursYear <=", value, "totalhoursyear");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursyearIn(List<BigDecimal> values) {
+        public Criteria andTotalhoursyearIn(List<Double> values) {
             addCriterion("totalhoursYear in", values, "totalhoursyear");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursyearNotIn(List<BigDecimal> values) {
+        public Criteria andTotalhoursyearNotIn(List<Double> values) {
             addCriterion("totalhoursYear not in", values, "totalhoursyear");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursyearBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andTotalhoursyearBetween(Double value1, Double value2) {
             addCriterion("totalhoursYear between", value1, value2, "totalhoursyear");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursyearNotBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andTotalhoursyearNotBetween(Double value1, Double value2) {
             addCriterion("totalhoursYear not between", value1, value2, "totalhoursyear");
             return (Criteria) this;
         }
@@ -956,52 +955,52 @@ public class WarningInfoDayExample {
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursEqualTo(BigDecimal value) {
+        public Criteria andTotalhoursEqualTo(Double value) {
             addCriterion("totalHours =", value, "totalhours");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursNotEqualTo(BigDecimal value) {
+        public Criteria andTotalhoursNotEqualTo(Double value) {
             addCriterion("totalHours <>", value, "totalhours");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursGreaterThan(BigDecimal value) {
+        public Criteria andTotalhoursGreaterThan(Double value) {
             addCriterion("totalHours >", value, "totalhours");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursGreaterThanOrEqualTo(BigDecimal value) {
+        public Criteria andTotalhoursGreaterThanOrEqualTo(Double value) {
             addCriterion("totalHours >=", value, "totalhours");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursLessThan(BigDecimal value) {
+        public Criteria andTotalhoursLessThan(Double value) {
             addCriterion("totalHours <", value, "totalhours");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursLessThanOrEqualTo(BigDecimal value) {
+        public Criteria andTotalhoursLessThanOrEqualTo(Double value) {
             addCriterion("totalHours <=", value, "totalhours");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursIn(List<BigDecimal> values) {
+        public Criteria andTotalhoursIn(List<Double> values) {
             addCriterion("totalHours in", values, "totalhours");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursNotIn(List<BigDecimal> values) {
+        public Criteria andTotalhoursNotIn(List<Double> values) {
             addCriterion("totalHours not in", values, "totalhours");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andTotalhoursBetween(Double value1, Double value2) {
             addCriterion("totalHours between", value1, value2, "totalhours");
             return (Criteria) this;
         }
 
-        public Criteria andTotalhoursNotBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andTotalhoursNotBetween(Double value1, Double value2) {
             addCriterion("totalHours not between", value1, value2, "totalhours");
             return (Criteria) this;
         }

src/main/java/com/gyee/frame/model/auto/Windturbinegoodness.java.1

@@ -1,477 +0,0 @@
-package com.gyee.frame.model.auto;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class Windturbinegoodness implements Serializable {
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinegoodness.id
-     *
-     * @mbg.generated
-     */
-    private Integer id;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinegoodness.windturbineId
-     *
-     * @mbg.generated
-     */
-    private String windturbineid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinegoodness.dayGoodness
-     *
-     * @mbg.generated
-     */
-    private BigDecimal daygoodness;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinegoodness.monthGoodness
-     *
-     * @mbg.generated
-     */
-    private BigDecimal monthgoodness;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinegoodness.yearGoodness
-     *
-     * @mbg.generated
-     */
-    private BigDecimal yeargoodness;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinegoodness.recordDate
-     *
-     * @mbg.generated
-     */
-    private Date recorddate;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinegoodness.dayTop
-     *
-     * @mbg.generated
-     */
-    private Integer daytop;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinegoodness.monthTop
-     *
-     * @mbg.generated
-     */
-    private Integer monthtop;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinegoodness.yearTop
-     *
-     * @mbg.generated
-     */
-    private Integer yeartop;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinegoodness.windtPowerStationId
-     *
-     * @mbg.generated
-     */
-    private String windtpowerstationid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinegoodness.modelId
-     *
-     * @mbg.generated
-     */
-    private String modelid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinegoodness.dayspeed
-     *
-     * @mbg.generated
-     */
-    private BigDecimal dayspeed;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinegoodness.monthspeed
-     *
-     * @mbg.generated
-     */
-    private BigDecimal monthspeed;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinegoodness.yearspeed
-     *
-     * @mbg.generated
-     */
-    private BigDecimal yearspeed;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table windturbinegoodness
-     *
-     * @mbg.generated
-     */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinegoodness.id
-     *
-     * @return the value of windturbinegoodness.id
-     *
-     * @mbg.generated
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinegoodness.id
-     *
-     * @param id the value for windturbinegoodness.id
-     *
-     * @mbg.generated
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinegoodness.windturbineId
-     *
-     * @return the value of windturbinegoodness.windturbineId
-     *
-     * @mbg.generated
-     */
-    public String getWindturbineid() {
-        return windturbineid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinegoodness.windturbineId
-     *
-     * @param windturbineid the value for windturbinegoodness.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 windturbinegoodness.dayGoodness
-     *
-     * @return the value of windturbinegoodness.dayGoodness
-     *
-     * @mbg.generated
-     */
-    public BigDecimal getDaygoodness() {
-        return daygoodness;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinegoodness.dayGoodness
-     *
-     * @param daygoodness the value for windturbinegoodness.dayGoodness
-     *
-     * @mbg.generated
-     */
-    public void setDaygoodness(BigDecimal daygoodness) {
-        this.daygoodness = daygoodness;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinegoodness.monthGoodness
-     *
-     * @return the value of windturbinegoodness.monthGoodness
-     *
-     * @mbg.generated
-     */
-    public BigDecimal getMonthgoodness() {
-        return monthgoodness;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinegoodness.monthGoodness
-     *
-     * @param monthgoodness the value for windturbinegoodness.monthGoodness
-     *
-     * @mbg.generated
-     */
-    public void setMonthgoodness(BigDecimal monthgoodness) {
-        this.monthgoodness = monthgoodness;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinegoodness.yearGoodness
-     *
-     * @return the value of windturbinegoodness.yearGoodness
-     *
-     * @mbg.generated
-     */
-    public BigDecimal getYeargoodness() {
-        return yeargoodness;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinegoodness.yearGoodness
-     *
-     * @param yeargoodness the value for windturbinegoodness.yearGoodness
-     *
-     * @mbg.generated
-     */
-    public void setYeargoodness(BigDecimal yeargoodness) {
-        this.yeargoodness = yeargoodness;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinegoodness.recordDate
-     *
-     * @return the value of windturbinegoodness.recordDate
-     *
-     * @mbg.generated
-     */
-    public Date getRecorddate() {
-        return recorddate;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinegoodness.recordDate
-     *
-     * @param recorddate the value for windturbinegoodness.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 windturbinegoodness.dayTop
-     *
-     * @return the value of windturbinegoodness.dayTop
-     *
-     * @mbg.generated
-     */
-    public Integer getDaytop() {
-        return daytop;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinegoodness.dayTop
-     *
-     * @param daytop the value for windturbinegoodness.dayTop
-     *
-     * @mbg.generated
-     */
-    public void setDaytop(Integer daytop) {
-        this.daytop = daytop;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinegoodness.monthTop
-     *
-     * @return the value of windturbinegoodness.monthTop
-     *
-     * @mbg.generated
-     */
-    public Integer getMonthtop() {
-        return monthtop;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinegoodness.monthTop
-     *
-     * @param monthtop the value for windturbinegoodness.monthTop
-     *
-     * @mbg.generated
-     */
-    public void setMonthtop(Integer monthtop) {
-        this.monthtop = monthtop;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinegoodness.yearTop
-     *
-     * @return the value of windturbinegoodness.yearTop
-     *
-     * @mbg.generated
-     */
-    public Integer getYeartop() {
-        return yeartop;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinegoodness.yearTop
-     *
-     * @param yeartop the value for windturbinegoodness.yearTop
-     *
-     * @mbg.generated
-     */
-    public void setYeartop(Integer yeartop) {
-        this.yeartop = yeartop;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinegoodness.windtPowerStationId
-     *
-     * @return the value of windturbinegoodness.windtPowerStationId
-     *
-     * @mbg.generated
-     */
-    public String getWindtpowerstationid() {
-        return windtpowerstationid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinegoodness.windtPowerStationId
-     *
-     * @param windtpowerstationid the value for windturbinegoodness.windtPowerStationId
-     *
-     * @mbg.generated
-     */
-    public void setWindtpowerstationid(String windtpowerstationid) {
-        this.windtpowerstationid = windtpowerstationid == null ? null : windtpowerstationid.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinegoodness.modelId
-     *
-     * @return the value of windturbinegoodness.modelId
-     *
-     * @mbg.generated
-     */
-    public String getModelid() {
-        return modelid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinegoodness.modelId
-     *
-     * @param modelid the value for windturbinegoodness.modelId
-     *
-     * @mbg.generated
-     */
-    public void setModelid(String modelid) {
-        this.modelid = modelid == null ? null : modelid.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinegoodness.dayspeed
-     *
-     * @return the value of windturbinegoodness.dayspeed
-     *
-     * @mbg.generated
-     */
-    public BigDecimal getDayspeed() {
-        return dayspeed;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinegoodness.dayspeed
-     *
-     * @param dayspeed the value for windturbinegoodness.dayspeed
-     *
-     * @mbg.generated
-     */
-    public void setDayspeed(BigDecimal dayspeed) {
-        this.dayspeed = dayspeed;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinegoodness.monthspeed
-     *
-     * @return the value of windturbinegoodness.monthspeed
-     *
-     * @mbg.generated
-     */
-    public BigDecimal getMonthspeed() {
-        return monthspeed;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinegoodness.monthspeed
-     *
-     * @param monthspeed the value for windturbinegoodness.monthspeed
-     *
-     * @mbg.generated
-     */
-    public void setMonthspeed(BigDecimal monthspeed) {
-        this.monthspeed = monthspeed;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinegoodness.yearspeed
-     *
-     * @return the value of windturbinegoodness.yearspeed
-     *
-     * @mbg.generated
-     */
-    public BigDecimal getYearspeed() {
-        return yearspeed;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinegoodness.yearspeed
-     *
-     * @param yearspeed the value for windturbinegoodness.yearspeed
-     *
-     * @mbg.generated
-     */
-    public void setYearspeed(BigDecimal yearspeed) {
-        this.yearspeed = yearspeed;
-    }
-}

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

@@ -0,0 +1,116 @@
+package com.gyee.frame.model.custom;
+
+import java.util.Date;
+
+public class CurvefittingVo implements java.io.Serializable {
+
+	/** 
+    * @Fields serialVersionUID : TODO
+    */ 
+    
+    
+    private static final long serialVersionUID = 1L;
+	// Fields
+
+	private String id;
+	private String windturbineid;
+	private Double monthdeviationrate;
+	private Double yeardeviationrate;
+	private Double standarddeviationrate;
+	private Date recorddate;
+	private Double deviationrate1;
+	private Double deviationrate2;
+	private Double deviationrate3;
+	private String year;
+	private String month;
+	private String windfarm;
+	private Date endDate;
+	private Date beginDate;
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getWindturbineid() {
+		return windturbineid;
+	}
+	public void setWindturbineid(String windturbineid) {
+		this.windturbineid = windturbineid;
+	}
+	public Double getMonthdeviationrate() {
+		return monthdeviationrate;
+	}
+	public void setMonthdeviationrate(Double monthdeviationrate) {
+		this.monthdeviationrate = monthdeviationrate;
+	}
+	public Double getYeardeviationrate() {
+		return yeardeviationrate;
+	}
+	public void setYeardeviationrate(Double yeardeviationrate) {
+		this.yeardeviationrate = yeardeviationrate;
+	}
+	public Double getStandarddeviationrate() {
+		return standarddeviationrate;
+	}
+	public void setStandarddeviationrate(Double standarddeviationrate) {
+		this.standarddeviationrate = standarddeviationrate;
+	}
+	public Date getRecorddate() {
+		return recorddate;
+	}
+	public void setRecorddate(Date recorddate) {
+		this.recorddate = recorddate;
+	}
+	public Double getDeviationrate1() {
+		return deviationrate1;
+	}
+	public void setDeviationrate1(Double deviationrate1) {
+		this.deviationrate1 = deviationrate1;
+	}
+	public Double getDeviationrate2() {
+		return deviationrate2;
+	}
+	public void setDeviationrate2(Double deviationrate2) {
+		this.deviationrate2 = deviationrate2;
+	}
+	public Double getDeviationrate3() {
+		return deviationrate3;
+	}
+	public void setDeviationrate3(Double deviationrate3) {
+		this.deviationrate3 = deviationrate3;
+	}
+	public String getYear() {
+		return year;
+	}
+	public void setYear(String year) {
+		this.year = year;
+	}
+	public String getMonth() {
+		return month;
+	}
+	public void setMonth(String month) {
+		this.month = month;
+	}
+	public String getWindfarm() {
+		return windfarm;
+	}
+	public void setWindfarm(String windfarm) {
+		this.windfarm = windfarm;
+	}
+	public Date getEndDate() {
+		return endDate;
+	}
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
+	public Date getBeginDate() {
+		return beginDate;
+	}
+	public void setBeginDate(Date beginDate) {
+		this.beginDate = beginDate;
+	}
+	
+	
+
+}

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

@@ -0,0 +1,49 @@
+package com.gyee.frame.model.custom;
+
+public class StatisticalAnalysisWarningTopVo implements java.io.Serializable {
+
+	// Fields
+
+	private static final long serialVersionUID = 1L;
+
+	private Integer num;
+	private String name;
+	private Integer frequency;
+	private Integer frequencyday;
+	private Double totalhours;
+	
+	
+	
+	public Integer getFrequencyday() {
+		return frequencyday;
+	}
+	public void setFrequencyday(Integer frequencyday) {
+		this.frequencyday = frequencyday;
+	}
+	public Integer getNum() {
+		return num;
+	}
+	public void setNum(Integer num) {
+		this.num = num;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public Integer getFrequency() {
+		return frequency;
+	}
+	public void setFrequency(Integer frequency) {
+		this.frequency = frequency;
+	}
+	public Double getTotalhours() {
+		return totalhours;
+	}
+	public void setTotalhours(Double totalhours) {
+		this.totalhours = totalhours;
+	}
+	
+	
+}

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

@@ -0,0 +1,8 @@
+package com.gyee.frame.model.custom;
+
+public enum WarningADEnum {
+	base,
+	classify,
+	manufacturer
+}
+

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

@@ -5,11 +5,14 @@ import com.gyee.frame.common.support.Convert;
 import com.gyee.frame.mapper.auto.CurvefittingmainMapper;
 import com.gyee.frame.model.auto.Curvefittingmain;
 import com.gyee.frame.model.auto.CurvefittingmainExample;
+import com.gyee.frame.model.custom.Tablepar;
+import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.SnowflakeIdWorker;
+import com.gyee.frame.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import java.util.*;
 
 
 @Service
@@ -90,6 +93,182 @@ public class CurvefittingmainService implements BaseService<Curvefittingmain, Cu
 		
 		return curvefittingmainMapper.deleteByExample(example);
 	}
-	
 
+
+	public List<Curvefittingmain> getCurvefittingmainList(Tablepar tablepar, List<String> wtIds, Date recorddate)  {
+
+		List<Curvefittingmain> list =new ArrayList<>();
+
+		CurvefittingmainExample example=new CurvefittingmainExample();
+		example.setOrderByClause(" deviationrate2 DESC");
+
+
+		CurvefittingmainExample.Criteria criteria =example.createCriteria();
+
+		criteria.andWindturbineidIn(wtIds);
+		Date endDate= DateUtils.addDays(recorddate,1);
+		criteria.andRecorddateGreaterThanOrEqualTo(recorddate).andRecorddateLessThan(endDate);
+
+		list=curvefittingmainMapper.selectByExample(example);
+
+		list=sortCurvefittingmainList(tablepar, list);
+
+		return list;
+
+	}
+
+	public  List<Curvefittingmain> sortCurvefittingmainList(Tablepar tablepar,List<Curvefittingmain> ls)
+	{
+
+		if (null !=tablepar && StringUtils.notEmp(tablepar.getOrderByColumn())) {
+
+			switch (tablepar.getOrderByColumn()) {
+				case "windturbineid":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o1.getWindturbineid().compareTo(o2.getWindturbineid());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o2.getWindturbineid().compareTo(o1.getWindturbineid());
+							}
+
+						});
+					}
+					break;
+				case "monthdeviationrate":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o1.getMonthdeviationrate().compareTo(o2.getMonthdeviationrate());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o2.getMonthdeviationrate().compareTo(o1.getMonthdeviationrate());
+							}
+
+						});
+					}
+					break;
+				case "yeardeviationrate":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o1.getYeardeviationrate().compareTo(o2.getYeardeviationrate());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o2.getYeardeviationrate().compareTo(o1.getYeardeviationrate());
+							}
+
+						});
+					}
+					break;
+				case "standarddeviationrate":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o1.getStandarddeviationrate().compareTo(o2.getStandarddeviationrate());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o2.getStandarddeviationrate().compareTo(o1.getStandarddeviationrate());
+							}
+
+						});
+					}
+					break;
+				case "deviationrate1":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o1.getDeviationrate1().compareTo(o2.getDeviationrate1());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o2.getDeviationrate1().compareTo(o1.getDeviationrate1());
+							}
+
+						});
+					}
+					break;
+				case "deviationrate2":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o1.getDeviationrate2().compareTo(o2.getDeviationrate2());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o2.getDeviationrate2().compareTo(o1.getDeviationrate2());
+							}
+
+						});
+					}
+					break;
+				case "deviationrate3":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o1.getDeviationrate3().compareTo(o2.getDeviationrate3());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o2.getDeviationrate3().compareTo(o1.getDeviationrate3());
+							}
+
+						});
+					}
+					break;
+				default:
+
+					break;
+			}
+
+		}
+		return ls;
+	}
 }

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

@@ -3,16 +3,15 @@ package com.gyee.frame.service;
 import com.gyee.frame.common.base.BaseService;
 import com.gyee.frame.common.support.Convert;
 import com.gyee.frame.mapper.auto.CurvefittingmonthmainMapper;
-import com.gyee.frame.model.auto.*;
-import com.gyee.frame.model.custom.StatisticalAnalysisRnewTopVo;
+import com.gyee.frame.model.auto.Curvefittingmonthmain;
+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.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 
 @Service
@@ -94,5 +93,184 @@ public class CurvefittingmonthmainService implements BaseService<Curvefittingmon
 		return curvefittingmonthmainMapper.deleteByExample(example);
 	}
 
+	public List<Curvefittingmonthmain> getCurvefittingmonthmainList(Tablepar tablepar, List<String> wtIds, String year, String month)  {
 
+		List<Curvefittingmonthmain> list =new ArrayList<>();
+
+		if(StringUtils.notEmp(wtIds) && StringUtils.notEmp(year) && StringUtils.notEmp(month))
+		{
+			CurvefittingmonthmainExample example=new CurvefittingmonthmainExample();
+			example.setOrderByClause(" deviationrate2 DESC");
+
+
+			CurvefittingmonthmainExample.Criteria criteria =example.createCriteria();
+
+			criteria.andWindturbineidIn(wtIds);
+			criteria.andYearEqualTo(year);
+			criteria.andMonthEqualTo(month);
+
+			list=curvefittingmonthmainMapper.selectByExample(example);
+
+			list=sortCurvefittingmonthmainList(tablepar, list);
+		}
+
+
+		return list;
+
+	}
+
+	public  List<Curvefittingmonthmain> sortCurvefittingmonthmainList(Tablepar tablepar,List<Curvefittingmonthmain> ls)
+	{
+
+		if (null !=tablepar && StringUtils.notEmp(tablepar.getOrderByColumn())) {
+
+			switch (tablepar.getOrderByColumn()) {
+				case "windturbineid":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o1.getWindturbineid().compareTo(o2.getWindturbineid());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o2.getWindturbineid().compareTo(o1.getWindturbineid());
+							}
+
+						});
+					}
+					break;
+				case "monthdeviationrate":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o1.getMonthdeviationrate().compareTo(o2.getMonthdeviationrate());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o2.getMonthdeviationrate().compareTo(o1.getMonthdeviationrate());
+							}
+
+						});
+					}
+					break;
+				case "yeardeviationrate":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o1.getYeardeviationrate().compareTo(o2.getYeardeviationrate());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o2.getYeardeviationrate().compareTo(o1.getYeardeviationrate());
+							}
+
+						});
+					}
+					break;
+				case "standarddeviationrate":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o1.getStandarddeviationrate().compareTo(o2.getStandarddeviationrate());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o2.getStandarddeviationrate().compareTo(o1.getStandarddeviationrate());
+							}
+
+						});
+					}
+					break;
+				case "deviationrate1":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o1.getDeviationrate1().compareTo(o2.getDeviationrate1());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o2.getDeviationrate1().compareTo(o1.getDeviationrate1());
+							}
+
+						});
+					}
+					break;
+				case "deviationrate2":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o1.getDeviationrate2().compareTo(o2.getDeviationrate2());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o2.getDeviationrate2().compareTo(o1.getDeviationrate2());
+							}
+
+						});
+					}
+					break;
+				case "deviationrate3":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o1.getDeviationrate3().compareTo(o2.getDeviationrate3());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o2.getDeviationrate3().compareTo(o1.getDeviationrate3());
+							}
+
+						});
+					}
+					break;
+				default:
+
+					break;
+			}
+
+		}
+		return ls;
+	}
 }

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

@@ -0,0 +1,95 @@
+package com.gyee.frame.service;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.EquipmentmodelMapper;
+import com.gyee.frame.model.auto.Equipmentmodel;
+import com.gyee.frame.model.auto.EquipmentmodelExample;
+import com.gyee.frame.util.SnowflakeIdWorker;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service
+public class EquipmentmodelService implements BaseService<Equipmentmodel, EquipmentmodelExample> {
+	@Autowired
+	private EquipmentmodelMapper equipmentmodelMapper;
+	
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista=Convert.toListStrArray(ids);
+			EquipmentmodelExample example=new EquipmentmodelExample();
+			example.createCriteria().andIdIn(lista);
+			return equipmentmodelMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public Equipmentmodel selectByPrimaryKey(String id) {
+				
+			return equipmentmodelMapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(Equipmentmodel record) {
+		return equipmentmodelMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Equipmentmodel record) {
+				
+		//添加雪花主键id
+		record.setId(SnowflakeIdWorker.getUUID());
+			
+				
+		return equipmentmodelMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(Equipmentmodel record, EquipmentmodelExample example) {
+		
+		return equipmentmodelMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(Equipmentmodel record, EquipmentmodelExample example) {
+		
+		return equipmentmodelMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Equipmentmodel> selectByExample(EquipmentmodelExample example) {
+		
+		return equipmentmodelMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(EquipmentmodelExample example) {
+		
+		return equipmentmodelMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(EquipmentmodelExample example) {
+		
+		return equipmentmodelMapper.deleteByExample(example);
+	}
+	
+
+}

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

@@ -0,0 +1,95 @@
+package com.gyee.frame.service;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.ManufacturerMapper;
+import com.gyee.frame.model.auto.Manufacturer;
+import com.gyee.frame.model.auto.ManufacturerExample;
+import com.gyee.frame.util.SnowflakeIdWorker;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service
+public class ManufacturerService implements BaseService<Manufacturer, ManufacturerExample> {
+	@Autowired
+	private ManufacturerMapper manufacturerMapper;
+	
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista=Convert.toListStrArray(ids);
+			ManufacturerExample example=new ManufacturerExample();
+			example.createCriteria().andIdIn(lista);
+			return manufacturerMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public Manufacturer selectByPrimaryKey(String id) {
+				
+			return manufacturerMapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(Manufacturer record) {
+		return manufacturerMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Manufacturer record) {
+				
+		//添加雪花主键id
+		record.setId(SnowflakeIdWorker.getUUID());
+			
+				
+		return manufacturerMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(Manufacturer record, ManufacturerExample example) {
+		
+		return manufacturerMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(Manufacturer record, ManufacturerExample example) {
+		
+		return manufacturerMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Manufacturer> selectByExample(ManufacturerExample example) {
+		
+		return manufacturerMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(ManufacturerExample example) {
+		
+		return manufacturerMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(ManufacturerExample example) {
+		
+		return manufacturerMapper.deleteByExample(example);
+	}
+	
+
+}

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

@@ -0,0 +1,95 @@
+package com.gyee.frame.service;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.ModelPowerMapper;
+import com.gyee.frame.model.auto.ModelPower;
+import com.gyee.frame.model.auto.ModelPowerExample;
+import com.gyee.frame.util.SnowflakeIdWorker;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service
+public class ModelPowerService implements BaseService<ModelPower, ModelPowerExample> {
+	@Autowired
+	private ModelPowerMapper modelPowerMapper;
+	
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista=Convert.toListStrArray(ids);
+			ModelPowerExample example=new ModelPowerExample();
+			example.createCriteria().andIdIn(lista);
+			return modelPowerMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public ModelPower selectByPrimaryKey(String id) {
+				
+			return modelPowerMapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(ModelPower record) {
+		return modelPowerMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(ModelPower record) {
+				
+		//添加雪花主键id
+		record.setId(SnowflakeIdWorker.getUUID());
+			
+				
+		return modelPowerMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(ModelPower record, ModelPowerExample example) {
+		
+		return modelPowerMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(ModelPower record, ModelPowerExample example) {
+		
+		return modelPowerMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<ModelPower> selectByExample(ModelPowerExample example) {
+		
+		return modelPowerMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(ModelPowerExample example) {
+		
+		return modelPowerMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(ModelPowerExample example) {
+		
+		return modelPowerMapper.deleteByExample(example);
+	}
+	
+
+}

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

@@ -1,14 +1,19 @@
 package com.gyee.frame.service;
 
 import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.common.support.Convert;
 import com.gyee.frame.mapper.auto.WarningInfoDayMapper;
-import com.gyee.frame.model.auto.WarningInfoDay;
-import com.gyee.frame.model.auto.WarningInfoDayExample;
+import com.gyee.frame.model.auto.*;
+import com.gyee.frame.model.custom.StatisticalAnalysisWarningTopVo;
+import com.gyee.frame.model.custom.Tablepar;
+import com.gyee.frame.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
 
 
 @Service
@@ -87,6 +92,606 @@ public class WarningInfoDayService implements BaseService<WarningInfoDay, Warnin
 		
 		return warningInfoDayMapper.deleteByExample(example);
 	}
-	
 
+
+	public List<StatisticalAnalysisWarningTopVo> getWarningInfoDayByWarningid(Tablepar tablepar,Date beginDate, Date endDate)  {
+
+		List<StatisticalAnalysisWarningTopVo> list =new ArrayList<>();
+
+		WarningInfoDayExample example=new WarningInfoDayExample();
+		example.setOrderByClause(" frequencyday desc");
+
+
+		WarningInfoDayExample.Criteria criteria =example.createCriteria();
+
+		criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+
+		List<WarningInfoDay> wils=warningInfoDayMapper.selectByExample(example);
+
+		Map<String, List<WarningInfoDay>> lsMap = new LinkedHashMap<>();
+		if(!wils.isEmpty())
+		{
+			for(WarningInfoDay ap:wils)
+			{
+				List<WarningInfoDay> items=null;
+				if (lsMap.containsKey(ap.getWarningid())) {
+					items = lsMap.get(ap.getWarningid());
+					items.add(ap);
+					lsMap.put(ap.getWarningid(), items);
+				} else {
+					items = new ArrayList<>();
+					items.add(ap);
+					lsMap.put(ap.getWarningid(), items);
+				}
+
+			}
+
+
+			Set<Map.Entry<String, List<WarningInfoDay>>> set = lsMap.entrySet();
+			int i=0;
+			for (Iterator<Map.Entry<String, List<WarningInfoDay>>> it = set.iterator(); it.hasNext();) {
+				Map.Entry<String, List<WarningInfoDay>> entry = (Map.Entry<String, List<WarningInfoDay>>) it.next();
+				System.out.println(entry.getKey() + "--->" + entry.getValue());
+
+				List<WarningInfoDay> ls=entry.getValue();
+
+				Warning warning= InitialRunner.warningmap.get(entry.getKey());
+
+				StatisticalAnalysisWarningTopVo item = new StatisticalAnalysisWarningTopVo();
+				item.setNum(i++);
+				item.setName(warning.getChinesetext());
+				int frequencyday=ls.stream().mapToInt(WarningInfoDay::getFrequencyday).sum();//合计
+				double totalhoursday=ls.stream().mapToDouble(WarningInfoDay::getTotalhoursday).sum();//合计
+				item.setFrequency(frequencyday);
+				item.setFrequencyday(frequencyday);
+				item.setTotalhours(totalhoursday);
+
+				if(i<10)
+				{
+					list.add(item);
+				}else
+				{
+					break;
+				}
+			}
+
+			list=sortStatisticalAnalysisWarningTopVoList(tablepar,list);
+		}
+		return list;
+
+	}
+
+
+	public List<StatisticalAnalysisWarningTopVo> getWarningInfoDayByWarningClassify(Tablepar tablepar,Date beginDate, Date endDate)  {
+
+		List<StatisticalAnalysisWarningTopVo> list =new ArrayList<>();
+
+		WarningInfoDayExample example=new WarningInfoDayExample();
+		example.setOrderByClause("frequencyday desc");
+
+
+		WarningInfoDayExample.Criteria criteria =example.createCriteria();
+
+		criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+
+		List<WarningInfoDay> wils=warningInfoDayMapper.selectByExample(example);
+
+		Map<String, List<WarningInfoDay>> lsMap = new LinkedHashMap<String, List<WarningInfoDay>>();
+		if(!wils.isEmpty())
+		{
+			for(WarningInfoDay ap:wils)
+			{
+				Warning warning=InitialRunner.warningmap.get(ap.getWarningid());
+				WarningClassify warningClassify=InitialRunner.warningClassifymap.get(warning.getWarningclassifyid());
+				List<WarningInfoDay> items=null;
+
+				if (lsMap.containsKey(warningClassify.getName())) {
+					items = lsMap.get(warningClassify.getName());
+					items.add(ap);
+					lsMap.put(warningClassify.getName(), items);
+				} else {
+					items = new ArrayList<>();
+					items.add(ap);
+					lsMap.put(warningClassify.getName(), items);
+				}
+
+			}
+
+
+			Set<Map.Entry<String, List<WarningInfoDay>>> set = lsMap.entrySet();
+			int i=0;
+			for (Iterator<Map.Entry<String, List<WarningInfoDay>>> it = set.iterator(); it.hasNext();) {
+				Map.Entry<String, List<WarningInfoDay>> entry = (Map.Entry<String, List<WarningInfoDay>>) it.next();
+				System.out.println(entry.getKey() + "--->" + entry.getValue());
+
+				List<WarningInfoDay> ls=entry.getValue();
+
+				Warning warning= InitialRunner.warningmap.get(entry.getKey());
+
+				StatisticalAnalysisWarningTopVo item = new StatisticalAnalysisWarningTopVo();
+				item.setNum(i++);
+				item.setName(entry.getKey());
+				int frequencyday=ls.stream().mapToInt(WarningInfoDay::getFrequencyday).sum();//合计
+				double totalhoursday=ls.stream().mapToDouble(WarningInfoDay::getTotalhoursday).sum();//合计
+				item.setFrequency(frequencyday);
+				item.setFrequencyday(frequencyday);
+				item.setTotalhours(totalhoursday);
+
+				if(i<10)
+				{
+					list.add(item);
+				}else
+				{
+					break;
+				}
+			}
+			list=sortStatisticalAnalysisWarningTopVoList(tablepar,list);
+		}
+		return list;
+
+	}
+
+
+	public  List<StatisticalAnalysisWarningTopVo> sortStatisticalAnalysisWarningTopVoList(Tablepar tablepar,List<StatisticalAnalysisWarningTopVo> ls)
+	{
+
+		if (null !=tablepar && StringUtils.notEmp(tablepar.getOrderByColumn())) {
+
+			switch (tablepar.getOrderByColumn()) {
+				case "name":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<StatisticalAnalysisWarningTopVo>() {
+							// 升序排序
+							public int compare(StatisticalAnalysisWarningTopVo o1, StatisticalAnalysisWarningTopVo o2) {
+								return o1.getName().compareTo(o2.getName());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<StatisticalAnalysisWarningTopVo>() {
+							// 升序排序
+							public int compare(StatisticalAnalysisWarningTopVo o1, StatisticalAnalysisWarningTopVo o2) {
+								return o2.getName().compareTo(o1.getName());
+							}
+
+						});
+					}
+					break;
+				case "frequency":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<StatisticalAnalysisWarningTopVo>() {
+							// 升序排序
+							public int compare(StatisticalAnalysisWarningTopVo o1, StatisticalAnalysisWarningTopVo o2) {
+								return o1.getFrequency().compareTo(o2.getFrequency());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<StatisticalAnalysisWarningTopVo>() {
+							// 升序排序
+							public int compare(StatisticalAnalysisWarningTopVo o1, StatisticalAnalysisWarningTopVo o2) {
+								return o2.getFrequency().compareTo(o1.getFrequency());
+							}
+
+						});
+					}
+					break;
+				case "frequencyday":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<StatisticalAnalysisWarningTopVo>() {
+							// 升序排序
+							public int compare(StatisticalAnalysisWarningTopVo o1, StatisticalAnalysisWarningTopVo o2) {
+								return o1.getFrequencyday().compareTo(o2.getFrequencyday());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<StatisticalAnalysisWarningTopVo>() {
+							// 升序排序
+							public int compare(StatisticalAnalysisWarningTopVo o1, StatisticalAnalysisWarningTopVo o2) {
+								return o2.getFrequencyday().compareTo(o1.getFrequencyday());
+							}
+
+						});
+					}
+					break;
+				case "totalhours":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<StatisticalAnalysisWarningTopVo>() {
+							// 升序排序
+							public int compare(StatisticalAnalysisWarningTopVo o1, StatisticalAnalysisWarningTopVo o2) {
+								return o1.getTotalhours().compareTo(o2.getTotalhours());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<StatisticalAnalysisWarningTopVo>() {
+							// 升序排序
+							public int compare(StatisticalAnalysisWarningTopVo o1, StatisticalAnalysisWarningTopVo o2) {
+								return o2.getTotalhours().compareTo(o1.getTotalhours());
+							}
+
+						});
+					}
+					break;
+				default:
+
+					break;
+			}
+
+		}
+		return ls;
+	}
+
+
+	public List<StatisticalAnalysisWarningTopVo> getWarningInfoDayByManufacturer(Tablepar tablepar,Date beginDate, Date endDate)  {
+
+		List<StatisticalAnalysisWarningTopVo> list =new ArrayList<>();
+
+		WarningInfoDayExample example=new WarningInfoDayExample();
+		example.setOrderByClause("frequencyday desc");
+
+
+		WarningInfoDayExample.Criteria criteria =example.createCriteria();
+
+		criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+
+		List<WarningInfoDay> wils=warningInfoDayMapper.selectByExample(example);
+
+		Map<String, List<WarningInfoDay>> lsMap = new LinkedHashMap<String, List<WarningInfoDay>>();
+		if(!wils.isEmpty())
+		{
+			for(WarningInfoDay ap:wils)
+			{
+				Manufacturer manufacturer=InitialRunner.manufacturermap.get(ap.getManufacturerid());
+
+				List<WarningInfoDay> items=null;
+
+				if (lsMap.containsKey(manufacturer.getName())) {
+					items = lsMap.get(manufacturer.getName());
+					items.add(ap);
+					lsMap.put(manufacturer.getName(), items);
+				} else {
+					items = new ArrayList<>();
+					items.add(ap);
+					lsMap.put(manufacturer.getName(), items);
+				}
+
+			}
+
+
+			Set<Map.Entry<String, List<WarningInfoDay>>> set = lsMap.entrySet();
+			int i=0;
+			for (Iterator<Map.Entry<String, List<WarningInfoDay>>> it = set.iterator(); it.hasNext();) {
+				Map.Entry<String, List<WarningInfoDay>> entry = (Map.Entry<String, List<WarningInfoDay>>) it.next();
+				System.out.println(entry.getKey() + "--->" + entry.getValue());
+
+				List<WarningInfoDay> ls=entry.getValue();
+
+				Warning warning= InitialRunner.warningmap.get(entry.getKey());
+
+				StatisticalAnalysisWarningTopVo item = new StatisticalAnalysisWarningTopVo();
+				item.setNum(i++);
+				item.setName(entry.getKey());
+				int frequencyday=ls.stream().mapToInt(WarningInfoDay::getFrequencyday).sum();//合计
+				double totalhoursday=ls.stream().mapToDouble(WarningInfoDay::getTotalhoursday).sum();//合计
+				item.setFrequency(frequencyday);
+				item.setFrequencyday(frequencyday);
+				item.setTotalhours(totalhoursday);
+
+				if(i<10)
+				{
+					list.add(item);
+				}else
+				{
+					break;
+				}
+			}
+
+			list=sortStatisticalAnalysisWarningTopVoList(tablepar,list);
+		}
+		return list;
+
+	}
+
+	/*****************************************************************************************************/
+
+
+
+	public List<StatisticalAnalysisWarningTopVo> getWarningInfoDayByWarningidPercentage(Date beginDate, Date endDate)  {
+
+		List<StatisticalAnalysisWarningTopVo> list =new ArrayList<>();
+
+		WarningInfoDayExample example=new WarningInfoDayExample();
+		example.setOrderByClause("frequencyday desc");
+
+
+		WarningInfoDayExample.Criteria criteria =example.createCriteria();
+
+		criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+
+		List<WarningInfoDay> wils=warningInfoDayMapper.selectByExample(example);
+
+		Map<String, List<WarningInfoDay>> lsMap = new LinkedHashMap<String, List<WarningInfoDay>>();
+		if(!wils.isEmpty())
+		{
+
+			int total=wils.stream().mapToInt(WarningInfoDay::getFrequencyday).sum();//总合计
+			for(WarningInfoDay ap:wils)
+			{
+				List<WarningInfoDay> items=null;
+				if (lsMap.containsKey(ap.getWarningid())) {
+					items = lsMap.get(ap.getWarningid());
+					items.add(ap);
+					lsMap.put(ap.getWarningid(), items);
+				} else {
+					items = new ArrayList<>();
+					items.add(ap);
+					lsMap.put(ap.getWarningid(), items);
+				}
+
+			}
+
+
+			Set<Map.Entry<String, List<WarningInfoDay>>> set = lsMap.entrySet();
+			int i=0;
+			for (Iterator<Map.Entry<String, List<WarningInfoDay>>> it = set.iterator(); it.hasNext();) {
+				Map.Entry<String, List<WarningInfoDay>> entry = (Map.Entry<String, List<WarningInfoDay>>) it.next();
+				System.out.println(entry.getKey() + "--->" + entry.getValue());
+
+				List<WarningInfoDay> ls=entry.getValue();
+
+				Warning warning= InitialRunner.warningmap.get(entry.getKey());
+
+				StatisticalAnalysisWarningTopVo item = new StatisticalAnalysisWarningTopVo();
+				item.setNum(i++);
+				item.setName(warning.getChinesetext());
+				int frequencyday=ls.stream().mapToInt(WarningInfoDay::getFrequencyday).sum();//合计
+				double totalhoursday=ls.stream().mapToDouble(WarningInfoDay::getTotalhoursday).sum();//合计
+				item.setFrequency(frequencyday);
+				item.setFrequencyday(frequencyday);
+				item.setTotalhours(totalhoursday);
+
+				if(i<10)
+				{
+					list.add(item);
+				}else
+				{
+					break;
+				}
+			}
+
+			int sum = 0;
+			for (StatisticalAnalysisWarningTopVo item : list) {
+				sum += item.getFrequency();
+				if (total != 0) {
+					BigDecimal b1 = new BigDecimal(item.getFrequency());
+					BigDecimal b2 = new BigDecimal(total);
+
+					item.setTotalhours(b1.divide(b2, 2, RoundingMode.HALF_EVEN).doubleValue());
+				} else {
+					item.setTotalhours(0d);
+				}
+			}
+
+			if (sum != total) {
+				StatisticalAnalysisWarningTopVo item = new StatisticalAnalysisWarningTopVo();
+				item.setNum(i++);
+				item.setName("其他");
+				item.setFrequency(sum);
+				if (total != 0) {
+					BigDecimal b1 = new BigDecimal(item.getFrequency());
+					BigDecimal b2 = new BigDecimal(total);
+
+					item.setTotalhours(b1.divide(b2, 2, RoundingMode.HALF_EVEN).doubleValue());
+				}
+				list.add(item);
+			}
+
+		}
+		return list;
+
+	}
+
+
+	public List<StatisticalAnalysisWarningTopVo> getWarningInfoDayByWarningClassifyPercentage(Date beginDate, Date endDate)  {
+
+		List<StatisticalAnalysisWarningTopVo> list =new ArrayList<>();
+
+		WarningInfoDayExample example=new WarningInfoDayExample();
+		example.setOrderByClause("frequencyday desc");
+
+
+		WarningInfoDayExample.Criteria criteria =example.createCriteria();
+
+		criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+
+		List<WarningInfoDay> wils=warningInfoDayMapper.selectByExample(example);
+
+		Map<String, List<WarningInfoDay>> lsMap = new LinkedHashMap<String, List<WarningInfoDay>>();
+		if(!wils.isEmpty())
+		{
+			int total=wils.stream().mapToInt(WarningInfoDay::getFrequencyday).sum();//总合计
+			for(WarningInfoDay ap:wils)
+			{
+				Warning warning=InitialRunner.warningmap.get(ap.getWarningid());
+				WarningClassify warningClassify=InitialRunner.warningClassifymap.get(warning.getWarningclassifyid());
+				List<WarningInfoDay> items=null;
+
+				if (lsMap.containsKey(warningClassify.getName())) {
+					items = lsMap.get(warningClassify.getName());
+					items.add(ap);
+					lsMap.put(warningClassify.getName(), items);
+				} else {
+					items = new ArrayList<>();
+					items.add(ap);
+					lsMap.put(warningClassify.getName(), items);
+				}
+
+			}
+
+
+			Set<Map.Entry<String, List<WarningInfoDay>>> set = lsMap.entrySet();
+			int i=0;
+			for (Iterator<Map.Entry<String, List<WarningInfoDay>>> it = set.iterator(); it.hasNext();) {
+				Map.Entry<String, List<WarningInfoDay>> entry = (Map.Entry<String, List<WarningInfoDay>>) it.next();
+				System.out.println(entry.getKey() + "--->" + entry.getValue());
+
+				List<WarningInfoDay> ls=entry.getValue();
+
+				Warning warning= InitialRunner.warningmap.get(entry.getKey());
+
+				StatisticalAnalysisWarningTopVo item = new StatisticalAnalysisWarningTopVo();
+				item.setNum(i++);
+				item.setName(entry.getKey());
+				int frequencyday=ls.stream().mapToInt(WarningInfoDay::getFrequencyday).sum();//合计
+				double totalhoursday=ls.stream().mapToDouble(WarningInfoDay::getTotalhoursday).sum();//合计
+				item.setFrequency(frequencyday);
+				item.setFrequencyday(frequencyday);
+				item.setTotalhours(totalhoursday);
+
+				if(i<10)
+				{
+					list.add(item);
+				}else
+				{
+					break;
+				}
+			}
+
+			int sum = 0;
+			for (StatisticalAnalysisWarningTopVo item : list) {
+				sum += item.getFrequency();
+				if (total != 0) {
+					BigDecimal b1 = new BigDecimal(item.getFrequency());
+					BigDecimal b2 = new BigDecimal(total);
+
+					item.setTotalhours(b1.divide(b2, 2, RoundingMode.HALF_EVEN).doubleValue());
+				} else {
+					item.setTotalhours(0d);
+				}
+			}
+
+			if (sum != total) {
+				StatisticalAnalysisWarningTopVo item = new StatisticalAnalysisWarningTopVo();
+				item.setNum(i++);
+				item.setName("其他");
+				item.setFrequency(sum);
+				if (total != 0) {
+					BigDecimal b1 = new BigDecimal(item.getFrequency());
+					BigDecimal b2 = new BigDecimal(total);
+
+					item.setTotalhours(b1.divide(b2, 2, RoundingMode.HALF_EVEN).doubleValue());
+				}
+				list.add(item);
+			}
+
+		}
+		return list;
+
+	}
+
+
+
+
+	public List<StatisticalAnalysisWarningTopVo> getWarningInfoDayByManufacturerPercentage(Date beginDate, Date endDate)  {
+
+		List<StatisticalAnalysisWarningTopVo> list =new ArrayList<>();
+
+		WarningInfoDayExample example=new WarningInfoDayExample();
+		example.setOrderByClause("frequencyday desc");
+
+
+		WarningInfoDayExample.Criteria criteria =example.createCriteria();
+
+		criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+
+		List<WarningInfoDay> wils=warningInfoDayMapper.selectByExample(example);
+
+		Map<String, List<WarningInfoDay>> lsMap = new LinkedHashMap<String, List<WarningInfoDay>>();
+		if(!wils.isEmpty())
+		{
+			int total=wils.stream().mapToInt(WarningInfoDay::getFrequencyday).sum();//总合计
+			for(WarningInfoDay ap:wils)
+			{
+				Manufacturer manufacturer=InitialRunner.manufacturermap.get(ap.getManufacturerid());
+
+				List<WarningInfoDay> items=null;
+
+				if (lsMap.containsKey(manufacturer.getName())) {
+					items = lsMap.get(manufacturer.getName());
+					items.add(ap);
+					lsMap.put(manufacturer.getName(), items);
+				} else {
+					items = new ArrayList<>();
+					items.add(ap);
+					lsMap.put(manufacturer.getName(), items);
+				}
+
+			}
+
+
+			Set<Map.Entry<String, List<WarningInfoDay>>> set = lsMap.entrySet();
+			int i=0;
+			for (Iterator<Map.Entry<String, List<WarningInfoDay>>> it = set.iterator(); it.hasNext();) {
+				Map.Entry<String, List<WarningInfoDay>> entry = (Map.Entry<String, List<WarningInfoDay>>) it.next();
+				System.out.println(entry.getKey() + "--->" + entry.getValue());
+
+				List<WarningInfoDay> ls=entry.getValue();
+
+				Warning warning= InitialRunner.warningmap.get(entry.getKey());
+
+				StatisticalAnalysisWarningTopVo item = new StatisticalAnalysisWarningTopVo();
+				item.setNum(i++);
+				item.setName(entry.getKey());
+				int frequencyday=ls.stream().mapToInt(WarningInfoDay::getFrequencyday).sum();//合计
+				double totalhoursday=ls.stream().mapToDouble(WarningInfoDay::getTotalhoursday).sum();//合计
+				item.setFrequency(frequencyday);
+				item.setFrequencyday(frequencyday);
+				item.setTotalhours(totalhoursday);
+
+				if(i<10)
+				{
+					list.add(item);
+				}else
+				{
+					break;
+				}
+
+			}
+
+			int sum = 0;
+			for (StatisticalAnalysisWarningTopVo item : list) {
+				sum += item.getFrequency();
+				if (total != 0) {
+					BigDecimal b1 = new BigDecimal(item.getFrequency());
+					BigDecimal b2 = new BigDecimal(total);
+
+					item.setTotalhours(b1.divide(b2, 2, RoundingMode.HALF_EVEN).doubleValue());
+				} else {
+					item.setTotalhours(0d);
+				}
+			}
+
+			if (sum != total) {
+				StatisticalAnalysisWarningTopVo item = new StatisticalAnalysisWarningTopVo();
+				item.setNum(i++);
+				item.setName("其他");
+				item.setFrequency(sum);
+				if (total != 0) {
+					BigDecimal b1 = new BigDecimal(item.getFrequency());
+					BigDecimal b2 = new BigDecimal(total);
+
+					item.setTotalhours(b1.divide(b2, 2, RoundingMode.HALF_EVEN).doubleValue());
+				}
+				list.add(item);
+			}
+		}
+		return list;
+
+	}
 }

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

@@ -178,4 +178,25 @@ public class WindturbinecurvefittingmonthService implements BaseService<Windturb
 		return list;
 
 	}
+
+	public List<Windturbinecurvefittingmonth> getWindturbinecurvefittingmonthList(String windturbineid,String year,String month)  {
+
+
+		List<Windturbinecurvefittingmonth> list =new ArrayList<>();
+
+		WindturbinecurvefittingmonthExample example=new WindturbinecurvefittingmonthExample();
+		example.setOrderByClause("windturbineid ASC");
+
+		WindturbinecurvefittingmonthExample.Criteria criteria =example.createCriteria();
+
+		criteria.andWindturbineidEqualTo(windturbineid);
+		criteria.andYearEqualTo(year);
+		criteria.andMonthEqualTo(month);
+
+		list= windturbinecurvefittingmonthMapper.selectByExample(example);
+
+
+		return list;
+
+	}
 }

src/main/java/com/gyee/frame/service/leaderboard/LeaderboardService.java

@@ -1,14 +1,9 @@
 package com.gyee.frame.service.leaderboard;
 
 import com.gyee.frame.common.spring.InitialRunner;
-import com.gyee.frame.model.auto.ModelpowerRd;
-import com.gyee.frame.model.auto.Windpowerstation;
-import com.gyee.frame.model.auto.Windturbinecurvefittingmonth;
-import com.gyee.frame.model.custom.StatisticalAnalysisRnewTopVo;
-import com.gyee.frame.model.custom.StatisticalAnalysisTopVo;
-import com.gyee.frame.service.ActivePowerDataService;
-import com.gyee.frame.service.WindturbinecurvefittingmonthService;
-import com.gyee.frame.service.WindturbineinfodayService;
+import com.gyee.frame.model.auto.*;
+import com.gyee.frame.model.custom.*;
+import com.gyee.frame.service.*;
 import com.gyee.frame.util.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -26,7 +21,26 @@ public class LeaderboardService {
     private WindturbinecurvefittingmonthService windturbinecurvefittingmonthService;
     @Resource
     private WindturbineinfodayService windturbineinfodayService;
+    @Resource
+    private Windturbineinfoday3Service windturbineinfoday3Service;
+    @Resource
+    private WarningInfoDayService warningInfoDayService;
+    @Resource
+    private WindturbinecurvefittingService windturbinecurvefittingService;
+    @Resource
+    private CurvefittingmainService curvefittingmainService;
+    @Resource
+    private CurvefittingmonthmainService curvefittingmonthmainService;
 
+    private final String SJBZ = "sjbz";
+    private final String SJZY = "sjzy";
+    private final String ZYBZ = "zybz";
+    private final String TB = "tb";
+    private final String HB = "hb";
+    private final String BG = "bg";
+
+    private String name1;
+    private String name2;
 
     public List<StatisticalAnalysisTopVo> getRnewTopDate(String wpIps, Date beginDate, Date endDate) {
 
@@ -199,7 +213,7 @@ public class LeaderboardService {
         return map;
     }
 
-    public List<StatisticalAnalysisTopVo> getWindturbineinfo(String wpIds, Date beginDate, Date endDate)  {
+    public List<StatisticalAnalysisTopVo> totalPowerCapacityTopList(String wpIds, Date beginDate, Date endDate)  {
         List<StatisticalAnalysisTopVo> ls=new ArrayList<>();
 
         if ( StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
@@ -230,4 +244,781 @@ public class LeaderboardService {
         return ls;
     }
 
+    public List<Windturbineinfoday3> utilizationList(Tablepar tablepar, String wpIds, Date beginDate, Date endDate, String type)  {
+        List<Windturbineinfoday3> ls=new ArrayList<>();
+
+        if (StringUtils.notEmp(wpIds) && StringUtils.notEmp(type) &&  StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
+
+
+            ls = windturbineinfoday3Service.utilizationList(tablepar, wpIds, beginDate, endDate, type);
+
+        }
+
+        return ls;
+    }
+
+    public List<Windturbineinfoday3> lossList(Tablepar tablepar, String wpIds, Date beginDate, Date endDate, String type)  {
+        List<Windturbineinfoday3> ls=new ArrayList<>();
+
+        if (StringUtils.notEmp(wpIds) && StringUtils.notEmp(type) &&  StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
+
+
+            ls = windturbineinfoday3Service.lossList(tablepar, wpIds, beginDate, endDate, type);
+
+        }
+
+        return ls;
+    }
+
+    public List<StatisticalAnalysisTopVo> loadfactortoplist(String wpIds, Date beginDate, Date endDate)  {
+        List<StatisticalAnalysisTopVo> vos=new ArrayList<>();
+
+        if (StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
+            List<String> wpids=new ArrayList<>();
+            if(StringUtils.isNotEmpty(wpIds))
+            {
+                String[] wpid = wpIds.split(",");
+
+                for(String w:wpid)
+                {
+                    wpids.add(w);
+                }
+            }else
+            {
+                for(Windpowerstation wp:InitialRunner.wpls)
+                {
+                    if(wp.getId().endsWith("FDC"))
+                    {
+                        wpids.add(wp.getId());
+                    }
+                }
+            }
+
+            vos = windturbineinfodayService.getWindturbineinfo(wpids, beginDate, endDate);
+
+            if (!vos.isEmpty()) {
+                Map<String, Equipmentmodel> mlmap = InitialRunner.mlmap;
+                Map<String, Windturbine> wtmap = InitialRunner.wtmap;
+                for (StatisticalAnalysisTopVo vo : vos) {
+                    if (StringUtils.notEmp(vo.getWindturbine()) && wtmap.containsKey(vo.getWindturbine())) {
+                        Windturbine wt = wtmap.get(vo.getWindturbine());
+                        if (StringUtils.notEmp(wt.getModelid()) && mlmap.containsKey(wt.getModelid())) {
+                            Equipmentmodel ml = mlmap.get(wt.getModelid());
+                            if (ml.getPowerproduction() != 0) {
+                                BigDecimal b1 = new BigDecimal(vo.getGeneratingCapacity());
+                                BigDecimal b2 = new BigDecimal(ml.getPowerproduction());
+
+                                vo.setGeneratingCapacity(b1.divide(b2.divide(new BigDecimal(100), 2, RoundingMode.HALF_UP), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)).doubleValue());
+
+                            }
+
+                        }
+                    }
+                }
+
+
+            }
+
+        }
+
+        return vos;
+    }
+
+
+    public List<StatisticalAnalysisWarningTopVo> getWarningTopDate(Tablepar tablepar,String type,  Date beginDate,  Date endDate)  {
+        List<StatisticalAnalysisWarningTopVo> vos=new ArrayList<>();
+
+        if(StringUtils.isNotEmpty(type))
+        {
+            switch (type) {
+                case "1":
+                    vos=warningInfoDayService.getWarningInfoDayByWarningid(tablepar,beginDate, endDate);
+                    break;
+                case "2":
+                    vos=warningInfoDayService.getWarningInfoDayByWarningClassify(tablepar,beginDate, endDate);
+                    break;
+                case "3":
+                    vos=warningInfoDayService.getWarningInfoDayByManufacturer(tablepar,beginDate, endDate);
+                    break;
+                default:
+
+                    break;
+            }
+        }
+
+        return vos;
+    }
+    public List<StatisticalAnalysisWarningTopVo> getWarningTopDatePercentage(String type,  Date beginDate,  Date endDate)  {
+        List<StatisticalAnalysisWarningTopVo> vos=new ArrayList<>();
+
+        if(StringUtils.isNotEmpty(type))
+        {
+            switch (type) {
+                case "1":
+                    vos=warningInfoDayService.getWarningInfoDayByWarningidPercentage(beginDate, endDate);
+                    break;
+                case "2":
+                    vos=warningInfoDayService.getWarningInfoDayByWarningClassifyPercentage(beginDate, endDate);
+                    break;
+                case "3":
+                    vos=warningInfoDayService.getWarningInfoDayByManufacturerPercentage(beginDate, endDate);
+                    break;
+                default:
+
+                    break;
+            }
+        }
+        return vos;
+    }
+    /*******************************************************************************************************************************************************/
+
+    public List<Curvefittingmain> curvefittingmainList(Tablepar tablepar, String wpId, Date recorddate)  {
+
+        List<Curvefittingmain> list =new ArrayList<>();
+        List<String> wtIds=new ArrayList<>();
+        if(StringUtils.notEmp(wpId) && StringUtils.notEmp(recorddate))
+        {
+            List<Windturbine> wtls=InitialRunner.wp_wtmap.get(wpId);
+            for(Windturbine wt:wtls)
+            {
+                wtIds.add(wt.getId());
+            }
+
+
+            list =curvefittingmainService.getCurvefittingmainList(tablepar,wtIds,recorddate);
+        }
+
+        return list;
+
+    }
+
+    public  Map<String, Object>  getCurvechatAjax(String type,String wtId,  Date recorddate)  {
+        Map<String, Object> map = new HashMap<String, Object>();
+
+        if(StringUtils.notEmp(type) && StringUtils.notEmp(wtId) && StringUtils.notEmp(recorddate))
+        {
+            List<DataVo> datavos = new ArrayList<DataVo>();
+            List<Windturbinecurvefitting> wcls = windturbinecurvefittingService.comparechatAjax(wtId, recorddate);
+            Map<String, Windturbine> wtmap = InitialRunner.wtmap;
+            Map<String, Map<String, ModelPower>> modelPowermap = InitialRunner.modelPowermap;
+            Map<String, ModelPower> modelmap = null;
+            if (wtmap.containsKey(wtId)) {
+                Windturbine wt = wtmap.get(wtId);
+                if (modelPowermap.containsKey(wt.getModelid())) {
+                    modelmap = modelPowermap.get(wt.getModelid());
+                }
+            }
+
+            if (!wcls.isEmpty()) {
+                Collections.sort(wcls, new Comparator<Windturbinecurvefitting>() {
+                    public int compare(Windturbinecurvefitting arg0, Windturbinecurvefitting arg1) {
+                        return arg0.getSpeed().compareTo(arg1.getSpeed());
+
+                    }
+                });
+                for (Windturbinecurvefitting wc : wcls) {
+
+                    DataVo vo = new DataVo();
+                    int c = (int) wc.getSpeed().intValue();
+                    if (c == wc.getSpeed()) {
+                        vo.setValue1(wc.getSpeed());
+                        if (StringUtils.notEmp(type) && type.equals(SJBZ) && null != modelmap) {
+                            if (modelmap.containsKey(String.valueOf(wc.getSpeed()))) {
+                                ModelPower mp = modelmap.get(String.valueOf(wc.getSpeed()));
+                                vo.setValue3(mp.getEnsurepower());
+                            } else {
+                                vo.setValue3(0.0);
+                            }
+                            vo.setValue2(wc.getActualpower());
+
+                        } else if (StringUtils.notEmp(type) && type.equals(SJZY)) {
+                            vo.setValue2(wc.getActualpower());
+                            vo.setValue3(wc.getOptimalpower());
+
+                        } else if (StringUtils.notEmp(type) && type.equals(ZYBZ) && null != modelmap) {
+                            if (modelmap.containsKey(String.valueOf(wc.getSpeed()))) {
+                                ModelPower mp = modelmap.get(String.valueOf(wc.getSpeed()));
+                                vo.setValue3(mp.getEnsurepower());
+                            } else {
+                                vo.setValue3(0.0);
+                            }
+                            vo.setValue2(wc.getOptimalpower());
+
+                        }
+
+                        datavos.add(vo);
+
+                    }
+                }
+            }
+            curvechat(type);
+
+            map.put("datas", datavos);
+            map.put("name1", name1);
+            map.put("name2", name2);
+        }
+        return map;
+    }
+
+
+    public  Map<String, Object>  curvechatAjaxtb(String type,String wtId,  Date recorddate)  {
+        Map<String, Object> map = new HashMap<String, Object>();
+
+        if(StringUtils.notEmp(type) && StringUtils.notEmp(wtId) && StringUtils.notEmp(recorddate))
+        {
+            List<DataVo> datavos = new ArrayList<DataVo>();
+            Map<Double, Double> speedmap = new HashMap<Double, Double>();
+            List<Windturbinecurvefitting> thisdayls = windturbinecurvefittingService.comparechatAjax(wtId,recorddate);
+
+            // 去年统计指标
+            Calendar cal = Calendar.getInstance();
+            cal.setTime(recorddate);
+            cal.add(Calendar.YEAR, -1);
+
+            List<Windturbinecurvefitting> lastyearls = windturbinecurvefittingService.comparechatAjax(wtId,cal.getTime());
+
+            if (!lastyearls.isEmpty()) {
+
+                for (Windturbinecurvefitting wc : lastyearls) {
+                    int c = (int) wc.getSpeed().intValue();
+                    if (c == wc.getSpeed()) {
+                        speedmap.put(wc.getSpeed(), wc.getActualpower());
+                    }
+                }
+            }
+            if (!thisdayls.isEmpty()) {
+                Collections.sort(thisdayls, new Comparator<Windturbinecurvefitting>() {
+                    public int compare(Windturbinecurvefitting arg0, Windturbinecurvefitting arg1) {
+                        return arg0.getSpeed().compareTo(arg1.getSpeed());
+                    }
+                });
+
+                for (Windturbinecurvefitting wc : thisdayls) {
+
+                    DataVo vo = new DataVo();
+                    int c = (int) wc.getSpeed().intValue();
+                    if (c == wc.getSpeed()) {
+                        vo.setValue1(wc.getSpeed());
+                        vo.setValue2(wc.getActualpower());
+
+                        if (speedmap.containsKey(wc.getSpeed())) {
+                            vo.setValue3(speedmap.get(wc.getSpeed()));
+                        } else {
+                            vo.setValue3(0.0);
+                        }
+                        datavos.add(vo);
+
+                    }
+                }
+            }
+
+            curvechat(type);
+
+            map.put("datas", datavos);
+            map.put("name1", name1);
+            map.put("name2", name2);
+        }
+        return map;
+    }
+
+    public  Map<String, Object>  curvechatAjaxhb(String type,String wtId,  Date recorddate)  {
+        Map<String, Object> map = new HashMap<String, Object>();
+
+        if(StringUtils.notEmp(type) && StringUtils.notEmp(wtId) && StringUtils.notEmp(recorddate))
+        {
+            List<DataVo> datavos = new ArrayList<DataVo>();
+            Map<Double, Double> speedmap = new HashMap<Double, Double>();
+            List<Windturbinecurvefitting> thisdayls = windturbinecurvefittingService.comparechatAjax(wtId,recorddate);
+
+            // 上个月统计指标
+            Calendar cal = Calendar.getInstance();
+            cal.setTime(recorddate);
+            cal.add(Calendar.DAY_OF_MONTH, -1);
+
+            List<Windturbinecurvefitting> lastyearls = windturbinecurvefittingService.comparechatAjax(wtId,cal.getTime());
+
+            if (!lastyearls.isEmpty()) {
+
+                for (Windturbinecurvefitting wc : lastyearls) {
+                    int c = (int) wc.getSpeed().intValue();
+                    if (c == wc.getSpeed()) {
+                        speedmap.put(wc.getSpeed(), wc.getActualpower());
+                    }
+                }
+            }
+            if (!thisdayls.isEmpty()) {
+                Collections.sort(thisdayls, new Comparator<Windturbinecurvefitting>() {
+                    public int compare(Windturbinecurvefitting arg0, Windturbinecurvefitting arg1) {
+                        return arg0.getSpeed().compareTo(arg1.getSpeed());
+                    }
+                });
+
+                for (Windturbinecurvefitting wc : thisdayls) {
+
+                    DataVo vo = new DataVo();
+                    int c = (int) wc.getSpeed().intValue();
+                    if (c == wc.getSpeed()) {
+                        vo.setValue1(wc.getSpeed());
+                        vo.setValue2(wc.getActualpower());
+
+                        if (speedmap.containsKey(wc.getSpeed())) {
+                            vo.setValue3(speedmap.get(wc.getSpeed()));
+                        } else {
+                            vo.setValue3(0.0);
+                        }
+                        datavos.add(vo);
+
+                    }
+                }
+            }
+
+            curvechat(type);
+
+            map.put("datas", datavos);
+            map.put("name1", name1);
+            map.put("name2", name2);
+        }
+        return map;
+    }
+
+    public  Map<String, Object>  curvechatAjaxbg(String type,String wtId,  Date recorddate)  {
+        Map<String, Object> map = new HashMap<String, Object>();
+
+        if(StringUtils.notEmp(type) && StringUtils.notEmp(wtId) && StringUtils.notEmp(recorddate))
+        {
+            List<DataVo> datavos = new ArrayList<DataVo>();
+            Map<Double, Double> speedmap = new HashMap<Double, Double>();
+            List<Windturbinecurvefitting> thisdayls = windturbinecurvefittingService.comparechatAjax(wtId,recorddate);
+
+            // 标杆风机指标
+            Windturbine wt = InitialRunner.wtmap.get(wtId);
+            String stid = wt.getStandardid();
+
+            if(StringUtils.notEmp(stid))
+            {
+                List<Windturbinecurvefitting> stmonthls = windturbinecurvefittingService.comparechatAjax(wtId,recorddate);
+
+                if (null != stmonthls && !stmonthls.isEmpty()) {
+
+                    if (!stmonthls.isEmpty()) {
+
+                        for (Windturbinecurvefitting wc : stmonthls) {
+                            int c = (int) wc.getSpeed().intValue();
+                            if (c == wc.getSpeed()) {
+                                speedmap.put(wc.getSpeed(), wc.getActualpower());
+                            }
+                        }
+                    }
+                }
+
+                if (!thisdayls.isEmpty()) {
+                    Collections.sort(thisdayls, new Comparator<Windturbinecurvefitting>() {
+                        public int compare(Windturbinecurvefitting arg0, Windturbinecurvefitting arg1) {
+                            return arg0.getSpeed().compareTo(arg1.getSpeed());
+                            /*
+                             * int result = 0; if (arg0.getSpeed() >
+                             * arg1.getSpeed()) result = 1; else result = 0; return
+                             * result;
+                             */
+                        }
+                    });
+                    for (Windturbinecurvefitting wc : thisdayls) {
+
+                        DataVo vo = new DataVo();
+                        int c = (int) wc.getSpeed().intValue();
+                        if (c == wc.getSpeed()) {
+                            vo.setValue1(wc.getSpeed());
+                            vo.setValue2(wc.getActualpower());
+
+                            if (speedmap.containsKey(wc.getSpeed())) {
+                                vo.setValue3(speedmap.get(wc.getSpeed()));
+                            } else {
+                                vo.setValue3(0.0);
+                            }
+                            datavos.add(vo);
+
+                        }
+                    }
+                }
+
+                curvechat(type);
+
+                map.put("datas", datavos);
+                map.put("name1", name1);
+                map.put("name2", name2);
+            }
+
+        }
+        return map;
+    }
+
+    private void curvechat(String type) {
+        if (StringUtils.notEmp(type) && type.equals(SJBZ)) {
+
+            name1 = "实际功率";
+            name2 = "保证功率";
+
+        } else if (StringUtils.notEmp(type) && type.equals(SJZY)) {
+
+            name1 = "实际功率";
+            name2 = "最优功率";
+        } else if (StringUtils.notEmp(type) && type.equals(ZYBZ)) {
+
+            name1 = "最优功率";
+            name2 = "保证功率";
+        } else if (StringUtils.notEmp(type) && type.equals(TB)) {
+
+            name1 = "本日实际功率";
+            name2 = "去年同期实际功率";
+        } else if (StringUtils.notEmp(type) && type.equals(HB)) {
+
+            name1 = "本日实际功率";
+            name2 = "上日实际功率";
+        } else if (StringUtils.notEmp(type) && type.equals(BG)) {
+
+            name1 = "本日实际功率";
+            name2 = "标杆实际功率";
+        }
+
+    }
+
+
+    /*******************************************************************************************************************************************************/
+
+    public List<Curvefittingmonthmain> curvefittingmonthmainList(Tablepar tablepar, String wpId, String year,String month)  {
+
+        List<Curvefittingmonthmain> list =new ArrayList<>();
+        List<String> wtIds=new ArrayList<>();
+        if(StringUtils.notEmp(wpId) && StringUtils.notEmp(year) && StringUtils.notEmp(month))
+        {
+            List<Windturbine> wtls=InitialRunner.wp_wtmap.get(wpId);
+            for(Windturbine wt:wtls)
+            {
+                wtIds.add(wt.getId());
+            }
+
+
+            list =curvefittingmonthmainService.getCurvefittingmonthmainList(tablepar,wtIds,year,month);
+        }
+
+        return list;
+
+    }
+    public  Map<String, Object>  curveMonthchatAjax(String type,String wtId, String year,String month)  {
+        Map<String, Object> map = new HashMap<String, Object>();
+
+        if(StringUtils.notEmp(type) && StringUtils.notEmp(wtId) && StringUtils.notEmp(year) && StringUtils.notEmp(month))
+        {
+            List<DataVo> datavos = new ArrayList<DataVo>();
+            List<Windturbinecurvefittingmonth> wcls = windturbinecurvefittingmonthService.getWindturbinecurvefittingmonthList(wtId, year,month);
+            Map<String, Windturbine> wtmap = InitialRunner.wtmap;
+            Map<String, Map<String, ModelPower>> modelPowermap = InitialRunner.modelPowermap;
+
+            Map<String, ModelPower> modelmap = null;
+            if (wtmap.containsKey(wtId)) {
+                Windturbine wt = wtmap.get(wtId);
+                if (modelPowermap.containsKey(wt.getModelid())) {
+                    modelmap = modelPowermap.get(wt.getModelid());
+                }
+            }
+
+            if (!wcls.isEmpty()) {
+                Collections.sort(wcls, new Comparator<Windturbinecurvefittingmonth>() {
+                    public int compare(Windturbinecurvefittingmonth arg0, Windturbinecurvefittingmonth arg1) {
+                        return arg0.getSpeed().compareTo(arg1.getSpeed());
+                        /*
+                         * int result = 0; if (arg0.getSpeed() >
+                         * arg1.getSpeed()) result = 1; else result = 0; return
+                         * result;
+                         */
+                    }
+                });
+                for (Windturbinecurvefittingmonth wc : wcls) {
+                    // private final String SJBZ ="sjbz" ;
+                    // private final String SJZY ="sjzy" ;
+                    // private final String ZYBZ ="zybz" ;
+                    DataVo vo = new DataVo();
+                    int c = (int) wc.getSpeed().intValue();
+                    if (c == wc.getSpeed()) {
+                        vo.setValue1(wc.getSpeed());
+                        if (StringUtils.notEmp(type) && type.equals(SJBZ) && null != modelmap) {
+                            if (modelmap.containsKey(String.valueOf(wc.getSpeed()))) {
+                                ModelPower mp = modelmap.get(String.valueOf(wc.getSpeed()));
+                                vo.setValue3(mp.getEnsurepower());
+                            } else {
+                                vo.setValue3(0.0);
+                            }
+                            vo.setValue2(wc.getActualpower());
+                            name1 = "实际功率";
+                            name2 = "保证功率";
+
+                        } else if (StringUtils.notEmp(type) && type.equals(SJZY)) {
+                            vo.setValue2(wc.getActualpower());
+                            vo.setValue3(wc.getOptimalpower());
+                            name1 = "实际功率";
+                            name2 = "最优功率";
+                        } else if (StringUtils.notEmp(type) && type.equals(ZYBZ) && null != modelmap) {
+                            if (modelmap.containsKey(String.valueOf(wc.getSpeed()))) {
+                                ModelPower mp = modelmap.get(String.valueOf(wc.getSpeed()));
+                                vo.setValue3(mp.getEnsurepower());
+                            } else {
+                                vo.setValue3(0.0);
+                            }
+                            vo.setValue2(wc.getOptimalpower());
+
+                            name1 = "最优功率";
+                            name2 = "保证功率";
+                        }
+
+                        datavos.add(vo);
+
+                    }
+                }
+            }
+            curvemonthchat(type);
+
+            map.put("datas", datavos);
+            map.put("name1", name1);
+            map.put("name2", name2);
+        }
+        return map;
+    }
+
+
+    public  Map<String, Object>  curveMonthchatAjaxtb(String type,String wtId,  String year,String month)  {
+        Map<String, Object> map = new HashMap<String, Object>();
+
+        if(StringUtils.notEmp(type) && StringUtils.notEmp(wtId) && StringUtils.notEmp(year) && StringUtils.notEmp(month))
+        {
+            List<DataVo> datavos = new ArrayList<DataVo>();
+            Map<Double, Double> speedmap = new HashMap<Double, Double>();
+            List<Windturbinecurvefittingmonth> thismonthls = windturbinecurvefittingmonthService.getWindturbinecurvefittingmonthList(wtId, year,month);
+
+            // 去年统计指标
+            Calendar cal = Calendar.getInstance();
+            cal.set(Calendar.YEAR,Integer.valueOf(year));
+            cal.set(Calendar.MONTH,Integer.valueOf(month)-1);
+            cal.add(Calendar.YEAR, -1);
+
+            String lastyear=String.valueOf(cal.get(Calendar.YEAR));
+
+            List<Windturbinecurvefittingmonth> lastyearls =windturbinecurvefittingmonthService.getWindturbinecurvefittingmonthList(wtId, lastyear,month);
+
+            if (!lastyearls.isEmpty()) {
+
+                for (Windturbinecurvefittingmonth wc : lastyearls) {
+                    int c = (int) wc.getSpeed().intValue();
+                    if (c == wc.getSpeed()) {
+                        speedmap.put(wc.getSpeed(), wc.getActualpower());
+                    }
+                }
+            }
+            if (!thismonthls.isEmpty()) {
+                Collections.sort(thismonthls, new Comparator<Windturbinecurvefittingmonth>() {
+                    public int compare(Windturbinecurvefittingmonth arg0, Windturbinecurvefittingmonth arg1) {
+                        return arg0.getSpeed().compareTo(arg1.getSpeed());
+                    }
+                });
+
+                for (Windturbinecurvefittingmonth wc : thismonthls) {
+
+                    DataVo vo = new DataVo();
+                    int c = (int) wc.getSpeed().intValue();
+                    if (c == wc.getSpeed()) {
+                        vo.setValue1(wc.getSpeed());
+                        vo.setValue2(wc.getActualpower());
+                        name1 = "本月实际功率";
+                        name2 = "去年同期实际功率";
+                        if (speedmap.containsKey(wc.getSpeed())) {
+                            vo.setValue3(speedmap.get(wc.getSpeed()));
+                        } else {
+                            vo.setValue3(0.0);
+                        }
+                        datavos.add(vo);
+
+                    }
+                }
+            }
+
+            curvemonthchat(type);
+
+            map.put("datas", datavos);
+            map.put("name1", name1);
+            map.put("name2", name2);
+        }
+        return map;
+    }
+
+    public  Map<String, Object>  curveMonthchatAjaxhb(String type,String wtId,  String year,String month)  {
+        Map<String, Object> map = new HashMap<String, Object>();
+
+        if(StringUtils.notEmp(type) && StringUtils.notEmp(wtId) && StringUtils.notEmp(year) && StringUtils.notEmp(month))
+        {
+            List<DataVo> datavos = new ArrayList<DataVo>();
+            Map<Double, Double> speedmap = new HashMap<Double, Double>();
+            List<Windturbinecurvefittingmonth> thismonthls = windturbinecurvefittingmonthService.getWindturbinecurvefittingmonthList(wtId, year,month);
+
+            // 上个月统计指标
+            Calendar cal = Calendar.getInstance();
+            cal.set(Calendar.YEAR,Integer.valueOf(year));
+            cal.set(Calendar.MONTH,Integer.valueOf(month)-1);
+            cal.add(Calendar.MONTH, -1);
+
+            String lastyearmonth=String.valueOf(cal.get(Calendar.MONTH));
+
+            List<Windturbinecurvefittingmonth> lastmonthls =windturbinecurvefittingmonthService.getWindturbinecurvefittingmonthList(wtId, year,lastyearmonth);
+
+
+            if (!lastmonthls.isEmpty()) {
+
+                for (Windturbinecurvefittingmonth wc : lastmonthls) {
+                    int c = (int) wc.getSpeed().intValue();
+                    if (c == wc.getSpeed()) {
+                        speedmap.put(wc.getSpeed(), wc.getActualpower());
+                    }
+                }
+            }
+
+            if (!thismonthls.isEmpty()) {
+                Collections.sort(thismonthls, new Comparator<Windturbinecurvefittingmonth>() {
+                    public int compare(Windturbinecurvefittingmonth arg0, Windturbinecurvefittingmonth arg1) {
+                        // 修改横轴排序
+                        return arg0.getSpeed().compareTo(arg1.getSpeed());
+                        /*
+                         * int result = 0; if (arg0.getSpeed() >
+                         * arg1.getSpeed()) result = 1; else result = 0; return
+                         * result;
+                         */
+                    }
+                });
+                for (Windturbinecurvefittingmonth wc : thismonthls) {
+
+                    DataVo vo = new DataVo();
+                    int c = (int) wc.getSpeed().intValue();
+                    if (c == wc.getSpeed()) {
+                        vo.setValue1(wc.getSpeed());
+                        vo.setValue2(wc.getActualpower());
+                        name1 = "本月实际功率";
+                        name2 = "上月实际功率";
+                        if (speedmap.containsKey(wc.getSpeed())) {
+                            vo.setValue3(speedmap.get(wc.getSpeed()));
+                        } else {
+                            vo.setValue3(0.0);
+                        }
+                        datavos.add(vo);
+
+                    }
+                }
+            }
+            curvemonthchat(type);
+            map.put("datas", datavos);
+            map.put("name1", name1);
+            map.put("name2", name2);
+        }
+        return map;
+    }
+
+    public  Map<String, Object>  curveMonthchatAjaxbg(String type,String wtId,  String year,String month)  {
+        Map<String, Object> map = new HashMap<String, Object>();
+
+        if(StringUtils.notEmp(type) && StringUtils.notEmp(wtId) && StringUtils.notEmp(year) && StringUtils.notEmp(month))
+        {
+            List<DataVo> datavos = new ArrayList<DataVo>();
+            Map<Double, Double> speedmap = new HashMap<Double, Double>();
+            List<Windturbinecurvefittingmonth> thismonthls = windturbinecurvefittingmonthService.getWindturbinecurvefittingmonthList(wtId, year,month);
+
+            // 标杆风机指标
+            Windturbine wt = InitialRunner.wtmap.get(wtId);
+            String stid = wt.getStandardid();
+
+            if(StringUtils.notEmp(stid))
+            {
+                List<Windturbinecurvefittingmonth> stmonthls = windturbinecurvefittingmonthService.getWindturbinecurvefittingmonthList(stid, year,month);
+
+                if (null != stmonthls && !stmonthls.isEmpty()) {
+
+                    if (!stmonthls.isEmpty()) {
+
+                        for (Windturbinecurvefittingmonth wc : stmonthls) {
+                            int c = (int) wc.getSpeed().intValue();
+                            if (c == wc.getSpeed()) {
+                                speedmap.put(wc.getSpeed(), wc.getActualpower());
+                            }
+                        }
+                    }
+                }
+
+                if (!thismonthls.isEmpty()) {
+                    Collections.sort(thismonthls, new Comparator<Windturbinecurvefittingmonth>() {
+                        public int compare(Windturbinecurvefittingmonth arg0, Windturbinecurvefittingmonth arg1) {
+                            return arg0.getSpeed().compareTo(arg1.getSpeed());
+                            /*
+                             * int result = 0; if (arg0.getSpeed() >
+                             * arg1.getSpeed()) result = 1; else result = 0; return
+                             * result;
+                             */
+                        }
+                    });
+                    for (Windturbinecurvefittingmonth wc : thismonthls) {
+
+                        DataVo vo = new DataVo();
+                        int c = (int) wc.getSpeed().intValue();
+                        if (c == wc.getSpeed()) {
+                            vo.setValue1(wc.getSpeed());
+                            vo.setValue2(wc.getActualpower());
+                            name1 = "本月实际功率";
+                            name2 = "标杆实际功率";
+                            if (speedmap.containsKey(wc.getSpeed())) {
+                                vo.setValue3(speedmap.get(wc.getSpeed()));
+                            } else {
+                                vo.setValue3(0.0);
+                            }
+                            datavos.add(vo);
+
+                        }
+                    }
+                }
+
+                curvemonthchat(type);
+
+                map.put("datas", datavos);
+                map.put("name1", name1);
+                map.put("name2", name2);
+            }
+
+
+        }
+        return map;
+    }
+
+    private void curvemonthchat(String type) {
+
+        if (StringUtils.notEmp(type) && type.equals(SJBZ)) {
+
+            name1 = "实际功率";
+            name2 = "保证功率";
+
+        } else if (StringUtils.notEmp(type) && type.equals(SJZY)) {
+
+            name1 = "实际功率";
+            name2 = "最优功率";
+        } else if (StringUtils.notEmp(type) && type.equals(ZYBZ)) {
+
+            name1 = "最优功率";
+            name2 = "保证功率";
+        } else if (StringUtils.notEmp(type) && type.equals(TB)) {
+
+            name1 = "本月实际功率";
+            name2 = "去年同期实际功率";
+        } else if (StringUtils.notEmp(type) && type.equals(HB)) {
+
+            name1 = "本月实际功率";
+            name2 = "上月实际功率";
+        } else if (StringUtils.notEmp(type) && type.equals(BG)) {
+
+            name1 = "本月实际功率";
+            name2 = "标杆实际功率";
+        }
+
+    }
 }

src/main/resources/mybatis-generator.xml

@@ -101,7 +101,7 @@
             <generatedKey column="id" sqlStatement="Mysql" identity="true"/>
         </table>-->
 
-        <table tableName='ModelpowerRd' domainObjectName='ModelpowerRd'/>
+        <table tableName='ModelPower' domainObjectName='ModelPower'/>
 
     </context>
 </generatorConfiguration>

src/main/resources/mybatis/auto/EquipmentmodelMapper.xml

@@ -0,0 +1,398 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.frame.mapper.auto.EquipmentmodelMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Equipmentmodel">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="description" jdbcType="VARCHAR" property="description" />
+    <result column="powerProduction" jdbcType="DECIMAL" property="powerproduction" />
+    <result column="cutinWindSpeed" jdbcType="DECIMAL" property="cutinwindspeed" />
+    <result column="ratedWindSpeed" jdbcType="DECIMAL" property="ratedwindspeed" />
+    <result column="cutoutWindSpeed" jdbcType="VARCHAR" property="cutoutwindspeed" />
+    <result column="windTurbineManufacturerId" jdbcType="VARCHAR" property="windturbinemanufacturerid" />
+    <result column="photo" jdbcType="VARCHAR" property="photo" />
+    <result column="unit" jdbcType="VARCHAR" property="unit" />
+    <result column="sweptArea" jdbcType="DECIMAL" property="sweptarea" />
+    <result column="equipmentCategory" jdbcType="INTEGER" property="equipmentcategory" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    id, code, name, description, powerProduction, cutinWindSpeed, ratedWindSpeed, cutoutWindSpeed, 
+    windTurbineManufacturerId, photo, unit, sweptArea, equipmentCategory
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.EquipmentmodelExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from equipmentmodel
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from equipmentmodel
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from equipmentmodel
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.EquipmentmodelExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from equipmentmodel
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Equipmentmodel">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into equipmentmodel (id, code, name, 
+      description, powerProduction, cutinWindSpeed, 
+      ratedWindSpeed, cutoutWindSpeed, windTurbineManufacturerId, 
+      photo, unit, sweptArea, 
+      equipmentCategory)
+    values (#{id,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{description,jdbcType=VARCHAR}, #{powerproduction,jdbcType=DECIMAL}, #{cutinwindspeed,jdbcType=DECIMAL}, 
+      #{ratedwindspeed,jdbcType=DECIMAL}, #{cutoutwindspeed,jdbcType=VARCHAR}, #{windturbinemanufacturerid,jdbcType=VARCHAR}, 
+      #{photo,jdbcType=VARCHAR}, #{unit,jdbcType=VARCHAR}, #{sweptarea,jdbcType=DECIMAL}, 
+      #{equipmentcategory,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Equipmentmodel">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into equipmentmodel
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="code != null">
+        code,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="description != null">
+        description,
+      </if>
+      <if test="powerproduction != null">
+        powerProduction,
+      </if>
+      <if test="cutinwindspeed != null">
+        cutinWindSpeed,
+      </if>
+      <if test="ratedwindspeed != null">
+        ratedWindSpeed,
+      </if>
+      <if test="cutoutwindspeed != null">
+        cutoutWindSpeed,
+      </if>
+      <if test="windturbinemanufacturerid != null">
+        windTurbineManufacturerId,
+      </if>
+      <if test="photo != null">
+        photo,
+      </if>
+      <if test="unit != null">
+        unit,
+      </if>
+      <if test="sweptarea != null">
+        sweptArea,
+      </if>
+      <if test="equipmentcategory != null">
+        equipmentCategory,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="code != null">
+        #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="description != null">
+        #{description,jdbcType=VARCHAR},
+      </if>
+      <if test="powerproduction != null">
+        #{powerproduction,jdbcType=DECIMAL},
+      </if>
+      <if test="cutinwindspeed != null">
+        #{cutinwindspeed,jdbcType=DECIMAL},
+      </if>
+      <if test="ratedwindspeed != null">
+        #{ratedwindspeed,jdbcType=DECIMAL},
+      </if>
+      <if test="cutoutwindspeed != null">
+        #{cutoutwindspeed,jdbcType=VARCHAR},
+      </if>
+      <if test="windturbinemanufacturerid != null">
+        #{windturbinemanufacturerid,jdbcType=VARCHAR},
+      </if>
+      <if test="photo != null">
+        #{photo,jdbcType=VARCHAR},
+      </if>
+      <if test="unit != null">
+        #{unit,jdbcType=VARCHAR},
+      </if>
+      <if test="sweptarea != null">
+        #{sweptarea,jdbcType=DECIMAL},
+      </if>
+      <if test="equipmentcategory != null">
+        #{equipmentcategory,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.EquipmentmodelExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from equipmentmodel
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update equipmentmodel
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.code != null">
+        code = #{record.code,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.description != null">
+        description = #{record.description,jdbcType=VARCHAR},
+      </if>
+      <if test="record.powerproduction != null">
+        powerProduction = #{record.powerproduction,jdbcType=DECIMAL},
+      </if>
+      <if test="record.cutinwindspeed != null">
+        cutinWindSpeed = #{record.cutinwindspeed,jdbcType=DECIMAL},
+      </if>
+      <if test="record.ratedwindspeed != null">
+        ratedWindSpeed = #{record.ratedwindspeed,jdbcType=DECIMAL},
+      </if>
+      <if test="record.cutoutwindspeed != null">
+        cutoutWindSpeed = #{record.cutoutwindspeed,jdbcType=VARCHAR},
+      </if>
+      <if test="record.windturbinemanufacturerid != null">
+        windTurbineManufacturerId = #{record.windturbinemanufacturerid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.photo != null">
+        photo = #{record.photo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.unit != null">
+        unit = #{record.unit,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sweptarea != null">
+        sweptArea = #{record.sweptarea,jdbcType=DECIMAL},
+      </if>
+      <if test="record.equipmentcategory != null">
+        equipmentCategory = #{record.equipmentcategory,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update equipmentmodel
+    set id = #{record.id,jdbcType=VARCHAR},
+      code = #{record.code,jdbcType=VARCHAR},
+      name = #{record.name,jdbcType=VARCHAR},
+      description = #{record.description,jdbcType=VARCHAR},
+      powerProduction = #{record.powerproduction,jdbcType=DECIMAL},
+      cutinWindSpeed = #{record.cutinwindspeed,jdbcType=DECIMAL},
+      ratedWindSpeed = #{record.ratedwindspeed,jdbcType=DECIMAL},
+      cutoutWindSpeed = #{record.cutoutwindspeed,jdbcType=VARCHAR},
+      windTurbineManufacturerId = #{record.windturbinemanufacturerid,jdbcType=VARCHAR},
+      photo = #{record.photo,jdbcType=VARCHAR},
+      unit = #{record.unit,jdbcType=VARCHAR},
+      sweptArea = #{record.sweptarea,jdbcType=DECIMAL},
+      equipmentCategory = #{record.equipmentcategory,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Equipmentmodel">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update equipmentmodel
+    <set>
+      <if test="code != null">
+        code = #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="description != null">
+        description = #{description,jdbcType=VARCHAR},
+      </if>
+      <if test="powerproduction != null">
+        powerProduction = #{powerproduction,jdbcType=DECIMAL},
+      </if>
+      <if test="cutinwindspeed != null">
+        cutinWindSpeed = #{cutinwindspeed,jdbcType=DECIMAL},
+      </if>
+      <if test="ratedwindspeed != null">
+        ratedWindSpeed = #{ratedwindspeed,jdbcType=DECIMAL},
+      </if>
+      <if test="cutoutwindspeed != null">
+        cutoutWindSpeed = #{cutoutwindspeed,jdbcType=VARCHAR},
+      </if>
+      <if test="windturbinemanufacturerid != null">
+        windTurbineManufacturerId = #{windturbinemanufacturerid,jdbcType=VARCHAR},
+      </if>
+      <if test="photo != null">
+        photo = #{photo,jdbcType=VARCHAR},
+      </if>
+      <if test="unit != null">
+        unit = #{unit,jdbcType=VARCHAR},
+      </if>
+      <if test="sweptarea != null">
+        sweptArea = #{sweptarea,jdbcType=DECIMAL},
+      </if>
+      <if test="equipmentcategory != null">
+        equipmentCategory = #{equipmentcategory,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Equipmentmodel">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update equipmentmodel
+    set code = #{code,jdbcType=VARCHAR},
+      name = #{name,jdbcType=VARCHAR},
+      description = #{description,jdbcType=VARCHAR},
+      powerProduction = #{powerproduction,jdbcType=DECIMAL},
+      cutinWindSpeed = #{cutinwindspeed,jdbcType=DECIMAL},
+      ratedWindSpeed = #{ratedwindspeed,jdbcType=DECIMAL},
+      cutoutWindSpeed = #{cutoutwindspeed,jdbcType=VARCHAR},
+      windTurbineManufacturerId = #{windturbinemanufacturerid,jdbcType=VARCHAR},
+      photo = #{photo,jdbcType=VARCHAR},
+      unit = #{unit,jdbcType=VARCHAR},
+      sweptArea = #{sweptarea,jdbcType=DECIMAL},
+      equipmentCategory = #{equipmentcategory,jdbcType=INTEGER}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

src/main/resources/mybatis/auto/ManufacturerMapper.xml

@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.frame.mapper.auto.ManufacturerMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Manufacturer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="country" jdbcType="VARCHAR" property="country" />
+    <result column="address" jdbcType="VARCHAR" property="address" />
+    <result column="telephone" jdbcType="VARCHAR" property="telephone" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    id, name, country, address, telephone
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.ManufacturerExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from manufacturer
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from manufacturer
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from manufacturer
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.ManufacturerExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from manufacturer
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Manufacturer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into manufacturer (id, name, country, 
+      address, telephone)
+    values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{country,jdbcType=VARCHAR}, 
+      #{address,jdbcType=VARCHAR}, #{telephone,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Manufacturer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into manufacturer
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="country != null">
+        country,
+      </if>
+      <if test="address != null">
+        address,
+      </if>
+      <if test="telephone != null">
+        telephone,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="country != null">
+        #{country,jdbcType=VARCHAR},
+      </if>
+      <if test="address != null">
+        #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="telephone != null">
+        #{telephone,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.ManufacturerExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from manufacturer
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update manufacturer
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.country != null">
+        country = #{record.country,jdbcType=VARCHAR},
+      </if>
+      <if test="record.address != null">
+        address = #{record.address,jdbcType=VARCHAR},
+      </if>
+      <if test="record.telephone != null">
+        telephone = #{record.telephone,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update manufacturer
+    set id = #{record.id,jdbcType=VARCHAR},
+      name = #{record.name,jdbcType=VARCHAR},
+      country = #{record.country,jdbcType=VARCHAR},
+      address = #{record.address,jdbcType=VARCHAR},
+      telephone = #{record.telephone,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Manufacturer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update manufacturer
+    <set>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="country != null">
+        country = #{country,jdbcType=VARCHAR},
+      </if>
+      <if test="address != null">
+        address = #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="telephone != null">
+        telephone = #{telephone,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Manufacturer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update manufacturer
+    set name = #{name,jdbcType=VARCHAR},
+      country = #{country,jdbcType=VARCHAR},
+      address = #{address,jdbcType=VARCHAR},
+      telephone = #{telephone,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

src/main/resources/mybatis/auto/ModelPowerMapper.xml

@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.frame.mapper.auto.ModelPowerMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.ModelPower">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="modelId" jdbcType="VARCHAR" property="modelid" />
+    <result column="speed" jdbcType="DECIMAL" property="speed" />
+    <result column="theoryPower" jdbcType="DECIMAL" property="theorypower" />
+    <result column="ensurePower" jdbcType="DECIMAL" property="ensurepower" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    id, modelId, speed, theoryPower, ensurePower
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.ModelPowerExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from modelpower
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from modelpower
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from modelpower
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.ModelPowerExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from modelpower
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.ModelPower">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into modelpower (id, modelId, speed, 
+      theoryPower, ensurePower)
+    values (#{id,jdbcType=VARCHAR}, #{modelid,jdbcType=VARCHAR}, #{speed,jdbcType=DECIMAL}, 
+      #{theorypower,jdbcType=DECIMAL}, #{ensurepower,jdbcType=DECIMAL})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.ModelPower">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into modelpower
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="modelid != null">
+        modelId,
+      </if>
+      <if test="speed != null">
+        speed,
+      </if>
+      <if test="theorypower != null">
+        theoryPower,
+      </if>
+      <if test="ensurepower != null">
+        ensurePower,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="modelid != null">
+        #{modelid,jdbcType=VARCHAR},
+      </if>
+      <if test="speed != null">
+        #{speed,jdbcType=DECIMAL},
+      </if>
+      <if test="theorypower != null">
+        #{theorypower,jdbcType=DECIMAL},
+      </if>
+      <if test="ensurepower != null">
+        #{ensurepower,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.ModelPowerExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from modelpower
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update modelpower
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.modelid != null">
+        modelId = #{record.modelid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.speed != null">
+        speed = #{record.speed,jdbcType=DECIMAL},
+      </if>
+      <if test="record.theorypower != null">
+        theoryPower = #{record.theorypower,jdbcType=DECIMAL},
+      </if>
+      <if test="record.ensurepower != null">
+        ensurePower = #{record.ensurepower,jdbcType=DECIMAL},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update modelpower
+    set id = #{record.id,jdbcType=VARCHAR},
+      modelId = #{record.modelid,jdbcType=VARCHAR},
+      speed = #{record.speed,jdbcType=DECIMAL},
+      theoryPower = #{record.theorypower,jdbcType=DECIMAL},
+      ensurePower = #{record.ensurepower,jdbcType=DECIMAL}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.ModelPower">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update modelpower
+    <set>
+      <if test="modelid != null">
+        modelId = #{modelid,jdbcType=VARCHAR},
+      </if>
+      <if test="speed != null">
+        speed = #{speed,jdbcType=DECIMAL},
+      </if>
+      <if test="theorypower != null">
+        theoryPower = #{theorypower,jdbcType=DECIMAL},
+      </if>
+      <if test="ensurepower != null">
+        ensurePower = #{ensurepower,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.ModelPower">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update modelpower
+    set modelId = #{modelid,jdbcType=VARCHAR},
+      speed = #{speed,jdbcType=DECIMAL},
+      theoryPower = #{theorypower,jdbcType=DECIMAL},
+      ensurePower = #{ensurepower,jdbcType=DECIMAL}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

src/main/resources/mybatis/auto/WindturbinegoodnessMapper.xml.1

@@ -1,413 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gyee.frame.mapper.auto.WindturbinegoodnessMapper">
-  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Windturbinegoodness">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="windturbineId" jdbcType="VARCHAR" property="windturbineid" />
-    <result column="dayGoodness" jdbcType="DECIMAL" property="daygoodness" />
-    <result column="monthGoodness" jdbcType="DECIMAL" property="monthgoodness" />
-    <result column="yearGoodness" jdbcType="DECIMAL" property="yeargoodness" />
-    <result column="recordDate" jdbcType="DATE" property="recorddate" />
-    <result column="dayTop" jdbcType="INTEGER" property="daytop" />
-    <result column="monthTop" jdbcType="INTEGER" property="monthtop" />
-    <result column="yearTop" jdbcType="INTEGER" property="yeartop" />
-    <result column="windtPowerStationId" jdbcType="VARCHAR" property="windtpowerstationid" />
-    <result column="modelId" jdbcType="VARCHAR" property="modelid" />
-    <result column="dayspeed" jdbcType="DECIMAL" property="dayspeed" />
-    <result column="monthspeed" jdbcType="DECIMAL" property="monthspeed" />
-    <result column="yearspeed" jdbcType="DECIMAL" property="yearspeed" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    id, windturbineId, dayGoodness, monthGoodness, yearGoodness, recordDate, dayTop, 
-    monthTop, yearTop, windtPowerStationId, modelId, dayspeed, monthspeed, yearspeed
-  </sql>
-  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.WindturbinegoodnessExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from windturbinegoodness
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select 
-    <include refid="Base_Column_List" />
-    from windturbinegoodness
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    delete from windturbinegoodness
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WindturbinegoodnessExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    delete from windturbinegoodness
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.gyee.frame.model.auto.Windturbinegoodness">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    insert into windturbinegoodness (id, windturbineId, dayGoodness, 
-      monthGoodness, yearGoodness, recordDate, 
-      dayTop, monthTop, yearTop, 
-      windtPowerStationId, modelId, dayspeed, 
-      monthspeed, yearspeed)
-    values (#{id,jdbcType=INTEGER}, #{windturbineid,jdbcType=VARCHAR}, #{daygoodness,jdbcType=DECIMAL}, 
-      #{monthgoodness,jdbcType=DECIMAL}, #{yeargoodness,jdbcType=DECIMAL}, #{recorddate,jdbcType=DATE}, 
-      #{daytop,jdbcType=INTEGER}, #{monthtop,jdbcType=INTEGER}, #{yeartop,jdbcType=INTEGER}, 
-      #{windtpowerstationid,jdbcType=VARCHAR}, #{modelid,jdbcType=VARCHAR}, #{dayspeed,jdbcType=DECIMAL}, 
-      #{monthspeed,jdbcType=DECIMAL}, #{yearspeed,jdbcType=DECIMAL})
-  </insert>
-  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Windturbinegoodness">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    insert into windturbinegoodness
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="windturbineid != null">
-        windturbineId,
-      </if>
-      <if test="daygoodness != null">
-        dayGoodness,
-      </if>
-      <if test="monthgoodness != null">
-        monthGoodness,
-      </if>
-      <if test="yeargoodness != null">
-        yearGoodness,
-      </if>
-      <if test="recorddate != null">
-        recordDate,
-      </if>
-      <if test="daytop != null">
-        dayTop,
-      </if>
-      <if test="monthtop != null">
-        monthTop,
-      </if>
-      <if test="yeartop != null">
-        yearTop,
-      </if>
-      <if test="windtpowerstationid != null">
-        windtPowerStationId,
-      </if>
-      <if test="modelid != null">
-        modelId,
-      </if>
-      <if test="dayspeed != null">
-        dayspeed,
-      </if>
-      <if test="monthspeed != null">
-        monthspeed,
-      </if>
-      <if test="yearspeed != null">
-        yearspeed,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="windturbineid != null">
-        #{windturbineid,jdbcType=VARCHAR},
-      </if>
-      <if test="daygoodness != null">
-        #{daygoodness,jdbcType=DECIMAL},
-      </if>
-      <if test="monthgoodness != null">
-        #{monthgoodness,jdbcType=DECIMAL},
-      </if>
-      <if test="yeargoodness != null">
-        #{yeargoodness,jdbcType=DECIMAL},
-      </if>
-      <if test="recorddate != null">
-        #{recorddate,jdbcType=DATE},
-      </if>
-      <if test="daytop != null">
-        #{daytop,jdbcType=INTEGER},
-      </if>
-      <if test="monthtop != null">
-        #{monthtop,jdbcType=INTEGER},
-      </if>
-      <if test="yeartop != null">
-        #{yeartop,jdbcType=INTEGER},
-      </if>
-      <if test="windtpowerstationid != null">
-        #{windtpowerstationid,jdbcType=VARCHAR},
-      </if>
-      <if test="modelid != null">
-        #{modelid,jdbcType=VARCHAR},
-      </if>
-      <if test="dayspeed != null">
-        #{dayspeed,jdbcType=DECIMAL},
-      </if>
-      <if test="monthspeed != null">
-        #{monthspeed,jdbcType=DECIMAL},
-      </if>
-      <if test="yearspeed != null">
-        #{yearspeed,jdbcType=DECIMAL},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.gyee.frame.model.auto.WindturbinegoodnessExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select count(*) from windturbinegoodness
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update windturbinegoodness
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=INTEGER},
-      </if>
-      <if test="record.windturbineid != null">
-        windturbineId = #{record.windturbineid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.daygoodness != null">
-        dayGoodness = #{record.daygoodness,jdbcType=DECIMAL},
-      </if>
-      <if test="record.monthgoodness != null">
-        monthGoodness = #{record.monthgoodness,jdbcType=DECIMAL},
-      </if>
-      <if test="record.yeargoodness != null">
-        yearGoodness = #{record.yeargoodness,jdbcType=DECIMAL},
-      </if>
-      <if test="record.recorddate != null">
-        recordDate = #{record.recorddate,jdbcType=DATE},
-      </if>
-      <if test="record.daytop != null">
-        dayTop = #{record.daytop,jdbcType=INTEGER},
-      </if>
-      <if test="record.monthtop != null">
-        monthTop = #{record.monthtop,jdbcType=INTEGER},
-      </if>
-      <if test="record.yeartop != null">
-        yearTop = #{record.yeartop,jdbcType=INTEGER},
-      </if>
-      <if test="record.windtpowerstationid != null">
-        windtPowerStationId = #{record.windtpowerstationid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.modelid != null">
-        modelId = #{record.modelid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.dayspeed != null">
-        dayspeed = #{record.dayspeed,jdbcType=DECIMAL},
-      </if>
-      <if test="record.monthspeed != null">
-        monthspeed = #{record.monthspeed,jdbcType=DECIMAL},
-      </if>
-      <if test="record.yearspeed != null">
-        yearspeed = #{record.yearspeed,jdbcType=DECIMAL},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update windturbinegoodness
-    set id = #{record.id,jdbcType=INTEGER},
-      windturbineId = #{record.windturbineid,jdbcType=VARCHAR},
-      dayGoodness = #{record.daygoodness,jdbcType=DECIMAL},
-      monthGoodness = #{record.monthgoodness,jdbcType=DECIMAL},
-      yearGoodness = #{record.yeargoodness,jdbcType=DECIMAL},
-      recordDate = #{record.recorddate,jdbcType=DATE},
-      dayTop = #{record.daytop,jdbcType=INTEGER},
-      monthTop = #{record.monthtop,jdbcType=INTEGER},
-      yearTop = #{record.yeartop,jdbcType=INTEGER},
-      windtPowerStationId = #{record.windtpowerstationid,jdbcType=VARCHAR},
-      modelId = #{record.modelid,jdbcType=VARCHAR},
-      dayspeed = #{record.dayspeed,jdbcType=DECIMAL},
-      monthspeed = #{record.monthspeed,jdbcType=DECIMAL},
-      yearspeed = #{record.yearspeed,jdbcType=DECIMAL}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Windturbinegoodness">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update windturbinegoodness
-    <set>
-      <if test="windturbineid != null">
-        windturbineId = #{windturbineid,jdbcType=VARCHAR},
-      </if>
-      <if test="daygoodness != null">
-        dayGoodness = #{daygoodness,jdbcType=DECIMAL},
-      </if>
-      <if test="monthgoodness != null">
-        monthGoodness = #{monthgoodness,jdbcType=DECIMAL},
-      </if>
-      <if test="yeargoodness != null">
-        yearGoodness = #{yeargoodness,jdbcType=DECIMAL},
-      </if>
-      <if test="recorddate != null">
-        recordDate = #{recorddate,jdbcType=DATE},
-      </if>
-      <if test="daytop != null">
-        dayTop = #{daytop,jdbcType=INTEGER},
-      </if>
-      <if test="monthtop != null">
-        monthTop = #{monthtop,jdbcType=INTEGER},
-      </if>
-      <if test="yeartop != null">
-        yearTop = #{yeartop,jdbcType=INTEGER},
-      </if>
-      <if test="windtpowerstationid != null">
-        windtPowerStationId = #{windtpowerstationid,jdbcType=VARCHAR},
-      </if>
-      <if test="modelid != null">
-        modelId = #{modelid,jdbcType=VARCHAR},
-      </if>
-      <if test="dayspeed != null">
-        dayspeed = #{dayspeed,jdbcType=DECIMAL},
-      </if>
-      <if test="monthspeed != null">
-        monthspeed = #{monthspeed,jdbcType=DECIMAL},
-      </if>
-      <if test="yearspeed != null">
-        yearspeed = #{yearspeed,jdbcType=DECIMAL},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Windturbinegoodness">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update windturbinegoodness
-    set windturbineId = #{windturbineid,jdbcType=VARCHAR},
-      dayGoodness = #{daygoodness,jdbcType=DECIMAL},
-      monthGoodness = #{monthgoodness,jdbcType=DECIMAL},
-      yearGoodness = #{yeargoodness,jdbcType=DECIMAL},
-      recordDate = #{recorddate,jdbcType=DATE},
-      dayTop = #{daytop,jdbcType=INTEGER},
-      monthTop = #{monthtop,jdbcType=INTEGER},
-      yearTop = #{yeartop,jdbcType=INTEGER},
-      windtPowerStationId = #{windtpowerstationid,jdbcType=VARCHAR},
-      modelId = #{modelid,jdbcType=VARCHAR},
-      dayspeed = #{dayspeed,jdbcType=DECIMAL},
-      monthspeed = #{monthspeed,jdbcType=DECIMAL},
-      yearspeed = #{yearspeed,jdbcType=DECIMAL}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-</mapper>

src/test/java/test/ContrastTest.java

@@ -45,14 +45,23 @@ public class ContrastTest {
         tablepar.setPageNum(1);
         tablepar.setPageSize(10);
 
-        AjaxResult ajaxResult = contrastController.benchmarkLossList(tablepar,wpid,"2021-01-01 00:00:00","2021-01-04 00:00:00");
+//        AjaxResult ajaxResult = contrastController.benchmarkPjList(tablepar,wpid,"","2021-01-01 00:00:00","2021-01-04 00:00:00");
+//
+//        List<BenchMarkVo> test=(List<BenchMarkVo>)ajaxResult.get("data");
+//        for(BenchMarkVo wtd:test)
+//        {
+//            System.out.println(wtd.getDxklylnum()+"----------------"+wtd.getDxklyl()+"----------------"+wtd.getEdfshgl());
+//        }
+//        System.out.println("/***********************************************/");
+
+        AjaxResult ajaxResult2 = contrastController.benchmarkLnList(tablepar,wpid,"","2021-01-01 00:00:00","2021-01-04 00:00:00");
 
-        List<BenchMarkVo> test=(List<BenchMarkVo>)ajaxResult.get("data");
-        for(BenchMarkVo wtd:test)
+        List<BenchMarkVo> test2=(List<BenchMarkVo>)ajaxResult2.get("data");
+        for(BenchMarkVo wtd:test2)
         {
             System.out.println(wtd.getDxklylnum()+"----------------"+wtd.getDxklyl()+"----------------"+wtd.getEdfshgl());
         }
-        System.out.println(test);
+        System.out.println("/***********************************************/");
 
 //        AjaxResult ajaxResult = contrastController.findWpPowerOutChat(wpid,"2021-01-01 00:00:00","2021-01-04 00:00:00");
 //        List<DataVo> test=(List<DataVo>)ajaxResult.get("data");

src/test/java/test/LeaderboardTest.java

@@ -4,7 +4,8 @@ import com.gyee.SpringbootStart;
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.common.spring.SpringUtils;
 import com.gyee.frame.controller.leaderboard.LeaderboardController;
-import com.gyee.frame.model.custom.StatisticalAnalysisTopVo;
+import com.gyee.frame.model.auto.Curvefittingmain;
+import com.gyee.frame.model.custom.DataVo;
 import com.gyee.frame.model.custom.Tablepar;
 import lombok.SneakyThrows;
 import org.springframework.boot.SpringApplication;
@@ -12,6 +13,7 @@ import org.springframework.boot.SpringApplication;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 public class LeaderboardTest {
 
@@ -36,7 +38,7 @@ public class LeaderboardTest {
         Date endDate = c.getTime();
 
         String wtid="MG01_01,MG01_02,MG01_03,MG01_04,MG01_05";
-
+        String wpid="MHS_FDC";
         LeaderboardController leaderboardController= SpringUtils.getBean("leaderboardController");
 //
 //        AjaxResult ajaxResult = dayBenchmarkingController.gadaylist(wpid,"2021-01-01");
@@ -57,12 +59,59 @@ public class LeaderboardTest {
 //            System.out.println(wtd.getFrequency()+"----------------"+wtd.getPower()+"----------------"+wtd.getSpeed());
 //        }
 
-        AjaxResult  ajaxResult =leaderboardController.totalPowerCapacityTopList(tablepar,null,beginDate,endDate);
+//        AjaxResult  ajaxResult =leaderboardController.totalPowerCapacityTopList(tablepar,null,beginDate,endDate);
+//
+//        List<StatisticalAnalysisTopVo>   test2=(List<StatisticalAnalysisTopVo>)ajaxResult.get("data");
+//        for(StatisticalAnalysisTopVo wtd:test2)
+//        {
+//            System.out.println(wtd.getGeneratingCapacity()+"----------------"+wtd.getPower()+"----------------"+wtd.getSpeed());
+//        }
+
+
+//        AjaxResult  ajaxResult =leaderboardController.utilizationList(tablepar,"MHS_FDC",beginDate,endDate,"3");
+//
+//        List<Windturbineinfoday3>   test2=(List<Windturbineinfoday3>)ajaxResult.get("data");
+//        for(Windturbineinfoday3 wtd:test2)
+//        {
+//            System.out.println(wtd.getDaydl2()+"----------------"+wtd.getDaylldl()+"----------------"+wtd.getDayspeed());
+//        }
+
+
+//        AjaxResult ajaxResult =leaderboardController.querywarningStatistical(tablepar,"1",beginDate,endDate);
+//
+//        List<StatisticalAnalysisWarningTopVo> test=(List<StatisticalAnalysisWarningTopVo>)ajaxResult.get("data");
+//        for(StatisticalAnalysisWarningTopVo wtd:test)
+//        {
+//            System.out.println(wtd.getFrequency()+"----------------"+wtd.getFrequencyday()+"----------------"+wtd.getTotalhours());
+//        }
+//
+//
+//         AjaxResult  ajaxResult2 =leaderboardController.querywarningStatisticalPie("1",beginDate,endDate);
+//
+//        List<StatisticalAnalysisWarningTopVo>   test2=(List<StatisticalAnalysisWarningTopVo>)ajaxResult2.get("data");
+//        for(StatisticalAnalysisWarningTopVo wtd:test2)
+//        {
+//            System.out.println(wtd.getFrequency()+"----------------"+wtd.getFrequencyday()+"----------------"+wtd.getTotalhours());
+//        }
+
+
+        AjaxResult ajaxResult =leaderboardController.curvefittingmainList(tablepar,wpid,beginDate);
+
+        List<Curvefittingmain> test=(List<Curvefittingmain>)ajaxResult.get("data");
+        for(Curvefittingmain wtd:test)
+        {
+            System.out.println(wtd.getDeviationrate1()+"----------------"+wtd.getDeviationrate2()+"----------------"+wtd.getDeviationrate3());
+        }
+
+
+        AjaxResult  ajaxResult2 =leaderboardController.getCurvechatAjax("sjbz","MG01_01",beginDate);
+
 
-        List<StatisticalAnalysisTopVo>   test2=(List<StatisticalAnalysisTopVo>)ajaxResult.get("data");
-        for(StatisticalAnalysisTopVo wtd:test2)
+        Map<String, Object> map=(Map<String, Object>)ajaxResult2.get("data");
+        List<DataVo> datavos =(List<DataVo>)map.get("datas");
+        for(DataVo wtd:datavos)
         {
-            System.out.println(wtd.getGeneratingCapacity()+"----------------"+wtd.getPower()+"----------------"+wtd.getSpeed());
+            System.out.println(wtd.getValue1()+"----------------"+wtd.getValue2()+"----------------"+wtd.getValue3());
         }
     }
 

src/test/java/test/PowercompareTest.java

@@ -51,25 +51,32 @@ public class PowercompareTest {
 //            System.out.println(wtd.getLineid()+"----------------"+wtd.getLocation());
 //        }
 //        System.out.println(test);
+//
+//        AjaxResult ajaxResult3 = powerCompareController.windfarmAjax();
+//
+//        List<StopTypeTreeVo> test3=(List<StopTypeTreeVo>)ajaxResult3.get("data");
+//        for(StopTypeTreeVo wtd:test3)
+//        {
+//            System.out.println(wtd.getId()+"----------------"+wtd.getName());
+//        }
+//
+//
+//        AjaxResult ajaxResult = powerCompareController.projectAjax("MHS_FDC");
+//
+//        List<StopTypeTreeVo> test=(List<StopTypeTreeVo>)ajaxResult.get("data");
+//        for(StopTypeTreeVo wtd:test)
+//        {
+//            System.out.println(wtd.getId()+"----------------"+wtd.getName());
+//        }
+//
+//        AjaxResult ajaxResult2 = powerCompareController.lineAjax("MHS01_GC");
+//        List<StopTypeTreeVo> test2=(List<StopTypeTreeVo>)ajaxResult2.get("data");
+//        for(StopTypeTreeVo wtd:test2)
+//        {
+//            System.out.println(wtd.getId()+"----------------"+wtd.getName());
+//        }
 
-        AjaxResult ajaxResult3 = powerCompareController.windfarmAjax();
-
-        List<StopTypeTreeVo> test3=(List<StopTypeTreeVo>)ajaxResult3.get("data");
-        for(StopTypeTreeVo wtd:test3)
-        {
-            System.out.println(wtd.getId()+"----------------"+wtd.getName());
-        }
-
-
-        AjaxResult ajaxResult = powerCompareController.projectAjax("MHS_FDC");
-
-        List<StopTypeTreeVo> test=(List<StopTypeTreeVo>)ajaxResult.get("data");
-        for(StopTypeTreeVo wtd:test)
-        {
-            System.out.println(wtd.getId()+"----------------"+wtd.getName());
-        }
-
-        AjaxResult ajaxResult2 = powerCompareController.lineAjax("MHS01_GC");
+        AjaxResult ajaxResult2 = powerCompareController.windturbineAjax("MHS_FDC");
         List<StopTypeTreeVo> test2=(List<StopTypeTreeVo>)ajaxResult2.get("data");
         for(StopTypeTreeVo wtd:test2)
         {