添加场站监视页面上网电量和购网电量数据

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

@@ -46,7 +46,13 @@ public class MybatisConfig {
         return DruidDataSourceBuilder.create().build();
     }
 
-
+    @Bean(name = "ticket")
+    @ConfigurationProperties("spring.datasource.druid.ticket")
+//    @ConditionalOnProperty(prefix = "spring.datasource.druid.ticket", name = "enabled", havingValue = "true")
+    public DataSource ticketDataSource()
+    {
+        return DruidDataSourceBuilder.create().build();
+    }
     @Bean(name = "dynamicDataSource")
     @Primary
     public DynamicDataSource dataSource(@Qualifier("master")DataSource masterDataSource, @Qualifier("slave")DataSource slaveDataSource)
@@ -57,6 +63,17 @@ public class MybatisConfig {
         return new DynamicDataSource(masterDataSource(), targetDataSources);
     }
 
+    @Bean(name = "dynamicDataSource")
+    @Primary
+    public DynamicDataSource dataSource(@Qualifier("master")DataSource masterDataSource, @Qualifier("slave")DataSource slaveDataSource, @Qualifier("ticket")DataSource ticketDataSource)
+    {
+        Map<Object, Object> targetDataSources = new HashMap<>();
+        targetDataSources.put(DataSourceType.MASTER.name(), masterDataSource);
+        targetDataSources.put(DataSourceType.SLAVE.name(),slaveDataSource);
+        targetDataSources.put(DataSourceType.TICKET.name(),ticketDataSource);
+        return new DynamicDataSource(masterDataSource(), targetDataSources);
+    }
+
     @Bean
     public SqlSessionFactory sqlSessionFactory(DynamicDataSource dynamicDataSource) throws Exception {
         SqlSessionFactoryBean factoryBean = new SqlSessionFactoryBean();

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

@@ -89,8 +89,8 @@ public  class InitialRedis {
             for(Windpowerstation wp:InitialRunner.wpls)
             {
                 String wpId=wp.getId();
-                WindPowerStationTestingPoint2  gl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
-                WindPowerStationTestingPoint2  fs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
+                WindPowerStationTestingPoint gl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
+                WindPowerStationTestingPoint fs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
 
                 int daynum = DateUtils.daysDiff(beginDate, endDate);
                 long pried = 600 ;
@@ -169,8 +169,8 @@ public  class InitialRedis {
             for(Project pj:InitialRunner.pjls)
             {
                 String wpId=pj.getId();
-                WindPowerStationTestingPoint2  gl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
-                WindPowerStationTestingPoint2  fs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
+                WindPowerStationTestingPoint gl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
+                WindPowerStationTestingPoint fs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
 
                 int daynum = DateUtils.daysDiff(beginDate, endDate);
                 long pried = 600 ;
@@ -249,8 +249,8 @@ public  class InitialRedis {
             for(Line wp:InitialRunner.linels)
             {
                 String wpId=wp.getId();
-                WindPowerStationTestingPoint2  gl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
-                WindPowerStationTestingPoint2  fs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
+                WindPowerStationTestingPoint gl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
+                WindPowerStationTestingPoint fs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
 
                 int daynum = DateUtils.daysDiff(beginDate, endDate);
                 long pried = 600 ;
@@ -325,8 +325,8 @@ public  class InitialRedis {
             for(Windturbine wt:InitialRunner.wtls)
             {
                 String wpId=wt.getId();
-                WindTurbineTestingPointAi2  gl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wpId, Constant.TPOINT_WT_FJGL);
-                WindTurbineTestingPointAi2  fs = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wpId, Constant.TPOINT_WT_FJSSFS);
+                WindTurbineTestingPointAi gl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wpId, Constant.TPOINT_WT_FJGL);
+                WindTurbineTestingPointAi fs = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wpId, Constant.TPOINT_WT_FJSSFS);
 
                 int daynum = DateUtils.daysDiff(beginDate, endDate);
                 long pried = 600 ;

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

@@ -1,5 +1,8 @@
 package com.gyee.frame.common.spring;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.gyee.frame.common.cache.IGlobalCache;
 import com.gyee.frame.model.auto.*;
 import com.gyee.frame.service.*;
@@ -36,7 +39,7 @@ public class InitialRunner implements CommandLineRunner {
     @Resource
     private WindturbinepowercurvefittingService windturbinepowercurvefittingService;
     @Resource
-    private Warning2Service warning2Service;
+    private WarningService warningService;
     @Resource
     private ModelpowerRdService modelpowerRdService;
     @Resource
@@ -83,12 +86,12 @@ public class InitialRunner implements CommandLineRunner {
     public static Map<String, Windturbine> wtmap = new HashMap<String, Windturbine>();//风机（包含光电电）
 
     public static Map<String, Stoptype> stoptypemap = new HashMap<String, Stoptype>();//停机类型
-    public static List<Warning2> warnls = new ArrayList<Warning2>(); // 报警LIST集合
-    public static Map<String, Warning2> warningmap = new HashMap<String, Warning2>();// 报警MAP集合
+    public static List<Warning> warnls = new ArrayList<Warning>(); // 报警LIST集合
+    public static Map<String, Warning> warningmap = new HashMap<String, Warning>();// 报警MAP集合
     public static List<Windturbineparts> windturbinepartsls = new ArrayList<Windturbineparts>();
     public static Map<String, Windturbineparts> windturbinepartsmap = new HashMap<String, Windturbineparts>();
-    public static Map<String, Map<String, List<Warning2>>> warnmodelmap = new HashMap<>();
-    public static Map<String, List<Warning2>> warnmap = new HashMap<>();// 按照型号划分报警MAP集合 <型号，报警集合>
+    public static Map<String, Map<String, List<Warning>>> warnmodelmap = new HashMap<>();
+    public static Map<String, List<Warning>> warnmap = new HashMap<>();// 按照型号划分报警MAP集合 <型号，报警集合>
     public static List<WarningClassify> warningClassls = new ArrayList<WarningClassify>(); //报警类型列表
     public static Map<String, WarningClassify> warningClassifymap = new HashMap<String, WarningClassify>();
     public static Map<String, Manufacturer> manufacturermap = new HashMap<String, Manufacturer>();
@@ -99,10 +102,10 @@ public class InitialRunner implements CommandLineRunner {
     public static Map<String, List<Project>> pjsmap = new HashMap<String, List<Project>>(); // 通过风场编号获得所属项目
     public static Map<String, List<Line>> lnsmap = new HashMap<String, List<Line>>(); // 通过项目编号获得所属线路
     public static Map<String, Map<Double, ModelpowerRd>> mprdMap = new HashMap<String, Map<Double, ModelpowerRd>>();
-    public static Map<String, Map<String, WindTurbineTestingPointAi2>> wtPointmap = new HashMap<String, Map<String, WindTurbineTestingPointAi2>>();// 风电机测点AI表
-    public static Map<String, Map<String, WindPowerStationTestingPoint2>> wpPointmap = new HashMap<String, Map<String, WindPowerStationTestingPoint2>>();//场站测点
-    public static Map<String, Map<String, WindPowerStationTestingPoint2>> pjPointmap = new HashMap<String, Map<String, WindPowerStationTestingPoint2>>();//项目测点
-    public static Map<String, Map<String, WindPowerStationTestingPoint2>> lnPointmap = new HashMap<String, Map<String, WindPowerStationTestingPoint2>>();//线路测点
+    public static Map<String, Map<String, WindTurbineTestingPointAi>> wtPointmap = new HashMap<String, Map<String, WindTurbineTestingPointAi>>();// 风电机测点AI表
+    public static Map<String, Map<String, WindPowerStationTestingPoint>> wpPointmap = new HashMap<String, Map<String, WindPowerStationTestingPoint>>();//场站测点
+    public static Map<String, Map<String, WindPowerStationTestingPoint>> pjPointmap = new HashMap<String, Map<String, WindPowerStationTestingPoint>>();//项目测点
+    public static Map<String, Map<String, WindPowerStationTestingPoint>> lnPointmap = new HashMap<String, Map<String, WindPowerStationTestingPoint>>();//线路测点
     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>();// 风电机模型
@@ -121,96 +124,87 @@ public class InitialRunner implements CommandLineRunner {
     public void run(String... args) throws Exception {
         System.out.println(">>>>>>>>>>>>>>>服务启动执行，换成测点关联数据 <<<<<<<<<<<<<");
 
-//        //配置追加功率曲线测点
-//        Map<String, Object> ycmap = new HashMap<>();
-//
-//        String[] ycPoints4 = Constant.TPOINT_QS3_YGCL4.split(",");
-//        String[] ycPoints24 = Constant.TPOINT_QS3_YGCL24.split(",");
-//        //添加预测风速第一个点，存储到当前的历史值
-//        ycmap.put("cdq1", "SLFGL.NX_GD_QSF_YC_P1_L1_001_CDQ001");
-//        ycmap.put("dq1","SLFGL.NX_GD_QSF_YC_P1_L1_001_DQ0001");
-//        //添加预测功率后续预测点字符串数组，实时数据
-//        ycmap.put("cdq2", ycPoints4);
-//        ycmap.put("dq2", ycPoints24);
-//
-//        appendYcglMap.put("QS_FDC", ycmap);
-//
-//        List< Alertrule2> alertrulels =alertrule2ervice.getAlertruleAllList();
-//        if(!alertrulels.isEmpty())
-//        {
-//            for(Alertrule2 ar:alertrulels)
-//            {
-//                alertrulemap.put(ar.getName(),ar);
-//            }
-//        }
-//
-//        windturbinepartsls=windturbinepartsService.findAll();
-//        if(!windturbinepartsls.isEmpty())
-//        {
-//            for(Windturbineparts wp:windturbinepartsls)
-//            {
-//                windturbinepartsmap.put(wp.getId(),wp);
-//            }
-//
-//        }
-//
+        //配置追加功率曲线测点
+        Map<String, Object> ycmap = new HashMap<>();
+
+        String[] ycPoints4 = Constant.TPOINT_QS3_YGCL4.split(",");
+        String[] ycPoints24 = Constant.TPOINT_QS3_YGCL24.split(",");
+        //添加预测风速第一个点，存储到当前的历史值
+        ycmap.put("cdq1", "SLFGL.NX_GD_QSF_YC_P1_L1_001_CDQ001");
+        ycmap.put("dq1","SLFGL.NX_GD_QSF_YC_P1_L1_001_DQ0001");
+        //添加预测功率后续预测点字符串数组，实时数据
+        ycmap.put("cdq2", ycPoints4);
+        ycmap.put("dq2", ycPoints24);
+
+        appendYcglMap.put("QS_FDC", ycmap);
+
+        List< Alertrule2> alertrulels =alertrule2ervice.getAlertruleAllList();
+        if(!alertrulels.isEmpty())
+        {
+            for(Alertrule2 ar:alertrulels)
+            {
+                alertrulemap.put(ar.getName(),ar);
+            }
+        }
+
+        windturbinepartsls=windturbinepartsService.findAll();
+        if(!windturbinepartsls.isEmpty())
+        {
+            for(Windturbineparts wp:windturbinepartsls)
+            {
+                windturbinepartsmap.put(wp.getId(),wp);
+            }
+
+        }
 
 
-//        List<TaosMap> taosls=taosMapService.findTaosMap();
-//        if(!taosls.isEmpty())
-//        {
-//            for(TaosMap taos:taosls)
-//            {
-//                taosmap.put(taos.getStablesid(), taos.getDatabaseid());
-//            }
-//
-//        }
 
-//        List<SysQuartzJob> quartzJobs=sysQuartzJobService.selectByExample(new SysQuartzJobExample());
-//
-//        if(!quartzJobs.isEmpty())
-//        {
-//            for(SysQuartzJob sysQuartzJob:quartzJobs){
-//
-//                jobsmap.put(sysQuartzJob.getId(),sysQuartzJob);
-//            }
-//
-//        }
-//
-//
-//        List<WindTurbineTestingPointaiyj> list = windTurbineTestingPointaiyjService.findAll();
-//
-//        Map<String, WindTurbineTestingPointaiyj> yjmap = null;
-//
-//        if (list != null && !list.isEmpty()) {
-//            for (WindTurbineTestingPointaiyj mp : list) {
-//                if (wtpAiyjmap.containsKey(mp.getWindturbineid())) {
-//                    yjmap = wtpAiyjmap.get(mp.getWindturbineid());
-//                    yjmap.put(mp.getUniformcode(), mp);
-//                } else {
-//                    yjmap = new HashMap<String, WindTurbineTestingPointaiyj>();
-//                    yjmap.put(mp.getUniformcode(), mp);
-//                    wtpAiyjmap.put(mp.getWindturbineid(), yjmap);
-//                }
-//            }
-//        }
-//
-//        String wpString = JSON.toJSONString(globalCache.get("WP"));
-//        wpPointmap = JSONObject.parseObject(wpString, new TypeReference<Map<String, Map<String, WindPowerStationTestingPoint2>>>() {
-//        });
-//        String pjString = JSON.toJSONString(globalCache.get("PJ"));
-//        pjPointmap = JSONObject.parseObject(pjString, new TypeReference<Map<String, Map<String, WindPowerStationTestingPoint2>>>() {
-//        });
-//        String lnString = JSON.toJSONString(globalCache.get("LN"));
-//        lnPointmap = JSONObject.parseObject(lnString, new TypeReference<Map<String, Map<String, WindPowerStationTestingPoint2>>>() {
-//        });
-//
-//        String wtString = JSON.toJSONString(globalCache.get("WT"));
-//        wtPointmap = JSONObject.parseObject(wtString, new TypeReference<Map<String, Map<String, WindTurbineTestingPointAi2>>>() {
-//        });
-//        String wpcmapString = (String)(globalCache.get("wpcmap"));
-//        wpcmap = JSONObject.parseObject(wpcmapString, new TypeReference<Map<String, Map<Double, Windturbinepowercurvefitting>>>() {
-//        });
+
+        List<SysQuartzJob> quartzJobs=sysQuartzJobService.selectByExample(new SysQuartzJobExample());
+
+        if(!quartzJobs.isEmpty())
+        {
+            for(SysQuartzJob sysQuartzJob:quartzJobs){
+
+                jobsmap.put(sysQuartzJob.getId(),sysQuartzJob);
+            }
+
+        }
+
+
+        List<WindTurbineTestingPointaiyj> list = windTurbineTestingPointaiyjService.findAll();
+
+        Map<String, WindTurbineTestingPointaiyj> yjmap = null;
+
+        if (list != null && !list.isEmpty()) {
+            for (WindTurbineTestingPointaiyj mp : list) {
+                if (wtpAiyjmap.containsKey(mp.getWindturbineid())) {
+                    yjmap = wtpAiyjmap.get(mp.getWindturbineid());
+                    yjmap.put(mp.getUniformcode(), mp);
+                } else {
+                    yjmap = new HashMap<String, WindTurbineTestingPointaiyj>();
+                    yjmap.put(mp.getUniformcode(), mp);
+                    wtpAiyjmap.put(mp.getWindturbineid(), yjmap);
+                }
+            }
+        }
+
+        String wpString = JSON.toJSONString(globalCache.get("WP"));
+        wpPointmap = JSONObject.parseObject(wpString, new TypeReference<Map<String, Map<String, WindPowerStationTestingPoint>>>() {
+        });
+        String pjString = JSON.toJSONString(globalCache.get("PJ"));
+        pjPointmap = JSONObject.parseObject(pjString, new TypeReference<Map<String, Map<String, WindPowerStationTestingPoint>>>() {
+        });
+        String lnString = JSON.toJSONString(globalCache.get("LN"));
+        lnPointmap = JSONObject.parseObject(lnString, new TypeReference<Map<String, Map<String, WindPowerStationTestingPoint>>>() {
+        });
+
+        String wtString = JSON.toJSONString(globalCache.get("WT"));
+        wtPointmap = JSONObject.parseObject(wtString, new TypeReference<Map<String, Map<String, WindTurbineTestingPointAi>>>() {
+        });
+        String wpcmapString = (String)(globalCache.get("wpcmap"));
+        wpcmap = JSONObject.parseObject(wpcmapString, new TypeReference<Map<String, Map<Double, Windturbinepowercurvefitting>>>() {
+        });
 
         WindpowerstationExample windpowerstationExample = new WindpowerstationExample();
         windpowerstationExample.setOrderByClause("ordernum ASC");
@@ -292,17 +286,17 @@ public class InitialRunner implements CommandLineRunner {
             }
         }
 
-//        mprdMap = modelpowerRdService.getModelpowerRdAllMap();
-//
-//        StoptypeExample stoptypeExample = new StoptypeExample();
-//        stoptypeExample.setOrderByClause("name ASC");
-//
-//        List<Stoptype> stoptypels = stoptypeService.selectByExample(stoptypeExample);
-//        if (stoptypels != null && !stoptypels.isEmpty()) {
-//            for (int i = 0; i < stoptypels.size(); i++) {
-//                stoptypemap.put(stoptypels.get(i).getId(),stoptypels.get(i));
-//            }
-//        }
+        mprdMap = modelpowerRdService.getModelpowerRdAllMap();
+
+        StoptypeExample stoptypeExample = new StoptypeExample();
+        stoptypeExample.setOrderByClause("name ASC");
+
+        List<Stoptype> stoptypels = stoptypeService.selectByExample(stoptypeExample);
+        if (stoptypels != null && !stoptypels.isEmpty()) {
+            for (int i = 0; i < stoptypels.size(); i++) {
+                stoptypemap.put(stoptypels.get(i).getId(),stoptypels.get(i));
+            }
+        }
 
 //        WindturbinepowercurvefittingExample windturbinepowercurvefittingExample=new WindturbinepowercurvefittingExample();
 //        windturbinepowercurvefittingExample.setOrderByClause("WINDTURBINEID ASC,speed ASC");
@@ -320,94 +314,94 @@ public class InitialRunner implements CommandLineRunner {
 //                }
 //            }
 //        }
-//
-//        Warning2Example warning2Example = new Warning2Example();
-//        warning2Example.setOrderByClause("id ASC");
-//
-//        Warning2Example.Criteria criteria = warning2Example.createCriteria();
-//        criteria.andEdnavalueNotEqualTo(0);
-//        criteria.andWarningclassifyidIsNotNull();
-//        warnls = warning2Service.selectByExample(warning2Example);
-//
-//        if (warnls != null && !warnls.isEmpty()) {
-//            for (int i = 0; i < warnls.size(); i++) {
-//                Warning2 warning = warnls.get(i);
-//
-//                if (warnmodelmap.containsKey(warning.getModelid())) {
-//                    Map<String, List<Warning2>> map = warnmodelmap.get(warning.getModelid());
-//                    if(map.containsKey(warning.getWarningclassifyid()))
-//                    {
-//                        List<Warning2> ls =map.get(warning.getWarningclassifyid());
-//                        ls.add(warning);
-//                        map.put(warning.getWarningclassifyid(), ls);
-//                    }else
-//                    {
-//                        List<Warning2> ls = new ArrayList<>();
-//                        ls.add(warning);
-//                        map.put(warning.getWarningclassifyid(), ls);
-//                    }
-//                    warnmodelmap.put(warning.getModelid(),map);
-//                } else {
-//                    Map<String, List<Warning2>> map = new HashMap<>();
-//                    List<Warning2> ls = new ArrayList<>();
-//                    ls.add(warning);
-//                    map.put(warning.getWarningclassifyid(), ls);
-//                    warnmodelmap.put(warning.getModelid(),map);
-//                }
-//
-//                if (warnmap.containsKey(warning.getModelid())) {
-//                    List<Warning2> ls =warnmap.get(warning.getModelid());
-//                    ls.add(warning);
-//                    warnmap.put(warning.getModelid(),ls);
-//                } else {
-//                    List<Warning2> ls =new ArrayList<>();
-//                    ls.add(warning);
-//                    warnmap.put(warning.getModelid(),ls);
-//                }
-//
-//                warningmap.put(warning.getId(), warning);
-//            }
-//        }
-//        if (wtallls != null && !wtallls.isEmpty()) {
-//
-//            for (int i = 0; i < wtallls.size(); i++) {
-//
-//                Windturbine point = wtallls.get(i);
-//                if (wp_wtmap.containsKey(point.getWindpowerstationid())) {
-//                    List<Windturbine> ls = wp_wtmap.get(point.getWindpowerstationid());
-//                    ls.add(point);
-//                    wp_wtmap.put(point.getWindpowerstationid(), ls);
-//                } else {
-//                    List<Windturbine> ls = new ArrayList();
-//                    ls.add(point);
-//                    wp_wtmap.put(point.getWindpowerstationid(), ls);
-//                }
-//
-//                if (pj_wtmap.containsKey(point.getProjectid())) {
-//                    List<Windturbine> ls = pj_wtmap.get(point.getProjectid());
-//                    ls.add(point);
-//                    pj_wtmap.put(point.getProjectid(), ls);
-//                } else {
-//                    List<Windturbine> ls = new ArrayList();
-//                    ls.add(point);
-//                    pj_wtmap.put(point.getProjectid(), ls);
-//                }
-//
-//
-//                if (ln_wtmap.containsKey(point.getLineid())) {
-//                    List<Windturbine> ls = ln_wtmap.get(point.getLineid());
-//                    ls.add(point);
-//                    ln_wtmap.put(point.getLineid(), ls);
-//                } else {
-//                    List<Windturbine> ls = new ArrayList();
-//                    ls.add(point);
-//                    ln_wtmap.put(point.getLineid(), ls);
-//                }
-//
-//            }
-//
-//
-//        }
+
+        WarningExample warningExample = new WarningExample();
+        warningExample.setOrderByClause("id ASC");
+
+        WarningExample.Criteria criteria = warningExample.createCriteria();
+        criteria.andEdnavalueNotEqualTo(0);
+        criteria.andWarningclassifyidIsNotNull();
+        warnls = warningService.selectByExample(warningExample);
+
+        if (warnls != null && !warnls.isEmpty()) {
+            for (int i = 0; i < warnls.size(); i++) {
+                Warning warning = warnls.get(i);
+
+                if (warnmodelmap.containsKey(warning.getModelid())) {
+                    Map<String, List<Warning>> map = warnmodelmap.get(warning.getModelid());
+                    if(map.containsKey(warning.getWarningclassifyid()))
+                    {
+                        List<Warning> ls =map.get(warning.getWarningclassifyid());
+                        ls.add(warning);
+                        map.put(warning.getWarningclassifyid(), ls);
+                    }else
+                    {
+                        List<Warning> ls = new ArrayList<>();
+                        ls.add(warning);
+                        map.put(warning.getWarningclassifyid(), ls);
+                    }
+                    warnmodelmap.put(warning.getModelid(),map);
+                } else {
+                    Map<String, List<Warning>> map = new HashMap<>();
+                    List<Warning> ls = new ArrayList<>();
+                    ls.add(warning);
+                    map.put(warning.getWarningclassifyid(), ls);
+                    warnmodelmap.put(warning.getModelid(),map);
+                }
+
+                if (warnmap.containsKey(warning.getModelid())) {
+                    List<Warning> ls =warnmap.get(warning.getModelid());
+                    ls.add(warning);
+                    warnmap.put(warning.getModelid(),ls);
+                } else {
+                    List<Warning> ls =new ArrayList<>();
+                    ls.add(warning);
+                    warnmap.put(warning.getModelid(),ls);
+                }
+
+                warningmap.put(warning.getId(), warning);
+            }
+        }
+        if (wtallls != null && !wtallls.isEmpty()) {
+
+            for (int i = 0; i < wtallls.size(); i++) {
+
+                Windturbine point = wtallls.get(i);
+                if (wp_wtmap.containsKey(point.getWindpowerstationid())) {
+                    List<Windturbine> ls = wp_wtmap.get(point.getWindpowerstationid());
+                    ls.add(point);
+                    wp_wtmap.put(point.getWindpowerstationid(), ls);
+                } else {
+                    List<Windturbine> ls = new ArrayList();
+                    ls.add(point);
+                    wp_wtmap.put(point.getWindpowerstationid(), ls);
+                }
+
+                if (pj_wtmap.containsKey(point.getProjectid())) {
+                    List<Windturbine> ls = pj_wtmap.get(point.getProjectid());
+                    ls.add(point);
+                    pj_wtmap.put(point.getProjectid(), ls);
+                } else {
+                    List<Windturbine> ls = new ArrayList();
+                    ls.add(point);
+                    pj_wtmap.put(point.getProjectid(), ls);
+                }
+
+
+                if (ln_wtmap.containsKey(point.getLineid())) {
+                    List<Windturbine> ls = ln_wtmap.get(point.getLineid());
+                    ls.add(point);
+                    ln_wtmap.put(point.getLineid(), ls);
+                } else {
+                    List<Windturbine> ls = new ArrayList();
+                    ls.add(point);
+                    ln_wtmap.put(point.getLineid(), ls);
+                }
+
+            }
+
+
+        }
 //
 
 //        WindPowerStationTestingPoint2Example windPowerstationTestingPointExample=new WindPowerStationTestingPoint2Example();
@@ -457,43 +451,43 @@ public class InitialRunner implements CommandLineRunner {
                 mlmap.put(model.getId(), model);
             }
         }
-//
-//        WarningClassifyExample wcexample = new WarningClassifyExample();
-//        warningClassls = warningClassifyService.selectByExample(wcexample);
-//        if (!warningClassls.isEmpty()) {
-//            for (WarningClassify model : warningClassls) {
-//                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> mpmap = null;
-//
-//            if (mpls != null && !mpls.isEmpty()) {
-//                for (ModelPower mp : mpls) {
-//                    if (modelPowermap.containsKey(mp.getModelid())) {
-//                        mpmap = modelPowermap.get(mp.getModelid());
-//                        mpmap.put(String.valueOf(mp.getSpeed().doubleValue()), mp);
-//                    } else {
-//                        mpmap = new HashMap<String, ModelPower>();
-//                        mpmap.put(String.valueOf(mp.getSpeed().doubleValue()), mp);
-//                        modelPowermap.put(mp.getModelid(), mpmap);
-//                    }
-//                }
-//            }
-//        }
-       // wppointnummap= windPowerstationTestingPoint2Service.getWpPointTotal();
+
+        WarningClassifyExample wcexample = new WarningClassifyExample();
+        warningClassls = warningClassifyService.selectByExample(wcexample);
+        if (!warningClassls.isEmpty()) {
+            for (WarningClassify model : warningClassls) {
+                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> mpmap = null;
+
+            if (mpls != null && !mpls.isEmpty()) {
+                for (ModelPower mp : mpls) {
+                    if (modelPowermap.containsKey(mp.getModelid())) {
+                        mpmap = modelPowermap.get(mp.getModelid());
+                        mpmap.put(String.valueOf(mp.getSpeed().doubleValue()), mp);
+                    } else {
+                        mpmap = new HashMap<String, ModelPower>();
+                        mpmap.put(String.valueOf(mp.getSpeed().doubleValue()), mp);
+                        modelPowermap.put(mp.getModelid(), mpmap);
+                    }
+                }
+            }
+        }
+        wppointnummap= windPowerstationTestingPoint2Service.getWpPointTotal();
     }
 
 }

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

@@ -3,13 +3,10 @@ package com.gyee.frame.controller.health;
 
 import com.gyee.frame.common.conf.AjaxStatus;
 import com.gyee.frame.common.domain.AjaxResult;
-import com.gyee.frame.common.exception.enums.QiNiuErrorEnum;
 import com.gyee.frame.common.feign.RemoteServiceBuilder;
-import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.mapper.auto.WindturbineMapper;
 import com.gyee.frame.model.auto.*;
 import com.gyee.frame.model.custom.export.TsPointData;
-import com.gyee.frame.model.custom.weather.Sys;
 import com.gyee.frame.service.Alertrule2ervice;
 import com.gyee.frame.service.WindTurbineTestingPointAiService;
 import com.gyee.frame.service.WindTurbineTestingPointDiService;
@@ -72,7 +69,7 @@ public class ReliabilityAnalysisController {
         for (String code : codes){
             Map<String, Object> map = new HashMap<>();
             if (code.startsWith("AI")){
-                WindTurbineTestingPointAi2 windAI = windAIService.getWindTurbineTestingPointAi2(wtId, code);
+                WindTurbineTestingPointAi windAI = windAIService.getWindTurbineTestingPointAi2(wtId, code);
                 List<TsPointData> data = null;
                 if (interval.isPresent() && interval.get() > 0)
                     data = remoteService.ShardingService().getHistorySnap(windAI.getId(), startTs, endTs, interval.get());

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

@@ -3,7 +3,7 @@ package com.gyee.frame.controller.health;
 import com.gyee.frame.common.conf.AjaxStatus;
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.common.spring.Constant;
-import com.gyee.frame.model.auto.WindTurbineTestingPointAi2;
+import com.gyee.frame.model.auto.WindTurbineTestingPointAi;
 import com.gyee.frame.model.auto.Windturbinecurvefittingmonth;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.model.custom.QxpcVo;
@@ -98,13 +98,13 @@ public class WindTurbineCurveController {
             Date beginDate = cal.getTime();
 
 
-            WindTurbineTestingPointAi2 gl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.TPOINT_WT_FJGL);
+            WindTurbineTestingPointAi gl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.TPOINT_WT_FJGL);
             int daynum = DateUtils.daysDiff(beginDate, endDate);
             long pried = 300;
             long count = 12 * 24 * daynum;
             DecimalFormat dcmFmt = new DecimalFormat("0.00");
             List<PointData> gls = realApiUtil.getHistoryDatasSnap(gl, beginDate.getTime() / 1000, endDate.getTime() / 1000, count, pried);
-            WindTurbineTestingPointAi2 fs = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.TPOINT_WT_FJSSFS);
+            WindTurbineTestingPointAi fs = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.TPOINT_WT_FJSSFS);
             List<PointData> fss = realApiUtil.getHistoryDatasSnap(fs, beginDate.getTime() / 1000, endDate.getTime() / 1000, count, pried);
 
             List<List<Double>> vos = new ArrayList<List<Double>>();

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

@@ -6,8 +6,8 @@ import com.gyee.frame.common.cache.IGlobalCache;
 import com.gyee.frame.common.conf.AjaxStatus;
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.common.spring.Constant;
-import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
-import com.gyee.frame.model.auto.WindTurbineTestingPointAi2;
+import com.gyee.frame.model.auto.WindPowerStationTestingPoint;
+import com.gyee.frame.model.auto.WindTurbineTestingPointAi;
 import com.gyee.frame.model.auto.Windturbinecurvefittingmonth;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.service.WindPowerstationTestingPoint2Service;
@@ -99,8 +99,8 @@ public class ScatterController {
                 Date endDate = cal.getTime();
 
 
-                WindPowerStationTestingPoint2 gl = null;
-                WindPowerStationTestingPoint2 fs = null;
+                WindPowerStationTestingPoint gl = null;
+                WindPowerStationTestingPoint fs = null;
 
                 if (StringUtils.notEmp(wpId)) {
                     gl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
@@ -201,13 +201,13 @@ public class ScatterController {
                 cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
                 Date endDate = cal.getTime();
 
-                WindTurbineTestingPointAi2 gl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.TPOINT_WT_FJGL);
+                WindTurbineTestingPointAi gl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.TPOINT_WT_FJGL);
                 int daynum = DateUtils.daysDiff(beginDate, endDate);
                 long pried = 60 * 10;
                 long count = 6 * 24 * daynum;
                 DecimalFormat dcmFmt = new DecimalFormat("0.00");
                 List<PointData> gls = realApiUtil.getHistoryDatasSnap(gl, beginDate.getTime() / 1000, endDate.getTime() / 1000, count, pried);
-                WindTurbineTestingPointAi2 fs = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.TPOINT_WT_FJSSFS);
+                WindTurbineTestingPointAi fs = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.TPOINT_WT_FJSSFS);
                 List<PointData> fss = realApiUtil.getHistoryDatasSnap(fs, beginDate.getTime() / 1000, endDate.getTime() / 1000, count, pried);
 
                 if (!gls.isEmpty() && !fss.isEmpty()) {

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

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

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

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
 public interface WarningMapper {
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table warning
+     * This method corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -16,7 +16,7 @@ public interface WarningMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table warning
+     * This method corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -24,7 +24,7 @@ public interface WarningMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table warning
+     * This method corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -32,7 +32,7 @@ public interface WarningMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table warning
+     * This method corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -40,7 +40,7 @@ public interface WarningMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table warning
+     * This method corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -48,7 +48,7 @@ public interface WarningMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table warning
+     * This method corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -56,7 +56,7 @@ public interface WarningMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table warning
+     * This method corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -64,7 +64,7 @@ public interface WarningMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table warning
+     * This method corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -72,7 +72,7 @@ public interface WarningMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table warning
+     * This method corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -80,7 +80,7 @@ public interface WarningMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table warning
+     * This method corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -88,7 +88,7 @@ public interface WarningMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table warning
+     * This method corresponds to the database table warning2
      *
      * @mbg.generated
      */

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

@@ -1,101 +0,0 @@
-package com.gyee.frame.mapper.auto;
-
-import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
-import com.gyee.frame.model.auto.WindPowerStationTestingPoint2Example;
-import com.gyee.frame.model.custom.SimpleVo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface WindPowerStationTestingPoint2Mapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
-     *
-     * @mbg.generated
-     */
-    long countByExample(WindPowerStationTestingPoint2Example example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
-     *
-     * @mbg.generated
-     */
-    int deleteByExample(WindPowerStationTestingPoint2Example example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
-     *
-     * @mbg.generated
-     */
-    int deleteByPrimaryKey(String code);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
-     *
-     * @mbg.generated
-     */
-    int insert(WindPowerStationTestingPoint2 record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
-     *
-     * @mbg.generated
-     */
-    int insertSelective(WindPowerStationTestingPoint2 record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
-     *
-     * @mbg.generated
-     */
-    List<WindPowerStationTestingPoint2> selectByExample(WindPowerStationTestingPoint2Example example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
-     *
-     * @mbg.generated
-     */
-    WindPowerStationTestingPoint2 selectByPrimaryKey(String code);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
-     *
-     * @mbg.generated
-     */
-    int updateByExampleSelective(@Param("record") WindPowerStationTestingPoint2 record, @Param("example") WindPowerStationTestingPoint2Example example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
-     *
-     * @mbg.generated
-     */
-    int updateByExample(@Param("record") WindPowerStationTestingPoint2 record, @Param("example") WindPowerStationTestingPoint2Example example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKeySelective(WindPowerStationTestingPoint2 record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKey(WindPowerStationTestingPoint2 record);
-
-    List<SimpleVo> getWpPointTotal(@Param("wpId") String wpId, @Param("type") String type);
-
-}

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

@@ -2,6 +2,7 @@ package com.gyee.frame.mapper.auto;
 
 import com.gyee.frame.model.auto.WindPowerStationTestingPoint;
 import com.gyee.frame.model.auto.WindPowerStationTestingPointExample;
+import com.gyee.frame.model.custom.SimpleVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -9,7 +10,7 @@ import java.util.List;
 public interface WindPowerStationTestingPointMapper {
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -17,7 +18,7 @@ public interface WindPowerStationTestingPointMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -25,7 +26,7 @@ public interface WindPowerStationTestingPointMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -33,7 +34,7 @@ public interface WindPowerStationTestingPointMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -41,7 +42,7 @@ public interface WindPowerStationTestingPointMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -49,7 +50,7 @@ public interface WindPowerStationTestingPointMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -57,7 +58,7 @@ public interface WindPowerStationTestingPointMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -65,7 +66,7 @@ public interface WindPowerStationTestingPointMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -73,7 +74,7 @@ public interface WindPowerStationTestingPointMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -81,7 +82,7 @@ public interface WindPowerStationTestingPointMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -89,16 +90,12 @@ public interface WindPowerStationTestingPointMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
     int updateByPrimaryKey(WindPowerStationTestingPoint record);
 
-    int deleteAll();
+    List<SimpleVo> getWpPointTotal(@Param("wpId") String wpId, @Param("type") String type);
 
-    int deleteYc();
-
-
-    int insertBatch(List<WindPowerStationTestingPoint> ls);
 }

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

@@ -1,19 +1,19 @@
 package com.gyee.frame.mapper.auto;
 
-import com.gyee.frame.model.auto.WindTurbineTestingPointAi2;
-import com.gyee.frame.model.auto.WindTurbineTestingPointAi2Example;
+import com.gyee.frame.model.auto.WindTurbineTestingPointAi;
+import com.gyee.frame.model.auto.WindTurbineTestingPointAiExample;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-public interface WindTurbineTestingPointAi2Mapper {
+public interface WindTurbineTestingPointAiMapper {
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table WINDTURBINETESTINGPOINTAI2
      *
      * @mbg.generated
      */
-    long countByExample(WindTurbineTestingPointAi2Example example);
+    long countByExample(WindTurbineTestingPointAiExample example);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -21,7 +21,7 @@ public interface WindTurbineTestingPointAi2Mapper {
      *
      * @mbg.generated
      */
-    int deleteByExample(WindTurbineTestingPointAi2Example example);
+    int deleteByExample(WindTurbineTestingPointAiExample example);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -37,7 +37,7 @@ public interface WindTurbineTestingPointAi2Mapper {
      *
      * @mbg.generated
      */
-    int insert(WindTurbineTestingPointAi2 record);
+    int insert(WindTurbineTestingPointAi record);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -45,7 +45,7 @@ public interface WindTurbineTestingPointAi2Mapper {
      *
      * @mbg.generated
      */
-    int insertSelective(WindTurbineTestingPointAi2 record);
+    int insertSelective(WindTurbineTestingPointAi record);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -53,7 +53,7 @@ public interface WindTurbineTestingPointAi2Mapper {
      *
      * @mbg.generated
      */
-    List<WindTurbineTestingPointAi2> selectByExample(WindTurbineTestingPointAi2Example example);
+    List<WindTurbineTestingPointAi> selectByExample(WindTurbineTestingPointAiExample example);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -61,7 +61,7 @@ public interface WindTurbineTestingPointAi2Mapper {
      *
      * @mbg.generated
      */
-    WindTurbineTestingPointAi2 selectByPrimaryKey(String id);
+    WindTurbineTestingPointAi selectByPrimaryKey(String id);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -69,7 +69,7 @@ public interface WindTurbineTestingPointAi2Mapper {
      *
      * @mbg.generated
      */
-    int updateByExampleSelective(@Param("record") WindTurbineTestingPointAi2 record, @Param("example") WindTurbineTestingPointAi2Example example);
+    int updateByExampleSelective(@Param("record") WindTurbineTestingPointAi record, @Param("example") WindTurbineTestingPointAiExample example);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -77,7 +77,7 @@ public interface WindTurbineTestingPointAi2Mapper {
      *
      * @mbg.generated
      */
-    int updateByExample(@Param("record") WindTurbineTestingPointAi2 record, @Param("example") WindTurbineTestingPointAi2Example example);
+    int updateByExample(@Param("record") WindTurbineTestingPointAi record, @Param("example") WindTurbineTestingPointAiExample example);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -85,7 +85,7 @@ public interface WindTurbineTestingPointAi2Mapper {
      *
      * @mbg.generated
      */
-    int updateByPrimaryKeySelective(WindTurbineTestingPointAi2 record);
+    int updateByPrimaryKeySelective(WindTurbineTestingPointAi record);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -93,5 +93,5 @@ public interface WindTurbineTestingPointAi2Mapper {
      *
      * @mbg.generated
      */
-    int updateByPrimaryKey(WindTurbineTestingPointAi2 record);
+    int updateByPrimaryKey(WindTurbineTestingPointAi record);
 }

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

@@ -1,18 +1,18 @@
 package com.gyee.frame.mapper.auto;
 
-import com.gyee.frame.model.auto.WindTurbineTestingPointDi2;
-import com.gyee.frame.model.auto.WindTurbineTestingPointDi2Example;
+import com.gyee.frame.model.auto.WindTurbineTestingPointDi;
+import com.gyee.frame.model.auto.WindTurbineTestingPointDiExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
-public interface WindTurbineTestingPointDi2Mapper {
+public interface WindTurbineTestingPointDiMapper {
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table WINDTURBINETESTINGPOINTDI2
      *
      * @mbg.generated
      */
-    long countByExample(WindTurbineTestingPointDi2Example example);
+    long countByExample(WindTurbineTestingPointDiExample example);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -20,7 +20,7 @@ public interface WindTurbineTestingPointDi2Mapper {
      *
      * @mbg.generated
      */
-    int deleteByExample(WindTurbineTestingPointDi2Example example);
+    int deleteByExample(WindTurbineTestingPointDiExample example);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -36,7 +36,7 @@ public interface WindTurbineTestingPointDi2Mapper {
      *
      * @mbg.generated
      */
-    int insert(WindTurbineTestingPointDi2 record);
+    int insert(WindTurbineTestingPointDi record);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -44,7 +44,7 @@ public interface WindTurbineTestingPointDi2Mapper {
      *
      * @mbg.generated
      */
-    int insertSelective(WindTurbineTestingPointDi2 record);
+    int insertSelective(WindTurbineTestingPointDi record);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -52,7 +52,7 @@ public interface WindTurbineTestingPointDi2Mapper {
      *
      * @mbg.generated
      */
-    List<WindTurbineTestingPointDi2> selectByExample(WindTurbineTestingPointDi2Example example);
+    List<WindTurbineTestingPointDi> selectByExample(WindTurbineTestingPointDiExample example);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -60,7 +60,7 @@ public interface WindTurbineTestingPointDi2Mapper {
      *
      * @mbg.generated
      */
-    WindTurbineTestingPointDi2 selectByPrimaryKey(String id);
+    WindTurbineTestingPointDi selectByPrimaryKey(String id);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -68,7 +68,7 @@ public interface WindTurbineTestingPointDi2Mapper {
      *
      * @mbg.generated
      */
-    int updateByExampleSelective(@Param("record") WindTurbineTestingPointDi2 record, @Param("example") WindTurbineTestingPointDi2Example example);
+    int updateByExampleSelective(@Param("record") WindTurbineTestingPointDi record, @Param("example") WindTurbineTestingPointDiExample example);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -76,7 +76,7 @@ public interface WindTurbineTestingPointDi2Mapper {
      *
      * @mbg.generated
      */
-    int updateByExample(@Param("record") WindTurbineTestingPointDi2 record, @Param("example") WindTurbineTestingPointDi2Example example);
+    int updateByExample(@Param("record") WindTurbineTestingPointDi record, @Param("example") WindTurbineTestingPointDiExample example);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -84,7 +84,7 @@ public interface WindTurbineTestingPointDi2Mapper {
      *
      * @mbg.generated
      */
-    int updateByPrimaryKeySelective(WindTurbineTestingPointDi2 record);
+    int updateByPrimaryKeySelective(WindTurbineTestingPointDi record);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -92,5 +92,5 @@ public interface WindTurbineTestingPointDi2Mapper {
      *
      * @mbg.generated
      */
-    int updateByPrimaryKey(WindTurbineTestingPointDi2 record);
+    int updateByPrimaryKey(WindTurbineTestingPointDi record);
 }

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

@@ -1,19 +1,19 @@
 package com.gyee.frame.mapper.auto;
 
-import com.gyee.frame.model.auto.Windsubstationtestingpoint2;
-import com.gyee.frame.model.auto.Windsubstationtestingpoint2Example;
+import com.gyee.frame.model.auto.Windsubstationtestingpoint;
+import com.gyee.frame.model.auto.WindsubstationtestingpointExample;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-public interface Windsubstationtestingpoint2Mapper {
+public interface WindsubstationtestingpointMapper {
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table WINDSUBSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
-    long countByExample(Windsubstationtestingpoint2Example example);
+    long countByExample(WindsubstationtestingpointExample example);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -21,7 +21,7 @@ public interface Windsubstationtestingpoint2Mapper {
      *
      * @mbg.generated
      */
-    int deleteByExample(Windsubstationtestingpoint2Example example);
+    int deleteByExample(WindsubstationtestingpointExample example);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -37,7 +37,7 @@ public interface Windsubstationtestingpoint2Mapper {
      *
      * @mbg.generated
      */
-    int insert(Windsubstationtestingpoint2 record);
+    int insert(Windsubstationtestingpoint record);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -45,7 +45,7 @@ public interface Windsubstationtestingpoint2Mapper {
      *
      * @mbg.generated
      */
-    int insertSelective(Windsubstationtestingpoint2 record);
+    int insertSelective(Windsubstationtestingpoint record);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -53,7 +53,7 @@ public interface Windsubstationtestingpoint2Mapper {
      *
      * @mbg.generated
      */
-    List<Windsubstationtestingpoint2> selectByExample(Windsubstationtestingpoint2Example example);
+    List<Windsubstationtestingpoint> selectByExample(WindsubstationtestingpointExample example);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -61,7 +61,7 @@ public interface Windsubstationtestingpoint2Mapper {
      *
      * @mbg.generated
      */
-    Windsubstationtestingpoint2 selectByPrimaryKey(String code);
+    Windsubstationtestingpoint selectByPrimaryKey(String code);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -69,7 +69,7 @@ public interface Windsubstationtestingpoint2Mapper {
      *
      * @mbg.generated
      */
-    int updateByExampleSelective(@Param("record") Windsubstationtestingpoint2 record, @Param("example") Windsubstationtestingpoint2Example example);
+    int updateByExampleSelective(@Param("record") Windsubstationtestingpoint record, @Param("example") WindsubstationtestingpointExample example);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -77,7 +77,7 @@ public interface Windsubstationtestingpoint2Mapper {
      *
      * @mbg.generated
      */
-    int updateByExample(@Param("record") Windsubstationtestingpoint2 record, @Param("example") Windsubstationtestingpoint2Example example);
+    int updateByExample(@Param("record") Windsubstationtestingpoint record, @Param("example") WindsubstationtestingpointExample example);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -85,7 +85,7 @@ public interface Windsubstationtestingpoint2Mapper {
      *
      * @mbg.generated
      */
-    int updateByPrimaryKeySelective(Windsubstationtestingpoint2 record);
+    int updateByPrimaryKeySelective(Windsubstationtestingpoint record);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -93,10 +93,10 @@ public interface Windsubstationtestingpoint2Mapper {
      *
      * @mbg.generated
      */
-    int updateByPrimaryKey(Windsubstationtestingpoint2 record);
+    int updateByPrimaryKey(Windsubstationtestingpoint record);
 
 
     int deleteAll();
 
-    int insertBatch(List<Windsubstationtestingpoint2> ls);
+    int insertBatch(List<Windsubstationtestingpoint> ls);
 }

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

@@ -7,7 +7,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning.id
+     * This field corresponds to the database column warning2.id
      *
      * @mbg.generated
      */
@@ -16,7 +16,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning.levelId
+     * This field corresponds to the database column warning2.levelId
      *
      * @mbg.generated
      */
@@ -25,7 +25,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning.manufacturerCode
+     * This field corresponds to the database column warning2.manufacturerCode
      *
      * @mbg.generated
      */
@@ -34,7 +34,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning.englishText
+     * This field corresponds to the database column warning2.englishText
      *
      * @mbg.generated
      */
@@ -43,7 +43,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning.chineseText
+     * This field corresponds to the database column warning2.chineseText
      *
      * @mbg.generated
      */
@@ -52,7 +52,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning.parentId
+     * This field corresponds to the database column warning2.parentId
      *
      * @mbg.generated
      */
@@ -61,7 +61,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning.isLeaf
+     * This field corresponds to the database column warning2.isLeaf
      *
      * @mbg.generated
      */
@@ -70,7 +70,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning.sequenceNumber
+     * This field corresponds to the database column warning2.sequenceNumber
      *
      * @mbg.generated
      */
@@ -79,7 +79,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning.characteristic
+     * This field corresponds to the database column warning2.characteristic
      *
      * @mbg.generated
      */
@@ -88,7 +88,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning.modelId
+     * This field corresponds to the database column warning2.modelId
      *
      * @mbg.generated
      */
@@ -97,7 +97,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning.codeName
+     * This field corresponds to the database column warning2.codeName
      *
      * @mbg.generated
      */
@@ -106,7 +106,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning.ednaValue
+     * This field corresponds to the database column warning2.ednaValue
      *
      * @mbg.generated
      */
@@ -115,7 +115,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning.display
+     * This field corresponds to the database column warning2.display
      *
      * @mbg.generated
      */
@@ -124,7 +124,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning.warningClassifyId
+     * This field corresponds to the database column warning2.warningClassifyId
      *
      * @mbg.generated
      */
@@ -133,7 +133,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning.isreset
+     * This field corresponds to the database column warning2.isreset
      *
      * @mbg.generated
      */
@@ -142,7 +142,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning.standardTime
+     * This field corresponds to the database column warning2.standardTime
      *
      * @mbg.generated
      */
@@ -151,7 +151,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning.warningtypeid
+     * This field corresponds to the database column warning2.warningtypeid
      *
      * @mbg.generated
      */
@@ -159,7 +159,7 @@ public class Warning implements Serializable {
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table warning
+     * This field corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -167,9 +167,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning.id
+     * This method returns the value of the database column warning2.id
      *
-     * @return the value of warning.id
+     * @return the value of warning2.id
      *
      * @mbg.generated
      */
@@ -179,9 +179,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning.id
+     * This method sets the value of the database column warning2.id
      *
-     * @param id the value for warning.id
+     * @param id the value for warning2.id
      *
      * @mbg.generated
      */
@@ -191,9 +191,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning.levelId
+     * This method returns the value of the database column warning2.levelId
      *
-     * @return the value of warning.levelId
+     * @return the value of warning2.levelId
      *
      * @mbg.generated
      */
@@ -203,9 +203,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning.levelId
+     * This method sets the value of the database column warning2.levelId
      *
-     * @param levelid the value for warning.levelId
+     * @param levelid the value for warning2.levelId
      *
      * @mbg.generated
      */
@@ -215,9 +215,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning.manufacturerCode
+     * This method returns the value of the database column warning2.manufacturerCode
      *
-     * @return the value of warning.manufacturerCode
+     * @return the value of warning2.manufacturerCode
      *
      * @mbg.generated
      */
@@ -227,9 +227,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning.manufacturerCode
+     * This method sets the value of the database column warning2.manufacturerCode
      *
-     * @param manufacturercode the value for warning.manufacturerCode
+     * @param manufacturercode the value for warning2.manufacturerCode
      *
      * @mbg.generated
      */
@@ -239,9 +239,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning.englishText
+     * This method returns the value of the database column warning2.englishText
      *
-     * @return the value of warning.englishText
+     * @return the value of warning2.englishText
      *
      * @mbg.generated
      */
@@ -251,9 +251,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning.englishText
+     * This method sets the value of the database column warning2.englishText
      *
-     * @param englishtext the value for warning.englishText
+     * @param englishtext the value for warning2.englishText
      *
      * @mbg.generated
      */
@@ -263,9 +263,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning.chineseText
+     * This method returns the value of the database column warning2.chineseText
      *
-     * @return the value of warning.chineseText
+     * @return the value of warning2.chineseText
      *
      * @mbg.generated
      */
@@ -275,9 +275,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning.chineseText
+     * This method sets the value of the database column warning2.chineseText
      *
-     * @param chinesetext the value for warning.chineseText
+     * @param chinesetext the value for warning2.chineseText
      *
      * @mbg.generated
      */
@@ -287,9 +287,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning.parentId
+     * This method returns the value of the database column warning2.parentId
      *
-     * @return the value of warning.parentId
+     * @return the value of warning2.parentId
      *
      * @mbg.generated
      */
@@ -299,9 +299,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning.parentId
+     * This method sets the value of the database column warning2.parentId
      *
-     * @param parentid the value for warning.parentId
+     * @param parentid the value for warning2.parentId
      *
      * @mbg.generated
      */
@@ -311,9 +311,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning.isLeaf
+     * This method returns the value of the database column warning2.isLeaf
      *
-     * @return the value of warning.isLeaf
+     * @return the value of warning2.isLeaf
      *
      * @mbg.generated
      */
@@ -323,9 +323,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning.isLeaf
+     * This method sets the value of the database column warning2.isLeaf
      *
-     * @param isleaf the value for warning.isLeaf
+     * @param isleaf the value for warning2.isLeaf
      *
      * @mbg.generated
      */
@@ -335,9 +335,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning.sequenceNumber
+     * This method returns the value of the database column warning2.sequenceNumber
      *
-     * @return the value of warning.sequenceNumber
+     * @return the value of warning2.sequenceNumber
      *
      * @mbg.generated
      */
@@ -347,9 +347,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning.sequenceNumber
+     * This method sets the value of the database column warning2.sequenceNumber
      *
-     * @param sequencenumber the value for warning.sequenceNumber
+     * @param sequencenumber the value for warning2.sequenceNumber
      *
      * @mbg.generated
      */
@@ -359,9 +359,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning.characteristic
+     * This method returns the value of the database column warning2.characteristic
      *
-     * @return the value of warning.characteristic
+     * @return the value of warning2.characteristic
      *
      * @mbg.generated
      */
@@ -371,9 +371,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning.characteristic
+     * This method sets the value of the database column warning2.characteristic
      *
-     * @param characteristic the value for warning.characteristic
+     * @param characteristic the value for warning2.characteristic
      *
      * @mbg.generated
      */
@@ -383,9 +383,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning.modelId
+     * This method returns the value of the database column warning2.modelId
      *
-     * @return the value of warning.modelId
+     * @return the value of warning2.modelId
      *
      * @mbg.generated
      */
@@ -395,9 +395,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning.modelId
+     * This method sets the value of the database column warning2.modelId
      *
-     * @param modelid the value for warning.modelId
+     * @param modelid the value for warning2.modelId
      *
      * @mbg.generated
      */
@@ -407,9 +407,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning.codeName
+     * This method returns the value of the database column warning2.codeName
      *
-     * @return the value of warning.codeName
+     * @return the value of warning2.codeName
      *
      * @mbg.generated
      */
@@ -419,9 +419,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning.codeName
+     * This method sets the value of the database column warning2.codeName
      *
-     * @param codename the value for warning.codeName
+     * @param codename the value for warning2.codeName
      *
      * @mbg.generated
      */
@@ -431,9 +431,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning.ednaValue
+     * This method returns the value of the database column warning2.ednaValue
      *
-     * @return the value of warning.ednaValue
+     * @return the value of warning2.ednaValue
      *
      * @mbg.generated
      */
@@ -443,9 +443,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning.ednaValue
+     * This method sets the value of the database column warning2.ednaValue
      *
-     * @param ednavalue the value for warning.ednaValue
+     * @param ednavalue the value for warning2.ednaValue
      *
      * @mbg.generated
      */
@@ -455,9 +455,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning.display
+     * This method returns the value of the database column warning2.display
      *
-     * @return the value of warning.display
+     * @return the value of warning2.display
      *
      * @mbg.generated
      */
@@ -467,9 +467,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning.display
+     * This method sets the value of the database column warning2.display
      *
-     * @param display the value for warning.display
+     * @param display the value for warning2.display
      *
      * @mbg.generated
      */
@@ -479,9 +479,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning.warningClassifyId
+     * This method returns the value of the database column warning2.warningClassifyId
      *
-     * @return the value of warning.warningClassifyId
+     * @return the value of warning2.warningClassifyId
      *
      * @mbg.generated
      */
@@ -491,9 +491,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning.warningClassifyId
+     * This method sets the value of the database column warning2.warningClassifyId
      *
-     * @param warningclassifyid the value for warning.warningClassifyId
+     * @param warningclassifyid the value for warning2.warningClassifyId
      *
      * @mbg.generated
      */
@@ -503,9 +503,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning.isreset
+     * This method returns the value of the database column warning2.isreset
      *
-     * @return the value of warning.isreset
+     * @return the value of warning2.isreset
      *
      * @mbg.generated
      */
@@ -515,9 +515,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning.isreset
+     * This method sets the value of the database column warning2.isreset
      *
-     * @param isreset the value for warning.isreset
+     * @param isreset the value for warning2.isreset
      *
      * @mbg.generated
      */
@@ -527,9 +527,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning.standardTime
+     * This method returns the value of the database column warning2.standardTime
      *
-     * @return the value of warning.standardTime
+     * @return the value of warning2.standardTime
      *
      * @mbg.generated
      */
@@ -539,9 +539,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning.standardTime
+     * This method sets the value of the database column warning2.standardTime
      *
-     * @param standardtime the value for warning.standardTime
+     * @param standardtime the value for warning2.standardTime
      *
      * @mbg.generated
      */
@@ -551,9 +551,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning.warningtypeid
+     * This method returns the value of the database column warning2.warningtypeid
      *
-     * @return the value of warning.warningtypeid
+     * @return the value of warning2.warningtypeid
      *
      * @mbg.generated
      */
@@ -563,9 +563,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning.warningtypeid
+     * This method sets the value of the database column warning2.warningtypeid
      *
-     * @param warningtypeid the value for warning.warningtypeid
+     * @param warningtypeid the value for warning2.warningtypeid
      *
      * @mbg.generated
      */

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

@@ -1,575 +0,0 @@
-package com.gyee.frame.model.auto;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-public class Warning2 implements Serializable {
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.id
-     *
-     * @mbg.generated
-     */
-    private String id;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.levelId
-     *
-     * @mbg.generated
-     */
-    private String levelid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.manufacturerCode
-     *
-     * @mbg.generated
-     */
-    private String manufacturercode;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.englishText
-     *
-     * @mbg.generated
-     */
-    private String englishtext;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.chineseText
-     *
-     * @mbg.generated
-     */
-    private String chinesetext;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.parentId
-     *
-     * @mbg.generated
-     */
-    private String parentid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.isLeaf
-     *
-     * @mbg.generated
-     */
-    private Short isleaf;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.sequenceNumber
-     *
-     * @mbg.generated
-     */
-    private Integer sequencenumber;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.characteristic
-     *
-     * @mbg.generated
-     */
-    private String characteristic;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.modelId
-     *
-     * @mbg.generated
-     */
-    private String modelid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.codeName
-     *
-     * @mbg.generated
-     */
-    private String codename;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.ednaValue
-     *
-     * @mbg.generated
-     */
-    private Integer ednavalue;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.display
-     *
-     * @mbg.generated
-     */
-    private Integer display;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.warningClassifyId
-     *
-     * @mbg.generated
-     */
-    private String warningclassifyid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.isreset
-     *
-     * @mbg.generated
-     */
-    private BigDecimal isreset;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.standardTime
-     *
-     * @mbg.generated
-     */
-    private BigDecimal standardtime;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.warningtypeid
-     *
-     * @mbg.generated
-     */
-    private String warningtypeid;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table warning2
-     *
-     * @mbg.generated
-     */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.id
-     *
-     * @return the value of warning2.id
-     *
-     * @mbg.generated
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.id
-     *
-     * @param id the value for warning2.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 warning2.levelId
-     *
-     * @return the value of warning2.levelId
-     *
-     * @mbg.generated
-     */
-    public String getLevelid() {
-        return levelid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.levelId
-     *
-     * @param levelid the value for warning2.levelId
-     *
-     * @mbg.generated
-     */
-    public void setLevelid(String levelid) {
-        this.levelid = levelid == null ? null : levelid.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.manufacturerCode
-     *
-     * @return the value of warning2.manufacturerCode
-     *
-     * @mbg.generated
-     */
-    public String getManufacturercode() {
-        return manufacturercode;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.manufacturerCode
-     *
-     * @param manufacturercode the value for warning2.manufacturerCode
-     *
-     * @mbg.generated
-     */
-    public void setManufacturercode(String manufacturercode) {
-        this.manufacturercode = manufacturercode == null ? null : manufacturercode.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.englishText
-     *
-     * @return the value of warning2.englishText
-     *
-     * @mbg.generated
-     */
-    public String getEnglishtext() {
-        return englishtext;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.englishText
-     *
-     * @param englishtext the value for warning2.englishText
-     *
-     * @mbg.generated
-     */
-    public void setEnglishtext(String englishtext) {
-        this.englishtext = englishtext == null ? null : englishtext.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.chineseText
-     *
-     * @return the value of warning2.chineseText
-     *
-     * @mbg.generated
-     */
-    public String getChinesetext() {
-        return chinesetext;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.chineseText
-     *
-     * @param chinesetext the value for warning2.chineseText
-     *
-     * @mbg.generated
-     */
-    public void setChinesetext(String chinesetext) {
-        this.chinesetext = chinesetext == null ? null : chinesetext.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.parentId
-     *
-     * @return the value of warning2.parentId
-     *
-     * @mbg.generated
-     */
-    public String getParentid() {
-        return parentid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.parentId
-     *
-     * @param parentid the value for warning2.parentId
-     *
-     * @mbg.generated
-     */
-    public void setParentid(String parentid) {
-        this.parentid = parentid == null ? null : parentid.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.isLeaf
-     *
-     * @return the value of warning2.isLeaf
-     *
-     * @mbg.generated
-     */
-    public Short getIsleaf() {
-        return isleaf;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.isLeaf
-     *
-     * @param isleaf the value for warning2.isLeaf
-     *
-     * @mbg.generated
-     */
-    public void setIsleaf(Short isleaf) {
-        this.isleaf = isleaf;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.sequenceNumber
-     *
-     * @return the value of warning2.sequenceNumber
-     *
-     * @mbg.generated
-     */
-    public Integer getSequencenumber() {
-        return sequencenumber;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.sequenceNumber
-     *
-     * @param sequencenumber the value for warning2.sequenceNumber
-     *
-     * @mbg.generated
-     */
-    public void setSequencenumber(Integer sequencenumber) {
-        this.sequencenumber = sequencenumber;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.characteristic
-     *
-     * @return the value of warning2.characteristic
-     *
-     * @mbg.generated
-     */
-    public String getCharacteristic() {
-        return characteristic;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.characteristic
-     *
-     * @param characteristic the value for warning2.characteristic
-     *
-     * @mbg.generated
-     */
-    public void setCharacteristic(String characteristic) {
-        this.characteristic = characteristic == null ? null : characteristic.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.modelId
-     *
-     * @return the value of warning2.modelId
-     *
-     * @mbg.generated
-     */
-    public String getModelid() {
-        return modelid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.modelId
-     *
-     * @param modelid the value for warning2.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 warning2.codeName
-     *
-     * @return the value of warning2.codeName
-     *
-     * @mbg.generated
-     */
-    public String getCodename() {
-        return codename;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.codeName
-     *
-     * @param codename the value for warning2.codeName
-     *
-     * @mbg.generated
-     */
-    public void setCodename(String codename) {
-        this.codename = codename == null ? null : codename.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.ednaValue
-     *
-     * @return the value of warning2.ednaValue
-     *
-     * @mbg.generated
-     */
-    public Integer getEdnavalue() {
-        return ednavalue;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.ednaValue
-     *
-     * @param ednavalue the value for warning2.ednaValue
-     *
-     * @mbg.generated
-     */
-    public void setEdnavalue(Integer ednavalue) {
-        this.ednavalue = ednavalue;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.display
-     *
-     * @return the value of warning2.display
-     *
-     * @mbg.generated
-     */
-    public Integer getDisplay() {
-        return display;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.display
-     *
-     * @param display the value for warning2.display
-     *
-     * @mbg.generated
-     */
-    public void setDisplay(Integer display) {
-        this.display = display;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.warningClassifyId
-     *
-     * @return the value of warning2.warningClassifyId
-     *
-     * @mbg.generated
-     */
-    public String getWarningclassifyid() {
-        return warningclassifyid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.warningClassifyId
-     *
-     * @param warningclassifyid the value for warning2.warningClassifyId
-     *
-     * @mbg.generated
-     */
-    public void setWarningclassifyid(String warningclassifyid) {
-        this.warningclassifyid = warningclassifyid == null ? null : warningclassifyid.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.isreset
-     *
-     * @return the value of warning2.isreset
-     *
-     * @mbg.generated
-     */
-    public BigDecimal getIsreset() {
-        return isreset;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.isreset
-     *
-     * @param isreset the value for warning2.isreset
-     *
-     * @mbg.generated
-     */
-    public void setIsreset(BigDecimal isreset) {
-        this.isreset = isreset;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.standardTime
-     *
-     * @return the value of warning2.standardTime
-     *
-     * @mbg.generated
-     */
-    public BigDecimal getStandardtime() {
-        return standardtime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.standardTime
-     *
-     * @param standardtime the value for warning2.standardTime
-     *
-     * @mbg.generated
-     */
-    public void setStandardtime(BigDecimal standardtime) {
-        this.standardtime = standardtime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.warningtypeid
-     *
-     * @return the value of warning2.warningtypeid
-     *
-     * @mbg.generated
-     */
-    public String getWarningtypeid() {
-        return warningtypeid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.warningtypeid
-     *
-     * @param warningtypeid the value for warning2.warningtypeid
-     *
-     * @mbg.generated
-     */
-    public void setWarningtypeid(String warningtypeid) {
-        this.warningtypeid = warningtypeid == null ? null : warningtypeid.trim();
-    }
-}

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

@@ -7,7 +7,7 @@ import java.util.List;
 public class WarningExample {
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table warning
+     * This field corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -15,7 +15,7 @@ public class WarningExample {
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table warning
+     * This field corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -23,7 +23,7 @@ public class WarningExample {
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table warning
+     * This field corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -31,7 +31,7 @@ public class WarningExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table warning
+     * This method corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -41,7 +41,7 @@ public class WarningExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table warning
+     * This method corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -51,7 +51,7 @@ public class WarningExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table warning
+     * This method corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -61,7 +61,7 @@ public class WarningExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table warning
+     * This method corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -71,7 +71,7 @@ public class WarningExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table warning
+     * This method corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -81,7 +81,7 @@ public class WarningExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table warning
+     * This method corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -91,7 +91,7 @@ public class WarningExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table warning
+     * This method corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -101,7 +101,7 @@ public class WarningExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table warning
+     * This method corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -113,7 +113,7 @@ public class WarningExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table warning
+     * This method corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -127,7 +127,7 @@ public class WarningExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table warning
+     * This method corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -138,7 +138,7 @@ public class WarningExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table warning
+     * This method corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -150,7 +150,7 @@ public class WarningExample {
 
     /**
      * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table warning
+     * This class corresponds to the database table warning2
      *
      * @mbg.generated
      */
@@ -1328,7 +1328,7 @@ public class WarningExample {
 
     /**
      * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table warning
+     * This class corresponds to the database table warning2
      *
      * @mbg.generated do_not_delete_during_merge
      */
@@ -1341,7 +1341,7 @@ public class WarningExample {
 
     /**
      * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table warning
+     * This class corresponds to the database table warning2
      *
      * @mbg.generated
      */

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

@@ -7,7 +7,7 @@ public class WindPowerStationTestingPoint implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.CODE
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.CODE
      *
      * @mbg.generated
      */
@@ -16,7 +16,7 @@ public class WindPowerStationTestingPoint implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.NAME
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.NAME
      *
      * @mbg.generated
      */
@@ -25,7 +25,7 @@ public class WindPowerStationTestingPoint implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.MODEL
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.MODEL
      *
      * @mbg.generated
      */
@@ -34,7 +34,7 @@ public class WindPowerStationTestingPoint implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.VALUEUNIT
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.VALUEUNIT
      *
      * @mbg.generated
      */
@@ -43,7 +43,7 @@ public class WindPowerStationTestingPoint implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.ENGLISHNAME
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.ENGLISHNAME
      *
      * @mbg.generated
      */
@@ -52,7 +52,7 @@ public class WindPowerStationTestingPoint implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.TYPEID
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.TYPEID
      *
      * @mbg.generated
      */
@@ -61,7 +61,7 @@ public class WindPowerStationTestingPoint implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.MODELID
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.MODELID
      *
      * @mbg.generated
      */
@@ -70,7 +70,7 @@ public class WindPowerStationTestingPoint implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.MAXVAL
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.MAXVAL
      *
      * @mbg.generated
      */
@@ -79,7 +79,7 @@ public class WindPowerStationTestingPoint implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.MINVAL
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.MINVAL
      *
      * @mbg.generated
      */
@@ -88,7 +88,7 @@ public class WindPowerStationTestingPoint implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.REASONABLEMAXVAL
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.REASONABLEMAXVAL
      *
      * @mbg.generated
      */
@@ -97,7 +97,7 @@ public class WindPowerStationTestingPoint implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.REASONABLEMINVAL
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.REASONABLEMINVAL
      *
      * @mbg.generated
      */
@@ -106,7 +106,7 @@ public class WindPowerStationTestingPoint implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.UNIFORMCODE
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.UNIFORMCODE
      *
      * @mbg.generated
      */
@@ -115,7 +115,7 @@ public class WindPowerStationTestingPoint implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.SHORTID
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.SHORTID
      *
      * @mbg.generated
      */
@@ -124,7 +124,7 @@ public class WindPowerStationTestingPoint implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.LONGID
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.LONGID
      *
      * @mbg.generated
      */
@@ -133,7 +133,7 @@ public class WindPowerStationTestingPoint implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.WINDPOWERSTATIONID
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.WINDPOWERSTATIONID
      *
      * @mbg.generated
      */
@@ -142,7 +142,7 @@ public class WindPowerStationTestingPoint implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.REALTIMEID
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.REALTIMEID
      *
      * @mbg.generated
      */
@@ -150,7 +150,7 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This field corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -158,9 +158,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.CODE
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.CODE
      *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT.CODE
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.CODE
      *
      * @mbg.generated
      */
@@ -170,9 +170,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.CODE
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.CODE
      *
-     * @param code the value for WINDPOWERSTATIONTESTINGPOINT.CODE
+     * @param code the value for WINDPOWERSTATIONTESTINGPOINT2.CODE
      *
      * @mbg.generated
      */
@@ -182,9 +182,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.NAME
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.NAME
      *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT.NAME
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.NAME
      *
      * @mbg.generated
      */
@@ -194,9 +194,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.NAME
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.NAME
      *
-     * @param name the value for WINDPOWERSTATIONTESTINGPOINT.NAME
+     * @param name the value for WINDPOWERSTATIONTESTINGPOINT2.NAME
      *
      * @mbg.generated
      */
@@ -206,9 +206,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.MODEL
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.MODEL
      *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT.MODEL
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.MODEL
      *
      * @mbg.generated
      */
@@ -218,9 +218,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.MODEL
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.MODEL
      *
-     * @param model the value for WINDPOWERSTATIONTESTINGPOINT.MODEL
+     * @param model the value for WINDPOWERSTATIONTESTINGPOINT2.MODEL
      *
      * @mbg.generated
      */
@@ -230,9 +230,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.VALUEUNIT
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.VALUEUNIT
      *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT.VALUEUNIT
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.VALUEUNIT
      *
      * @mbg.generated
      */
@@ -242,9 +242,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.VALUEUNIT
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.VALUEUNIT
      *
-     * @param valueunit the value for WINDPOWERSTATIONTESTINGPOINT.VALUEUNIT
+     * @param valueunit the value for WINDPOWERSTATIONTESTINGPOINT2.VALUEUNIT
      *
      * @mbg.generated
      */
@@ -254,9 +254,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.ENGLISHNAME
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.ENGLISHNAME
      *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT.ENGLISHNAME
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.ENGLISHNAME
      *
      * @mbg.generated
      */
@@ -266,9 +266,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.ENGLISHNAME
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.ENGLISHNAME
      *
-     * @param englishname the value for WINDPOWERSTATIONTESTINGPOINT.ENGLISHNAME
+     * @param englishname the value for WINDPOWERSTATIONTESTINGPOINT2.ENGLISHNAME
      *
      * @mbg.generated
      */
@@ -278,9 +278,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.TYPEID
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.TYPEID
      *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT.TYPEID
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.TYPEID
      *
      * @mbg.generated
      */
@@ -290,9 +290,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.TYPEID
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.TYPEID
      *
-     * @param typeid the value for WINDPOWERSTATIONTESTINGPOINT.TYPEID
+     * @param typeid the value for WINDPOWERSTATIONTESTINGPOINT2.TYPEID
      *
      * @mbg.generated
      */
@@ -302,9 +302,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.MODELID
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.MODELID
      *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT.MODELID
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.MODELID
      *
      * @mbg.generated
      */
@@ -314,9 +314,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.MODELID
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.MODELID
      *
-     * @param modelid the value for WINDPOWERSTATIONTESTINGPOINT.MODELID
+     * @param modelid the value for WINDPOWERSTATIONTESTINGPOINT2.MODELID
      *
      * @mbg.generated
      */
@@ -326,9 +326,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.MAXVAL
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.MAXVAL
      *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT.MAXVAL
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.MAXVAL
      *
      * @mbg.generated
      */
@@ -338,9 +338,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.MAXVAL
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.MAXVAL
      *
-     * @param maxval the value for WINDPOWERSTATIONTESTINGPOINT.MAXVAL
+     * @param maxval the value for WINDPOWERSTATIONTESTINGPOINT2.MAXVAL
      *
      * @mbg.generated
      */
@@ -350,9 +350,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.MINVAL
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.MINVAL
      *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT.MINVAL
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.MINVAL
      *
      * @mbg.generated
      */
@@ -362,9 +362,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.MINVAL
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.MINVAL
      *
-     * @param minval the value for WINDPOWERSTATIONTESTINGPOINT.MINVAL
+     * @param minval the value for WINDPOWERSTATIONTESTINGPOINT2.MINVAL
      *
      * @mbg.generated
      */
@@ -374,9 +374,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.REASONABLEMAXVAL
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.REASONABLEMAXVAL
      *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT.REASONABLEMAXVAL
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.REASONABLEMAXVAL
      *
      * @mbg.generated
      */
@@ -386,9 +386,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.REASONABLEMAXVAL
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.REASONABLEMAXVAL
      *
-     * @param reasonablemaxval the value for WINDPOWERSTATIONTESTINGPOINT.REASONABLEMAXVAL
+     * @param reasonablemaxval the value for WINDPOWERSTATIONTESTINGPOINT2.REASONABLEMAXVAL
      *
      * @mbg.generated
      */
@@ -398,9 +398,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.REASONABLEMINVAL
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.REASONABLEMINVAL
      *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT.REASONABLEMINVAL
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.REASONABLEMINVAL
      *
      * @mbg.generated
      */
@@ -410,9 +410,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.REASONABLEMINVAL
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.REASONABLEMINVAL
      *
-     * @param reasonableminval the value for WINDPOWERSTATIONTESTINGPOINT.REASONABLEMINVAL
+     * @param reasonableminval the value for WINDPOWERSTATIONTESTINGPOINT2.REASONABLEMINVAL
      *
      * @mbg.generated
      */
@@ -422,9 +422,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.UNIFORMCODE
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.UNIFORMCODE
      *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT.UNIFORMCODE
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.UNIFORMCODE
      *
      * @mbg.generated
      */
@@ -434,9 +434,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.UNIFORMCODE
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.UNIFORMCODE
      *
-     * @param uniformcode the value for WINDPOWERSTATIONTESTINGPOINT.UNIFORMCODE
+     * @param uniformcode the value for WINDPOWERSTATIONTESTINGPOINT2.UNIFORMCODE
      *
      * @mbg.generated
      */
@@ -446,9 +446,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.SHORTID
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.SHORTID
      *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT.SHORTID
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.SHORTID
      *
      * @mbg.generated
      */
@@ -458,9 +458,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.SHORTID
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.SHORTID
      *
-     * @param shortid the value for WINDPOWERSTATIONTESTINGPOINT.SHORTID
+     * @param shortid the value for WINDPOWERSTATIONTESTINGPOINT2.SHORTID
      *
      * @mbg.generated
      */
@@ -470,9 +470,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.LONGID
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.LONGID
      *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT.LONGID
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.LONGID
      *
      * @mbg.generated
      */
@@ -482,9 +482,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.LONGID
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.LONGID
      *
-     * @param longid the value for WINDPOWERSTATIONTESTINGPOINT.LONGID
+     * @param longid the value for WINDPOWERSTATIONTESTINGPOINT2.LONGID
      *
      * @mbg.generated
      */
@@ -494,9 +494,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.WINDPOWERSTATIONID
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.WINDPOWERSTATIONID
      *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT.WINDPOWERSTATIONID
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.WINDPOWERSTATIONID
      *
      * @mbg.generated
      */
@@ -506,9 +506,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.WINDPOWERSTATIONID
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.WINDPOWERSTATIONID
      *
-     * @param windpowerstationid the value for WINDPOWERSTATIONTESTINGPOINT.WINDPOWERSTATIONID
+     * @param windpowerstationid the value for WINDPOWERSTATIONTESTINGPOINT2.WINDPOWERSTATIONID
      *
      * @mbg.generated
      */
@@ -518,9 +518,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.REALTIMEID
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.REALTIMEID
      *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT.REALTIMEID
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.REALTIMEID
      *
      * @mbg.generated
      */
@@ -530,9 +530,9 @@ public class WindPowerStationTestingPoint implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.REALTIMEID
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.REALTIMEID
      *
-     * @param realtimeid the value for WINDPOWERSTATIONTESTINGPOINT.REALTIMEID
+     * @param realtimeid the value for WINDPOWERSTATIONTESTINGPOINT2.REALTIMEID
      *
      * @mbg.generated
      */

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

@@ -1,542 +0,0 @@
-package com.gyee.frame.model.auto;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-public class WindPowerStationTestingPoint2 implements Serializable {
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.CODE
-     *
-     * @mbg.generated
-     */
-    private String code;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.NAME
-     *
-     * @mbg.generated
-     */
-    private String name;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.MODEL
-     *
-     * @mbg.generated
-     */
-    private String model;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.VALUEUNIT
-     *
-     * @mbg.generated
-     */
-    private String valueunit;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.ENGLISHNAME
-     *
-     * @mbg.generated
-     */
-    private String englishname;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.TYPEID
-     *
-     * @mbg.generated
-     */
-    private String typeid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.MODELID
-     *
-     * @mbg.generated
-     */
-    private String modelid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.MAXVAL
-     *
-     * @mbg.generated
-     */
-    private BigDecimal maxval;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.MINVAL
-     *
-     * @mbg.generated
-     */
-    private BigDecimal minval;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.REASONABLEMAXVAL
-     *
-     * @mbg.generated
-     */
-    private BigDecimal reasonablemaxval;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.REASONABLEMINVAL
-     *
-     * @mbg.generated
-     */
-    private BigDecimal reasonableminval;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.UNIFORMCODE
-     *
-     * @mbg.generated
-     */
-    private String uniformcode;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.SHORTID
-     *
-     * @mbg.generated
-     */
-    private String shortid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.LONGID
-     *
-     * @mbg.generated
-     */
-    private String longid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.WINDPOWERSTATIONID
-     *
-     * @mbg.generated
-     */
-    private String windpowerstationid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT2.REALTIMEID
-     *
-     * @mbg.generated
-     */
-    private String realtimeid;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
-     *
-     * @mbg.generated
-     */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.CODE
-     *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.CODE
-     *
-     * @mbg.generated
-     */
-    public String getCode() {
-        return code;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.CODE
-     *
-     * @param code the value for WINDPOWERSTATIONTESTINGPOINT2.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 WINDPOWERSTATIONTESTINGPOINT2.NAME
-     *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.NAME
-     *
-     * @mbg.generated
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.NAME
-     *
-     * @param name the value for WINDPOWERSTATIONTESTINGPOINT2.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 WINDPOWERSTATIONTESTINGPOINT2.MODEL
-     *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.MODEL
-     *
-     * @mbg.generated
-     */
-    public String getModel() {
-        return model;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.MODEL
-     *
-     * @param model the value for WINDPOWERSTATIONTESTINGPOINT2.MODEL
-     *
-     * @mbg.generated
-     */
-    public void setModel(String model) {
-        this.model = model == null ? null : model.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.VALUEUNIT
-     *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.VALUEUNIT
-     *
-     * @mbg.generated
-     */
-    public String getValueunit() {
-        return valueunit;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.VALUEUNIT
-     *
-     * @param valueunit the value for WINDPOWERSTATIONTESTINGPOINT2.VALUEUNIT
-     *
-     * @mbg.generated
-     */
-    public void setValueunit(String valueunit) {
-        this.valueunit = valueunit == null ? null : valueunit.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.ENGLISHNAME
-     *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.ENGLISHNAME
-     *
-     * @mbg.generated
-     */
-    public String getEnglishname() {
-        return englishname;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.ENGLISHNAME
-     *
-     * @param englishname the value for WINDPOWERSTATIONTESTINGPOINT2.ENGLISHNAME
-     *
-     * @mbg.generated
-     */
-    public void setEnglishname(String englishname) {
-        this.englishname = englishname == null ? null : englishname.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.TYPEID
-     *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.TYPEID
-     *
-     * @mbg.generated
-     */
-    public String getTypeid() {
-        return typeid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.TYPEID
-     *
-     * @param typeid the value for WINDPOWERSTATIONTESTINGPOINT2.TYPEID
-     *
-     * @mbg.generated
-     */
-    public void setTypeid(String typeid) {
-        this.typeid = typeid == null ? null : typeid.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.MODELID
-     *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.MODELID
-     *
-     * @mbg.generated
-     */
-    public String getModelid() {
-        return modelid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.MODELID
-     *
-     * @param modelid the value for WINDPOWERSTATIONTESTINGPOINT2.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 WINDPOWERSTATIONTESTINGPOINT2.MAXVAL
-     *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.MAXVAL
-     *
-     * @mbg.generated
-     */
-    public BigDecimal getMaxval() {
-        return maxval;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.MAXVAL
-     *
-     * @param maxval the value for WINDPOWERSTATIONTESTINGPOINT2.MAXVAL
-     *
-     * @mbg.generated
-     */
-    public void setMaxval(BigDecimal maxval) {
-        this.maxval = maxval;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.MINVAL
-     *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.MINVAL
-     *
-     * @mbg.generated
-     */
-    public BigDecimal getMinval() {
-        return minval;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.MINVAL
-     *
-     * @param minval the value for WINDPOWERSTATIONTESTINGPOINT2.MINVAL
-     *
-     * @mbg.generated
-     */
-    public void setMinval(BigDecimal minval) {
-        this.minval = minval;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.REASONABLEMAXVAL
-     *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.REASONABLEMAXVAL
-     *
-     * @mbg.generated
-     */
-    public BigDecimal getReasonablemaxval() {
-        return reasonablemaxval;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.REASONABLEMAXVAL
-     *
-     * @param reasonablemaxval the value for WINDPOWERSTATIONTESTINGPOINT2.REASONABLEMAXVAL
-     *
-     * @mbg.generated
-     */
-    public void setReasonablemaxval(BigDecimal reasonablemaxval) {
-        this.reasonablemaxval = reasonablemaxval;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.REASONABLEMINVAL
-     *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.REASONABLEMINVAL
-     *
-     * @mbg.generated
-     */
-    public BigDecimal getReasonableminval() {
-        return reasonableminval;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.REASONABLEMINVAL
-     *
-     * @param reasonableminval the value for WINDPOWERSTATIONTESTINGPOINT2.REASONABLEMINVAL
-     *
-     * @mbg.generated
-     */
-    public void setReasonableminval(BigDecimal reasonableminval) {
-        this.reasonableminval = reasonableminval;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.UNIFORMCODE
-     *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.UNIFORMCODE
-     *
-     * @mbg.generated
-     */
-    public String getUniformcode() {
-        return uniformcode;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.UNIFORMCODE
-     *
-     * @param uniformcode the value for WINDPOWERSTATIONTESTINGPOINT2.UNIFORMCODE
-     *
-     * @mbg.generated
-     */
-    public void setUniformcode(String uniformcode) {
-        this.uniformcode = uniformcode == null ? null : uniformcode.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.SHORTID
-     *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.SHORTID
-     *
-     * @mbg.generated
-     */
-    public String getShortid() {
-        return shortid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.SHORTID
-     *
-     * @param shortid the value for WINDPOWERSTATIONTESTINGPOINT2.SHORTID
-     *
-     * @mbg.generated
-     */
-    public void setShortid(String shortid) {
-        this.shortid = shortid == null ? null : shortid.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.LONGID
-     *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.LONGID
-     *
-     * @mbg.generated
-     */
-    public String getLongid() {
-        return longid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.LONGID
-     *
-     * @param longid the value for WINDPOWERSTATIONTESTINGPOINT2.LONGID
-     *
-     * @mbg.generated
-     */
-    public void setLongid(String longid) {
-        this.longid = longid == null ? null : longid.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.WINDPOWERSTATIONID
-     *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.WINDPOWERSTATIONID
-     *
-     * @mbg.generated
-     */
-    public String getWindpowerstationid() {
-        return windpowerstationid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.WINDPOWERSTATIONID
-     *
-     * @param windpowerstationid the value for WINDPOWERSTATIONTESTINGPOINT2.WINDPOWERSTATIONID
-     *
-     * @mbg.generated
-     */
-    public void setWindpowerstationid(String windpowerstationid) {
-        this.windpowerstationid = windpowerstationid == null ? null : windpowerstationid.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT2.REALTIMEID
-     *
-     * @return the value of WINDPOWERSTATIONTESTINGPOINT2.REALTIMEID
-     *
-     * @mbg.generated
-     */
-    public String getRealtimeid() {
-        return realtimeid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT2.REALTIMEID
-     *
-     * @param realtimeid the value for WINDPOWERSTATIONTESTINGPOINT2.REALTIMEID
-     *
-     * @mbg.generated
-     */
-    public void setRealtimeid(String realtimeid) {
-        this.realtimeid = realtimeid == null ? null : realtimeid.trim();
-    }
-}

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

@@ -7,7 +7,7 @@ import java.util.List;
 public class WindPowerStationTestingPointExample {
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This field corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -15,7 +15,7 @@ public class WindPowerStationTestingPointExample {
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This field corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -23,7 +23,7 @@ public class WindPowerStationTestingPointExample {
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This field corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -31,7 +31,7 @@ public class WindPowerStationTestingPointExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -41,7 +41,7 @@ public class WindPowerStationTestingPointExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -51,7 +51,7 @@ public class WindPowerStationTestingPointExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -61,7 +61,7 @@ public class WindPowerStationTestingPointExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -71,7 +71,7 @@ public class WindPowerStationTestingPointExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -81,7 +81,7 @@ public class WindPowerStationTestingPointExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -91,7 +91,7 @@ public class WindPowerStationTestingPointExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -101,7 +101,7 @@ public class WindPowerStationTestingPointExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -113,7 +113,7 @@ public class WindPowerStationTestingPointExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -127,7 +127,7 @@ public class WindPowerStationTestingPointExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -138,7 +138,7 @@ public class WindPowerStationTestingPointExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -150,7 +150,7 @@ public class WindPowerStationTestingPointExample {
 
     /**
      * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This class corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */
@@ -1278,7 +1278,7 @@ public class WindPowerStationTestingPointExample {
 
     /**
      * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This class corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated do_not_delete_during_merge
      */
@@ -1291,7 +1291,7 @@ public class WindPowerStationTestingPointExample {
 
     /**
      * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     * This class corresponds to the database table WINDPOWERSTATIONTESTINGPOINT2
      *
      * @mbg.generated
      */

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

@@ -3,7 +3,7 @@ package com.gyee.frame.model.auto;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
-public class WindTurbineTestingPointAi2 implements Serializable {
+public class WindTurbineTestingPointAi implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.

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

@@ -4,7 +4,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-public class WindTurbineTestingPointAi2Example {
+public class WindTurbineTestingPointAiExample {
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table WINDTURBINETESTINGPOINTAI2
@@ -35,7 +35,7 @@ public class WindTurbineTestingPointAi2Example {
      *
      * @mbg.generated
      */
-    public WindTurbineTestingPointAi2Example() {
+    public WindTurbineTestingPointAiExample() {
         oredCriteria = new ArrayList<Criteria>();
     }
 

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

@@ -3,7 +3,7 @@ package com.gyee.frame.model.auto;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
-public class WindTurbineTestingPointDi2 implements Serializable {
+public class WindTurbineTestingPointDi implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.

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

@@ -4,7 +4,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-public class WindTurbineTestingPointDi2Example {
+public class WindTurbineTestingPointDiExample {
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table WINDTURBINETESTINGPOINTDI2
@@ -35,7 +35,7 @@ public class WindTurbineTestingPointDi2Example {
      *
      * @mbg.generated
      */
-    public WindTurbineTestingPointDi2Example() {
+    public WindTurbineTestingPointDiExample() {
         oredCriteria = new ArrayList<Criteria>();
     }
 

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

@@ -3,7 +3,7 @@ package com.gyee.frame.model.auto;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
-public class Windsubstationtestingpoint2 implements Serializable {
+public class Windsubstationtestingpoint implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.

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

@@ -4,7 +4,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-public class Windsubstationtestingpoint2Example {
+public class WindsubstationtestingpointExample {
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table WINDSUBSTATIONTESTINGPOINT2
@@ -35,7 +35,7 @@ public class Windsubstationtestingpoint2Example {
      *
      * @mbg.generated
      */
-    public Windsubstationtestingpoint2Example() {
+    public WindsubstationtestingpointExample() {
         oredCriteria = new ArrayList<Criteria>();
     }
 

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

@@ -1,8 +1,8 @@
 package com.gyee.frame.service;
 
 import com.gyee.frame.common.spring.Constant;
-import com.gyee.frame.model.auto.WindTurbineTestingPointAi2;
-import com.gyee.frame.model.auto.WindTurbineTestingPointDi2;
+import com.gyee.frame.model.auto.WindTurbineTestingPointAi;
+import com.gyee.frame.model.auto.WindTurbineTestingPointDi;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.model.custom.PointVo;
 import com.gyee.frame.util.IRealTimeDataBaseUtil;
@@ -43,7 +43,7 @@ public class FaultPlaybackService  {
         String[][] points = new String[pointids.length][20];
 
 
-        Map<String, WindTurbineTestingPointDi2> dimap = queryWindTurbineTestingPointDisByWtId(wtId);
+        Map<String, WindTurbineTestingPointDi> dimap = queryWindTurbineTestingPointDisByWtId(wtId);
 
         Calendar cal = Calendar.getInstance();
         cal.setTime(stopTime);
@@ -72,7 +72,7 @@ public class FaultPlaybackService  {
 
                 if (dimap.containsKey(pointids[i])) {
 
-                    WindTurbineTestingPointDi2 di = dimap.get(pointids[i]);
+                    WindTurbineTestingPointDi di = dimap.get(pointids[i]);
                     String[] value = new String[length];
                     if (null != di) {
 
@@ -96,7 +96,7 @@ public class FaultPlaybackService  {
                     }
                 }else
                 {
-                    WindTurbineTestingPointAi2 ai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, pointids[i]);
+                    WindTurbineTestingPointAi ai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, pointids[i]);
                     String[] value = new String[length];
                     if (null != ai && StringUtils.notEmp(ai.getId())) {
 
@@ -250,10 +250,10 @@ public class FaultPlaybackService  {
         if (StringUtils.notEmp(wtId)) {
 
             if (bjlx == 0) {
-                List<WindTurbineTestingPointAi2> ails = queryWindTurbineTestingPointAis(wtId);
+                List<WindTurbineTestingPointAi> ails = queryWindTurbineTestingPointAis(wtId);
 
                 if ((cdlx == 0 || cdlx == 1) && !ails.isEmpty()) {
-                    for (WindTurbineTestingPointAi2 ai : ails) {
+                    for (WindTurbineTestingPointAi ai : ails) {
                         PointVo vo = new PointVo();
                         vo.setId(ai.getId());
                         vo.setCode(ai.getCode());
@@ -267,10 +267,10 @@ public class FaultPlaybackService  {
                     }
                 }
 
-                List<WindTurbineTestingPointDi2> dils = queryWindTurbineTestingPointDis(wtId);
+                List<WindTurbineTestingPointDi> dils = queryWindTurbineTestingPointDis(wtId);
 
                 if ((cdlx == 0 || cdlx == 2) && !dils.isEmpty()) {
-                    for (WindTurbineTestingPointDi2 di : dils) {
+                    for (WindTurbineTestingPointDi di : dils) {
                         PointVo vo = new PointVo();
                         vo.setId(di.getId());
                         vo.setCode(di.getCode());
@@ -284,9 +284,9 @@ public class FaultPlaybackService  {
                     }
                 }
             } else {
-                List<WindTurbineTestingPointAi2> ails = queryWindTurbineTestingPointAisByPart(wtId, bjlx);
+                List<WindTurbineTestingPointAi> ails = queryWindTurbineTestingPointAisByPart(wtId, bjlx);
                 if ((cdlx == 0 || cdlx == 1) && !ails.isEmpty()) {
-                    for (WindTurbineTestingPointAi2 ai : ails) {
+                    for (WindTurbineTestingPointAi ai : ails) {
                         PointVo vo = new PointVo();
                         vo.setId(ai.getId());
                         vo.setCode(ai.getCode());
@@ -300,10 +300,10 @@ public class FaultPlaybackService  {
                     }
                 }
 
-                List<WindTurbineTestingPointDi2> dils = queryWindTurbineTestingPointDisByPart(wtId, bjlx);
+                List<WindTurbineTestingPointDi> dils = queryWindTurbineTestingPointDisByPart(wtId, bjlx);
 
                 if ((cdlx == 0 || cdlx == 2) && !dils.isEmpty()) {
-                    for (WindTurbineTestingPointDi2 di : dils) {
+                    for (WindTurbineTestingPointDi di : dils) {
                         PointVo vo = new PointVo();
                         vo.setId(di.getId());
                         vo.setCode(di.getCode());
@@ -322,9 +322,9 @@ public class FaultPlaybackService  {
         return ls;
     }
 
-    private List<WindTurbineTestingPointAi2> queryWindTurbineTestingPointAis(String wtId) {
+    private List<WindTurbineTestingPointAi> queryWindTurbineTestingPointAis(String wtId) {
 
-        List<WindTurbineTestingPointAi2> list = new ArrayList<>();
+        List<WindTurbineTestingPointAi> list = new ArrayList<>();
 
         List<String> uids = new ArrayList<>();
         uids.add("AI001");
@@ -425,7 +425,7 @@ public class FaultPlaybackService  {
         if (StringUtils.notEmp(wtId)) {
            for(String str:uids)
            {
-               WindTurbineTestingPointAi2 ai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, str);
+               WindTurbineTestingPointAi ai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, str);
                if(StringUtils.notEmp(ai) && StringUtils.notEmp(ai.getId()))
                {
                    list.add(ai);
@@ -435,9 +435,9 @@ public class FaultPlaybackService  {
         return list;
     }
 
-    private List<WindTurbineTestingPointDi2> queryWindTurbineTestingPointDis(String wtId) {
+    private List<WindTurbineTestingPointDi> queryWindTurbineTestingPointDis(String wtId) {
 
-        List<WindTurbineTestingPointDi2> list = new ArrayList<>();
+        List<WindTurbineTestingPointDi> list = new ArrayList<>();
 
         List<String> uids = new ArrayList<>();
         uids.add("DI013");
@@ -470,9 +470,9 @@ public class FaultPlaybackService  {
         return list;
     }
 
-    private List<WindTurbineTestingPointAi2> queryWindTurbineTestingPointAisByPart(String wtId, int bjlx) {
+    private List<WindTurbineTestingPointAi> queryWindTurbineTestingPointAisByPart(String wtId, int bjlx) {
 
-        List<WindTurbineTestingPointAi2> list = new ArrayList<>();
+        List<WindTurbineTestingPointAi> list = new ArrayList<>();
 
         if (StringUtils.notEmp(wtId)) {
 
@@ -539,7 +539,7 @@ public class FaultPlaybackService  {
             if (StringUtils.notEmp(wtId)) {
                 for(String str:codels)
                 {
-                    WindTurbineTestingPointAi2 ai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, str);
+                    WindTurbineTestingPointAi ai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, str);
                     if(StringUtils.notEmp(ai) && StringUtils.notEmp(ai.getId()))
                     {
                         list.add(ai);
@@ -550,9 +550,9 @@ public class FaultPlaybackService  {
         return list;
     }
 
-    private List<WindTurbineTestingPointDi2> queryWindTurbineTestingPointDisByPart(String wtId, int bjlx) {
+    private List<WindTurbineTestingPointDi> queryWindTurbineTestingPointDisByPart(String wtId, int bjlx) {
 
-        List<WindTurbineTestingPointDi2> list = new ArrayList<>();
+        List<WindTurbineTestingPointDi> list = new ArrayList<>();
 
         if (StringUtils.notEmp(wtId)) {
 
@@ -651,10 +651,10 @@ public class FaultPlaybackService  {
         return list;
     }
 
-    private Map<String, WindTurbineTestingPointDi2> queryWindTurbineTestingPointDisByWtId(String wtId) {
+    private Map<String, WindTurbineTestingPointDi> queryWindTurbineTestingPointDisByWtId(String wtId) {
 
-        Map<String, WindTurbineTestingPointDi2> map = new HashMap<String, WindTurbineTestingPointDi2>();
-        List<WindTurbineTestingPointDi2> list = new ArrayList<>();
+        Map<String, WindTurbineTestingPointDi> map = new HashMap<String, WindTurbineTestingPointDi>();
+        List<WindTurbineTestingPointDi> list = new ArrayList<>();
 
         if (StringUtils.notEmp(wtId)) {
 
@@ -663,7 +663,7 @@ public class FaultPlaybackService  {
 
             if(!list.isEmpty())
             {
-                for(WindTurbineTestingPointDi2 di:list)
+                for(WindTurbineTestingPointDi di:list)
                 {
                     map.put(di.getUniformcode(), di);
                 }

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

@@ -150,7 +150,7 @@ public class Shutdownevent2Service implements BaseService<Shutdownevent2, Shutdo
 				event.setWarningId(wr.getWarningid());
 				if(StringUtils.notEmp(wr.getWarningid()) && InitialRunner.warningmap.containsKey(wr.getWarningid()))
 				{
-					Warning2 warning2=InitialRunner.warningmap.get(wr.getWarningid());
+					Warning warning2=InitialRunner.warningmap.get(wr.getWarningid());
 					event.setWarnDesc(warning2.getChinesetext());
 				}
 				event.setStartTime(wr.getStarttime());

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

@@ -2,27 +2,27 @@ 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.Warning2Mapper;
-import com.gyee.frame.model.auto.Warning2;
-import com.gyee.frame.model.auto.Warning2Example;
+import com.gyee.frame.mapper.auto.WarningMapper;
+import com.gyee.frame.model.auto.Warning;
+import com.gyee.frame.model.auto.WarningExample;
 import com.gyee.frame.util.SnowflakeIdWorker;
-import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 
 @Service
-public class Warning2Service implements BaseService<Warning2, Warning2Example> {
+public class Warning2Service implements BaseService<Warning, WarningExample> {
 	@Resource
-	private Warning2Mapper warning2Mapper;
+	private WarningMapper warning2Mapper;
 	
 
 	@Override
 	public int deleteByPrimaryKey(String ids) {
 				
 			List<String> lista=Convert.toListStrArray(ids);
-			Warning2Example example=new Warning2Example();
+			WarningExample example=new WarningExample();
 			example.createCriteria().andIdIn(lista);
 			return warning2Mapper.deleteByExample(example);
 			
@@ -31,7 +31,7 @@ public class Warning2Service implements BaseService<Warning2, Warning2Example> {
 	
 	
 	@Override
-	public Warning2 selectByPrimaryKey(String id) {
+	public Warning selectByPrimaryKey(String id) {
 				
 			return warning2Mapper.selectByPrimaryKey(id);
 				
@@ -39,7 +39,7 @@ public class Warning2Service implements BaseService<Warning2, Warning2Example> {
 
 	
 	@Override
-	public int updateByPrimaryKeySelective(Warning2 record) {
+	public int updateByPrimaryKeySelective(Warning record) {
 		return warning2Mapper.updateByPrimaryKeySelective(record);
 	}
 	
@@ -48,7 +48,7 @@ public class Warning2Service implements BaseService<Warning2, Warning2Example> {
 	 * 添加
 	 */
 	@Override
-	public int insertSelective(Warning2 record) {
+	public int insertSelective(Warning record) {
 				
 		//添加雪花主键id
 		record.setId(SnowflakeIdWorker.getUUID());
@@ -59,34 +59,34 @@ public class Warning2Service implements BaseService<Warning2, Warning2Example> {
 	
 	
 	@Override
-	public int updateByExampleSelective(Warning2 record, Warning2Example example) {
+	public int updateByExampleSelective(Warning record, WarningExample example) {
 		
 		return warning2Mapper.updateByExampleSelective(record, example);
 	}
 
 	
 	@Override
-	public int updateByExample(Warning2 record, Warning2Example example) {
+	public int updateByExample(Warning record, WarningExample example) {
 		
 		return warning2Mapper.updateByExample(record, example);
 	}
 
 	@Override
-	public List<Warning2> selectByExample(Warning2Example example) {
+	public List<Warning> selectByExample(WarningExample example) {
 		
 		return warning2Mapper.selectByExample(example);
 	}
 
 	
 	@Override
-	public long countByExample(Warning2Example example) {
+	public long countByExample(WarningExample example) {
 		
 		return warning2Mapper.countByExample(example);
 	}
 
 	
 	@Override
-	public int deleteByExample(Warning2Example example) {
+	public int deleteByExample(WarningExample example) {
 		
 		return warning2Mapper.deleteByExample(example);
 	}

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

@@ -321,7 +321,7 @@ public class WarningInfoDayService implements BaseService<WarningInfoDay, Warnin
 
 				List<WarningInfoDay> ls=entry.getValue();
 
-				Warning2 warning= InitialRunner.warningmap.get(entry.getKey());
+				Warning warning= InitialRunner.warningmap.get(entry.getKey());
 
 				SawVo item = new SawVo();
 				item.setNum(i++);
@@ -394,7 +394,7 @@ public class WarningInfoDayService implements BaseService<WarningInfoDay, Warnin
 			int total=wils.stream().mapToInt(WarningInfoDay::getFrequencyday).sum();//总合计
 			for(WarningInfoDay ap:wils)
 			{
-				Warning2 warning=null;
+				Warning warning=null;
 				if(InitialRunner.warningmap.containsKey(ap.getWarningid()))
 				{
 					warning=InitialRunner.warningmap.get(ap.getWarningid());
@@ -434,7 +434,7 @@ public class WarningInfoDayService implements BaseService<WarningInfoDay, Warnin
 
 				List<WarningInfoDay> ls=entry.getValue();
 
-				Warning2 warning= InitialRunner.warningmap.get(entry.getKey());
+				Warning warning= InitialRunner.warningmap.get(entry.getKey());
 
 				SawVo item = new SawVo();
 				item.setNum(i++);
@@ -542,7 +542,7 @@ public class WarningInfoDayService implements BaseService<WarningInfoDay, Warnin
 
 				List<WarningInfoDay> ls=entry.getValue();
 
-				Warning2 warning= InitialRunner.warningmap.get(entry.getKey());
+				Warning warning= InitialRunner.warningmap.get(entry.getKey());
 
 				SawVo item = new SawVo();
 				item.setNum(i++);

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

@@ -135,7 +135,7 @@ public class WarningRecordsService implements BaseService<WarningRecords, Warnin
 			{
 				if(StringUtils.notEmp(wr.getWarningid()) && InitialRunner.warningmap.containsKey(wr.getWarningid()))
 				{
-					Warning2 warning2=InitialRunner.warningmap.get(wr.getWarningid());
+					Warning warning2=InitialRunner.warningmap.get(wr.getWarningid());
 					wr.setWarnDesc(warning2.getChinesetext());
 				}
 			}
@@ -192,7 +192,7 @@ public class WarningRecordsService implements BaseService<WarningRecords, Warnin
 
 				List<WarningRecords> ls=entry.getValue();
 
-				Warning2 warning= InitialRunner.warningmap.get(entry.getKey());
+				Warning warning= InitialRunner.warningmap.get(entry.getKey());
 				if(null == warning){
 					continue;
 				}

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

@@ -6,9 +6,9 @@ import com.gyee.frame.mapper.auto.WarningMapper;
 import com.gyee.frame.model.auto.Warning;
 import com.gyee.frame.model.auto.WarningExample;
 import com.gyee.frame.util.SnowflakeIdWorker;
-import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 

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

@@ -6,9 +6,9 @@ import com.gyee.frame.common.base.BaseService;
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.common.support.Convert;
-import com.gyee.frame.mapper.auto.WindPowerStationTestingPoint2Mapper;
-import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
-import com.gyee.frame.model.auto.WindPowerStationTestingPoint2Example;
+import com.gyee.frame.mapper.auto.WindPowerStationTestingPointMapper;
+import com.gyee.frame.model.auto.WindPowerStationTestingPoint;
+import com.gyee.frame.model.auto.WindPowerStationTestingPointExample;
 import com.gyee.frame.model.auto.Windpowerstation;
 import com.gyee.frame.model.custom.SimpleVo;
 import com.gyee.frame.model.custom.Tablepar;
@@ -31,9 +31,9 @@ import java.util.Map;
  * @date 2019-12-31 14:58:09  
  **/
 @Service
-public class WindPowerstationTestingPoint2Service implements BaseService<WindPowerStationTestingPoint2, WindPowerStationTestingPoint2Example> {
+public class WindPowerstationTestingPoint2Service implements BaseService<WindPowerStationTestingPoint, WindPowerStationTestingPointExample> {
 	@Resource
-	private WindPowerStationTestingPoint2Mapper windPowerStationTestingPoint2Mapper;
+	private WindPowerStationTestingPointMapper windPowerStationTestingPoint2Mapper;
 	
       	   	      	      	      	      	      	      	      	      	      	
 	/**
@@ -42,16 +42,16 @@ public class WindPowerstationTestingPoint2Service implements BaseService<WindPow
 	 * @param name
 	 * @return
 	 */
-	 public PageInfo<WindPowerStationTestingPoint2> list(Tablepar tablepar, String name){
-	        WindPowerStationTestingPoint2Example testExample=new WindPowerStationTestingPoint2Example();
+	 public PageInfo<WindPowerStationTestingPoint> list(Tablepar tablepar, String name){
+	        WindPowerStationTestingPointExample testExample=new WindPowerStationTestingPointExample();
 	        testExample.setOrderByClause("id ASC");
 	        if(name!=null&&!"".equals(name)){
 	        	testExample.createCriteria().andCodeLike("%"+name+"%");
 	        }
 
 	        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
-	        List<WindPowerStationTestingPoint2> list= windPowerStationTestingPoint2Mapper.selectByExample(testExample);
-	        PageInfo<WindPowerStationTestingPoint2> pageInfo = new PageInfo<WindPowerStationTestingPoint2>(list);
+	        List<WindPowerStationTestingPoint> list= windPowerStationTestingPoint2Mapper.selectByExample(testExample);
+	        PageInfo<WindPowerStationTestingPoint> pageInfo = new PageInfo<WindPowerStationTestingPoint>(list);
 	        return  pageInfo;
 	 }
 
@@ -59,7 +59,7 @@ public class WindPowerstationTestingPoint2Service implements BaseService<WindPow
 	public int deleteByPrimaryKey(String ids) {
 				
 			List<String> lista=Convert.toListStrArray(ids);
-			WindPowerStationTestingPoint2Example example=new WindPowerStationTestingPoint2Example();
+			WindPowerStationTestingPointExample example=new WindPowerStationTestingPointExample();
 			example.createCriteria().andCodeIn(lista);
 			return windPowerStationTestingPoint2Mapper.deleteByExample(example);
 			
@@ -68,7 +68,7 @@ public class WindPowerstationTestingPoint2Service implements BaseService<WindPow
 	
 	
 	@Override
-	public WindPowerStationTestingPoint2 selectByPrimaryKey(String id) {
+	public WindPowerStationTestingPoint selectByPrimaryKey(String id) {
 				
 			return windPowerStationTestingPoint2Mapper.selectByPrimaryKey(id);
 				
@@ -76,7 +76,7 @@ public class WindPowerstationTestingPoint2Service implements BaseService<WindPow
 
 	
 	@Override
-	public int updateByPrimaryKeySelective(WindPowerStationTestingPoint2 record) {
+	public int updateByPrimaryKeySelective(WindPowerStationTestingPoint record) {
 		return windPowerStationTestingPoint2Mapper.updateByPrimaryKeySelective(record);
 	}
 	
@@ -85,7 +85,7 @@ public class WindPowerstationTestingPoint2Service implements BaseService<WindPow
 	 * 添加
 	 */
 	@Override
-	public int insertSelective(WindPowerStationTestingPoint2 record) {
+	public int insertSelective(WindPowerStationTestingPoint record) {
 				
 		//添加雪花主键id
 		record.setCode(SnowflakeIdWorker.getUUID());
@@ -96,34 +96,34 @@ public class WindPowerstationTestingPoint2Service implements BaseService<WindPow
 	
 	
 	@Override
-	public int updateByExampleSelective(WindPowerStationTestingPoint2 record, WindPowerStationTestingPoint2Example example) {
+	public int updateByExampleSelective(WindPowerStationTestingPoint record, WindPowerStationTestingPointExample example) {
 		
 		return windPowerStationTestingPoint2Mapper.updateByExampleSelective(record, example);
 	}
 
 	
 	@Override
-	public int updateByExample(WindPowerStationTestingPoint2 record, WindPowerStationTestingPoint2Example example) {
+	public int updateByExample(WindPowerStationTestingPoint record, WindPowerStationTestingPointExample example) {
 		
 		return windPowerStationTestingPoint2Mapper.updateByExample(record, example);
 	}
 
 	@Override
-	public List<WindPowerStationTestingPoint2> selectByExample(WindPowerStationTestingPoint2Example example) {
+	public List<WindPowerStationTestingPoint> selectByExample(WindPowerStationTestingPointExample example) {
 		
 		return windPowerStationTestingPoint2Mapper.selectByExample(example);
 	}
 
 	
 	@Override
-	public long countByExample(WindPowerStationTestingPoint2Example example) {
+	public long countByExample(WindPowerStationTestingPointExample example) {
 		
 		return windPowerStationTestingPoint2Mapper.countByExample(example);
 	}
 
 	
 	@Override
-	public int deleteByExample(WindPowerStationTestingPoint2Example example) {
+	public int deleteByExample(WindPowerStationTestingPointExample example) {
 		
 		return windPowerStationTestingPoint2Mapper.deleteByExample(example);
 	}
@@ -133,15 +133,15 @@ public class WindPowerstationTestingPoint2Service implements BaseService<WindPow
 	 * @param windPowerstationTestingPoint
 	 * @return
 	 */
-	public int checkNameUnique(WindPowerStationTestingPoint2 windPowerstationTestingPoint){
-		WindPowerStationTestingPoint2Example example=new WindPowerStationTestingPoint2Example();
+	public int checkNameUnique(WindPowerStationTestingPoint windPowerstationTestingPoint){
+		WindPowerStationTestingPointExample example=new WindPowerStationTestingPointExample();
 		example.createCriteria().andCodeEqualTo(windPowerstationTestingPoint.getCode());
-		List<WindPowerStationTestingPoint2> list=windPowerStationTestingPoint2Mapper.selectByExample(example);
+		List<WindPowerStationTestingPoint> list=windPowerStationTestingPoint2Mapper.selectByExample(example);
 		return list.size();
 	}
 
-	public WindPowerStationTestingPoint2 getWindPowerStationTestingPoint2(String wpId, String unicode)  {
-		WindPowerStationTestingPoint2 point=new WindPowerStationTestingPoint2();
+	public WindPowerStationTestingPoint getWindPowerStationTestingPoint2(String wpId, String unicode)  {
+		WindPowerStationTestingPoint point=new WindPowerStationTestingPoint();
 
 		if(StringUtils.notEmp(wpId) && StringUtils.notEmp(unicode) )
 		{
@@ -149,7 +149,7 @@ public class WindPowerstationTestingPoint2Service implements BaseService<WindPow
 			{
 				if(InitialRunner.wpPointmap.containsKey(wpId))
 				{
-					Map<String, WindPowerStationTestingPoint2> map=InitialRunner.wpPointmap.get(wpId);
+					Map<String, WindPowerStationTestingPoint> map=InitialRunner.wpPointmap.get(wpId);
 					if(map.containsKey(unicode))
 					{
 						point=map.get(unicode);
@@ -159,7 +159,7 @@ public class WindPowerstationTestingPoint2Service implements BaseService<WindPow
 			{
 				if(InitialRunner.pjPointmap.containsKey(wpId))
 				{
-					Map<String, WindPowerStationTestingPoint2> map=InitialRunner.pjPointmap.get(wpId);
+					Map<String, WindPowerStationTestingPoint> map=InitialRunner.pjPointmap.get(wpId);
 					if(map.containsKey(unicode))
 					{
 						point=map.get(unicode);
@@ -169,7 +169,7 @@ public class WindPowerstationTestingPoint2Service implements BaseService<WindPow
 			{
 				if(InitialRunner.lnPointmap.containsKey(wpId))
 				{
-					Map<String, WindPowerStationTestingPoint2> map=InitialRunner.lnPointmap.get(wpId);
+					Map<String, WindPowerStationTestingPoint> map=InitialRunner.lnPointmap.get(wpId);
 					if(map.containsKey(unicode))
 					{
 						point=map.get(unicode);
@@ -205,13 +205,13 @@ public class WindPowerstationTestingPoint2Service implements BaseService<WindPow
 	}
 
 
-	public List<WindPowerStationTestingPoint2> getJsztList(String wpId){
+	public List<WindPowerStationTestingPoint> getJsztList(String wpId){
 
-		List<WindPowerStationTestingPoint2> wpoints=new ArrayList<>();
+		List<WindPowerStationTestingPoint> wpoints=new ArrayList<>();
 		if(StringUtils.notEmp(wpId) )
 		{
-			WindPowerStationTestingPoint2Example example=new WindPowerStationTestingPoint2Example();
-			WindPowerStationTestingPoint2Example.Criteria criteria =example.createCriteria();
+			WindPowerStationTestingPointExample example=new WindPowerStationTestingPointExample();
+			WindPowerStationTestingPointExample.Criteria criteria =example.createCriteria();
 			criteria.andWindpowerstationidEqualTo(wpId);
 			criteria.andUniformcodeEqualTo(Constant.JSZT);
 			wpoints=windPowerStationTestingPoint2Mapper.selectByExample(example);

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

@@ -120,33 +120,5 @@ public class WindPowerstationTestingPointService implements BaseService<WindPowe
 		return windPowerStationTestingPointMapper.deleteByExample(example);
 	}
 
-	public int deleteAll() {
 
-
-		int result= windPowerStationTestingPointMapper.deleteAll();
-
-
-		return result;
-
-	}
-
-	public int deleteYc() {
-
-
-		int result= windPowerStationTestingPointMapper.deleteYc();
-
-
-		return result;
-
-	}
-
-	public int insertBatch(List<WindPowerStationTestingPoint> ls) {
-
-
-		int result= windPowerStationTestingPointMapper.insertBatch(ls);
-
-
-		return result;
-
-	}
 }

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

@@ -5,12 +5,10 @@ import com.github.pagehelper.PageInfo;
 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.WindTurbineTestingPointAi2Mapper;
-import com.gyee.frame.model.auto.WindTurbineTestingPointAi2;
-import com.gyee.frame.model.auto.WindTurbineTestingPointAi2Example;
+import com.gyee.frame.mapper.auto.WindTurbineTestingPointAiMapper;
+import com.gyee.frame.model.auto.WindTurbineTestingPointAi;
+import com.gyee.frame.model.auto.WindTurbineTestingPointAiExample;
 import com.gyee.frame.model.custom.Tablepar;
-import com.gyee.frame.model.custom.weather.Sys;
-import com.gyee.frame.model.custom.weather.Wind;
 import com.gyee.frame.util.SnowflakeIdWorker;
 import com.gyee.frame.util.StringUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -33,9 +31,9 @@ import java.util.Map;
 @Slf4j
 @CacheConfig(cacheNames = "tsPoints")
 @Service
-public class WindTurbineTestingPointAiService implements BaseService<WindTurbineTestingPointAi2, WindTurbineTestingPointAi2Example> {
+public class WindTurbineTestingPointAiService implements BaseService<WindTurbineTestingPointAi, WindTurbineTestingPointAiExample> {
 	@Resource
-	private WindTurbineTestingPointAi2Mapper windTurbineTestingPointAi2Mapper;
+	private WindTurbineTestingPointAiMapper windTurbineTestingPointAi2Mapper;
 	
       	   	      	      	      	      	      	      	      	      	      	
 	/**
@@ -44,16 +42,16 @@ public class WindTurbineTestingPointAiService implements BaseService<WindTurbine
 	 * @param name
 	 * @return
 	 */
-	 public PageInfo<WindTurbineTestingPointAi2> list(Tablepar tablepar, String name){
-	        WindTurbineTestingPointAi2Example testExample=new WindTurbineTestingPointAi2Example();
+	 public PageInfo<WindTurbineTestingPointAi> list(Tablepar tablepar, String name){
+	        WindTurbineTestingPointAiExample testExample=new WindTurbineTestingPointAiExample();
 	        testExample.setOrderByClause("id ASC");
 	        if(name!=null&&!"".equals(name)){
 	        	testExample.createCriteria().andCodeLike("%"+name+"%");
 	        }
 
 	        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
-	        List<WindTurbineTestingPointAi2> list= windTurbineTestingPointAi2Mapper.selectByExample(testExample);
-	        PageInfo<WindTurbineTestingPointAi2> pageInfo = new PageInfo<WindTurbineTestingPointAi2>(list);
+	        List<WindTurbineTestingPointAi> list= windTurbineTestingPointAi2Mapper.selectByExample(testExample);
+	        PageInfo<WindTurbineTestingPointAi> pageInfo = new PageInfo<WindTurbineTestingPointAi>(list);
 	        return  pageInfo;
 	 }
 
@@ -61,7 +59,7 @@ public class WindTurbineTestingPointAiService implements BaseService<WindTurbine
 	public int deleteByPrimaryKey(String ids) {
 				
 			List<String> lista=Convert.toListStrArray(ids);
-			WindTurbineTestingPointAi2Example example=new WindTurbineTestingPointAi2Example();
+			WindTurbineTestingPointAiExample example=new WindTurbineTestingPointAiExample();
 			example.createCriteria().andIdIn(lista);
 			return windTurbineTestingPointAi2Mapper.deleteByExample(example);
 			
@@ -70,7 +68,7 @@ public class WindTurbineTestingPointAiService implements BaseService<WindTurbine
 	
 	
 	@Override
-	public WindTurbineTestingPointAi2 selectByPrimaryKey(String id) {
+	public WindTurbineTestingPointAi selectByPrimaryKey(String id) {
 				
 			return windTurbineTestingPointAi2Mapper.selectByPrimaryKey(id);
 				
@@ -78,7 +76,7 @@ public class WindTurbineTestingPointAiService implements BaseService<WindTurbine
 
 	
 	@Override
-	public int updateByPrimaryKeySelective(WindTurbineTestingPointAi2 record) {
+	public int updateByPrimaryKeySelective(WindTurbineTestingPointAi record) {
 		return windTurbineTestingPointAi2Mapper.updateByPrimaryKeySelective(record);
 	}
 	
@@ -87,7 +85,7 @@ public class WindTurbineTestingPointAiService implements BaseService<WindTurbine
 	 * 添加
 	 */
 	@Override
-	public int insertSelective(WindTurbineTestingPointAi2 record) {
+	public int insertSelective(WindTurbineTestingPointAi record) {
 				
 		//添加雪花主键id
 		record.setId(SnowflakeIdWorker.getUUID());
@@ -98,34 +96,34 @@ public class WindTurbineTestingPointAiService implements BaseService<WindTurbine
 	
 	
 	@Override
-	public int updateByExampleSelective(WindTurbineTestingPointAi2 record, WindTurbineTestingPointAi2Example example) {
+	public int updateByExampleSelective(WindTurbineTestingPointAi record, WindTurbineTestingPointAiExample example) {
 		
 		return windTurbineTestingPointAi2Mapper.updateByExampleSelective(record, example);
 	}
 
 	
 	@Override
-	public int updateByExample(WindTurbineTestingPointAi2 record, WindTurbineTestingPointAi2Example example) {
+	public int updateByExample(WindTurbineTestingPointAi record, WindTurbineTestingPointAiExample example) {
 		
 		return windTurbineTestingPointAi2Mapper.updateByExample(record, example);
 	}
 
 	@Override
-	public List<WindTurbineTestingPointAi2> selectByExample(WindTurbineTestingPointAi2Example example) {
+	public List<WindTurbineTestingPointAi> selectByExample(WindTurbineTestingPointAiExample example) {
 		
 		return windTurbineTestingPointAi2Mapper.selectByExample(example);
 	}
 
 	
 	@Override
-	public long countByExample(WindTurbineTestingPointAi2Example example) {
+	public long countByExample(WindTurbineTestingPointAiExample example) {
 		
 		return windTurbineTestingPointAi2Mapper.countByExample(example);
 	}
 
 	
 	@Override
-	public int deleteByExample(WindTurbineTestingPointAi2Example example) {
+	public int deleteByExample(WindTurbineTestingPointAiExample example) {
 		
 		return windTurbineTestingPointAi2Mapper.deleteByExample(example);
 	}
@@ -135,23 +133,23 @@ public class WindTurbineTestingPointAiService implements BaseService<WindTurbine
 	 * @param windTurbineTestingPointAi
 	 * @return
 	 */
-	public int checkNameUnique(WindTurbineTestingPointAi2 windTurbineTestingPointAi){
-		WindTurbineTestingPointAi2Example example=new WindTurbineTestingPointAi2Example();
+	public int checkNameUnique(WindTurbineTestingPointAi windTurbineTestingPointAi){
+		WindTurbineTestingPointAiExample example=new WindTurbineTestingPointAiExample();
 		example.createCriteria().andCodeEqualTo(windTurbineTestingPointAi.getCode());
-		List<WindTurbineTestingPointAi2> list=windTurbineTestingPointAi2Mapper.selectByExample(example);
+		List<WindTurbineTestingPointAi> list=windTurbineTestingPointAi2Mapper.selectByExample(example);
 		return list.size();
 	}
 
-	public WindTurbineTestingPointAi2 getWindTurbineTestingPointAi2(String wtId, String unicode)  {
+	public WindTurbineTestingPointAi getWindTurbineTestingPointAi2(String wtId, String unicode)  {
 
-		WindTurbineTestingPointAi2 point=new WindTurbineTestingPointAi2();
+		WindTurbineTestingPointAi point=new WindTurbineTestingPointAi();
 		if(StringUtils.notEmp(wtId) && StringUtils.notEmp(unicode) )
 		{
 			 if(InitialRunner.wtmap.containsKey(wtId))
 			{
 				if(InitialRunner.wtPointmap.containsKey(wtId))
 				{
-					Map<String, WindTurbineTestingPointAi2> map=InitialRunner.wtPointmap.get(wtId);
+					Map<String, WindTurbineTestingPointAi> map=InitialRunner.wtPointmap.get(wtId);
 					if(map.containsKey(unicode))
 					{
 						point=map.get(unicode);
@@ -172,13 +170,13 @@ public class WindTurbineTestingPointAiService implements BaseService<WindTurbine
 	 * @param uniformCode 统一编码
 	 * @return
 	 */
-	public List<WindTurbineTestingPointAi2> findPointsByUniformCodeAndStation(String station, String wtId, String uniformCode) {
-		WindTurbineTestingPointAi2Example example = new WindTurbineTestingPointAi2Example();
+	public List<WindTurbineTestingPointAi> findPointsByUniformCodeAndStation(String station, String wtId, String uniformCode) {
+		WindTurbineTestingPointAiExample example = new WindTurbineTestingPointAiExample();
 		example.createCriteria().andUniformcodeEqualTo(uniformCode)
 			                    .andWindturbineidEqualTo(wtId)
 								.andWindpowerstationidEqualTo(station);
 
-		List<WindTurbineTestingPointAi2> list = windTurbineTestingPointAi2Mapper.selectByExample(example);
+		List<WindTurbineTestingPointAi> list = windTurbineTestingPointAi2Mapper.selectByExample(example);
 
 		return list;
 	}
@@ -188,15 +186,15 @@ public class WindTurbineTestingPointAiService implements BaseService<WindTurbine
 
 		for (String model : models){
 			for (String ls : list){
-				WindTurbineTestingPointAi2Example example = new WindTurbineTestingPointAi2Example();
+				WindTurbineTestingPointAiExample example = new WindTurbineTestingPointAiExample();
 				example.createCriteria().andUniformcodeEqualTo(ls).andModelidLike("%"+model+"%");
 
-				List<WindTurbineTestingPointAi2> winds = windTurbineTestingPointAi2Mapper.selectByExample(example);
+				List<WindTurbineTestingPointAi> winds = windTurbineTestingPointAi2Mapper.selectByExample(example);
 
 				if (winds == null || winds.size() == 0)
 					continue;
 
-				for (WindTurbineTestingPointAi2 wind : winds) {
+				for (WindTurbineTestingPointAi wind : winds) {
 					if (wind != null && wind.getId().contains("FJ")) {
 						lists.add(wind.getId() + "$" + wind.getName() + "@" + wind.getModelid());
 //						System.out.println(wind.getId() + "," + wind.getModelid());

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

@@ -4,9 +4,9 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.gyee.frame.common.base.BaseService;
 import com.gyee.frame.common.support.Convert;
-import com.gyee.frame.mapper.auto.WindTurbineTestingPointDi2Mapper;
-import com.gyee.frame.model.auto.WindTurbineTestingPointDi2;
-import com.gyee.frame.model.auto.WindTurbineTestingPointDi2Example;
+import com.gyee.frame.mapper.auto.WindTurbineTestingPointDiMapper;
+import com.gyee.frame.model.auto.WindTurbineTestingPointDi;
+import com.gyee.frame.model.auto.WindTurbineTestingPointDiExample;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.util.SnowflakeIdWorker;
 import com.gyee.frame.util.StringUtils;
@@ -25,9 +25,9 @@ import java.util.List;
  * @date 2019-12-31 14:58:09  
  **/
 @Service
-public class WindTurbineTestingPointDiService implements BaseService<WindTurbineTestingPointDi2, WindTurbineTestingPointDi2Example> {
+public class WindTurbineTestingPointDiService implements BaseService<WindTurbineTestingPointDi, WindTurbineTestingPointDiExample> {
 	@Resource
-	private WindTurbineTestingPointDi2Mapper windTurbineTestingPointDi2Mapper;
+	private WindTurbineTestingPointDiMapper windTurbineTestingPointDi2Mapper;
 	
       	   	      	      	      	      	      	      	      	      	      	
 	/**
@@ -36,16 +36,16 @@ public class WindTurbineTestingPointDiService implements BaseService<WindTurbine
 	 * @param name
 	 * @return
 	 */
-	 public PageInfo<WindTurbineTestingPointDi2> list(Tablepar tablepar, String name){
-	        WindTurbineTestingPointDi2Example testExample=new WindTurbineTestingPointDi2Example();
+	 public PageInfo<WindTurbineTestingPointDi> list(Tablepar tablepar, String name){
+	        WindTurbineTestingPointDiExample testExample=new WindTurbineTestingPointDiExample();
 	        testExample.setOrderByClause("id ASC");
 	        if(name!=null&&!"".equals(name)){
 	        	testExample.createCriteria().andCodeLike("%"+name+"%");
 	        }
 
 	        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
-	        List<WindTurbineTestingPointDi2> list= windTurbineTestingPointDi2Mapper.selectByExample(testExample);
-	        PageInfo<WindTurbineTestingPointDi2> pageInfo = new PageInfo<WindTurbineTestingPointDi2>(list);
+	        List<WindTurbineTestingPointDi> list= windTurbineTestingPointDi2Mapper.selectByExample(testExample);
+	        PageInfo<WindTurbineTestingPointDi> pageInfo = new PageInfo<WindTurbineTestingPointDi>(list);
 	        return  pageInfo;
 	 }
 
@@ -53,7 +53,7 @@ public class WindTurbineTestingPointDiService implements BaseService<WindTurbine
 	public int deleteByPrimaryKey(String ids) {
 				
 			List<String> lista=Convert.toListStrArray(ids);
-			WindTurbineTestingPointDi2Example example=new WindTurbineTestingPointDi2Example();
+			WindTurbineTestingPointDiExample example=new WindTurbineTestingPointDiExample();
 			example.createCriteria().andIdIn(lista);
 			return windTurbineTestingPointDi2Mapper.deleteByExample(example);
 			
@@ -62,7 +62,7 @@ public class WindTurbineTestingPointDiService implements BaseService<WindTurbine
 	
 	
 	@Override
-	public WindTurbineTestingPointDi2 selectByPrimaryKey(String id) {
+	public WindTurbineTestingPointDi selectByPrimaryKey(String id) {
 				
 			return windTurbineTestingPointDi2Mapper.selectByPrimaryKey(id);
 				
@@ -70,7 +70,7 @@ public class WindTurbineTestingPointDiService implements BaseService<WindTurbine
 
 	
 	@Override
-	public int updateByPrimaryKeySelective(WindTurbineTestingPointDi2 record) {
+	public int updateByPrimaryKeySelective(WindTurbineTestingPointDi record) {
 		return windTurbineTestingPointDi2Mapper.updateByPrimaryKeySelective(record);
 	}
 	
@@ -79,7 +79,7 @@ public class WindTurbineTestingPointDiService implements BaseService<WindTurbine
 	 * 添加
 	 */
 	@Override
-	public int insertSelective(WindTurbineTestingPointDi2 record) {
+	public int insertSelective(WindTurbineTestingPointDi record) {
 				
 		//添加雪花主键id
 		record.setId(SnowflakeIdWorker.getUUID());
@@ -90,34 +90,34 @@ public class WindTurbineTestingPointDiService implements BaseService<WindTurbine
 	
 	
 	@Override
-	public int updateByExampleSelective(WindTurbineTestingPointDi2 record, WindTurbineTestingPointDi2Example example) {
+	public int updateByExampleSelective(WindTurbineTestingPointDi record, WindTurbineTestingPointDiExample example) {
 		
 		return windTurbineTestingPointDi2Mapper.updateByExampleSelective(record, example);
 	}
 
 	
 	@Override
-	public int updateByExample(WindTurbineTestingPointDi2 record, WindTurbineTestingPointDi2Example example) {
+	public int updateByExample(WindTurbineTestingPointDi record, WindTurbineTestingPointDiExample example) {
 		
 		return windTurbineTestingPointDi2Mapper.updateByExample(record, example);
 	}
 
 	@Override
-	public List<WindTurbineTestingPointDi2> selectByExample(WindTurbineTestingPointDi2Example example) {
+	public List<WindTurbineTestingPointDi> selectByExample(WindTurbineTestingPointDiExample example) {
 		
 		return windTurbineTestingPointDi2Mapper.selectByExample(example);
 	}
 
 	
 	@Override
-	public long countByExample(WindTurbineTestingPointDi2Example example) {
+	public long countByExample(WindTurbineTestingPointDiExample example) {
 		
 		return windTurbineTestingPointDi2Mapper.countByExample(example);
 	}
 
 	
 	@Override
-	public int deleteByExample(WindTurbineTestingPointDi2Example example) {
+	public int deleteByExample(WindTurbineTestingPointDiExample example) {
 		
 		return windTurbineTestingPointDi2Mapper.deleteByExample(example);
 	}
@@ -127,24 +127,24 @@ public class WindTurbineTestingPointDiService implements BaseService<WindTurbine
 	 * @param windTurbineTestingPointDi
 	 * @return
 	 */
-	public int checkNameUnique(WindTurbineTestingPointDi2 windTurbineTestingPointDi){
-		WindTurbineTestingPointDi2Example example=new WindTurbineTestingPointDi2Example();
+	public int checkNameUnique(WindTurbineTestingPointDi windTurbineTestingPointDi){
+		WindTurbineTestingPointDiExample example=new WindTurbineTestingPointDiExample();
 		example.createCriteria().andCodeEqualTo(windTurbineTestingPointDi.getCode());
-		List<WindTurbineTestingPointDi2> list=windTurbineTestingPointDi2Mapper.selectByExample(example);
+		List<WindTurbineTestingPointDi> list=windTurbineTestingPointDi2Mapper.selectByExample(example);
 		return list.size();
 	}
 
-	public WindTurbineTestingPointDi2 getWindTurbineTestingPointDi2(String wtId, String unicode)  {
+	public WindTurbineTestingPointDi getWindTurbineTestingPointDi2(String wtId, String unicode)  {
 
-		WindTurbineTestingPointDi2 point=new WindTurbineTestingPointDi2();
+		WindTurbineTestingPointDi point=new WindTurbineTestingPointDi();
 		if(StringUtils.notEmp(wtId) && StringUtils.notEmp(unicode) )
 		{
-			WindTurbineTestingPointDi2Example example=new WindTurbineTestingPointDi2Example();
+			WindTurbineTestingPointDiExample example=new WindTurbineTestingPointDiExample();
 			example.setOrderByClause("id ASC");
-			WindTurbineTestingPointDi2Example.Criteria criteria =example.createCriteria();
+			WindTurbineTestingPointDiExample.Criteria criteria =example.createCriteria();
 			criteria.andWindturbineidEqualTo(wtId);
 			criteria.andUniformcodeEqualTo(unicode);
-			List<WindTurbineTestingPointDi2> list= windTurbineTestingPointDi2Mapper.selectByExample(example);
+			List<WindTurbineTestingPointDi> list= windTurbineTestingPointDi2Mapper.selectByExample(example);
 			if(!list.isEmpty())
 			{
 				point=list.get(0);
@@ -154,17 +154,17 @@ public class WindTurbineTestingPointDiService implements BaseService<WindTurbine
 		return point;
 	}
 
-	public List<WindTurbineTestingPointDi2> getWindTurbineTestingPointDi2List(String wtId,List<String> unicoadels)  {
+	public List<WindTurbineTestingPointDi> getWindTurbineTestingPointDi2List(String wtId, List<String> unicoadels)  {
 
-		List<WindTurbineTestingPointDi2> list=new ArrayList<>();
+		List<WindTurbineTestingPointDi> list=new ArrayList<>();
 
 
 		if(StringUtils.notEmp(wtId)  && StringUtils.notEmp(unicoadels))
 		{
-			WindTurbineTestingPointDi2Example example=new WindTurbineTestingPointDi2Example();
+			WindTurbineTestingPointDiExample example=new WindTurbineTestingPointDiExample();
 			example.setOrderByClause("id ASC");
 			example.isDistinct();
-			WindTurbineTestingPointDi2Example.Criteria criteria =example.createCriteria();
+			WindTurbineTestingPointDiExample.Criteria criteria =example.createCriteria();
 			criteria.andWindturbineidEqualTo(wtId);
 			criteria.andUniformcodeIn(unicoadels);
 			list= windTurbineTestingPointDi2Mapper.selectByExample(example);
@@ -174,17 +174,17 @@ public class WindTurbineTestingPointDiService implements BaseService<WindTurbine
 		return list;
 	}
 
-	public List<WindTurbineTestingPointDi2> getWindTurbineTestingPointDi2List(String wtId)  {
+	public List<WindTurbineTestingPointDi> getWindTurbineTestingPointDi2List(String wtId)  {
 
-		List<WindTurbineTestingPointDi2> list=new ArrayList<>();
+		List<WindTurbineTestingPointDi> list=new ArrayList<>();
 
 
 		if(StringUtils.notEmp(wtId))
 		{
-			WindTurbineTestingPointDi2Example example=new WindTurbineTestingPointDi2Example();
+			WindTurbineTestingPointDiExample example=new WindTurbineTestingPointDiExample();
 			example.setOrderByClause("id ASC");
 			example.isDistinct();
-			WindTurbineTestingPointDi2Example.Criteria criteria =example.createCriteria();
+			WindTurbineTestingPointDiExample.Criteria criteria =example.createCriteria();
 			criteria.andWindturbineidEqualTo(wtId);
 			list= windTurbineTestingPointDi2Mapper.selectByExample(example);
 

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

@@ -2,7 +2,7 @@ package com.gyee.frame.service;
 
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.mapper.auto.WindTurbineTestingPointaiyjMapper;
-import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
+import com.gyee.frame.model.auto.WindPowerStationTestingPoint;
 import com.gyee.frame.model.custom.DataVo;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.model.custom.ValueObjVo;
@@ -39,8 +39,8 @@ public class WinddirectionService {
 			Date endDate = sdfs.parse(sdf.format(DateUtils.addDays(recorddate, 1)) + " 00:00:00");
 			Date beginDate = sdfs.parse(sdf.format(recorddate) + " 00:00:00");
 
-			WindPowerStationTestingPoint2 fspoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.FCCFTFS70);
-			WindPowerStationTestingPoint2 fxpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.FCCFTFX70);
+			WindPowerStationTestingPoint fspoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.FCCFTFS70);
+			WindPowerStationTestingPoint fxpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.FCCFTFX70);
 
 			List<PointData> fxls = realApiUtil.getHistoryDatasSnap(fxpoint, beginDate.getTime() / 1000, endDate.getTime() / 1000, 24l, 3600L);
 			List<PointData> fsls = realApiUtil.getHistoryDatasSnap(fspoint, beginDate.getTime() / 1000, endDate.getTime() / 1000, 24l, 3600L);

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

@@ -2,9 +2,9 @@ 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.Windsubstationtestingpoint2Mapper;
-import com.gyee.frame.model.auto.Windsubstationtestingpoint2;
-import com.gyee.frame.model.auto.Windsubstationtestingpoint2Example;
+import com.gyee.frame.mapper.auto.WindsubstationtestingpointMapper;
+import com.gyee.frame.model.auto.Windsubstationtestingpoint;
+import com.gyee.frame.model.auto.WindsubstationtestingpointExample;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -12,16 +12,16 @@ import java.util.List;
 
 
 @Service
-public class Windsubstationtestingpoint2Service implements BaseService<Windsubstationtestingpoint2, Windsubstationtestingpoint2Example> {
+public class Windsubstationtestingpoint2Service implements BaseService<Windsubstationtestingpoint, WindsubstationtestingpointExample> {
     @Resource
-    private Windsubstationtestingpoint2Mapper windsubstationtestingpoint2Mapper;
+    private WindsubstationtestingpointMapper windsubstationtestingpoint2Mapper;
 
 
     @Override
     public int deleteByPrimaryKey(String ids) {
 
         List<String> lista = Convert.toListStrArray(ids);
-        Windsubstationtestingpoint2Example example = new Windsubstationtestingpoint2Example();
+        WindsubstationtestingpointExample example = new WindsubstationtestingpointExample();
         example.createCriteria().andCodeIn(lista);
         return windsubstationtestingpoint2Mapper.deleteByExample(example);
 
@@ -30,7 +30,7 @@ public class Windsubstationtestingpoint2Service implements BaseService<Windsubst
 
 
     @Override
-    public Windsubstationtestingpoint2 selectByPrimaryKey(String id) {
+    public Windsubstationtestingpoint selectByPrimaryKey(String id) {
 
         return windsubstationtestingpoint2Mapper.selectByPrimaryKey(id);
 
@@ -38,7 +38,7 @@ public class Windsubstationtestingpoint2Service implements BaseService<Windsubst
 
 
     @Override
-    public int updateByPrimaryKeySelective(Windsubstationtestingpoint2 record) {
+    public int updateByPrimaryKeySelective(Windsubstationtestingpoint record) {
         return windsubstationtestingpoint2Mapper.updateByPrimaryKeySelective(record);
     }
 
@@ -47,7 +47,7 @@ public class Windsubstationtestingpoint2Service implements BaseService<Windsubst
      * 添加
      */
     @Override
-    public int insertSelective(Windsubstationtestingpoint2 record) {
+    public int insertSelective(Windsubstationtestingpoint record) {
 
 
         return windsubstationtestingpoint2Mapper.insertSelective(record);
@@ -55,34 +55,34 @@ public class Windsubstationtestingpoint2Service implements BaseService<Windsubst
 
 
     @Override
-    public int updateByExampleSelective(Windsubstationtestingpoint2 record, Windsubstationtestingpoint2Example example) {
+    public int updateByExampleSelective(Windsubstationtestingpoint record, WindsubstationtestingpointExample example) {
 
         return windsubstationtestingpoint2Mapper.updateByExampleSelective(record, example);
     }
 
 
     @Override
-    public int updateByExample(Windsubstationtestingpoint2 record, Windsubstationtestingpoint2Example example) {
+    public int updateByExample(Windsubstationtestingpoint record, WindsubstationtestingpointExample example) {
 
         return windsubstationtestingpoint2Mapper.updateByExample(record, example);
     }
 
     @Override
-    public List<Windsubstationtestingpoint2> selectByExample(Windsubstationtestingpoint2Example example) {
+    public List<Windsubstationtestingpoint> selectByExample(WindsubstationtestingpointExample example) {
 
         return windsubstationtestingpoint2Mapper.selectByExample(example);
     }
 
 
     @Override
-    public long countByExample(Windsubstationtestingpoint2Example example) {
+    public long countByExample(WindsubstationtestingpointExample example) {
 
         return windsubstationtestingpoint2Mapper.countByExample(example);
     }
 
 
     @Override
-    public int deleteByExample(Windsubstationtestingpoint2Example example) {
+    public int deleteByExample(WindsubstationtestingpointExample example) {
 
         return windsubstationtestingpoint2Mapper.deleteByExample(example);
     }
@@ -99,7 +99,7 @@ public class Windsubstationtestingpoint2Service implements BaseService<Windsubst
 
     }
 
-    public int insertBatch(List<Windsubstationtestingpoint2> ls) {
+    public int insertBatch(List<Windsubstationtestingpoint> ls) {
 
 
         int result= windsubstationtestingpoint2Mapper.insertBatch(ls);

src/main/java/com/gyee/frame/service/goodness/WindturbinegoodnessService.java

@@ -4,7 +4,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.mapper.auto.WindturbinegoodnessMapper;
-import com.gyee.frame.model.auto.WindTurbineTestingPointAi2;
+import com.gyee.frame.model.auto.WindTurbineTestingPointAi;
 import com.gyee.frame.model.auto.Windturbinegoodness;
 import com.gyee.frame.model.auto.WindturbinegoodnessExample;
 import com.gyee.frame.model.custom.DataVo;
@@ -111,9 +111,9 @@ public class WindturbinegoodnessService {
 
 
 
-        WindTurbineTestingPointAi2 sjgl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_FJGL);
-        WindTurbineTestingPointAi2 bzgl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_YFGL);
-        WindTurbineTestingPointAi2 pjfs = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_FJSSFS);
+        WindTurbineTestingPointAi sjgl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_FJGL);
+        WindTurbineTestingPointAi bzgl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_YFGL);
+        WindTurbineTestingPointAi pjfs = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_FJSSFS);
 
 
        // WindTurbineTestingPointAi2 fs = map.get(Constant.TPOINT_WT_PJFS);
@@ -246,7 +246,7 @@ public class WindturbinegoodnessService {
         String plotBands = null;
         StringBuilder sb = new StringBuilder("");
 
-        WindTurbineTestingPointAi2 fjzt = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.FJZT);
+        WindTurbineTestingPointAi fjzt = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.FJZT);
 
         String beginTime=null;
         String endTime=null;
@@ -393,11 +393,11 @@ public class WindturbinegoodnessService {
     }
 
     public Map<String, String> getPlotBand(String wtId , String begin, String end) throws Exception {
-        WindTurbineTestingPointAi2 fdlAi =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_RFDL);
-        WindTurbineTestingPointAi2 fsAi = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_FJSSFS);
-        WindTurbineTestingPointAi2 llfdlAi =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_RFDLBZ);
-        WindTurbineTestingPointAi2 glAi = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_FJGL);
-        WindTurbineTestingPointAi2 fjztAi =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.FJZT);
+        WindTurbineTestingPointAi fdlAi =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_RFDL);
+        WindTurbineTestingPointAi fsAi = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_FJSSFS);
+        WindTurbineTestingPointAi llfdlAi =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_RFDLBZ);
+        WindTurbineTestingPointAi glAi = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_FJGL);
+        WindTurbineTestingPointAi fjztAi =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.FJZT);
          String sdf = "yyyy-MM-dd HH:mm";
         Date begindate=DateUtils.parseStrtoDate(begin,sdf);
         Date enddate=DateUtils.parseStrtoDate(end,sdf);
@@ -581,12 +581,12 @@ public class WindturbinegoodnessService {
 
 
 
-        WindTurbineTestingPointAi2 fdl =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_RFDL);
-        WindTurbineTestingPointAi2 whss =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.RJXSSDL);
-        WindTurbineTestingPointAi2 gzss =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.RGZSSDL);
-        WindTurbineTestingPointAi2 xdss =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.RXDSSDL);
-        WindTurbineTestingPointAi2 qfss =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.RQFSSDL);
-        WindTurbineTestingPointAi2 fs =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_FJSSFS);
+        WindTurbineTestingPointAi fdl =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_RFDL);
+        WindTurbineTestingPointAi whss =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.RJXSSDL);
+        WindTurbineTestingPointAi gzss =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.RGZSSDL);
+        WindTurbineTestingPointAi xdss =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.RXDSSDL);
+        WindTurbineTestingPointAi qfss =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.RQFSSDL);
+        WindTurbineTestingPointAi fs =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_FJSSFS);
 
         try {
             if (null != fdl) {

src/main/java/com/gyee/frame/service/health/HealthMainService.java

@@ -71,9 +71,9 @@ public class HealthMainService {
 
                 Windturbine wt=wtls.get(x);
 
-                WindTurbineTestingPointAi2 jkztpoint =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(),Constant.FJJKZZ);
+                WindTurbineTestingPointAi jkztpoint =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(),Constant.FJJKZZ);
                 jkpoints[x] = jkztpoint.getId();
-                WindTurbineTestingPointAi2 fjztpoint =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(),Constant.FJZT);
+                WindTurbineTestingPointAi fjztpoint =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(),Constant.FJZT);
                 ztpoints[x] = fjztpoint.getId();
 
             }
@@ -223,7 +223,7 @@ public class HealthMainService {
             for (int x = 0; x < wtidls.size(); x++) {
 
 
-                WindTurbineTestingPointAi2 ai = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), codejkls.get(x));
+                WindTurbineTestingPointAi ai = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), codejkls.get(x));
                 jkpoints[x] = ai.getId();
             }
 
@@ -388,7 +388,7 @@ public class HealthMainService {
                 }
                 // 获得实时风速测点编号
 
-                WindPowerStationTestingPoint2 point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_SSFS);
+                WindPowerStationTestingPoint point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_SSFS);
                 String wppintId = point.getCode();
 
                 PointData ssfspoint = realApiUtil.getRealData(wppintId);
@@ -419,9 +419,9 @@ public class HealthMainService {
                 // 获得训练参数对象
                 for (int x = 0; x < wtidls.size(); x++) {
 
-                    WindTurbineTestingPointAi2 ai1 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), codejkls.get(x));
+                    WindTurbineTestingPointAi ai1 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), codejkls.get(x));
                     jkpoints[x] = ai1.getId();
-                    WindTurbineTestingPointAi2 ai2 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), codeztls.get(x));
+                    WindTurbineTestingPointAi ai2 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), codeztls.get(x));
                     ztpoints[x] = ai2.getId();
 
                 }
@@ -597,12 +597,12 @@ public class HealthMainService {
 
                 // 获得实时风速测点编号
 
-                WindPowerStationTestingPoint2 point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_RFDL);
+                WindPowerStationTestingPoint point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_RFDL);
                 String wppintId1 = point.getCode();
                 PointData ssfspoint1 = realApiUtil.getRealData(wppintId1);
                 double rfdl = StringUtils.round(ssfspoint1.getPointValueInDouble(), digit);
 
-                WindPowerStationTestingPoint2 point2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_YFDL);
+                WindPowerStationTestingPoint point2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_YFDL);
                 String wppintId2 = point2.getCode();
                 PointData ssfspoint2 = realApiUtil.getRealData(wppintId2);
                 double yfdl = StringUtils.round(ssfspoint2.getPointValueInDouble(), digit);
@@ -763,9 +763,9 @@ public class HealthMainService {
                 // 获得训练参数对象
                 for (int x = 0; x < wtidls.size(); x++) {
 
-                    WindTurbineTestingPointAi2 ai1 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), codejkls.get(x));
+                    WindTurbineTestingPointAi ai1 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), codejkls.get(x));
                     jkpoints[x] = ai1.getId();
-                    WindTurbineTestingPointAi2 ai2 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), codeztls.get(x));
+                    WindTurbineTestingPointAi ai2 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), codeztls.get(x));
                     ztpoints[x] = ai2.getId();
 
                 }

src/main/java/com/gyee/frame/service/health/HealthOperationService.java

@@ -3,7 +3,7 @@ package com.gyee.frame.service.health;
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.auto.Project;
-import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
+import com.gyee.frame.model.auto.WindPowerStationTestingPoint;
 import com.gyee.frame.model.auto.Windpowerstation;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.service.*;
@@ -47,7 +47,7 @@ public class HealthOperationService {
 
         List<String> idls=new ArrayList<>();
 
-        WindPowerStationTestingPoint2 point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(QS, Constant.FJZCSL);
+        WindPowerStationTestingPoint point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(QS, Constant.FJZCSL);
         idls.add(point.getCode());// 合格(正常)
         point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(QS, Constant.FJLHSL);
         idls.add(point.getCode());// 良好
@@ -98,7 +98,7 @@ public class HealthOperationService {
                 if (wpList.get(i).getCode().indexOf("_FDC") > 0) {
                     List<String> idls=new ArrayList<>();
 
-                    WindPowerStationTestingPoint2 point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpList.get(i).getId(), Constant.FJZCSL);
+                    WindPowerStationTestingPoint point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpList.get(i).getId(), Constant.FJZCSL);
                     idls.add(point.getCode());// 合格(正常)
                     point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpList.get(i).getId(), Constant.FJLHSL);
                     idls.add(point.getCode());// 良好
@@ -138,7 +138,7 @@ public class HealthOperationService {
                 if (pList.get(i).getWindpowerstationid().indexOf("_FDC") > 0) {
                     List<String> idls=new ArrayList<>();
 
-                    WindPowerStationTestingPoint2 point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(pList.get(i).getId(), Constant.FJZCSL);
+                    WindPowerStationTestingPoint point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(pList.get(i).getId(), Constant.FJZCSL);
                     idls.add(point.getCode());// 合格(正常)
                     point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(pList.get(i).getId(), Constant.FJLHSL);
                     idls.add(point.getCode());// 良好
@@ -199,7 +199,7 @@ public class HealthOperationService {
 
                 if (wpList.get(i).getCode().indexOf("_FDC") > 0) {
                     if ("1".equals(status)) {
-                        WindPowerStationTestingPoint2 point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpList.get(i).getId(), Constant.FJZCSL);
+                        WindPowerStationTestingPoint point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpList.get(i).getId(), Constant.FJZCSL);
                         String hgCode = point.getCode();// 合格(正常)
                          point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpList.get(i).getId(), Constant.FJLHSL);
                         String lhCode = point.getCode();// 良好
@@ -257,7 +257,7 @@ public class HealthOperationService {
 
                     } else {
 
-                        WindPowerStationTestingPoint2 point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpList.get(i).getId(), Constant.FJZYSL);
+                        WindPowerStationTestingPoint point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpList.get(i).getId(), Constant.FJZYSL);
                         String zyCode = point.getCode();// 注意
                         point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpList.get(i).getId(), Constant.FJYZSL);
                         String yzCode = point.getCode();// 严重
@@ -330,7 +330,7 @@ public class HealthOperationService {
 
                 if (pList.get(i).getWindpowerstationid().indexOf("_FDC") > 0) {
                     if ("1".equals(status)) {
-                        WindPowerStationTestingPoint2 point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(pList.get(i).getId(), Constant.FJZCSL);
+                        WindPowerStationTestingPoint point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(pList.get(i).getId(), Constant.FJZCSL);
                         String hgCode = point.getCode();// 合格(正常)
                         point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(pList.get(i).getId(), Constant.FJLHSL);
                         String lhCode = point.getCode();// 良好
@@ -386,7 +386,7 @@ public class HealthOperationService {
                         }
 
                     } else {
-                        WindPowerStationTestingPoint2 point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(pList.get(i).getId(), Constant.FJZYSL);
+                        WindPowerStationTestingPoint point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(pList.get(i).getId(), Constant.FJZYSL);
                         String zyCode = point.getCode();// 注意
                         point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(pList.get(i).getId(), Constant.FJYZSL);
                         String yzCode = point.getCode();// 严重

src/main/java/com/gyee/frame/service/health/HealthSubService.java

@@ -134,7 +134,7 @@ public class HealthSubService {
         // 获得风机健康状态结果数组
         String[] jkpoints = new String[5];
 
-        WindTurbineTestingPointAi2 ai = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.CLXJKZT);
+        WindTurbineTestingPointAi ai = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.CLXJKZT);
         jkpoints[0] = ai.getId();
         ai = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.FDJJKZT);
         jkpoints[1] = ai.getId();
@@ -673,7 +673,7 @@ public class HealthSubService {
             timearr[i]=cal.getTime().getTime();
             cal.add(Calendar.MINUTE,3);
         }
-        WindTurbineTestingPointAi2 sjgl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.TPOINT_WT_FJGL);
+        WindTurbineTestingPointAi sjgl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.TPOINT_WT_FJGL);
 
         List<PointData> sjglls = realApiUtil.getHistoryDatasSnap(sjgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 180L);
 
@@ -683,7 +683,7 @@ public class HealthSubService {
                 sjglarr[i] = MathUtil.twoBit(sjglls.get(i).getPointValueInDouble());
             }
         }
-        WindTurbineTestingPointAi2 llgl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.TPOINT_WT_LLGL);
+        WindTurbineTestingPointAi llgl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.TPOINT_WT_LLGL);
 
         List<PointData> llglls = realApiUtil.getHistoryDatasSnap(llgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 180L);
 
@@ -693,7 +693,7 @@ public class HealthSubService {
             }
         }
 
-        WindTurbineTestingPointAi2 ssfs = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.TPOINT_WT_FJSSFS);
+        WindTurbineTestingPointAi ssfs = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.TPOINT_WT_FJSSFS);
 
         List<PointData> ssfsls = realApiUtil.getHistoryDatasSnap(ssfs, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 180L);
 
@@ -761,10 +761,10 @@ public class HealthSubService {
         // 获得风机健康状态结果数组
         String[] jkpoints = new String[4];
 
-        WindTurbineTestingPointAi2 clx = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.CLXJKZT);
-        WindTurbineTestingPointAi2 fdj = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.FDJJKZT);
-        WindTurbineTestingPointAi2 bj = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.BJJKZT);
-        WindTurbineTestingPointAi2 zk = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.ZKJKZT);
+        WindTurbineTestingPointAi clx = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.CLXJKZT);
+        WindTurbineTestingPointAi fdj = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.FDJJKZT);
+        WindTurbineTestingPointAi bj = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.BJJKZT);
+        WindTurbineTestingPointAi zk = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.ZKJKZT);
 
         jkpoints[0] = clx.getId();
         jkpoints[1] = fdj.getId();
@@ -970,11 +970,11 @@ public class HealthSubService {
         List<DatasetsVo> datasets = new ArrayList<DatasetsVo>();
 
 
-        WindTurbineTestingPointAi2 fj = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.FJJKZZ);
-        WindTurbineTestingPointAi2 clx = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.CLXJKJL);
-        WindTurbineTestingPointAi2 fdj = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.FDJJKJL);
-        WindTurbineTestingPointAi2 kzys = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.BJJKJL);
-        WindTurbineTestingPointAi2 jcxt = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.ZKJKJL);
+        WindTurbineTestingPointAi fj = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.FJJKZZ);
+        WindTurbineTestingPointAi clx = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.CLXJKJL);
+        WindTurbineTestingPointAi fdj = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.FDJJKJL);
+        WindTurbineTestingPointAi kzys = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.BJJKJL);
+        WindTurbineTestingPointAi jcxt = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.ZKJKJL);
 
 
         if (null != fj) {
@@ -1163,11 +1163,11 @@ public class HealthSubService {
         Map<String, Windturbine> wtmap = InitialRunner.wtmap;
         //String wtName = wtmap.get(wtId).getName();
 
-        WindTurbineTestingPointAi2 fj = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.FJJKZT);
-        WindTurbineTestingPointAi2 clx = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.CLXJKZT);
-        WindTurbineTestingPointAi2 fdj = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.FDJJKZT);
-        WindTurbineTestingPointAi2 bj = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.BJJKZT);
-        WindTurbineTestingPointAi2 zk = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.ZKJKZT);
+        WindTurbineTestingPointAi fj = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.FJJKZT);
+        WindTurbineTestingPointAi clx = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.CLXJKZT);
+        WindTurbineTestingPointAi fdj = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.FDJJKZT);
+        WindTurbineTestingPointAi bj = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.BJJKZT);
+        WindTurbineTestingPointAi zk = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.ZKJKZT);
 
         // 时间 目前当天0点开始
         Calendar cl = Calendar.getInstance();
@@ -1291,10 +1291,10 @@ public class HealthSubService {
 
 
 
-        WindTurbineTestingPointAi2 clx = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.CLXJKZT);
-        WindTurbineTestingPointAi2 fdj = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.FDJJKZT);
-        WindTurbineTestingPointAi2 bj = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.BJJKZT);
-        WindTurbineTestingPointAi2 zk = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.ZKJKZT);
+        WindTurbineTestingPointAi clx = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.CLXJKZT);
+        WindTurbineTestingPointAi fdj = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.FDJJKZT);
+        WindTurbineTestingPointAi bj = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.BJJKZT);
+        WindTurbineTestingPointAi zk = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.ZKJKZT);
 
 
         if (null != clx) {
@@ -1419,10 +1419,10 @@ public class HealthSubService {
         Date endDate = sdfs.parse(sdf.format(DateUtils.addDays(currentDate, 1)) + " 00:00:00");
         Date beginDate = sdfs.parse(sdf.format(currentDate) + " 00:00:00");
 
-        WindTurbineTestingPointAi2 clxsrzc = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI038");
-        WindTurbineTestingPointAi2 clxsczc = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI039");
-        WindTurbineTestingPointAi2 clxrkyw = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI040");
-        WindTurbineTestingPointAi2 clxyw = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI041");
+        WindTurbineTestingPointAi clxsrzc = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI038");
+        WindTurbineTestingPointAi clxsczc = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI039");
+        WindTurbineTestingPointAi clxrkyw = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI040");
+        WindTurbineTestingPointAi clxyw = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI041");
 
 
         if (null != clxsrzc && StringUtils.notEmp(clxsrzc.getId())) {
@@ -1558,12 +1558,12 @@ public class HealthSubService {
         Date beginDate = sdfs.parse(sdf.format(currentDate) + " 00:00:00");
 
 
-        WindTurbineTestingPointAi2 fdjzca = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI052");
-        WindTurbineTestingPointAi2 fdjzcb = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI053");
-        WindTurbineTestingPointAi2 fdjrzu = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI045");
-        WindTurbineTestingPointAi2 fdjrzv = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI047");
-        WindTurbineTestingPointAi2 fdjrzw = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI049");
-        WindTurbineTestingPointAi2 fdjlqf = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI054");
+        WindTurbineTestingPointAi fdjzca = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI052");
+        WindTurbineTestingPointAi fdjzcb = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI053");
+        WindTurbineTestingPointAi fdjrzu = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI045");
+        WindTurbineTestingPointAi fdjrzv = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI047");
+        WindTurbineTestingPointAi fdjrzw = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI049");
+        WindTurbineTestingPointAi fdjlqf = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI054");
 
 
         if (null != fdjzca  && StringUtils.notEmp(fdjzca.getId())) {
@@ -1749,11 +1749,11 @@ public class HealthSubService {
         Date endDate = sdfs.parse(sdf.format(DateUtils.addDays(currentDate, 1)) + " 00:00:00");
         Date beginDate = sdfs.parse(sdf.format(currentDate) + " 00:00:00");
 
-        WindTurbineTestingPointAi2 bjdrqwd = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI113");
-        WindTurbineTestingPointAi2 bjdrqdy = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI236");
-        WindTurbineTestingPointAi2 bjblwd = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI239");
-        WindTurbineTestingPointAi2 bjdjwd = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI103");
-        WindTurbineTestingPointAi2 bjkzgwd = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI233");
+        WindTurbineTestingPointAi bjdrqwd = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI113");
+        WindTurbineTestingPointAi bjdrqdy = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI236");
+        WindTurbineTestingPointAi bjblwd = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI239");
+        WindTurbineTestingPointAi bjdjwd = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI103");
+        WindTurbineTestingPointAi bjkzgwd = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI233");
 
 
         if (null != bjdrqwd  && StringUtils.notEmp(bjdrqwd.getId())) {
@@ -1910,8 +1910,8 @@ public class HealthSubService {
         Date beginDate = sdfs.parse(sdf.format(currentDate) + " 00:00:00");
 
 
-        WindTurbineTestingPointAi2 tdgwd = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI069");
-        WindTurbineTestingPointAi2 tdkzgwd = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI070");
+        WindTurbineTestingPointAi tdgwd = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI069");
+        WindTurbineTestingPointAi tdkzgwd = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "AI070");
 
 
         if (null != tdgwd   && StringUtils.notEmp(tdgwd.getId())) {
@@ -1980,19 +1980,19 @@ public class HealthSubService {
 
         String pointid = null;
         if (type.equals("1")) {
-            WindTurbineTestingPointAi2 pointAi2 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "JKZT001");
+            WindTurbineTestingPointAi pointAi2 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "JKZT001");
             pointid = pointAi2.getId();
         } else if (type.equals("2")) {
-            WindTurbineTestingPointAi2 pointAi2 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "JKZT002");
+            WindTurbineTestingPointAi pointAi2 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "JKZT002");
             pointid = pointAi2.getId();
         } else if (type.equals("3")) {
-            WindTurbineTestingPointAi2 pointAi2 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "JKZT003");
+            WindTurbineTestingPointAi pointAi2 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "JKZT003");
             pointid = pointAi2.getId();
         } else if (type.equals("4")) {
-            WindTurbineTestingPointAi2 pointAi2 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "JKZT004");
+            WindTurbineTestingPointAi pointAi2 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "JKZT004");
             pointid = pointAi2.getId();
         } else if (type.equals("5")) {
-            WindTurbineTestingPointAi2 pointAi2 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "JKZT005");
+            WindTurbineTestingPointAi pointAi2 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, "JKZT005");
             pointid =pointAi2.getId();
         }
 

src/main/java/com/gyee/frame/service/health/LossPowerRateHealthService.java

@@ -3,7 +3,7 @@ package com.gyee.frame.service.health;
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.mapper.auto.AlarmsnapMapper;
-import com.gyee.frame.model.auto.WindTurbineTestingPointAi2;
+import com.gyee.frame.model.auto.WindTurbineTestingPointAi;
 import com.gyee.frame.model.auto.Windpowerstation;
 import com.gyee.frame.model.auto.Windturbine;
 import com.gyee.frame.model.custom.DNAVal;
@@ -71,7 +71,7 @@ public class LossPowerRateHealthService {
 
             for (int i = 0; i < codels.size(); i++) {
 
-                WindTurbineTestingPointAi2 ai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(),codels.get(i));
+                WindTurbineTestingPointAi ai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(),codels.get(i));
                 points[i] = ai.getId();
             }
 

src/main/java/com/gyee/frame/service/health/WindTurbineHealthListService.java

@@ -3,7 +3,7 @@ package com.gyee.frame.service.health;
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.mapper.auto.AlarmsnapMapper;
-import com.gyee.frame.model.auto.WindTurbineTestingPointAi2;
+import com.gyee.frame.model.auto.WindTurbineTestingPointAi;
 import com.gyee.frame.model.auto.Windpowerstation;
 import com.gyee.frame.model.auto.Windturbine;
 import com.gyee.frame.model.custom.DNAVal;
@@ -73,7 +73,7 @@ public class WindTurbineHealthListService {
 
                 for (int i = 0; i < codels.size(); i++) {
 
-                    WindTurbineTestingPointAi2 ai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(),codels.get(i));
+                    WindTurbineTestingPointAi ai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(),codels.get(i));
                     points[i] = ai.getId();
                 }
 

src/main/java/com/gyee/frame/service/initialpoint/InitialPointEdosService.java

@@ -509,7 +509,7 @@ public class InitialPointEdosService implements  IinitialPoint{
 
         List<Windsubstationtandardpoint> stpointls=windsubstationstandardpointService.findAllList();
         List<Windsubstation> wsubls=windsubstationService.findAllList();
-        List<Windsubstationtestingpoint2> allpoints=new ArrayList<>();
+        List<Windsubstationtestingpoint> allpoints=new ArrayList<>();
         if(!wsubls.isEmpty() && !stpointls.isEmpty())
         {
             for(Windsubstation wsub:wsubls)
@@ -519,7 +519,7 @@ public class InitialPointEdosService implements  IinitialPoint{
                 {
                     Windpowerstation wp=InitialRunner.wpmap.get(wsub.getWindpowerstationid());
 
-                    List<Windsubstationtestingpoint2> points=new ArrayList<>();
+                    List<Windsubstationtestingpoint> points=new ArrayList<>();
                     for(int i=0;i<stpointls.size();i++)
                     {
                         StringBuilder sbtable =new StringBuilder();
@@ -578,7 +578,7 @@ public class InitialPointEdosService implements  IinitialPoint{
 //                        {
 //                            sbtable.append(".").append(sb);
 //                        }
-                        Windsubstationtestingpoint2 po=new Windsubstationtestingpoint2();
+                        Windsubstationtestingpoint po=new Windsubstationtestingpoint();
                         po.setCode(String.valueOf(sb));
                         sb =new StringBuilder();
                         sb.append(wsub.getAname()).append(stp.getName());

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

@@ -316,7 +316,7 @@ public class RecommenService {
 			// 获得训练参数对象
 			for (int x = 0; x < wtidls.size(); x++) {
 
-				WindTurbineTestingPointAi2 ai = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), codejkls.get(x));
+				WindTurbineTestingPointAi ai = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), codejkls.get(x));
 				if(StringUtils.notEmp(ai))
 				{
 					jkpoints[x] = ai.getId();

src/main/java/com/gyee/frame/service/stopanalysis/StopAnalysisStaticService.java

@@ -91,17 +91,17 @@ public class StopAnalysisStaticService {
                 // 获得训练参数对象
                 for (int x = 0; x < wtidls.size(); x++) {
 
-                    WindTurbineTestingPointAi2 ai1 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), codejkls.get(x));
+                    WindTurbineTestingPointAi ai1 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), codejkls.get(x));
                     jkpoints[x] = ai1.getId();
-                    WindTurbineTestingPointAi2 ai2 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), codeztls.get(x));
+                    WindTurbineTestingPointAi ai2 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), codeztls.get(x));
                     ztpoints[x] = ai2.getId();
-                    WindTurbineTestingPointAi2 ai3 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), clxjkls.get(x));
+                    WindTurbineTestingPointAi ai3 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), clxjkls.get(x));
                     clxpoints[x] = ai3.getId();
-                    WindTurbineTestingPointAi2 ai4 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), fdjjkls.get(x));
+                    WindTurbineTestingPointAi ai4 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), fdjjkls.get(x));
                     fdjpoints[x] = ai4.getId();
-                    WindTurbineTestingPointAi2 ai5 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), bjjkls.get(x));
+                    WindTurbineTestingPointAi ai5 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), bjjkls.get(x));
                     bjpoints[x] = ai5.getId();
-                    WindTurbineTestingPointAi2 ai6 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), zkjkls.get(x));
+                    WindTurbineTestingPointAi ai6 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), zkjkls.get(x));
                     zkpoints[x] = ai6.getId();
 
                 }
@@ -161,13 +161,13 @@ public class StopAnalysisStaticService {
 //                    public static final String FDJJKZT = "JKZT003";// 发电机健康状态
 //                    public static final String BJJKZT = "JKZT004";// 变桨健康
 //                    public static final String ZKJKZT = "JKZT005";// 主控健康状态
-                    WindTurbineTestingPointAi2 ai1 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.CLXJKZT);
+                    WindTurbineTestingPointAi ai1 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.CLXJKZT);
                     List<PointData> pointls1 = realApiUtil.getHistoryDatasSnap(ai1, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) 10, 60L);
-                    WindTurbineTestingPointAi2 ai2 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.FDJJKZT);
+                    WindTurbineTestingPointAi ai2 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.FDJJKZT);
                     List<PointData> pointls2 = realApiUtil.getHistoryDatasSnap(ai1, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) 10, 60L);
-                    WindTurbineTestingPointAi2 ai3 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.BJJKZT);
+                    WindTurbineTestingPointAi ai3 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.BJJKZT);
                     List<PointData> pointls3 = realApiUtil.getHistoryDatasSnap(ai1, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) 10, 60L);
-                    WindTurbineTestingPointAi2 ai4 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.ZKJKZT);
+                    WindTurbineTestingPointAi ai4 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.ZKJKZT);
                     List<PointData> pointls4 = realApiUtil.getHistoryDatasSnap(ai1, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) 10, 60L);
 
 
@@ -264,7 +264,7 @@ public class StopAnalysisStaticService {
 
             for (int i = 0; i < codels.size(); i++) {
 
-                WindTurbineTestingPointAi2 ai = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, codels.get(i));
+                WindTurbineTestingPointAi ai = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, codels.get(i));
                 points[i] = ai.getId();
             }
 

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

@@ -3,7 +3,7 @@ package com.gyee.frame.service.websocket;
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.agc.AgcVo;
-import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
+import com.gyee.frame.model.auto.WindPowerStationTestingPoint;
 import com.gyee.frame.model.auto.Windpowerstation;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.service.WindPowerstationTestingPoint2Service;
@@ -111,7 +111,7 @@ public class AgcService {
             Map<String, Object> resultmap = new HashMap<String, Object>();
             String[] agcPoints = Constant.TPOINT_WP_AGC;
 
-            Map<String, WindPowerStationTestingPoint2> map = InitialRunner.wpPointmap.get(wp.getId());
+            Map<String, WindPowerStationTestingPoint> map = InitialRunner.wpPointmap.get(wp.getId());
 
             for (int i = 0; i < agcPoints.length; i++) {
                 String ai;
@@ -370,9 +370,9 @@ public class AgcService {
                 vos.add(vo);
             }
 
-            Map<String, WindPowerStationTestingPoint2> map = InitialRunner.wpPointmap.get(wp.getId());
+            Map<String, WindPowerStationTestingPoint> map = InitialRunner.wpPointmap.get(wp.getId());
 
-            WindPowerStationTestingPoint2 sjgl = map.get(agcPoints[3]);
+            WindPowerStationTestingPoint sjgl = map.get(agcPoints[3]);
             if (null != sjgl) {
                 List<PointData> sjglls = ednaApiUtil.getHistoryDatasSnap(sjgl, beginDate.getTime() / 1000,
                         endDate.getTime() / 1000, (long) length, 1800L);
@@ -402,7 +402,7 @@ public class AgcService {
 
 
             }
-            WindPowerStationTestingPoint2 llgl = map.get(Constant.TPOINT_WP_ZZSGL);
+            WindPowerStationTestingPoint llgl = map.get(Constant.TPOINT_WP_ZZSGL);
             if (null != llgl) {
                 List<PointData> llglls;
                 if (wp.getId().equals("SBQ_FDC")) {
@@ -438,7 +438,7 @@ public class AgcService {
                 }
 
             }
-            WindPowerStationTestingPoint2 xdgl = map.get(agcPoints[2]);
+            WindPowerStationTestingPoint xdgl = map.get(agcPoints[2]);
             if (null != xdgl) {
                 List<PointData> xdglls = ednaApiUtil.getHistoryDatasSnap(xdgl, beginDate.getTime() / 1000,
                         endDate.getTime() / 1000, (long) length, 1800L);
@@ -468,7 +468,7 @@ public class AgcService {
                     if ("CL_FDC".equals(wp.getId())) {
 
                     } else {
-                        WindPowerStationTestingPoint2 ycgl1 = map.get(ycPoints[0]);
+                        WindPowerStationTestingPoint ycgl1 = map.get(ycPoints[0]);
                         if (num > 0) {
                             List<PointData> datas = new ArrayList<PointData>();
                             datas = ednaApiUtil.getHistoryDatasSnap(ycgl1, beginDate.getTime() / 1000,
@@ -484,7 +484,7 @@ public class AgcService {
                                     subresult = 8;
                                 }
                                 for (int i = 0; i < subresult; i++) {
-                                    WindPowerStationTestingPoint2 ycgl = map.get(ycPoints2SB[i]);
+                                    WindPowerStationTestingPoint ycgl = map.get(ycPoints2SB[i]);
                                     double value = 0.0;
                                     value = ednaApiUtil.getRealData(ycgl).getPointValueInDouble();
                                     vos.get(datas.size() + i).setYcgl(StringUtils.round(value, 2));
@@ -507,7 +507,7 @@ public class AgcService {
                     if ("CL_FDC".equals(wp.getId())) {
 
                     } else {
-                        WindPowerStationTestingPoint2 ycgl1 = map.get(ycPoints[0]);
+                        WindPowerStationTestingPoint ycgl1 = map.get(ycPoints[0]);
                         if (num > 0) {
                             List<PointData> datas = new ArrayList<PointData>();
                             datas = ednaApiUtil.getHistoryDatasSnap(ycgl1, beginDate.getTime() / 1000,
@@ -525,9 +525,9 @@ public class AgcService {
                                     subresult = length - datas.size();
                                 }
                                 for (int i = 0; i < subresult; i++) {
-                                    WindPowerStationTestingPoint2 ycgl = map
+                                    WindPowerStationTestingPoint ycgl = map
                                             .get(ycPoints2[i]);
-                                    WindPowerStationTestingPoint2 ycgld = map
+                                    WindPowerStationTestingPoint ycgld = map
                                             .get(ycPoints[i]);
                                     double value = 0.0;
                                     int minute = Calendar.getInstance().get(

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

@@ -4,7 +4,7 @@ package com.gyee.frame.service.websocket;
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.websocket.WebSocketConfig;
 import com.gyee.frame.common.websocket.WebsocketMessageService;
-import com.gyee.frame.model.auto.WindTurbineTestingPointAi2;
+import com.gyee.frame.model.auto.WindTurbineTestingPointAi;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.service.WindTurbineTestingPointAiService;
 import com.gyee.frame.util.IRealTimeDataBaseUtil;
@@ -275,9 +275,9 @@ public class BraceletService  {
                 String wtId=entry.getKey().substring(entry.getKey().indexOf(WebSocketConfig.PARAM)+6);
                 List<String> pointids=new ArrayList<>();
 
-                WindTurbineTestingPointAi2 sjgl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.TPOINT_WT_FJGL);
-                WindTurbineTestingPointAi2 bzgl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_YFGL);
-                WindTurbineTestingPointAi2 pjfs = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_FJSSFS);
+                WindTurbineTestingPointAi sjgl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.TPOINT_WT_FJGL);
+                WindTurbineTestingPointAi bzgl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_YFGL);
+                WindTurbineTestingPointAi pjfs = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_FJSSFS);
                 pointids.add(sjgl.getId());
                 pointids.add(bzgl.getId());
                 pointids.add(pjfs.getId());

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

@@ -2,7 +2,7 @@ package com.gyee.frame.service.websocket;
 
 
 import com.gyee.frame.common.spring.Constant;
-import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
+import com.gyee.frame.model.auto.WindPowerStationTestingPoint;
 import com.gyee.frame.model.custom.DataVo;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.service.ProjectPlanService;
@@ -64,7 +64,7 @@ public class CftInfoPushService {
 
             for(int i=0;i<cftstrs.length;i++)
             {
-                WindPowerStationTestingPoint2 point2 =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, cftstrs[i]);
+                WindPowerStationTestingPoint point2 =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, cftstrs[i]);
 
                 if(StringUtils.notEmp(point2.getCode()))
                 {

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

@@ -120,7 +120,7 @@ public class GenreSetPushDetailLnService {
                 // public static final String RWZSSDL = "RWZSSDL"; // 日场外受累电网
                 // public static final String RTZSSDL = "RTZSSDL"; // 日场外受累天气
                 if (targetName.equals(RFDL)) {
-                    WindTurbineTestingPointAi2 rfdlai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.TPOINT_WT_RFDL);// 日发电量
+                    WindTurbineTestingPointAi rfdlai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.TPOINT_WT_RFDL);// 日发电量
                     List<PointData> rfdls = new ArrayList<PointData>();
                     try {
                         rfdls = realApiUtil.getHistoryDatasSnap(rfdlai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -130,7 +130,7 @@ public class GenreSetPushDetailLnService {
                     }
                     setPointValue(wp, vo, rfdls, summap);
                 } else if (targetName.equals(RXDSSDL)) {
-                    WindTurbineTestingPointAi2 xdai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.RXDSSDL);
+                    WindTurbineTestingPointAi xdai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.RXDSSDL);
                     List<PointData> xdls = new ArrayList<PointData>();
                     try {
                         xdls = realApiUtil.getHistoryDatasSnap(xdai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -141,10 +141,10 @@ public class GenreSetPushDetailLnService {
                     setPointValue(wp, vo, xdls, summap);
                 } else if (targetName.equals(RXNSSDL)) {
 
-                    WindTurbineTestingPointAi2 qfai1 =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.RSDJZSDL);
-                    WindTurbineTestingPointAi2 qfai2 =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.RSSTZSDL);
-                    WindTurbineTestingPointAi2 qfai3 =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.RXNZSDL);
-                    WindTurbineTestingPointAi2 qfai4 =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.RSQXZSDL);
+                    WindTurbineTestingPointAi qfai1 =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.RSDJZSDL);
+                    WindTurbineTestingPointAi qfai2 =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.RSSTZSDL);
+                    WindTurbineTestingPointAi qfai3 =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.RXNZSDL);
+                    WindTurbineTestingPointAi qfai4 =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.RSQXZSDL);
 
                     List<PointData> qfls1 = new ArrayList<PointData>();
                     List<PointData> qfls2 = new ArrayList<PointData>();
@@ -183,8 +183,8 @@ public class GenreSetPushDetailLnService {
                     }
 
                 } else if (targetName.equals("rgzssdl")) {
-                    WindTurbineTestingPointAi2 gzai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.RGZSSDL);
-                    WindTurbineTestingPointAi2 gzslai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.RSZSSDL);
+                    WindTurbineTestingPointAi gzai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.RGZSSDL);
+                    WindTurbineTestingPointAi gzslai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.RSZSSDL);
                     List<PointData> gzls = new ArrayList<PointData>();
                     try {
                         gzls = realApiUtil.getHistoryDatasSnap(gzai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -201,8 +201,8 @@ public class GenreSetPushDetailLnService {
                     }
                     setPointValue(wp, vo, gzls, gzslls, summap);
                 } else if (targetName.equals(RJXSSDL)) {
-                    WindTurbineTestingPointAi2 jxai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.RJXSSDL);
-                    WindTurbineTestingPointAi2 jxslai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.RLZSSDL);
+                    WindTurbineTestingPointAi jxai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.RJXSSDL);
+                    WindTurbineTestingPointAi jxslai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.RLZSSDL);
                     List<PointData> jxls = new ArrayList<PointData>();
                     try {
                         jxls = realApiUtil.getHistoryDatasSnap(jxai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -220,8 +220,8 @@ public class GenreSetPushDetailLnService {
 
                     setPointValue(wp, vo, jxls, jxslls, summap);
                 } else if (targetName.equals(RSLSSDL)) {
-                    WindTurbineTestingPointAi2 dwai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.RWZSSDL);
-                    WindTurbineTestingPointAi2 tqai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.RTZSSDL);
+                    WindTurbineTestingPointAi dwai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.RWZSSDL);
+                    WindTurbineTestingPointAi tqai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.RTZSSDL);
                     List<PointData> dwls = new ArrayList<PointData>();
                     try {
                         dwls = realApiUtil.getHistoryDatasSnap(dwai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -542,7 +542,7 @@ public class GenreSetPushDetailLnService {
                 Date endDate = c.getTime();
                 Date beginDate = c.getTime();
                 if (targetName.equals(YFDL)) {
-                    WindTurbineTestingPointAi2 yfdlai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.TPOINT_WT_YFDL);// 月发电量
+                    WindTurbineTestingPointAi yfdlai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.TPOINT_WT_YFDL);// 月发电量
                     List<PointData> yfdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -582,7 +582,7 @@ public class GenreSetPushDetailLnService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YXDSSDL)) {
-                    WindTurbineTestingPointAi2 xdai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.YXDSSDL);
+                    WindTurbineTestingPointAi xdai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.YXDSSDL);
                     List<PointData> xdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -627,7 +627,7 @@ public class GenreSetPushDetailLnService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YXNSSDL)) {
-                    WindTurbineTestingPointAi2 qfai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.YQFSSDL);
+                    WindTurbineTestingPointAi qfai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.YQFSSDL);
                     List<PointData> qfls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -673,8 +673,8 @@ public class GenreSetPushDetailLnService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YGZSSDL)) {
-                    WindTurbineTestingPointAi2 gzai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.YGZSSDL);
-                    WindTurbineTestingPointAi2 gzslai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.YSZSSDL);
+                    WindTurbineTestingPointAi gzai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.YGZSSDL);
+                    WindTurbineTestingPointAi gzslai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.YSZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -749,8 +749,8 @@ public class GenreSetPushDetailLnService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YJXSSDL)) {
-                    WindTurbineTestingPointAi2 jxai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.YJXSSDL);
-                    WindTurbineTestingPointAi2 jxslai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.YLZSSDL);
+                    WindTurbineTestingPointAi jxai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.YJXSSDL);
+                    WindTurbineTestingPointAi jxslai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.YLZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -822,8 +822,8 @@ public class GenreSetPushDetailLnService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YSLSSDL)) {
-                    WindTurbineTestingPointAi2 dwai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.YWZSSDL);
-                    WindTurbineTestingPointAi2 tqai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.YTZSSDL);
+                    WindTurbineTestingPointAi dwai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.YWZSSDL);
+                    WindTurbineTestingPointAi tqai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.YTZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1002,7 +1002,7 @@ public class GenreSetPushDetailLnService {
                 Date endDate = c.getTime();
                 Date beginDate = c.getTime();
                 if (targetName.equals(NFDL)) {
-                    WindTurbineTestingPointAi2 yfdlai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.TPOINT_WP_NFDL);// 月发电量
+                    WindTurbineTestingPointAi yfdlai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.TPOINT_WP_NFDL);// 月发电量
                     List<PointData> yfdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -1044,7 +1044,7 @@ public class GenreSetPushDetailLnService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NXDSSDL)) {
-                    WindTurbineTestingPointAi2 xdai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.NXDSSDL);
+                    WindTurbineTestingPointAi xdai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.NXDSSDL);
                     List<PointData> xdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -1089,7 +1089,7 @@ public class GenreSetPushDetailLnService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NXNSSDL)) {
-                    WindTurbineTestingPointAi2 qfai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.NQFSSDL);
+                    WindTurbineTestingPointAi qfai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.NQFSSDL);
                     List<PointData> qfls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -1135,8 +1135,8 @@ public class GenreSetPushDetailLnService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NGZSSDL)) {
-                    WindTurbineTestingPointAi2 gzai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.NGZSSDL);
-                    WindTurbineTestingPointAi2 gzslai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.NSZSSDL);
+                    WindTurbineTestingPointAi gzai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.NGZSSDL);
+                    WindTurbineTestingPointAi gzslai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.NSZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1211,8 +1211,8 @@ public class GenreSetPushDetailLnService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NJXSSDL)) {
-                    WindTurbineTestingPointAi2 jxai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.NJXSSDL);
-                    WindTurbineTestingPointAi2 jxslai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.NLZSSDL);
+                    WindTurbineTestingPointAi jxai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.NJXSSDL);
+                    WindTurbineTestingPointAi jxslai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.NLZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1284,8 +1284,8 @@ public class GenreSetPushDetailLnService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NSLSSDL)) {
-                    WindTurbineTestingPointAi2 dwai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.NWZSSDL);
-                    WindTurbineTestingPointAi2 tqai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.NTZSSDL);
+                    WindTurbineTestingPointAi dwai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.NWZSSDL);
+                    WindTurbineTestingPointAi tqai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wp.getId(), Constant.NTZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1425,8 +1425,8 @@ public class GenreSetPushDetailLnService {
                 if (wt.getLineid().equals(id)) {
                     DataVo vo = new DataVo();
                     vo.setName(wt.getId());
-                    WindTurbineTestingPointAi2 yfdlpoint=windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_ALL_YFDL);
-                    WindTurbineTestingPointAi2 nfdlpoint=windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_ALL_NFDL);
+                    WindTurbineTestingPointAi yfdlpoint=windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_ALL_YFDL);
+                    WindTurbineTestingPointAi nfdlpoint=windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_ALL_NFDL);
 
                     double yfdl = realApiUtil.getRealData(yfdlpoint).getPointValueInDouble();
                     double nfdl = realApiUtil.getRealData(nfdlpoint).getPointValueInDouble();

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

@@ -6,7 +6,7 @@ import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.auto.Line;
 import com.gyee.frame.model.auto.Project;
 import com.gyee.frame.model.auto.ProjectPlan;
-import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
+import com.gyee.frame.model.auto.WindPowerStationTestingPoint;
 import com.gyee.frame.model.custom.DataVo;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.model.custom.resultVo;
@@ -132,7 +132,7 @@ public class GenreSetPushDetailPjService {
                 // public static final String RWZSSDL = "RWZSSDL"; // 日场外受累电网
                 // public static final String RTZSSDL = "RTZSSDL"; // 日场外受累天气
                 if (targetName.equals(RFDL)) {
-                    WindPowerStationTestingPoint2 rfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_RFDL);// 日发电量
+                    WindPowerStationTestingPoint rfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_RFDL);// 日发电量
                     List<PointData> rfdls = new ArrayList<PointData>();
                     try {
                         rfdls = realApiUtil.getHistoryDatasSnap(rfdlai, beginDate.getTime() / 1000,
@@ -143,7 +143,7 @@ public class GenreSetPushDetailPjService {
                     }
                     setPointValueFdl(wp, vo, rfdls, summap);
                 } else if (targetName.equals(RXDSSDL)) {
-                    WindPowerStationTestingPoint2 xdai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RXDSSDL);
+                    WindPowerStationTestingPoint xdai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RXDSSDL);
                     List<PointData> xdls = new ArrayList<PointData>();
                     try {
                         xdls = realApiUtil.getHistoryDatasSnap(xdai, beginDate.getTime() / 1000,
@@ -154,10 +154,10 @@ public class GenreSetPushDetailPjService {
                     }
                     setPointValue(wp, vo, xdls, summap);
                 } else if (targetName.equals(RXNSSDL)) {
-                    WindPowerStationTestingPoint2 qfai1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSDJZSDL);
-                    WindPowerStationTestingPoint2 qfai2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSSTZSDL);
-                    WindPowerStationTestingPoint2 qfai3 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RXNZSDL);
-                    WindPowerStationTestingPoint2 qfai4 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSQXZSDL);
+                    WindPowerStationTestingPoint qfai1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSDJZSDL);
+                    WindPowerStationTestingPoint qfai2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSSTZSDL);
+                    WindPowerStationTestingPoint qfai3 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RXNZSDL);
+                    WindPowerStationTestingPoint qfai4 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSQXZSDL);
 
                     List<PointData> qfls1 = new ArrayList<PointData>();
                     List<PointData> qfls2 = new ArrayList<PointData>();
@@ -197,8 +197,8 @@ public class GenreSetPushDetailPjService {
                         setPointValue(wp, vo, qfls, summap);
                     }
                 } else if (targetName.equals(RGZSSDL)) {
-                    WindPowerStationTestingPoint2 gzai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RGZSSDL);
-                    WindPowerStationTestingPoint2 gzslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSZSSDL);
+                    WindPowerStationTestingPoint gzai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RGZSSDL);
+                    WindPowerStationTestingPoint gzslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSZSSDL);
                     List<PointData> gzls = new ArrayList<PointData>();
                     try {
                         gzls = realApiUtil.getHistoryDatasSnap(gzai, beginDate.getTime() / 1000,
@@ -217,8 +217,8 @@ public class GenreSetPushDetailPjService {
                     }
                     setPointValue(wp, vo, gzls, gzslls, summap);
                 } else if (targetName.equals(RJXSSDL)) {
-                    WindPowerStationTestingPoint2 jxai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RJXSSDL);
-                    WindPowerStationTestingPoint2 jxslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RLZSSDL);
+                    WindPowerStationTestingPoint jxai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RJXSSDL);
+                    WindPowerStationTestingPoint jxslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RLZSSDL);
                     List<PointData> jxls = new ArrayList<PointData>();
                     try {
                         jxls = realApiUtil.getHistoryDatasSnap(jxai, beginDate.getTime() / 1000,
@@ -238,8 +238,8 @@ public class GenreSetPushDetailPjService {
 
                     setPointValue(wp, vo, jxls, jxslls, summap);
                 } else if (targetName.equals(RSLSSDL)) {
-                    WindPowerStationTestingPoint2 dwai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RWZSSDL);
-                    WindPowerStationTestingPoint2 tqai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RTZSSDL);
+                    WindPowerStationTestingPoint dwai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RWZSSDL);
+                    WindPowerStationTestingPoint tqai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RTZSSDL);
                     List<PointData> dwls = new ArrayList<PointData>();
                     try {
                         dwls = realApiUtil.getHistoryDatasSnap(dwai, beginDate.getTime() / 1000,
@@ -593,7 +593,7 @@ public class GenreSetPushDetailPjService {
                 Date endDate = c.getTime();
                 Date beginDate = c.getTime();
                 if (targetName.equals(YFDL)) {
-                    WindPowerStationTestingPoint2 yfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_YFDL);// 月发电量
+                    WindPowerStationTestingPoint yfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_YFDL);// 月发电量
                     List<PointData> yfdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -649,7 +649,7 @@ public class GenreSetPushDetailPjService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YXDSSDL)) {
-                    WindPowerStationTestingPoint2 xdai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YXDSSDL);
+                    WindPowerStationTestingPoint xdai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YXDSSDL);
                     List<PointData> xdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -711,10 +711,10 @@ public class GenreSetPushDetailPjService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YXNSSDL)) {
-                    WindPowerStationTestingPoint2 qfai1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSDJZSDL);
-                    WindPowerStationTestingPoint2 qfai2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSSTZSDL);
-                    WindPowerStationTestingPoint2 qfai3 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YXNZSDL);
-                    WindPowerStationTestingPoint2 qfai4 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSQXZSDL);
+                    WindPowerStationTestingPoint qfai1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSDJZSDL);
+                    WindPowerStationTestingPoint qfai2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSSTZSDL);
+                    WindPowerStationTestingPoint qfai3 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YXNZSDL);
+                    WindPowerStationTestingPoint qfai4 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSQXZSDL);
                     List<PointData> qfls = new ArrayList<PointData>();
 
                     double value2 = 0.0;
@@ -820,8 +820,8 @@ public class GenreSetPushDetailPjService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YGZSSDL)) {
-                    WindPowerStationTestingPoint2 gzai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YGZSSDL);
-                    WindPowerStationTestingPoint2 gzslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSZSSDL);
+                    WindPowerStationTestingPoint gzai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YGZSSDL);
+                    WindPowerStationTestingPoint gzslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -930,8 +930,8 @@ public class GenreSetPushDetailPjService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YJXSSDL)) {
-                    WindPowerStationTestingPoint2 jxai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YJXSSDL);
-                    WindPowerStationTestingPoint2 jxslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YLZSSDL);
+                    WindPowerStationTestingPoint jxai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YJXSSDL);
+                    WindPowerStationTestingPoint jxslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YLZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1037,8 +1037,8 @@ public class GenreSetPushDetailPjService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YSLSSDL)) {
-                    WindPowerStationTestingPoint2 dwai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YWZSSDL);
-                    WindPowerStationTestingPoint2 tqai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YTZSSDL);
+                    WindPowerStationTestingPoint dwai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YWZSSDL);
+                    WindPowerStationTestingPoint tqai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YTZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1253,7 +1253,7 @@ public class GenreSetPushDetailPjService {
                 Date endDate = c.getTime();
                 Date beginDate = c.getTime();
                 if (targetName.equals(NFDL)) {
-                    WindPowerStationTestingPoint2 yfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_NFDL);
+                    WindPowerStationTestingPoint yfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_NFDL);
                     List<PointData> yfdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -1309,7 +1309,7 @@ public class GenreSetPushDetailPjService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NXDSSDL)) {
-                    WindPowerStationTestingPoint2 xdai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NXDSSDL);
+                    WindPowerStationTestingPoint xdai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NXDSSDL);
                     List<PointData> xdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -1373,10 +1373,10 @@ public class GenreSetPushDetailPjService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NXNSSDL)) {
-                    WindPowerStationTestingPoint2 qfai1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSDJZSDL);
-                    WindPowerStationTestingPoint2 qfai2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSSTZSDL);
-                    WindPowerStationTestingPoint2 qfai3 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NXNZSDL);
-                    WindPowerStationTestingPoint2 qfai4 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSQXZSDL);
+                    WindPowerStationTestingPoint qfai1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSDJZSDL);
+                    WindPowerStationTestingPoint qfai2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSSTZSDL);
+                    WindPowerStationTestingPoint qfai3 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NXNZSDL);
+                    WindPowerStationTestingPoint qfai4 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSQXZSDL);
                     List<PointData> qfls = new ArrayList<PointData>();
 
                     double value2 = 0.0;
@@ -1482,8 +1482,8 @@ public class GenreSetPushDetailPjService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NGZSSDL)) {
-                    WindPowerStationTestingPoint2 gzai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NGZSSDL);
-                    WindPowerStationTestingPoint2 gzslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSZSSDL);
+                    WindPowerStationTestingPoint gzai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NGZSSDL);
+                    WindPowerStationTestingPoint gzslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1592,8 +1592,8 @@ public class GenreSetPushDetailPjService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NJXSSDL)) {
-                    WindPowerStationTestingPoint2 jxai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NJXSSDL);
-                    WindPowerStationTestingPoint2 jxslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NLZSSDL);
+                    WindPowerStationTestingPoint jxai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NJXSSDL);
+                    WindPowerStationTestingPoint jxslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NLZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1699,8 +1699,8 @@ public class GenreSetPushDetailPjService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NSLSSDL)) {
-                    WindPowerStationTestingPoint2 dwai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NWZSSDL);
-                    WindPowerStationTestingPoint2 tqai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NTZSSDL);
+                    WindPowerStationTestingPoint dwai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NWZSSDL);
+                    WindPowerStationTestingPoint tqai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NTZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1877,8 +1877,8 @@ public class GenreSetPushDetailPjService {
                 if (line.getProjectid().equals(id)) {
                     DataVo vo = new DataVo();
                     vo.setName(line.getName());
-                    WindPowerStationTestingPoint2 yfdlpoint=windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(line.getId(), Constant.TPOINT_WP_YFDL);
-                    WindPowerStationTestingPoint2 nfdlpoint=windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(line.getId(), Constant.TPOINT_WP_NFDL);
+                    WindPowerStationTestingPoint yfdlpoint=windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(line.getId(), Constant.TPOINT_WP_YFDL);
+                    WindPowerStationTestingPoint nfdlpoint=windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(line.getId(), Constant.TPOINT_WP_NFDL);
 
                     double yfdl = realApiUtil.getRealData(yfdlpoint).getPointValueInDouble();
                     double nfdl = realApiUtil.getRealData(nfdlpoint).getPointValueInDouble();

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

@@ -4,7 +4,7 @@ package com.gyee.frame.service.websocket;
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.auto.ProjectPlan;
-import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
+import com.gyee.frame.model.auto.WindPowerStationTestingPoint;
 import com.gyee.frame.model.auto.Windpowerstation;
 import com.gyee.frame.model.custom.DataVo;
 import com.gyee.frame.model.custom.PointData;
@@ -156,7 +156,7 @@ public class GenreSetPushDetailService {
                 // public static final String RWZSSDL = "RWZSSDL"; // 日场外受累电网
                 // public static final String RTZSSDL = "RTZSSDL"; // 日场外受累天气
                 if (targetName.equals(RFDL)) {
-                    WindPowerStationTestingPoint2 rfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_RFDL);// 日发电量
+                    WindPowerStationTestingPoint rfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_RFDL);// 日发电量
 
                     List<PointData> rfdls = new ArrayList<PointData>();
                     try {
@@ -167,7 +167,7 @@ public class GenreSetPushDetailService {
                     }
                     setPointValueFdl(wp, vo, rfdls, summap);
                 } else if (targetName.equals(RXDSSDL)) {
-                    WindPowerStationTestingPoint2 xdai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RXDSSDL);
+                    WindPowerStationTestingPoint xdai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RXDSSDL);
                     List<PointData> xdls = new ArrayList<PointData>();
                     try {
                         xdls = realApiUtil.getHistoryDatasSnap(xdai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -178,10 +178,10 @@ public class GenreSetPushDetailService {
                     setPointValue(wp, vo, xdls, summap);
                 } else if (targetName.equals(RXNSSDL)) {
 
-                    WindPowerStationTestingPoint2 qfai1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSDJZSDL);
-                    WindPowerStationTestingPoint2 qfai2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSSTZSDL);
-                    WindPowerStationTestingPoint2 qfai3 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RXNZSDL);
-                    WindPowerStationTestingPoint2 qfai4 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSQXZSDL);
+                    WindPowerStationTestingPoint qfai1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSDJZSDL);
+                    WindPowerStationTestingPoint qfai2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSSTZSDL);
+                    WindPowerStationTestingPoint qfai3 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RXNZSDL);
+                    WindPowerStationTestingPoint qfai4 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSQXZSDL);
 
                     List<PointData> qfls1 = new ArrayList<PointData>();
                     List<PointData> qfls2 = new ArrayList<PointData>();
@@ -220,8 +220,8 @@ public class GenreSetPushDetailService {
                     }
 
                 } else if (targetName.equals(RGZSSDL)) {
-                    WindPowerStationTestingPoint2 gzai =  windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RGZSSDL);
-                    WindPowerStationTestingPoint2 gzslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSZSSDL);
+                    WindPowerStationTestingPoint gzai =  windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RGZSSDL);
+                    WindPowerStationTestingPoint gzslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSZSSDL);
                     List<PointData> gzls = new ArrayList<PointData>();
                     try {
                         gzls = realApiUtil.getHistoryDatasSnap(gzai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -239,8 +239,8 @@ public class GenreSetPushDetailService {
                     }
                     setPointValue(wp, vo, gzls, gzslls, summap);
                 } else if (targetName.equals(RJXSSDL)) {
-                    WindPowerStationTestingPoint2 jxai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RJXSSDL);
-                    WindPowerStationTestingPoint2 jxslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RLZSSDL);
+                    WindPowerStationTestingPoint jxai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RJXSSDL);
+                    WindPowerStationTestingPoint jxslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RLZSSDL);
                     List<PointData> jxls = new ArrayList<PointData>();
                     try {
                         jxls = realApiUtil.getHistoryDatasSnap(jxai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -258,8 +258,8 @@ public class GenreSetPushDetailService {
 
                     setPointValue(wp, vo, jxls, jxslls, summap);
                 } else if (targetName.equals(RSLSSDL)) {
-                    WindPowerStationTestingPoint2 dwai =  windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RWZSSDL);
-                    WindPowerStationTestingPoint2 tqai =  windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RTZSSDL);
+                    WindPowerStationTestingPoint dwai =  windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RWZSSDL);
+                    WindPowerStationTestingPoint tqai =  windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RTZSSDL);
                     List<PointData> dwls = new ArrayList<PointData>();
                     try {
                         dwls = realApiUtil.getHistoryDatasSnap(dwai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -611,7 +611,7 @@ public class GenreSetPushDetailService {
                 Date endDate = c.getTime();
                 Date beginDate = c.getTime();
                 if (targetName.equals(YFDL)) {
-                    WindPowerStationTestingPoint2 yfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_YFDL);// 月发电量
+                    WindPowerStationTestingPoint yfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_YFDL);// 月发电量
                     List<PointData> yfdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -670,7 +670,7 @@ public class GenreSetPushDetailService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YXDSSDL)) {
-                    WindPowerStationTestingPoint2 xdai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YXDSSDL);
+                    WindPowerStationTestingPoint xdai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YXDSSDL);
                     List<PointData> xdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -732,10 +732,10 @@ public class GenreSetPushDetailService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YXNSSDL)) {
-                    WindPowerStationTestingPoint2 qfai1 =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSDJZSDL);
-                    WindPowerStationTestingPoint2 qfai2 =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSSTZSDL);
-                    WindPowerStationTestingPoint2 qfai3 =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YXNZSDL);
-                    WindPowerStationTestingPoint2 qfai4 =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSQXZSDL);
+                    WindPowerStationTestingPoint qfai1 =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSDJZSDL);
+                    WindPowerStationTestingPoint qfai2 =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSSTZSDL);
+                    WindPowerStationTestingPoint qfai3 =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YXNZSDL);
+                    WindPowerStationTestingPoint qfai4 =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSQXZSDL);
                     List<PointData> qfls = new ArrayList<PointData>();
 
                     double value2 = 0.0;
@@ -838,8 +838,8 @@ public class GenreSetPushDetailService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YGZSSDL)) {
-                    WindPowerStationTestingPoint2 gzai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YGZSSDL);
-                    WindPowerStationTestingPoint2 gzslai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YGZSSDL);
+                    WindPowerStationTestingPoint gzai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YGZSSDL);
+                    WindPowerStationTestingPoint gzslai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YGZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -951,8 +951,8 @@ public class GenreSetPushDetailService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YJXSSDL)) {
-                    WindPowerStationTestingPoint2 jxai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YJXSSDL);
-                    WindPowerStationTestingPoint2 jxslai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YLZSSDL);
+                    WindPowerStationTestingPoint jxai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YJXSSDL);
+                    WindPowerStationTestingPoint jxslai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YLZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1061,8 +1061,8 @@ public class GenreSetPushDetailService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YSLSSDL)) {
-                    WindPowerStationTestingPoint2 dwai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YWZSSDL);
-                    WindPowerStationTestingPoint2 tqai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YTZSSDL);
+                    WindPowerStationTestingPoint dwai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YWZSSDL);
+                    WindPowerStationTestingPoint tqai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YTZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1310,7 +1310,7 @@ public class GenreSetPushDetailService {
                 Date endDate = c.getTime();
                 Date beginDate = c.getTime();
                 if (targetName.equals(NFDL)) {
-                    WindPowerStationTestingPoint2 yfdlai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_NFDL);
+                    WindPowerStationTestingPoint yfdlai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_NFDL);
                     List<PointData> yfdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -1368,7 +1368,7 @@ public class GenreSetPushDetailService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NXDSSDL)) {
-                    WindPowerStationTestingPoint2 xdai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NXDSSDL);
+                    WindPowerStationTestingPoint xdai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NXDSSDL);
                     List<PointData> xdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -1431,10 +1431,10 @@ public class GenreSetPushDetailService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NXNSSDL)) {
-                    WindPowerStationTestingPoint2 qfai1 =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSDJZSDL);
-                    WindPowerStationTestingPoint2 qfai2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSSTZSDL);
-                    WindPowerStationTestingPoint2 qfai3 =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NXNZSDL);
-                    WindPowerStationTestingPoint2 qfai4 =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSQXZSDL);
+                    WindPowerStationTestingPoint qfai1 =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSDJZSDL);
+                    WindPowerStationTestingPoint qfai2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSSTZSDL);
+                    WindPowerStationTestingPoint qfai3 =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NXNZSDL);
+                    WindPowerStationTestingPoint qfai4 =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSQXZSDL);
                     List<PointData> qfls = new ArrayList<PointData>();
 
                     double value2 = 0.0;
@@ -1537,8 +1537,8 @@ public class GenreSetPushDetailService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals("ngzssdl")) {
-                    WindPowerStationTestingPoint2 gzai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NGZSSDL);
-                    WindPowerStationTestingPoint2 gzslai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSZSSDL);
+                    WindPowerStationTestingPoint gzai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NGZSSDL);
+                    WindPowerStationTestingPoint gzslai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1649,8 +1649,8 @@ public class GenreSetPushDetailService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NJXSSDL)) {
-                    WindPowerStationTestingPoint2 jxai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NJXSSDL);
-                    WindPowerStationTestingPoint2 jxslai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NLZSSDL);
+                    WindPowerStationTestingPoint jxai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NJXSSDL);
+                    WindPowerStationTestingPoint jxslai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NLZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1758,8 +1758,8 @@ public class GenreSetPushDetailService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NSLSSDL)) {
-                    WindPowerStationTestingPoint2 dwai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NWZSSDL);
-                    WindPowerStationTestingPoint2 tqai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NTZSSDL);
+                    WindPowerStationTestingPoint dwai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NWZSSDL);
+                    WindPowerStationTestingPoint tqai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NTZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1961,8 +1961,8 @@ public class GenreSetPushDetailService {
             Map.Entry<String, DataVo> entry = (Map.Entry<String, DataVo>) it.next();
             DataVo vo = entry.getValue();
 
-            WindPowerStationTestingPoint2 yfdlpoint=windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(entry.getKey(), Constant.TPOINT_WP_YFDL);
-            WindPowerStationTestingPoint2 nfdlpoint=windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(entry.getKey(), Constant.TPOINT_WP_NFDL);
+            WindPowerStationTestingPoint yfdlpoint=windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(entry.getKey(), Constant.TPOINT_WP_YFDL);
+            WindPowerStationTestingPoint nfdlpoint=windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(entry.getKey(), Constant.TPOINT_WP_NFDL);
             double yfdl = realApiUtil.getRealData(yfdlpoint).getPointValueInDouble();
             double nfdl = realApiUtil.getRealData(nfdlpoint).getPointValueInDouble();
 

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

@@ -5,7 +5,7 @@ import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.auto.Project;
 import com.gyee.frame.model.auto.ProjectPlan;
-import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
+import com.gyee.frame.model.auto.WindPowerStationTestingPoint;
 import com.gyee.frame.model.custom.DataVo;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.model.custom.resultVo;
@@ -128,7 +128,7 @@ public class GenreSetPushDetailWpService {
                 // public static final String RWZSSDL = "RWZSSDL"; // 日场外受累电网
                 // public static final String RTZSSDL = "RTZSSDL"; // 日场外受累天气
                 if (targetName.equals(RFDL)) {
-                    WindPowerStationTestingPoint2 rfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_RFDL);// 日发电量
+                    WindPowerStationTestingPoint rfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_RFDL);// 日发电量
                     List<PointData> rfdls = new ArrayList<PointData>();
                     try {
                         rfdls = realApiUtil.getHistoryDatasSnap(rfdlai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -138,7 +138,7 @@ public class GenreSetPushDetailWpService {
                     }
                     setPointValueFdl(wp, vo, rfdls, summap);
                 } else if (targetName.equals(RXDSSDL)) {
-                    WindPowerStationTestingPoint2 xdai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RXDSSDL);
+                    WindPowerStationTestingPoint xdai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RXDSSDL);
                     List<PointData> xdls = new ArrayList<PointData>();
                     try {
                         xdls = realApiUtil.getHistoryDatasSnap(xdai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -148,10 +148,10 @@ public class GenreSetPushDetailWpService {
                     }
                     setPointValue(wp, vo, xdls, summap);
                 } else if (targetName.equals(RXNSSDL)) {
-                    WindPowerStationTestingPoint2 qfai1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSDJZSDL);
-                    WindPowerStationTestingPoint2 qfai2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSSTZSDL);
-                    WindPowerStationTestingPoint2 qfai3 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RXNZSDL);
-                    WindPowerStationTestingPoint2 qfai4 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSQXZSDL);
+                    WindPowerStationTestingPoint qfai1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSDJZSDL);
+                    WindPowerStationTestingPoint qfai2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSSTZSDL);
+                    WindPowerStationTestingPoint qfai3 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RXNZSDL);
+                    WindPowerStationTestingPoint qfai4 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSQXZSDL);
 
                     List<PointData> qfls1 = new ArrayList<PointData>();
                     List<PointData> qfls2 = new ArrayList<PointData>();
