~zhoushihao/YiWuProject.git

			@@ -8,13 +8,12 @@
			import com.mes.bigstoragecagetask.entity.BigStorageCageTask;
			import com.mes.bigstoragecagetask.service.BigStorageCageTaskService;
			import com.mes.common.config.Const;
			import com.mes.hollow.entity.HollowBigStorageCage;
			import com.mes.hollow.entity.HollowGlassOutRelationInfo;
			import com.mes.hollow.service.HollowBigStorageCageDetailsService;
			import com.mes.hollow.service.HollowBigStorageCageService;
			import com.mes.hollow.service.HollowGlassOutRelationInfoService;
			import com.mes.hollowqueue.entity.HollowGlassQueueInfo;
			import com.mes.hollowqueue.service.HollowGlassQueueInfoService;
			import com.mes.temperingglass.entity.TemperingGlassInfo;
			import com.mes.tools.WebSocketServer;
			import com.mes.utils.RedisUtil;
			import lombok.extern.slf4j.Slf4j;
			@@ -38,11 +37,13 @@
			public class PushMessageToIndex {

			@Resource
			HollowGlassQueueInfoService hollowGlassQueueInfoService;
			HollowGlassQueueInfoService hollowGlassQueueInfoService;
			@Resource
			HollowGlassOutRelationInfoService hollowGlassOutRelationInfoService;
			@Resource
			HollowBigStorageCageService hollowBigStorageCageService;
			@Resource
			HollowBigStorageCageDetailsService hollowBigStorageCageDetailsService;
			@Resource
			BigStorageCageTaskService bigStorageCageTaskService;

			@@ -51,20 +52,32 @@

			@Resource
			RedisUtil redisUtil;

			@Scheduled(fixedDelay = 1000)
			public void hollowGlassTask() {
			List<HollowGlassOutRelationInfo> taskList = hollowGlassOutRelationInfoService.list(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
			.in(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START, Const.HOLLOW_FLOW_CARD_PAUSE));
			.in(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START));
			if (CollectionUtil.isEmpty(taskList)) {
			return;
			}
			JSONObject jsonObject = new JSONObject();
			List<String> flowCardIdList = taskList.stream().map(HollowGlassOutRelationInfo::getFlowCardId).collect(Collectors.toList());
			List<HollowGlassQueueInfo> list = hollowGlassQueueInfoService.list(new LambdaQueryWrapper<HollowGlassQueueInfo>().in(HollowGlassQueueInfo::getFlowCardId, flowCardIdList));
			List<Long> taskIdList = taskList.stream().map(HollowGlassOutRelationInfo::getId).collect(Collectors.toList());
			List<HollowGlassQueueInfo> list = hollowGlassQueueInfoService.list(new LambdaQueryWrapper<HollowGlassQueueInfo>().in(HollowGlassQueueInfo::getRelationId, taskIdList));
			Map<Integer, List<HollowGlassQueueInfo>> listMap = list.stream().collect(Collectors.groupingBy(HollowGlassQueueInfo::getCell));
			jsonObject.append("930", listMap.get(930));
			jsonObject.append("931", listMap.get(931));
			jsonObject.append("932", listMap.get(932));
			try {
			//930空闲信号
			ReadWriteEntity freeOneRequestEntity = miloService.readFromOpcUa("CMJ1.CMJ1.isFree");
			jsonObject.append("freeOneRequestEntity", freeOneRequestEntity.getValue());
			//931空闲信号
			ReadWriteEntity freeTwoRequestEntity = miloService.readFromOpcUa("ZKQ2.ZKQ2.isFree");
			jsonObject.append("freeTwoRequestEntity", freeTwoRequestEntity.getValue());
			}catch (Exception e){
			log.error("opc存在异常",e);
			}

			List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("HollowGlass");
			if (CollectionUtil.isNotEmpty(sendwServer)) {
			for (WebSocketServer socketServer : sendwServer) {
			@@ -109,7 +122,7 @@
			carPostion.add(0.5);
			jsonObject.append("carPostion", carPostion);
			//界面展示笼子信息
			jsonObject.append("bigStorageCageInfos", hollowBigStorageCageService.queryHollowbigStorageCageDetail());
			jsonObject.append("bigStorageCageInfos", hollowBigStorageCageDetailsService.queryHollowbigStorageCageDetail());

			try{
			//进片任务数据
			@@ -145,6 +158,12 @@
			//出片请求
			ReadWriteEntity outRequestEntity = miloService.readFromOpcUa("DLP2B.DLP2B.RequestMes");
			jsonObject.append("outRequestEntity", outRequestEntity.getValue());
			//930空闲信号
			ReadWriteEntity freeOneRequestEntity = miloService.readFromOpcUa("CMJ1.CMJ1.isFree");
			jsonObject.append("freeOneRequestEntity", freeOneRequestEntity.getValue());
			//931空闲信号
			ReadWriteEntity freeTwoRequestEntity = miloService.readFromOpcUa("ZKQ2.ZKQ2.isFree");
			jsonObject.append("freeTwoRequestEntity", freeTwoRequestEntity.getValue());

			}catch(Exception e){
			//todo:不做任务处理