YiWuProject.git

			@@ -5,7 +5,6 @@
			import com.mes.device.PlcParameterObject;
			import com.mes.engineering.entity.Engineering;
			import com.mes.engineering.service.EngineeringService;
			import com.mes.pp.entity.OptimizeProject;
			import com.mes.pp.service.OptimizeProjectService;
			import com.mes.tools.WebSocketServer;
			import com.mes.uppattenusage.entity.UpPattenUsage;
			@@ -44,7 +43,7 @@
			* fixedDelay : 上一个调用结束后再次调用的延时
			*/

			@Scheduled(fixedDelay = 300)
			@Scheduled(fixedDelay = 3000000)
			public void plcLoadGlassTask() throws InterruptedException {
			try {
			//获取联机状态
			@@ -88,7 +87,7 @@
			}
			}

			@Scheduled(fixedDelay = 300)
			@Scheduled(fixedDelay = 30000000)
			public void plcLoadGlassReport(){
			//获取是否有汇报
			String loadStatus = plcParameterObject.getPlcParameter("PlcStatus").getValue();
			@@ -130,11 +129,11 @@
			for (WebSocketServer webserver : sendwServer) {
			if (webserver != null) {
			webserver.sendMessage(jsonObject.toString());
			List<String> messages = webserver.getMessages();
			if (!messages.isEmpty()) {
			// // 将最后一个消息转换为整数类型的列表
			webserver.clearMessages();
			}
			// List<String> messages = webserver.getMessages();
			// if (!messages.isEmpty()) {
			// // // 将最后一个消息转换为整数类型的列表
			// webserver.clearMessages();
			// }
			} else {
			log.info("Home is closed");
			}
			@@ -145,19 +144,14 @@
			public void loadGlassStatus(){
			JSONObject jsonObject = new JSONObject();
			//正在进行的任务
			//String inkageStatus =plcParameterObject.getPlcParameter("MesToPlc").getValue();
			String inkageStatus ="1";
			String inkageStatus =plcParameterObject.getPlcParameter("MesToPlc").getValue();
			//String inkageStatus ="1";
			jsonObject.append("InkageStatus", inkageStatus);
			ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
			if (sendwServer != null) {
			for (WebSocketServer webserver : sendwServer) {
			if (webserver != null) {
			webserver.sendMessage(jsonObject.toString());
			List<String> messages = webserver.getMessages();
			if (!messages.isEmpty()) {
			// // 将最后一个消息转换为整数类型的列表
			webserver.clearMessages();
			}
			} else {
			log.info("Home is closed");
			}