@@ -189,8 +189,8 @@ public class GenreSetPushDetailWpService {
                         setPointValue(wp, vo, qfls, summap);
                     }
                 } else if (targetName.equals(RGZSSDL)) {
-                    WindPowerStationTestingPoint2 gzai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RGZSSDL);
-                    WindPowerStationTestingPoint2 gzslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSZSSDL);
+                    WindPowerStationTestingPoint gzai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RGZSSDL);
+                    WindPowerStationTestingPoint gzslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSZSSDL);
                     List<PointData> gzls = new ArrayList<PointData>();
                     try {
                         gzls = realApiUtil.getHistoryDatasSnap(gzai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -207,8 +207,8 @@ public class GenreSetPushDetailWpService {
                     }
                     setPointValue(wp, vo, gzls, gzslls, summap);
                 } else if (targetName.equals(RJXSSDL)) {
-                    WindPowerStationTestingPoint2 jxai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RJXSSDL);
-                    WindPowerStationTestingPoint2 jxslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RLZSSDL);
+                    WindPowerStationTestingPoint jxai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RJXSSDL);
+                    WindPowerStationTestingPoint jxslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RLZSSDL);
                     List<PointData> jxls = new ArrayList<PointData>();
                     try {
                         jxls = realApiUtil.getHistoryDatasSnap(jxai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -226,8 +226,8 @@ public class GenreSetPushDetailWpService {
 
                     setPointValue(wp, vo, jxls, jxslls, summap);
                 } else if (targetName.equals(RSLSSDL)) {
-                    WindPowerStationTestingPoint2 dwai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RWZSSDL);
-                    WindPowerStationTestingPoint2 tqai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RTZSSDL);
+                    WindPowerStationTestingPoint dwai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RWZSSDL);
+                    WindPowerStationTestingPoint tqai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RTZSSDL);
                     List<PointData> dwls = new ArrayList<PointData>();
                     try {
                         dwls = realApiUtil.getHistoryDatasSnap(dwai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -548,7 +548,7 @@ public class GenreSetPushDetailWpService {
                 Date endDate = c.getTime();
                 Date beginDate = c.getTime();
                 if (targetName.equals(YFDL)) {
-                    WindPowerStationTestingPoint2 yfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_YFDL);// 月发电量
+                    WindPowerStationTestingPoint yfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_YFDL);// 月发电量
                     List<PointData> yfdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -607,7 +607,7 @@ public class GenreSetPushDetailWpService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YXDSSDL)) {
-                    WindPowerStationTestingPoint2 xdai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YXDSSDL);
+                    WindPowerStationTestingPoint xdai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YXDSSDL);
                     List<PointData> xdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -669,10 +669,10 @@ public class GenreSetPushDetailWpService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YXNSSDL)) {
-                    WindPowerStationTestingPoint2 qfai1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSDJZSDL);
-                    WindPowerStationTestingPoint2 qfai2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSSTZSDL);
-                    WindPowerStationTestingPoint2 qfai3 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YXNZSDL);
-                    WindPowerStationTestingPoint2 qfai4 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSQXZSDL);
+                    WindPowerStationTestingPoint qfai1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSDJZSDL);
+                    WindPowerStationTestingPoint qfai2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSSTZSDL);
+                    WindPowerStationTestingPoint qfai3 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YXNZSDL);
+                    WindPowerStationTestingPoint qfai4 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSQXZSDL);
                     List<PointData> qfls = new ArrayList<PointData>();
 
                     double value2 = 0.0;
