手机后台升级整合

pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.example</groupId>
@@ -23,8 +23,9 @@
 		<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>
 	</properties>
-	
+
 	<!-- https://mvnrepository.com/ 查找jar网站 -->
 	<dependencies>
 		<!-- SpringBoot Web容器 -->
@@ -32,12 +33,14 @@
 			<groupId>org.springframework.boot</groupId>
 			<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>-->
+<!--		<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>
@@ -94,6 +97,17 @@
 			<artifactId>pagehelper-spring-boot-starter</artifactId>
 			<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>
+			<artifactId>pagehelper-spring-boot-starter</artifactId>
+			<version>1.2.5</version>
+		</dependency>
 		<!-- mysql驱动7.0-->
 		<dependency>
 			<groupId>mysql</groupId>
@@ -109,11 +123,14 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-websocket</artifactId>
 		</dependency>
-
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-websocket</artifactId>
+		</dependency>
 		<!-- mysql驱动8.0
-		 <dependency> 
-		 	<groupId>mysql</groupId> 
-		 	<artifactId>mysql-connector-java</artifactId> 
+		 <dependency>
+		 	<groupId>mysql</groupId>
+		 	<artifactId>mysql-connector-java</artifactId>
 			<version>8.0.11</version>
 		 </dependency>
 		 -->
@@ -194,12 +211,12 @@
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.apache.velocity/velocity -->
 		<dependency>
-		    <groupId>org.apache.velocity</groupId>
-		    <artifactId>velocity</artifactId>
-		    <version>1.7</version>
+			<groupId>org.apache.velocity</groupId>
+			<artifactId>velocity</artifactId>
+			<version>1.7</version>
 		</dependency>
 		<!-- websocket -->
-		 <dependency>
+		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-websocket</artifactId>
 		</dependency>
@@ -215,28 +232,28 @@
 			<artifactId>spring-boot-configuration-processor</artifactId>
 			<optional>true</optional>
 		</dependency>
-		
+
 		<!-- mail -->
 		<dependency>
-		    <groupId>javax.mail</groupId>
-		    <artifactId>mail</artifactId>
-		    <version>1.4.7</version>
+			<groupId>javax.mail</groupId>
+			<artifactId>mail</artifactId>
+			<version>1.4.7</version>
 		</dependency>
-		
+
 		<!--百度UEditor依赖的jar包 -->
-<!--		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-			<version>20180813</version>
-		</dependency>-->
+		<!--		<dependency>
+                    <groupId>org.json</groupId>
+                    <artifactId>json</artifactId>
+                    <version>20180813</version>
+                </dependency>-->
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
 			<version>1.9</version>
 		</dependency>
 		<dependency>
-			 <groupId>ueditor</groupId>
-			 <artifactId>1.1.2</artifactId>
+			<groupId>ueditor</groupId>
+			<artifactId>1.1.2</artifactId>
 			<version>1.8</version>
 			<scope>system</scope>
 			<systemPath>${project.basedir}/src/main/resources/lib/ueditor-1.1.2.jar</systemPath>
@@ -259,10 +276,10 @@
 			<artifactId>spring-boot-configuration-processor</artifactId>
 			<optional>true</optional>
 		</dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.mongodb</groupId>
 			<artifactId>mongo-java-driver</artifactId>
@@ -294,6 +311,27 @@
 			<artifactId>mybatis-plus-extension</artifactId>
 			<version>3.3.2</version>
 		</dependency>
+
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-juli</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-core</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-el</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-websocket</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
 	</dependencies>
 
 
@@ -343,7 +381,6 @@
 	<build>
 		<plugins>
 
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
@@ -353,26 +390,36 @@
 				</configuration>
 			</plugin>
 			<!-- generator 配置-->
-			<!--<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>com.oracle</groupId>-->
-						<!--<artifactId>ojdbc6</artifactId>-->
-						<!--<version>11.2.0.3</version>-->
-					<!--</dependency>-->
-				<!--</dependencies>-->
-			<!--</plugin>-->
+			<plugin>
+				<groupId>org.mybatis.generator</groupId>
+				<artifactId>mybatis-generator-maven-plugin</artifactId>
+				<version>1.3.7</version>
+				<configuration>
+					<!--允许移动生成的文件 -->
+					<verbose>false</verbose>
+					<!--允许覆盖生成的文件 -->
+					<overwrite>false</overwrite>
+					<!--配置文件的路径 -->
+					<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>
@@ -409,19 +456,19 @@
 			</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>-->
+		<!-- <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/MpGenerator.java

