CanadaMes.git - Gitblit

			@@ -2,13 +2,15 @@

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

			import org.apache.commons.io.FileUtils;

			import java.io.*;
			import java.util.ArrayList;
			import java.util.Arrays;
			import java.util.List;

			@Slf4j
			public class PLCManualJog extends Thread {


			@@ -33,14 +35,7 @@
			while (this != null) {
			try {
			Thread.sleep(500);

			} catch (InterruptedException e) {
			e.printStackTrace();
			}



			List<String> addressList21 = Arrays.asList(config.getProperty("PLCManualJog.button").split(","));
			List<String> addressList21 = Arrays.asList(config.getProperty("PLCManualJog.button").split(","));
			List<Boolean> arraylist = S7control.getinstance().readBits(addressList21);


			@@ -58,12 +53,12 @@
			ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("ManualJog");
			if (sendwServer != null) {
			for (WebSocketServer webserver : sendwServer) {
			webserver.sendMessage(jsonObject.toString());


			// WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ManualJog");

			if (webserver != null) {

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

			List<String> messages = webserver.getMessages();
			if (!messages.isEmpty()) {
			@@ -108,10 +103,19 @@

			webserver.clearMessages();
			}
			}else{
			log.info("ManualJog is closed");
			}
			}

			}
			} catch (InterruptedException e) {
			e.printStackTrace();
			}





			}
			}