@@ -775,8 +775,8 @@ public class GenreSetPushDetailWpService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YGZSSDL)) {
-                    WindPowerStationTestingPoint2 gzai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YGZSSDL);
-                    WindPowerStationTestingPoint2 gzslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSZSSDL);
+                    WindPowerStationTestingPoint gzai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YGZSSDL);
+                    WindPowerStationTestingPoint gzslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -888,8 +888,8 @@ public class GenreSetPushDetailWpService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YJXSSDL)) {
-                    WindPowerStationTestingPoint2 jxai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YJXSSDL);
-                    WindPowerStationTestingPoint2 jxslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YLZSSDL);
+                    WindPowerStationTestingPoint jxai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YJXSSDL);
+                    WindPowerStationTestingPoint jxslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YLZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -998,8 +998,8 @@ public class GenreSetPushDetailWpService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YSLSSDL)) {
-                    WindPowerStationTestingPoint2 dwai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YWZSSDL);
-                    WindPowerStationTestingPoint2 tqai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YTZSSDL);
+                    WindPowerStationTestingPoint dwai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YWZSSDL);
+                    WindPowerStationTestingPoint tqai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YTZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1215,7 +1215,7 @@ public class GenreSetPushDetailWpService {
                 Date endDate = c.getTime();
                 Date beginDate = c.getTime();
                 if (targetName.equals(NFDL)) {
-                    WindPowerStationTestingPoint2 yfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_NFDL);// 月发电量
+                    WindPowerStationTestingPoint yfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_NFDL);// 月发电量
                     List<PointData> yfdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -1273,7 +1273,7 @@ public class GenreSetPushDetailWpService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NXDSSDL)) {
-                    WindPowerStationTestingPoint2 xdai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NXDSSDL);
+                    WindPowerStationTestingPoint xdai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NXDSSDL);
                     List<PointData> xdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -1336,10 +1336,10 @@ public class GenreSetPushDetailWpService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NXNSSDL)) {
-                    WindPowerStationTestingPoint2 qfai1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSDJZSDL);
-                    WindPowerStationTestingPoint2 qfai2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSSTZSDL);
-                    WindPowerStationTestingPoint2 qfai3 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NXNZSDL);
-                    WindPowerStationTestingPoint2 qfai4 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSQXZSDL);
+                    WindPowerStationTestingPoint qfai1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSDJZSDL);
+                    WindPowerStationTestingPoint qfai2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSSTZSDL);
+                    WindPowerStationTestingPoint qfai3 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NXNZSDL);
+                    WindPowerStationTestingPoint qfai4 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSQXZSDL);
                     List<PointData> qfls = new ArrayList<PointData>();
 
                     double value2 = 0.0;
