|
@@ -25,39 +25,42 @@ public class PaperService {
|
|
|
@Value("${report.host}")
|
|
|
private String reportHost;
|
|
|
private final String HTTP = "http://";
|
|
|
+ private final String CHARSET = "UTF-8";
|
|
|
|
|
|
|
|
|
public JSONArray getPaperData(){
|
|
|
RestTemplate rt = new RestTemplate();
|
|
|
- StringHttpMessageConverter stringHttpMessageConverter=new StringHttpMessageConverter(Charset.forName("UTF-8"));
|
|
|
+ StringHttpMessageConverter stringHttpMessageConverter=new StringHttpMessageConverter(Charset.forName(CHARSET));
|
|
|
List<HttpMessageConverter<?>> list=new ArrayList<HttpMessageConverter<?>>();
|
|
|
list.add(stringHttpMessageConverter);
|
|
|
rt.setMessageConverters(list);
|
|
|
- String str = HTTP+reportHost+"/Bug/api/paper/getPapers";
|
|
|
- JSONArray tasksJson = JSON.parseArray(rt.getForObject(str , String.class));
|
|
|
+ StringBuffer sb = new StringBuffer(HTTP);
|
|
|
+ sb.append(reportHost).append("/Bug/api/paper/getPapers");
|
|
|
+ JSONArray tasksJson = JSON.parseArray(rt.getForObject(sb.toString() , String.class));
|
|
|
return tasksJson;
|
|
|
}
|
|
|
|
|
|
public JSONArray getJobsByPaperId(String paperId){
|
|
|
RestTemplate rt = new RestTemplate();
|
|
|
- StringHttpMessageConverter stringHttpMessageConverter=new StringHttpMessageConverter(Charset.forName("UTF-8"));
|
|
|
+ StringHttpMessageConverter stringHttpMessageConverter=new StringHttpMessageConverter(Charset.forName(CHARSET));
|
|
|
List<HttpMessageConverter<?>> list=new ArrayList<HttpMessageConverter<?>>();
|
|
|
list.add(stringHttpMessageConverter);
|
|
|
rt.setMessageConverters(list);
|
|
|
- String str = HTTP+reportHost+"/Bug/api/job/getJobsByPaper?paperId="+paperId;
|
|
|
- JSONArray tasksJson = JSON.parseArray(rt.getForObject(str , String.class));
|
|
|
+ StringBuffer sb = new StringBuffer(HTTP);
|
|
|
+ sb.append(reportHost).append("/Bug/api/job/getJobsByPaper?paperId=").append(paperId);
|
|
|
+ JSONArray tasksJson = JSON.parseArray(rt.getForObject(sb.toString() , String.class));
|
|
|
return tasksJson;
|
|
|
}
|
|
|
|
|
|
public JSONObject deletePaper (String paperId){
|
|
|
RestTemplate template = new RestTemplate();
|
|
|
- String url = HTTP+reportHost+"/Bug/api/paper/delPaper";
|
|
|
+ StringBuffer url = new StringBuffer(HTTP).append(reportHost).append("/Bug/api/paper/delPaper");
|
|
|
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<String, Object>();
|
|
|
paramMap.add("paperId", paperId);
|
|
|
template.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));
|
|
|
HttpHeaders headers = new HttpHeaders();
|
|
|
HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity<MultiValueMap<String, Object>>(paramMap,headers);
|
|
|
- ResponseEntity<String> response2 = template.postForEntity(url, httpEntity, String.class);
|
|
|
+ ResponseEntity<String> response2 = template.postForEntity(url.toString(), httpEntity, String.class);
|
|
|
JSONObject tasksJson = JSON.parseObject(response2.getBody());
|
|
|
// JSONObject resJson = JSON.parseObject(tasksJson.getString("json"));
|
|
|
// resJson.put("paperId", tasksJson.getString("paper_id"));
|