Merge remote-tracking branch 'origin/master'

lis-interfaceCommon/pom.xml

@@ -70,6 +70,12 @@
             <artifactId>pinyin4j</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+
+
     </dependencies>
 
 

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/config/WebSocketConfiguration.java

@@ -0,0 +1,19 @@
+package com.czlis.interfaceCommon.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+
+
+/**
+ * WebSocket配置类，用于注册WebSocket的Bean
+ */
+@Configuration
+public class WebSocketConfiguration {
+
+    @Bean
+    public ServerEndpointExporter serverEndpointExporter() {
+        return new ServerEndpointExporter();
+    }
+
+}

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/websocket/WSParam.java

@@ -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;
+}

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/websocket/WebSocketParam.java

@@ -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;
+}

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/websocket/WebSocketInstrComm.java

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

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/websocket/WebSocketServer.java

@@ -0,0 +1,72 @@
+package com.czlis.interfaceCommon.websocket;
+
+
+
+import com.czlis.interfaceCommon.pojo.websocket.WebSocketParam;
+
+
+import javax.websocket.OnClose;
+import javax.websocket.OnMessage;
+import javax.websocket.OnOpen;
+import javax.websocket.Session;
+import javax.websocket.server.PathParam;
+import java.util.*;
+
+/**
+ * WebSocket服务
+ */
+
+public class WebSocketServer {
+
+    //存放会话对象
+    protected static Map<String, WebSocketParam> sessionMap = new HashMap();
+
+    /**
+     * 连接建立成功调用的方法
+     */
+    @OnOpen
+    public void onOpen(Session session, @PathParam("sid") String sid) {
+        System.out.println("客户端：" + sid + "建立连接");
+        session.setMaxTextMessageBufferSize(8192000);
+        sessionMap.put(sid,new WebSocketParam(session,null));
+    }
+
+    /**
+     * 收到客户端消息后调用的方法
+     *
+     * @param message 客户端发送过来的消息
+     */
+    @OnMessage
+    public void onMessage(String message, @PathParam("sid") String sid) {
+        System.out.println("收到来自客户端：" + sid + "的信息:" + message);
+    }
+
+    /**
+     * 连接关闭调用的方法
+     *
+     * @param sid
+     */
+    @OnClose
+    public void onClose(@PathParam("sid") String sid) {
+        System.out.println("连接断开:" + sid);
+        sessionMap.remove(sid);
+    }
+
+    /**
+     * 给所有客户端群发
+     *
+     * @param message
+     */
+    public void sendToAllClient(String message) {
+        Collection<WebSocketParam> sessions = sessionMap.values();
+        for (WebSocketParam webSocketParam : sessions) {
+            try {
+                //服务器向客户端发送消息
+                webSocketParam.getSession().getBasicRemote().sendText(message);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+}

lis-system/src/main/java/com/czlis/system/config/SecurityConfig.java

@@ -113,6 +113,7 @@ public class SecurityConfig {
                             .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                             .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/printPDF/**","/graphs/**").permitAll()
                             .antMatchers("/doc.html").permitAll()   //Knife4j 过滤
+                            .antMatchers("/ws/**").permitAll()  //websocket过滤
                             // 除上面外的所有请求全部需要鉴权认证
                             .anyRequest().authenticated();
                 })

pom.xml

@@ -47,7 +47,7 @@
         <itextpdf.version>7.2.5</itextpdf.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>
         <spring-security.version>5.7.12</spring-security.version>
         <spring-framework.version>5.3.39</spring-framework.version>
@@ -123,6 +123,12 @@
                 <scope>test</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-websocket</artifactId>
+                <version>${spring-boot.version}</version>
+            </dependency>
+
             <!-- 阿里数据库连接池 -->
             <dependency>
                 <groupId>com.alibaba</groupId>