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-19 14:36:24 +08:00
parent de533189f5
commit 7eaf6d6508
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/nis/util/ConfigServiceUtil.java
View File

@@ -1,14 +1,17 @@
package com.nis.util; package com.nis.util;
import java.io.File; import java.io.File;
import java.net.URI;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.Entity; import javax.ws.rs.client.Entity;
import javax.ws.rs.client.Invocation.Builder; import javax.ws.rs.client.Invocation.Builder;
import javax.ws.rs.client.WebTarget; import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriBuilder;
import org.glassfish.jersey.media.multipart.FormDataMultiPart; import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.glassfish.jersey.media.multipart.file.FileDataBodyPart; import org.glassfish.jersey.media.multipart.file.FileDataBodyPart;
@@ -322,19 +325,19 @@ public class ConfigServiceUtil {
} }
String result = null; String result = null;
ReportResult<NtcPzReport> bean = null; ReportResult<NtcPzReport> bean = null;
StringBuffer url=new StringBuffer(Constants.SERVICE_URL+Constants.NTC_PZ_REPORT+"?"); UriBuilder builder=UriBuilder.fromPath(Constants.LOG_BASE_URL+Constants.NTC_PZ_REPORT);
url.append("searchBusinessType=").append(type) builder.queryParam("searchBusinessType",type);
.append("&searchService=").append(serviceIds).append("&searchCfgId=").append(ids); builder.queryParam("searchService",serviceIds);
if(StringUtils.isNotBlank(searchReportStartTime)){ builder.queryParam("searchCfgId",ids);
url.append("&searchReportStartTime=").append(searchReportStartTime); // builder.queryParam("searchReportStartTime",searchReportStartTime);
} // builder.queryParam("searchReportEndTime",searchReportEndTime);
if(StringUtils.isNotBlank(searchReportEndTime)){ URI uri=builder.build();
url.append("&searchReportEndTime=").append(searchReportEndTime);
}
//创建连接 //创建连接
WebTarget wt = ClientUtil.getWebTarger(url.toString()); ClientUtil.initClient();
logger.info("getReport url:"+url); Client client=ClientUtil.getClient();
Builder header = wt.request(MediaType.APPLICATION_JSON); WebTarget wt = client.target(uri);
logger.info("getReport url:"+uri.toString());
Builder header = wt.request();
Response response= header.get(); Response response= header.get();
if( response.getStatus() == 200){ if( response.getStatus() == 200){
result= response.readEntity(String.class); result= response.readEntity(String.class);

19
src/main/java/com/nis/web/controller/report/NtcPzReportController.java
View File

@@ -32,6 +32,7 @@ import com.nis.domain.basics.ServiceDictInfo;
import com.nis.domain.log.SearchReport; import com.nis.domain.log.SearchReport;
import com.nis.domain.report.NtcPzReport; import com.nis.domain.report.NtcPzReport;
import com.nis.domain.report.ReportResult; import com.nis.domain.report.ReportResult;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants; import com.nis.util.Constants;
import com.nis.util.DictUtils; import com.nis.util.DictUtils;
import com.nis.web.controller.BaseController; import com.nis.web.controller.BaseController;
@@ -62,18 +63,14 @@ public class NtcPzReportController extends BaseController{
break; break;
} }
} }
// ReportResultLog result=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, String.valueOf(compileId), String.valueOf(serviceId), sdf.format(startDate), sdf.format(endDate));
// if(result.getData()!=null&&result.getData().getList()!=null){
// model.addAttribute("data", result.getData().getList());
// }
data.put("compileId", compileId.intValue()); data.put("compileId", compileId.intValue());
data.put("sum", 1000l); ReportResult<NtcPzReport> result=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, String.valueOf(compileId), String.valueOf(serviceId), sdf.format(startDate), sdf.format(endDate));
// try { if(result.getData()!=null&&result.getData().getList()!=null&&result.getData().getList().size()>0){
// Thread.sleep(10000); data.put("sum", result.getData().getList().get(0).getSum().longValue());
// } catch (InterruptedException e) { }else {
// // TODO Auto-generated catch block data.put("sum", 0);
// e.printStackTrace(); }
// }
return data; return data;
} }
@RequestMapping("/ntcPzReport") @RequestMapping("/ntcPzReport")