import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
-import java.util.List;
import java.util.Map;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
-
-import compbio.cassandra.DataBase;
+import compbio.engine.JobStatus;
+import compbio.cassandra.DateBean;
+import compbio.cassandra.TotalJobsStatisticBean;
import compbio.statistic.CassandraRequester;
import compbio.statistic.StatisticsProt;
* @author Natasha Sherstneva
*/
@Controller
-public class DailyStatisticsController {
+public class DailyStatisticsController extends BasicController {
- @RequestMapping(value = "/stat", method = RequestMethod.GET)
+ @RequestMapping(value = "/stat/jobs/query", method = RequestMethod.GET)
public String initFindForm(Map<String, Object> model) {
+ model.put("username", getPrincipalName());
Calendar cal = Calendar.getInstance();
String date2 = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DATE);
cal.add(Calendar.DATE, -3);
model.put("date1", date1);
model.put("date2", date2);
-
- return "queryJobStatistics";
+
+ return "query/JobStatistics";
}
- @RequestMapping(value = "/stat/query", method = RequestMethod.GET)
+ @RequestMapping(value = "/stat/jobsdaily/results", method = RequestMethod.GET)
public String findJobsInPeriod(@RequestParam("date1") String date1, @RequestParam("date2") String date2,
@RequestParam("option") String option, Map<String, Object> model) {
+ model.put("username", getPrincipalName());
final long startTime = System.currentTimeMillis();
CassandraRequester cr = new CassandraRequester();
}
model.put("date1", date1);
model.put("date2", date2);
- List<DataBase> res = cr.countJobs(date1, date2);
+ TotalJobsStatisticBean res = cr.countJobs(date1, date2);
model.put("result", res);
+ model.put("ndays", res.getDateTotal().size());
final long endTime = System.currentTimeMillis();
model.put("timeExecution", (endTime - startTime));
model.put("option", option);
return "/reportJobStatistics";
}
-
- @RequestMapping(value = "/stat/oneday", method = RequestMethod.GET)
- public String findJobsInOneDay(@RequestParam("date") String date, Map<String, Object> model) throws ParseException {
+
+ @RequestMapping(value = "/stat/jobsoneday/results", method = RequestMethod.GET)
+ public String findJobsInOneDay(@RequestParam("date") String date, @RequestParam("status") String status, Map<String, Object> model)
+ throws ParseException {
+ model.put("username", getPrincipalName());
final long startTime = System.currentTimeMillis();
+ String realdate;
final SimpleDateFormat formaterDDMMYY = new SimpleDateFormat("dd/MM/yyyy");
final SimpleDateFormat formaterYYMMDD = new SimpleDateFormat("yyyy/MM/dd");
- String date1 = formaterYYMMDD.format(new Date(formaterDDMMYY.parse(date).getTime()));
-
+ try {
+ long thetime = formaterYYMMDD.parse(date).getTime();
+ if (thetime < 0) {
+ realdate = date;
+ } else {
+ realdate = formaterDDMMYY.format(new Date(thetime));
+ }
+ } catch (ParseException e) {
+ realdate = date;
+ }
+
+ if (null == JobStatus.getJobStatus(status)) {
+ return "support/Notimplemented";
+ }
+
CassandraRequester cr = new CassandraRequester();
- //List<DataBase> r1 = cr.countJobs(date1, date1);
- List<DataBase> r = cr.readJobByDay(date);
+ // IMPORTANT: input should be suppied in the format: DD/MM/YYYY
+ DateBean r = cr.readJobByDay(realdate, JobStatus.getJobStatus(status));
model.put("results", r);
- model.put("njobs", r.size());
- model.put("date", date1);
+ if (r != null)
+ model.put("njobs", r.getJobidAndSeq().size());
+ model.put("date", realdate);
+ model.put("status", status);
final long endTime = System.currentTimeMillis();
model.put("timeExecution", (endTime - startTime));
- System.out.println("Request for date = " + date1 + ": " + r.size() + " jobs found");
return "/reportJobStatisticsOneDay";
}
}