提交 50b26b6c 编写于 作者: Y yong.you

modify the bug http api

上级 ff85eb48
......@@ -4,6 +4,7 @@ import java.io.IOException;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
......@@ -78,8 +79,12 @@ public class Handler implements PageHandler<Context> {
Map<String, ErrorStatis> errors = visitor.getErrors();
errors = sortErrorStatis(errors);
model.setBugReport(bugReport);
model.setErrorStatis(errors);
if (payload.getAction() == Action.HTTP_JSON) {
new ClearBugReport().visitBugReport(bugReport);
}
model.setBugReport(bugReport);
model.setPage(ReportPage.BUG);
m_jspViewer.view(ctx, model);
}
......@@ -106,7 +111,6 @@ public class Handler implements PageHandler<Context> {
start = payload.getHistoryStartDate();
end = payload.getHistoryEndDate();
}
return m_reportService.queryBugReport(CatString.CAT, start, end);
}
......@@ -148,6 +152,24 @@ public class Handler implements PageHandler<Context> {
return errors;
}
public class ClearBugReport extends BaseVisitor{
@Override
public void visitDomain(Domain domain) {
String domainName = domain.getId();
Set<String> removes= new HashSet<String>();
Map<String, ExceptionItem> items = domain.getExceptionItems();
for (ExceptionItem item : items.values()){
if(!isBug(domainName, item.getId())){
removes.add(item.getId());
}
}
for(String remove:removes){
items.remove(remove);
}
}
}
public class BugReportVisitor extends BaseVisitor {
private String m_domain;
......
......@@ -6,10 +6,9 @@ import java.util.Map;
import com.dianping.cat.helper.CatString;
import com.dianping.cat.home.bug.entity.BugReport;
import com.dianping.cat.home.bug.transform.DefaultJsonBuilder;
import com.dianping.cat.report.page.AbstractReportModel;
import com.dianping.cat.report.page.NonPrexFieldNamingStrategy;
import com.dianping.cat.report.page.bug.Handler.ErrorStatis;
import com.google.gson.GsonBuilder;
public class Model extends AbstractReportModel<Action, Context> {
......@@ -38,10 +37,7 @@ public class Model extends AbstractReportModel<Action, Context> {
}
public String getBugs() {
GsonBuilder gsonBuilder = new GsonBuilder();
gsonBuilder.setFieldNamingStrategy(new NonPrexFieldNamingStrategy());
return gsonBuilder.create().toJson(m_errorStatis);
return new DefaultJsonBuilder().buildJson(m_bugReport);
}
@Override
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册