YiWuProject.git

			@@ -1,16 +1,13 @@
			package com.mes.job;

			import cn.hutool.json.JSONObject;
			import cn.smallbun.screw.core.util.CollectionUtils;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.kangaroohy.milo.model.ReadWriteEntity;
			import com.kangaroohy.milo.service.MiloService;
			import com.mes.bigstorage.entity.BigStorageCageDetails;
			import com.mes.bigstorage.service.BigStorageCageDetailsService;
			import com.mes.bigstorage.service.BigStorageCageService;
			import com.mes.bigstoragecagetask.entity.BigStorageCageTask;
			import com.mes.bigstoragecagetask.service.BigStorageCageTaskService;
			import com.mes.glassinfo.entity.GlassInfo;
			import com.mes.glassinfo.service.GlassInfoService;
			import com.mes.temperingglass.entity.TemperingGlassInfo;
			import com.mes.temperingglass.service.TemperingGlassInfoService;
			@@ -18,14 +15,10 @@
			import com.mes.utils.RedisUtil;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.scheduling.annotation.Scheduled;
			import org.springframework.stereotype.Component;

			import javax.annotation.Resource;
			import java.io.BufferedReader;
			import java.io.InputStreamReader;
			import java.net.Socket;
			import java.util.ArrayList;
			import java.util.List;
			import java.util.Map;
			@@ -53,12 +46,6 @@
			@Autowired(required = false)
			MiloService miloService;

			@Value("${mes.scan.ip}")
			private String scanIp;

			@Value("${mes.scan.port}")
			private Integer scanPort;

			private JSONObject jsonObject = new JSONObject();

			public void queryDataSource1() throws Exception {
			@@ -67,7 +54,7 @@
			carPostion.add(0.5);
			jsonObject.append("carPostion", carPostion);
			//界面展示笼子信息
			jsonObject.append("bigStorageCageInfos", bigStorageCageService.querybigStorageCageDetail());
			jsonObject.append("bigStorageCageInfos", bigStorageCageDetailsService.querybigStorageCageDetail());

			try{
			//进片任务数据
			@@ -178,7 +165,7 @@
			//查询使用数据源1查询数据
			queryDataSource1();
			//查询使用数据源2查询数据
			queryDataSource2();
			// queryDataSource2();

			ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("slicecage");
			if (sendwServer != null) {