diff --git a/dangan-common/src/main/java/com/da/common/enums/BusinessType.java b/dangan-common/src/main/java/com/da/common/enums/BusinessType.java index b69fd4c..2eaf4e5 100644 --- a/dangan-common/src/main/java/com/da/common/enums/BusinessType.java +++ b/dangan-common/src/main/java/com/da/common/enums/BusinessType.java @@ -56,4 +56,8 @@ public enum BusinessType * 清空数据 */ CLEAN, + /** + * 重提任务 + */ + TASKUP, } diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DangAnCollectController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DangAnCollectController.java index ef1afc5..f27225c 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/controller/DangAnCollectController.java +++ b/dangan-dangan/src/main/java/com/da/dangan/controller/DangAnCollectController.java @@ -1,8 +1,10 @@ package com.da.dangan.controller; +import com.da.common.annotation.Log; import com.da.common.config.RuoYiConfig; import com.da.common.core.controller.BaseController; import com.da.common.core.domain.AjaxResult; +import com.da.common.enums.BusinessType; import com.da.common.utils.file.FileUploadUtils; import com.da.common.utils.file.FileUtils; import com.da.dangan.domain.DaPicturesRecard; @@ -255,6 +257,7 @@ public class DangAnCollectController extends BaseController { /** * 创建识别任务 */ + @Log(title = "识别任务", businessType = BusinessType.INSERT) @PostMapping("/recongnize") public AjaxResult recognize(@RequestBody List picRecards) { //取所有id的集合 stream()有顺序 @@ -369,6 +372,7 @@ public class DangAnCollectController extends BaseController { /** * 任务重新识别 */ + @Log(title = "识别任务", businessType = BusinessType.TASKUP) @PostMapping("/reRecongnize") public AjaxResult reRecongnize(Long taskId) { try { diff --git a/dangan-system/src/main/java/com/da/system/domain/SysOperLog.java b/dangan-system/src/main/java/com/da/system/domain/SysOperLog.java index 63a0121..2a22715 100644 --- a/dangan-system/src/main/java/com/da/system/domain/SysOperLog.java +++ b/dangan-system/src/main/java/com/da/system/domain/SysOperLog.java @@ -1,10 +1,12 @@ package com.da.system.domain; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; import com.da.common.annotation.Excel; import com.da.common.annotation.Excel.ColumnType; import com.da.common.core.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + /** * 操作日志记录表 oper_log @@ -24,7 +26,7 @@ public class SysOperLog extends BaseEntity private String title; /** 业务类型(0其它 1新增 2修改 3删除) */ - @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据") + @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据,10=重新提交") private Integer businessType; /** 业务类型数组 */