CanadaMes.git - Gitblit

			@@ -1,18 +1,10 @@
			package com.example.springboot.component;

			import cn.hutool.json.JSONObject;

			import java.util.ArrayList;
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;

			import org.springframework.web.bind.annotation.PostMapping;

			import com.example.springboot.common.Result;
			import com.example.springboot.entity.Glass;
			import com.example.springboot.entity.StorageCage;
			import com.example.springboot.entity.alarmmg;
			import com.example.springboot.entity.north_glass_buffer1;
			import com.example.springboot.mapper.HomeMapper;
			import com.example.springboot.mapper.SpianMapper;
			import com.example.springboot.service.JdbcConnections;
			@@ -45,12 +37,18 @@
			List<StorageCage> cagelist3 = homeMapper.selectRack3();
			List<StorageCage> cagelist4 = homeMapper.selectRack4();
			jsonObject.append("cagelist1", cagelist1);
			jsonObject.append("cagelist2", (Object) cagelist2);
			jsonObject.append("cagelist2", cagelist2);
			jsonObject.append("cagelist3", cagelist3);
			jsonObject.append("cagelist4", cagelist4);
			// 进出片任务
			List<StorageCage> tasklist1 = homeMapper.selectinout(3);
			List<StorageCage> tasklist2 = homeMapper.selectinout(2);
			for (StorageCage storageCage : tasklist1) {
			storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
			}
			for (StorageCage storageCage : tasklist2) {
			storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
			}
			jsonObject.append("tasklist1", tasklist1);
			jsonObject.append("tasklist2", tasklist2);
			// 查询报警信息
			@@ -65,7 +63,8 @@
			// jsonObject.append("params", paramlist);
			// }
			// // 获取进片车状态
			// List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);// 获取进片车状态
			// List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8",
			// 1);// 获取进片车状态
			// boolean exist1 = datas1ListState.contains((short) 0);
			// jsonObject.append("zhuangtai", exist1);
			//获取进片玻璃信息
			@@ -80,8 +79,10 @@
			jsonObject.append("queid", queid);
			jsonObject.append("state", state);
			// 获取扫码位与上片位玻璃信息
			Glass form2 = homeMapper.GetQueueInfo(2);
			Glass form3 = homeMapper.GetQueueInfo(1);
			String queueglassid2 = homeMapper.GetQueueInfo(2);
			String queueglassid1 = homeMapper.GetQueueInfo(1);
			north_glass_buffer1 form2 = homeMapper.SelectGlassByGlassID(queueglassid2);
			north_glass_buffer1 form3 = homeMapper.SelectGlassByGlassID(queueglassid1);
			jsonObject.append("form2", form2);
			jsonObject.append("form3", form3);
			// List<Short> paramlists = new ArrayList<Short>();
			@@ -90,7 +91,6 @@
			// paramlists.add(para1);
			// paramlists.add(para2);
			// System.out.println(paramlists);


			dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
			boolean dbconnected = false;