@@ -1442,8 +1442,8 @@ public class GenreSetPushDetailWpService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NGZSSDL)) {
-                    WindPowerStationTestingPoint2 gzai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NGZSSDL);
-                    WindPowerStationTestingPoint2 gzslai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSZSSDL);
+                    WindPowerStationTestingPoint gzai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NGZSSDL);
+                    WindPowerStationTestingPoint gzslai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1554,8 +1554,8 @@ public class GenreSetPushDetailWpService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NJXSSDL)) {
-                    WindPowerStationTestingPoint2 jxai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NJXSSDL);
-                    WindPowerStationTestingPoint2 jxslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NLZSSDL);
+                    WindPowerStationTestingPoint jxai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NJXSSDL);
+                    WindPowerStationTestingPoint jxslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NLZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1663,8 +1663,8 @@ public class GenreSetPushDetailWpService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NSLSSDL)) {
-                    WindPowerStationTestingPoint2 dwai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NWZSSDL);
-                    WindPowerStationTestingPoint2 tqai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NWZSSDL);
+                    WindPowerStationTestingPoint dwai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NWZSSDL);
+                    WindPowerStationTestingPoint tqai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NWZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1842,8 +1842,8 @@ public class GenreSetPushDetailWpService {
             Map.Entry<String, DataVo> entry = (Map.Entry<String, DataVo>) it.next();
             DataVo vo = entry.getValue();
 
-            WindPowerStationTestingPoint2 yfdlpoint=windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(entry.getKey(), Constant.TPOINT_WP_YFDL);
-            WindPowerStationTestingPoint2 nfdlpoint=windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(entry.getKey(), Constant.TPOINT_WP_NFDL);
+            WindPowerStationTestingPoint yfdlpoint=windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(entry.getKey(), Constant.TPOINT_WP_YFDL);
+            WindPowerStationTestingPoint nfdlpoint=windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(entry.getKey(), Constant.TPOINT_WP_NFDL);
 
             double yfdl = realApiUtil.getRealData(yfdlpoint).getPointValueInDouble();
             double nfdl = realApiUtil.getRealData(nfdlpoint).getPointValueInDouble();

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

@@ -131,8 +131,8 @@ public class GenreSetPushService {
                     zjrl += wp.getCapacity();
                     zjts += wp.getQuantity();
 
-                    WindPowerStationTestingPoint2 fczt = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.FJZT);
-                    WindPowerStationTestingPoint2 fcgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_SJGL);
+                    WindPowerStationTestingPoint fczt = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.FJZT);
+                    WindPowerStationTestingPoint fcgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_SJGL);
 
                     Double fcztvalue = realApiUtil.getRealData(fczt).getPointValueInDouble();
                     Double fcglvalue = realApiUtil.getRealData(fcgl).getPointValueInDouble();
