gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

报表调整，注释掉测试数据，返回接口真正的数据

Browse Source
This commit is contained in:
wangxin
2018-07-17 11:30:45 +08:00
parent 9400b7e089
commit 5666a93160
10 changed files with 478 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/com/nis/domain/report/ReportResult.java
View File

@@ -9,7 +9,12 @@
package com.nis.domain.report;
import java.io.UnsupportedEncodingException;
import java.lang.reflect.Type;
import java.net.URI;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map.Entry;
import javax.ws.rs.client.Client;
@@ -20,6 +25,14 @@ import javax.ws.rs.core.UriBuilder;
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonParseException;
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import com.nis.domain.Page;
import com.nis.domain.RestfulResult;
import com.nis.domain.log.SearchReport;
@@ -66,7 +79,7 @@ public class ReportResult<T extends BaseReport> extends RestfulResult{
public void setData(Page<T> data) {
this.data = data;
}
public ReportResult<T> getReport(String reportUrl, SearchReport searchCondition) throws MaatConvertException, UnsupportedEncodingException{
public String getReport(String reportUrl, SearchReport searchCondition) throws MaatConvertException, UnsupportedEncodingException{
// if(StringUtils.isBlank(searchCondition.getSearchService())){
// throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
// }
@@ -74,7 +87,9 @@ public class ReportResult<T extends BaseReport> extends RestfulResult{
ReportResult<T> bean = null;
UriBuilder builder=UriBuilder.fromPath(reportUrl);
builder.queryParam("searchBusinessType",searchCondition.getSearchBusinessType());
builder.queryParam("searchService",searchCondition.getSearchService());
if(StringUtils.isNotBlank(searchCondition.getSearchService())) {
builder.queryParam("searchService",searchCondition.getSearchService());
}
if(searchCondition.getSearchCondition()!=null){
for(Entry<String, Object> e:searchCondition.getSearchCondition().entrySet()){
builder.queryParam(e.getKey(),e.getValue());
@@ -108,12 +123,10 @@ public class ReportResult<T extends BaseReport> extends RestfulResult{
Response response= header.get();
if( response.getStatus() == 200){
result= response.readEntity(String.class);
Gson gson=Constants.gsonbuilder.create();
bean = gson.fromJson(result, new TypeToken<ReportResult<T>>(){
private static final long serialVersionUID = 7963055764864141968L;}.getType());
}else{
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+response.readEntity(String.class));
}
return bean;
return result;
}
}