后台监视系统功能修正

web/monitor-web-hb/src/main/java/com/gyee/frame/common/conf/V2Config.java

@@ -3,6 +3,8 @@ package com.gyee.frame.common.conf;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+
 /**
  * 读取项目相关配置
  * 
@@ -48,6 +50,16 @@ public class V2Config
     private  static  String weatherurl;
     /** 区域公司key指定IP **/
     private  static  String weatherqygs;
+    /** 海拔信息配置 **/
+    private static Map<String,Double> hbmaps;
+
+    public static Map<String, Double> getHbmaps() {
+        return hbmaps;
+    }
+
+    public  void setHbmaps(Map<String, Double> hbmaps) {
+        V2Config.hbmaps = hbmaps;
+    }
 
     public static String getWeatherurl() {
         return weatherurl;

web/monitor-web-hb/src/main/java/com/gyee/frame/common/conf/ZmConfig.java

@@ -4,6 +4,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 预警配置
@@ -13,205 +14,14 @@ import java.util.List;
 public class ZmConfig {
 
 
-    private static List<String> mhskey;
-    private static List<String> mhspoint;
-    private static List<String> nsskey;
-    private static List<String> nsspoint;
-    private static List<String> qskey;
-    private static List<String> qspoint;
-    private static List<String> sbqkey;
-    private static List<String> sbqpoint;
-    private static List<String> xskey;
-    private static List<String> xspoint;
-    private static List<String> dwkkey;
-    private static List<String> dwkpoint;
-    private static List<String> plyqkey;
-    private static List<String> plyqpoint;
-    private static List<String> pleqkey;
-    private static List<String> pleqpoint;
-    private static List<String> mchkey;
-    private static List<String> mchpoint;
-    private static List<String> xhkey;
-    private static List<String> xhpoint;
-    private static List<String> hzjkey;
-    private static List<String> hzjpoint;
+    private static Map<String,List<String>> maps;
 
-    public static List<String> getHzjkey() {
-        return hzjkey;
-    }
-
-    public void setHzjkey(List<String> hzjkey) {
-        ZmConfig.hzjkey = hzjkey;
-    }
-
-    public static List<String> getHzjpoint() {
-        return hzjpoint;
-    }
-
-    public  void setHzjpoint(List<String> hzjpoint) {
-        ZmConfig.hzjpoint = hzjpoint;
-    }
-
-    public static List<String> getMhskey() {
-        return mhskey;
-    }
-
-    public static List<String> getNsskey() {
-        return nsskey;
-    }
-
-
-    public  void setNsskey(List<String> nsskey) {
-        ZmConfig.nsskey = nsskey;
-    }
-
-    public static List<String> getNsspoint() {
-        return nsspoint;
-    }
-
-    public  void setNsspoint(List<String> nsspoint) {
-        ZmConfig.nsspoint = nsspoint;
-    }
-
-    public static List<String> getQskey() {
-        return qskey;
-    }
-
-    public  void setQskey(List<String> qskey) {
-        ZmConfig.qskey = qskey;
-    }
-
-    public static List<String> getQspoint() {
-        return qspoint;
-    }
-
-    public  void setQspoint(List<String> qspoint) {
-        ZmConfig.qspoint = qspoint;
-    }
-
-    public static List<String> getSbqkey() {
-        return sbqkey;
-    }
-
-    public  void setSbqkey(List<String> sbqkey) {
-        ZmConfig.sbqkey = sbqkey;
-    }
-
-    public static List<String> getSbqpoint() {
-        return sbqpoint;
-    }
-
-    public  void setSbqpoint(List<String> sbqpoint) {
-        ZmConfig.sbqpoint = sbqpoint;
-    }
-
-    public static List<String> getXskey() {
-        return xskey;
-    }
-
-    public  void setXskey(List<String> xskey) {
-        ZmConfig.xskey = xskey;
-    }
-
-    public static List<String> getXspoint() {
-        return xspoint;
-    }
-
-    public  void setXspoint(List<String> xspoint) {
-        ZmConfig.xspoint = xspoint;
-    }
-
-    public static List<String> getDwkkey() {
-        return dwkkey;
-    }
-
-    public  void setDwkkey(List<String> dwkkey) {
-        ZmConfig.dwkkey = dwkkey;
-    }
-
-    public static List<String> getDwkpoint() {
-        return dwkpoint;
-    }
-
-    public  void setDwkpoint(List<String> dwkpoint) {
-        ZmConfig.dwkpoint = dwkpoint;
-    }
-
-    public static List<String> getPlyqkey() {
-        return plyqkey;
-    }
-
-    public  void setPlyqkey(List<String> plyqkey) {
-        ZmConfig.plyqkey = plyqkey;
-    }
 
-    public static List<String> getPlyqpoint() {
-        return plyqpoint;
+    public static Map<String, List<String>> getMaps() {
+        return maps;
     }
 
-    public  void setPlyqpoint(List<String> plyqpoint) {
-        ZmConfig.plyqpoint = plyqpoint;
+    public void setMaps(Map<String, List<String>> maps) {
+        this.maps = maps;
     }
-
-    public static List<String> getPleqkey() {
-        return pleqkey;
-    }
-
-    public  void setPleqkey(List<String> pleqkey) {
-        ZmConfig.pleqkey = pleqkey;
-    }
-
-    public static List<String> getPleqpoint() {
-        return pleqpoint;
-    }
-
-    public  void setPleqpoint(List<String> pleqpoint) {
-        ZmConfig.pleqpoint = pleqpoint;
-    }
-
-    public static List<String> getMchkey() {
-        return mchkey;
-    }
-
-    public  void setMchkey(List<String> mchkey) {
-        ZmConfig.mchkey = mchkey;
-    }
-
-    public static List<String> getMchpoint() {
-        return mchpoint;
-    }
-
-    public  void setMchpoint(List<String> mchpoint) {
-        ZmConfig.mchpoint = mchpoint;
-    }
-
-    public static List<String> getXhkey() {
-        return xhkey;
-    }
-
-    public  void setXhkey(List<String> xhkey) {
-        ZmConfig.xhkey = xhkey;
-    }
-
-    public static List<String> getXhpoint() {
-        return xhpoint;
-    }
-
-    public  void setXhpoint(List<String> xhpoint) {
-        ZmConfig.xhpoint = xhpoint;
-    }
-
-    public  void setMhskey(List<String> mhskey) {
-        ZmConfig.mhskey = mhskey;
-    }
-
-    public static List<String> getMhspoint() {
-        return mhspoint;
-    }
-
-    public  void setMhspoint(List<String> mhspoint) {
-        ZmConfig.mhspoint = mhspoint;
-    }
-
-
 }

web/monitor-web-hb/src/main/java/com/gyee/frame/common/spring/InitialRunner.java

@@ -103,6 +103,7 @@ public class InitialRunner implements CommandLineRunner {
     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, WindTurbineTestingPointAi>> wtPointmap = new HashMap<String, Map<String, WindTurbineTestingPointAi>>();// 风电机测点AI表
+   // public static Map<String, Map<String, Windturbinetestingpointnew>> wtPointmap = new HashMap<String, Map<String, Windturbinetestingpointnew>>();// 风电机测点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>>();//线路测点
@@ -208,7 +209,7 @@ public class InitialRunner implements CommandLineRunner {
 
         WindpowerstationExample windpowerstationExample = new WindpowerstationExample();
         windpowerstationExample.setOrderByClause("ordernum ASC");
-//        windpowerstationExample.createCriteria().andIdNotLike("%MCH%");
+        windpowerstationExample.createCriteria().andIdNotLike("%SY_FDC%");
         wpallls = windpowerstationService.selectByExample(windpowerstationExample);
         if (!wpallls.isEmpty()) {
             for (Windpowerstation wp : wpallls) {
@@ -225,7 +226,7 @@ public class InitialRunner implements CommandLineRunner {
 
         ProjectExample projectExample = new ProjectExample();
         projectExample.setOrderByClause("ordernum ASC");
-        //       projectExample.createCriteria().andWindpowerstationidNotLike("%GDC");
+        projectExample.createCriteria().andWindpowerstationidNotLike("%SY_FDC%");
         pjallls = projectService.selectByExample(projectExample);
 
         if (!pjallls.isEmpty()) {
@@ -279,9 +280,12 @@ public class InitialRunner implements CommandLineRunner {
 
         if (!wtallls.isEmpty()) {
             for (Windturbine wt : wtallls) {
-                if (wt.getWindpowerstationid().endsWith("FDC")) {
-                    wtls.add(wt);
+                if (wpmap.containsKey(wt.getWindpowerstationid())) {
+                    if (wt.getWindpowerstationid().endsWith("FDC")) {
+                        wtls.add(wt);
+                    }
                 }
+
                 wtmap.put(wt.getId(), wt);
             }
         }

web/monitor-web-hb/src/main/java/com/gyee/frame/mapper/auto/WindpowerstationpointnewMapper.java

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

web/monitor-web-hb/src/main/java/com/gyee/frame/mapper/auto/WindpowerstationpointnewMapper.java.1

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

web/monitor-web-hb/src/main/java/com/gyee/frame/mapper/auto/WindpowerstationpointnewMapper.java.2

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

web/monitor-web-hb/src/main/java/com/gyee/frame/mapper/auto/WindturbinetestingpointnewMapper.java

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

web/monitor-web-hb/src/main/java/com/gyee/frame/mapper/auto/WindturbinetestingpointnewMapper.java.1

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

web/monitor-web-hb/src/main/java/com/gyee/frame/mapper/auto/WindturbinetestingpointnewMapper.java.2

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

web/monitor-web-hb/src/main/java/com/gyee/frame/model/auto/Windpowerstationpointnew.java

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

web/monitor-web-hb/src/main/java/com/gyee/frame/model/auto/Windpowerstationpointnew.java.1

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

web/monitor-web-hb/src/main/java/com/gyee/frame/model/auto/Windpowerstationpointnew.java.2

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

web/monitor-web-hb/src/main/java/com/gyee/frame/model/auto/Windturbinetestingpointnew.java

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

web/monitor-web-hb/src/main/java/com/gyee/frame/model/auto/Windturbinetestingpointnew.java.1

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

web/monitor-web-hb/src/main/java/com/gyee/frame/model/auto/Windturbinetestingpointnew.java.2

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

web/monitor-web-hb/src/main/java/com/gyee/frame/service/ForecastwindspeedService.java

@@ -1,5 +1,6 @@
 package com.gyee.frame.service;
 
+import com.gyee.frame.common.conf.V2Config;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.auto.Line;
 import com.gyee.frame.model.auto.Project;
@@ -32,7 +33,7 @@ public class ForecastwindspeedService  {
 		if(StringUtils.notEmp(wpId))
 		{
 
-			if(wpId.equals(QS) || wpId.equals(FD))
+			if(wpId.equals(QS) || wpId.equals(FD) || wpId.equals(V2Config.getWeatherqygs()))
 			{
 				for(Windpowerstation wp: InitialRunner.wpls)
 				{
@@ -44,51 +45,57 @@ public class ForecastwindspeedService  {
 					{
 						java.util.List<Map<String,Object>> weatherls=(java.util.List<Map<String,Object>>)weathermap.get("ls");
 
-						int num=0;
-						for(int j=0;j<5;j++)
-						{
-							Map<Double, Integer> speedmap = new HashMap<Double, Integer>();
-							for (int i=num;i<num+8;i++) {
-
-								Map<String,Object> wh=weatherls.get(i);
-
-								double fs=(double)wh.get("fs");
-
-								if (speedmap.containsKey(fs)) {
-									int temp = speedmap.get(fs) + 180;
-									speedmap.put(fs, temp);
-								} else {
-									speedmap.put(fs, 180);
-								}
-							}
-							switch (j)
-							{
-								case 0:
-									double ycfdl = powerToPowerService.getPowerByWp(speedmap, wp.getId(), 1);
-									vo.setValue1(MathUtil.twoBit(ycfdl));
-									break;
-								case 1:
-									ycfdl = powerToPowerService.getPowerByWp(speedmap, wp.getId(), 1);
-									vo.setValue2(MathUtil.twoBit(ycfdl));
-									break;
-								case 2:
-									ycfdl = powerToPowerService.getPowerByWp(speedmap, wp.getId(), 1);
-									vo.setValue3(MathUtil.twoBit(ycfdl));
-									break;
-								case 3:
-									ycfdl = powerToPowerService.getPowerByWp(speedmap, wp.getId(), 1);
-									vo.setValue4(MathUtil.twoBit(ycfdl));
-									break;
-								case 4:
-									ycfdl = powerToPowerService.getPowerByWp(speedmap, wp.getId(), 1);
-									vo.setValue5(MathUtil.twoBit(ycfdl));
-									break;
-							}
-							num=num+8;
-
-						}
-
-						vos.add(vo);
+
+						if(!weatherls.isEmpty())
+                        {
+                            int num=0;
+                            for(int j=0;j<5;j++)
+                            {
+                                Map<Double, Integer> speedmap = new HashMap<Double, Integer>();
+                                for (int i=num;i<num+8;i++) {
+
+                                    Map<String,Object> wh=weatherls.get(i);
+
+                                    double fs=(double)wh.get("fs");
+
+                                    if (speedmap.containsKey(fs)) {
+                                        int temp = speedmap.get(fs) + 180;
+                                        speedmap.put(fs, temp);
+                                    } else {
+                                        speedmap.put(fs, 180);
+                                    }
+                                }
+                                switch (j)
+                                {
+                                    case 0:
+                                        double ycfdl = powerToPowerService.getPowerByWp(speedmap, wp.getId(), 1);
+                                        vo.setValue1(MathUtil.twoBit(ycfdl));
+                                        break;
+                                    case 1:
+                                        ycfdl = powerToPowerService.getPowerByWp(speedmap, wp.getId(), 1);
+                                        vo.setValue2(MathUtil.twoBit(ycfdl));
+                                        break;
+                                    case 2:
+                                        ycfdl = powerToPowerService.getPowerByWp(speedmap, wp.getId(), 1);
+                                        vo.setValue3(MathUtil.twoBit(ycfdl));
+                                        break;
+                                    case 3:
+                                        ycfdl = powerToPowerService.getPowerByWp(speedmap, wp.getId(), 1);
+                                        vo.setValue4(MathUtil.twoBit(ycfdl));
+                                        break;
+                                    case 4:
+                                        ycfdl = powerToPowerService.getPowerByWp(speedmap, wp.getId(), 1);
+                                        vo.setValue5(MathUtil.twoBit(ycfdl));
+                                        break;
+                                }
+                                num=num+8;
+
+                            }
+
+                            vos.add(vo);
+
+                        }
+
 					}
 
 				}
@@ -103,52 +110,55 @@ public class ForecastwindspeedService  {
 					if(!weathermap.isEmpty() && weathermap.containsKey("ls"))
 					{
 						java.util.List<Map<String,Object>> weatherls=(java.util.List<Map<String,Object>>)weathermap.get("ls");
+                        if(!weatherls.isEmpty())
+                        {
+                            int num=0;
+                            for(int j=0;j<5;j++)
+                            {
+                                Map<Double, Integer> speedmap = new HashMap<Double, Integer>();
+                                for (int i=num;i<num+8;i++) {
+
+                                    Map<String,Object> wh=weatherls.get(i);
+
+                                    double fs=(double)wh.get("fs");
+
+                                    if (speedmap.containsKey(fs)) {
+                                        int temp = speedmap.get(fs) + 180;
+                                        speedmap.put(fs, temp);
+                                    } else {
+                                        speedmap.put(fs, 180);
+                                    }
+                                }
+                                switch (j)
+                                {
+                                    case 0:
+                                        double ycfdl = powerToPowerService.getPowerByWp(speedmap, pj.getId(), 1);
+                                        vo.setValue1(MathUtil.twoBit(ycfdl));
+                                        break;
+                                    case 1:
+                                        ycfdl = powerToPowerService.getPowerByWp(speedmap, pj.getId(), 1);
+                                        vo.setValue2(MathUtil.twoBit(ycfdl));
+                                        break;
+                                    case 2:
+                                        ycfdl = powerToPowerService.getPowerByWp(speedmap, pj.getId(), 1);
+                                        vo.setValue3(MathUtil.twoBit(ycfdl));
+                                        break;
+                                    case 3:
+                                        ycfdl = powerToPowerService.getPowerByWp(speedmap, pj.getId(), 1);
+                                        vo.setValue4(MathUtil.twoBit(ycfdl));
+                                        break;
+                                    case 4:
+                                        ycfdl = powerToPowerService.getPowerByWp(speedmap, pj.getId(), 1);
+                                        vo.setValue5(MathUtil.twoBit(ycfdl));
+                                        break;
+                                }
+                                num=num+8;
+
+                            }
+
+                            vos.add(vo);
+                        }
 
-						int num=0;
-						for(int j=0;j<5;j++)
-						{
-							Map<Double, Integer> speedmap = new HashMap<Double, Integer>();
-							for (int i=num;i<num+8;i++) {
-
-								Map<String,Object> wh=weatherls.get(i);
-
-								double fs=(double)wh.get("fs");
-
-								if (speedmap.containsKey(fs)) {
-									int temp = speedmap.get(fs) + 180;
-									speedmap.put(fs, temp);
-								} else {
-									speedmap.put(fs, 180);
-								}
-							}
-							switch (j)
-							{
-								case 0:
-									double ycfdl = powerToPowerService.getPowerByWp(speedmap, pj.getId(), 1);
-									vo.setValue1(MathUtil.twoBit(ycfdl));
-									break;
-								case 1:
-									ycfdl = powerToPowerService.getPowerByWp(speedmap, pj.getId(), 1);
-									vo.setValue2(MathUtil.twoBit(ycfdl));
-									break;
-								case 2:
-									ycfdl = powerToPowerService.getPowerByWp(speedmap, pj.getId(), 1);
-									vo.setValue3(MathUtil.twoBit(ycfdl));
-									break;
-								case 3:
-									ycfdl = powerToPowerService.getPowerByWp(speedmap, pj.getId(), 1);
-									vo.setValue4(MathUtil.twoBit(ycfdl));
-									break;
-								case 4:
-									ycfdl = powerToPowerService.getPowerByWp(speedmap, pj.getId(), 1);
-									vo.setValue5(MathUtil.twoBit(ycfdl));
-									break;
-							}
-							num=num+8;
-
-						}
-
-						vos.add(vo);
 					}
 				}
 			}else if(InitialRunner.pjmap.containsKey(wpId))
@@ -162,52 +172,55 @@ public class ForecastwindspeedService  {
 					if(!weathermap.isEmpty() && weathermap.containsKey("ls"))
 					{
 						java.util.List<Map<String,Object>> weatherls=(java.util.List<Map<String,Object>>)weathermap.get("ls");
+                        if(!weatherls.isEmpty())
+                        {
+                            int num=0;
+                            for(int j=0;j<5;j++)
+                            {
+                                Map<Double, Integer> speedmap = new HashMap<Double, Integer>();
+                                for (int i=num;i<num+8;i++) {
+
+                                    Map<String,Object> wh=weatherls.get(i);
+
+                                    double fs=(double)wh.get("fs");
+
+                                    if (speedmap.containsKey(fs)) {
+                                        int temp = speedmap.get(fs) + 180;
+                                        speedmap.put(fs, temp);
+                                    } else {
+                                        speedmap.put(fs, 180);
+                                    }
+                                }
+                                switch (j)
+                                {
+                                    case 0:
+                                        double ycfdl = powerToPowerService.getPowerByWp(speedmap, ln.getId(), 1);
+                                        vo.setValue1(MathUtil.twoBit(ycfdl));
+                                        break;
+                                    case 1:
+                                        ycfdl = powerToPowerService.getPowerByWp(speedmap, ln.getId(), 1);
+                                        vo.setValue2(MathUtil.twoBit(ycfdl));
+                                        break;
+                                    case 2:
+                                        ycfdl = powerToPowerService.getPowerByWp(speedmap, ln.getId(), 1);
+                                        vo.setValue3(MathUtil.twoBit(ycfdl));
+                                        break;
+                                    case 3:
+                                        ycfdl = powerToPowerService.getPowerByWp(speedmap, ln.getId(), 1);
+                                        vo.setValue4(MathUtil.twoBit(ycfdl));
+                                        break;
+                                    case 4:
+                                        ycfdl = powerToPowerService.getPowerByWp(speedmap, ln.getId(), 1);
+                                        vo.setValue5(MathUtil.twoBit(ycfdl));
+                                        break;
+                                }
+                                num=num+8;
+
+                            }
+
+                            vos.add(vo);
+                        }
 
-						int num=0;
-						for(int j=0;j<5;j++)
-						{
-							Map<Double, Integer> speedmap = new HashMap<Double, Integer>();
-							for (int i=num;i<num+8;i++) {
-
-								Map<String,Object> wh=weatherls.get(i);
-
-								double fs=(double)wh.get("fs");
-
-								if (speedmap.containsKey(fs)) {
-									int temp = speedmap.get(fs) + 180;
-									speedmap.put(fs, temp);
-								} else {
-									speedmap.put(fs, 180);
-								}
-							}
-							switch (j)
-							{
-								case 0:
-									double ycfdl = powerToPowerService.getPowerByWp(speedmap, ln.getId(), 1);
-									vo.setValue1(MathUtil.twoBit(ycfdl));
-									break;
-								case 1:
-									ycfdl = powerToPowerService.getPowerByWp(speedmap, ln.getId(), 1);
-									vo.setValue2(MathUtil.twoBit(ycfdl));
-									break;
-								case 2:
-									ycfdl = powerToPowerService.getPowerByWp(speedmap, ln.getId(), 1);
-									vo.setValue3(MathUtil.twoBit(ycfdl));
-									break;
-								case 3:
-									ycfdl = powerToPowerService.getPowerByWp(speedmap, ln.getId(), 1);
-									vo.setValue4(MathUtil.twoBit(ycfdl));
-									break;
-								case 4:
-									ycfdl = powerToPowerService.getPowerByWp(speedmap, ln.getId(), 1);
-									vo.setValue5(MathUtil.twoBit(ycfdl));
-									break;
-							}
-							num=num+8;
-
-						}
-
-						vos.add(vo);
 					}
 				}
 			}else if(InitialRunner.lnmap.containsKey(wpId))
@@ -221,52 +234,55 @@ public class ForecastwindspeedService  {
 					if(!weathermap.isEmpty() && weathermap.containsKey("ls"))
 					{
 						java.util.List<Map<String,Object>> weatherls=(java.util.List<Map<String,Object>>)weathermap.get("ls");
+                        if(!weatherls.isEmpty())
+                        {
+                            int num=0;
+                            for(int j=0;j<5;j++)
+                            {
+                                Map<Double, Integer> speedmap = new HashMap<Double, Integer>();
+                                for (int i=num;i<num+8;i++) {
+
+                                    Map<String,Object> wh=weatherls.get(i);
+
+                                    double fs=(double)wh.get("fs");
+
+                                    if (speedmap.containsKey(fs)) {
+                                        int temp = speedmap.get(fs) + 180;
+                                        speedmap.put(fs, temp);
+                                    } else {
+                                        speedmap.put(fs, 180);
+                                    }
+                                }
+                                switch (j)
+                                {
+                                    case 0:
+                                        double ycfdl = powerToPowerService.getPowerByWp(speedmap, wt.getId(), 1);
+                                        vo.setValue1(MathUtil.twoBit(ycfdl));
+                                        break;
+                                    case 1:
+                                        ycfdl = powerToPowerService.getPowerByWp(speedmap, wt.getId(), 1);
+                                        vo.setValue2(MathUtil.twoBit(ycfdl));
+                                        break;
+                                    case 2:
+                                        ycfdl = powerToPowerService.getPowerByWp(speedmap, wt.getId(), 1);
+                                        vo.setValue3(MathUtil.twoBit(ycfdl));
+                                        break;
+                                    case 3:
+                                        ycfdl = powerToPowerService.getPowerByWp(speedmap, wt.getId(), 1);
+                                        vo.setValue4(MathUtil.twoBit(ycfdl));
+                                        break;
+                                    case 4:
+                                        ycfdl = powerToPowerService.getPowerByWp(speedmap, wt.getId(), 1);
+                                        vo.setValue5(MathUtil.twoBit(ycfdl));
+                                        break;
+                                }
+                                num=num+8;
+
+                            }
+
+                            vos.add(vo);
+                        }
 
-						int num=0;
-						for(int j=0;j<5;j++)
-						{
-							Map<Double, Integer> speedmap = new HashMap<Double, Integer>();
-							for (int i=num;i<num+8;i++) {
-
-								Map<String,Object> wh=weatherls.get(i);
-
-								double fs=(double)wh.get("fs");
-
-								if (speedmap.containsKey(fs)) {
-									int temp = speedmap.get(fs) + 180;
-									speedmap.put(fs, temp);
-								} else {
-									speedmap.put(fs, 180);
-								}
-							}
-							switch (j)
-							{
-								case 0:
-									double ycfdl = powerToPowerService.getPowerByWp(speedmap, wt.getId(), 1);
-									vo.setValue1(MathUtil.twoBit(ycfdl));
-									break;
-								case 1:
-									ycfdl = powerToPowerService.getPowerByWp(speedmap, wt.getId(), 1);
-									vo.setValue2(MathUtil.twoBit(ycfdl));
-									break;
-								case 2:
-									ycfdl = powerToPowerService.getPowerByWp(speedmap, wt.getId(), 1);
-									vo.setValue3(MathUtil.twoBit(ycfdl));
-									break;
-								case 3:
-									ycfdl = powerToPowerService.getPowerByWp(speedmap, wt.getId(), 1);
-									vo.setValue4(MathUtil.twoBit(ycfdl));
-									break;
-								case 4:
-									ycfdl = powerToPowerService.getPowerByWp(speedmap, wt.getId(), 1);
-									vo.setValue5(MathUtil.twoBit(ycfdl));
-									break;
-							}
-							num=num+8;
-
-						}
-
-						vos.add(vo);
 					}
 				}
 			}

web/monitor-web-hb/src/main/java/com/gyee/frame/service/WindturbinetestingpointnewService.java

@@ -0,0 +1,265 @@
+package com.gyee.frame.service;
+
+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.WindturbinetestingpointnewMapper;
+import com.gyee.frame.model.auto.Windturbinetestingpointnew;
+import com.gyee.frame.model.auto.WindturbinetestingpointnewExample;
+import com.gyee.frame.model.custom.Tablepar;
+import com.gyee.frame.util.SnowflakeIdWorker;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 风机AI测点 WindTurbineTestingPointDiService
+ * @Title: WindTurbineTestingPointDiService.java 
+ * @Package com.gyee.frame.service 
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2019-12-31 14:58:09  
+ **/
+@Service
+public class WindturbinetestingpointnewService implements BaseService<Windturbinetestingpointnew, WindturbinetestingpointnewExample> {
+	@Resource
+	private WindturbinetestingpointnewMapper windturbinetestingpointnewMapper;
+	
+      	   	      	      	      	      	      	      	      	      	      	
+	/**
+	 * 分页查询
+	 * @param tablepar
+	 * @param name
+	 * @return
+	 */
+	 public PageInfo<Windturbinetestingpointnew> list(Tablepar tablepar, String name){
+	        WindturbinetestingpointnewExample testExample=new WindturbinetestingpointnewExample();
+	        testExample.setOrderByClause("id ASC");
+	        if(name!=null&&!"".equals(name)){
+	        	testExample.createCriteria().andCodeLike("%"+name+"%");
+	        }
+
+	        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+	        List<Windturbinetestingpointnew> list= windturbinetestingpointnewMapper.selectByExample(testExample);
+	        PageInfo<Windturbinetestingpointnew> pageInfo = new PageInfo<Windturbinetestingpointnew>(list);
+	        return  pageInfo;
+	 }
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista=Convert.toListStrArray(ids);
+			WindturbinetestingpointnewExample example=new WindturbinetestingpointnewExample();
+			example.createCriteria().andIdIn(lista);
+			return windturbinetestingpointnewMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public Windturbinetestingpointnew selectByPrimaryKey(String id) {
+				
+			return windturbinetestingpointnewMapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(Windturbinetestingpointnew record) {
+		return windturbinetestingpointnewMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Windturbinetestingpointnew record) {
+				
+		//添加雪花主键id
+		record.setId(SnowflakeIdWorker.getUUID());
+			
+				
+		return windturbinetestingpointnewMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(Windturbinetestingpointnew record, WindturbinetestingpointnewExample example) {
+		
+		return windturbinetestingpointnewMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(Windturbinetestingpointnew record, WindturbinetestingpointnewExample example) {
+		
+		return windturbinetestingpointnewMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Windturbinetestingpointnew> selectByExample(WindturbinetestingpointnewExample example) {
+		
+		return windturbinetestingpointnewMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(WindturbinetestingpointnewExample example) {
+		
+		return windturbinetestingpointnewMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(WindturbinetestingpointnewExample example) {
+		
+		return windturbinetestingpointnewMapper.deleteByExample(example);
+	}
+	
+	/**
+	 * 检查name
+	 * @param windTurbineTestingPointDi
+	 * @return
+	 */
+	public int checkNameUnique(Windturbinetestingpointnew windTurbineTestingPointDi){
+		WindturbinetestingpointnewExample example=new WindturbinetestingpointnewExample();
+		example.createCriteria().andCodeEqualTo(windTurbineTestingPointDi.getCode());
+		List<Windturbinetestingpointnew> list=windturbinetestingpointnewMapper.selectByExample(example);
+		return list.size();
+	}
+
+	public Windturbinetestingpointnew getWindTurbineTestingPointDi2(String wtId, String unicode)  {
+
+		Windturbinetestingpointnew point=new Windturbinetestingpointnew();
+		if(StringUtils.notEmp(wtId) && StringUtils.notEmp(unicode) )
+		{
+			WindturbinetestingpointnewExample example=new WindturbinetestingpointnewExample();
+			example.setOrderByClause("id ASC");
+			WindturbinetestingpointnewExample.Criteria criteria =example.createCriteria();
+			criteria.andWindturbineidEqualTo(wtId);
+			criteria.andUniformcodeEqualTo(unicode);
+			List<Windturbinetestingpointnew> list= windturbinetestingpointnewMapper.selectByExample(example);
+			if(!list.isEmpty())
+			{
+				point=list.get(0);
+			}
+		}
+
+		return point;
+	}
+
+	public List<Windturbinetestingpointnew> getWindTurbineTestingPointDi2List(String wtId, List<String> unicoadels)  {
+
+		List<Windturbinetestingpointnew> list=new ArrayList<>();
+
+
+		if(StringUtils.notEmp(wtId)  && StringUtils.notEmp(unicoadels))
+		{
+			WindturbinetestingpointnewExample example=new WindturbinetestingpointnewExample();
+			example.setOrderByClause("id ASC");
+			example.isDistinct();
+			WindturbinetestingpointnewExample.Criteria criteria =example.createCriteria();
+			criteria.andWindturbineidEqualTo(wtId);
+			criteria.andUniformcodeIn(unicoadels);
+			list= windturbinetestingpointnewMapper.selectByExample(example);
+
+		}
+
+		return list;
+	}
+
+	public List<Windturbinetestingpointnew> getWindTurbineTestingPointDi2List(String wtId)  {
+
+		List<Windturbinetestingpointnew> list=new ArrayList<>();
+
+
+		if(StringUtils.notEmp(wtId))
+		{
+			WindturbinetestingpointnewExample example=new WindturbinetestingpointnewExample();
+			example.setOrderByClause("id ASC");
+			example.isDistinct();
+			WindturbinetestingpointnewExample.Criteria criteria =example.createCriteria();
+			criteria.andWindturbineidEqualTo(wtId);
+			list= windturbinetestingpointnewMapper.selectByExample(example);
+
+		}
+
+		return list;
+	}
+
+
+
+//    public Windturbinetestingpointnew getWindTurbineTestingPointAi2(String wtId, String unicode)  {
+//
+//        Windturbinetestingpointnew point=new Windturbinetestingpointnew();
+//        if(StringUtils.notEmp(wtId) && StringUtils.notEmp(unicode) )
+//        {
+//            if(InitialRunner.wtmap.containsKey(wtId))
+//            {
+//                if(InitialRunner.wtPointmap.containsKey(wtId))
+//                {
+//                    Map<String, Windturbinetestingpointnew> map=InitialRunner.wtPointmap.get(wtId);
+//                    if(map.containsKey(unicode))
+//                    {
+//                        point=map.get(unicode);
+//                    }
+//                }
+//            }
+//        }
+//
+//        return point;
+//    }
+//
+//
+//    /**
+//     * 通过统一编码查询指定场站的点
+//     *
+//     * @param station     场站
+//     * @param wtId        风机ID
+//     * @param uniformCode 统一编码
+//     * @return
+//     */
+//    public List<Windturbinetestingpointnew> findPointsByUniformCodeAndStation(String station, String wtId, String uniformCode) {
+//        WindturbinetestingpointnewExample example = new WindturbinetestingpointnewExample();
+//        example.createCriteria().andUniformcodeEqualTo(uniformCode)
+//                .andWindturbineidEqualTo(wtId)
+//                .andWindpowerstationidEqualTo(station);
+//
+//        List<Windturbinetestingpointnew> list = windTurbineTestingPointAi2Mapper.selectByExample(example);
+//
+//        return list;
+//    }
+//
+//    public List<String> findPointByUniformcode(List<String> list,List<String> models){
+//        List<String> lists = new ArrayList<>();
+//
+//        for (String model : models){
+//            for (String ls : list){
+//                WindturbinetestingpointnewExample example = new WindturbinetestingpointnewExample();
+//                example.createCriteria().andUniformcodeEqualTo(ls).andModelidLike("%"+model+"%");
+//
+//                List<Windturbinetestingpointnew> winds = windTurbineTestingPointAi2Mapper.selectByExample(example);
+//
+//                if (winds == null || winds.size() == 0)
+//                    continue;
+//
+//                for (Windturbinetestingpointnew wind : winds) {
+//                    if (wind != null && wind.getId().contains("FJ")) {
+//                        lists.add(wind.getId() + "$" + wind.getName() + "@" + wind.getModelid());
+////						System.out.println(wind.getId() + "," + wind.getModelid());
+//                        break;
+//                    }
+//                }
+//            }
+//        }
+//
+//
+//        return lists;
+//    }
+}

web/monitor-web-hb/src/main/java/com/gyee/frame/service/initialpoint/InitialPointEdosService.java

@@ -698,6 +698,12 @@ public class InitialPointEdosService implements  IinitialPoint{
 
 
                         po.setRealtimeid(String.valueOf(sb));
+
+
+                        sb =new StringBuilder();
+                        temp=wp.getId().substring(0,wp.getId().indexOf("_"));
+                        sb.append("GDHF.JSFW").append(temp).append("YC");
+                        po.setRealtimeid(String.valueOf(sb));
                     }
                     points.add(po);
                 }

web/monitor-web-hb/src/main/java/com/gyee/frame/service/websocket/GeneralAppearancePushService.java

@@ -131,54 +131,14 @@ public class GeneralAppearancePushService {
 
         if (StringUtils.notEmp(wpId)) {
 
-            switch (wpId) {
-                case "MHS_FDC":
-                    namels= ZmConfig.getMhskey();
-                    valuels= ZmConfig.getMhspoint();
-                    break;
-                case "NSS_FDC":
-                    namels= ZmConfig.getNsskey();
-                    valuels= ZmConfig.getNsspoint();
-                    break;
-                case "QS_FDC":
-                    namels= ZmConfig.getQskey();
-                    valuels= ZmConfig.getQspoint();
-                    break;
-                case "SBQ_FDC":
-                    namels= ZmConfig.getSbqkey();
-                    valuels= ZmConfig.getSbqpoint();
-                    break;
-                case "XS_FDC":
-                    namels= ZmConfig.getXskey();
-                    valuels= ZmConfig.getXspoint();
-                    break;
-                case "DWK_GDC":
-                    namels= ZmConfig.getDwkkey();
-                    valuels= ZmConfig.getDwkpoint();
-                    break;
-                case "PL01_GC":
-                    namels= ZmConfig.getPlyqkey();
-                    valuels= ZmConfig.getPlyqpoint();
-                    break;
-                case "PL02_GC":
-                    namels= ZmConfig.getPleqkey();
-                    valuels= ZmConfig.getPleqpoint();
-                    break;
-                case "MCH_GDC":
-                    namels= ZmConfig.getMchkey();
-                    valuels= ZmConfig.getMchpoint();
-                    break;
-                case "XH_GDC":
-                    namels= ZmConfig.getXhkey();
-                    valuels= ZmConfig.getXhpoint();
-                    break;
-                case "HZJ_GDC":
-                    namels= ZmConfig.getHzjkey();
-                    valuels= ZmConfig.getHzjpoint();
-                    break;
-
-                default:
+            if(ZmConfig.getMaps().containsKey(wpId+"_KEY"))
+            {
+                namels= ZmConfig.getMaps().get(wpId+"_KEY");
+            }
 
+            if(ZmConfig.getMaps().containsKey(wpId+"_VALUES"))
+            {
+                valuels= ZmConfig.getMaps().get(wpId+"_VALUES");
             }
 
 

web/monitor-web-hb/src/main/java/com/gyee/frame/service/websocket/GenreSetPushService.java

@@ -1,10 +1,10 @@
 package com.gyee.frame.service.websocket;
 
 
+import com.gyee.frame.common.conf.V2Config;
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.ConstantTR;
 import com.gyee.frame.common.spring.InitialRunner;
-import com.gyee.frame.common.spring.WpEnum;
 import com.gyee.frame.model.auto.*;
 import com.gyee.frame.model.custom.DNAVal;
 import com.gyee.frame.model.custom.DataVo;
@@ -372,10 +372,10 @@ public class GenreSetPushService {
                 // 节约水
                 int jys = (int)(realApiUtil.getRealData(ConstantTR.JYS).getPointValueInDouble() * 10000);
 
-                Double gfsjgl = realApiUtil.getRealData(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(GF, Constant.TPOINT_WP_SJGL)).getPointValueInDouble();
-
-                bzgl = bzgl + gfsjgl;
-                yfgl = yfgl + gfsjgl;
+//                Double gfsjgl = realApiUtil.getRealData(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(GF, Constant.TPOINT_WP_SJGL)).getPointValueInDouble();
+//
+//                bzgl = bzgl + gfsjgl;
+//                yfgl = yfgl + gfsjgl;
 
                 jczbmap.put("jpeyht", StringUtils.round(jpeyht, 2));
                 jczbmap.put("jybm", StringUtils.round(jybm, 2));
@@ -1623,7 +1623,7 @@ public class GenreSetPushService {
 
         String[] ids=new String[wxssls.size()];
 
-        DNAVal[] wxsslist = realApiUtil.getHistMatrix(wxssls.toArray(ids),DateUtils.truncate(cal.getTime()).getTime());
+        DNAVal[] wxsslist = realApiUtil.getHistMatrix(wxssls.toArray(ids),DateUtils.truncate(cal.getTime()).getTime()/1000);
 
         if (wxsslist.length == wxssls.size()) {
 
@@ -1995,68 +1995,79 @@ public class GenreSetPushService {
 //
 //                }
                 PointData ptValue =null;
-                if (wpId.equals(WpEnum.MHS_FDC.name())) {
-                    ptValue = realApiUtil.getRealData(ConstantTR.MHSFGL_AI000305);
-                    retValue.put("dqwd", StringUtils.round(ptValue.getPointValueInDouble(), 0));
-                    retValue.put("hb", 1893.0);
-                    ptValue = realApiUtil.getRealData(ConstantTR.JSFW_MHSSFS);
-                    retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
-                } else if (wpId.equals(WpEnum.NSS_FDC.name())) {
-                    ptValue = realApiUtil.getRealData(ConstantTR.NSSWD);
-                    retValue.put("dqwd", StringUtils.round(ptValue.getPointValueInDouble(), 0));
-                    retValue.put("hb", 1810.0);
-                    ptValue = realApiUtil.getRealData(ConstantTR.NSSPJFS);
-                    retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
-                } else if (wpId.equals(WpEnum.QS_FDC.name())) {
-                    ptValue = realApiUtil.getRealData(ConstantTR.QSWD);
-                    retValue.put("dqwd", StringUtils.round(ptValue.getPointValueInDouble(), 0));
-                    retValue.put("hb", 1573.0);
-                    ptValue = realApiUtil.getRealData(ConstantTR.QSPJFS);
-                    retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
-
-                } else if (wpId.equals(WpEnum.SBQ_FDC.name())) {
-                    ptValue = realApiUtil.getRealData(ConstantTR.SBQFGL_AI000305);
-                    retValue.put("dqwd", StringUtils.round(ptValue.getPointValueInDouble(), 0));
-                    retValue.put("hb", 1357.0);
-                    ptValue = realApiUtil.getRealData(ConstantTR.JSFW_SBSSFS);
-                    retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
-                } else if (wpId.equals(WpEnum.DWK_GDC.name())) {
-                    ptValue = realApiUtil.getRealData(ConstantTR.DWKWD);
-                    retValue.put("dqwd", StringUtils.round(ptValue.getPointValueInDouble(), 0));
-                    retValue.put("hb", 1100.0);
-                    ptValue = realApiUtil.getRealData(ConstantTR.DWKPJFS);
-                    retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
-                } else if (wpId.equals(WpEnum.PL_GDC.name())) {
-                    ptValue = realApiUtil.getRealData(ConstantTR.PLWD);
-                    retValue.put("dqwd", StringUtils.round(ptValue.getPointValueInDouble(), 0));
-                    retValue.put("hb", 1080.0);
-                    ptValue = realApiUtil.getRealData(ConstantTR.PLPJFS);
-                    retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
-                } else if (wpId.equals(WpEnum.MCH_GDC.name())) {
-                    ptValue = realApiUtil.getRealData(ConstantTR.MCHWD);
-                    retValue.put("dqwd", StringUtils.round(ptValue.getPointValueInDouble(), 0));
-                    retValue.put("hb", 1360.0);
-                    ptValue = realApiUtil.getRealData(ConstantTR.MCHPJFS);
-                    retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
-                } else if (wpId.equals(WpEnum.XH_GDC.name())) {
-                    ptValue = realApiUtil.getRealData(ConstantTR.XHWD);
-                    retValue.put("dqwd", StringUtils.round(ptValue.getPointValueInDouble(), 0));
-                    retValue.put("hb", 1385.0);
-                    ptValue = realApiUtil.getRealData(ConstantTR.XHPJFS);
-                    retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
-                }  else if (wpId.equals(WpEnum.HZJ_GDC.name())) {
-                    ptValue = realApiUtil.getRealData(ConstantTR.HZJWD);
-                    retValue.put("dqwd", StringUtils.round(ptValue.getPointValueInDouble(), 0));
-                    retValue.put("hb", 1385.0);
-                    ptValue = realApiUtil.getRealData(ConstantTR.HZJPJFS);
-                    retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
-                } else if (wpId.equals(WpEnum.XS_FDC.name())) {
-                    ptValue = realApiUtil.getRealData(ConstantTR.XSWD);
-                    retValue.put("dqwd", StringUtils.round(ptValue.getPointValueInDouble(), 0));
-                    retValue.put("hb", 2210.0);
-                    ptValue = realApiUtil.getRealData(ConstantTR.XSPJFS);
-                    retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
+                WindPowerStationTestingPoint wd = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_FCCFTWD);
+                ptValue = realApiUtil.getRealData(wd);
+                retValue.put("dqwd", StringUtils.round(ptValue.getPointValueInDouble(), 0));
+                WindPowerStationTestingPoint fs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
+                ptValue = realApiUtil.getRealData(fs);
+                retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
+
+
+                if(V2Config.getHbmaps().containsKey(wpId+"_KEY"))
+                {
+                    retValue.put("hb", V2Config.getHbmaps().get(wpId+"_KEY"));
                 }
+//                if (wpId.equals(WpEnum.MHS_FDC.name())) {
+//
+//
+//                    retValue.put("hb", 1893.0);
+//
+//                } else if (wpId.equals(WpEnum.NSS_FDC.name())) {
+//                    ptValue = realApiUtil.getRealData(ConstantTR.NSSWD);
+//                    retValue.put("dqwd", StringUtils.round(ptValue.getPointValueInDouble(), 0));
+//                    retValue.put("hb", 1810.0);
+//                    ptValue = realApiUtil.getRealData(ConstantTR.NSSPJFS);
+//                    retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
+//                } else if (wpId.equals(WpEnum.QS_FDC.name())) {
+//                    ptValue = realApiUtil.getRealData(ConstantTR.QSWD);
+//                    retValue.put("dqwd", StringUtils.round(ptValue.getPointValueInDouble(), 0));
+//                    retValue.put("hb", 1573.0);
+//                    ptValue = realApiUtil.getRealData(ConstantTR.QSPJFS);
+//                    retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
+//
+//                } else if (wpId.equals(WpEnum.SBQ_FDC.name())) {
+//                    ptValue = realApiUtil.getRealData(ConstantTR.SBQFGL_AI000305);
+//                    retValue.put("dqwd", StringUtils.round(ptValue.getPointValueInDouble(), 0));
+//                    retValue.put("hb", 1357.0);
+//                    ptValue = realApiUtil.getRealData(ConstantTR.JSFW_SBSSFS);
+//                    retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
+//                } else if (wpId.equals(WpEnum.DWK_GDC.name())) {
+//                    ptValue = realApiUtil.getRealData(ConstantTR.DWKWD);
+//                    retValue.put("dqwd", StringUtils.round(ptValue.getPointValueInDouble(), 0));
+//                    retValue.put("hb", 1100.0);
+//                    ptValue = realApiUtil.getRealData(ConstantTR.DWKPJFS);
+//                    retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
+//                } else if (wpId.equals(WpEnum.PL_GDC.name())) {
+//                    ptValue = realApiUtil.getRealData(ConstantTR.PLWD);
+//                    retValue.put("dqwd", StringUtils.round(ptValue.getPointValueInDouble(), 0));
+//                    retValue.put("hb", 1080.0);
+//                    ptValue = realApiUtil.getRealData(ConstantTR.PLPJFS);
+//                    retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
+//                } else if (wpId.equals(WpEnum.MCH_GDC.name())) {
+//                    ptValue = realApiUtil.getRealData(ConstantTR.MCHWD);
+//                    retValue.put("dqwd", StringUtils.round(ptValue.getPointValueInDouble(), 0));
+//                    retValue.put("hb", 1360.0);
+//                    ptValue = realApiUtil.getRealData(ConstantTR.MCHPJFS);
+//                    retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
+//                } else if (wpId.equals(WpEnum.XH_GDC.name())) {
+//                    ptValue = realApiUtil.getRealData(ConstantTR.XHWD);
+//                    retValue.put("dqwd", StringUtils.round(ptValue.getPointValueInDouble(), 0));
+//                    retValue.put("hb", 1385.0);
+//                    ptValue = realApiUtil.getRealData(ConstantTR.XHPJFS);
+//                    retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
+//                }  else if (wpId.equals(WpEnum.HZJ_GDC.name())) {
+//                    ptValue = realApiUtil.getRealData(ConstantTR.HZJWD);
+//                    retValue.put("dqwd", StringUtils.round(ptValue.getPointValueInDouble(), 0));
+//                    retValue.put("hb", 1385.0);
+//                    ptValue = realApiUtil.getRealData(ConstantTR.HZJPJFS);
+//                    retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
+//                } else if (wpId.equals(WpEnum.XS_FDC.name())) {
+//                    ptValue = realApiUtil.getRealData(ConstantTR.XSWD);
+//                    retValue.put("dqwd", StringUtils.round(ptValue.getPointValueInDouble(), 0));
+//                    retValue.put("hb", 2210.0);
+//                    ptValue = realApiUtil.getRealData(ConstantTR.XSPJFS);
+//                    retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
+//                }
 
                 WindPowerStationTestingPoint glpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
                 ptValue = realApiUtil.getRealData(glpoint.getCode());

web/monitor-web-hb/src/main/java/com/gyee/frame/service/websocket/RealPowerPushService.java

@@ -381,9 +381,9 @@ public class RealPowerPushService {
                 WindPowerStationTestingPoint zygl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZZYGL);
 
 
-                // 光伏实际发功率
-                WindPowerStationTestingPoint gdsjgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(GF, Constant.TPOINT_WP_SJGL);
-                List<PointData> gdsjglls = realApiUtil.getHistoryDatasSnap(gdsjgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, pried);
+//                // 光伏实际发功率
+//                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 {
 
@@ -401,15 +401,15 @@ public class RealPowerPushService {
 
                                 if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
                                     temp1 = yfglls.get(i).getPointValueInDouble();
-                                    temp2 = gdsjglls.get(i).getPointValueInDouble();
+//                                    temp2 = gdsjglls.get(i).getPointValueInDouble();
                                     temp1 = new BigDecimal(temp1).divide(new BigDecimal(100000), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
 
 
-                                    if (id.equals(QS)) {
-                                        vos.get(i).setValue1(StringUtils.round(temp1 + temp2, 2));// 应发功率
-                                    } else {
+//                                    if (id.equals(QS)) {
+//                                        vos.get(i).setValue1(StringUtils.round(temp1 + temp2, 2));// 应发功率
+//                                    } else {
                                         vos.get(i).setValue1(StringUtils.round(temp1, 2));// 应发功率
-                                    }
+//                                    }
                                 } else {
                                     vos.get(i).setValue1(0d);// 应发功率
                                 }
@@ -438,18 +438,18 @@ public class RealPowerPushService {
 
                                 if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
                                     temp1 = llglls.get(i).getPointValueInDouble();
-                                    temp2 = gdsjglls.get(i).getPointValueInDouble();
+//                                    temp2 = gdsjglls.get(i).getPointValueInDouble();
                                     temp1 = new BigDecimal(temp1).divide(new BigDecimal(100000), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
 
-                                    if (Math.abs(temp1) < 10000) {
-
-                                        if (id.equals(QS)) {
-                                            vos.get(i).setValue3(StringUtils.round(temp1 + temp2, 2));// 理论功率
-                                        } else {
+//                                    if (Math.abs(temp1) < 10000) {
+//
+//                                        if (id.equals(QS)) {
+//                                            vos.get(i).setValue3(StringUtils.round(temp1 + temp2, 2));// 理论功率
+//                                        } else {
                                             vos.get(i).setValue3(StringUtils.round(temp1, 2));// 理论功率
-                                        }
-
-                                    }
+//                                        }
+//
+//                                    }
 
                                     count++;
                                 } else {
@@ -478,17 +478,17 @@ public class RealPowerPushService {
 
                                 if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
                                     temp1 = bzglls.get(i).getPointValueInDouble();
-                                    temp2 = gdsjglls.get(i).getPointValueInDouble();
+//                                    temp2 = gdsjglls.get(i).getPointValueInDouble();
                                     temp1 = new BigDecimal(temp1).divide(new BigDecimal(100000), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
 
-                                    if (Math.abs(temp1) < 10000) {
-
-                                        if (id.equals(QS)) {
-                                            vos.get(i).setValue5(StringUtils.round(temp1 + temp2, 2));// 保证功率
-                                        } else {
+//                                    if (Math.abs(temp1) < 10000) {
+//
+//                                        if (id.equals(QS)) {
+//                                            vos.get(i).setValue5(StringUtils.round(temp1 + temp2, 2));// 保证功率
+//                                        } else {
                                             vos.get(i).setValue5(StringUtils.round(temp1, 2));// 保证功率
-                                        }
-                                    }
+//                                        }
+//                                    }
 
                                     count++;
                                 } else {

web/monitor-web-hb/src/main/java/com/gyee/frame/service/websocket/WtInfoPushService.java

@@ -549,8 +549,8 @@ public class WtInfoPushService {
 
                 namemap.put("YYXTYY",new String[]{"液压系统油压","bar","ai",null});
                 namemap.put("ZZSCXTYY",new String[]{"转子刹车系统液压","bar","ai",null});
-                namemap.put("FDJLQSWD",new String[]{"液压油温","°c","ai",null});
-                namemap.put("YYYW",new String[]{"液压系统油压","bar","ai",null});
+                namemap.put("FDJLQSWD",new String[]{"冷却水温度","°c","ai",null});
+                namemap.put("YYYW",new String[]{"液压油温","bar","ai",null});
 
                 namemap.put("YYYWDCX",new String[]{"液压油温度超限","","di",null});
                 namemap.put("YYYYW",new String[]{"液压油液位ok","","di",null});

web/monitor-web-hb/src/main/java/com/gyee/frame/util/golden/EdosUtil.java

@@ -33,111 +33,130 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
 
     @Override
     public PointData getRealData(WindPowerStationTestingPoint point) throws Exception {
-        try {
-            Optional<String> keys = Optional.ofNullable(point.getCode());
-            Optional<String> thingType = Optional.ofNullable("station");
-            Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
-            Optional<String> uniformCodes = Optional.ofNullable(point.getUniformcode());
 
-            String url = baseURL + "/latest?null=0";
-            if (keys.isPresent())
-                url = url + "&keys=" + keys.get();
-            if (thingType.isPresent())
-                url = url + "&thingType=" + thingType.get();
-            if (thingId.isPresent())
-                url = url + "&thingId=" + thingId.get();
-            if (uniformCodes.isPresent())
-                url = url + "&uniformCodes=" + uniformCodes.get();
+        if(StringUtils.notEmp(point) && StringUtils.notEmp(point.getCode()))
+        {
+            try {
+                Optional<String> keys = Optional.ofNullable(point.getCode());
+                Optional<String> thingType = Optional.ofNullable("station");
+                Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
+                Optional<String> uniformCodes = Optional.ofNullable(point.getUniformcode());
+
+                String url = baseURL + "/latest?null=0";
+                if (keys.isPresent())
+                    url = url + "&keys=" + keys.get();
+                if (thingType.isPresent())
+                    url = url + "&thingType=" + thingType.get();
+                if (thingId.isPresent())
+                    url = url + "&thingId=" + thingId.get();
+                if (uniformCodes.isPresent())
+                    url = url + "&uniformCodes=" + uniformCodes.get();
 
-            ResponseEntity<JSONObject> resp = restTemplate.getForEntity(url, JSONObject.class);
-            JSONObject jsonArray = resp.getBody();
-            if (StringUtils.isNotEmpty(jsonArray)){
-                List<PointData> list = JsonObjectHelper.phrasePointData(jsonArray);
-                if (list.size() > 0)
-                    return list.get(0);
-                else
+                ResponseEntity<JSONObject> resp = restTemplate.getForEntity(url, JSONObject.class);
+                JSONObject jsonArray = resp.getBody();
+                if (StringUtils.isNotEmpty(jsonArray)){
+                    List<PointData> list = JsonObjectHelper.phrasePointData(jsonArray);
+                    if (list.size() > 0)
+                        return list.get(0);
+                    else
+                        return ErrorRequest.RequestError(point.getCode());
+                } else {
                     return ErrorRequest.RequestError(point.getCode());
-            } else {
-                return ErrorRequest.RequestError(point.getCode());
-            }
-        } catch (HttpClientErrorException exception) {
-            if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
-                //System.out.println("404请求错误");
-                return ErrorRequest.RequestError(point.getCode());
-            } else {
-                throw exception;
+                }
+            } catch (HttpClientErrorException exception) {
+                if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
+                    //System.out.println("404请求错误");
+                    return ErrorRequest.RequestError(point.getCode());
+                } else {
+                    throw exception;
+                }
             }
+        }else
+        {
+            return new PointData();
         }
+
     }
 
 
     @Override
     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());
-        Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
-        Optional<Long> startTs = Optional.ofNullable(beginDate * 1000);
-        Optional<Long> endTs = Optional.ofNullable(endDate * 1000);
-        //通过时间区间和时间间隔获取点数
-        Long finalInterval;
-        if (pried != null)
-            finalInterval = pried;
-        else if (count != null)
-            finalInterval = (endDate - beginDate) / count;
-        else
-            return ErrorRequest.RequestListError(point.getCode());
-        Optional<Integer> interval = Optional.ofNullable(Integer.parseInt(finalInterval.toString()));
-
-        try {
-            String url = baseURL + "/history/snap?null=0";
-            //tagName 或thingType，thingId，uniformCode可以确定一个标签点
-            if (tagName.isPresent())
-                url = url + "&tagName=" + tagName.get();
-            else {
-                if (thingType.isPresent())
-                    url = url + "&thingType=" + thingType.get();
-                if (thingId.isPresent())
-                    url = url + "&thingId=" + thingId.get();
-                if (uniformCode.isPresent())
-                    url = url + "&uniformCodes=" + uniformCode.get();
-            }
-            if (startTs.isPresent())
-                url = url + "&startTs=" + startTs.get();
-            if (endTs.isPresent())
-                url = url + "&endTs=" + endTs.get();
-            if (interval.isPresent())
-                url = url + "&interval=" + interval.get();
-
-            ResponseEntity<JSONArray> resp = restTemplate.getForEntity(url, JSONArray.class);
-            JSONArray jsonArray = resp.getBody();
-            if (jsonArray != null) {
-                List<PointData> snapList = JsonObjectHelper.phrasePointData(jsonArray, point.getCode());
-                List<PointData> resultList = new ArrayList<>();
-
-                if(snapList.isEmpty())
-                {
-
-                    getHistsnapSameTiem(point.getCode(), beginDate, pried, resultList);
-                }else
-                {
-                    for (PointData snapItem : snapList) {
+        if(StringUtils.notEmp(point) && StringUtils.notEmp(point.getCode()))
+        {
+            Optional<String> tagName = Optional.ofNullable(point.getCode());
+            Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
+            Optional<String> thingType = Optional.ofNullable(point.getModelid());
+            Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
+            Optional<Long> startTs = Optional.ofNullable(beginDate * 1000);
+            Optional<Long> endTs = Optional.ofNullable(endDate * 1000);
+            //通过时间区间和时间间隔获取点数
+            Long finalInterval;
+            if (pried != null)
+                finalInterval = pried;
+            else if (count != null)
+                finalInterval = (endDate - beginDate) / count;
+            else
+                return ErrorRequest.RequestListError(point.getCode());
+            Optional<Integer> interval = Optional.ofNullable(Integer.parseInt(finalInterval.toString()));
+
+            try {
+                String url = baseURL + "/history/snap?null=0";
+                //tagName 或thingType，thingId，uniformCode可以确定一个标签点
+                if (tagName.isPresent())
+                    url = url + "&tagName=" + tagName.get();
+                else {
+                    if (thingType.isPresent())
+                        url = url + "&thingType=" + thingType.get();
+                    if (thingId.isPresent())
+                        url = url + "&thingId=" + thingId.get();
+                    if (uniformCode.isPresent())
+                        url = url + "&uniformCodes=" + uniformCode.get();
+                }
+                if (startTs.isPresent())
+                    url = url + "&startTs=" + startTs.get();
+                if (endTs.isPresent())
+                    url = url + "&endTs=" + endTs.get();
+                if (interval.isPresent())
+                    url = url + "&interval=" + interval.get();
+
+                ResponseEntity<JSONArray> resp = restTemplate.getForEntity(url, JSONArray.class);
+                JSONArray jsonArray = resp.getBody();
+                if (jsonArray != null) {
+                    List<PointData> snapList = JsonObjectHelper.phrasePointData(jsonArray, point.getCode());
+                    List<PointData> resultList = new ArrayList<>();
 
-                        long subTime = snapItem.getPointTime() - pried;
-                        //查询时间区间的截面值(截面值为传入时间节点的上一个最近值，返回时间为值的真实时间)，
-                        // 再进行比较，若截面值的时间戳在以快照时间节点前推一个单位的时间区间中，
-                        // 则代表该时间节点快照有效，否则为0
-                        String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getCode() + "&ts=" + snapItem.getPointTime() + "000";
-                        ResponseEntity<JSONObject> sectionResp = restTemplate.getForEntity(rawUrl, JSONObject.class);
-                        JSONObject jsonObjectSection = sectionResp.getBody();
+                    if(snapList.isEmpty())
+                    {
 
-                        if (jsonObjectSection != null) {
-                            List<PointData> sectionlist = JsonObjectHelper.phrasePointData(jsonObjectSection);
-                            if (sectionlist.size() > 0) {
-                                if(sectionlist.get(0).getPointTime()>=subTime&&sectionlist.get(0).getPointTime()<=snapItem.getPointTime()){
-                                    resultList.add(snapItem);
-                                }
-                                else{
+                        getHistsnapSameTiem(point.getCode(), beginDate, pried, resultList);
+                    }else
+                    {
+                        for (PointData snapItem : snapList) {
+
+                            long subTime = snapItem.getPointTime() - pried;
+                            //查询时间区间的截面值(截面值为传入时间节点的上一个最近值，返回时间为值的真实时间)，
+                            // 再进行比较，若截面值的时间戳在以快照时间节点前推一个单位的时间区间中，
+                            // 则代表该时间节点快照有效，否则为0
+                            String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getCode() + "&ts=" + snapItem.getPointTime() + "000";
+                            ResponseEntity<JSONObject> sectionResp = restTemplate.getForEntity(rawUrl, JSONObject.class);
+                            JSONObject jsonObjectSection = sectionResp.getBody();
+
+                            if (jsonObjectSection != null) {
+                                List<PointData> sectionlist = JsonObjectHelper.phrasePointData(jsonObjectSection);
+                                if (sectionlist.size() > 0) {
+                                    if(sectionlist.get(0).getPointTime()>=subTime&&sectionlist.get(0).getPointTime()<=snapItem.getPointTime()){
+                                        resultList.add(snapItem);
+                                    }
+                                    else{
+                                        PointData data = new PointData();
+                                        data.setEdnaId(point.getCode());
+                                        data.setPointTime(snapItem.getPointTime());
+                                        data.setPointValue("0");
+                                        data.setPointName("1");
+                                        data.setPointValueInDouble(0.0);
+                                        resultList.add(data);
+                                    }
+                                } else {
                                     PointData data = new PointData();
                                     data.setEdnaId(point.getCode());
                                     data.setPointTime(snapItem.getPointTime());
@@ -155,35 +174,31 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                                 data.setPointValueInDouble(0.0);
                                 resultList.add(data);
                             }
-                        } else {
-                            PointData data = new PointData();
-                            data.setEdnaId(point.getCode());
-                            data.setPointTime(snapItem.getPointTime());
-                            data.setPointValue("0");
-                            data.setPointName("1");
-                            data.setPointValueInDouble(0.0);
-                            resultList.add(data);
                         }
                     }
-                }
 
 
-                return resultList;
+                    return resultList;
 
 
-            } else {
-                return ErrorRequest.RequestListError(point.getCode());
-            }
+                } else {
+                    return ErrorRequest.RequestListError(point.getCode());
+                }
 
-        } catch (HttpClientErrorException exception) {
-            if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
-                //System.out.println("404请求错误");
-                return ErrorRequest.RequestListError(point.getCode());
-            } else {
-                throw exception;
+            } catch (HttpClientErrorException exception) {
+                if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
+                    //System.out.println("404请求错误");
+                    return ErrorRequest.RequestListError(point.getCode());
+                } else {
+                    throw exception;
+                }
             }
+        }else
+        {
+            return new ArrayList<>();
         }
 
+
     }
 
 
@@ -231,158 +246,185 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
 
     @Override
     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());
-        Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
-        Optional<Long> startTs = Optional.ofNullable(beginDate * 1000);
-        Optional<Long> endTs = Optional.ofNullable(endDate * 1000);
 
-        try {
-            String url = baseURL + "/history/snap?null=0";
-            //tagName 或thingType，thingId，uniformCode可以确定一个标签点
-            if (tagName.isPresent())
-                url = url + "&tagName=" + tagName.get();
-            else {
-                if (thingType.isPresent())
-                    url = url + "&thingType=" + thingType.get();
-                if (thingId.isPresent())
-                    url = url + "&thingId=" + thingId.get();
-                if (uniformCode.isPresent())
-                    url = url + "&uniformCodes=" + uniformCode.get();
-            }
+        if(StringUtils.notEmp(point) && StringUtils.notEmp(point.getCode()))
+        {
+            Optional<String> tagName = Optional.ofNullable(point.getCode());
+            Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
+            Optional<String> thingType = Optional.ofNullable(point.getModelid());
+            Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
+            Optional<Long> startTs = Optional.ofNullable(beginDate * 1000);
+            Optional<Long> endTs = Optional.ofNullable(endDate * 1000);
+
+            try {
+                String url = baseURL + "/history/snap?null=0";
+                //tagName 或thingType，thingId，uniformCode可以确定一个标签点
+                if (tagName.isPresent())
+                    url = url + "&tagName=" + tagName.get();
+                else {
+                    if (thingType.isPresent())
+                        url = url + "&thingType=" + thingType.get();
+                    if (thingId.isPresent())
+                        url = url + "&thingId=" + thingId.get();
+                    if (uniformCode.isPresent())
+                        url = url + "&uniformCodes=" + uniformCode.get();
+                }
 
-            if (startTs.isPresent())
-                url = url + "&startTs=" + startTs.get();
-            if (endTs.isPresent())
-                url = url + "&endTs=" + endTs.get();
+                if (startTs.isPresent())
+                    url = url + "&startTs=" + startTs.get();
+                if (endTs.isPresent())
+                    url = url + "&endTs=" + endTs.get();
 
-            ResponseEntity<JSONArray> resp = restTemplate.getForEntity(url, JSONArray.class);
-            JSONArray jsonArray = resp.getBody();
-            if (jsonArray != null)
-                return JsonObjectHelper.phrasePointData(jsonArray, point.getCode());
-            else {
-                return ErrorRequest.RequestListError(point.getCode());
-            }
+                ResponseEntity<JSONArray> resp = restTemplate.getForEntity(url, JSONArray.class);
+                JSONArray jsonArray = resp.getBody();
+                if (jsonArray != null)
+                    return JsonObjectHelper.phrasePointData(jsonArray, point.getCode());
+                else {
+                    return ErrorRequest.RequestListError(point.getCode());
+                }
 
-        } catch (HttpClientErrorException exception) {
-            if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
-                //System.out.println("404请求错误");
-                return ErrorRequest.RequestListError(point.getCode());
-            } else {
-                throw exception;
+            } catch (HttpClientErrorException exception) {
+                if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
+                    //System.out.println("404请求错误");
+                    return ErrorRequest.RequestListError(point.getCode());
+                } else {
+                    throw exception;
+                }
             }
+        }else
+        {
+            return new ArrayList<>();
         }
+
     }
 
     @Override
     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());
-        Optional<String> uniformCodes = Optional.ofNullable(point.getUniformcode());
 
-        try {
-            String url = baseURL + "/latest?null=0";
-            //tagName 或thingType，thingId，uniformCode可以确定一个标签点
-            if (keys.isPresent())
-                url = url + "&keys=" + keys.get();
-            else {
-                if (thingType.isPresent())
-                    url = url + "&thingType=" + thingType.get();
-                if (thingId.isPresent())
-                    url = url + "&thingId=" + thingId.get();
-                if (uniformCodes.isPresent())
-                    url = url + "&uniformCodes=" + uniformCodes.get();
-            }
-            ResponseEntity<JSONObject> resp = restTemplate.getForEntity(url, JSONObject.class);
-            JSONObject jsonArray = resp.getBody();
-            if (StringUtils.isNotEmpty(jsonArray)){
-                List<PointData> list = JsonObjectHelper.phrasePointData(jsonArray);
-                if (list.size() > 0)
-                    return list.get(0);
-                else
+        if(StringUtils.notEmp(point) && StringUtils.notEmp(point.getId()))
+        {
+            Optional<String> keys = Optional.ofNullable(point.getId());
+            Optional<String> thingType = Optional.ofNullable(point.getModelid());
+            Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
+            Optional<String> uniformCodes = Optional.ofNullable(point.getUniformcode());
+
+            try {
+                String url = baseURL + "/latest?null=0";
+                //tagName 或thingType，thingId，uniformCode可以确定一个标签点
+                if (keys.isPresent())
+                    url = url + "&keys=" + keys.get();
+                else {
+                    if (thingType.isPresent())
+                        url = url + "&thingType=" + thingType.get();
+                    if (thingId.isPresent())
+                        url = url + "&thingId=" + thingId.get();
+                    if (uniformCodes.isPresent())
+                        url = url + "&uniformCodes=" + uniformCodes.get();
+                }
+                ResponseEntity<JSONObject> resp = restTemplate.getForEntity(url, JSONObject.class);
+                JSONObject jsonArray = resp.getBody();
+                if (StringUtils.isNotEmpty(jsonArray)){
+                    List<PointData> list = JsonObjectHelper.phrasePointData(jsonArray);
+                    if (list.size() > 0)
+                        return list.get(0);
+                    else
+                        return ErrorRequest.RequestError(point.getId());
+                } else {
                     return ErrorRequest.RequestError(point.getId());
-            } else {
-                return ErrorRequest.RequestError(point.getId());
-            }
+                }
 
-        } catch (HttpClientErrorException exception) {
-            if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
-                //System.out.println("404请求错误");
-                return ErrorRequest.RequestError(point.getId());
-            } else {
-                throw exception;
+            } catch (HttpClientErrorException exception) {
+                if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
+                    //System.out.println("404请求错误");
+                    return ErrorRequest.RequestError(point.getId());
+                } else {
+                    throw exception;
+                }
             }
+        }else
+        {
+            return new PointData();
         }
+
     }
 
     @Override
     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());
-        Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
-        Optional<Long> startTs = Optional.ofNullable(beginDate * 1000);
-        Optional<Long> endTs = Optional.ofNullable(endDate * 1000);
-        //通过时间区间和时间间隔获取点数
-        Long finalInterval;
-        if (pried != null)
-            finalInterval = pried;
-        else if (count != null)
-            finalInterval = (endDate - beginDate) / count;
-        else
-            return ErrorRequest.RequestListError(point.getId());
-        Optional<Integer> interval = Optional.ofNullable(Integer.parseInt(finalInterval.toString()));
-
-        try {
-            String url = baseURL + "/history/snap?null=0";
-            //tagName 或thingType，thingId，uniformCode可以确定一个标签点
-            if (tagName.isPresent())
-                url = url + "&tagName=" + tagName.get();
-            else {
-                if (thingType.isPresent())
-                    url = url + "&thingType=" + thingType.get();
-                if (thingId.isPresent())
-                    url = url + "&thingId=" + thingId.get();
-                if (uniformCode.isPresent())
-                    url = url + "&uniformCodes=" + uniformCode.get();
-            }
-            if (startTs.isPresent())
-                url = url + "&startTs=" + startTs.get();
-            if (endTs.isPresent())
-                url = url + "&endTs=" + endTs.get();
-            if (interval.isPresent())
-                url = url + "&interval=" + interval.get();
-
-            ResponseEntity<JSONArray> resp = restTemplate.getForEntity(url, JSONArray.class);
-            JSONArray jsonArray = resp.getBody();
-            if (jsonArray != null) {
-                List<PointData> snapList = JsonObjectHelper.phrasePointData(jsonArray, point.getId());
-                List<PointData> resultList = new ArrayList<>();
-
-                if(snapList.isEmpty())
-                {
+        if(StringUtils.notEmp(point) && StringUtils.notEmp(point.getId()))
+        {
+            Optional<String> tagName = Optional.ofNullable(point.getId());
+            Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
+            Optional<String> thingType = Optional.ofNullable(point.getModelid());
+            Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
+            Optional<Long> startTs = Optional.ofNullable(beginDate * 1000);
+            Optional<Long> endTs = Optional.ofNullable(endDate * 1000);
+            //通过时间区间和时间间隔获取点数
+            Long finalInterval;
+            if (pried != null)
+                finalInterval = pried;
+            else if (count != null)
+                finalInterval = (endDate - beginDate) / count;
+            else
+                return ErrorRequest.RequestListError(point.getId());
+            Optional<Integer> interval = Optional.ofNullable(Integer.parseInt(finalInterval.toString()));
+
+            try {
+                String url = baseURL + "/history/snap?null=0";
+                //tagName 或thingType，thingId，uniformCode可以确定一个标签点
+                if (tagName.isPresent())
+                    url = url + "&tagName=" + tagName.get();
+                else {
+                    if (thingType.isPresent())
+                        url = url + "&thingType=" + thingType.get();
+                    if (thingId.isPresent())
+                        url = url + "&thingId=" + thingId.get();
+                    if (uniformCode.isPresent())
+                        url = url + "&uniformCodes=" + uniformCode.get();
+                }
+                if (startTs.isPresent())
+                    url = url + "&startTs=" + startTs.get();
+                if (endTs.isPresent())
+                    url = url + "&endTs=" + endTs.get();
+                if (interval.isPresent())
+                    url = url + "&interval=" + interval.get();
+
+                ResponseEntity<JSONArray> resp = restTemplate.getForEntity(url, JSONArray.class);
+                JSONArray jsonArray = resp.getBody();
+                if (jsonArray != null) {
+                    List<PointData> snapList = JsonObjectHelper.phrasePointData(jsonArray, point.getId());
+                    List<PointData> resultList = new ArrayList<>();
 
-                    getHistsnapSameTiem(point.getId(), beginDate, pried, resultList);
-                }else
-                {
-                    for (PointData snapItem : snapList) {
-                        long subTime = snapItem.getPointTime() - pried;
-                        //查询时间区间的截面值(截面值为传入时间节点的上一个最近值，返回时间为值的真实时间)，
-                        // 再进行比较，若截面值的时间戳在以快照时间节点前推一个单位的时间区间中，
-                        // 则代表该时间节点快照有效，否则为0
-                        String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getId() + "&ts=" + snapItem.getPointTime() + "000";
-                        ResponseEntity<JSONObject> sectionResp = restTemplate.getForEntity(rawUrl, JSONObject.class);
-                        JSONObject jsonObjectSection = sectionResp.getBody();
+                    if(snapList.isEmpty())
+                    {
 
-                        if (jsonObjectSection != null) {
-                            List<PointData> sectionlist = JsonObjectHelper.phrasePointData(jsonObjectSection);
-                            if (sectionlist.size() > 0) {
-                                if(sectionlist.get(0).getPointTime()>=subTime&&sectionlist.get(0).getPointTime()<=snapItem.getPointTime()){
-                                    resultList.add(snapItem);
-                                }
-                                else{
+                        getHistsnapSameTiem(point.getId(), beginDate, pried, resultList);
+                    }else
+                    {
+                        for (PointData snapItem : snapList) {
+                            long subTime = snapItem.getPointTime() - pried;
+                            //查询时间区间的截面值(截面值为传入时间节点的上一个最近值，返回时间为值的真实时间)，
+                            // 再进行比较，若截面值的时间戳在以快照时间节点前推一个单位的时间区间中，
+                            // 则代表该时间节点快照有效，否则为0
+                            String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getId() + "&ts=" + snapItem.getPointTime() + "000";
+                            ResponseEntity<JSONObject> sectionResp = restTemplate.getForEntity(rawUrl, JSONObject.class);
+                            JSONObject jsonObjectSection = sectionResp.getBody();
+
+                            if (jsonObjectSection != null) {
+                                List<PointData> sectionlist = JsonObjectHelper.phrasePointData(jsonObjectSection);
+                                if (sectionlist.size() > 0) {
+                                    if(sectionlist.get(0).getPointTime()>=subTime&&sectionlist.get(0).getPointTime()<=snapItem.getPointTime()){
+                                        resultList.add(snapItem);
+                                    }
+                                    else{
+                                        PointData data = new PointData();
+                                        data.setEdnaId(point.getId());
+                                        data.setPointTime(snapItem.getPointTime());
+                                        data.setPointValue("0");
+                                        data.setPointName("1");
+                                        data.setPointValueInDouble(0.0);
+                                        resultList.add(data);
+                                    }
+                                } else {
                                     PointData data = new PointData();
                                     data.setEdnaId(point.getId());
                                     data.setPointTime(snapItem.getPointTime());
@@ -400,76 +442,79 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                                 data.setPointValueInDouble(0.0);
                                 resultList.add(data);
                             }
-                        } else {
-                            PointData data = new PointData();
-                            data.setEdnaId(point.getId());
-                            data.setPointTime(snapItem.getPointTime());
-                            data.setPointValue("0");
-                            data.setPointName("1");
-                            data.setPointValueInDouble(0.0);
-                            resultList.add(data);
                         }
                     }
-                }
 
 
-                return resultList;
-            } else {
-                return ErrorRequest.RequestListError(point.getId());
-            }
-        } catch (HttpClientErrorException exception) {
-            if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
-                //System.out.println("404请求错误");
-                return ErrorRequest.RequestListError(point.getId());
-            } else {
-                throw exception;
+                    return resultList;
+                } else {
+                    return ErrorRequest.RequestListError(point.getId());
+                }
+            } catch (HttpClientErrorException exception) {
+                if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
+                    //System.out.println("404请求错误");
+                    return ErrorRequest.RequestListError(point.getId());
+                } else {
+                    throw exception;
+                }
             }
+        }else
+        {
+            return new ArrayList<>();
         }
+
     }
 
 
     @Override
     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());
-        Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
-        Optional<Long> startTs = Optional.ofNullable(beginDate);
-        Optional<Long> endTs = Optional.ofNullable(endDate);
-        try {
-            String url = baseURL + "/history/snap?null=0";
-            //tagName 或thingType，thingId，uniformCode可以确定一个标签点
-            if (tagName.isPresent())
-                url = url + "&tagName=" + tagName.get();
-            else {
-                if (thingType.isPresent())
-                    url = url + "&thingType=" + thingType.get();
-                if (thingId.isPresent())
-                    url = url + "&thingId=" + thingId.get();
-                if (uniformCode.isPresent())
-                    url = url + "&uniformCodes=" + uniformCode.get();
-            }
+        if(StringUtils.notEmp(point) && StringUtils.notEmp(point.getId()))
+        {
+            Optional<String> tagName = Optional.ofNullable(point.getId());
+            Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
+            Optional<String> thingType = Optional.ofNullable(point.getModelid());
+            Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
+            Optional<Long> startTs = Optional.ofNullable(beginDate);
+            Optional<Long> endTs = Optional.ofNullable(endDate);
+            try {
+                String url = baseURL + "/history/snap?null=0";
+                //tagName 或thingType，thingId，uniformCode可以确定一个标签点
+                if (tagName.isPresent())
+                    url = url + "&tagName=" + tagName.get();
+                else {
+                    if (thingType.isPresent())
+                        url = url + "&thingType=" + thingType.get();
+                    if (thingId.isPresent())
+                        url = url + "&thingId=" + thingId.get();
+                    if (uniformCode.isPresent())
+                        url = url + "&uniformCodes=" + uniformCode.get();
+                }
 
-            if (startTs.isPresent())
-                url = url + "&startTs=" + startTs.get();
-            if (endTs.isPresent())
-                url = url + "&endTs=" + endTs.get();
+                if (startTs.isPresent())
+                    url = url + "&startTs=" + startTs.get();
+                if (endTs.isPresent())
+                    url = url + "&endTs=" + endTs.get();
 
-            ResponseEntity<JSONArray> resp = restTemplate.getForEntity(url, JSONArray.class);
-            JSONArray jsonArray = resp.getBody();
-            if (jsonArray != null)
-                return JsonObjectHelper.phrasePointData(jsonArray, point.getId());
-            else {
-                return ErrorRequest.RequestListError(point.getId());
-            }
-        } catch (HttpClientErrorException exception) {
-            if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
-                //System.out.println("404请求错误");
-                return ErrorRequest.RequestListError(point.getId());
-            } else {
-                throw exception;
+                ResponseEntity<JSONArray> resp = restTemplate.getForEntity(url, JSONArray.class);
+                JSONArray jsonArray = resp.getBody();
+                if (jsonArray != null)
+                    return JsonObjectHelper.phrasePointData(jsonArray, point.getId());
+                else {
+                    return ErrorRequest.RequestListError(point.getId());
+                }
+            } catch (HttpClientErrorException exception) {
+                if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
+                    //System.out.println("404请求错误");
+                    return ErrorRequest.RequestListError(point.getId());
+                } else {
+                    throw exception;
+                }
             }
+        }else
+        {
+            return new ArrayList<>();
         }
+
     }
 
     @Override

web/monitor-web-hb/src/main/resources/mybatis-generator.xml

@@ -109,8 +109,8 @@
 <!--        <table tableName='StopAnalysis' domainObjectName='StopAnalysis'/>-->
 <!--        <table tableName='StopAnalysismain' domainObjectName='StopAnalysismain'/>-->
 <!--        <table tableName='StopAnalysismainVo' domainObjectName='StopAnalysismainVo'/>-->
-        <table tableName='WARNING2' domainObjectName='Warning2'/>
-
+        <table tableName='windpowerstationpointnew' domainObjectName='Windpowerstationpointnew'/>
+        <table tableName='windturbinetestingpointnew' domainObjectName='Windturbinetestingpointnew'/>
 
 
     </context>

web/monitor-web-hb/src/main/resources/mybatis/auto/WindPowerStationTestingPointMapper.xml

@@ -107,7 +107,7 @@
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from WINDPOWERSTATIONTESTINGPOINT2
+    from WINDPOWERSTATIONTESTINGPOINT
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -122,7 +122,7 @@
     -->
     select 
     <include refid="Base_Column_List" />
-    from WINDPOWERSTATIONTESTINGPOINT2
+    from WINDPOWERSTATIONTESTINGPOINT
     where CODE = #{code,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -130,7 +130,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    delete from WINDPOWERSTATIONTESTINGPOINT2
+    delete from WINDPOWERSTATIONTESTINGPOINT
     where CODE = #{code,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WindPowerStationTestingPointExample">
@@ -138,7 +138,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    delete from WINDPOWERSTATIONTESTINGPOINT2
+    delete from WINDPOWERSTATIONTESTINGPOINT
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -148,7 +148,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into WINDPOWERSTATIONTESTINGPOINT2 (CODE, NAME, MODEL, 
+    insert into WINDPOWERSTATIONTESTINGPOINT (CODE, NAME, MODEL, 
       VALUEUNIT, ENGLISHNAME, TYPEID, 
       MODELID, MAXVAL, MINVAL, 
       REASONABLEMAXVAL, REASONABLEMINVAL, UNIFORMCODE, 
@@ -166,7 +166,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into WINDPOWERSTATIONTESTINGPOINT2
+    insert into WINDPOWERSTATIONTESTINGPOINT
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="code != null">
         CODE,
@@ -273,7 +273,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    select count(*) from WINDPOWERSTATIONTESTINGPOINT2
+    select count(*) from WINDPOWERSTATIONTESTINGPOINT
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -283,7 +283,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update WINDPOWERSTATIONTESTINGPOINT2
+    update WINDPOWERSTATIONTESTINGPOINT
     <set>
       <if test="record.code != null">
         CODE = #{record.code,jdbcType=VARCHAR},
@@ -343,7 +343,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update WINDPOWERSTATIONTESTINGPOINT2
+    update WINDPOWERSTATIONTESTINGPOINT
     set CODE = #{record.code,jdbcType=VARCHAR},
       NAME = #{record.name,jdbcType=VARCHAR},
       MODEL = #{record.model,jdbcType=VARCHAR},
@@ -369,7 +369,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update WINDPOWERSTATIONTESTINGPOINT2
+    update WINDPOWERSTATIONTESTINGPOINT
     <set>
       <if test="name != null">
         NAME = #{name,jdbcType=VARCHAR},
@@ -424,7 +424,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update WINDPOWERSTATIONTESTINGPOINT2
+    update WINDPOWERSTATIONTESTINGPOINT
     set NAME = #{name,jdbcType=VARCHAR},
       MODEL = #{model,jdbcType=VARCHAR},
       VALUEUNIT = #{valueunit,jdbcType=VARCHAR},

web/monitor-web-hb/src/main/resources/mybatis/auto/WindTurbineTestingPointAiMapper.xml

@@ -110,7 +110,7 @@
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from WINDTURBINETESTINGPOINTAI2
+    from WINDTURBINETESTINGPOINTAI
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -125,7 +125,7 @@
     -->
     select 
     <include refid="Base_Column_List" />
-    from WINDTURBINETESTINGPOINTAI2
+    from WINDTURBINETESTINGPOINTAI
     where ID = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -133,7 +133,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    delete from WINDTURBINETESTINGPOINTAI2
+    delete from WINDTURBINETESTINGPOINTAI
     where ID = #{id,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointAiExample">
@@ -141,7 +141,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    delete from WINDTURBINETESTINGPOINTAI2
+    delete from WINDTURBINETESTINGPOINTAI
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -151,7 +151,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into WINDTURBINETESTINGPOINTAI2 (ID, CODE, NAME, 
+    insert into WINDTURBINETESTINGPOINTAI (ID, CODE, NAME, 
       MODEL, VALUEUNIT, ENGLISHNAME, 
       TYPEID, MODELID, MAXVAL, 
       MINVAL, REASONABLEMAXVAL, REASONABLEMINVAL, 
@@ -171,7 +171,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into WINDTURBINETESTINGPOINTAI2
+    insert into WINDTURBINETESTINGPOINTAI
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         ID,
@@ -290,7 +290,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    select count(*) from WINDTURBINETESTINGPOINTAI2
+    select count(*) from WINDTURBINETESTINGPOINTAI
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -300,7 +300,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update WINDTURBINETESTINGPOINTAI2
+    update WINDTURBINETESTINGPOINTAI
     <set>
       <if test="record.id != null">
         ID = #{record.id,jdbcType=VARCHAR},
@@ -366,7 +366,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update WINDTURBINETESTINGPOINTAI2
+    update WINDTURBINETESTINGPOINTAI
     set ID = #{record.id,jdbcType=VARCHAR},
       CODE = #{record.code,jdbcType=VARCHAR},
       NAME = #{record.name,jdbcType=VARCHAR},
@@ -394,7 +394,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update WINDTURBINETESTINGPOINTAI2
+    update WINDTURBINETESTINGPOINTAI
     <set>
       <if test="code != null">
         CODE = #{code,jdbcType=VARCHAR},
@@ -455,7 +455,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update WINDTURBINETESTINGPOINTAI2
+    update WINDTURBINETESTINGPOINTAI
     set CODE = #{code,jdbcType=VARCHAR},
       NAME = #{name,jdbcType=VARCHAR},
       MODEL = #{model,jdbcType=VARCHAR},

web/monitor-web-hb/src/main/resources/mybatis/auto/WindTurbineTestingPointDiMapper.xml

@@ -110,7 +110,7 @@
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from WINDTURBINETESTINGPOINTDI2
+    from WINDTURBINETESTINGPOINTDI
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -125,7 +125,7 @@
     -->
     select 
     <include refid="Base_Column_List" />
-    from WINDTURBINETESTINGPOINTDI2
+    from WINDTURBINETESTINGPOINTDI
     where ID = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -133,7 +133,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    delete from WINDTURBINETESTINGPOINTDI2
+    delete from WINDTURBINETESTINGPOINTDI
     where ID = #{id,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WindTurbineTestingPointDiExample">
@@ -141,7 +141,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    delete from WINDTURBINETESTINGPOINTDI2
+    delete from WINDTURBINETESTINGPOINTDI
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -151,7 +151,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into WINDTURBINETESTINGPOINTDI2 (ID, CODE, NAME, 
+    insert into WINDTURBINETESTINGPOINTDI (ID, CODE, NAME, 
       MODEL, VALUEUNIT, ENGLISHNAME, 
       TYPEID, MODELID, MAXVAL, 
       MINVAL, REASONABLEMAXVAL, REASONABLEMINVAL, 
@@ -171,7 +171,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into WINDTURBINETESTINGPOINTDI2
+    insert into WINDTURBINETESTINGPOINTDI
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         ID,
@@ -290,7 +290,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    select count(*) from WINDTURBINETESTINGPOINTDI2
+    select count(*) from WINDTURBINETESTINGPOINTDI
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -300,7 +300,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update WINDTURBINETESTINGPOINTDI2
+    update WINDTURBINETESTINGPOINTDI
     <set>
       <if test="record.id != null">
         ID = #{record.id,jdbcType=VARCHAR},
@@ -366,7 +366,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update WINDTURBINETESTINGPOINTDI2
+    update WINDTURBINETESTINGPOINTDI
     set ID = #{record.id,jdbcType=VARCHAR},
       CODE = #{record.code,jdbcType=VARCHAR},
       NAME = #{record.name,jdbcType=VARCHAR},
@@ -394,7 +394,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update WINDTURBINETESTINGPOINTDI2
+    update WINDTURBINETESTINGPOINTDI
     <set>
       <if test="code != null">
         CODE = #{code,jdbcType=VARCHAR},
@@ -455,7 +455,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update WINDTURBINETESTINGPOINTDI2
+    update WINDTURBINETESTINGPOINTDI
     set CODE = #{code,jdbcType=VARCHAR},
       NAME = #{name,jdbcType=VARCHAR},
       MODEL = #{model,jdbcType=VARCHAR},

web/monitor-web-hb/src/main/resources/mybatis/auto/WindpowerstationpointnewMapper.xml

@@ -0,0 +1,460 @@
+<?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.WindpowerstationpointnewMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Windpowerstationpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="CODE" jdbcType="VARCHAR" property="code" />
+    <result column="NAME" jdbcType="VARCHAR" property="name" />
+    <result column="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.
+    -->
+    ID, 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.WindpowerstationpointnewExample" 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 WINDPOWERSTATIONPOINTNEW
+    <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 WINDPOWERSTATIONPOINTNEW
+    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 WINDPOWERSTATIONPOINTNEW
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WindpowerstationpointnewExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WINDPOWERSTATIONPOINTNEW
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Windpowerstationpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WINDPOWERSTATIONPOINTNEW (ID, CODE, NAME, 
+      MODEL, VALUEUNIT, ENGLISHNAME, 
+      TYPEID, MODELID, MAXVAL, 
+      MINVAL, REASONABLEMAXVAL, REASONABLEMINVAL, 
+      UNIFORMCODE, SHORTID, LONGID, 
+      WINDPOWERSTATIONID, REALTIMEID)
+    values (#{id,jdbcType=VARCHAR}, #{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.Windpowerstationpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WINDPOWERSTATIONPOINTNEW
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <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="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <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.WindpowerstationpointnewExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from WINDPOWERSTATIONPOINTNEW
+    <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 WINDPOWERSTATIONPOINTNEW
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.code != null">
+        CODE = #{record.code,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        NAME = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.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 WINDPOWERSTATIONPOINTNEW
+    set ID = #{record.id,jdbcType=VARCHAR},
+      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.Windpowerstationpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WINDPOWERSTATIONPOINTNEW
+    <set>
+      <if test="code != null">
+        CODE = #{code,jdbcType=VARCHAR},
+      </if>
+      <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 ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Windpowerstationpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WINDPOWERSTATIONPOINTNEW
+    set CODE = #{code,jdbcType=VARCHAR},
+      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 ID = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

web/monitor-web-hb/src/main/resources/mybatis/auto/WindpowerstationpointnewMapper.xml.1

@@ -0,0 +1,460 @@
+<?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.WindpowerstationpointnewMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Windpowerstationpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="CODE" jdbcType="VARCHAR" property="code" />
+    <result column="NAME" jdbcType="VARCHAR" property="name" />
+    <result column="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.
+    -->
+    ID, 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.WindpowerstationpointnewExample" 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 WINDPOWERSTATIONPOINTNEW
+    <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 WINDPOWERSTATIONPOINTNEW
+    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 WINDPOWERSTATIONPOINTNEW
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WindpowerstationpointnewExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WINDPOWERSTATIONPOINTNEW
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Windpowerstationpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WINDPOWERSTATIONPOINTNEW (ID, CODE, NAME, 
+      MODEL, VALUEUNIT, ENGLISHNAME, 
+      TYPEID, MODELID, MAXVAL, 
+      MINVAL, REASONABLEMAXVAL, REASONABLEMINVAL, 
+      UNIFORMCODE, SHORTID, LONGID, 
+      WINDPOWERSTATIONID, REALTIMEID)
+    values (#{id,jdbcType=VARCHAR}, #{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.Windpowerstationpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WINDPOWERSTATIONPOINTNEW
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <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="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <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.WindpowerstationpointnewExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from WINDPOWERSTATIONPOINTNEW
+    <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 WINDPOWERSTATIONPOINTNEW
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.code != null">
+        CODE = #{record.code,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        NAME = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.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 WINDPOWERSTATIONPOINTNEW
+    set ID = #{record.id,jdbcType=VARCHAR},
+      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.Windpowerstationpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WINDPOWERSTATIONPOINTNEW
+    <set>
+      <if test="code != null">
+        CODE = #{code,jdbcType=VARCHAR},
+      </if>
+      <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 ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Windpowerstationpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WINDPOWERSTATIONPOINTNEW
+    set CODE = #{code,jdbcType=VARCHAR},
+      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 ID = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

web/monitor-web-hb/src/main/resources/mybatis/auto/WindpowerstationpointnewMapper.xml.2

@@ -0,0 +1,460 @@
+<?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.WindpowerstationpointnewMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Windpowerstationpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="CODE" jdbcType="VARCHAR" property="code" />
+    <result column="NAME" jdbcType="VARCHAR" property="name" />
+    <result column="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.
+    -->
+    ID, 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.WindpowerstationpointnewExample" 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 WINDPOWERSTATIONPOINTNEW
+    <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 WINDPOWERSTATIONPOINTNEW
+    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 WINDPOWERSTATIONPOINTNEW
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WindpowerstationpointnewExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WINDPOWERSTATIONPOINTNEW
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Windpowerstationpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WINDPOWERSTATIONPOINTNEW (ID, CODE, NAME, 
+      MODEL, VALUEUNIT, ENGLISHNAME, 
+      TYPEID, MODELID, MAXVAL, 
+      MINVAL, REASONABLEMAXVAL, REASONABLEMINVAL, 
+      UNIFORMCODE, SHORTID, LONGID, 
+      WINDPOWERSTATIONID, REALTIMEID)
+    values (#{id,jdbcType=VARCHAR}, #{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.Windpowerstationpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WINDPOWERSTATIONPOINTNEW
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <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="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <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.WindpowerstationpointnewExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from WINDPOWERSTATIONPOINTNEW
+    <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 WINDPOWERSTATIONPOINTNEW
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.code != null">
+        CODE = #{record.code,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        NAME = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.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 WINDPOWERSTATIONPOINTNEW
+    set ID = #{record.id,jdbcType=VARCHAR},
+      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.Windpowerstationpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WINDPOWERSTATIONPOINTNEW
+    <set>
+      <if test="code != null">
+        CODE = #{code,jdbcType=VARCHAR},
+      </if>
+      <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 ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Windpowerstationpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WINDPOWERSTATIONPOINTNEW
+    set CODE = #{code,jdbcType=VARCHAR},
+      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 ID = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

web/monitor-web-hb/src/main/resources/mybatis/auto/WindturbinetestingpointnewMapper.xml

@@ -0,0 +1,478 @@
+<?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.WindturbinetestingpointnewMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Windturbinetestingpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="CODE" jdbcType="VARCHAR" property="code" />
+    <result column="NAME" jdbcType="VARCHAR" property="name" />
+    <result column="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="WINDTURBINEID" jdbcType="VARCHAR" property="windturbineid" />
+    <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.
+    -->
+    ID, CODE, NAME, MODEL, VALUEUNIT, ENGLISHNAME, TYPEID, MODELID, MAXVAL, MINVAL, REASONABLEMAXVAL, 
+    REASONABLEMINVAL, WINDTURBINEID, UNIFORMCODE, SHORTID, LONGID, WINDPOWERSTATIONID, 
+    REALTIMEID
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.WindturbinetestingpointnewExample" 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 WINDTURBINETESTINGPOINTNEW
+    <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 WINDTURBINETESTINGPOINTNEW
+    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 WINDTURBINETESTINGPOINTNEW
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WindturbinetestingpointnewExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WINDTURBINETESTINGPOINTNEW
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Windturbinetestingpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WINDTURBINETESTINGPOINTNEW (ID, CODE, NAME, 
+      MODEL, VALUEUNIT, ENGLISHNAME, 
+      TYPEID, MODELID, MAXVAL, 
+      MINVAL, REASONABLEMAXVAL, REASONABLEMINVAL, 
+      WINDTURBINEID, UNIFORMCODE, SHORTID, 
+      LONGID, WINDPOWERSTATIONID, REALTIMEID
+      )
+    values (#{id,jdbcType=VARCHAR}, #{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}, 
+      #{windturbineid,jdbcType=VARCHAR}, #{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.Windturbinetestingpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WINDTURBINETESTINGPOINTNEW
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <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="windturbineid != null">
+        WINDTURBINEID,
+      </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="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <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="windturbineid != null">
+        #{windturbineid,jdbcType=VARCHAR},
+      </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.WindturbinetestingpointnewExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from WINDTURBINETESTINGPOINTNEW
+    <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 WINDTURBINETESTINGPOINTNEW
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.code != null">
+        CODE = #{record.code,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        NAME = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.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.windturbineid != null">
+        WINDTURBINEID = #{record.windturbineid,jdbcType=VARCHAR},
+      </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 WINDTURBINETESTINGPOINTNEW
+    set ID = #{record.id,jdbcType=VARCHAR},
+      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},
+      WINDTURBINEID = #{record.windturbineid,jdbcType=VARCHAR},
+      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.Windturbinetestingpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WINDTURBINETESTINGPOINTNEW
+    <set>
+      <if test="code != null">
+        CODE = #{code,jdbcType=VARCHAR},
+      </if>
+      <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="windturbineid != null">
+        WINDTURBINEID = #{windturbineid,jdbcType=VARCHAR},
+      </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 ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Windturbinetestingpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WINDTURBINETESTINGPOINTNEW
+    set CODE = #{code,jdbcType=VARCHAR},
+      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},
+      WINDTURBINEID = #{windturbineid,jdbcType=VARCHAR},
+      UNIFORMCODE = #{uniformcode,jdbcType=VARCHAR},
+      SHORTID = #{shortid,jdbcType=VARCHAR},
+      LONGID = #{longid,jdbcType=VARCHAR},
+      WINDPOWERSTATIONID = #{windpowerstationid,jdbcType=VARCHAR},
+      REALTIMEID = #{realtimeid,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

web/monitor-web-hb/src/main/resources/mybatis/auto/WindturbinetestingpointnewMapper.xml.1

@@ -0,0 +1,478 @@
+<?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.WindturbinetestingpointnewMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Windturbinetestingpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="CODE" jdbcType="VARCHAR" property="code" />
+    <result column="NAME" jdbcType="VARCHAR" property="name" />
+    <result column="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="WINDTURBINEID" jdbcType="VARCHAR" property="windturbineid" />
+    <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.
+    -->
+    ID, CODE, NAME, MODEL, VALUEUNIT, ENGLISHNAME, TYPEID, MODELID, MAXVAL, MINVAL, REASONABLEMAXVAL, 
+    REASONABLEMINVAL, WINDTURBINEID, UNIFORMCODE, SHORTID, LONGID, WINDPOWERSTATIONID, 
+    REALTIMEID
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.WindturbinetestingpointnewExample" 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 WINDTURBINETESTINGPOINTNEW
+    <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 WINDTURBINETESTINGPOINTNEW
+    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 WINDTURBINETESTINGPOINTNEW
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WindturbinetestingpointnewExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WINDTURBINETESTINGPOINTNEW
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Windturbinetestingpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WINDTURBINETESTINGPOINTNEW (ID, CODE, NAME, 
+      MODEL, VALUEUNIT, ENGLISHNAME, 
+      TYPEID, MODELID, MAXVAL, 
+      MINVAL, REASONABLEMAXVAL, REASONABLEMINVAL, 
+      WINDTURBINEID, UNIFORMCODE, SHORTID, 
+      LONGID, WINDPOWERSTATIONID, REALTIMEID
+      )
+    values (#{id,jdbcType=VARCHAR}, #{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}, 
+      #{windturbineid,jdbcType=VARCHAR}, #{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.Windturbinetestingpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WINDTURBINETESTINGPOINTNEW
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <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="windturbineid != null">
+        WINDTURBINEID,
+      </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="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <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="windturbineid != null">
+        #{windturbineid,jdbcType=VARCHAR},
+      </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.WindturbinetestingpointnewExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from WINDTURBINETESTINGPOINTNEW
+    <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 WINDTURBINETESTINGPOINTNEW
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.code != null">
+        CODE = #{record.code,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        NAME = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.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.windturbineid != null">
+        WINDTURBINEID = #{record.windturbineid,jdbcType=VARCHAR},
+      </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 WINDTURBINETESTINGPOINTNEW
+    set ID = #{record.id,jdbcType=VARCHAR},
+      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},
+      WINDTURBINEID = #{record.windturbineid,jdbcType=VARCHAR},
+      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.Windturbinetestingpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WINDTURBINETESTINGPOINTNEW
+    <set>
+      <if test="code != null">
+        CODE = #{code,jdbcType=VARCHAR},
+      </if>
+      <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="windturbineid != null">
+        WINDTURBINEID = #{windturbineid,jdbcType=VARCHAR},
+      </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 ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Windturbinetestingpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WINDTURBINETESTINGPOINTNEW
+    set CODE = #{code,jdbcType=VARCHAR},
+      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},
+      WINDTURBINEID = #{windturbineid,jdbcType=VARCHAR},
+      UNIFORMCODE = #{uniformcode,jdbcType=VARCHAR},
+      SHORTID = #{shortid,jdbcType=VARCHAR},
+      LONGID = #{longid,jdbcType=VARCHAR},
+      WINDPOWERSTATIONID = #{windpowerstationid,jdbcType=VARCHAR},
+      REALTIMEID = #{realtimeid,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

web/monitor-web-hb/src/main/resources/mybatis/auto/WindturbinetestingpointnewMapper.xml.2

@@ -0,0 +1,478 @@
+<?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.WindturbinetestingpointnewMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Windturbinetestingpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="CODE" jdbcType="VARCHAR" property="code" />
+    <result column="NAME" jdbcType="VARCHAR" property="name" />
+    <result column="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="WINDTURBINEID" jdbcType="VARCHAR" property="windturbineid" />
+    <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.
+    -->
+    ID, CODE, NAME, MODEL, VALUEUNIT, ENGLISHNAME, TYPEID, MODELID, MAXVAL, MINVAL, REASONABLEMAXVAL, 
+    REASONABLEMINVAL, WINDTURBINEID, UNIFORMCODE, SHORTID, LONGID, WINDPOWERSTATIONID, 
+    REALTIMEID
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.WindturbinetestingpointnewExample" 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 WINDTURBINETESTINGPOINTNEW
+    <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 WINDTURBINETESTINGPOINTNEW
+    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 WINDTURBINETESTINGPOINTNEW
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WindturbinetestingpointnewExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WINDTURBINETESTINGPOINTNEW
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Windturbinetestingpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WINDTURBINETESTINGPOINTNEW (ID, CODE, NAME, 
+      MODEL, VALUEUNIT, ENGLISHNAME, 
+      TYPEID, MODELID, MAXVAL, 
+      MINVAL, REASONABLEMAXVAL, REASONABLEMINVAL, 
+      WINDTURBINEID, UNIFORMCODE, SHORTID, 
+      LONGID, WINDPOWERSTATIONID, REALTIMEID
+      )
+    values (#{id,jdbcType=VARCHAR}, #{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}, 
+      #{windturbineid,jdbcType=VARCHAR}, #{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.Windturbinetestingpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WINDTURBINETESTINGPOINTNEW
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <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="windturbineid != null">
+        WINDTURBINEID,
+      </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="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <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="windturbineid != null">
+        #{windturbineid,jdbcType=VARCHAR},
+      </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.WindturbinetestingpointnewExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from WINDTURBINETESTINGPOINTNEW
+    <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 WINDTURBINETESTINGPOINTNEW
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.code != null">
+        CODE = #{record.code,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        NAME = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.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.windturbineid != null">
+        WINDTURBINEID = #{record.windturbineid,jdbcType=VARCHAR},
+      </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 WINDTURBINETESTINGPOINTNEW
+    set ID = #{record.id,jdbcType=VARCHAR},
+      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},
+      WINDTURBINEID = #{record.windturbineid,jdbcType=VARCHAR},
+      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.Windturbinetestingpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WINDTURBINETESTINGPOINTNEW
+    <set>
+      <if test="code != null">
+        CODE = #{code,jdbcType=VARCHAR},
+      </if>
+      <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="windturbineid != null">
+        WINDTURBINEID = #{windturbineid,jdbcType=VARCHAR},
+      </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 ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Windturbinetestingpointnew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WINDTURBINETESTINGPOINTNEW
+    set CODE = #{code,jdbcType=VARCHAR},
+      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},
+      WINDTURBINEID = #{windturbineid,jdbcType=VARCHAR},
+      UNIFORMCODE = #{uniformcode,jdbcType=VARCHAR},
+      SHORTID = #{shortid,jdbcType=VARCHAR},
+      LONGID = #{longid,jdbcType=VARCHAR},
+      WINDPOWERSTATIONID = #{windpowerstationid,jdbcType=VARCHAR},
+      REALTIMEID = #{realtimeid,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>