|
@@ -74,9 +74,11 @@ public class JobController {
|
|
@GetMapping(value = "/jobs")
|
|
@GetMapping(value = "/jobs")
|
|
public String jobs (Model model){
|
|
public String jobs (Model model){
|
|
JSONArray jsonArray = jobService.getJobs(); // 所有的数据
|
|
JSONArray jsonArray = jobService.getJobs(); // 所有的数据
|
|
|
|
+ List<JSONObject> list = new ArrayList<>();
|
|
for (Object single : jsonArray){
|
|
for (Object single : jsonArray){
|
|
JSONObject temp = (JSONObject) single;
|
|
JSONObject temp = (JSONObject) single;
|
|
temp.put("create_time",new Timestamp(Long.parseLong(temp.get("create_time").toString()))); // 修改创建时间的格式 以便前段展示
|
|
temp.put("create_time",new Timestamp(Long.parseLong(temp.get("create_time").toString()))); // 修改创建时间的格式 以便前段展示
|
|
|
|
+ list.add(temp);
|
|
}
|
|
}
|
|
// Collections.sort(jsonArray, new Comparator<Object>() {
|
|
// Collections.sort(jsonArray, new Comparator<Object>() {
|
|
// @Override
|
|
// @Override
|
|
@@ -86,7 +88,7 @@ public class JobController {
|
|
// return ((Timestamp)jso1.get("create_time")).compareTo((Timestamp)jso2.get("create_time"));
|
|
// return ((Timestamp)jso1.get("create_time")).compareTo((Timestamp)jso2.get("create_time"));
|
|
// }
|
|
// }
|
|
// });
|
|
// });
|
|
- model.addAttribute("tasks",jsonArray);
|
|
|
|
|
|
+ model.addAttribute("tasks",list);
|
|
model.addAttribute("reportHost",reportHost);
|
|
model.addAttribute("reportHost",reportHost);
|
|
return "jobList";
|
|
return "jobList";
|
|
}
|
|
}
|