~admin/HangZhouMes.git

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

			import cn.hutool.json.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.mes.bigstorage.entity.BigStorageCageDetails;
			import com.mes.bigstorage.service.BigStorageCageDetailsService;
			import com.mes.bigstorage.service.BigStorageCageService;
			import com.mes.common.S7object;
			import com.mes.common.config.Const;
			import com.mes.common.utils.RedisUtil;
			import com.mes.device.PlcParameterObject;
			import com.mes.temperingglass.entity.TemperingGlassInfo;
			import com.mes.temperingglass.service.TemperingGlassInfoService;
			@@ -31,9 +35,11 @@
			private BigStorageCageDetailsService bigStorageCageDetailsService;
			@Resource
			private TemperingGlassInfoService temperingGlassInfoService;
			@Resource
			private RedisUtil redisUtil;

			private JSONObject jsonObject = new JSONObject();
			public void dataBase1() throws InterruptedException {
			public void queryDataSource1() throws InterruptedException {
			List<Double> carPostion=new ArrayList<>();
			carPostion.add(0.25);
			carPostion.add(0.5);
			@@ -42,11 +48,11 @@
			jsonObject.append("bigStorageCageInfos", bigStorageCageService.querybigStorageCageDetail());

			//进片任务数据
			List<BigStorageCageDetails> bigStorageCageDetailsFeedTask=bigStorageCageDetailsService.selectTask(1);
			List<BigStorageCageDetails> bigStorageCageDetailsFeedTask=bigStorageCageDetailsService.selectFeedTask();
			jsonObject.append("bigStorageCageDetailsFeedTask", bigStorageCageDetailsFeedTask);

			//出片任务数据
			List<BigStorageCageDetails> bigStorageCageDetailsOutTask=bigStorageCageDetailsService.selectTask(2);
			List<BigStorageCageDetails> bigStorageCageDetailsOutTask=bigStorageCageDetailsService.selectOutTask();
			jsonObject.append("bigStorageCageDetailsOutTask", bigStorageCageDetailsOutTask);

			//理片笼使用情况
			@@ -56,11 +62,24 @@
			//理片笼表格信息
			jsonObject.append("bigStorageCageInfo", bigStorageCageService.querybigStorageCageDetailAll());

			//钢化开关
			boolean temperingSwitch=false;
			if(redisUtil.getCacheObject("temperingSwitch")==null){
			redisUtil.setCacheObject("temperingSwitch", false);
			}else{
			temperingSwitch=redisUtil.getCacheObject("temperingSwitch");
			}
			jsonObject.append("temperingSwitch", temperingSwitch);


			}

			public void dataBase2() throws InterruptedException {
			public void queryDataSource2() throws InterruptedException {
			//出片队列
			List<TemperingGlassInfo> temperingGlassInfoList= temperingGlassInfoService.list();
			List<TemperingGlassInfo> temperingGlassInfoList= temperingGlassInfoService.list(
			new LambdaQueryWrapper<TemperingGlassInfo>()
			.inSql(TemperingGlassInfo::getEngineerId,"select distinct engineer_id from tempering_glass_info where state<4")
			);
			jsonObject.append("temperingGlassInfoList", temperingGlassInfoList);

			}
			@@ -72,8 +91,11 @@
			public void plcStorageCageTask() throws InterruptedException {
			jsonObject = new JSONObject();
			try {
			dataBase1();
			dataBase2();
			//查询使用数据源1查询数据
			queryDataSource1();
			//查询使用数据源2查询数据
			queryDataSource2();

			ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("slicecage");
			if (sendwServer != null) {
			for (WebSocketServer webserver : sendwServer) {
			@@ -94,4 +116,25 @@
			}
			}

			@Scheduled(fixedDelay = 1000)
			public void temperingIsRun(){
			JSONObject jsonObject = new JSONObject();
			//进片任务数据
			List<BigStorageCageDetails> bigStorageCageDetailsFeedTask=bigStorageCageDetailsService.selectFeedTask();
			jsonObject.append("bigStorageCageDetailsFeedTask", bigStorageCageDetailsFeedTask);
			//出片任务数据
			List<BigStorageCageDetails> bigStorageCageDetailsOutTask=bigStorageCageDetailsService.selectOutTask();
			jsonObject.append("bigStorageCageDetailsOutTask", bigStorageCageDetailsOutTask);
			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");
			}
			}
			}
			}

			}