YiWuProject.git

			@@ -1,5 +1,10 @@
			package com.mes.job;

			import cn.hutool.json.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.mes.common.config.Const;
			import com.mes.damage.entity.Damage;
			import com.mes.damage.service.DamageService;
			import com.mes.temperingglass.service.TemperingGlassInfoService;
			import com.mes.temperingglass.entity.TemperingGlassInfo;
			import com.mes.tools.WebSocketServer;
			@@ -10,6 +15,7 @@

			import java.util.ArrayList;
			import java.util.List;
			import java.util.stream.Collectors;

			/**
			* @author SNG-010
			@@ -20,24 +26,27 @@

			@Autowired
			private TemperingGlassInfoService temperingAgoService;
			@Autowired
			private DamageService damageService;

			/**
			* fixedRate : 上一个调用开始后再次调用的延时（不用等待上一次调用完成）
			* fixedDelay : 上一个调用结束后再次调用的延时
			*/

			@Scheduled(fixedDelay = 1000)
			public void temperingGlassHome(){
			public void temperingGlassHome() {
			JSONObject jsonObject = new JSONObject();
			//正在等待进片的玻璃
			List<TemperingGlassInfo> waitingGlass = temperingAgoService.selectWaitingGlass();
			if(waitingGlass!=null){
			if (waitingGlass != null) {
			jsonObject.append("waitingGlass", waitingGlass);
			}

			//获取整在炉中的两个版图id
			List<TemperingGlassInfo> layoutId = temperingAgoService.selectLayoutId();
			//进炉中的玻璃
			if(!layoutId.isEmpty()) {
			if (!layoutId.isEmpty()) {
			List<TemperingGlassInfo> intoGlass = temperingAgoService.selectIntoGlass(layoutId.get(0));
			jsonObject.append("intoGlass", intoGlass);
			//进炉中的第二个版图
			@@ -48,7 +57,7 @@
			}
			//出炉后的玻璃
			List<TemperingGlassInfo> outGlass = temperingAgoService.selectOutGlass();
			if(outGlass!=null){
			if (outGlass != null) {
			jsonObject.append("outGlass", outGlass);
			}

			@@ -57,7 +66,27 @@
			if (outGlass != null) {
			jsonObject.append("overGlass", overGlass);
			}
			//当前钢化工程的拿走数据
			LambdaQueryWrapper<TemperingGlassInfo> queryWrapper = new LambdaQueryWrapper<>();
			queryWrapper.select(TemperingGlassInfo::getEngineerId)
			.lt(TemperingGlassInfo::getState, Const.TEMPERING_END)
			.groupBy(TemperingGlassInfo::getEngineerId);

			List<String> engineerIds = temperingAgoService.list(queryWrapper)
			.stream()
			.map(TemperingGlassInfo::getEngineerId)
			.distinct()
			.collect(Collectors.toList());

			List<Damage> temperingTakeGlassInfos = damageService.list(
			new LambdaQueryWrapper<Damage>()
			.in(Damage::getEngineerId, engineerIds)
			.eq(Damage::getType, Const.GLASS_STATE_TAKE)
			.orderByAsc(Damage::getId)
			);


			jsonObject.append("temperingTakeGlassInfos", temperingTakeGlassInfos);

			ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("temperingGlass");
			if (sendwServer != null) {
			@@ -70,13 +99,16 @@
			}
			}
			}

			@Scheduled(fixedDelay = 1000)
			public void temperingIsRun(){
			public void temperingIsRun() {
			JSONObject jsonObject = new JSONObject();
			//正在进行的任务
			List<TemperingGlassInfo>temperingTaskType=temperingAgoService.selectTaskType();
			List<TemperingGlassInfo> temperingTaskType = temperingAgoService.selectTaskType();
			jsonObject.append("temperingTaskType", temperingTaskType);
			ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("isRun");


			ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("temperingIsRun");
			if (sendwServer != null) {
			for (WebSocketServer webserver : sendwServer) {
			if (webserver != null) {
			@@ -86,6 +118,7 @@
			}
			}
			}

			}