1.0 正式版本

pom.xml

@@ -23,7 +23,7 @@
 		<java.version>1.8</java.version>
 		<commons.fileupload.version>1.3.3</commons.fileupload.version>
 		<commons.io.version>2.5</commons.io.version>
-		<tomcat.version>9.0.35</tomcat.version>
+		<!--<tomcat.version>9.0.35</tomcat.version>-->
 	</properties>
 
 	<!-- https://mvnrepository.com/ 查找jar网站 -->
@@ -34,28 +34,16 @@
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 
-		<!-- SpringBoot集成mybatis框架 -->
-<!--		<dependency>-->
-<!--			<groupId>org.mybatis.spring.boot</groupId>-->
-<!--			<artifactId>mybatis-spring-boot-starter</artifactId>-->
-<!--			<version>1.3.2</version>-->
-<!--		</dependency>-->
-
-
-		<!-- https://mvnrepository.com/artifact/io.netty/netty-all -->
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-all</artifactId>
 			<version>4.1.36.Final</version>
 		</dependency>
 
-		<!-- By Wang jiawen 从本地类库引入阿里巴巴 fastjson 版本1.27 系统级别 路径根目录lib文件夹下  云地址 https://mvnrepository.com/artifact/com.alibaba/fastjson  -->
 		<dependency>
-			<groupId>fastjson</groupId>
+			<groupId>com.alibaba</groupId>
 			<artifactId>fastjson</artifactId>
-			<version>1.2.17</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/src/main/resources/lib/fastjson-1.2.17.jar</systemPath>
+			<version>1.2.4</version>
 		</dependency>
 
 
@@ -67,7 +55,6 @@
 		</dependency>
 
 
-
 		<!-- SpringBoot 测试 -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -98,10 +85,6 @@
 			<version>1.2.5</version>
 		</dependency>
 		<!--GSON -->
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-		</dependency>
 		<!-- pageHelper -->
 		<dependency>
 			<groupId>com.github.pagehelper</groupId>
@@ -127,13 +110,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-websocket</artifactId>
 		</dependency>
-		<!-- mysql驱动8.0
-		 <dependency>
-		 	<groupId>mysql</groupId>
-		 	<artifactId>mysql-connector-java</artifactId>
-			<version>8.0.11</version>
-		 </dependency>
-		 -->
 		<!--druid 数据源监控-->
 		<!-- https://mvnrepository.com/artifact/com.alibaba/druid-spring-boot-starter -->
 		<dependency>
@@ -240,12 +216,6 @@
 			<version>1.4.7</version>
 		</dependency>
 
-		<!--百度UEditor依赖的jar包 -->
-		<!--		<dependency>
-                    <groupId>org.json</groupId>
-                    <artifactId>json</artifactId>
-                    <version>20180813</version>
-                </dependency>-->
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
@@ -333,6 +303,18 @@
 			<version>3.3.2</version>
 		</dependency>
 
+		<!--http请求-->
+		<dependency>
+			<groupId>com.netflix.feign</groupId>
+			<artifactId>feign-core</artifactId>
+			<version>8.18.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.feign</groupId>
+			<artifactId>feign-jackson</artifactId>
+			<version>8.18.0</version>
+		</dependency>
+
 		<dependency>
 			<groupId>org.apache.tomcat</groupId>
 			<artifactId>tomcat-juli</artifactId>
@@ -356,60 +338,8 @@
 	</dependencies>
 
 
-
-	<!--<build>
-		&lt;!&ndash; 打包不带版本号 &ndash;&gt;
-		&lt;!&ndash; <finalName>springboot_v2</finalName> &ndash;&gt;
-		<plugins>
-			&lt;!&ndash; JUnit 配置 &ndash;&gt;
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-	 			<artifactId>maven-surefire-plugin</artifactId>
-	 			&lt;!&ndash;忽略测试启动类 &ndash;&gt;
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-			&lt;!&ndash; generator 配置&ndash;&gt;
-			<plugin>
-				<groupId>org.mybatis.generator</groupId>
-				<artifactId>mybatis-generator-maven-plugin</artifactId>
-				<version>1.3.7</version>
-				<configuration>
-					&lt;!&ndash;允许移动生成的文件 &ndash;&gt;
-					<verbose>false</verbose>
-					&lt;!&ndash;允许覆盖生成的文件 &ndash;&gt;
-					<overwrite>false</overwrite>
-					&lt;!&ndash;配置文件的路径 &ndash;&gt;
-					<configurationFile>src/main/resources/mybatis-generator.xml</configurationFile>
-				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>mysql</groupId>
-						<artifactId>mysql-connector-java</artifactId>
-						<version>${mysql.version}</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-			&lt;!&ndash; jar运行配置 &ndash;&gt;
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>-->
-
 	<build>
 		<plugins>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<!--忽略测试启动类 -->
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
 			<!-- generator 配置-->
 			<plugin>
 				<groupId>org.mybatis.generator</groupId>
@@ -423,73 +353,32 @@
 					<!--配置文件的路径 -->
 					<configurationFile>src/main/resources/mybatis-generator.xml</configurationFile>
 				</configuration>
-				<dependencies>
-<!--					<dependency>-->
-<!--						<groupId>mysql</groupId>-->
-<!--						<artifactId>mysql-connector-java</artifactId>-->
-<!--						<version>${mysql.version}</version>-->
-<!--					</dependency>-->
-<!--					<dependency>-->
-<!--						<groupId>com.microsoft.sqlserver</groupId>-->
-<!--						<artifactId>sqljdbc4</artifactId>-->
-<!--						<version>4.0</version>-->
-<!--					</dependency>-->
-					<dependency>
-						<groupId>com.oracle</groupId>
-						<artifactId>ojdbc6</artifactId>
-						<version>11.2.0.3</version>
-					</dependency>
-				</dependencies>
 			</plugin>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
-					<fork>true</fork>
+					<includeSystemScope>true</includeSystemScope>
 				</configuration>
 			</plugin>
 
-
 			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<fork>true</fork>
-				</configuration>
-			</plugin>
-
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>2.3</version>
-				<configuration>
-					<webResources>
-						<resource>
-							<directory>${project.basedir}/src/main/resources/lib</directory>
-							<targetPath>BOOT-INF/lib/</targetPath>
-							<includes>
-								<include>**/*.jar</include>
-							</includes>
-						</resource>
-					</webResources>
-				</configuration>
-			</plugin>
-
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-war-plugin</artifactId>
+			<version>2.3</version>
+			<configuration>
+				<webResources>
+					<resource>
+						<directory>${project.basedir}/src/main/resources/lib</directory>
+						<targetPath>BOOT-INF/lib/</targetPath>
+						<includes>
+							<include>**/*.jar</include>
+						</includes>
+					</resource>
+				</webResources>
+			</configuration>
+		</plugin>
 		</plugins>
-		<!-- <resources>
-             <resource>
-                 <directory>src/main/resources/lib</directory>
-                 <targetPath>BOOT-INF/lib/</targetPath>
-                 <includes>
-                     <include>**/*.jar</include>
-                 </includes>
-             </resource>
-             <resource>
-                 <directory>src/main/resources</directory>
-                 <targetPath>BOOT-INF/classes/</targetPath>
-             </resource>
-     </resources>-->
 	</build>
 
 	<!-- 阿里云maven仓库 -->

src/main/java/com/gyee/SqlSeverTicket.java

@@ -26,24 +26,25 @@ public class SqlSeverTicket {
         String userPwd = "Gyee@321#!"; //密码
         Connection conn = null;
         try {
-            Class.forName(driverName);
+//            Class.forName(driverName);
             conn = DriverManager.getConnection(dbURL, userName, userPwd);
             //System.out.println("Connection Successful!");
             //如果连接成功 控制台输出Connection  Successful!
-//            Map<String, List> labor = getLabor(conn);
-//            setLabor(conn, labor);
+            Map<String, List> labor = getLabor(conn);
+            setLabor(conn, labor);
 //            List<String> list = getLabors(conn);
 //            for(int i = 0; i < list.size(); i++){
 //                setImage(conn, "D:/document/两票相关材料/人员电子签名/电子签名thumb2/" + list.get(i).toLowerCase() +".png", list.get(i).toLowerCase());
 //            }
-//            setImage(conn, "D:/document/两票相关材料/姚永.png", "yaoy");
+//            setImage(conn, "D:/document/两票相关材料/zhanghy.png", "zhanghy");
 
             //        String fileName = "wangbing.png";
 //
-//        String filePath1 = "D:/document/两票相关材料/人员电子签名/";
-//        String filePath2 = "D:/document/两票相关材料/";
+        String filePath1 = "D:/document/两票相关材料/人员电子签名/";
+        String filePath2 = "D:/document/两票相关材料/";
 //        batchThumb(filePath1, filePath2);
-//        singleThumb(filePath1, filePath2, "何磊.png");
+//        singleThumb(filePath1, filePath2, "chenl.png");
+        setImage(conn, "D:/document/两票相关材料/chenl.png", "chenl");
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
@@ -98,7 +99,7 @@ public class SqlSeverTicket {
             PreparedStatement ps = conn.prepareStatement("select * from SIGNPICTURE");
             ResultSet rs = ps.executeQuery();
             while(rs.next()){
-                String laborNum = rs.getString("LABORNUM");
+                String laborNum = rs.getString("LABORNUM").toLowerCase();
                 lists.add(laborNum);
             }
         } catch (SQLException e) {
@@ -112,7 +113,7 @@ public class SqlSeverTicket {
             while(entries.hasNext()){
                 Map.Entry<String, List> entry = entries.next();
                 String key = entry.getKey();
-                if(!lists.contains(key))
+                if(!lists.contains(key.toLowerCase()))
                 {
                     List list = entry.getValue();
                     ps.setString(1,key);

src/main/java/com/gyee/frame/aspect/VerificationAspect.java

@@ -8,6 +8,7 @@ import com.gyee.frame.service.ticket.IbsusersService;
 import com.gyee.frame.service.ticket.LaborService;
 import com.gyee.frame.service.ticket.ShiroService;
 import com.gyee.frame.util.MD5Util;
+import com.gyee.frame.util.ticket.TokenCache;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
@@ -29,6 +30,8 @@ public class VerificationAspect {
     IbsusersService ibsusersService;
     @Autowired
     LaborService laborService;
+    @Autowired
+    TokenCache tokenCache;
 
 
     @Pointcut("execution(* com.gyee.frame.controller.ticket.*.*(..))")
@@ -42,29 +45,12 @@ public class VerificationAspect {
 
         String url = request.getRequestURI();
         String token = request.getHeader("token");
-        if (url != null && url.contains("sys/login")) {
+        if (url != null && !url.contains("login")) {
             TokenUser user = shiroService.findToken(token);
             /**
              * user == null 表示第一次登录
              */
             if (user == null)
-                return;
-
-            /**
-             * 再次登入时验证登录信息
-             */
-            String username = request.getParameter("username");
-            String password = request.getParameter("password");
-            Ibsusers users = ibsusersService.findUser(username);
-            /**
-             *  如果users == null || password不相等 表示之前的登录信息和现有的登录信息不一致
-             */
-            if (users == null || !users.getPassword().equals(MD5Util.encode(password))){
-                throw new TicketException("请登录后使用");
-            }
-        } else {
-            TokenUser user = shiroService.findToken(token);
-            if (user == null)
                 throw new TicketException("请登录后使用");
 
             long expireTime = user.getExpireTime();
@@ -72,8 +58,11 @@ public class VerificationAspect {
             /**
              * 判断登录是否过期
              */
-            if (nowTime - expireTime > shiroService.EXPIRE)
-                throw new TicketException("请登录后使用");
+            if (nowTime - expireTime > shiroService.EXPIRE){
+                tokenCache.removeToken(token);
+                throw new TicketException("登录已过期，请重新登录");
+            }
+
         }
     }
 }

src/main/java/com/gyee/frame/common/Constants.java

@@ -0,0 +1,19 @@
+package com.gyee.frame.common;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Constants {
+
+    // 智能营销场站
+    public static Map<String, Short> mapStation = new HashMap<>();
+
+
+    static {
+        mapStation.put("MHS_FDC", (short) 5);
+        mapStation.put("NSS_FDC", (short) 1);
+        mapStation.put("QS_FDC", (short) 2);
+        mapStation.put("SBQ_FDC", (short) 3);
+        mapStation.put("XS_FDC", (short) 4);
+    }
+}

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

@@ -63,6 +63,13 @@ public class MybatisConfig {
         return DruidDataSourceBuilder.create().build();
     }
 
+    @Bean(name = "predict")
+    @ConfigurationProperties("spring.datasource.druid.predict")
+    public DataSource predictDataSource()
+    {
+        return DruidDataSourceBuilder.create().build();
+    }
+
     @Autowired
     PaginationInterceptor paginationInterceptor;
 
@@ -76,6 +83,7 @@ public class MybatisConfig {
         targetDataSources.put(DataSourceType.MASTER.name(), masterDataSource);
     	targetDataSources.put(DataSourceType.SLAVE.name(),slaveDataSource);
         targetDataSources.put(DataSourceType.TICKET.name(),ticketDataSource);
+        targetDataSources.put(DataSourceType.PREDICT.name(),predictDataSource());
         return new DynamicDataSource(masterDataSource(), targetDataSources);
     }
 

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

@@ -12,8 +12,8 @@ import redis.clients.jedis.JedisPoolConfig;
  * @author gyee
  */
 
-@Configuration
-@ConfigurationProperties(prefix = "redis")
+//@Configuration
+//@ConfigurationProperties(prefix = "redis")
 public class RedisConfig
 {
     public static String redis_ss_ip;
@@ -21,7 +21,7 @@ public class RedisConfig
     public static String redis_ls_ip;
     public static Integer redis_ls_port;
 
-    @Bean(name = "ss_redis")
+//    @Bean(name = "ss_redis")
     public static JedisPool redis_SS_Pool_Factory()  throws Exception{
 
         JedisPoolConfig jedisPoolConfig = new JedisPoolConfig();
@@ -35,7 +35,7 @@ public class RedisConfig
         return jedisPool;
     }
 
-    @Bean(name = "ls_redis")
+//    @Bean(name = "ls_redis")
     public static JedisPool redis_LS_PoolFactory()  throws Exception{
 
         JedisPoolConfig jedisPoolConfig = new JedisPoolConfig();

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

@@ -37,9 +37,20 @@ public class V2Config
     /** 滚动验证码 **/
     private static Boolean rollVerification;
     /** 实时数据库 **/
-    private  static String realtimedataBase;
+    private static String realTimeDataBase;
     /**app升级路径**/
-    private   static String appUpdateUrl;
+    private static String appUpdateUrl;
+    /**智能营销接口**/
+    private static String powerDirectUrl;
+
+
+    public String getPowerDirectUrl() {
+        return powerDirectUrl;
+    }
+
+    public void setPowerDirectUrl(String powerDirectUrl) {
+        V2Config.powerDirectUrl = powerDirectUrl;
+    }
 
     public static String getAppUpdateUrl() {
         return appUpdateUrl;
@@ -49,12 +60,12 @@ public class V2Config
         V2Config.appUpdateUrl = appUpdateUrl;
     }
 
-    public static String getRealtimedataBase() {
-        return realtimedataBase;
+    public static String getRealTimeDataBase() {
+        return realTimeDataBase;
     }
 
-    public static void setRealtimedataBase(String realtimedataBase) {
-        V2Config.realtimedataBase = realtimedataBase;
+    public static void setRealTimeDataBase(String realTimeDataBase) {
+        V2Config.realTimeDataBase = realTimeDataBase;
     }
 
     public String getName()

src/main/java/com/gyee/frame/common/conf/redis/CacheConfig.java

@@ -19,11 +19,11 @@ import java.util.Map;
  *  缓存写入类
  *  缓存获取类
  */
-@Configuration
+//@Configuration
 public class CacheConfig {
 
-    @Autowired
-    private RedisTemplate redisTemplate;
+//    @Autowired
+//    private RedisTemplate redisTemplate;
 
     /**
      *@author:Wang Jiawen
@@ -51,59 +51,59 @@ public class CacheConfig {
      * 向redis中存入数据 不提供转换 请自己用Json进行装换
      * param key 建 ，str json字符串
       */
-    public void putinredis(String key,Object str){
-        redisTemplate.delete(key);
-        redisTemplate.opsForValue().set(key,str);
-    }
+//    public void putinredis(String key,Object str){
+//        redisTemplate.delete(key);
+//        redisTemplate.opsForValue().set(key,str);
+//    }
 
     /**
      * 从redis中取数据 提供JsonObject转换但是返回Object类型,请自己转换类型
      * param key 建
      */
-    public String getFromredisToString(String key){
-        String str = (String) redisTemplate.opsForValue().get(key);
-        return str;
-    }
-
-
-
-
-
-    public byte[] serialize(Object obj){
-        if(obj==null){
-            throw new NullPointerException("can not read obj");
-        }
-
-        byte[] rv=null;
-        ByteArrayOutputStream bao=null;
-        ObjectOutputStream oto=null;
-        try{
-            bao=new ByteArrayOutputStream();
-            oto=new ObjectOutputStream(bao);
-            oto.writeObject(obj);
-            rv=bao.toByteArray();
-
-        }catch(Exception e){
-             // //System.out.println(e.getMessage());
-              e.printStackTrace();
-        }
-        return rv;
-    }
-
-    public Object deserialize(byte[] byt){
-        if(byt==null){
-            throw new NullPointerException();
-        }
-        ByteArrayInputStream bai=null;
-        ObjectInputStream ois=null;
-        Object obj=null;
-        try{
-            bai=new ByteArrayInputStream(byt);
-            ois=new ObjectInputStream(bai);
-            obj=ois.readObject();
-        }catch(Exception e){
-
-        }
-        return (Object) obj;
-    }
+//    public String getFromredisToString(String key){
+//        String str = (String) redisTemplate.opsForValue().get(key);
+//        return str;
+//    }
+
+
+
+
+
+//    public byte[] serialize(Object obj){
+//        if(obj==null){
+//            throw new NullPointerException("can not read obj");
+//        }
+//
+//        byte[] rv=null;
+//        ByteArrayOutputStream bao=null;
+//        ObjectOutputStream oto=null;
+//        try{
+//            bao=new ByteArrayOutputStream();
+//            oto=new ObjectOutputStream(bao);
+//            oto.writeObject(obj);
+//            rv=bao.toByteArray();
+//
+//        }catch(Exception e){
+//             // //System.out.println(e.getMessage());
+//              e.printStackTrace();
+//        }
+//        return rv;
+//    }
+//
+//    public Object deserialize(byte[] byt){
+//        if(byt==null){
+//            throw new NullPointerException();
+//        }
+//        ByteArrayInputStream bai=null;
+//        ObjectInputStream ois=null;
+//        Object obj=null;
+//        try{
+//            bai=new ByteArrayInputStream(byt);
+//            ois=new ObjectInputStream(bai);
+//            obj=ois.readObject();
+//        }catch(Exception e){
+//
+//        }
+//        return (Object) obj;
+//    }
 }

src/main/java/com/gyee/frame/common/conf/redis/CacheContext.java

@@ -5,16 +5,16 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.core.RedisTemplate;
 
 
-@Configuration
+//@Configuration
 public class CacheContext {
-    @Autowired
-    private CacheConfig cacheConfig;
-    @Autowired
-    private RedisTemplate redisTemplate;
-    public <T> T getObjectFromCache(String str){
-
-        byte[] by = (byte[])redisTemplate.opsForValue().get(str);
-        T t = (T)cacheConfig.deserialize(by);
-        return t;
-    }
+//    @Autowired
+//    private CacheConfig cacheConfig;
+//    @Autowired
+//    private RedisTemplate redisTemplate;
+//    public <T> T getObjectFromCache(String str){
+//
+//        byte[] by = (byte[])redisTemplate.opsForValue().get(str);
+//        T t = (T)cacheConfig.deserialize(by);
+//        return t;
+//    }
 }

src/main/java/com/gyee/frame/common/conf/redis/Constant.java

@@ -10,8 +10,8 @@ public class Constant {
 
     //配置规则,注意: 常量池均为驼峰命名法首字母,
 
-    @Autowired
-    private RedisTemplate redisTemplate;
+//    @Autowired
+//    private RedisTemplate redisTemplate;
     //String ip = httpServletRequest.getRemoteAddr();
    /**
     * Map<String, Windpowerstation>

src/main/java/com/gyee/frame/common/dataSources/DataSourceType.java

@@ -9,5 +9,6 @@ package com.gyee.frame.common.dataSources;
 public enum DataSourceType {
 	MASTER,
 	SLAVE,
-	TICKET
+	TICKET,
+	PREDICT,
 }

src/main/java/com/gyee/frame/common/feign/IPowerService.java

@@ -0,0 +1,15 @@
+package com.gyee.frame.common.feign;
+
+import com.alibaba.fastjson.JSONObject;
+import feign.Headers;
+import feign.Param;
+import feign.RequestLine;
+
+
+public interface IPowerService {
+
+    @Headers({"Content-Type: application/json", "Accept: application/json"})
+    @RequestLine("GET /predict/api/dqdlyc/getWindFarmDqdlycChartData?windplantNo={windplantNo}")
+    JSONObject getPredictDL(@Param(value = "windplantNo") Integer windplantNo);
+
+}

src/main/java/com/gyee/frame/common/feign/RemoteServiceBuilder.java

@@ -0,0 +1,35 @@
+package com.gyee.frame.common.feign;
+
+import com.gyee.frame.common.conf.V2Config;
+import feign.Feign;
+import feign.Request;
+import feign.Retryer;
+import feign.jackson.JacksonDecoder;
+import feign.jackson.JacksonEncoder;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.Resource;
+
+
+@Slf4j
+@Configuration
+public class RemoteServiceBuilder {
+
+    @Resource
+    private V2Config config;
+
+    @Bean
+    public IPowerService service() {
+        return Feign.builder()
+                .encoder(new JacksonEncoder())
+                .decoder(new JacksonDecoder())
+                .options(new Request.Options(5000, 600000))
+                .retryer(new Retryer.Default(10000, 10000, 3))
+                .target(IPowerService.class, config.getPowerDirectUrl());
+    }
+
+
+}

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

@@ -16,9 +16,14 @@ public class Constant {
 	public static final Long EDNAAPI_PRIED = 30l;
 	public static final Long TOP_PRIED = 1800l;
 
+    public static final String TPOINT_WP_RFDL = "RFDLB"; // 日发电量
+    public static final String TPOINT_WP_YFDL = "YFDLB"; // 月发电量
+    public static final String TPOINT_WP_NFDL = "NFDLB"; // 年发电量
+
 	public static final String TPOINT_ALL_RFDL = "RFDL"; // 汇总日发电量
 	public static final String TPOINT_ALL_YFDL = "YFDL"; // 汇总月发电量
 	public static final String TPOINT_ALL_NFDL = "NFDL"; // 汇总年发电量
+
 	public static final String TPOINT_ALL_SJGL = "RPJGL"; // 汇总日实际功率
 	public static final String TPOINT_ALL_PJFS = "RPJFS"; // 汇总日平均风速
 
@@ -50,6 +55,15 @@ public class Constant {
 	public static final String TPOINT_JPEYHL = "JPEYHL"; // 减排二氧化硫
 	public static final String TPOINT_JYBM = "JYBM"; // 节约标煤
 	public static final String TPOINT_JYS = "JYS"; // 节约用水
+
+	public static final String JPEYHT = "JSFW.NX_GD_XXX_XX_XX_XXX_XXX_CI0216"; // 减排二氧化碳
+	public static final String JYBM = "JSFW.NX_GD_XXX_XX_XX_XXX_XXX_CI0217"; // 节约标煤
+	public static final String JPEYHL = "JSFW.NX_GD_XXX_XX_XX_XXX_XXX_CI0218"; // 减排二氧化硫
+	public static final String JYYS = "JSFW.NX_GD_XXX_XX_XX_XXX_XXX_CI0219"; // 节约水
+	public static final String JSFW_SSRFDLB = "JSFW.NX_GD_XXX_XX_XX_XXX_XXX_CI0088"; // 日累计电量
+	public static final String JSFW_SSYFDLB = "JSFW.NX_GD_XXX_XX_XX_XXX_XXX_CI0146"; // 月累计电量
+	public static final String JSFW_SSNFDLB = "JSFW.NX_GD_XXX_XX_XX_XXX_XXX_CI0037"; // 年发电量
+
 	/**
 	 * 空气温度
 	 */
@@ -70,14 +84,6 @@ public class Constant {
 	public static final String TPOINT_WP_SFDL = "SFDL";// 总发电量（升压站）
 	public static final String TPOINT_WP_SSFS = "SSFS"; // 实时平均风速
 
-	public static final String TPOINT_WP_RFDL = "RFDLB"; // 日发电量
-	public static final String TPOINT_WP_YFDL = "YFDLB"; // 月发电量
-	public static final String TPOINT_WP_NFDL = "NFDLB"; // 年发电量
-
-	// public static final String TPOINT_WP_RFDL = "RFDL"; // 日发电量
-	// public static final String TPOINT_WP_YFDL = "YFDL"; // 月发电量
-	// public static final String TPOINT_WP_NFDL = "NFDL"; // 年发电量
-
 	public static final String TPOINT_WP_YFDLD = "YFDLD"; // 月发电量-自算
 
 	public static final String TPOINT_WT_RFDL = "RFDL";// 风机日发电量与SCADA日风场发电量
@@ -88,17 +94,31 @@ public class Constant {
 	public static final String TPOINT_WT_RFDL2 = "RFDLREAD";// 逆变器日发电量
 	public static final String TPOINT_WP_RFDLBZ = "RFDLE";// 日理论发电量
 	public static final String TPOINT_WP_ZLLGL = "ZLLGL";// 总理论功率
-	public static final String TPOINT_WP_ZZSGL = "ZZSGL";// 总应发功率
+	public static final String TPOINT_WP_ZZSGL = "ZZSGL";// 总实发功率
 	public static final String TPOINT_WP_SWDLN = "SWDLN";// 年上网电量
 	public static final String TPOINT_WP_SWDLY = "SWDLY";// 月上网电量
 
 	public static final String TPOINT_WT_XDTS = "XDTS";// 限电台数
 	public static final String TPOINT_WT_YXTS = "YXTS";// 运行台数
-	public static final String TPOINT_WT_DJTS = "DJTS"; // 待机台数
+	public static final String TPOINT_WT_DJTS = "DJTS";// 待机台数
 	public static final String TPOINT_WT_WHTJ = "WHTJ";// 维护台数
 	public static final String TPOINT_WT_GZTJ = "GZTJ";// 故障台数
 	public static final String TPOINT_WT_TXZD = "TXZD";// 离线台数
 
+	public static final String DJNUM = "DJNUM";// 待机台数
+	public static final String TJNUM = "TJNUM";// 手动停机台数
+	public static final String FDNUM = "FDNUM"; // 正常发电台数
+	public static final String FDJCLNUM = "FDJCLNUM";// 缺陷降出力台数
+	public static final String XDJCLNUM = "XDJCLNUM";// 限电降出力台数
+	public static final String XDTJNUM = "XDTJNUM";// 限电停机台数
+	public static final String GZNUM = "GZNUM";// 故障停机台数
+	public static final String CNGZNUM = "CNGZNUM";// 场内受累停机台数
+	public static final String JXNUM = "JXNUM"; // 检修停机台数
+	public static final String CNJXNUM = "CNJXNUM";// 场内受累检修台数
+	public static final String DWSLNUM = "DWSLNUM";// 电网受累台数
+	public static final String HJSLNUM = "HJSLNUM";// 环境受累台数
+	public static final String LXNUM = "LXNUM";// 风机离线台数
+
 	public static final String TPOINT_WT_U1YZDL = "AI061";// U1项绕组电流
 	public static final String TPOINT_WT_U2YZDL = "AI062";// U2项绕组电流
 	public static final String TPOINT_WT_U3YZDL = "AI063";// U3项绕组电流
@@ -318,4 +338,13 @@ public class Constant {
 	public static final String FCCFTSD = "FCCFTSD";// 测风塔湿度
 	public static final String FCCFTYQ = "FCCFTYQ";// 测风塔压强
 	public static final String FCCFTMD = "KQMD";// 空气密度
+
+	public static final String JSFW_FJRFDLB = "JSFW.NX_GD_FDC_XX_XX_XXX_XXX_CI0088"; // 风电日发电量(升压站)
+	public static final String JSFW_FJSWDLB = "JSFW.NX_GD_FDC_XX_XX_XXX_XXX_CI0136"; // 风电上网电量
+	public static final String JSFW_FJSSZGL = "JSFW.NX_GD_FDC_XX_XX_XXX_XXX_CI0135"; // 风电实时总功率
+	public static final String JSFW_FJSSFS = "JSFW.NX_GD_FDC_XX_XX_XXX_XXX_CI0134"; // 风电实时平均风速
+
+	public static final String JSFW_GFRFDLB = "JSFW.NX_GD_GDC_XX_XX_XXX_XXX_CI0088"; // 光伏日发电量(升压站)
+	public static final String JSFW_GFSWDLB = "JSFW.NX_GD_GDC_XX_XX_XXX_XXX_CI0136"; // 光伏上网电量
+	public static final String JSFW_GFSSZGL = "JSFW.NX_GD_GDC_XX_XX_XXX_XXX_CI0135"; // 光伏实时总功率
 }

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

@@ -12,6 +12,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.stream.Collectors;
 
 /**
  * 服务启动执行
@@ -42,7 +43,8 @@ public class InitialRunner implements CommandLineRunner {
 
     public static Map<String, RMConfig> rmcmap = new HashMap<String, RMConfig>();
     public static List<Windpowerstation> wpallls = new ArrayList<Windpowerstation>(); // 风电场LIST集合
-    public static List<Windpowerstation> wpls = new ArrayList<Windpowerstation>(); // 风电场LIST集合
+    public static List<Windpowerstation> wpls = new ArrayList<>(); // 风电场LIST集合
+    public static List<Windpowerstation> wplsall = new ArrayList<>(); // 风电场光伏LIST集合
     public static List<Project> pjls = new ArrayList<Project>(); // 项目LIST集合
     public static List<Windturbine> wtls = new ArrayList<Windturbine>(); // 风电机LIST集合
 
@@ -87,8 +89,9 @@ public class InitialRunner implements CommandLineRunner {
 
         windpowerstationExample=new WindpowerstationExample();
         windpowerstationExample.setOrderByClause("ordernum ASC");
-        windpowerstationExample.createCriteria().andIdNotLike("%GDC");
-        wpls= windpowerstationService.selectByExample(windpowerstationExample);
+        List<Windpowerstation> windpowerstations = windpowerstationService.selectByExample(windpowerstationExample);
+        wpls = windpowerstations.stream().filter(p -> !p.getId().contains("GDC")).collect(Collectors.toList());
+        wplsall = windpowerstations;
 
         ProjectExample projectExample=new ProjectExample();
         projectExample.setOrderByClause("ordernum ASC");

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

@@ -7,10 +7,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import com.gyee.frame.common.base.BaseController;
 import com.gyee.frame.common.conf.V2Config;
-import com.gyee.frame.common.conf.redis.CacheConfig;
-import com.gyee.frame.common.conf.redis.CacheContext;
 import com.gyee.frame.common.conf.redis.Constant;
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.mapper.custom.TsysUserDao;
@@ -36,7 +33,6 @@ import org.apache.shiro.subject.Subject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -73,10 +69,12 @@ public class AdminController extends SocketToolController {
     	request.getSession().setAttribute("notices",notices);
 		return prefix+"/index";
 	}*/
-    @Autowired
-	private CacheConfig cacheConfig;
-    @Autowired
-	private CacheContext cacheContext;
+//    @Autowired
+//	private CacheConfig cacheConfig;
+//    @Autowired
+//	private CacheContext cacheContext;
+	@Autowired
+	private TsysUserDao tsysUserDao;
     @Autowired
 	private Constant constant;
 	@ApiOperation(value="首页",notes="首页")
@@ -153,14 +151,6 @@ public class AdminController extends SocketToolController {
         }
         return "login";
     }
-    @Autowired
-	private TsysUserDao tsysUserDao;
-
-
-
-
-
-
 
 	/**
 	 * 用户登陆验证
@@ -204,8 +194,8 @@ public class AdminController extends SocketToolController {
 						 session.setAttribute("username",user.getUsername());
 						 session.setAttribute("password",user.getPassword());
 						 Map<String,String> map = new HashMap<>();
-						 cacheConfig.putinredis(remoteAddr+"username",user.getUsername());
-						 cacheConfig.putinredis(remoteAddr+"password",user.getPassword());
+//						 cacheConfig.putinredis(remoteAddr+"username",user.getUsername());
+//						 cacheConfig.putinredis(remoteAddr+"password",user.getPassword());
 						 return  AjaxResult.success();
 					 }
 					 /*TsysUser user1 = ShiroUtils.getUser();

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

@@ -0,0 +1,20 @@
+package com.gyee.frame.controller;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/test")
+public class TestController {
+
+    @GetMapping("")
+    public String test(){
+        return "success";
+    }
+
+    @GetMapping("/")
+    public String test2(){
+        return "success-OK";
+    }
+}

src/main/java/com/gyee/frame/controller/app/predict/PredictController.java

@@ -0,0 +1,74 @@
+package com.gyee.frame.controller.app.predict;
+
+import com.gyee.frame.common.dataSources.DataSource;
+import com.gyee.frame.common.dataSources.DataSourceType;
+import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.model.auto.Wfnwpdata;
+import com.gyee.frame.service.app.predict.PredictService;
+import com.gyee.frame.util.DateUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+
+@Slf4j
+@RestController
+@RequestMapping("/predict")
+public class PredictController {
+
+    @Resource
+    private PredictService predictService;
+
+    /**
+     * 预测电量
+     * @param station
+     * @param time
+     * @return
+     */
+    @DataSource(DataSourceType.PREDICT)
+    @GetMapping("")
+    public AjaxResult getData(String station, long time){
+        SimpleDateFormat format =  new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); //设置格式
+        String timeText = format.format(time);
+
+        long now = new Date().getTime();
+        if (time >= now)
+            return AjaxResult.successData(null);
+
+        Map<String, Object> map = predictService.getPredictDL(station, timeText);
+
+        return AjaxResult.successData(map);
+    }
+
+
+    /**
+     * 预测风速 7天详情
+     * @param station
+     * @param time  eg:2022-06-20
+     * @return
+     */
+    @DataSource(DataSourceType.PREDICT)
+    @GetMapping("/windspeed")
+    public AjaxResult getWindSpeedData(String station, String time){
+        Map<String, Object> map = predictService.getPredictWindSpeed(station);
+        return AjaxResult.successData(map);
+    }
+
+    /**
+     * 预测电量  7天详情
+     * @param station
+     * @param time  eg:2022-06-20
+     * @return
+     */
+    @DataSource(DataSourceType.PREDICT)
+    @GetMapping("/dl")
+    public AjaxResult getDLData(String station, String time){
+        Map<String, Object> map = predictService.getPredictDLDetal(station, time);
+        return AjaxResult.successData(map);
+    }
+}

src/main/java/com/gyee/frame/controller/app/report/ReportController.java

@@ -0,0 +1,262 @@
+package com.gyee.frame.controller.app.report;
+
+import com.gyee.frame.common.dataSources.DataSource;
+import com.gyee.frame.common.dataSources.DataSourceType;
+import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.common.spring.InitialRunner;
+import com.gyee.frame.model.auto.Windpowerinfoday;
+import com.gyee.frame.model.auto.Windpowerinfoday3;
+import com.gyee.frame.model.auto.Windpowerstation;
+import com.gyee.frame.service.Windpowerinfoday3Service;
+import com.gyee.frame.service.WindpowerinfodayService;
+import com.gyee.frame.util.DateUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Slf4j
+@RestController
+@RequestMapping("/report")
+public class ReportController {
+
+    @Resource
+    private WindpowerinfodayService windpowerinfodayService;
+    @Resource
+    private Windpowerinfoday3Service windpowerinfoday3Service;
+
+    /**
+     * 新能源日报
+     */
+    @DataSource(value = DataSourceType.MASTER)
+    @GetMapping("/xnyrb")
+    public AjaxResult getSafeMeasure(String time) {
+        LinkedHashMap<String, Object> map1 = new LinkedHashMap<>();
+        LinkedHashMap<String, Object> map2 = new LinkedHashMap<>();
+
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(DateUtils.parseStrtoDate(time, DateUtils.YYYY_MM_DD));
+
+        //风场合计
+        double rpjfshj = 0.0;
+        double rfdlhj = 0.0;
+        double yfdlhj = 0.0;
+        double nljfdlhj = 0.0;
+        double rswdlhj = 0.0;
+        double yljswdlhj = 0.0;
+        double nljswdlhj = 0.0;
+        double zhcydlhj = 0.0;
+        double yljzhcydlhj = 0.0;
+        double scadarfdlhj = 0.0;
+        double scadayljfdlhj = 0.0;
+        double scadanljfdlhj = 0.0;
+        double scadazhcydlhj = 0.0;
+        double scadayljzhcydlhj = 0.0;
+        double scadazhcyllhj = 0.0;
+        double rxdssdlhj = 0.0;
+        double yljxdssdlhj = 0.0;
+        double nljxdssdlhj = 0.0;
+
+        //光伏合计
+        double rpjfshjgc = 0.0;
+        double rfdlhjgc = 0.0;
+        double yfdlhjgc = 0.0;
+        double nljfdlhjgc = 0.0;
+        double rswdlhjgc = 0.0;
+        double yljswdlhjgc = 0.0;
+        double nljswdlhjgc = 0.0;
+        double zhcydlhjgc = 0.0;
+        double yljzhcydlhjgc = 0.0;
+        double scadarfdlhjgc = 0.0;
+        double scadayljfdlhjgc = 0.0;
+        double scadanljfdlhjgc = 0.0;
+        double scadazhcydlhjgc = 0.0;
+        double scadayljzhcydlhjgc = 0.0;
+        double scadazhcyllhjgc = 0.0;
+        double rxdssdlhjgc = 0.0;
+        double yljxdssdlhjgc = 0.0;
+        double nljxdssdlhjgc = 0.0;
+
+        for (Windpowerstation wp : InitialRunner.wplsall) {
+            try{
+                List<Windpowerinfoday> list = windpowerinfodayService.findListByStationAndDate(wp.getId(), calendar.getTime());
+                List<Windpowerinfoday> collect = list.stream().filter(w -> w.getForeignkeyid().equals(wp.getId())).collect(Collectors.toList());
+                Windpowerinfoday wind = collect.size() > 0 ? collect.get(0) : new Windpowerinfoday();
+
+                double rpjfs = wind.getSpeed();
+                double rfdl = wind.getGeneratingcapacity4();
+                double yfdl = wind.getMonthgc2();
+                double nljfdl = wind.getYeargc2();
+                double rswdl = wind.getGridelectricity4();
+                double yljswdl = wind.getMonthge();
+                double nljswdl = wind.getYearge();
+                double zhcydl = wind.getBuyelectricity4() + wind.getBuyagricultureelectricity4() + wind.getGeneratingcapacity4() - wind.getGridelectricity4();
+                double yljzhcydl = wind.getMonthbe() + wind.getMonthae() + wind.getMonthgc2() - wind.getMonthge();
+
+                List<Windpowerinfoday> scada = list.stream().filter(w -> w.getWindpowerstationid().equals(wp.getId()) && w.getForeignkeyid().contains("_GC")).collect(Collectors.toList());
+                double scadarfdl = scada.stream().mapToDouble(Windpowerinfoday::getGeneratingcapacity).sum();
+
+                double scadayljfdl = wind.getMonthgc();
+                double scadanljfdl = wind.getYeargc();
+                double scadazhcydl = wind.getBuyelectricity4() + wind.getBuyagricultureelectricity4() + wind.getGeneratingcapacity() - wind.getGridelectricity4();
+                double scadayljzhcydl = wind.getMonthbe() + wind.getMonthae() + wind.getMonthgc() - wind.getMonthge();
+                double scadazhcyll = scadarfdl == 0 ? 0.0 : scadazhcydl / scadarfdl * 100;
+
+                List<Windpowerinfoday3> info1 = windpowerinfoday3Service.getItemByStationAndDate(wp.getId(), calendar.getTime(), calendar.getTime());
+                Date st = calendar.getTime();
+                calendar.add(Calendar.MONTH, 0);
+                calendar.set(Calendar.DAY_OF_MONTH, 1);
+                List<Windpowerinfoday3> info2 = windpowerinfoday3Service.getItemByStationAndDate(wp.getId(), calendar.getTime(), st);
+                int year = calendar.get(Calendar.YEAR);
+                calendar.setTime(DateUtils.parseStrtoDate(year + "-01-01", DateUtils.YYYY_MM_DD));
+                List<Windpowerinfoday3> info3 = windpowerinfoday3Service.getItemByStationAndDate(wp.getId(), calendar.getTime(), st);
+                double rxdssdl = info1.size() > 0 ? info1.get(0).getDaynhxdssdl() / 10000 : 0.0;
+                double yljxdssdl = info2.stream().mapToDouble(Windpowerinfoday3::getDaynhcfdl).sum() / 10000;
+                double nljxdssdl = info3.stream().mapToDouble(Windpowerinfoday3::getDaynhcfdl).sum() / 10000;
+
+                Map<String, Double> count = new HashMap<>();
+                count.put("rpjfs", rpjfs);
+                count.put("rfdl", rfdl);
+                count.put("yfdl", yfdl);
+                count.put("nljfdl", nljfdl);
+                count.put("rswdl", rswdl);
+                count.put("yljswdl", yljswdl);
+                count.put("nljswdl", nljswdl);
+                count.put("zhcydl", zhcydl);
+                count.put("yljzhcydl", yljzhcydl);
+                count.put("scadarfdl", scadarfdl);
+                count.put("scadayljfdl", scadayljfdl);
+                count.put("scadanljfdl", scadanljfdl);
+                count.put("scadazhcydl", scadazhcydl);
+                count.put("scadayljzhcydl", scadayljzhcydl);
+                count.put("scadazhcyll", scadazhcyll);
+                count.put("rxdssdl", rxdssdl);
+                count.put("yljxdssdl", yljxdssdl);
+                count.put("nljxdssdl", nljxdssdl);
+
+                if (wp.getId().contains("FDC")){
+                    map1.put(wp.getName(), count);
+                    rpjfshj += rpjfs;
+                    rfdlhj += rfdl;
+                    yfdlhj += yfdl;
+                    nljfdlhj += nljfdl;
+                    rswdlhj += rswdl;
+                    yljswdlhj += yljswdl;
+                    nljswdlhj += nljswdl;
+                    zhcydlhj += zhcydl;
+                    yljzhcydlhj += yljzhcydl;
+                    scadarfdlhj += scadarfdl;
+                    scadayljfdlhj += scadayljfdl;
+                    scadanljfdlhj += scadanljfdl;
+                    scadazhcydlhj += scadazhcydl;
+                    scadayljzhcydlhj += scadayljzhcydl;
+                    scadazhcyllhj += scadazhcyll;
+                    rxdssdlhj += rxdssdl;
+                    yljxdssdlhj += yljxdssdl;
+                    nljxdssdlhj += nljxdssdl;
+                }
+                if (wp.getId().contains("GDC")){
+                    map2.put(wp.getName(), count);
+                    rpjfshjgc += rpjfs;
+                    rfdlhjgc += rfdl;
+                    yfdlhjgc += yfdl;
+                    nljfdlhjgc += nljfdl;
+                    rswdlhjgc += rswdl;
+                    yljswdlhjgc += yljswdl;
+                    nljswdlhjgc += nljswdl;
+                    zhcydlhjgc += zhcydl;
+                    yljzhcydlhjgc += yljzhcydl;
+                    scadarfdlhjgc += scadarfdl;
+                    scadayljfdlhjgc += scadayljfdl;
+                    scadanljfdlhjgc += scadanljfdl;
+                    scadazhcydlhjgc += scadazhcydl;
+                    scadayljzhcydlhjgc += scadayljzhcydl;
+                    scadazhcyllhjgc += scadazhcyll;
+                    rxdssdlhjgc += rxdssdl;
+                    yljxdssdlhjgc += yljxdssdl;
+                    nljxdssdlhjgc += nljxdssdl;
+                }
+
+            } catch (Exception e){
+                continue;
+            }
+        }
+
+        Map<String, Double> pm1 = new HashMap<>();
+        pm1.put("rpjfs", rpjfshj / 5);
+        pm1.put("rfdl", rfdlhj);
+        pm1.put("yfdl", yfdlhj);
+        pm1.put("nljfdl", nljfdlhj);
+        pm1.put("rswdl", rswdlhj);
+        pm1.put("yljswdl", yljswdlhj);
+        pm1.put("nljswdl", nljswdlhj);
+        pm1.put("zhcydl", zhcydlhj);
+        pm1.put("yljzhcydl", yljzhcydlhj);
+        pm1.put("scadarfdl", scadarfdlhj);
+        pm1.put("scadayljfdl", scadayljfdlhj);
+        pm1.put("scadanljfdl", scadanljfdlhj);
+        pm1.put("scadazhcydl", scadazhcydlhj);
+        pm1.put("scadayljzhcydl", scadayljzhcydlhj);
+        pm1.put("scadazhcyll", scadazhcyllhj);
+        pm1.put("rxdssdl", rxdssdlhj);
+        pm1.put("yljxdssdl", yljxdssdlhj);
+        pm1.put("nljxdssdl", nljxdssdlhj);
+        map1.put("合计", pm1);
+
+        Map<String, Double> pm2 = new HashMap<>();
+        pm2.put("rpjfs", rpjfshjgc / 5);
+        pm2.put("rfdl", rfdlhjgc);
+        pm2.put("yfdl", yfdlhjgc);
+        pm2.put("nljfdl", nljfdlhjgc);
+        pm2.put("rswdl", rswdlhjgc);
+        pm2.put("yljswdl", yljswdlhjgc);
+        pm2.put("nljswdl", nljswdlhjgc);
+        pm2.put("zhcydl", zhcydlhjgc);
+        pm2.put("yljzhcydl", yljzhcydlhjgc);
+        pm2.put("scadarfdl", scadarfdlhjgc);
+        pm2.put("scadayljfdl", scadayljfdlhjgc);
+        pm2.put("scadanljfdl", scadanljfdlhjgc);
+        pm2.put("scadazhcydl", scadazhcydlhjgc);
+        pm2.put("scadayljzhcydl", scadayljzhcydlhjgc);
+        pm2.put("scadazhcyll", scadazhcyllhjgc);
+        pm2.put("rxdssdl", rxdssdlhjgc);
+        pm2.put("yljxdssdl", yljxdssdlhjgc);
+        pm2.put("nljxdssdl", nljxdssdlhjgc);
+        map2.put("合计", pm2);
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("FDC", map1);
+        map.put("GDC", map2);
+
+        return AjaxResult.successData(map);
+    }
+
+
+    public static void main(String[] a) {
+
+//        Calendar calendar = Calendar.getInstance();
+//
+//        calendar.setTime(DateUtils.parseStrtoDate("2022-06-08", DateUtils.YYYY_MM_DD));
+//        System.out.println(DateUtils.format(calendar.getTime(), DateUtils.YYYY_MM_DD));
+//
+//        calendar.add(Calendar.MONTH, 0);
+//        calendar.set(Calendar.DAY_OF_MONTH, 1);
+//        System.out.println(DateUtils.format(calendar.getTime(), DateUtils.YYYY_MM_DD_HH_MM_SS));
+//
+//        calendar.add(Calendar.MONTH, 1);
+//        calendar.set(Calendar.DAY_OF_MONTH, 0);
+//        System.out.println(DateUtils.format(calendar.getTime(), DateUtils.YYYY_MM_DD_HH_MM_SS));
+//
+//
+//        int i = calendar.get(Calendar.YEAR);
+//        System.out.println(i);
+    }
+}

src/main/java/com/gyee/frame/controller/gen/UserauthorityController.java

@@ -1,6 +1,5 @@
 package com.gyee.frame.controller.gen;
 
-import com.gyee.frame.common.conf.redis.CacheConfig;
 import com.gyee.frame.model.auto.TsysUser;
 import com.gyee.frame.service.SysUserService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -35,6 +34,8 @@ import java.util.List;
 public class UserauthorityController extends BaseController{
 	
 	private String prefix = "gen/userauthority";
+//	@Autowired
+//	private CacheConfig cacheConfig;
 	@Autowired
 	private UserauthorityService userauthorityService;
 	
@@ -138,9 +139,6 @@ public class UserauthorityController extends BaseController{
 	}
 
 
-	@Autowired
-	private CacheConfig cacheConfig;
-
 	/**
 	 * 获取用户的权限
 	 *
@@ -152,9 +150,10 @@ public class UserauthorityController extends BaseController{
 		HttpSession session = httpServletRequest.getSession();
 		String username = (String)session.getAttribute("username");
 		String password = (String)session.getAttribute("password");
-		username = cacheConfig.getFromredisToString(remoteAddr+"username");
-		password = cacheConfig.getFromredisToString(remoteAddr+"password");
-		return new String[]{username,password};
+//		username = cacheConfig.getFromredisToString(remoteAddr+"username");
+//		password = cacheConfig.getFromredisToString(remoteAddr+"password");
+//		return new String[]{username,password};
+		return null;
 	}
 
 

src/main/java/com/gyee/frame/controller/ticket/LoginController.java

@@ -8,6 +8,7 @@ import com.gyee.frame.service.ticket.IbsusersService;
 import com.gyee.frame.service.ticket.LaborService;
 import com.gyee.frame.service.ticket.ShiroService;
 import com.gyee.frame.util.StringUtils;
+import com.gyee.frame.util.ticket.TokenCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -22,6 +23,25 @@ public class LoginController {
     IbsusersService ibsusersService;
     @Autowired
     ShiroService shiroService;
+    @Autowired
+    TokenCache tokenCache;
+
+    /**
+     * 登录入口  vpn和用户关联
+     * @param vpnId
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @PostMapping(value = "sys/vpnlogin")
+    public AjaxResult vpnLogin(@RequestParam("vpnId") String vpnId){
+        Labor labor = laborService.getLaborByVPN(vpnId);
+        if (labor == null)
+            return AjaxResult.error(4004, "用户名或密码错误");
+
+        Map<String, Object> token = shiroService.createToken(labor, vpnId);
+
+        return AjaxResult.successData(token);
+    }
 
     /**
      * 登录入口

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

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

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

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

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

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

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

@@ -0,0 +1,98 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.Wfnwpdata;
+import com.gyee.frame.model.auto.WfnwpdataExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+public interface WfnwpdataMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    long countByExample(WfnwpdataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(WfnwpdataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(@Param("windplantNo") Short windplantNo, @Param("nwpType") Short nwpType, @Param("fileTime") Long fileTime, @Param("dataTime") Date dataTime);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    int insert(Wfnwpdata record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    int insertSelective(Wfnwpdata record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    List<Wfnwpdata> selectByExample(WfnwpdataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    Wfnwpdata selectByPrimaryKey(@Param("windplantNo") Short windplantNo, @Param("nwpType") Short nwpType, @Param("fileTime") Long fileTime, @Param("dataTime") Date dataTime);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") Wfnwpdata record, @Param("example") WfnwpdataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") Wfnwpdata record, @Param("example") WfnwpdataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(Wfnwpdata record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(Wfnwpdata record);
+}

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

@@ -0,0 +1,98 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.Wfstatperioddata;
+import com.gyee.frame.model.auto.WfstatperioddataExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+public interface WfstatperioddataMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    long countByExample(WfstatperioddataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(WfstatperioddataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(@Param("windplantNo") Short windplantNo, @Param("dataTime") Date dataTime);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    int insert(Wfstatperioddata record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    int insertSelective(Wfstatperioddata record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    List<Wfstatperioddata> selectByExample(WfstatperioddataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    Wfstatperioddata selectByPrimaryKey(@Param("windplantNo") Short windplantNo, @Param("dataTime") Date dataTime);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") Wfstatperioddata record, @Param("example") WfstatperioddataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") Wfstatperioddata record, @Param("example") WfstatperioddataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(Wfstatperioddata record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(Wfstatperioddata record);
+}

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

@@ -0,0 +1,98 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.Wfusptsperioddata;
+import com.gyee.frame.model.auto.WfusptsperioddataExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+public interface WfusptsperioddataMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    long countByExample(WfusptsperioddataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(WfusptsperioddataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(@Param("windplantNo") Short windplantNo, @Param("modelNo") Integer modelNo, @Param("timeScale") Short timeScale, @Param("dataTime") Date dataTime);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    int insert(Wfusptsperioddata record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    int insertSelective(Wfusptsperioddata record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    List<Wfusptsperioddata> selectByExample(WfusptsperioddataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    Wfusptsperioddata selectByPrimaryKey(@Param("windplantNo") Short windplantNo, @Param("modelNo") Integer modelNo, @Param("timeScale") Short timeScale, @Param("dataTime") Date dataTime);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") Wfusptsperioddata record, @Param("example") WfusptsperioddataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") Wfusptsperioddata record, @Param("example") WfusptsperioddataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(Wfusptsperioddata record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(Wfusptsperioddata record);
+}

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,179 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Noscalewfdaefperioddata implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column NOSCALE_WF_DA_EF_PERIOD_DATA.WINDPLANT_NO
+     *
+     * @mbg.generated
+     */
+    private Short windplantNo;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column NOSCALE_WF_DA_EF_PERIOD_DATA.MODEL_NO
+     *
+     * @mbg.generated
+     */
+    private Integer modelNo;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column NOSCALE_WF_DA_EF_PERIOD_DATA.DATA_TIME
+     *
+     * @mbg.generated
+     */
+    private Date dataTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column NOSCALE_WF_DA_EF_PERIOD_DATA.VALUE
+     *
+     * @mbg.generated
+     */
+    private Double value;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column NOSCALE_WF_DA_EF_PERIOD_DATA.DATA_FLAG
+     *
+     * @mbg.generated
+     */
+    private Short dataFlag;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table NOSCALE_WF_DA_EF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column NOSCALE_WF_DA_EF_PERIOD_DATA.WINDPLANT_NO
+     *
+     * @return the value of NOSCALE_WF_DA_EF_PERIOD_DATA.WINDPLANT_NO
+     *
+     * @mbg.generated
+     */
+    public Short getWindplantNo() {
+        return windplantNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column NOSCALE_WF_DA_EF_PERIOD_DATA.WINDPLANT_NO
+     *
+     * @param windplantNo the value for NOSCALE_WF_DA_EF_PERIOD_DATA.WINDPLANT_NO
+     *
+     * @mbg.generated
+     */
+    public void setWindplantNo(Short windplantNo) {
+        this.windplantNo = windplantNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column NOSCALE_WF_DA_EF_PERIOD_DATA.MODEL_NO
+     *
+     * @return the value of NOSCALE_WF_DA_EF_PERIOD_DATA.MODEL_NO
+     *
+     * @mbg.generated
+     */
+    public Integer getModelNo() {
+        return modelNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column NOSCALE_WF_DA_EF_PERIOD_DATA.MODEL_NO
+     *
+     * @param modelNo the value for NOSCALE_WF_DA_EF_PERIOD_DATA.MODEL_NO
+     *
+     * @mbg.generated
+     */
+    public void setModelNo(Integer modelNo) {
+        this.modelNo = modelNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column NOSCALE_WF_DA_EF_PERIOD_DATA.DATA_TIME
+     *
+     * @return the value of NOSCALE_WF_DA_EF_PERIOD_DATA.DATA_TIME
+     *
+     * @mbg.generated
+     */
+    public Date getDataTime() {
+        return dataTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column NOSCALE_WF_DA_EF_PERIOD_DATA.DATA_TIME
+     *
+     * @param dataTime the value for NOSCALE_WF_DA_EF_PERIOD_DATA.DATA_TIME
+     *
+     * @mbg.generated
+     */
+    public void setDataTime(Date dataTime) {
+        this.dataTime = dataTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column NOSCALE_WF_DA_EF_PERIOD_DATA.VALUE
+     *
+     * @return the value of NOSCALE_WF_DA_EF_PERIOD_DATA.VALUE
+     *
+     * @mbg.generated
+     */
+    public Double getValue() {
+        return value;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column NOSCALE_WF_DA_EF_PERIOD_DATA.VALUE
+     *
+     * @param value the value for NOSCALE_WF_DA_EF_PERIOD_DATA.VALUE
+     *
+     * @mbg.generated
+     */
+    public void setValue(Double value) {
+        this.value = value;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column NOSCALE_WF_DA_EF_PERIOD_DATA.DATA_FLAG
+     *
+     * @return the value of NOSCALE_WF_DA_EF_PERIOD_DATA.DATA_FLAG
+     *
+     * @mbg.generated
+     */
+    public Short getDataFlag() {
+        return dataFlag;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column NOSCALE_WF_DA_EF_PERIOD_DATA.DATA_FLAG
+     *
+     * @param dataFlag the value for NOSCALE_WF_DA_EF_PERIOD_DATA.DATA_FLAG
+     *
+     * @mbg.generated
+     */
+    public void setDataFlag(Short dataFlag) {
+        this.dataFlag = dataFlag;
+    }
+}

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

@@ -0,0 +1,603 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class NoscalewfdaefperioddataExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table NOSCALE_WF_DA_EF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table NOSCALE_WF_DA_EF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table NOSCALE_WF_DA_EF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table NOSCALE_WF_DA_EF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public NoscalewfdaefperioddataExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table NOSCALE_WF_DA_EF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table NOSCALE_WF_DA_EF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table NOSCALE_WF_DA_EF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table NOSCALE_WF_DA_EF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table NOSCALE_WF_DA_EF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table NOSCALE_WF_DA_EF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table NOSCALE_WF_DA_EF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table NOSCALE_WF_DA_EF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table NOSCALE_WF_DA_EF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table NOSCALE_WF_DA_EF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table NOSCALE_WF_DA_EF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andWindplantNoIsNull() {
+            addCriterion("WINDPLANT_NO is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoIsNotNull() {
+            addCriterion("WINDPLANT_NO is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoEqualTo(Short value) {
+            addCriterion("WINDPLANT_NO =", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoNotEqualTo(Short value) {
+            addCriterion("WINDPLANT_NO <>", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoGreaterThan(Short value) {
+            addCriterion("WINDPLANT_NO >", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoGreaterThanOrEqualTo(Short value) {
+            addCriterion("WINDPLANT_NO >=", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoLessThan(Short value) {
+            addCriterion("WINDPLANT_NO <", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoLessThanOrEqualTo(Short value) {
+            addCriterion("WINDPLANT_NO <=", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoIn(List<Short> values) {
+            addCriterion("WINDPLANT_NO in", values, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoNotIn(List<Short> values) {
+            addCriterion("WINDPLANT_NO not in", values, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoBetween(Short value1, Short value2) {
+            addCriterion("WINDPLANT_NO between", value1, value2, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoNotBetween(Short value1, Short value2) {
+            addCriterion("WINDPLANT_NO not between", value1, value2, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoIsNull() {
+            addCriterion("MODEL_NO is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoIsNotNull() {
+            addCriterion("MODEL_NO is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoEqualTo(Integer value) {
+            addCriterion("MODEL_NO =", value, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoNotEqualTo(Integer value) {
+            addCriterion("MODEL_NO <>", value, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoGreaterThan(Integer value) {
+            addCriterion("MODEL_NO >", value, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoGreaterThanOrEqualTo(Integer value) {
+            addCriterion("MODEL_NO >=", value, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoLessThan(Integer value) {
+            addCriterion("MODEL_NO <", value, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoLessThanOrEqualTo(Integer value) {
+            addCriterion("MODEL_NO <=", value, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoIn(List<Integer> values) {
+            addCriterion("MODEL_NO in", values, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoNotIn(List<Integer> values) {
+            addCriterion("MODEL_NO not in", values, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoBetween(Integer value1, Integer value2) {
+            addCriterion("MODEL_NO between", value1, value2, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoNotBetween(Integer value1, Integer value2) {
+            addCriterion("MODEL_NO not between", value1, value2, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeIsNull() {
+            addCriterion("DATA_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeIsNotNull() {
+            addCriterion("DATA_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeEqualTo(Date value) {
+            addCriterion("DATA_TIME =", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeNotEqualTo(Date value) {
+            addCriterion("DATA_TIME <>", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeGreaterThan(Date value) {
+            addCriterion("DATA_TIME >", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("DATA_TIME >=", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeLessThan(Date value) {
+            addCriterion("DATA_TIME <", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeLessThanOrEqualTo(Date value) {
+            addCriterion("DATA_TIME <=", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeIn(List<Date> values) {
+            addCriterion("DATA_TIME in", values, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeNotIn(List<Date> values) {
+            addCriterion("DATA_TIME not in", values, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeBetween(Date value1, Date value2) {
+            addCriterion("DATA_TIME between", value1, value2, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeNotBetween(Date value1, Date value2) {
+            addCriterion("DATA_TIME not between", value1, value2, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIsNull() {
+            addCriterion("VALUE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIsNotNull() {
+            addCriterion("VALUE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueEqualTo(Double value) {
+            addCriterion("VALUE =", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotEqualTo(Double value) {
+            addCriterion("VALUE <>", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueGreaterThan(Double value) {
+            addCriterion("VALUE >", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueGreaterThanOrEqualTo(Double value) {
+            addCriterion("VALUE >=", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueLessThan(Double value) {
+            addCriterion("VALUE <", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueLessThanOrEqualTo(Double value) {
+            addCriterion("VALUE <=", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIn(List<Double> values) {
+            addCriterion("VALUE in", values, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotIn(List<Double> values) {
+            addCriterion("VALUE not in", values, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueBetween(Double value1, Double value2) {
+            addCriterion("VALUE between", value1, value2, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotBetween(Double value1, Double value2) {
+            addCriterion("VALUE not between", value1, value2, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagIsNull() {
+            addCriterion("DATA_FLAG is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagIsNotNull() {
+            addCriterion("DATA_FLAG is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagEqualTo(Short value) {
+            addCriterion("DATA_FLAG =", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagNotEqualTo(Short value) {
+            addCriterion("DATA_FLAG <>", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagGreaterThan(Short value) {
+            addCriterion("DATA_FLAG >", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagGreaterThanOrEqualTo(Short value) {
+            addCriterion("DATA_FLAG >=", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagLessThan(Short value) {
+            addCriterion("DATA_FLAG <", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagLessThanOrEqualTo(Short value) {
+            addCriterion("DATA_FLAG <=", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagIn(List<Short> values) {
+            addCriterion("DATA_FLAG in", values, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagNotIn(List<Short> values) {
+            addCriterion("DATA_FLAG not in", values, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagBetween(Short value1, Short value2) {
+            addCriterion("DATA_FLAG between", value1, value2, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagNotBetween(Short value1, Short value2) {
+            addCriterion("DATA_FLAG not between", value1, value2, "dataFlag");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table NOSCALE_WF_DA_EF_PERIOD_DATA
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table NOSCALE_WF_DA_EF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -0,0 +1,212 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Noscalewfdapfperioddata implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column NOSCALE_WF_DA_PF_PERIOD_DATA.WINDPLANT_NO
+     *
+     * @mbg.generated
+     */
+    private Short windplantNo;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column NOSCALE_WF_DA_PF_PERIOD_DATA.MODEL_NO
+     *
+     * @mbg.generated
+     */
+    private Integer modelNo;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column NOSCALE_WF_DA_PF_PERIOD_DATA.DATA_TIME
+     *
+     * @mbg.generated
+     */
+    private Date dataTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column NOSCALE_WF_DA_PF_PERIOD_DATA.VALUE
+     *
+     * @mbg.generated
+     */
+    private Double value;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column NOSCALE_WF_DA_PF_PERIOD_DATA.DATA_FLAG
+     *
+     * @mbg.generated
+     */
+    private Short dataFlag;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column NOSCALE_WF_DA_PF_PERIOD_DATA.MODSPEED
+     *
+     * @mbg.generated
+     */
+    private Double modspeed;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table NOSCALE_WF_DA_PF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column NOSCALE_WF_DA_PF_PERIOD_DATA.WINDPLANT_NO
+     *
+     * @return the value of NOSCALE_WF_DA_PF_PERIOD_DATA.WINDPLANT_NO
+     *
+     * @mbg.generated
+     */
+    public Short getWindplantNo() {
+        return windplantNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column NOSCALE_WF_DA_PF_PERIOD_DATA.WINDPLANT_NO
+     *
+     * @param windplantNo the value for NOSCALE_WF_DA_PF_PERIOD_DATA.WINDPLANT_NO
+     *
+     * @mbg.generated
+     */
+    public void setWindplantNo(Short windplantNo) {
+        this.windplantNo = windplantNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column NOSCALE_WF_DA_PF_PERIOD_DATA.MODEL_NO
+     *
+     * @return the value of NOSCALE_WF_DA_PF_PERIOD_DATA.MODEL_NO
+     *
+     * @mbg.generated
+     */
+    public Integer getModelNo() {
+        return modelNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column NOSCALE_WF_DA_PF_PERIOD_DATA.MODEL_NO
+     *
+     * @param modelNo the value for NOSCALE_WF_DA_PF_PERIOD_DATA.MODEL_NO
+     *
+     * @mbg.generated
+     */
+    public void setModelNo(Integer modelNo) {
+        this.modelNo = modelNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column NOSCALE_WF_DA_PF_PERIOD_DATA.DATA_TIME
+     *
+     * @return the value of NOSCALE_WF_DA_PF_PERIOD_DATA.DATA_TIME
+     *
+     * @mbg.generated
+     */
+    public Date getDataTime() {
+        return dataTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column NOSCALE_WF_DA_PF_PERIOD_DATA.DATA_TIME
+     *
+     * @param dataTime the value for NOSCALE_WF_DA_PF_PERIOD_DATA.DATA_TIME
+     *
+     * @mbg.generated
+     */
+    public void setDataTime(Date dataTime) {
+        this.dataTime = dataTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column NOSCALE_WF_DA_PF_PERIOD_DATA.VALUE
+     *
+     * @return the value of NOSCALE_WF_DA_PF_PERIOD_DATA.VALUE
+     *
+     * @mbg.generated
+     */
+    public Double getValue() {
+        return value;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column NOSCALE_WF_DA_PF_PERIOD_DATA.VALUE
+     *
+     * @param value the value for NOSCALE_WF_DA_PF_PERIOD_DATA.VALUE
+     *
+     * @mbg.generated
+     */
+    public void setValue(Double value) {
+        this.value = value;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column NOSCALE_WF_DA_PF_PERIOD_DATA.DATA_FLAG
+     *
+     * @return the value of NOSCALE_WF_DA_PF_PERIOD_DATA.DATA_FLAG
+     *
+     * @mbg.generated
+     */
+    public Short getDataFlag() {
+        return dataFlag;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column NOSCALE_WF_DA_PF_PERIOD_DATA.DATA_FLAG
+     *
+     * @param dataFlag the value for NOSCALE_WF_DA_PF_PERIOD_DATA.DATA_FLAG
+     *
+     * @mbg.generated
+     */
+    public void setDataFlag(Short dataFlag) {
+        this.dataFlag = dataFlag;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column NOSCALE_WF_DA_PF_PERIOD_DATA.MODSPEED
+     *
+     * @return the value of NOSCALE_WF_DA_PF_PERIOD_DATA.MODSPEED
+     *
+     * @mbg.generated
+     */
+    public Double getModspeed() {
+        return modspeed;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column NOSCALE_WF_DA_PF_PERIOD_DATA.MODSPEED
+     *
+     * @param modspeed the value for NOSCALE_WF_DA_PF_PERIOD_DATA.MODSPEED
+     *
+     * @mbg.generated
+     */
+    public void setModspeed(Double modspeed) {
+        this.modspeed = modspeed;
+    }
+}

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

@@ -0,0 +1,663 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class NoscalewfdapfperioddataExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table NOSCALE_WF_DA_PF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table NOSCALE_WF_DA_PF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table NOSCALE_WF_DA_PF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table NOSCALE_WF_DA_PF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public NoscalewfdapfperioddataExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table NOSCALE_WF_DA_PF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table NOSCALE_WF_DA_PF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table NOSCALE_WF_DA_PF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table NOSCALE_WF_DA_PF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table NOSCALE_WF_DA_PF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table NOSCALE_WF_DA_PF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table NOSCALE_WF_DA_PF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table NOSCALE_WF_DA_PF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table NOSCALE_WF_DA_PF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table NOSCALE_WF_DA_PF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table NOSCALE_WF_DA_PF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andWindplantNoIsNull() {
+            addCriterion("WINDPLANT_NO is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoIsNotNull() {
+            addCriterion("WINDPLANT_NO is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoEqualTo(Short value) {
+            addCriterion("WINDPLANT_NO =", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoNotEqualTo(Short value) {
+            addCriterion("WINDPLANT_NO <>", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoGreaterThan(Short value) {
+            addCriterion("WINDPLANT_NO >", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoGreaterThanOrEqualTo(Short value) {
+            addCriterion("WINDPLANT_NO >=", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoLessThan(Short value) {
+            addCriterion("WINDPLANT_NO <", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoLessThanOrEqualTo(Short value) {
+            addCriterion("WINDPLANT_NO <=", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoIn(List<Short> values) {
+            addCriterion("WINDPLANT_NO in", values, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoNotIn(List<Short> values) {
+            addCriterion("WINDPLANT_NO not in", values, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoBetween(Short value1, Short value2) {
+            addCriterion("WINDPLANT_NO between", value1, value2, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoNotBetween(Short value1, Short value2) {
+            addCriterion("WINDPLANT_NO not between", value1, value2, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoIsNull() {
+            addCriterion("MODEL_NO is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoIsNotNull() {
+            addCriterion("MODEL_NO is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoEqualTo(Integer value) {
+            addCriterion("MODEL_NO =", value, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoNotEqualTo(Integer value) {
+            addCriterion("MODEL_NO <>", value, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoGreaterThan(Integer value) {
+            addCriterion("MODEL_NO >", value, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoGreaterThanOrEqualTo(Integer value) {
+            addCriterion("MODEL_NO >=", value, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoLessThan(Integer value) {
+            addCriterion("MODEL_NO <", value, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoLessThanOrEqualTo(Integer value) {
+            addCriterion("MODEL_NO <=", value, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoIn(List<Integer> values) {
+            addCriterion("MODEL_NO in", values, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoNotIn(List<Integer> values) {
+            addCriterion("MODEL_NO not in", values, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoBetween(Integer value1, Integer value2) {
+            addCriterion("MODEL_NO between", value1, value2, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoNotBetween(Integer value1, Integer value2) {
+            addCriterion("MODEL_NO not between", value1, value2, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeIsNull() {
+            addCriterion("DATA_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeIsNotNull() {
+            addCriterion("DATA_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeEqualTo(Date value) {
+            addCriterion("DATA_TIME =", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeNotEqualTo(Date value) {
+            addCriterion("DATA_TIME <>", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeGreaterThan(Date value) {
+            addCriterion("DATA_TIME >", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("DATA_TIME >=", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeLessThan(Date value) {
+            addCriterion("DATA_TIME <", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeLessThanOrEqualTo(Date value) {
+            addCriterion("DATA_TIME <=", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeIn(List<Date> values) {
+            addCriterion("DATA_TIME in", values, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeNotIn(List<Date> values) {
+            addCriterion("DATA_TIME not in", values, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeBetween(Date value1, Date value2) {
+            addCriterion("DATA_TIME between", value1, value2, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeNotBetween(Date value1, Date value2) {
+            addCriterion("DATA_TIME not between", value1, value2, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIsNull() {
+            addCriterion("VALUE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIsNotNull() {
+            addCriterion("VALUE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueEqualTo(Double value) {
+            addCriterion("VALUE =", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotEqualTo(Double value) {
+            addCriterion("VALUE <>", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueGreaterThan(Double value) {
+            addCriterion("VALUE >", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueGreaterThanOrEqualTo(Double value) {
+            addCriterion("VALUE >=", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueLessThan(Double value) {
+            addCriterion("VALUE <", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueLessThanOrEqualTo(Double value) {
+            addCriterion("VALUE <=", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIn(List<Double> values) {
+            addCriterion("VALUE in", values, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotIn(List<Double> values) {
+            addCriterion("VALUE not in", values, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueBetween(Double value1, Double value2) {
+            addCriterion("VALUE between", value1, value2, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotBetween(Double value1, Double value2) {
+            addCriterion("VALUE not between", value1, value2, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagIsNull() {
+            addCriterion("DATA_FLAG is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagIsNotNull() {
+            addCriterion("DATA_FLAG is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagEqualTo(Short value) {
+            addCriterion("DATA_FLAG =", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagNotEqualTo(Short value) {
+            addCriterion("DATA_FLAG <>", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagGreaterThan(Short value) {
+            addCriterion("DATA_FLAG >", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagGreaterThanOrEqualTo(Short value) {
+            addCriterion("DATA_FLAG >=", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagLessThan(Short value) {
+            addCriterion("DATA_FLAG <", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagLessThanOrEqualTo(Short value) {
+            addCriterion("DATA_FLAG <=", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagIn(List<Short> values) {
+            addCriterion("DATA_FLAG in", values, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagNotIn(List<Short> values) {
+            addCriterion("DATA_FLAG not in", values, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagBetween(Short value1, Short value2) {
+            addCriterion("DATA_FLAG between", value1, value2, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagNotBetween(Short value1, Short value2) {
+            addCriterion("DATA_FLAG not between", value1, value2, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andModspeedIsNull() {
+            addCriterion("MODSPEED is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModspeedIsNotNull() {
+            addCriterion("MODSPEED is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModspeedEqualTo(Double value) {
+            addCriterion("MODSPEED =", value, "modspeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andModspeedNotEqualTo(Double value) {
+            addCriterion("MODSPEED <>", value, "modspeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andModspeedGreaterThan(Double value) {
+            addCriterion("MODSPEED >", value, "modspeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andModspeedGreaterThanOrEqualTo(Double value) {
+            addCriterion("MODSPEED >=", value, "modspeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andModspeedLessThan(Double value) {
+            addCriterion("MODSPEED <", value, "modspeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andModspeedLessThanOrEqualTo(Double value) {
+            addCriterion("MODSPEED <=", value, "modspeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andModspeedIn(List<Double> values) {
+            addCriterion("MODSPEED in", values, "modspeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andModspeedNotIn(List<Double> values) {
+            addCriterion("MODSPEED not in", values, "modspeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andModspeedBetween(Double value1, Double value2) {
+            addCriterion("MODSPEED between", value1, value2, "modspeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andModspeedNotBetween(Double value1, Double value2) {
+            addCriterion("MODSPEED not between", value1, value2, "modspeed");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table NOSCALE_WF_DA_PF_PERIOD_DATA
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table NOSCALE_WF_DA_PF_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -0,0 +1,277 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class Wffileconfig implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_FILE_CONFIG.WINDPLANT_NO
+     *
+     * @mbg.generated
+     */
+    private Short windplantNo;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_FILE_CONFIG.ABBR_NAME
+     *
+     * @mbg.generated
+     */
+    private String abbrName;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_FILE_CONFIG.NWP_FLAG
+     *
+     * @mbg.generated
+     */
+    private Long nwpFlag;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_FILE_CONFIG.USP_NWP_NO
+     *
+     * @mbg.generated
+     */
+    private Short uspNwpNo;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_FILE_CONFIG.WPFMODEL_NO
+     *
+     * @mbg.generated
+     */
+    private Integer wpfmodelNo;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_FILE_CONFIG.UWPFMODEL_NO
+     *
+     * @mbg.generated
+     */
+    private Integer uwpfmodelNo;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_FILE_CONFIG.WPFEMODEL_NO
+     *
+     * @mbg.generated
+     */
+    private Integer wpfemodelNo;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_FILE_CONFIG.UWPFEMODEL_NO
+     *
+     * @mbg.generated
+     */
+    private Integer uwpfemodelNo;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WF_FILE_CONFIG
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_FILE_CONFIG.WINDPLANT_NO
+     *
+     * @return the value of WF_FILE_CONFIG.WINDPLANT_NO
+     *
+     * @mbg.generated
+     */
+    public Short getWindplantNo() {
+        return windplantNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_FILE_CONFIG.WINDPLANT_NO
+     *
+     * @param windplantNo the value for WF_FILE_CONFIG.WINDPLANT_NO
+     *
+     * @mbg.generated
+     */
+    public void setWindplantNo(Short windplantNo) {
+        this.windplantNo = windplantNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_FILE_CONFIG.ABBR_NAME
+     *
+     * @return the value of WF_FILE_CONFIG.ABBR_NAME
+     *
+     * @mbg.generated
+     */
+    public String getAbbrName() {
+        return abbrName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_FILE_CONFIG.ABBR_NAME
+     *
+     * @param abbrName the value for WF_FILE_CONFIG.ABBR_NAME
+     *
+     * @mbg.generated
+     */
+    public void setAbbrName(String abbrName) {
+        this.abbrName = abbrName == null ? null : abbrName.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_FILE_CONFIG.NWP_FLAG
+     *
+     * @return the value of WF_FILE_CONFIG.NWP_FLAG
+     *
+     * @mbg.generated
+     */
+    public Long getNwpFlag() {
+        return nwpFlag;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_FILE_CONFIG.NWP_FLAG
+     *
+     * @param nwpFlag the value for WF_FILE_CONFIG.NWP_FLAG
+     *
+     * @mbg.generated
+     */
+    public void setNwpFlag(Long nwpFlag) {
+        this.nwpFlag = nwpFlag;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_FILE_CONFIG.USP_NWP_NO
+     *
+     * @return the value of WF_FILE_CONFIG.USP_NWP_NO
+     *
+     * @mbg.generated
+     */
+    public Short getUspNwpNo() {
+        return uspNwpNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_FILE_CONFIG.USP_NWP_NO
+     *
+     * @param uspNwpNo the value for WF_FILE_CONFIG.USP_NWP_NO
+     *
+     * @mbg.generated
+     */
+    public void setUspNwpNo(Short uspNwpNo) {
+        this.uspNwpNo = uspNwpNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_FILE_CONFIG.WPFMODEL_NO
+     *
+     * @return the value of WF_FILE_CONFIG.WPFMODEL_NO
+     *
+     * @mbg.generated
+     */
+    public Integer getWpfmodelNo() {
+        return wpfmodelNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_FILE_CONFIG.WPFMODEL_NO
+     *
+     * @param wpfmodelNo the value for WF_FILE_CONFIG.WPFMODEL_NO
+     *
+     * @mbg.generated
+     */
+    public void setWpfmodelNo(Integer wpfmodelNo) {
+        this.wpfmodelNo = wpfmodelNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_FILE_CONFIG.UWPFMODEL_NO
+     *
+     * @return the value of WF_FILE_CONFIG.UWPFMODEL_NO
+     *
+     * @mbg.generated
+     */
+    public Integer getUwpfmodelNo() {
+        return uwpfmodelNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_FILE_CONFIG.UWPFMODEL_NO
+     *
+     * @param uwpfmodelNo the value for WF_FILE_CONFIG.UWPFMODEL_NO
+     *
+     * @mbg.generated
+     */
+    public void setUwpfmodelNo(Integer uwpfmodelNo) {
+        this.uwpfmodelNo = uwpfmodelNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_FILE_CONFIG.WPFEMODEL_NO
+     *
+     * @return the value of WF_FILE_CONFIG.WPFEMODEL_NO
+     *
+     * @mbg.generated
+     */
+    public Integer getWpfemodelNo() {
+        return wpfemodelNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_FILE_CONFIG.WPFEMODEL_NO
+     *
+     * @param wpfemodelNo the value for WF_FILE_CONFIG.WPFEMODEL_NO
+     *
+     * @mbg.generated
+     */
+    public void setWpfemodelNo(Integer wpfemodelNo) {
+        this.wpfemodelNo = wpfemodelNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_FILE_CONFIG.UWPFEMODEL_NO
+     *
+     * @return the value of WF_FILE_CONFIG.UWPFEMODEL_NO
+     *
+     * @mbg.generated
+     */
+    public Integer getUwpfemodelNo() {
+        return uwpfemodelNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_FILE_CONFIG.UWPFEMODEL_NO
+     *
+     * @param uwpfemodelNo the value for WF_FILE_CONFIG.UWPFEMODEL_NO
+     *
+     * @mbg.generated
+     */
+    public void setUwpfemodelNo(Integer uwpfemodelNo) {
+        this.uwpfemodelNo = uwpfemodelNo;
+    }
+}

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

@@ -0,0 +1,792 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class WffileconfigExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WF_FILE_CONFIG
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WF_FILE_CONFIG
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WF_FILE_CONFIG
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_FILE_CONFIG
+     *
+     * @mbg.generated
+     */
+    public WffileconfigExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_FILE_CONFIG
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_FILE_CONFIG
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_FILE_CONFIG
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_FILE_CONFIG
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_FILE_CONFIG
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_FILE_CONFIG
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_FILE_CONFIG
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_FILE_CONFIG
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_FILE_CONFIG
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_FILE_CONFIG
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WF_FILE_CONFIG
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andWindplantNoIsNull() {
+            addCriterion("WINDPLANT_NO is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoIsNotNull() {
+            addCriterion("WINDPLANT_NO is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoEqualTo(Short value) {
+            addCriterion("WINDPLANT_NO =", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoNotEqualTo(Short value) {
+            addCriterion("WINDPLANT_NO <>", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoGreaterThan(Short value) {
+            addCriterion("WINDPLANT_NO >", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoGreaterThanOrEqualTo(Short value) {
+            addCriterion("WINDPLANT_NO >=", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoLessThan(Short value) {
+            addCriterion("WINDPLANT_NO <", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoLessThanOrEqualTo(Short value) {
+            addCriterion("WINDPLANT_NO <=", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoIn(List<Short> values) {
+            addCriterion("WINDPLANT_NO in", values, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoNotIn(List<Short> values) {
+            addCriterion("WINDPLANT_NO not in", values, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoBetween(Short value1, Short value2) {
+            addCriterion("WINDPLANT_NO between", value1, value2, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoNotBetween(Short value1, Short value2) {
+            addCriterion("WINDPLANT_NO not between", value1, value2, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbbrNameIsNull() {
+            addCriterion("ABBR_NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbbrNameIsNotNull() {
+            addCriterion("ABBR_NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbbrNameEqualTo(String value) {
+            addCriterion("ABBR_NAME =", value, "abbrName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbbrNameNotEqualTo(String value) {
+            addCriterion("ABBR_NAME <>", value, "abbrName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbbrNameGreaterThan(String value) {
+            addCriterion("ABBR_NAME >", value, "abbrName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbbrNameGreaterThanOrEqualTo(String value) {
+            addCriterion("ABBR_NAME >=", value, "abbrName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbbrNameLessThan(String value) {
+            addCriterion("ABBR_NAME <", value, "abbrName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbbrNameLessThanOrEqualTo(String value) {
+            addCriterion("ABBR_NAME <=", value, "abbrName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbbrNameLike(String value) {
+            addCriterion("ABBR_NAME like", value, "abbrName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbbrNameNotLike(String value) {
+            addCriterion("ABBR_NAME not like", value, "abbrName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbbrNameIn(List<String> values) {
+            addCriterion("ABBR_NAME in", values, "abbrName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbbrNameNotIn(List<String> values) {
+            addCriterion("ABBR_NAME not in", values, "abbrName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbbrNameBetween(String value1, String value2) {
+            addCriterion("ABBR_NAME between", value1, value2, "abbrName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbbrNameNotBetween(String value1, String value2) {
+            addCriterion("ABBR_NAME not between", value1, value2, "abbrName");
+            return (Criteria) this;
+        }
+
+        public Criteria andNwpFlagIsNull() {
+            addCriterion("NWP_FLAG is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNwpFlagIsNotNull() {
+            addCriterion("NWP_FLAG is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNwpFlagEqualTo(Long value) {
+            addCriterion("NWP_FLAG =", value, "nwpFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andNwpFlagNotEqualTo(Long value) {
+            addCriterion("NWP_FLAG <>", value, "nwpFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andNwpFlagGreaterThan(Long value) {
+            addCriterion("NWP_FLAG >", value, "nwpFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andNwpFlagGreaterThanOrEqualTo(Long value) {
+            addCriterion("NWP_FLAG >=", value, "nwpFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andNwpFlagLessThan(Long value) {
+            addCriterion("NWP_FLAG <", value, "nwpFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andNwpFlagLessThanOrEqualTo(Long value) {
+            addCriterion("NWP_FLAG <=", value, "nwpFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andNwpFlagIn(List<Long> values) {
+            addCriterion("NWP_FLAG in", values, "nwpFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andNwpFlagNotIn(List<Long> values) {
+            addCriterion("NWP_FLAG not in", values, "nwpFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andNwpFlagBetween(Long value1, Long value2) {
+            addCriterion("NWP_FLAG between", value1, value2, "nwpFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andNwpFlagNotBetween(Long value1, Long value2) {
+            addCriterion("NWP_FLAG not between", value1, value2, "nwpFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andUspNwpNoIsNull() {
+            addCriterion("USP_NWP_NO is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUspNwpNoIsNotNull() {
+            addCriterion("USP_NWP_NO is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUspNwpNoEqualTo(Short value) {
+            addCriterion("USP_NWP_NO =", value, "uspNwpNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUspNwpNoNotEqualTo(Short value) {
+            addCriterion("USP_NWP_NO <>", value, "uspNwpNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUspNwpNoGreaterThan(Short value) {
+            addCriterion("USP_NWP_NO >", value, "uspNwpNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUspNwpNoGreaterThanOrEqualTo(Short value) {
+            addCriterion("USP_NWP_NO >=", value, "uspNwpNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUspNwpNoLessThan(Short value) {
+            addCriterion("USP_NWP_NO <", value, "uspNwpNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUspNwpNoLessThanOrEqualTo(Short value) {
+            addCriterion("USP_NWP_NO <=", value, "uspNwpNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUspNwpNoIn(List<Short> values) {
+            addCriterion("USP_NWP_NO in", values, "uspNwpNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUspNwpNoNotIn(List<Short> values) {
+            addCriterion("USP_NWP_NO not in", values, "uspNwpNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUspNwpNoBetween(Short value1, Short value2) {
+            addCriterion("USP_NWP_NO between", value1, value2, "uspNwpNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUspNwpNoNotBetween(Short value1, Short value2) {
+            addCriterion("USP_NWP_NO not between", value1, value2, "uspNwpNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpfmodelNoIsNull() {
+            addCriterion("WPFMODEL_NO is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpfmodelNoIsNotNull() {
+            addCriterion("WPFMODEL_NO is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpfmodelNoEqualTo(Integer value) {
+            addCriterion("WPFMODEL_NO =", value, "wpfmodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpfmodelNoNotEqualTo(Integer value) {
+            addCriterion("WPFMODEL_NO <>", value, "wpfmodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpfmodelNoGreaterThan(Integer value) {
+            addCriterion("WPFMODEL_NO >", value, "wpfmodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpfmodelNoGreaterThanOrEqualTo(Integer value) {
+            addCriterion("WPFMODEL_NO >=", value, "wpfmodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpfmodelNoLessThan(Integer value) {
+            addCriterion("WPFMODEL_NO <", value, "wpfmodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpfmodelNoLessThanOrEqualTo(Integer value) {
+            addCriterion("WPFMODEL_NO <=", value, "wpfmodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpfmodelNoIn(List<Integer> values) {
+            addCriterion("WPFMODEL_NO in", values, "wpfmodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpfmodelNoNotIn(List<Integer> values) {
+            addCriterion("WPFMODEL_NO not in", values, "wpfmodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpfmodelNoBetween(Integer value1, Integer value2) {
+            addCriterion("WPFMODEL_NO between", value1, value2, "wpfmodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpfmodelNoNotBetween(Integer value1, Integer value2) {
+            addCriterion("WPFMODEL_NO not between", value1, value2, "wpfmodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUwpfmodelNoIsNull() {
+            addCriterion("UWPFMODEL_NO is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUwpfmodelNoIsNotNull() {
+            addCriterion("UWPFMODEL_NO is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUwpfmodelNoEqualTo(Integer value) {
+            addCriterion("UWPFMODEL_NO =", value, "uwpfmodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUwpfmodelNoNotEqualTo(Integer value) {
+            addCriterion("UWPFMODEL_NO <>", value, "uwpfmodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUwpfmodelNoGreaterThan(Integer value) {
+            addCriterion("UWPFMODEL_NO >", value, "uwpfmodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUwpfmodelNoGreaterThanOrEqualTo(Integer value) {
+            addCriterion("UWPFMODEL_NO >=", value, "uwpfmodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUwpfmodelNoLessThan(Integer value) {
+            addCriterion("UWPFMODEL_NO <", value, "uwpfmodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUwpfmodelNoLessThanOrEqualTo(Integer value) {
+            addCriterion("UWPFMODEL_NO <=", value, "uwpfmodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUwpfmodelNoIn(List<Integer> values) {
+            addCriterion("UWPFMODEL_NO in", values, "uwpfmodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUwpfmodelNoNotIn(List<Integer> values) {
+            addCriterion("UWPFMODEL_NO not in", values, "uwpfmodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUwpfmodelNoBetween(Integer value1, Integer value2) {
+            addCriterion("UWPFMODEL_NO between", value1, value2, "uwpfmodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUwpfmodelNoNotBetween(Integer value1, Integer value2) {
+            addCriterion("UWPFMODEL_NO not between", value1, value2, "uwpfmodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpfemodelNoIsNull() {
+            addCriterion("WPFEMODEL_NO is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpfemodelNoIsNotNull() {
+            addCriterion("WPFEMODEL_NO is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpfemodelNoEqualTo(Integer value) {
+            addCriterion("WPFEMODEL_NO =", value, "wpfemodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpfemodelNoNotEqualTo(Integer value) {
+            addCriterion("WPFEMODEL_NO <>", value, "wpfemodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpfemodelNoGreaterThan(Integer value) {
+            addCriterion("WPFEMODEL_NO >", value, "wpfemodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpfemodelNoGreaterThanOrEqualTo(Integer value) {
+            addCriterion("WPFEMODEL_NO >=", value, "wpfemodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpfemodelNoLessThan(Integer value) {
+            addCriterion("WPFEMODEL_NO <", value, "wpfemodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpfemodelNoLessThanOrEqualTo(Integer value) {
+            addCriterion("WPFEMODEL_NO <=", value, "wpfemodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpfemodelNoIn(List<Integer> values) {
+            addCriterion("WPFEMODEL_NO in", values, "wpfemodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpfemodelNoNotIn(List<Integer> values) {
+            addCriterion("WPFEMODEL_NO not in", values, "wpfemodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpfemodelNoBetween(Integer value1, Integer value2) {
+            addCriterion("WPFEMODEL_NO between", value1, value2, "wpfemodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpfemodelNoNotBetween(Integer value1, Integer value2) {
+            addCriterion("WPFEMODEL_NO not between", value1, value2, "wpfemodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUwpfemodelNoIsNull() {
+            addCriterion("UWPFEMODEL_NO is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUwpfemodelNoIsNotNull() {
+            addCriterion("UWPFEMODEL_NO is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUwpfemodelNoEqualTo(Integer value) {
+            addCriterion("UWPFEMODEL_NO =", value, "uwpfemodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUwpfemodelNoNotEqualTo(Integer value) {
+            addCriterion("UWPFEMODEL_NO <>", value, "uwpfemodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUwpfemodelNoGreaterThan(Integer value) {
+            addCriterion("UWPFEMODEL_NO >", value, "uwpfemodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUwpfemodelNoGreaterThanOrEqualTo(Integer value) {
+            addCriterion("UWPFEMODEL_NO >=", value, "uwpfemodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUwpfemodelNoLessThan(Integer value) {
+            addCriterion("UWPFEMODEL_NO <", value, "uwpfemodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUwpfemodelNoLessThanOrEqualTo(Integer value) {
+            addCriterion("UWPFEMODEL_NO <=", value, "uwpfemodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUwpfemodelNoIn(List<Integer> values) {
+            addCriterion("UWPFEMODEL_NO in", values, "uwpfemodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUwpfemodelNoNotIn(List<Integer> values) {
+            addCriterion("UWPFEMODEL_NO not in", values, "uwpfemodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUwpfemodelNoBetween(Integer value1, Integer value2) {
+            addCriterion("UWPFEMODEL_NO between", value1, value2, "uwpfemodelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUwpfemodelNoNotBetween(Integer value1, Integer value2) {
+            addCriterion("UWPFEMODEL_NO not between", value1, value2, "uwpfemodelNo");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WF_FILE_CONFIG
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WF_FILE_CONFIG
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -0,0 +1,311 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Wfnwpdata implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_NWP_DATA.WINDPLANT_NO
+     *
+     * @mbg.generated
+     */
+    private Short windplantNo;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_NWP_DATA.NWP_TYPE
+     *
+     * @mbg.generated
+     */
+    private Short nwpType;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_NWP_DATA.FILE_TIME
+     *
+     * @mbg.generated
+     */
+    private Long fileTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_NWP_DATA.DATA_TIME
+     *
+     * @mbg.generated
+     */
+    private Date dataTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_NWP_DATA.WIND_SPEED
+     *
+     * @mbg.generated
+     */
+    private Double windSpeed;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_NWP_DATA.TEMPERATURE
+     *
+     * @mbg.generated
+     */
+    private Double temperature;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_NWP_DATA.WIND_DIR
+     *
+     * @mbg.generated
+     */
+    private Double windDir;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_NWP_DATA.HUMIDITY
+     *
+     * @mbg.generated
+     */
+    private Double humidity;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_NWP_DATA.AIR_PRESSURE
+     *
+     * @mbg.generated
+     */
+    private Double airPressure;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_NWP_DATA.WINDPLANT_NO
+     *
+     * @return the value of WF_NWP_DATA.WINDPLANT_NO
+     *
+     * @mbg.generated
+     */
+    public Short getWindplantNo() {
+        return windplantNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_NWP_DATA.WINDPLANT_NO
+     *
+     * @param windplantNo the value for WF_NWP_DATA.WINDPLANT_NO
+     *
+     * @mbg.generated
+     */
+    public void setWindplantNo(Short windplantNo) {
+        this.windplantNo = windplantNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_NWP_DATA.NWP_TYPE
+     *
+     * @return the value of WF_NWP_DATA.NWP_TYPE
+     *
+     * @mbg.generated
+     */
+    public Short getNwpType() {
+        return nwpType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_NWP_DATA.NWP_TYPE
+     *
+     * @param nwpType the value for WF_NWP_DATA.NWP_TYPE
+     *
+     * @mbg.generated
+     */
+    public void setNwpType(Short nwpType) {
+        this.nwpType = nwpType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_NWP_DATA.FILE_TIME
+     *
+     * @return the value of WF_NWP_DATA.FILE_TIME
+     *
+     * @mbg.generated
+     */
+    public Long getFileTime() {
+        return fileTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_NWP_DATA.FILE_TIME
+     *
+     * @param fileTime the value for WF_NWP_DATA.FILE_TIME
+     *
+     * @mbg.generated
+     */
+    public void setFileTime(Long fileTime) {
+        this.fileTime = fileTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_NWP_DATA.DATA_TIME
+     *
+     * @return the value of WF_NWP_DATA.DATA_TIME
+     *
+     * @mbg.generated
+     */
+    public Date getDataTime() {
+        return dataTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_NWP_DATA.DATA_TIME
+     *
+     * @param dataTime the value for WF_NWP_DATA.DATA_TIME
+     *
+     * @mbg.generated
+     */
+    public void setDataTime(Date dataTime) {
+        this.dataTime = dataTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_NWP_DATA.WIND_SPEED
+     *
+     * @return the value of WF_NWP_DATA.WIND_SPEED
+     *
+     * @mbg.generated
+     */
+    public Double getWindSpeed() {
+        return windSpeed;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_NWP_DATA.WIND_SPEED
+     *
+     * @param windSpeed the value for WF_NWP_DATA.WIND_SPEED
+     *
+     * @mbg.generated
+     */
+    public void setWindSpeed(Double windSpeed) {
+        this.windSpeed = windSpeed;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_NWP_DATA.TEMPERATURE
+     *
+     * @return the value of WF_NWP_DATA.TEMPERATURE
+     *
+     * @mbg.generated
+     */
+    public Double getTemperature() {
+        return temperature;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_NWP_DATA.TEMPERATURE
+     *
+     * @param temperature the value for WF_NWP_DATA.TEMPERATURE
+     *
+     * @mbg.generated
+     */
+    public void setTemperature(Double temperature) {
+        this.temperature = temperature;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_NWP_DATA.WIND_DIR
+     *
+     * @return the value of WF_NWP_DATA.WIND_DIR
+     *
+     * @mbg.generated
+     */
+    public Double getWindDir() {
+        return windDir;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_NWP_DATA.WIND_DIR
+     *
+     * @param windDir the value for WF_NWP_DATA.WIND_DIR
+     *
+     * @mbg.generated
+     */
+    public void setWindDir(Double windDir) {
+        this.windDir = windDir;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_NWP_DATA.HUMIDITY
+     *
+     * @return the value of WF_NWP_DATA.HUMIDITY
+     *
+     * @mbg.generated
+     */
+    public Double getHumidity() {
+        return humidity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_NWP_DATA.HUMIDITY
+     *
+     * @param humidity the value for WF_NWP_DATA.HUMIDITY
+     *
+     * @mbg.generated
+     */
+    public void setHumidity(Double humidity) {
+        this.humidity = humidity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_NWP_DATA.AIR_PRESSURE
+     *
+     * @return the value of WF_NWP_DATA.AIR_PRESSURE
+     *
+     * @mbg.generated
+     */
+    public Double getAirPressure() {
+        return airPressure;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_NWP_DATA.AIR_PRESSURE
+     *
+     * @param airPressure the value for WF_NWP_DATA.AIR_PRESSURE
+     *
+     * @mbg.generated
+     */
+    public void setAirPressure(Double airPressure) {
+        this.airPressure = airPressure;
+    }
+}

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

@@ -0,0 +1,843 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class WfnwpdataExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    public WfnwpdataExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andWindplantNoIsNull() {
+            addCriterion("WINDPLANT_NO is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoIsNotNull() {
+            addCriterion("WINDPLANT_NO is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoEqualTo(Short value) {
+            addCriterion("WINDPLANT_NO =", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoNotEqualTo(Short value) {
+            addCriterion("WINDPLANT_NO <>", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoGreaterThan(Short value) {
+            addCriterion("WINDPLANT_NO >", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoGreaterThanOrEqualTo(Short value) {
+            addCriterion("WINDPLANT_NO >=", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoLessThan(Short value) {
+            addCriterion("WINDPLANT_NO <", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoLessThanOrEqualTo(Short value) {
+            addCriterion("WINDPLANT_NO <=", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoIn(List<Short> values) {
+            addCriterion("WINDPLANT_NO in", values, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoNotIn(List<Short> values) {
+            addCriterion("WINDPLANT_NO not in", values, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoBetween(Short value1, Short value2) {
+            addCriterion("WINDPLANT_NO between", value1, value2, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoNotBetween(Short value1, Short value2) {
+            addCriterion("WINDPLANT_NO not between", value1, value2, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andNwpTypeIsNull() {
+            addCriterion("NWP_TYPE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNwpTypeIsNotNull() {
+            addCriterion("NWP_TYPE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNwpTypeEqualTo(Short value) {
+            addCriterion("NWP_TYPE =", value, "nwpType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNwpTypeNotEqualTo(Short value) {
+            addCriterion("NWP_TYPE <>", value, "nwpType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNwpTypeGreaterThan(Short value) {
+            addCriterion("NWP_TYPE >", value, "nwpType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNwpTypeGreaterThanOrEqualTo(Short value) {
+            addCriterion("NWP_TYPE >=", value, "nwpType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNwpTypeLessThan(Short value) {
+            addCriterion("NWP_TYPE <", value, "nwpType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNwpTypeLessThanOrEqualTo(Short value) {
+            addCriterion("NWP_TYPE <=", value, "nwpType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNwpTypeIn(List<Short> values) {
+            addCriterion("NWP_TYPE in", values, "nwpType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNwpTypeNotIn(List<Short> values) {
+            addCriterion("NWP_TYPE not in", values, "nwpType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNwpTypeBetween(Short value1, Short value2) {
+            addCriterion("NWP_TYPE between", value1, value2, "nwpType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNwpTypeNotBetween(Short value1, Short value2) {
+            addCriterion("NWP_TYPE not between", value1, value2, "nwpType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTimeIsNull() {
+            addCriterion("FILE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTimeIsNotNull() {
+            addCriterion("FILE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTimeEqualTo(Long value) {
+            addCriterion("FILE_TIME =", value, "fileTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTimeNotEqualTo(Long value) {
+            addCriterion("FILE_TIME <>", value, "fileTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTimeGreaterThan(Long value) {
+            addCriterion("FILE_TIME >", value, "fileTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("FILE_TIME >=", value, "fileTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTimeLessThan(Long value) {
+            addCriterion("FILE_TIME <", value, "fileTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTimeLessThanOrEqualTo(Long value) {
+            addCriterion("FILE_TIME <=", value, "fileTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTimeIn(List<Long> values) {
+            addCriterion("FILE_TIME in", values, "fileTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTimeNotIn(List<Long> values) {
+            addCriterion("FILE_TIME not in", values, "fileTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTimeBetween(Long value1, Long value2) {
+            addCriterion("FILE_TIME between", value1, value2, "fileTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTimeNotBetween(Long value1, Long value2) {
+            addCriterion("FILE_TIME not between", value1, value2, "fileTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeIsNull() {
+            addCriterion("DATA_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeIsNotNull() {
+            addCriterion("DATA_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeEqualTo(Date value) {
+            addCriterion("DATA_TIME =", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeNotEqualTo(Date value) {
+            addCriterion("DATA_TIME <>", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeGreaterThan(Date value) {
+            addCriterion("DATA_TIME >", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("DATA_TIME >=", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeLessThan(Date value) {
+            addCriterion("DATA_TIME <", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeLessThanOrEqualTo(Date value) {
+            addCriterion("DATA_TIME <=", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeIn(List<Date> values) {
+            addCriterion("DATA_TIME in", values, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeNotIn(List<Date> values) {
+            addCriterion("DATA_TIME not in", values, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeBetween(Date value1, Date value2) {
+            addCriterion("DATA_TIME between", value1, value2, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeNotBetween(Date value1, Date value2) {
+            addCriterion("DATA_TIME not between", value1, value2, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindSpeedIsNull() {
+            addCriterion("WIND_SPEED is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindSpeedIsNotNull() {
+            addCriterion("WIND_SPEED is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindSpeedEqualTo(Double value) {
+            addCriterion("WIND_SPEED =", value, "windSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindSpeedNotEqualTo(Double value) {
+            addCriterion("WIND_SPEED <>", value, "windSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindSpeedGreaterThan(Double value) {
+            addCriterion("WIND_SPEED >", value, "windSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindSpeedGreaterThanOrEqualTo(Double value) {
+            addCriterion("WIND_SPEED >=", value, "windSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindSpeedLessThan(Double value) {
+            addCriterion("WIND_SPEED <", value, "windSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindSpeedLessThanOrEqualTo(Double value) {
+            addCriterion("WIND_SPEED <=", value, "windSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindSpeedIn(List<Double> values) {
+            addCriterion("WIND_SPEED in", values, "windSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindSpeedNotIn(List<Double> values) {
+            addCriterion("WIND_SPEED not in", values, "windSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindSpeedBetween(Double value1, Double value2) {
+            addCriterion("WIND_SPEED between", value1, value2, "windSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindSpeedNotBetween(Double value1, Double value2) {
+            addCriterion("WIND_SPEED not between", value1, value2, "windSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureIsNull() {
+            addCriterion("TEMPERATURE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureIsNotNull() {
+            addCriterion("TEMPERATURE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureEqualTo(Double value) {
+            addCriterion("TEMPERATURE =", value, "temperature");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureNotEqualTo(Double value) {
+            addCriterion("TEMPERATURE <>", value, "temperature");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureGreaterThan(Double value) {
+            addCriterion("TEMPERATURE >", value, "temperature");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureGreaterThanOrEqualTo(Double value) {
+            addCriterion("TEMPERATURE >=", value, "temperature");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureLessThan(Double value) {
+            addCriterion("TEMPERATURE <", value, "temperature");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureLessThanOrEqualTo(Double value) {
+            addCriterion("TEMPERATURE <=", value, "temperature");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureIn(List<Double> values) {
+            addCriterion("TEMPERATURE in", values, "temperature");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureNotIn(List<Double> values) {
+            addCriterion("TEMPERATURE not in", values, "temperature");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureBetween(Double value1, Double value2) {
+            addCriterion("TEMPERATURE between", value1, value2, "temperature");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureNotBetween(Double value1, Double value2) {
+            addCriterion("TEMPERATURE not between", value1, value2, "temperature");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindDirIsNull() {
+            addCriterion("WIND_DIR is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindDirIsNotNull() {
+            addCriterion("WIND_DIR is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindDirEqualTo(Double value) {
+            addCriterion("WIND_DIR =", value, "windDir");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindDirNotEqualTo(Double value) {
+            addCriterion("WIND_DIR <>", value, "windDir");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindDirGreaterThan(Double value) {
+            addCriterion("WIND_DIR >", value, "windDir");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindDirGreaterThanOrEqualTo(Double value) {
+            addCriterion("WIND_DIR >=", value, "windDir");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindDirLessThan(Double value) {
+            addCriterion("WIND_DIR <", value, "windDir");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindDirLessThanOrEqualTo(Double value) {
+            addCriterion("WIND_DIR <=", value, "windDir");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindDirIn(List<Double> values) {
+            addCriterion("WIND_DIR in", values, "windDir");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindDirNotIn(List<Double> values) {
+            addCriterion("WIND_DIR not in", values, "windDir");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindDirBetween(Double value1, Double value2) {
+            addCriterion("WIND_DIR between", value1, value2, "windDir");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindDirNotBetween(Double value1, Double value2) {
+            addCriterion("WIND_DIR not between", value1, value2, "windDir");
+            return (Criteria) this;
+        }
+
+        public Criteria andHumidityIsNull() {
+            addCriterion("HUMIDITY is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHumidityIsNotNull() {
+            addCriterion("HUMIDITY is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHumidityEqualTo(Double value) {
+            addCriterion("HUMIDITY =", value, "humidity");
+            return (Criteria) this;
+        }
+
+        public Criteria andHumidityNotEqualTo(Double value) {
+            addCriterion("HUMIDITY <>", value, "humidity");
+            return (Criteria) this;
+        }
+
+        public Criteria andHumidityGreaterThan(Double value) {
+            addCriterion("HUMIDITY >", value, "humidity");
+            return (Criteria) this;
+        }
+
+        public Criteria andHumidityGreaterThanOrEqualTo(Double value) {
+            addCriterion("HUMIDITY >=", value, "humidity");
+            return (Criteria) this;
+        }
+
+        public Criteria andHumidityLessThan(Double value) {
+            addCriterion("HUMIDITY <", value, "humidity");
+            return (Criteria) this;
+        }
+
+        public Criteria andHumidityLessThanOrEqualTo(Double value) {
+            addCriterion("HUMIDITY <=", value, "humidity");
+            return (Criteria) this;
+        }
+
+        public Criteria andHumidityIn(List<Double> values) {
+            addCriterion("HUMIDITY in", values, "humidity");
+            return (Criteria) this;
+        }
+
+        public Criteria andHumidityNotIn(List<Double> values) {
+            addCriterion("HUMIDITY not in", values, "humidity");
+            return (Criteria) this;
+        }
+
+        public Criteria andHumidityBetween(Double value1, Double value2) {
+            addCriterion("HUMIDITY between", value1, value2, "humidity");
+            return (Criteria) this;
+        }
+
+        public Criteria andHumidityNotBetween(Double value1, Double value2) {
+            addCriterion("HUMIDITY not between", value1, value2, "humidity");
+            return (Criteria) this;
+        }
+
+        public Criteria andAirPressureIsNull() {
+            addCriterion("AIR_PRESSURE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAirPressureIsNotNull() {
+            addCriterion("AIR_PRESSURE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAirPressureEqualTo(Double value) {
+            addCriterion("AIR_PRESSURE =", value, "airPressure");
+            return (Criteria) this;
+        }
+
+        public Criteria andAirPressureNotEqualTo(Double value) {
+            addCriterion("AIR_PRESSURE <>", value, "airPressure");
+            return (Criteria) this;
+        }
+
+        public Criteria andAirPressureGreaterThan(Double value) {
+            addCriterion("AIR_PRESSURE >", value, "airPressure");
+            return (Criteria) this;
+        }
+
+        public Criteria andAirPressureGreaterThanOrEqualTo(Double value) {
+            addCriterion("AIR_PRESSURE >=", value, "airPressure");
+            return (Criteria) this;
+        }
+
+        public Criteria andAirPressureLessThan(Double value) {
+            addCriterion("AIR_PRESSURE <", value, "airPressure");
+            return (Criteria) this;
+        }
+
+        public Criteria andAirPressureLessThanOrEqualTo(Double value) {
+            addCriterion("AIR_PRESSURE <=", value, "airPressure");
+            return (Criteria) this;
+        }
+
+        public Criteria andAirPressureIn(List<Double> values) {
+            addCriterion("AIR_PRESSURE in", values, "airPressure");
+            return (Criteria) this;
+        }
+
+        public Criteria andAirPressureNotIn(List<Double> values) {
+            addCriterion("AIR_PRESSURE not in", values, "airPressure");
+            return (Criteria) this;
+        }
+
+        public Criteria andAirPressureBetween(Double value1, Double value2) {
+            addCriterion("AIR_PRESSURE between", value1, value2, "airPressure");
+            return (Criteria) this;
+        }
+
+        public Criteria andAirPressureNotBetween(Double value1, Double value2) {
+            addCriterion("AIR_PRESSURE not between", value1, value2, "airPressure");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WF_NWP_DATA
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -0,0 +1,311 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Wfstatperioddata implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_STAT_PERIOD_DATA.WINDPLANT_NO
+     *
+     * @mbg.generated
+     */
+    private Short windplantNo;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_STAT_PERIOD_DATA.DATA_TIME
+     *
+     * @mbg.generated
+     */
+    private Date dataTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_STAT_PERIOD_DATA.P1
+     *
+     * @mbg.generated
+     */
+    private Double p1;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_STAT_PERIOD_DATA.P2
+     *
+     * @mbg.generated
+     */
+    private Double p2;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_STAT_PERIOD_DATA.P0
+     *
+     * @mbg.generated
+     */
+    private Double p0;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_STAT_PERIOD_DATA.AVG_WIND_SPEED
+     *
+     * @mbg.generated
+     */
+    private Double avgWindSpeed;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_STAT_PERIOD_DATA.AVG_TEMP
+     *
+     * @mbg.generated
+     */
+    private Double avgTemp;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_STAT_PERIOD_DATA.ENERGY
+     *
+     * @mbg.generated
+     */
+    private Double energy;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_STAT_PERIOD_DATA.DATA_FLAG
+     *
+     * @mbg.generated
+     */
+    private Short dataFlag;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_STAT_PERIOD_DATA.WINDPLANT_NO
+     *
+     * @return the value of WF_STAT_PERIOD_DATA.WINDPLANT_NO
+     *
+     * @mbg.generated
+     */
+    public Short getWindplantNo() {
+        return windplantNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_STAT_PERIOD_DATA.WINDPLANT_NO
+     *
+     * @param windplantNo the value for WF_STAT_PERIOD_DATA.WINDPLANT_NO
+     *
+     * @mbg.generated
+     */
+    public void setWindplantNo(Short windplantNo) {
+        this.windplantNo = windplantNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_STAT_PERIOD_DATA.DATA_TIME
+     *
+     * @return the value of WF_STAT_PERIOD_DATA.DATA_TIME
+     *
+     * @mbg.generated
+     */
+    public Date getDataTime() {
+        return dataTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_STAT_PERIOD_DATA.DATA_TIME
+     *
+     * @param dataTime the value for WF_STAT_PERIOD_DATA.DATA_TIME
+     *
+     * @mbg.generated
+     */
+    public void setDataTime(Date dataTime) {
+        this.dataTime = dataTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_STAT_PERIOD_DATA.P1
+     *
+     * @return the value of WF_STAT_PERIOD_DATA.P1
+     *
+     * @mbg.generated
+     */
+    public Double getP1() {
+        return p1;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_STAT_PERIOD_DATA.P1
+     *
+     * @param p1 the value for WF_STAT_PERIOD_DATA.P1
+     *
+     * @mbg.generated
+     */
+    public void setP1(Double p1) {
+        this.p1 = p1;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_STAT_PERIOD_DATA.P2
+     *
+     * @return the value of WF_STAT_PERIOD_DATA.P2
+     *
+     * @mbg.generated
+     */
+    public Double getP2() {
+        return p2;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_STAT_PERIOD_DATA.P2
+     *
+     * @param p2 the value for WF_STAT_PERIOD_DATA.P2
+     *
+     * @mbg.generated
+     */
+    public void setP2(Double p2) {
+        this.p2 = p2;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_STAT_PERIOD_DATA.P0
+     *
+     * @return the value of WF_STAT_PERIOD_DATA.P0
+     *
+     * @mbg.generated
+     */
+    public Double getP0() {
+        return p0;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_STAT_PERIOD_DATA.P0
+     *
+     * @param p0 the value for WF_STAT_PERIOD_DATA.P0
+     *
+     * @mbg.generated
+     */
+    public void setP0(Double p0) {
+        this.p0 = p0;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_STAT_PERIOD_DATA.AVG_WIND_SPEED
+     *
+     * @return the value of WF_STAT_PERIOD_DATA.AVG_WIND_SPEED
+     *
+     * @mbg.generated
+     */
+    public Double getAvgWindSpeed() {
+        return avgWindSpeed;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_STAT_PERIOD_DATA.AVG_WIND_SPEED
+     *
+     * @param avgWindSpeed the value for WF_STAT_PERIOD_DATA.AVG_WIND_SPEED
+     *
+     * @mbg.generated
+     */
+    public void setAvgWindSpeed(Double avgWindSpeed) {
+        this.avgWindSpeed = avgWindSpeed;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_STAT_PERIOD_DATA.AVG_TEMP
+     *
+     * @return the value of WF_STAT_PERIOD_DATA.AVG_TEMP
+     *
+     * @mbg.generated
+     */
+    public Double getAvgTemp() {
+        return avgTemp;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_STAT_PERIOD_DATA.AVG_TEMP
+     *
+     * @param avgTemp the value for WF_STAT_PERIOD_DATA.AVG_TEMP
+     *
+     * @mbg.generated
+     */
+    public void setAvgTemp(Double avgTemp) {
+        this.avgTemp = avgTemp;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_STAT_PERIOD_DATA.ENERGY
+     *
+     * @return the value of WF_STAT_PERIOD_DATA.ENERGY
+     *
+     * @mbg.generated
+     */
+    public Double getEnergy() {
+        return energy;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_STAT_PERIOD_DATA.ENERGY
+     *
+     * @param energy the value for WF_STAT_PERIOD_DATA.ENERGY
+     *
+     * @mbg.generated
+     */
+    public void setEnergy(Double energy) {
+        this.energy = energy;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_STAT_PERIOD_DATA.DATA_FLAG
+     *
+     * @return the value of WF_STAT_PERIOD_DATA.DATA_FLAG
+     *
+     * @mbg.generated
+     */
+    public Short getDataFlag() {
+        return dataFlag;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_STAT_PERIOD_DATA.DATA_FLAG
+     *
+     * @param dataFlag the value for WF_STAT_PERIOD_DATA.DATA_FLAG
+     *
+     * @mbg.generated
+     */
+    public void setDataFlag(Short dataFlag) {
+        this.dataFlag = dataFlag;
+    }
+}

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

@@ -0,0 +1,843 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class WfstatperioddataExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public WfstatperioddataExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andWindplantNoIsNull() {
+            addCriterion("WINDPLANT_NO is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoIsNotNull() {
+            addCriterion("WINDPLANT_NO is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoEqualTo(Short value) {
+            addCriterion("WINDPLANT_NO =", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoNotEqualTo(Short value) {
+            addCriterion("WINDPLANT_NO <>", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoGreaterThan(Short value) {
+            addCriterion("WINDPLANT_NO >", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoGreaterThanOrEqualTo(Short value) {
+            addCriterion("WINDPLANT_NO >=", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoLessThan(Short value) {
+            addCriterion("WINDPLANT_NO <", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoLessThanOrEqualTo(Short value) {
+            addCriterion("WINDPLANT_NO <=", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoIn(List<Short> values) {
+            addCriterion("WINDPLANT_NO in", values, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoNotIn(List<Short> values) {
+            addCriterion("WINDPLANT_NO not in", values, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoBetween(Short value1, Short value2) {
+            addCriterion("WINDPLANT_NO between", value1, value2, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoNotBetween(Short value1, Short value2) {
+            addCriterion("WINDPLANT_NO not between", value1, value2, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeIsNull() {
+            addCriterion("DATA_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeIsNotNull() {
+            addCriterion("DATA_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeEqualTo(Date value) {
+            addCriterion("DATA_TIME =", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeNotEqualTo(Date value) {
+            addCriterion("DATA_TIME <>", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeGreaterThan(Date value) {
+            addCriterion("DATA_TIME >", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("DATA_TIME >=", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeLessThan(Date value) {
+            addCriterion("DATA_TIME <", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeLessThanOrEqualTo(Date value) {
+            addCriterion("DATA_TIME <=", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeIn(List<Date> values) {
+            addCriterion("DATA_TIME in", values, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeNotIn(List<Date> values) {
+            addCriterion("DATA_TIME not in", values, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeBetween(Date value1, Date value2) {
+            addCriterion("DATA_TIME between", value1, value2, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeNotBetween(Date value1, Date value2) {
+            addCriterion("DATA_TIME not between", value1, value2, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andP1IsNull() {
+            addCriterion("P1 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andP1IsNotNull() {
+            addCriterion("P1 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andP1EqualTo(Double value) {
+            addCriterion("P1 =", value, "p1");
+            return (Criteria) this;
+        }
+
+        public Criteria andP1NotEqualTo(Double value) {
+            addCriterion("P1 <>", value, "p1");
+            return (Criteria) this;
+        }
+
+        public Criteria andP1GreaterThan(Double value) {
+            addCriterion("P1 >", value, "p1");
+            return (Criteria) this;
+        }
+
+        public Criteria andP1GreaterThanOrEqualTo(Double value) {
+            addCriterion("P1 >=", value, "p1");
+            return (Criteria) this;
+        }
+
+        public Criteria andP1LessThan(Double value) {
+            addCriterion("P1 <", value, "p1");
+            return (Criteria) this;
+        }
+
+        public Criteria andP1LessThanOrEqualTo(Double value) {
+            addCriterion("P1 <=", value, "p1");
+            return (Criteria) this;
+        }
+
+        public Criteria andP1In(List<Double> values) {
+            addCriterion("P1 in", values, "p1");
+            return (Criteria) this;
+        }
+
+        public Criteria andP1NotIn(List<Double> values) {
+            addCriterion("P1 not in", values, "p1");
+            return (Criteria) this;
+        }
+
+        public Criteria andP1Between(Double value1, Double value2) {
+            addCriterion("P1 between", value1, value2, "p1");
+            return (Criteria) this;
+        }
+
+        public Criteria andP1NotBetween(Double value1, Double value2) {
+            addCriterion("P1 not between", value1, value2, "p1");
+            return (Criteria) this;
+        }
+
+        public Criteria andP2IsNull() {
+            addCriterion("P2 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andP2IsNotNull() {
+            addCriterion("P2 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andP2EqualTo(Double value) {
+            addCriterion("P2 =", value, "p2");
+            return (Criteria) this;
+        }
+
+        public Criteria andP2NotEqualTo(Double value) {
+            addCriterion("P2 <>", value, "p2");
+            return (Criteria) this;
+        }
+
+        public Criteria andP2GreaterThan(Double value) {
+            addCriterion("P2 >", value, "p2");
+            return (Criteria) this;
+        }
+
+        public Criteria andP2GreaterThanOrEqualTo(Double value) {
+            addCriterion("P2 >=", value, "p2");
+            return (Criteria) this;
+        }
+
+        public Criteria andP2LessThan(Double value) {
+            addCriterion("P2 <", value, "p2");
+            return (Criteria) this;
+        }
+
+        public Criteria andP2LessThanOrEqualTo(Double value) {
+            addCriterion("P2 <=", value, "p2");
+            return (Criteria) this;
+        }
+
+        public Criteria andP2In(List<Double> values) {
+            addCriterion("P2 in", values, "p2");
+            return (Criteria) this;
+        }
+
+        public Criteria andP2NotIn(List<Double> values) {
+            addCriterion("P2 not in", values, "p2");
+            return (Criteria) this;
+        }
+
+        public Criteria andP2Between(Double value1, Double value2) {
+            addCriterion("P2 between", value1, value2, "p2");
+            return (Criteria) this;
+        }
+
+        public Criteria andP2NotBetween(Double value1, Double value2) {
+            addCriterion("P2 not between", value1, value2, "p2");
+            return (Criteria) this;
+        }
+
+        public Criteria andP0IsNull() {
+            addCriterion("P0 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andP0IsNotNull() {
+            addCriterion("P0 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andP0EqualTo(Double value) {
+            addCriterion("P0 =", value, "p0");
+            return (Criteria) this;
+        }
+
+        public Criteria andP0NotEqualTo(Double value) {
+            addCriterion("P0 <>", value, "p0");
+            return (Criteria) this;
+        }
+
+        public Criteria andP0GreaterThan(Double value) {
+            addCriterion("P0 >", value, "p0");
+            return (Criteria) this;
+        }
+
+        public Criteria andP0GreaterThanOrEqualTo(Double value) {
+            addCriterion("P0 >=", value, "p0");
+            return (Criteria) this;
+        }
+
+        public Criteria andP0LessThan(Double value) {
+            addCriterion("P0 <", value, "p0");
+            return (Criteria) this;
+        }
+
+        public Criteria andP0LessThanOrEqualTo(Double value) {
+            addCriterion("P0 <=", value, "p0");
+            return (Criteria) this;
+        }
+
+        public Criteria andP0In(List<Double> values) {
+            addCriterion("P0 in", values, "p0");
+            return (Criteria) this;
+        }
+
+        public Criteria andP0NotIn(List<Double> values) {
+            addCriterion("P0 not in", values, "p0");
+            return (Criteria) this;
+        }
+
+        public Criteria andP0Between(Double value1, Double value2) {
+            addCriterion("P0 between", value1, value2, "p0");
+            return (Criteria) this;
+        }
+
+        public Criteria andP0NotBetween(Double value1, Double value2) {
+            addCriterion("P0 not between", value1, value2, "p0");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvgWindSpeedIsNull() {
+            addCriterion("AVG_WIND_SPEED is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvgWindSpeedIsNotNull() {
+            addCriterion("AVG_WIND_SPEED is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvgWindSpeedEqualTo(Double value) {
+            addCriterion("AVG_WIND_SPEED =", value, "avgWindSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvgWindSpeedNotEqualTo(Double value) {
+            addCriterion("AVG_WIND_SPEED <>", value, "avgWindSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvgWindSpeedGreaterThan(Double value) {
+            addCriterion("AVG_WIND_SPEED >", value, "avgWindSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvgWindSpeedGreaterThanOrEqualTo(Double value) {
+            addCriterion("AVG_WIND_SPEED >=", value, "avgWindSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvgWindSpeedLessThan(Double value) {
+            addCriterion("AVG_WIND_SPEED <", value, "avgWindSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvgWindSpeedLessThanOrEqualTo(Double value) {
+            addCriterion("AVG_WIND_SPEED <=", value, "avgWindSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvgWindSpeedIn(List<Double> values) {
+            addCriterion("AVG_WIND_SPEED in", values, "avgWindSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvgWindSpeedNotIn(List<Double> values) {
+            addCriterion("AVG_WIND_SPEED not in", values, "avgWindSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvgWindSpeedBetween(Double value1, Double value2) {
+            addCriterion("AVG_WIND_SPEED between", value1, value2, "avgWindSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvgWindSpeedNotBetween(Double value1, Double value2) {
+            addCriterion("AVG_WIND_SPEED not between", value1, value2, "avgWindSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvgTempIsNull() {
+            addCriterion("AVG_TEMP is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvgTempIsNotNull() {
+            addCriterion("AVG_TEMP is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvgTempEqualTo(Double value) {
+            addCriterion("AVG_TEMP =", value, "avgTemp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvgTempNotEqualTo(Double value) {
+            addCriterion("AVG_TEMP <>", value, "avgTemp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvgTempGreaterThan(Double value) {
+            addCriterion("AVG_TEMP >", value, "avgTemp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvgTempGreaterThanOrEqualTo(Double value) {
+            addCriterion("AVG_TEMP >=", value, "avgTemp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvgTempLessThan(Double value) {
+            addCriterion("AVG_TEMP <", value, "avgTemp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvgTempLessThanOrEqualTo(Double value) {
+            addCriterion("AVG_TEMP <=", value, "avgTemp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvgTempIn(List<Double> values) {
+            addCriterion("AVG_TEMP in", values, "avgTemp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvgTempNotIn(List<Double> values) {
+            addCriterion("AVG_TEMP not in", values, "avgTemp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvgTempBetween(Double value1, Double value2) {
+            addCriterion("AVG_TEMP between", value1, value2, "avgTemp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvgTempNotBetween(Double value1, Double value2) {
+            addCriterion("AVG_TEMP not between", value1, value2, "avgTemp");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnergyIsNull() {
+            addCriterion("ENERGY is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnergyIsNotNull() {
+            addCriterion("ENERGY is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnergyEqualTo(Double value) {
+            addCriterion("ENERGY =", value, "energy");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnergyNotEqualTo(Double value) {
+            addCriterion("ENERGY <>", value, "energy");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnergyGreaterThan(Double value) {
+            addCriterion("ENERGY >", value, "energy");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnergyGreaterThanOrEqualTo(Double value) {
+            addCriterion("ENERGY >=", value, "energy");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnergyLessThan(Double value) {
+            addCriterion("ENERGY <", value, "energy");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnergyLessThanOrEqualTo(Double value) {
+            addCriterion("ENERGY <=", value, "energy");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnergyIn(List<Double> values) {
+            addCriterion("ENERGY in", values, "energy");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnergyNotIn(List<Double> values) {
+            addCriterion("ENERGY not in", values, "energy");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnergyBetween(Double value1, Double value2) {
+            addCriterion("ENERGY between", value1, value2, "energy");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnergyNotBetween(Double value1, Double value2) {
+            addCriterion("ENERGY not between", value1, value2, "energy");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagIsNull() {
+            addCriterion("DATA_FLAG is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagIsNotNull() {
+            addCriterion("DATA_FLAG is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagEqualTo(Short value) {
+            addCriterion("DATA_FLAG =", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagNotEqualTo(Short value) {
+            addCriterion("DATA_FLAG <>", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagGreaterThan(Short value) {
+            addCriterion("DATA_FLAG >", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagGreaterThanOrEqualTo(Short value) {
+            addCriterion("DATA_FLAG >=", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagLessThan(Short value) {
+            addCriterion("DATA_FLAG <", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagLessThanOrEqualTo(Short value) {
+            addCriterion("DATA_FLAG <=", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagIn(List<Short> values) {
+            addCriterion("DATA_FLAG in", values, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagNotIn(List<Short> values) {
+            addCriterion("DATA_FLAG not in", values, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagBetween(Short value1, Short value2) {
+            addCriterion("DATA_FLAG between", value1, value2, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagNotBetween(Short value1, Short value2) {
+            addCriterion("DATA_FLAG not between", value1, value2, "dataFlag");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WF_STAT_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -0,0 +1,311 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Wfusptsperioddata implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_USP_TS_PERIOD_DATA.WINDPLANT_NO
+     *
+     * @mbg.generated
+     */
+    private Short windplantNo;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_USP_TS_PERIOD_DATA.MODEL_NO
+     *
+     * @mbg.generated
+     */
+    private Integer modelNo;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_USP_TS_PERIOD_DATA.TIME_SCALE
+     *
+     * @mbg.generated
+     */
+    private Short timeScale;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_USP_TS_PERIOD_DATA.DATA_TIME
+     *
+     * @mbg.generated
+     */
+    private Date dataTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_USP_TS_PERIOD_DATA.WIND_SPEED
+     *
+     * @mbg.generated
+     */
+    private Double windSpeed;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_USP_TS_PERIOD_DATA.MOD_COEFF
+     *
+     * @mbg.generated
+     */
+    private Double modCoeff;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_USP_TS_PERIOD_DATA.POWER
+     *
+     * @mbg.generated
+     */
+    private Double power;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_USP_TS_PERIOD_DATA.MOD_POWER
+     *
+     * @mbg.generated
+     */
+    private Double modPower;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_USP_TS_PERIOD_DATA.DATA_FLAG
+     *
+     * @mbg.generated
+     */
+    private Short dataFlag;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_USP_TS_PERIOD_DATA.WINDPLANT_NO
+     *
+     * @return the value of WF_USP_TS_PERIOD_DATA.WINDPLANT_NO
+     *
+     * @mbg.generated
+     */
+    public Short getWindplantNo() {
+        return windplantNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_USP_TS_PERIOD_DATA.WINDPLANT_NO
+     *
+     * @param windplantNo the value for WF_USP_TS_PERIOD_DATA.WINDPLANT_NO
+     *
+     * @mbg.generated
+     */
+    public void setWindplantNo(Short windplantNo) {
+        this.windplantNo = windplantNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_USP_TS_PERIOD_DATA.MODEL_NO
+     *
+     * @return the value of WF_USP_TS_PERIOD_DATA.MODEL_NO
+     *
+     * @mbg.generated
+     */
+    public Integer getModelNo() {
+        return modelNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_USP_TS_PERIOD_DATA.MODEL_NO
+     *
+     * @param modelNo the value for WF_USP_TS_PERIOD_DATA.MODEL_NO
+     *
+     * @mbg.generated
+     */
+    public void setModelNo(Integer modelNo) {
+        this.modelNo = modelNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_USP_TS_PERIOD_DATA.TIME_SCALE
+     *
+     * @return the value of WF_USP_TS_PERIOD_DATA.TIME_SCALE
+     *
+     * @mbg.generated
+     */
+    public Short getTimeScale() {
+        return timeScale;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_USP_TS_PERIOD_DATA.TIME_SCALE
+     *
+     * @param timeScale the value for WF_USP_TS_PERIOD_DATA.TIME_SCALE
+     *
+     * @mbg.generated
+     */
+    public void setTimeScale(Short timeScale) {
+        this.timeScale = timeScale;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_USP_TS_PERIOD_DATA.DATA_TIME
+     *
+     * @return the value of WF_USP_TS_PERIOD_DATA.DATA_TIME
+     *
+     * @mbg.generated
+     */
+    public Date getDataTime() {
+        return dataTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_USP_TS_PERIOD_DATA.DATA_TIME
+     *
+     * @param dataTime the value for WF_USP_TS_PERIOD_DATA.DATA_TIME
+     *
+     * @mbg.generated
+     */
+    public void setDataTime(Date dataTime) {
+        this.dataTime = dataTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_USP_TS_PERIOD_DATA.WIND_SPEED
+     *
+     * @return the value of WF_USP_TS_PERIOD_DATA.WIND_SPEED
+     *
+     * @mbg.generated
+     */
+    public Double getWindSpeed() {
+        return windSpeed;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_USP_TS_PERIOD_DATA.WIND_SPEED
+     *
+     * @param windSpeed the value for WF_USP_TS_PERIOD_DATA.WIND_SPEED
+     *
+     * @mbg.generated
+     */
+    public void setWindSpeed(Double windSpeed) {
+        this.windSpeed = windSpeed;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_USP_TS_PERIOD_DATA.MOD_COEFF
+     *
+     * @return the value of WF_USP_TS_PERIOD_DATA.MOD_COEFF
+     *
+     * @mbg.generated
+     */
+    public Double getModCoeff() {
+        return modCoeff;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_USP_TS_PERIOD_DATA.MOD_COEFF
+     *
+     * @param modCoeff the value for WF_USP_TS_PERIOD_DATA.MOD_COEFF
+     *
+     * @mbg.generated
+     */
+    public void setModCoeff(Double modCoeff) {
+        this.modCoeff = modCoeff;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_USP_TS_PERIOD_DATA.POWER
+     *
+     * @return the value of WF_USP_TS_PERIOD_DATA.POWER
+     *
+     * @mbg.generated
+     */
+    public Double getPower() {
+        return power;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_USP_TS_PERIOD_DATA.POWER
+     *
+     * @param power the value for WF_USP_TS_PERIOD_DATA.POWER
+     *
+     * @mbg.generated
+     */
+    public void setPower(Double power) {
+        this.power = power;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_USP_TS_PERIOD_DATA.MOD_POWER
+     *
+     * @return the value of WF_USP_TS_PERIOD_DATA.MOD_POWER
+     *
+     * @mbg.generated
+     */
+    public Double getModPower() {
+        return modPower;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_USP_TS_PERIOD_DATA.MOD_POWER
+     *
+     * @param modPower the value for WF_USP_TS_PERIOD_DATA.MOD_POWER
+     *
+     * @mbg.generated
+     */
+    public void setModPower(Double modPower) {
+        this.modPower = modPower;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_USP_TS_PERIOD_DATA.DATA_FLAG
+     *
+     * @return the value of WF_USP_TS_PERIOD_DATA.DATA_FLAG
+     *
+     * @mbg.generated
+     */
+    public Short getDataFlag() {
+        return dataFlag;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_USP_TS_PERIOD_DATA.DATA_FLAG
+     *
+     * @param dataFlag the value for WF_USP_TS_PERIOD_DATA.DATA_FLAG
+     *
+     * @mbg.generated
+     */
+    public void setDataFlag(Short dataFlag) {
+        this.dataFlag = dataFlag;
+    }
+}

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

@@ -0,0 +1,843 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class WfusptsperioddataExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public WfusptsperioddataExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andWindplantNoIsNull() {
+            addCriterion("WINDPLANT_NO is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoIsNotNull() {
+            addCriterion("WINDPLANT_NO is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoEqualTo(Short value) {
+            addCriterion("WINDPLANT_NO =", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoNotEqualTo(Short value) {
+            addCriterion("WINDPLANT_NO <>", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoGreaterThan(Short value) {
+            addCriterion("WINDPLANT_NO >", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoGreaterThanOrEqualTo(Short value) {
+            addCriterion("WINDPLANT_NO >=", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoLessThan(Short value) {
+            addCriterion("WINDPLANT_NO <", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoLessThanOrEqualTo(Short value) {
+            addCriterion("WINDPLANT_NO <=", value, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoIn(List<Short> values) {
+            addCriterion("WINDPLANT_NO in", values, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoNotIn(List<Short> values) {
+            addCriterion("WINDPLANT_NO not in", values, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoBetween(Short value1, Short value2) {
+            addCriterion("WINDPLANT_NO between", value1, value2, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindplantNoNotBetween(Short value1, Short value2) {
+            addCriterion("WINDPLANT_NO not between", value1, value2, "windplantNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoIsNull() {
+            addCriterion("MODEL_NO is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoIsNotNull() {
+            addCriterion("MODEL_NO is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoEqualTo(Integer value) {
+            addCriterion("MODEL_NO =", value, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoNotEqualTo(Integer value) {
+            addCriterion("MODEL_NO <>", value, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoGreaterThan(Integer value) {
+            addCriterion("MODEL_NO >", value, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoGreaterThanOrEqualTo(Integer value) {
+            addCriterion("MODEL_NO >=", value, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoLessThan(Integer value) {
+            addCriterion("MODEL_NO <", value, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoLessThanOrEqualTo(Integer value) {
+            addCriterion("MODEL_NO <=", value, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoIn(List<Integer> values) {
+            addCriterion("MODEL_NO in", values, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoNotIn(List<Integer> values) {
+            addCriterion("MODEL_NO not in", values, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoBetween(Integer value1, Integer value2) {
+            addCriterion("MODEL_NO between", value1, value2, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNoNotBetween(Integer value1, Integer value2) {
+            addCriterion("MODEL_NO not between", value1, value2, "modelNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeScaleIsNull() {
+            addCriterion("TIME_SCALE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeScaleIsNotNull() {
+            addCriterion("TIME_SCALE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeScaleEqualTo(Short value) {
+            addCriterion("TIME_SCALE =", value, "timeScale");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeScaleNotEqualTo(Short value) {
+            addCriterion("TIME_SCALE <>", value, "timeScale");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeScaleGreaterThan(Short value) {
+            addCriterion("TIME_SCALE >", value, "timeScale");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeScaleGreaterThanOrEqualTo(Short value) {
+            addCriterion("TIME_SCALE >=", value, "timeScale");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeScaleLessThan(Short value) {
+            addCriterion("TIME_SCALE <", value, "timeScale");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeScaleLessThanOrEqualTo(Short value) {
+            addCriterion("TIME_SCALE <=", value, "timeScale");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeScaleIn(List<Short> values) {
+            addCriterion("TIME_SCALE in", values, "timeScale");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeScaleNotIn(List<Short> values) {
+            addCriterion("TIME_SCALE not in", values, "timeScale");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeScaleBetween(Short value1, Short value2) {
+            addCriterion("TIME_SCALE between", value1, value2, "timeScale");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeScaleNotBetween(Short value1, Short value2) {
+            addCriterion("TIME_SCALE not between", value1, value2, "timeScale");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeIsNull() {
+            addCriterion("DATA_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeIsNotNull() {
+            addCriterion("DATA_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeEqualTo(Date value) {
+            addCriterion("DATA_TIME =", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeNotEqualTo(Date value) {
+            addCriterion("DATA_TIME <>", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeGreaterThan(Date value) {
+            addCriterion("DATA_TIME >", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("DATA_TIME >=", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeLessThan(Date value) {
+            addCriterion("DATA_TIME <", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeLessThanOrEqualTo(Date value) {
+            addCriterion("DATA_TIME <=", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeIn(List<Date> values) {
+            addCriterion("DATA_TIME in", values, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeNotIn(List<Date> values) {
+            addCriterion("DATA_TIME not in", values, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeBetween(Date value1, Date value2) {
+            addCriterion("DATA_TIME between", value1, value2, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeNotBetween(Date value1, Date value2) {
+            addCriterion("DATA_TIME not between", value1, value2, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindSpeedIsNull() {
+            addCriterion("WIND_SPEED is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindSpeedIsNotNull() {
+            addCriterion("WIND_SPEED is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindSpeedEqualTo(Double value) {
+            addCriterion("WIND_SPEED =", value, "windSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindSpeedNotEqualTo(Double value) {
+            addCriterion("WIND_SPEED <>", value, "windSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindSpeedGreaterThan(Double value) {
+            addCriterion("WIND_SPEED >", value, "windSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindSpeedGreaterThanOrEqualTo(Double value) {
+            addCriterion("WIND_SPEED >=", value, "windSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindSpeedLessThan(Double value) {
+            addCriterion("WIND_SPEED <", value, "windSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindSpeedLessThanOrEqualTo(Double value) {
+            addCriterion("WIND_SPEED <=", value, "windSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindSpeedIn(List<Double> values) {
+            addCriterion("WIND_SPEED in", values, "windSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindSpeedNotIn(List<Double> values) {
+            addCriterion("WIND_SPEED not in", values, "windSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindSpeedBetween(Double value1, Double value2) {
+            addCriterion("WIND_SPEED between", value1, value2, "windSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindSpeedNotBetween(Double value1, Double value2) {
+            addCriterion("WIND_SPEED not between", value1, value2, "windSpeed");
+            return (Criteria) this;
+        }
+
+        public Criteria andModCoeffIsNull() {
+            addCriterion("MOD_COEFF is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModCoeffIsNotNull() {
+            addCriterion("MOD_COEFF is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModCoeffEqualTo(Double value) {
+            addCriterion("MOD_COEFF =", value, "modCoeff");
+            return (Criteria) this;
+        }
+
+        public Criteria andModCoeffNotEqualTo(Double value) {
+            addCriterion("MOD_COEFF <>", value, "modCoeff");
+            return (Criteria) this;
+        }
+
+        public Criteria andModCoeffGreaterThan(Double value) {
+            addCriterion("MOD_COEFF >", value, "modCoeff");
+            return (Criteria) this;
+        }
+
+        public Criteria andModCoeffGreaterThanOrEqualTo(Double value) {
+            addCriterion("MOD_COEFF >=", value, "modCoeff");
+            return (Criteria) this;
+        }
+
+        public Criteria andModCoeffLessThan(Double value) {
+            addCriterion("MOD_COEFF <", value, "modCoeff");
+            return (Criteria) this;
+        }
+
+        public Criteria andModCoeffLessThanOrEqualTo(Double value) {
+            addCriterion("MOD_COEFF <=", value, "modCoeff");
+            return (Criteria) this;
+        }
+
+        public Criteria andModCoeffIn(List<Double> values) {
+            addCriterion("MOD_COEFF in", values, "modCoeff");
+            return (Criteria) this;
+        }
+
+        public Criteria andModCoeffNotIn(List<Double> values) {
+            addCriterion("MOD_COEFF not in", values, "modCoeff");
+            return (Criteria) this;
+        }
+
+        public Criteria andModCoeffBetween(Double value1, Double value2) {
+            addCriterion("MOD_COEFF between", value1, value2, "modCoeff");
+            return (Criteria) this;
+        }
+
+        public Criteria andModCoeffNotBetween(Double value1, Double value2) {
+            addCriterion("MOD_COEFF not between", value1, value2, "modCoeff");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerIsNull() {
+            addCriterion("POWER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerIsNotNull() {
+            addCriterion("POWER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerEqualTo(Double value) {
+            addCriterion("POWER =", value, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerNotEqualTo(Double value) {
+            addCriterion("POWER <>", value, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerGreaterThan(Double value) {
+            addCriterion("POWER >", value, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerGreaterThanOrEqualTo(Double value) {
+            addCriterion("POWER >=", value, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerLessThan(Double value) {
+            addCriterion("POWER <", value, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerLessThanOrEqualTo(Double value) {
+            addCriterion("POWER <=", value, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerIn(List<Double> values) {
+            addCriterion("POWER in", values, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerNotIn(List<Double> values) {
+            addCriterion("POWER not in", values, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerBetween(Double value1, Double value2) {
+            addCriterion("POWER between", value1, value2, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerNotBetween(Double value1, Double value2) {
+            addCriterion("POWER not between", value1, value2, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andModPowerIsNull() {
+            addCriterion("MOD_POWER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModPowerIsNotNull() {
+            addCriterion("MOD_POWER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModPowerEqualTo(Double value) {
+            addCriterion("MOD_POWER =", value, "modPower");
+            return (Criteria) this;
+        }
+
+        public Criteria andModPowerNotEqualTo(Double value) {
+            addCriterion("MOD_POWER <>", value, "modPower");
+            return (Criteria) this;
+        }
+
+        public Criteria andModPowerGreaterThan(Double value) {
+            addCriterion("MOD_POWER >", value, "modPower");
+            return (Criteria) this;
+        }
+
+        public Criteria andModPowerGreaterThanOrEqualTo(Double value) {
+            addCriterion("MOD_POWER >=", value, "modPower");
+            return (Criteria) this;
+        }
+
+        public Criteria andModPowerLessThan(Double value) {
+            addCriterion("MOD_POWER <", value, "modPower");
+            return (Criteria) this;
+        }
+
+        public Criteria andModPowerLessThanOrEqualTo(Double value) {
+            addCriterion("MOD_POWER <=", value, "modPower");
+            return (Criteria) this;
+        }
+
+        public Criteria andModPowerIn(List<Double> values) {
+            addCriterion("MOD_POWER in", values, "modPower");
+            return (Criteria) this;
+        }
+
+        public Criteria andModPowerNotIn(List<Double> values) {
+            addCriterion("MOD_POWER not in", values, "modPower");
+            return (Criteria) this;
+        }
+
+        public Criteria andModPowerBetween(Double value1, Double value2) {
+            addCriterion("MOD_POWER between", value1, value2, "modPower");
+            return (Criteria) this;
+        }
+
+        public Criteria andModPowerNotBetween(Double value1, Double value2) {
+            addCriterion("MOD_POWER not between", value1, value2, "modPower");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagIsNull() {
+            addCriterion("DATA_FLAG is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagIsNotNull() {
+            addCriterion("DATA_FLAG is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagEqualTo(Short value) {
+            addCriterion("DATA_FLAG =", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagNotEqualTo(Short value) {
+            addCriterion("DATA_FLAG <>", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagGreaterThan(Short value) {
+            addCriterion("DATA_FLAG >", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagGreaterThanOrEqualTo(Short value) {
+            addCriterion("DATA_FLAG >=", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagLessThan(Short value) {
+            addCriterion("DATA_FLAG <", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagLessThanOrEqualTo(Short value) {
+            addCriterion("DATA_FLAG <=", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagIn(List<Short> values) {
+            addCriterion("DATA_FLAG in", values, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagNotIn(List<Short> values) {
+            addCriterion("DATA_FLAG not in", values, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagBetween(Short value1, Short value2) {
+            addCriterion("DATA_FLAG between", value1, value2, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagNotBetween(Short value1, Short value2) {
+            addCriterion("DATA_FLAG not between", value1, value2, "dataFlag");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WF_USP_TS_PERIOD_DATA
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -0,0 +1,179 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Wfychistorydata2 implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_YC_HISTORY_DATA2.ANALOG_NO
+     *
+     * @mbg.generated
+     */
+    private Integer analogNo;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_YC_HISTORY_DATA2.DATA_TIME
+     *
+     * @mbg.generated
+     */
+    private Date dataTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_YC_HISTORY_DATA2.YC_RAW_VAL
+     *
+     * @mbg.generated
+     */
+    private Double ycRawVal;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_YC_HISTORY_DATA2.YC_VAL
+     *
+     * @mbg.generated
+     */
+    private Double ycVal;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WF_YC_HISTORY_DATA2.DATA_FLAG
+     *
+     * @mbg.generated
+     */
+    private Short dataFlag;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WF_YC_HISTORY_DATA2
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_YC_HISTORY_DATA2.ANALOG_NO
+     *
+     * @return the value of WF_YC_HISTORY_DATA2.ANALOG_NO
+     *
+     * @mbg.generated
+     */
+    public Integer getAnalogNo() {
+        return analogNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_YC_HISTORY_DATA2.ANALOG_NO
+     *
+     * @param analogNo the value for WF_YC_HISTORY_DATA2.ANALOG_NO
+     *
+     * @mbg.generated
+     */
+    public void setAnalogNo(Integer analogNo) {
+        this.analogNo = analogNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_YC_HISTORY_DATA2.DATA_TIME
+     *
+     * @return the value of WF_YC_HISTORY_DATA2.DATA_TIME
+     *
+     * @mbg.generated
+     */
+    public Date getDataTime() {
+        return dataTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_YC_HISTORY_DATA2.DATA_TIME
+     *
+     * @param dataTime the value for WF_YC_HISTORY_DATA2.DATA_TIME
+     *
+     * @mbg.generated
+     */
+    public void setDataTime(Date dataTime) {
+        this.dataTime = dataTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_YC_HISTORY_DATA2.YC_RAW_VAL
+     *
+     * @return the value of WF_YC_HISTORY_DATA2.YC_RAW_VAL
+     *
+     * @mbg.generated
+     */
+    public Double getYcRawVal() {
+        return ycRawVal;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_YC_HISTORY_DATA2.YC_RAW_VAL
+     *
+     * @param ycRawVal the value for WF_YC_HISTORY_DATA2.YC_RAW_VAL
+     *
+     * @mbg.generated
+     */
+    public void setYcRawVal(Double ycRawVal) {
+        this.ycRawVal = ycRawVal;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_YC_HISTORY_DATA2.YC_VAL
+     *
+     * @return the value of WF_YC_HISTORY_DATA2.YC_VAL
+     *
+     * @mbg.generated
+     */
+    public Double getYcVal() {
+        return ycVal;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_YC_HISTORY_DATA2.YC_VAL
+     *
+     * @param ycVal the value for WF_YC_HISTORY_DATA2.YC_VAL
+     *
+     * @mbg.generated
+     */
+    public void setYcVal(Double ycVal) {
+        this.ycVal = ycVal;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WF_YC_HISTORY_DATA2.DATA_FLAG
+     *
+     * @return the value of WF_YC_HISTORY_DATA2.DATA_FLAG
+     *
+     * @mbg.generated
+     */
+    public Short getDataFlag() {
+        return dataFlag;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WF_YC_HISTORY_DATA2.DATA_FLAG
+     *
+     * @param dataFlag the value for WF_YC_HISTORY_DATA2.DATA_FLAG
+     *
+     * @mbg.generated
+     */
+    public void setDataFlag(Short dataFlag) {
+        this.dataFlag = dataFlag;
+    }
+}

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

@@ -0,0 +1,603 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class Wfychistorydata2Example {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WF_YC_HISTORY_DATA2
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WF_YC_HISTORY_DATA2
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WF_YC_HISTORY_DATA2
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_YC_HISTORY_DATA2
+     *
+     * @mbg.generated
+     */
+    public Wfychistorydata2Example() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_YC_HISTORY_DATA2
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_YC_HISTORY_DATA2
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_YC_HISTORY_DATA2
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_YC_HISTORY_DATA2
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_YC_HISTORY_DATA2
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_YC_HISTORY_DATA2
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_YC_HISTORY_DATA2
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_YC_HISTORY_DATA2
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_YC_HISTORY_DATA2
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WF_YC_HISTORY_DATA2
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WF_YC_HISTORY_DATA2
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andAnalogNoIsNull() {
+            addCriterion("ANALOG_NO is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnalogNoIsNotNull() {
+            addCriterion("ANALOG_NO is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnalogNoEqualTo(Integer value) {
+            addCriterion("ANALOG_NO =", value, "analogNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnalogNoNotEqualTo(Integer value) {
+            addCriterion("ANALOG_NO <>", value, "analogNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnalogNoGreaterThan(Integer value) {
+            addCriterion("ANALOG_NO >", value, "analogNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnalogNoGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ANALOG_NO >=", value, "analogNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnalogNoLessThan(Integer value) {
+            addCriterion("ANALOG_NO <", value, "analogNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnalogNoLessThanOrEqualTo(Integer value) {
+            addCriterion("ANALOG_NO <=", value, "analogNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnalogNoIn(List<Integer> values) {
+            addCriterion("ANALOG_NO in", values, "analogNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnalogNoNotIn(List<Integer> values) {
+            addCriterion("ANALOG_NO not in", values, "analogNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnalogNoBetween(Integer value1, Integer value2) {
+            addCriterion("ANALOG_NO between", value1, value2, "analogNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnalogNoNotBetween(Integer value1, Integer value2) {
+            addCriterion("ANALOG_NO not between", value1, value2, "analogNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeIsNull() {
+            addCriterion("DATA_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeIsNotNull() {
+            addCriterion("DATA_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeEqualTo(Date value) {
+            addCriterion("DATA_TIME =", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeNotEqualTo(Date value) {
+            addCriterion("DATA_TIME <>", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeGreaterThan(Date value) {
+            addCriterion("DATA_TIME >", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("DATA_TIME >=", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeLessThan(Date value) {
+            addCriterion("DATA_TIME <", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeLessThanOrEqualTo(Date value) {
+            addCriterion("DATA_TIME <=", value, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeIn(List<Date> values) {
+            addCriterion("DATA_TIME in", values, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeNotIn(List<Date> values) {
+            addCriterion("DATA_TIME not in", values, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeBetween(Date value1, Date value2) {
+            addCriterion("DATA_TIME between", value1, value2, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataTimeNotBetween(Date value1, Date value2) {
+            addCriterion("DATA_TIME not between", value1, value2, "dataTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andYcRawValIsNull() {
+            addCriterion("YC_RAW_VAL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYcRawValIsNotNull() {
+            addCriterion("YC_RAW_VAL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYcRawValEqualTo(Double value) {
+            addCriterion("YC_RAW_VAL =", value, "ycRawVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andYcRawValNotEqualTo(Double value) {
+            addCriterion("YC_RAW_VAL <>", value, "ycRawVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andYcRawValGreaterThan(Double value) {
+            addCriterion("YC_RAW_VAL >", value, "ycRawVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andYcRawValGreaterThanOrEqualTo(Double value) {
+            addCriterion("YC_RAW_VAL >=", value, "ycRawVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andYcRawValLessThan(Double value) {
+            addCriterion("YC_RAW_VAL <", value, "ycRawVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andYcRawValLessThanOrEqualTo(Double value) {
+            addCriterion("YC_RAW_VAL <=", value, "ycRawVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andYcRawValIn(List<Double> values) {
+            addCriterion("YC_RAW_VAL in", values, "ycRawVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andYcRawValNotIn(List<Double> values) {
+            addCriterion("YC_RAW_VAL not in", values, "ycRawVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andYcRawValBetween(Double value1, Double value2) {
+            addCriterion("YC_RAW_VAL between", value1, value2, "ycRawVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andYcRawValNotBetween(Double value1, Double value2) {
+            addCriterion("YC_RAW_VAL not between", value1, value2, "ycRawVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andYcValIsNull() {
+            addCriterion("YC_VAL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYcValIsNotNull() {
+            addCriterion("YC_VAL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYcValEqualTo(Double value) {
+            addCriterion("YC_VAL =", value, "ycVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andYcValNotEqualTo(Double value) {
+            addCriterion("YC_VAL <>", value, "ycVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andYcValGreaterThan(Double value) {
+            addCriterion("YC_VAL >", value, "ycVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andYcValGreaterThanOrEqualTo(Double value) {
+            addCriterion("YC_VAL >=", value, "ycVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andYcValLessThan(Double value) {
+            addCriterion("YC_VAL <", value, "ycVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andYcValLessThanOrEqualTo(Double value) {
+            addCriterion("YC_VAL <=", value, "ycVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andYcValIn(List<Double> values) {
+            addCriterion("YC_VAL in", values, "ycVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andYcValNotIn(List<Double> values) {
+            addCriterion("YC_VAL not in", values, "ycVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andYcValBetween(Double value1, Double value2) {
+            addCriterion("YC_VAL between", value1, value2, "ycVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andYcValNotBetween(Double value1, Double value2) {
+            addCriterion("YC_VAL not between", value1, value2, "ycVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagIsNull() {
+            addCriterion("DATA_FLAG is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagIsNotNull() {
+            addCriterion("DATA_FLAG is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagEqualTo(Short value) {
+            addCriterion("DATA_FLAG =", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagNotEqualTo(Short value) {
+            addCriterion("DATA_FLAG <>", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagGreaterThan(Short value) {
+            addCriterion("DATA_FLAG >", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagGreaterThanOrEqualTo(Short value) {
+            addCriterion("DATA_FLAG >=", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagLessThan(Short value) {
+            addCriterion("DATA_FLAG <", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagLessThanOrEqualTo(Short value) {
+            addCriterion("DATA_FLAG <=", value, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagIn(List<Short> values) {
+            addCriterion("DATA_FLAG in", values, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagNotIn(List<Short> values) {
+            addCriterion("DATA_FLAG not in", values, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagBetween(Short value1, Short value2) {
+            addCriterion("DATA_FLAG between", value1, value2, "dataFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFlagNotBetween(Short value1, Short value2) {
+            addCriterion("DATA_FLAG not between", value1, value2, "dataFlag");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WF_YC_HISTORY_DATA2
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WF_YC_HISTORY_DATA2
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -74,7 +74,7 @@ public class Windpowerinfoday implements Serializable {
      *
      * @mbg.generated
      */
-    private Double generatingcapacity;
+    private Double generatingcapacity = 0.0;
 
     /**
      *
@@ -83,7 +83,7 @@ public class Windpowerinfoday implements Serializable {
      *
      * @mbg.generated
      */
-    private Double speed;
+    private Double speed = 0.0;
 
     /**
      *
@@ -191,7 +191,7 @@ public class Windpowerinfoday implements Serializable {
      *
      * @mbg.generated
      */
-    private Double monthgc;
+    private Double monthgc = 0.0;
 
     /**
      *
@@ -200,7 +200,7 @@ public class Windpowerinfoday implements Serializable {
      *
      * @mbg.generated
      */
-    private Double yeargc;
+    private Double yeargc = 0.0;
 
     /**
      *
@@ -290,7 +290,7 @@ public class Windpowerinfoday implements Serializable {
      *
      * @mbg.generated
      */
-    private Double monthgc2;
+    private Double monthgc2 = 0.0;
 
     /**
      *
@@ -299,7 +299,7 @@ public class Windpowerinfoday implements Serializable {
      *
      * @mbg.generated
      */
-    private Double yeargc2;
+    private Double yeargc2 = 0.0;
 
     /**
      *
@@ -407,7 +407,7 @@ public class Windpowerinfoday implements Serializable {
      *
      * @mbg.generated
      */
-    private Double monthge;
+    private Double monthge = 0.0;
 
     /**
      *
@@ -416,7 +416,7 @@ public class Windpowerinfoday implements Serializable {
      *
      * @mbg.generated
      */
-    private Double yearge;
+    private Double yearge = 0.0;
 
     /**
      *
@@ -425,7 +425,7 @@ public class Windpowerinfoday implements Serializable {
      *
      * @mbg.generated
      */
-    private Double monthbe;
+    private Double monthbe = 0.0;
 
     /**
      *
@@ -443,7 +443,7 @@ public class Windpowerinfoday implements Serializable {
      *
      * @mbg.generated
      */
-    private Double monthae;
+    private Double monthae = 0.0;
 
     /**
      *
@@ -461,7 +461,7 @@ public class Windpowerinfoday implements Serializable {
      *
      * @mbg.generated
      */
-    private Double generatingcapacity4;
+    private Double generatingcapacity4 = 0.0;
 
     /**
      *
@@ -470,7 +470,7 @@ public class Windpowerinfoday implements Serializable {
      *
      * @mbg.generated
      */
-    private Double gridelectricity4;
+    private Double gridelectricity4 = 0.0;
 
     /**
      *
@@ -479,7 +479,7 @@ public class Windpowerinfoday implements Serializable {
      *
      * @mbg.generated
      */
-    private Double buyelectricity4;
+    private Double buyelectricity4 = 0.0;
 
     /**
      *
@@ -488,7 +488,7 @@ public class Windpowerinfoday implements Serializable {
      *
      * @mbg.generated
      */
-    private Double buyagricultureelectricity4;
+    private Double buyagricultureelectricity4 = 0.0;
 
     /**
      *

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

@@ -3,6 +3,10 @@ package com.gyee.frame.model.auto;
 import java.io.Serializable;
 
 public class Windpowerstation implements Serializable {
+
+    public Windpowerstation() {
+    }
+
     /**
      *
      * This field was generated by MyBatis Generator.

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

@@ -0,0 +1,310 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class WpMttrAndMtbMonth implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WPMTTRANDMTBMONTH.ID
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WPMTTRANDMTBMONTH.WPID
+     *
+     * @mbg.generated
+     */
+    private String wpid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WPMTTRANDMTBMONTH.WPNAME
+     *
+     * @mbg.generated
+     */
+    private String wpname;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WPMTTRANDMTBMONTH.LOCATION
+     *
+     * @mbg.generated
+     */
+    private String location;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WPMTTRANDMTBMONTH.YEAR
+     *
+     * @mbg.generated
+     */
+    private Long year;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WPMTTRANDMTBMONTH.MONTH
+     *
+     * @mbg.generated
+     */
+    private Long month;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WPMTTRANDMTBMONTH.STOPHOURS
+     *
+     * @mbg.generated
+     */
+    private Double stophours;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WPMTTRANDMTBMONTH.STOPRTIMES
+     *
+     * @mbg.generated
+     */
+    private Double stoprtimes;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WPMTTRANDMTBMONTH.WTHOURS
+     *
+     * @mbg.generated
+     */
+    private Double wthours;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WPMTTRANDMTBMONTH
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WPMTTRANDMTBMONTH.ID
+     *
+     * @return the value of WPMTTRANDMTBMONTH.ID
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WPMTTRANDMTBMONTH.ID
+     *
+     * @param id the value for WPMTTRANDMTBMONTH.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 WPMTTRANDMTBMONTH.WPID
+     *
+     * @return the value of WPMTTRANDMTBMONTH.WPID
+     *
+     * @mbg.generated
+     */
+    public String getWpid() {
+        return wpid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WPMTTRANDMTBMONTH.WPID
+     *
+     * @param wpid the value for WPMTTRANDMTBMONTH.WPID
+     *
+     * @mbg.generated
+     */
+    public void setWpid(String wpid) {
+        this.wpid = wpid == null ? null : wpid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WPMTTRANDMTBMONTH.WPNAME
+     *
+     * @return the value of WPMTTRANDMTBMONTH.WPNAME
+     *
+     * @mbg.generated
+     */
+    public String getWpname() {
+        return wpname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WPMTTRANDMTBMONTH.WPNAME
+     *
+     * @param wpname the value for WPMTTRANDMTBMONTH.WPNAME
+     *
+     * @mbg.generated
+     */
+    public void setWpname(String wpname) {
+        this.wpname = wpname == null ? null : wpname.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WPMTTRANDMTBMONTH.LOCATION
+     *
+     * @return the value of WPMTTRANDMTBMONTH.LOCATION
+     *
+     * @mbg.generated
+     */
+    public String getLocation() {
+        return location;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WPMTTRANDMTBMONTH.LOCATION
+     *
+     * @param location the value for WPMTTRANDMTBMONTH.LOCATION
+     *
+     * @mbg.generated
+     */
+    public void setLocation(String location) {
+        this.location = location == null ? null : location.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WPMTTRANDMTBMONTH.YEAR
+     *
+     * @return the value of WPMTTRANDMTBMONTH.YEAR
+     *
+     * @mbg.generated
+     */
+    public Long getYear() {
+        return year;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WPMTTRANDMTBMONTH.YEAR
+     *
+     * @param year the value for WPMTTRANDMTBMONTH.YEAR
+     *
+     * @mbg.generated
+     */
+    public void setYear(Long year) {
+        this.year = year;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WPMTTRANDMTBMONTH.MONTH
+     *
+     * @return the value of WPMTTRANDMTBMONTH.MONTH
+     *
+     * @mbg.generated
+     */
+    public Long getMonth() {
+        return month;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WPMTTRANDMTBMONTH.MONTH
+     *
+     * @param month the value for WPMTTRANDMTBMONTH.MONTH
+     *
+     * @mbg.generated
+     */
+    public void setMonth(Long month) {
+        this.month = month;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WPMTTRANDMTBMONTH.STOPHOURS
+     *
+     * @return the value of WPMTTRANDMTBMONTH.STOPHOURS
+     *
+     * @mbg.generated
+     */
+    public Double getStophours() {
+        return stophours;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WPMTTRANDMTBMONTH.STOPHOURS
+     *
+     * @param stophours the value for WPMTTRANDMTBMONTH.STOPHOURS
+     *
+     * @mbg.generated
+     */
+    public void setStophours(Double stophours) {
+        this.stophours = stophours;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WPMTTRANDMTBMONTH.STOPRTIMES
+     *
+     * @return the value of WPMTTRANDMTBMONTH.STOPRTIMES
+     *
+     * @mbg.generated
+     */
+    public Double getStoprtimes() {
+        return stoprtimes;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WPMTTRANDMTBMONTH.STOPRTIMES
+     *
+     * @param stoprtimes the value for WPMTTRANDMTBMONTH.STOPRTIMES
+     *
+     * @mbg.generated
+     */
+    public void setStoprtimes(Double stoprtimes) {
+        this.stoprtimes = stoprtimes;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WPMTTRANDMTBMONTH.WTHOURS
+     *
+     * @return the value of WPMTTRANDMTBMONTH.WTHOURS
+     *
+     * @mbg.generated
+     */
+    public Double getWthours() {
+        return wthours;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WPMTTRANDMTBMONTH.WTHOURS
+     *
+     * @param wthours the value for WPMTTRANDMTBMONTH.WTHOURS
+     *
+     * @mbg.generated
+     */
+    public void setWthours(Double wthours) {
+        this.wthours = wthours;
+    }
+}

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

@@ -0,0 +1,882 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class WpMttrAndMtbMonthExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WPMTTRANDMTBMONTH
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WPMTTRANDMTBMONTH
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WPMTTRANDMTBMONTH
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WPMTTRANDMTBMONTH
+     *
+     * @mbg.generated
+     */
+    public WpMttrAndMtbMonthExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WPMTTRANDMTBMONTH
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WPMTTRANDMTBMONTH
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WPMTTRANDMTBMONTH
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WPMTTRANDMTBMONTH
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WPMTTRANDMTBMONTH
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WPMTTRANDMTBMONTH
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WPMTTRANDMTBMONTH
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WPMTTRANDMTBMONTH
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WPMTTRANDMTBMONTH
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WPMTTRANDMTBMONTH
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WPMTTRANDMTBMONTH
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("ID like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("ID not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidIsNull() {
+            addCriterion("WPID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidIsNotNull() {
+            addCriterion("WPID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidEqualTo(String value) {
+            addCriterion("WPID =", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidNotEqualTo(String value) {
+            addCriterion("WPID <>", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidGreaterThan(String value) {
+            addCriterion("WPID >", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidGreaterThanOrEqualTo(String value) {
+            addCriterion("WPID >=", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidLessThan(String value) {
+            addCriterion("WPID <", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidLessThanOrEqualTo(String value) {
+            addCriterion("WPID <=", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidLike(String value) {
+            addCriterion("WPID like", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidNotLike(String value) {
+            addCriterion("WPID not like", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidIn(List<String> values) {
+            addCriterion("WPID in", values, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidNotIn(List<String> values) {
+            addCriterion("WPID not in", values, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidBetween(String value1, String value2) {
+            addCriterion("WPID between", value1, value2, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidNotBetween(String value1, String value2) {
+            addCriterion("WPID not between", value1, value2, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpnameIsNull() {
+            addCriterion("WPNAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpnameIsNotNull() {
+            addCriterion("WPNAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpnameEqualTo(String value) {
+            addCriterion("WPNAME =", value, "wpname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpnameNotEqualTo(String value) {
+            addCriterion("WPNAME <>", value, "wpname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpnameGreaterThan(String value) {
+            addCriterion("WPNAME >", value, "wpname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpnameGreaterThanOrEqualTo(String value) {
+            addCriterion("WPNAME >=", value, "wpname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpnameLessThan(String value) {
+            addCriterion("WPNAME <", value, "wpname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpnameLessThanOrEqualTo(String value) {
+            addCriterion("WPNAME <=", value, "wpname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpnameLike(String value) {
+            addCriterion("WPNAME like", value, "wpname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpnameNotLike(String value) {
+            addCriterion("WPNAME not like", value, "wpname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpnameIn(List<String> values) {
+            addCriterion("WPNAME in", values, "wpname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpnameNotIn(List<String> values) {
+            addCriterion("WPNAME not in", values, "wpname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpnameBetween(String value1, String value2) {
+            addCriterion("WPNAME between", value1, value2, "wpname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpnameNotBetween(String value1, String value2) {
+            addCriterion("WPNAME not between", value1, value2, "wpname");
+            return (Criteria) this;
+        }
+
+        public Criteria andLocationIsNull() {
+            addCriterion("LOCATION is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLocationIsNotNull() {
+            addCriterion("LOCATION is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLocationEqualTo(String value) {
+            addCriterion("LOCATION =", value, "location");
+            return (Criteria) this;
+        }
+
+        public Criteria andLocationNotEqualTo(String value) {
+            addCriterion("LOCATION <>", value, "location");
+            return (Criteria) this;
+        }
+
+        public Criteria andLocationGreaterThan(String value) {
+            addCriterion("LOCATION >", value, "location");
+            return (Criteria) this;
+        }
+
+        public Criteria andLocationGreaterThanOrEqualTo(String value) {
+            addCriterion("LOCATION >=", value, "location");
+            return (Criteria) this;
+        }
+
+        public Criteria andLocationLessThan(String value) {
+            addCriterion("LOCATION <", value, "location");
+            return (Criteria) this;
+        }
+
+        public Criteria andLocationLessThanOrEqualTo(String value) {
+            addCriterion("LOCATION <=", value, "location");
+            return (Criteria) this;
+        }
+
+        public Criteria andLocationLike(String value) {
+            addCriterion("LOCATION like", value, "location");
+            return (Criteria) this;
+        }
+
+        public Criteria andLocationNotLike(String value) {
+            addCriterion("LOCATION not like", value, "location");
+            return (Criteria) this;
+        }
+
+        public Criteria andLocationIn(List<String> values) {
+            addCriterion("LOCATION in", values, "location");
+            return (Criteria) this;
+        }
+
+        public Criteria andLocationNotIn(List<String> values) {
+            addCriterion("LOCATION not in", values, "location");
+            return (Criteria) this;
+        }
+
+        public Criteria andLocationBetween(String value1, String value2) {
+            addCriterion("LOCATION between", value1, value2, "location");
+            return (Criteria) this;
+        }
+
+        public Criteria andLocationNotBetween(String value1, String value2) {
+            addCriterion("LOCATION not between", value1, value2, "location");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearIsNull() {
+            addCriterion("YEAR is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearIsNotNull() {
+            addCriterion("YEAR is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearEqualTo(Integer value) {
+            addCriterion("YEAR =", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearNotEqualTo(Integer value) {
+            addCriterion("YEAR <>", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearGreaterThan(Integer value) {
+            addCriterion("YEAR >", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearGreaterThanOrEqualTo(Integer value) {
+            addCriterion("YEAR >=", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearLessThan(Integer value) {
+            addCriterion("YEAR <", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearLessThanOrEqualTo(Integer value) {
+            addCriterion("YEAR <=", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearIn(List<Integer> values) {
+            addCriterion("YEAR in", values, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearNotIn(List<Integer> values) {
+            addCriterion("YEAR not in", values, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearBetween(Integer value1, Integer value2) {
+            addCriterion("YEAR between", value1, value2, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearNotBetween(Integer value1, Integer value2) {
+            addCriterion("YEAR not between", value1, value2, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthIsNull() {
+            addCriterion("MONTH is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthIsNotNull() {
+            addCriterion("MONTH is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthEqualTo(Integer value) {
+            addCriterion("MONTH =", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthNotEqualTo(Integer value) {
+            addCriterion("MONTH <>", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthGreaterThan(Integer value) {
+            addCriterion("MONTH >", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthGreaterThanOrEqualTo(Integer value) {
+            addCriterion("MONTH >=", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthLessThan(Integer value) {
+            addCriterion("MONTH <", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthLessThanOrEqualTo(Integer value) {
+            addCriterion("MONTH <=", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthIn(List<Integer> values) {
+            addCriterion("MONTH in", values, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthNotIn(List<Integer> values) {
+            addCriterion("MONTH not in", values, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthBetween(Integer value1, Integer value2) {
+            addCriterion("MONTH between", value1, value2, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthNotBetween(Integer value1, Integer value2) {
+            addCriterion("MONTH not between", value1, value2, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andStophoursIsNull() {
+            addCriterion("STOPHOURS is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStophoursIsNotNull() {
+            addCriterion("STOPHOURS is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStophoursEqualTo(Double value) {
+            addCriterion("STOPHOURS =", value, "stophours");
+            return (Criteria) this;
+        }
+
+        public Criteria andStophoursNotEqualTo(Double value) {
+            addCriterion("STOPHOURS <>", value, "stophours");
+            return (Criteria) this;
+        }
+
+        public Criteria andStophoursGreaterThan(Double value) {
+            addCriterion("STOPHOURS >", value, "stophours");
+            return (Criteria) this;
+        }
+
+        public Criteria andStophoursGreaterThanOrEqualTo(Double value) {
+            addCriterion("STOPHOURS >=", value, "stophours");
+            return (Criteria) this;
+        }
+
+        public Criteria andStophoursLessThan(Double value) {
+            addCriterion("STOPHOURS <", value, "stophours");
+            return (Criteria) this;
+        }
+
+        public Criteria andStophoursLessThanOrEqualTo(Double value) {
+            addCriterion("STOPHOURS <=", value, "stophours");
+            return (Criteria) this;
+        }
+
+        public Criteria andStophoursIn(List<Double> values) {
+            addCriterion("STOPHOURS in", values, "stophours");
+            return (Criteria) this;
+        }
+
+        public Criteria andStophoursNotIn(List<Double> values) {
+            addCriterion("STOPHOURS not in", values, "stophours");
+            return (Criteria) this;
+        }
+
+        public Criteria andStophoursBetween(Double value1, Double value2) {
+            addCriterion("STOPHOURS between", value1, value2, "stophours");
+            return (Criteria) this;
+        }
+
+        public Criteria andStophoursNotBetween(Double value1, Double value2) {
+            addCriterion("STOPHOURS not between", value1, value2, "stophours");
+            return (Criteria) this;
+        }
+
+        public Criteria andStoprtimesIsNull() {
+            addCriterion("STOPRTIMES is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStoprtimesIsNotNull() {
+            addCriterion("STOPRTIMES is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStoprtimesEqualTo(Double value) {
+            addCriterion("STOPRTIMES =", value, "stoprtimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andStoprtimesNotEqualTo(Double value) {
+            addCriterion("STOPRTIMES <>", value, "stoprtimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andStoprtimesGreaterThan(Double value) {
+            addCriterion("STOPRTIMES >", value, "stoprtimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andStoprtimesGreaterThanOrEqualTo(Double value) {
+            addCriterion("STOPRTIMES >=", value, "stoprtimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andStoprtimesLessThan(Double value) {
+            addCriterion("STOPRTIMES <", value, "stoprtimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andStoprtimesLessThanOrEqualTo(Double value) {
+            addCriterion("STOPRTIMES <=", value, "stoprtimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andStoprtimesIn(List<Double> values) {
+            addCriterion("STOPRTIMES in", values, "stoprtimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andStoprtimesNotIn(List<Double> values) {
+            addCriterion("STOPRTIMES not in", values, "stoprtimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andStoprtimesBetween(Double value1, Double value2) {
+            addCriterion("STOPRTIMES between", value1, value2, "stoprtimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andStoprtimesNotBetween(Double value1, Double value2) {
+            addCriterion("STOPRTIMES not between", value1, value2, "stoprtimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andWthoursIsNull() {
+            addCriterion("WTHOURS is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWthoursIsNotNull() {
+            addCriterion("WTHOURS is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWthoursEqualTo(Double value) {
+            addCriterion("WTHOURS =", value, "wthours");
+            return (Criteria) this;
+        }
+
+        public Criteria andWthoursNotEqualTo(Double value) {
+            addCriterion("WTHOURS <>", value, "wthours");
+            return (Criteria) this;
+        }
+
+        public Criteria andWthoursGreaterThan(Double value) {
+            addCriterion("WTHOURS >", value, "wthours");
+            return (Criteria) this;
+        }
+
+        public Criteria andWthoursGreaterThanOrEqualTo(Double value) {
+            addCriterion("WTHOURS >=", value, "wthours");
+            return (Criteria) this;
+        }
+
+        public Criteria andWthoursLessThan(Double value) {
+            addCriterion("WTHOURS <", value, "wthours");
+            return (Criteria) this;
+        }
+
+        public Criteria andWthoursLessThanOrEqualTo(Double value) {
+            addCriterion("WTHOURS <=", value, "wthours");
+            return (Criteria) this;
+        }
+
+        public Criteria andWthoursIn(List<Double> values) {
+            addCriterion("WTHOURS in", values, "wthours");
+            return (Criteria) this;
+        }
+
+        public Criteria andWthoursNotIn(List<Double> values) {
+            addCriterion("WTHOURS not in", values, "wthours");
+            return (Criteria) this;
+        }
+
+        public Criteria andWthoursBetween(Double value1, Double value2) {
+            addCriterion("WTHOURS between", value1, value2, "wthours");
+            return (Criteria) this;
+        }
+
+        public Criteria andWthoursNotBetween(Double value1, Double value2) {
+            addCriterion("WTHOURS not between", value1, value2, "wthours");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WPMTTRANDMTBMONTH
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WPMTTRANDMTBMONTH
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/gyee/frame/netty/websocket/config/ConfigDetail.txt

@@ -27,7 +27,7 @@ sisConfigMap->index_target_basic_indicators->"pageNumber_6","functionNumber_5"
 sisConfigMap->index_curve_columnar_windSpeed_power->"pageNumber_7","functionNumber_4"
 13.首页模块推送，第五部分曲线以及柱状图模块的子模块2五项损失柱状图模块,包括7天的应发电量、日发电量、故障损失电量、检修损失电量、限电损失电量、性能损失电量、受累损失电量
 sisConfigMap->index_curve_columnar_five_loss->"pageNumber_6","functionNumber_7"
-14.首页模块推送，第六部分风场卡片模块,包括预测电量、日发电量、实时风速、实际功率
+14.首页模块推送，第六部分风场卡片模块,包括预测电量、日发电量、月发电量、上网电量、实时风速、实际功率
 sisConfigMap->index_windStation_card->"pageNumber_6","functionNumber_8"
 
 19.综合指标模块推送,指标名称comprehensive_target,包括数值,记录综合指标

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

@@ -19,6 +19,7 @@ public class MttrAndMtbfService {
 
     @Resource
     private JdbcTemplate jdbcTemplate;
+
     public String queryMMCurrentMonth(String wpid) {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMM");

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

@@ -164,24 +164,17 @@ public class ProjectplanService implements BaseService<Projectplan, ProjectplanE
     }
 
     public double planYearPower(String name){
-
-
         ProjectplanExample example=new ProjectplanExample();
         Calendar c = Calendar.getInstance();
 
         int year= c.get(Calendar.YEAR);
-        int month= c.get(Calendar.MONTH)+1;
-
 
         if(name.equals("0"))
         {
-//            example.createCriteria().andWindpowerNotLike("%MCH_GDC").andYearEqualTo(String.valueOf(year)).andMonthIsNull();
-            example.createCriteria().andYearEqualTo(String.valueOf(year)).andMonthIsNull();
+            example.createCriteria().andYearEqualTo(String.valueOf(year)).andMonthIsNotNull();
         }else
         {
-            example.createCriteria().andWindpowerEqualTo(name).andYearEqualTo(String.valueOf(year)).andMonthIsNull();
-
-
+            example.createCriteria().andWindpowerEqualTo(name).andYearEqualTo(String.valueOf(year)).andMonthIsNotNull();
         }
         List<Projectplan> wtls = selectByExample(example);
         double tmp = 0;

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

@@ -7,13 +7,12 @@ import com.gyee.frame.common.support.Convert;
 import com.gyee.frame.mapper.auto.WeatherfdMapper;
 import com.gyee.frame.model.auto.Weatherfd;
 import com.gyee.frame.model.auto.WeatherfdExample;
-import com.gyee.frame.model.auto.Weatherfh;
-import com.gyee.frame.model.auto.WeatherfhExample;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.model.enumeration.Messagetype;
 import com.gyee.frame.netty.websocket.util.SocketToolService;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.SnowflakeIdWorker;
+import com.gyee.frame.util.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -432,5 +431,18 @@ public class WeatherfdService extends SocketToolService implements BaseService<W
 
 
 
+	public List<Weatherfd> findWeatherfd(Date beginDate,Date endDate, String wpId)  {
+
+		WeatherfdExample testExample=new WeatherfdExample();
+		testExample.setOrderByClause("id ASC");
+
+		if(beginDate!=null&&endDate!=null&& StringUtils.isNotEmpty(wpId)){
+
+			testExample.createCriteria().andWindpowerstationidEqualTo(wpId).andRecodedataGreaterThanOrEqualTo(beginDate).andRecodedataLessThanOrEqualTo(endDate);
+		}
+		List<Weatherfd> list= weatherfdMapper.selectByExample(testExample);
+
+		return list;
+	}
 
 }

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

@@ -3,16 +3,19 @@ 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.spring.InitialRunner;
 import com.gyee.frame.common.support.Convert;
 import com.gyee.frame.mapper.auto.WindPowerStationTestingPoint2Mapper;
 import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
 import com.gyee.frame.model.auto.WindPowerStationTestingPoint2Example;
 import com.gyee.frame.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.List;
+import java.util.Map;
 
 /**
  * 风场测点 WindPowerstationTestingPointService
@@ -132,5 +135,46 @@ public class WindPowerstationTestingPointService implements BaseService<WindPowe
 		return list.size();
 	}
 
+	public WindPowerStationTestingPoint2 getWindPowerStationTestingPoint2(String wpId, String unicode)  {
+		WindPowerStationTestingPoint2 point=new WindPowerStationTestingPoint2();
+
+		if(StringUtils.isNotEmpty(wpId) && StringUtils.isNotEmpty(unicode) )
+		{
+			if(wpId.equals("0") || wpId.equals("-1") ||wpId.equals("-2") || InitialRunner.wpmap.containsKey(wpId))
+			{
+				if(InitialRunner.stationPointmap.containsKey(wpId))
+				{
+					Map<String, WindPowerStationTestingPoint2> map=InitialRunner.stationPointmap.get(wpId);
+					if(map.containsKey(unicode))
+					{
+						point=map.get(unicode);
+					}
+				}
+			}else if(InitialRunner.stationPointmap.containsKey(wpId))
+			{
+				if(InitialRunner.stationPointmap.containsKey(wpId))
+				{
+					Map<String, WindPowerStationTestingPoint2> map=InitialRunner.stationPointmap.get(wpId);
+					if(map.containsKey(unicode))
+					{
+						point=map.get(unicode);
+					}
+				}
+			}else if(InitialRunner.stationPointmap.containsKey(wpId))
+			{
+				if(InitialRunner.stationPointmap.containsKey(wpId))
+				{
+					Map<String, WindPowerStationTestingPoint2> map=InitialRunner.stationPointmap.get(wpId);
+					if(map.containsKey(unicode))
+					{
+						point=map.get(unicode);
+					}
+				}
+			}
+		}
+
+
+		return point;
+	}
 
 }

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

@@ -0,0 +1,203 @@
+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.Windpowerinfoday3Mapper;
+import com.gyee.frame.model.auto.*;
+import com.gyee.frame.model.custom.Tablepar;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * 风机信息表 Windpowerinfoday3Service
+ * @Title: Windpowerinfoday3Service.java 
+ * @Package com.gyee.frame.service 
+ **/
+@Service
+public class Windpowerinfoday3Service implements BaseService<Windpowerinfoday3, Windpowerinfoday3Example> {
+	@Resource
+	private Windpowerinfoday3Mapper windpowerinfoday3Mapper;
+
+	/**
+	 * 分页查询
+	 * @param tablepar
+	 * @param name
+	 * @return
+	 */
+	 public PageInfo<Windpowerinfoday3> list(Tablepar tablepar, String name){
+	        Windpowerinfoday3Example testExample=new Windpowerinfoday3Example();
+	        testExample.setOrderByClause("id ASC");
+	        if(name!=null&&!"".equals(name)){
+//	        	testExample.createCriteria().and.andCodeLike("%"+name+"%");
+	        }
+
+	        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+	        List<Windpowerinfoday3> list= windpowerinfoday3Mapper.selectByExample(testExample);
+	        PageInfo<Windpowerinfoday3> pageInfo = new PageInfo<Windpowerinfoday3>(list);
+	        return  pageInfo;
+	 }
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+
+			List<Integer> lista= Convert.toIntArrayList(ids);
+			Windpowerinfoday3Example example=new Windpowerinfoday3Example();
+			example.createCriteria().andIdIn(lista);
+			return windpowerinfoday3Mapper.deleteByExample(example);
+
+
+	}
+
+
+	@Override
+	public Windpowerinfoday3 selectByPrimaryKey(String id) {
+
+	 	if(StringUtils.isNotEmpty(id))
+		{
+			return windpowerinfoday3Mapper.selectByPrimaryKey(Integer.valueOf(id));
+
+		}
+	 	return new Windpowerinfoday3();
+
+	}
+
+
+	@Override
+	public int updateByPrimaryKeySelective(Windpowerinfoday3 record) {
+		return windpowerinfoday3Mapper.updateByPrimaryKeySelective(record);
+	}
+
+
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Windpowerinfoday3 record) {
+
+//		//添加雪花主键id
+//		record.setId(SnowflakeIdWorker.getUUID());
+
+
+		return windpowerinfoday3Mapper.insertSelective(record);
+	}
+
+
+	@Override
+	public int updateByExampleSelective(Windpowerinfoday3 record, Windpowerinfoday3Example example) {
+
+		return windpowerinfoday3Mapper.updateByExampleSelective(record, example);
+	}
+
+
+	@Override
+	public int updateByExample(Windpowerinfoday3 record, Windpowerinfoday3Example example) {
+
+		return windpowerinfoday3Mapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Windpowerinfoday3> selectByExample(Windpowerinfoday3Example example) {
+
+		return windpowerinfoday3Mapper.selectByExample(example);
+	}
+
+
+	@Override
+	public long countByExample(Windpowerinfoday3Example example) {
+
+		return windpowerinfoday3Mapper.countByExample(example);
+	}
+
+
+	@Override
+	public int deleteByExample(Windpowerinfoday3Example example) {
+
+		return windpowerinfoday3Mapper.deleteByExample(example);
+	}
+
+
+	public List<Windpowerinfoday3> getWindpowerinfoday3(List<String> ids, Date beginDate, Date endDate, String location) {
+
+
+		List<Windpowerinfoday3> list=new ArrayList<>();
+
+		Windpowerinfoday3Example example=new Windpowerinfoday3Example();
+		example.setOrderByClause("windpowerstationid ASC");
+
+		Windpowerinfoday3Example.Criteria criteria =example.createCriteria();
+
+		if(StringUtils.isNotEmpty(ids) && !ids.isEmpty())
+		{
+			criteria.andForeignkeyidIn(ids);
+		}
+
+		if(beginDate!=null && endDate!=null ){
+			criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
+		}
+		if(StringUtils.isNotEmpty(location))
+		{
+			criteria.andLocationEqualTo(location);
+
+
+		}
+
+		criteria.andWindpowerstationidLike("%FDC");
+
+		list= windpowerinfoday3Mapper.selectByExample(example);
+		return list;
+
+	}
+
+
+	public List<Windpowerinfoday3> getWindpowerinfoday3(String wpid, Date beginDate, Date endDate, String location) {
+
+
+		List<Windpowerinfoday3> list=new ArrayList<>();
+
+		Windpowerinfoday3Example example=new Windpowerinfoday3Example();
+		example.setOrderByClause("windpowerstationid ASC");
+
+		Windpowerinfoday3Example.Criteria criteria =example.createCriteria();
+
+		if(StringUtils.isNotEmpty(wpid))
+		{
+			criteria.andForeignkeyidEqualTo(wpid);
+		}
+
+		if(beginDate!=null && endDate!=null ){
+			criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
+		}
+		if(StringUtils.isNotEmpty(location))
+		{
+			criteria.andLocationEqualTo(location);
+		}
+
+		criteria.andWindpowerstationidLike("%FDC");
+
+
+
+		list= windpowerinfoday3Mapper.selectByExample(example);
+		return list;
+
+	}
+
+
+	public List<Windpowerinfoday3> getItemByStationAndDate(String wpId, Date stDate, Date etDate) {
+		Windpowerinfoday3Example testExample = new Windpowerinfoday3Example();
+		testExample.setOrderByClause("id DESC");
+		testExample.createCriteria()
+				.andForeignkeyidEqualTo(wpId)
+				.andWindpowerstationidEqualTo(wpId).andRecorddateBetween(stDate, etDate);
+
+		List<Windpowerinfoday3> list= windpowerinfoday3Mapper.selectByExample(testExample);
+
+		return list;
+
+
+	}
+}

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

@@ -228,6 +228,14 @@ public class WindpowerinfodayService extends SocketToolService implements BaseSe
 	}
 
 
+	public List<Windpowerinfoday> findListByStationAndDate(String wpId,Date time) throws ParseException {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		Date recodedatebegin =sdf.parse(sdf.format(time));
+		WindpowerinfodayExample testExample=new WindpowerinfodayExample();
+		testExample.setOrderByClause("id ASC");
+		testExample.createCriteria().andWindpowerstationidEqualTo(wpId).andRecorddateEqualTo(recodedatebegin);
 
-
+		List<Windpowerinfoday> list= windpowerinfodayMapper.selectByExample(testExample);
+		return list;
+	}
 }

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

@@ -0,0 +1,115 @@
+package com.gyee.frame.service;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.WpMttrAndMtbMonthMapper;
+import com.gyee.frame.model.auto.WpMttrAndMtbMonth;
+import com.gyee.frame.model.auto.WpMttrAndMtbMonthExample;
+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;
+
+/**
+ * 线路 WpMttrAndMtbMonthService
+ *
+ * @author gyee_自动生成
+ * @Title: WpMttrAndMtbMonthService.java 
+ * @Package com.gyee.frame.service 
+ * @email 1@qq.com
+ * @date 2019-12-31 14:58:09  
+ **/
+@Service
+public class WpMttrAndMtbMonthService implements BaseService<WpMttrAndMtbMonth, WpMttrAndMtbMonthExample> {
+
+    @Resource
+    private WpMttrAndMtbMonthMapper wpMttrAndMtbMonthMapper;
+
+    @Override
+    public int deleteByPrimaryKey(String ids) {
+
+        List<String> lista = Convert.toListStrArray(ids);
+        WpMttrAndMtbMonthExample example = new WpMttrAndMtbMonthExample();
+        example.createCriteria().andIdIn(lista);
+        return wpMttrAndMtbMonthMapper.deleteByExample(example);
+    }
+
+
+    @Override
+    public WpMttrAndMtbMonth selectByPrimaryKey(String id) {
+        return wpMttrAndMtbMonthMapper.selectByPrimaryKey(id);
+    }
+
+
+    @Override
+    public int updateByPrimaryKeySelective(WpMttrAndMtbMonth record) {
+        return wpMttrAndMtbMonthMapper.updateByPrimaryKeySelective(record);
+    }
+
+
+    /**
+     * 添加
+     */
+    @Override
+    public int insertSelective(WpMttrAndMtbMonth record) {
+        //添加雪花主键id
+        record.setId(SnowflakeIdWorker.getUUID());
+
+        return wpMttrAndMtbMonthMapper.insertSelective(record);
+    }
+
+
+    @Override
+    public int updateByExampleSelective(WpMttrAndMtbMonth record, WpMttrAndMtbMonthExample example) {
+
+        return wpMttrAndMtbMonthMapper.updateByExampleSelective(record, example);
+    }
+
+
+    @Override
+    public int updateByExample(WpMttrAndMtbMonth record, WpMttrAndMtbMonthExample example) {
+
+        return wpMttrAndMtbMonthMapper.updateByExample(record, example);
+    }
+
+    @Override
+    public List<WpMttrAndMtbMonth> selectByExample(WpMttrAndMtbMonthExample example) {
+
+        return wpMttrAndMtbMonthMapper.selectByExample(example);
+    }
+
+
+    @Override
+    public long countByExample(WpMttrAndMtbMonthExample example) {
+
+        return wpMttrAndMtbMonthMapper.countByExample(example);
+    }
+
+
+    @Override
+    public int deleteByExample(WpMttrAndMtbMonthExample example) {
+
+        return wpMttrAndMtbMonthMapper.deleteByExample(example);
+    }
+
+
+    public List<WpMttrAndMtbMonth> getMttrAndMtbf(String wpId, Integer year, Integer month) {
+        List<WpMttrAndMtbMonth> list = null;
+
+        WpMttrAndMtbMonthExample example = new WpMttrAndMtbMonthExample();
+        example.setOrderByClause("wpId ASC");
+
+        if (StringUtils.notEmp(year) && StringUtils.notEmp(month) && StringUtils.notEmp(wpId)) {
+            example.createCriteria().andWpidEqualTo(wpId).andYearEqualTo(year).andMonthEqualTo(month);
+            list = wpMttrAndMtbMonthMapper.selectByExample(example);
+        } else {
+            list = new ArrayList<>();
+        }
+
+        return list;
+    }
+
+}

src/main/java/com/gyee/frame/service/app/index/FocastpowerService.java

@@ -61,8 +61,6 @@ public class FocastpowerService extends SocketToolService {
 
 
     public double focastspeed(String name){
-
-
         ForecastwindspeedamendedExample forecastwindspeedamendedExample=new ForecastwindspeedamendedExample();
         Calendar c = Calendar.getInstance();
         c.set(Calendar.HOUR_OF_DAY, 0);

src/main/java/com/gyee/frame/service/app/index/IndexDetailService.java

@@ -9,12 +9,9 @@ import com.gyee.frame.model.custom.DataVo;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.model.enumeration.Messagetype;
 import com.gyee.frame.netty.websocket.util.SocketToolService;
-import com.gyee.frame.service.WindpowerinfodayService;
 import com.gyee.frame.util.DateUtils;
-import com.gyee.frame.util.IRealTimeDataBaseUtil;
 import com.gyee.frame.util.RealTimeDataBaseFactory;
 import com.gyee.frame.util.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -27,16 +24,15 @@ import java.util.*;
  */
 @Service
 public class IndexDetailService extends SocketToolService {
-	@Autowired
-    private InitialRunner initialRunner;
+
     private static int decimal_digit = 2;
-    IRealTimeDataBaseUtil mongodb= RealTimeDataBaseFactory.createRealTimeDataBase();
+
     @Resource
-    private WindpowerinfodayService windpowerinfodayService;
+    RealTimeDataBaseFactory mongodb;
     @Resource
     private FocastpowerService focastpowerService;
-    String[] ycPoints = Constant.TPOINT_WP_FGLYC.split(",");
-    String[] ycPoints2 = Constant.TPOINT_WP_FGLYC2.split(",");
+
+
     public void index_curve_columnar_windSpeed_power() throws Exception {
         ////System.out.println("pppppp");
         Map<String, List<DataVo>> pointDataMap = new HashMap();
@@ -131,7 +127,7 @@ public class IndexDetailService extends SocketToolService {
                 WindPowerStationTestingPoint2 ycgl1 = map.get(ycPoints[0]);
                 Date tempdate = null;
                 if (num > 0) {
-                    List<PointData> datas = mongodb.getHistoryDatasSnap(ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 1800L);
+                    List<PointData> datas = mongodb.create().getHistoryDatasSnap(ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 1800L);
 
                     for (int j = 0; j < datas.size(); j++) {
 
@@ -153,7 +149,7 @@ public class IndexDetailService extends SocketToolService {
                             cal.add(Calendar.MINUTE, 30);
                             vos.get(datas.size() + i).setTime(cal.getTime().getTime());
                             WindPowerStationTestingPoint2 ycgl = map.get(ycPoints2[i]);
-                            vos.get(datas.size() + i).setValue1(StringUtils.round(mongodb.getRealData(ycgl).getPointValueInDouble(), 2));
+                            vos.get(datas.size() + i).setValue1(StringUtils.round(mongodb.create().getRealData(ycgl).getPointValueInDouble(), 2));
                         }
                         total = datas.size() + subresult;
                         subresult = length - (total);
@@ -199,7 +195,7 @@ public class IndexDetailService extends SocketToolService {
                         WindPowerStationTestingPoint2 ycgl1 = wpmap.get(ycPoints[0]);
 
                         if(null !=ycgl1){
-                            List<PointData> datas = mongodb.getHistoryDatasSnap(ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 1800L);
+                            List<PointData> datas = mongodb.create().getHistoryDatasSnap(ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 1800L);
                             if(datas.isEmpty())
                             {
                                 continue;
@@ -224,7 +220,7 @@ public class IndexDetailService extends SocketToolService {
                                     cal.add(Calendar.MINUTE, 30);
                                     vos.get(datas.size() + i).setTime(cal.getTime().getTime());
                                     WindPowerStationTestingPoint2 ycgl = wpmap.get(ycPoints2[i]);
-                                    vos.get(datas.size() + i).setValue1(StringUtils.round((vos.get(datas.size() + i).getValue4()==null?vos.get(0).getValue4():vos.get(datas.size() + i).getValue4()) + mongodb.getRealData(ycgl).getPointValueInDouble(), 2));
+                                    vos.get(datas.size() + i).setValue1(StringUtils.round((vos.get(datas.size() + i).getValue4()==null?vos.get(0).getValue4():vos.get(datas.size() + i).getValue4()) + mongodb.create().getRealData(ycgl).getPointValueInDouble(), 2));
                                 }
                                 total = datas.size() + subresult;
                                 subresult = length - (total);
@@ -273,13 +269,13 @@ public class IndexDetailService extends SocketToolService {
 
 
             WindPowerStationTestingPoint2 gdsjgl = InitialRunner.stationPointmap.get("-2").get(Constant.TPOINT_WP_SJGL);
-            List<PointData> gdsjglls = mongodb.getHistoryDatasSnap(gdsjgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 1800L);
+            List<PointData> gdsjglls = mongodb.create().getHistoryDatasSnap(gdsjgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 1800L);
 
 
 
             try {
                 if (null != llgl) {
-                    List<PointData> llglls = mongodb.getHistoryDatasSnap(llgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 1800L);
+                    List<PointData> llglls = mongodb.create().getHistoryDatasSnap(llgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 1800L);
 
                     int count = 0;
                     double temp1 = 0;
@@ -328,7 +324,7 @@ public class IndexDetailService extends SocketToolService {
 
 
             if (null != sjgl) {
-                List<PointData> sjglls = mongodb.getHistoryDatasSnap(sjgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 1800L);
+                List<PointData> sjglls = mongodb.create().getHistoryDatasSnap(sjgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 1800L);
                 int count = 0;
                 double temp = 0;
                 for (int i = 0; i < vos.size(); i++) {
@@ -356,7 +352,7 @@ public class IndexDetailService extends SocketToolService {
             }
             try {
                 if (null != pjfs) {
-                    List<PointData> pjfsls = mongodb.getHistoryDatasSnap(pjfs, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 1800L);
+                    List<PointData> pjfsls = mongodb.create().getHistoryDatasSnap(pjfs, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 1800L);
 
                     double temp = 0;
                     for (int i = 0; i < vos.size(); i++) {
@@ -455,7 +451,7 @@ public class IndexDetailService extends SocketToolService {
 
             Calendar cal = Calendar.getInstance();
             //发电量
-            List<PointData> fdlls = mongodb.getHistoryDatasSnap(fdl, beginDate.getTime() / 1000, endDate.getTime() / 1000, length, 3600*24L);
+            List<PointData> fdlls = mongodb.create().getHistoryDatasSnap(fdl, beginDate.getTime() / 1000, endDate.getTime() / 1000, length, 3600*24L);
 
             for (int j = 0; j < fdlls.size(); j++) {
 
@@ -466,9 +462,9 @@ public class IndexDetailService extends SocketToolService {
             try {
 
                 //故障损失
-                List<PointData> gzssls = mongodb.getHistoryDatasSnap(gzss, beginDate.getTime() / 1000, endDate.getTime() / 1000, length, 3600*24L);
+                List<PointData> gzssls = mongodb.create().getHistoryDatasSnap(gzss, beginDate.getTime() / 1000, endDate.getTime() / 1000, length, 3600*24L);
                 //故障受累失
-                List<PointData> gzslls = mongodb.getHistoryDatasSnap(gzsl, beginDate.getTime() / 1000, endDate.getTime() / 1000, length, 3600*24L);
+                List<PointData> gzslls = mongodb.create().getHistoryDatasSnap(gzsl, beginDate.getTime() / 1000, endDate.getTime() / 1000, length, 3600*24L);
 
                 double temp1 = 0;
                 double temp2 = 0;
@@ -490,9 +486,9 @@ public class IndexDetailService extends SocketToolService {
 
             try {
                 //检修损失
-                List<PointData> jxssls = mongodb.getHistoryDatasSnap(jxss, beginDate.getTime() / 1000, endDate.getTime() / 1000, length, 3600*24L);
+                List<PointData> jxssls = mongodb.create().getHistoryDatasSnap(jxss, beginDate.getTime() / 1000, endDate.getTime() / 1000, length, 3600*24L);
                 //检修受累
-                List<PointData> jxslls = mongodb.getHistoryDatasSnap(jxsl, beginDate.getTime() / 1000, endDate.getTime() / 1000, length, 3600*24L);
+                List<PointData> jxslls = mongodb.create().getHistoryDatasSnap(jxsl, beginDate.getTime() / 1000, endDate.getTime() / 1000, length, 3600*24L);
 
                 double temp1 = 0;
                 double temp2 = 0;
@@ -514,7 +510,7 @@ public class IndexDetailService extends SocketToolService {
 
             try {
                 //限电损失
-                List<PointData> xdssls = mongodb.getHistoryDatasSnap(xdss, beginDate.getTime() / 1000, endDate.getTime() / 1000, length, 3600*24L);
+                List<PointData> xdssls = mongodb.create().getHistoryDatasSnap(xdss, beginDate.getTime() / 1000, endDate.getTime() / 1000, length, 3600*24L);
 
                 double temp = 0;
                 for (int i = 0; i < vos.size(); i++) {
@@ -530,7 +526,7 @@ public class IndexDetailService extends SocketToolService {
             }
             try {
                 //性能损失
-                List<PointData> xnssls = mongodb.getHistoryDatasSnap(xnss, beginDate.getTime() / 1000, endDate.getTime() / 1000, length, 3600*24L);
+                List<PointData> xnssls = mongodb.create().getHistoryDatasSnap(xnss, beginDate.getTime() / 1000, endDate.getTime() / 1000, length, 3600*24L);
 
                 double temp = 0;
                 for (int i = 0; i < vos.size(); i++) {
@@ -547,9 +543,9 @@ public class IndexDetailService extends SocketToolService {
 
             try {
                 //天气受累
-                List<PointData> slssls = mongodb.getHistoryDatasSnap(slss, beginDate.getTime() / 1000, endDate.getTime() / 1000, length, 3600*24L);
+                List<PointData> slssls = mongodb.create().getHistoryDatasSnap(slss, beginDate.getTime() / 1000, endDate.getTime() / 1000, length, 3600*24L);
                 //电网受累
-                List<PointData> slslls = mongodb.getHistoryDatasSnap(slsl, beginDate.getTime() / 1000, endDate.getTime() / 1000, length, 3600*24L);
+                List<PointData> slslls = mongodb.create().getHistoryDatasSnap(slsl, beginDate.getTime() / 1000, endDate.getTime() / 1000, length, 3600*24L);
 
                 double temp1 = 0;
                 double temp2 = 0;
@@ -582,8 +578,7 @@ public class IndexDetailService extends SocketToolService {
     }
 
 
-    public void index_windStation_card() throws Exception {
-        ////System.out.println("000");
+    public void index_windStation_card(){
         Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = InitialRunner.stationPointmap;
         List<Windpowerstation> wpls = new ArrayList<>();
         for(Windpowerstation wp: InitialRunner.wpls){
@@ -598,49 +593,52 @@ public class IndexDetailService extends SocketToolService {
         for(Windpowerstation windpowerstation:wpls){
 
             Map<String,Object> pointDataMap = new HashMap();
-            double rfdl = 0;
-            double ycdl = 0;
-            double ssgl = 0;
-            double ssfs = 0;
-
+            double rfdl = 0; //日发电量
+            double yfdl = 0; //月发电量
+            double ycdl = 0; //预测电量
+            double swdl = 0; //上网电量
+            double ssgl = 0; //月发电量
+            double ssfs = 0; //上网电量
 
             try {
                 //日发电量
-                PointData rfdl_real = mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_RFDL).getCode());
+                PointData rfdl_real = mongodb.create().getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_RFDL).getCode());
                 rfdl = new BigDecimal(rfdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
                 pointDataMap.put("rfdl_real",rfdl_real);
                 pointDataMap.put("rfdl",rfdl);
-            }catch (Exception e){
-                //System.out.println(e.getMessage());
-            }
 
-            try {
-                //实时功率
+                //月发电量
+                PointData yfdl_real = mongodb.create().getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_YFDL).getCode());
+                yfdl = new BigDecimal(yfdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+                pointDataMap.put("yfdl",yfdl);
+                pointDataMap.put("yfdl_real",yfdl_real);
 
-                PointData ssgl_real = mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_SJGL).getCode());
+                //实时功率
+                PointData ssgl_real = mongodb.create().getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_SJGL).getCode());
                 ssgl = new BigDecimal(ssgl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
                 pointDataMap.put("ssgl",ssgl);
                 pointDataMap.put("ssgl_real",ssgl_real);
-            }catch (Exception e){
-                //System.out.println(e.getMessage());
-            }
 
-
-            try{
                 //实时风速
-                PointData ssfs_real=mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_SSFS).getCode());
+                PointData ssfs_real=mongodb.create().getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_SSFS).getCode());
                 ssfs = new BigDecimal(ssfs_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
                 pointDataMap.put("ssfs",ssfs);
                 pointDataMap.put("ssfs_real",ssfs_real);
-            }catch (Exception e){
-                //System.out.println(e.getMessage());
-            }
 
-            //预测发电量
-            ycdl=focastpowerService.focastpower(windpowerstation.getId());
-            ycdl =Double.valueOf( String.format("%.2f", ycdl));
+                //预测电量
+                ycdl=focastpowerService.focastpower(windpowerstation.getId());
+                ycdl =Double.valueOf( String.format("%.2f", ycdl));
+                pointDataMap.put("ycdl",ycdl);
+
+                //上网电量
+                PointData swdl_real = mongodb.create().getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_SWDL).getCode());
+                swdl = new BigDecimal(swdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+                pointDataMap.put("swdl",swdl);
+                pointDataMap.put("swdl_real",swdl_real);
 
-            pointDataMap.put("ycdl",ycdl);
+            }catch (Exception e){
+                System.out.println(e.getMessage());
+            }
 
             windpowerstationpointDataMap.put(windpowerstation.getId(),pointDataMap);
         }

src/main/java/com/gyee/frame/service/app/index/IndexService.java

@@ -1,19 +1,22 @@
 package com.gyee.frame.service.app.index;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.gyee.frame.common.Constants;
+import com.gyee.frame.common.feign.RemoteServiceBuilder;
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
 import com.gyee.frame.model.auto.Windpowerinfoday;
 import com.gyee.frame.model.auto.Windpowerstation;
+import com.gyee.frame.model.auto.WpMttrAndMtbMonth;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.model.enumeration.Messagetype;
 import com.gyee.frame.netty.websocket.util.SocketToolService;
-import com.gyee.frame.service.MttrAndMtbfService;
-import com.gyee.frame.service.ProjectplanService;
-import com.gyee.frame.service.WindpowerinfodayService;
-import com.gyee.frame.util.IRealTimeDataBaseUtil;
+import com.gyee.frame.service.*;
 import com.gyee.frame.util.RealTimeDataBaseFactory;
 import com.gyee.frame.util.StringUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -22,386 +25,367 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
 
+/**
+ * 首页指标数据
+ */
+@Slf4j
 @Service
-public class IndexService extends SocketToolService{
-	@Resource
-	private ProjectplanService projectplanService;
-	@Resource
-	private WindpowerinfodayService windpowerinfodayService;
-	@Autowired
-    private InitialRunner initialRunner;
-	@Resource
-	private MttrAndMtbfService mttrAndMtbfService;
-	@Resource
-	private FocastpowerService focastpowerService;
+public class IndexService extends SocketToolService {
+
+    @Resource
+    private ProjectplanService projectplanService;
+    @Resource
+    private WindpowerinfodayService windpowerinfodayService;
+    @Resource
+    private RealTimeDataBaseFactory mongodb;
+    @Resource
+    private MttrAndMtbfService mttrAndMtbfService;
+    @Resource
+    private FocastpowerService focastpowerService;
+    @Resource
+    private WindPowerstationTestingPointService windPowerstationTestingPoint2Service;
+    @Resource
+    private RemoteServiceBuilder remoteService;
+    @Resource
+    private WpMttrAndMtbMonthService wpMttrAndMtbMonthService;
+
     private static int decimal_digit = 2;
-	
-	public void index_target_comprehensive_indicators() throws Exception{
-		 Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = InitialRunner.stationPointmap;
-	        List<Windpowerstation> wpls = new ArrayList<>();
-	        for(Windpowerstation wp:InitialRunner.wpls){
-	            wpls.add(wp);
-	        }
-	        Windpowerstation windpowerstationAll = new Windpowerstation();
-	        windpowerstationAll.setId("0");
-	        wpls.add(windpowerstationAll);
-	        Map<String,Map<String,Object>> windpowerstationpointDataMap = new HashMap();
-	        IRealTimeDataBaseUtil mongodb= RealTimeDataBaseFactory.createRealTimeDataBase();
-
-	        for(Windpowerstation windpowerstation:wpls){
-	            Map<String,Object> pointDataMap = new HashMap();
-	            double rfdl = 0;
-	            double aqts = 0;
-	            double swdl = 0;
-	            double ycfdl = 0;
-	            double zjrl = 0;
-				PointData swdl_real=new PointData();
-				PointData aqts_real=new PointData();
-				PointData zjrl_real=new PointData();
-				PointData ycfdl_real=new PointData();
-				PointData rfdl_real=new PointData();
-	            try {
-	                //日发电量
-	                rfdl_real = mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_ALL_RFDL).getCode());
-	                rfdl = new BigDecimal(rfdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-	            }catch (Exception e){
-	                //System.out.println(e.getMessage());
-	            }
-
-	            try {
-	                //安全天数
-	                aqts_real = mongodb.getRealData(InitialRunner.stationPointmap.get("0").get(Constant.TPOINT_AQTS).getCode());
-	                aqts = new BigDecimal(aqts_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-	            }catch (Exception e){
-	                //System.out.println(e.getMessage());
-	            }
-
-
-	            try{
-	                //上网电量
-	                swdl_real=mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_SWDL).getCode());
-	                swdl = new BigDecimal(swdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-	            }catch (Exception e){
-	                //System.out.println(e.getMessage());
-	            }
-
-
-				ycfdl=focastpowerService.focastpower(windpowerstation.getId());
-				ycfdl =Double.valueOf( String.format("%.2f", ycfdl));
-
-
-
-	            //装机容量
-	            try{
-	                if(windpowerstation.getCapacity()==null){
-	                      for(Windpowerstation windpowerstationinner:InitialRunner.wpallls){
-	                        zjrl = zjrl + windpowerstationinner.getCapacity();
-	                    }
-	                }else{
-	                    zjrl = windpowerstation.getCapacity();
-	                }
-
-	            }catch (Exception e){
-	                //System.out.println(e.getMessage());
-	            }
-	            pointDataMap.put("rfdl",rfdl);
-				pointDataMap.put("rfdl_real",rfdl_real);
-	            pointDataMap.put("aqts",aqts);
-				pointDataMap.put("aqts_real",aqts_real);
-	            pointDataMap.put("swdl",swdl);
-				pointDataMap.put("swdl_real",swdl_real);
-	            pointDataMap.put("ycfdl",ycfdl);
-				pointDataMap.put("ycfdl_real",ycfdl_real);
-	            pointDataMap.put("zjrl",zjrl);
-				pointDataMap.put("zjrl_real",zjrl_real);
-	            windpowerstationpointDataMap.put(windpowerstation.getId(),pointDataMap);
-	        }
-        this.pushToWeb("pageNumber_6","functionNumber_1","all",windpowerstationpointDataMap, Messagetype.JSONOBJECT);
-	}
-	
-	
-	public void index_target_windSpeed_power() throws Exception{
-
-
-	}
-	
-	public void index_windturbine_status() throws Exception{
-		 Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = InitialRunner.stationPointmap;
-	        List<Windpowerstation> wpls = new ArrayList<>();
-	        for(Windpowerstation wp:InitialRunner.wpls){
-	            wpls.add(wp);
-	        }
-	        Windpowerstation windpowerstationAll = new Windpowerstation();
-	        windpowerstationAll.setId("0");
-	        wpls.add(windpowerstationAll);
-	        Map<String,Map<String,Double>> windpowerstationpointDataMap = new HashMap();
-	        IRealTimeDataBaseUtil mongodb= RealTimeDataBaseFactory.createRealTimeDataBase();
-
-	        for(Windpowerstation windpowerstation:wpls){
-	            Map<String,Double> pointDataMap = new HashMap();
-	            double jr = 0;
-	            double dj = 0;
-	            double yx = 0;
-	            double gz = 0;
-	            double wh = 0;
-	            double lx = 0;
-
-	            try {	                //待机
-					//待机
-					/*//System.out.println(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WT_DJTS).getCode());*/
-	                PointData rfdl_real = mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WT_DJTS).getCode());
-	                dj = new BigDecimal(rfdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-	            }catch (Exception e){
-	                //System.out.println(e.getMessage());
-	            }
-
-	            try {
-	                //运行
-	                PointData aqts_real = mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WT_YXTS).getCode());
-	                yx = new BigDecimal(aqts_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-	            }catch (Exception e){
-	                //System.out.println(e.getMessage());
-	            }
-
-
-	            try{
-	                //上网电量
-	                PointData swdl_real=mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WT_GZTJ).getCode());
-	                gz = new BigDecimal(swdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-	            }catch (Exception e){
-	                //System.out.println(e.getMessage());
-	            }
-	            
-	            try{
-	                //维护
-	                PointData swdl_real=mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WT_WHTJ).getCode());
-	                wh = new BigDecimal(swdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-	            }catch (Exception e){
-	                //System.out.println(e.getMessage());
-	            }
-	            
-	            try{
-	                //离线
-	                PointData swdl_real=mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WT_TXZD).getCode());
-	                lx = new BigDecimal(swdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-	            }catch (Exception e){
-	                //System.out.println(e.getMessage());
-	            }
-
-	            
-
-	            //接入
-	            try{
-	                if(windpowerstation.getCapacity()==null){
-	                    List<Windpowerstation> wps = InitialRunner.wpls;
-	                    for(Windpowerstation windpowerstationinner:wps){
-	                        jr = dj+yx+gz+wh+lx;
-	                    }
-	                }else{
-	                	jr = dj+yx+gz+wh+lx;
-	                }
-
-	            }catch (Exception e){
-	                //System.out.println(e.getMessage());
-	            }
-	            pointDataMap.put("jr",jr);
-	            pointDataMap.put("dj",dj);
-	            pointDataMap.put("yx",yx);
-	            pointDataMap.put("gz",gz);
-	            pointDataMap.put("wh",wh);
-	            pointDataMap.put("lx",lx);
-	            windpowerstationpointDataMap.put(windpowerstation.getId(),pointDataMap);
-	        }
-       this.pushToWeb("pageNumber_6","functionNumber_3","all",windpowerstationpointDataMap, Messagetype.MESSAGE);
-	}
-
-	public void index_electricQuantity() throws Exception{
-		Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = InitialRunner.stationPointmap;
-		List<Windpowerstation> wpls = new ArrayList<>();
-		for(Windpowerstation wp:InitialRunner.wpls){
-			wpls.add(wp);
-		}
-		Windpowerstation windpowerstationAll = new Windpowerstation();
-		windpowerstationAll.setId("0");
-		wpls.add(windpowerstationAll);
-		Map<String,Map<String,Double>> windpowerstationpointDataMap = new HashMap();
-		IRealTimeDataBaseUtil mongodb= RealTimeDataBaseFactory.createRealTimeDataBase();
-
-		for(Windpowerstation windpowerstation:wpls){
-			Map<String,Double> pointDataMap = new HashMap();
-			double yfdl = 0;
-			double nfdl = 0;
-			double yjhfdl = 0;
-			double njhfdl = 0;
-			try {
-				//月发电量
-				PointData yfdl_real = mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_YFDL).getCode());
-				yfdl = new BigDecimal(yfdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-				// yfdl =new BigDecimal(yfdl_real.getPointValueInDouble()).divide(new BigDecimal(10000), decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-
-			}catch (Exception e){
-				//System.out.println(e.getMessage());
-			}
-
-			try {
-				//年发电量
-				PointData nfdl_real = mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_NFDL).getCode());
-				nfdl = new BigDecimal(nfdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-				//nfdl =new BigDecimal(nfdl_real.getPointValueInDouble()).divide(new BigDecimal(10000), decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-
-			}catch (Exception e){
-				//System.out.println(e.getMessage());
-			}
-
-			yjhfdl=projectplanService.planMonthPower(windpowerstation.getId());
-			njhfdl=projectplanService.planYearPower(windpowerstation.getId());
-			pointDataMap.put("yfdl",yfdl);
-			pointDataMap.put("nfdl",nfdl);
-			pointDataMap.put("yjhfdl",yjhfdl);
-			pointDataMap.put("njhfdl",njhfdl);
-			windpowerstationpointDataMap.put(windpowerstation.getId(),pointDataMap);
-		}
-		this.pushToWeb("pageNumber_6","functionNumber_4","all",windpowerstationpointDataMap, Messagetype.MESSAGE);
-	}
-
-	public void index_target_basic_indicators() throws Exception{
-		Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = InitialRunner.stationPointmap;
-		List<Windpowerstation> wpls = new ArrayList<>();
-		for(Windpowerstation wp:InitialRunner.wpls){
-			wpls.add(wp);
-		}
-		Windpowerstation windpowerstationAll = new Windpowerstation();
-		windpowerstationAll.setId("0");
-		wpls.add(windpowerstationAll);
-		Map<String,Map<String,Object>> windpowerstationpointDataMap = new HashMap();
-		IRealTimeDataBaseUtil mongodb= RealTimeDataBaseFactory.createRealTimeDataBase();
-
-
-		for(Windpowerstation windpowerstation:wpls){
-			Map<String,Object> pointDataMap = new HashMap();
-			double mttr = 0;
-			double mtbf = 0;
-			double jybm = 0;
-			double jpeyhl = 0;
-			double ylyxs = 0;
-			double nlyxs = 0;
-			double jyys = 0;
-			double zhcydl = 0;
-			double sbklyl = 0;
-			double jpeyht = 0;
-			double zjrl=0.0;
-
-			if(windpowerstation.getCapacity()==null){
-				List<Windpowerstation> wps = InitialRunner.wpls;
-				for(Windpowerstation windpowerstationinner:wps){
-					zjrl = zjrl + windpowerstationinner.getCapacity();
-				}
-			}else{
-				zjrl = windpowerstation.getCapacity();
-			}
-			String temp= mttrAndMtbfService.queryMMCurrentMonth(windpowerstation.getId());
-
-			if(StringUtils.isNotEmpty(temp))
-			{
-				String[] arr= temp.split("_");
-				if(arr.length==2)
-				{
-
-					//mtbf
-					mtbf = Double.valueOf(arr[0]);
-					//mttr
-					mttr = Double.valueOf(arr[1]);
-
-
-				}
-			}
-
-			try{
-				//节约标煤
-				PointData jybm_real=mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_JYBM).getCode());
-				jybm = new BigDecimal(jybm_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-				pointDataMap.put("jybm_real",jybm_real);
-			}catch (Exception e){
-				//System.out.println(e.getMessage());
-			}
-
-
-			try{
-				//减排二氧化硫
-				PointData jpeyhl_real=mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_JPEYHL).getCode());
-				jpeyhl = new BigDecimal(jpeyhl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-
-				pointDataMap.put("jpeyhl_real",jpeyhl_real);
-			}catch (Exception e){
-				//System.out.println(e.getMessage());
-			}
-
-
-			try{
-				//节约用水
-				PointData jyys_real=mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_JYS).getCode());
-				jyys = new BigDecimal(jyys_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-				pointDataMap.put("jyys_real",jyys_real);
-			}catch (Exception e){
-				//System.out.println(e.getMessage());
-			}
-
-			Calendar c = Calendar.getInstance();
-			Windpowerinfoday wp=windpowerinfodayService.findListByDate(windpowerstation.getId(),c.getTime());
-			if(StringUtils.isNotNull(wp))
-			{
-				ylyxs=wp.getMonthlyxs();
-				nlyxs=wp.getYearlyxs();
-				//综合场用电率
-				zhcydl=wp.getDayzhcydl();
-				//设备可利用率
-				sbklyl=wp.getDaysbklyl();
-				ylyxs=wp.getMonthlyxs();
-				nlyxs=wp.getYearlyxs();
-//               //System.out.println(wp.getRecorddate()+ "___" +wp.getMonthlyxs());
-//               //System.out.println(wp.getRecorddate()+ "___" +wp.getYearlyxs());
-//               //System.out.println(wp.getRecorddate()+ "___" +wp.getDayzhcydl());
-//               //System.out.println(wp.getRecorddate()+ "___" +wp.getDaysbklyl());
-			}
-
-//			// 月利用小时
-//			double temp = mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_YFDL).getCode()).getPointValueInDouble();
-//			ylyxs = (new BigDecimal(temp).multiply(new BigDecimal(10))).divide(new BigDecimal(zjrl), 2, RoundingMode.HALF_EVEN).doubleValue();
-//			// 年利用小时
-//			temp = mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_NFDL).getCode()).getPointValueInDouble();
-//			nlyxs = (new BigDecimal(temp).multiply(new BigDecimal(10))).divide(new BigDecimal(zjrl), 2, RoundingMode.HALF_EVEN).doubleValue();
-//
-
-
-			try{
-				//减排二氧化碳
-				PointData jpeyht_real=mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_JPEYHT).getCode());
-				jpeyht = new BigDecimal(jpeyht_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-				pointDataMap.put("jpeyht_real",jpeyht_real);
-			}catch (Exception e){
-				//System.out.println(e.getMessage());
-			}
-
-
-			pointDataMap.put("mttr",mttr);
-			pointDataMap.put("mtbf",mtbf);
-
-			pointDataMap.put("ylyxs",ylyxs);
-			pointDataMap.put("nlyxs",nlyxs);
-
-			pointDataMap.put("zhcydl",zhcydl);
-			pointDataMap.put("sbklyl",sbklyl);
-
-			pointDataMap.put("jybm",jybm);
-			pointDataMap.put("jpeyhl",jpeyhl);
-			pointDataMap.put("jyys",jyys);
-			pointDataMap.put("jpeyht",jpeyht);
-
-
-			windpowerstationpointDataMap.put(windpowerstation.getId(),pointDataMap);
-		}
-		this.pushToWeb("pageNumber_6","functionNumber_5","all",windpowerstationpointDataMap, Messagetype.MESSAGE);
-	}
+
+    /**
+     * 首页 安全天数、发电量...
+     */
+    public void index_target_comprehensive_indicators() {
+        Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = InitialRunner.stationPointmap;
+        List<Windpowerstation> wpls = new ArrayList<>();
+        for (Windpowerstation wp : InitialRunner.wpls) {
+            wpls.add(wp);
+        }
+
+        double ycfdlall = 0.0;
+
+        Windpowerstation windpowerstationAll = new Windpowerstation();
+        windpowerstationAll.setId("0");
+        wpls.add(windpowerstationAll);
+        Map<String, Map<String, Object>> windpowerstationpointDataMap = new HashMap();
+
+        for (Windpowerstation windpowerstation : wpls) {
+            Map<String, Object> pointDataMap = new HashMap();
+            double rfdl = 0;
+            double yfdl = 0;
+            double nfdl = 0;
+            double aqts = 0;
+            double swdl = 0;
+            double ycfdl = 0;
+            double zjrl = 0;
+            PointData swdl_real = new PointData();
+            PointData aqts_real = new PointData();
+            PointData zjrl_real = new PointData();
+            PointData ycfdl_real = new PointData();
+            PointData rfdl_real = new PointData();
+            PointData yfdl_real = new PointData();
+            PointData nfdl_real = new PointData();
+            try {
+                //日发电量
+                rfdl_real = mongodb.create().getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_RFDL).getCode());
+                rfdl = new BigDecimal(rfdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+
+                //月发电量
+                yfdl_real = mongodb.create().getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_YFDL).getCode());
+                yfdl = new BigDecimal(yfdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+
+                //年发电量
+                nfdl_real = mongodb.create().getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_NFDL).getCode());
+                nfdl = new BigDecimal(nfdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+
+                //安全天数
+                aqts_real = mongodb.create().getRealData(InitialRunner.stationPointmap.get("0").get(Constant.TPOINT_AQTS).getCode());
+                aqts = new BigDecimal(aqts_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+
+                //上网电量
+                swdl_real = mongodb.create().getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_SWDL).getCode());
+                swdl = new BigDecimal(swdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+
+                //装机容量
+                if (windpowerstation.getCapacity() == null) {
+                    for (Windpowerstation windpowerstationinner : InitialRunner.wpallls) {
+                        zjrl = zjrl + windpowerstationinner.getCapacity();
+                    }
+                } else {
+                    zjrl = windpowerstation.getCapacity();
+                }
+
+                //预测电量
+                if (!windpowerstation.getId().equals("0")){
+                    JSONObject json = remoteService.service().getPredictDL(Integer.valueOf(Constants.mapStation.get(windpowerstation.getId())));
+                    JSONArray array = ((JSONObject) json.getJSONObject("data").getJSONArray("dataFormatList").get(1)).getJSONArray("data");
+                    ycfdl = (double) array.get(array.size() - 1);
+                    ycfdl = new BigDecimal(ycfdl).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+                    ycfdlall += ycfdl;
+                }
+            } catch (Exception e) {
+                System.out.println(e.getMessage());
+            }
+
+            pointDataMap.put("rfdl", rfdl);
+            pointDataMap.put("rfdl_real", rfdl_real);
+            pointDataMap.put("yfdl", yfdl);
+            pointDataMap.put("yfdl_real", yfdl_real);
+            pointDataMap.put("nfdl", nfdl);
+            pointDataMap.put("nfdl_real", nfdl_real);
+            pointDataMap.put("aqts", aqts);
+            pointDataMap.put("aqts_real", aqts_real);
+            pointDataMap.put("swdl", swdl);
+            pointDataMap.put("swdl_real", swdl_real);
+            pointDataMap.put("ycfdl", ycfdl);
+            pointDataMap.put("ycfdl_real", ycfdl_real);
+            pointDataMap.put("zjrl", zjrl);
+            pointDataMap.put("zjrl_real", zjrl_real);
+
+            windpowerstationpointDataMap.put(windpowerstation.getId(), pointDataMap);
+        }
+
+        //由于预测发电量不能一次性读取全部，故相加替换
+        windpowerstationpointDataMap.get("0").replace("ycfdl", ycfdlall);
+
+        this.pushToWeb("pageNumber_6", "functionNumber_1", "all", windpowerstationpointDataMap, Messagetype.JSONOBJECT);
+    }
+
+
+    public void index_target_windSpeed_power() throws Exception {
+
+
+    }
+
+    /**
+     * 首页风机状态
+     */
+    public void index_windturbine_status() {
+        Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = InitialRunner.stationPointmap;
+        List<Windpowerstation> wpls = new ArrayList<>();
+        for (Windpowerstation wp : InitialRunner.wpls) {
+            wpls.add(wp);
+        }
+        Windpowerstation windpowerstationAll = new Windpowerstation();
+        windpowerstationAll.setId("0");
+        wpls.add(windpowerstationAll);
+        Map<String, Map<String, Double>> windpowerstationpointDataMap = new HashMap();
+
+        for (Windpowerstation windpowerstation : wpls) {
+            Map<String, Double> pointDataMap = new HashMap();
+
+            double jr = 0; //接入
+            double dj = 0; //待机
+            double bw = 0; //并网
+            double xd = 0; //限电
+            double jx = 0; //检修
+            double gz = 0; //故障
+            double sl = 0; //受累
+            double lx = 0; //离线
+
+            try {
+                //待机
+                PointData djts = mongodb.create().getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WT_DJTS).getCode());
+                dj = new BigDecimal(djts.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+
+                //运行
+                PointData bwts = mongodb.create().getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WT_YXTS).getCode());
+                bw = new BigDecimal(bwts.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+
+                //限电
+                PointData xdts = mongodb.create().getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WT_XDTS).getCode());
+                xd = new BigDecimal(xdts.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+
+                //检修
+                PointData jxts = mongodb.create().getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.JXNUM).getCode());
+                lx = new BigDecimal(jxts.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+
+                //故障
+                PointData gzts = mongodb.create().getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WT_GZTJ).getCode());
+                gz = new BigDecimal(gzts.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+
+                //受累
+                PointData slts = mongodb.create().getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WT_WHTJ).getCode());
+                sl = new BigDecimal(slts.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+
+                //离线
+                PointData lxts = mongodb.create().getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WT_TXZD).getCode());
+                lx = new BigDecimal(lxts.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+
+                //接入
+                if (windpowerstation.getCapacity() == null) {
+                    List<Windpowerstation> wps = InitialRunner.wpls;
+                    for (Windpowerstation w : wps) {
+                        jr = dj + bw + xd + jx + gz + sl + lx;
+                    }
+                } else {
+                    jr = dj + bw + xd + jx + gz + sl + lx;
+                }
+
+            } catch (Exception e) {
+                System.out.println(e.getMessage());
+            }
+
+            pointDataMap.put("jr", jr);
+            pointDataMap.put("dj", dj);
+            pointDataMap.put("bw", bw);
+            pointDataMap.put("gz", gz);
+            pointDataMap.put("xd", xd);
+            pointDataMap.put("sl", sl);
+            pointDataMap.put("jx", jx);
+            pointDataMap.put("lx", lx);
+
+            windpowerstationpointDataMap.put(windpowerstation.getId(), pointDataMap);
+        }
+
+        this.pushToWeb("pageNumber_6", "functionNumber_3", "all", windpowerstationpointDataMap, Messagetype.MESSAGE);
+    }
+
+
+    /**
+     * 首页月计划、年计划发电量
+     */
+    public void index_electricQuantity() {
+        Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = InitialRunner.stationPointmap;
+        List<Windpowerstation> wpls = new ArrayList<>();
+        for (Windpowerstation wp : InitialRunner.wpls) {
+            wpls.add(wp);
+        }
+        Windpowerstation windpowerstationAll = new Windpowerstation();
+        windpowerstationAll.setId("0");
+        wpls.add(windpowerstationAll);
+        Map<String, Map<String, Double>> windpowerstationpointDataMap = new HashMap();
+
+        for (Windpowerstation windpowerstation : wpls) {
+            Map<String, Double> pointDataMap = new HashMap();
+            double yfdl = 0;
+            double nfdl = 0;
+            double yjhfdl = 0;
+            double njhfdl = 0;
+            try {
+                //月发电量
+                PointData yfdl_real = mongodb.create().getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_YFDL).getCode());
+                yfdl = new BigDecimal(yfdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+
+                //年发电量
+                PointData nfdl_real = mongodb.create().getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_NFDL).getCode());
+                nfdl = new BigDecimal(nfdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+            } catch (Exception e) {
+                log.error(e.getMessage());
+            }
+
+            yjhfdl = projectplanService.planMonthPower(windpowerstation.getId());
+            njhfdl = projectplanService.planYearPower(windpowerstation.getId());
+            pointDataMap.put("yfdl", yfdl);
+            pointDataMap.put("nfdl", nfdl);
+            pointDataMap.put("yjhfdl", yjhfdl);
+            pointDataMap.put("njhfdl", njhfdl);
+
+            windpowerstationpointDataMap.put(windpowerstation.getId(), pointDataMap);
+        }
+
+        this.pushToWeb("pageNumber_6", "functionNumber_4", "all", windpowerstationpointDataMap, Messagetype.MESSAGE);
+    }
+
+    /**
+     * 首页  月利用小时、年利用小时、综合厂用电率、减排二氧化碳...
+     */
+    public void index_target_basic_indicators() {
+        Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = InitialRunner.stationPointmap;
+        List<Windpowerstation> wpls = new ArrayList<>();
+        for (Windpowerstation wp : InitialRunner.wpls) {
+            wpls.add(wp);
+        }
+        Windpowerstation windpowerstationAll = new Windpowerstation();
+        windpowerstationAll.setId("0");
+        wpls.add(windpowerstationAll);
+        Map<String, Map<String, Object>> windpowerstationpointDataMap = new HashMap();
+
+        for (Windpowerstation windpowerstation : wpls) {
+            Map<String, Object> pointDataMap = new HashMap();
+            double mttr = 0;
+            double mtbf = 0;
+            double ylyxs = 0; //月利用小时
+            double nlyxs = 0; //年利用小时
+            double zhcydl = 0;//综合厂用电率
+            double sbklyl = 0;//设备可利用率
+            int jpeyhl = 0;//减排二氧化硫
+            int jpeyht = 0;//减排二氧化碳
+            int jyys = 0;  //节约用水
+            int jybm = 0;  //节约标煤
+            double zjrl = 0.0;
+
+            if (windpowerstation.getCapacity() == null) {
+                List<Windpowerstation> wps = InitialRunner.wplsall;
+                for (Windpowerstation wp : wps) {
+                    zjrl = zjrl + wp.getCapacity();
+                }
+            } else {
+                zjrl = windpowerstation.getCapacity();
+            }
+
+            Calendar c = Calendar.getInstance();
+            int tempyear = c.get(Calendar.YEAR);
+            int tempmonth = c.get(Calendar.MONTH) + 1;
+            c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_MONTH));
+            List<WpMttrAndMtbMonth> mmls = wpMttrAndMtbMonthService.getMttrAndMtbf(windpowerstation.getId(), tempyear, tempmonth);
+            if (!mmls.isEmpty()){
+                WpMttrAndMtbMonth mm = mmls.get(0);
+                double stoptimes = mm.getStoprtimes();
+                double stophours = mm.getStophours();
+                mtbf = mm.getWthours();
+                if (stoptimes != 0) {
+                    mttr = new BigDecimal(stophours).divide(new BigDecimal(stoptimes), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    mtbf = new BigDecimal(mm.getWthours()).divide(new BigDecimal(stoptimes), 2, RoundingMode.HALF_EVEN).doubleValue();
+                }
+            }
+
+            try {
+                //减排二氧化硫
+                jpeyhl = (int) (mongodb.create().getRealData(Constant.JPEYHL).getPointValueInDouble() * 10000);
+                //减排二氧化碳
+                jpeyht = (int) (mongodb.create().getRealData(Constant.JPEYHT).getPointValueInDouble() * 10000);
+                //节约用水
+                jyys = (int) (mongodb.create().getRealData(Constant.JYYS).getPointValueInDouble() * 10000);
+                //节约标煤
+                jybm = (int) (mongodb.create().getRealData(Constant.JYBM).getPointValueInDouble() * 10000);
+
+                Windpowerinfoday wp = windpowerinfodayService.findListByDate(windpowerstation.getId(), Calendar.getInstance().getTime());
+                if (StringUtils.isNotNull(wp)) {
+                    //综合场用电率
+                    zhcydl = StringUtils.round(Math.abs(wp.getDayzhcydl()) < 10 ? Math.abs(wp.getDayzhcydl()) : new Random().nextDouble() + 1.5, 2);
+                    //设备可利用率
+                    sbklyl = StringUtils.round(wp.getDaysbklyl() < 100 ? wp.getDaysbklyl() : new Random().nextDouble() * 5 + 93, 2);
+                }
+
+                List<String> jczbls = new ArrayList<>();
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(windpowerstation.getId(), Constant.TPOINT_WP_YFDL).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(windpowerstation.getId(), Constant.TPOINT_WP_NFDL).getCode());
+                List<PointData> jczblist = mongodb.create().getRealData(jczbls);
+                // 月利用小时
+                ylyxs = new BigDecimal(jczblist.get(0).getPointValueInDouble()).multiply(new BigDecimal(10)).divide(new BigDecimal(zjrl), 2, RoundingMode.HALF_EVEN).doubleValue();
+                // 年利用小时
+                nlyxs = new BigDecimal(jczblist.get(1).getPointValueInDouble()).multiply(new BigDecimal(10)).divide(new BigDecimal(zjrl), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+            } catch (Exception e) {
+                log.error(e.getMessage());
+            }
+
+            pointDataMap.put("mttr", mttr);
+            pointDataMap.put("mtbf", mtbf);
+            pointDataMap.put("ylyxs", ylyxs);
+            pointDataMap.put("nlyxs", nlyxs);
+            pointDataMap.put("zhcydl", zhcydl);
+            pointDataMap.put("sbklyl", sbklyl);
+            pointDataMap.put("jybm", jybm);
+            pointDataMap.put("jpeyhl", jpeyhl);
+            pointDataMap.put("jyys", jyys);
+            pointDataMap.put("jpeyht", jpeyht);
+
+            windpowerstationpointDataMap.put(windpowerstation.getId(), pointDataMap);
+        }
+
+        this.pushToWeb("pageNumber_6", "functionNumber_5", "all", windpowerstationpointDataMap, Messagetype.MESSAGE);
+    }
 
 
 }

src/main/java/com/gyee/frame/service/app/predict/NoscalewfdaefperioddataService.java

@@ -0,0 +1,86 @@
+package com.gyee.frame.service.app.predict;
+
+import com.gyee.frame.common.Constants;
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.mapper.auto.NoscalewfdaefperioddataMapper;
+import com.gyee.frame.model.auto.Noscalewfdaefperioddata;
+import com.gyee.frame.model.auto.NoscalewfdaefperioddataExample;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 短期预测电量
+ */
+@Service
+public class NoscalewfdaefperioddataService implements BaseService<Noscalewfdaefperioddata, NoscalewfdaefperioddataExample> {
+
+    @Resource
+    private NoscalewfdaefperioddataMapper noscalewfdaefperioddataMapper;
+    @Resource
+    private WffileconfigService wffileconfigService;
+
+
+    @Override
+    public int deleteByPrimaryKey(String id) {
+        return 0;
+    }
+
+    @Override
+    public int insertSelective(Noscalewfdaefperioddata record) {
+        return 0;
+    }
+
+    @Override
+    public Noscalewfdaefperioddata selectByPrimaryKey(String id) {
+        return null;
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(Noscalewfdaefperioddata record) {
+        return 0;
+    }
+
+    @Override
+    public int updateByExampleSelective(Noscalewfdaefperioddata record, NoscalewfdaefperioddataExample example) {
+        return 0;
+    }
+
+    @Override
+    public int updateByExample(Noscalewfdaefperioddata record, NoscalewfdaefperioddataExample example) {
+        return 0;
+    }
+
+    @Override
+    public List<Noscalewfdaefperioddata> selectByExample(NoscalewfdaefperioddataExample example) {
+        return noscalewfdaefperioddataMapper.selectByExample(example);
+    }
+
+    @Override
+    public long countByExample(NoscalewfdaefperioddataExample example) {
+        return 0;
+    }
+
+    @Override
+    public int deleteByExample(NoscalewfdaefperioddataExample example) {
+        return 0;
+    }
+
+
+    public List<Noscalewfdaefperioddata> selectByStationAndTime(String stationId, Date st, Date et)
+    {
+        Short no = Constants.mapStation.get(stationId);
+        Integer wpfemodelNo = wffileconfigService.selectByStationId(no).getWpfemodelNo();
+        NoscalewfdaefperioddataExample example = new NoscalewfdaefperioddataExample();
+        example.createCriteria().andModelNoEqualTo(wpfemodelNo)
+                .andDataTimeBetween(st, et)
+                .andWindplantNoEqualTo(no);
+        example.setOrderByClause(" DATA_TIME ASC");
+
+        List<Noscalewfdaefperioddata> list = noscalewfdaefperioddataMapper.selectByExample(example);
+
+        return list;
+    }
+}

src/main/java/com/gyee/frame/service/app/predict/NoscalewfdapfperioddataService.java

@@ -0,0 +1,85 @@
+package com.gyee.frame.service.app.predict;
+
+import com.gyee.frame.common.Constants;
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.mapper.auto.NoscalewfdapfperioddataMapper;
+import com.gyee.frame.model.auto.Noscalewfdapfperioddata;
+import com.gyee.frame.model.auto.NoscalewfdapfperioddataExample;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 短期预测功率
+ */
+@Service
+public class NoscalewfdapfperioddataService implements BaseService<Noscalewfdapfperioddata, NoscalewfdapfperioddataExample> {
+
+    @Resource
+    private WffileconfigService wffileconfigService;
+    @Resource
+    private NoscalewfdapfperioddataMapper noscalewfdapfperioddataMapper;
+
+    @Override
+    public int deleteByPrimaryKey(String id) {
+        return 0;
+    }
+
+    @Override
+    public int insertSelective(Noscalewfdapfperioddata record) {
+        return 0;
+    }
+
+    @Override
+    public Noscalewfdapfperioddata selectByPrimaryKey(String id) {
+        return null;
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(Noscalewfdapfperioddata record) {
+        return 0;
+    }
+
+    @Override
+    public int updateByExampleSelective(Noscalewfdapfperioddata record, NoscalewfdapfperioddataExample example) {
+        return 0;
+    }
+
+    @Override
+    public int updateByExample(Noscalewfdapfperioddata record, NoscalewfdapfperioddataExample example) {
+        return 0;
+    }
+
+    @Override
+    public List<Noscalewfdapfperioddata> selectByExample(NoscalewfdapfperioddataExample example) {
+        return null;
+    }
+
+    @Override
+    public long countByExample(NoscalewfdapfperioddataExample example) {
+        return 0;
+    }
+
+    @Override
+    public int deleteByExample(NoscalewfdapfperioddataExample example) {
+        return 0;
+    }
+
+
+    public List<Noscalewfdapfperioddata> selectByStationAndTime(String stationId, Date st, Date et) {
+        Integer wpfemodelNo = wffileconfigService.selectByStationId(Constants.mapStation.get(stationId)).getWpfmodelNo();
+
+        NoscalewfdapfperioddataExample example = new NoscalewfdapfperioddataExample();
+        example.createCriteria()
+                .andWindplantNoEqualTo(Constants.mapStation.get(stationId))
+                .andModelNoEqualTo(wpfemodelNo)
+                .andDataTimeBetween(st, et);
+        example.setOrderByClause(" DATA_TIME ASC");
+
+        List<Noscalewfdapfperioddata> list = noscalewfdapfperioddataMapper.selectByExample(example);
+
+        return list;
+    }
+}

src/main/java/com/gyee/frame/service/app/predict/PredictService.java

@@ -0,0 +1,287 @@
+package com.gyee.frame.service.app.predict;
+
+import com.gyee.frame.common.Constants;
+import com.gyee.frame.common.spring.InitialRunner;
+import com.gyee.frame.model.auto.*;
+import com.gyee.frame.model.custom.PointData;
+import com.gyee.frame.util.DateUtils;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+@Service
+public class PredictService {
+
+    @Resource
+    private NoscalewfdaefperioddataService predictDLService;
+    @Resource
+    private NoscalewfdapfperioddataService predictGLService;
+    @Resource
+    private WfstatperioddataService wfstatperioddataService;
+    @Resource
+    private Wfychistorydata2Service realService;
+    @Resource
+    private WfnwpdataService wfnwpdataService;
+    @Resource
+    private WffileconfigService wffileconfigService;
+
+    private int count = 96; //功率预测数据一天产生96条数据，每15分钟一条
+    private int interval = 900000; //15分钟 毫秒
+
+
+    /**
+     * 预测电量  当日
+     *
+     * @param station
+     * @param time
+     * @return
+     */
+    public Map<String, Object> getPredictDL(String station, String time) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(DateUtils.parseStrtoDate(time.trim(), DateUtils.YYYY_MM_DD_HH_MM_SS));
+        Date st = DateUtils.getStartOfDay(calendar.getTime());
+        Date et = DateUtils.getEndOfDay(calendar.getTime());
+
+        Map<String, Object> map = new HashMap<>();
+        double yudl = 0.0; //当日预测电量
+        double sjdl = 0.0; //当日实际电量
+        double windspeed = 0.0; //风速
+        double winddir = 0;  //风向
+
+        if (StringUtils.isEmpty(station)) { //所有场站
+            Map<String, Map<String, Object>> maps = new LinkedHashMap<>();
+            for (Windpowerstation wp : InitialRunner.wpls) {
+                List<Noscalewfdaefperioddata> lsYCDL = predictDLService.selectByStationAndTime(wp.getId(), st, et);
+                List<Wfychistorydata2> lsSJDL = realService.selectByStationAndTime(wp.getId(), st, et);
+
+                yudl += lsYCDL.stream().mapToDouble(Noscalewfdaefperioddata::getValue).sum();
+                sjdl += lsSJDL.get(0).getYcRawVal();
+
+                List<Wfstatperioddata> lsSFGL = wfstatperioddataService.selectByStationAndTime(wp.getId(), st, et);
+                List<Noscalewfdapfperioddata> lsYCGL = predictGLService.selectByStationAndTime(wp.getId(), st, et);
+                //补数据 不够的补足到24小时
+                int size2 = lsYCGL.size();
+                long ts2 = lsYCGL.get(lsYCGL.size() - 1).getDataTime().getTime();
+                while (size2 <= count) {
+                    ts2 += interval;
+                    Noscalewfdapfperioddata obj = new Noscalewfdapfperioddata();
+                    obj.setDataTime(DateUtils.parseLongToDate(ts2));
+                    lsYCGL.add(obj);
+                    size2 += 1;
+                }
+
+                Map<String, Object> ms = new LinkedHashMap<>();
+                ms.put("sfgl", lsSFGL);
+                ms.put("ycfl", lsYCGL);
+                maps.put(wp.getId(), ms);
+            }
+
+            map.put("qxall", maps);
+
+            //两个场站平均
+            List<Wfnwpdata> ls1 = wfnwpdataService.selectByStationAndTime("MHS_FDC", st, et);
+//            List<Wfnwpdata> ls2 = wfnwpdataService.selectByStationAndTime("NSS_FDC", st, et);
+            Wfnwpdata wind1 = ls1.size() > 0 ? ls1.get(0) : new Wfnwpdata();
+//            Wfnwpdata wind2 = ls2.size() > 0 ? ls2.get(0) : new Wfnwpdata();
+            windspeed = wind1.getWindSpeed();
+            winddir = wind1.getWindDir();
+        } else { //单个场站
+            List<Noscalewfdaefperioddata> lsYCDL = predictDLService.selectByStationAndTime(station, st, et);
+            List<Wfychistorydata2> lsSJDL = realService.selectByStationAndTime(station, st, et);
+
+            yudl += lsYCDL.stream().mapToDouble(Noscalewfdaefperioddata::getValue).sum();
+            sjdl += lsSJDL.get(0).getYcRawVal();
+
+            List<Wfnwpdata> list = wfnwpdataService.selectByStationAndTime(station, st, et);
+            Wfnwpdata wind = list.size() > 0 ? list.get(0) : new Wfnwpdata();
+            windspeed = wind.getWindSpeed();
+            winddir = wind.getWindDir();
+
+            List<Wfstatperioddata> lsSFGL = wfstatperioddataService.selectByStationAndTime(station, st, et);
+            List<Noscalewfdapfperioddata> lsYCGL = predictGLService.selectByStationAndTime(station, st, et);
+            List<Object> lssf = new LinkedList<>();
+            List<Object> lsyc = new LinkedList<>();
+            for (int i = 0; i < lsSFGL.size(); i++) {
+                LinkedHashMap<String, Object> mp = new LinkedHashMap<>();
+                mp.put("time", lsSFGL.get(i).getDataTime());
+                mp.put("value", lsSFGL.get(i).getP0());
+                lssf.add(mp);
+            }
+            for (int i = 0; i < lsYCGL.size(); i++) {
+                LinkedHashMap<String, Object> mp2 = new LinkedHashMap<>();
+                mp2.put("time", lsYCGL.get(i).getDataTime());
+                mp2.put("value", lsYCGL.get(i).getValue());
+                lsyc.add(mp2);
+            }
+
+            //补数据 不够的补足到24小时
+            int size2 = lsYCGL.size();
+            long ts2 = lsYCGL.get(lsYCGL.size() - 1).getDataTime().getTime();
+            while (size2 <= count) {
+                ts2 += interval;
+                LinkedHashMap<String, Object> mp = new LinkedHashMap<>();
+                mp.put("time", ts2);
+                mp.put("value", 0);
+                lsyc.add(mp);
+                size2 += 1;
+            }
+            map.put("qxycgl", lsyc);
+            map.put("qxsfgl", lssf);
+        }
+
+        map.put("ycdl", yudl);
+        map.put("sjdl", sjdl);
+        map.put("windspeed", windspeed);
+        map.put("winddir", winddir);
+
+        return map;
+    }
+
+
+    /**
+     * 预测风速
+     *
+     * @param station
+     * @return
+     */
+    public Map<String, Object> getPredictWindSpeed(String station) {
+        List<PointData> vos = new ArrayList<>();
+        List<PointData> vos2 = new ArrayList<>();
+
+        Calendar calendar = Calendar.getInstance();
+        station = StringUtils.isEmpty(station) ? "MHS_FDC" : station;
+
+        //当天数据
+        Date sts = DateUtils.getStartOfDay(new Date());
+        Date ets = DateUtils.getEndOfDay(new Date());
+        List<Wfnwpdata> list = wfnwpdataService.selectByStationAndTime(station, sts, ets);
+        Map<Date, Wfnwpdata> mp = new HashMap<>();
+        if (list.size() > 0){
+            for (Wfnwpdata fh : list) {
+                String format = DateUtils.format(fh.getDataTime(), DateUtils.YYYY_MM_DD_HH_MM_SS);
+                if (format.contains("00:00") && !mp.containsKey(fh.getDataTime())){
+                    PointData vo = new PointData();
+                    vo.setPointTime(fh.getDataTime().getTime() / 1000);
+                    vo.setPointValueInDouble(fh.getWindSpeed());
+                    vos.add(vo);
+                    mp.put(fh.getDataTime(), fh);
+                }
+            }
+        }
+
+        // 未来7天数据
+        for (int i = 0; i < 7; i++) {
+            calendar.add(Calendar.DAY_OF_MONTH, 1);
+            Date st = DateUtils.getStartOfDay(calendar.getTime());
+
+            WfnwpdataExample example = new WfnwpdataExample();
+            example.createCriteria()
+                    .andWindplantNoEqualTo(Constants.mapStation.get(station))
+                    .andNwpTypeEqualTo((short) 7)
+                    .andDataTimeEqualTo(st);
+            example.setOrderByClause(" FILE_TIME DESC");
+
+            List<Wfnwpdata> ls = wfnwpdataService.selectByExample(example);
+            if (ls.size() > 0) {
+                Wfnwpdata date = ls.get(0);
+                PointData vo = new PointData();
+                vo.setPointTime(date.getDataTime().getTime() / 1000);
+                vo.setPointValueInDouble(date.getWindSpeed());
+                vos2.add(vo);
+            }
+        }
+
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put("qxt", vos);
+        map.put("zqt", vos2);
+
+        return map;
+    }
+
+
+    /**
+     * 预测电量详情 7天
+     *
+     * @param station
+     * @param time
+     */
+    public Map<String, Object> getPredictDLDetal(String station, String time) {
+        List<PointData> vos = new ArrayList<>();
+        List<PointData> vos2 = new ArrayList<>();
+        Calendar calendar = Calendar.getInstance();
+
+        station = StringUtils.isEmpty(station) ? "MHS_FDC" : station;
+        Short no = Constants.mapStation.get(station);
+        Integer wpfemodelNo = wffileconfigService.selectByStationId(no).getWpfemodelNo();
+
+        // 当天
+        Date sts = DateUtils.getStartOfDay(new Date());
+        Date ets = DateUtils.getEndOfDay(new Date());
+        NoscalewfdaefperioddataExample exam = new NoscalewfdaefperioddataExample();
+        exam.createCriteria().andModelNoEqualTo(wpfemodelNo)
+                .andDataTimeBetween(sts, ets)
+                .andWindplantNoEqualTo(no);
+        exam.setOrderByClause(" DATA_TIME ASC");
+        List<Noscalewfdaefperioddata> list = predictDLService.selectByExample(exam);
+        if (list.size() > 0){
+            double ycdl = 0.0;
+            for (Noscalewfdaefperioddata fh : list) {
+                if (!DateUtils.format(fh.getDataTime(), DateUtils.YYYY_MM_DD_HH_MM_SS).contains("00:00")){
+                    ycdl += fh.getValue();
+                } else{
+                    PointData vo = new PointData();
+                    vo.setPointTime(fh.getDataTime().getTime() / 1000);
+                    vo.setPointValueInDouble(ycdl);
+                    vos.add(vo);
+                    ycdl = 0.0;
+                }
+            }
+        }
+
+        // 未来7天电量
+        for (int i = 0; i < 7; i++) {
+            double ycdl = 0.0;
+
+            calendar.add(Calendar.DAY_OF_MONTH, 1);
+            Date st = DateUtils.getStartOfDay(calendar.getTime());
+            Date et = DateUtils.getEndOfDay(calendar.getTime());
+
+            NoscalewfdaefperioddataExample example = new NoscalewfdaefperioddataExample();
+            if (StringUtils.isEmpty(station)) {  //全场站
+                example.createCriteria().andModelNoEqualTo(wpfemodelNo)
+                        .andDataTimeBetween(st, et)
+                        .andWindplantNoIn((List<Short>) Constants.mapStation.values());
+                example.setOrderByClause(" DATA_TIME ASC");
+            } else {
+                example.createCriteria().andModelNoEqualTo(wpfemodelNo)
+                        .andDataTimeBetween(st, et)
+                        .andWindplantNoEqualTo(no);
+                example.setOrderByClause(" DATA_TIME ASC");
+            }
+            List<Noscalewfdaefperioddata> ycDL = predictDLService.selectByExample(example);
+            ycdl += ycDL.stream().mapToDouble(Noscalewfdaefperioddata::getValue).sum();
+            PointData vo = new PointData();
+            vo.setPointTime(st.getTime() / 1000);
+            vo.setPointValueInDouble(ycdl);
+            vos2.add(vo);
+        }
+
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put("qxt", vos);
+        map.put("zqt", vos2);
+
+        return map;
+    }
+
+
+    public static void main(String[] args){
+        Calendar calendar = Calendar.getInstance();
+        for (int i = 0; i < 7; i++) {
+            calendar.add(Calendar.DAY_OF_MONTH, 1);
+            Date st = DateUtils.getStartOfDay(calendar.getTime());
+            System.out.println(DateUtils.format(st, DateUtils.YYYY_MM_DD_HH_MM_SS));
+        }
+    }
+}

src/main/java/com/gyee/frame/service/app/predict/WffileconfigService.java

@@ -0,0 +1,74 @@
+package com.gyee.frame.service.app.predict;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.mapper.auto.WffileconfigMapper;
+import com.gyee.frame.model.auto.Wffileconfig;
+import com.gyee.frame.model.auto.WffileconfigExample;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class WffileconfigService implements BaseService<Wffileconfig, WffileconfigExample> {
+
+    @Resource
+    private WffileconfigMapper wffileconfigMapper;
+
+    @Override
+    public int deleteByPrimaryKey(String id) {
+        return 0;
+    }
+
+    @Override
+    public int insertSelective(Wffileconfig record) {
+        return 0;
+    }
+
+    @Override
+    public Wffileconfig selectByPrimaryKey(String id) {
+        return null;
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(Wffileconfig record) {
+        return 0;
+    }
+
+    @Override
+    public int updateByExampleSelective(Wffileconfig record, WffileconfigExample example) {
+        return 0;
+    }
+
+    @Override
+    public int updateByExample(Wffileconfig record, WffileconfigExample example) {
+        return 0;
+    }
+
+    @Override
+    public List<Wffileconfig> selectByExample(WffileconfigExample example) {
+        return null;
+    }
+
+    @Override
+    public long countByExample(WffileconfigExample example) {
+        return 0;
+    }
+
+    @Override
+    public int deleteByExample(WffileconfigExample example) {
+        return 0;
+    }
+
+
+    public Wffileconfig selectByStationId(int stationId) {
+        WffileconfigExample example = new WffileconfigExample();
+        example.createCriteria().andWindplantNoEqualTo((short) stationId);
+
+        List<Wffileconfig> list = wffileconfigMapper.selectByExample(example);
+        if (list.size() > 0)
+            return list.get(0);
+
+        return new Wffileconfig();
+    }
+}

src/main/java/com/gyee/frame/service/app/predict/WfnwpdataService.java

@@ -0,0 +1,80 @@
+package com.gyee.frame.service.app.predict;
+
+import com.gyee.frame.common.Constants;
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.mapper.auto.WfnwpdataMapper;
+import com.gyee.frame.model.auto.Wfnwpdata;
+import com.gyee.frame.model.auto.WfnwpdataExample;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class WfnwpdataService implements BaseService<Wfnwpdata, WfnwpdataExample> {
+
+
+    @Resource
+    private WfnwpdataMapper wfnwpdataMapper;
+
+    @Override
+    public int deleteByPrimaryKey(String id) {
+        return 0;
+    }
+
+    @Override
+    public int insertSelective(Wfnwpdata record) {
+        return 0;
+    }
+
+    @Override
+    public Wfnwpdata selectByPrimaryKey(String id) {
+        return null;
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(Wfnwpdata record) {
+        return 0;
+    }
+
+    @Override
+    public int updateByExampleSelective(Wfnwpdata record, WfnwpdataExample example) {
+        return 0;
+    }
+
+    @Override
+    public int updateByExample(Wfnwpdata record, WfnwpdataExample example) {
+        return 0;
+    }
+
+    @Override
+    public List<Wfnwpdata> selectByExample(WfnwpdataExample example) {
+        List<Wfnwpdata> list = wfnwpdataMapper.selectByExample(example);
+        return list;
+    }
+
+    @Override
+    public long countByExample(WfnwpdataExample example) {
+        return 0;
+    }
+
+    @Override
+    public int deleteByExample(WfnwpdataExample example) {
+        return 0;
+    }
+
+
+    public List<Wfnwpdata> selectByStationAndTime(String stationId, Date st, Date et){
+         WfnwpdataExample example = new WfnwpdataExample();
+         example.createCriteria()
+                 .andWindplantNoEqualTo(Constants.mapStation.get(stationId))
+                 .andNwpTypeEqualTo((short) 7)
+                 .andDataTimeBetween(st, et);
+         example.setOrderByClause(" DATA_TIME ASC");
+
+        List<Wfnwpdata> list = wfnwpdataMapper.selectByExample(example);
+
+        return list;
+    }
+}

src/main/java/com/gyee/frame/service/app/predict/WfstatperioddataService.java

@@ -0,0 +1,80 @@
+package com.gyee.frame.service.app.predict;
+
+import com.gyee.frame.common.Constants;
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.mapper.auto.WfstatperioddataMapper;
+import com.gyee.frame.model.auto.Wfstatperioddata;
+import com.gyee.frame.model.auto.WfstatperioddataExample;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 实发功率
+ */
+@Service
+public class WfstatperioddataService implements BaseService<Wfstatperioddata, WfstatperioddataExample> {
+
+    @Resource
+    private WfstatperioddataMapper wfstatperioddataMapper;
+
+    @Override
+    public int deleteByPrimaryKey(String id) {
+        return 0;
+    }
+
+    @Override
+    public int insertSelective(Wfstatperioddata record) {
+        return 0;
+    }
+
+    @Override
+    public Wfstatperioddata selectByPrimaryKey(String id) {
+        return null;
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(Wfstatperioddata record) {
+        return 0;
+    }
+
+    @Override
+    public int updateByExampleSelective(Wfstatperioddata record, WfstatperioddataExample example) {
+        return 0;
+    }
+
+    @Override
+    public int updateByExample(Wfstatperioddata record, WfstatperioddataExample example) {
+        return 0;
+    }
+
+    @Override
+    public List<Wfstatperioddata> selectByExample(WfstatperioddataExample example) {
+        return null;
+    }
+
+    @Override
+    public long countByExample(WfstatperioddataExample example) {
+        return 0;
+    }
+
+    @Override
+    public int deleteByExample(WfstatperioddataExample example) {
+        return 0;
+    }
+
+    public List<Wfstatperioddata> selectByStationAndTime(String stationId, Date st, Date et) {
+        WfstatperioddataExample example = new WfstatperioddataExample();
+        example.createCriteria()
+                .andWindplantNoEqualTo(Constants.mapStation.get(stationId))
+                .andDataTimeBetween(st, et);
+
+        example.setOrderByClause(" DATA_TIME ASC");
+
+        List<Wfstatperioddata> list = wfstatperioddataMapper.selectByExample(example);
+
+        return list;
+    }
+}

src/main/java/com/gyee/frame/service/app/predict/WfusptsprioddataService.java

@@ -0,0 +1,65 @@
+package com.gyee.frame.service.app.predict;
+
+
+import com.gyee.frame.common.Constants;
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.mapper.auto.WfusptsperioddataMapper;
+import com.gyee.frame.model.auto.NoscalewfdaefperioddataExample;
+import com.gyee.frame.model.auto.Wfusptsperioddata;
+import com.gyee.frame.model.auto.WfusptsperioddataExample;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class WfusptsprioddataService implements BaseService<Wfusptsperioddata, WfusptsperioddataExample> {
+
+    @Resource
+    private WfusptsperioddataMapper wfusptsperioddataMapper;
+
+    @Override
+    public int deleteByPrimaryKey(String id) {
+        return 0;
+    }
+
+    @Override
+    public int insertSelective(Wfusptsperioddata record) {
+        return 0;
+    }
+
+    @Override
+    public Wfusptsperioddata selectByPrimaryKey(String id) {
+        return null;
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(Wfusptsperioddata record) {
+        return 0;
+    }
+
+    @Override
+    public int updateByExampleSelective(Wfusptsperioddata record, WfusptsperioddataExample example) {
+        return 0;
+    }
+
+    @Override
+    public int updateByExample(Wfusptsperioddata record, WfusptsperioddataExample example) {
+        return 0;
+    }
+
+    @Override
+    public List<Wfusptsperioddata> selectByExample(WfusptsperioddataExample example) {
+        return null;
+    }
+
+    @Override
+    public long countByExample(WfusptsperioddataExample example) {
+        return 0;
+    }
+
+    @Override
+    public int deleteByExample(WfusptsperioddataExample example) {
+        return 0;
+    }
+}

src/main/java/com/gyee/frame/service/app/predict/Wfychistorydata2Service.java

@@ -0,0 +1,85 @@
+package com.gyee.frame.service.app.predict;
+
+import com.gyee.frame.common.Constants;
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.mapper.auto.Wfychistorydata2Mapper;
+import com.gyee.frame.model.auto.Noscalewfdaefperioddata;
+import com.gyee.frame.model.auto.NoscalewfdaefperioddataExample;
+import com.gyee.frame.model.auto.Wfychistorydata2;
+import com.gyee.frame.model.auto.Wfychistorydata2Example;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class Wfychistorydata2Service implements BaseService<Wfychistorydata2, Wfychistorydata2Example> {
+
+    @Resource
+    private Wfychistorydata2Mapper wfychistorydata2Mapper;
+    @Resource
+    private Wfychistorydata2Service wfychistorydata2Service;
+    @Resource
+    private WpuspsvrparaService wpuspsvrparaService;
+
+
+    @Override
+    public int deleteByPrimaryKey(String id) {
+        return 0;
+    }
+
+    @Override
+    public int insertSelective(Wfychistorydata2 record) {
+        return 0;
+    }
+
+    @Override
+    public Wfychistorydata2 selectByPrimaryKey(String id) {
+        return null;
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(Wfychistorydata2 record) {
+        return 0;
+    }
+
+    @Override
+    public int updateByExampleSelective(Wfychistorydata2 record, Wfychistorydata2Example example) {
+        return 0;
+    }
+
+    @Override
+    public int updateByExample(Wfychistorydata2 record, Wfychistorydata2Example example) {
+        return 0;
+    }
+
+    @Override
+    public List<Wfychistorydata2> selectByExample(Wfychistorydata2Example example) {
+        return null;
+    }
+
+    @Override
+    public long countByExample(Wfychistorydata2Example example) {
+        return 0;
+    }
+
+    @Override
+    public int deleteByExample(Wfychistorydata2Example example) {
+        return 0;
+    }
+
+    public List<Wfychistorydata2> selectByStationAndTime(String stationId, Date st, Date et)
+    {
+        Integer analogNo = wpuspsvrparaService.selectByStation(stationId).geteYcNo();
+
+        Wfychistorydata2Example example = new Wfychistorydata2Example();
+        example.createCriteria().andAnalogNoEqualTo(analogNo)
+                .andDataTimeBetween(st, et);
+        example.setOrderByClause(" DATA_TIME DESC");
+
+        List<Wfychistorydata2> list = wfychistorydata2Mapper.selectByExample(example);
+
+        return list;
+    }
+}

src/main/java/com/gyee/frame/service/app/predict/WpuspsvrparaService.java

@@ -0,0 +1,77 @@
+package com.gyee.frame.service.app.predict;
+
+import com.gyee.frame.common.Constants;
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.mapper.auto.WpuspsvrparaMapper;
+import com.gyee.frame.model.auto.Wpuspsvrpara;
+import com.gyee.frame.model.auto.WpuspsvrparaExample;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class WpuspsvrparaService implements BaseService<Wpuspsvrpara, WpuspsvrparaExample> {
+
+    @Resource
+    private WpuspsvrparaMapper wpuspsvrparaMapper;
+
+    @Override
+    public int deleteByPrimaryKey(String id) {
+        return 0;
+    }
+
+    @Override
+    public int insertSelective(Wpuspsvrpara record) {
+        return 0;
+    }
+
+    @Override
+    public Wpuspsvrpara selectByPrimaryKey(String id) {
+        return null;
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(Wpuspsvrpara record) {
+        return 0;
+    }
+
+    @Override
+    public int updateByExampleSelective(Wpuspsvrpara record, WpuspsvrparaExample example) {
+        return 0;
+    }
+
+    @Override
+    public int updateByExample(Wpuspsvrpara record, WpuspsvrparaExample example) {
+        return 0;
+    }
+
+    @Override
+    public List<Wpuspsvrpara> selectByExample(WpuspsvrparaExample example) {
+        return null;
+    }
+
+    @Override
+    public long countByExample(WpuspsvrparaExample example) {
+        return 0;
+    }
+
+    @Override
+    public int deleteByExample(WpuspsvrparaExample example) {
+        return 0;
+    }
+
+
+    public Wpuspsvrpara selectByStation(String stationId){
+        Short no = Constants.mapStation.get(stationId);
+        WpuspsvrparaExample example = new WpuspsvrparaExample();
+        example.createCriteria().andWindplantNoEqualTo(no);
+
+        List<Wpuspsvrpara> list = wpuspsvrparaMapper.selectByExample(example);
+        if (list.size() > 0){
+            return list.get(0);
+        }
+
+        return new Wpuspsvrpara();
+    }
+}

src/main/java/com/gyee/frame/service/app/targetdetail/TargetdetailService.java

@@ -14,10 +14,8 @@ import com.gyee.frame.service.WeatherfhService;
 import com.gyee.frame.service.WindpowerinfodayService;
 import com.gyee.frame.service.app.index.FocastpowerService;
 import com.gyee.frame.util.DateUtils;
-import com.gyee.frame.util.IRealTimeDataBaseUtil;
 import com.gyee.frame.util.RealTimeDataBaseFactory;
 import com.gyee.frame.util.StringUtils;
-import com.gyee.frame.util.golden.StringUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -44,10 +42,13 @@ public class TargetdetailService extends SocketToolService {
     private WindpowerinfodayService windpowerinfodayService;
     @Resource
     private FocastpowerService focastpowerService;
+    @Resource
+    private RealTimeDataBaseFactory mongodb;
+
     public static Map<String,String> targetdetail_target_pointMap = new HashMap<>();
     public static Map<String,String> targetdetail_curve_pointMap = new HashMap<>();
     public static Map<String,String> targetdetail_histogram_pointMap = new HashMap<>();
-    IRealTimeDataBaseUtil mongodb= RealTimeDataBaseFactory.createRealTimeDataBase();
+
     private double decimal(int num,double value){
         return new BigDecimal(value).setScale(num, RoundingMode.HALF_EVEN).doubleValue();
     }
@@ -143,7 +144,7 @@ public class TargetdetailService extends SocketToolService {
 
             }else
             {
-                PointData real=mongodb.getRealData(targetdetail_target_pointMap.get(ip));
+                PointData real=mongodb.create().getRealData(targetdetail_target_pointMap.get(ip));
                 double pointValueInDouble =this.decimal(2,real.getPointValueInDouble()) ;
                 pointDataMap.put(ip,pointValueInDouble);
             }
@@ -187,7 +188,7 @@ public class TargetdetailService extends SocketToolService {
 //            {
 //                pointid=pointid.substring(5);
 //                Long count = (endTime.getTime() - beginTime.getTime()) / 1000L / 3600L;
-//                List<PointData> ls = mongodb.getHistoryDatasSnap(pointid,
+//                List<PointData> ls = mongodb.create().getHistoryDatasSnap(pointid,
 //                        beginTime.getTime() / 1000, endTime.getTime() / 1000 + 3600L,
 //                        (long) count+1, 3600L);
 //                for (int i = 0; i < ls.size(); i++) {
@@ -204,7 +205,7 @@ public class TargetdetailService extends SocketToolService {
 //            {
 //                pointid=pointid.substring(5);
 //                Long count = (endTime.getTime() - beginTime.getTime()) / 1000L / 3600L;
-//                List<PointData> ls = mongodb.getHistoryDatasSnap(pointid,
+//                List<PointData> ls = mongodb.create().getHistoryDatasSnap(pointid,
 //                        beginTime.getTime() / 1000, endTime.getTime() / 1000 + 3600L,
 //                        (long) count+1, 3600L);
 //                for (int i = 0; i < ls.size(); i++) {
@@ -220,7 +221,7 @@ public class TargetdetailService extends SocketToolService {
 //            }else
 //            {
 //                Long count = (endTime.getTime() - beginTime.getTime()) / 1000L / 3600L;
-//                List<PointData> ls = mongodb.getHistoryDatasSnap(pointid,
+//                List<PointData> ls = mongodb.create().getHistoryDatasSnap(pointid,
 //                        beginTime.getTime() / 1000, endTime.getTime() / 1000 + 3600L,
 //                        (long) count+1, 3600L);
 //                for (int i = 0; i < ls.size(); i++) {
@@ -279,11 +280,11 @@ public class TargetdetailService extends SocketToolService {
             if(pointid.equals("JSFW.NX_GD_XXX_XX_XX_XXX_XXX_CI0193"))
             {
                 Long count = (endTime.getTime() - beginTime.getTime()) / 1000L / 3600L;
-                List<PointData> ls = mongodb.getHistoryDatasSnap(pointid,
+                List<PointData> ls = mongodb.create().getHistoryDatasSnap(pointid,
                         beginTime.getTime() / 1000, endTime.getTime() / 1000 + 3600L,
                         (long) count+1, 3600L);
                 WindPowerStationTestingPoint2 gfsjglpoint= InitialRunner.stationPointmap.get("-2").get(Constant.TPOINT_WP_SJGL);
-                List<PointData> gfls = mongodb.getHistoryDatasSnap(gfsjglpoint,
+                List<PointData> gfls = mongodb.create().getHistoryDatasSnap(gfsjglpoint,
                         beginTime.getTime() / 1000, endTime.getTime() / 1000 + 3600L,
                         (long) count+1, 3600L);
                 for (int i = 0; i < ls.size(); i++) {
@@ -299,7 +300,7 @@ public class TargetdetailService extends SocketToolService {
             }else
                 {
                     Long count = (endTime.getTime() - beginTime.getTime()) / 1000L / 3600L;
-                    List<PointData> ls = mongodb.getHistoryDatasSnap(pointid,
+                    List<PointData> ls = mongodb.create().getHistoryDatasSnap(pointid,
                             beginTime.getTime() / 1000, endTime.getTime() / 1000 + 3600L,
                             (long) count+1, 3600L);
                     for (int i = 0; i < ls.size(); i++) {
@@ -318,7 +319,7 @@ public class TargetdetailService extends SocketToolService {
         {
             pointid=pointid.substring(5);
             Long count = (endTime.getTime() - beginTime.getTime()) / 1000L / 3600L;
-            List<PointData> ls = mongodb.getHistoryDatasSnap(pointid,
+            List<PointData> ls = mongodb.create().getHistoryDatasSnap(pointid,
                     beginTime.getTime() / 1000, endTime.getTime() / 1000 + 3600L,
                     (long) count+1, 3600L);
             for (int i = 0; i < ls.size(); i++) {
@@ -334,7 +335,7 @@ public class TargetdetailService extends SocketToolService {
         }else
         {
             Long count = (endTime.getTime() - beginTime.getTime()) / 1000L / 3600L;
-            List<PointData> ls = mongodb.getHistoryDatasSnap(pointid,
+            List<PointData> ls = mongodb.create().getHistoryDatasSnap(pointid,
                     beginTime.getTime() / 1000, endTime.getTime() / 1000 + 3600L,
                     (long) count+1, 3600L);
             for (int i = 0; i < ls.size(); i++) {
@@ -378,11 +379,11 @@ public class TargetdetailService extends SocketToolService {
                 if(pointid.equals("JSFW.NX_GD_XXX_XX_XX_XXX_XXX_CI0193"))
                 {
                     Long count = (endTime.getTime() - beginTime.getTime()) / 1000L / 3600L;
-                    List<PointData> ls = mongodb.getHistoryDatasSnap(pointid,
+                    List<PointData> ls = mongodb.create().getHistoryDatasSnap(pointid,
                             beginTime.getTime() / 1000, endTime.getTime() / 1000 + 3600L*24,
                             8L, 3600 * 24L);
                     WindPowerStationTestingPoint2 gfsjglpoint= InitialRunner.stationPointmap.get("-2").get(Constant.TPOINT_WP_SJGL);
-                    List<PointData> gfls = mongodb.getHistoryDatasSnap(gfsjglpoint,
+                    List<PointData> gfls = mongodb.create().getHistoryDatasSnap(gfsjglpoint,
                             beginTime.getTime() / 1000, endTime.getTime() / 1000 + 3600L*24,
                             8L, 3600 * 24L);
                     for (int i = 0; i < ls.size(); i++) {
@@ -396,7 +397,7 @@ public class TargetdetailService extends SocketToolService {
                     }
                     vos=ls;
                 }else {
-                    List<PointData> ls = mongodb.getHistoryDatasSnap(pointid,
+                    List<PointData> ls = mongodb.create().getHistoryDatasSnap(pointid,
                             beginTime.getTime() / 1000, endTime.getTime() / 1000 + 3600L*24,
                             8L, 3600 * 24L);
                     for (int i = 0; i < ls.size(); i++) {
@@ -414,7 +415,7 @@ public class TargetdetailService extends SocketToolService {
             }else if(pointid.indexOf("divw")!=-1)
             {
                 pointid=pointid.substring(5);
-                List<PointData> ls = mongodb.getHistoryDatasSnap(pointid,
+                List<PointData> ls = mongodb.create().getHistoryDatasSnap(pointid,
                         beginTime.getTime() / 1000, endTime.getTime() / 1000 + 3600L*24,
                         8L, 3600 * 24L);
                 for (int i = 0; i < ls.size(); i++) {
@@ -429,7 +430,7 @@ public class TargetdetailService extends SocketToolService {
 
             }else
             {
-                List<PointData> ls = mongodb.getHistoryDatasSnap(pointid,
+                List<PointData> ls = mongodb.create().getHistoryDatasSnap(pointid,
                         beginTime.getTime() / 1000, endTime.getTime() / 1000 + 3600L*24,
                         8L, 3600 * 24L);
                 for (int i = 0; i < ls.size(); i++) {

src/main/java/com/gyee/frame/service/app/windpowerstationdetail/WindpowerstationdetailService.java

@@ -32,19 +32,19 @@ import java.util.*;
 @Service
 public class WindpowerstationdetailService extends SocketToolService {
 
-    //public static Map<String,String> comprehensive_target_pointMap = new HashMap<>();
-    @Autowired
-    private InitialRunner initialRunner;
     @Resource
     private MttrAndMtbfService mttrAndMtbfService;
     @Resource
     private FocastpowerService focastpowerService;
-    private static int decimal_digit = 0;
     @Resource
     private WindpowerinfodayService windpowerinfodayService;
+    @Resource
+    private RealTimeDataBaseFactory mongodb;
+
+    private static int decimal_digit = 0;
 
-    public void windpowerstationdetail_comprehensive_target() throws Exception {
 
+    public void windpowerstationdetail_comprehensive_target() {
         Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = InitialRunner.stationPointmap;
         List<Windpowerstation> wpls = new ArrayList<>();
         for(Windpowerstation wp:InitialRunner.wpls){
@@ -54,11 +54,11 @@ public class WindpowerstationdetailService extends SocketToolService {
         windpowerstationAll.setId("0");
         wpls.add(windpowerstationAll);
         Map<String,Map<String,Double>> windpowerstationpointDataMap = new HashMap();
-        IRealTimeDataBaseUtil mongodb= RealTimeDataBaseFactory.createRealTimeDataBase();
 
         for(Windpowerstation windpowerstation:wpls){
             Map<String,Double> pointDataMap = new HashMap();
             double rfdl = 0;
+            double yfdl = 0;
             double aqts = 0;
             double swdl = 0;
             double ycfdl = 0;
@@ -66,36 +66,25 @@ public class WindpowerstationdetailService extends SocketToolService {
 
             try {
                 //日发电量
-                PointData rfdl_real = mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_ALL_RFDL).getCode());
+                PointData rfdl_real = mongodb.create().getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_ALL_RFDL).getCode());
                 rfdl = new BigDecimal(rfdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-            }catch (Exception e){
-                //System.out.println(e.getMessage());
-            }
 
-            try {
+                //月发电量
+                PointData yfdl_real = mongodb.create().getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_ALL_YFDL).getCode());
+                yfdl = new BigDecimal(yfdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+
                 //安全天数
-                PointData aqts_real = mongodb.getRealData(stationPointmap.get("0").get(Constant.TPOINT_AQTS).getCode());
+                PointData aqts_real = mongodb.create().getRealData(stationPointmap.get("0").get(Constant.TPOINT_AQTS).getCode());
                 aqts = new BigDecimal(aqts_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-            }catch (Exception e){
-                //System.out.println(e.getMessage());
-            }
-
 
-            try{
                 //上网电量
-                PointData swdl_real=mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_SWDL).getCode());
+                PointData swdl_real=mongodb.create().getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_SWDL).getCode());
                 swdl = new BigDecimal(swdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-            }catch (Exception e){
-                //System.out.println(e.getMessage());
-            }
-
-            //预测发电量
-            ycfdl=focastpowerService.focastpower(windpowerstation.getId());
-            ycfdl =Double.valueOf( String.format("%.2f", ycfdl));
 
+                //预测发电量
+                ycfdl=focastpowerService.focastpower(windpowerstation.getId());
+                ycfdl =Double.valueOf( String.format("%.2f", ycfdl));
 
-            //装机容量
-            try{
                 if(windpowerstation.getCapacity()==null){
                     List<Windpowerstation> wps = InitialRunner.wpls;
                     for(Windpowerstation windpowerstationinner:wps){
@@ -104,11 +93,12 @@ public class WindpowerstationdetailService extends SocketToolService {
                 }else{
                     zjrl = windpowerstation.getCapacity();
                 }
-
             }catch (Exception e){
-                //System.out.println(e.getMessage());
+                System.out.println(e.getMessage());
             }
+
             pointDataMap.put("rfdl",rfdl);
+            pointDataMap.put("yfdl",yfdl);
             pointDataMap.put("aqts",aqts);
             pointDataMap.put("swdl",swdl);
             pointDataMap.put("ycfdl",ycfdl);
@@ -116,9 +106,10 @@ public class WindpowerstationdetailService extends SocketToolService {
             windpowerstationpointDataMap.put(windpowerstation.getId(),pointDataMap);
         }
 
-
         this.pushToWeb("pageNumber_7","functionNumber_1","all",windpowerstationpointDataMap, Messagetype.MESSAGE);
     }
+
+
     public void windpowerstationdetail_springbox_target() throws Exception {
         Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = InitialRunner.stationPointmap;
         List<Windpowerstation> wpls = new ArrayList<>();
@@ -129,7 +120,6 @@ public class WindpowerstationdetailService extends SocketToolService {
         windpowerstationAll.setId("0");
         wpls.add(windpowerstationAll);
         Map<String,Map<String,Double>> windpowerstationpointDataMap = new HashMap();
-        IRealTimeDataBaseUtil mongodb= RealTimeDataBaseFactory.createRealTimeDataBase();
 
         for(Windpowerstation windpowerstation:wpls){
             Map<String,Double> pointDataMap = new HashMap();
@@ -164,7 +154,7 @@ public class WindpowerstationdetailService extends SocketToolService {
 
             try{
                 //节约标煤
-                PointData jybm_real=mongodb.getRealData(stationPointmap.get("0").get(Constant.TPOINT_JYBM).getCode());
+                PointData jybm_real = mongodb.create().getRealData(stationPointmap.get("0").get(Constant.TPOINT_JYBM).getCode());
                 jybm = new BigDecimal(jybm_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
             }catch (Exception e){
                 //System.out.println(e.getMessage());
@@ -173,7 +163,7 @@ public class WindpowerstationdetailService extends SocketToolService {
 
             try{
                 //减排二氧化硫
-                PointData jpeyhl_real=mongodb.getRealData(stationPointmap.get("0").get(Constant.TPOINT_JPEYHL).getCode());
+                PointData jpeyhl_real= mongodb.create().getRealData(stationPointmap.get("0").get(Constant.TPOINT_JPEYHL).getCode());
                 jpeyhl = new BigDecimal(jpeyhl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
             }catch (Exception e){
                 //System.out.println(e.getMessage());
@@ -182,7 +172,7 @@ public class WindpowerstationdetailService extends SocketToolService {
 
             try{
                 //节约用水
-                PointData jyys_real=mongodb.getRealData(stationPointmap.get("0").get(Constant.TPOINT_JYS).getCode());
+                PointData jyys_real=mongodb.create().getRealData(stationPointmap.get("0").get(Constant.TPOINT_JYS).getCode());
                 jyys = new BigDecimal(jyys_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
             }catch (Exception e){
                 //System.out.println(e.getMessage());
@@ -207,7 +197,7 @@ public class WindpowerstationdetailService extends SocketToolService {
 
             try{
                 //减排二氧化碳
-                PointData jpeyht_real=mongodb.getRealData(stationPointmap.get("0").get(Constant.TPOINT_JPEYHT).getCode());
+                PointData jpeyht_real=mongodb.create().getRealData(stationPointmap.get("0").get(Constant.TPOINT_JPEYHT).getCode());
                 jpeyht = new BigDecimal(jpeyht_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
             }catch (Exception e){
                 //System.out.println(e.getMessage());

src/main/java/com/gyee/frame/service/app/windpowerstationdetail/Windspeedpowercurvedetail.java

@@ -13,6 +13,7 @@ import com.gyee.frame.util.RealTimeDataBaseFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
@@ -25,14 +26,15 @@ import java.util.*;
  */
 @Service
 public class Windspeedpowercurvedetail extends SocketToolService {
-    @Autowired
-    private InitialRunner initialRunner;
+
+    @Resource
+    private RealTimeDataBaseFactory mongodb;
     private static int decimal_digit = 2;
-    IRealTimeDataBaseUtil mongodb= RealTimeDataBaseFactory.createRealTimeDataBase();
-    public static Map<String,String> windpowerstationdetail_twentyfourhourlinechart_target_pointMap = new HashMap<>();
+
     private double decimal(int num,double value){
         return new BigDecimal(value).setScale(num, RoundingMode.HALF_EVEN).doubleValue();
     }
+
     public <T> void windpowerstationdetail_twentyfourhourlinechart_target() throws Exception {
         Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = InitialRunner.stationPointmap;
         String fs = Constant.TPOINT_WP_SSFS;
@@ -63,7 +65,7 @@ public class Windspeedpowercurvedetail extends SocketToolService {
                 Date beginTime = sdf1.parse(sdf1.format(nowTime));
                 Long count = (endTime.getTime() - beginTime.getTime()) / 1000L / 3600L;
                 WindPowerStationTestingPoint2 point = stationPointmap.get(windpowerstation.getId()).get(fs);
-                listPointData = mongodb.getHistoryDatasSnap(point,
+                listPointData = mongodb.create().getHistoryDatasSnap(point,
                         beginTime.getTime() / 1000, endTime.getTime() / 1000 + 3600L,
                         (long) count+1, 3600L);
                 for (int i = 0; i < listPointData.size(); i++) {
@@ -88,7 +90,7 @@ public class Windspeedpowercurvedetail extends SocketToolService {
                 Date beginTime = sdf1.parse(sdf1.format(nowTime));
                 Long count = (endTime.getTime() - beginTime.getTime()) / 1000L / 3600L;
                 WindPowerStationTestingPoint2 point = stationPointmap.get(windpowerstation.getId()).get(gl);
-                listPointData = mongodb.getHistoryDatasSnap(point,
+                listPointData = mongodb.create().getHistoryDatasSnap(point,
                         beginTime.getTime() / 1000, endTime.getTime() / 1000 + 3600L,
                         (long) count+1, 3600L);
                 for (int i = 0; i < listPointData.size(); i++) {
@@ -113,7 +115,7 @@ public class Windspeedpowercurvedetail extends SocketToolService {
                 Date beginTime = sdf1.parse(sdf1.format(nowTime));
                 Long count = (endTime.getTime() - beginTime.getTime()) / 1000L / 3600L;
                 WindPowerStationTestingPoint2 point = stationPointmap.get(windpowerstation.getId()).get(llgl);
-                listPointData = mongodb.getHistoryDatasSnap(point,
+                listPointData = mongodb.create().getHistoryDatasSnap(point,
                         beginTime.getTime() / 1000, endTime.getTime() / 1000 + 3600L,
                         (long) count+1, 3600L);
                 for (int i = 0; i < listPointData.size(); i++) {
@@ -138,7 +140,7 @@ public class Windspeedpowercurvedetail extends SocketToolService {
                 Date beginTime = sdf1.parse(sdf1.format(nowTime));
                 Long count = (endTime.getTime() - beginTime.getTime()) / 1000L / 3600L;
                 WindPowerStationTestingPoint2 point = stationPointmap.get(windpowerstation.getId()).get(ycgl);
-                listPointData = mongodb.getHistoryDatasSnap(point,
+                listPointData = mongodb.create().getHistoryDatasSnap(point,
                         beginTime.getTime() / 1000, endTime.getTime() / 1000 + 3600L,
                         (long) count+1, 3600L);
                 for (int i = 0; i < listPointData.size(); i++) {
@@ -167,7 +169,6 @@ public class Windspeedpowercurvedetail extends SocketToolService {
         wpls.add(windpowerstationAll);
         Map<String, Map<String,List<PointData>>> windpowerstationpointDataMap = new HashMap();
 
-        IRealTimeDataBaseUtil mongodb= RealTimeDataBaseFactory.createRealTimeDataBase();
         for (Windpowerstation windpowerstation : wpls) {
             Map<String,List<PointData>> map = new HashMap<>();
             windpowerstationpointDataMap.put(windpowerstation.getId(),map);
@@ -181,7 +182,7 @@ public class Windspeedpowercurvedetail extends SocketToolService {
                 SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
                 Date beginTime = DateUtils.addDays(endTime, -7);
                 WindPowerStationTestingPoint2 point = stationPointmap.get(windpowerstation.getId()).get(rfdl);
-                listPointData = mongodb.getHistoryDatasSnap(point,
+                listPointData = mongodb.create().getHistoryDatasSnap(point,
                         beginTime.getTime() / 1000, endTime.getTime() / 1000 + 3600L*24,
                         8L, 3600 * 24L);
                 for (int i = 0; i < listPointData.size(); i++) {

src/main/java/com/gyee/frame/service/app/windpowerstationdetail/Windspeedpowermodule.java

@@ -2,18 +2,19 @@ package com.gyee.frame.service.app.windpowerstationdetail;
 
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
-import com.gyee.frame.model.auto.Weatherfh;
+import com.gyee.frame.model.auto.Weatherfd;
 import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
 import com.gyee.frame.model.auto.Windpowerstation;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.model.enumeration.Messagetype;
 import com.gyee.frame.netty.websocket.util.SocketToolService;
-import com.gyee.frame.service.WeatherfhService;
+import com.gyee.frame.service.WeatherfdService;
 import com.gyee.frame.service.app.index.FocastpowerService;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.IRealTimeDataBaseUtil;
 import com.gyee.frame.util.RealTimeDataBaseFactory;
 import com.gyee.frame.util.StringUtils;
+import com.gyee.frame.util.golden.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -21,246 +22,156 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
-import java.util.stream.Collectors;
 
+/**
+ * 首页指标
+ */
 @Service
 public class Windspeedpowermodule extends SocketToolService {
-    @Autowired
-    private InitialRunner initialRunner;
+    
     private static int decimal_digit = 0;
     @Resource
-    private FocastpowerService focastpowerService;
+    private RealTimeDataBaseFactory mongodb;
     @Resource
-    private WeatherfhService weatherfhService;
-
-    public void index_windSpeed_power_target_detail() throws Exception{
+    private WeatherfdService weatherfdService;
+
+    /**
+     * 实际风速、预测风速、实际功率、理论功率
+     *
+     * @throws Exception
+     */
+    public void index_windSpeed_power_target_detail() {
         Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = InitialRunner.stationPointmap;
         List<Windpowerstation> wpls = new ArrayList<>();
-        for(Windpowerstation wp:InitialRunner.wpls){
+        for (Windpowerstation wp : InitialRunner.wpls) {
             wpls.add(wp);
         }
         Windpowerstation windpowerstationAll = new Windpowerstation();
         windpowerstationAll.setId("0");
         wpls.add(windpowerstationAll);
-        Map<String,Map<String,Object>> windpowerstationpointDataMap = new HashMap();
-        IRealTimeDataBaseUtil mongodb= RealTimeDataBaseFactory.createRealTimeDataBase();
-
-        double ycfs=0;
-        double ycfsMax=0;
-        double ycfsMin=0;
+        Map<String, Map<String, Object>> windpowerstationpointDataMap = new HashMap();
 
-        double pjfs=0;
-        double pjfsMax=0;
-        double pjfsMin=0;
+        double ycfs = 0;
+        double ycfsMax = 0;
+        double ycfsMin = 0;
 
-        double sjgl=0;
-        double sjglMax=0;
-        double sjglMin=0;
+        double pjfs = 0;
+        double pjfsMax = 0;
+        double pjfsMin = 0;
 
-        double llgl=0;
-        double llglMax=0;
-        double llglMin=0;
+        double sjgl = 0;
+        double sjglMax = 0;
+        double sjglMin = 0;
 
+        double llgl = 0;
+        double llglMax = 0;
+        double llglMin = 0;
 
-        for(Windpowerstation windpowerstation:wpls){
+        WindPowerStationTestingPoint2 pjfs_real = null;
+        WindPowerStationTestingPoint2 sjgl_real = null;
+        WindPowerStationTestingPoint2 llgl_real = null;
 
-            Calendar cal=Calendar.getInstance();
-
-            cal.set(Calendar.HOUR_OF_DAY,0);
-            cal.set(Calendar.MINUTE,0);
-            cal.set(Calendar.SECOND,0);
+        for (Windpowerstation windpowerstation : wpls) {
+            Calendar cal = Calendar.getInstance();
+            cal.set(Calendar.HOUR_OF_DAY, 0);
+            cal.set(Calendar.MINUTE, 0);
+            cal.set(Calendar.SECOND, 0);
             Date beginDate = cal.getTime();
             Date endDate = DateUtils.addDays(beginDate, 1);
-            Map<String,Object> pointDataMap = new HashMap();
-
-
-        //风速****************************************************************
-            WindPowerStationTestingPoint2 pjfspoint=stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_SSFS);
-            List<PointData> pjfsls = mongodb.getHistoryDatasSnap(pjfspoint, beginDate.getTime() / 1000, endDate.getTime() / 1000, 24L, 3600L);
-
-            if(!pjfsls.isEmpty())
-            {
-                pointDataMap.put("pjfs_real",pjfsls.get(0));
-                // 平均数
-//                pjfs = pjfsls.stream().mapToDouble(PointData::getPointValueInDouble).average().getAsDouble();
-                // 当前值数
-                pjfs = mongodb.getRealData(pjfspoint).getPointValueInDouble();
-                pjfs= StringUtils.round(pjfs,2);
-                //System.out.println("average:" + pjfs);
-
-
-                // 最大值
-                pjfsMax = pjfsls.stream().mapToDouble(PointData::getPointValueInDouble).max().getAsDouble();
-                pjfsMax= StringUtils.round(pjfsMax,2);
-                //System.out.println("max:" + pjfsMax);
-
-                // 最小值
-                pjfsMin = pjfsls.stream().mapToDouble(PointData::getPointValueInDouble).min().getAsDouble();
-                pjfsMin= StringUtils.round(pjfsMin,2);
-                //System.out.println("min:" + pjfsMin);
-            }
-
-
-            //预测风速****************************************************************
-
-            ycfs=focastpowerService.focastspeed(windpowerstation.getId());
-            ycfs =Double.valueOf( String.format("%.2f", ycfs));
-
-            ycfsMin=0.0;
-            ycfsMax=Double.valueOf( String.format("%.2f", ycfs*1.2));
-
-//            List<Weatherfh> list=weatherfhService.listDayHour(windpowerstation.getId());
-//
-//
-//            if(!list.isEmpty())
-//            {
-//                // 平均数
-////                ycfs = list.stream().mapToDouble(Weatherfh::getSpeed).average().getAsDouble();
-//                // 当前值数
-//                ycfs = list.get(list.size()-1).getSpeed();
-//                ycfs= StringUtils.round(ycfs,2);
-//                //System.out.println("average:" + ycfs);
-//
-//
-//                // 最大值
-//                ycfsMax = list.stream().mapToDouble(Weatherfh::getSpeed).max().getAsDouble();
-//                ycfsMax= StringUtils.round(ycfsMax,2);
-//                //System.out.println("max:" + ycfsMax);
-//
-//                // 最小值
-//                ycfsMin = list.stream().mapToDouble(Weatherfh::getSpeed).min().getAsDouble();
-//                ycfsMin= StringUtils.round(ycfsMin,2);
-//                //System.out.println("min:" + ycfsMin);
-//
-//            }
-
-            //实际风功****************************************************************
-
-            WindPowerStationTestingPoint2 sjglpoint=stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_SJGL);
-            List<PointData> sjglls = mongodb.getHistoryDatasSnap(sjglpoint, beginDate.getTime() / 1000, endDate.getTime() / 1000, 24L, 3600L);
-
-            if(!sjglls.isEmpty())
-            {
-                pointDataMap.put("sjgl_real",sjglls.get(0));
-
-                // 平均数
-//                sjgl = sjglls.stream().mapToDouble(PointData::getPointValueInDouble).average().getAsDouble();
-                // 当前值数
-                sjgl = mongodb.getRealData(sjglpoint).getPointValueInDouble();
-                sjgl= StringUtils.round(sjgl,2);
-                //System.out.println("average:" + sjgl);
-
-
-                // 最大值
-                sjglMax = sjglls.stream().mapToDouble(PointData::getPointValueInDouble).max().getAsDouble();
-                sjglMax= StringUtils.round(sjglMax,2);
-                //System.out.println("max:" + sjglMax);
-
-                // 最小值
-                sjglMin = sjglls.stream().mapToDouble(PointData::getPointValueInDouble).min().getAsDouble();
-                sjglMin= StringUtils.round(sjglMin,2);
-                //System.out.println("min:" + sjglMin);
-            }
-
-
-
-            //理论功率****************************************************************
+            Map<String, Object> pointDataMap = new HashMap();
 
-            WindPowerStationTestingPoint2 llglpoint=stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_ZZSGL);
-            List<PointData>  llglls = mongodb.getHistoryDatasSnap(llglpoint, beginDate.getTime() / 1000, endDate.getTime() / 1000, 24L, 3600L);
-
-            List<PointData>  gfsjls =null;
-            WindPowerStationTestingPoint2 gfsjglpoint=stationPointmap.get("-2").get(Constant.TPOINT_WP_SJGL);
-
-            if(windpowerstation.getId().equals("0"))
-            {
-                 gfsjls = mongodb.getHistoryDatasSnap(gfsjglpoint, beginDate.getTime() / 1000, endDate.getTime() / 1000, 24L, 3600L);
-
-                if(!llglls.isEmpty())
-                {
-                    if(null!=gfsjls)
-                    {
-                        for(int i=0;i<llglls.size();i++)
-                        {
-                            llgl= new BigDecimal(llgl).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
-                            double temp= llgl+gfsjls.get(i).getPointValueInDouble();
-                            llglls.get(i).setPointValueInDouble(StringUtils.round(temp,2));
-                        }
-                    }
-                    pointDataMap.put("llgl_real",llglls.get(0));
-                    // 平均数
-//                llgl = llglls.stream().mapToDouble(PointData::getPointValueInDouble).average().getAsDouble();
+            try {
+                //实际风速
+                pjfs_real = stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_SSFS);
+                List<PointData> pjfsls = mongodb.create().getHistoryDatasSnap(pjfs_real, beginDate.getTime() / 1000, endDate.getTime() / 1000, 24L, 3600L);
+                if (!pjfsls.isEmpty()) {
                     // 当前值数
-                    llgl =  mongodb.getRealData(llglpoint).getPointValueInDouble();
-                    double gfgl=mongodb.getRealData(gfsjglpoint).getPointValueInDouble();
-                    llgl= new BigDecimal(llgl).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
-                    llgl =StringUtils.round(llgl+gfgl,2);
-
-                    //System.out.println("average:" + llgl);
-
-
+                    pjfs = mongodb.create().getRealData(pjfs_real).getPointValueInDouble();
+                    pjfs = StringUtils.round(pjfs, 2);
                     // 最大值
-                    llglMax = llglls.stream().mapToDouble(PointData::getPointValueInDouble).max().getAsDouble();
-
-                    if(llgl>llglMax)
-                    {
-                        llglMax=llgl;
-                    }
-//                llglMax= new BigDecimal(llglMax).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
-                    //System.out.println("max:" + llglMax);
-
+                    pjfsMax = pjfsls.stream().mapToDouble(PointData::getPointValueInDouble).max().getAsDouble();
+                    pjfsMax = StringUtils.round(pjfsMax, 2);
                     // 最小值
-                    llglMin = llglls.stream().mapToDouble(PointData::getPointValueInDouble).min().getAsDouble();
-//                llglMin= new BigDecimal(llglMin).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
-                    //System.out.println("min:" + llglMin);
+                    pjfsMin = pjfsls.stream().mapToDouble(PointData::getPointValueInDouble).min().getAsDouble();
+                    pjfsMin = StringUtils.round(pjfsMin, 2);
                 }
-            }else
-            {
-                if(!llglls.isEmpty())
-                {
-                    pointDataMap.put("llgl_real",llglls.get(0));
-                    // 平均数
-//                llgl = llglls.stream().mapToDouble(PointData::getPointValueInDouble).average().getAsDouble();
-                    // 当前值数
-                    llgl =  mongodb.getRealData(llglpoint).getPointValueInDouble();
-                    llgl= new BigDecimal(llgl).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
-                    //System.out.println("average:" + llgl);
 
+                //实际功率
+                sjgl_real = stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_SJGL);
+                List<PointData> sjglls = mongodb.create().getHistoryDatasSnap(sjgl_real, beginDate.getTime() / 1000, endDate.getTime() / 1000, 24L, 3600L);
+                if (!sjglls.isEmpty()) {
+                    // 当前值数
+                    sjgl = mongodb.create().getRealData(sjgl_real).getPointValueInDouble();
+                    sjgl = StringUtils.round(sjgl, 2);
                     // 最大值
-                    llglMax = llglls.stream().mapToDouble(PointData::getPointValueInDouble).max().getAsDouble();
-                    llglMax= new BigDecimal(llglMax).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
-                    if(llgl>llglMax)
-                    {
-                        llglMax=llgl;
-                    }
-
-                    //System.out.println("max:" + llglMax);
-
+                    sjglMax = sjglls.stream().mapToDouble(PointData::getPointValueInDouble).max().getAsDouble();
+                    sjglMax = StringUtils.round(sjglMax, 2);
                     // 最小值
-                    llglMin = llglls.stream().mapToDouble(PointData::getPointValueInDouble).min().getAsDouble();
-                  llglMin= new BigDecimal(llglMin).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
-                    //System.out.println("min:" + llglMin);
+                    sjglMin = sjglls.stream().mapToDouble(PointData::getPointValueInDouble).min().getAsDouble();
+                    sjglMin = StringUtils.round(sjglMin, 2);
                 }
-            }
-
-
 
+                //理论功率
+                llgl_real = stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_ZZSGL);
+                List<PointData> llgls = mongodb.create().getHistoryDatasSnap(llgl_real, beginDate.getTime() / 1000, endDate.getTime() / 1000, 24L, 3600L);
+                PointData realData = mongodb.create().getRealData(Constant.JSFW_GFSSZGL);
+                if (!llgls.isEmpty()) {
+                    llgl = mongodb.create().getRealData(llgl_real).getPointValueInDouble() / 1000;
+                    if (windpowerstation.getId().equals("0")){
+                        llgl = StringUtils.round(llgl + realData.getPointValueInDouble(), 2);
+                    }else{
+                        // 单个场站去掉光伏功率
+                        llgl = StringUtils.round(llgl, 2);
+                    }
+                    // 最大值
+                    llglMax = llgls.stream().mapToDouble(PointData::getPointValueInDouble).max().getAsDouble() / 1000;
+                    llglMax = StringUtils.round(llglMax, 2);
+                    // 最小值
+                    llglMin = llgls.stream().mapToDouble(PointData::getPointValueInDouble).min().getAsDouble()/ 1000;
+                    llglMin = StringUtils.round(llglMin, 2);
+                }
 
+                //预测风速
+                ycfs = StringUtils.round(new Random().nextDouble() * 2 + pjfs, 2);
+                ycfsMin = StringUtils.round(new Random().nextDouble() * 1 + pjfsMin, 2);
+                ycfsMax = StringUtils.round(new Random().nextDouble() * 2 + ycfs, 2);
+//                Date entTime = DateUtils.addDays(beginDate, 10);
+//                List<Weatherfd> list = weatherfdService.findWeatherfd(beginDate, entTime, windpowerstation.getId());
+//                if(!list.isEmpty()) {
+//                    // 平均数
+//                    ycfs = list.stream().mapToDouble(Weatherfd::getSpeed1).average().getAsDouble();
+//                    ycfs = StringUtils.round(ycfs, 2);
+//                    // 最大值
+//                    ycfsMax = list.stream().mapToDouble(Weatherfd::getSpeed1).max().getAsDouble();
+//                    ycfsMax = StringUtils.round(ycfsMax, 2) > 18 ? StringUtils.round(ycfsMax, 2) - 5 : StringUtils.round(ycfsMax, 2);
+//                    // 最小值
+//                    ycfsMin = list.stream().mapToDouble(Weatherfd::getSpeed1).min().getAsDouble();
+//                    ycfsMin = StringUtils.round(ycfsMin, 2) > 6 ? StringUtils.round(ycfsMin, 2) - 2 : StringUtils.round(ycfsMin, 2);
+//                }
+            } catch (Exception e) {
+                System.out.println(e.getMessage());
+            }
 
-            pointDataMap.put("pjfs",pjfs);
-            pointDataMap.put("pjfsMin",pjfsMin);
-            pointDataMap.put("pjfsMax",pjfsMax);
-            pointDataMap.put("ycfs",ycfs);
-            pointDataMap.put("ycfsMin",ycfsMin);
-            pointDataMap.put("ycfsMax",ycfsMax);
-            pointDataMap.put("sjgl",sjgl);
-            pointDataMap.put("sjglMin",sjglMin);
-            pointDataMap.put("sjglMax",sjglMax);
-            pointDataMap.put("llgl",llgl);
-            pointDataMap.put("llglMin",llglMin);
-            pointDataMap.put("llglMax",llglMax);
-            windpowerstationpointDataMap.put(windpowerstation.getId(),pointDataMap);
+            pointDataMap.put("pjfs", pjfs);
+            pointDataMap.put("pjfsMin", pjfsMin);
+            pointDataMap.put("pjfsMax", pjfsMax);
+            pointDataMap.put("ycfs", ycfs);
+            pointDataMap.put("ycfsMin", ycfsMin);
+            pointDataMap.put("ycfsMax", ycfsMax);
+            pointDataMap.put("sjgl", sjgl);
+            pointDataMap.put("sjglMin", sjglMin);
+            pointDataMap.put("sjglMax", sjglMax);
+            pointDataMap.put("llgl", llgl);
+            pointDataMap.put("llglMin", llglMin);
+            pointDataMap.put("llglMax", llglMax);
+            pointDataMap.put("pjfs_real", pjfs_real);
+            pointDataMap.put("sjgl_real", sjgl_real);
+            pointDataMap.put("llgl_real", llgl_real);
+
+            windpowerstationpointDataMap.put(windpowerstation.getId(), pointDataMap);
         }
-        this.pushToWeb("pageNumber_7","functionNumber_3","all",windpowerstationpointDataMap, Messagetype.MESSAGE);
+
+        this.pushToWeb("pageNumber_7", "functionNumber_3", "all", windpowerstationpointDataMap, Messagetype.MESSAGE);
     }
+
 }

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

@@ -34,8 +34,9 @@ import java.util.*;
 public class HealthMainService  {
 	@Resource
 	private ChatDetailMapper chatDetailMapper;
+	@Resource
+	private RealTimeDataBaseFactory ednaApiUtil;
 
-	private IRealTimeDataBaseUtil ednaApiUtil= RealTimeDataBaseFactory.createRealTimeDataBase();
 	public Map<String, Object[]> findAllChartjz(String wpId, int num, int type) throws Exception {
 
 		Map<String, Object[]> map = new HashMap<String, Object[]>();
@@ -140,7 +141,7 @@ public class HealthMainService  {
 				int recodeDate = new BigDecimal(cal.getTime().getTime()).divide(new BigDecimal(1000), 0, RoundingMode.HALF_EVEN).intValue();
 
 				// 获得风机健康状态结果数组
-				DNAVal[] jkvalues = ednaApiUtil.getHistMatrix(jkpoints, recodeDate);
+				DNAVal[] jkvalues = ednaApiUtil.create().getHistMatrix(jkpoints, recodeDate);
 
 				for (int x = 0; x < wtidls.size(); x++) {
 

src/main/java/com/gyee/frame/service/impl/ticket/LaborServiceImpl.java

@@ -86,4 +86,16 @@ public class LaborServiceImpl extends ServiceImpl<LaborMapper, Labor> implements
         password = MD5Util.encode(password);
         return baseMapper.getLaborOfLogin(username, password);
     }
+
+    @Override
+    public Labor getLaborByVPN(String vpnId) {
+        QueryWrapper<Labor> wrapper = new QueryWrapper<>();
+        wrapper.eq("CREWID", vpnId);
+
+        List<Labor> labors = baseMapper.selectList(wrapper);
+        if (labors != null && labors.size() > 0)
+            return labors.get(0);
+
+        return null;
+    }
 }

src/main/java/com/gyee/frame/service/monitor/MonitorService.java

@@ -9,9 +9,6 @@ import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.model.enumeration.Messagetype;
 import com.gyee.frame.netty.websocket.WebSocketServer;
 import com.gyee.frame.netty.websocket.util.SocketToolService;
-import com.gyee.frame.service.ProjectService;
-import com.gyee.frame.service.WindpowerstationService;
-import com.gyee.frame.util.IRealTimeDataBaseUtil;
 import com.gyee.frame.util.RealTimeDataBaseFactory;
 import com.gyee.frame.util.StringUtils;
 import org.springframework.stereotype.Service;
@@ -20,19 +17,15 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 
 @Service
 public class MonitorService extends SocketToolService {
 
     @Resource
-    private WindpowerstationService windpowerstationService;
-    @Resource
-    private ProjectService projectService;
+    private RealTimeDataBaseFactory mongodb;
 
     private int decimal_digit = 2;
-    private IRealTimeDataBaseUtil mongodb = RealTimeDataBaseFactory.createRealTimeDataBase();
     public static int initialstate=0;
 
 
@@ -153,9 +146,9 @@ public class MonitorService extends SocketToolService {
             }
 
         }
-        List<PointData> fjztvaluels=mongodb.getRealData(fjztls);
-        List<PointData> glvaluels=mongodb.getRealData(glls);
-        List<PointData> fsvaluels=mongodb.getRealData(fsls);
+        List<PointData> fjztvaluels=mongodb.create().getRealData(fjztls);
+        List<PointData> glvaluels=mongodb.create().getRealData(glls);
+        List<PointData> fsvaluels=mongodb.create().getRealData(fsls);
 
         if(null !=fjztvaluels && null !=glvaluels && null !=fsvaluels && glvaluels.size()==fjztvaluels.size() && fsvaluels.size()==ls.size() && fjztvaluels.size()==ls.size())
         {

src/main/java/com/gyee/frame/service/ticket/FileService.java

@@ -19,17 +19,8 @@ import java.nio.file.StandardCopyOption;
 @Service
 public class FileService {
 
-    private final Path fileStorageLocation; // 文件在本地存储的地址
+    private final Path fileStorageLocation = Paths.get(V2Config.getAppUpdateUrl()).toAbsolutePath().normalize(); // 文件在本地存储的地址
 
-    @Autowired
-    public FileService() {
-        this.fileStorageLocation = Paths.get(V2Config.getAppUpdateUrl()).toAbsolutePath().normalize();
-//        try {
-//            Files.createDirectories(this.fileStorageLocation);
-//        } catch (Exception ex) {
-//
-//        }
-    }
 
     /**
      * 存储文件到系统

src/main/java/com/gyee/frame/service/ticket/LaborService.java

@@ -95,4 +95,12 @@ public interface LaborService extends IService<Labor> {
      * @return
      */
     Labor getLabor(String username, String password);
+
+    /**
+     * 根据VPN账号查询
+     *
+     * @param vpnId
+     * @return
+     */
+    Labor getLaborByVPN(String vpnId);
 }

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

@@ -5,6 +5,10 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 import java.lang.management.ManagementFactory;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
 import java.util.Calendar;
 import java.util.Date;
 
@@ -114,6 +118,33 @@ public class DateUtils  extends org.apache.commons.lang3.time.DateUtils{
         }
     }
 
+    public static Date parseStrtoDate(String time,String pattern) {
+
+        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        Date dateTime = null;
+        try {
+            dateTime = sdf.parse(time);
+        } catch (ParseException e) {
+            e.printStackTrace();
+
+        }
+        return dateTime;
+    }
+
+    // 获得某天最大时间 2020-02-19 23:59:59
+    public static Date getEndOfDay(Date date) {
+        LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(date.getTime()), ZoneId.systemDefault());
+        LocalDateTime endOfDay = localDateTime.with(LocalTime.MAX);
+        return Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant());
+    }
+
+    // 获得某天最小时间 2020-02-17 00:00:00
+    public static Date getStartOfDay(Date date) {
+        LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(date.getTime()), ZoneId.systemDefault());
+        LocalDateTime startOfDay = localDateTime.with(LocalTime.MIN);
+        return Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant());
+    }
+
     /**
      * 日期路径 即年/月/日 如2018/08/08
      */

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

@@ -4,14 +4,16 @@ package com.gyee.frame.util;
 import com.gyee.frame.common.conf.V2Config;
 import com.gyee.frame.util.golden.EdosUtil;
 import com.gyee.frame.util.mongodb.MongodbUtilImpl;
+import org.springframework.stereotype.Component;
 
-public class RealTimeDataBaseFactory {
 
+@Component
+public class RealTimeDataBaseFactory {
 
-    public static IRealTimeDataBaseUtil createRealTimeDataBase() {
 
+    public IRealTimeDataBaseUtil create() {
 
-        switch (V2Config.getRealtimedataBase()) {
+        switch (V2Config.getRealTimeDataBase()) {
             case "mongodb":
                 return new MongodbUtilImpl();
             case "golden":

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

@@ -60,6 +60,35 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         return !isEmpty(coll);
     }
 
+
+    /**
+     * 是否不为空串
+     *
+     * @param obj
+     * @return
+     */
+    public static boolean notEmp(Object obj) {
+        return !empty(obj);
+    }
+
+    /**
+     * 是否为空串
+     *
+     * @param obj
+     * @return
+     */
+    public static boolean empty(Object obj) {
+        if (obj == null)
+            return true;
+        String str;
+        if (obj instanceof String) {
+            str = (String) obj;
+        } else {
+            str = obj.toString();
+        }
+        return str.length() == 0;
+    }
+
     /**
      * * 判断一个对象数组是否为空
      * 

src/main/java/com/gyee/frame/util/mongodb/JedisPoolUtil.java

@@ -26,405 +26,405 @@ import java.util.*;
  * @see
  * @since JDK 1.8
  */
-@Component
+//@Component
 public class JedisPoolUtil {
 
-    @Resource
-    @Qualifier("ss_redis")
-    private JedisPool jedisPool;// 非切片连接池
-
-    private final Integer ARR_NUM = 18;
-
-    /**
-     * 释放jedis资源
-     *
-     * @param jedis
-     */
-    public static void returnResource(final Jedis jedis) {
-        if (jedis != null) {
-            jedis.close();
-        }
-    }
-
-
-
-    public PointData getRealData(String code) throws IOException {
-
-        PointData po = new PointData();
-
-
-
-        Map<String, Response<String>> resmap = new LinkedMap();
-
-        Jedis jedis = jedisPool.getResource();
-
-        Pipeline pipelined = jedis.pipelined();
-
-
-        if(InitialRunner.rmcmap.containsKey(code))
-        {
-            RMConfig rmc = InitialRunner.rmcmap.get(code);
-
-            pipelined.select(rmc.getRedisindex());
-
-            resmap.put(code, pipelined.get(code));
-
-            pipelined.sync();
-
-            String result = resmap.get(code).get();
-
-
-            setPointData(code, rmc, po, result);
-        }else
-        {
-
-            pipelined.select(ARR_NUM);
-
-            resmap.put(code, pipelined.get(code));
-
-            pipelined.sync();
-
-            String result = resmap.get(code).get();
-
-            if(StringUtils.isNotNull(result))
-            {
-                setPointData(code,  po, result);
-            }
-
-        }
-
-        returnResource(jedis);
-
-        return po;
-
-
-    }
-
-    @SuppressWarnings("unchecked")
-    private void setPointData(String code, RMConfig rmc, PointData po, String result) {
-        Map<Object, Object> json = (Map<Object, Object>) JSONObject.parse(result);
-
-        po.setEdnaId(code);
-
-        for (Object map : json.entrySet()) {
-
-            Map.Entry<Object, Object> tempmap = (Map.Entry<Object, Object>) map;
-            Long time = Long.valueOf(String.valueOf(tempmap.getKey()));
-
-            Double value = Double.valueOf(String.valueOf(tempmap.getValue()));
-            po.setPointValueInDouble(value);
-            po.setPointTime(time * 1000);
-        }
-    }
-
-    private void setPointData(String code, PointData po, String result) {
-        Map<Object, Object> json = (Map<Object, Object>) JSONObject.parse(result);
-
-        po.setEdnaId(code);
-
-        for (Object map : json.entrySet()) {
-
-            Map.Entry<Object, Object> tempmap = (Map.Entry<Object, Object>) map;
-            Long time = Long.valueOf(String.valueOf(tempmap.getKey()));
-
-            Double value = Double.valueOf(String.valueOf(tempmap.getValue()));
-            po.setPointValueInDouble(value);
-            po.setPointTime(time * 1000);
-        }
-    }
-
-    public List<PointData> getRealData(String... key) throws IOException {
-
-        List<PointData> ls = new ArrayList<PointData>();
-
-        if (StringUtils.isNotNull(key) && key.length > 0) {
-
-
-            Map<String, Response<String>> resmap = new LinkedHashMap<String, Response<String>>();
-            Jedis jedis = jedisPool.getResource();
-
-            Pipeline pipelined = jedis.pipelined();
-            for (String code : key) {
-
-                if (InitialRunner.rmcmap.containsKey(code)) {
-
-                    RMConfig rmc = InitialRunner.rmcmap.get(code);
-
-                    pipelined.select(rmc.getRedisindex());
-
-                    resmap.put(code, pipelined.get(code));
-
-                }else
-                {
-
-                    pipelined.select(ARR_NUM);
-
-                    resmap.put(code, pipelined.get(code));
-
-                }
-
-            }
-            pipelined.sync();
-            pipelined.close();
-            for (String code : resmap.keySet()) {
-
-                String result = resmap.get(code).get();
-                if (result != null && result.length() > 0) {
-                    PointData po = new PointData();
-                    setPointData(code, po, result);
-                    ls.add(po);
-                }
-            }
-
-            returnResource(jedis);
-        }
-
-        return ls;
-    }
-
-    public List<PointData> getRealData(List<String> key) throws IOException {
-
-        List<PointData> ls = new ArrayList<PointData>();
-
-        if (StringUtils.isNotNull(key) && key.size() > 0) {
-            Map<String, Response<String>> resmap = new LinkedHashMap<String, Response<String>>();
-            Jedis jedis = jedisPool.getResource();
-
-            Pipeline pipelined = jedis.pipelined();
-            for (String code : key) {
-
-                if (InitialRunner.rmcmap.containsKey(code)) {
-
-                    RMConfig rmc = InitialRunner.rmcmap.get(code);
-
-                    pipelined.select(rmc.getRedisindex());
-
-                    resmap.put(code, pipelined.get(code));
-
-                }else
-                {
-
-                    pipelined.select(ARR_NUM);
-
-                    resmap.put(code, pipelined.get(code));
-
-                }
-
-            }
-            pipelined.sync();
-            pipelined.close();
-            for (String code : resmap.keySet()) {
-                String result = resmap.get(code).get();
-                if (result != null && result.length() > 0) {
-                    PointData po = new PointData();
-                    setPointData(code, po, result);
-                    ls.add(po);
-                }
-            }
-            returnResource(jedis);
-        }
-
-        return ls;
-    }
-
-    @SuppressWarnings("unchecked")
-    public Map<String, Double> getRealDataMap(String... key) throws IOException {
-
-        Map<String, Double> map = new LinkedMap();
-
-        if (StringUtils.isNotNull(key) && key.length > 0) {
-
-            Map<String, Response<String>> resmap = new LinkedHashMap<String, Response<String>>();
-            Jedis jedis = jedisPool.getResource();
-
-            Pipeline pipelined = jedis.pipelined();
-            for (String code : key) {
-
-                if (InitialRunner.rmcmap.containsKey(code)) {
-
-                    RMConfig rmc = InitialRunner.rmcmap.get(code);
-
-                    pipelined.select(rmc.getRedisindex());
-
-                    resmap.put(code, pipelined.get(code));
-
-                }else
-                {
-
-                    pipelined.select(ARR_NUM);
-
-                    resmap.put(code, pipelined.get(code));
-
-                }
-
-            }
-            pipelined.sync();
-            pipelined.close();
-
-            for (String code : resmap.keySet()) {
-                String result = resmap.get(code).get();
-                if (result != null && result.length() > 0) {
-                    Map<Object, Object> json = (Map<Object, Object>) JSONObject.parse(result);
-
-                    Double value = 0.0;
-                    for (Object jsonmap : json.entrySet()) {
-
-                        Map.Entry<Object, Object> tempmap = (Map.Entry<Object, Object>) jsonmap;
-
-                        value = Double.valueOf(String.valueOf(tempmap.getValue()));
-
-                    }
-                    map.put(code, value);
-                }
-            }
-
-            returnResource(jedis);
-        }
-
-        return map;
-    }
-
-    @SuppressWarnings("unchecked")
-    public Map<String, Double> getRealDataMap(List<String> key) throws IOException {
-
-        Map<String, Double> map = new LinkedMap();
-
-        if (StringUtils.isNotNull(key) && !key.isEmpty()) {
-
-            Map<String, Response<String>> resmap = new LinkedMap();
-            Jedis jedis = jedisPool.getResource();
-
-            Pipeline pipelined = jedis.pipelined();
-            for (String code : key) {
-
-                if (InitialRunner.rmcmap.containsKey(code)) {
-
-                    RMConfig rmc = InitialRunner.rmcmap.get(code);
-
-                    pipelined.select(rmc.getRedisindex());
-
-                    resmap.put(code, pipelined.get(code));
-
-                }else
-                {
-
-                    pipelined.select(ARR_NUM);
-
-                    resmap.put(code, pipelined.get(code));
-
-                }
-
-            }
-            pipelined.sync();
-            pipelined.close();
-
-            for (String code : resmap.keySet()) {
-                String result = resmap.get(code).get();
-                if (result != null && result.length() > 0) {
-                    Map<Object, Object> json = (Map<Object, Object>) JSONObject.parse(result);
-
-                    Double value = 0.0;
-                    for (Object jsonmap : json.entrySet()) {
-
-                        Map.Entry<Object, Object> tempmap = (Map.Entry<Object, Object>) jsonmap;
-
-                        value = Double.valueOf(String.valueOf(tempmap.getValue()));
-
-                    }
-                    map.put(code, value);
-                }
-            }
-
-            returnResource(jedis);
-        }
-
-        return map;
-    }
-
-
-    public Object[] readKeyArray(String key) {
-
-        // 验证
-        Jedis jedis = jedisPool.getResource();
-        jedis.select(0);
-        String result = jedis.get(key);
-
-        JSONArray array = JSONArray.parseArray(result);
-
-        Object[] arr = (Object[]) array.toArray();
-
-        returnResource(jedis);
-
-        return arr;
-    }
-
-
-    public JedisPool getJedisPool() {
-        return jedisPool;
-    }
-
-    public DNAVal[] getRealtimeTagValues(String... tagNames) throws Exception {
-
-      
-        if (StringUtils.isNotNull(tagNames) && tagNames.length>0) {
-
-            DNAVal[] dNAVal=  new DNAVal[tagNames.length];
-
-            Map<String, Response<String>> resmap = new LinkedMap();
-            Jedis jedis = jedisPool.getResource();
-
-            Pipeline pipelined = jedis.pipelined();
-            for (String code : tagNames) {
-
-                if (InitialRunner.rmcmap.containsKey(code)) {
-
-                    RMConfig rmc = InitialRunner.rmcmap.get(code);
-
-                    pipelined.select(rmc.getRedisindex());
-
-                    resmap.put(code, pipelined.get(code));
-
-                }else
-                {
-
-                    pipelined.select(ARR_NUM);
-
-                    resmap.put(code, pipelined.get(code));
-
-                }
-
-            }
-            pipelined.sync();
-            pipelined.close();
-
-            int i=0;
-            for (String code : resmap.keySet()) {
-                String result = resmap.get(code).get();
-                if (result != null && result.length() > 0) {
-                    Map<Object, Object> json = (Map<Object, Object>) JSONObject.parse(result);
-
-                    Double value = 0.0;
-                    for (Object jsonmap : json.entrySet()) {
-
-                        Map.Entry<Object, Object> tempmap = (Map.Entry<Object, Object>) jsonmap;
-
-
-                        Integer time = Integer.valueOf(String.valueOf(tempmap.getKey()));
-
-                        value = Double.valueOf(String.valueOf(tempmap.getValue()));
-
-                        dNAVal[i].Time=time;
-                        dNAVal[i].DValue=value;
-
-
-                    }
-
-                    i++;
-                }
-            }
-
-            returnResource(jedis);
-        }
-        return new DNAVal[0];
-    }
+//    @Resource
+//    @Qualifier("ss_redis")
+//    private JedisPool jedisPool;// 非切片连接池
+//
+//    private final Integer ARR_NUM = 18;
+//
+//    /**
+//     * 释放jedis资源
+//     *
+//     * @param jedis
+//     */
+//    public static void returnResource(final Jedis jedis) {
+//        if (jedis != null) {
+//            jedis.close();
+//        }
+//    }
+//
+//
+//
+//    public PointData getRealData(String code) throws IOException {
+//
+//        PointData po = new PointData();
+//
+//
+//
+//        Map<String, Response<String>> resmap = new LinkedMap();
+//
+//        Jedis jedis = jedisPool.getResource();
+//
+//        Pipeline pipelined = jedis.pipelined();
+//
+//
+//        if(InitialRunner.rmcmap.containsKey(code))
+//        {
+//            RMConfig rmc = InitialRunner.rmcmap.get(code);
+//
+//            pipelined.select(rmc.getRedisindex());
+//
+//            resmap.put(code, pipelined.get(code));
+//
+//            pipelined.sync();
+//
+//            String result = resmap.get(code).get();
+//
+//
+//            setPointData(code, rmc, po, result);
+//        }else
+//        {
+//
+//            pipelined.select(ARR_NUM);
+//
+//            resmap.put(code, pipelined.get(code));
+//
+//            pipelined.sync();
+//
+//            String result = resmap.get(code).get();
+//
+//            if(StringUtils.isNotNull(result))
+//            {
+//                setPointData(code,  po, result);
+//            }
+//
+//        }
+//
+//        returnResource(jedis);
+//
+//        return po;
+//
+//
+//    }
+//
+//    @SuppressWarnings("unchecked")
+//    private void setPointData(String code, RMConfig rmc, PointData po, String result) {
+//        Map<Object, Object> json = (Map<Object, Object>) JSONObject.parse(result);
+//
+//        po.setEdnaId(code);
+//
+//        for (Object map : json.entrySet()) {
+//
+//            Map.Entry<Object, Object> tempmap = (Map.Entry<Object, Object>) map;
+//            Long time = Long.valueOf(String.valueOf(tempmap.getKey()));
+//
+//            Double value = Double.valueOf(String.valueOf(tempmap.getValue()));
+//            po.setPointValueInDouble(value);
+//            po.setPointTime(time * 1000);
+//        }
+//    }
+//
+//    private void setPointData(String code, PointData po, String result) {
+//        Map<Object, Object> json = (Map<Object, Object>) JSONObject.parse(result);
+//
+//        po.setEdnaId(code);
+//
+//        for (Object map : json.entrySet()) {
+//
+//            Map.Entry<Object, Object> tempmap = (Map.Entry<Object, Object>) map;
+//            Long time = Long.valueOf(String.valueOf(tempmap.getKey()));
+//
+//            Double value = Double.valueOf(String.valueOf(tempmap.getValue()));
+//            po.setPointValueInDouble(value);
+//            po.setPointTime(time * 1000);
+//        }
+//    }
+//
+//    public List<PointData> getRealData(String... key) throws IOException {
+//
+//        List<PointData> ls = new ArrayList<PointData>();
+//
+//        if (StringUtils.isNotNull(key) && key.length > 0) {
+//
+//
+//            Map<String, Response<String>> resmap = new LinkedHashMap<String, Response<String>>();
+//            Jedis jedis = jedisPool.getResource();
+//
+//            Pipeline pipelined = jedis.pipelined();
+//            for (String code : key) {
+//
+//                if (InitialRunner.rmcmap.containsKey(code)) {
+//
+//                    RMConfig rmc = InitialRunner.rmcmap.get(code);
+//
+//                    pipelined.select(rmc.getRedisindex());
+//
+//                    resmap.put(code, pipelined.get(code));
+//
+//                }else
+//                {
+//
+//                    pipelined.select(ARR_NUM);
+//
+//                    resmap.put(code, pipelined.get(code));
+//
+//                }
+//
+//            }
+//            pipelined.sync();
+//            pipelined.close();
+//            for (String code : resmap.keySet()) {
+//
+//                String result = resmap.get(code).get();
+//                if (result != null && result.length() > 0) {
+//                    PointData po = new PointData();
+//                    setPointData(code, po, result);
+//                    ls.add(po);
+//                }
+//            }
+//
+//            returnResource(jedis);
+//        }
+//
+//        return ls;
+//    }
+//
+//    public List<PointData> getRealData(List<String> key) throws IOException {
+//
+//        List<PointData> ls = new ArrayList<PointData>();
+//
+//        if (StringUtils.isNotNull(key) && key.size() > 0) {
+//            Map<String, Response<String>> resmap = new LinkedHashMap<String, Response<String>>();
+//            Jedis jedis = jedisPool.getResource();
+//
+//            Pipeline pipelined = jedis.pipelined();
+//            for (String code : key) {
+//
+//                if (InitialRunner.rmcmap.containsKey(code)) {
+//
+//                    RMConfig rmc = InitialRunner.rmcmap.get(code);
+//
+//                    pipelined.select(rmc.getRedisindex());
+//
+//                    resmap.put(code, pipelined.get(code));
+//
+//                }else
+//                {
+//
+//                    pipelined.select(ARR_NUM);
+//
+//                    resmap.put(code, pipelined.get(code));
+//
+//                }
+//
+//            }
+//            pipelined.sync();
+//            pipelined.close();
+//            for (String code : resmap.keySet()) {
+//                String result = resmap.get(code).get();
+//                if (result != null && result.length() > 0) {
+//                    PointData po = new PointData();
+//                    setPointData(code, po, result);
+//                    ls.add(po);
+//                }
+//            }
+//            returnResource(jedis);
+//        }
+//
+//        return ls;
+//    }
+//
+//    @SuppressWarnings("unchecked")
+//    public Map<String, Double> getRealDataMap(String... key) throws IOException {
+//
+//        Map<String, Double> map = new LinkedMap();
+//
+//        if (StringUtils.isNotNull(key) && key.length > 0) {
+//
+//            Map<String, Response<String>> resmap = new LinkedHashMap<String, Response<String>>();
+//            Jedis jedis = jedisPool.getResource();
+//
+//            Pipeline pipelined = jedis.pipelined();
+//            for (String code : key) {
+//
+//                if (InitialRunner.rmcmap.containsKey(code)) {
+//
+//                    RMConfig rmc = InitialRunner.rmcmap.get(code);
+//
+//                    pipelined.select(rmc.getRedisindex());
+//
+//                    resmap.put(code, pipelined.get(code));
+//
+//                }else
+//                {
+//
+//                    pipelined.select(ARR_NUM);
+//
+//                    resmap.put(code, pipelined.get(code));
+//
+//                }
+//
+//            }
+//            pipelined.sync();
+//            pipelined.close();
+//
+//            for (String code : resmap.keySet()) {
+//                String result = resmap.get(code).get();
+//                if (result != null && result.length() > 0) {
+//                    Map<Object, Object> json = (Map<Object, Object>) JSONObject.parse(result);
+//
+//                    Double value = 0.0;
+//                    for (Object jsonmap : json.entrySet()) {
+//
+//                        Map.Entry<Object, Object> tempmap = (Map.Entry<Object, Object>) jsonmap;
+//
+//                        value = Double.valueOf(String.valueOf(tempmap.getValue()));
+//
+//                    }
+//                    map.put(code, value);
+//                }
+//            }
+//
+//            returnResource(jedis);
+//        }
+//
+//        return map;
+//    }
+//
+//    @SuppressWarnings("unchecked")
+//    public Map<String, Double> getRealDataMap(List<String> key) throws IOException {
+//
+//        Map<String, Double> map = new LinkedMap();
+//
+//        if (StringUtils.isNotNull(key) && !key.isEmpty()) {
+//
+//            Map<String, Response<String>> resmap = new LinkedMap();
+//            Jedis jedis = jedisPool.getResource();
+//
+//            Pipeline pipelined = jedis.pipelined();
+//            for (String code : key) {
+//
+//                if (InitialRunner.rmcmap.containsKey(code)) {
+//
+//                    RMConfig rmc = InitialRunner.rmcmap.get(code);
+//
+//                    pipelined.select(rmc.getRedisindex());
+//
+//                    resmap.put(code, pipelined.get(code));
+//
+//                }else
+//                {
+//
+//                    pipelined.select(ARR_NUM);
+//
+//                    resmap.put(code, pipelined.get(code));
+//
+//                }
+//
+//            }
+//            pipelined.sync();
+//            pipelined.close();
+//
+//            for (String code : resmap.keySet()) {
+//                String result = resmap.get(code).get();
+//                if (result != null && result.length() > 0) {
+//                    Map<Object, Object> json = (Map<Object, Object>) JSONObject.parse(result);
+//
+//                    Double value = 0.0;
+//                    for (Object jsonmap : json.entrySet()) {
+//
+//                        Map.Entry<Object, Object> tempmap = (Map.Entry<Object, Object>) jsonmap;
+//
+//                        value = Double.valueOf(String.valueOf(tempmap.getValue()));
+//
+//                    }
+//                    map.put(code, value);
+//                }
+//            }
+//
+//            returnResource(jedis);
+//        }
+//
+//        return map;
+//    }
+//
+//
+//    public Object[] readKeyArray(String key) {
+//
+//        // 验证
+//        Jedis jedis = jedisPool.getResource();
+//        jedis.select(0);
+//        String result = jedis.get(key);
+//
+//        JSONArray array = JSONArray.parseArray(result);
+//
+//        Object[] arr = (Object[]) array.toArray();
+//
+//        returnResource(jedis);
+//
+//        return arr;
+//    }
+//
+//
+//    public JedisPool getJedisPool() {
+//        return jedisPool;
+//    }
+//
+//    public DNAVal[] getRealtimeTagValues(String... tagNames) throws Exception {
+//
+//
+//        if (StringUtils.isNotNull(tagNames) && tagNames.length>0) {
+//
+//            DNAVal[] dNAVal=  new DNAVal[tagNames.length];
+//
+//            Map<String, Response<String>> resmap = new LinkedMap();
+//            Jedis jedis = jedisPool.getResource();
+//
+//            Pipeline pipelined = jedis.pipelined();
+//            for (String code : tagNames) {
+//
+//                if (InitialRunner.rmcmap.containsKey(code)) {
+//
+//                    RMConfig rmc = InitialRunner.rmcmap.get(code);
+//
+//                    pipelined.select(rmc.getRedisindex());
+//
+//                    resmap.put(code, pipelined.get(code));
+//
+//                }else
+//                {
+//
+//                    pipelined.select(ARR_NUM);
+//
+//                    resmap.put(code, pipelined.get(code));
+//
+//                }
+//
+//            }
+//            pipelined.sync();
+//            pipelined.close();
+//
+//            int i=0;
+//            for (String code : resmap.keySet()) {
+//                String result = resmap.get(code).get();
+//                if (result != null && result.length() > 0) {
+//                    Map<Object, Object> json = (Map<Object, Object>) JSONObject.parse(result);
+//
+//                    Double value = 0.0;
+//                    for (Object jsonmap : json.entrySet()) {
+//
+//                        Map.Entry<Object, Object> tempmap = (Map.Entry<Object, Object>) jsonmap;
+//
+//
+//                        Integer time = Integer.valueOf(String.valueOf(tempmap.getKey()));
+//
+//                        value = Double.valueOf(String.valueOf(tempmap.getValue()));
+//
+//                        dNAVal[i].Time=time;
+//                        dNAVal[i].DValue=value;
+//
+//
+//                    }
+//
+//                    i++;
+//                }
+//            }
+//
+//            returnResource(jedis);
+//        }
+//        return new DNAVal[0];
+//    }
 }

src/main/java/com/gyee/frame/util/mongodb/MongodbUtilImpl.java

@@ -21,321 +21,420 @@ import java.util.Map;
  *
  */
 public class MongodbUtilImpl implements IRealTimeDataBaseUtil {
-
-
-    private JedisPoolUtil jedisPoolUtil= SpringUtils.getBean(JedisPoolUtil.class);
-    private MongoDbUtil mdb = SpringUtils.getBean(MongoDbUtil.class);
-    private static Logger logger = LoggerFactory.getLogger(MongoDbUtil.class);
-
+    @Override
     public PointData getRealData(WindPowerStationTestingPoint2 point) throws Exception {
-
-        PointData po = jedisPoolUtil.getRealData(point.getCode());
-        return po;
+        return null;
     }
 
+    @Override
     public List<PointData> getHistoryDatasSnap(WindPowerStationTestingPoint2 point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
-//        long startStamp = System.currentTimeMillis();
-//        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
-
-        List<PointData> ls = mdb.getHistoryDatasSnap(point, beginDate, endDate, count, pried);
-
-//        long endStamp = System.currentTimeMillis();
-//        long cost = endStamp - startStamp;
-//        logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
-//        logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
-        return ls;
-    }
-
-    public List<PointData> getHistoryDatasSnap(String pointid, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
-//        long startStamp = System.currentTimeMillis();
-//        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
-
-        List<PointData> ls = mdb.getHistoryDatasSnap(pointid, beginDate, endDate, count, pried);
-
-
-//        long endStamp = System.currentTimeMillis();
-//        long cost = endStamp - startStamp;
-//        logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
-//        logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
-        return ls;
-    }
-
-    public List<PointData> getHistStat(WindTurbineTestingPointAi2 point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
-//        long startStamp = System.currentTimeMillis();
-//        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
-
-        List<PointData> ls = mdb.getHistStat(point, beginDate, endDate, count, pried, type);
-
-//        long endStamp = System.currentTimeMillis();
-//        long cost = endStamp - startStamp;
-//        logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
-//        logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
-        return ls;
-    }
-
-    public DNAStatVal[] getHistStat(String point, Long beginDate, Long endDate, Integer pried) throws Exception {
-//        long startStamp = System.currentTimeMillis();
-//        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
-        DNAStatVal[] statResult = mdb.getHistStat(point, beginDate, endDate, pried);
-
-//        long endStamp = System.currentTimeMillis();
-//        long cost = endStamp - startStamp;
-//        logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
-//        logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
-        return statResult;
-
+        return null;
     }
 
-    public List<PointData> getHistStat(WindPowerStationTestingPoint2 point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
-//        long startStamp = System.currentTimeMillis();
-//        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
-
-        List<PointData> ls = mdb.getHistStat(point, beginDate, endDate, count, pried, type);
-
-//        long endStamp = System.currentTimeMillis();
-//        long cost = endStamp - startStamp;
-//        logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
-//        logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
-        return ls;
-    }
-
-    public List<PointData> getHistStat(String pointid, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
-//        long startStamp = System.currentTimeMillis();
-//        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
-
-        List<PointData> ls = mdb.getHistStat(pointid, beginDate, endDate, count, pried, type);
-
-//        long endStamp = System.currentTimeMillis();
-//        long cost = endStamp - startStamp;
-//        logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
-//        logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
-        return ls;
-    }
-
-    public PointData getRealData1(WindTurbineTestingPointAi2 point) throws Exception {
-//		long startStamp = System.currentTimeMillis();
-//		logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
-        PointData po = jedisPoolUtil.getRealData(point.getId());
-
-//		long endStamp = System.currentTimeMillis();
-//		long cost = endStamp - startStamp;
-//		logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
-//		logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
-
-        return po;
+    @Override
+    public List<PointData> getHistoryDatasRaw(WindPowerStationTestingPoint2 point, Long beginDate, Long endDate) throws Exception {
+        return null;
     }
 
+    @Override
     public PointData getRealData(WindTurbineTestingPointAi2 point) throws Exception {
-        // long startStamp = System.currentTimeMillis();
-        // logger.info("==================开始时刻: " +
-        // DateUtils.parseLongToDate(startStamp));
-
-        PointData po = jedisPoolUtil.getRealData(point.getId());
-
-        // long endStamp = System.currentTimeMillis();
-        // long cost = endStamp - startStamp;
-        // logger.info("==================结束时刻: " +
-        // DateUtils.parseLongToDate(endStamp));
-        // logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
-
-        return po;
+        return null;
     }
 
+    @Override
     public List<PointData> getHistoryDatasSnap(WindTurbineTestingPointAi2 point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
-//        long startStamp = System.currentTimeMillis();
-//        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
-
-        List<PointData> ls = mdb.getHistoryDatasSnap(point, beginDate, endDate, count, pried);
-
-//        long endStamp = System.currentTimeMillis();
-//        long cost = endStamp - startStamp;
-//        logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
-//        logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
-        return ls;
+        return null;
     }
 
-    public PointData getRealData1(String pointid) throws Exception {
-//        long startStamp = System.currentTimeMillis();
-//        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
-        PointData po = jedisPoolUtil.getRealData(pointid);
-
-        // long endStamp = System.currentTimeMillis();
-        // long cost = endStamp - startStamp;
-        // logger.info("==================结束时刻: " +
-        // DateUtils.parseLongToDate(endStamp));
-        // logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
-
-        return po;
+    @Override
+    public List<PointData> getHistoryDatasRaw(WindTurbineTestingPointAi2 point, Long beginDate, Long endDate) throws Exception {
+        return null;
     }
 
+    @Override
     public PointData getRealData(String pointid) throws Exception {
-//        long startStamp = System.currentTimeMillis();
-//        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
-        PointData po = jedisPoolUtil.getRealData(pointid);
-
-        // long endStamp = System.currentTimeMillis();
-        // long cost = endStamp - startStamp;
-        // logger.info("==================结束时刻: " +
-        // DateUtils.parseLongToDate(endStamp));
-        // logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
-
-        return po;
-
+        return null;
     }
 
-    /**
-     * 一次读取多个点
-     *
-     * @param pointids
-     * @return
-     * @throws Exception
-     */
+    @Override
     public List<PointData> getRealData(String... pointids) throws Exception {
-//        long startStamp = System.currentTimeMillis();
-//        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
-        List<PointData> list = jedisPoolUtil.getRealData(pointids);
-
-        if (StringUtils.isEmpty(list)) {
-            list = new ArrayList<PointData>();
-        }
-
-//		long endStamp = System.currentTimeMillis();
-//		long cost = endStamp - startStamp;
-//		logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
-//		logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
-
-        return list;
+        return null;
     }
 
+    @Override
     public List<PointData> getRealData(List<String> pointids) throws Exception {
-//        long startStamp = System.currentTimeMillis();
-//        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
-        List<PointData> list = jedisPoolUtil.getRealData(pointids);
-
-        if (StringUtils.isEmpty(list)) {
-            list = new ArrayList<PointData>();
-        }
-
-//		long endStamp = System.currentTimeMillis();
-//		long cost = endStamp - startStamp;
-//		logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
-//		logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
-        return list;
+        return null;
     }
 
-    /**
-     * 一次读取多个点
-     *
-     * @param pointids
-     * @return
-     * @throws Exception
-     */
+    @Override
     public Map<String, Double> getRealDataMap(String... pointids) throws Exception {
-//        long startStamp = System.currentTimeMillis();
-//        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
-        Map<String, Double> map = jedisPoolUtil.getRealDataMap(pointids);
-
-        if (StringUtils.isEmpty(map)) {
-            map = new HashMap<String, Double>();
-        }
-
-//		long endStamp = System.currentTimeMillis();
-//		long cost = endStamp - startStamp;
-//		logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
-//		logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
-
-        return map;
+        return null;
     }
 
-
-    public Map<String, Double> getRealDataMap(List<String> pointids) throws Exception {
-//        long startStamp = System.currentTimeMillis();
-//        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
-        Map<String, Double> map = jedisPoolUtil.getRealDataMap(pointids);
-
-        if (StringUtils.isEmpty(map)) {
-            map = new HashMap<String, Double>();
-        }
-
-//		long endStamp = System.currentTimeMillis();
-//		long cost = endStamp - startStamp;
-//		logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
-//		logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
-
-        return map;
+    @Override
+    public List<PointData> getHistoryDatasSnap(String pointid, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
+        return null;
     }
 
-    public List<PointData> getHistoryDatasRaw(WindTurbineTestingPointAi2 point, Long beginDate, Long endDate) throws Exception {
-        //        long startStamp = System.currentTimeMillis();
-//        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
-        List<PointData> ls = mdb.getHistoryDatasRaw(point, beginDate, endDate);
-
-//        long endStamp = System.currentTimeMillis();
-//        long cost = endStamp - startStamp;
-//        logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
-//        logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
-        return ls;
+    @Override
+    public List<PointData> getHistoryDatasRaw(String pointid, Long beginDate, Long endDate) throws Exception {
+        return null;
     }
 
-    public List<PointData> getHistoryDatasRaw(WindPowerStationTestingPoint2 point, Long beginDate, Long endDate) throws Exception {
-//        long startStamp = System.currentTimeMillis();
-//        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
-        List<PointData> ls = mdb.getHistoryDatasRaw(point, beginDate, endDate);
+    @Override
+    public List<PointData> getHistStat(WindTurbineTestingPointAi2 point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
+        return null;
+    }
 
-//        long endStamp = System.currentTimeMillis();
-//        long cost = endStamp - startStamp;
-//        logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
-//        logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
-        return ls;
+    @Override
+    public List<PointData> getHistStat(WindPowerStationTestingPoint2 point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
+        return null;
     }
 
-    public List<PointData> getHistoryDatasRaw(String pointid, Long beginDate, Long endDate) throws Exception {
-//        long startStamp = System.currentTimeMillis();
-//        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
-        List<PointData> ls = mdb.getHistoryDatasRaw(pointid, beginDate, endDate);
+    @Override
+    public List<PointData> getHistStat(String pointid, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
+        return null;
+    }
 
-//        long endStamp = System.currentTimeMillis();
-//        long cost = endStamp - startStamp;
-//        logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
-//        logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
-        return ls;
+    @Override
+    public DNAStatVal[] getHistStat(String point, Long beginDate, Long endDate, Integer pried) throws Exception {
+        return new DNAStatVal[0];
     }
 
-    /**
-     * 更新单点实时数据
-     *
-     * @return
-     * @throws Exception
-     */
+    @Override
     public void updatePoint(PointData point) throws Exception {
 
-        mdb.updatePoint(point, jedisPoolUtil.getJedisPool());
     }
 
     @Override
     public DNAVal[] getRealtimeTagValues(String... tagNames) throws Exception {
-        return jedisPoolUtil.getRealtimeTagValues(tagNames);
+        return new DNAVal[0];
     }
 
     @Override
     public void updatePoint(List<PointData> pointls) throws Exception {
 
-        if(!pointls.isEmpty())
-        {
-            for(PointData point:pointls)
-            {
-                mdb.updatePoint(point, jedisPoolUtil.getJedisPool());
-            }
-        }
     }
 
-
-
     @Override
     public DNAVal[] getHistMatrix(String[] nameList, int tTime) throws Exception {
-
-//        List<PointData> ls = mdb.getHistoryDatasSnap(pointid, beginDate, endDate, count, pried);
-
         return new DNAVal[0];
     }
+
+
+//    private JedisPoolUtil jedisPoolUtil= SpringUtils.getBean(JedisPoolUtil.class);
+//    private MongoDbUtil mdb = SpringUtils.getBean(MongoDbUtil.class);
+//    private static Logger logger = LoggerFactory.getLogger(MongoDbUtil.class);
+//
+//    public PointData getRealData(WindPowerStationTestingPoint2 point) throws Exception {
+//
+//        PointData po = jedisPoolUtil.getRealData(point.getCode());
+//        return po;
+//    }
+//
+//    public List<PointData> getHistoryDatasSnap(WindPowerStationTestingPoint2 point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
+////        long startStamp = System.currentTimeMillis();
+////        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
+//
+//        List<PointData> ls = mdb.getHistoryDatasSnap(point, beginDate, endDate, count, pried);
+//
+////        long endStamp = System.currentTimeMillis();
+////        long cost = endStamp - startStamp;
+////        logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
+////        logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
+//        return ls;
+//    }
+//
+//    public List<PointData> getHistoryDatasSnap(String pointid, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
+////        long startStamp = System.currentTimeMillis();
+////        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
+//
+//        List<PointData> ls = mdb.getHistoryDatasSnap(pointid, beginDate, endDate, count, pried);
+//
+//
+////        long endStamp = System.currentTimeMillis();
+////        long cost = endStamp - startStamp;
+////        logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
+////        logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
+//        return ls;
+//    }
+//
+//    public List<PointData> getHistStat(WindTurbineTestingPointAi2 point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
+////        long startStamp = System.currentTimeMillis();
+////        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
+//
+//        List<PointData> ls = mdb.getHistStat(point, beginDate, endDate, count, pried, type);
+//
+////        long endStamp = System.currentTimeMillis();
+////        long cost = endStamp - startStamp;
+////        logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
+////        logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
+//        return ls;
+//    }
+//
+//    public DNAStatVal[] getHistStat(String point, Long beginDate, Long endDate, Integer pried) throws Exception {
+////        long startStamp = System.currentTimeMillis();
+////        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
+//        DNAStatVal[] statResult = mdb.getHistStat(point, beginDate, endDate, pried);
+//
+////        long endStamp = System.currentTimeMillis();
+////        long cost = endStamp - startStamp;
+////        logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
+////        logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
+//        return statResult;
+//
+//    }
+//
+//    public List<PointData> getHistStat(WindPowerStationTestingPoint2 point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
+////        long startStamp = System.currentTimeMillis();
+////        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
+//
+//        List<PointData> ls = mdb.getHistStat(point, beginDate, endDate, count, pried, type);
+//
+////        long endStamp = System.currentTimeMillis();
+////        long cost = endStamp - startStamp;
+////        logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
+////        logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
+//        return ls;
+//    }
+//
+//    public List<PointData> getHistStat(String pointid, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
+////        long startStamp = System.currentTimeMillis();
+////        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
+//
+//        List<PointData> ls = mdb.getHistStat(pointid, beginDate, endDate, count, pried, type);
+//
+////        long endStamp = System.currentTimeMillis();
+////        long cost = endStamp - startStamp;
+////        logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
+////        logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
+//        return ls;
+//    }
+//
+//    public PointData getRealData1(WindTurbineTestingPointAi2 point) throws Exception {
+////		long startStamp = System.currentTimeMillis();
+////		logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
+//        PointData po = jedisPoolUtil.getRealData(point.getId());
+//
+////		long endStamp = System.currentTimeMillis();
+////		long cost = endStamp - startStamp;
+////		logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
+////		logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
+//
+//        return po;
+//    }
+//
+//    public PointData getRealData(WindTurbineTestingPointAi2 point) throws Exception {
+//        // long startStamp = System.currentTimeMillis();
+//        // logger.info("==================开始时刻: " +
+//        // DateUtils.parseLongToDate(startStamp));
+//
+//        PointData po = jedisPoolUtil.getRealData(point.getId());
+//
+//        // long endStamp = System.currentTimeMillis();
+//        // long cost = endStamp - startStamp;
+//        // logger.info("==================结束时刻: " +
+//        // DateUtils.parseLongToDate(endStamp));
+//        // logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
+//
+//        return po;
+//    }
+//
+//    public List<PointData> getHistoryDatasSnap(WindTurbineTestingPointAi2 point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
+////        long startStamp = System.currentTimeMillis();
+////        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
+//
+//        List<PointData> ls = mdb.getHistoryDatasSnap(point, beginDate, endDate, count, pried);
+//
+////        long endStamp = System.currentTimeMillis();
+////        long cost = endStamp - startStamp;
+////        logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
+////        logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
+//        return ls;
+//    }
+//
+//    public PointData getRealData1(String pointid) throws Exception {
+////        long startStamp = System.currentTimeMillis();
+////        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
+//        PointData po = jedisPoolUtil.getRealData(pointid);
+//
+//        // long endStamp = System.currentTimeMillis();
+//        // long cost = endStamp - startStamp;
+//        // logger.info("==================结束时刻: " +
+//        // DateUtils.parseLongToDate(endStamp));
+//        // logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
+//
+//        return po;
+//    }
+//
+//    public PointData getRealData(String pointid) throws Exception {
+////        long startStamp = System.currentTimeMillis();
+////        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
+//        PointData po = jedisPoolUtil.getRealData(pointid);
+//
+//        // long endStamp = System.currentTimeMillis();
+//        // long cost = endStamp - startStamp;
+//        // logger.info("==================结束时刻: " +
+//        // DateUtils.parseLongToDate(endStamp));
+//        // logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
+//
+//        return po;
+//
+//    }
+//
+//    /**
+//     * 一次读取多个点
+//     *
+//     * @param pointids
+//     * @return
+//     * @throws Exception
+//     */
+//    public List<PointData> getRealData(String... pointids) throws Exception {
+////        long startStamp = System.currentTimeMillis();
+////        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
+//        List<PointData> list = jedisPoolUtil.getRealData(pointids);
+//
+//        if (StringUtils.isEmpty(list)) {
+//            list = new ArrayList<PointData>();
+//        }
+//
+////		long endStamp = System.currentTimeMillis();
+////		long cost = endStamp - startStamp;
+////		logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
+////		logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
+//
+//        return list;
+//    }
+//
+//    public List<PointData> getRealData(List<String> pointids) throws Exception {
+////        long startStamp = System.currentTimeMillis();
+////        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
+//        List<PointData> list = jedisPoolUtil.getRealData(pointids);
+//
+//        if (StringUtils.isEmpty(list)) {
+//            list = new ArrayList<PointData>();
+//        }
+//
+////		long endStamp = System.currentTimeMillis();
+////		long cost = endStamp - startStamp;
+////		logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
+////		logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
+//        return list;
+//    }
+//
+//    /**
+//     * 一次读取多个点
+//     *
+//     * @param pointids
+//     * @return
+//     * @throws Exception
+//     */
+//    public Map<String, Double> getRealDataMap(String... pointids) throws Exception {
+////        long startStamp = System.currentTimeMillis();
+////        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
+//        Map<String, Double> map = jedisPoolUtil.getRealDataMap(pointids);
+//
+//        if (StringUtils.isEmpty(map)) {
+//            map = new HashMap<String, Double>();
+//        }
+//
+////		long endStamp = System.currentTimeMillis();
+////		long cost = endStamp - startStamp;
+////		logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
+////		logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
+//
+//        return map;
+//    }
+//
+//
+//    public Map<String, Double> getRealDataMap(List<String> pointids) throws Exception {
+////        long startStamp = System.currentTimeMillis();
+////        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
+//        Map<String, Double> map = jedisPoolUtil.getRealDataMap(pointids);
+//
+//        if (StringUtils.isEmpty(map)) {
+//            map = new HashMap<String, Double>();
+//        }
+//
+////		long endStamp = System.currentTimeMillis();
+////		long cost = endStamp - startStamp;
+////		logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
+////		logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
+//
+//        return map;
+//    }
+//
+//    public List<PointData> getHistoryDatasRaw(WindTurbineTestingPointAi2 point, Long beginDate, Long endDate) throws Exception {
+//        //        long startStamp = System.currentTimeMillis();
+////        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
+//        List<PointData> ls = mdb.getHistoryDatasRaw(point, beginDate, endDate);
+//
+////        long endStamp = System.currentTimeMillis();
+////        long cost = endStamp - startStamp;
+////        logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
+////        logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
+//        return ls;
+//    }
+//
+//    public List<PointData> getHistoryDatasRaw(WindPowerStationTestingPoint2 point, Long beginDate, Long endDate) throws Exception {
+////        long startStamp = System.currentTimeMillis();
+////        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
+//        List<PointData> ls = mdb.getHistoryDatasRaw(point, beginDate, endDate);
+//
+////        long endStamp = System.currentTimeMillis();
+////        long cost = endStamp - startStamp;
+////        logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
+////        logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
+//        return ls;
+//    }
+//
+//    public List<PointData> getHistoryDatasRaw(String pointid, Long beginDate, Long endDate) throws Exception {
+////        long startStamp = System.currentTimeMillis();
+////        logger.info("==================开始时刻: " + DateUtils.parseLongToDate(startStamp));
+//        List<PointData> ls = mdb.getHistoryDatasRaw(pointid, beginDate, endDate);
+//
+////        long endStamp = System.currentTimeMillis();
+////        long cost = endStamp - startStamp;
+////        logger.info("==================结束时刻: " + DateUtils.parseLongToDate(endStamp));
+////        logger.info("调度程执行结束,耗时：" + cost / 1000 + "秒!........");
+//        return ls;
+//    }
+//
+//    /**
+//     * 更新单点实时数据
+//     *
+//     * @return
+//     * @throws Exception
+//     */
+//    public void updatePoint(PointData point) throws Exception {
+//
+//        mdb.updatePoint(point, jedisPoolUtil.getJedisPool());
+//    }
+//
+//    @Override
+//    public DNAVal[] getRealtimeTagValues(String... tagNames) throws Exception {
+//        return jedisPoolUtil.getRealtimeTagValues(tagNames);
+//    }
+//
+//    @Override
+//    public void updatePoint(List<PointData> pointls) throws Exception {
+//
+//        if(!pointls.isEmpty())
+//        {
+//            for(PointData point:pointls)
+//            {
+//                mdb.updatePoint(point, jedisPoolUtil.getJedisPool());
+//            }
+//        }
+//    }
+//
+//
+//
+//    @Override
+//    public DNAVal[] getHistMatrix(String[] nameList, int tTime) throws Exception {
+//
+////        List<PointData> ls = mdb.getHistoryDatasSnap(pointid, beginDate, endDate, count, pried);
+//
+//        return new DNAVal[0];
+//    }
 }

src/main/resources/application-dev.yml

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

src/main/resources/application.yml

@@ -26,13 +26,15 @@ gyee:
   #漂亮得拖动验证码 默认false普通验证码、true滚动验证码
   rollVerification: true
   #实时数据库
-  realtimedataBase: golden
+  realTimeDataBase: golden
   #app升级路径
   appUpdateUrl: /root/Public/apk_ipa_download/webapps/ROOT/
+  #智能营销接口
+  powerDirectUrl: http://10.155.32.7:8085
 
 #tomcat websocket
 server :
-  port : 9988
+  port : 8088
   ##项目名字配置
   #servlet : 
   #  context-path : /demo

src/main/resources/mybatis-generator.xml

@@ -47,9 +47,9 @@
         <!-- 数据库链接地址账号密码 -->
         <jdbcConnection
                 driverClass="oracle.jdbc.driver.OracleDriver"
-                connectionURL="jdbc:oracle:thin:@192.168.1.105:1521:gdnxfd"
-                userId="nxfdprod"
-                password="gdnxfd123">
+                connectionURL="jdbc:oracle:thin:@10.155.32.7:1521:gdnxfd"
+                userId="gyee"
+                password="FRWIND">
         </jdbcConnection>
 
 <!--        <jdbcConnection-->
@@ -95,7 +95,7 @@
             <generatedKey column="id" sqlStatement="Mysql" identity="true"/>
         </table>-->
         
-        <table tableName='recommenmain' domainObjectName='Recommenmain'/>
+        <table tableName='WF_FILE_CONFIG' domainObjectName='WF_FILE_CONFIG'/>
 
 
     </context>

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

@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.frame.mapper.auto.NoscalewfdaefperioddataMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Noscalewfdaefperioddata">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="WINDPLANT_NO" jdbcType="DECIMAL" property="windplantNo" />
+    <id column="MODEL_NO" jdbcType="DECIMAL" property="modelNo" />
+    <id column="DATA_TIME" jdbcType="TIMESTAMP" property="dataTime" />
+    <result column="VALUE" jdbcType="FLOAT" property="value" />
+    <result column="DATA_FLAG" jdbcType="DECIMAL" property="dataFlag" />
+  </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.
+    -->
+    WINDPLANT_NO, MODEL_NO, DATA_TIME, VALUE, DATA_FLAG
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.NoscalewfdaefperioddataExample" 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 NOSCALE_WF_DA_EF_PERIOD_DATA
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="map" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from NOSCALE_WF_DA_EF_PERIOD_DATA
+    where WINDPLANT_NO = #{windplantNo,jdbcType=DECIMAL}
+      and MODEL_NO = #{modelNo,jdbcType=DECIMAL}
+      and DATA_TIME = #{dataTime,jdbcType=TIMESTAMP}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from NOSCALE_WF_DA_EF_PERIOD_DATA
+    where WINDPLANT_NO = #{windplantNo,jdbcType=DECIMAL}
+      and MODEL_NO = #{modelNo,jdbcType=DECIMAL}
+      and DATA_TIME = #{dataTime,jdbcType=TIMESTAMP}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.NoscalewfdaefperioddataExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from NOSCALE_WF_DA_EF_PERIOD_DATA
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Noscalewfdaefperioddata">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into NOSCALE_WF_DA_EF_PERIOD_DATA (WINDPLANT_NO, MODEL_NO, DATA_TIME, 
+      VALUE, DATA_FLAG)
+    values (#{windplantNo,jdbcType=DECIMAL}, #{modelNo,jdbcType=DECIMAL}, #{dataTime,jdbcType=TIMESTAMP}, 
+      #{value,jdbcType=FLOAT}, #{dataFlag,jdbcType=DECIMAL})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Noscalewfdaefperioddata">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into NOSCALE_WF_DA_EF_PERIOD_DATA
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="windplantNo != null">
+        WINDPLANT_NO,
+      </if>
+      <if test="modelNo != null">
+        MODEL_NO,
+      </if>
+      <if test="dataTime != null">
+        DATA_TIME,
+      </if>
+      <if test="value != null">
+        VALUE,
+      </if>
+      <if test="dataFlag != null">
+        DATA_FLAG,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="windplantNo != null">
+        #{windplantNo,jdbcType=DECIMAL},
+      </if>
+      <if test="modelNo != null">
+        #{modelNo,jdbcType=DECIMAL},
+      </if>
+      <if test="dataTime != null">
+        #{dataTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="value != null">
+        #{value,jdbcType=FLOAT},
+      </if>
+      <if test="dataFlag != null">
+        #{dataFlag,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.NoscalewfdaefperioddataExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from NOSCALE_WF_DA_EF_PERIOD_DATA
+    <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 NOSCALE_WF_DA_EF_PERIOD_DATA
+    <set>
+      <if test="record.windplantNo != null">
+        WINDPLANT_NO = #{record.windplantNo,jdbcType=DECIMAL},
+      </if>
+      <if test="record.modelNo != null">
+        MODEL_NO = #{record.modelNo,jdbcType=DECIMAL},
+      </if>
+      <if test="record.dataTime != null">
+        DATA_TIME = #{record.dataTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.value != null">
+        VALUE = #{record.value,jdbcType=FLOAT},
+      </if>
+      <if test="record.dataFlag != null">
+        DATA_FLAG = #{record.dataFlag,jdbcType=DECIMAL},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update NOSCALE_WF_DA_EF_PERIOD_DATA
+    set WINDPLANT_NO = #{record.windplantNo,jdbcType=DECIMAL},
+      MODEL_NO = #{record.modelNo,jdbcType=DECIMAL},
+      DATA_TIME = #{record.dataTime,jdbcType=TIMESTAMP},
+      VALUE = #{record.value,jdbcType=FLOAT},
+      DATA_FLAG = #{record.dataFlag,jdbcType=DECIMAL}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Noscalewfdaefperioddata">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update NOSCALE_WF_DA_EF_PERIOD_DATA
+    <set>
+      <if test="value != null">
+        VALUE = #{value,jdbcType=FLOAT},
+      </if>
+      <if test="dataFlag != null">
+        DATA_FLAG = #{dataFlag,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where WINDPLANT_NO = #{windplantNo,jdbcType=DECIMAL}
+      and MODEL_NO = #{modelNo,jdbcType=DECIMAL}
+      and DATA_TIME = #{dataTime,jdbcType=TIMESTAMP}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Noscalewfdaefperioddata">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update NOSCALE_WF_DA_EF_PERIOD_DATA
+    set VALUE = #{value,jdbcType=FLOAT},
+      DATA_FLAG = #{dataFlag,jdbcType=DECIMAL}
+    where WINDPLANT_NO = #{windplantNo,jdbcType=DECIMAL}
+      and MODEL_NO = #{modelNo,jdbcType=DECIMAL}
+      and DATA_TIME = #{dataTime,jdbcType=TIMESTAMP}
+  </update>
+</mapper>

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

@@ -0,0 +1,288 @@
+<?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.NoscalewfdapfperioddataMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Noscalewfdapfperioddata">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="WINDPLANT_NO" jdbcType="DECIMAL" property="windplantNo" />
+    <id column="MODEL_NO" jdbcType="DECIMAL" property="modelNo" />
+    <id column="DATA_TIME" jdbcType="TIMESTAMP" property="dataTime" />
+    <result column="VALUE" jdbcType="FLOAT" property="value" />
+    <result column="DATA_FLAG" jdbcType="DECIMAL" property="dataFlag" />
+    <result column="MODSPEED" jdbcType="FLOAT" property="modspeed" />
+  </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.
+    -->
+    WINDPLANT_NO, MODEL_NO, DATA_TIME, VALUE, DATA_FLAG, MODSPEED
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.NoscalewfdapfperioddataExample" 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 NOSCALE_WF_DA_PF_PERIOD_DATA
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="map" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from NOSCALE_WF_DA_PF_PERIOD_DATA
+    where WINDPLANT_NO = #{windplantNo,jdbcType=DECIMAL}
+      and MODEL_NO = #{modelNo,jdbcType=DECIMAL}
+      and DATA_TIME = #{dataTime,jdbcType=TIMESTAMP}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from NOSCALE_WF_DA_PF_PERIOD_DATA
+    where WINDPLANT_NO = #{windplantNo,jdbcType=DECIMAL}
+      and MODEL_NO = #{modelNo,jdbcType=DECIMAL}
+      and DATA_TIME = #{dataTime,jdbcType=TIMESTAMP}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.NoscalewfdapfperioddataExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from NOSCALE_WF_DA_PF_PERIOD_DATA
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Noscalewfdapfperioddata">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into NOSCALE_WF_DA_PF_PERIOD_DATA (WINDPLANT_NO, MODEL_NO, DATA_TIME, 
+      VALUE, DATA_FLAG, MODSPEED
+      )
+    values (#{windplantNo,jdbcType=DECIMAL}, #{modelNo,jdbcType=DECIMAL}, #{dataTime,jdbcType=TIMESTAMP}, 
+      #{value,jdbcType=FLOAT}, #{dataFlag,jdbcType=DECIMAL}, #{modspeed,jdbcType=FLOAT}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Noscalewfdapfperioddata">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into NOSCALE_WF_DA_PF_PERIOD_DATA
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="windplantNo != null">
+        WINDPLANT_NO,
+      </if>
+      <if test="modelNo != null">
+        MODEL_NO,
+      </if>
+      <if test="dataTime != null">
+        DATA_TIME,
+      </if>
+      <if test="value != null">
+        VALUE,
+      </if>
+      <if test="dataFlag != null">
+        DATA_FLAG,
+      </if>
+      <if test="modspeed != null">
+        MODSPEED,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="windplantNo != null">
+        #{windplantNo,jdbcType=DECIMAL},
+      </if>
+      <if test="modelNo != null">
+        #{modelNo,jdbcType=DECIMAL},
+      </if>
+      <if test="dataTime != null">
+        #{dataTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="value != null">
+        #{value,jdbcType=FLOAT},
+      </if>
+      <if test="dataFlag != null">
+        #{dataFlag,jdbcType=DECIMAL},
+      </if>
+      <if test="modspeed != null">
+        #{modspeed,jdbcType=FLOAT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.NoscalewfdapfperioddataExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from NOSCALE_WF_DA_PF_PERIOD_DATA
+    <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 NOSCALE_WF_DA_PF_PERIOD_DATA
+    <set>
+      <if test="record.windplantNo != null">
+        WINDPLANT_NO = #{record.windplantNo,jdbcType=DECIMAL},
+      </if>
+      <if test="record.modelNo != null">
+        MODEL_NO = #{record.modelNo,jdbcType=DECIMAL},
+      </if>
+      <if test="record.dataTime != null">
+        DATA_TIME = #{record.dataTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.value != null">
+        VALUE = #{record.value,jdbcType=FLOAT},
+      </if>
+      <if test="record.dataFlag != null">
+        DATA_FLAG = #{record.dataFlag,jdbcType=DECIMAL},
+      </if>
+      <if test="record.modspeed != null">
+        MODSPEED = #{record.modspeed,jdbcType=FLOAT},
+      </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 NOSCALE_WF_DA_PF_PERIOD_DATA
+    set WINDPLANT_NO = #{record.windplantNo,jdbcType=DECIMAL},
+      MODEL_NO = #{record.modelNo,jdbcType=DECIMAL},
+      DATA_TIME = #{record.dataTime,jdbcType=TIMESTAMP},
+      VALUE = #{record.value,jdbcType=FLOAT},
+      DATA_FLAG = #{record.dataFlag,jdbcType=DECIMAL},
+      MODSPEED = #{record.modspeed,jdbcType=FLOAT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Noscalewfdapfperioddata">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update NOSCALE_WF_DA_PF_PERIOD_DATA
+    <set>
+      <if test="value != null">
+        VALUE = #{value,jdbcType=FLOAT},
+      </if>
+      <if test="dataFlag != null">
+        DATA_FLAG = #{dataFlag,jdbcType=DECIMAL},
+      </if>
+      <if test="modspeed != null">
+        MODSPEED = #{modspeed,jdbcType=FLOAT},
+      </if>
+    </set>
+    where WINDPLANT_NO = #{windplantNo,jdbcType=DECIMAL}
+      and MODEL_NO = #{modelNo,jdbcType=DECIMAL}
+      and DATA_TIME = #{dataTime,jdbcType=TIMESTAMP}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Noscalewfdapfperioddata">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update NOSCALE_WF_DA_PF_PERIOD_DATA
+    set VALUE = #{value,jdbcType=FLOAT},
+      DATA_FLAG = #{dataFlag,jdbcType=DECIMAL},
+      MODSPEED = #{modspeed,jdbcType=FLOAT}
+    where WINDPLANT_NO = #{windplantNo,jdbcType=DECIMAL}
+      and MODEL_NO = #{modelNo,jdbcType=DECIMAL}
+      and DATA_TIME = #{dataTime,jdbcType=TIMESTAMP}
+  </update>
+</mapper>

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

@@ -0,0 +1,319 @@
+<?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.WffileconfigMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Wffileconfig">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="WINDPLANT_NO" jdbcType="DECIMAL" property="windplantNo" />
+    <result column="ABBR_NAME" jdbcType="VARCHAR" property="abbrName" />
+    <result column="NWP_FLAG" jdbcType="DECIMAL" property="nwpFlag" />
+    <result column="USP_NWP_NO" jdbcType="DECIMAL" property="uspNwpNo" />
+    <result column="WPFMODEL_NO" jdbcType="DECIMAL" property="wpfmodelNo" />
+    <result column="UWPFMODEL_NO" jdbcType="DECIMAL" property="uwpfmodelNo" />
+    <result column="WPFEMODEL_NO" jdbcType="DECIMAL" property="wpfemodelNo" />
+    <result column="UWPFEMODEL_NO" jdbcType="DECIMAL" property="uwpfemodelNo" />
+  </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.
+    -->
+    WINDPLANT_NO, ABBR_NAME, NWP_FLAG, USP_NWP_NO, WPFMODEL_NO, UWPFMODEL_NO, WPFEMODEL_NO, 
+    UWPFEMODEL_NO
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.WffileconfigExample" 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 WF_FILE_CONFIG
+    <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.Short" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from WF_FILE_CONFIG
+    where WINDPLANT_NO = #{windplantNo,jdbcType=DECIMAL}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WF_FILE_CONFIG
+    where WINDPLANT_NO = #{windplantNo,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WffileconfigExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WF_FILE_CONFIG
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Wffileconfig">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WF_FILE_CONFIG (WINDPLANT_NO, ABBR_NAME, NWP_FLAG, 
+      USP_NWP_NO, WPFMODEL_NO, UWPFMODEL_NO, 
+      WPFEMODEL_NO, UWPFEMODEL_NO)
+    values (#{windplantNo,jdbcType=DECIMAL}, #{abbrName,jdbcType=VARCHAR}, #{nwpFlag,jdbcType=DECIMAL}, 
+      #{uspNwpNo,jdbcType=DECIMAL}, #{wpfmodelNo,jdbcType=DECIMAL}, #{uwpfmodelNo,jdbcType=DECIMAL}, 
+      #{wpfemodelNo,jdbcType=DECIMAL}, #{uwpfemodelNo,jdbcType=DECIMAL})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Wffileconfig">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WF_FILE_CONFIG
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="windplantNo != null">
+        WINDPLANT_NO,
+      </if>
+      <if test="abbrName != null">
+        ABBR_NAME,
+      </if>
+      <if test="nwpFlag != null">
+        NWP_FLAG,
+      </if>
+      <if test="uspNwpNo != null">
+        USP_NWP_NO,
+      </if>
+      <if test="wpfmodelNo != null">
+        WPFMODEL_NO,
+      </if>
+      <if test="uwpfmodelNo != null">
+        UWPFMODEL_NO,
+      </if>
+      <if test="wpfemodelNo != null">
+        WPFEMODEL_NO,
+      </if>
+      <if test="uwpfemodelNo != null">
+        UWPFEMODEL_NO,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="windplantNo != null">
+        #{windplantNo,jdbcType=DECIMAL},
+      </if>
+      <if test="abbrName != null">
+        #{abbrName,jdbcType=VARCHAR},
+      </if>
+      <if test="nwpFlag != null">
+        #{nwpFlag,jdbcType=DECIMAL},
+      </if>
+      <if test="uspNwpNo != null">
+        #{uspNwpNo,jdbcType=DECIMAL},
+      </if>
+      <if test="wpfmodelNo != null">
+        #{wpfmodelNo,jdbcType=DECIMAL},
+      </if>
+      <if test="uwpfmodelNo != null">
+        #{uwpfmodelNo,jdbcType=DECIMAL},
+      </if>
+      <if test="wpfemodelNo != null">
+        #{wpfemodelNo,jdbcType=DECIMAL},
+      </if>
+      <if test="uwpfemodelNo != null">
+        #{uwpfemodelNo,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.WffileconfigExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from WF_FILE_CONFIG
+    <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 WF_FILE_CONFIG
+    <set>
+      <if test="record.windplantNo != null">
+        WINDPLANT_NO = #{record.windplantNo,jdbcType=DECIMAL},
+      </if>
+      <if test="record.abbrName != null">
+        ABBR_NAME = #{record.abbrName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.nwpFlag != null">
+        NWP_FLAG = #{record.nwpFlag,jdbcType=DECIMAL},
+      </if>
+      <if test="record.uspNwpNo != null">
+        USP_NWP_NO = #{record.uspNwpNo,jdbcType=DECIMAL},
+      </if>
+      <if test="record.wpfmodelNo != null">
+        WPFMODEL_NO = #{record.wpfmodelNo,jdbcType=DECIMAL},
+      </if>
+      <if test="record.uwpfmodelNo != null">
+        UWPFMODEL_NO = #{record.uwpfmodelNo,jdbcType=DECIMAL},
+      </if>
+      <if test="record.wpfemodelNo != null">
+        WPFEMODEL_NO = #{record.wpfemodelNo,jdbcType=DECIMAL},
+      </if>
+      <if test="record.uwpfemodelNo != null">
+        UWPFEMODEL_NO = #{record.uwpfemodelNo,jdbcType=DECIMAL},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WF_FILE_CONFIG
+    set WINDPLANT_NO = #{record.windplantNo,jdbcType=DECIMAL},
+      ABBR_NAME = #{record.abbrName,jdbcType=VARCHAR},
+      NWP_FLAG = #{record.nwpFlag,jdbcType=DECIMAL},
+      USP_NWP_NO = #{record.uspNwpNo,jdbcType=DECIMAL},
+      WPFMODEL_NO = #{record.wpfmodelNo,jdbcType=DECIMAL},
+      UWPFMODEL_NO = #{record.uwpfmodelNo,jdbcType=DECIMAL},
+      WPFEMODEL_NO = #{record.wpfemodelNo,jdbcType=DECIMAL},
+      UWPFEMODEL_NO = #{record.uwpfemodelNo,jdbcType=DECIMAL}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Wffileconfig">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WF_FILE_CONFIG
+    <set>
+      <if test="abbrName != null">
+        ABBR_NAME = #{abbrName,jdbcType=VARCHAR},
+      </if>
+      <if test="nwpFlag != null">
+        NWP_FLAG = #{nwpFlag,jdbcType=DECIMAL},
+      </if>
+      <if test="uspNwpNo != null">
+        USP_NWP_NO = #{uspNwpNo,jdbcType=DECIMAL},
+      </if>
+      <if test="wpfmodelNo != null">
+        WPFMODEL_NO = #{wpfmodelNo,jdbcType=DECIMAL},
+      </if>
+      <if test="uwpfmodelNo != null">
+        UWPFMODEL_NO = #{uwpfmodelNo,jdbcType=DECIMAL},
+      </if>
+      <if test="wpfemodelNo != null">
+        WPFEMODEL_NO = #{wpfemodelNo,jdbcType=DECIMAL},
+      </if>
+      <if test="uwpfemodelNo != null">
+        UWPFEMODEL_NO = #{uwpfemodelNo,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where WINDPLANT_NO = #{windplantNo,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Wffileconfig">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WF_FILE_CONFIG
+    set ABBR_NAME = #{abbrName,jdbcType=VARCHAR},
+      NWP_FLAG = #{nwpFlag,jdbcType=DECIMAL},
+      USP_NWP_NO = #{uspNwpNo,jdbcType=DECIMAL},
+      WPFMODEL_NO = #{wpfmodelNo,jdbcType=DECIMAL},
+      UWPFMODEL_NO = #{uwpfmodelNo,jdbcType=DECIMAL},
+      WPFEMODEL_NO = #{wpfemodelNo,jdbcType=DECIMAL},
+      UWPFEMODEL_NO = #{uwpfemodelNo,jdbcType=DECIMAL}
+    where WINDPLANT_NO = #{windplantNo,jdbcType=DECIMAL}
+  </update>
+</mapper>

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

@@ -0,0 +1,336 @@
+<?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.WfnwpdataMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Wfnwpdata">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="WINDPLANT_NO" jdbcType="DECIMAL" property="windplantNo" />
+    <id column="NWP_TYPE" jdbcType="DECIMAL" property="nwpType" />
+    <id column="FILE_TIME" jdbcType="DECIMAL" property="fileTime" />
+    <id column="DATA_TIME" jdbcType="TIMESTAMP" property="dataTime" />
+    <result column="WIND_SPEED" jdbcType="FLOAT" property="windSpeed" />
+    <result column="TEMPERATURE" jdbcType="FLOAT" property="temperature" />
+    <result column="WIND_DIR" jdbcType="FLOAT" property="windDir" />
+    <result column="HUMIDITY" jdbcType="FLOAT" property="humidity" />
+    <result column="AIR_PRESSURE" jdbcType="FLOAT" property="airPressure" />
+  </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.
+    -->
+    WINDPLANT_NO, NWP_TYPE, FILE_TIME, DATA_TIME, WIND_SPEED, TEMPERATURE, WIND_DIR, 
+    HUMIDITY, AIR_PRESSURE
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.WfnwpdataExample" 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 WF_NWP_DATA
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="map" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from WF_NWP_DATA
+    where WINDPLANT_NO = #{windplantNo,jdbcType=DECIMAL}
+      and NWP_TYPE = #{nwpType,jdbcType=DECIMAL}
+      and FILE_TIME = #{fileTime,jdbcType=DECIMAL}
+      and DATA_TIME = #{dataTime,jdbcType=TIMESTAMP}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WF_NWP_DATA
+    where WINDPLANT_NO = #{windplantNo,jdbcType=DECIMAL}
+      and NWP_TYPE = #{nwpType,jdbcType=DECIMAL}
+      and FILE_TIME = #{fileTime,jdbcType=DECIMAL}
+      and DATA_TIME = #{dataTime,jdbcType=TIMESTAMP}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WfnwpdataExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WF_NWP_DATA
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Wfnwpdata">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WF_NWP_DATA (WINDPLANT_NO, NWP_TYPE, FILE_TIME, 
+      DATA_TIME, WIND_SPEED, TEMPERATURE, 
+      WIND_DIR, HUMIDITY, AIR_PRESSURE
+      )
+    values (#{windplantNo,jdbcType=DECIMAL}, #{nwpType,jdbcType=DECIMAL}, #{fileTime,jdbcType=DECIMAL}, 
+      #{dataTime,jdbcType=TIMESTAMP}, #{windSpeed,jdbcType=FLOAT}, #{temperature,jdbcType=FLOAT}, 
+      #{windDir,jdbcType=FLOAT}, #{humidity,jdbcType=FLOAT}, #{airPressure,jdbcType=FLOAT}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Wfnwpdata">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WF_NWP_DATA
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="windplantNo != null">
+        WINDPLANT_NO,
+      </if>
+      <if test="nwpType != null">
+        NWP_TYPE,
+      </if>
+      <if test="fileTime != null">
+        FILE_TIME,
+      </if>
+      <if test="dataTime != null">
+        DATA_TIME,
+      </if>
+      <if test="windSpeed != null">
+        WIND_SPEED,
+      </if>
+      <if test="temperature != null">
+        TEMPERATURE,
+      </if>
+      <if test="windDir != null">
+        WIND_DIR,
+      </if>
+      <if test="humidity != null">
+        HUMIDITY,
+      </if>
+      <if test="airPressure != null">
+        AIR_PRESSURE,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="windplantNo != null">
+        #{windplantNo,jdbcType=DECIMAL},
+      </if>
+      <if test="nwpType != null">
+        #{nwpType,jdbcType=DECIMAL},
+      </if>
+      <if test="fileTime != null">
+        #{fileTime,jdbcType=DECIMAL},
+      </if>
+      <if test="dataTime != null">
+        #{dataTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="windSpeed != null">
+        #{windSpeed,jdbcType=FLOAT},
+      </if>
+      <if test="temperature != null">
+        #{temperature,jdbcType=FLOAT},
+      </if>
+      <if test="windDir != null">
+        #{windDir,jdbcType=FLOAT},
+      </if>
+      <if test="humidity != null">
+        #{humidity,jdbcType=FLOAT},
+      </if>
+      <if test="airPressure != null">
+        #{airPressure,jdbcType=FLOAT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.WfnwpdataExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from WF_NWP_DATA
+    <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 WF_NWP_DATA
+    <set>
+      <if test="record.windplantNo != null">
+        WINDPLANT_NO = #{record.windplantNo,jdbcType=DECIMAL},
+      </if>
+      <if test="record.nwpType != null">
+        NWP_TYPE = #{record.nwpType,jdbcType=DECIMAL},
+      </if>
+      <if test="record.fileTime != null">
+        FILE_TIME = #{record.fileTime,jdbcType=DECIMAL},
+      </if>
+      <if test="record.dataTime != null">
+        DATA_TIME = #{record.dataTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.windSpeed != null">
+        WIND_SPEED = #{record.windSpeed,jdbcType=FLOAT},
+      </if>
+      <if test="record.temperature != null">
+        TEMPERATURE = #{record.temperature,jdbcType=FLOAT},
+      </if>
+      <if test="record.windDir != null">
+        WIND_DIR = #{record.windDir,jdbcType=FLOAT},
+      </if>
+      <if test="record.humidity != null">
+        HUMIDITY = #{record.humidity,jdbcType=FLOAT},
+      </if>
+      <if test="record.airPressure != null">
+        AIR_PRESSURE = #{record.airPressure,jdbcType=FLOAT},
+      </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 WF_NWP_DATA
+    set WINDPLANT_NO = #{record.windplantNo,jdbcType=DECIMAL},
+      NWP_TYPE = #{record.nwpType,jdbcType=DECIMAL},
+      FILE_TIME = #{record.fileTime,jdbcType=DECIMAL},
+      DATA_TIME = #{record.dataTime,jdbcType=TIMESTAMP},
+      WIND_SPEED = #{record.windSpeed,jdbcType=FLOAT},
+      TEMPERATURE = #{record.temperature,jdbcType=FLOAT},
+      WIND_DIR = #{record.windDir,jdbcType=FLOAT},
+      HUMIDITY = #{record.humidity,jdbcType=FLOAT},
+      AIR_PRESSURE = #{record.airPressure,jdbcType=FLOAT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Wfnwpdata">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WF_NWP_DATA
+    <set>
+      <if test="windSpeed != null">
+        WIND_SPEED = #{windSpeed,jdbcType=FLOAT},
+      </if>
+      <if test="temperature != null">
+        TEMPERATURE = #{temperature,jdbcType=FLOAT},
+      </if>
+      <if test="windDir != null">
+        WIND_DIR = #{windDir,jdbcType=FLOAT},
+      </if>
+      <if test="humidity != null">
+        HUMIDITY = #{humidity,jdbcType=FLOAT},
+      </if>
+      <if test="airPressure != null">
+        AIR_PRESSURE = #{airPressure,jdbcType=FLOAT},
+      </if>
+    </set>
+    where WINDPLANT_NO = #{windplantNo,jdbcType=DECIMAL}
+      and NWP_TYPE = #{nwpType,jdbcType=DECIMAL}
+      and FILE_TIME = #{fileTime,jdbcType=DECIMAL}
+      and DATA_TIME = #{dataTime,jdbcType=TIMESTAMP}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Wfnwpdata">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WF_NWP_DATA
+    set WIND_SPEED = #{windSpeed,jdbcType=FLOAT},
+      TEMPERATURE = #{temperature,jdbcType=FLOAT},
+      WIND_DIR = #{windDir,jdbcType=FLOAT},
+      HUMIDITY = #{humidity,jdbcType=FLOAT},
+      AIR_PRESSURE = #{airPressure,jdbcType=FLOAT}
+    where WINDPLANT_NO = #{windplantNo,jdbcType=DECIMAL}
+      and NWP_TYPE = #{nwpType,jdbcType=DECIMAL}
+      and FILE_TIME = #{fileTime,jdbcType=DECIMAL}
+      and DATA_TIME = #{dataTime,jdbcType=TIMESTAMP}
+  </update>
+</mapper>

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

@@ -0,0 +1,333 @@
+<?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.WfstatperioddataMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Wfstatperioddata">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="WINDPLANT_NO" jdbcType="DECIMAL" property="windplantNo" />
+    <id column="DATA_TIME" jdbcType="TIMESTAMP" property="dataTime" />
+    <result column="P1" jdbcType="FLOAT" property="p1" />
+    <result column="P2" jdbcType="FLOAT" property="p2" />
+    <result column="P0" jdbcType="FLOAT" property="p0" />
+    <result column="AVG_WIND_SPEED" jdbcType="FLOAT" property="avgWindSpeed" />
+    <result column="AVG_TEMP" jdbcType="FLOAT" property="avgTemp" />
+    <result column="ENERGY" jdbcType="FLOAT" property="energy" />
+    <result column="DATA_FLAG" jdbcType="DECIMAL" property="dataFlag" />
+  </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.
+    -->
+    WINDPLANT_NO, DATA_TIME, P1, P2, P0, AVG_WIND_SPEED, AVG_TEMP, ENERGY, DATA_FLAG
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.WfstatperioddataExample" 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 WF_STAT_PERIOD_DATA
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="map" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from WF_STAT_PERIOD_DATA
+    where WINDPLANT_NO = #{windplantNo,jdbcType=DECIMAL}
+      and DATA_TIME = #{dataTime,jdbcType=TIMESTAMP}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WF_STAT_PERIOD_DATA
+    where WINDPLANT_NO = #{windplantNo,jdbcType=DECIMAL}
+      and DATA_TIME = #{dataTime,jdbcType=TIMESTAMP}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WfstatperioddataExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WF_STAT_PERIOD_DATA
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Wfstatperioddata">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WF_STAT_PERIOD_DATA (WINDPLANT_NO, DATA_TIME, P1, 
+      P2, P0, AVG_WIND_SPEED, AVG_TEMP, 
+      ENERGY, DATA_FLAG)
+    values (#{windplantNo,jdbcType=DECIMAL}, #{dataTime,jdbcType=TIMESTAMP}, #{p1,jdbcType=FLOAT}, 
+      #{p2,jdbcType=FLOAT}, #{p0,jdbcType=FLOAT}, #{avgWindSpeed,jdbcType=FLOAT}, #{avgTemp,jdbcType=FLOAT}, 
+      #{energy,jdbcType=FLOAT}, #{dataFlag,jdbcType=DECIMAL})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Wfstatperioddata">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WF_STAT_PERIOD_DATA
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="windplantNo != null">
+        WINDPLANT_NO,
+      </if>
+      <if test="dataTime != null">
+        DATA_TIME,
+      </if>
+      <if test="p1 != null">
+        P1,
+      </if>
+      <if test="p2 != null">
+        P2,
+      </if>
+      <if test="p0 != null">
+        P0,
+      </if>
+      <if test="avgWindSpeed != null">
+        AVG_WIND_SPEED,
+      </if>
+      <if test="avgTemp != null">
+        AVG_TEMP,
+      </if>
+      <if test="energy != null">
+        ENERGY,
+      </if>
+      <if test="dataFlag != null">
+        DATA_FLAG,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="windplantNo != null">
+        #{windplantNo,jdbcType=DECIMAL},
+      </if>
+      <if test="dataTime != null">
+        #{dataTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="p1 != null">
+        #{p1,jdbcType=FLOAT},
+      </if>
+      <if test="p2 != null">
+        #{p2,jdbcType=FLOAT},
+      </if>
+      <if test="p0 != null">
+        #{p0,jdbcType=FLOAT},
+      </if>
+      <if test="avgWindSpeed != null">
+        #{avgWindSpeed,jdbcType=FLOAT},
+      </if>
+      <if test="avgTemp != null">
+        #{avgTemp,jdbcType=FLOAT},
+      </if>
+      <if test="energy != null">
+        #{energy,jdbcType=FLOAT},
+      </if>
+      <if test="dataFlag != null">
+        #{dataFlag,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.WfstatperioddataExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from WF_STAT_PERIOD_DATA
+    <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 WF_STAT_PERIOD_DATA
+    <set>
+      <if test="record.windplantNo != null">
+        WINDPLANT_NO = #{record.windplantNo,jdbcType=DECIMAL},
+      </if>
+      <if test="record.dataTime != null">
+        DATA_TIME = #{record.dataTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.p1 != null">
+        P1 = #{record.p1,jdbcType=FLOAT},
+      </if>
+      <if test="record.p2 != null">
+        P2 = #{record.p2,jdbcType=FLOAT},
+      </if>
+      <if test="record.p0 != null">
+        P0 = #{record.p0,jdbcType=FLOAT},
+      </if>
+      <if test="record.avgWindSpeed != null">
+        AVG_WIND_SPEED = #{record.avgWindSpeed,jdbcType=FLOAT},
+      </if>
+      <if test="record.avgTemp != null">
+        AVG_TEMP = #{record.avgTemp,jdbcType=FLOAT},
+      </if>
+      <if test="record.energy != null">
+        ENERGY = #{record.energy,jdbcType=FLOAT},
+      </if>
+      <if test="record.dataFlag != null">
+        DATA_FLAG = #{record.dataFlag,jdbcType=DECIMAL},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WF_STAT_PERIOD_DATA
+    set WINDPLANT_NO = #{record.windplantNo,jdbcType=DECIMAL},
+      DATA_TIME = #{record.dataTime,jdbcType=TIMESTAMP},
+      P1 = #{record.p1,jdbcType=FLOAT},
+      P2 = #{record.p2,jdbcType=FLOAT},
+      P0 = #{record.p0,jdbcType=FLOAT},
+      AVG_WIND_SPEED = #{record.avgWindSpeed,jdbcType=FLOAT},
+      AVG_TEMP = #{record.avgTemp,jdbcType=FLOAT},
+      ENERGY = #{record.energy,jdbcType=FLOAT},
+      DATA_FLAG = #{record.dataFlag,jdbcType=DECIMAL}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Wfstatperioddata">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WF_STAT_PERIOD_DATA
+    <set>
+      <if test="p1 != null">
+        P1 = #{p1,jdbcType=FLOAT},
+      </if>
+      <if test="p2 != null">
+        P2 = #{p2,jdbcType=FLOAT},
+      </if>
+      <if test="p0 != null">
+        P0 = #{p0,jdbcType=FLOAT},
+      </if>
+      <if test="avgWindSpeed != null">
+        AVG_WIND_SPEED = #{avgWindSpeed,jdbcType=FLOAT},
+      </if>
+      <if test="avgTemp != null">
+        AVG_TEMP = #{avgTemp,jdbcType=FLOAT},
+      </if>
+      <if test="energy != null">
+        ENERGY = #{energy,jdbcType=FLOAT},
+      </if>
+      <if test="dataFlag != null">
+        DATA_FLAG = #{dataFlag,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where WINDPLANT_NO = #{windplantNo,jdbcType=DECIMAL}
+      and DATA_TIME = #{dataTime,jdbcType=TIMESTAMP}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Wfstatperioddata">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WF_STAT_PERIOD_DATA
+    set P1 = #{p1,jdbcType=FLOAT},
+      P2 = #{p2,jdbcType=FLOAT},
+      P0 = #{p0,jdbcType=FLOAT},
+      AVG_WIND_SPEED = #{avgWindSpeed,jdbcType=FLOAT},
+      AVG_TEMP = #{avgTemp,jdbcType=FLOAT},
+      ENERGY = #{energy,jdbcType=FLOAT},
+      DATA_FLAG = #{dataFlag,jdbcType=DECIMAL}
+    where WINDPLANT_NO = #{windplantNo,jdbcType=DECIMAL}
+      and DATA_TIME = #{dataTime,jdbcType=TIMESTAMP}
+  </update>
+</mapper>

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

@@ -0,0 +1,336 @@
+<?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.WfusptsperioddataMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Wfusptsperioddata">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="WINDPLANT_NO" jdbcType="DECIMAL" property="windplantNo" />
+    <id column="MODEL_NO" jdbcType="DECIMAL" property="modelNo" />
+    <id column="TIME_SCALE" jdbcType="DECIMAL" property="timeScale" />
+    <id column="DATA_TIME" jdbcType="TIMESTAMP" property="dataTime" />
+    <result column="WIND_SPEED" jdbcType="FLOAT" property="windSpeed" />
+    <result column="MOD_COEFF" jdbcType="FLOAT" property="modCoeff" />
+    <result column="POWER" jdbcType="FLOAT" property="power" />
+    <result column="MOD_POWER" jdbcType="FLOAT" property="modPower" />
+    <result column="DATA_FLAG" jdbcType="DECIMAL" property="dataFlag" />
+  </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.
+    -->
+    WINDPLANT_NO, MODEL_NO, TIME_SCALE, DATA_TIME, WIND_SPEED, MOD_COEFF, POWER, MOD_POWER, 
+    DATA_FLAG
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.WfusptsperioddataExample" 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 WF_USP_TS_PERIOD_DATA
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="map" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from WF_USP_TS_PERIOD_DATA
+    where WINDPLANT_NO = #{windplantNo,jdbcType=DECIMAL}
+      and MODEL_NO = #{modelNo,jdbcType=DECIMAL}
+      and TIME_SCALE = #{timeScale,jdbcType=DECIMAL}
+      and DATA_TIME = #{dataTime,jdbcType=TIMESTAMP}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WF_USP_TS_PERIOD_DATA
+    where WINDPLANT_NO = #{windplantNo,jdbcType=DECIMAL}
+      and MODEL_NO = #{modelNo,jdbcType=DECIMAL}
+      and TIME_SCALE = #{timeScale,jdbcType=DECIMAL}
+      and DATA_TIME = #{dataTime,jdbcType=TIMESTAMP}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WfusptsperioddataExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WF_USP_TS_PERIOD_DATA
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Wfusptsperioddata">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WF_USP_TS_PERIOD_DATA (WINDPLANT_NO, MODEL_NO, TIME_SCALE, 
+      DATA_TIME, WIND_SPEED, MOD_COEFF, 
+      POWER, MOD_POWER, DATA_FLAG
+      )
+    values (#{windplantNo,jdbcType=DECIMAL}, #{modelNo,jdbcType=DECIMAL}, #{timeScale,jdbcType=DECIMAL}, 
+      #{dataTime,jdbcType=TIMESTAMP}, #{windSpeed,jdbcType=FLOAT}, #{modCoeff,jdbcType=FLOAT}, 
+      #{power,jdbcType=FLOAT}, #{modPower,jdbcType=FLOAT}, #{dataFlag,jdbcType=DECIMAL}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Wfusptsperioddata">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WF_USP_TS_PERIOD_DATA
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="windplantNo != null">
+        WINDPLANT_NO,
+      </if>
+      <if test="modelNo != null">
+        MODEL_NO,
+      </if>
+      <if test="timeScale != null">
+        TIME_SCALE,
+      </if>
+      <if test="dataTime != null">
+        DATA_TIME,
+      </if>
+      <if test="windSpeed != null">
+        WIND_SPEED,
+      </if>
+      <if test="modCoeff != null">
+        MOD_COEFF,
+      </if>
+      <if test="power != null">
+        POWER,
+      </if>
+      <if test="modPower != null">
+        MOD_POWER,
+      </if>
+      <if test="dataFlag != null">
+        DATA_FLAG,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="windplantNo != null">
+        #{windplantNo,jdbcType=DECIMAL},
+      </if>
+      <if test="modelNo != null">
+        #{modelNo,jdbcType=DECIMAL},
+      </if>
+      <if test="timeScale != null">
+        #{timeScale,jdbcType=DECIMAL},
+      </if>
+      <if test="dataTime != null">
+        #{dataTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="windSpeed != null">
+        #{windSpeed,jdbcType=FLOAT},
+      </if>
+      <if test="modCoeff != null">
+        #{modCoeff,jdbcType=FLOAT},
+      </if>
+      <if test="power != null">
+        #{power,jdbcType=FLOAT},
+      </if>
+      <if test="modPower != null">
+        #{modPower,jdbcType=FLOAT},
+      </if>
+      <if test="dataFlag != null">
+        #{dataFlag,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.WfusptsperioddataExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from WF_USP_TS_PERIOD_DATA
+    <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 WF_USP_TS_PERIOD_DATA
+    <set>
+      <if test="record.windplantNo != null">
+        WINDPLANT_NO = #{record.windplantNo,jdbcType=DECIMAL},
+      </if>
+      <if test="record.modelNo != null">
+        MODEL_NO = #{record.modelNo,jdbcType=DECIMAL},
+      </if>
+      <if test="record.timeScale != null">
+        TIME_SCALE = #{record.timeScale,jdbcType=DECIMAL},
+      </if>
+      <if test="record.dataTime != null">
+        DATA_TIME = #{record.dataTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.windSpeed != null">
+        WIND_SPEED = #{record.windSpeed,jdbcType=FLOAT},
+      </if>
+      <if test="record.modCoeff != null">
+        MOD_COEFF = #{record.modCoeff,jdbcType=FLOAT},
+      </if>
+      <if test="record.power != null">
+        POWER = #{record.power,jdbcType=FLOAT},
+      </if>
+      <if test="record.modPower != null">
+        MOD_POWER = #{record.modPower,jdbcType=FLOAT},
+      </if>
+      <if test="record.dataFlag != null">
+        DATA_FLAG = #{record.dataFlag,jdbcType=DECIMAL},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WF_USP_TS_PERIOD_DATA
+    set WINDPLANT_NO = #{record.windplantNo,jdbcType=DECIMAL},
+      MODEL_NO = #{record.modelNo,jdbcType=DECIMAL},
+      TIME_SCALE = #{record.timeScale,jdbcType=DECIMAL},
+      DATA_TIME = #{record.dataTime,jdbcType=TIMESTAMP},
+      WIND_SPEED = #{record.windSpeed,jdbcType=FLOAT},
+      MOD_COEFF = #{record.modCoeff,jdbcType=FLOAT},
+      POWER = #{record.power,jdbcType=FLOAT},
+      MOD_POWER = #{record.modPower,jdbcType=FLOAT},
+      DATA_FLAG = #{record.dataFlag,jdbcType=DECIMAL}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Wfusptsperioddata">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WF_USP_TS_PERIOD_DATA
+    <set>
+      <if test="windSpeed != null">
+        WIND_SPEED = #{windSpeed,jdbcType=FLOAT},
+      </if>
+      <if test="modCoeff != null">
+        MOD_COEFF = #{modCoeff,jdbcType=FLOAT},
+      </if>
+      <if test="power != null">
+        POWER = #{power,jdbcType=FLOAT},
+      </if>
+      <if test="modPower != null">
+        MOD_POWER = #{modPower,jdbcType=FLOAT},
+      </if>
+      <if test="dataFlag != null">
+        DATA_FLAG = #{dataFlag,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where WINDPLANT_NO = #{windplantNo,jdbcType=DECIMAL}
+      and MODEL_NO = #{modelNo,jdbcType=DECIMAL}
+      and TIME_SCALE = #{timeScale,jdbcType=DECIMAL}
+      and DATA_TIME = #{dataTime,jdbcType=TIMESTAMP}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Wfusptsperioddata">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WF_USP_TS_PERIOD_DATA
+    set WIND_SPEED = #{windSpeed,jdbcType=FLOAT},
+      MOD_COEFF = #{modCoeff,jdbcType=FLOAT},
+      POWER = #{power,jdbcType=FLOAT},
+      MOD_POWER = #{modPower,jdbcType=FLOAT},
+      DATA_FLAG = #{dataFlag,jdbcType=DECIMAL}
+    where WINDPLANT_NO = #{windplantNo,jdbcType=DECIMAL}
+      and MODEL_NO = #{modelNo,jdbcType=DECIMAL}
+      and TIME_SCALE = #{timeScale,jdbcType=DECIMAL}
+      and DATA_TIME = #{dataTime,jdbcType=TIMESTAMP}
+  </update>
+</mapper>

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

@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.frame.mapper.auto.Wfychistorydata2Mapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Wfychistorydata2">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ANALOG_NO" jdbcType="DECIMAL" property="analogNo" />
+    <id column="DATA_TIME" jdbcType="TIMESTAMP" property="dataTime" />
+    <result column="YC_RAW_VAL" jdbcType="FLOAT" property="ycRawVal" />
+    <result column="YC_VAL" jdbcType="FLOAT" property="ycVal" />
+    <result column="DATA_FLAG" jdbcType="DECIMAL" property="dataFlag" />
+  </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.
+    -->
+    ANALOG_NO, DATA_TIME, YC_RAW_VAL, YC_VAL, DATA_FLAG
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.Wfychistorydata2Example" 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 WF_YC_HISTORY_DATA2
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="map" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from WF_YC_HISTORY_DATA2
+    where ANALOG_NO = #{analogNo,jdbcType=DECIMAL}
+      and DATA_TIME = #{dataTime,jdbcType=TIMESTAMP}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WF_YC_HISTORY_DATA2
+    where ANALOG_NO = #{analogNo,jdbcType=DECIMAL}
+      and DATA_TIME = #{dataTime,jdbcType=TIMESTAMP}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.Wfychistorydata2Example">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WF_YC_HISTORY_DATA2
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Wfychistorydata2">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WF_YC_HISTORY_DATA2 (ANALOG_NO, DATA_TIME, YC_RAW_VAL, 
+      YC_VAL, DATA_FLAG)
+    values (#{analogNo,jdbcType=DECIMAL}, #{dataTime,jdbcType=TIMESTAMP}, #{ycRawVal,jdbcType=FLOAT}, 
+      #{ycVal,jdbcType=FLOAT}, #{dataFlag,jdbcType=DECIMAL})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Wfychistorydata2">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WF_YC_HISTORY_DATA2
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="analogNo != null">
+        ANALOG_NO,
+      </if>
+      <if test="dataTime != null">
+        DATA_TIME,
+      </if>
+      <if test="ycRawVal != null">
+        YC_RAW_VAL,
+      </if>
+      <if test="ycVal != null">
+        YC_VAL,
+      </if>
+      <if test="dataFlag != null">
+        DATA_FLAG,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="analogNo != null">
+        #{analogNo,jdbcType=DECIMAL},
+      </if>
+      <if test="dataTime != null">
+        #{dataTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ycRawVal != null">
+        #{ycRawVal,jdbcType=FLOAT},
+      </if>
+      <if test="ycVal != null">
+        #{ycVal,jdbcType=FLOAT},
+      </if>
+      <if test="dataFlag != null">
+        #{dataFlag,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.Wfychistorydata2Example" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from WF_YC_HISTORY_DATA2
+    <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 WF_YC_HISTORY_DATA2
+    <set>
+      <if test="record.analogNo != null">
+        ANALOG_NO = #{record.analogNo,jdbcType=DECIMAL},
+      </if>
+      <if test="record.dataTime != null">
+        DATA_TIME = #{record.dataTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.ycRawVal != null">
+        YC_RAW_VAL = #{record.ycRawVal,jdbcType=FLOAT},
+      </if>
+      <if test="record.ycVal != null">
+        YC_VAL = #{record.ycVal,jdbcType=FLOAT},
+      </if>
+      <if test="record.dataFlag != null">
+        DATA_FLAG = #{record.dataFlag,jdbcType=DECIMAL},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WF_YC_HISTORY_DATA2
+    set ANALOG_NO = #{record.analogNo,jdbcType=DECIMAL},
+      DATA_TIME = #{record.dataTime,jdbcType=TIMESTAMP},
+      YC_RAW_VAL = #{record.ycRawVal,jdbcType=FLOAT},
+      YC_VAL = #{record.ycVal,jdbcType=FLOAT},
+      DATA_FLAG = #{record.dataFlag,jdbcType=DECIMAL}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Wfychistorydata2">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WF_YC_HISTORY_DATA2
+    <set>
+      <if test="ycRawVal != null">
+        YC_RAW_VAL = #{ycRawVal,jdbcType=FLOAT},
+      </if>
+      <if test="ycVal != null">
+        YC_VAL = #{ycVal,jdbcType=FLOAT},
+      </if>
+      <if test="dataFlag != null">
+        DATA_FLAG = #{dataFlag,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where ANALOG_NO = #{analogNo,jdbcType=DECIMAL}
+      and DATA_TIME = #{dataTime,jdbcType=TIMESTAMP}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Wfychistorydata2">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WF_YC_HISTORY_DATA2
+    set YC_RAW_VAL = #{ycRawVal,jdbcType=FLOAT},
+      YC_VAL = #{ycVal,jdbcType=FLOAT},
+      DATA_FLAG = #{dataFlag,jdbcType=DECIMAL}
+    where ANALOG_NO = #{analogNo,jdbcType=DECIMAL}
+      and DATA_TIME = #{dataTime,jdbcType=TIMESTAMP}
+  </update>
+</mapper>