@@ -29,7 +29,7 @@ public class MpGenerator {
     //作者
     private static String authorName = "chenmh";
     //要生成的表名
-    private static String[] tables = {""};
+    private static String[] tables = {"GYEEPERMISSION","GYEECONTACTS"};
     //table前缀
     private static String prefix = "";
 
@@ -68,7 +68,7 @@ public class MpGenerator {
                     // 自定义数据库表字段类型转换【可选】
                     //@Override
                     //public DbColumnType processTypeConvert(String fieldType) {
-                    //System.out.println("转换类型：" + fieldType);
+                    ////System.out.println("转换类型：" + fieldType);
                     // if ( fieldType.toLowerCase().contains( "tinyint" ) ) {
                     //    return DbColumnType.BOOLEAN;
                     // }

src/main/java/com/gyee/SpringbootStart.java

@@ -20,6 +20,6 @@ public class SpringbootStart {
     	
         SpringApplication.run(SpringbootStart.class, args);
 
-        System.out.println("******************项目启动完成*************************");
+        //System.out.println("******************项目启动完成*************************");
     }
 }

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

@@ -28,7 +28,7 @@ public class SqlSeverTicket {
         try {
             Class.forName(driverName);
             conn = DriverManager.getConnection(dbURL, userName, userPwd);
-            System.out.println("Connection Successful!");
+            //System.out.println("Connection Successful!");
             //如果连接成功 控制台输出Connection  Successful!
 //            Map<String, List> labor = getLabor(conn);
 //            setLabor(conn, labor);
@@ -142,7 +142,7 @@ public class SqlSeverTicket {
         try{
             fis = new FileInputStream(file);
         }catch(FileNotFoundException e){
-            System.out.println("Not find file!");
+            //System.out.println("Not find file!");
         }
         try{
 //            PreparedStatement ps = conn.prepareStatement("Insert into SIGNPICTURE (IMAGE) values (?)");
@@ -151,9 +151,9 @@ public class SqlSeverTicket {
             ps.executeUpdate();
             ps.close();
             fis.close();
-            System.out.println("写进去了！");
+            //System.out.println("写进去了！");
         }catch(Exception e){
-            System.out.println("fis cann't cloase!");
+            //System.out.println("fis cann't cloase!");
         }
     }
 

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

@@ -26,7 +26,8 @@ public class RedisConfig
 
         JedisPoolConfig jedisPoolConfig = new JedisPoolConfig();
         jedisPoolConfig.setMaxIdle(2000);
-        jedisPoolConfig.setMaxWaitMillis(500);
+        jedisPoolConfig.setMaxTotal(20000);
+        jedisPoolConfig.setMaxWaitMillis(5000);
 
         // 是否启用pool的jmx管理功能, 默认true
         jedisPoolConfig.setJmxEnabled(true);
@@ -39,8 +40,8 @@ public class RedisConfig
 
         JedisPoolConfig jedisPoolConfig = new JedisPoolConfig();
         jedisPoolConfig.setMaxIdle(2000);
-        jedisPoolConfig.setMaxWaitMillis(500);
-
+        jedisPoolConfig.setMaxWaitMillis(5000);
+        jedisPoolConfig.setMaxTotal(20000);
         // 是否启用pool的jmx管理功能, 默认true
         jedisPoolConfig.setJmxEnabled(true);
         JedisPool jedisPool = new JedisPool(jedisPoolConfig, redis_ls_ip, redis_ls_port);

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

@@ -36,6 +36,17 @@ public class V2Config
     private static String demoEnabled;
     /** 滚动验证码 **/
     private static Boolean rollVerification;
+    /** 实时数据库 **/
+    private  static String realtimedataBase;
+
+    public static String getRealtimedataBase() {
+        return realtimedataBase;
+    }
+
+    public static void setRealtimedataBase(String realtimedataBase) {
+        V2Config.realtimedataBase = realtimedataBase;
+    }
+
     public String getName()
     {
         return name;

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

@@ -84,7 +84,7 @@ public class CacheConfig {
             rv=bao.toByteArray();
 
         }catch(Exception e){
-              System.out.println(e.getMessage());
+             // //System.out.println(e.getMessage());
               e.printStackTrace();
         }
         return rv;

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

@@ -17,5 +17,5 @@ public @interface DataSource {
 	/**
      * 切换数据源名称
      */
-	DataSourceType value() default DataSourceType.TICKET;
+	DataSourceType value() default DataSourceType.MASTER;
 }

src/main/java/com/gyee/frame/common/interceptor/MyInterceptor.java

@@ -110,19 +110,19 @@ public class MyInterceptor  implements HandlerInterceptor {
 	/*************演示模式需要 end*************/
 	@Override
 	public void afterCompletion(HttpServletRequest arg0, HttpServletResponse arg1, Object arg2, Exception arg3)throws Exception {
-		// System.out.println(">>>MyInterceptor1>>>>>>>在整个请求结束之后被调用，也就是在DispatcherServlet 渲染了对应的视图之后执行（主要是用于进行资源清理工作）");
+		// //System.out.println(">>>MyInterceptor1>>>>>>>在整个请求结束之后被调用，也就是在DispatcherServlet 渲染了对应的视图之后执行（主要是用于进行资源清理工作）");
 	}
 
 	@Override
 	public void postHandle(HttpServletRequest arg0, HttpServletResponse arg1, Object arg2, ModelAndView arg3)throws Exception {
-		// System.out.println(">>>MyInterceptor1>>>>>>>请求处理之后进行调用，但是在视图被渲染之前（Controller方法调用之后）");
+		// //System.out.println(">>>MyInterceptor1>>>>>>>请求处理之后进行调用，但是在视图被渲染之前（Controller方法调用之后）");
 	}
 
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object arg2) throws Exception {
 		//String url2=request.getScheme()+"://"+ request.getServerName();
-		//System.out.println("xxxxxxxxx==="+"http://localhost:8081/");
-		//System.out.println(">>>MyInterceptor1>>>>>>>在请求处理之前进行调用（Controller方法调用之前）");
+		////System.out.println("xxxxxxxxx==="+"http://localhost:8081/");
+		////System.out.println(">>>MyInterceptor1>>>>>>>在请求处理之前进行调用（Controller方法调用之前）");
 		//设置前端的全局 地址，如果前端网页错乱请修改这儿
 
 		// by Wang Jiawen 2020-01-07 临时补丁  调试需要暂时取消shiro大管家的登入限制

src/main/java/com/gyee/frame/common/interceptor/MyWebAppConfigurer.java

@@ -23,22 +23,20 @@ public class MyWebAppConfigurer  extends  WebMvcConfigurationSupport  {
 	/** 解决跨域问题 **/
 	@Override
 	public void addCorsMappings(CorsRegistry registry){
-
-		registry.addMapping("/**")
-		// 设置允许跨域请求的域名
-		.allowedOrigins("*")
-		// 设置允许跨域的header
-		.allowedHeaders("*")
-		// 是否允许证书
-		.allowCredentials(true)
-		// 设置允许的方法
-		.allowedMethods("GET", "POST", "DELETE", "PUT")
-		// 设置允许的header属性
-		.allowedHeaders("*")
-		// 跨域允许时间
-		.maxAge(3600);
-		super.addCorsMappings(registry);
-
+		/*
+			registry.addMapping("/**")
+			// 设置允许跨域请求的域名
+			.allowedOrigins("*")
+			// 是否允许证书
+			.allowCredentials(true)
+			// 设置允许的方法
+			.allowedMethods("GET", "POST", "DELETE", "PUT")
+			// 设置允许的header属性
+			.allowedHeaders("*")
+			// 跨域允许时间
+			.maxAge(3600);
+			super.addCorsMappings(registry);
+		*/
 	}
 	
 	/** 添加拦截器 **/

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

@@ -117,9 +117,9 @@ public class LogAspect
             // 处理设置注解上的参数
             getControllerMethodDescription(controllerLog, operLog);
             // 保存数据库
-            //System.out.println("-----------------");
-            //System.out.println(new Gson().toJson(operLog));
-            //System.out.println("-----------------");
+            ////System.out.println("-----------------");
+            ////System.out.println(new Gson().toJson(operLog));
+            ////System.out.println("-----------------");
             operLogService.insertSelective(operLog);
         }
         catch (Exception exp)

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

@@ -1,19 +1,16 @@
 package com.gyee.frame.common.quartz;
 
 import cn.hutool.core.exceptions.ExceptionUtil;
-
-import com.gyee.frame.common.spring.SpringUtils;
 import com.gyee.frame.model.auto.SysQuartzJob;
 import com.gyee.frame.model.auto.SysQuartzJobLog;
-import com.gyee.frame.service.SysQuartzJobLogService;
 import com.gyee.frame.util.StringUtils;
-
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
+
 import java.util.Date;
 
 /**
@@ -61,7 +58,7 @@ public abstract class AbstractQuartzJob implements Job {
      */
     protected void before(JobExecutionContext context, SysQuartzJob sysJob)
     {
-        System.out.println(new Date());
+     //   //System.out.println(new Date());
         threadLocal.set(new Date());
     }
 
@@ -95,7 +92,7 @@ public abstract class AbstractQuartzJob implements Job {
             sysJobLog.setStatus(ScheduleConstants.SUCCESS_STATUS);
         }
         //  这里获取service然后插入库中
-        SpringUtils.getBean(SysQuartzJobLogService.class).insertSelective(sysJobLog);
+       // SpringUtils.getBean(SysQuartzJobLogService.class).insertSelective(sysJobLog);
     }
 
     /**

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

@@ -1,22 +1,21 @@
 package com.gyee.frame.common.quartz;
 
+import com.gyee.frame.model.auto.SysQuartzJob;
+import com.gyee.frame.model.auto.SysQuartzJobExample;
+import com.gyee.frame.service.SysQuartzJobService;
 import com.gyee.frame.util.DateUtils;
+import com.gyee.frame.util.StringUtils;
 import org.quartz.*;
 import org.quartz.impl.JobDetailImpl;
 import org.quartz.impl.matchers.GroupMatcher;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
-import com.gyee.frame.model.auto.SysQuartzJob;
-import com.gyee.frame.model.auto.SysQuartzJobExample;
-import com.gyee.frame.service.SysQuartzJobService;
-import com.gyee.frame.util.StringUtils;
 
+import javax.annotation.PostConstruct;
 import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Set;
 
-import javax.annotation.PostConstruct;
-
 /**
  * @CLASSNAME QuartzConfig
  * @Description  Quartz配置类
@@ -96,7 +95,7 @@ public class QuartzSchedulerUtil {
         scheduler.start();
     } catch (SchedulerException e) {
         e.printStackTrace();
-        System.out.println("定时任务执行失败");
+        //System.out.println("定时任务执行失败");
     }
 }
 
@@ -195,9 +194,9 @@ public class QuartzSchedulerUtil {
                 bl = true;
             }
         } catch (SchedulerException e) {
-            System.out.println("继续调度任务异常:" + e);
+            //System.out.println("继续调度任务异常:" + e);
         } catch (Exception e) {
-            System.out.println("继续调度任务异常:" + e);
+            //System.out.println("继续调度任务异常:" + e);
         }
         return bl;
     }
@@ -218,9 +217,9 @@ public class QuartzSchedulerUtil {
                 bl = true;
             }
         } catch (SchedulerException e) {
-            System.out.println("删除调度任务异常:" + e);
+            //System.out.println("删除调度任务异常:" + e);
         } catch (Exception e) {
-            System.out.println("删除调度任务异常:" + e);
+            //System.out.println("删除调度任务异常:" + e);
         }
         return bl;
     }
@@ -259,9 +258,9 @@ public class QuartzSchedulerUtil {
                 bl = true;
             }
         } catch (SchedulerException e) {
-             System.out.println("暂停调度任务异常:" + e);
+             //System.out.println("暂停调度任务异常:" + e);
         } catch (Exception e) {
-        	 System.out.println("暂停调度任务异常:"+ e);
+        	 //System.out.println("暂停调度任务异常:"+ e);
         }
         return bl;
     }
@@ -304,9 +303,9 @@ public class QuartzSchedulerUtil {
                  //获取trigger拥有的Job
                  JobKey jobKey =trigger.getJobKey();
                  JobDetailImpl jobDetail2 = (JobDetailImpl) scheduler.getJobDetail(jobKey);
-                 System.out.println(groupName);
-                 System.out.println(jobDetail2.getName());
-                 System.out.println(trigger.getCronExpression());
+//                 //System.out.println(groupName);
+//                 //System.out.println(jobDetail2.getName());
+//                 //System.out.println(trigger.getCronExpression());
         	 }
         }
 

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

@@ -1,15 +1,11 @@
 package com.gyee.frame.common.quartz;
 
-import com.gyee.frame.common.quartz.QuartzSchedulerUtil;
 import com.gyee.frame.common.spring.SpringUtils;
 import com.gyee.frame.model.auto.SysQuartzJob;
 import com.gyee.frame.model.auto.SysQuartzJobExample;
 import com.gyee.frame.service.SysQuartzJobService;
-import lombok.AllArgsConstructor;
 import org.quartz.SchedulerException;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Service;
 
 import java.util.List;
 
@@ -63,8 +59,12 @@ public class SocketTaskUtil {
         }
         this.deleteJob(sysQuartzJob1);//符合标准步骤删除-创建-启动流程
         try {
+           // //System.out.println(sysQuartzJob1.getJobName());
+
             sysQuartzJob1.setStatus(0);//开启任务
             quartzSchedulerUtil.createSchedule(sysQuartzJob1);
+
+            //startJob(sysQuartzJob1);
         } catch (SchedulerException e) {
             e.printStackTrace();
         }
@@ -81,6 +81,10 @@ public class SocketTaskUtil {
                 break;
             }
         }
-        this.deleteJob(sysQuartzJob1);
+        if(sysQuartzJob1!=null)
+        {
+            this.deleteJob(sysQuartzJob1);
+        }
+
     }
 }

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

@@ -30,7 +30,7 @@ public class Index_target_comprehensive_indicators {
      */
     public void index_target_comprehensive_indicators() throws Exception {
     	indexService.index_target_comprehensive_indicators();//调用list方法完成对 key ："weatherProphet_1" ，路径"weather/weatherProphet_1"的推送     
-        //System.out.println("我已执行");
+        ////System.out.println("我已执行");
     }   
        
 
@@ -45,7 +45,7 @@ public class Index_target_comprehensive_indicators {
     {
     	//List<TsysUser> list=  tsysUserMapper.selectByExample(new TsysUserExample());
     	//System.err.println("用户查询num："+list.size());
-        System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
+        //System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
     }
 
 }

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

@@ -23,7 +23,7 @@ public class Index_windSpeed_power_target_detail {
      */
     public void index_windSpeed_power_target_detail() throws Exception {
         windspeedpowermodule.index_windSpeed_power_target_detail();//调用list方法完成对 key ："weatherProphet_1" ，路径"weather/weatherProphet_1"的推送
-        //System.out.println("我已执行");
+        ////System.out.println("我已执行");
     }
 
 
@@ -38,6 +38,6 @@ public class Index_windSpeed_power_target_detail {
     {
         //List<TsysUser> list=  tsysUserMapper.selectByExample(new TsysUserExample());
         //System.err.println("用户查询num："+list.size());
-        System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
+        //System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
     }
 }

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

@@ -22,7 +22,7 @@ public class Targetdetail_curve {
      */
     public void targetdetail_curve() throws Exception {
         targetdetailService.targetdetail_curve();//调用list方法完成对 key ："weatherProphet_1" ，路径"weather/weatherProphet_1"的推送
-        //System.out.println("我已执行");
+        ////System.out.println("我已执行");
     }
 
 
@@ -37,7 +37,7 @@ public class Targetdetail_curve {
     {
     	//List<TsysUser> list=  tsysUserMapper.selectByExample(new TsysUserExample());
     	//System.err.println("用户查询num："+list.size());
-        System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
+        //System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
     }
 
 }

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

@@ -22,7 +22,7 @@ public class Targetdetail_histogram {
      */
     public void targetdetail_histogram() throws Exception {
         targetdetailService.targetdetail_histogram();//调用list方法完成对 key ："weatherProphet_1" ，路径"weather/weatherProphet_1"的推送
-        //System.out.println("我已执行");
+        ////System.out.println("我已执行");
     }
 
 
@@ -37,7 +37,7 @@ public class Targetdetail_histogram {
     {
     	//List<TsysUser> list=  tsysUserMapper.selectByExample(new TsysUserExample());
     	//System.err.println("用户查询num："+list.size());
-        System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
+        //System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
     }
 
 }

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

@@ -25,7 +25,7 @@ public class Targetdetail_target {
      */
     public void targetdetail_target() throws Exception {
         targetdetailService.targetdetail_target();//调用list方法完成对 key ："weatherProphet_1" ，路径"weather/weatherProphet_1"的推送
-        //System.out.println("我已执行");
+        ////System.out.println("我已执行");
     }
 
 
@@ -40,7 +40,7 @@ public class Targetdetail_target {
     {
     	//List<TsysUser> list=  tsysUserMapper.selectByExample(new TsysUserExample());
     	//System.err.println("用户查询num："+list.size());
-        System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
+        //System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
     }
 
 }

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

@@ -21,7 +21,7 @@ public class V2Task {
      */
     public void runTask1()
     {
-        System.out.println("正在执行定时任务，无参方法");
+        //System.out.println("正在执行定时任务，无参方法");
     }
 
     /**
@@ -34,7 +34,7 @@ public class V2Task {
     {
     	//List<TsysUser> list=  tsysUserMapper.selectByExample(new TsysUserExample());
     	//System.err.println("用户查询num："+list.size());
-        System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
+        //System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
         
 
     }

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

@@ -28,7 +28,7 @@ public class WeatherfdPushTask_1 {
      */
     public void runTaskProphet_1() throws ParseException {
         weatherfdService.listProphet1();//调用list方法完成对 key ："weatherProphet_1" ，路径"weather/weatherProphet_1"的推送     
-        //System.out.println("我已执行");
+        ////System.out.println("我已执行");
     }   
        
 
@@ -43,7 +43,7 @@ public class WeatherfdPushTask_1 {
     {
     	//List<TsysUser> list=  tsysUserMapper.selectByExample(new TsysUserExample());
     	//System.err.println("用户查询num："+list.size());
-        System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
+        //System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
     }
 
 }

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

@@ -26,7 +26,7 @@ public class WeatherfdPushTask_40 {
      */
     public void runTaskProphet_40() throws ParseException {
         weatherfdService.listProphet40();//调用list方法完成对 key ："weatherProphet_40" ，路径"weather/weatherProphet_40"的推送
-        //System.out.println("我已执行");
+        ////System.out.println("我已执行");
     }
     /**
      * 有参任务
@@ -38,7 +38,7 @@ public class WeatherfdPushTask_40 {
     {
         //List<TsysUser> list=  tsysUserMapper.selectByExample(new TsysUserExample());
         //System.err.println("用户查询num："+list.size());
-        System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
+        //System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
     }
 
 }

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

@@ -31,7 +31,7 @@ public class WeatherfdPushTask_7 {
         
     public void runTaskProphet_7() throws ParseException {        
         weatherfdService.listProphet7();//调用list方法完成对 key ："weatherProphet_7" ，路径"weather/weatherProphet_7"的推送
-        //System.out.println("我已执行");
+        ////System.out.println("我已执行");
     }
 
     /**
@@ -44,7 +44,7 @@ public class WeatherfdPushTask_7 {
     {
     	//List<TsysUser> list=  tsysUserMapper.selectByExample(new TsysUserExample());
     	//System.err.println("用户查询num："+list.size());
-        System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
+        //System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
     }
 
 }

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

@@ -30,7 +30,7 @@ public class WeatherfdPushTask_8_15 {
 	
 	 public void runTaskProphet_8_15() throws ParseException {        
 	        weatherfdService.listProphet8_15();//调用list方法完成对 key ："weatherProphet_8_15" ，路径"weather/weatherProphet_8_15"的推送
-	        //System.out.println("我已执行");
+	        ////System.out.println("我已执行");
 	    }
 
 	    /**
@@ -43,7 +43,7 @@ public class WeatherfdPushTask_8_15 {
 	    {
 	    	//List<TsysUser> list=  tsysUserMapper.selectByExample(new TsysUserExample());
 	    	//System.err.println("用户查询num："+list.size());
-	        System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
+	        //System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
 	    }
 
 }

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

@@ -33,7 +33,7 @@ public class WeatherfhPushTask_7Day_17Hour {
         
     public void runTaskProphet_17() throws ParseException {        
         weatherfhService.listProphet7Day_17Hour();;//调用list方法完成对 key ："weatherProphet_7_17Hour" ，路径"weather/weatherProphet_7_17Hour"的推送
-        //System.out.println("我已执行");
+        ////System.out.println("我已执行");
     }
 
     /**
@@ -46,7 +46,7 @@ public class WeatherfhPushTask_7Day_17Hour {
     {
     	//List<TsysUser> list=  tsysUserMapper.selectByExample(new TsysUserExample());
     	//System.err.println("用户查询num："+list.size());
-        System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
+        //System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
     }
 
 }

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

@@ -1,5 +1,7 @@
 package com.gyee.frame.common.quartz.task;
 
+import com.gyee.frame.model.auto.Windpowerstation;
+import com.gyee.frame.service.app.targetdetail.TargetdetailService;
 import com.gyee.frame.service.app.windpowerstationdetail.WindpowerstationdetailService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -22,7 +24,7 @@ public class Windpowerstationdetail_comprehensive_target {
      */
     public void windpowerstationdetail_comprehensive_target() throws Exception {
         windpowerstationdetailService.windpowerstationdetail_comprehensive_target();//调用list方法完成对 key ："weatherProphet_1" ，路径"weather/weatherProphet_1"的推送
-        //System.out.println("我已执行");
+        ////System.out.println("我已执行");
     }
 
 
@@ -37,7 +39,7 @@ public class Windpowerstationdetail_comprehensive_target {
     {
         //List<TsysUser> list=  tsysUserMapper.selectByExample(new TsysUserExample());
         //System.err.println("用户查询num："+list.size());
-        System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
+        //System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
     }
 
 }

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

@@ -22,7 +22,7 @@ public class Windpowerstationdetail_sevendaycolumn_target {
      */
     public void windpowerstationdetail_sevendaycolumn_target() throws Exception {
         windspeedpowercurvedetail.windpowerstationdetail_sevendaycolumn_target();//调用list方法完成对 key ："weatherProphet_1" ，路径"weather/weatherProphet_1"的推送
-        //System.out.println("我已执行");
+        ////System.out.println("我已执行");
     }
 
 
@@ -37,6 +37,6 @@ public class Windpowerstationdetail_sevendaycolumn_target {
     {
         //List<TsysUser> list=  tsysUserMapper.selectByExample(new TsysUserExample());
         //System.err.println("用户查询num："+list.size());
-        System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
+        //System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
     }
 }

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

@@ -22,7 +22,7 @@ public class Windpowerstationdetail_springbox_target {
      */
     public void windpowerstationdetail_springbox_target() throws Exception {
         windpowerstationdetailService.windpowerstationdetail_springbox_target();//调用list方法完成对 key ："weatherProphet_1" ，路径"weather/weatherProphet_1"的推送
-        //System.out.println("我已执行");
+        ////System.out.println("我已执行");
     }
 
 
@@ -37,6 +37,6 @@ public class Windpowerstationdetail_springbox_target {
     {
         //List<TsysUser> list=  tsysUserMapper.selectByExample(new TsysUserExample());
         //System.err.println("用户查询num："+list.size());
-        System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
+        //System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
     }
 }

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

@@ -1,6 +1,5 @@
 package com.gyee.frame.common.quartz.task;
 
-import com.gyee.frame.service.app.targetdetail.TargetdetailService;
 import com.gyee.frame.service.app.windpowerstationdetail.Windspeedpowercurvedetail;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -12,33 +11,36 @@ import java.util.Date;
  * @CLASSNAME   WeatherfdPushTask
  * @Description 向页面预测今天24小时气象推送数据
  * @Auther Li ZaiXun
- * @DATE 2020/1/2 15:33
- */
+ * @DATE 2020/1/2 15:33*/
+
+
 @Component("windpowerstationdetail_twentyfourhourlinechart_target")
 public class Windpowerstationdetail_twentyfourhourlinechart_target {
     @Autowired
     private Windspeedpowercurvedetail windspeedpowercurvedetail;
-    /**
-     * 无参的任务
-     */
+/**
+     * 无参的任务*/
+
+
     public void windpowerstationdetail_twentyfourhourlinechart_target() throws Exception {
         windspeedpowercurvedetail.windpowerstationdetail_twentyfourhourlinechart_target();//调用list方法完成对 key ："weatherProphet_1" ，路径"weather/weatherProphet_1"的推送
-        //System.out.println("我已执行");
+        ////System.out.println("我已执行");
     }
 
 
-    /**
+/**
      * 有参任务
      * 目前仅执行常见的数据类型  Integer Long  带L  string  带 ''  bool Double 带 d
      * @param a
      * @param b
-     *
-     */
+     **/
+
+
     public void runTask2(Integer a,Long b,String c,Boolean d,Double e)
     {
         //List<TsysUser> list=  tsysUserMapper.selectByExample(new TsysUserExample());
         //System.err.println("用户查询num："+list.size());
-        System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
+        //System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
     }
 
 }

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

@@ -20,7 +20,7 @@ public class index_curve_columnar_five_loss {
      */
     public void index_curve_columnar_five_loss() throws Exception {
     	indexDetailService.index_curve_columnar_five_loss();//调用list方法完成对 key ："weatherProphet_1" ，路径"weather/weatherProphet_1"的推送     
-        //System.out.println("我已执行");
+        ////System.out.println("我已执行");
     }   
        
 
@@ -35,7 +35,7 @@ public class index_curve_columnar_five_loss {
     {
     	//List<TsysUser> list=  tsysUserMapper.selectByExample(new TsysUserExample());
     	//System.err.println("用户查询num："+list.size());
-        System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
+        //System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
     }
 
 }

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

@@ -13,30 +13,30 @@ import java.util.Date;
 @Component("index_curve_columnar_windSpeed_power")
 public class index_curve_columnar_windSpeed_power {
 
-	@Autowired
+    @Autowired
     private IndexDetailService indexDetailService;
     /**
      * 无参的任务
-     * @throws Exception 
+     * @throws Exception
      */
     public void index_curve_columnar_windSpeed_power() throws Exception {
-    	indexDetailService.index_curve_columnar_windSpeed_power();//调用list方法完成对 key ："weatherProphet_1" ，路径"weather/weatherProphet_1"的推送     
-        //System.out.println("我已执行");
-    }   
-       
+        indexDetailService.index_curve_columnar_windSpeed_power();//调用list方法完成对 key ："weatherProphet_1" ，路径"weather/weatherProphet_1"的推送
+        ////System.out.println("我已执行");
+    }
+
 
     /**
      * 有参任务
      * 目前仅执行常见的数据类型  Integer Long  带L  string  带 ''  bool Double 带 d
      * @param a
      * @param b
-     * 
+     *
      */
     public void runTask2(Integer a,Long b,String c,Boolean d,Double e)
     {
-    	//List<TsysUser> list=  tsysUserMapper.selectByExample(new TsysUserExample());
-    	//System.err.println("用户查询num："+list.size());
-        System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
+        //List<TsysUser> list=  tsysUserMapper.selectByExample(new TsysUserExample());
+        //System.err.println("用户查询num："+list.size());
+        //System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
     }
 
 }

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

@@ -1,15 +1,11 @@
 package com.gyee.frame.common.quartz.task;
 
 import com.gyee.frame.mapper.auto.TsysUserMapper;
-import com.gyee.frame.model.auto.Weatherfd;
 import com.gyee.frame.service.app.index.IndexService;
-import com.gyee.frame.service.WeatherfdService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.text.ParseException;
 import java.util.Date;
-import java.util.List;
 
 /**
  *测试类
@@ -30,7 +26,7 @@ public class index_electricQuantity {
      */
     public void index_electricQuantity() throws Exception {
     	indexService.index_electricQuantity();//调用list方法完成对 key ："weatherProphet_1" ，路径"weather/weatherProphet_1"的推送     
-        //System.out.println("我已执行");
+        ////System.out.println("我已执行");
     }   
        
 
@@ -45,7 +41,7 @@ public class index_electricQuantity {
     {
     	//List<TsysUser> list=  tsysUserMapper.selectByExample(new TsysUserExample());
     	//System.err.println("用户查询num："+list.size());
-        System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
+        //System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
     }
 
 }

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

@@ -1,15 +1,11 @@
 package com.gyee.frame.common.quartz.task;
 
 import com.gyee.frame.mapper.auto.TsysUserMapper;
-import com.gyee.frame.model.auto.Weatherfd;
 import com.gyee.frame.service.app.index.IndexService;
-import com.gyee.frame.service.WeatherfdService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.text.ParseException;
 import java.util.Date;
-import java.util.List;
 
 /**
  *测试类
@@ -26,11 +22,11 @@ public class index_target_basic_indicators {
     private IndexService indexService;
     /**
      * 无参的任务
-     * @throws Exception 
-     */
+     * @throws Exception
+    */
     public void index_target_basic_indicators() throws Exception {
     	indexService.index_target_basic_indicators();//调用list方法完成对 key ："weatherProphet_1" ，路径"weather/weatherProphet_1"的推送     
-        //System.out.println("我已执行");
+        ////System.out.println("我已执行");
     }   
        
 
@@ -45,7 +41,7 @@ public class index_target_basic_indicators {
     {
     	//List<TsysUser> list=  tsysUserMapper.selectByExample(new TsysUserExample());
     	//System.err.println("用户查询num："+list.size());
-        System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
+        //System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
     }
 
 }

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

@@ -30,7 +30,7 @@ public class index_target_windSpeed_power {
      */
     public void index_target_windSpeed_power() throws Exception {
     	indexService.index_target_windSpeed_power();//调用list方法完成对 key ："weatherProphet_1" ，路径"weather/weatherProphet_1"的推送     
-        //System.out.println("我已执行");
+        ////System.out.println("我已执行");
     }   
        
 
@@ -45,7 +45,7 @@ public class index_target_windSpeed_power {
     {
     	//List<TsysUser> list=  tsysUserMapper.selectByExample(new TsysUserExample());
     	//System.err.println("用户查询num："+list.size());
-        System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
+        //System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
     }
 
 }

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

@@ -20,7 +20,7 @@ public class index_windStation_card {
      */
     public void index_windStation_card() throws Exception {
     	indexDetailService.index_windStation_card();//调用list方法完成对 key ："weatherProphet_1" ，路径"weather/weatherProphet_1"的推送     
-        //System.out.println("我已执行");
+        ////System.out.println("我已执行");
     }   
        
 
@@ -35,7 +35,7 @@ public class index_windStation_card {
     {
     	//List<TsysUser> list=  tsysUserMapper.selectByExample(new TsysUserExample());
     	//System.err.println("用户查询num："+list.size());
-        System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
+        //System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
     }
 
 }

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

@@ -30,7 +30,7 @@ public class index_windturbine_status {
      */
     public void index_windturbine_status() throws Exception {
     	indexService.index_windturbine_status();//调用list方法完成对 key ："weatherProphet_1" ，路径"weather/weatherProphet_1"的推送     
-        //System.out.println("我已执行");
+        ////System.out.println("我已执行");
     }   
        
 
@@ -45,7 +45,7 @@ public class index_windturbine_status {
     {
     	//List<TsysUser> list=  tsysUserMapper.selectByExample(new TsysUserExample());
     	//System.err.println("用户查询num："+list.size());
-        System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
+        //System.out.println("正在执行定时任务，带多个参数的方法"+a+"   "+b+" "+c+"  "+d+" "+e+"执行时间:"+new Date().toLocaleString());
     }
 
 }

src/main/java/com/gyee/frame/common/quartz/utils/JobInvokeUtil.java

@@ -34,7 +34,7 @@ public class JobInvokeUtil
             if (null != bean) {
                 invokeMethod(bean, methodName, methodParams);
             }else {
-                System.out.println("找不到class["+ beanName +"]");
+                //System.out.println("找不到class["+ beanName +"]");
             }
         }
         else
@@ -43,7 +43,7 @@ public class JobInvokeUtil
             if (null != bean) {
                 invokeMethod(bean, methodName, methodParams);
             }else {
-                System.out.println("找不到class["+ beanName +"]");
+                //System.out.println("找不到class["+ beanName +"]");
             }
         }
     }

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

@@ -10,6 +10,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArraySet;
 
 /**
  * 服务启动执行
@@ -37,51 +38,104 @@ public class InitialRunner implements CommandLineRunner {
     //RMConfig
 
     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<Project> pjls = new ArrayList<Project>(); // 项目LIST集合
     public static List<Windturbine> wtls = new ArrayList<Windturbine>(); // 风电机LIST集合
-    public static List<Line> lnls = new ArrayList<Line>(); // 线路LIST集合
+//    public static List<Line> lnls = new ArrayList<Line>(); // 线路LIST集合
+
+    public static Map<String, List<Windturbine>> wp_wtmap = new HashMap<String, List<Windturbine>>();
+    public static Map<String, List<Windturbine>> pj_wtmap = new HashMap<String, List<Windturbine>>();
+   // public static Map<String, List<Windturbine>> ln_wtmap = new HashMap<String, List<Windturbine>>();
 
     public static Map<String, Map<String, WindTurbineTestingPointAi2>> wtpAimap = new HashMap<String, Map<String, WindTurbineTestingPointAi2>>();// 风电机测点AI表
     public static Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = new HashMap<String, Map<String, WindPowerStationTestingPoint2>>();//场站测点
+    public static Map<String, CopyOnWriteArraySet<String>> keyidMap = new HashMap<String, CopyOnWriteArraySet<String>>();
+
     @Override
     public void run(String... args) throws Exception {
-        System.out.println(">>>>>>>>>>>>>>>服务启动执行，换成测点关联数据 <<<<<<<<<<<<<");
-
-//        RMConfigExample example=new RMConfigExample();
-//        example.createCriteria().getAllCriteria();
-//        List<RMConfig> list= rMConfigService.selectByExample(example);
-//        if(!list.isEmpty())
-//        {
-//            for(RMConfig rm:list)
-//            {
-//                rmcmap.put(rm.getId(),rm);
-//            }
-//        }
+        //System.out.println(">>>>>>>>>>>>>>>服务启动执行，换成测点关联数据 <<<<<<<<<<<<<");
+
+        RMConfigExample example=new RMConfigExample();
+        example.createCriteria().getAllCriteria();
+        List<RMConfig> list= rMConfigService.selectByExample(example);
+        if(!list.isEmpty())
+        {
+            for(RMConfig rm:list)
+            {
+                rmcmap.put(rm.getId(),rm);
+            }
+        }
 
         WindpowerstationExample windpowerstationExample=new WindpowerstationExample();
         windpowerstationExample.setOrderByClause("ordernum ASC");
-        windpowerstationExample.createCriteria().andIdNotLike("MCH_GDC").getAllCriteria();
-        wpls= windpowerstationService.selectByExample(windpowerstationExample);
-
+        windpowerstationExample.createCriteria().andIdNotLike("%MCH%");
+        wpallls= windpowerstationService.selectByExample(windpowerstationExample);
 
+        windpowerstationExample=new WindpowerstationExample();
+        windpowerstationExample.setOrderByClause("ordernum ASC");
+        windpowerstationExample.createCriteria().andIdNotLike("%GDC");
+        wpls= windpowerstationService.selectByExample(windpowerstationExample);
 
         ProjectExample projectExample=new ProjectExample();
         projectExample.setOrderByClause("ordernum ASC");
-        projectExample.createCriteria().andWindpowerstationidNotLike("MCH_GDC").getAllCriteria();
+        projectExample.createCriteria().andWindpowerstationidNotLike("%GDC");
         pjls= projectService.selectByExample(projectExample);
 
-        LineExample lineExample=new LineExample();
-        lineExample.setOrderByClause("ordernum ASC");
-        lineExample.createCriteria().getAllCriteria();
-        lnls= lineService.selectByExample(lineExample);
+//        LineExample lineExample=new LineExample();
+//        lineExample.setOrderByClause("ordernum ASC");
+//        lineExample.createCriteria().getAllCriteria();
+//        lnls= lineService.selectByExample(lineExample);
 
         WindturbineExample windturbineExample=new WindturbineExample();
         windturbineExample.setOrderByClause("id ASC");
-        windturbineExample.createCriteria().getAllCriteria();
+        windturbineExample.createCriteria().andWindpowerstationidNotLike("%GDC");
         wtls= windturbineService.selectByExample(windturbineExample);
 
 
+        if(wtls!=null && !wtls.isEmpty()){
+
+            for(int i=0;i<wtls.size();i++){
+
+                Windturbine point=wtls.get(i);
+                if(wp_wtmap.containsKey(point.getWindpowerstationid())){
+                    List<Windturbine> ls=wp_wtmap.get(point.getWindpowerstationid());
+                    ls.add(point);
+                    wp_wtmap.put(point.getWindpowerstationid(),ls);
+                }
+                else{
+                    List<Windturbine> ls =new ArrayList();
+                    ls.add(point);
+                    wp_wtmap.put(point.getWindpowerstationid(),ls);
+                }
+
+                if(pj_wtmap.containsKey(point.getProjectid())){
+                    List<Windturbine> ls=pj_wtmap.get(point.getProjectid());
+                    ls.add(point);
+                    pj_wtmap.put(point.getProjectid(),ls);
+                }
+                else{
+                    List<Windturbine> ls =new ArrayList();
+                    ls.add(point);
+                    pj_wtmap.put(point.getProjectid(),ls);
+                }
+
+
+//                if(ln_wtmap.containsKey(point.getLineid())){
+//                    List<Windturbine> ls=ln_wtmap.get(point.getLineid());
+//                    ls.add(point);
+//                    ln_wtmap.put(point.getLineid(),ls);
+//                }
+//                else{
+//                    List<Windturbine> ls =new ArrayList();
+//                    ls.add(point);
+//                    ln_wtmap.put(point.getLineid(),ls);
+//                }
+
+            }
+        }
+
+
         WindPowerStationTestingPoint2Example windPowerstationTestingPointExample=new WindPowerStationTestingPoint2Example();
         windPowerstationTestingPointExample.createCriteria().getAllCriteria();
         List<WindPowerStationTestingPoint2> wpPointlist= windPowerstationTestingPointService.selectByExample(windPowerstationTestingPointExample);
@@ -122,6 +176,31 @@ public class InitialRunner implements CommandLineRunner {
             }
         }
 
+
+//        String pageNumber = "pageNumber_4";
+//        String functionNumber = "functionNumber_2";
+//        StringBuilder sb = new StringBuilder();
+//        sb.append(pageNumber).append("_").append(functionNumber);
+//
+//        String jobkey = String.valueOf(sb);
+//
+//
+//        CopyOnWriteArraySet<String> set=new CopyOnWriteArraySet<String>();
+//        for(Windpowerstation wp: wpls)
+//        {
+//            StringBuilder sb2 = new StringBuilder();
+//            sb2.append("wp_").append(wp.getId());
+//            set.add(String.valueOf(sb2));
+//        }
+//
+//        for(Project pj: pjls)
+//        {
+//            StringBuilder sb2 = new StringBuilder();
+//            sb2.append("pj_").append(pj.getId());
+//            set.add(String.valueOf(sb2));
+//        }
+//
+//        keyidMap.put(jobkey,set);
     }
 
 }

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

@@ -142,10 +142,10 @@ public class AdminController extends SocketToolController {
             if ((null != SecurityUtils.getSubject() && SecurityUtils.getSubject().isAuthenticated()) || SecurityUtils.getSubject().isRemembered()) {
             	return "redirect:/"+prefix+"/index";
             } else {
-            	System.out.println("--进行登录验证..验证开始"); 
+            	//System.out.println("--进行登录验证..验证开始");
 
             	modelMap.put("RollVerification", V2Config.getRollVerification());
-            	System.out.println("V2Config.getRollVerification()>>>"+V2Config.getRollVerification());
+            	//System.out.println("V2Config.getRollVerification()>>>"+V2Config.getRollVerification());
                 return "login";
             }
         } catch (Exception e) {

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

@@ -1,7 +1,5 @@
 package com.gyee.frame.controller.admin;
 
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
 import com.gyee.frame.common.base.BaseController;
@@ -26,6 +24,9 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * 代码自动生成
  * @ClassName: AutoCodeController
@@ -66,7 +67,7 @@ public class AutoCodeController  extends BaseController{
 	
 	/**
 	 * 代码自动生成全局配置
-	 * @param model
+
 	 * @return
 	 * @author gyee
 	 * @Date 2019年8月13日 上午12:34:30
@@ -79,7 +80,7 @@ public class AutoCodeController  extends BaseController{
 		setTitle(modelMap, new TitleVo("配置", str+"管理", true,"欢迎进入"+str+"页面", true, false));
         
 		modelMap.put("autoConfig", AutoCodeConfig.getGlobalConfig());
-		System.out.println(JSONUtil.toJsonStr(AutoCodeConfig.getGlobalConfig()));
+	//	//System.out.println(JSONUtil.toJsonStr(AutoCodeConfig.getGlobalConfig()));
 		return prefix + "/global";
     }
 	
@@ -118,7 +119,7 @@ public class AutoCodeController  extends BaseController{
 	@ResponseBody
 	public AjaxResult queryTableInfo(String tableName) {
 		List<BeanColumn> list= generatorService.queryColumns2(tableName);
-		System.out.println(JSONUtil.toJsonStr(list));
+		////System.out.println(JSONUtil.toJsonStr(list));
 		if(list.size()>0) {
 			return AjaxResult.successData(200, list);
 		}
@@ -174,7 +175,7 @@ public class AutoCodeController  extends BaseController{
 	
 	/**
 	 * 根据权限字段查询是否存在
-	 * @param perms
+
 	 * @return
 	 * @author gyee
 	 * @Date 2019年9月1日 上午2:06:31

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

@@ -1,16 +1,6 @@
 package com.gyee.frame.controller.admin;
 
-import java.util.List;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import com.github.pagehelper.PageInfo;
 import com.gyee.frame.common.base.BaseController;
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.common.log.Log;
@@ -20,9 +10,14 @@ import com.gyee.frame.model.custom.RoleVo;
 import com.gyee.frame.model.custom.TableSplitResult;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.model.custom.TitleVo;
-import com.github.pagehelper.PageInfo;
-
 import io.swagger.annotations.Api;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 用户Controller
@@ -66,8 +61,8 @@ public class UserController extends BaseController{
 	@RequiresPermissions("system:user:list")
 	@ResponseBody
 	public Object list(Tablepar tablepar,String searchText){
-		PageInfo<TsysUser> page=sysUserService.list(tablepar,searchText) ; 
-		TableSplitResult<TsysUser> result=new TableSplitResult<TsysUser>(page.getPageNum(), page.getTotal(), page.getList()); 
+		PageInfo<TsysUser> page=sysUserService.list(tablepar,searchText) ;
+		TableSplitResult<TsysUser> result=new TableSplitResult<TsysUser>(page.getPageNum(), page.getTotal(), page.getList());
 		return  result;
 	}
 	/**

src/main/java/com/gyee/frame/controller/app/TargetdetailController.java

@@ -1,86 +0,0 @@
-package com.gyee.frame.controller.app;
-
-import com.gyee.frame.netty.websocket.util.SocketToolController;
-import com.gyee.frame.service.app.targetdetail.TargetdetailService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Map;
-
-/**
- * @author Wang Jiawen
- * @purpose
- * @date 2020-05-14 21:52
- */
-@Controller
-@RequestMapping("/targetdetail")
-public class TargetdetailController extends SocketToolController {
-    @Autowired
-    private TargetdetailService targetdetailService;
-
-    @ResponseBody
-    @RequestMapping("/targetdetail_target")
-    public String targetdetail(HttpServletRequest httpServletRequest,String pointKey) throws Exception {
-        String remoteAddr = httpServletRequest.getRemoteAddr();
-        Map<String, String> pointMap = TargetdetailService.targetdetail_target_pointMap;
-        pointMap.put(remoteAddr,pointKey);
-        TargetdetailService.targetdetail_target_pointMap = pointMap;
-        return remoteAddr;
-    }
-
-    @ResponseBody
-    @RequestMapping("/targetdetail_curve")
-    public String targetdetail_curve(HttpServletRequest httpServletRequest,String pointKey) throws Exception {
-        String remoteAddr = httpServletRequest.getRemoteAddr();
-        Map<String, String> pointMap = TargetdetailService.targetdetail_curve_pointMap;
-        pointMap.put(remoteAddr,pointKey);
-        TargetdetailService.targetdetail_curve_pointMap = pointMap;
-        return remoteAddr;
-    }
-
-    @ResponseBody
-    @RequestMapping("/targetdetail_histogram")
-    public String targetdetail_histogram(HttpServletRequest httpServletRequest,String pointKey) throws Exception {
-        String remoteAddr = httpServletRequest.getRemoteAddr();
-        Map<String, String> pointMap = TargetdetailService.targetdetail_histogram_pointMap;
-        pointMap.put(remoteAddr,pointKey);
-        TargetdetailService.targetdetail_histogram_pointMap = pointMap;
-        return remoteAddr;
-    }
-
-
-    @ResponseBody
-    @RequestMapping("/close_targetdetail_target")
-    public String close_targetdetail(HttpServletRequest httpServletRequest,String pointKey) throws Exception {
-        String remoteAddr = httpServletRequest.getRemoteAddr();
-        Map<String, String> pointMap = TargetdetailService.targetdetail_target_pointMap;
-        pointMap.remove(remoteAddr);
-        TargetdetailService.targetdetail_target_pointMap = pointMap;
-        return remoteAddr;
-    }
-
-    @ResponseBody
-    @RequestMapping("/close_targetdetail_curve")
-    public String close_targetdetail_curve(HttpServletRequest httpServletRequest,String pointKey) throws Exception {
-        String remoteAddr = httpServletRequest.getRemoteAddr();
-        Map<String, String> pointMap = TargetdetailService.targetdetail_curve_pointMap;
-        pointMap.remove(remoteAddr);
-        TargetdetailService.targetdetail_curve_pointMap = pointMap;
-        return remoteAddr;
-    }
-
-    @ResponseBody
-    @RequestMapping("/close_targetdetail_histogram")
-    public String close_targetdetail_histogram(HttpServletRequest httpServletRequest,String pointKey) throws Exception {
-        String remoteAddr = httpServletRequest.getRemoteAddr();
-        Map<String, String> pointMap = TargetdetailService.targetdetail_histogram_pointMap;
-        pointMap.remove(remoteAddr);
-        TargetdetailService.targetdetail_histogram_pointMap = pointMap;
-        return remoteAddr;
-    }
-
-}

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

@@ -0,0 +1,42 @@
+package com.gyee.frame.controller.gen;
+
+import com.gyee.frame.common.base.BaseController;
+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.GyeeBraceletuser;
+import com.gyee.frame.service.GyeeBraceletuserService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+@Controller
+@RequestMapping("gyeeBraceletuser")
+@Api(value = "")
+
+public class GyeeBraceletuserController extends BaseController {
+
+
+    @Autowired
+    private GyeeBraceletuserService gyeeBraceletuserService;
+
+
+    @DataSource(value = DataSourceType.TICKET)
+    @GetMapping("/getBraceletuser")
+    @ResponseBody
+    public AjaxResult getBraceletuser(String userid) {
+        GyeeBraceletuser vo = gyeeBraceletuserService.queryBraceletuserByUserId(userid);
+        if (null == vo) {
+            return AjaxResult.error(500, "无法获取手环用户信息");
+
+        } else {
+            return AjaxResult.successData(200, vo);
+        }
+    }
+
+}

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

@@ -1,62 +1,41 @@
 package com.gyee.frame.controller.gen;
 
-import java.util.List;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import com.github.pagehelper.PageInfo;
 import com.gyee.frame.common.base.BaseController;
+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.Gyeeorgan;
-import com.gyee.frame.model.auto.Gyeerole;
 import com.gyee.frame.model.custom.TableSplitResult;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.model.custom.TitleVo;
 import com.gyee.frame.service.GyeeorganService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 @Controller
 @RequestMapping("GyeeorganController")
 @Api(value = "")
+
 public class GyeeorganController extends BaseController{
 	
 	private String prefix = "gen/gyeeorgan";
 	@Autowired
 	private GyeeorganService gyeeorganService;
-	
-	@GetMapping("view")
-	@RequiresPermissions("gen:gyeeorgan:view")
-    public String view(ModelMap model)
-    {	
-		String str="";
-		setTitle(model, new TitleVo("列表", str+"管理", true,"欢迎进入"+str+"页面", true, false));
-        return prefix + "/list";
-    }
-	
-	/**
-	 * 
-		 *@author:Li Miao
-		 *
-		 *@description: 获取风电场权限
-		 *
-		 *@param:userid
-		 *
-		 *@return:
-		 *
-		 *@createTime:2020年4月17日
-		 *
-	 */
+
+
+
+	@DataSource(value = DataSourceType.TICKET)
 	@GetMapping("/GyeeOrganList")
 	@ResponseBody
-	public AjaxResult getOrgan(String userid){
+	public AjaxResult GyeeOrganList(String userid){
 		List<Gyeeorgan> list=gyeeorganService.queryOrganByUserId(userid);
 		if(list.isEmpty()){
 			return AjaxResult.error(500, "无法获取风场权限");
@@ -65,116 +44,18 @@ public class GyeeorganController extends BaseController{
 			return AjaxResult.successData(200, list);
 		}
 	}
-	
-	
-	//@Log(title = "集合查询", action = "111")
-	@PostMapping("list")
-	@RequiresPermissions("gen:gyeeorgan:list")
-	@ResponseBody
-	public Object list(Tablepar tablepar,String searchText){
-		PageInfo<Gyeeorgan> page=gyeeorganService.list(tablepar,searchText) ; 
-		TableSplitResult<Gyeeorgan> result=new TableSplitResult<Gyeeorgan>(page.getPageNum(), page.getTotal(), page.getList()); 
-		return  result;
-	}
-	
-	/**
-     * 新增
-     */
 
-    @GetMapping("/add")
-    public String add(ModelMap modelMap)
-    {
-        return prefix + "/add";
-    }
-	
-	//@Log(title = "新增", action = "111")
-	@PostMapping("add")
-	@RequiresPermissions("gen:gyeeorgan:add")
+	@DataSource(value = DataSourceType.TICKET)
+	@GetMapping("/gyeeOrganAll")
 	@ResponseBody
-	public AjaxResult add(Gyeeorgan gyeeorgan){
-		int b=gyeeorganService.insertSelective(gyeeorgan);
-		if(b>0){
-			return success();
-		}else{
-			return error();
-		}
-	}
-	
-	/**
-	 * 删除用户
-	 * @param ids
-	 * @return
-	 */
-	//@Log(title = "删除", action = "111")
-	@PostMapping("remove")
-	@RequiresPermissions("gen:gyeeorgan:remove")
-	@ResponseBody
-	public AjaxResult remove(String ids){
-		int b=gyeeorganService.deleteByPrimaryKey(ids);
-		if(b>0){
-			return success();
-		}else{
-			return error();
-		}
-	}
-	
-	/**
-	 * 检查用户
-	 * @param tsysUser
-	 * @return
-	 */
-	@PostMapping("checkNameUnique")
-	@ResponseBody
-	public int checkNameUnique(Gyeeorgan gyeeorgan){
-		int b=gyeeorganService.checkNameUnique(gyeeorgan);
-		if(b>0){
-			return 1;
+	public AjaxResult gyeeOrganAll(){
+		List<Gyeeorgan> list=gyeeorganService.gyeeOrganAll();
+		if(list.isEmpty()){
+			return AjaxResult.error(500, "无法获取组织结构");
+
 		}else{
-			return 0;
+			return AjaxResult.successData(200, list);
 		}
 	}
 	
-	
-	/**
-	 * 修改跳转
-	 * @param id
-	 * @param mmap
-	 * @return
-	 */
-	@GetMapping("/edit/{id}")
-    public String edit(@PathVariable("id") String id, ModelMap mmap)
-    {
-        mmap.put("Gyeeorgan", gyeeorganService.selectByPrimaryKey(id));
-
-        return prefix + "/edit";
-    }
-	
-	/**
-     * 修改保存
-     */
-    //@Log(title = "修改", action = "111")
-    @RequiresPermissions("gen:gyeeorgan:edit")
-    @PostMapping("/edit")
-    @ResponseBody
-    public AjaxResult editSave(Gyeeorgan record)
-    {
-        return toAjax(gyeeorganService.updateByPrimaryKeySelective(record));
-    }
-
-    
-    /**
-   	 * 根据主键查询
-   	 * 
-   	 * @param id
-   	 * @param mmap
-   	 * @return
-   	 */
-   	@PostMapping("/get/{id}")
-   	@ApiOperation(value = "根据id查询唯一", notes = "根据id查询唯一")
-   	public Gyeeorgan edit(@PathVariable("id") String id) {
-   		return gyeeorganService.selectByPrimaryKey(id);
-   	}
-    
-
-	
 }

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

@@ -2,62 +2,32 @@ package com.gyee.frame.controller.gen;
 
 import java.util.List;
 
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import com.gyee.frame.common.dataSources.DataSource;
+import com.gyee.frame.common.dataSources.DataSourceType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import com.github.pagehelper.PageInfo;
 import com.gyee.frame.common.base.BaseController;
 import com.gyee.frame.common.domain.AjaxResult;
-import com.gyee.frame.model.auto.Gyeepermission;
 import com.gyee.frame.model.auto.GyeepermissionView;
-import com.gyee.frame.model.auto.Gyeerole;
-import com.gyee.frame.model.custom.TableSplitResult;
-import com.gyee.frame.model.custom.Tablepar;
-import com.gyee.frame.model.custom.TitleVo;
 import com.gyee.frame.service.GyeepermissionService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 
 @Controller
 @RequestMapping("GyeepermissionController")
 @Api(value = "")
 public class GyeepermissionController extends BaseController{
 	
-	private String prefix = "gen/gyeepermission";
 	@Autowired
 	private GyeepermissionService gyeepermissionService;
 	
-	@GetMapping("view")
-	@RequiresPermissions("gen:gyeepermission:view")
-    public String view(ModelMap model)
-    {	
-		String str="";
-		setTitle(model, new TitleVo("列表", str+"管理", true,"欢迎进入"+str+"页面", true, false));
-        return prefix + "/list";
-    }
-	
-	/**
-	 * 
-		 *@author:Li Miao
-		 *
-		 *@description: 得到模块权限
-		 *
-		 *@param:roleId
-		 *
-		 *@return:
-		 *
-		 *@createTime:2020年4月20日
-		 *
-	 */
+
+	@DataSource(value = DataSourceType.TICKET)
 	@GetMapping("/GyeePermissionList")
 	@ResponseBody
-	public AjaxResult getPermission(String userid){
+	public AjaxResult GyeePermissionList(String userid){
 		List<GyeepermissionView> list=gyeepermissionService.queryPermissionByRoleId(userid);
 		if(list.isEmpty()){
 			return AjaxResult.error(500, "无法获取权限");
@@ -67,115 +37,5 @@ public class GyeepermissionController extends BaseController{
 		}
 	}
 	
-	
-	//@Log(title = "集合查询", action = "111")
-	@PostMapping("list")
-	@RequiresPermissions("gen:gyeepermission:list")
-	@ResponseBody
-	public Object list(Tablepar tablepar,String searchText){
-		PageInfo<Gyeepermission> page=gyeepermissionService.list(tablepar,searchText) ; 
-		TableSplitResult<Gyeepermission> result=new TableSplitResult<Gyeepermission>(page.getPageNum(), page.getTotal(), page.getList()); 
-		return  result;
-	}
-	
-	/**
-     * 新增
-     */
-
-    @GetMapping("/add")
-    public String add(ModelMap modelMap)
-    {
-        return prefix + "/add";
-    }
-	
-	//@Log(title = "新增", action = "111")
-	@PostMapping("add")
-	@RequiresPermissions("gen:gyeepermission:add")
-	@ResponseBody
-	public AjaxResult add(Gyeepermission gyeepermission){
-		int b=gyeepermissionService.insertSelective(gyeepermission);
-		if(b>0){
-			return success();
-		}else{
-			return error();
-		}
-	}
-	
-	/**
-	 * 删除用户
-	 * @param ids
-	 * @return
-	 */
-	//@Log(title = "删除", action = "111")
-	@PostMapping("remove")
-	@RequiresPermissions("gen:gyeepermission:remove")
-	@ResponseBody
-	public AjaxResult remove(String ids){
-		int b=gyeepermissionService.deleteByPrimaryKey(ids);
-		if(b>0){
-			return success();
-		}else{
-			return error();
-		}
-	}
-	
-	/**
-	 * 检查用户
-	 * @param tsysUser
-	 * @return
-	 */
-	@PostMapping("checkNameUnique")
-	@ResponseBody
-	public int checkNameUnique(Gyeepermission gyeepermission){
-		int b=gyeepermissionService.checkNameUnique(gyeepermission);
-		if(b>0){
-			return 1;
-		}else{
-			return 0;
-		}
-	}
-	
-	
-	/**
-	 * 修改跳转
-	 * @param id
-	 * @param mmap
-	 * @return
-	 */
-	@GetMapping("/edit/{id}")
-    public String edit(@PathVariable("id") String id, ModelMap mmap)
-    {
-        mmap.put("Gyeepermission", gyeepermissionService.selectByPrimaryKey(id));
 
-        return prefix + "/edit";
-    }
-	
-	/**
-     * 修改保存
-     */
-    //@Log(title = "修改", action = "111")
-    @RequiresPermissions("gen:gyeepermission:edit")
-    @PostMapping("/edit")
-    @ResponseBody
-    public AjaxResult editSave(Gyeepermission record)
-    {
-        return toAjax(gyeepermissionService.updateByPrimaryKeySelective(record));
-    }
-
-    
-    /**
-   	 * 根据主键查询
-   	 * 
-   	 * @param id
-   	 * @param mmap
-   	 * @return
-   	 */
-   	@PostMapping("/get/{id}")
-   	@ApiOperation(value = "根据id查询唯一", notes = "根据id查询唯一")
-   	public Gyeepermission edit(@PathVariable("id") String id) {
-   		return gyeepermissionService.selectByPrimaryKey(id);
-   	}
-    
-
-	
 }

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

@@ -27,152 +27,9 @@ import io.swagger.annotations.ApiOperation;
 @Api(value = "")
 public class GyeeroleController extends BaseController{
 	
-	private String prefix = "gen/gyeerole";
+
 	@Autowired
 	private GyeeroleService gyeeroleService;
 	
-	@GetMapping("view")
-	@RequiresPermissions("gen:gyeerole:view")
-    public String view(ModelMap model)
-    {	
-		String str="";
-		setTitle(model, new TitleVo("列表", str+"管理", true,"欢迎进入"+str+"页面", true, false));
-        return prefix + "/list";
-    }
-	
-	/**
-	 * 
-		 *@author:Li Miao
-		 *
-		 *@description: 获取用户角色
-		 *
-		 *@param:userid
-		 *
-		 *@return:
-		 *
-		 *@createTime:2020年4月16日
-		 *
-	 */
-	@GetMapping("/GyeeRoleList")
-	@ResponseBody
-	public AjaxResult getRole(String userid){
-		List<Gyeerole> list=gyeeroleService.queryRoleByUserId(userid);
-		if(list.isEmpty()){
-			return AjaxResult.error(500, "无法获取角色");
-			
-		}else{
-			return AjaxResult.successData(200, list);
-		}
-	}
-	
-	//@Log(title = "集合查询", action = "111")
-	@PostMapping("list")
-	@RequiresPermissions("gen:gyeerole:list")
-	@ResponseBody
-	public Object list(Tablepar tablepar,String searchText){
-		PageInfo<Gyeerole> page=gyeeroleService.list(tablepar,searchText) ; 
-		TableSplitResult<Gyeerole> result=new TableSplitResult<Gyeerole>(page.getPageNum(), page.getTotal(), page.getList()); 
-		return  result;
-	}
-	
-	/**
-     * 新增
-     */
-
-    @GetMapping("/add")
-    public String add(ModelMap modelMap)
-    {
-        return prefix + "/add";
-    }
-	
-	//@Log(title = "新增", action = "111")
-	@PostMapping("add")
-	@RequiresPermissions("gen:gyeerole:add")
-	@ResponseBody
-	public AjaxResult add(Gyeerole gyeerole){
-		int b=gyeeroleService.insertSelective(gyeerole);
-		if(b>0){
-			return success();
-		}else{
-			return error();
-		}
-	}
-	
-	/**
-	 * 删除用户
-	 * @param ids
-	 * @return
-	 */
-	//@Log(title = "删除", action = "111")
-	@PostMapping("remove")
-	@RequiresPermissions("gen:gyeerole:remove")
-	@ResponseBody
-	public AjaxResult remove(String ids){
-		int b=gyeeroleService.deleteByPrimaryKey(ids);
-		if(b>0){
-			return success();
-		}else{
-			return error();
-		}
-	}
-	
-	/**
-	 * 检查用户
-	 * @param tsysUser
-	 * @return
-	 */
-	@PostMapping("checkNameUnique")
-	@ResponseBody
-	public int checkNameUnique(Gyeerole gyeerole){
-		int b=gyeeroleService.checkNameUnique(gyeerole);
-		if(b>0){
-			return 1;
-		}else{
-			return 0;
-		}
-	}
-	
-	
-	/**
-	 * 修改跳转
-	 * @param id
-	 * @param mmap
-	 * @return
-	 */
-	@GetMapping("/edit/{id}")
-    public String edit(@PathVariable("id") String id, ModelMap mmap)
-    {
-        mmap.put("Gyeerole", gyeeroleService.selectByPrimaryKey(id));
 
-        return prefix + "/edit";
-    }
-	
-	/**
-     * 修改保存
-     */
-    //@Log(title = "修改", action = "111")
-    @RequiresPermissions("gen:gyeerole:edit")
-    @PostMapping("/edit")
-    @ResponseBody
-    public AjaxResult editSave(Gyeerole record)
-    {
-        return toAjax(gyeeroleService.updateByPrimaryKeySelective(record));
-    }
-
-    
-    /**
-   	 * 根据主键查询
-   	 * 
-   	 * @param id
-   	 * @param mmap
-   	 * @return
-   	 */
-   	@PostMapping("/get/{id}")
-   	@ApiOperation(value = "根据id查询唯一", notes = "根据id查询唯一")
-   	public Gyeerole edit(@PathVariable("id") String id) {
-   		return gyeeroleService.selectByPrimaryKey(id);
-   	}
-    
-
-	
 }

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

@@ -1,183 +1,89 @@
 package com.gyee.frame.controller.gen;
 
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import com.github.pagehelper.PageInfo;
-import com.gyee.frame.common.base.BaseController;
+import com.gyee.frame.common.conf.UserLoginContext;
+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.Gyeeuser;
-import com.gyee.frame.model.custom.TableSplitResult;
-import com.gyee.frame.model.custom.Tablepar;
-import com.gyee.frame.model.custom.TitleVo;
+import com.gyee.frame.model.custom.*;
+import com.gyee.frame.model.enumeration.Messagetype;
 import com.gyee.frame.netty.websocket.util.SocketToolController;
 import com.gyee.frame.service.GyeeuserService;
-
-import io.lettuce.core.dynamic.annotation.Param;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.websocket.Session;
+import java.io.IOException;
+import java.util.*;
 
 @Controller
 @RequestMapping("GyeeuserController")
 @Api(value = "")
 public class GyeeuserController extends SocketToolController{
 	
-	private String prefix = "gen/gyeeuser";
+
 	@Autowired
 	private GyeeuserService gyeeuserService;
-	
-	@GetMapping("view")
-	@RequiresPermissions("gen:gyeeuser:view")
-    public String view(ModelMap model)
-    {	
-		String str="";
-		setTitle(model, new TitleVo("列表", str+"管理", true,"欢迎进入"+str+"页面", true, false));
-        return prefix + "/list";
-    }
-	
-	/**
-	 * 
-		 *@author:Li Miao
-		 *
-		 *@description: 登录接口
-		 *
-		 *@param:username,password
-		 *
-		 *@return:
-		 *
-		 *@createTime:2020年4月16日
-		 *
-	 */
-	@GetMapping("/login")
-	@ResponseBody
-	public AjaxResult login(String username,String password){
-		Gyeeuser gyeeuser=new Gyeeuser();
-		gyeeuser.setUsername(username);
-		gyeeuser.setPassword(password);
-		String id=gyeeuserService.queryIdByUserNamePassWord(gyeeuser);
-		if(id!=""&&id!=null){
-			return AjaxResult.successData(200, id);
-			
-		}else{			
-			return AjaxResult.successData(200, "-1");
-		}
-	}
-	
-	
-	//@Log(title = "集合查询", action = "111")
-	@PostMapping("list")
-	@RequiresPermissions("gen:gyeeuser:list")
-	@ResponseBody
-	public Object list(Tablepar tablepar,String searchText){
-		PageInfo<Gyeeuser> page=gyeeuserService.list(tablepar,searchText) ; 
-		TableSplitResult<Gyeeuser> result=new TableSplitResult<Gyeeuser>(page.getPageNum(), page.getTotal(), page.getList()); 
-		return  result;
-	}
-	
-	/**
-     * 新增
-     */
-
-    @GetMapping("/add")
-    public String add(ModelMap modelMap)
-    {
-        return prefix + "/add";
-    }
-	
-	//@Log(title = "新增", action = "111")
-	@PostMapping("add")
-	@RequiresPermissions("gen:gyeeuser:add")
-	@ResponseBody
-	public AjaxResult add(Gyeeuser gyeeuser){
-		int b=gyeeuserService.insertSelective(gyeeuser);
-		if(b>0){
-			return success();
-		}else{
-			return error();
-		}
-	}
-	
-	/**
-	 * 删除用户
-	 * @param ids
-	 * @return
-	 */
-	//@Log(title = "删除", action = "111")
-	@PostMapping("remove")
-	@RequiresPermissions("gen:gyeeuser:remove")
+
+
+	@DataSource(value = DataSourceType.TICKET)
+	@GetMapping("/selectUserList")
 	@ResponseBody
-	public AjaxResult remove(String ids){
-		int b=gyeeuserService.deleteByPrimaryKey(ids);
-		if(b>0){
-			return success();
-		}else{
-			return error();
+	public AjaxResult selectUserList(String userid) {
+
+		List<Gyeeuser> result=gyeeuserService.findContactUserlist(userid);
+		if (result == null )
+		{
+			return AjaxResult.error(4004, "没有用户先关通信录");
 		}
+		return AjaxResult.successData(result);
+
 	}
-	
-	/**
-	 * 检查用户
-	 * @param tsysUser
-	 * @return
-	 */
-	@PostMapping("checkNameUnique")
+
+	@DataSource(value = DataSourceType.TICKET)
+	@PostMapping("/selectUserList")
 	@ResponseBody
-	public int checkNameUnique(Gyeeuser gyeeuser){
-		int b=gyeeuserService.checkNameUnique(gyeeuser);
-		if(b>0){
-			return 1;
-		}else{
-			return 0;
+	public List<ContactUserVo> selectUserList(@RequestBody Map<String,String> map) {
+
+		List<ContactUserVo> list=new ArrayList<>();
+		if(null!=map && !map.isEmpty())
+		{
+			Set<Map.Entry<String, String>> set = map.entrySet();
+			for (Iterator<Map.Entry<String, String>> it = set.iterator(); it.hasNext();) {
+				Map.Entry<String, String> entry = (Map.Entry<String, String>) it.next();
+				//System.out.println(entry.getKey() + "--->" + entry.getValue());
+
+				ContactUserVo vo=new ContactUserVo();
+				vo.setId(entry.getKey());
+				List<Gyeeuser> result=gyeeuserService.findContactUserlist(entry.getKey());
+				{
+					for(Gyeeuser user:result)
+					{
+						if(null!=map && map.containsKey(user.getId()))
+						{
+							user.setRemak1("1");
+						}else
+						{
+							user.setRemak1("0");
+						}
+					}
+				}
+				vo.setList(result);
+
+				list.add(vo);
+			}
 		}
+
+		this.pushToWeb("pageNumber_4","functionNumber_3","all",list, Messagetype.MESSAGE);
+
+		return  list;
 	}
-	
-	
-	/**
-	 * 修改跳转
-	 * @param id
-	 * @param mmap
-	 * @return
-	 */
-	@GetMapping("/edit/{id}")
-    public String edit(@PathVariable("id") String id, ModelMap mmap)
-    {
-        mmap.put("Gyeeuser", gyeeuserService.selectByPrimaryKey(id));
-
-        return prefix + "/edit";
-    }
-	
-	/**
-     * 修改保存
-     */
-    //@Log(title = "修改", action = "111")
-    @RequiresPermissions("gen:gyeeuser:edit")
-    @PostMapping("/edit")
-    @ResponseBody
-    public AjaxResult editSave(Gyeeuser record)
-    {
-        return toAjax(gyeeuserService.updateByPrimaryKeySelective(record));
-    }
-
-    
-    /**
-   	 * 根据主键查询
-   	 * 
-   	 * @param id
-   	 * @param mmap
-   	 * @return
-   	 */
-   	@PostMapping("/get/{id}")
-   	@ApiOperation(value = "根据id查询唯一", notes = "根据id查询唯一")
-   	public Gyeeuser edit(@PathVariable("id") String id) {
-   		return gyeeuserService.selectByPrimaryKey(id);
-   	}
-    
 
-	
+
 }

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

@@ -1,5 +1,6 @@
 package com.gyee.frame.controller.gen;
 
+import com.gyee.frame.model.auto.Weatherfh;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -12,9 +13,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.github.pagehelper.PageInfo;
-import com.gyee.frame.common.base.BaseController;
 import com.gyee.frame.common.domain.AjaxResult;
-import com.gyee.frame.model.auto.Weatherfh;
 import com.gyee.frame.model.custom.TableSplitResult;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.model.custom.TitleVo;
@@ -105,7 +104,6 @@ public class WeatherfhController extends SocketToolController{
 	
 	/**
 	 * 检查用户
-	 * @param tsysUser
 	 * @return
 	 */
 	@PostMapping("checkNameUnique")
@@ -151,7 +149,6 @@ public class WeatherfhController extends SocketToolController{
    	 * 根据主键查询
    	 * 
    	 * @param id
-   	 * @param mmap
    	 * @return
    	 */
    	@PostMapping("/get/{id}")

src/main/java/com/gyee/frame/controller/socket/CheckCenterController.java

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.annotation.Resource;
 import javax.websocket.EncodeException;
 import java.io.IOException;
 
@@ -16,6 +17,9 @@ import java.io.IOException;
 @RequestMapping("/checkcenter")
 public class CheckCenterController extends SocketToolController {
 
+	@Resource
+	private WebSocketServer webSocketServer;
+
 	//页面请求,模板样例
 	@GetMapping("/socket1")
 	public ModelAndView socket() throws IOException {
@@ -28,9 +32,9 @@ public class CheckCenterController extends SocketToolController {
 	//推送数据接口
 	@ResponseBody
 	@GetMapping("/socket/push")
-	public void pushToWeb(String pageNumber,String functionNumber, String message) {
+	public void pushToWeb(String pageNumber,String functionNumber,String keyid, String message) {
 		try {
-			WebSocketServer.sendInfo(message,pageNumber,functionNumber);
+			webSocketServer.sendObject(message,pageNumber,functionNumber,keyid);
 		} catch (IOException | EncodeException e) {
 			e.printStackTrace();
 		}

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

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

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

@@ -0,0 +1,42 @@
+package com.gyee.frame.mapper.auto;
+
+
+import java.util.List;
+
+import com.gyee.frame.model.auto.GyeePermission;
+import com.gyee.frame.model.auto.GyeePermissionExample;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ *  GyeePermissionMapper
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2020-04-16 14:55:15
+ */
+public interface GyeePermissionMapper {
+      	   	      	      	      	      	      	      	      	      
+    long countByExample(GyeePermissionExample example);
+
+    int deleteByExample(GyeePermissionExample example);
+		
+    int deleteByPrimaryKey(String id);
+		
+    int insert(GyeePermission record);
+
+    int insertSelective(GyeePermission record);
+
+    List<GyeePermission> selectByExample(GyeePermissionExample example);
+		
+    GyeePermission selectByPrimaryKey(String id);
+		
+    int updateByExampleSelective(@Param("record") GyeePermission record, @Param("example") GyeePermissionExample example);
+
+    int updateByExample(@Param("record") GyeePermission record, @Param("example") GyeePermissionExample example); 
+		
+    int updateByPrimaryKeySelective(GyeePermission record);
+
+    int updateByPrimaryKey(GyeePermission record);
+    
+    List<GyeePermission> queryPermissionByRoleId(String userid);
+  	  	
+}

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

@@ -1,40 +0,0 @@
-package com.gyee.frame.mapper.auto;
-
-import com.gyee.frame.model.auto.Gyeepermission;
-import com.gyee.frame.model.auto.GyeepermissionExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-/**
- *  GyeepermissionMapper
- * @author gyee_自动生成
- * @email 1@qq.com
- * @date 2020-04-16 14:55:15
- */
-public interface GyeepermissionMapper {
-      	   	      	      	      	      	      	      	      	      
-    long countByExample(GyeepermissionExample example);
-
-    int deleteByExample(GyeepermissionExample example);
-		
-    int deleteByPrimaryKey(String id);
-		
-    int insert(Gyeepermission record);
-
-    int insertSelective(Gyeepermission record);
-
-    List<Gyeepermission> selectByExample(GyeepermissionExample example);
-		
-    Gyeepermission selectByPrimaryKey(String id);
-		
-    int updateByExampleSelective(@Param("record") Gyeepermission record, @Param("example") GyeepermissionExample example);
-
-    int updateByExample(@Param("record") Gyeepermission record, @Param("example") GyeepermissionExample example); 
-		
-    int updateByPrimaryKeySelective(Gyeepermission record);
-
-    int updateByPrimaryKey(Gyeepermission record);
-    
-    List<Gyeepermission> queryPermissionByRoleId(String userid);
-  	  	
-}

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

@@ -0,0 +1,39 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.Shbraceletpoint;
+import com.gyee.frame.model.auto.ShbraceletpointExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *  ShbraceletpointMapper
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2020-05-20 19:07:48
+ */
+public interface ShbraceletpointMapper {
+      	   	      	      	      	      	      	      	      	      
+    long countByExample(ShbraceletpointExample example);
+
+    int deleteByExample(ShbraceletpointExample example);
+		
+    int deleteByPrimaryKey(String id);
+		
+    int insert(Shbraceletpoint record);
+
+    int insertSelective(Shbraceletpoint record);
+
+    List<Shbraceletpoint> selectByExample(ShbraceletpointExample example);
+		
+    Shbraceletpoint selectByPrimaryKey(String id);
+		
+    int updateByExampleSelective(@Param("record") Shbraceletpoint record, @Param("example") ShbraceletpointExample example);
+
+    int updateByExample(@Param("record") Shbraceletpoint record, @Param("example") ShbraceletpointExample example);
+		
+    int updateByPrimaryKeySelective(Shbraceletpoint record);
+
+    int updateByPrimaryKey(Shbraceletpoint record);
+  	  	
+}

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

@@ -1,38 +0,0 @@
-package com.gyee.frame.mapper.auto;
-
-import com.gyee.frame.model.auto.Weatherfh;
-import com.gyee.frame.model.auto.WeatherfhExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-/**
- *  WeatherfhMapper
- * @author Wang Jiawen_自动生成
- * @email 1@qq.com
- * @date 2020-01-07 16:14:18
- */
-public interface WeatherfhMapper {
-      	   	      	      	      	      	      	      	      	      	      
-    long countByExample(WeatherfhExample example);
-
-    int deleteByExample(WeatherfhExample example);
-		
-    int deleteByPrimaryKey(Integer id);
-		
-    int insert(Weatherfh record);
-
-    int insertSelective(Weatherfh record);
-
-    List<Weatherfh> selectByExample(WeatherfhExample example);
-		
-    Weatherfh selectByPrimaryKey(Integer id);
-		
-    int updateByExampleSelective(@Param("record") Weatherfh record, @Param("example") WeatherfhExample example);
-
-    int updateByExample(@Param("record") Weatherfh record, @Param("example") WeatherfhExample example); 
-		
-    int updateByPrimaryKeySelective(Weatherfh record);
-
-    int updateByPrimaryKey(Weatherfh record);
-  	  	
-}

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

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

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

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

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

@@ -1,9 +1,10 @@
 package com.gyee.frame.model.auto;
 
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
+
 
 /**
  *  Gyeeorgan 

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

@@ -1,8 +1,6 @@
 package com.gyee.frame.model.auto;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**

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

@@ -1,143 +0,0 @@
-package com.gyee.frame.model.auto;
-
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-
-/**
- *  Gyeepermission 
- * @author gyee_自动生成
- * @email 1@qq.com
- * @date 2020-04-16 14:55:15
- */
- @ApiModel(value="Gyeepermission", description="")
-public class Gyeepermission implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-	
-		
-	/**  **/
-	@ApiModelProperty(value = "") 
-private String id;
-		
-	/**  **/
-	@ApiModelProperty(value = "") 
-private String permisssionlevel;
-		
-	/**  **/
-	@ApiModelProperty(value = "") 
-private String permisssionname;
-		
-	/**  **/
-	@ApiModelProperty(value = "") 
-private String describes;
-		
-	/**  **/
-	@ApiModelProperty(value = "") 
-private String remark1;
-		
-	/**  **/
-	@ApiModelProperty(value = "") 
-private String remark2;
-		
-	/**  **/
-	@ApiModelProperty(value = "") 
-private String parent;
-		
-	/**  **/
-	@ApiModelProperty(value = "") 
-private String isable;
-		
-		
-	public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-	 
-			
-	public String getPermisssionlevel() {
-        return permisssionlevel;
-    }
-
-    public void setPermisssionlevel(String permisssionlevel) {
-        this.permisssionlevel = permisssionlevel;
-    }
-	 
-			
-	public String getPermisssionname() {
-        return permisssionname;
-    }
-
-    public void setPermisssionname(String permisssionname) {
-        this.permisssionname = permisssionname;
-    }
-	 
-			
-	public String getDescribes() {
-        return describes;
-    }
-
-    public void setDescribes(String describes) {
-        this.describes = describes;
-    }
-	 
-			
-	public String getRemark1() {
-        return remark1;
-    }
-
-    public void setRemark1(String remark1) {
-        this.remark1 = remark1;
-    }
-	 
-			
-	public String getRemark2() {
-        return remark2;
-    }
-
-    public void setRemark2(String remark2) {
-        this.remark2 = remark2;
-    }
-	 
-			
-	public String getParent() {
-        return parent;
-    }
-
-    public void setParent(String parent) {
-        this.parent = parent;
-    }
-	 
-			
-	public String getIsable() {
-        return isable;
-    }
-
-    public void setIsable(String isable) {
-        this.isable = isable;
-    }
-	 
-			
-	public Gyeepermission() {
-        super();
-    }
-    
-																																										
-	public Gyeepermission(String id,String permisssionlevel,String permisssionname,String describes,String remark1,String remark2,String parent,String isable) {
-	
-		this.id = id;
-		this.permisssionlevel = permisssionlevel;
-		this.permisssionname = permisssionname;
-		this.describes = describes;
-		this.remark1 = remark1;
-		this.remark2 = remark2;
-		this.parent = parent;
-		this.isable = isable;
-		
-	}
-	
-}

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

@@ -1,777 +0,0 @@
-package com.gyee.frame.model.auto;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- *  GyeepermissionExample
- * @author gyee_自动生成
- * @email 1@qq.com
- * @date 2020-04-16 14:55:15
- */
-public class GyeepermissionExample {
-
-    protected String orderByClause;
-
-    protected boolean distinct;
-
-    protected List<Criteria> oredCriteria;
-
-    public GyeepermissionExample() {
-        oredCriteria = new ArrayList<Criteria>();
-    }
-
-    public void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
-    public void or(Criteria criteria) {
-        oredCriteria.add(criteria);
-    }
-
-    public Criteria or() {
-        Criteria criteria = createCriteriaInternal();
-        oredCriteria.add(criteria);
-        return criteria;
-    }
-
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
-    }
-
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria();
-        return criteria;
-    }
-
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
-    }
-
-    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 andPermisssionlevelIsNull() {
-            addCriterion("permisssionlevel is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionlevelIsNotNull() {
-            addCriterion("permisssionlevel is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionlevelEqualTo(String value) {
-            addCriterion("permisssionlevel =", value, "permisssionlevel");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionlevelNotEqualTo(String value) {
-            addCriterion("permisssionlevel <>", value, "permisssionlevel");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionlevelGreaterThan(String value) {
-            addCriterion("permisssionlevel >", value, "permisssionlevel");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionlevelGreaterThanOrEqualTo(String value) {
-            addCriterion("permisssionlevel >=", value, "permisssionlevel");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionlevelLessThan(String value) {
-            addCriterion("permisssionlevel <", value, "permisssionlevel");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionlevelLessThanOrEqualTo(String value) {
-            addCriterion("permisssionlevel <=", value, "permisssionlevel");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionlevelLike(String value) {
-            addCriterion("permisssionlevel like", value, "permisssionlevel");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionlevelNotLike(String value) {
-            addCriterion("permisssionlevel not like", value, "permisssionlevel");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionlevelIn(List<String> values) {
-            addCriterion("permisssionlevel in", values, "permisssionlevel");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionlevelNotIn(List<String> values) {
-            addCriterion("permisssionlevel not in", values, "permisssionlevel");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionlevelBetween(String value1, String value2) {
-            addCriterion("permisssionlevel between", value1, value2, "permisssionlevel");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionlevelNotBetween(String value1, String value2) {
-            addCriterion("permisssionlevel not between", value1, value2, "permisssionlevel");
-            return (Criteria) this;
-        }
-        
-			
-        public Criteria andPermisssionnameIsNull() {
-            addCriterion("permisssionname is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionnameIsNotNull() {
-            addCriterion("permisssionname is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionnameEqualTo(String value) {
-            addCriterion("permisssionname =", value, "permisssionname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionnameNotEqualTo(String value) {
-            addCriterion("permisssionname <>", value, "permisssionname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionnameGreaterThan(String value) {
-            addCriterion("permisssionname >", value, "permisssionname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionnameGreaterThanOrEqualTo(String value) {
-            addCriterion("permisssionname >=", value, "permisssionname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionnameLessThan(String value) {
-            addCriterion("permisssionname <", value, "permisssionname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionnameLessThanOrEqualTo(String value) {
-            addCriterion("permisssionname <=", value, "permisssionname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionnameLike(String value) {
-            addCriterion("permisssionname like", value, "permisssionname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionnameNotLike(String value) {
-            addCriterion("permisssionname not like", value, "permisssionname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionnameIn(List<String> values) {
-            addCriterion("permisssionname in", values, "permisssionname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionnameNotIn(List<String> values) {
-            addCriterion("permisssionname not in", values, "permisssionname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionnameBetween(String value1, String value2) {
-            addCriterion("permisssionname between", value1, value2, "permisssionname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermisssionnameNotBetween(String value1, String value2) {
-            addCriterion("permisssionname not between", value1, value2, "permisssionname");
-            return (Criteria) this;
-        }
-        
-			
-        public Criteria andDescribesIsNull() {
-            addCriterion("describes is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescribesIsNotNull() {
-            addCriterion("describes is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescribesEqualTo(String value) {
-            addCriterion("describes =", value, "describes");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescribesNotEqualTo(String value) {
-            addCriterion("describes <>", value, "describes");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescribesGreaterThan(String value) {
-            addCriterion("describes >", value, "describes");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescribesGreaterThanOrEqualTo(String value) {
-            addCriterion("describes >=", value, "describes");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescribesLessThan(String value) {
-            addCriterion("describes <", value, "describes");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescribesLessThanOrEqualTo(String value) {
-            addCriterion("describes <=", value, "describes");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescribesLike(String value) {
-            addCriterion("describes like", value, "describes");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescribesNotLike(String value) {
-            addCriterion("describes not like", value, "describes");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescribesIn(List<String> values) {
-            addCriterion("describes in", values, "describes");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescribesNotIn(List<String> values) {
-            addCriterion("describes not in", values, "describes");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescribesBetween(String value1, String value2) {
-            addCriterion("describes between", value1, value2, "describes");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescribesNotBetween(String value1, String value2) {
-            addCriterion("describes not between", value1, value2, "describes");
-            return (Criteria) this;
-        }
-        
-			
-        public Criteria andRemark1IsNull() {
-            addCriterion("remark1 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark1IsNotNull() {
-            addCriterion("remark1 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark1EqualTo(String value) {
-            addCriterion("remark1 =", value, "remark1");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark1NotEqualTo(String value) {
-            addCriterion("remark1 <>", value, "remark1");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark1GreaterThan(String value) {
-            addCriterion("remark1 >", value, "remark1");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark1GreaterThanOrEqualTo(String value) {
-            addCriterion("remark1 >=", value, "remark1");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark1LessThan(String value) {
-            addCriterion("remark1 <", value, "remark1");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark1LessThanOrEqualTo(String value) {
-            addCriterion("remark1 <=", value, "remark1");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark1Like(String value) {
-            addCriterion("remark1 like", value, "remark1");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark1NotLike(String value) {
-            addCriterion("remark1 not like", value, "remark1");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark1In(List<String> values) {
-            addCriterion("remark1 in", values, "remark1");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark1NotIn(List<String> values) {
-            addCriterion("remark1 not in", values, "remark1");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark1Between(String value1, String value2) {
-            addCriterion("remark1 between", value1, value2, "remark1");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark1NotBetween(String value1, String value2) {
-            addCriterion("remark1 not between", value1, value2, "remark1");
-            return (Criteria) this;
-        }
-        
-			
-        public Criteria andRemark2IsNull() {
-            addCriterion("remark2 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark2IsNotNull() {
-            addCriterion("remark2 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark2EqualTo(String value) {
-            addCriterion("remark2 =", value, "remark2");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark2NotEqualTo(String value) {
-            addCriterion("remark2 <>", value, "remark2");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark2GreaterThan(String value) {
-            addCriterion("remark2 >", value, "remark2");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark2GreaterThanOrEqualTo(String value) {
-            addCriterion("remark2 >=", value, "remark2");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark2LessThan(String value) {
-            addCriterion("remark2 <", value, "remark2");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark2LessThanOrEqualTo(String value) {
-            addCriterion("remark2 <=", value, "remark2");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark2Like(String value) {
-            addCriterion("remark2 like", value, "remark2");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark2NotLike(String value) {
-            addCriterion("remark2 not like", value, "remark2");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark2In(List<String> values) {
-            addCriterion("remark2 in", values, "remark2");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark2NotIn(List<String> values) {
-            addCriterion("remark2 not in", values, "remark2");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark2Between(String value1, String value2) {
-            addCriterion("remark2 between", value1, value2, "remark2");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemark2NotBetween(String value1, String value2) {
-            addCriterion("remark2 not between", value1, value2, "remark2");
-            return (Criteria) this;
-        }
-        
-			
-        public Criteria andParentIsNull() {
-            addCriterion("parent is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andParentIsNotNull() {
-            addCriterion("parent is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andParentEqualTo(String value) {
-            addCriterion("parent =", value, "parent");
-            return (Criteria) this;
-        }
-
-        public Criteria andParentNotEqualTo(String value) {
-            addCriterion("parent <>", value, "parent");
-            return (Criteria) this;
-        }
-
-        public Criteria andParentGreaterThan(String value) {
-            addCriterion("parent >", value, "parent");
-            return (Criteria) this;
-        }
-
-        public Criteria andParentGreaterThanOrEqualTo(String value) {
-            addCriterion("parent >=", value, "parent");
-            return (Criteria) this;
-        }
-
-        public Criteria andParentLessThan(String value) {
-            addCriterion("parent <", value, "parent");
-            return (Criteria) this;
-        }
-
-        public Criteria andParentLessThanOrEqualTo(String value) {
-            addCriterion("parent <=", value, "parent");
-            return (Criteria) this;
-        }
-
-        public Criteria andParentLike(String value) {
-            addCriterion("parent like", value, "parent");
-            return (Criteria) this;
-        }
-
-        public Criteria andParentNotLike(String value) {
-            addCriterion("parent not like", value, "parent");
-            return (Criteria) this;
-        }
-
-        public Criteria andParentIn(List<String> values) {
-            addCriterion("parent in", values, "parent");
-            return (Criteria) this;
-        }
-
-        public Criteria andParentNotIn(List<String> values) {
-            addCriterion("parent not in", values, "parent");
-            return (Criteria) this;
-        }
-
-        public Criteria andParentBetween(String value1, String value2) {
-            addCriterion("parent between", value1, value2, "parent");
-            return (Criteria) this;
-        }
-
-        public Criteria andParentNotBetween(String value1, String value2) {
-            addCriterion("parent not between", value1, value2, "parent");
-            return (Criteria) this;
-        }
-        
-			
-        public Criteria andIsableIsNull() {
-            addCriterion("isable is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsableIsNotNull() {
-            addCriterion("isable is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsableEqualTo(String value) {
-            addCriterion("isable =", value, "isable");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsableNotEqualTo(String value) {
-            addCriterion("isable <>", value, "isable");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsableGreaterThan(String value) {
-            addCriterion("isable >", value, "isable");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsableGreaterThanOrEqualTo(String value) {
-            addCriterion("isable >=", value, "isable");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsableLessThan(String value) {
-            addCriterion("isable <", value, "isable");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsableLessThanOrEqualTo(String value) {
-            addCriterion("isable <=", value, "isable");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsableLike(String value) {
-            addCriterion("isable like", value, "isable");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsableNotLike(String value) {
-            addCriterion("isable not like", value, "isable");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsableIn(List<String> values) {
-            addCriterion("isable in", values, "isable");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsableNotIn(List<String> values) {
-            addCriterion("isable not in", values, "isable");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsableBetween(String value1, String value2) {
-            addCriterion("isable between", value1, value2, "isable");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsableNotBetween(String value1, String value2) {
-            addCriterion("isable not between", value1, value2, "isable");
-            return (Criteria) this;
-        }
-        
-	}
-
-    public static class Criteria extends GeneratedCriteria {
-
-        protected Criteria() {
-            super();
-        }
-    }
-
-    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/Gyeeuser.java

@@ -1,87 +1,277 @@
 package com.gyee.frame.model.auto;
 
 import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
-
-/**
- *  Gyeeuser 
- * @author gyee_自动生成
- * @email 1@qq.com
- * @date 2020-04-15 16:48:37
- */
- @ApiModel(value="Gyeeuser", description="")
 public class Gyeeuser implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gyeeuser.id
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gyeeuser.username
+     *
+     * @mbg.generated
+     */
+    private String username;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gyeeuser.password
+     *
+     * @mbg.generated
+     */
+    private String password;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gyeeuser.nickname
+     *
+     * @mbg.generated
+     */
+    private String nickname;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gyeeuser.photo
+     *
+     * @mbg.generated
+     */
+    private String photo;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gyeeuser.remak1
+     *
+     * @mbg.generated
+     */
+    private String remak1;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gyeeuser.remak2
+     *
+     * @mbg.generated
+     */
+    private String remak2;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gyeeuser.remak3
+     *
+     * @mbg.generated
+     */
+    private String remak3;
 
-	private static final long serialVersionUID = 1L;
-	
-		
-	/**  **/
-	@ApiModelProperty(value = "") 
-private String id;
-		
-	/**  **/
-	@ApiModelProperty(value = "") 
-private String username;
-		
-	/**  **/
-	@ApiModelProperty(value = "") 
-private String password;
-		
-	/**  **/
-	@ApiModelProperty(value = "") 
-private String nickname;
-		
-		
-	public String getId() {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gyeeuser.id
+     *
+     * @return the value of gyeeuser.id
+     *
+     * @mbg.generated
+     */
+    public String getId() {
         return id;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gyeeuser.id
+     *
+     * @param id the value for gyeeuser.id
+     *
+     * @mbg.generated
+     */
     public void setId(String id) {
-        this.id = id;
+        this.id = id == null ? null : id.trim();
     }
-	 
-			
-	public String getUsername() {
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gyeeuser.username
+     *
+     * @return the value of gyeeuser.username
+     *
+     * @mbg.generated
+     */
+    public String getUsername() {
         return username;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gyeeuser.username
+     *
+     * @param username the value for gyeeuser.username
+     *
+     * @mbg.generated
+     */
     public void setUsername(String username) {
-        this.username = username;
+        this.username = username == null ? null : username.trim();
     }
-	 
-			
-	public String getPassword() {
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gyeeuser.password
+     *
+     * @return the value of gyeeuser.password
+     *
+     * @mbg.generated
+     */
+    public String getPassword() {
         return password;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gyeeuser.password
+     *
+     * @param password the value for gyeeuser.password
+     *
+     * @mbg.generated
+     */
     public void setPassword(String password) {
-        this.password = password;
+        this.password = password == null ? null : password.trim();
     }
-	 
-			
-	public String getNickname() {
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gyeeuser.nickname
+     *
+     * @return the value of gyeeuser.nickname
+     *
+     * @mbg.generated
+     */
+    public String getNickname() {
         return nickname;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gyeeuser.nickname
+     *
+     * @param nickname the value for gyeeuser.nickname
+     *
+     * @mbg.generated
+     */
     public void setNickname(String nickname) {
-        this.nickname = nickname;
-    }
-	 
-			
-	public Gyeeuser() {
-        super();
-    }
-    
-																						
-	public Gyeeuser(String id,String username,String password,String nickname) {
-	
-		this.id = id;
-		this.username = username;
-		this.password = password;
-		this.nickname = nickname;
-		
-	}
-	
+        this.nickname = nickname == null ? null : nickname.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gyeeuser.photo
+     *
+     * @return the value of gyeeuser.photo
+     *
+     * @mbg.generated
+     */
+    public String getPhoto() {
+        return photo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gyeeuser.photo
+     *
+     * @param photo the value for gyeeuser.photo
+     *
+     * @mbg.generated
+     */
+    public void setPhoto(String photo) {
+        this.photo = photo == null ? null : photo.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gyeeuser.remak1
+     *
+     * @return the value of gyeeuser.remak1
+     *
+     * @mbg.generated
+     */
+    public String getRemak1() {
+        return remak1;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gyeeuser.remak1
+     *
+     * @param remak1 the value for gyeeuser.remak1
+     *
+     * @mbg.generated
+     */
+    public void setRemak1(String remak1) {
+        this.remak1 = remak1 == null ? null : remak1.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gyeeuser.remak2
+     *
+     * @return the value of gyeeuser.remak2
+     *
+     * @mbg.generated
+     */
+    public String getRemak2() {
+        return remak2;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gyeeuser.remak2
+     *
+     * @param remak2 the value for gyeeuser.remak2
+     *
+     * @mbg.generated
+     */
+    public void setRemak2(String remak2) {
+        this.remak2 = remak2 == null ? null : remak2.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gyeeuser.remak3
+     *
+     * @return the value of gyeeuser.remak3
+     *
+     * @mbg.generated
+     */
+    public String getRemak3() {
+        return remak3;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gyeeuser.remak3
+     *
+     * @param remak3 the value for gyeeuser.remak3
+     *
+     * @mbg.generated
+     */
+    public void setRemak3(String remak3) {
+        this.remak3 = remak3 == null ? null : remak3.trim();
+    }
 }

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

@@ -1,58 +1,121 @@
 package com.gyee.frame.model.auto;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
-/**
- *  GyeeuserExample
- * @author gyee_自动生成
- * @email 1@qq.com
- * @date 2020-04-15 16:48:37
- */
 public class GyeeuserExample {
-
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     protected String orderByClause;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     protected boolean distinct;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     protected List<Criteria> oredCriteria;
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     public GyeeuserExample() {
         oredCriteria = new ArrayList<Criteria>();
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     public String getOrderByClause() {
         return orderByClause;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     public boolean isDistinct() {
         return distinct;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @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 gyeeuser
+     *
+     * @mbg.generated
+     */
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
         if (oredCriteria.size() == 0) {
@@ -61,17 +124,35 @@ public class GyeeuserExample {
         return criteria;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @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 gyeeuser
+     *
+     * @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 gyeeuser
+     *
+     * @mbg.generated
+     */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
 
@@ -112,7 +193,7 @@ public class GyeeuserExample {
             }
             criteria.add(new Criterion(condition, value1, value2));
         }
-				
+
         public Criteria andIdIsNull() {
             addCriterion("id is null");
             return (Criteria) this;
@@ -182,8 +263,7 @@ public class GyeeuserExample {
             addCriterion("id not between", value1, value2, "id");
             return (Criteria) this;
         }
-        
-			
+
         public Criteria andUsernameIsNull() {
             addCriterion("username is null");
             return (Criteria) this;
@@ -253,8 +333,7 @@ public class GyeeuserExample {
             addCriterion("username not between", value1, value2, "username");
             return (Criteria) this;
         }
-        
-			
+
         public Criteria andPasswordIsNull() {
             addCriterion("password is null");
             return (Criteria) this;
@@ -324,8 +403,7 @@ public class GyeeuserExample {
             addCriterion("password not between", value1, value2, "password");
             return (Criteria) this;
         }
-        
-			
+
         public Criteria andNicknameIsNull() {
             addCriterion("nickname is null");
             return (Criteria) this;
@@ -395,9 +473,294 @@ public class GyeeuserExample {
             addCriterion("nickname not between", value1, value2, "nickname");
             return (Criteria) this;
         }
-        
-	}
 
+        public Criteria andPhotoIsNull() {
+            addCriterion("photo is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoIsNotNull() {
+            addCriterion("photo is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoEqualTo(String value) {
+            addCriterion("photo =", value, "photo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoNotEqualTo(String value) {
+            addCriterion("photo <>", value, "photo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoGreaterThan(String value) {
+            addCriterion("photo >", value, "photo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoGreaterThanOrEqualTo(String value) {
+            addCriterion("photo >=", value, "photo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoLessThan(String value) {
+            addCriterion("photo <", value, "photo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoLessThanOrEqualTo(String value) {
+            addCriterion("photo <=", value, "photo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoLike(String value) {
+            addCriterion("photo like", value, "photo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoNotLike(String value) {
+            addCriterion("photo not like", value, "photo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoIn(List<String> values) {
+            addCriterion("photo in", values, "photo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoNotIn(List<String> values) {
+            addCriterion("photo not in", values, "photo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoBetween(String value1, String value2) {
+            addCriterion("photo between", value1, value2, "photo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoNotBetween(String value1, String value2) {
+            addCriterion("photo not between", value1, value2, "photo");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1IsNull() {
+            addCriterion("remak1 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1IsNotNull() {
+            addCriterion("remak1 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1EqualTo(String value) {
+            addCriterion("remak1 =", value, "remak1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1NotEqualTo(String value) {
+            addCriterion("remak1 <>", value, "remak1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1GreaterThan(String value) {
+            addCriterion("remak1 >", value, "remak1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1GreaterThanOrEqualTo(String value) {
+            addCriterion("remak1 >=", value, "remak1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1LessThan(String value) {
+            addCriterion("remak1 <", value, "remak1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1LessThanOrEqualTo(String value) {
+            addCriterion("remak1 <=", value, "remak1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1Like(String value) {
+            addCriterion("remak1 like", value, "remak1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1NotLike(String value) {
+            addCriterion("remak1 not like", value, "remak1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1In(List<String> values) {
+            addCriterion("remak1 in", values, "remak1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1NotIn(List<String> values) {
+            addCriterion("remak1 not in", values, "remak1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1Between(String value1, String value2) {
+            addCriterion("remak1 between", value1, value2, "remak1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1NotBetween(String value1, String value2) {
+            addCriterion("remak1 not between", value1, value2, "remak1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2IsNull() {
+            addCriterion("remak2 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2IsNotNull() {
+            addCriterion("remak2 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2EqualTo(String value) {
+            addCriterion("remak2 =", value, "remak2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2NotEqualTo(String value) {
+            addCriterion("remak2 <>", value, "remak2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2GreaterThan(String value) {
+            addCriterion("remak2 >", value, "remak2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2GreaterThanOrEqualTo(String value) {
+            addCriterion("remak2 >=", value, "remak2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2LessThan(String value) {
+            addCriterion("remak2 <", value, "remak2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2LessThanOrEqualTo(String value) {
+            addCriterion("remak2 <=", value, "remak2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2Like(String value) {
+            addCriterion("remak2 like", value, "remak2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2NotLike(String value) {
+            addCriterion("remak2 not like", value, "remak2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2In(List<String> values) {
+            addCriterion("remak2 in", values, "remak2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2NotIn(List<String> values) {
+            addCriterion("remak2 not in", values, "remak2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2Between(String value1, String value2) {
+            addCriterion("remak2 between", value1, value2, "remak2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2NotBetween(String value1, String value2) {
+            addCriterion("remak2 not between", value1, value2, "remak2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3IsNull() {
+            addCriterion("remak3 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3IsNotNull() {
+            addCriterion("remak3 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3EqualTo(String value) {
+            addCriterion("remak3 =", value, "remak3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3NotEqualTo(String value) {
+            addCriterion("remak3 <>", value, "remak3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3GreaterThan(String value) {
+            addCriterion("remak3 >", value, "remak3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3GreaterThanOrEqualTo(String value) {
+            addCriterion("remak3 >=", value, "remak3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3LessThan(String value) {
+            addCriterion("remak3 <", value, "remak3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3LessThanOrEqualTo(String value) {
+            addCriterion("remak3 <=", value, "remak3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3Like(String value) {
+            addCriterion("remak3 like", value, "remak3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3NotLike(String value) {
+            addCriterion("remak3 not like", value, "remak3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3In(List<String> values) {
+            addCriterion("remak3 in", values, "remak3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3NotIn(List<String> values) {
+            addCriterion("remak3 not in", values, "remak3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3Between(String value1, String value2) {
+            addCriterion("remak3 between", value1, value2, "remak3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3NotBetween(String value1, String value2) {
+            addCriterion("remak3 not between", value1, value2, "remak3");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table gyeeuser
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
     public static class Criteria extends GeneratedCriteria {
 
         protected Criteria() {
@@ -405,6 +768,12 @@ public class GyeeuserExample {
         }
     }
 
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     public static class Criterion {
         private String condition;
 

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

@@ -1,162 +0,0 @@
-package com.gyee.frame.model.auto;
-
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.lang.Double;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.lang.Integer;
-
-/**
- *  Weatherfh 
- * @author Wang Jiawen_自动生成
- * @email 1@qq.com
- * @date 2020-01-07 16:14:18
- */
- @ApiModel(value="Weatherfh", description="")
-public class Weatherfh implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-	
-		
-	/** id编码 **/
-	@ApiModelProperty(value = "id编码") 
-private Integer id;
-		
-	/** 日期 **/
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-	@ApiModelProperty(value = "日期") 
-private Date date;
-		
-	/** 地点 **/
-	@ApiModelProperty(value = "地点") 
-private String region;
-		
-	/** 风场编号 **/
-	@ApiModelProperty(value = "风场编号") 
-private String windpowerstationid;
-		
-	/** 气象 **/
-	@ApiModelProperty(value = "气象") 
-private String weather;
-		
-	/** 温度 **/
-	@ApiModelProperty(value = "温度") 
-private String temperature;
-		
-	/** 风向 **/
-	@ApiModelProperty(value = "风向") 
-private String winddirection;
-		
-	/** 体感温度 **/
-	@ApiModelProperty(value = "体感温度") 
-private Double realfeel;
-		
-	/** 风速 **/
-	@ApiModelProperty(value = "风速") 
-private Double speed;
-		
-		
-	public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-	 
-			
-	public Date getDate() {
-        return date;
-    }
-
-    public void setDate(Date date) {
-        this.date = date;
-    }
-	 
-			
-	public String getRegion() {
-        return region;
-    }
-
-    public void setRegion(String region) {
-        this.region = region;
-    }
-	 
-			
-	public String getWindpowerstationid() {
-        return windpowerstationid;
-    }
-
-    public void setWindpowerstationid(String windpowerstationid) {
-        this.windpowerstationid = windpowerstationid;
-    }
-	 
-			
-	public String getWeather() {
-        return weather;
-    }
-
-    public void setWeather(String weather) {
-        this.weather = weather;
-    }
-	 
-			
-	public String getTemperature() {
-        return temperature;
-    }
-
-    public void setTemperature(String temperature) {
-        this.temperature = temperature;
-    }
-	 
-			
-	public String getWinddirection() {
-        return winddirection;
-    }
-
-    public void setWinddirection(String winddirection) {
-        this.winddirection = winddirection;
-    }
-	 
-			
-	public Double getRealfeel() {
-        return realfeel;
-    }
-
-    public void setRealfeel(Double realfeel) {
-        this.realfeel = realfeel;
-    }
-	 
-			
-	public Double getSpeed() {
-        return speed;
-    }
-
-    public void setSpeed(Double speed) {
-        this.speed = speed;
-    }
-	 
-			
-	public Weatherfh() {
-        super();
-    }
-    
-																																															
-	public Weatherfh(Integer id,Date date,String region,String windpowerstationid,String weather,String temperature,String winddirection,Double realfeel,Double speed) {
-	
-		this.id = id;
-		this.date = date;
-		this.region = region;
-		this.windpowerstationid = windpowerstationid;
-		this.weather = weather;
-		this.temperature = temperature;
-		this.winddirection = winddirection;
-		this.realfeel = realfeel;
-		this.speed = speed;
-		
-	}
-	
-}

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

@@ -1,848 +0,0 @@
-package com.gyee.frame.model.auto;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- *  WeatherfhExample
- * @author Wang Jiawen_自动生成
- * @email 1@qq.com
- * @date 2020-01-07 16:14:18
- */
-public class WeatherfhExample {
-
-    protected String orderByClause;
-
-    protected boolean distinct;
-
-    protected List<Criteria> oredCriteria;
-
-    public WeatherfhExample() {
-        oredCriteria = new ArrayList<Criteria>();
-    }
-
-    public void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
-    public void or(Criteria criteria) {
-        oredCriteria.add(criteria);
-    }
-
-    public Criteria or() {
-        Criteria criteria = createCriteriaInternal();
-        oredCriteria.add(criteria);
-        return criteria;
-    }
-
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
-    }
-
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria();
-        return criteria;
-    }
-
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
-    }
-
-    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(Integer value) {
-            addCriterion("id =", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotEqualTo(Integer value) {
-            addCriterion("id <>", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThan(Integer value) {
-            addCriterion("id >", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("id >=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThan(Integer value) {
-            addCriterion("id <", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThanOrEqualTo(Integer value) {
-            addCriterion("id <=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLike(Integer value) {
-            addCriterion("id like", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotLike(Integer value) {
-            addCriterion("id not like", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIn(List<Integer> values) {
-            addCriterion("id in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotIn(List<Integer> values) {
-            addCriterion("id not in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdBetween(Integer value1, Integer value2) {
-            addCriterion("id between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("id not between", value1, value2, "id");
-            return (Criteria) this;
-        }
-        
-			
-        public Criteria andDateIsNull() {
-            addCriterion("date is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDateIsNotNull() {
-            addCriterion("date is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDateEqualTo(Date value) {
-            addCriterion("date =", value, "date");
-            return (Criteria) this;
-        }
-
-        public Criteria andDateNotEqualTo(Date value) {
-            addCriterion("date <>", value, "date");
-            return (Criteria) this;
-        }
-
-        public Criteria andDateGreaterThan(Date value) {
-            addCriterion("date >", value, "date");
-            return (Criteria) this;
-        }
-
-        public Criteria andDateGreaterThanOrEqualTo(Date value) {
-            addCriterion("date >=", value, "date");
-            return (Criteria) this;
-        }
-
-        public Criteria andDateLessThan(Date value) {
-            addCriterion("date <", value, "date");
-            return (Criteria) this;
-        }
-
-        public Criteria andDateLessThanOrEqualTo(Date value) {
-            addCriterion("date <=", value, "date");
-            return (Criteria) this;
-        }
-
-        public Criteria andDateLike(Date value) {
-            addCriterion("date like", value, "date");
-            return (Criteria) this;
-        }
-
-        public Criteria andDateNotLike(Date value) {
-            addCriterion("date not like", value, "date");
-            return (Criteria) this;
-        }
-
-        public Criteria andDateIn(List<Date> values) {
-            addCriterion("date in", values, "date");
-            return (Criteria) this;
-        }
-
-        public Criteria andDateNotIn(List<Date> values) {
-            addCriterion("date not in", values, "date");
-            return (Criteria) this;
-        }
-
-        public Criteria andDateBetween(Date value1, Date value2) {
-            addCriterion("date between", value1, value2, "date");
-            return (Criteria) this;
-        }
-
-        public Criteria andDateNotBetween(Date value1, Date value2) {
-            addCriterion("date not between", value1, value2, "date");
-            return (Criteria) this;
-        }
-        
-			
-        public Criteria andRegionIsNull() {
-            addCriterion("region is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRegionIsNotNull() {
-            addCriterion("region is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRegionEqualTo(String value) {
-            addCriterion("region =", value, "region");
-            return (Criteria) this;
-        }
-
-        public Criteria andRegionNotEqualTo(String value) {
-            addCriterion("region <>", value, "region");
-            return (Criteria) this;
-        }
-
-        public Criteria andRegionGreaterThan(String value) {
-            addCriterion("region >", value, "region");
-            return (Criteria) this;
-        }
-
-        public Criteria andRegionGreaterThanOrEqualTo(String value) {
-            addCriterion("region >=", value, "region");
-            return (Criteria) this;
-        }
-
-        public Criteria andRegionLessThan(String value) {
-            addCriterion("region <", value, "region");
-            return (Criteria) this;
-        }
-
-        public Criteria andRegionLessThanOrEqualTo(String value) {
-            addCriterion("region <=", value, "region");
-            return (Criteria) this;
-        }
-
-        public Criteria andRegionLike(String value) {
-            addCriterion("region like", value, "region");
-            return (Criteria) this;
-        }
-
-        public Criteria andRegionNotLike(String value) {
-            addCriterion("region not like", value, "region");
-            return (Criteria) this;
-        }
-
-        public Criteria andRegionIn(List<String> values) {
-            addCriterion("region in", values, "region");
-            return (Criteria) this;
-        }
-
-        public Criteria andRegionNotIn(List<String> values) {
-            addCriterion("region not in", values, "region");
-            return (Criteria) this;
-        }
-
-        public Criteria andRegionBetween(String value1, String value2) {
-            addCriterion("region between", value1, value2, "region");
-            return (Criteria) this;
-        }
-
-        public Criteria andRegionNotBetween(String value1, String value2) {
-            addCriterion("region not between", value1, value2, "region");
-            return (Criteria) this;
-        }
-        
-			
-        public Criteria andWindpowerstationidIsNull() {
-            addCriterion("windpowerstationid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andWindpowerstationidIsNotNull() {
-            addCriterion("windpowerstationid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andWindpowerstationidEqualTo(String value) {
-            addCriterion("windpowerstationid =", value, "windpowerstationid");
-            return (Criteria) this;
-        }
-
-        public Criteria andWindpowerstationidNotEqualTo(String value) {
-            addCriterion("windpowerstationid <>", value, "windpowerstationid");
-            return (Criteria) this;
-        }
-
-        public Criteria andWindpowerstationidGreaterThan(String value) {
-            addCriterion("windpowerstationid >", value, "windpowerstationid");
-            return (Criteria) this;
-        }
-
-        public Criteria andWindpowerstationidGreaterThanOrEqualTo(String value) {
-            addCriterion("windpowerstationid >=", value, "windpowerstationid");
-            return (Criteria) this;
-        }
-
-        public Criteria andWindpowerstationidLessThan(String value) {
-            addCriterion("windpowerstationid <", value, "windpowerstationid");
-            return (Criteria) this;
-        }
-
-        public Criteria andWindpowerstationidLessThanOrEqualTo(String value) {
-            addCriterion("windpowerstationid <=", value, "windpowerstationid");
-            return (Criteria) this;
-        }
-
-        public Criteria andWindpowerstationidLike(String value) {
-            addCriterion("windpowerstationid like", value, "windpowerstationid");
-            return (Criteria) this;
-        }
-
-        public Criteria andWindpowerstationidNotLike(String value) {
-            addCriterion("windpowerstationid not like", value, "windpowerstationid");
-            return (Criteria) this;
-        }
-
-        public Criteria andWindpowerstationidIn(List<String> values) {
-            addCriterion("windpowerstationid in", values, "windpowerstationid");
-            return (Criteria) this;
-        }
-
-        public Criteria andWindpowerstationidNotIn(List<String> values) {
-            addCriterion("windpowerstationid not in", values, "windpowerstationid");
-            return (Criteria) this;
-        }
-
-        public Criteria andWindpowerstationidBetween(String value1, String value2) {
-            addCriterion("windpowerstationid between", value1, value2, "windpowerstationid");
-            return (Criteria) this;
-        }
-
-        public Criteria andWindpowerstationidNotBetween(String value1, String value2) {
-            addCriterion("windpowerstationid not between", value1, value2, "windpowerstationid");
-            return (Criteria) this;
-        }
-        
-			
-        public Criteria andWeatherIsNull() {
-            addCriterion("weather is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andWeatherIsNotNull() {
-            addCriterion("weather is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andWeatherEqualTo(String value) {
-            addCriterion("weather =", value, "weather");
-            return (Criteria) this;
-        }
-
-        public Criteria andWeatherNotEqualTo(String value) {
-            addCriterion("weather <>", value, "weather");
-            return (Criteria) this;
-        }
-
-        public Criteria andWeatherGreaterThan(String value) {
-            addCriterion("weather >", value, "weather");
-            return (Criteria) this;
-        }
-
-        public Criteria andWeatherGreaterThanOrEqualTo(String value) {
-            addCriterion("weather >=", value, "weather");
-            return (Criteria) this;
-        }
-
-        public Criteria andWeatherLessThan(String value) {
-            addCriterion("weather <", value, "weather");
-            return (Criteria) this;
-        }
-
-        public Criteria andWeatherLessThanOrEqualTo(String value) {
-            addCriterion("weather <=", value, "weather");
-            return (Criteria) this;
-        }
-
-        public Criteria andWeatherLike(String value) {
-            addCriterion("weather like", value, "weather");
-            return (Criteria) this;
-        }
-
-        public Criteria andWeatherNotLike(String value) {
-            addCriterion("weather not like", value, "weather");
-            return (Criteria) this;
-        }
-
-        public Criteria andWeatherIn(List<String> values) {
-            addCriterion("weather in", values, "weather");
-            return (Criteria) this;
-        }
-
-        public Criteria andWeatherNotIn(List<String> values) {
-            addCriterion("weather not in", values, "weather");
-            return (Criteria) this;
-        }
-
-        public Criteria andWeatherBetween(String value1, String value2) {
-            addCriterion("weather between", value1, value2, "weather");
-            return (Criteria) this;
-        }
-
-        public Criteria andWeatherNotBetween(String value1, String value2) {
-            addCriterion("weather not between", value1, value2, "weather");
-            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(String value) {
-            addCriterion("temperature =", value, "temperature");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemperatureNotEqualTo(String value) {
-            addCriterion("temperature <>", value, "temperature");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemperatureGreaterThan(String value) {
-            addCriterion("temperature >", value, "temperature");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemperatureGreaterThanOrEqualTo(String value) {
-            addCriterion("temperature >=", value, "temperature");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemperatureLessThan(String value) {
-            addCriterion("temperature <", value, "temperature");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemperatureLessThanOrEqualTo(String value) {
-            addCriterion("temperature <=", value, "temperature");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemperatureLike(String value) {
-            addCriterion("temperature like", value, "temperature");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemperatureNotLike(String value) {
-            addCriterion("temperature not like", value, "temperature");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemperatureIn(List<String> values) {
-            addCriterion("temperature in", values, "temperature");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemperatureNotIn(List<String> values) {
-            addCriterion("temperature not in", values, "temperature");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemperatureBetween(String value1, String value2) {
-            addCriterion("temperature between", value1, value2, "temperature");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemperatureNotBetween(String value1, String value2) {
-            addCriterion("temperature not between", value1, value2, "temperature");
-            return (Criteria) this;
-        }
-        
-			
-        public Criteria andWinddirectionIsNull() {
-            addCriterion("winddirection is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andWinddirectionIsNotNull() {
-            addCriterion("winddirection is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andWinddirectionEqualTo(String value) {
-            addCriterion("winddirection =", value, "winddirection");
-            return (Criteria) this;
-        }
-
-        public Criteria andWinddirectionNotEqualTo(String value) {
-            addCriterion("winddirection <>", value, "winddirection");
-            return (Criteria) this;
-        }
-
-        public Criteria andWinddirectionGreaterThan(String value) {
-            addCriterion("winddirection >", value, "winddirection");
-            return (Criteria) this;
-        }
-
-        public Criteria andWinddirectionGreaterThanOrEqualTo(String value) {
-            addCriterion("winddirection >=", value, "winddirection");
-            return (Criteria) this;
-        }
-
-        public Criteria andWinddirectionLessThan(String value) {
-            addCriterion("winddirection <", value, "winddirection");
-            return (Criteria) this;
-        }
-
-        public Criteria andWinddirectionLessThanOrEqualTo(String value) {
-            addCriterion("winddirection <=", value, "winddirection");
-            return (Criteria) this;
-        }
-
-        public Criteria andWinddirectionLike(String value) {
-            addCriterion("winddirection like", value, "winddirection");
-            return (Criteria) this;
-        }
-
-        public Criteria andWinddirectionNotLike(String value) {
-            addCriterion("winddirection not like", value, "winddirection");
-            return (Criteria) this;
-        }
-
-        public Criteria andWinddirectionIn(List<String> values) {
-            addCriterion("winddirection in", values, "winddirection");
-            return (Criteria) this;
-        }
-
-        public Criteria andWinddirectionNotIn(List<String> values) {
-            addCriterion("winddirection not in", values, "winddirection");
-            return (Criteria) this;
-        }
-
-        public Criteria andWinddirectionBetween(String value1, String value2) {
-            addCriterion("winddirection between", value1, value2, "winddirection");
-            return (Criteria) this;
-        }
-
-        public Criteria andWinddirectionNotBetween(String value1, String value2) {
-            addCriterion("winddirection not between", value1, value2, "winddirection");
-            return (Criteria) this;
-        }
-        
-			
-        public Criteria andRealfeelIsNull() {
-            addCriterion("realfeel is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealfeelIsNotNull() {
-            addCriterion("realfeel is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealfeelEqualTo(Double value) {
-            addCriterion("realfeel =", value, "realfeel");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealfeelNotEqualTo(Double value) {
-            addCriterion("realfeel <>", value, "realfeel");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealfeelGreaterThan(Double value) {
-            addCriterion("realfeel >", value, "realfeel");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealfeelGreaterThanOrEqualTo(Double value) {
-            addCriterion("realfeel >=", value, "realfeel");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealfeelLessThan(Double value) {
-            addCriterion("realfeel <", value, "realfeel");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealfeelLessThanOrEqualTo(Double value) {
-            addCriterion("realfeel <=", value, "realfeel");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealfeelLike(Double value) {
-            addCriterion("realfeel like", value, "realfeel");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealfeelNotLike(Double value) {
-            addCriterion("realfeel not like", value, "realfeel");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealfeelIn(List<Double> values) {
-            addCriterion("realfeel in", values, "realfeel");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealfeelNotIn(List<Double> values) {
-            addCriterion("realfeel not in", values, "realfeel");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealfeelBetween(Double value1, Double value2) {
-            addCriterion("realfeel between", value1, value2, "realfeel");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealfeelNotBetween(Double value1, Double value2) {
-            addCriterion("realfeel not between", value1, value2, "realfeel");
-            return (Criteria) this;
-        }
-        
-			
-        public Criteria andSpeedIsNull() {
-            addCriterion("speed is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSpeedIsNotNull() {
-            addCriterion("speed is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSpeedEqualTo(Double value) {
-            addCriterion("speed =", value, "speed");
-            return (Criteria) this;
-        }
-
-        public Criteria andSpeedNotEqualTo(Double value) {
-            addCriterion("speed <>", value, "speed");
-            return (Criteria) this;
-        }
-
-        public Criteria andSpeedGreaterThan(Double value) {
-            addCriterion("speed >", value, "speed");
-            return (Criteria) this;
-        }
-
-        public Criteria andSpeedGreaterThanOrEqualTo(Double value) {
-            addCriterion("speed >=", value, "speed");
-            return (Criteria) this;
-        }
-
-        public Criteria andSpeedLessThan(Double value) {
-            addCriterion("speed <", value, "speed");
-            return (Criteria) this;
-        }
-
-        public Criteria andSpeedLessThanOrEqualTo(Double value) {
-            addCriterion("speed <=", value, "speed");
-            return (Criteria) this;
-        }
-
-        public Criteria andSpeedLike(Double value) {
-            addCriterion("speed like", value, "speed");
-            return (Criteria) this;
-        }
-
-        public Criteria andSpeedNotLike(Double value) {
-            addCriterion("speed not like", value, "speed");
-            return (Criteria) this;
-        }
-
-        public Criteria andSpeedIn(List<Double> values) {
-            addCriterion("speed in", values, "speed");
-            return (Criteria) this;
-        }
-
-        public Criteria andSpeedNotIn(List<Double> values) {
-            addCriterion("speed not in", values, "speed");
-            return (Criteria) this;
-        }
-
-        public Criteria andSpeedBetween(Double value1, Double value2) {
-            addCriterion("speed between", value1, value2, "speed");
-            return (Criteria) this;
-        }
-
-        public Criteria andSpeedNotBetween(Double value1, Double value2) {
-            addCriterion("speed not between", value1, value2, "speed");
-            return (Criteria) this;
-        }
-        
-	}
-
-    public static class Criteria extends GeneratedCriteria {
-
-        protected Criteria() {
-            super();
-        }
-    }
-
-    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/WindPowerstationTestingPoint.java

@@ -1,541 +0,0 @@
-package com.gyee.frame.model.auto;
-
-import java.io.Serializable;
-
-public class WindPowerstationTestingPoint implements Serializable {
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windpowerstationtestingpoint.code
-     *
-     * @mbg.generated
-     */
-    private String code;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windpowerstationtestingpoint.name
-     *
-     * @mbg.generated
-     */
-    private String name;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windpowerstationtestingpoint.model
-     *
-     * @mbg.generated
-     */
-    private String model;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windpowerstationtestingpoint.valueUnit
-     *
-     * @mbg.generated
-     */
-    private String valueunit;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windpowerstationtestingpoint.englishName
-     *
-     * @mbg.generated
-     */
-    private String englishname;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windpowerstationtestingpoint.typeId
-     *
-     * @mbg.generated
-     */
-    private String typeid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windpowerstationtestingpoint.modelId
-     *
-     * @mbg.generated
-     */
-    private String modelid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windpowerstationtestingpoint.maxVal
-     *
-     * @mbg.generated
-     */
-    private Double maxval;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windpowerstationtestingpoint.MinVal
-     *
-     * @mbg.generated
-     */
-    private Double minval;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windpowerstationtestingpoint.reasonableMaxVal
-     *
-     * @mbg.generated
-     */
-    private Double reasonablemaxval;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windpowerstationtestingpoint.reasonableMinVal
-     *
-     * @mbg.generated
-     */
-    private Double reasonableminval;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windpowerstationtestingpoint.uniformCode
-     *
-     * @mbg.generated
-     */
-    private String uniformcode;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windpowerstationtestingpoint.shortId
-     *
-     * @mbg.generated
-     */
-    private String shortid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windpowerstationtestingpoint.longId
-     *
-     * @mbg.generated
-     */
-    private String longid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windpowerstationtestingpoint.windPowerStationId
-     *
-     * @mbg.generated
-     */
-    private String windpowerstationid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windpowerstationtestingpoint.realTimeId
-     *
-     * @mbg.generated
-     */
-    private String realtimeid;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table windpowerstationtestingpoint
-     *
-     * @mbg.generated
-     */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windpowerstationtestingpoint.code
-     *
-     * @return the value of windpowerstationtestingpoint.code
-     *
-     * @mbg.generated
-     */
-    public String getCode() {
-        return code;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windpowerstationtestingpoint.code
-     *
-     * @param code the value for windpowerstationtestingpoint.code
-     *
-     * @mbg.generated
-     */
-    public void setCode(String code) {
-        this.code = code == null ? null : code.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windpowerstationtestingpoint.name
-     *
-     * @return the value of windpowerstationtestingpoint.name
-     *
-     * @mbg.generated
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windpowerstationtestingpoint.name
-     *
-     * @param name the value for windpowerstationtestingpoint.name
-     *
-     * @mbg.generated
-     */
-    public void setName(String name) {
-        this.name = name == null ? null : name.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windpowerstationtestingpoint.model
-     *
-     * @return the value of windpowerstationtestingpoint.model
-     *
-     * @mbg.generated
-     */
-    public String getModel() {
-        return model;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windpowerstationtestingpoint.model
-     *
-     * @param model the value for windpowerstationtestingpoint.model
-     *
-     * @mbg.generated
-     */
-    public void setModel(String model) {
-        this.model = model == null ? null : model.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windpowerstationtestingpoint.valueUnit
-     *
-     * @return the value of windpowerstationtestingpoint.valueUnit
-     *
-     * @mbg.generated
-     */
-    public String getValueunit() {
-        return valueunit;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windpowerstationtestingpoint.valueUnit
-     *
-     * @param valueunit the value for windpowerstationtestingpoint.valueUnit
-     *
-     * @mbg.generated
-     */
-    public void setValueunit(String valueunit) {
-        this.valueunit = valueunit == null ? null : valueunit.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windpowerstationtestingpoint.englishName
-     *
-     * @return the value of windpowerstationtestingpoint.englishName
-     *
-     * @mbg.generated
-     */
-    public String getEnglishname() {
-        return englishname;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windpowerstationtestingpoint.englishName
-     *
-     * @param englishname the value for windpowerstationtestingpoint.englishName
-     *
-     * @mbg.generated
-     */
-    public void setEnglishname(String englishname) {
-        this.englishname = englishname == null ? null : englishname.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windpowerstationtestingpoint.typeId
-     *
-     * @return the value of windpowerstationtestingpoint.typeId
-     *
-     * @mbg.generated
-     */
-    public String getTypeid() {
-        return typeid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windpowerstationtestingpoint.typeId
-     *
-     * @param typeid the value for windpowerstationtestingpoint.typeId
-     *
-     * @mbg.generated
-     */
-    public void setTypeid(String typeid) {
-        this.typeid = typeid == null ? null : typeid.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windpowerstationtestingpoint.modelId
-     *
-     * @return the value of windpowerstationtestingpoint.modelId
-     *
-     * @mbg.generated
-     */
-    public String getModelid() {
-        return modelid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windpowerstationtestingpoint.modelId
-     *
-     * @param modelid the value for windpowerstationtestingpoint.modelId
-     *
-     * @mbg.generated
-     */
-    public void setModelid(String modelid) {
-        this.modelid = modelid == null ? null : modelid.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windpowerstationtestingpoint.maxVal
-     *
-     * @return the value of windpowerstationtestingpoint.maxVal
-     *
-     * @mbg.generated
-     */
-    public Double getMaxval() {
-        return maxval;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windpowerstationtestingpoint.maxVal
-     *
-     * @param maxval the value for windpowerstationtestingpoint.maxVal
-     *
-     * @mbg.generated
-     */
-    public void setMaxval(Double maxval) {
-        this.maxval = maxval;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windpowerstationtestingpoint.MinVal
-     *
-     * @return the value of windpowerstationtestingpoint.MinVal
-     *
-     * @mbg.generated
-     */
-    public Double getMinval() {
-        return minval;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windpowerstationtestingpoint.MinVal
-     *
-     * @param minval the value for windpowerstationtestingpoint.MinVal
-     *
-     * @mbg.generated
-     */
-    public void setMinval(Double minval) {
-        this.minval = minval;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windpowerstationtestingpoint.reasonableMaxVal
-     *
-     * @return the value of windpowerstationtestingpoint.reasonableMaxVal
-     *
-     * @mbg.generated
-     */
-    public Double getReasonablemaxval() {
-        return reasonablemaxval;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windpowerstationtestingpoint.reasonableMaxVal
-     *
-     * @param reasonablemaxval the value for windpowerstationtestingpoint.reasonableMaxVal
-     *
-     * @mbg.generated
-     */
-    public void setReasonablemaxval(Double reasonablemaxval) {
-        this.reasonablemaxval = reasonablemaxval;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windpowerstationtestingpoint.reasonableMinVal
-     *
-     * @return the value of windpowerstationtestingpoint.reasonableMinVal
-     *
-     * @mbg.generated
-     */
-    public Double getReasonableminval() {
-        return reasonableminval;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windpowerstationtestingpoint.reasonableMinVal
-     *
-     * @param reasonableminval the value for windpowerstationtestingpoint.reasonableMinVal
-     *
-     * @mbg.generated
-     */
-    public void setReasonableminval(Double reasonableminval) {
-        this.reasonableminval = reasonableminval;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windpowerstationtestingpoint.uniformCode
-     *
-     * @return the value of windpowerstationtestingpoint.uniformCode
-     *
-     * @mbg.generated
-     */
-    public String getUniformcode() {
-        return uniformcode;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windpowerstationtestingpoint.uniformCode
-     *
-     * @param uniformcode the value for windpowerstationtestingpoint.uniformCode
-     *
-     * @mbg.generated
-     */
-    public void setUniformcode(String uniformcode) {
-        this.uniformcode = uniformcode == null ? null : uniformcode.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windpowerstationtestingpoint.shortId
-     *
-     * @return the value of windpowerstationtestingpoint.shortId
-     *
-     * @mbg.generated
-     */
-    public String getShortid() {
-        return shortid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windpowerstationtestingpoint.shortId
-     *
-     * @param shortid the value for windpowerstationtestingpoint.shortId
-     *
-     * @mbg.generated
-     */
-    public void setShortid(String shortid) {
-        this.shortid = shortid == null ? null : shortid.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windpowerstationtestingpoint.longId
-     *
-     * @return the value of windpowerstationtestingpoint.longId
-     *
-     * @mbg.generated
-     */
-    public String getLongid() {
-        return longid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windpowerstationtestingpoint.longId
-     *
-     * @param longid the value for windpowerstationtestingpoint.longId
-     *
-     * @mbg.generated
-     */
-    public void setLongid(String longid) {
-        this.longid = longid == null ? null : longid.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windpowerstationtestingpoint.windPowerStationId
-     *
-     * @return the value of windpowerstationtestingpoint.windPowerStationId
-     *
-     * @mbg.generated
-     */
-    public String getWindpowerstationid() {
-        return windpowerstationid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windpowerstationtestingpoint.windPowerStationId
-     *
-     * @param windpowerstationid the value for windpowerstationtestingpoint.windPowerStationId
-     *
-     * @mbg.generated
-     */
-    public void setWindpowerstationid(String windpowerstationid) {
-        this.windpowerstationid = windpowerstationid == null ? null : windpowerstationid.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windpowerstationtestingpoint.realTimeId
-     *
-     * @return the value of windpowerstationtestingpoint.realTimeId
-     *
-     * @mbg.generated
-     */
-    public String getRealtimeid() {
-        return realtimeid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windpowerstationtestingpoint.realTimeId
-     *
-     * @param realtimeid the value for windpowerstationtestingpoint.realTimeId
-     *
-     * @mbg.generated
-     */
-    public void setRealtimeid(String realtimeid) {
-        this.realtimeid = realtimeid == null ? null : realtimeid.trim();
-    }
-}

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

@@ -1,607 +0,0 @@
-package com.gyee.frame.model.auto;
-
-import java.io.Serializable;
-
-public class WindTurbineTestingPointAi implements Serializable {
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinetestingpointai.id
-     *
-     * @mbg.generated
-     */
-    private String id;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinetestingpointai.code
-     *
-     * @mbg.generated
-     */
-    private String code;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinetestingpointai.name
-     *
-     * @mbg.generated
-     */
-    private String name;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinetestingpointai.model
-     *
-     * @mbg.generated
-     */
-    private String model;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinetestingpointai.valueUnit
-     *
-     * @mbg.generated
-     */
-    private String valueunit;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinetestingpointai.englishName
-     *
-     * @mbg.generated
-     */
-    private String englishname;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinetestingpointai.typeId
-     *
-     * @mbg.generated
-     */
-    private String typeid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinetestingpointai.modelId
-     *
-     * @mbg.generated
-     */
-    private String modelid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinetestingpointai.maxVal
-     *
-     * @mbg.generated
-     */
-    private Double maxval;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinetestingpointai.MinVal
-     *
-     * @mbg.generated
-     */
-    private Double minval;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinetestingpointai.reasonableMaxVal
-     *
-     * @mbg.generated
-     */
-    private Double reasonablemaxval;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinetestingpointai.reasonableMinVal
-     *
-     * @mbg.generated
-     */
-    private Double reasonableminval;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinetestingpointai.windTurbineid
-     *
-     * @mbg.generated
-     */
-    private String windturbineid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinetestingpointai.uniformCode
-     *
-     * @mbg.generated
-     */
-    private String uniformcode;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinetestingpointai.shortId
-     *
-     * @mbg.generated
-     */
-    private String shortid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinetestingpointai.longId
-     *
-     * @mbg.generated
-     */
-    private String longid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinetestingpointai.windPowerStationId
-     *
-     * @mbg.generated
-     */
-    private String windpowerstationid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column windturbinetestingpointai.realTimeId
-     *
-     * @mbg.generated
-     */
-    private String realtimeid;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table windturbinetestingpointai
-     *
-     * @mbg.generated
-     */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinetestingpointai.id
-     *
-     * @return the value of windturbinetestingpointai.id
-     *
-     * @mbg.generated
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinetestingpointai.id
-     *
-     * @param id the value for windturbinetestingpointai.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 windturbinetestingpointai.code
-     *
-     * @return the value of windturbinetestingpointai.code
-     *
-     * @mbg.generated
-     */
-    public String getCode() {
-        return code;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinetestingpointai.code
-     *
-     * @param code the value for windturbinetestingpointai.code
-     *
-     * @mbg.generated
-     */
-    public void setCode(String code) {
-        this.code = code == null ? null : code.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinetestingpointai.name
-     *
-     * @return the value of windturbinetestingpointai.name
-     *
-     * @mbg.generated
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinetestingpointai.name
-     *
-     * @param name the value for windturbinetestingpointai.name
-     *
-     * @mbg.generated
-     */
-    public void setName(String name) {
-        this.name = name == null ? null : name.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinetestingpointai.model
-     *
-     * @return the value of windturbinetestingpointai.model
-     *
-     * @mbg.generated
-     */
-    public String getModel() {
-        return model;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinetestingpointai.model
-     *
-     * @param model the value for windturbinetestingpointai.model
-     *
-     * @mbg.generated
-     */
-    public void setModel(String model) {
-        this.model = model == null ? null : model.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinetestingpointai.valueUnit
-     *
-     * @return the value of windturbinetestingpointai.valueUnit
-     *
-     * @mbg.generated
-     */
-    public String getValueunit() {
-        return valueunit;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinetestingpointai.valueUnit
-     *
-     * @param valueunit the value for windturbinetestingpointai.valueUnit
-     *
-     * @mbg.generated
-     */
-    public void setValueunit(String valueunit) {
-        this.valueunit = valueunit == null ? null : valueunit.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinetestingpointai.englishName
-     *
-     * @return the value of windturbinetestingpointai.englishName
-     *
-     * @mbg.generated
-     */
-    public String getEnglishname() {
-        return englishname;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinetestingpointai.englishName
-     *
-     * @param englishname the value for windturbinetestingpointai.englishName
-     *
-     * @mbg.generated
-     */
-    public void setEnglishname(String englishname) {
-        this.englishname = englishname == null ? null : englishname.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinetestingpointai.typeId
-     *
-     * @return the value of windturbinetestingpointai.typeId
-     *
-     * @mbg.generated
-     */
-    public String getTypeid() {
-        return typeid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinetestingpointai.typeId
-     *
-     * @param typeid the value for windturbinetestingpointai.typeId
-     *
-     * @mbg.generated
-     */
-    public void setTypeid(String typeid) {
-        this.typeid = typeid == null ? null : typeid.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinetestingpointai.modelId
-     *
-     * @return the value of windturbinetestingpointai.modelId
-     *
-     * @mbg.generated
-     */
-    public String getModelid() {
-        return modelid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinetestingpointai.modelId
-     *
-     * @param modelid the value for windturbinetestingpointai.modelId
-     *
-     * @mbg.generated
-     */
-    public void setModelid(String modelid) {
-        this.modelid = modelid == null ? null : modelid.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinetestingpointai.maxVal
-     *
-     * @return the value of windturbinetestingpointai.maxVal
-     *
-     * @mbg.generated
-     */
-    public Double getMaxval() {
-        return maxval;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinetestingpointai.maxVal
-     *
-     * @param maxval the value for windturbinetestingpointai.maxVal
-     *
-     * @mbg.generated
-     */
-    public void setMaxval(Double maxval) {
-        this.maxval = maxval;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinetestingpointai.MinVal
-     *
-     * @return the value of windturbinetestingpointai.MinVal
-     *
-     * @mbg.generated
-     */
-    public Double getMinval() {
-        return minval;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinetestingpointai.MinVal
-     *
-     * @param minval the value for windturbinetestingpointai.MinVal
-     *
-     * @mbg.generated
-     */
-    public void setMinval(Double minval) {
-        this.minval = minval;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinetestingpointai.reasonableMaxVal
-     *
-     * @return the value of windturbinetestingpointai.reasonableMaxVal
-     *
-     * @mbg.generated
-     */
-    public Double getReasonablemaxval() {
-        return reasonablemaxval;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinetestingpointai.reasonableMaxVal
-     *
-     * @param reasonablemaxval the value for windturbinetestingpointai.reasonableMaxVal
-     *
-     * @mbg.generated
-     */
-    public void setReasonablemaxval(Double reasonablemaxval) {
-        this.reasonablemaxval = reasonablemaxval;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinetestingpointai.reasonableMinVal
-     *
-     * @return the value of windturbinetestingpointai.reasonableMinVal
-     *
-     * @mbg.generated
-     */
-    public Double getReasonableminval() {
-        return reasonableminval;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinetestingpointai.reasonableMinVal
-     *
-     * @param reasonableminval the value for windturbinetestingpointai.reasonableMinVal
-     *
-     * @mbg.generated
-     */
-    public void setReasonableminval(Double reasonableminval) {
-        this.reasonableminval = reasonableminval;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinetestingpointai.windTurbineid
-     *
-     * @return the value of windturbinetestingpointai.windTurbineid
-     *
-     * @mbg.generated
-     */
-    public String getWindturbineid() {
-        return windturbineid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinetestingpointai.windTurbineid
-     *
-     * @param windturbineid the value for windturbinetestingpointai.windTurbineid
-     *
-     * @mbg.generated
-     */
-    public void setWindturbineid(String windturbineid) {
-        this.windturbineid = windturbineid == null ? null : windturbineid.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinetestingpointai.uniformCode
-     *
-     * @return the value of windturbinetestingpointai.uniformCode
-     *
-     * @mbg.generated
-     */
-    public String getUniformcode() {
-        return uniformcode;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinetestingpointai.uniformCode
-     *
-     * @param uniformcode the value for windturbinetestingpointai.uniformCode
-     *
-     * @mbg.generated
-     */
-    public void setUniformcode(String uniformcode) {
-        this.uniformcode = uniformcode == null ? null : uniformcode.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinetestingpointai.shortId
-     *
-     * @return the value of windturbinetestingpointai.shortId
-     *
-     * @mbg.generated
-     */
-    public String getShortid() {
-        return shortid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinetestingpointai.shortId
-     *
-     * @param shortid the value for windturbinetestingpointai.shortId
-     *
-     * @mbg.generated
-     */
-    public void setShortid(String shortid) {
-        this.shortid = shortid == null ? null : shortid.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinetestingpointai.longId
-     *
-     * @return the value of windturbinetestingpointai.longId
-     *
-     * @mbg.generated
-     */
-    public String getLongid() {
-        return longid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinetestingpointai.longId
-     *
-     * @param longid the value for windturbinetestingpointai.longId
-     *
-     * @mbg.generated
-     */
-    public void setLongid(String longid) {
-        this.longid = longid == null ? null : longid.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinetestingpointai.windPowerStationId
-     *
-     * @return the value of windturbinetestingpointai.windPowerStationId
-     *
-     * @mbg.generated
-     */
-    public String getWindpowerstationid() {
-        return windpowerstationid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinetestingpointai.windPowerStationId
-     *
-     * @param windpowerstationid the value for windturbinetestingpointai.windPowerStationId
-     *
-     * @mbg.generated
-     */
-    public void setWindpowerstationid(String windpowerstationid) {
-        this.windpowerstationid = windpowerstationid == null ? null : windpowerstationid.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column windturbinetestingpointai.realTimeId
-     *
-     * @return the value of windturbinetestingpointai.realTimeId
-     *
-     * @mbg.generated
-     */
-    public String getRealtimeid() {
-        return realtimeid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column windturbinetestingpointai.realTimeId
-     *
-     * @param realtimeid the value for windturbinetestingpointai.realTimeId
-     *
-     * @mbg.generated
-     */
-    public void setRealtimeid(String realtimeid) {
-        this.realtimeid = realtimeid == null ? null : realtimeid.trim();
-    }
-}

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

@@ -0,0 +1,32 @@
+
+package com.gyee.frame.model.custom;
+
+import com.gyee.frame.model.auto.Gyeeuser;
+
+import java.util.List;
+
+/**
+ *
+ */
+
+public class ContactUserVo {
+
+    private String id;
+    private List<Gyeeuser> list;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public List<Gyeeuser> getList() {
+        return list;
+    }
+
+    public void setList(List<Gyeeuser> list) {
+        this.list = list;
+    }
+}

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

@@ -29,7 +29,15 @@ public class PointData {
 	}
 
 	public double getPointValueInDouble() {
-		return pointValueInDouble;
+
+		if(Double.isNaN(this.pointValueInDouble) || Double.isInfinite(this.pointValueInDouble))
+		{
+			return 0.0;
+		}else
+		{
+			return pointValueInDouble;
+		}
+
 	}
 
 	public void setEdnaId(String ednaId) {

src/main/java/com/gyee/frame/model/custom/autocode/AutoCodeConfig.java

@@ -43,7 +43,7 @@ public class AutoCodeConfig {
         try {
             return new PropertiesConfiguration("auto_code/auto_code_config.properties" );
         } catch (ConfigurationException e) {
-            System.out.println("获取配置文件失败");
+            //System.out.println("获取配置文件失败");
         	e.printStackTrace();
         	return null;
         }

src/main/java/com/gyee/frame/model/ticket/TokenUser.java

@@ -7,6 +7,7 @@ import java.util.Date;
 @Data
 public class TokenUser {
 
+
     private String laborNum;
     private String laborName;
     private String password;

src/main/java/com/gyee/frame/netty/websocket/WebSocketServer.java

@@ -1,20 +1,28 @@
 package com.gyee.frame.netty.websocket;
 
+import cn.hutool.log.Log;
+import cn.hutool.log.LogFactory;
+import com.gyee.frame.common.conf.ExceptJobConfig;
+import com.gyee.frame.common.conf.UserLoginContext;
+import com.gyee.frame.common.quartz.SocketTaskUtil;
+import com.gyee.frame.common.spring.SpringUtils;
+import com.gyee.frame.netty.websocket.util.WebsocketUtil;
+import com.gyee.frame.service.GyeeuserService;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Component;
+
+import javax.websocket.*;
+import javax.websocket.server.PathParam;
+import javax.websocket.server.ServerEndpoint;
 import java.io.IOException;
 import java.net.BindException;
+import java.net.InetSocketAddress;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
-
-import javax.websocket.*;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
-
-import com.gyee.frame.common.quartz.SocketTaskUtil;
-import org.springframework.stereotype.Component;
-import cn.hutool.log.Log;
-import cn.hutool.log.LogFactory;
-
 /**
  *@author:Wang Jiawen
  *
@@ -24,17 +32,24 @@ import cn.hutool.log.LogFactory;
  *
  */
 
-@ServerEndpoint(value = "/websocket/{pageNumber}/{functionNumber}",encoders = { ServerEncoder.class })
+@ServerEndpoint(value = "/websocket/{pageNumber}/{functionNumber}/{keyid}",encoders = { ServerEncoder.class })
 @Component
 public class WebSocketServer extends SocketTaskUtil {
 
 	static Log log=LogFactory.get(WebSocketServer.class);
     //静态变量，用来记录当前在线连接数。应该把它设计成线程安全的。
     private static int onlineCount = 0;
-    //concurrent包的线程安全Set，用来存放每个客户端对应的MyWebSocket对象,准备弃用
-    private static CopyOnWriteArraySet<WebSocketServer> webSocketSet = new CopyOnWriteArraySet<WebSocketServer>();
-    //功能名称与页面名称为key 举例 页面名称_功能名称
-    private static Map<String,WebSocketServer> webSocketMap = new HashMap();
+    //concurrent包的线程安全Set，功能名称与页面名称+对象编号（风场、项目、线路、风机）为key
+    private static Map<String,CopyOnWriteArraySet<WebSocketServer>> webSocketMapSet = new HashMap<>();
+
+//    //功能名称与页面名称为key 举例 页面名称_功能名称>>WebSocketServer
+//    private static Map<String,WebSocketServer> webSocketMap = new HashMap();
+    //用来存储每个调度任务请求的数量
+    private static ConcurrentHashMap<String,Integer> funcationNunberMap = new ConcurrentHashMap();
+
+    public static ConcurrentHashMap<String, CopyOnWriteArraySet<String>> keyidMap = new ConcurrentHashMap();
+
+
 
     //与某个客户端的连接会话，需要通过它来给客户端发送数据
     private Session session;
@@ -45,36 +60,184 @@ public class WebSocketServer extends SocketTaskUtil {
     private String pageNumber="";
     //接收functionNumber
     private String functionNumber="";
+
+    //接收风场编号、接收项目编号、收线路编号、接收风机编号编号
+    private String keyid="";
+    //页数和功能数组合key
+    private String jobkey="";
+    //页数和功能数组合+对象编号（风场、项目、线路、风机）
+    private String pfkey="";
     /**
      * 连接建立成功调用的方法*/
     @OnOpen
-    public void onOpen(Session session,@PathParam("pageNumber") String pageNumber,@PathParam("functionNumber") String functionNumber) {
-        this.session = session;
-        webSocketMap.put((pageNumber+"_"+functionNumber),this);
-        webSocketSet.add(this);     //加入set中
-        addOnlineCount();           //在线数加1
-        log.info("有新窗口开始监听:页面编码:"+pageNumber+",功能编码:"+functionNumber+",当前在线人数为" + getOnlineCount());
+    public void onOpen(Session session, @PathParam("pageNumber") String pageNumber, @PathParam("functionNumber") String functionNumber
+            , @PathParam("keyid") String keyid) {
+
         //目标连接成功后注入基本信息
-        this.sid=sid;
+        this.session = session;
+
+        this.sid=session.getId();
         this.pageNumber=pageNumber; //页面编码
         this.functionNumber=functionNumber;//功能编码
+        this.keyid=keyid;
+
+        StringBuilder sb=new StringBuilder();
+        sb.append(pageNumber).append("_").append(functionNumber);
+
+        jobkey=String.valueOf(sb);
+        //判断是否有对象编号
+        if(StringUtils.isNotNull(keyid))
+        {
+            sb.append("_").append(keyid);
+        }
+
+        pfkey=String.valueOf(sb);
+
+        //根据调度任务key进行map分组，二级存储不同seesion的WebSocketServer对象
+
+
+
+        //根据调度任务统计数量
+        if(funcationNunberMap.containsKey(jobkey))
+        {
+            Integer number=funcationNunberMap.get(jobkey);
+            number++;
+            funcationNunberMap.put(jobkey,number);
+        }else
+            {
+                funcationNunberMap.put(jobkey,1);
+            }
+
+        if(jobkey.equals("pageNumber_4_functionNumber_5"))
+        {
+            UserLoginContext.userLoginMap.put(keyid,session);
+        }
+        Set<Map.Entry<String, CopyOnWriteArraySet<WebSocketServer>>> webSocketset = webSocketMapSet.entrySet();
+        for (Iterator<Map.Entry<String, CopyOnWriteArraySet<WebSocketServer>>> it = webSocketset.iterator(); it.hasNext();) {
+            Map.Entry<String, CopyOnWriteArraySet<WebSocketServer>> entry = (Map.Entry<String, CopyOnWriteArraySet<WebSocketServer>>) it.next();
+            for(WebSocketServer item:entry.getValue())
+            {
+                InetSocketAddress curryip=WebsocketUtil.getRemoteAddress(session);
+                InetSocketAddress itemip=WebsocketUtil.getRemoteAddress(item.session);
+                if(curryip.getHostString().equals(itemip.getHostString()) &&
+                           (item.session.getRequestURI().getPath().indexOf("/wp_")>0 ||
+                                   item.session.getRequestURI().getPath().indexOf("/pj_")>0
+                                )
+                )
+                {
+                    entry.getValue().remove(item);
+                }
+            }
+          //  //System.out.println(entry.getKey() + "--->" + entry.getValue());
+        }
+
+        //页数和功能数组合+对象编号（风场、项目、线路、风机）作为KEY，保存对应的set集合
+        if(webSocketMapSet.containsKey(pfkey))
+        {
+            CopyOnWriteArraySet<WebSocketServer> set=webSocketMapSet.get(pfkey);
+            set.add(this);
+            webSocketMapSet.put(pfkey,set);
+        }else
+        {
+            CopyOnWriteArraySet<WebSocketServer> set=new CopyOnWriteArraySet<>();
+            set.add(this);
+            webSocketMapSet.put(pfkey,set);
+        }
+
+        addOnlineCount();           //在线数加1
+        log.info("有新窗口开始监听:页面编码:"+pageNumber+",功能编码:"+functionNumber+",当前在线人数为" + getOnlineCount());
+
+
+        if(keyidMap.containsKey(jobkey))
+        {
+            Set<String> set=keyidMap.get(jobkey);
+            set.add(keyid);
+        }else
+        {
+            CopyOnWriteArraySet<String> set= new CopyOnWriteArraySet<String>();
+            set.add(keyid);
+            keyidMap.put(jobkey,set);
+        }
+
         log.info("连接成功");
-        if(getOnlineCount()>=1){
-            this.restartJob((pageNumber+"_"+functionNumber));//重启任务
+
+
+
+//        if(funcationNunberMap.containsKey(jobkey))
+//        {
+//            Integer number=funcationNunberMap.get(jobkey);
+//            if(number==1){
+//                this.restartJob((jobkey));//重启任务
+//            }
+//        }
+
+
+        if(!ExceptJobConfig.exceptmaps.containsKey(jobkey))
+        {
+            this.restartJob((jobkey));//重启任务
         }
+//        else
+//        {
+//            if(jobkey.equals("pageNumber_4_functionNumber_3"))
+//            {
+//
+//                GyeeuserService gyeeuserService=SpringUtils.getBean("gyeeuserService");
+//                gyeeuserService.initialUserList();
+//            }
+//        }
+
     }
 
     /**
      * 连接关闭调用的方法
      */
     @OnClose
-    public void onClose() {
-        webSocketMap.remove(this.pageNumber+"_"+this.functionNumber);
-        webSocketSet.remove(this);  //从set中删除
+    public void onClose(@PathParam("pageNumber") String pageNumber,@PathParam("functionNumber") String functionNumber,@PathParam("keyid") String keyid) {
+        StringBuilder sb=new StringBuilder();
+        sb.append(pageNumber).append("_").append(functionNumber);
+
+        jobkey=String.valueOf(sb);
+        //判断是否有对象编号
+        if(StringUtils.isNotNull(keyid))
+        {
+            sb.append("_").append(keyid);
+        }
+
+        pfkey=String.valueOf(sb);
+
+//        if(webSocketMap.containsKey(pfkey))
+//        {
+//            webSocketMap.remove(pfkey);
+//
+//        }
+
+        if(webSocketMapSet.containsKey(pfkey))
+        {
+            CopyOnWriteArraySet<WebSocketServer> set=webSocketMapSet.get(pfkey);
+            set.remove(this);
+            webSocketMapSet.put(pfkey,set);
+        }
         subOnlineCount();           //在线数减1
         log.info("有一连接关闭！当前在线人数为" + getOnlineCount());
+        if(funcationNunberMap.containsKey(jobkey))
+        {
+            int fnumber=funcationNunberMap.get(jobkey);
+            if(fnumber>0)
+            {
+                fnumber--;
+            }else {
+                fnumber=0;
+            }
+            funcationNunberMap.put(jobkey,fnumber);
+            if(fnumber==0){
+                this.deleteJob((jobkey));//关闭任务
+                keyidMap=new ConcurrentHashMap<>();
+            }
+        }
+
         if(getOnlineCount()==0){
-            this.deleteJob((pageNumber+"_"+functionNumber));//关闭任务
+            this.deleteJob((jobkey));//关闭任务
+            keyidMap=new ConcurrentHashMap<>();
         }
     }
 
@@ -84,15 +247,24 @@ public class WebSocketServer extends SocketTaskUtil {
      * @param message 客户端发送过来的消息*/
     @OnMessage
     public void onMessage(String message, Session session) {
-    	log.info("收到来自窗口:"+pageNumber+",功能编码:"+functionNumber+"的信息:"+message);
-        //群发消息
-        for (WebSocketServer item : webSocketSet) {
-            try {
-                item.sendMessage(message);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
+//    	log.info("收到来自窗口:"+pageNumber+",功能编码:"+functionNumber+"的信息:"+message);
+//        //群发消息
+//        if(webSocketMapSet.containsKey(pfkey))
+//        {
+//            CopyOnWriteArraySet<WebSocketServer> set=webSocketMapSet.get(pfkey);
+//            for (WebSocketServer item : set) {
+//                try {
+//                    if(item.session.isOpen())
+//                    {
+//                        item.sendMessage(message);
+//                    }
+//
+//                } catch (IOException e) {
+//                    e.printStackTrace();
+//                }
+//            }
+//        }
+
     }
 
 	/**
@@ -101,9 +273,10 @@ public class WebSocketServer extends SocketTaskUtil {
 	 * @param error
 	 */
     @OnError
-    public void onError(Session session, Throwable error) {
+    public void onError(Session session, Throwable error,@PathParam("pageNumber") String pageNumber,@PathParam("functionNumber") String functionNumber,@PathParam("keyid") String keyid) {
         log.error("发生错误");
-        error.printStackTrace();
+
+        log.error(error.getMessage());
     }
 	/**
 	 * 实现服务器主动推送
@@ -130,41 +303,71 @@ public class WebSocketServer extends SocketTaskUtil {
     /**
      * 群发自定义消息
      * */
-    public static void sendInfo(Object message,@PathParam("pageNumber") String pageNumber,@PathParam("functionNumber") String functionNumber) throws IOException, EncodeException {
-    	log.info("推送消息到窗口:"+pageNumber+",功能编码:"+functionNumber+"的信息:"+message);
-        WebSocketServer item = webSocketMap.get(pageNumber + "_" + functionNumber);
-
-        //这里可以设定只推送给这个sid的，为null则全部推送
-        if(functionNumber==null||pageNumber==null) {
-            throw new BindException("请核对编码信息(包括页面编码以及功能编码非空)");
-        }else if(item.pageNumber.equals(pageNumber)&&item.functionNumber.equals(functionNumber)){
-            item.sendMessage(message);
+//    public static void sendInfo(Object message,@PathParam("pageNumber") String pageNumber,@PathParam("functionNumber") String functionNumber) throws IOException, EncodeException {
+//    	log.info("推送消息到窗口:"+pageNumber+",功能编码:"+functionNumber+"的信息:"+message);
+//        WebSocketServer item = webSocketMap.get(pageNumber + "_" + functionNumber);
+//
+//        //这里可以设定只推送给这个sid的，为null则全部推送
+//        if(functionNumber==null||pageNumber==null) {
+//            throw new BindException("请核对编码信息(包括页面编码以及功能编码非空)");
+//        }else if(item.pageNumber.equals(pageNumber)&&item.functionNumber.equals(functionNumber)){
+//            item.sendMessage(message);
+//        }
+//        //利用set容器循环的方式暂时被关闭,原因节约资源
+///*        for (WebSocketServer item : webSocketSet) {
+//            try {
+//            	//这里可以设定只推送给这个sid的，为null则全部推送
+//            	if(functionNumber==null||pageNumber==null) {
+//                    throw new BindException("请核对编码信息");
+//            	}else if(item.pageNumber.equals(pageNumber)&&item.functionNumber.equals(functionNumber)){
+//            		item.sendMessage(message);
+//            	}
+//            } catch (IOException e) {
+//                e.printStackTrace();
+//                continue;
+//            }
+//        }*/
+//    }
+    public void sendObject(Object message,@PathParam("pageNumber") String pageNumber,@PathParam("functionNumber") String functionNumber,@PathParam("keyid") String keyid) throws IOException, EncodeException {
+        log.info("推送消息到窗口:"+pageNumber+",功能编码:"+functionNumber+"的信息:"+message);
+
+
+        StringBuilder sb=new StringBuilder();
+        sb.append(pageNumber).append("_").append(functionNumber);
+
+        //判断是否有对象编号
+        if(StringUtils.isNotNull(keyid))
+        {
+            sb.append("_").append(keyid);
         }
-        //利用set容器循环的方式暂时被关闭,原因节约资源
-/*        for (WebSocketServer item : webSocketSet) {
-            try {
-            	//这里可以设定只推送给这个sid的，为null则全部推送
-            	if(functionNumber==null||pageNumber==null) {
-                    throw new BindException("请核对编码信息");
-            	}else if(item.pageNumber.equals(pageNumber)&&item.functionNumber.equals(functionNumber)){
-            		item.sendMessage(message);
-            	}
-            } catch (IOException e) {
-                e.printStackTrace();
-                continue;
+
+        pfkey=String.valueOf(sb);
+        if(webSocketMapSet.containsKey(pfkey))
+        {
+
+            //这里可以设定只推送给这个sid的，为null则全部推送
+            if(functionNumber==null||pageNumber==null) {
+                throw new BindException("请核对编码信息(包括页面编码以及功能编码非空)");
+            }else{
+                if(webSocketMapSet.containsKey(pfkey))
+                {
+                    CopyOnWriteArraySet<WebSocketServer> set=webSocketMapSet.get(pfkey);
+                    for (WebSocketServer item : set) {
+                        try {
+                            item.sendMessage(message);
+
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+
             }
-        }*/
-    }
-    public void sendObject(Object message,@PathParam("pageNumber") String pageNumber,@PathParam("functionNumber") String functionNumber) throws IOException, EncodeException {
-        log.info("推送消息到窗口:"+pageNumber+",功能编码:"+functionNumber+"的信息:"+message);
-        WebSocketServer item = webSocketMap.get(pageNumber + "_" + functionNumber);
 
-        //这里可以设定只推送给这个sid的，为null则全部推送
-        if(functionNumber==null||pageNumber==null) {
-            throw new BindException("请核对编码信息(包括页面编码以及功能编码非空)");
-        }else if(item.pageNumber.equals(pageNumber)&&item.functionNumber.equals(functionNumber)){
-            item.sendMessage(message);
         }
+
+
+
         //利用set容器循环的方式暂时被关闭,原因节约资源
 /*        for (WebSocketServer item : webSocketSet) {
             try {
@@ -192,5 +395,8 @@ public class WebSocketServer extends SocketTaskUtil {
     public static synchronized void subOnlineCount() {
         WebSocketServer.onlineCount--;
     }
+
+
+
 }
 

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

@@ -18,12 +18,14 @@ sisConfigMap->index_target_comprehensive_indicators->"pageNumber_6","functionNum
 sisConfigMap->index_target_windSpeed_power->"pageNumber_6","functionNumber_2"
 9.首页模块推送，第三部分风机状态模块，包括接入、待机、运行、故障、维护、离线
 sisConfigMap->index_windturbine_status->"pageNumber_6","functionNumber_3"
+
+
 10.首页模块推送，第四部分发电量完成情况模块，包括月计划发电量、年计划发电量
 sisConfigMap->index_electricQuantity->"pageNumber_6","functionNumber_4"
 11.首页模块推送，第二部分指标模块的子模块3,基础指标模块，包括月利用小时、年利用小时、综合场用电率、设备可利用率、减排二氧化硫、减排二氧化碳、节约用水、节约标煤、mttr、mtbf
 sisConfigMap->index_target_basic_indicators->"pageNumber_6","functionNumber_5"
 12.首页模块推送，第五部分曲线以及柱状图模块的子模块1风速功率曲线图模块,包括24小时功率、风速、理论功率、预测功率
-sisConfigMap->index_curve_columnar_windSpeed_power->"pageNumber_6","functionNumber_6"
+sisConfigMap->index_curve_columnar_windSpeed_power->"pageNumber_7","functionNumber_4"
 13.首页模块推送，第五部分曲线以及柱状图模块的子模块2五项损失柱状图模块,包括7天的应发电量、日发电量、故障损失电量、检修损失电量、限电损失电量、性能损失电量、受累损失电量
 sisConfigMap->index_curve_columnar_five_loss->"pageNumber_6","functionNumber_7"
 14.首页模块推送，第六部分风场卡片模块,包括预测电量、日发电量、实时风速、实际功率
@@ -37,5 +39,12 @@ sisConfigMap->targetdetail_target->"pageNumber_8","functionNumber_1"
 sisConfigMap->targetdetail_curve>"pageNumber_8","functionNumber_2"
 22.过去7天指标柱状图,指标名称targetdetail_histogram,包括过去7天该指标的数据,记录指标过去7天的数值
 sisConfigMap->targetdetail_histogram->"pageNumber_8","functionNumber_3"
+23.手环指标推送,指标名称braceletPushTask,包括人员的疲劳度,收缩血压,舒张血压,心跳频率,血氧浓度,步数,经度,纬度
+sisConfigMap->braceletPushTask->"pageNumber_9","functionNumber_1"
 
-
+24.矩阵监视模块推送，按照场站、期次、线路推送 keyid例如（wp_CL_FDC,pj_CL01_GC,ln_CL01_XL）
+socketConfigMap->monitor_target_matrixMonitor->"pageNumber_4","functionNumber_2","keyid"
+25.判断即时通信用户在线状态
+socketConfigMap->monitor_target_status->"pageNumber_4","functionNumber_3","keyid"（无调度任务，rtc推送实时数据）
+26.试试监听登录用户信息，便于后台退出
+socketConfigMap->online_target_status->"pageNumber_4","functionNumber_5","keyid"（keyid为用户id，无调度任务，rtc推送实时数据）

src/main/java/com/gyee/frame/netty/websocket/config/SocketPageConfig.java

@@ -119,7 +119,6 @@ public class SocketPageConfig {
         return new String[]{"pageNumber_6","functionNumber_5"};//首页第二部分指标模块的子模块3,基础指标模块，包括月利用小时、年利用小时、综合场用电率、设备可利用率、减排二氧化硫、减排二氧化碳、节约用水、节约标煤、mttr、mtbf
     }
 
-    
     private String[] Createsis_targetdetail_target() {
         return new String[]{"pageNumber_8","functionNumber_1"};//气象预测未来16小时数据，按小时预测，包含当前小时，pageNumber_3，功能编号functionNumber_2
     }

src/main/java/com/gyee/frame/netty/websocket/util/SocketToolController.java

@@ -7,10 +7,10 @@ import com.gyee.frame.netty.websocket.WebSocketServer;
 import com.gyee.frame.netty.websocket.config.SocketPageConfig;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.websocket.EncodeException;
 import java.io.IOException;
-import java.util.HashMap;
 
 /**
  * @author Wang Jiawen
@@ -20,6 +20,9 @@ import java.util.HashMap;
  */
 
 abstract public class SocketToolController extends BaseController {
+
+    @Resource
+    private WebSocketServer webSocketServer;
     /**
      *@author:Wang Jiawen
      *
@@ -61,7 +64,7 @@ abstract public class SocketToolController extends BaseController {
      *@createTime:2020/1/9
      *
      */
-    public void pushToWeb(String pageNumber, String functionNumber, Object message, Messagetype type)  {
+    public void pushToWeb(String pageNumber, String functionNumber,String keyid, Object message, Messagetype type)  {
 
         Integer messageNum = type.getMessageNum();
 
@@ -75,7 +78,7 @@ abstract public class SocketToolController extends BaseController {
             message = this.convertmessage(message); //调用已经写好的方法
         }
         try {
-            WebSocketServer.sendInfo(message,pageNumber,functionNumber);//调用socketserver进行推送消息
+            webSocketServer.sendObject(message,pageNumber,functionNumber,keyid);//调用socketserver进行推送消息
         } catch (IOException | EncodeException e ) {
             e.printStackTrace();
         }

src/main/java/com/gyee/frame/netty/websocket/util/SocketToolService.java

@@ -1,17 +1,13 @@
 package com.gyee.frame.netty.websocket.util;
 
 import com.alibaba.fastjson.JSON;
-import com.gyee.frame.common.base.BaseController;
-import com.gyee.frame.common.base.BaseService;
-import com.gyee.frame.common.quartz.QuartzSchedulerUtil;
-import com.gyee.frame.common.spring.SpringUtils;
 import com.gyee.frame.model.enumeration.Messagetype;
 import com.gyee.frame.netty.websocket.WebSocketServer;
 import com.gyee.frame.netty.websocket.config.SocketPageConfig;
+import com.gyee.frame.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.swing.*;
 import javax.websocket.EncodeException;
 import java.io.IOException;
 
@@ -68,25 +64,29 @@ abstract public class SocketToolService {
      *@createTime:2020/1/9
      *
      */
-    public void pushToWeb(String pageNumber, String functionNumber, Object message, Messagetype type)  {
+    public void pushToWeb(String pageNumber, String functionNumber, String keyid, Object message, Messagetype type)  {
 
         Integer messageNum = type.getMessageNum();
 
-        if(messageNum==1){
-            message = JSON.toJSONString(message);//对此转换成string格式
-        }else if(messageNum==2){
-            message = JSON.parse(JSON.toJSONString(message));//转换成json格式
-        }else if(messageNum==3){
-            //不处理
-        }else if(messageNum==4){
-            message = this.convertmessage(message); //调用已经写好的方法
-        }
-        try {
-            //spring介入
-            webSocketServer.sendObject(message,pageNumber,functionNumber);//调用socketserver进行推送消息
-        } catch (IOException | EncodeException e ) {
-            e.printStackTrace();
+        if(StringUtils.isNotNull(message))
+        {
+            if(messageNum==1){
+                message = JSON.toJSONString(message);//对此转换成string格式
+            }else if(messageNum==2){
+                message = JSON.parse(JSON.toJSONString(message));//转换成json格式
+            }else if(messageNum==3){
+                //不处理
+            }else if(messageNum==4){
+                message = this.convertmessage(message); //调用已经写好的方法
+            }
+            try {
+                //spring介入
+                webSocketServer.sendObject(message,pageNumber,functionNumber,keyid);//调用socketserver进行推送消息
+            } catch (IOException | EncodeException e ) {
+                e.printStackTrace();
+            }
         }
+
     }
 
     public String convertmessage(Object message){

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

@@ -21,7 +21,7 @@ import java.util.List;
  * @date 2019-12-31 14:58:09  
  **/
 @Service
-public class ForecastwindspeedamendedService implements BaseService<Forecastwindspeedamended, ForecastwindspeedamendedExample>{
+public class ForecastwindspeedamendedService implements BaseService<Forecastwindspeedamended, ForecastwindspeedamendedExample> {
 	@Resource
 	private ForecastwindspeedamendedMapper forecastwindspeedamendedMapper;
 	
@@ -32,7 +32,7 @@ public class ForecastwindspeedamendedService implements BaseService<Forecastwind
 	 * @param name
 	 * @return
 	 */
-	 public PageInfo<Forecastwindspeedamended> list(Tablepar tablepar,String name){
+	 public PageInfo<Forecastwindspeedamended> list(Tablepar tablepar, String name){
 	        ForecastwindspeedamendedExample testExample=new ForecastwindspeedamendedExample();
 	        testExample.setOrderByClause("id ASC");
 	        if(name!=null&&!"".equals(name)){

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

@@ -54,7 +54,7 @@ public class GeneratorService {
 	  * @return
 	  */
 	public List<BeanColumn> queryColumns2(String tableName){
-		System.out.println("queryColumns2>>>"+JSONUtil.toJsonPrettyStr(generatorMapper.queryColumns3(tableName)));
+		//System.out.println("queryColumns2>>>"+JSONUtil.toJsonPrettyStr(generatorMapper.queryColumns3(tableName)));
 		return generatorMapper.queryColumns2(tableName);
 	 }
 	

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

@@ -0,0 +1,100 @@
+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.GyeeBraceletuserMapper;
+import com.gyee.frame.model.auto.GyeeBraceletuser;
+import com.gyee.frame.model.auto.GyeeBraceletuserExample;
+import com.gyee.frame.model.auto.Windpowerstation;
+import com.gyee.frame.model.custom.Tablepar;
+import com.gyee.frame.model.ticket.Labor;
+import com.gyee.frame.service.ticket.LaborService;
+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;
+
+/**
+ *  GyeeBraceletuserService
+ * @Title: GyeeBraceletuserService.java 
+ * @Package com.gyee.frame.service 
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2020-04-17 14:18:03  
+ **/
+@Service
+public class GyeeBraceletuserService implements BaseService<GyeeBraceletuser, GyeeBraceletuserExample>{
+	@Resource
+	private GyeeBraceletuserMapper gyeeBraceletuserMapper;
+	@Resource
+	private LaborService laborService;;
+
+
+	@Override
+	public int deleteByPrimaryKey(String id) {
+		return 0;
+	}
+
+	@Override
+	public int insertSelective(GyeeBraceletuser record) {
+		return 0;
+	}
+
+	@Override
+	public GyeeBraceletuser selectByPrimaryKey(String id) {
+		return null;
+	}
+
+	@Override
+	public int updateByPrimaryKeySelective(GyeeBraceletuser record) {
+		return 0;
+	}
+
+	@Override
+	public int updateByExampleSelective(GyeeBraceletuser record, GyeeBraceletuserExample example) {
+		return 0;
+	}
+
+	@Override
+	public int updateByExample(GyeeBraceletuser record, GyeeBraceletuserExample example) {
+		return 0;
+	}
+
+	@Override
+	public List<GyeeBraceletuser> selectByExample(GyeeBraceletuserExample example) {
+		return null;
+	}
+
+	@Override
+	public long countByExample(GyeeBraceletuserExample example) {
+		return 0;
+	}
+
+	@Override
+	public int deleteByExample(GyeeBraceletuserExample example) {
+		return 0;
+	}
+
+	public GyeeBraceletuser queryBraceletuserByUserId(String userid){
+
+		GyeeBraceletuserExample testExample=new GyeeBraceletuserExample();
+		testExample.setOrderByClause("id ASC");
+		testExample.createCriteria().andUseridEqualTo(userid);
+		List<GyeeBraceletuser> list= gyeeBraceletuserMapper.selectByExample(testExample);
+
+		if(!list.isEmpty())
+		{
+			return list.get(0);
+		}
+
+		return null;
+	}
+
+
+}

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

@@ -0,0 +1,128 @@
+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.GyeeContactsMapper;
+import com.gyee.frame.model.auto.GyeeContacts;
+import com.gyee.frame.model.auto.GyeeContactsExample;
+import com.gyee.frame.model.custom.Tablepar;
+import com.gyee.frame.util.SnowflakeIdWorker;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ *  GyeeContactsService
+ * @Title: GyeeContactsService.java 
+ * @Package com.gyee.frame.service 
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2020-04-17 14:18:03  
+ **/
+@Service
+public class GyeeContactsService implements BaseService<GyeeContacts, GyeeContactsExample>{
+	@Resource
+	private GyeeContactsMapper gyeecontactsMapper;
+
+      	   	      	      	      	      	
+	/**
+	 * 分页查询
+	 * @return
+	 */
+	 public PageInfo<GyeeContacts> list(Tablepar tablepar,String name){
+	        GyeeContactsExample testExample=new GyeeContactsExample();
+	        testExample.setOrderByClause("id ASC");
+
+	        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+	        List<GyeeContacts> list= gyeecontactsMapper.selectByExample(testExample);
+	        PageInfo<GyeeContacts> pageInfo = new PageInfo<GyeeContacts>(list);
+	        return  pageInfo;
+	 }
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista=Convert.toListStrArray(ids);
+			GyeeContactsExample example=new GyeeContactsExample();
+			example.createCriteria().andIdIn(lista);
+			return gyeecontactsMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public GyeeContacts selectByPrimaryKey(String id) {
+				
+			return gyeecontactsMapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(GyeeContacts record) {
+		return gyeecontactsMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(GyeeContacts record) {
+				
+		//添加雪花主键id
+		record.setId(SnowflakeIdWorker.getUUID());
+			
+				
+		return gyeecontactsMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(GyeeContacts record, GyeeContactsExample example) {
+		
+		return gyeecontactsMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(GyeeContacts record, GyeeContactsExample example) {
+		
+		return gyeecontactsMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<GyeeContacts> selectByExample(GyeeContactsExample example) {
+		
+		return gyeecontactsMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(GyeeContactsExample example) {
+		
+		return gyeecontactsMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(GyeeContactsExample example) {
+		
+		return gyeecontactsMapper.deleteByExample(example);
+	}
+
+
+
+	public List<GyeeContacts> queryGyeeContactsByUserId(String userid){
+
+		return gyeecontactsMapper.queryGyeeContactsByUserId(userid);
+	}
+
+
+
+
+}

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

@@ -1,18 +1,24 @@
 package com.gyee.frame.service;
 
-import java.util.List;
-import java.util.Arrays;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.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.GyeeorganMapper;
 import com.gyee.frame.model.auto.Gyeeorgan;
 import com.gyee.frame.model.auto.GyeeorganExample;
+import com.gyee.frame.model.auto.Windpowerstation;
 import com.gyee.frame.model.custom.Tablepar;
+import com.gyee.frame.model.ticket.Labor;
+import com.gyee.frame.service.ticket.LaborService;
 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;
 
 /**
  *  GyeeorganService
@@ -24,14 +30,13 @@ import com.gyee.frame.util.SnowflakeIdWorker;
  **/
 @Service
 public class GyeeorganService implements BaseService<Gyeeorgan, GyeeorganExample>{
-	@Autowired
+	@Resource
 	private GyeeorganMapper gyeeorganMapper;
-	
+	@Resource
+	private LaborService laborService;;
       	   	      	      	      	      	
 	/**
 	 * 分页查询
-	 * @param pageNum
-	 * @param pageSize
 	 * @return
 	 */
 	 public PageInfo<Gyeeorgan> list(Tablepar tablepar,String name){
@@ -146,8 +151,88 @@ public class GyeeorganService implements BaseService<Gyeeorgan, GyeeorganExample
 		 *
 	 */
 	public List<Gyeeorgan> queryOrganByUserId(String userid){
+
+		Labor labor=laborService.getLaborItem(userid);
+
+		if(null!=labor && StringUtils.isNotEmpty(labor.getDeptnum()))
+		{
+			String dept=labor.getDeptnum();
+
+			List<Gyeeorgan> ls=new ArrayList<>();
+			if(dept.indexOf("电站")>0)
+			{
+				Gyeeorgan vo=new Gyeeorgan();
+				vo.setName("MHS_FDC");
+				vo.setDescribes("麻黄山风电场");
+				ls.add(vo);
+			}else if(dept.indexOf("电站")>0){
+				Gyeeorgan vo=new Gyeeorgan();
+				switch(dept) {
+					case "麻黄山风电场" :
+						vo.setName("MHS_FDC");
+						vo.setDescribes("麻黄山风电场");
+						break;
+					case "牛首山风电场" :
+						vo.setName("NSS_FDC");
+						vo.setDescribes("牛首山风电场");
+						break;
+					case "青山风电场" :
+						vo.setName("QS_FDC");
+						vo.setDescribes("青山风电场");
+						break;
+					case "石板泉风电场" :
+						vo.setName("SBQ_FDC");
+						vo.setDescribes("石板泉风电场");
+						break;
+					case "香山风电场" :
+						vo.setName("XS_FDC");
+						vo.setDescribes("香山风电场");
+						break;
+
+					default:
+						break;
+				}
+				ls.add(vo);
+			}else {
+				Gyeeorgan vo=new Gyeeorgan();
+				vo.setName("0");
+				vo.setDescribes("国电电力宁夏新能源");
+				ls.add(vo);
+				for(Windpowerstation wp:InitialRunner.wpls)
+				{
+						if(wp.getId().endsWith("FDC"))
+						{
+							Gyeeorgan vo1=new Gyeeorgan();
+							vo1.setName(wp.getId());
+							vo1.setDescribes(wp.getName());
+							ls.add(vo1);
+						}
+				}
+				return ls;
+			}
+		}
 		return gyeeorganMapper.queryOrganByUserId(userid);
 	}
 
 
+	public List<Gyeeorgan> gyeeOrganAll(){
+
+		List<Gyeeorgan> ls=new ArrayList<>();
+		Gyeeorgan vo=new Gyeeorgan();
+		vo.setName("0");
+		vo.setDescribes("国电电力宁夏新能源");
+		ls.add(vo);
+		for(Windpowerstation wp:InitialRunner.wpls)
+		{
+			if(wp.getId().endsWith("FDC"))
+			{
+				Gyeeorgan vo1=new Gyeeorgan();
+				vo1.setName(wp.getId());
+				vo1.setDescribes(wp.getName());
+				ls.add(vo1);
+			}
+		}
+		return ls;
+	}
+
 }

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

@@ -1,20 +1,16 @@
 package com.gyee.frame.service;
 
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Arrays;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.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.GyeepermissionMapper;
-import com.gyee.frame.model.auto.Gyeepermission;
-import com.gyee.frame.model.auto.GyeepermissionExample;
+import com.gyee.frame.mapper.auto.GyeePermissionMapper;
+import com.gyee.frame.model.auto.GyeePermission;
+import com.gyee.frame.model.auto.GyeePermissionExample;
 import com.gyee.frame.model.auto.GyeepermissionView;
-import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.util.SnowflakeIdWorker;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  *  GyeepermissionService
@@ -25,112 +21,93 @@ import com.gyee.frame.util.SnowflakeIdWorker;
  * @date 2020-04-16 14:55:15  
  **/
 @Service
-public class GyeepermissionService implements BaseService<Gyeepermission, GyeepermissionExample>{
-	@Autowired
-	private GyeepermissionMapper gyeepermissionMapper;
+public class GyeepermissionService implements BaseService<GyeePermission, GyeePermissionExample>{
+	@Resource
+	private GyeePermissionMapper gyeepermissionMapper;
 	
       	   	      	      	      	      	      	      	      	      	
-	/**
-	 * 分页查询
-	 * @param pageNum
-	 * @param pageSize
-	 * @return
-	 */
-	 public PageInfo<Gyeepermission> list(Tablepar tablepar,String name){
-	        GyeepermissionExample testExample=new GyeepermissionExample();
-	        testExample.setOrderByClause("id ASC");
-	        if(name!=null&&!"".equals(name)){
-	        	testExample.createCriteria().andPermisssionnameLike("%"+name+"%");
-	        }
-
-	        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
-	        List<Gyeepermission> list= gyeepermissionMapper.selectByExample(testExample);
-	        PageInfo<Gyeepermission> pageInfo = new PageInfo<Gyeepermission>(list);
-	        return  pageInfo;
-	 }
+
 
 	@Override
 	public int deleteByPrimaryKey(String ids) {
-				
-			List<String> lista=Convert.toListStrArray(ids);
-			GyeepermissionExample example=new GyeepermissionExample();
-			example.createCriteria().andIdIn(lista);
-			return gyeepermissionMapper.deleteByExample(example);
-			
-				
+
+
+			return -1;
+
+
 	}
-	
+
 	
 	@Override
-	public Gyeepermission selectByPrimaryKey(String id) {
+	public GyeePermission selectByPrimaryKey(String id) {
 				
-			return gyeepermissionMapper.selectByPrimaryKey(id);
+			return null;
 				
 	}
 
-	
+
 	@Override
-	public int updateByPrimaryKeySelective(Gyeepermission record) {
-		return gyeepermissionMapper.updateByPrimaryKeySelective(record);
+	public int updateByPrimaryKeySelective(GyeePermission record) {
+		return -1;
 	}
-	
-	
+
+
 	/**
 	 * 添加
 	 */
 	@Override
-	public int insertSelective(Gyeepermission record) {
-				
+	public int insertSelective(GyeePermission record) {
+
 		//添加雪花主键id
 		record.setId(SnowflakeIdWorker.getUUID());
-			
-				
-		return gyeepermissionMapper.insertSelective(record);
+
+
+		return -1;
 	}
-	
-	
+
+
 	@Override
-	public int updateByExampleSelective(Gyeepermission record, GyeepermissionExample example) {
-		
-		return gyeepermissionMapper.updateByExampleSelective(record, example);
+	public int updateByExampleSelective(GyeePermission record, GyeePermissionExample example) {
+
+		return -1;
 	}
 
-	
+
 	@Override
-	public int updateByExample(Gyeepermission record, GyeepermissionExample example) {
-		
-		return gyeepermissionMapper.updateByExample(record, example);
+	public int updateByExample(GyeePermission record, GyeePermissionExample example) {
+
+		return -1;
 	}
 
 	@Override
-	public List<Gyeepermission> selectByExample(GyeepermissionExample example) {
+	public List<GyeePermission> selectByExample(GyeePermissionExample example) {
 		
 		return gyeepermissionMapper.selectByExample(example);
 	}
 
-	
+
 	@Override
-	public long countByExample(GyeepermissionExample example) {
-		
-		return gyeepermissionMapper.countByExample(example);
+	public long countByExample(GyeePermissionExample example) {
+
+		return -1;
 	}
 
-	
+
 	@Override
-	public int deleteByExample(GyeepermissionExample example) {
-		
-		return gyeepermissionMapper.deleteByExample(example);
+	public int deleteByExample(GyeePermissionExample example) {
+
+		return -1;
 	}
-	
+
 	/**
 	 * 检查name
 	 * @param gyeepermission
 	 * @return
 	 */
-	public int checkNameUnique(Gyeepermission gyeepermission){
-		GyeepermissionExample example=new GyeepermissionExample();
+	public int checkNameUnique(GyeePermission gyeepermission){
+		GyeePermissionExample example=new GyeePermissionExample();
 		example.createCriteria().andPermisssionnameEqualTo(gyeepermission.getPermisssionname());
-		List<Gyeepermission> list=gyeepermissionMapper.selectByExample(example);
+		List<GyeePermission> list=gyeepermissionMapper.selectByExample(example);
 		return list.size();
 	}
 
@@ -147,8 +124,11 @@ public class GyeepermissionService implements BaseService<Gyeepermission, Gyeepe
 		 *@createTime:2020年4月20日
 		 *
 	 */
+
 	public List<GyeepermissionView> queryPermissionByRoleId(String userid){
-		List<Gyeepermission> allList=gyeepermissionMapper.queryPermissionByRoleId(userid);
+		GyeePermissionExample example=new GyeePermissionExample();
+		List<GyeePermission> allList=gyeepermissionMapper.selectByExample(example);
+
 		List<GyeepermissionView> list=new ArrayList();		
 		for(int i=0;i<allList.size();i++){
 			if(allList.get(i).getParent().equals("-1")){
@@ -184,7 +164,7 @@ public class GyeepermissionService implements BaseService<Gyeepermission, Gyeepe
 		 *@createTime:2020年4月20日
 		 *
 	 */
-	public List<GyeepermissionView> getPermission(List<Gyeepermission> allList,String parent){
+	public List<GyeepermissionView> getPermission(List<GyeePermission> allList,String parent){
 		List<GyeepermissionView> layerList=new ArrayList();
 		for(int i=0;i<allList.size();i++){
 			if(allList.get(i).getParent().equals(parent)){

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

@@ -1,18 +1,24 @@
 package com.gyee.frame.service;
 
-import java.util.List;
-import java.util.Arrays;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.dataSources.DataSource;
+import com.gyee.frame.common.dataSources.DataSourceType;
 import com.gyee.frame.common.support.Convert;
 import com.gyee.frame.mapper.auto.GyeeuserMapper;
+import com.gyee.frame.model.auto.GyeeContacts;
 import com.gyee.frame.model.auto.Gyeeuser;
 import com.gyee.frame.model.auto.GyeeuserExample;
 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.SnowflakeIdWorker;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  *  GyeeuserService
@@ -23,15 +29,14 @@ import com.gyee.frame.util.SnowflakeIdWorker;
  * @date 2020-04-15 16:48:37  
  **/
 @Service
-public class GyeeuserService implements BaseService<Gyeeuser, GyeeuserExample>{
-	@Autowired
+public class GyeeuserService extends SocketToolService implements BaseService<Gyeeuser, GyeeuserExample>{
+	@Resource
 	private GyeeuserMapper gyeeuserMapper;
-	
-      	   	      	      	      	      	
+	@Resource
+	private GyeeContactsService gyeecontactsService;
+
 	/**
 	 * 分页查询
-	 * @param pageNum
-	 * @param pageSize
 	 * @return
 	 */
 	 public PageInfo<Gyeeuser> list(Tablepar tablepar,String name){
@@ -149,5 +154,36 @@ public class GyeeuserService implements BaseService<Gyeeuser, GyeeuserExample>{
 		return gyeeuserMapper.queryIdByUserNamePassWord(gyeeuser);
 	}
 
+	@DataSource(value = DataSourceType.TICKET)
+	public List<Gyeeuser> findContactUserlist(String userId){
+
+		List<Gyeeuser> list=new ArrayList<>();
+
+		List<GyeeContacts> ls=gyeecontactsService.queryGyeeContactsByUserId(userId);
+
+		if(!ls.isEmpty())
+		{
+
+			for(GyeeContacts gc:ls)
+			{
+				Gyeeuser vo=new Gyeeuser();
+				vo.setId(gc.getContid());
+				vo.setUsername(gc.getContname());
+				vo.setNickname(gc.getContname());
+				list.add(vo);
+			}
+		}
+
+		return  list;
+	}
+
+
+	public void initialUserList(String userid) {
+
+		List<Gyeeuser> result=findContactUserlist(userid);
+
+		this.pushToWeb("pageNumber_4","functionNumber_3","all",result, Messagetype.MESSAGE);
+
+	}
 
 }

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

@@ -5,8 +5,6 @@ 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.ProjectplanMapper;
-import com.gyee.frame.model.auto.Forecastwindspeedamended;
-import com.gyee.frame.model.auto.ForecastwindspeedamendedExample;
 import com.gyee.frame.model.auto.Projectplan;
 import com.gyee.frame.model.auto.ProjectplanExample;
 import com.gyee.frame.model.custom.Tablepar;
@@ -28,169 +26,169 @@ import java.util.List;
  **/
 @Service
 public class ProjectplanService implements BaseService<Projectplan, ProjectplanExample>{
-	@Resource
-	private ProjectplanMapper projectplanMapper;
-	
-      	   	      	      	      	      	      	      	      	      	      	
-	/**
-	 * 分页查询
-	 * @param tablepar
-	 * @param name
-	 * @return
-	 */
-	 public PageInfo<Projectplan> list(Tablepar tablepar,String name){
-	        ProjectplanExample testExample=new ProjectplanExample();
-	        testExample.setOrderByClause("id ASC");
-	        if(name!=null&&!"".equals(name)){
-	        	testExample.createCriteria().andIdLike("%"+name+"%");
-	        }
-
-	        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
-	        List<Projectplan> list= projectplanMapper.selectByExample(testExample);
-	        PageInfo<Projectplan> pageInfo = new PageInfo<Projectplan>(list);
-	        return  pageInfo;
-	 }
-
-	@Override
-	public int deleteByPrimaryKey(String ids) {
-				
-			List<String> lista=Convert.toListStrArray(ids);
-			ProjectplanExample example=new ProjectplanExample();
-			example.createCriteria().andIdIn(lista);
-			return projectplanMapper.deleteByExample(example);
-			
-				
-	}
-	
-	
-	@Override
-	public Projectplan selectByPrimaryKey(String id) {
-				
-			return projectplanMapper.selectByPrimaryKey(id);
-				
-	}
-
-	
-	@Override
-	public int updateByPrimaryKeySelective(Projectplan record) {
-		return projectplanMapper.updateByPrimaryKeySelective(record);
-	}
-	
-	
-	/**
-	 * 添加
-	 */
-	@Override
-	public int insertSelective(Projectplan record) {
-				
-		//添加雪花主键id
-		record.setId(SnowflakeIdWorker.getUUID());
-			
-				
-		return projectplanMapper.insertSelective(record);
-	}
-	
-	
-	@Override
-	public int updateByExampleSelective(Projectplan record, ProjectplanExample example) {
-		
-		return projectplanMapper.updateByExampleSelective(record, example);
-	}
-
-	
-	@Override
-	public int updateByExample(Projectplan record, ProjectplanExample example) {
-		
-		return projectplanMapper.updateByExample(record, example);
-	}
-
-	@Override
-	public List<Projectplan> selectByExample(ProjectplanExample example) {
-		
-		return projectplanMapper.selectByExample(example);
-	}
-
-	
-	@Override
-	public long countByExample(ProjectplanExample example) {
-		
-		return projectplanMapper.countByExample(example);
-	}
-
-	
-	@Override
-	public int deleteByExample(ProjectplanExample example) {
-		
-		return projectplanMapper.deleteByExample(example);
-	}
-	
-	/**
-	 * 检查name
-	 * @param project
-	 * @return
-	 */
-	public int checkNameUnique(Projectplan project){
-		ProjectplanExample example=new ProjectplanExample();
-		example.createCriteria().andIdEqualTo(project.getId());
-		List<Projectplan> list=projectplanMapper.selectByExample(example);
-		return list.size();
-	}
-
-	public double planMonthPower(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("%_GDC").andYearEqualTo(String.valueOf(year)).andMonthEqualTo(String.valueOf(month));
-
-		}else
-		{
-			example.createCriteria().andWindpowerEqualTo(name).andYearEqualTo(String.valueOf(year)).andMonthEqualTo(String.valueOf(month));
-
-
-		}
-		List<Projectplan> wtls = selectByExample(example);
-		double tmp = 0;
-		for(Projectplan wt:wtls)
-		{
-			tmp = tmp + Double.valueOf(wt.getGeneratingcapacity());
-		}
-		return tmp;
-	}
-
-	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("%_GDC").andYearEqualTo(String.valueOf(year)).andMonthIsNull();
-
-		}else
-		{
-			example.createCriteria().andWindpowerEqualTo(name).andYearEqualTo(String.valueOf(year)).andMonthIsNull();
-
-
-		}
-		List<Projectplan> wtls = selectByExample(example);
-		double tmp = 0;
-		for(Projectplan wt:wtls)
-		{
-			tmp = tmp + Double.valueOf(wt.getGeneratingcapacity());
-		}
-		return tmp;
-	}
+    @Resource
+    private ProjectplanMapper projectplanMapper;
+
+
+    /**
+     * 分页查询
+     * @param tablepar
+     * @param name
+     * @return
+     */
+    public PageInfo<Projectplan> list(Tablepar tablepar,String name){
+        ProjectplanExample testExample=new ProjectplanExample();
+        testExample.setOrderByClause("id ASC");
+        if(name!=null&&!"".equals(name)){
+            testExample.createCriteria().andIdLike("%"+name+"%");
+        }
+
+        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+        List<Projectplan> list= projectplanMapper.selectByExample(testExample);
+        PageInfo<Projectplan> pageInfo = new PageInfo<Projectplan>(list);
+        return  pageInfo;
+    }
+
+    @Override
+    public int deleteByPrimaryKey(String ids) {
+
+        List<String> lista=Convert.toListStrArray(ids);
+        ProjectplanExample example=new ProjectplanExample();
+        example.createCriteria().andIdIn(lista);
+        return projectplanMapper.deleteByExample(example);
+
+
+    }
+
+
+    @Override
+    public Projectplan selectByPrimaryKey(String id) {
+
+        return projectplanMapper.selectByPrimaryKey(id);
+
+    }
+
+
+    @Override
+    public int updateByPrimaryKeySelective(Projectplan record) {
+        return projectplanMapper.updateByPrimaryKeySelective(record);
+    }
+
+
+    /**
+     * 添加
+     */
+    @Override
+    public int insertSelective(Projectplan record) {
+
+        //添加雪花主键id
+        record.setId(SnowflakeIdWorker.getUUID());
+
+
+        return projectplanMapper.insertSelective(record);
+    }
+
+
+    @Override
+    public int updateByExampleSelective(Projectplan record, ProjectplanExample example) {
+
+        return projectplanMapper.updateByExampleSelective(record, example);
+    }
+
+
+    @Override
+    public int updateByExample(Projectplan record, ProjectplanExample example) {
+
+        return projectplanMapper.updateByExample(record, example);
+    }
+
+    @Override
+    public List<Projectplan> selectByExample(ProjectplanExample example) {
+
+        return projectplanMapper.selectByExample(example);
+    }
+
+
+    @Override
+    public long countByExample(ProjectplanExample example) {
+
+        return projectplanMapper.countByExample(example);
+    }
+
+
+    @Override
+    public int deleteByExample(ProjectplanExample example) {
+
+        return projectplanMapper.deleteByExample(example);
+    }
+
+    /**
+     * 检查name
+     * @param project
+     * @return
+     */
+    public int checkNameUnique(Projectplan project){
+        ProjectplanExample example=new ProjectplanExample();
+        example.createCriteria().andIdEqualTo(project.getId());
+        List<Projectplan> list=projectplanMapper.selectByExample(example);
+        return list.size();
+    }
+
+    public double planMonthPower(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("%_GDC").andYearEqualTo(String.valueOf(year)).andMonthEqualTo(String.valueOf(month));
+
+        }else
+        {
+            example.createCriteria().andWindpowerEqualTo(name).andYearEqualTo(String.valueOf(year)).andMonthEqualTo(String.valueOf(month));
+
+
+        }
+        List<Projectplan> wtls = selectByExample(example);
+        double tmp = 0;
+        for(Projectplan wt:wtls)
+        {
+            tmp = tmp + Double.valueOf(wt.getGeneratingcapacity());
+        }
+        return tmp;
+    }
+
+    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("%_GDC").andYearEqualTo(String.valueOf(year)).andMonthIsNull();
+
+        }else
+        {
+            example.createCriteria().andWindpowerEqualTo(name).andYearEqualTo(String.valueOf(year)).andMonthIsNull();
+
+
+        }
+        List<Projectplan> wtls = selectByExample(example);
+        double tmp = 0;
+        for(Projectplan wt:wtls)
+        {
+            tmp = tmp + Double.valueOf(wt.getGeneratingcapacity());
+        }
+        return tmp;
+    }
 }

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

@@ -53,8 +53,8 @@ public class QiNiuCloudService {
         Response response = uploadManager.put(uploadFile.getBytes(), fileName, upToken);
         //解析上传成功的结果
         DefaultPutRet putRet = new Gson().fromJson(response.bodyString(), DefaultPutRet.class);
-        // System.out.println(putRet.key);
-        //System.out.println(putRet.hash);
+        // //System.out.println(putRet.key);
+        ////System.out.println(putRet.hash);
         //成功 返回url name
         
         return  AjaxResult.success()

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

@@ -25,7 +25,7 @@ import com.github.pagehelper.PageInfo;
 
 /**
  * 系统用户
- * @ClassName: SysUsersService
+ * @ClassName: SysUserService
  * @author gyee
  * @date 2018年8月26日
  *

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

@@ -1,17 +1,5 @@
 package com.gyee.frame.service;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Arrays;
-
-import com.gyee.frame.model.enumeration.Messagetype;
-import com.gyee.frame.netty.websocket.util.SocketToolService;
-import com.gyee.frame.util.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.gyee.frame.common.base.BaseService;
@@ -19,8 +7,22 @@ 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 org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
 
 /**
  *  WeatherfdService
@@ -32,7 +34,7 @@ import com.gyee.frame.util.SnowflakeIdWorker;
  **/
 @Service
 public class WeatherfdService extends SocketToolService implements BaseService<Weatherfd, WeatherfdExample>{
-	@Autowired
+	@Resource
 	private WeatherfdMapper weatherfdMapper;
 	
       	   	      	      	      	      	      	      	      	      	      	      	      	      	      	      	      	      	      	      	      	      	      	      	      	      	
@@ -62,9 +64,59 @@ public class WeatherfdService extends SocketToolService implements BaseService<W
 	        return  pageInfo;
 	 }
 
+	public List<Weatherfd> list7Day(String wpid) throws ParseException {
+
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH");
+		Calendar cal=Calendar.getInstance();
+		cal.set(Calendar.HOUR_OF_DAY,0);
+		cal.set(Calendar.MINUTE,0);
+		cal.set(Calendar.SECOND,0);
+		Date recodedate = cal.getTime();
+		Date recodedateend = DateUtils.addDays(recodedate, 7);
+		WeatherfdExample testExample=new WeatherfdExample();
+		testExample.setOrderByClause(" recodedata ASC");
+		if(recodedate!=null){
+			if(wpid!=null && !wpid.equals("0"))
+			{
+				testExample.createCriteria().andRecodedataGreaterThanOrEqualTo(recodedate).andRecodedataLessThanOrEqualTo(recodedateend).andWindpowerstationidEqualTo(wpid);
+			}else
+			{
+				testExample.createCriteria().andRecodedataGreaterThanOrEqualTo(recodedate).andRecodedataLessThanOrEqualTo(recodedateend);
+
+			}
+		}
+
+		List<Weatherfd> list= weatherfdMapper.selectByExample(testExample);
+		return  list;
+
+	}
 
+	public List<Weatherfd> listDay(String wpid) throws ParseException {
 
 
+		Calendar cal=Calendar.getInstance();
+		cal.set(Calendar.HOUR_OF_DAY,0);
+		cal.set(Calendar.MINUTE,0);
+		cal.set(Calendar.SECOND,0);
+		Date recodedate = cal.getTime();
+		Date recodedateend = DateUtils.addDays(recodedate,1);
+		WeatherfdExample testExample=new WeatherfdExample();
+		testExample.setOrderByClause("recodedata ASC");
+		if(recodedate!=null){
+			if(wpid!=null && !wpid.equals("0"))
+			{
+				testExample.createCriteria().andRecodedataGreaterThanOrEqualTo(recodedate).andRecodedataLessThanOrEqualTo(recodedateend).andWindpowerstationidEqualTo(wpid);
+			}else
+			{
+				testExample.createCriteria().andRecodedataGreaterThanOrEqualTo(recodedate).andRecodedataLessThanOrEqualTo(recodedateend);
+
+			}
+		}
+
+		List<Weatherfd> list= weatherfdMapper.selectByExample(testExample);
+		return  list;
+
+	}
 	/**
 	 *@author:Wang Jiawen
 	 *
@@ -89,7 +141,7 @@ public class WeatherfdService extends SocketToolService implements BaseService<W
 			testExample.createCriteria().andRecodedataGreaterThanOrEqualTo(recodedate).andRecodedataLessThan(recodedateend);
 		}
 		List<Weatherfd> list= weatherfdMapper.selectByExample(testExample);
-		this.pushToWeb("pageNumber_2","functionNumber_1",list, Messagetype.MESSAGE);
+		this.pushToWeb("pageNumber_2","functionNumber_1","all",list, Messagetype.MESSAGE);
 	}
 	
 	/**
@@ -113,7 +165,7 @@ public class WeatherfdService extends SocketToolService implements BaseService<W
 			testExample.createCriteria().andRecodedataGreaterThanOrEqualTo(recodedate).andRecodedataLessThan(recodedateend);
 		}
 		List<Weatherfd> list= weatherfdMapper.selectByExample(testExample);
-		this.pushToWeb("pageNumber_3","functionNumber_1",list, Messagetype.MESSAGE);
+		this.pushToWeb("pageNumber_3","functionNumber_1","all",list, Messagetype.MESSAGE);
 	}
 	
 	/**
@@ -137,7 +189,7 @@ public class WeatherfdService extends SocketToolService implements BaseService<W
 			testExample.createCriteria().andRecodedataGreaterThanOrEqualTo(recodedatebegin).andRecodedataLessThanOrEqualTo(recodedateend);
 		}
 		List<Weatherfd> list= weatherfdMapper.selectByExample(testExample);
-		this.pushToWeb("pageNumber_4","functionNumber_1",list, Messagetype.MESSAGE);
+		this.pushToWeb("pageNumber_4","functionNumber_1","all",list, Messagetype.MESSAGE);
 	
 	}
 	
@@ -161,7 +213,7 @@ public class WeatherfdService extends SocketToolService implements BaseService<W
 			testExample.createCriteria().andRecodedataGreaterThanOrEqualTo(recodedate).andRecodedataLessThan(recodedateend);
 		}
 		List<Weatherfd> list= weatherfdMapper.selectByExample(testExample);
-		this.pushToWeb("pageNumber_5","functionNumber_1",list, Messagetype.MESSAGE);
+		this.pushToWeb("pageNumber_5","functionNumber_1","all",list, Messagetype.MESSAGE);
 	}
 	
 

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

@@ -1,16 +1,5 @@
 package com.gyee.frame.service;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Arrays;
-
-import com.gyee.frame.model.auto.Weatherfd;
-import com.gyee.frame.model.auto.WeatherfdExample;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.gyee.frame.common.base.BaseService;
@@ -22,7 +11,15 @@ 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 org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
 
 /**
  *  WeatherfhService
@@ -34,24 +31,22 @@ import com.gyee.frame.util.SnowflakeIdWorker;
  **/
 @Service
 public class WeatherfhService extends SocketToolService implements BaseService<Weatherfh, WeatherfhExample>{
-	@Autowired
+	@Resource
 	private WeatherfhMapper weatherfhMapper;
 	
       	   	      	      	      	      	      	      	      	      	      	
 	/**
 	 * 分页查询
-	 * @param pageNum
-	 * @param pageSize
 	 * @param windpowerstationid
 	 * @return
 	 */
-	 public PageInfo<Weatherfh> list(Tablepar tablepar,String name,String windpowerstationid) throws ParseException {
+	 public PageInfo<Weatherfh> list(Tablepar tablepar, String name, String windpowerstationid) throws ParseException {
 		 	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		 	Date recodedate = sdf.parse(name);
 	        WeatherfhExample testExample=new WeatherfhExample();
 	        testExample.setOrderByClause("id ASC");
 	        if(name!=null&&!"".equals(name)){
-	        	testExample.createCriteria().andDateLike(recodedate);
+	        	testExample.createCriteria().andRecodedataEqualTo(recodedate);
 	        }
 
 	        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
@@ -80,16 +75,40 @@ public class WeatherfhService extends SocketToolService implements BaseService<W
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH");
 			String name =  sdf.format(DateUtils.getNowDate());
 			Date recodedate = sdf.parse(name);
-			Date recodedateend = DateUtils.addHours(recodedate, 16);
+			Date recodedateend = DateUtils.addHours(recodedate, 4);
 			WeatherfhExample testExample=new WeatherfhExample();
 			testExample.setOrderByClause("id ASC");
 			if(name!=null&&!"".equals(name)){
-				testExample.createCriteria().andDateGreaterThanOrEqualTo(recodedate).andDateLessThanOrEqualTo(recodedateend);
+				testExample.createCriteria().andRecodedataGreaterThanOrEqualTo(recodedate).andRecodedataLessThanOrEqualTo(recodedateend);
 			}
 			List<Weatherfh> list= weatherfhMapper.selectByExample(testExample);
-			this.pushToWeb("pageNumber_3","functionNumber_2",list, Messagetype.MESSAGE);
+			this.pushToWeb("pageNumber_3","functionNumber_2","all",list, Messagetype.MESSAGE);
 		}
 
+	public List<Weatherfh> listDayHour(String wpid) throws ParseException {
+
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH");
+		Calendar cal=Calendar.getInstance();
+//		cal.set(Calendar.MONTH,6);
+//		cal.set(Calendar.DAY_OF_MONTH,10);
+		cal.set(Calendar.HOUR_OF_DAY,0);
+		cal.set(Calendar.MINUTE,0);
+		cal.set(Calendar.SECOND,0);
+		Date recodedate = cal.getTime();
+		Date recodedateend = DateUtils.addDays(recodedate, 1);
+		WeatherfhExample testExample=new WeatherfhExample();
+		testExample.setOrderByClause("id ASC");
+		if(recodedate!=null){
+			testExample.createCriteria().andRecodedataGreaterThanOrEqualTo(recodedate).andRecodedataLessThanOrEqualTo(recodedateend);
+		}
+		if(wpid!=null && !wpid.equals("0"))
+		{
+			testExample.createCriteria().andWindpowerstationidEqualTo(wpid);
+		}
+		List<Weatherfh> list= weatherfhMapper.selectByExample(testExample);
+		return  list;
+
+	}
 	@Override
 	public int deleteByPrimaryKey(String ids) {
 					
@@ -171,7 +190,7 @@ public class WeatherfhService extends SocketToolService implements BaseService<W
 	 */
 	public int checkNameUnique(Weatherfh weatherfh){
 		WeatherfhExample example=new WeatherfhExample();
-		example.createCriteria().andDateEqualTo(weatherfh.getDate());
+		example.createCriteria().andRecodedataEqualTo(weatherfh.getRecodedata());
 		List<Weatherfh> list=weatherfhMapper.selectByExample(example);
 		return list.size();
 	}

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

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -60,8 +61,8 @@ public class WindpowerinfodayService extends SocketToolService implements BaseSe
 
 	/**
 	 *
-	 * @return
-	 * @throws ParseException
+			* @return
+			* @throws ParseException
 	 */
 	public Windpowerinfoday findListByDate(String wpid,Date recorddate) throws ParseException {
 
@@ -69,12 +70,14 @@ public class WindpowerinfodayService extends SocketToolService implements BaseSe
 
 		if(recorddate!=null&&!"".equals(recorddate) && wpid!=null&&!"".equals(wpid)){
 
-
-			Date recodedatebegin =recorddate;
-			Date recodedateend = DateUtils.addDays(recodedatebegin,1);
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			Date recodedatebegin =sdf.parse(sdf.format(recorddate));
+			Date recodedateend = sdf.parse(sdf.format(DateUtils.addDays(recodedatebegin,1)));
 			WindpowerinfodayExample testExample=new WindpowerinfodayExample();
 			testExample.setOrderByClause("id ASC");
 			testExample.createCriteria().andForeignkeyidEqualTo(wpid).andRecorddateBetween(recodedatebegin,recodedateend);
+			////System.out.println(testExample);
+
 			List<Windpowerinfoday> list= windpowerinfodayMapper.selectByExample(testExample);
 
 			if(!list.isEmpty())
@@ -83,10 +86,53 @@ public class WindpowerinfodayService extends SocketToolService implements BaseSe
 			}
 		}
 		return wpi;
-	
+
 	}
-	
 
+
+
+	public List<Windpowerinfoday> listByDate(String wpid) throws ParseException {
+
+		Windpowerinfoday wpi=null;
+		Calendar cal=Calendar.getInstance();
+		cal.set(Calendar.HOUR_OF_DAY,0);
+		cal.set(Calendar.MINUTE,0);
+		cal.set(Calendar.SECOND,0);
+		Date recodedate = cal.getTime();
+		Date recodedateend = DateUtils.addDays(recodedate, 1);
+
+		WindpowerinfodayExample testExample=new WindpowerinfodayExample();
+		testExample.setOrderByClause("id ASC");
+		testExample.createCriteria().andForeignkeyidEqualTo(wpid).andRecorddateBetween(recodedate,recodedateend);
+		////System.out.println(testExample);
+
+		List<Windpowerinfoday> list= windpowerinfodayMapper.selectByExample(testExample);
+
+		return list;
+
+	}
+
+	public List<Windpowerinfoday> listBy7Date(String wpid) throws ParseException {
+
+		Windpowerinfoday wpi=null;
+		Calendar cal=Calendar.getInstance();
+		cal.set(Calendar.HOUR_OF_DAY,0);
+		cal.set(Calendar.MINUTE,0);
+		cal.set(Calendar.SECOND,0);
+		cal.add(Calendar.DAY_OF_MONTH,1);
+		Date recodedateend = cal.getTime();
+		Date recodedate = DateUtils.addDays(recodedateend, -6);
+
+		WindpowerinfodayExample testExample=new WindpowerinfodayExample();
+		testExample.setOrderByClause("id ASC");
+		testExample.createCriteria().andForeignkeyidEqualTo(wpid).andRecorddateBetween(recodedate,recodedateend);
+		////System.out.println(testExample);
+
+		List<Windpowerinfoday> list= windpowerinfodayMapper.selectByExample(testExample);
+
+		return list;
+
+	}
 	
 
 

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

@@ -16,7 +16,7 @@ import java.util.List;
  *
  */
 @Service
-public class FocastpowerService extends SocketToolService{
+public class FocastpowerService extends SocketToolService {
 
     @Resource
     private ForecastwindspeedamendedService forecastwindspeedamendedService;
@@ -83,7 +83,7 @@ public class FocastpowerService extends SocketToolService{
                 tmp = tmp + wt.getDayspeed().doubleValue()+wt.getNightspeed().doubleValue();
 
             }
-            tmp=StringUtils.round(tmp/(wtls.size()*2),2);
+            tmp= StringUtils.round(tmp/(wtls.size()*2),2);
         }
 
         return tmp;

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

@@ -1,102 +1,137 @@
 package com.gyee.frame.service.app.index;
 
-import com.gyee.frame.common.conf.redis.CacheContext;
+
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
-import com.gyee.frame.common.spring.SpringUtils;
-import com.gyee.frame.model.auto.*;
+import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
+import com.gyee.frame.model.auto.Windpowerstation;
 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.ForecastwindspeedamendedService;
 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 com.gyee.frame.util.golden.EdosUtil;
-import com.gyee.frame.util.golden.IEdosUtil;
-import com.gyee.frame.util.golden.StringUtil;
-import com.gyee.frame.util.mongodb.IMongodbUtil;
-import com.gyee.frame.util.mongodb.MongodbUtilImpl;
 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;
 import java.util.*;
 
 /**
  *
  */
 @Service
-public class IndexDetailService extends SocketToolService{
+public class IndexDetailService extends SocketToolService {
 	@Autowired
     private InitialRunner initialRunner;
     private static int decimal_digit = 2;
-	IEdosUtil mongodb = new EdosUtil();
+    IRealTimeDataBaseUtil mongodb= RealTimeDataBaseFactory.createRealTimeDataBase();
     @Resource
     private WindpowerinfodayService windpowerinfodayService;
     @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();
 
         List<Windpowerstation> wpls = new ArrayList<>();
-        for (Windpowerstation wp : InitialRunner.wpls) {
-            wpls.add(wp);
-        }
         Windpowerstation windpowerstationAll = new Windpowerstation();
         windpowerstationAll.setId("0");
         wpls.add(windpowerstationAll);
+        for (Windpowerstation wp : InitialRunner.wpls) {
+            wpls.add(wp);
+        }
 
-        String[] ycPoints = Constant.TPOINT_WP_FGLYC.split(",");
-        String[] ycPoints2 = Constant.TPOINT_WP_FGLYC2.split(",");
 
+       for(Windpowerstation wp:wpls)
+       {
+           List<DataVo> vos=findRealPowerChar(wp.getId());
+           pointDataMap.put(wp.getId(),vos);
 
+       }
 
-        Calendar c = Calendar.getInstance();
-        Date endDate = c.getTime();
-        c.set(Calendar.HOUR_OF_DAY, 0);
-        c.set(Calendar.MINUTE, 0);
-        c.set(Calendar.SECOND, 0);
-        Date beginDate = c.getTime();
-        long num = DateUtils.hoursDiff(beginDate, endDate);
-        Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = InitialRunner.stationPointmap;
+        this.pushToWeb("pageNumber_6", "functionNumber_6","all", pointDataMap, Messagetype.MESSAGE);
 
-        for (Windpowerstation windpowerstation : wpls) {
+    }
 
-            List<DataVo> vos = new ArrayList<DataVo>();
-            int length = 24;
-            for (int i = 0; i < length; i++) {
-                DataVo vo = new DataVo();
 
-                vo.setValue1(0.0);// 预测功率
-                vo.setValue2(0.0);// 理论功率
-                vo.setValue3(0.0);// 实发功率
-                vo.setValue4(0.0);// 平均风速
-                vos.add(vo);
-            }
+    public List<DataVo> findRealPowerChar(String wpId) throws Exception {
+        List<DataVo> vos = new ArrayList<DataVo>();
 
-            Map<String, WindPowerStationTestingPoint2> map = stationPointmap.get(windpowerstation.getId());
+        Calendar cal = Calendar.getInstance();
+        Date currentDate=cal.getTime();
 
+        Date beginDate = null;
+        Date endDate = null;
+        if(cal.get(Calendar.HOUR_OF_DAY)==0 && cal.get(Calendar.MINUTE)==0 && cal.get(Calendar.SECOND)==0 )
+        {
+            beginDate = cal.getTime();
+            cal.add(Calendar.DAY_OF_MONTH, 1);
+            endDate = cal.getTime();
+        }else
+        {
+            cal.set(Calendar.HOUR_OF_DAY, 0);
+            cal.set(Calendar.MINUTE, 0);
+            cal.set(Calendar.SECOND, 0);
 
-            WindPowerStationTestingPoint2 sjgl = map.get(Constant.TPOINT_WP_SJGL);
-            WindPowerStationTestingPoint2 llgl = map.get(Constant.TPOINT_WP_ZZSGL);
-            WindPowerStationTestingPoint2 pjfs = map.get(Constant.TPOINT_WP_SSFS);
+            beginDate = cal.getTime();
+        }
 
-            Calendar cal = Calendar.getInstance();
-            //理论功率
-            if (!windpowerstation.getId().equals("0") && !windpowerstation.getId().equals("-1") && !windpowerstation.getId().equals("-2")) {
+
+
+        // cal.set(Calendar.HOUR_OF_DAY, 23);
+        // cal.set(Calendar.MINUTE, 45);
+        // cal.set(Calendar.SECOND, 0);
+        cal.setTime(currentDate);
+        cal.set(Calendar.SECOND, 0);
+
+        if (cal.get(Calendar.MINUTE) > 30) {
+            cal.set(Calendar.MINUTE, 0);
+            cal.add(Calendar.HOUR_OF_DAY, 1);
+        }else
+        {
+            cal.set(Calendar.MINUTE, 30);
+        }
+
+
+        if(null==endDate)
+        {
+            endDate = cal.getTime();
+        }
+
+        long num = DateUtils.hoursDiff(beginDate, endDate) * 2;
+        if (cal.get(Calendar.MINUTE) == 30) {
+            num++;
+        }
+        String[] ycPoints = Constant.TPOINT_WP_FGLYC.split(",");
+        String[] ycPoints2 = Constant.TPOINT_WP_FGLYC2.split(",");
+        int length = 48;
+        for (int i = 0; i < length; i++) {
+            DataVo vo = new DataVo();
+
+            vo.setValue1(0.0);// 预测功率
+            vo.setValue2(0.0);// 理论功率
+            vo.setValue3(0.0);// 实发功率
+            vo.setValue4(0.0);// 平均风速
+            vos.add(vo);
+        }
+
+        if (StringUtils.isNotEmpty(wpId)) {
+            Map<String, WindPowerStationTestingPoint2> map =InitialRunner.stationPointmap.get(wpId);
+            if (!wpId.equals("0") && !wpId.equals("-1") && !wpId.equals("-2")) {
 
                 // /////////////////////////////////////////////
                 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, 3600L);
+                    List<PointData> datas = mongodb.getHistoryDatasSnap(ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 1800L);
 
                     for (int j = 0; j < datas.size(); j++) {
 
@@ -131,34 +166,48 @@ public class IndexDetailService extends SocketToolService{
                             }
                     }
                     for (int k = 0; k < vos.size(); k++) {
-                        vos.get(k).setValue7(48.0);
+                        vos.get(k).setValue7(24.0);
                     }
                 }
             } else {
                 List<Windpowerstation> stations = new ArrayList<Windpowerstation>();
-                if (windpowerstation.getId().equals("") || windpowerstation.getId().equals("0")) {
-                    for (Windpowerstation station : InitialRunner.wpls) {
-                        stations.add(station);
+                if (wpId.equals("") || wpId.equals("0")) {
+                    for (Windpowerstation station : InitialRunner.wpallls) {
+                        if (station.getId().endsWith("FDC") || station.getId().endsWith("GDC")) {
+                            stations.add(station);
+                        }
+                    }
+                } else if (wpId.equals("-1")) {
+                    for (Windpowerstation station : InitialRunner.wpallls) {
+                        if (station.getId().endsWith("FDC")) {
+                            stations.add(station);
+                        }
+                    }
+                } else {
+                    for (Windpowerstation station : InitialRunner.wpallls) {
+                        if (station.getId().endsWith("GDC")) {
+                            stations.add(station);
+                        }
                     }
                 }
                 for (Windpowerstation station : stations) {
 
-                    Map<String, WindPowerStationTestingPoint2> wpmap = stationPointmap.get(station.getId());
+                    Map<String, WindPowerStationTestingPoint2> wpmap = InitialRunner.stationPointmap.get(station.getId());
                     Date tempdate = null;
+
                     if (num > 0) {
                         WindPowerStationTestingPoint2 ycgl1 = wpmap.get(ycPoints[0]);
 
-                        if(null !=ycgl1)
-                        {
-                            List<PointData> datas = mongodb.getHistoryDatasSnap(ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 3600L);
+                        if(null !=ycgl1){
+                            List<PointData> datas = mongodb.getHistoryDatasSnap(ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 1800L);
                             if(datas.isEmpty())
                             {
                                 continue;
                             }
                             for (int j = 0; j < datas.size(); j++) {
-
+                                ////System.out.println(j);
                                 vos.get(j).setTime(datas.get(j).getPointTime() * 1000);
-                                vos.get(j).setValue1(StringUtils.round(vos.get(j).getValue1() + datas.get(j).getPointValueInDouble(), 2));
+                                vos.get(j).setValue1(StringUtils.round((vos.get(j).getValue4()==null?vos.get(0).getValue4():vos.get(j).getValue4()) + (datas.get(j)==null?datas.get(0).getPointValueInDouble():datas.get(j).getPointValueInDouble()), 2));
                                 if (j == datas.size() - 1) {
                                     tempdate = new Date(datas.get(j).getPointTime() * 1000);
                                     cal.setTime(tempdate);
@@ -175,7 +224,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).getValue1() + 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.getRealData(ycgl).getPointValueInDouble(), 2));
                                 }
                                 total = datas.size() + subresult;
                                 subresult = length - (total);
@@ -187,29 +236,59 @@ public class IndexDetailService extends SocketToolService{
                                         vos.get(total + i).setValue1(null);
                                     }
                             }
+                            for (int k = 0; k < vos.size(); k++) {
+                                vos.get(k).setValue7(48.0);
+                            }
 
                         }
 
                     }
+
                 }
+
             }
-            
+
+            // / <summary>
+            // / 理论
+            // / </summary>
+            // public const string ZLLGL = "ZLLGL";
+            // / <summary>
+            // / 保证
+            // / </summary>
+            // public const string ZBZGL = "ZBZGL";
+            // / <summary>
+            // / 应发
+            // / </summary>
+            // public const string ZZSGL = "ZZSGL";
+            // / <summary>
+            // / 实际
+            // / </summary>
+            // public const string SSZGL = "SSZGL";
+
+
+
+            WindPowerStationTestingPoint2 llgl = map.get("ZLLGL");
+            WindPowerStationTestingPoint2 sjgl = map.get(Constant.TPOINT_WP_SJGL);
+            WindPowerStationTestingPoint2 pjfs = map.get(Constant.TPOINT_WP_SSFS);
+
+
             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, 3600L);
+            List<PointData> gdsjglls = mongodb.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, 3600L);
+                    List<PointData> llglls = mongodb.getHistoryDatasSnap(llgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 1800L);
 
                     int count = 0;
                     double temp1 = 0;
                     double temp2 = 0;
                     for (int i = 0; i < vos.size(); i++) {
 
-                        if (i < llglls.size() && StringUtils.isNotNull(llglls.get(i).getPointTime())) {
+                        if (i < llglls.size() && null!= llglls.get(i).getPointTime()) {
 
-                            if (vos.get(i).getTime() <= new Date().getTime()) {
+                            if (vos.get(i).getTime() <= DateUtils.getNowDate().getTime()) {
                                 temp1 = llglls.get(i).getPointValueInDouble();
                                 temp2 = gdsjglls.get(i).getPointValueInDouble();
                                 temp1 = new BigDecimal(temp1).divide(new BigDecimal(100000), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
@@ -220,7 +299,7 @@ public class IndexDetailService extends SocketToolService{
 
                                 if (Math.abs(temp1) < 10000) {
 
-                                    if (windpowerstation.getId().equals("0")) {
+                                    if (wpId.equals("0")) {
                                         vos.get(i).setValue2(StringUtils.round(temp1 + temp2, 2));// 理论功率
                                     } else {
                                         vos.get(i).setValue2(StringUtils.round(temp1, 2));// 理论功率
@@ -230,9 +309,11 @@ public class IndexDetailService extends SocketToolService{
 
                                 count++;
                             } else {
-                                vos.get(i).setValue2(0d);// 理论功率
+                                vos.get(i).setValue2(null);// 理论功率
                             }
 
+                        }else {
+                            vos.get(i).setValue2(null);// 理论功率
                         }
                     }
                     // for(int i=0;i<vos.size();i++){
@@ -240,19 +321,21 @@ public class IndexDetailService extends SocketToolService{
                     // }
                 }
             } catch (Exception e) {
+                e.printStackTrace();
                 // TODO: handle exception
             }
 
 
+
             if (null != sjgl) {
-                List<PointData> sjglls = mongodb.getHistoryDatasSnap(sjgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 3600L);
+                List<PointData> sjglls = mongodb.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++) {
 
-                    if (i < sjglls.size() && StringUtils.isNotNull(sjglls.get(i).getPointTime())) {
+                    if (i < sjglls.size() && null!= sjglls.get(i).getPointTime()) {
 
-                        if (vos.get(i).getTime() <= new Date().getTime()) {
+                        if (vos.get(i).getTime() <= DateUtils.getNowDate().getTime()) {
                             temp = sjglls.get(i).getPointValueInDouble();
                             if (Math.abs(temp) < 10000) {
                                 vos.get(i).setValue3(StringUtils.round(temp, 2));// 实际功率
@@ -260,34 +343,38 @@ public class IndexDetailService extends SocketToolService{
 
                             count++;
                         } else {
-                            vos.get(i).setValue3(0d);// 实际功率
+                            vos.get(i).setValue3(null);// 实际功率
                         }
 
+                    }else {
+                        vos.get(i).setValue3(null);// 理论功率
                     }
                 }
                 for (int i = 0; i < vos.size(); i++) {
-                    vos.get(i).setValue3((double) count);
+                    vos.get(i).setValue8((double) count);
                 }
             }
             try {
                 if (null != pjfs) {
-                    List<PointData> pjfsls = mongodb.getHistoryDatasSnap(pjfs, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 3600L);
+                    List<PointData> pjfsls = mongodb.getHistoryDatasSnap(pjfs, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 1800L);
 
                     double temp = 0;
                     for (int i = 0; i < vos.size(); i++) {
 
-                        if (i < pjfsls.size() && StringUtils.isNotNull(pjfsls.get(i).getPointTime())) {
+                        if (i < pjfsls.size() && null!= pjfsls.get(i).getPointTime()) {
 
-                            if (vos.get(i).getTime() <= new Date().getTime()) {
+                            if (vos.get(i).getTime() <= DateUtils.getNowDate().getTime()) {
                                 temp = pjfsls.get(i).getPointValueInDouble();
 
                                 if (Math.abs(temp) < 10000) {
                                     vos.get(i).setValue4(StringUtils.round(temp, 2));// 平均风速
                                 }
                             } else {
-                                vos.get(i).setValue4(0d);// 平均风速
+                                vos.get(i).setValue4(null);// 平均风速
                             }
 
+                        }else {
+                            vos.get(i).setValue4(null);// 理论功率
                         }
                     }
                 }
@@ -295,15 +382,11 @@ public class IndexDetailService extends SocketToolService{
                 // TODO: handle exception
             }
 
-            pointDataMap.put(windpowerstation.getId(),vos);
-
+            // ////////////////////////////////////////////////
         }
-
-        this.pushToWeb("pageNumber_6", "functionNumber_6", pointDataMap, Messagetype.MESSAGE);
-
+        return vos;
     }
 
-
     public void index_curve_columnar_five_loss() throws Exception {
 
         Map<String, List<DataVo>> pointDataMap = new HashMap();
@@ -318,10 +401,12 @@ public class IndexDetailService extends SocketToolService{
 
 
         Calendar c = Calendar.getInstance();
-        Date endDate = c.getTime();
+
         c.set(Calendar.HOUR_OF_DAY, 0);
         c.set(Calendar.MINUTE, 0);
         c.set(Calendar.SECOND, 0);
+        c.add(Calendar.DAY_OF_MONTH,2);
+        Date endDate = c.getTime();
         c.add(Calendar.DAY_OF_MONTH,-7);
         Date beginDate = c.getTime();
 
@@ -374,7 +459,7 @@ public class IndexDetailService extends SocketToolService{
 
             for (int j = 0; j < fdlls.size(); j++) {
 
-                vos.get(j).setTime(fdlls.get(j).getPointTime() * 1000);
+                vos.get(j).setTime((fdlls.get(j).getPointTime()-3600*24) * 1000);
                 vos.get(j).setValue1(StringUtils.round(fdlls.get(j).getPointValueInDouble(),2));
             }
 
@@ -492,16 +577,16 @@ public class IndexDetailService extends SocketToolService{
 
         }
 
-        this.pushToWeb("pageNumber_6", "functionNumber_7", pointDataMap, Messagetype.MESSAGE);
+        this.pushToWeb("pageNumber_6", "functionNumber_7","all", pointDataMap, Messagetype.MESSAGE);
 
     }
 
 
     public void index_windStation_card() throws Exception {
-
+        ////System.out.println("000");
         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();
@@ -526,7 +611,7 @@ public class IndexDetailService extends SocketToolService{
                 pointDataMap.put("rfdl_real",rfdl_real);
                 pointDataMap.put("rfdl",rfdl);
             }catch (Exception e){
-                System.out.println(e.getMessage());
+                //System.out.println(e.getMessage());
             }
 
             try {
@@ -537,7 +622,7 @@ public class IndexDetailService extends SocketToolService{
                 pointDataMap.put("ssgl",ssgl);
                 pointDataMap.put("ssgl_real",ssgl_real);
             }catch (Exception e){
-                System.out.println(e.getMessage());
+                //System.out.println(e.getMessage());
             }
 
 
@@ -548,12 +633,12 @@ public class IndexDetailService extends SocketToolService{
                 pointDataMap.put("ssfs",ssfs);
                 pointDataMap.put("ssfs_real",ssfs_real);
             }catch (Exception e){
-                System.out.println(e.getMessage());
+                //System.out.println(e.getMessage());
             }
 
             //预测发电量
             ycdl=focastpowerService.focastpower(windpowerstation.getId());
-
+            ycdl =Double.valueOf( String.format("%.2f", ycdl));
 
             pointDataMap.put("ycdl",ycdl);
 
@@ -561,10 +646,8 @@ public class IndexDetailService extends SocketToolService{
         }
 
 
-        this.pushToWeb("pageNumber_6","functionNumber_8",windpowerstationpointDataMap, Messagetype.MESSAGE);
+        this.pushToWeb("pageNumber_6","functionNumber_8","all",windpowerstationpointDataMap, Messagetype.MESSAGE);
     }
 
 
-
-
 }

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

@@ -1,6 +1,5 @@
 package com.gyee.frame.service.app.index;
 
-import com.gyee.frame.common.conf.redis.CacheContext;
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
@@ -11,9 +10,9 @@ import com.gyee.frame.model.enumeration.Messagetype;
 import com.gyee.frame.netty.websocket.util.SocketToolService;
 import com.gyee.frame.service.ProjectplanService;
 import com.gyee.frame.service.WindpowerinfodayService;
+import com.gyee.frame.util.IRealTimeDataBaseUtil;
+import com.gyee.frame.util.RealTimeDataBaseFactory;
 import com.gyee.frame.util.StringUtils;
-import com.gyee.frame.util.golden.EdosUtil;
-import com.gyee.frame.util.golden.IEdosUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -22,27 +21,16 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
 
-/**
- * 
-	 *@author:Li Miao
-	 *
-	 *@description: sis手机app首页数据接入
-	 *
-	 *@createTime:2020年5月15日
-	 *
- */
 @Service
 public class IndexService extends SocketToolService{
+	@Resource
+	private ProjectplanService projectplanService;
+	@Resource
+	private WindpowerinfodayService windpowerinfodayService;
 	@Autowired
     private InitialRunner initialRunner;
-    private static int decimal_digit = 2;
-	IEdosUtil mongodb = new EdosUtil();
-    @Resource
-    private WindpowerinfodayService windpowerinfodayService;
-    @Resource
-    private ProjectplanService projectplanService;
-    @Resource
-    private FocastpowerService focastpowerService;
+    private static int decimal_digit = 0;
+	
 	public void index_target_comprehensive_indicators() throws Exception{
 		 Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = InitialRunner.stationPointmap;
 	        List<Windpowerstation> wpls = new ArrayList<>();
@@ -53,7 +41,7 @@ public class IndexService extends SocketToolService{
 	        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();
@@ -62,37 +50,54 @@ public class IndexService extends SocketToolService{
 	            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 {
 	                //日发电量
-	                PointData rfdl_real = mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_RFDL).getCode());
+	                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();
-                    pointDataMap.put("rfdl_real",rfdl_real);
 	            }catch (Exception e){
-	                System.out.println(e.getMessage());
+	                //System.out.println(e.getMessage());
 	            }
 
 	            try {
 	                //安全天数
-	                PointData aqts_real = mongodb.getRealData(stationPointmap.get("0").get(Constant.TPOINT_AQTS).getCode());
+	                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();
-                    pointDataMap.put("aqts_real",aqts_real);
 	            }catch (Exception e){
-	                System.out.println(e.getMessage());
+	                //System.out.println(e.getMessage());
 	            }
 
 
 	            try{
 	                //上网电量
-	                PointData swdl_real=mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_SWDL).getCode());
+	                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();
-                    pointDataMap.put("swdl_real",swdl_real);
 	            }catch (Exception e){
-	                System.out.println(e.getMessage());
+	                //System.out.println(e.getMessage());
 	            }
 
-	            //预测发电量
-                ycfdl=focastpowerService.focastpower(windpowerstation.getId());
+				try{
+					//装机容量
+					zjrl_real=mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_SWDL).getCode());
+					zjrl = new BigDecimal(zjrl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+				}catch (Exception e){
+					//System.out.println(e.getMessage());
+				}
+
+				try{
+					//预测发电量
+					ycfdl_real=mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.RFDLE).getCode());
+					ycfdl = new BigDecimal(ycfdl_real.getPointValueInDouble()).divide(new BigDecimal(10000), 0, RoundingMode.HALF_EVEN).doubleValue();
+
+				}catch (Exception e){
+					//System.out.println(e.getMessage());
+				}
+
+
 
 	            //装机容量
 	            try{
@@ -106,16 +111,21 @@ public class IndexService extends SocketToolService{
 	                }
 
 	            }catch (Exception e){
-	                System.out.println(e.getMessage());
+	                //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",windpowerstationpointDataMap, Messagetype.MESSAGE);
+        this.pushToWeb("pageNumber_6","functionNumber_1","all",windpowerstationpointDataMap, Messagetype.JSONOBJECT);
 	}
 	
 	
@@ -129,7 +139,7 @@ public class IndexService extends SocketToolService{
         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();
@@ -148,11 +158,11 @@ public class IndexService extends SocketToolService{
 
             try {
                 //平均风速
-                PointData pjfs_real = mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_SSFS).getCode());
+                PointData pjfs_real = mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_PJFS).getCode());
+				pointDataMap.put("pjfs_real",pjfs_real);
                 pjfs = new BigDecimal(pjfs_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-                pointDataMap.put("pjfs_real",pjfs_real);
             }catch (Exception e){
-                System.out.println(e.getMessage());
+                //System.out.println(e.getMessage());
             }
             
             //平均风速min
@@ -194,7 +204,19 @@ public class IndexService extends SocketToolService{
             }
             
             //预测风速
-            ycfs=focastpowerService.focastspeed(windpowerstation.getId());
+            try{
+                if(windpowerstation.getId().equalsIgnoreCase("0")){
+                    List<Windpowerstation> wps = InitialRunner.wpls;
+                    for(Windpowerstation windpowerstationinner:wps){
+                    	ycfs = pjfs + 2;
+                    }
+                }else{
+                	ycfs = pjfs + 2;
+                }
+            }
+            catch(Exception e){
+                System.out.printf(e.getMessage());
+            }
             
           //预测风速min
             try{
@@ -237,10 +259,10 @@ public class IndexService extends SocketToolService{
             try{
                 //实际功率
                 PointData sjgl_real=mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_SJGL).getCode());
+				pointDataMap.put("sjgl_real",sjgl_real);
                 sjgl = new BigDecimal(sjgl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-                pointDataMap.put("sjgl_real",sjgl_real);
             }catch (Exception e){
-                System.out.println(e.getMessage());
+                //System.out.println(e.getMessage());
             }
             
           //实际功率min
@@ -283,14 +305,13 @@ public class IndexService extends SocketToolService{
             
             try{
                 //理论功率
-                PointData llgl_real=mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_ZZSGL).getCode());
-                llgl =new BigDecimal(llgl_real.getPointValueInDouble()).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
-                double gfsjgl = mongodb.getRealData(stationPointmap.get("-2").get(Constant.TPOINT_WP_SJGL)).getPointValueInDouble();
-                llgl=StringUtils.round(llgl+gfsjgl,2);
-                //llgl = new BigDecimal(llgl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-                pointDataMap.put("llgl_real",llgl_real);
-            }catch (Exception e){
-                System.out.println(e.getMessage());
+                PointData llgl_real=mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_ZLLGL).getCode());
+                //llgl = new BigDecimal(swdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+				pointDataMap.put("llgl_real",llgl_real);
+				llgl =new BigDecimal(llgl_real.getPointValueInDouble()).divide(new BigDecimal(1000), decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+
+			}catch (Exception e){
+                //System.out.println(e.getMessage());
             }
             
           //理论功率min
@@ -311,7 +332,9 @@ public class IndexService extends SocketToolService{
                 		llglMin = llgl - 2;
                 	}
                 }
-            }
+				//llglMin =new BigDecimal(llglMin).divide(new BigDecimal(1000), decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+
+			}
             catch(Exception e){
                 System.out.printf(e.getMessage());
             }
@@ -326,27 +349,31 @@ public class IndexService extends SocketToolService{
                 }else{
                 	llglMax = llgl + 2;
                 }
+
+
+//				llglMax =new BigDecimal(llglMax).divide(new BigDecimal(1000), decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
             }
             catch(Exception e){
                 System.out.printf(e.getMessage());
             }
 
+
                       
             pointDataMap.put("pjfs",pjfs);
-            pointDataMap.put("pjfsMin",StringUtils.round(pjfsMin,2));
-            pointDataMap.put("pjfsMax",StringUtils.round(pjfsMax,2));
+            pointDataMap.put("pjfsMin",pjfsMin);
+            pointDataMap.put("pjfsMax",pjfsMax);
             pointDataMap.put("ycfs",ycfs);
-            pointDataMap.put("ycfsMin",StringUtils.round(ycfsMin,2));
-            pointDataMap.put("ycfsMax",StringUtils.round(ycfsMax,2));
+            pointDataMap.put("ycfsMin",ycfsMin);
+            pointDataMap.put("ycfsMax",ycfsMax);
             pointDataMap.put("sjgl",sjgl);
-            pointDataMap.put("sjglMin",StringUtils.round(sjglMin,2));
-            pointDataMap.put("sjglMax",StringUtils.round(sjglMax,2));
+            pointDataMap.put("sjglMin",sjglMin);
+            pointDataMap.put("sjglMax",sjglMax);
             pointDataMap.put("llgl",llgl);
-            pointDataMap.put("llglMin",StringUtils.round(llglMin,2));
-            pointDataMap.put("llglMax",StringUtils.round(llglMax,2));
+            pointDataMap.put("llglMin",llglMin);
+            pointDataMap.put("llglMax",llglMax);
             windpowerstationpointDataMap.put(windpowerstation.getId(),pointDataMap);
         }
-        this.pushToWeb("pageNumber_6","functionNumber_2",windpowerstationpointDataMap, Messagetype.MESSAGE);
+        this.pushToWeb("pageNumber_6","functionNumber_2","all",windpowerstationpointDataMap, Messagetype.MESSAGE);
 	}
 	
 	public void index_windturbine_status() throws Exception{
@@ -359,7 +386,7 @@ public class IndexService 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();
@@ -370,12 +397,13 @@ public class IndexService extends SocketToolService{
 	            double wh = 0;
 	            double lx = 0;
 
-	            try {
-	                //待机
+	            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());
+	                //System.out.println(e.getMessage());
 	            }
 
 	            try {
@@ -383,16 +411,16 @@ public class IndexService extends SocketToolService{
 	                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());
+	                //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());
+	                //System.out.println(e.getMessage());
 	            }
 	            
 	            try{
@@ -400,7 +428,7 @@ public class IndexService extends SocketToolService{
 	                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());
+	                //System.out.println(e.getMessage());
 	            }
 	            
 	            try{
@@ -408,7 +436,7 @@ public class IndexService extends SocketToolService{
 	                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());
+	                //System.out.println(e.getMessage());
 	            }
 
 	            
@@ -425,7 +453,7 @@ public class IndexService extends SocketToolService{
 	                }
 
 	            }catch (Exception e){
-	                System.out.println(e.getMessage());
+	                //System.out.println(e.getMessage());
 	            }
 	            pointDataMap.put("jr",jr);
 	            pointDataMap.put("dj",dj);
@@ -435,181 +463,185 @@ public class IndexService extends SocketToolService{
 	            pointDataMap.put("lx",lx);
 	            windpowerstationpointDataMap.put(windpowerstation.getId(),pointDataMap);
 	        }
-       this.pushToWeb("pageNumber_6","functionNumber_3",windpowerstationpointDataMap, Messagetype.MESSAGE);
+       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();
-
-
-	        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",windpowerstationpointDataMap, Messagetype.MESSAGE);
+		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();
-
-
-       for(Windpowerstation windpowerstation:wpls){
-           Map<String,Object> pointDataMap = new HashMap();
-           double mttr = 99;
-           double mtbf = 99;
-           double jybm = 99;
-           double jpeyhl = 99;
-           double ylyxs = 99;
-           double nlyxs = 99;
-           double jyys = 99;
-           double zhcydl = 99;
-           double sbklyl = 99;
-           double jpeyht = 99;
-           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();
-           }
-           //mttr
-           mttr = jybm + 10;
-
-           //mtbf
-           mtbf = jpeyht + 12;
-
-           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();
-//               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)).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)).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",windpowerstationpointDataMap, Messagetype.MESSAGE);
+		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 = 99;
+			double mtbf = 99;
+			double jybm = 99;
+			double jpeyhl = 99;
+			double ylyxs = 99;
+			double nlyxs = 99;
+			double jyys = 99;
+			double zhcydl = 99;
+			double sbklyl = 99;
+			double jpeyht = 99;
+			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();
+			}
+			//mttr
+			mttr = jybm + 10;
+
+			//mtbf
+			mtbf = jpeyht + 12;
+
+			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);
 	}
 
+
 }

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

@@ -1,15 +1,23 @@
 package com.gyee.frame.service.app.targetdetail;
 
+import com.gyee.frame.model.auto.Weatherfd;
+import com.gyee.frame.model.auto.Windpowerinfoday;
 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.WeatherfdService;
+import com.gyee.frame.service.WindpowerinfodayService;
 import com.gyee.frame.util.DateUtils;
-import com.gyee.frame.util.golden.EdosUtil;
-import com.gyee.frame.util.golden.IEdosUtil;
+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;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -22,11 +30,14 @@ import java.util.*;
 @Service
 public class TargetdetailService extends SocketToolService {
 
-    IEdosUtil mongodb = new EdosUtil();
+    @Resource
+    private WeatherfdService  weatherfdService;
+    @Resource
+    private WindpowerinfodayService windpowerinfodayService;
     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();
     }
@@ -36,12 +47,100 @@ public class TargetdetailService extends SocketToolService {
         Map<String,Double> pointDataMap = new HashMap();
         while(it.hasNext()){
             String ip = it.next();
-            PointData real=mongodb.getRealData(targetdetail_target_pointMap.get(ip));
-            double pointValueInDouble =this.decimal(2,real.getPointValueInDouble()) ;
-            pointDataMap.put(ip,pointValueInDouble);
+            String pointid=targetdetail_target_pointMap.get(ip);
+            if(pointid.indexOf("ora_")!=-1)
+            {
+                pointid=pointid.substring(4);
+                String []temp=pointid.split("_");
+                if(temp.length==2)
+                {
+                    String id=temp[0];
+                    String wpid=temp[1];
+
+                    switch (id) {
+                        case "ycfs":
+                            if(wpid.equals("0"))
+                            {
+                                wpid="MHS_FDC";
+                            }
+                            List<Weatherfd> list=weatherfdService.listDay(wpid);
+                            if(!list.isEmpty())
+                            {
+                                Weatherfd wd=list.get(0);
+                                double value =wd.getSpeed1();
+                                pointDataMap.put(ip, StringUtils.round(value,2));
+                            }else
+                            {
+                                pointDataMap.put(ip, 0.0);
+                            }
+                            break;
+                        case "ylyxs":
+
+                            List<Windpowerinfoday> wdls=windpowerinfodayService.listByDate(wpid);
+                            if(!wdls.isEmpty())
+                            {
+                                Windpowerinfoday wd=wdls.get(0);
+                                double value =wd.getMonthlyxs();
+                                pointDataMap.put(ip, StringUtils.round(value,2));
+                            }else
+                            {
+                                pointDataMap.put(ip, 0.0);
+                            }
+                            break;
+                        case "nlyxs":
+
+                            List<Windpowerinfoday> wdls2=windpowerinfodayService.listByDate(wpid);
+                            if(!wdls2.isEmpty())
+                            {
+                                Windpowerinfoday wd=wdls2.get(0);
+                                double value =wd.getYearlyxs();
+                                pointDataMap.put(ip, StringUtils.round(value,2));
+                            }else
+                            {
+                                pointDataMap.put(ip, 0.0);
+                            }
+                            break;
+                        case "zhcydl":
+
+                            List<Windpowerinfoday> wdls3=windpowerinfodayService.listByDate(wpid);
+                            if(!wdls3.isEmpty())
+                            {
+                                Windpowerinfoday wd=wdls3.get(0);
+                                double value =wd.getMonthzhcydl();
+                                pointDataMap.put(ip, StringUtils.round(value,2));
+                            }else
+                            {
+                                pointDataMap.put(ip, 0.0);
+                            }
+                            break;
+                        case "sbklyl":
+
+                            List<Windpowerinfoday> wdls4=windpowerinfodayService.listByDate(wpid);
+                            if(!wdls4.isEmpty())
+                            {
+                                Windpowerinfoday wd=wdls4.get(0);
+                                double value =wd.getMonthsbklyl();
+                                pointDataMap.put(ip, StringUtils.round(value,2));
+                            }else
+                            {
+                                pointDataMap.put(ip, 0.0);
+                            }
+                            break;
+                        default:
+                            break;
+                    }
+                }
+
+            }else
+            {
+                PointData real=mongodb.getRealData(targetdetail_target_pointMap.get(ip));
+                double pointValueInDouble =this.decimal(2,real.getPointValueInDouble()) ;
+                pointDataMap.put(ip,pointValueInDouble);
+            }
+
         }
 
-        this.pushToWeb("pageNumber_8","functionNumber_1",pointDataMap, Messagetype.MESSAGE);
+        this.pushToWeb("pageNumber_8","functionNumber_1","all",pointDataMap, Messagetype.MESSAGE);
     }
 
     public void targetdetail_curve() throws Exception {
@@ -55,29 +154,49 @@ public class TargetdetailService extends SocketToolService {
             Date endTime = sdf.parse(sdf.format(nowTime));
             SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
             Date beginTime = sdf1.parse(sdf1.format(nowTime));
-            Long count = (endTime.getTime() - beginTime.getTime()) / 1000L / 3600L;
-            List<PointData> ls = mongodb.getHistoryDatasSnap(targetdetail_curve_pointMap.get(ip),
-                    beginTime.getTime() / 1000, endTime.getTime() / 1000 + 3600L,
-                    (long) count+1, 3600L);
-            for (int i = 0; i < ls.size(); i++) {
-                ls.get(i).setPointTime(ls.get(i).getPointTime() - 3600);
-                ls.get(i).setPointValueInDouble(this.decimal(2,ls.get(i).getPointValueInDouble()));
-            }
-            if(ls.size()>0) {
-                ls.remove(0);
+
+            String pointid=targetdetail_curve_pointMap.get(ip);
+            if(pointid.indexOf("ora_")!=-1)
+            {
+                pointid=pointid.substring(4);
+                String []temp=pointid.split("_");
+                if(temp.length==2)
+                {
+                    String id=temp[0];
+                    String wpid=temp[1];
+
+                    set7DayValues(pointDataMap, ip, id, wpid);
+                }
+
+            }else
+            {
+                Long count = (endTime.getTime() - beginTime.getTime()) / 1000L / 3600L;
+                List<PointData> ls = mongodb.getHistoryDatasSnap(pointid,
+                        beginTime.getTime() / 1000, endTime.getTime() / 1000 + 3600L,
+                        (long) count+1, 3600L);
+                for (int i = 0; i < ls.size(); i++) {
+                    ls.get(i).setPointTime(ls.get(i).getPointTime() - 3600);
+                    ls.get(i).setPointValueInDouble(this.decimal(2,ls.get(i).getPointValueInDouble()));
+                }
+                if(ls.size()>0) {
+                    ls.remove(0);
+                }
+                pointDataMap.put(ip,ls);
             }
-            pointDataMap.put(ip,ls);
+
         }
 /*        if (!ls.isEmpty()) {
-            ls.forEach(obj -> System.out.println(obj.getEdnaId() + "___" +obj.getPointTime() + "___" + obj.getPointValueInDouble()));
+            ls.forEach(obj -> //System.out.println(obj.getEdnaId() + "___" +obj.getPointTime() + "___" + obj.getPointValueInDouble()));
         }
         for(PointData obj:ls){
-            System.out.println(obj.getEdnaId() + "___" +obj.getPointTime() + "___" + obj.getPointValueInDouble());
+            //System.out.println(obj.getEdnaId() + "___" +obj.getPointTime() + "___" + obj.getPointValueInDouble());
         }*/
-        this.pushToWeb("pageNumber_8","functionNumber_2",pointDataMap, Messagetype.MESSAGE);
+        this.pushToWeb("pageNumber_8","functionNumber_2","all",pointDataMap, Messagetype.MESSAGE);
     }
 
     public void targetdetail_histogram() throws Exception {
+
+
         Set set = targetdetail_histogram_pointMap.keySet();
         Iterator<String>  it =  set.iterator();
         Map<String,List<PointData>> pointDataMap = new HashMap();
@@ -87,24 +206,133 @@ public class TargetdetailService extends SocketToolService {
             SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
             Date endTime = sdf1.parse(sdf1.format(nowTime));
             Date beginTime = DateUtils.addDays(endTime, -7);
-//查看历史快照数据
-            List<PointData> ls = mongodb.getHistoryDatasSnap(targetdetail_histogram_pointMap.get(ip),
-                    beginTime.getTime() / 1000, endTime.getTime() / 1000 + 3600L*24,
-                    8L, 3600 * 24L);
-            for (int i = 0; i < ls.size(); i++) {
-                ls.get(i).setPointTime(ls.get(i).getPointTime() - 24 * 3600);
-                ls.get(i).setPointValueInDouble(this.decimal(2,ls.get(i).getPointValueInDouble()));
-            }
-            if(ls.size()>0) {
-                ls.remove(0);
+
+            String pointid=targetdetail_histogram_pointMap.get(ip);
+            if(pointid.indexOf("ora_")!=-1)
+            {
+                pointid=pointid.substring(4);
+                String []temp=pointid.split("_");
+                if(temp.length==2)
+                {
+                    String id=temp[0];
+                    String wpid=temp[1];
+
+                    set7DayValues(pointDataMap, ip, id, wpid);
+                }
+
+            }else
+            {
+                List<PointData> ls = mongodb.getHistoryDatasSnap(pointid,
+                        beginTime.getTime() / 1000, endTime.getTime() / 1000 + 3600L*24,
+                        8L, 3600 * 24L);
+                for (int i = 0; i < ls.size(); i++) {
+                    ls.get(i).setPointTime(ls.get(i).getPointTime() - 24 * 3600);
+                    ls.get(i).setPointValueInDouble(this.decimal(2,ls.get(i).getPointValueInDouble()));
+                }
+                if(ls.size()>0) {
+                    ls.remove(0);
+                }
+                pointDataMap.put(ip,ls);
             }
-            pointDataMap.put(ip,ls);
+
         }
 
         /*if (!ls.isEmpty()) {
-            ls.forEach(obj -> System.out.println(obj.getEdnaId() + "___" +obj.getPointTime() + "___" + obj.getPointValueInDouble()));
+            ls.forEach(obj -> //System.out.println(obj.getEdnaId() + "___" +obj.getPointTime() + "___" + obj.getPointValueInDouble()));
         }*/
-        this.pushToWeb("pageNumber_8","functionNumber_3",pointDataMap, Messagetype.MESSAGE);
+        this.pushToWeb("pageNumber_8","functionNumber_3","all",pointDataMap, Messagetype.MESSAGE);
+    }
+
+    private void set7DayValues(Map<String, List<PointData>> pointDataMap, String ip, String id, String wpid) throws ParseException {
+        switch (id) {
+            case "ycfs":
+                if(wpid.equals("0"))
+                {
+                    wpid="MHS_FDC";
+                }
+                List<Weatherfd> list=weatherfdService.list7Day(wpid);
+                List<PointData> vos=new ArrayList<>();
+                if(!list.isEmpty())
+                {
+                    for (Weatherfd fd:list)
+                    {
+                        PointData vo=new PointData();
+                        vo.setPointTime(fd.getRecodedata().getTime());
+                        vo.setPointValueInDouble(fd.getSpeed1());
+                        vos.add(vo);
+                    }
+
+                }
+                pointDataMap.put(ip, vos);
+                break;
+            case "ylyxs":
+                List<Windpowerinfoday> wdls=windpowerinfodayService.listBy7Date(wpid);;
+                List<PointData> vos1=new ArrayList<>();
+                if(!wdls.isEmpty())
+                {
+                    for (Windpowerinfoday fd:wdls)
+                    {
+                        PointData vo=new PointData();
+                        vo.setPointTime(fd.getRecorddate().getTime());
+                        vo.setPointValueInDouble(fd.getMonthlyxs());
+                        vos1.add(vo);
+                    }
+
+                }
+                pointDataMap.put(ip, vos1);
+                break;
+            case "nlyxs":
+                List<Windpowerinfoday> wdls2=windpowerinfodayService.listBy7Date(wpid);;
+                List<PointData> vos2=new ArrayList<>();
+                if(!wdls2.isEmpty())
+                {
+                    for (Windpowerinfoday fd:wdls2)
+                    {
+                        PointData vo=new PointData();
+                        vo.setPointTime(fd.getRecorddate().getTime());
+                        vo.setPointValueInDouble(fd.getYearlyxs());
+                        vos2.add(vo);
+                    }
+
+                }
+                pointDataMap.put(ip, vos2);
+                break;
+            case "zhcydl":
+                List<Windpowerinfoday> wdls3=windpowerinfodayService.listBy7Date(wpid);;
+                List<PointData> vos3=new ArrayList<>();
+                if(!wdls3.isEmpty())
+                {
+                    for (Windpowerinfoday fd:wdls3)
+                    {
+                        PointData vo=new PointData();
+                        vo.setPointTime(fd.getRecorddate().getTime());
+                        vo.setPointValueInDouble(fd.getMonthzhcydl());
+                        vos3.add(vo);
+                    }
+
+                }
+                pointDataMap.put(ip, vos3);
+                break;
+            case "sbklyl":
+                List<Windpowerinfoday> wdls4=windpowerinfodayService.listBy7Date(wpid);;
+                List<PointData> vos4=new ArrayList<>();
+                if(!wdls4.isEmpty())
+                {
+                    for (Windpowerinfoday fd:wdls4)
+                    {
+                        PointData vo=new PointData();
+                        vo.setPointTime(fd.getRecorddate().getTime());
+                        vo.setPointValueInDouble(fd.getMonthsbklyl());
+                        vos4.add(vo);
+                    }
+
+                }
+                pointDataMap.put(ip, vos4);
+                break;
+
+            default:
+                break;
+        }
     }
 
 

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

@@ -9,10 +9,9 @@ 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.service.app.index.FocastpowerService;
+import com.gyee.frame.util.IRealTimeDataBaseUtil;
+import com.gyee.frame.util.RealTimeDataBaseFactory;
 import com.gyee.frame.util.StringUtils;
-import com.gyee.frame.util.golden.EdosUtil;
-import com.gyee.frame.util.golden.IEdosUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -30,15 +29,13 @@ import java.util.*;
 @Service
 public class WindpowerstationdetailService extends SocketToolService {
 
-    IEdosUtil mongodb = new EdosUtil();
     //public static Map<String,String> comprehensive_target_pointMap = new HashMap<>();
     @Autowired
     private InitialRunner initialRunner;
-    private static int decimal_digit = 2;
+    private static int decimal_digit = 0;
     @Resource
     private WindpowerinfodayService windpowerinfodayService;
-    @Resource
-    private FocastpowerService focastpowerService;
+
     public void windpowerstationdetail_comprehensive_target() throws Exception {
 
         Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = InitialRunner.stationPointmap;
@@ -50,6 +47,7 @@ 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();
@@ -61,10 +59,10 @@ public class WindpowerstationdetailService extends SocketToolService {
 
             try {
                 //日发电量
-                PointData rfdl_real = mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_RFDL).getCode());
+                PointData 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());
+                //System.out.println(e.getMessage());
             }
 
             try {
@@ -72,7 +70,7 @@ public class WindpowerstationdetailService extends SocketToolService {
                 PointData aqts_real = mongodb.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());
+                //System.out.println(e.getMessage());
             }
 
 
@@ -81,11 +79,23 @@ public class WindpowerstationdetailService extends SocketToolService {
                 PointData 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());
+                //System.out.println(e.getMessage());
             }
 
             //预测发电量
-            ycfdl=focastpowerService.focastpower(windpowerstation.getId());
+            try{
+                if(windpowerstation.getId().equalsIgnoreCase("0")){
+                    List<Windpowerstation> wps = InitialRunner.wpls;
+                    for(Windpowerstation windpowerstationinner:wps){
+                        ycfdl = ycfdl + 12;
+                    }
+                }else{
+                    ycfdl = 6;
+                }
+            }
+            catch(Exception e){
+                System.out.printf(e.getMessage());
+            }
 
             //装机容量
             try{
@@ -99,7 +109,7 @@ public class WindpowerstationdetailService extends SocketToolService {
                 }
 
             }catch (Exception e){
-                System.out.println(e.getMessage());
+                //System.out.println(e.getMessage());
             }
             pointDataMap.put("rfdl",rfdl);
             pointDataMap.put("aqts",aqts);
@@ -110,7 +120,7 @@ public class WindpowerstationdetailService extends SocketToolService {
         }
 
 
-        this.pushToWeb("pageNumber_7","functionNumber_1",windpowerstationpointDataMap, Messagetype.MESSAGE);
+        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;
@@ -122,6 +132,7 @@ 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();
@@ -135,16 +146,7 @@ public class WindpowerstationdetailService extends SocketToolService {
             double zhcydl = 99;
             double sbklyl = 99;
             double jpeyht = 99;
-            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();
-            }
 
             //mttr
             mttr = jybm + 10;
@@ -157,7 +159,7 @@ public class WindpowerstationdetailService extends SocketToolService {
                 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();
             }catch (Exception e){
-                System.out.println(e.getMessage());
+                //System.out.println(e.getMessage());
             }
 
 
@@ -166,7 +168,7 @@ public class WindpowerstationdetailService extends SocketToolService {
                 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();
             }catch (Exception e){
-                System.out.println(e.getMessage());
+                //System.out.println(e.getMessage());
             }
 
 
@@ -175,39 +177,32 @@ public class WindpowerstationdetailService extends SocketToolService {
                 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();
             }catch (Exception e){
-                System.out.println(e.getMessage());
+                //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();
+                ylyxs=wp.getMonthlyxs();
+                nlyxs=wp.getYearlyxs();
                 //综合场用电率
                 zhcydl=wp.getDayzhcydl();
                 //设备可利用率
                 sbklyl=wp.getDaysbklyl();
-//                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());
+                //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)).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)).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();
             }catch (Exception e){
-                System.out.println(e.getMessage());
+                //System.out.println(e.getMessage());
             }
 
 
@@ -223,7 +218,7 @@ public class WindpowerstationdetailService extends SocketToolService {
             pointDataMap.put("jpeyht",jpeyht);
             windpowerstationpointDataMap.put(windpowerstation.getId(),pointDataMap);
         }
-        this.pushToWeb("pageNumber_7","functionNumber_2",windpowerstationpointDataMap, Messagetype.MESSAGE);
+        this.pushToWeb("pageNumber_7","functionNumber_2","all",windpowerstationpointDataMap, Messagetype.MESSAGE);
     }
 
 /*    double  focastpower(String name){

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

@@ -8,8 +8,8 @@ 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.util.DateUtils;
-import com.gyee.frame.util.golden.EdosUtil;
-import com.gyee.frame.util.golden.IEdosUtil;
+import com.gyee.frame.util.IRealTimeDataBaseUtil;
+import com.gyee.frame.util.RealTimeDataBaseFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -28,7 +28,7 @@ public class Windspeedpowercurvedetail extends SocketToolService {
     @Autowired
     private InitialRunner initialRunner;
     private static int decimal_digit = 2;
-    IEdosUtil mongodb = new EdosUtil();
+    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();
@@ -37,8 +37,8 @@ public class Windspeedpowercurvedetail extends SocketToolService {
         Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = InitialRunner.stationPointmap;
         String fs = Constant.TPOINT_WP_SSFS;
         String gl = Constant.TPOINT_WP_SJGL;
-        String llgl = Constant.TPOINT_WP_ZZSGL;
-        String ycgl = Constant.TPOINT_WP_YCGL;
+        String llgl = Constant.TPOINT_WP_ZLLGL;
+        String ycgl = Constant.TPOINT_WP_ZZSGL;
         List<Windpowerstation> wpls = new ArrayList<>();
         for (Windpowerstation wp : InitialRunner.wpls) {
             wpls.add(wp);
@@ -48,7 +48,7 @@ public class Windspeedpowercurvedetail extends SocketToolService {
         wpls.add(windpowerstationAll);
         Map<String, Map<String,List<PointData>>> windpowerstationpointDataMap = new HashMap();
 
-        
+
         for (Windpowerstation windpowerstation : wpls) {
             Map<String,List<PointData>> map = new HashMap<>();
             windpowerstationpointDataMap.put(windpowerstation.getId(),map);
@@ -75,7 +75,7 @@ public class Windspeedpowercurvedetail extends SocketToolService {
                 }
                 map.put("fs",listPointData);
             } catch (Exception e) {
-                System.out.println(e.getMessage());
+                //System.out.println(e.getMessage());
             }
 
 
@@ -100,7 +100,7 @@ public class Windspeedpowercurvedetail extends SocketToolService {
                 }
                 map.put("gl",listPointData);
             } catch (Exception e) {
-                System.out.println(e.getMessage());
+                //System.out.println(e.getMessage());
             }
 
 
@@ -118,14 +118,14 @@ public class Windspeedpowercurvedetail extends SocketToolService {
                         (long) count+1, 3600L);
                 for (int i = 0; i < listPointData.size(); i++) {
                     listPointData.get(i).setPointTime(listPointData.get(i).getPointTime() - 3600);
-                    listPointData.get(i).setPointValueInDouble(this.decimal(2,listPointData.get(i).getPointValueInDouble()));
+                    listPointData.get(i).setPointValueInDouble(this.decimal(2,listPointData.get(i).getPointValueInDouble()/1000));
                 }
                 if(listPointData.size()>0) {
                     listPointData.remove(0);
                 }
                 map.put("llgl",listPointData);
             } catch (Exception e) {
-                System.out.println(e.getMessage());
+                //System.out.println(e.getMessage());
             }
 
 
@@ -143,17 +143,17 @@ public class Windspeedpowercurvedetail extends SocketToolService {
                         (long) count+1, 3600L);
                 for (int i = 0; i < listPointData.size(); i++) {
                     listPointData.get(i).setPointTime(listPointData.get(i).getPointTime() - 3600);
-                    listPointData.get(i).setPointValueInDouble(this.decimal(2,listPointData.get(i).getPointValueInDouble()));
+                    listPointData.get(i).setPointValueInDouble(this.decimal(2,listPointData.get(i).getPointValueInDouble()/1000));
                 }
                 if(listPointData.size()>0) {
                     listPointData.remove(0);
                 }
                 map.put("ycgl",listPointData);
             } catch (Exception e) {
-                System.out.println(e.getMessage());
+                //System.out.println(e.getMessage());
             }
         }
-        this.pushToWeb("pageNumber_7","functionNumber_4",windpowerstationpointDataMap, Messagetype.MESSAGE);
+        this.pushToWeb("pageNumber_7","functionNumber_4","all",windpowerstationpointDataMap, Messagetype.MESSAGE);
     }
     public <T> void windpowerstationdetail_sevendaycolumn_target() throws Exception {
         Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = InitialRunner.stationPointmap;
@@ -167,7 +167,7 @@ public class Windspeedpowercurvedetail extends SocketToolService {
         wpls.add(windpowerstationAll);
         Map<String, Map<String,List<PointData>>> windpowerstationpointDataMap = new HashMap();
 
-        IEdosUtil mongodb = new EdosUtil();
+        IRealTimeDataBaseUtil mongodb= RealTimeDataBaseFactory.createRealTimeDataBase();
         for (Windpowerstation windpowerstation : wpls) {
             Map<String,List<PointData>> map = new HashMap<>();
             windpowerstationpointDataMap.put(windpowerstation.getId(),map);
@@ -194,9 +194,9 @@ public class Windspeedpowercurvedetail extends SocketToolService {
                 }
                 map.put("rfdl",listPointData);
             } catch (Exception e) {
-                System.out.println(e.getMessage());
+                //System.out.println(e.getMessage());
             }
         }
-        this.pushToWeb("pageNumber_7","functionNumber_5",windpowerstationpointDataMap, Messagetype.MESSAGE);
+        this.pushToWeb("pageNumber_7","functionNumber_5","all",windpowerstationpointDataMap, Messagetype.MESSAGE);
     }
 }

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

@@ -2,32 +2,35 @@ 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.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.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.EdosUtil;
-import com.gyee.frame.util.golden.IEdosUtil;
-import com.gyee.frame.util.mongodb.IMongodbUtil;
-import com.gyee.frame.util.mongodb.MongodbUtilImpl;
 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.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class Windspeedpowermodule extends SocketToolService {
     @Autowired
     private InitialRunner initialRunner;
-    private static int decimal_digit = 2;
-    IEdosUtil mongodb = new EdosUtil();
+    private static int decimal_digit = 0;
+
+    @Resource
+    private WeatherfhService weatherfhService;
+
     public void index_windSpeed_power_target_detail() throws Exception{
         Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = InitialRunner.stationPointmap;
         List<Windpowerstation> wpls = new ArrayList<>();
@@ -37,234 +40,156 @@ public class Windspeedpowermodule extends SocketToolService {
         Windpowerstation windpowerstationAll = new Windpowerstation();
         windpowerstationAll.setId("0");
         wpls.add(windpowerstationAll);
-        Map<String,Map<String,Double>> windpowerstationpointDataMap = new HashMap();
+        Map<String,Map<String,Object>> windpowerstationpointDataMap = new HashMap();
+        IRealTimeDataBaseUtil mongodb= RealTimeDataBaseFactory.createRealTimeDataBase();
+
+        double ycfs=0;
+        double ycfsMax=0;
+        double ycfsMin=0;
+
+        double pjfs=0;
+        double pjfsMax=0;
+        double pjfsMin=0;
+
+        double sjgl=0;
+        double sjglMax=0;
+        double sjglMin=0;
+
+        double llgl=0;
+        double llglMax=0;
+        double llglMin=0;
 
 
         for(Windpowerstation windpowerstation:wpls){
-            Map<String,Double> pointDataMap = new HashMap();
-            double pjfs = 0;
-            double pjfsMin = 0;
-            double pjfsMax = 0;
-            double ycfs = 0;
-            double ycfsMin = 0;
-            double ycfsMax = 0;
-            double sjgl = 0;
-            double sjglMin = 0;
-            double sjglMax = 0;
-            double llgl = 0;
-            double llglMax = 0;
-            double llglMin = 0;
-
-            try {
-                //平均风速
-                PointData rfdl_real = mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_SSFS).getCode());
-                pjfs = new BigDecimal(rfdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-            }catch (Exception e){
-                System.out.println(e.getMessage());
-            }
 
-            //平均风速min
-            try{
-                if(windpowerstation.getId().equalsIgnoreCase("0")){
-                    List<Windpowerstation> wps = InitialRunner.wpls;
-                    for(Windpowerstation windpowerstationinner:wps){
-                        if(pjfs==0){
-                            pjfsMin=pjfs;
-                        }else{
-                            pjfsMin = pjfs - 2;
-                        }
-                    }
-                }else{
-                    if(pjfs==0){
-                        pjfsMin=pjfs;
-                    }else{
-                        pjfsMin = pjfs - 2;
-                    }
-                }
-            }
-            catch(Exception e){
-                System.out.printf(e.getMessage());
-            }
+            Calendar cal=Calendar.getInstance();
 
-            //平均风速max
-            try{
-                if(windpowerstation.getId().equalsIgnoreCase("0")){
-                    List<Windpowerstation> wps = InitialRunner.wpls;
-                    for(Windpowerstation windpowerstationinner:wps){
-                        pjfsMax = pjfs + 2;
-                    }
-                }else{
-                    pjfsMax = pjfs + 2;
-                }
-            }
-            catch(Exception e){
-                System.out.printf(e.getMessage());
-            }
+            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();
 
-            //预测风速
-            try{
-                if(windpowerstation.getId().equalsIgnoreCase("0")){
-                    List<Windpowerstation> wps = InitialRunner.wpls;
-                    for(Windpowerstation windpowerstationinner:wps){
-                        ycfs = pjfs + 2;
-                    }
-                }else{
-                    ycfs = pjfs + 2;
-                }
-            }
-            catch(Exception e){
-                System.out.printf(e.getMessage());
-            }
 
-            //预测风速min
-            try{
-                if(windpowerstation.getId().equalsIgnoreCase("0")){
-                    List<Windpowerstation> wps = InitialRunner.wpls;
-                    for(Windpowerstation windpowerstationinner:wps){
-                        if(ycfs==0){
-                            ycfsMin = ycfs;
-                        }else{
-                            ycfsMin = ycfs - 2;
-                        }
-                    }
-                }else{
-                    if(ycfs==0){
-                        ycfsMin = ycfs;
-                    }else{
-                        ycfsMin = ycfs - 2;
-                    }
-                }
-            }
-            catch(Exception e){
-                System.out.printf(e.getMessage());
-            }
+        //风速****************************************************************
+            WindPowerStationTestingPoint2 pjfspoint=stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_PJFS);
+            List<PointData> pjfsls = mongodb.getHistoryDatasSnap(pjfspoint, beginDate.getTime() / 1000, endDate.getTime() / 1000, 24L, 3600L);
 
-            //预测风速max
-            try{
-                if(windpowerstation.getId().equalsIgnoreCase("0")){
-                    List<Windpowerstation> wps = InitialRunner.wpls;
-                    for(Windpowerstation windpowerstationinner:wps){
-                        ycfsMax = ycfs + 2;
-                    }
-                }else{
-                    ycfsMax = ycfs + 2;
-                }
-            }
-            catch(Exception e){
-                System.out.printf(e.getMessage());
-            }
+            if(!pjfsls.isEmpty())
+            {
+                pointDataMap.put("pjfs_real",pjfsls.get(0));
+                // 平均数
+                pjfs = pjfsls.stream().mapToDouble(PointData::getPointValueInDouble).average().getAsDouble();
+                pjfs= StringUtils.round(pjfs,2);
+                //System.out.println("average:" + pjfs);
 
-            try{
-                //实际功率
-                PointData swdl_real=mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_SJGL).getCode());
-                sjgl = new BigDecimal(swdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-            }catch (Exception e){
-                System.out.println(e.getMessage());
-            }
 
-            //实际功率min
-            try{
-                if(windpowerstation.getId().equalsIgnoreCase("0")){
-                    List<Windpowerstation> wps = InitialRunner.wpls;
-                    for(Windpowerstation windpowerstationinner:wps){
-                        if(sjgl==0){
-                            sjglMin = sjgl;
-                        }else{
-                            sjglMin = sjgl - 2;
-                        }
-                    }
-                }else{
-                    if(sjgl==0){
-                        sjglMin = sjgl;
-                    }else{
-                        sjglMin = sjgl - 2;
-                    }
-                }
-            }
-            catch(Exception e){
-                System.out.printf(e.getMessage());
-            }
+                // 最大值
+                pjfsMax = pjfsls.stream().mapToDouble(PointData::getPointValueInDouble).max().getAsDouble();
+                pjfsMax= StringUtils.round(pjfsMax,2);
+                //System.out.println("max:" + pjfsMax);
 
-            //实际功率max
-            try{
-                if(windpowerstation.getId().equalsIgnoreCase("0")){
-                    List<Windpowerstation> wps = InitialRunner.wpls;
-                    for(Windpowerstation windpowerstationinner:wps){
-                        sjglMax = sjgl + 2;
-                    }
-                }else{
-                    sjglMax = sjgl + 2;
-                }
-            }
-            catch(Exception e){
-                System.out.printf(e.getMessage());
+                // 最小值
+                pjfsMin = pjfsls.stream().mapToDouble(PointData::getPointValueInDouble).min().getAsDouble();
+                pjfsMin= StringUtils.round(pjfsMin,2);
+                //System.out.println("min:" + pjfsMin);
             }
 
-            try{
-                //理论功率
-                PointData llgl_real=mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_ZZSGL).getCode());
-                //llgl = new BigDecimal(swdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-                llgl =new BigDecimal(llgl_real.getPointValueInDouble()).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
-                double gfsjgl = mongodb.getRealData(stationPointmap.get("-2").get(Constant.TPOINT_WP_SJGL)).getPointValueInDouble();
-                llgl=StringUtils.round(llgl+gfsjgl,2);
-            }catch (Exception e){
-                System.out.println(e.getMessage());
-            }
 
-            //理论功率min
-            try{
-                if(windpowerstation.getId().equalsIgnoreCase("0")){
-                    List<Windpowerstation> wps = InitialRunner.wpls;
-                    for(Windpowerstation windpowerstationinner:wps){
-                        if(llgl==0){
-                            llglMin = llgl;
-                        }else{
-                            llglMin = llgl - 2;
-                        }
-                    }
-                }else{
-                    if(llgl==0){
-                        llglMin = llgl;
-                    }else{
-                        llglMin = llgl - 2;
-                    }
-                }
-            }
-            catch(Exception e){
-                System.out.printf(e.getMessage());
+            //预测风速****************************************************************
+            List<Weatherfh> list=weatherfhService.listDayHour(windpowerstation.getId());
+
+            if(!list.isEmpty())
+            {
+                // 平均数
+                ycfs = list.stream().mapToDouble(Weatherfh::getSpeed).average().getAsDouble();
+                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);
+
             }
 
-            //理论功率max
-            try{
-                if(windpowerstation.getId().equalsIgnoreCase("0")){
-                    List<Windpowerstation> wps = InitialRunner.wpls;
-                    for(Windpowerstation windpowerstationinner:wps){
-                        llglMax = llgl + 2;
-                    }
-                }else{
-                    llglMax = llgl + 2;
-                }
+            //实际风功****************************************************************
+
+            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= 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);
             }
-            catch(Exception e){
-                System.out.printf(e.getMessage());
+
+
+
+            //理论功率****************************************************************
+
+            WindPowerStationTestingPoint2 llglpoint=stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_ZLLGL);
+            List<PointData>  llglls = mongodb.getHistoryDatasSnap(llglpoint, beginDate.getTime() / 1000, endDate.getTime() / 1000, 24L, 3600L);
+
+
+            if(!llglls.isEmpty())
+            {
+                pointDataMap.put("llgl_real",llglls.get(0));
+                // 平均数
+                llgl = sjglls.stream().mapToDouble(PointData::getPointValueInDouble).average().getAsDouble();
+                llgl= StringUtils.round(llgl,2);
+                //System.out.println("average:" + llgl);
+
+
+                // 最大值
+                llglMax = sjglls.stream().mapToDouble(PointData::getPointValueInDouble).max().getAsDouble();
+                llglMax= StringUtils.round(llglMax,2);
+                //System.out.println("max:" + llglMax);
+
+                // 最小值
+                llglMin = sjglls.stream().mapToDouble(PointData::getPointValueInDouble).min().getAsDouble();
+                llglMin= StringUtils.round(llglMin,2);
+                //System.out.println("min:" + llglMin);
             }
 
 
 
             pointDataMap.put("pjfs",pjfs);
-            pointDataMap.put("pjfsMin", StringUtils.round(pjfsMin,2));
-            pointDataMap.put("pjfsMax",StringUtils.round(pjfsMax,2));
+            pointDataMap.put("pjfsMin",pjfsMin);
+            pointDataMap.put("pjfsMax",pjfsMax);
             pointDataMap.put("ycfs",ycfs);
-            pointDataMap.put("ycfsMin",StringUtils.round(ycfsMin,2));
-            pointDataMap.put("ycfsMax",StringUtils.round(ycfsMax,2));
+            pointDataMap.put("ycfsMin",ycfsMin);
+            pointDataMap.put("ycfsMax",ycfsMax);
             pointDataMap.put("sjgl",sjgl);
-            pointDataMap.put("sjglMin",StringUtils.round(sjglMin,2));
-            pointDataMap.put("sjglMax",StringUtils.round(sjglMax,2));
+            pointDataMap.put("sjglMin",sjglMin);
+            pointDataMap.put("sjglMax",sjglMax);
             pointDataMap.put("llgl",llgl);
-            pointDataMap.put("llglMin",StringUtils.round(llglMin,2));
-            pointDataMap.put("llglMax",StringUtils.round(llglMax,2));
+            pointDataMap.put("llglMin",llglMin);
+            pointDataMap.put("llglMax",llglMax);
             windpowerstationpointDataMap.put(windpowerstation.getId(),pointDataMap);
         }
-        this.pushToWeb("pageNumber_7","functionNumber_3",windpowerstationpointDataMap, Messagetype.MESSAGE);
+        this.pushToWeb("pageNumber_7","functionNumber_3","all",windpowerstationpointDataMap, Messagetype.MESSAGE);
     }
 }

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

@@ -96,15 +96,15 @@ public class WfinstanceServiceImpl extends ServiceImpl<WfinstanceMapper, Wfinsta
                 case "开始":
                     obj = new FlowStep("节点：" + nodeMap.get(wftrans.get(i).getNodeid()),
                             "人员：" + laborMap.get(wfinstance.getStartor().toLowerCase()),
-                            "日期：" + DateUtils.format(wftrans.get(i).getTransdate().toString(), DateUtils.DATE_TIME_PATTERN));
+                            "日期：" + DateUtils.format(wftrans.get(i).getTransdate(), DateUtils.DATE_TIME_PATTERN));
                     break;
                 case "任务":
                     obj = new FlowStep("节点：" + nodeMap.get(wftrans.get(i).getNodeid()),
                             "人员：" + laborMap.get(wftrans.get(i).getAssigncode().toLowerCase()),
-                            "日期：" + DateUtils.format(wftrans.get(i).getTransdate().toString(), DateUtils.DATE_TIME_PATTERN));
+                            "日期：" + DateUtils.format(wftrans.get(i).getTransdate(), DateUtils.DATE_TIME_PATTERN));
                     break;
                 case "等待":
-                    obj = new FlowStep("等待节点","日期：" + DateUtils.format(wftrans.get(i).getTransdate().toString(), DateUtils.DATE_TIME_PATTERN));
+                    obj = new FlowStep("等待节点","日期：" + DateUtils.format(wftrans.get(i).getTransdate(), DateUtils.DATE_TIME_PATTERN));
                     break;
                 case "结束":
                     obj = new FlowStep("节点：" + nodeMap.get(wftrans.get(i).getNodeid()));

src/main/java/com/gyee/frame/shiro/service/ExtendRolesAuthorizationFilter.java

@@ -17,7 +17,7 @@ public class ExtendRolesAuthorizationFilter  extends RolesAuthorizationFilter{
     
     public boolean isAccessAllowed(HttpServletRequest request, HttpServletResponse response, Object mappedValue) throws IOException {
 //        
-//        System.out.println(ExtendRolesAuthorizationFilter.class.toString());
+//        //System.out.println(ExtendRolesAuthorizationFilter.class.toString());
 //        Subject subject = getSubject(request, response);
 //        String[] rolesArray = (String[]) mappedValue;
 //