@@ -166,8 +166,8 @@ public class GenreSetPushService {
                                 zjrl += ln.getCapacity();
                                 zjts += ln.getQuantity();
 
-                                WindPowerStationTestingPoint2 fczt = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(ln.getId(), Constant.FJZT);
-                                WindPowerStationTestingPoint2 fcgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(ln.getId(), Constant.TPOINT_WP_SJGL);
+                                WindPowerStationTestingPoint fczt = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(ln.getId(), Constant.FJZT);
+                                WindPowerStationTestingPoint fcgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(ln.getId(), Constant.TPOINT_WP_SJGL);
 
                                 Double fcztvalue = realApiUtil.getRealData(fczt).getPointValueInDouble();
                                 Double fcglvalue = realApiUtil.getRealData(fcgl).getPointValueInDouble();
@@ -198,8 +198,8 @@ public class GenreSetPushService {
                         zjrl += ln.getCapacity();
                         zjts += ln.getQuantity();
 
-                        WindPowerStationTestingPoint2 fczt = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(ln.getId(), Constant.FJZT);
-                        WindPowerStationTestingPoint2 fcgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(ln.getId(), Constant.TPOINT_WP_SJGL);
+                        WindPowerStationTestingPoint fczt = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(ln.getId(), Constant.FJZT);
+                        WindPowerStationTestingPoint fcgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(ln.getId(), Constant.TPOINT_WP_SJGL);
 
                         Double fcztvalue = realApiUtil.getRealData(fczt).getPointValueInDouble();
                         Double fcglvalue = realApiUtil.getRealData(fcgl).getPointValueInDouble();
@@ -228,8 +228,8 @@ public class GenreSetPushService {
                         zjrl += ln.getCapacity();
                         zjts += ln.getQuantity();
 
-                        WindPowerStationTestingPoint2 fczt = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(ln.getId(), Constant.FJZT);
-                        WindPowerStationTestingPoint2 fcgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(ln.getId(), Constant.TPOINT_WP_SJGL);
+                        WindPowerStationTestingPoint fczt = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(ln.getId(), Constant.FJZT);
+                        WindPowerStationTestingPoint fcgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(ln.getId(), Constant.TPOINT_WP_SJGL);
 
                         Double fcztvalue = realApiUtil.getRealData(fczt).getPointValueInDouble();
                         Double fcglvalue = realApiUtil.getRealData(fcgl).getPointValueInDouble();
@@ -1467,10 +1467,10 @@ public class GenreSetPushService {
         long num = c.get(Calendar.DAY_OF_MONTH);
         // long num = 30;
 
-        WindPowerStationTestingPoint2 rfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_RFDL);
-        WindPowerStationTestingPoint2 swdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SWDL);
-        WindPowerStationTestingPoint2 gwdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_GWDL);
-        WindPowerStationTestingPoint2 ssfs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
+        WindPowerStationTestingPoint rfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_RFDL);
+        WindPowerStationTestingPoint swdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SWDL);
+        WindPowerStationTestingPoint gwdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_GWDL);
+        WindPowerStationTestingPoint ssfs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         List<PointData> rfdls = realApiUtil.getHistoryDatasSnap(rfdlai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -1834,10 +1834,10 @@ public class GenreSetPushService {
 
         // long num = 30;
 
-        WindPowerStationTestingPoint2 rfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_RFDL);
-        WindPowerStationTestingPoint2 sjgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
+        WindPowerStationTestingPoint rfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_RFDL);
+        WindPowerStationTestingPoint sjgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
 
