diff --git a/cat-home/src/main/java/com/dianping/cat/report/view/DomainNavManager.java b/cat-home/src/main/java/com/dianping/cat/report/view/DomainNavManager.java index 2a5a6bb838c8c70c55723cf082a31f011e4258e2..1d9202bb624d6aaa5eaec761fb17f4f467f93f84 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/view/DomainNavManager.java +++ b/cat-home/src/main/java/com/dianping/cat/report/view/DomainNavManager.java @@ -31,6 +31,10 @@ public class DomainNavManager implements Initializable { return m_projects.get(domain); } + public static Map getProjects() { + return m_projects; + } + public static Map getDepartment(Collection domains) { Map result = new TreeMap(); diff --git a/cat-home/src/main/java/com/dianping/cat/system/page/project/Handler.java b/cat-home/src/main/java/com/dianping/cat/system/page/project/Handler.java index ff7bd5c3cb504a5b727de1576a42e849549547de..b59deb5c59a66100a7741d22602cf89348f98c8f 100644 --- a/cat-home/src/main/java/com/dianping/cat/system/page/project/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/system/page/project/Handler.java @@ -12,6 +12,7 @@ import com.dainping.cat.consumer.dal.report.Project; import com.dainping.cat.consumer.dal.report.ProjectDao; import com.dainping.cat.consumer.dal.report.ProjectEntity; import com.dianping.cat.Cat; +import com.dianping.cat.report.view.DomainNavManager; import com.dianping.cat.system.SystemPage; import com.site.dal.jdbc.DalException; import com.site.lookup.annotation.Inject; @@ -27,6 +28,9 @@ public class Handler implements PageHandler { @Inject private ProjectDao m_projectDao; + @Inject + private DomainNavManager m_domainNavManager; + @Override @PayloadMeta(Payload.class) @InboundActionMeta(name = "project") @@ -59,7 +63,8 @@ public class Handler implements PageHandler { m_jspViewer.view(ctx, model); } - private void updateProject(Payload payload) { + @SuppressWarnings("static-access") + private void updateProject(Payload payload) { int projectId = payload.getProjectId(); String department = payload.getDepartment(); String email = payload.getEmail(); @@ -78,6 +83,7 @@ public class Handler implements PageHandler { try { m_projectDao.updateByPK(project, ProjectEntity.UPDATESET_FULL); + m_domainNavManager.getProjects().put(project.getDomain(), project); } catch (DalException e) { Cat.logError(e); } @@ -121,7 +127,7 @@ public class Handler implements PageHandler { return productLine1.compareTo(productLine2); } } else { - return department1.compareTo(productLine2); + return department1.compareTo(department2); } } diff --git a/cat-home/src/main/resources/META-INF/plexus/components.xml b/cat-home/src/main/resources/META-INF/plexus/components.xml index ad8fd6a31eb594d84c95be04fa49d0bba9ce46e3..3730067de87e0d940b3e13ce3d3551d1ff40b776 100755 --- a/cat-home/src/main/resources/META-INF/plexus/components.xml +++ b/cat-home/src/main/resources/META-INF/plexus/components.xml @@ -2504,6 +2504,9 @@ com.dainping.cat.consumer.dal.report.ProjectDao + + com.dianping.cat.report.view.DomainNavManager + @@ -2519,6 +2522,15 @@ + + com.dianping.cat.report.view.DomainNavManager + com.dianping.cat.report.view.DomainNavManager + + + com.dainping.cat.consumer.dal.report.ProjectDao + + + com.dianping.cat.system.alarm.AlarmRuleCreator com.dianping.cat.system.alarm.AlarmRuleCreator diff --git a/cat-home/src/main/webapp/WEB-INF/tags/historyReport.tag b/cat-home/src/main/webapp/WEB-INF/tags/historyReport.tag index 7d35354cc082ec86969485cffa9cd7f274c3b03d..c77c557b169109d33061a94763eac500e2ede727 100755 --- a/cat-home/src/main/webapp/WEB-INF/tags/historyReport.tag +++ b/cat-home/src/main/webapp/WEB-INF/tags/historyReport.tag @@ -39,16 +39,16 @@
Current Domain:  ${model.department}   >  ${model.projectLine}    >  ${model.domain}   -   [  ShowDomain  ]   +   [  More  ]   diff --git a/cat-home/src/main/webapp/WEB-INF/tags/hourlyReport.tag b/cat-home/src/main/webapp/WEB-INF/tags/hourlyReport.tag index c90ea8cd2db1af0d0b7e293c820f68ca5d828553..e21a6409d4c7ab5c4236d90fa11c5f40f794405b 100755 --- a/cat-home/src/main/webapp/WEB-INF/tags/hourlyReport.tag +++ b/cat-home/src/main/webapp/WEB-INF/tags/hourlyReport.tag @@ -29,16 +29,16 @@
Current Domain:  ${model.department}   >  ${model.projectLine}    >  ${model.domain}   -   [  ShowDomain  ]   +   [  More  ]   diff --git a/cat-home/src/main/webapp/css/report.css b/cat-home/src/main/webapp/css/report.css index 165ec3479e81900a0e2318c2eef2bc2d18184174..b3e6ba59eb5240d313da99fe2ea7a8362037bf2c 100755 --- a/cat-home/src/main/webapp/css/report.css +++ b/cat-home/src/main/webapp/css/report.css @@ -81,7 +81,7 @@ .report .position{ padding:4px; - padding-left:8px; + padding-left:10px; font-weight: bold; font-size: 14px; background: lightBlue; diff --git a/cat-home/src/main/webapp/jsp/system/projectUpdate.jsp b/cat-home/src/main/webapp/jsp/system/projectUpdate.jsp index fa38a05b90a55838fe41f7e4a0c9503c7f44462f..6fef0d7e07a318d0ff5c09c96306795d3d8fd8f8 100644 --- a/cat-home/src/main/webapp/jsp/system/projectUpdate.jsp +++ b/cat-home/src/main/webapp/jsp/system/projectUpdate.jsp @@ -21,22 +21,27 @@ 项目名称 ${model.project.domain} + 所属部门 + （一级分类）建议填写，主站、手机、团购、搜索、架构 产品线 - - - 项目组邮件(多个，逗号分割) - + （二级分类）由各自业务线决定,建议字数小于4 负责人 + 可选字段 + + + 项目组邮件 + + 可选字段(多个，逗号分割)