|  | @@ -223,57 +223,6 @@ public class FormulaController {
 | 
											
												
													
														|  |          return R.fail("无数据");
 |  |          return R.fail("无数据");
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -    @GetMapping("/execute")
 |  | 
 | 
											
												
													
														|  | -    @ApiIgnore
 |  | 
 | 
											
												
													
														|  | -    public R execute() {
 |  | 
 | 
											
												
													
														|  | -        List<FormData> list = new ArrayList<>();
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("MILE<M1,M2,M3,M4,M5,M6,M7,M8,M9>","MILE","M1,M2,M3,M4,M5,M6,M7,M8,M9"));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("","M1","","TK0+700","TK0+750","TK0+800","TK0+850","TK0+900"));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("","M2","","0","0","0","0","0"));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("","M3","",""));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("","M4","",""));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("","M5","",""));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("","M6","",""));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("","M7","",""));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("","M8","",""));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("","M9","",""));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("1+1/2","ta",""));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("6+6","tb",""));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("5000/90","tc",""));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("FC.tree(trees,WP[snake])","t-f1",""));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("FC.avg(E[ele852])","ele100","ele852"));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("","ele852","",0,1,2,3,4,5,6));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("(E[a]+E[b])/2+E[c]*E[d]","szys","a,b,c,d"));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("","a","",0,2,2,2,2,2));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("","b","",0,3,3,6,3,8));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("","c","",0,5.5,3,7,3,9));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("","d","",0,10,7,2,5,5));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("","T","","true","true"));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("","F","","false","false"));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("","cp1","",10,20));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("","cp2","","false"));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("FC.ifelse(0<E[cp1]&&E[cp1]<=15,E[T],E[F])","FT","F,T,cp1"));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("","head","","www.","www."));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("","tail","","badu.com","jd.com"));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("E[head]+E[tail]","concat","head,tail"));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("","zms","","19","5"));
 |  | 
 | 
											
												
													
														|  | -        list.add(makeFd("FC.pow(E[zms],2)","pow","zms"));
 |  | 
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | -        this.service.execute(list,12563252L,45646L,1000L);
 |  | 
 | 
											
												
													
														|  | -       return R.success("执行完成");
 |  | 
 | 
											
												
													
														|  | -    }
 |  | 
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | -    public FormData makeFd(String fs,String code,String rely,Object ...obs){
 |  | 
 | 
											
												
													
														|  | -        Formula f= new Formula();
 |  | 
 | 
											
												
													
														|  | -        f.setRely(rely);
 |  | 
 | 
											
												
													
														|  | -        f.setFormula(fs);
 |  | 
 | 
											
												
													
														|  | -        List<ElementData> list = new ArrayList<>();
 |  | 
 | 
											
												
													
														|  | -        if(obs!=null){
 |  | 
 | 
											
												
													
														|  | -            list= Arrays.stream(obs).map(e->new ElementData(0,0,e)).collect(Collectors.toList());
 |  | 
 | 
											
												
													
														|  | -        }
 |  | 
 | 
											
												
													
														|  | -        return new FormData(code, list,f,"");
 |  | 
 | 
											
												
													
														|  | -    }
 |  | 
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  
 |  |  
 |