YiWuProject.git

			@@ -12,6 +12,7 @@
			import com.mes.engineering.service.EngineeringService;
			import com.mes.largenscreen.entity.DailyProductionVO;
			import com.mes.largenscreen.entity.DateRequest;
			import com.mes.largenscreen.entity.PieChartVO;
			import com.mes.largenscreen.service.LargenScreenService;
			import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
			import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService;
			@@ -150,7 +151,7 @@
			@Scheduled(fixedDelay = 1000)
			public void querySameDayProductionTask() {
			JSONObject jsonObject = new JSONObject();
			DailyProductionVO productionVO = largenScreenService.querySameDayProduction(new DateRequest());
			List<DailyProductionVO> productionVO = largenScreenService.querySameDayProduction(new DateRequest());
			jsonObject.append("productionVO", productionVO);

			ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreenProduction");
			@@ -174,15 +175,15 @@
			public void largenScreen() {
			JSONObject jsonObject = new JSONObject();
			//磨边信息
			List<EdgStorageDeviceTaskHistory> edgOneTasks = edgStorageDeviceTaskHistoryService.list(
			new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>()
			.eq(EdgStorageDeviceTaskHistory::getDeviceId, 1)
			.eq(EdgStorageDeviceTaskHistory::getTaskState, Const.EDG_GLASS_BEFORE)
			List<EdgGlassTaskInfo> edgOneTasks = edgGlassTaskInfoService.list(
			new LambdaQueryWrapper<EdgGlassTaskInfo>()
			.lt(EdgGlassTaskInfo::getState, 2)
			.eq(EdgGlassTaskInfo::getLine, 1)
			);
			List<EdgStorageDeviceTaskHistory> edgTwoTasks = edgStorageDeviceTaskHistoryService.list(
			new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>()
			.eq(EdgStorageDeviceTaskHistory::getDeviceId, 2)
			.eq(EdgStorageDeviceTaskHistory::getTaskState, Const.EDG_GLASS_BEFORE)
			List<EdgGlassTaskInfo> edgTwoTasks = edgGlassTaskInfoService.list(
			new LambdaQueryWrapper<EdgGlassTaskInfo>()
			.lt(EdgGlassTaskInfo::getState, 2)
			.eq(EdgGlassTaskInfo::getLine, 2)
			);
			jsonObject.append("edgOneTasks", edgOneTasks);
			jsonObject.append("edgTwoTasks", edgTwoTasks);
			@@ -198,6 +199,8 @@
			);
			jsonObject.append("engineeringOne", engineeringOne);
			jsonObject.append("engineeringTwo", engineeringTow);
			List<PieChartVO> pieChartVOS = edgStorageCageDetailsService.queryPieChart();
			jsonObject.append("pieChartVOS", pieChartVOS);
			ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
			if (sendwServer != null) {
			for (WebSocketServer webserver : sendwServer) {