diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/event/JspFile.java b/cat-home/src/main/java/com/dianping/cat/report/page/event/JspFile.java index e27abc3b6b842ec717af186a31baade0b4727263..c4022c358260bc04b24a32c98b2a7b236476871e 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/event/JspFile.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/event/JspFile.java @@ -5,7 +5,7 @@ public enum JspFile { GRAPHS("/jsp/report/event_graphs.jsp"), - MOBILE("/jsp/report/mobile.jsp"); + MOBILE("/jsp/report/event_mobile.jsp"); private String m_path; diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/event/JspViewer.java b/cat-home/src/main/java/com/dianping/cat/report/page/event/JspViewer.java index 1931f700079522374e58eac0be6feba3b96f248b..684bae21e0ae3d3a0ecb227b52e08e57a04650f6 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/event/JspViewer.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/event/JspViewer.java @@ -13,6 +13,8 @@ public class JspViewer extends BaseJspViewer return JspFile.VIEW.getPath(); case GRAPHS: return JspFile.GRAPHS.getPath(); + case MOBILE: + return JspFile.MOBILE.getPath(); } throw new RuntimeException("Unknown action: " + action); diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/problem/Action.java b/cat-home/src/main/java/com/dianping/cat/report/page/problem/Action.java index f20e73bfb70f8baf6d22a28b303c31ad5a98459f..21bb1b2670da91f4bb87c5345ed0c93244ed6aa1 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/problem/Action.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/problem/Action.java @@ -5,7 +5,9 @@ public enum Action implements com.site.web.mvc.Action { THREAD("thread"), - DETAIL("detail"); + DETAIL("detail"), + + MOBILE("mobile"); private String m_name; diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/problem/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/problem/Handler.java index 2211b7da81170e59949085481b6ae4a2558ad330..1610ec883a1b776b6409dd08075966ae58beef8d 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/problem/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/problem/Handler.java @@ -17,6 +17,7 @@ import com.dianping.cat.report.page.model.spi.ModelPeriod; import com.dianping.cat.report.page.model.spi.ModelRequest; import com.dianping.cat.report.page.model.spi.ModelResponse; import com.dianping.cat.report.page.model.spi.ModelService; +import com.google.gson.Gson; import com.site.lookup.annotation.Inject; import com.site.lookup.util.StringUtils; import com.site.web.mvc.PageHandler; @@ -144,7 +145,13 @@ public class Handler implements PageHandler { report = getAllIpReport(payload); model.setReport(report); model.setLongDate(payload.getDate()); - model.setAllStatistics(new ProblemStatistics().displayByAllIps(report, payload)); + ProblemStatistics allStatistics = new ProblemStatistics().displayByAllIps(report, payload); + model.setAllStatistics(allStatistics); + if (payload.getAction() == Action.MOBILE) { + Gson gson = new Gson(); + String response = gson.toJson(allStatistics); + model.setMobileResponse(response); + } } else { switch (payload.getAction()) { case GROUP: diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/problem/JspFile.java b/cat-home/src/main/java/com/dianping/cat/report/page/problem/JspFile.java index 1f06fa7983108d5f51f5594439c6db8b87bddf34..2820a89dbc2ff9df64a105859148aaaf875f9d22 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/problem/JspFile.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/problem/JspFile.java @@ -6,7 +6,9 @@ public enum JspFile { THREAD("/jsp/report/problemThread.jsp"), - DETAIL("/jsp/report/problemDetail.jsp") + DETAIL("/jsp/report/problemDetail.jsp"), + + MOBILE("/jsp/report/problem_mobile.jsp"); ; private String m_path; diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/problem/JspViewer.java b/cat-home/src/main/java/com/dianping/cat/report/page/problem/JspViewer.java index ab62dfa6928458d76a30ecd53e21c175e372e9f5..8360c073f2a4efdff42d8b3b89fb9792a0efdc8b 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/problem/JspViewer.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/problem/JspViewer.java @@ -15,6 +15,8 @@ public class JspViewer extends BaseJspViewer return JspFile.THREAD.getPath(); case DETAIL: return JspFile.DETAIL.getPath(); + case MOBILE: + return JspFile.MOBILE.getPath(); } throw new RuntimeException("Unknown action: " + action); diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/problem/Model.java b/cat-home/src/main/java/com/dianping/cat/report/page/problem/Model.java index 188bed839b10a826578fff8751970ee031d01b04..4b911d7d9b8fdd4b6c02fca02922da4ce70c959e 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/problem/Model.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/problem/Model.java @@ -34,6 +34,8 @@ public class Model extends AbstractReportModel { private ProblemStatistics m_allStatistics; + private String m_mobileResponse; + public Model(Context ctx) { super(ctx); } @@ -187,4 +189,12 @@ public class Model extends AbstractReportModel { m_threshold = threshold; } + public String getMobileResponse() { + return m_mobileResponse; + } + + public void setMobileResponse(String mobileResponse) { + m_mobileResponse = mobileResponse; + } + } diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/transaction/JspFile.java b/cat-home/src/main/java/com/dianping/cat/report/page/transaction/JspFile.java index 80a1e74da1af57b4144ec694f42907e0c1b2a2e1..0a72cf30eb120d10492088bf9a06dc756e094b08 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/transaction/JspFile.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/transaction/JspFile.java @@ -5,7 +5,7 @@ public enum JspFile { GRAPHS("/jsp/report/transaction_graphs.jsp"), - MOBILE("/jsp/report/mobile.jsp"); + MOBILE("/jsp/report/transaction_mobile.jsp"); private String m_path; diff --git a/cat-home/src/main/webapp/jsp/report/event_mobile.jsp b/cat-home/src/main/webapp/jsp/report/event_mobile.jsp new file mode 100755 index 0000000000000000000000000000000000000000..0931f457ed1cf3cd7f51d858fd53ffa4dc1c5513 --- /dev/null +++ b/cat-home/src/main/webapp/jsp/report/event_mobile.jsp @@ -0,0 +1,4 @@ +<%@ page session="false" language="java" pageEncoding="UTF-8" %> +<%@ page contentType="text/html; charset=utf-8"%> + +${model.mobileResponse} \ No newline at end of file diff --git a/cat-home/src/main/webapp/jsp/report/heartbeat_mobile.jsp b/cat-home/src/main/webapp/jsp/report/heartbeat_mobile.jsp new file mode 100755 index 0000000000000000000000000000000000000000..219fc0ce18e06e29e9376b91212d7e5b3f6ae067 --- /dev/null +++ b/cat-home/src/main/webapp/jsp/report/heartbeat_mobile.jsp @@ -0,0 +1,4 @@ +<%@ page session="false" language="java" pageEncoding="UTF-8" %> +<%@ page contentType="text/html; charset=utf-8"%> + +${model.mobileResponse} \ No newline at end of file diff --git a/cat-home/src/main/webapp/jsp/report/problem_mobile.jsp b/cat-home/src/main/webapp/jsp/report/problem_mobile.jsp new file mode 100755 index 0000000000000000000000000000000000000000..d20aa4a464ba66f9d4135acc326cf7735b26a5f6 --- /dev/null +++ b/cat-home/src/main/webapp/jsp/report/problem_mobile.jsp @@ -0,0 +1,4 @@ +<%@ page session="false" language="java" pageEncoding="UTF-8" %> +<%@ page contentType="text/html; charset=utf-8"%> + +${model.mobileResponse} \ No newline at end of file diff --git a/cat-home/src/main/webapp/jsp/report/mobile.jsp b/cat-home/src/main/webapp/jsp/report/transaction_mobile.jsp similarity index 100% rename from cat-home/src/main/webapp/jsp/report/mobile.jsp rename to cat-home/src/main/webapp/jsp/report/transaction_mobile.jsp