X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Fcontrollers%2FJobExecutionTimeController.java;h=71843a9247a68a88caa2390061c01b8a302f3932;hb=6b59d49dbcca1616d74c2814d87faf47e3aa7cf2;hp=6170078a35ed9146b15e13250548bf921322e22d;hpb=8f30a2189dc9926985d82a113aba87711a91c244;p=proteocache.git diff --git a/server/compbio/controllers/JobExecutionTimeController.java b/server/compbio/controllers/JobExecutionTimeController.java index 6170078..71843a9 100644 --- a/server/compbio/controllers/JobExecutionTimeController.java +++ b/server/compbio/controllers/JobExecutionTimeController.java @@ -1,5 +1,6 @@ package compbio.controllers; +import java.security.Principal; import java.util.Calendar; import java.util.List; import java.util.Map; @@ -21,8 +22,9 @@ import compbio.statistic.StatisticsProt; @Controller public class JobExecutionTimeController { - @RequestMapping(value = "/exectime", method = RequestMethod.GET) - public String initFindForm(Map model) { + @RequestMapping(value = "/stat/exectime/query", method = RequestMethod.GET) + public String initFindForm(Map model, Principal principal) { + model.put("username", principal.getName()); Calendar cal = Calendar.getInstance(); String date2 = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DATE); cal.add(Calendar.DATE, -3); @@ -33,9 +35,10 @@ public class JobExecutionTimeController { return "queryTimeExecution"; } - @RequestMapping(value = "/exectime/query", method = RequestMethod.GET) + @RequestMapping(value = "/stat/exectime/results", method = RequestMethod.GET) public String findSequence(@RequestParam("date1") String date1, @RequestParam("date2") String date2, - @RequestParam(value="option", required=false) String option, Map model) { + @RequestParam(value="option", required=false) String option, Map model, Principal principal) { + model.put("username", principal.getName()); final long startTime = System.currentTimeMillis(); CassandraRequester sp = new CassandraRequester();