Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

wuyouming666

2024-05-09 c0b596275d583b0874e501f49a90e7a1dfd879e3

 springboot-vue3/src/main/java/com/example/springboot/component/PlcLayout.java

@@ -2,6 +2,7 @@

import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import lombok.extern.slf4j.Slf4j;

import java.io.IOException;
import java.sql.SQLException;
@@ -20,6 +21,7 @@
import com.example.springboot.mapper.HomeMapper;
import com.example.springboot.mapper.SpianMapper;

@Slf4j
public class PlcLayout extends Thread {

    @Autowired
@@ -89,17 +91,18 @@
                ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Layout");
                if (sendwServer != null) {
                    for (WebSocketServer webserver : sendwServer) {
                        

                        if (webserver != null&& webserver.session.isOpen()) {
                        webserver.sendMessage(jsonObject.toString());

                        if (webserver != null) {

                            List<String> messages = webserver.getMessages();

                            if (!messages.isEmpty()) {
                                // // 将最后一个消息转换为整数类型的列表
                                webserver.clearMessages();
                            }

                        }else{
                            log.info("Layout is closed");
                        }

                    }