MES_Projects.git

			@@ -14,6 +14,9 @@
			import java.net.URL;
			import java.net.URLConnection;
			import java.net.URLDecoder;
			import java.nio.charset.StandardCharsets;
			import java.nio.file.Files;
			import java.nio.file.Paths;
			import java.text.SimpleDateFormat;
			import java.util.ArrayList;
			import java.util.Date;
			@@ -64,24 +67,28 @@

			@Autowired
			private OutTasksDao outTasksDao;
			public void CeshiMainche() {

			// public static Map<String,OutTasks> jsonArrayStatic;

			public void testMainche() {
			//List<Machine> Machine=machineDao.SelectMinchineFlag("1");
			Telecoms telecoms=telecomsDao.findOne(10L);
			String str="000000000000000000";
			Telecoms telecoms=telecomsDao.findOne(1L);
			String str="000100000000000000";
			for(int i=0;i<45;i++){
			if(i==19){
			str+=HexUtil.intBinaryTo16("0000100000000000");
			continue;
			}
			if(i==34){
			str+=HexUtil.intBinaryTo16("0000100000000000");
			continue;
			}/*
			if(i==2\|\|i==12){
			str+="0002";
			// if(i==19){
			// str+=HexUtil.intBinaryTo16("0000100000000000");
			// continue;
			// }
			// if(i==34){
			// str+=HexUtil.intBinaryTo16("0000100000000000");
			// continue;
			// }

			if(i==5\|\|i==9999){
			str+="0001";
			}else{
			str+="0000";
			}*/
			}
			}
			String strss=MessageProcessor.generateReturnMessage(str,telecoms);
			if(strss.length()>26){
			@@ -91,19 +98,30 @@
			}
			}

			public void connect() {
			//CeshiMainche();
			public void connect() {
			//testMainche();
			// ApiHttp ApiHttp= new ApiHttp("192.168.10.127",1);
			// ApiHttp.handle();


			//
			// Telecoms telecoms=telecomsDao.findOne(10L);
			// TaskChange(telecoms);
			// Telecoms telecoms=telecomsDao.findOne(1L);
			// telecomsService.connect(telecoms);
			List<Telecoms> telecoms=telecomsDao.findAll();
			for(Telecoms Telecom:telecoms){
			telecomsService.connect(Telecom);
			}


			// Telecoms telecoms=telecomsDao.findOne(10L);
			// String TasksStr=task(telecoms);
			// System.out.println(TasksStr);
			}
			//ä»»å¡é¢åä»¥åæ±æ¥
			public void TaskChange(Telecoms telecoms){
			try {
			try {
			String TasksStr=task(telecoms);
			//String TasksStr=new String(Files.readAllBytes(Paths.get("D:\\haojingconfig\\json-format.json")),StandardCharsets.UTF_8);;
			if(TasksStr==""\|\|TasksStr==null){
			if(!"ç¦»çº¿".equals(telecoms.getConnState())){
			telecoms.setConnState("ç¦»çº¿");
			@@ -126,70 +144,90 @@
			}
			String Chexiao="";
			WriteFile("D:","é¢åä»»å¡",df.format(new Date())+"\rä»»å¡æåµ:"+content,false);
			//System.out.println(content);
			String cancelText[]=telecoms.getInterprets().split(",");
			List cancelList=new ArrayList<>();
			for(String item:cancelText){
			cancelList.add(item);
			}
			for(int j=0;j<jsonArray.size();j++){//æ¾å°æ¯å¦ææ¤ç®çå°çè¡¥çä»»å¡
			String Taskid=jsonArray.getJSONObject(j).get("TaskId").toString();
			List<OutTasks> OutTaskss=outTasksDao.FindOutTasksTaskIds(Taskid);
			//DeviceService.jsonArrayStatic.put(OutTasksadd.getTaskId(),OutTasksadd);
			if(OutTaskss.isEmpty()){
			//ç´æ¥æ·»å
			OutTasks OutTasks=new OutTasks();
			OutTasks.setTaskId(jsonArray.getJSONObject(j).get("TaskId").toString());
			OutTasks.setTaskType(jsonArray.getJSONObject(j).get("TaskTypeName").toString());
			OutTasks.setMesStatus("null".equals(jsonArray.getJSONObject(j).get("MESStatusName").toString())?"0":jsonArray.getJSONObject(j).get("MESStatusName").toString());
			OutTasks.setMachineStatus("null".equals(jsonArray.getJSONObject(j).get("MachineStatusName").toString())?"0":jsonArray.getJSONObject(j).get("MachineStatusName").toString());
			OutTasks.setWorkStatus("çå¾ä¸");
			OutTasks.setPkgId(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("PkgId").toString())?"0":jsonArray.getJSONObject(j).get("PkgId").toString()));
			OutTasks.setStockName("null".equals(jsonArray.getJSONObject(j).get("StockName").toString())?"0":jsonArray.getJSONObject(j).get("StockName").toString());
			OutTasks.setDestination("null".equals(jsonArray.getJSONObject(j).get("Destination").toString())?"0":jsonArray.getJSONObject(j).get("Destination").toString());
			OutTasks.setPlanLoadNum1(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("PlanLoadNum1").toString())?"0":jsonArray.getJSONObject(j).get("PlanLoadNum1").toString()));
			OutTasks.setPlanLoadNum2(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("PlanLoadNum2").toString())?"0":jsonArray.getJSONObject(j).get("PlanLoadNum2").toString()));
			OutTasks.setPlanLoadNum3(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("PlanLoadNum3").toString())?"0":jsonArray.getJSONObject(j).get("PlanLoadNum3").toString()));
			OutTasks.setStockNum(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("StockNum").toString())?"0":jsonArray.getJSONObject(j).get("StockNum").toString()));
			OutTasks.setLoadeNum(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("LoadedNum").toString())?"0":jsonArray.getJSONObject(j).get("LoadedNum").toString()));
			OutTasks.setNewPkgId(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("NewPkgId").toString())?"0":jsonArray.getJSONObject(j).get("NewPkgId").toString()));
			OutTasks.setNewPkgNum(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("NewPkgNum").toString())?"0":jsonArray.getJSONObject(j).get("NewPkgNum").toString()));
			OutTasks.setBb(Double.valueOf("null".equals(jsonArray.getJSONObject(j).get("BB").toString())?"0":jsonArray.getJSONObject(j).get("BB").toString()));
			OutTasks.setHh(Double.valueOf("null".equals(jsonArray.getJSONObject(j).get("HH").toString())?"0":jsonArray.getJSONObject(j).get("HH").toString()));
			OutTasks.setColor("null".equals(jsonArray.getJSONObject(j).get("Color").toString())?"0":jsonArray.getJSONObject(j).get("Color").toString());
			OutTasks.setThickness(Double.valueOf("null".equals(jsonArray.getJSONObject(j).get("Thickness").toString())?"0":jsonArray.getJSONObject(j).get("Thickness").toString()));
			OutTasks.setPkgNum(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("PkgNum").toString())?"0":jsonArray.getJSONObject(j).get("PkgNum").toString()));
			OutTasks.setStockThickness(Double.valueOf("null".equals(jsonArray.getJSONObject(j).get("StockThickness").toString())?"0":jsonArray.getJSONObject(j).get("StockThickness").toString()));
			OutTasks.setTaskIds(Long.valueOf(jsonArray.getJSONObject(j).get("TaskId").toString()));
			OutTasks.setPosunCount(0);
			OutTasks.setRackNumber("");
			OutTasks.setInfoContent("");
			OutTasks.setStartTime(new Date());
			OutTasks.setFinshTime(new Date());
			OutTasks.setFlag("æ£å¸¸");
			OutTasks.setLoadTime(new Date());
			outTasksDao.save(OutTasks);
			System.out.println("é¢åä»»å¡ï¼"+jsonArray.getJSONObject(j).get("TaskId").toString());
			//ç´æ¥æ·»å
			OutTasks OutTasksadd=new OutTasks();
			OutTasksadd.setTaskId(jsonArray.getJSONObject(j).get("TaskId").toString());
			OutTasksadd.setTaskType(jsonArray.getJSONObject(j).get("TaskTypeName").toString());
			OutTasksadd.setMesStatus("null".equals(jsonArray.getJSONObject(j).get("MESStatusName").toString())?"0":jsonArray.getJSONObject(j).get("MESStatusName").toString());
			OutTasksadd.setMachineStatus("null".equals(jsonArray.getJSONObject(j).get("MachineStatusName").toString())?"0":jsonArray.getJSONObject(j).get("MachineStatusName").toString());
			OutTasksadd.setWorkStatus("çå¾ä¸");
			OutTasksadd.setPkgId(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("PkgId").toString())?"0":jsonArray.getJSONObject(j).get("PkgId").toString()));
			OutTasksadd.setStockName("null".equals(jsonArray.getJSONObject(j).get("StockName").toString())?"0":jsonArray.getJSONObject(j).get("StockName").toString());
			OutTasksadd.setDestination("null".equals(jsonArray.getJSONObject(j).get("Destination").toString())?"0":jsonArray.getJSONObject(j).get("Destination").toString());
			OutTasksadd.setPlanLoadNum1(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("PlanLoadNum1").toString())?"0":jsonArray.getJSONObject(j).get("PlanLoadNum1").toString()));
			OutTasksadd.setPlanLoadNum2(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("PlanLoadNum2").toString())?"0":jsonArray.getJSONObject(j).get("PlanLoadNum2").toString()));
			OutTasksadd.setPlanLoadNum3(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("PlanLoadNum3").toString())?"0":jsonArray.getJSONObject(j).get("PlanLoadNum3").toString()));
			OutTasksadd.setStockNum(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("StockNum").toString())?"0":jsonArray.getJSONObject(j).get("StockNum").toString()));
			OutTasksadd.setLoadeNum(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("LoadedNum").toString())?"0":jsonArray.getJSONObject(j).get("LoadedNum").toString()));
			OutTasksadd.setNewPkgId(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("NewPkgId").toString())?"0":jsonArray.getJSONObject(j).get("NewPkgId").toString()));
			OutTasksadd.setNewPkgNum(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("NewPkgNum").toString())?"0":jsonArray.getJSONObject(j).get("NewPkgNum").toString()));
			OutTasksadd.setBb(Double.valueOf("null".equals(jsonArray.getJSONObject(j).get("BB").toString())?"0":jsonArray.getJSONObject(j).get("BB").toString()));
			OutTasksadd.setHh(Double.valueOf("null".equals(jsonArray.getJSONObject(j).get("HH").toString())?"0":jsonArray.getJSONObject(j).get("HH").toString()));
			OutTasksadd.setColor("null".equals(jsonArray.getJSONObject(j).get("Color").toString())?"0":jsonArray.getJSONObject(j).get("Color").toString());
			OutTasksadd.setThickness(Double.valueOf("null".equals(jsonArray.getJSONObject(j).get("Thickness").toString())?"0":jsonArray.getJSONObject(j).get("Thickness").toString()));
			OutTasksadd.setPkgNum(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("PkgNum").toString())?"0":jsonArray.getJSONObject(j).get("PkgNum").toString()));
			OutTasksadd.setStockThickness(Double.valueOf("null".equals(jsonArray.getJSONObject(j).get("StockThickness").toString())?"0":jsonArray.getJSONObject(j).get("StockThickness").toString()));
			OutTasksadd.setTaskIds(Long.valueOf(jsonArray.getJSONObject(j).get("TaskId").toString()));
			OutTasksadd.setPosunCount(0);
			OutTasksadd.setRackNumber("");
			OutTasksadd.setInfoContent("");
			OutTasksadd.setStartTime(new Date());
			OutTasksadd.setFinshTime(new Date());
			OutTasksadd.setFlag("æ£å¸¸");
			OutTasksadd.setLoadTime(new Date());
			if("å¨çº¿åºå°ä¸çå°ï¼è¡¥çï¼".equals(OutTasksadd.getTaskType())){
			OutTasksadd.setPriority(1001);
			}else{
			OutTasksadd.setPriority(1000);
			}
			outTasksDao.save(OutTasksadd);
			System.out.println("é¢åä»»å¡ï¼[ "+jsonArray.getJSONObject(j).get("TaskId").toString()+" ]");
			}else if(OutTaskss.size()==1){
			String MESStatusName="null".equals(jsonArray.getJSONObject(j).get("MESStatusName").toString())?"0":jsonArray.getJSONObject(j).get("MESStatusName").toString();
			OutTasks OutTasks=OutTaskss.get(0);
			if("æ¤éä»»å¡".equals(MESStatusName))
			if("æ¤éä»»å¡".equals(MESStatusName)&&!cancelList.contains(OutTasks.getTaskId()))
			{ //æ¤éä»»å¡
			Chexiao+=OutTasks.getTaskId()+",";
			// OutTasks.setMesStatus("æ¤éä»»å¡");
			// outTasksDao.save(OutTasks);
			System.out.println("æ¤éä»»å¡ï¼[ "+jsonArray.getJSONObject(j).get("TaskId").toString()+" ]");
			}else if(!"æ´¾å°ç¡®è®¤ä»»å¡å®æ".equals(OutTasks.getMesStatus())&&"ä»»å¡å®æ".equals(OutTasks.getMachineStatus())){
			boolean isFinsh=PaiFinsh(telecoms,OutTasks,"æ´¾å°ç¡®è®¤ä»»å¡å®æ","æ±æ¥æ´¾å°éåºå®æå¤±è´¥ï¼","5");
			System.out.println("ä»»å¡id:["+OutTasks.getTaskId()+"]èªå¨çº æ£æ±æ¥ä»»å¡éåå¨çº¿åºï¼"+(isFinsh==true?"æå!":"å¤±è´¥!"));
			}
			}
			}
			telecoms.setInterprets(Chexiao);
			telecomsDao.save(telecoms);
			List list=new ArrayList<>();
			String s[]=Chexiao.split(",");
			for(String item:s){
			list.add(item);
			}
			List<OutTasks> OutTasksAll=outTasksDao.FindNoMesStatus("æ´¾å°ç¡®è®¤ä»»å¡å®æ");
			try {
			for(OutTasks OutTask:OutTasksAll){
			if("ä¸çä»»å¡å·²å¼å§".equals(OutTask.getMesStatus())&&
			"éæ¶å·²å°ä¸çä½".equals(OutTask.getMachineStatus()))
			{
			List list=new ArrayList<>();
			String s[]=Chexiao.split(",");
			for(String item:s){
			list.add(item);
			}

			if(list.contains(OutTask.getTaskId())){
			//æ¤ä»»å¡å·²æ¤é
			OutTask.setMesStatus("ä¸çå®æå¯éå");
			OutTask.setMachineStatus("ä¸çå®æè¯·æ±éå");
			outTasksDao.save(OutTask);
			System.out.println("ä»»å¡id:["+OutTask.getTaskId()+"] å°è¾¾ä¸çä½ æ¤ä»»å¡å·²æ¤é");
			}else{
			boolean isFinsh=PaiFinsh(telecoms,OutTask,"æ´¾å°ç¡®è®¤éæ¶å·²å°ä½","æ±æ¥æ´¾å°éæ¶å·²å°ä½å¤±è´¥ï¼","3");
			//ä¸çä»»å¡å°ä½æ±æ¥æ´¾å°å°ä½ éæ¶å·²å°ä½-3
			@@ -205,7 +243,8 @@
			break;
			}
			}
			}
			}

			}
			}
			else if("ä¸çä»»å¡å·²å¼å§".equals(OutTask.getMesStatus())&&
			@@ -236,8 +275,8 @@
			}
			else if("ä¸çå®æå¯éå".equals(OutTask.getMesStatus())&&
			"ä¸çå®æè¯·æ±éå".equals(OutTask.getMachineStatus()))
			{
			//ä¸çæ´¾å°ç¡®è®¤éå //éªè¯ææ²¡æè¡¥çä»»å¡
			{
			//ä¸çæ´¾å°ç¡®è®¤éå //éªè¯ææ²¡æè¡¥çä»»å¡
			if(isPosunTaskLoad(OutTask,TasksStr)){
			//æè¡¥çä»»å¡,æåæºå¨çå¾è¡¥ç
			List<Machine> machines=machineDao.FindNumber(OutTask.getDestination());
			@@ -252,34 +291,47 @@
			outTasksDao.save(OutTask);
			break;
			}
			}else{
			}else{
			// æ¤çº¿è·¯ä¸ä¸ä»»å¡æ¯å¦è¿æ¯æ¤ææ¶ æ¤çº¿è·¯æªå®æçä»»å¡ï¼OutTasksSameStokess
			List<OutTasks> OutTasksSameStokess=outTasksDao.FindDestinationNoFinshTaskIdOderbyASC(OutTask.getDestination(),OutTask.getTaskId(),"ä»»å¡å®æ");
			for(OutTasks outTask:OutTasksSameStokess){
			if(!OutTasksSameStokess.isEmpty()){
			OutTasks outTask=OutTasksSameStokess.get(0);
			if(outTask.getStockName().equals(OutTask.getStockName())){
			outTask.setMachineStatus("éæ¶å·²å°ä¸çä½");
			outTask.setInfoContent("");
			outTasksDao.save(OutTask);
			outTasksDao.save(outTask);
			System.out.println("æ¤ä»»å¡ä¸ä¸ä¸ä»»å¡ææ¶ç¸åï¼"+OutTask.getId()+"----1");
			//æ¾å°å½åä»»å¡æå¨ææ¶
			List<LoadRack> loadRacks=loadRackDao.findOutTasksId(OutTask.getId());
			if(loadRacks.size()==1){

			LoadRack loadRack=loadRacks.get(0);
			loadRack.getOutTasks().setWorkStatus("");
			loadRack.getOutTasks().setMesStatus("æ´¾å°ç¡®è®¤å¯éå");
			loadRack.getOutTasks().setInfoContent("");
			loadRack.getOutTasks().setMachineStatus("ä»»å¡å®æ");
			loadRackDao.save(loadRack);
			loadRack.setOutTasks(outTask);
			loadRack.getMachineLoad().setWorkState("çå¾ä¸");
			loadRackDao.save(loadRack);
			System.out.println("æ¤ä»»å¡ä¸ä¸ä¸ä»»å¡ææ¶ç¸åï¼"+OutTask.getId()+"----2");
			}else{
			System.out.println("åææ¶åå¨å¤ä¸ªå·¥ä½ä¸ï¼"+OutTask.getId());
			}
			}else{
			break;
			}
			}
			//æ²¡æè¡¥çä»»å¡,æ¥çææ²¡ææ¤ææ¶é¤æ¤ä»»å¡ å·²å°ä½çä»»å¡
			List<OutTasks> OutTasksSameStoke=outTasksDao.FindDestinationNoTaskIdstockName(OutTask.getDestination(),OutTask.getTaskId(),"éæ¶å·²å°ä¸çä½",OutTask.getStockName());
			if(!OutTasksSameStoke.isEmpty()){
			List<LoadRack> loadRacks=loadRackDao.findOutTasksId(OutTask.getId());
			if(loadRacks.size()==1){
			LoadRack loadRack=loadRacks.get(0);
			loadRack.getOutTasks().setWorkStatus("");
			loadRack.getOutTasks().setMesStatus("æ´¾å°ç¡®è®¤å¯éå");
			loadRack.getOutTasks().setInfoContent("");
			loadRack.getOutTasks().setMachineStatus("ä»»å¡å®æ");
			loadRackDao.save(loadRack);
			loadRack.setOutTasks(OutTasksSameStoke.get(0));
			loadRack.getMachineLoad().setWorkState("çå¾ä¸");
			loadRackDao.save(loadRack);

			}else{
			System.out.println(OutTask.getId()+":1");
			List<LoadRack> loadRacks=loadRackDao.findOutTasksId(OutTask.getId());
			if(loadRacks.size()==1){
			LoadRack loadRack=loadRacks.get(0);
			loadRack.getOutTasks().setMesStatus("æ´¾å°ç¡®è®¤å¯éå");
			loadRack.getOutTasks().setInfoContent("");
			loadRack.getOutTasks().setMachineStatus("éæ¶éåäºæ¬¡æ¥å");
			loadRack.getOutTasks().setWorkStatus("çå¾ä¸");
			loadRack.getMachineLoad().setWorkState("çå¾ä¸");
			loadRackDao.save(loadRack);
			System.out.println("æ¤ä»»å¡ä¸ä¸ä¸ä»»å¡ææ¶ä¸ç¸åï¼"+OutTask.getId()+"----3");
			}else{
			System.out.println("æ¤ææ¶ä¸åå¨æå·¥ä½ï¼"+OutTask.getId());
			}
			}
			}else{
			List<LoadRack> loadRacks=loadRackDao.findOutTasksId(OutTask.getId());
			@@ -291,8 +343,9 @@
			loadRack.getOutTasks().setWorkStatus("çå¾ä¸");
			loadRack.getMachineLoad().setWorkState("çå¾ä¸");
			loadRackDao.save(loadRack);
			System.out.println("æ¤ä»»å¡ä¸ºå½åçº¿è·¯æåä¸ä¸ªä»»å¡ï¼"+OutTask.getId()+"----4");
			}else{
			System.out.println(OutTask.getId()+":2");
			System.out.println("æ¤ææ¶ä¸åå¨æå·¥ä½ï¼"+OutTask.getId());
			}
			}

			@@ -302,41 +355,35 @@
			"éæ¶å·²å°åè£ä½".equals(OutTask.getMachineStatus()))
			{

			boolean abc=false;
			boolean isExecute=false;
			for(int i=0;i<jsonArray.size();i++){
			if(OutTask.getTaskId().equals(jsonArray.getJSONObject(i).get("TaskId").toString())&&
			"å·¥äººå·²å°ç»çåè£å°å¥æå£éæ¶ä¸".equals(jsonArray.getJSONObject(i).get("MESStatusName").toString())){
			abc=true;
			isExecute=true;
			System.out.println("ä»»å¡id:["+OutTask.getTaskId()+"]æ´¾å°åè£åè®¸éå!");
			}else if(OutTask.getTaskId().equals(jsonArray.getJSONObject(i).get("TaskId").toString())&&
			"æ¤éä»»å¡".equals(jsonArray.getJSONObject(i).get("MESStatusName").toString())){
			abc=true;
			isExecute=true;
			System.out.println("ä»»å¡id:["+OutTask.getTaskId()+"]æ´¾å°åè£æ¤éä»»å¡éå!");
			}
			}
			if(abc){
			if(isExecute){
			OutTask.setMesStatus("æ´¾å°ç¡®è®¤å¯éå");
			OutTask.setMachineStatus("çå¾éååºåº");
			outTasksDao.save(OutTask);
			}
			}
			else if("æ´¾å°ç¡®è®¤å¯éå".equals(OutTask.getMesStatus())&&
			"ä»»å¡å®æ".equals(OutTask.getMachineStatus()))
			else if(list.contains(OutTask.getTaskId())&&"ä»»å¡å®æ".equals(OutTask.getMachineStatus()))
			{
			//æ¤ä»»å¡å·²æ¤é "9"
			boolean isFinsh=PaiFinsh(telecoms,OutTask,"æ´¾å°ç¡®è®¤ä»»å¡å®æ","æ±æ¥æ´¾å°éåºå®æå¤±è´¥ï¼","9");
			System.out.println("æ¤éä»»å¡id:["+OutTask.getTaskId()+"]æ±æ¥ä»»å¡éåå¨çº¿åºï¼"+(isFinsh==true?"æå!":"å¤±è´¥!"));
			}
			else if(!"æ´¾å°ç¡®è®¤ä»»å¡å®æ".equals(OutTask.getMesStatus())&&"ä»»å¡å®æ".equals(OutTask.getMachineStatus()))
			{
			//ä»»å¡å®ææ±æ¥æ´¾å° éååºåº-5
			List list=new ArrayList<>();
			String s[]=Chexiao.split(",");
			for(String item:s){
			list.add(item);
			}
			if(list.contains(OutTask.getTaskId())){
			//æ¤ä»»å¡å·²æ¤é
			boolean isFinsh=PaiFinsh(telecoms,OutTask,"æ´¾å°ç¡®è®¤ä»»å¡å®æ","æ±æ¥æ´¾å°éåºå®æå¤±è´¥ï¼","9");
			System.out.println("ä»»å¡id:["+OutTask.getTaskId()+"]æ±æ¥ä»»å¡éåå¨çº¿åºï¼"+(isFinsh==true?"æå!":"å¤±è´¥!"));
			}else{
			boolean isFinsh=PaiFinsh(telecoms,OutTask,"æ´¾å°ç¡®è®¤ä»»å¡å®æ","æ±æ¥æ´¾å°éåºå®æå¤±è´¥ï¼","5");
			System.out.println("ä»»å¡id:["+OutTask.getTaskId()+"]æ±æ¥ä»»å¡éåå¨çº¿åºï¼"+(isFinsh==true?"æå!":"å¤±è´¥!"));
			}
			//ä»»å¡å®ææ±æ¥æ´¾å° éååºåº-5
			boolean isFinsh=PaiFinsh(telecoms,OutTask,"æ´¾å°ç¡®è®¤ä»»å¡å®æ","æ±æ¥æ´¾å°éåºå®æå¤±è´¥ï¼","5");
			System.out.println("ä»»å¡id:["+OutTask.getTaskId()+"]æ±æ¥ä»»å¡éåå¨çº¿åºï¼"+(isFinsh==true?"æå!":"å¤±è´¥!"));
			}
			}
			} catch (Exception e) {
			@@ -444,8 +491,31 @@
			System.out.println("æ±æ¥å¼å¸¸ï¼ï¼288");
			return false;
			}

			}
			// // æ±æ¥ä»»å¡ æ±æ¥æåè¿åtrue ä»»å¡ï¼æ±æ¥æ å¿ï¼éè¯¯ä¿¡æ¯ï¼ä¿®æ¹ç¶æ
			// public boolean PaiFinsh(Telecoms telecoms, OutTasks outTask, String MachineStatus, String InfoContent,
			// String MachineStatusFlag) {
			// try {
			// boolean Results = true;
			// if (Results) {
			// outTask.setMesStatus(MachineStatus);
			// // outTask.setMachineStatus(MachineStatus);
			// outTask.setInfoContent("");
			// outTasksDao.save(outTask);
			// } else {
			// if (!InfoContent.equals(outTask.getInfoContent())) {
			// outTask.setInfoContent(InfoContent);
			// outTasksDao.save(outTask);
			// }
			// }
			// return Results;
			//
			// } catch (Exception e) {
			// // TODO: handle exception
			// System.out.println("æ±æ¥å¼å¸¸ï¼ï¼288");
			// return false;
			// }
			// }
			//è¿æ¥æ´¾å°httpæ¥å£
			public String httpapi(String methodUrl,String json){
			try {