diff --git a/bin/clean.bat b/bin/clean.bat new file mode 100644 index 000000000..4462a0110 --- /dev/null +++ b/bin/clean.bat @@ -0,0 +1,14 @@ +@echo off +echo. +echo [信息] 清理生成路径。 +echo. +pause +echo. + +cd %~dp0 +cd.. + +call mvn clean + +cd bin +pause \ No newline at end of file diff --git a/package.bat b/bin/package.bat similarity index 96% rename from package.bat rename to bin/package.bat index 7879e80d3..dc756fbd3 100644 --- a/package.bat +++ b/bin/package.bat @@ -6,6 +6,7 @@ pause echo. cd %~dp0 +cd.. call mvn clean package -Dmaven.test.skip=true diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java index a8669985a..1e98551cc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java @@ -4,7 +4,9 @@ import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -12,10 +14,10 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.base.AjaxResult; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.ExcelUtil; +import com.ruoyi.framework.web.base.BaseController; import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.quartz.domain.SysJobLog; import com.ruoyi.quartz.service.ISysJobLogService; -import com.ruoyi.framework.web.base.BaseController; /** * 璋冨害鏃ュ織鎿嶄綔澶勭悊 @@ -68,6 +70,14 @@ public class SysJobLogController extends BaseController return toAjax(jobLogService.deleteJobLogByIds(ids)); } + @RequiresPermissions("monitor:job:detail") + @GetMapping("/detail/{jobLogId}") + public String detail(@PathVariable("jobLogId") Long jobLogId, ModelMap mmap) + { + mmap.put("jobLog", jobLogService.selectJobLogById(jobLogId)); + return prefix + "/detail"; + } + @Log(title = "璋冨害鏃ュ織", businessType = BusinessType.CLEAN) @RequiresPermissions("monitor:job:remove") @PostMapping("/clean") diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index b6846d12d..f015f1a83 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -99,7 +99,6 @@ // 鍒锋柊琛ㄦ牸 refresh: function() { $("#bootstrap-table").bootstrapTable('refresh', { - url: $.table._option.url, silent: true }); }, @@ -135,7 +134,7 @@ $.table._option = options; _striped = $.common.isEmpty(options.striped) ? false : options.striped; _expandColumn = $.common.isEmpty(options.expandColumn) ? '1' : options.expandColumn; - var treeTable = $('#bootstrap-table').bootstrapTreeTable({ + var treeTable = $('#bootstrap-tree-table').bootstrapTreeTable({ code: options.code, // 鐢ㄤ簬璁剧疆鐖跺瓙鍏崇郴 parentCode: options.parentCode, // 鐢ㄤ簬璁剧疆鐖跺瓙鍏崇郴 type: 'get', // 璇锋眰鏂瑰紡锛*锛 @@ -528,7 +527,7 @@ dataType: "json", data: data, success: function(result) { - $.operate.saveSuccess(result); + $.operate.successCallback(result); } }; $.ajax(config) @@ -543,7 +542,7 @@ } $.modal.closeLoading(); }, - // 淇濆瓨缁撴灉鎻愮ずmsg + // 鎴愬姛缁撴灉鎻愮ずmsg锛堢埗绐椾綋鍏ㄥ眬鏇存柊锛 saveSuccess: function (result) { if (result.code == web_status.SUCCESS) { $.modal.msgReload("淇濆瓨鎴愬姛,姝ｅ湪鍒锋柊鏁版嵁璇风◢鍚庘︹", modal_status.SUCCESS); @@ -551,6 +550,25 @@ $.modal.alertError(result.msg); } $.modal.closeLoading(); + }, + // 鎴愬姛鍥炶皟鎵ц浜嬩欢锛堢埗绐椾綋闈欓粯鏇存柊锛 + successCallback: function(result) { + if (result.code == web_status.SUCCESS) { + if (window.parent.$("#bootstrap-table").length > 0) { + $.modal.close(); + window.parent.$.modal.msgSuccess(result.msg); + window.parent.$.table.refresh(); + } else if (window.parent.$("#bootstrap-tree-table").length > 0) { + $.modal.close(); + window.parent.$.modal.msgSuccess(result.msg); + window.parent.$.treeTable.refresh(); + } else { + $.modal.msgReload("淇濆瓨鎴愬姛,姝ｅ湪鍒锋柊鏁版嵁璇风◢鍚庘︹", modal_status.SUCCESS); + } + } else { + $.modal.alertError(result.msg); + } + $.modal.closeLoading(); } }, // 鏍￠獙灏佽澶勭悊 diff --git a/ruoyi-admin/src/main/resources/templates/monitor/job/detail.html b/ruoyi-admin/src/main/resources/templates/monitor/job/detail.html new file mode 100644 index 000000000..ec9c71248 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/monitor/job/detail.html @@ -0,0 +1,49 @@ + + + + + +
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/monitor/job/jobLog.html b/ruoyi-admin/src/main/resources/templates/monitor/job/jobLog.html index 1fc415d3e..cce505c44 100644 --- a/ruoyi-admin/src/main/resources/templates/monitor/job/jobLog.html +++ b/ruoyi-admin/src/main/resources/templates/monitor/job/jobLog.html @@ -57,7 +57,7 @@