-        WindPowerStationTestingPoint2 ssfs =ssfs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
+        WindPowerStationTestingPoint ssfs =ssfs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         List<PointData> rfdls = realApiUtil.getHistoryDatasSnap(rfdlai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 3600L);
@@ -1959,7 +1959,7 @@ public class GenreSetPushService {
                 retValue.put("wd", station.getLatitude() == null ? 0 : StringUtils.round(station.getLatitude(), 2));
 
                 retValue.put("zjts", StringUtils.round(station.getQuantity(), 0));
-                Map<String, WindPowerStationTestingPoint2> map;
+                Map<String, WindPowerStationTestingPoint> map;
 
 
 //                WindPowerStationTestingPoint2 yxts = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_YXTS);
@@ -2058,7 +2058,7 @@ public class GenreSetPushService {
                     retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
                 }
 
-                WindPowerStationTestingPoint2 glpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
+                WindPowerStationTestingPoint glpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
                 ptValue = realApiUtil.getRealData(glpoint.getCode());
                 retValue.put("gl", StringUtils.round(ptValue.getPointValueInDouble(), 0));
             }

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

@@ -169,7 +169,7 @@ public class RealPowerPushService {
                     if (num > 0) {
 
 /***************************************************************超短期功率预测***************************************************************************/
-                        WindPowerStationTestingPoint2 ycgl1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycPoints1[0]);
+                        WindPowerStationTestingPoint ycgl1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycPoints1[0]);
 
                         if (null != ycgl1) {
                             List<PointData> datas = realApiUtil.getHistoryDatasSnap(ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, pried);
@@ -225,7 +225,7 @@ public class RealPowerPushService {
                                                 cal.add(Calendar.HOUR_OF_DAY, 1);
                                                 vos.get(datas.size() + i).setTime(cal.getTime().getTime());
                                                 String qs3_ycgl = ycPoints3[i];
-                                                WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycPoints2[i]);
+                                                WindPowerStationTestingPoint ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycPoints2[i]);
 
                                                 vos.get(datas.size() + i).setValue4(StringUtils.round(realApiUtil.getRealData(ycglpoint).getPointValueInDouble() + realApiUtil.getRealData(qs3_ycgl).getPointValueInDouble(), 2));
                                             }
