项目联调

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/quartz/AbstractQuartzJob.java

@@ -61,7 +61,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());
     }
 

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

@@ -304,9 +304,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,7 +59,7 @@ public class SocketTaskUtil {
         }
         this.deleteJob(sysQuartzJob1);//符合标准步骤删除-创建-启动流程
         try {
-            System.out.println(sysQuartzJob1.getJobName());
+           // System.out.println(sysQuartzJob1.getJobName());
             sysQuartzJob1.setStatus(0);//开启任务
             quartzSchedulerUtil.createSchedule(sysQuartzJob1);
         } catch (SchedulerException e) {
@@ -82,6 +78,10 @@ public class SocketTaskUtil {
                 break;
             }
         }
-        this.deleteJob(sysQuartzJob1);
+        if(sysQuartzJob1!=null)
+        {
+            this.deleteJob(sysQuartzJob1);
+        }
+
     }
 }

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/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/netty/websocket/WebSocketServer.java

@@ -1,20 +1,22 @@
 package com.gyee.frame.netty.websocket;
 
+import cn.hutool.log.Log;
+import cn.hutool.log.LogFactory;
+import com.gyee.frame.common.quartz.SocketTaskUtil;
+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.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 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 +26,22 @@ 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 举例 页面名称_功能名称
+    //concurrent包的线程安全Set，功能名称与页面名称+对象编号（风场、项目、线路、风机）为key
+    private static Map<String,CopyOnWriteArraySet<WebSocketServer>> webSocketMapSet = new HashMap();
+    //功能名称与页面名称为key 举例 页面名称_功能名称>>WebSocketServer
     private static Map<String,WebSocketServer> webSocketMap = new HashMap();
+    //用来存储每个调度任务请求的数量
+    private static Map<String,Integer> funcationNunberMap = new HashMap();
+
+    public static Map<String, Set<String>> keyidMap = new HashMap();
+
 
     //与某个客户端的连接会话，需要通过它来给客户端发送数据
     private Session session;
@@ -45,36 +52,147 @@ 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;//功能编码
-        log.info("连接成功");
-        if(getOnlineCount()>=1){
-            this.restartJob((pageNumber+"_"+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对象
+
+        webSocketMap.put(pfkey,this);
+
+
+        //根据调度任务统计数量
+        if(funcationNunberMap.containsKey(jobkey))
+        {
+            Integer number=funcationNunberMap.get(jobkey);
+            number++;
+            funcationNunberMap.put(jobkey,number);
+        }else
+            {
+                funcationNunberMap.put(jobkey,1);
+            }
+
+        //页数和功能数组合+对象编号（风场、项目、线路、风机）作为KEY，保存对应的set集合
+        if(webSocketMapSet.containsKey(pfkey))
+        {
+            CopyOnWriteArraySet<WebSocketServer> set=webSocketMapSet.get(pfkey);
+            set.add(this);
+
+        }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
+        {
+            Set<String> set= new HashSet<String>();
+            set.add(keyid);
+            keyidMap.put(jobkey,set);
+        }
+
+        log.info("连接成功");
+
+
+
+//        if(funcationNunberMap.containsKey(jobkey))
+//        {
+//            Integer number=funcationNunberMap.get(jobkey);
+//            if(number==1){
+//                this.restartJob((jobkey));//重启任务
+//            }
+//        }
+
+        this.restartJob((jobkey));//重启任务
+
     }
 
     /**
      * 连接关闭调用的方法
      */
     @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);
+        }
         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 HashMap<>();
+            }
+        }
+
         if(getOnlineCount()==0){
-            this.deleteJob((pageNumber+"_"+functionNumber));//关闭任务
+            this.deleteJob((jobkey));//关闭任务
+            keyidMap=new HashMap<>();
         }
     }
 
