~admin/HangZhouMes.git

			@@ -88,7 +88,7 @@

			public static String engineerId = "";

			@Scheduled(fixedDelay = 1000)
			// @Scheduled(fixedDelay = 1000)
			public void plcHomeEdgTask() {
			Date startDate = new Date();
			log.info("本次任务开始执行时间：{}", startDate);
			@@ -140,6 +140,23 @@
			log.info("本次任务结束时间：{}，共耗时：{}ms", endDate, endDate.getTime() - startDate.getTime());
			}

			@Scheduled(fixedDelay = 1000)
			public void temperingIsRun() {
			JSONObject jsonObject = new JSONObject();
			//正在进行的任务
			List<TaskCache> taskCaches = taskCacheService.selectTaskCacheIsRun();
			jsonObject.append("taskCaches", taskCaches);
			ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("isRun");
			if (sendwServer != null) {
			for (WebSocketServer webserver : sendwServer) {
			if (webserver != null) {
			webserver.sendMessage(jsonObject.toString());
			} else {
			log.info("Home is closed");
			}
			}
			}
			}

			/**
			* 进片任务
			@@ -683,14 +700,6 @@
			public void CacheGlassTasks() {
			JSONObject jsonObject = new JSONObject();
			List<Map<String, Object>> currentCutTerritorys = edgStorageCageDetailsService.selectCutTerritory();
			// List<Map<String, Object>> currentCutTerritorys=new ArrayList<>();
			// if(engineerId==null\|\|engineerId.isEmpty()){
			// //识别摆片当前版图数据
			// currentCutTerritorys = edgStorageCageDetailsService.selectCutTerritory();
			// }else{
			// //识别摆片此engineerId 工程版图数据
			// currentCutTerritorys = edgStorageCageDetailsService.selectCurrentCutTerritory(engineerId);
			// }
			jsonObject.append("currentCutTerritory", currentCutTerritorys);
			//log.info("本次识别版图{},++++{}",engineerId,currentCutTerritorys);
			//磨边信息
			@@ -720,10 +729,10 @@
			}
			}
			@Scheduled(fixedDelay = 1000)
			public void cacheGlassIsRun(){
			public void cacheGlassIsRun() {
			JSONObject jsonObject = new JSONObject();
			//正在进行的任务
			List<TaskCache>taskCaches=taskCacheService.selectTaskCacheIsRun();
			List<TaskCache> taskCaches = taskCacheService.selectTaskCacheIsRun();
			jsonObject.append("taskCaches", taskCaches);
			ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("cacheGlassIsRun");
			if (sendwServer != null) {
			@@ -737,4 +746,5 @@
			}
			}


			}