@@ -237,7 +237,7 @@ public class RealPowerPushService {
                                             cal.add(Calendar.HOUR_OF_DAY, 1);
                                             vos.get(datas.size() + i).setTime(cal.getTime().getTime());
 
-                                            WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycPoints2[i]);
+                                            WindPowerStationTestingPoint ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycPoints2[i]);
 
                                             double ycgl = realApiUtil.getRealData(ycglpoint).getPointValueInDouble();
 
@@ -266,7 +266,7 @@ public class RealPowerPushService {
 
 
 /***************************************************************短期功率预测***************************************************************************/
-                        WindPowerStationTestingPoint2 dqgl1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycDqPoints1[0]);
+                        WindPowerStationTestingPoint dqgl1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycDqPoints1[0]);
 
                         if (null != dqgl1) {
                             List<PointData> datas = realApiUtil.getHistoryDatasSnap(dqgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, pried);
@@ -322,7 +322,7 @@ public class RealPowerPushService {
                                                 cal.add(Calendar.HOUR_OF_DAY, 1);
                                                 vos.get(datas.size() + i).setTime(cal.getTime().getTime());
                                                 String qs3_ycgl = ycPoints3[i];
-                                                WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycDqPoints2[i]);
+                                                WindPowerStationTestingPoint ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycDqPoints2[i]);
 
                                                 vos.get(datas.size() + i).setValue7(StringUtils.round(realApiUtil.getRealData(ycglpoint).getPointValueInDouble() + realApiUtil.getRealData(qs3_ycgl).getPointValueInDouble(), 2));
                                             }
@@ -334,7 +334,7 @@ public class RealPowerPushService {
                                             cal.add(Calendar.HOUR_OF_DAY, 1);
                                             vos.get(datas.size() + i).setTime(cal.getTime().getTime());
 
-                                            WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycDqPoints2[i]);
+                                            WindPowerStationTestingPoint ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycDqPoints2[i]);
 
                                             double ycgl = realApiUtil.getRealData(ycglpoint).getPointValueInDouble();
 
@@ -368,21 +368,21 @@ public class RealPowerPushService {
 
 
                 // 实际发功率
-                WindPowerStationTestingPoint2 sjgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SJGL);
+                WindPowerStationTestingPoint sjgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SJGL);
                 // 总应发功率
-                WindPowerStationTestingPoint2 yfgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZZSGL);
+                WindPowerStationTestingPoint yfgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZZSGL);
                 // 总理论功率
-                WindPowerStationTestingPoint2 llgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZLLGL);
+                WindPowerStationTestingPoint llgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZLLGL);
                 // 总保证功率
-                WindPowerStationTestingPoint2 bzgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.ZBZGL);
+                WindPowerStationTestingPoint bzgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.ZBZGL);
                 //实时平均风速
-                WindPowerStationTestingPoint2 pjfs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SSFS);
+                WindPowerStationTestingPoint pjfs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SSFS);
                 // 最优功率
-                WindPowerStationTestingPoint2 zygl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZZYGL);
+                WindPowerStationTestingPoint zygl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZZYGL);
 
 
                 // 光伏实际发功率
-                WindPowerStationTestingPoint2 gdsjgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(GF, Constant.TPOINT_WP_SJGL);
+                WindPowerStationTestingPoint gdsjgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(GF, Constant.TPOINT_WP_SJGL);
                 List<PointData> gdsjglls = realApiUtil.getHistoryDatasSnap(gdsjgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, pried);
 
                 try {
@@ -583,7 +583,7 @@ public class RealPowerPushService {
                 if (InitialRunner.wpmap.containsKey(id)) {
                     if (num > 0) {
  /***************************************************************超短期功率预测***************************************************************************/
-                        WindPowerStationTestingPoint2 ycgl1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycPoints1[0]);
+                        WindPowerStationTestingPoint ycgl1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycPoints1[0]);
 
                         if (null != ycgl1) {
                             List<PointData> datas = realApiUtil.getHistoryDatasSnap(ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, pried);
@@ -638,7 +638,7 @@ public class RealPowerPushService {
                                                 cal.add(Calendar.HOUR_OF_DAY, 1);
                                                 vos.get(datas.size() + i).setTime(cal.getTime().getTime());
                                                 String qs3_ycgl = ycPoints3[i];
-                                                WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycPoints2[i]);
+                                                WindPowerStationTestingPoint ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycPoints2[i]);
 
                                                 vos.get(datas.size() + i).setValue4(StringUtils.round(realApiUtil.getRealData(ycglpoint).getPointValueInDouble() + realApiUtil.getRealData(qs3_ycgl).getPointValueInDouble(), 2));
                                             }
@@ -650,7 +650,7 @@ public class RealPowerPushService {
 
                                             vos.get(datas.size() + i).setTime(cal.getTime().getTime());
 
-                                            WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycPoints2[i]);
+                                            WindPowerStationTestingPoint ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycPoints2[i]);
 
                                             double ycgl = realApiUtil.getRealData(ycglpoint).getPointValueInDouble();
 
@@ -679,7 +679,7 @@ public class RealPowerPushService {
 
 
 /***************************************************************短期功率预测***************************************************************************/
-                        WindPowerStationTestingPoint2 dqgl1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycDqPoints1[0]);
+                        WindPowerStationTestingPoint dqgl1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycDqPoints1[0]);
 
                         if (null != dqgl1) {
                             List<PointData> datas = realApiUtil.getHistoryDatasSnap(dqgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, pried);
@@ -734,7 +734,7 @@ public class RealPowerPushService {
                                                 cal.add(Calendar.HOUR_OF_DAY, 1);
                                                 vos.get(datas.size() + i).setTime(cal.getTime().getTime());
                                                 String qs3_ycgl = ycPoints3[i];
-                                                WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycDqPoints2[i]);
+                                                WindPowerStationTestingPoint ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycDqPoints2[i]);
 
                                                 vos.get(datas.size() + i).setValue7(StringUtils.round(realApiUtil.getRealData(ycglpoint).getPointValueInDouble() + realApiUtil.getRealData(qs3_ycgl).getPointValueInDouble(), 2));
                                             }
@@ -746,7 +746,7 @@ public class RealPowerPushService {
 
                                             vos.get(datas.size() + i).setTime(cal.getTime().getTime());
 
-                                            WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycDqPoints2[i]);
+                                            WindPowerStationTestingPoint ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycDqPoints2[i]);
 
                                             double ycgl = realApiUtil.getRealData(ycglpoint).getPointValueInDouble();
 
@@ -777,17 +777,17 @@ public class RealPowerPushService {
 
 
                 // 实际发功率
-                WindPowerStationTestingPoint2 sjgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SJGL);
+                WindPowerStationTestingPoint sjgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SJGL);
                 // 总应发功率
-                WindPowerStationTestingPoint2 yfgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZZSGL);
+                WindPowerStationTestingPoint yfgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZZSGL);
                 // 总理论功率
-                WindPowerStationTestingPoint2 llgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZLLGL);
+                WindPowerStationTestingPoint llgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZLLGL);
                 // 总保证功率
-                WindPowerStationTestingPoint2 bzgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.ZBZGL);
+                WindPowerStationTestingPoint bzgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.ZBZGL);
                 //实时平均风速
-                WindPowerStationTestingPoint2 pjfs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SSFS);
+                WindPowerStationTestingPoint pjfs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SSFS);
                 // 最优功率
-                WindPowerStationTestingPoint2 zygl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZZYGL);
+                WindPowerStationTestingPoint zygl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZZYGL);
 
 
                 try {
@@ -1083,7 +1083,7 @@ public class RealPowerPushService {
                         case "sjgl":
 
                             // 实际发功率
-                            WindPowerStationTestingPoint2 sjgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(vo.getId(), Constant.TPOINT_WP_SJGL);
+                            WindPowerStationTestingPoint sjgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(vo.getId(), Constant.TPOINT_WP_SJGL);
 
                             if(null!=sjgl && null!=sjgl.getCode())
                             {
@@ -1092,7 +1092,7 @@ public class RealPowerPushService {
                             break;
                         case "bzgl":
                             // 总保证功率
-                            WindPowerStationTestingPoint2 bzgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(vo.getId(), Constant.ZBZGL);
+                            WindPowerStationTestingPoint bzgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(vo.getId(), Constant.ZBZGL);
                             if(null!=bzgl && null!=bzgl.getCode())
                             {
                                 pointid=bzgl.getCode();
@@ -1100,7 +1100,7 @@ public class RealPowerPushService {
                             break;
                         case "yfgl":
                             // 总应发功率
-                            WindPowerStationTestingPoint2 yfgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(vo.getId(), Constant.TPOINT_WP_ZZSGL);
+                            WindPowerStationTestingPoint yfgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(vo.getId(), Constant.TPOINT_WP_ZZSGL);
                             if(null!=yfgl && null!=yfgl.getCode())
                             {
                                 pointid=yfgl.getCode();
@@ -1108,7 +1108,7 @@ public class RealPowerPushService {
                             break;
                         case "ssfs":
                             //实时平均风速
-                            WindPowerStationTestingPoint2 ssfs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(vo.getId(), Constant.TPOINT_WP_SSFS);
+                            WindPowerStationTestingPoint ssfs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(vo.getId(), Constant.TPOINT_WP_SSFS);
                             if(null!=ssfs && null!=ssfs.getCode())
                             {
                                 pointid=ssfs.getCode();
@@ -1122,7 +1122,7 @@ public class RealPowerPushService {
                         case "sjgl":
 
                             // 实际发功率
-                            WindTurbineTestingPointAi2 sjgl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(vo.getId(), Constant.TPOINT_WT_FJGL);
+                            WindTurbineTestingPointAi sjgl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(vo.getId(), Constant.TPOINT_WT_FJGL);
 
                             if(null!=sjgl && null!=sjgl.getCode())
                             {
@@ -1131,7 +1131,7 @@ public class RealPowerPushService {
                             break;
                         case "bzgl":
                             // 总保证功率
-                            WindTurbineTestingPointAi2 bzgl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(vo.getId(), Constant.TPOINT_WT_LLGL);
+                            WindTurbineTestingPointAi bzgl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(vo.getId(), Constant.TPOINT_WT_LLGL);
                             if(null!=bzgl && null!=bzgl.getCode())
                             {
                                 pointid=bzgl.getId();
@@ -1139,7 +1139,7 @@ public class RealPowerPushService {
                             break;
                         case "yfgl":
                             // 总应发功率
-                            WindTurbineTestingPointAi2 yfgl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(vo.getId(), Constant.TPOINT_WT_YFGL);
+                            WindTurbineTestingPointAi yfgl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(vo.getId(), Constant.TPOINT_WT_YFGL);
                             if(null!=yfgl && null!=yfgl.getCode())
                             {
                                 pointid=yfgl.getId();
@@ -1147,7 +1147,7 @@ public class RealPowerPushService {
                             break;
                         case "ssfs":
                             //实时平均风速
-                            WindTurbineTestingPointAi2 ssfs = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(vo.getId(), Constant.TPOINT_WT_FJSSFS);
+                            WindTurbineTestingPointAi ssfs = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(vo.getId(), Constant.TPOINT_WT_FJSSFS);
                             if(null!=ssfs && null!=ssfs.getCode())
                             {
                                 pointid=ssfs.getId();

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

@@ -485,9 +485,9 @@ public class SandtableService {
                     // 获得训练参数对象
                     for (int x = 0; x < wtidls.size(); x++) {
 
-                        WindTurbineTestingPointAi2 ai1 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), codejkls.get(x));
+                        WindTurbineTestingPointAi ai1 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), codejkls.get(x));
                         jkpoints[x] = ai1.getId();
-                        WindTurbineTestingPointAi2 ai2 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), codeztls.get(x));
+                        WindTurbineTestingPointAi ai2 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), codeztls.get(x));
                         ztpoints[x] = ai2.getId();
 
                     }

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

@@ -3,7 +3,7 @@ package com.gyee.frame.service.websocket;
 
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
-import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
+import com.gyee.frame.model.auto.WindPowerStationTestingPoint;
 import com.gyee.frame.model.auto.Windpowerstation;
 import com.gyee.frame.model.auto.Windturbine;
 import com.gyee.frame.model.auto.WpMttrAndMtbMonth;
@@ -234,11 +234,11 @@ public class WpInfoPushService {
             }
 
 
-            List<WindPowerStationTestingPoint2> wpoints= windPowerstationTestingPoint2Service.getJsztList(id);
+            List<WindPowerStationTestingPoint> wpoints= windPowerstationTestingPoint2Service.getJsztList(id);
 
             if(!wpoints.isEmpty())
             {
-                for(WindPowerStationTestingPoint2 wpoint:wpoints)
+                for(WindPowerStationTestingPoint wpoint:wpoints)
                 {
                     if(StringUtils.notEmp(wpoint) && StringUtils.notEmp(wpoint.getName()))
                     {
@@ -529,7 +529,7 @@ public class WpInfoPushService {
 /*************************************************测风塔*************************************************************/
 
             if (InitialRunner.wpmap.containsKey(id)) {
-                WindPowerStationTestingPoint2 point2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.FCCFTFX30);
+                WindPowerStationTestingPoint point2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.FCCFTFX30);
 
                 if (StringUtils.notEmp(point2.getCode())) {
                     PointData value = realApiUtil.getRealData(point2);
@@ -1750,20 +1750,20 @@ public class WpInfoPushService {
         long monthdaynum = c.getActualMaximum(Calendar.DAY_OF_MONTH);
 
 
-        WindPowerStationTestingPoint2 gzslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RSZSSDL);
-        WindPowerStationTestingPoint2 jxslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RLZSSDL);
+        WindPowerStationTestingPoint gzslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RSZSSDL);
+        WindPowerStationTestingPoint jxslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RLZSSDL);
 
-        WindPowerStationTestingPoint2 gzssai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RGZSSDL);
-        WindPowerStationTestingPoint2 jxssai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RJXSSDL);
+        WindPowerStationTestingPoint gzssai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RGZSSDL);
+        WindPowerStationTestingPoint jxssai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RJXSSDL);
 
-        WindPowerStationTestingPoint2 djssai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RSDJZSDL);
-        WindPowerStationTestingPoint2 sdtjai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RSSTZSDL);
-        WindPowerStationTestingPoint2 xnssai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RXNZSDL);
-        WindPowerStationTestingPoint2 qxjclai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RSQXZSDL);
+        WindPowerStationTestingPoint djssai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RSDJZSDL);
+        WindPowerStationTestingPoint sdtjai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RSSTZSDL);
+        WindPowerStationTestingPoint xnssai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RXNZSDL);
+        WindPowerStationTestingPoint qxjclai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RSQXZSDL);
 
-        WindPowerStationTestingPoint2 xdssai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RSSTZSDL);
-        WindPowerStationTestingPoint2 dwslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RXNZSDL);
-        WindPowerStationTestingPoint2 tqslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RSQXZSDL);
+        WindPowerStationTestingPoint xdssai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RSSTZSDL);
+        WindPowerStationTestingPoint dwslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RXNZSDL);
+        WindPowerStationTestingPoint tqslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RSQXZSDL);
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -1898,12 +1898,12 @@ public class WpInfoPushService {
         // long num = 30;
 
 
-        WindPowerStationTestingPoint2 rfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_RFDL);
+        WindPowerStationTestingPoint rfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_RFDL);
 
-        WindPowerStationTestingPoint2 fsai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
+        WindPowerStationTestingPoint fsai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
 
-        WindPowerStationTestingPoint2 swai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SWDL);
-        WindPowerStationTestingPoint2 gwai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_GWDL);
+        WindPowerStationTestingPoint swai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SWDL);
+        WindPowerStationTestingPoint gwai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_GWDL);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         List<PointData> rfdlls = realApiUtil.getHistoryDatasSnap(rfdlai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -1961,8 +1961,8 @@ public class WpInfoPushService {
             wpId = "0";
         }
 
-        WindPowerStationTestingPoint2 fsai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
-        WindPowerStationTestingPoint2 yfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_YFDL);
+        WindPowerStationTestingPoint fsai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
+        WindPowerStationTestingPoint yfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_YFDL);
         String[] fdlpoints = new String[2];
         fdlpoints[0] = yfdlai.getCode();
         fdlpoints[1] = fsai.getCode();

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

@@ -12,7 +12,6 @@ import com.gyee.frame.service.WindTurbineTestingPointDiService;
 import com.gyee.frame.service.WindturbineinfodayService;
 import com.gyee.frame.util.*;
 
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 
 import org.apache.commons.compress.utils.Lists;
