|
@@ -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;
|
|
|
|
|
@@ -72,21 +68,25 @@ abstract public class SocketToolService {
|
|
|
|
|
|
Integer messageNum = type.getMessageNum();
|
|
|
|
|
|
- if(messageNum==1){
|
|
|
- message = JSON.toJSONString(message);
|
|
|
- }else if(messageNum==2){
|
|
|
- message = JSON.parse(JSON.toJSONString(message));
|
|
|
- }else if(messageNum==3){
|
|
|
-
|
|
|
- }else if(messageNum==4){
|
|
|
- message = this.convertmessage(message);
|
|
|
- }
|
|
|
- try {
|
|
|
-
|
|
|
- webSocketServer.sendObject(message,pageNumber,functionNumber);
|
|
|
- } catch (IOException | EncodeException e ) {
|
|
|
- e.printStackTrace();
|
|
|
+ if(StringUtils.isNotNull(message))
|
|
|
+ {
|
|
|
+ if(messageNum==1){
|
|
|
+ message = JSON.toJSONString(message);
|
|
|
+ }else if(messageNum==2){
|
|
|
+ message = JSON.parse(JSON.toJSONString(message));
|
|
|
+ }else if(messageNum==3){
|
|
|
+
|
|
|
+ }else if(messageNum==4){
|
|
|
+ message = this.convertmessage(message);
|
|
|
+ }
|
|
|
+ try {
|
|
|
+
|
|
|
+ webSocketServer.sendObject(message,pageNumber,functionNumber);
|
|
|
+ } catch (IOException | EncodeException e ) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
|
|
|
public String convertmessage(Object message){
|