YiWuProject.git

			@@ -1,9 +1,8 @@
			package com.mes.job;

			import cn.hutool.json.JSONObject;
			import com.github.yulichang.wrapper.MPJLambdaWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.mes.common.S7object;
			import com.mes.common.config.Const;
			import com.mes.device.PlcParameterObject;
			import com.mes.engineering.entity.Engineering;
			import com.mes.engineering.service.EngineeringService;
			@@ -11,8 +10,6 @@
			import com.mes.opctask.service.LoadGlassDeviceTaskService;
			import com.mes.pp.service.OptimizeProjectService;
			import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
			import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
			import com.mes.rawglassstation.entity.RawGlassStorageStation;
			import com.mes.rawglassstation.service.RawGlassStorageStationService;
			import com.mes.tools.DateUtil;
			import com.mes.tools.WebSocketServer;
			@@ -137,56 +134,48 @@
			}
			}

			@Scheduled(fixedDelay = 1000)
			public void loadGlassHome() {
			@Scheduled(fixedDelay = 10000)
			public void loadOneGlass() {
			loadGlassChild("loadGlassRequestOne", 5, LOAD_GLASS_DEVICE_ONE_TASK, "loadGlassOne");
			}

			@Scheduled(fixedDelay = 10)
			public void loadTwoGlass() {
			loadGlassChild("loadGlassRequestTwo", 6, LOAD_GLASS_DEVICE_TWO_TASK, "loadGlassTwo");
			}


			private void loadGlassChild(String redisRequest, int stationCell, String tableName, String webSocketName) {
			try {
			JSONObject jsonObject = new JSONObject();
			//正在进行的任务
			List<UpPattenUsage> upPattenUsages = upPattenUsageService.prioritylist();
			if (upPattenUsages != null) {
			jsonObject.append("prioritylist", upPattenUsages);
			//当前线路正在执行的工程
			Engineering engineering = engineeringService.getOne(new LambdaQueryWrapper<Engineering>().eq(Engineering::getStationCell, stationCell)
			.eq(Engineering::getState, 1).last("limit 1"));
			if (null != engineering) {
			jsonObject.append("engineering", engineering);
			}
			//查询1号线的任务
			Engineering request = redisUtil.getCacheObject("loadGlassRequest");
			//获取当前线路正在执行的工程原片信息
			Engineering request = redisUtil.getCacheObject(redisRequest);
			if (request == null) {
			request = new Engineering();
			request.setStationCell(5);
			request.setStationCell(stationCell);
			}
			List<UpPattenUsage> upPattenUsages1 = upPattenUsageService.selectLoadTask(request);
			jsonObject.append("loadTask1", upPattenUsages1);
			//查询2号线的任务
			Engineering request2 = redisUtil.getCacheObject("loadGlassRequest2");
			if (request2 == null) {
			request2 = new Engineering();
			request2.setStationCell(6);
			}
			List<UpPattenUsage> upPattenUsages2 = upPattenUsageService.selectLoadTask(request2);
			jsonObject.append("loadTask2", upPattenUsages2);
			// 查询工位任务
			//联机状态
			LoadGlassDeviceTask LoadOneState = loadGlassDeviceTaskService.queryTaskMessage(LOAD_GLASS_DEVICE_ONE_TASK);
			LoadGlassDeviceTask LoadTwoState = loadGlassDeviceTaskService.queryTaskMessage(LOAD_GLASS_DEVICE_TWO_TASK);
			jsonObject.append("LoadOneState", LoadOneState.getInkageState());
			jsonObject.append("LoadTwoervice", LoadTwoState.getInkageState());
			List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectLoadTask(request);
			jsonObject.append("upPattenUsages", upPattenUsages);

			//联机状态
			LoadGlassDeviceTask LoadTask = loadGlassDeviceTaskService.queryTaskMessage(tableName);
			jsonObject.append("inkageState", LoadTask.getInkageState());
			//工位信息
			List<RawGlassStorageDetails> rawGlassStorageDetailList = rawGlassStorageStationService.listRawGlassDetails();
			List<RawGlassStorageDetails> stationOneList = rawGlassStorageDetailList.stream().filter(item -> item.getDeviceId() == 5).collect(Collectors.toList());
			List<RawGlassStorageDetails> stationTwoList = rawGlassStorageDetailList.stream().filter(item -> item.getDeviceId() == 6).collect(Collectors.toList());
			jsonObject.append("stationOne", stationOneList);
			jsonObject.append("stationTwo", stationTwoList);
			//是否开始工程
			Engineering engineering = engineeringService.selectInitiate(1);
			jsonObject.append("engineering", engineering);
			//工位信息
			List<UpWorkstation> upWorkstations = upWorkstationService.list();
			jsonObject.append("list", upWorkstations);
			ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
			List<RawGlassStorageDetails> stationList = rawGlassStorageDetailList.stream().filter(item -> item.getDeviceId() == stationCell).collect(Collectors.toList());
			jsonObject.append("stationList", stationList);

			ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get(webSocketName);
			if (sendwServer != null) {
			for (WebSocketServer webserver : sendwServer) {
			if (webserver != null) {
			webserver.sendMessage(jsonObject.toString());
			// }
			} else {
			log.info("loadGlass is closed");
			}
			@@ -195,8 +184,8 @@
			} catch (Exception e) {
			e.printStackTrace();
			}

			}


			// @Scheduled(fixedDelay = 5000)
			public void loadGlassStatus() {
			@@ -218,21 +207,6 @@
			}
			}

			// @Scheduled(fixedDelay = 1000)
			// public void loadGlassIsRun() {
			// JSONObject jsonObject = new JSONObject();
			//
			// ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlassIsRun");
			// if (sendwServer != null) {
			// for (WebSocketServer webserver : sendwServer) {
			// if (webserver != null) {
			// webserver.sendMessage(jsonObject.toString());
			// } else {
			// log.info("loadGlassIsRun is closed");
			// }
			// }
			// }
			// }

			public void overTask(String loadStatus, int state) {