import java.util.List;
import java.util.Map;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.InitBinder;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
@RequestMapping(value = "/stat", method = RequestMethod.GET)
public String initFindForm(Map<String, Object> model) {
- return "QueryJobsByDate";
+ return "queryJobStatistics";
}
@RequestMapping(value = "/stat/query", method = RequestMethod.GET)
- public String findJobsInPeriod(@RequestParam("data1") String date1, @RequestParam("data2") String date2,
+ public String findJobsInPeriod(@RequestParam("date1") String date1, @RequestParam("date2") String date2,
@RequestParam("option") String option, Map<String, Object> model) {
final long startTime = System.currentTimeMillis();
CassandraRequester cr = new CassandraRequester();
- if (option.equals("AllDates")) {
+ if (option.equals("AllDates,off")) {
Calendar cal = Calendar.getInstance();
date1 = StatisticsProt.DateFormatYYMMDD(cr.earliestDate());
date2 = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH);
final long endTime = System.currentTimeMillis();
model.put("timeExecution", (endTime - startTime));
model.put("flag", option);
- return "/ReportJobsByDate";
+ return "/reportJobStatistics";
}
@RequestMapping(value = "/stat/oneday", method = RequestMethod.GET)
String date1 = formaterYYMMDD.format(new Date(formaterDDMMYY.parse(date).getTime()));
CassandraRequester cr = new CassandraRequester();
- List<DataBase> r1 = cr.countJobs(date1, date1);
+ //List<DataBase> r1 = cr.countJobs(date1, date1);
List<DataBase> r = cr.readJobByDay(date);
model.put("results", r);
model.put("njobs", r.size());
final long endTime = System.currentTimeMillis();
model.put("timeExecution", (endTime - startTime));
System.out.println("Request for date = " + date1 + ": " + r.size() + " jobs found");
- return "/ReportJobsOfOneDay";
+ return "/reportJobStatisticsOneDay";
}
}