WFC/be.wfc
2
0
Fork 0
Code Activity

fix: 修复任务日志

Browse Source
This commit is contained in:
caiyuchao
2025-01-10 14:27:54 +08:00
parent d5eb759303
commit 92358e29c7
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysRole.java
View File

@@ -1,15 +1,15 @@
package org.wfc.system.api.domain;
import java.util.Set;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.wfc.common.core.annotation.Excel;
import org.wfc.common.core.annotation.Excel.ColumnType;
import org.wfc.common.core.web.domain.BaseEntity;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import java.util.Set;
/**
* 角色表 sys_role
*
@@ -118,7 +118,6 @@ public class SysRole extends BaseEntity
this.roleKey = roleKey;
}
@NotNull(message = "显示顺序不能为空")
public Integer getRoleSort()
{
return roleSort;

16
wfc-modules/wfc-job/src/main/java/org/wfc/job/controller/SysJobLogController.java
View File

@@ -1,7 +1,5 @@
package org.wfc.job.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -15,10 +13,12 @@ import org.wfc.common.core.web.domain.AjaxResult;
import org.wfc.common.core.web.page.TableDataInfo;
import org.wfc.common.log.annotation.Log;
import org.wfc.common.log.enums.BusinessType;
import org.wfc.common.security.annotation.RequiresPermissions;
import org.wfc.job.domain.SysJobLog;
import org.wfc.job.service.ISysJobLogService;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 调度日志操作处理
*
@@ -34,7 +34,7 @@ public class SysJobLogController extends BaseController
/**
* 查询定时任务调度日志列表
*/
@RequiresPermissions("monitor:job:list")
// @RequiresPermissions("monitor:job:list")
@GetMapping("/list")
public TableDataInfo list(SysJobLog sysJobLog)
{
@@ -46,7 +46,7 @@ public class SysJobLogController extends BaseController
/**
* 导出定时任务调度日志列表
*/
@RequiresPermissions("monitor:job:export")
// @RequiresPermissions("monitor:job:export")
@Log(title = "任务调度日志", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SysJobLog sysJobLog)
@@ -59,7 +59,7 @@ public class SysJobLogController extends BaseController
/**
* 根据调度编号获取详细信息
*/
@RequiresPermissions("monitor:job:query")
// @RequiresPermissions("monitor:job:query")
@GetMapping(value = "/{jobLogId}")
public AjaxResult getInfo(@PathVariable Long jobLogId)
{
@@ -69,7 +69,7 @@ public class SysJobLogController extends BaseController
/**
* 删除定时任务调度日志
*/
@RequiresPermissions("monitor:job:remove")
// @RequiresPermissions("monitor:job:remove")
@Log(title = "定时任务调度日志", businessType = BusinessType.DELETE)
@DeleteMapping("/{jobLogIds}")
public AjaxResult remove(@PathVariable Long[] jobLogIds)
@@ -80,7 +80,7 @@ public class SysJobLogController extends BaseController
/**
* 清空定时任务调度日志
*/
@RequiresPermissions("monitor:job:remove")
// @RequiresPermissions("monitor:job:remove")
@Log(title = "调度日志", businessType = BusinessType.CLEAN)
@DeleteMapping("/clean")
public AjaxResult clean()