Rename and merge controllers

[proteocache.git] / server / compbio / controllers / JobController.java

diff --git a/server/compbio/controllers/JobExecutionTimeController.java b/server/compbio/controllers/JobController.java
similarity index 65%
rename from server/compbio/controllers/JobExecutionTimeController.java
rename to server/compbio/controllers/JobController.java
index 71843a9..6bfe4ee 100644 (file)
--- a/server/compbio/controllers/JobExecutionTimeController.java
+++ b/server/compbio/controllers/JobController.java
@@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-
 import compbio.statistic.CassandraRequester;
 import compbio.cassandra.DataBase;
 import compbio.statistic.StatisticsProt;
@@ -20,10 +19,10 @@ import compbio.statistic.StatisticsProt;
  * @author Natasha Sherstneva
  */
 @Controller
-public class JobExecutionTimeController {
+public class JobController {
 
        @RequestMapping(value = "/stat/exectime/query", method = RequestMethod.GET)
-       public String initFindForm(Map<String, Object> model, Principal principal) {
+       public String initFormExecTime(Map<String, Object> 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);
@@ -35,9 +34,16 @@ public class JobExecutionTimeController {
                return "queryTimeExecution";
        }
 
+       @RequestMapping(value = "/job/query", method = RequestMethod.GET)
+       public String initFindForm(Map<String, Object> model, Principal principal) {
+               model.put("username", principal.getName());
+               model.put("value", "jp_NzBOJKo");
+               return "queryJobLog";
+       }
+
        @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<String, Object> model, Principal principal) {
+       public String findExecTimeData(@RequestParam("date1") String date1, @RequestParam("date2") String date2,
+                       @RequestParam(value = "option", required = false) String option, Map<String, Object> model, Principal principal) {
                model.put("username", principal.getName());
                final long startTime = System.currentTimeMillis();
 
@@ -57,4 +63,17 @@ public class JobExecutionTimeController {
                model.put("timeExecution", (endTime - startTime));
                return "/reportTimeExecution";
        }
+
+       @RequestMapping(value = "/job/results", method = RequestMethod.GET)
+       public String findJob(@RequestParam("IdJob") String jobid, Map<String, Object> model, Principal principal) {
+               model.put("username", principal.getName());
+               final long startTime = System.currentTimeMillis();
+               CassandraRequester cr = new CassandraRequester();
+               model.put("result", cr.readJobLog(jobid));
+               final long endTime = System.currentTimeMillis();
+               model.put("timeExecution", (endTime - startTime));
+               model.put("IdJob", jobid);
+               return "reportJobLog";
+       }
+       
 }