@@ -86,13 +204,18 @@ public class WebSocketServer extends SocketTaskUtil {
     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();
+        if(webSocketMapSet.containsKey(pfkey))
+        {
+            CopyOnWriteArraySet<WebSocketServer> set=webSocketMapSet.get(pfkey);
+            for (WebSocketServer item : set) {
+                try {
+                    item.sendMessage(message);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
             }
         }
+
     }
 
 	/**
@@ -101,9 +224,51 @@ 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();
+
+        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);
+        }
+        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 HashMap<>();
+            }
+        }else  if(getOnlineCount()==0){
+            this.deleteJob((jobkey));//关闭任务
+            keyidMap=new HashMap<>();
+        }
     }
 	/**
 	 * 实现服务器主动推送
@@ -130,41 +295,60 @@ 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(webSocketMap.containsKey(pfkey))
+        {
+            WebSocketServer item =webSocketMap.get(pfkey);
+
+            //这里可以设定只推送给这个sid的，为null则全部推送
+            if(functionNumber==null||pageNumber==null) {
+                throw new BindException("请核对编码信息(包括页面编码以及功能编码非空)");
+            }else if(item.pageNumber.equals(pageNumber)&&item.functionNumber.equals(functionNumber)){
+                item.sendMessage(message);
             }
-        }*/
-    }
-    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 +376,8 @@ public class WebSocketServer extends SocketTaskUtil {
     public static synchronized void subOnlineCount() {
         WebSocketServer.onlineCount--;
     }
+
+
+
 }
 

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

@@ -64,7 +64,7 @@ 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();
 
@@ -81,7 +81,7 @@ abstract public class SocketToolService {
             }
             try {
                 //spring介入
-                webSocketServer.sendObject(message,pageNumber,functionNumber);//调用socketserver进行推送消息
+                webSocketServer.sendObject(message,pageNumber,functionNumber,keyid);//调用socketserver进行推送消息
             } catch (IOException | EncodeException e ) {
                 e.printStackTrace();
             }

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;
@@ -20,7 +8,18 @@ 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.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.Date;
+import java.util.List;
 
 /**
  *  WeatherfdService
@@ -32,7 +31,7 @@ import com.gyee.frame.util.SnowflakeIdWorker;
  **/
 @Service
 public class WeatherfdService extends SocketToolService implements BaseService<Weatherfd, WeatherfdExample>{
-	@Autowired
+	@Resource
 	private WeatherfdMapper weatherfdMapper;
 	
       	   	      	      	      	      	      	      	      	      	      	      	      	      	      	      	      	      	      	      	      	      	      	      	      	      	
@@ -89,7 +88,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 +112,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 +136,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 +160,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

@@ -81,7 +81,7 @@ public class WeatherfhService extends SocketToolService implements BaseService<W
 				testExample.createCriteria().andDateGreaterThanOrEqualTo(recodedate).andDateLessThanOrEqualTo(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);
 		}
 
 	@Override

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

@@ -75,7 +75,7 @@ public class WindpowerinfodayService extends SocketToolService implements BaseSe
 			WindpowerinfodayExample testExample=new WindpowerinfodayExample();
 			testExample.setOrderByClause("id ASC");
 			testExample.createCriteria().andForeignkeyidEqualTo(wpid).andRecorddateBetween(recodedatebegin,recodedateend);
-			System.out.println(testExample);
+			//System.out.println(testExample);
 
 			List<Windpowerinfoday> list= windpowerinfodayMapper.selectByExample(testExample);
 

src/main/java/com/gyee/frame/service/app/bracelet/BraceletService.java

@@ -1,7 +1,6 @@
 package com.gyee.frame.service.app.bracelet;
 
 import com.gyee.frame.model.auto.Shbraceletpoint;
-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.ShbraceletpointService;
@@ -73,7 +72,7 @@ public class BraceletService extends SocketToolService {
             shbraceletpointMapMapMapList.put(ip,deviceNameMap);
         }
 