@@ -931,7 +930,7 @@ public class WtInfoPushService {
 
             if(null !=warningRecords && null !=warningRecords.getWarningid() && InitialRunner.warningmap.containsKey(warningRecords.getWarningid()))
             {
-                Warning2 warning2=InitialRunner.warningmap.get(warningRecords.getWarningid());
+                Warning warning2=InitialRunner.warningmap.get(warningRecords.getWarningid());
                 gxkmap.put("bjmc", warning2.getChinesetext());
                 gxkmap.put("bjsj", DateUtils.formatDateTime(warningRecords.getWarningtime()));
             }
@@ -951,12 +950,12 @@ public class WtInfoPushService {
             {
                 tempmap.put(unicodels.get(i),unmsls.get(i));
             }
-            List<WindTurbineTestingPointDi2> list = windTurbineTestingPointDiService.getWindTurbineTestingPointDi2List(id, unicodels);
+            List<WindTurbineTestingPointDi> list = windTurbineTestingPointDiService.getWindTurbineTestingPointDi2List(id, unicodels);
 
             if (!list.isEmpty()) {
 
                 for (int i=0;i<list.size();i++) {
-                    WindTurbineTestingPointDi2 di=list.get(i);
+                    WindTurbineTestingPointDi di=list.get(i);
                     if(map.containsKey(di.getUniformcode()))
                     {
                         continue;
@@ -982,7 +981,7 @@ public class WtInfoPushService {
         {
             for(int i=0;i<uids.size();i++)
             {
-                WindTurbineTestingPointAi2 point= windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, uids.get(i));
+                WindTurbineTestingPointAi point= windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, uids.get(i));
                 if(null!=point && null!=point.getId())
                 {
                     zbls.add(point.getId());//
@@ -1195,10 +1194,10 @@ public class WtInfoPushService {
 	}
 
 	public Object findInverterDI(String id) throws Exception {
-		List<WindTurbineTestingPointDi2> pointList = windTurbineTestingPointDiService.getWindTurbineTestingPointDi2List(id);
+		List<WindTurbineTestingPointDi> pointList = windTurbineTestingPointDiService.getWindTurbineTestingPointDi2List(id);
 		Map<String, String> idName = Maps.newHashMap();
 		List<String> pointids = Lists.newArrayList();
-		for (WindTurbineTestingPointDi2 point : pointList) {
+		for (WindTurbineTestingPointDi point : pointList) {
 			idName.put(point.getId(), point.getName());
 			pointids.add(point.getId());
 		}

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

@@ -2,9 +2,9 @@ package com.gyee.frame.service.websocket;
 
 
 import com.gyee.frame.common.spring.InitialRunner;
-import com.gyee.frame.model.auto.Warning2;
+import com.gyee.frame.model.auto.Warning;
 import com.gyee.frame.model.auto.WarningClassify;
-import com.gyee.frame.model.auto.WindTurbineTestingPointDi2;
+import com.gyee.frame.model.auto.WindTurbineTestingPointDi;
 import com.gyee.frame.model.auto.Windturbine;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.model.custom.ValueVo;
@@ -47,15 +47,15 @@ public class WtWarnPushService {
 
                 Windturbine wt = InitialRunner.wtmap.get(id);
 
-                List<Warning2> warnls=InitialRunner.warnmap.get(wt.getModelid());
+                List<Warning> warnls=InitialRunner.warnmap.get(wt.getModelid());
 
                 if (!warnls.isEmpty()) {
 
                         if(!warnls.isEmpty())
                         {
                             List<String> unicodels = new ArrayList<>();
-                            Map<String,Warning2> wmap=new HashMap<>();
-                            for(Warning2 wr :warnls)
+                            Map<String, Warning> wmap=new HashMap<>();
+                            for(Warning wr :warnls)
                             {
                                 StringBuilder sb = new StringBuilder();
                                 sb.setLength(0);
@@ -67,12 +67,12 @@ public class WtWarnPushService {
 
                             Map<String,String> dimap=new HashMap<>();
 
-                            List<WindTurbineTestingPointDi2> list=windTurbineTestingPointDiService.getWindTurbineTestingPointDi2List(id,unicodels);
+                            List<WindTurbineTestingPointDi> list=windTurbineTestingPointDiService.getWindTurbineTestingPointDi2List(id,unicodels);
                             if(!list.isEmpty())
                             {
                                 List<ValueVo> vos = new ArrayList<>();
                                 List<String> pointls = new ArrayList<>();
-                                for(WindTurbineTestingPointDi2 di:list)
+                                for(WindTurbineTestingPointDi di:list)
                                 {
 
                                     if(null!=di && null!=di.getId())
@@ -87,7 +87,7 @@ public class WtWarnPushService {
                                         vo.setName(di.getName());
                                         if(wmap.containsKey(di.getUniformcode()))
                                         {
-                                            Warning2 wr=wmap.get(di.getUniformcode());
+                                            Warning wr=wmap.get(di.getUniformcode());
                                             vo.setTypeId(wr.getWarningclassifyid());
                                             vo.setName(wr.getChinesetext());
                                             vo.setValue(wr.getEnglishtext());

src/main/java/com/gyee/frame/util/IRealTimeDataBaseUtil.java

@@ -2,8 +2,8 @@ package com.gyee.frame.util;
 
 
 
-import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
-import com.gyee.frame.model.auto.WindTurbineTestingPointAi2;
+import com.gyee.frame.model.auto.WindPowerStationTestingPoint;
+import com.gyee.frame.model.auto.WindTurbineTestingPointAi;
 import com.gyee.frame.model.custom.DNAStatVal;
 import com.gyee.frame.model.custom.DNAVal;
 import com.gyee.frame.model.custom.PointData;
@@ -19,7 +19,7 @@ public interface IRealTimeDataBaseUtil {
      * @returns
      * @throws Exception
      */
-    public PointData getRealData(WindPowerStationTestingPoint2 point) throws Exception;
+    public PointData getRealData(WindPowerStationTestingPoint point) throws Exception;
 
     /**
      * 通过风场测点获得测点历史快照数据
@@ -31,7 +31,7 @@ public interface IRealTimeDataBaseUtil {
      * @return
      * @throws Exception
      */
-    public List<PointData> getHistoryDatasSnap(WindPowerStationTestingPoint2 point, Long beginDate, Long endDate, Long count, Long pried) throws Exception;
+    public List<PointData> getHistoryDatasSnap(WindPowerStationTestingPoint point, Long beginDate, Long endDate, Long count, Long pried) throws Exception;
 
     /**
      * 通过风场测点获得测点历史存储数据，存多少取多少
@@ -41,7 +41,7 @@ public interface IRealTimeDataBaseUtil {
      * @return
      * @throws Exception
      */
-    public List<PointData> getHistoryDatasRaw(WindPowerStationTestingPoint2 point, Long beginDate, Long endDate) throws Exception;
+    public List<PointData> getHistoryDatasRaw(WindPowerStationTestingPoint point, Long beginDate, Long endDate) throws Exception;
 
     /**
      * 通过风机测点获得测点实时数据
@@ -49,7 +49,7 @@ public interface IRealTimeDataBaseUtil {
      * @return
      * @throws Exception
      */
-    public PointData getRealData(WindTurbineTestingPointAi2 point) throws Exception;
+    public PointData getRealData(WindTurbineTestingPointAi point) throws Exception;
 
     /**
      * 通过风机测点获得历史快照
@@ -61,7 +61,7 @@ public interface IRealTimeDataBaseUtil {
      * @return
      * @throws Exception
      */
-    public List<PointData> getHistoryDatasSnap(WindTurbineTestingPointAi2 point, Long beginDate, Long endDate, Long count, Long pried) throws Exception;
+    public List<PointData> getHistoryDatasSnap(WindTurbineTestingPointAi point, Long beginDate, Long endDate, Long count, Long pried) throws Exception;
 
     /**
      * 通过风机测点获得测点历史存储数据，存多少取多少
@@ -71,7 +71,7 @@ public interface IRealTimeDataBaseUtil {
      * @return
      * @throws Exception
      */
-    public List<PointData> getHistoryDatasRaw(WindTurbineTestingPointAi2 point, Long beginDate, Long endDate) throws Exception;
+    public List<PointData> getHistoryDatasRaw(WindTurbineTestingPointAi point, Long beginDate, Long endDate) throws Exception;
 
 
     /**
@@ -138,7 +138,7 @@ public interface IRealTimeDataBaseUtil {
      * @return
      * @throws Exception
      */
-    public List<PointData> getHistStat(WindTurbineTestingPointAi2 point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception;
+    public List<PointData> getHistStat(WindTurbineTestingPointAi point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception;
 
     /**
      * 通过风场测点获得测点指定时间周期的统计数据
@@ -151,7 +151,7 @@ public interface IRealTimeDataBaseUtil {
      * @return
      * @throws Exception
      */
-    public List<PointData> getHistStat(WindPowerStationTestingPoint2 point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception;
+    public List<PointData> getHistStat(WindPowerStationTestingPoint point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception;
 
     /**
      * 通过全局点名获得测点指定时间周期的统计数据

src/main/java/com/gyee/frame/util/golden/EdosUtil.java

@@ -4,8 +4,8 @@ package com.gyee.frame.util.golden;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.gyee.frame.common.conf.V2Config;
-import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
-import com.gyee.frame.model.auto.WindTurbineTestingPointAi2;
+import com.gyee.frame.model.auto.WindPowerStationTestingPoint;
+import com.gyee.frame.model.auto.WindTurbineTestingPointAi;
 import com.gyee.frame.model.custom.DNAStatVal;
 import com.gyee.frame.model.custom.DNAVal;
 import com.gyee.frame.model.custom.PointData;
@@ -32,7 +32,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
     static String baseURL = V2Config.getBaseurl();
 
     @Override
-    public PointData getRealData(WindPowerStationTestingPoint2 point) throws Exception {
+    public PointData getRealData(WindPowerStationTestingPoint point) throws Exception {
         try {
             Optional<String> keys = Optional.ofNullable(point.getCode());
             Optional<String> thingType = Optional.ofNullable("station");
@@ -72,7 +72,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
 
 
     @Override
-    public List<PointData> getHistoryDatasSnap(WindPowerStationTestingPoint2 point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
+    public List<PointData> getHistoryDatasSnap(WindPowerStationTestingPoint point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());
@@ -230,7 +230,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
 
 
     @Override
-    public List<PointData> getHistoryDatasRaw(WindPowerStationTestingPoint2 point, Long beginDate, Long endDate) throws Exception {
+    public List<PointData> getHistoryDatasRaw(WindPowerStationTestingPoint point, Long beginDate, Long endDate) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());
@@ -276,7 +276,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
     }
 
     @Override
-    public PointData getRealData(WindTurbineTestingPointAi2 point) throws Exception {
+    public PointData getRealData(WindTurbineTestingPointAi point) throws Exception {
         Optional<String> keys = Optional.ofNullable(point.getId());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
@@ -318,7 +318,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
     }
 
     @Override
-    public List<PointData> getHistoryDatasSnap(WindTurbineTestingPointAi2 point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
+    public List<PointData> getHistoryDatasSnap(WindTurbineTestingPointAi point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getId());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());
@@ -429,7 +429,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
 
 
     @Override
-    public List<PointData> getHistoryDatasRaw(WindTurbineTestingPointAi2 point, Long beginDate, Long endDate) throws Exception {
+    public List<PointData> getHistoryDatasRaw(WindTurbineTestingPointAi point, Long beginDate, Long endDate) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getId());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());
@@ -864,7 +864,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
     }
 
     @Override
-    public List<PointData> getHistStat(WindTurbineTestingPointAi2 point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
+    public List<PointData> getHistStat(WindTurbineTestingPointAi point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getId());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());
@@ -926,7 +926,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
     }
 
     @Override
-    public List<PointData> getHistStat(WindPowerStationTestingPoint2 point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
+    public List<PointData> getHistStat(WindPowerStationTestingPoint point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());

src/main/java/com/gyee/frame/util/hwy/HwyUtil.java

@@ -4,8 +4,8 @@ package com.gyee.frame.util.hwy;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.gyee.frame.common.conf.V2Config;
-import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
-import com.gyee.frame.model.auto.WindTurbineTestingPointAi2;
+import com.gyee.frame.model.auto.WindPowerStationTestingPoint;
+import com.gyee.frame.model.auto.WindTurbineTestingPointAi;
 import com.gyee.frame.model.custom.DNAStatVal;
 import com.gyee.frame.model.custom.DNAVal;
 import com.gyee.frame.model.custom.PointData;
@@ -33,7 +33,7 @@ public class HwyUtil implements IRealTimeDataBaseUtil {
     static String baseURL = V2Config.getBaseurl();
 
     @Override
-    public PointData getRealData(WindPowerStationTestingPoint2 point) throws Exception {
+    public PointData getRealData(WindPowerStationTestingPoint point) throws Exception {
         try {
             Optional<String> keys = Optional.ofNullable(point.getModel());
             Optional<String> thingType = Optional.ofNullable("station");
@@ -73,7 +73,7 @@ public class HwyUtil implements IRealTimeDataBaseUtil {
 
 
     @Override
-    public List<PointData> getHistoryDatasSnap(WindPowerStationTestingPoint2 point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
+    public List<PointData> getHistoryDatasSnap(WindPowerStationTestingPoint point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getModel());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());
@@ -231,7 +231,7 @@ public class HwyUtil implements IRealTimeDataBaseUtil {
 
 
     @Override
-    public List<PointData> getHistoryDatasRaw(WindPowerStationTestingPoint2 point, Long beginDate, Long endDate) throws Exception {
+    public List<PointData> getHistoryDatasRaw(WindPowerStationTestingPoint point, Long beginDate, Long endDate) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getModel());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());
@@ -277,7 +277,7 @@ public class HwyUtil implements IRealTimeDataBaseUtil {
     }
 
     @Override
-    public PointData getRealData(WindTurbineTestingPointAi2 point) throws Exception {
+    public PointData getRealData(WindTurbineTestingPointAi point) throws Exception {
         Optional<String> keys = Optional.ofNullable(point.getCode());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
@@ -319,7 +319,7 @@ public class HwyUtil implements IRealTimeDataBaseUtil {
     }
 
     @Override
-    public List<PointData> getHistoryDatasSnap(WindTurbineTestingPointAi2 point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
+    public List<PointData> getHistoryDatasSnap(WindTurbineTestingPointAi point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());
@@ -430,7 +430,7 @@ public class HwyUtil implements IRealTimeDataBaseUtil {
 
 
     @Override
-    public List<PointData> getHistoryDatasRaw(WindTurbineTestingPointAi2 point, Long beginDate, Long endDate) throws Exception {
+    public List<PointData> getHistoryDatasRaw(WindTurbineTestingPointAi point, Long beginDate, Long endDate) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());
@@ -865,7 +865,7 @@ public class HwyUtil implements IRealTimeDataBaseUtil {
     }
 
     @Override
-    public List<PointData> getHistStat(WindTurbineTestingPointAi2 point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
+    public List<PointData> getHistStat(WindTurbineTestingPointAi point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());
@@ -927,7 +927,7 @@ public class HwyUtil implements IRealTimeDataBaseUtil {
     }
 
     @Override
-    public List<PointData> getHistStat(WindPowerStationTestingPoint2 point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
+    public List<PointData> getHistStat(WindPowerStationTestingPoint point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getModel());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());

src/main/java/com/gyee/frame/util/taos/TaosUtil.java

@@ -2,8 +2,8 @@ package com.gyee.frame.util.taos;
 
 import com.alibaba.fastjson.JSONObject;
 import com.gyee.frame.common.spring.InitialRunner;
-import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
-import com.gyee.frame.model.auto.WindTurbineTestingPointAi2;
+import com.gyee.frame.model.auto.WindPowerStationTestingPoint;
+import com.gyee.frame.model.auto.WindTurbineTestingPointAi;
 import com.gyee.frame.model.custom.DNAStatVal;
 import com.gyee.frame.model.custom.DNAVal;
 import com.gyee.frame.model.custom.PointData;
@@ -27,7 +27,7 @@ public class TaosUtil implements IRealTimeDataBaseUtil {
 
 
 	@Override
-	public PointData getRealData(WindPowerStationTestingPoint2 point) throws Exception {
+	public PointData getRealData(WindPowerStationTestingPoint point) throws Exception {
 
 		PointData po = null;
 		if (StringUtils.notEmp(point) && StringUtils.notEmp(point.getCode())) {
@@ -79,7 +79,7 @@ public class TaosUtil implements IRealTimeDataBaseUtil {
 	}
 
 	@Override
-	public List<PointData> getHistoryDatasSnap(WindPowerStationTestingPoint2 point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
+	public List<PointData> getHistoryDatasSnap(WindPowerStationTestingPoint point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
 
 		// 通过时间区间和时间间隔获取点数
 		Long finalInterval;
@@ -189,7 +189,7 @@ public class TaosUtil implements IRealTimeDataBaseUtil {
 
 
 	@Override
-	public List<PointData> getHistoryDatasRaw(WindPowerStationTestingPoint2 point, Long beginDate, Long endDate) throws Exception {
+	public List<PointData> getHistoryDatasRaw(WindPowerStationTestingPoint point, Long beginDate, Long endDate) throws Exception {
 
 		List<PointData> vos = new ArrayList<>();
 
@@ -244,7 +244,7 @@ public class TaosUtil implements IRealTimeDataBaseUtil {
 	}
 
 	@Override
-	public PointData getRealData(WindTurbineTestingPointAi2 point) throws Exception {
+	public PointData getRealData(WindTurbineTestingPointAi point) throws Exception {
 		PointData po = null;
 		if (StringUtils.notEmp(point) && StringUtils.notEmp(point.getId())) {
 
@@ -295,7 +295,7 @@ public class TaosUtil implements IRealTimeDataBaseUtil {
 	}
 
 	@Override
-	public List<PointData> getHistoryDatasSnap(WindTurbineTestingPointAi2 point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
+	public List<PointData> getHistoryDatasSnap(WindTurbineTestingPointAi point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
 		// 通过时间区间和时间间隔获取点数
 		Long finalInterval;
 		if (pried != null)
@@ -399,7 +399,7 @@ public class TaosUtil implements IRealTimeDataBaseUtil {
 
 
 	@Override
-	public List<PointData> getHistoryDatasRaw(WindTurbineTestingPointAi2 point, Long beginDate, Long endDate) throws Exception {
+	public List<PointData> getHistoryDatasRaw(WindTurbineTestingPointAi point, Long beginDate, Long endDate) throws Exception {
 		List<PointData> vos = new ArrayList<>();
 
 		if (StringUtils.notEmp(point) && StringUtils.notEmp(point.getId()) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
@@ -700,7 +700,7 @@ public class TaosUtil implements IRealTimeDataBaseUtil {
 	}
 
 	@Override
-	public List<PointData> getHistStat(WindTurbineTestingPointAi2 point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
+	public List<PointData> getHistStat(WindTurbineTestingPointAi point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
 		// 通过时间区间和时间间隔获取点数
 		Long finalInterval;
 		if (pried != null)
@@ -818,7 +818,7 @@ public class TaosUtil implements IRealTimeDataBaseUtil {
 	}
 
 	@Override
-	public List<PointData> getHistStat(WindPowerStationTestingPoint2 point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
+	public List<PointData> getHistStat(WindPowerStationTestingPoint point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
 
 		// 通过时间区间和时间间隔获取点数
 		Long finalInterval;

src/main/java/com/gyee/frame/util/task/TaskTemplateCallable.java

@@ -4,7 +4,7 @@ package com.gyee.frame.util.task;
 import com.gyee.frame.common.exception.QiNiuException;
 import com.gyee.frame.common.exception.enums.QiNiuErrorEnum;
 import com.gyee.frame.common.feign.IAdapterService;
-import com.gyee.frame.model.auto.WindTurbineTestingPointAi2;
+import com.gyee.frame.model.auto.WindTurbineTestingPointAi;
 import com.gyee.frame.model.custom.export.TsPointData;
 import com.gyee.frame.service.WindTurbineTestingPointAiService;
 import com.gyee.frame.util.DateUtils;
@@ -52,11 +52,11 @@ public class TaskTemplateCallable implements Callable {
 
         try {
             for (String code : this.codes) {
-                List<WindTurbineTestingPointAi2> windPoints = this.windService.findPointsByUniformCodeAndStation(station, wtId, code);
+                List<WindTurbineTestingPointAi> windPoints = this.windService.findPointsByUniformCodeAndStation(station, wtId, code);
                 if (windPoints == null || windPoints.size() == 0)
                     continue;
 
-                WindTurbineTestingPointAi2 windPoint = windPoints.get(0);
+                WindTurbineTestingPointAi windPoint = windPoints.get(0);
                 List<TsPointData> data = this.service.getHistorySnap(windPoint.getId(), startTs, endTs, interval);
 
                 List<Object> collect = new ArrayList<>();

src/main/resources/application-dev.yml

@@ -2,58 +2,65 @@
 spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
-#    driverClassName: com.mysql.jdbc.Driver
+    #    driverClassName: com.mysql.jdbc.Driver
     #druid连接池配置
     druid:
-     #主库数据源
-     master:
-#        url: jdbc:mysql://localhost:3306/springbootv2?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
-#        username: root
-#        password: 123456
+      #主库数据源
+      master:
+        #        url: jdbc:mysql://localhost:3306/springbootv2?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
+        #        username: root
+        #        password: 123456
 
         #url: jdbc:oracle:thin:@123.60.213.70:1521:gdnxfd
         url: jdbc:oracle:thin:@10.0.118.71:1521:gdsj
         username: gdprod
         password: gd123
         driver-class-name: oracle.jdbc.driver.OracleDriver
-     #备数据源 #关闭
-     slave:
+      #备数据源 #关闭
+      slave:
         enabled: false
         url: jdbc:mysql://localhost:3306/springbootv3?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=UTC
         username: root
         password: root
-      #配置初始化连接数大小
-     initial-size: 10
-     # 最大连接数
-     max-active: 50
-     #最小连接数
-     min-idle: 10
-     #获取连接等待超时时间
-     max-wait: 5000
-     pool-prepared-statements: true #是否缓存preparedStatement，也就是PSCache。PSCache对支持游标的数据库性能提升巨大，比如说oracle。在mysql下建议关闭。
-     max-pool-prepared-statement-per-connection-size: 20
-     validation-query: SELECT 1 FROM DUAL
-     validation-query-timeout: 20000
-     test-on-borrow: false #申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
-     test-on-return: false #归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
-     test-while-idle: true #建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。
-     time-between-eviction-runs-millis: 60000 #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-     min-evictable-idle-time-millis: 300000  #一个连接在池中最小生存的时间，单位是毫秒
-     #StatViewServlet配置。（因为暴露的监控信息比较敏感，支持密码加密和访问ip限定）
-     stat-view-servlet:
-      enabled: true
-      url-pattern: /druid/*
-      #可以增加访问账号密码【去掉注释就可以】
-      #login-username: admin
-      #login-password: admin
-     filter:
-      stat:
-        log-slow-sql: true
-        slow-sql-millis: 1000
-        merge-sql: false
-      wall:
-        config:
-          multi-statement-allow: true
+        #两票数据源
+      ticket:
+        #url: jdbc:sqlserver://123.60.213.70:1433;DatabaseName=fdeam
+        url: jdbc:sqlserver://10.155.32.2:1433;DatabaseName=fdeam
+        username: sa
+        password: Gyee@321#!
+        driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        #配置初始化连接数大小
+      initial-size: 10
+      # 最大连接数
+      max-active: 50
+      #最小连接数
+      min-idle: 10
+      #获取连接等待超时时间
+      max-wait: 5000
+      pool-prepared-statements: true #是否缓存preparedStatement，也就是PSCache。PSCache对支持游标的数据库性能提升巨大，比如说oracle。在mysql下建议关闭。
+      max-pool-prepared-statement-per-connection-size: 20
+      validation-query: SELECT 1 FROM DUAL
+      validation-query-timeout: 20000
+      test-on-borrow: false #申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+      test-on-return: false #归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+      test-while-idle: true #建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。
+      time-between-eviction-runs-millis: 60000 #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      min-evictable-idle-time-millis: 300000  #一个连接在池中最小生存的时间，单位是毫秒
+      #StatViewServlet配置。（因为暴露的监控信息比较敏感，支持密码加密和访问ip限定）
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        #可以增加访问账号密码【去掉注释就可以】
+        #login-username: admin
+        #login-password: admin
+      filter:
+        stat:
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: false
+        wall:
+          config:
+            multi-statement-allow: true
 
 #mysql 8.0
 

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

@@ -1,461 +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.Warning2Mapper">
-  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Warning2">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="levelId" jdbcType="VARCHAR" property="levelid" />
-    <result column="manufacturerCode" jdbcType="VARCHAR" property="manufacturercode" />
-    <result column="englishText" jdbcType="VARCHAR" property="englishtext" />
-    <result column="chineseText" jdbcType="VARCHAR" property="chinesetext" />
-    <result column="parentId" jdbcType="VARCHAR" property="parentid" />
-    <result column="isLeaf" jdbcType="SMALLINT" property="isleaf" />
-    <result column="sequenceNumber" jdbcType="INTEGER" property="sequencenumber" />
-    <result column="characteristic" jdbcType="VARCHAR" property="characteristic" />
-    <result column="modelId" jdbcType="VARCHAR" property="modelid" />
-    <result column="codeName" jdbcType="VARCHAR" property="codename" />
-    <result column="ednaValue" jdbcType="INTEGER" property="ednavalue" />
-    <result column="display" jdbcType="INTEGER" property="display" />
-    <result column="warningClassifyId" jdbcType="VARCHAR" property="warningclassifyid" />
-    <result column="isreset" jdbcType="DECIMAL" property="isreset" />
-    <result column="standardTime" jdbcType="DECIMAL" property="standardtime" />
-    <result column="warningtypeid" jdbcType="VARCHAR" property="warningtypeid" />
-  </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, levelId, manufacturerCode, englishText, chineseText, parentId, isLeaf, sequenceNumber, 
-    characteristic, modelId, codeName, ednaValue, display, warningClassifyId, isreset, 
-    standardTime, warningtypeid
-  </sql>
-  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.Warning2Example" 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 warning2
-    <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 warning2
-    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 warning2
-    where id = #{id,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.Warning2Example">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    delete from warning2
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.gyee.frame.model.auto.Warning2">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    insert into warning2 (id, levelId, manufacturerCode, 
-      englishText, chineseText, parentId, 
-      isLeaf, sequenceNumber, characteristic, 
-      modelId, codeName, ednaValue, 
-      display, warningClassifyId, isreset, 
-      standardTime, warningtypeid)
-    values (#{id,jdbcType=VARCHAR}, #{levelid,jdbcType=VARCHAR}, #{manufacturercode,jdbcType=VARCHAR}, 
-      #{englishtext,jdbcType=VARCHAR}, #{chinesetext,jdbcType=VARCHAR}, #{parentid,jdbcType=VARCHAR}, 
-      #{isleaf,jdbcType=SMALLINT}, #{sequencenumber,jdbcType=INTEGER}, #{characteristic,jdbcType=VARCHAR}, 
-      #{modelid,jdbcType=VARCHAR}, #{codename,jdbcType=VARCHAR}, #{ednavalue,jdbcType=INTEGER}, 
-      #{display,jdbcType=INTEGER}, #{warningclassifyid,jdbcType=VARCHAR}, #{isreset,jdbcType=DECIMAL}, 
-      #{standardtime,jdbcType=DECIMAL}, #{warningtypeid,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Warning2">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    insert into warning2
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="levelid != null">
-        levelId,
-      </if>
-      <if test="manufacturercode != null">
-        manufacturerCode,
-      </if>
-      <if test="englishtext != null">
-        englishText,
-      </if>
-      <if test="chinesetext != null">
-        chineseText,
-      </if>
-      <if test="parentid != null">
-        parentId,
-      </if>
-      <if test="isleaf != null">
-        isLeaf,
-      </if>
-      <if test="sequencenumber != null">
-        sequenceNumber,
-      </if>
-      <if test="characteristic != null">
-        characteristic,
-      </if>
-      <if test="modelid != null">
-        modelId,
-      </if>
-      <if test="codename != null">
-        codeName,
-      </if>
-      <if test="ednavalue != null">
-        ednaValue,
-      </if>
-      <if test="display != null">
-        display,
-      </if>
-      <if test="warningclassifyid != null">
-        warningClassifyId,
-      </if>
-      <if test="isreset != null">
-        isreset,
-      </if>
-      <if test="standardtime != null">
-        standardTime,
-      </if>
-      <if test="warningtypeid != null">
-        warningtypeid,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=VARCHAR},
-      </if>
-      <if test="levelid != null">
-        #{levelid,jdbcType=VARCHAR},
-      </if>
-      <if test="manufacturercode != null">
-        #{manufacturercode,jdbcType=VARCHAR},
-      </if>
-      <if test="englishtext != null">
-        #{englishtext,jdbcType=VARCHAR},
-      </if>
-      <if test="chinesetext != null">
-        #{chinesetext,jdbcType=VARCHAR},
-      </if>
-      <if test="parentid != null">
-        #{parentid,jdbcType=VARCHAR},
-      </if>
-      <if test="isleaf != null">
-        #{isleaf,jdbcType=SMALLINT},
-      </if>
-      <if test="sequencenumber != null">
-        #{sequencenumber,jdbcType=INTEGER},
-      </if>
-      <if test="characteristic != null">
-        #{characteristic,jdbcType=VARCHAR},
-      </if>
-      <if test="modelid != null">
-        #{modelid,jdbcType=VARCHAR},
-      </if>
-      <if test="codename != null">
-        #{codename,jdbcType=VARCHAR},
-      </if>
-      <if test="ednavalue != null">
-        #{ednavalue,jdbcType=INTEGER},
-      </if>
-      <if test="display != null">
-        #{display,jdbcType=INTEGER},
-      </if>
-      <if test="warningclassifyid != null">
-        #{warningclassifyid,jdbcType=VARCHAR},
-      </if>
-      <if test="isreset != null">
-        #{isreset,jdbcType=DECIMAL},
-      </if>
-      <if test="standardtime != null">
-        #{standardtime,jdbcType=DECIMAL},
-      </if>
-      <if test="warningtypeid != null">
-        #{warningtypeid,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.gyee.frame.model.auto.Warning2Example" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select count(*) from warning2
-    <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 warning2
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=VARCHAR},
-      </if>
-      <if test="record.levelid != null">
-        levelId = #{record.levelid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.manufacturercode != null">
-        manufacturerCode = #{record.manufacturercode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.englishtext != null">
-        englishText = #{record.englishtext,jdbcType=VARCHAR},
-      </if>
-      <if test="record.chinesetext != null">
-        chineseText = #{record.chinesetext,jdbcType=VARCHAR},
-      </if>
-      <if test="record.parentid != null">
-        parentId = #{record.parentid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.isleaf != null">
-        isLeaf = #{record.isleaf,jdbcType=SMALLINT},
-      </if>
-      <if test="record.sequencenumber != null">
-        sequenceNumber = #{record.sequencenumber,jdbcType=INTEGER},
-      </if>
-      <if test="record.characteristic != null">
-        characteristic = #{record.characteristic,jdbcType=VARCHAR},
-      </if>
-      <if test="record.modelid != null">
-        modelId = #{record.modelid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.codename != null">
-        codeName = #{record.codename,jdbcType=VARCHAR},
-      </if>
-      <if test="record.ednavalue != null">
-        ednaValue = #{record.ednavalue,jdbcType=INTEGER},
-      </if>
-      <if test="record.display != null">
-        display = #{record.display,jdbcType=INTEGER},
-      </if>
-      <if test="record.warningclassifyid != null">
-        warningClassifyId = #{record.warningclassifyid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.isreset != null">
-        isreset = #{record.isreset,jdbcType=DECIMAL},
-      </if>
-      <if test="record.standardtime != null">
-        standardTime = #{record.standardtime,jdbcType=DECIMAL},
-      </if>
-      <if test="record.warningtypeid != null">
-        warningtypeid = #{record.warningtypeid,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 warning2
-    set id = #{record.id,jdbcType=VARCHAR},
-      levelId = #{record.levelid,jdbcType=VARCHAR},
-      manufacturerCode = #{record.manufacturercode,jdbcType=VARCHAR},
-      englishText = #{record.englishtext,jdbcType=VARCHAR},
-      chineseText = #{record.chinesetext,jdbcType=VARCHAR},
-      parentId = #{record.parentid,jdbcType=VARCHAR},
-      isLeaf = #{record.isleaf,jdbcType=SMALLINT},
-      sequenceNumber = #{record.sequencenumber,jdbcType=INTEGER},
-      characteristic = #{record.characteristic,jdbcType=VARCHAR},
-      modelId = #{record.modelid,jdbcType=VARCHAR},
-      codeName = #{record.codename,jdbcType=VARCHAR},
-      ednaValue = #{record.ednavalue,jdbcType=INTEGER},
-      display = #{record.display,jdbcType=INTEGER},
-      warningClassifyId = #{record.warningclassifyid,jdbcType=VARCHAR},
-      isreset = #{record.isreset,jdbcType=DECIMAL},
-      standardTime = #{record.standardtime,jdbcType=DECIMAL},
-      warningtypeid = #{record.warningtypeid,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Warning2">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update warning2
-    <set>
-      <if test="levelid != null">
-        levelId = #{levelid,jdbcType=VARCHAR},
-      </if>
-      <if test="manufacturercode != null">
-        manufacturerCode = #{manufacturercode,jdbcType=VARCHAR},
-      </if>
-      <if test="englishtext != null">
-        englishText = #{englishtext,jdbcType=VARCHAR},
-      </if>
-      <if test="chinesetext != null">
-        chineseText = #{chinesetext,jdbcType=VARCHAR},
-      </if>
-      <if test="parentid != null">
-        parentId = #{parentid,jdbcType=VARCHAR},
-      </if>
-      <if test="isleaf != null">
-        isLeaf = #{isleaf,jdbcType=SMALLINT},
-      </if>
-      <if test="sequencenumber != null">
-        sequenceNumber = #{sequencenumber,jdbcType=INTEGER},
-      </if>
-      <if test="characteristic != null">
-        characteristic = #{characteristic,jdbcType=VARCHAR},
-      </if>
-      <if test="modelid != null">
-        modelId = #{modelid,jdbcType=VARCHAR},
-      </if>
-      <if test="codename != null">
-        codeName = #{codename,jdbcType=VARCHAR},
-      </if>
-      <if test="ednavalue != null">
-        ednaValue = #{ednavalue,jdbcType=INTEGER},
-      </if>
-      <if test="display != null">
-        display = #{display,jdbcType=INTEGER},
-      </if>
-      <if test="warningclassifyid != null">
-        warningClassifyId = #{warningclassifyid,jdbcType=VARCHAR},
-      </if>
-      <if test="isreset != null">
-        isreset = #{isreset,jdbcType=DECIMAL},
-      </if>
-      <if test="standardtime != null">
-        standardTime = #{standardtime,jdbcType=DECIMAL},
-      </if>
-      <if test="warningtypeid != null">
-        warningtypeid = #{warningtypeid,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Warning2">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update warning2
-    set levelId = #{levelid,jdbcType=VARCHAR},
-      manufacturerCode = #{manufacturercode,jdbcType=VARCHAR},
-      englishText = #{englishtext,jdbcType=VARCHAR},
-      chineseText = #{chinesetext,jdbcType=VARCHAR},
-      parentId = #{parentid,jdbcType=VARCHAR},
-      isLeaf = #{isleaf,jdbcType=SMALLINT},
-      sequenceNumber = #{sequencenumber,jdbcType=INTEGER},
-      characteristic = #{characteristic,jdbcType=VARCHAR},
-      modelId = #{modelid,jdbcType=VARCHAR},
-      codeName = #{codename,jdbcType=VARCHAR},
-      ednaValue = #{ednavalue,jdbcType=INTEGER},
-      display = #{display,jdbcType=INTEGER},
-      warningClassifyId = #{warningclassifyid,jdbcType=VARCHAR},
-      isreset = #{isreset,jdbcType=DECIMAL},
-      standardTime = #{standardtime,jdbcType=DECIMAL},
-      warningtypeid = #{warningtypeid,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-</mapper>

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

@@ -109,7 +109,7 @@
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from warning
+    from warning2
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -124,7 +124,7 @@
     -->
     select 
     <include refid="Base_Column_List" />
-    from warning
+    from warning2
     where id = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -132,7 +132,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    delete from warning
+    delete from warning2
     where id = #{id,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WarningExample">
@@ -140,7 +140,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    delete from warning
+    delete from warning2
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -150,7 +150,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into warning (id, levelId, manufacturerCode, 
+    insert into warning2 (id, levelId, manufacturerCode, 
       englishText, chineseText, parentId, 
       isLeaf, sequenceNumber, characteristic, 
       modelId, codeName, ednaValue, 
@@ -168,7 +168,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into warning
+    insert into warning2
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
@@ -281,7 +281,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    select count(*) from warning
+    select count(*) from warning2
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -291,7 +291,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update warning
+    update warning2
     <set>
       <if test="record.id != null">
         id = #{record.id,jdbcType=VARCHAR},
@@ -354,7 +354,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update warning
+    update warning2
     set id = #{record.id,jdbcType=VARCHAR},
       levelId = #{record.levelid,jdbcType=VARCHAR},
       manufacturerCode = #{record.manufacturercode,jdbcType=VARCHAR},
@@ -381,7 +381,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update warning
+    update warning2
     <set>
       <if test="levelid != null">
         levelId = #{levelid,jdbcType=VARCHAR},
@@ -439,7 +439,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update warning
+    update warning2
     set levelId = #{levelid,jdbcType=VARCHAR},
       manufacturerCode = #{manufacturercode,jdbcType=VARCHAR},
       englishText = #{englishtext,jdbcType=VARCHAR},

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

@@ -1,461 +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.WindPowerStationTestingPoint2Mapper">
-  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.WindPowerStationTestingPoint2">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <id column="CODE" jdbcType="VARCHAR" property="code" />
-    <result column="NAME" jdbcType="VARCHAR" property="name" />
-    <result column="MODEL" jdbcType="VARCHAR" property="model" />
-    <result column="VALUEUNIT" jdbcType="VARCHAR" property="valueunit" />
-    <result column="ENGLISHNAME" jdbcType="VARCHAR" property="englishname" />
-    <result column="TYPEID" jdbcType="VARCHAR" property="typeid" />
-    <result column="MODELID" jdbcType="VARCHAR" property="modelid" />
-    <result column="MAXVAL" jdbcType="DECIMAL" property="maxval" />
-    <result column="MINVAL" jdbcType="DECIMAL" property="minval" />
-    <result column="REASONABLEMAXVAL" jdbcType="DECIMAL" property="reasonablemaxval" />
-    <result column="REASONABLEMINVAL" jdbcType="DECIMAL" property="reasonableminval" />
-    <result column="UNIFORMCODE" jdbcType="VARCHAR" property="uniformcode" />
-    <result column="SHORTID" jdbcType="VARCHAR" property="shortid" />
-    <result column="LONGID" jdbcType="VARCHAR" property="longid" />
-    <result column="WINDPOWERSTATIONID" jdbcType="VARCHAR" property="windpowerstationid" />
-    <result column="REALTIMEID" jdbcType="VARCHAR" property="realtimeid" />
-  </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.
-    -->
-    CODE, NAME, MODEL, VALUEUNIT, ENGLISHNAME, TYPEID, MODELID, MAXVAL, MINVAL, REASONABLEMAXVAL, 
-    REASONABLEMINVAL, UNIFORMCODE, SHORTID, LONGID, WINDPOWERSTATIONID, REALTIMEID
-  </sql>
-  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.WindPowerStationTestingPoint2Example" 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 WINDPOWERSTATIONTESTINGPOINT2
-    <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 WINDPOWERSTATIONTESTINGPOINT2
-    where CODE = #{code,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 WINDPOWERSTATIONTESTINGPOINT2
-    where CODE = #{code,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WindPowerStationTestingPoint2Example">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    delete from WINDPOWERSTATIONTESTINGPOINT2
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.gyee.frame.model.auto.WindPowerStationTestingPoint2">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    insert into WINDPOWERSTATIONTESTINGPOINT2 (CODE, NAME, MODEL, 
-      VALUEUNIT, ENGLISHNAME, TYPEID, 
-      MODELID, MAXVAL, MINVAL, 
-      REASONABLEMAXVAL, REASONABLEMINVAL, UNIFORMCODE, 
-      SHORTID, LONGID, WINDPOWERSTATIONID, 
-      REALTIMEID)
-    values (#{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, 
-      #{valueunit,jdbcType=VARCHAR}, #{englishname,jdbcType=VARCHAR}, #{typeid,jdbcType=VARCHAR}, 
-      #{modelid,jdbcType=VARCHAR}, #{maxval,jdbcType=DECIMAL}, #{minval,jdbcType=DECIMAL}, 
-      #{reasonablemaxval,jdbcType=DECIMAL}, #{reasonableminval,jdbcType=DECIMAL}, #{uniformcode,jdbcType=VARCHAR}, 
-      #{shortid,jdbcType=VARCHAR}, #{longid,jdbcType=VARCHAR}, #{windpowerstationid,jdbcType=VARCHAR}, 
-      #{realtimeid,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.WindPowerStationTestingPoint2">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    insert into WINDPOWERSTATIONTESTINGPOINT2
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="code != null">
-        CODE,
-      </if>
-      <if test="name != null">
-        NAME,
-      </if>
-      <if test="model != null">
-        MODEL,
-      </if>
-      <if test="valueunit != null">
-        VALUEUNIT,
-      </if>
-      <if test="englishname != null">
-        ENGLISHNAME,
-      </if>
-      <if test="typeid != null">
-        TYPEID,
-      </if>
-      <if test="modelid != null">
-        MODELID,
-      </if>
-      <if test="maxval != null">
-        MAXVAL,
-      </if>
-      <if test="minval != null">
-        MINVAL,
-      </if>
-      <if test="reasonablemaxval != null">
-        REASONABLEMAXVAL,
-      </if>
-      <if test="reasonableminval != null">
-        REASONABLEMINVAL,
-      </if>
-      <if test="uniformcode != null">
-        UNIFORMCODE,
-      </if>
-      <if test="shortid != null">
-        SHORTID,
-      </if>
-      <if test="longid != null">
-        LONGID,
-      </if>
-      <if test="windpowerstationid != null">
-        WINDPOWERSTATIONID,
-      </if>
-      <if test="realtimeid != null">
-        REALTIMEID,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="code != null">
-        #{code,jdbcType=VARCHAR},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="model != null">
-        #{model,jdbcType=VARCHAR},
-      </if>
-      <if test="valueunit != null">
-        #{valueunit,jdbcType=VARCHAR},
-      </if>
-      <if test="englishname != null">
-        #{englishname,jdbcType=VARCHAR},
-      </if>
-      <if test="typeid != null">
-        #{typeid,jdbcType=VARCHAR},
-      </if>
-      <if test="modelid != null">
-        #{modelid,jdbcType=VARCHAR},
-      </if>
-      <if test="maxval != null">
-        #{maxval,jdbcType=DECIMAL},
-      </if>
-      <if test="minval != null">
-        #{minval,jdbcType=DECIMAL},
-      </if>
-      <if test="reasonablemaxval != null">
-        #{reasonablemaxval,jdbcType=DECIMAL},
-      </if>
-      <if test="reasonableminval != null">
-        #{reasonableminval,jdbcType=DECIMAL},
-      </if>
-      <if test="uniformcode != null">
-        #{uniformcode,jdbcType=VARCHAR},
-      </if>
-      <if test="shortid != null">
-        #{shortid,jdbcType=VARCHAR},
-      </if>
-      <if test="longid != null">
-        #{longid,jdbcType=VARCHAR},
-      </if>
-      <if test="windpowerstationid != null">
-        #{windpowerstationid,jdbcType=VARCHAR},
-      </if>
-      <if test="realtimeid != null">
-        #{realtimeid,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.gyee.frame.model.auto.WindPowerStationTestingPoint2Example" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select count(*) from WINDPOWERSTATIONTESTINGPOINT2
-    <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 WINDPOWERSTATIONTESTINGPOINT2
-    <set>
-      <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.model != null">
-        MODEL = #{record.model,jdbcType=VARCHAR},
-      </if>
-      <if test="record.valueunit != null">
-        VALUEUNIT = #{record.valueunit,jdbcType=VARCHAR},
-      </if>
-      <if test="record.englishname != null">
-        ENGLISHNAME = #{record.englishname,jdbcType=VARCHAR},
-      </if>
-      <if test="record.typeid != null">
-        TYPEID = #{record.typeid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.modelid != null">
-        MODELID = #{record.modelid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.maxval != null">
-        MAXVAL = #{record.maxval,jdbcType=DECIMAL},
-      </if>
-      <if test="record.minval != null">
-        MINVAL = #{record.minval,jdbcType=DECIMAL},
-      </if>
-      <if test="record.reasonablemaxval != null">
-        REASONABLEMAXVAL = #{record.reasonablemaxval,jdbcType=DECIMAL},
-      </if>
-      <if test="record.reasonableminval != null">
-        REASONABLEMINVAL = #{record.reasonableminval,jdbcType=DECIMAL},
-      </if>
-      <if test="record.uniformcode != null">
-        UNIFORMCODE = #{record.uniformcode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.shortid != null">
-        SHORTID = #{record.shortid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.longid != null">
-        LONGID = #{record.longid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.windpowerstationid != null">
-        WINDPOWERSTATIONID = #{record.windpowerstationid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.realtimeid != null">
-        REALTIMEID = #{record.realtimeid,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 WINDPOWERSTATIONTESTINGPOINT2
-    set CODE = #{record.code,jdbcType=VARCHAR},
-      NAME = #{record.name,jdbcType=VARCHAR},
-      MODEL = #{record.model,jdbcType=VARCHAR},
-      VALUEUNIT = #{record.valueunit,jdbcType=VARCHAR},
-      ENGLISHNAME = #{record.englishname,jdbcType=VARCHAR},
-      TYPEID = #{record.typeid,jdbcType=VARCHAR},
-      MODELID = #{record.modelid,jdbcType=VARCHAR},
-      MAXVAL = #{record.maxval,jdbcType=DECIMAL},
-      MINVAL = #{record.minval,jdbcType=DECIMAL},
-      REASONABLEMAXVAL = #{record.reasonablemaxval,jdbcType=DECIMAL},
-      REASONABLEMINVAL = #{record.reasonableminval,jdbcType=DECIMAL},
-      UNIFORMCODE = #{record.uniformcode,jdbcType=VARCHAR},
-      SHORTID = #{record.shortid,jdbcType=VARCHAR},
-      LONGID = #{record.longid,jdbcType=VARCHAR},
-      WINDPOWERSTATIONID = #{record.windpowerstationid,jdbcType=VARCHAR},
-      REALTIMEID = #{record.realtimeid,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.WindPowerStationTestingPoint2">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update WINDPOWERSTATIONTESTINGPOINT2
-    <set>
-      <if test="name != null">
-        NAME = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="model != null">
-        MODEL = #{model,jdbcType=VARCHAR},
-      </if>
-      <if test="valueunit != null">
-        VALUEUNIT = #{valueunit,jdbcType=VARCHAR},
-      </if>
-      <if test="englishname != null">
-        ENGLISHNAME = #{englishname,jdbcType=VARCHAR},
-      </if>
-      <if test="typeid != null">
-        TYPEID = #{typeid,jdbcType=VARCHAR},
-      </if>
-      <if test="modelid != null">
-        MODELID = #{modelid,jdbcType=VARCHAR},
-      </if>
-      <if test="maxval != null">
-        MAXVAL = #{maxval,jdbcType=DECIMAL},
-      </if>
-      <if test="minval != null">
-        MINVAL = #{minval,jdbcType=DECIMAL},
-      </if>
-      <if test="reasonablemaxval != null">
-        REASONABLEMAXVAL = #{reasonablemaxval,jdbcType=DECIMAL},
-      </if>
-      <if test="reasonableminval != null">
-        REASONABLEMINVAL = #{reasonableminval,jdbcType=DECIMAL},
-      </if>
-      <if test="uniformcode != null">
-        UNIFORMCODE = #{uniformcode,jdbcType=VARCHAR},
-      </if>
-      <if test="shortid != null">
-        SHORTID = #{shortid,jdbcType=VARCHAR},
-      </if>
-      <if test="longid != null">
-        LONGID = #{longid,jdbcType=VARCHAR},
-      </if>
-      <if test="windpowerstationid != null">
-        WINDPOWERSTATIONID = #{windpowerstationid,jdbcType=VARCHAR},
-      </if>
-      <if test="realtimeid != null">
-        REALTIMEID = #{realtimeid,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where CODE = #{code,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.WindPowerStationTestingPoint2">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update WINDPOWERSTATIONTESTINGPOINT2
-    set NAME = #{name,jdbcType=VARCHAR},
-      MODEL = #{model,jdbcType=VARCHAR},
-      VALUEUNIT = #{valueunit,jdbcType=VARCHAR},
-      ENGLISHNAME = #{englishname,jdbcType=VARCHAR},
-      TYPEID = #{typeid,jdbcType=VARCHAR},
-      MODELID = #{modelid,jdbcType=VARCHAR},
-      MAXVAL = #{maxval,jdbcType=DECIMAL},
-      MINVAL = #{minval,jdbcType=DECIMAL},
-      REASONABLEMAXVAL = #{reasonablemaxval,jdbcType=DECIMAL},
-      REASONABLEMINVAL = #{reasonableminval,jdbcType=DECIMAL},
-      UNIFORMCODE = #{uniformcode,jdbcType=VARCHAR},
-      SHORTID = #{shortid,jdbcType=VARCHAR},
-      LONGID = #{longid,jdbcType=VARCHAR},
-      WINDPOWERSTATIONID = #{windpowerstationid,jdbcType=VARCHAR},
-      REALTIMEID = #{realtimeid,jdbcType=VARCHAR}
-    where CODE = #{code,jdbcType=VARCHAR}
-  </update>
-
-  <select id="getWpPointTotal" resultType="com.gyee.frame.model.custom.SimpleVo" >
-    select count(*) value
-    from view_tspoint  where
-    <if test="wpId != null">
-      ID LIKE '%${wpId}%' and
-    </if>
-    <if test="type != null">
-       id  like '%JSFW%'
-    </if>
-    <if test="type == null">
-      id not like '%JSFW%'
-    </if>
-
-  </select>
-
-</mapper>

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

@@ -1,7 +1,7 @@
 <?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.WindTurbineTestingPointAi2Mapper">
-  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.WindTurbineTestingPointAi2">
+<mapper namespace="com.gyee.frame.mapper.auto.WindTurbineTestingPointAiMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.WindTurbineTestingPointAi">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -100,7 +100,7 @@
     REASONABLEMINVAL, WINDTURBINEID, UNIFORMCODE, SHORTID, LONGID, WINDPOWERSTATIONID, 
     REALTIMEID
   </sql>
-  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointAi2Example" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointAiExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -136,7 +136,7 @@
     delete from WINDTURBINETESTINGPOINTAI2
     where ID = #{id,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointAi2Example">
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointAiExample">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -146,7 +146,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointAi2">
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointAi">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -166,7 +166,7 @@
       #{longid,jdbcType=VARCHAR}, #{windpowerstationid,jdbcType=VARCHAR}, #{realtimeid,jdbcType=VARCHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointAi2">
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointAi">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -285,7 +285,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointAi2Example" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointAiExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -389,7 +389,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointAi2">
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointAi">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -450,7 +450,7 @@
     </set>
     where ID = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointAi2">
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointAi">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.

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

@@ -1,7 +1,7 @@
 <?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.WindTurbineTestingPointDi2Mapper">
-  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.WindTurbineTestingPointDi2">
+<mapper namespace="com.gyee.frame.mapper.auto.WindTurbineTestingPointDiMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.WindTurbineTestingPointDi">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -100,7 +100,7 @@
     REASONABLEMINVAL, WINDTURBINEID, UNIFORMCODE, SHORTID, LONGID, WINDPOWERSTATIONID, 
     REALTIMEID
   </sql>
-  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointDi2Example" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointDiExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -136,7 +136,7 @@
     delete from WINDTURBINETESTINGPOINTDI2
     where ID = #{id,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointDi2Example">
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointDiExample">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -146,7 +146,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointDi2">
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointDi">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -166,7 +166,7 @@
       #{longid,jdbcType=VARCHAR}, #{windpowerstationid,jdbcType=VARCHAR}, #{realtimeid,jdbcType=VARCHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointDi2">
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointDi">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -285,7 +285,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointDi2Example" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointDiExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -389,7 +389,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointDi2">
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointDi">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -450,7 +450,7 @@
     </set>
     where ID = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointDi2">
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointDi">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.

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

@@ -1,7 +1,7 @@
 <?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.Windsubstationtestingpoint2Mapper">
-  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Windsubstationtestingpoint2">
+<mapper namespace="com.gyee.frame.mapper.auto.WindsubstationtestingpointMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Windsubstationtestingpoint">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -97,7 +97,7 @@
     CODE, NAME, MODEL, VALUEUNIT, ENGLISHNAME, TYPEID, MODELID, MAXVAL, MINVAL, REASONABLEMAXVAL, 
     REASONABLEMINVAL, UNIFORMCODE, SHORTID, LONGID, WINDSUBSTATIONID, REALTIMEID
   </sql>
-  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.Windsubstationtestingpoint2Example" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.WindsubstationtestingpointExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -133,7 +133,7 @@
     delete from WINDSUBSTATIONTESTINGPOINT2
     where CODE = #{code,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.Windsubstationtestingpoint2Example">
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WindsubstationtestingpointExample">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -143,7 +143,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.gyee.frame.model.auto.Windsubstationtestingpoint2">
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Windsubstationtestingpoint">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -161,7 +161,7 @@
       #{shortid,jdbcType=VARCHAR}, #{longid,jdbcType=VARCHAR}, #{windsubstationid,jdbcType=VARCHAR}, 
       #{realtimeid,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Windsubstationtestingpoint2">
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Windsubstationtestingpoint">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -268,7 +268,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.gyee.frame.model.auto.Windsubstationtestingpoint2Example" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.WindsubstationtestingpointExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -364,7 +364,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Windsubstationtestingpoint2">
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Windsubstationtestingpoint">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -419,7 +419,7 @@
     </set>
     where CODE = #{code,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Windsubstationtestingpoint2">
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Windsubstationtestingpoint">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.

src/test/java/test/InitialPointServiceTest.java

@@ -1,8 +1,6 @@
 package test;
 
 import com.gyee.SpringbootStart;
-import com.gyee.frame.common.spring.SpringUtils;
-import com.gyee.frame.service.initialpoint.InitialPointEdosService;
 import lombok.SneakyThrows;
 import org.springframework.boot.SpringApplication;
 
@@ -18,13 +16,13 @@ public class InitialPointServiceTest {
 
 
 
-        InitialPointEdosService initialPointEdosService= SpringUtils.getBean("initialPointEdosService");
+//        InitialPointEdosService initialPointEdosService= SpringUtils.getBean("initialPointEdosService");
 
 ////        initialPointEdosService.initalFj();
 //
- //       initialPointEdosService.initalFc(false);
+//       initialPointEdosService.initalFc(false);
 //
-        initialPointEdosService.initalDd();
+//        initialPointEdosService.initalDd();
 //
 //        initialPointEdosService.initalFgl();