ws仪器通讯类,修改tomcat为112版本
This commit is contained in:
parent
b86082c27d
commit
f8d625ae33
@ -0,0 +1,12 @@
|
|||||||
|
package com.czlis.interfaceCommon.pojo.websocket;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class WSParam {
|
||||||
|
private String yq;
|
||||||
|
}
|
||||||
@ -0,0 +1,14 @@
|
|||||||
|
package com.czlis.interfaceCommon.pojo.websocket;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
import javax.websocket.Session;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class WebSocketParam {
|
||||||
|
private Session session;
|
||||||
|
private WSParam wsParam;
|
||||||
|
}
|
||||||
@ -0,0 +1,59 @@
|
|||||||
|
package com.czlis.interfaceCommon.websocket;
|
||||||
|
|
||||||
|
import cn.hutool.json.JSONObject;
|
||||||
|
import cn.hutool.json.JSONUtil;
|
||||||
|
import com.czlis.interfaceCommon.pojo.websocket.WSParam;
|
||||||
|
import com.czlis.interfaceCommon.pojo.websocket.WebSocketParam;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
import javax.websocket.OnMessage;
|
||||||
|
import javax.websocket.server.PathParam;
|
||||||
|
import javax.websocket.server.ServerEndpoint;
|
||||||
|
import java.util.Collection;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ws仪器通讯类
|
||||||
|
*/
|
||||||
|
@Component
|
||||||
|
@ServerEndpoint("/ws/instr/{sid}")
|
||||||
|
public class WebSocketInstrComm extends WebSocketServer {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 接收消息
|
||||||
|
* @param message 客户端发送过来的消息
|
||||||
|
* @param sid
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
@OnMessage
|
||||||
|
public void onMessage(String message,@PathParam("sid") String sid) {
|
||||||
|
super.onMessage(message, sid);
|
||||||
|
String yq = "";
|
||||||
|
try{
|
||||||
|
JSONObject jsonObject = JSONUtil.parseObj(message);
|
||||||
|
yq = jsonObject.getStr("yq");
|
||||||
|
}catch (Exception e){
|
||||||
|
|
||||||
|
}
|
||||||
|
sessionMap.put(sid,new WebSocketParam(sessionMap.get(sid).getSession(),new WSParam(yq)));
|
||||||
|
System.out.println(sessionMap);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 给指定的客户端发消息
|
||||||
|
* @param message
|
||||||
|
*/
|
||||||
|
public void sendToSingleClient(String message,String yq){
|
||||||
|
Collection<WebSocketParam> sessions = sessionMap.values();
|
||||||
|
for (WebSocketParam webSocketParam : sessions) {
|
||||||
|
String yq1 = webSocketParam.getWsParam().getYq();
|
||||||
|
try {
|
||||||
|
if(yq1.equals(yq)){
|
||||||
|
//服务器向客户端发送消息
|
||||||
|
webSocketParam.getSession().getBasicRemote().sendText(message);
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,27 +1,25 @@
|
|||||||
package com.czlis.interfaceCommon.websocket;
|
package com.czlis.interfaceCommon.websocket;
|
||||||
|
|
||||||
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
import com.czlis.interfaceCommon.pojo.websocket.WebSocketParam;
|
||||||
|
|
||||||
|
|
||||||
import javax.websocket.OnClose;
|
import javax.websocket.OnClose;
|
||||||
import javax.websocket.OnMessage;
|
import javax.websocket.OnMessage;
|
||||||
import javax.websocket.OnOpen;
|
import javax.websocket.OnOpen;
|
||||||
import javax.websocket.Session;
|
import javax.websocket.Session;
|
||||||
import javax.websocket.server.PathParam;
|
import javax.websocket.server.PathParam;
|
||||||
import javax.websocket.server.ServerEndpoint;
|
import java.util.*;
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* WebSocket服务
|
* WebSocket服务
|
||||||
*/
|
*/
|
||||||
@Component
|
|
||||||
@ServerEndpoint("/ws/{sid}")
|
|
||||||
public class WebSocketServer {
|
public class WebSocketServer {
|
||||||
|
|
||||||
//存放会话对象
|
//存放会话对象
|
||||||
private static Map<String, Session> sessionMap = new HashMap();
|
protected static Map<String, WebSocketParam> sessionMap = new HashMap();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 连接建立成功调用的方法
|
* 连接建立成功调用的方法
|
||||||
@ -29,7 +27,8 @@ public class WebSocketServer {
|
|||||||
@OnOpen
|
@OnOpen
|
||||||
public void onOpen(Session session, @PathParam("sid") String sid) {
|
public void onOpen(Session session, @PathParam("sid") String sid) {
|
||||||
System.out.println("客户端:" + sid + "建立连接");
|
System.out.println("客户端:" + sid + "建立连接");
|
||||||
sessionMap.put(sid, session);
|
session.setMaxTextMessageBufferSize(8192000);
|
||||||
|
sessionMap.put(sid,new WebSocketParam(session,null));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -54,16 +53,16 @@ public class WebSocketServer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 群发
|
* 给所有客户端群发
|
||||||
*
|
*
|
||||||
* @param message
|
* @param message
|
||||||
*/
|
*/
|
||||||
public void sendToAllClient(String message) {
|
public void sendToAllClient(String message) {
|
||||||
Collection<Session> sessions = sessionMap.values();
|
Collection<WebSocketParam> sessions = sessionMap.values();
|
||||||
for (Session session : sessions) {
|
for (WebSocketParam webSocketParam : sessions) {
|
||||||
try {
|
try {
|
||||||
//服务器向客户端发送消息
|
//服务器向客户端发送消息
|
||||||
session.getBasicRemote().sendText(message);
|
webSocketParam.getSession().getBasicRemote().sendText(message);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -113,6 +113,7 @@ public class SecurityConfig {
|
|||||||
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
|
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
|
||||||
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/printPDF/**","/graphs/**").permitAll()
|
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/printPDF/**","/graphs/**").permitAll()
|
||||||
.antMatchers("/doc.html").permitAll() //Knife4j 过滤
|
.antMatchers("/doc.html").permitAll() //Knife4j 过滤
|
||||||
|
.antMatchers("/ws/**").permitAll() //websocket过滤
|
||||||
// 除上面外的所有请求全部需要鉴权认证
|
// 除上面外的所有请求全部需要鉴权认证
|
||||||
.anyRequest().authenticated();
|
.anyRequest().authenticated();
|
||||||
})
|
})
|
||||||
|
|||||||
2
pom.xml
2
pom.xml
@ -47,7 +47,7 @@
|
|||||||
<itextpdf.version>7.2.5</itextpdf.version>
|
<itextpdf.version>7.2.5</itextpdf.version>
|
||||||
|
|
||||||
<!-- override dependency version -->
|
<!-- override dependency version -->
|
||||||
<tomcat.version>9.0.98</tomcat.version>
|
<tomcat.version>9.0.112</tomcat.version>
|
||||||
<logback.version>1.2.13</logback.version>
|
<logback.version>1.2.13</logback.version>
|
||||||
<spring-security.version>5.7.12</spring-security.version>
|
<spring-security.version>5.7.12</spring-security.version>
|
||||||
<spring-framework.version>5.3.39</spring-framework.version>
|
<spring-framework.version>5.3.39</spring-framework.version>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user