-        this.pushToWeb("pageNumber_9", "functionNumber_1", shbraceletpointMapMapMapList, Messagetype.MESSAGE);
+        this.pushToWeb("pageNumber_9", "functionNumber_1","all", shbraceletpointMapMapMapList, Messagetype.MESSAGE);
     }
     private  Map<String,Map<String,List<Shbraceletpoint>>> injectionMap(List<Shbraceletpoint> shbraceletpointList ){
         Map<String,Map<String,List<Shbraceletpoint>>> deviceNameMap = new HashMap<>();/*设备名*/

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

@@ -36,7 +36,7 @@ public class IndexDetailService extends SocketToolService {
     private FocastpowerService focastpowerService;
 
     public void index_curve_columnar_windSpeed_power() throws Exception {
-        System.out.println("pppppp");
+        //System.out.println("pppppp");
         Map<String, List<DataVo>> pointDataMap = new HashMap();
 
         List<Windpowerstation> wpls = new ArrayList<>();
@@ -68,13 +68,20 @@ public class IndexDetailService extends SocketToolService {
             for (int i = 0; i < length; i++) {
                 DataVo vo = new DataVo();
 
+                vo.setTime(c.getTime().getTime());
                 vo.setValue1(0.0);// 预测功率
                 vo.setValue2(0.0);// 理论功率
                 vo.setValue3(0.0);// 实发功率
                 vo.setValue4(0.0);// 平均风速
+                c.add(Calendar.HOUR_OF_DAY, 1);
                 vos.add(vo);
             }
 
+            c.set(Calendar.HOUR_OF_DAY, 0);
+            c.set(Calendar.MINUTE, 0);
+            c.set(Calendar.SECOND, 0);
+            beginDate = c.getTime();
+
             Map<String, WindPowerstationTestingPoint> map = stationPointmap.get(windpowerstation.getId());
 
 
@@ -94,7 +101,7 @@ public class IndexDetailService extends SocketToolService {
 
                     for (int j = 0; j < datas.size(); j++) {
 
-                        vos.get(j).setTime(datas.get(j).getPointTime() * 1000);
+                        //vos.get(j).setTime(datas.get(j).getPointTime() * 1000);
                         vos.get(j).setValue1(StringUtils.round(datas.get(j).getPointValueInDouble(), 2));
                         if (j == datas.size() - 1) {
                             tempdate = new Date(datas.get(j).getPointTime() * 1000);
@@ -110,7 +117,7 @@ public class IndexDetailService extends SocketToolService {
                         }
                         for (int i = 0; i < subresult; i++) {
                             cal.add(Calendar.MINUTE, 30);
-                            vos.get(datas.size() + i).setTime(cal.getTime().getTime());
+                            //vos.get(datas.size() + i).setTime(cal.getTime().getTime());
                             WindPowerstationTestingPoint ycgl = map.get(ycPoints2[i]);
                             vos.get(datas.size() + i).setValue1(StringUtils.round(mongodb.getRealData(ycgl).getPointValueInDouble(), 2));
                         }
@@ -120,12 +127,12 @@ public class IndexDetailService extends SocketToolService {
                         if (subresult > 0)
                             for (int i = 0; i < subresult; i++) {
                                 cal.add(Calendar.MINUTE, 30);
-                                vos.get(total + i).setTime(cal.getTime().getTime());
-                                vos.get(total + i).setValue1(null);
+                              //  vos.get(total + i).setTime(cal.getTime().getTime());
+                              //  vos.get(total + i).setValue1(null);
                             }
                     }
                     for (int k = 0; k < vos.size(); k++) {
-                        vos.get(k).setValue7(48.0);
+                        vos.get(k).setValue7(24.0);
                     }
                 }
             } else {
@@ -151,7 +158,7 @@ public class IndexDetailService extends SocketToolService {
                             }
                             for (int j = 0; j < datas.size(); j++) {
 
-                                vos.get(j).setTime(datas.get(j).getPointTime() * 1000);
+                              //  vos.get(j).setTime(datas.get(j).getPointTime() * 1000);
                                 vos.get(j).setValue1(StringUtils.round(vos.get(j).getValue1() + datas.get(j).getPointValueInDouble(), 2));
                                 if (j == datas.size() - 1) {
                                     tempdate = new Date(datas.get(j).getPointTime() * 1000);
@@ -167,7 +174,7 @@ public class IndexDetailService extends SocketToolService {
                                 }
                                 for (int i = 0; i < subresult; i++) {
                                     cal.add(Calendar.MINUTE, 30);
-                                    vos.get(datas.size() + i).setTime(cal.getTime().getTime());
+                                  //  vos.get(datas.size() + i).setTime(cal.getTime().getTime());
                                     WindPowerstationTestingPoint ycgl = wpmap.get(ycPoints2[i]);
                                     vos.get(datas.size() + i).setValue1(StringUtils.round(vos.get(datas.size() + i).getValue1() + mongodb.getRealData(ycgl).getPointValueInDouble(), 2));
                                 }
@@ -177,8 +184,8 @@ public class IndexDetailService extends SocketToolService {
                                 if (subresult > 0)
                                     for (int i = 0; i < subresult; i++) {
                                         cal.add(Calendar.MINUTE, 30);
-                                        vos.get(total + i).setTime(cal.getTime().getTime());
-                                        vos.get(total + i).setValue1(null);
+                                    //    vos.get(total + i).setTime(cal.getTime().getTime());
+                                    //    vos.get(total + i).setValue1(null);
                                     }
                             }
 
@@ -204,6 +211,7 @@ public class IndexDetailService extends SocketToolService {
                         if (i < llglls.size() && StringUtils.isNotNull(llglls.get(i).getPointTime())) {
 
                             if (vos.get(i).getTime() <= new Date().getTime()) {
+                             //   vos.get(i).setTime(llglls.get(i).getPointTime() * 1000);
                                 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();
@@ -244,19 +252,21 @@ public class IndexDetailService extends SocketToolService {
                 double temp = 0;
                 for (int i = 0; i < vos.size(); i++) {
 
-                    if (i < sjglls.size() && StringUtils.isNotNull(sjglls.get(i).getPointTime())) {
+                   // vos.get(i).setTime(sjglls.get(i).getPointTime() * 1000);
+                    if (vos.get(i).getTime() <= new Date().getTime()) {
+
+                        if (i < sjglls.size() && StringUtils.isNotNull(sjglls.get(i).getPointTime())) {
 
-                        if (vos.get(i).getTime() <= new Date().getTime()) {
                             temp = sjglls.get(i).getPointValueInDouble();
                             if (Math.abs(temp) < 10000) {
                                 vos.get(i).setValue3(StringUtils.round(temp, 2));// 实际功率
                             }
 
-                            count++;
-                        } else {
-                            vos.get(i).setValue3(0d);// 实际功率
                         }
 
+                        count++;
+                    } else {
+                        vos.get(i).setValue3(0d);// 实际功率
                     }
                 }
                 for (int i = 0; i < vos.size(); i++) {
@@ -269,7 +279,7 @@ public class IndexDetailService extends SocketToolService {
 
                     double temp = 0;
                     for (int i = 0; i < vos.size(); i++) {
-
+                     //   vos.get(i).setTime(pjfsls.get(i).getPointTime() * 1000);
                         if (i < pjfsls.size() && StringUtils.isNotNull(pjfsls.get(i).getPointTime())) {
 
                             if (vos.get(i).getTime() <= new Date().getTime()) {
@@ -293,7 +303,7 @@ public class IndexDetailService extends SocketToolService {
 
         }
 
-        this.pushToWeb("pageNumber_6", "functionNumber_6", pointDataMap, Messagetype.MESSAGE);
+        this.pushToWeb("pageNumber_6", "functionNumber_6","all", pointDataMap, Messagetype.MESSAGE);
 
     }
 
@@ -486,13 +496,13 @@ 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");
+        //System.out.println("000");
         Map<String, Map<String, WindPowerstationTestingPoint>> stationPointmap = InitialRunner.stationPointmap;
         List<Windpowerstation> wpls = new ArrayList<>();
         for(Windpowerstation wp: InitialRunner.wpls){
@@ -555,7 +565,7 @@ 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

@@ -2,9 +2,9 @@ package com.gyee.frame.service.app.index;
 
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
+import com.gyee.frame.model.auto.WindPowerstationTestingPoint;
 import com.gyee.frame.model.auto.Windpowerinfoday;
 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;
@@ -15,7 +15,7 @@ import com.gyee.frame.util.RealTimeDataBaseFactory;
 import com.gyee.frame.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.gyee.frame.model.auto.WindPowerstationTestingPoint;
+
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -137,7 +137,7 @@ public class IndexService extends SocketToolService{
 				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.MESSAGE);
 	}
 	
 	
@@ -316,8 +316,11 @@ public class IndexService extends SocketToolService{
             try{
                 //理论功率
                 PointData swdl_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();
-            }catch (Exception e){
+                //llgl = new BigDecimal(swdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+
+				llgl =new BigDecimal(swdl_real.getPointValueInDouble()).divide(new BigDecimal(1000), decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+
+			}catch (Exception e){
                 System.out.println(e.getMessage());
             }
             
@@ -339,7 +342,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());
             }
@@ -354,6 +359,9 @@ 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());
@@ -374,7 +382,7 @@ public class IndexService extends SocketToolService{
             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{
@@ -464,7 +472,7 @@ 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{
@@ -513,7 +521,7 @@ public class IndexService extends SocketToolService{
 			pointDataMap.put("njhfdl",njhfdl);
 			windpowerstationpointDataMap.put(windpowerstation.getId(),pointDataMap);
 		}
-		this.pushToWeb("pageNumber_6","functionNumber_4",windpowerstationpointDataMap, Messagetype.MESSAGE);
+		this.pushToWeb("pageNumber_6","functionNumber_4","all",windpowerstationpointDataMap, Messagetype.MESSAGE);
 	}
 
 	public void index_target_basic_indicators() throws Exception{
@@ -639,7 +647,7 @@ public class IndexService extends SocketToolService{
 
 			windpowerstationpointDataMap.put(windpowerstation.getId(),pointDataMap);
 		}
-		this.pushToWeb("pageNumber_6","functionNumber_5",windpowerstationpointDataMap, Messagetype.MESSAGE);
+		this.pushToWeb("pageNumber_6","functionNumber_5","all",windpowerstationpointDataMap, Messagetype.MESSAGE);
 	}
 
 

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

@@ -40,7 +40,7 @@ public class TargetdetailService extends SocketToolService {
             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 {
@@ -73,7 +73,7 @@ public class TargetdetailService extends SocketToolService {
         for(PointData obj:ls){
             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 {
@@ -103,7 +103,7 @@ public class TargetdetailService extends SocketToolService {
         /*if (!ls.isEmpty()) {
             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);
     }
 
 

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

@@ -119,7 +119,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, WindPowerstationTestingPoint>> stationPointmap = InitialRunner.stationPointmap;
@@ -217,7 +217,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

@@ -153,7 +153,7 @@ public class Windspeedpowercurvedetail extends SocketToolService {
                 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, WindPowerstationTestingPoint>> stationPointmap = InitialRunner.stationPointmap;
@@ -197,6 +197,6 @@ public class Windspeedpowercurvedetail extends SocketToolService {
                 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

@@ -200,7 +200,9 @@ public class Windspeedpowermodule extends SocketToolService {
             try{
                 //理论功率
                 PointData swdl_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();
+              //  llgl = new BigDecimal(swdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+                llgl =new BigDecimal(swdl_real.getPointValueInDouble()).divide(new BigDecimal(1000), decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+
             }catch (Exception e){
                 System.out.println(e.getMessage());
             }
@@ -258,6 +260,6 @@ public class Windspeedpowermodule extends SocketToolService {
             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/util/AutoCode/AutoCodeUtil.java

@@ -1,27 +1,19 @@
 package com.gyee.frame.util.AutoCode;
 
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import org.apache.commons.lang.StringUtils;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
+import cn.hutool.core.date.DateTime;
 import com.gyee.frame.model.custom.TsysTables;
 import com.gyee.frame.model.custom.autocode.AutoCodeConfig;
 import com.gyee.frame.model.custom.autocode.BeanColumn;
 import com.gyee.frame.model.custom.autocode.GlobalConfig;
 import com.gyee.frame.service.SysUtilService;
 import com.gyee.frame.util.SnowflakeIdWorker;
-import cn.hutool.core.date.DateTime;
+import org.apache.commons.lang.StringUtils;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
+
+import java.io.*;
+import java.util.*;
 
 /**
  * 自动生成 通用类
@@ -99,13 +91,13 @@ public class AutoCodeUtil {
         				Template tpl = Velocity.getTemplate(template, "UTF-8" );
             			StringWriter sw = new StringWriter(); 
             			tpl.merge(context, sw);
-            			System.out.println(sw);
+            			//System.out.println(sw);
             			executeSQL(sysUtilService, sw.toString());
         			}else {//只输出
         				Template tpl = Velocity.getTemplate(template, "UTF-8" );
             			StringWriter sw = new StringWriter(); 
             			tpl.merge(context, sw);
-            			System.out.println(sw);
+            			//System.out.println(sw);
         			}
         			
         		}else {
@@ -190,7 +182,7 @@ public class AutoCodeUtil {
      */
     public static void executeSQL(SysUtilService sysUtilService,String sql) {
     	int list= sysUtilService.executeSQL(sql);
-    	System.out.println(list);
+    	//System.out.println(list);
     }
     
     /**

src/main/resources/application.yml

@@ -29,7 +29,7 @@ gyee:
   realtimedataBase: mongodb
 #tomcat websocket
 server :
-  port : 8082
+  port : 9988
   ##项目名字配置
   #servlet : 
   #  context-path : /demo