兰宝车间质量管理系统
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
疯狂的狮子Li
2023-01-13 0fc796b90d3f44b81ef30285edb897223df439f7 
 ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java


@@ -1,7 +1,7 @@


package com.xxl.job.admin.controller;




import com.xxl.job.admin.core.complete.XxlJobCompleter;


import com.xxl.job.admin.core.exception.XxlJobException;


import com.xxl.job.admin.core.complete.XxlJobCompleter;


import com.xxl.job.admin.core.model.XxlJobGroup;


import com.xxl.job.admin.core.model.XxlJobInfo;


import com.xxl.job.admin.core.model.XxlJobLog;


@@ -24,8 +24,8 @@


import org.springframework.web.bind.annotation.RequestParam;


import org.springframework.web.bind.annotation.ResponseBody;




import javax.annotation.Resource;


import javax.servlet.http.HttpServletRequest;


import jakarta.annotation.Resource;


import jakarta.servlet.http.HttpServletRequest;


import java.util.Date;


import java.util.HashMap;


import java.util.List;


@@ -60,7 +60,7 @@


            throw new XxlJobException(I18nUtil.getString("jobgroup_empty"));


        }




        model.addAttribute("JobGroupList" , jobGroupList);


        model.addAttribute("JobGroupList", jobGroupList);




        // 任务


        if (jobId > 0) {


@@ -69,7 +69,7 @@


                throw new RuntimeException(I18nUtil.getString("jobinfo_field_id") + I18nUtil.getString("system_unvalid"));


            }




            model.addAttribute("jobInfo" , jobInfo);


            model.addAttribute("jobInfo", jobInfo);




            // valid permission


            JobInfoController.validPermission(request, jobInfo.getJobGroup());


@@ -112,9 +112,9 @@




        // package result


        Map<String, Object> maps = new HashMap<String, Object>();


        maps.put("recordsTotal" , list_count);        // 总记录数


        maps.put("recordsFiltered" , list_count);    // 过滤后的总记录数


        maps.put("data" , list);                    // 分页列表


        maps.put("recordsTotal", list_count);        // 总记录数


        maps.put("recordsFiltered", list_count);    // 过滤后的总记录数


        maps.put("data", list);                    // 分页列表


        return maps;


    }




@@ -128,11 +128,11 @@


            throw new RuntimeException(I18nUtil.getString("joblog_logid_unvalid"));


        }




        model.addAttribute("triggerCode" , jobLog.getTriggerCode());


        model.addAttribute("handleCode" , jobLog.getHandleCode());


        model.addAttribute("executorAddress" , jobLog.getExecutorAddress());


        model.addAttribute("triggerTime" , jobLog.getTriggerTime().getTime());


        model.addAttribute("logId" , jobLog.getId());


        model.addAttribute("triggerCode", jobLog.getTriggerCode());


        model.addAttribute("handleCode", jobLog.getHandleCode());


        model.addAttribute("executorAddress", jobLog.getExecutorAddress());


        model.addAttribute("triggerTime", jobLog.getTriggerTime().getTime());


        model.addAttribute("logId", jobLog.getId());


        return "joblog/joblog.detail";


    }