3.4.0 日志

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -1947,21 +1947,14 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             BasicOperationLog basicOperationLog = new BasicOperationLog();
             basicOperationLog.setId(SystemConstant.getDbUuid());
             basicOperationLog.setSchoolId(sysUser.getSchoolId());
-            basicOperationLog.setOrgId(sysUser.getOrgId());
             BasicExam basicExam = basicExamService.getById(examTask.getExamId());
             String examName = basicExam == null ? "-" : basicExam.getName();
             String courseName = examTask.getCourseName() + "(" + examTask.getCourseCode() + ")";
             basicOperationLog.setDetail(String.format("考试[%s]，课程[%s]，试卷编号[%s]，题卡或试卷[%s]，卷型[%s]", examName, courseName, examTask.getPaperNumber(), type.equals("paper") ? "试卷" : "题卡", paperType));
-            basicOperationLog.setLevel(LevelEnum.SECONDARY);
-            basicOperationLog.setCustomizedOperationType(CustomizedOperationTypeEnum.PREVIEW);
-            basicOperationLog.setOperationType(OperationTypeEnum.UN_KNOW);
-            basicOperationLog.setOperationUnit(OperationUnitEnum.UN_KNOW);
-            basicOperationLog.setSystemType(SystemEnum.DISTRIBUTED_PRINT);
+            basicOperationLog.setOperationType(OperationTypeEnum.PREVIEW);
             basicOperationLog.setPrivilegeId(ServletUtil.getCurrentPrivilegeId());
-            basicOperationLog.setRunTime(0L);
             basicOperationLog.setRunStatus("成功");
             basicOperationLog.setUserId(sysUser.getId());
-            basicOperationLog.setUserName(sysUser.getLoginName());
             basicOperationLog.setIp(ServletUtil.getIP());
             basicOperationLog.setCreateTime(System.currentTimeMillis());
             basicOperationLogService.save(basicOperationLog);

distributed-print/install/mysql/upgrade/3.4.0.sql

@@ -8,13 +8,18 @@ DROP COLUMN `method`,
 DROP COLUMN `clazz_name`,
 DROP COLUMN `system_type`,
 DROP COLUMN `operation_unit`,
-DROP COLUMN `customized_operation_type`,
+DROP COLUMN `operation_type`,
 DROP COLUMN `level`,
 DROP COLUMN `org_id`,
-ADD COLUMN `function_name` VARCHAR(100) NULL COMMENT '操作名称' AFTER `operation_type`,
-CHANGE COLUMN `privilege_id` `privilege_id` BIGINT NULL DEFAULT NULL COMMENT '权限菜单id' AFTER `school_id`,
-CHANGE COLUMN `detail` `detail` MEDIUMTEXT CHARACTER SET 'utf8mb4' NULL COMMENT '日志详情' AFTER `url`,
-CHANGE COLUMN `operation_type` `operation_type` VARCHAR(32) CHARACTER SET 'utf8mb4' NULL DEFAULT NULL COMMENT '操作类型（OTHER(“其它”),SELECT(\"查询\"),EDIT(\"新增或更新\"),DELETE(\"删除\")）' ,
+ADD COLUMN `function_name` VARCHAR(100) NULL COMMENT '功能名称' AFTER `operation_type`,
+CHANGE COLUMN `user_id` `user_id` BIGINT NOT NULL COMMENT '用户对象id' AFTER `school_id`,
+CHANGE COLUMN `ip` `ip` VARCHAR(32) CHARACTER SET 'utf8mb4' NOT NULL COMMENT 'ip地址' AFTER `user_id`,
+CHANGE COLUMN `privilege_id` `privilege_id` BIGINT NULL DEFAULT NULL COMMENT '权限菜单id' AFTER `ip`,
+CHANGE COLUMN `customized_operation_type` `operation_type` VARCHAR(32) CHARACTER SET 'utf8mb4' NOT NULL COMMENT '自定义记录日志操作类型（LOGIN(\"用户登录\"),LOGOUT(\"用户登出\"),ADD(\"新增\"),DELETE(\"删除\"),UPDATE(\"修改\"),IMPORT(\"导入\"),EXPORT(\"导出\"),UN_KNOW(\"未知\")）' AFTER `privilege_id`,
+CHANGE COLUMN `school_id` `school_id` BIGINT NULL COMMENT '学校id' ,
+CHANGE COLUMN `detail` `detail` MEDIUMTEXT CHARACTER SET 'utf8mb4' NULL COMMENT '日志详情' ,
 DROP INDEX `operation_log_idx` ,
-ADD INDEX `operation_log_idx` USING BTREE (`school_id`, `privilege_id`, `user_id`, `create_time`) VISIBLE;
-;
+ADD INDEX `operation_log_idx` USING BTREE (`school_id`, `user_id`, `privilege_id`, `operation_type`, `create_time`);
+
+update basic_operation_log t set t.operation_type = 'SAVE' where t.operation_type = 'EDIT';
+update basic_operation_log t set t.operation_type = 'OTHER' where t.operation_type = 'UN_KNOW';

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicCardRuleController.java

@@ -8,7 +8,7 @@ import com.qmth.distributed.print.business.service.BasicCardRuleService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;
@@ -97,7 +97,7 @@ public class BasicCardRuleController {
      */
     @ApiOperation(value = "新增/修改")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result save(@RequestBody BasicCardRule cardRule) {
         return ResultUtil.ok(basicCardRuleService.saveCardRule(cardRule));
     }
@@ -110,7 +110,7 @@ public class BasicCardRuleController {
      */
     @ApiOperation(value = "删除")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result delete(@RequestBody BasicCardRule cardRule) {
         return ResultUtil.ok(basicCardRuleService.delete(cardRule));
     }
@@ -120,7 +120,7 @@ public class BasicCardRuleController {
      */
     @ApiOperation(value = "启用/禁用")
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result enable(@RequestBody BasicCardRule basicCardRule) {
         return ResultUtil.ok(basicCardRuleService.enable(basicCardRule.getId(), basicCardRule.getEnable()));
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicClazzController.java

@@ -6,7 +6,7 @@ import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.bean.params.BasicClazzParams;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.service.BasicClazzService;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
@@ -50,7 +50,7 @@ public class BasicClazzController {
     @ApiOperation(value = "班级基本信息管理-新增/编辑")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result saveBasicClazz(@Valid @RequestBody BasicClazzParams basicClazzParams, BindingResult bindingResult) throws IllegalAccessException {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -62,7 +62,7 @@ public class BasicClazzController {
     @ApiOperation(value = "班级基本信息管理-批量删除")
     @RequestMapping(value = "/delete_batch", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result deleteBasicClazz(@ApiParam(value = "选择的要删除的班级id集合", required = true) @RequestParam List<String> idList) {
         return ResultUtil.ok(basicClazzService.removeBasicClazzBatch(idList.stream().map(SystemConstant::convertIdToLong).collect(Collectors.toList())));
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicCollegeController.java

@@ -8,7 +8,7 @@ import com.qmth.teachcloud.common.bean.result.BasicCollegeResult;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.service.BasicCollegeService;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
@@ -49,7 +49,7 @@ public class BasicCollegeController {
     @ApiOperation(value = "学生学院管理-新增/编辑")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result saveBasicCollege(@Valid @RequestBody BasicCollegeParams basicCollegeParams, BindingResult bindingResult) throws IllegalAccessException {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -61,7 +61,7 @@ public class BasicCollegeController {
     @ApiOperation(value = "学生学院管理-删除")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result deleteBasicCollege(@ApiParam(value = "学生学院id", required = true) @RequestParam List<String> idList) {
         if (idList.size() == 0) {
             throw ExceptionResultEnum.ERROR.exception("请选择要删除的学生学院");

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicCourseController.java

@@ -3,15 +3,12 @@ package com.qmth.distributed.print.api;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.service.PrintCommonService;
-import com.qmth.distributed.print.business.service.TeachCourseService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.bean.params.BasicCourseParams;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicCourse;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
-import com.qmth.teachcloud.common.enums.log.LevelEnum;
 import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.service.BasicCourseService;
 import com.qmth.teachcloud.common.util.Result;
@@ -57,7 +54,7 @@ public class BasicCourseController {
     @ApiOperation(value = "模糊查询")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     public Result query(@RequestParam(value = "param", required = false) String param, @RequestParam(value = "printPlanId", required = false) List<String> printPlanId,
-            @RequestParam(value = "teachingRoomId", required = false) Long teachingRoomId) {
+                        @RequestParam(value = "teachingRoomId", required = false) Long teachingRoomId) {
         if (Objects.isNull(printPlanId)) {
             printPlanId = new ArrayList<>();
         }
@@ -68,7 +65,7 @@ public class BasicCourseController {
 
     @ApiOperation(value = "删除")
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result remove(@RequestBody BasicCourse course) {
         boolean isSuccess = printCommonService.remove(course.getId());
         return ResultUtil.ok(isSuccess);
@@ -76,11 +73,11 @@ public class BasicCourseController {
 
     @ApiOperation(value = "课程管理-查询")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = Result.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
     public Result findBasicCourseList(@ApiParam(value = "所属机构id") @RequestParam(required = false) String belongOrgId, @ApiParam(value = "课程名称（模糊查询）") @RequestParam(required = false) String courseName,
-            @ApiParam(value = "创建时间（起始位置）") @RequestParam(required = false) String startCreateTime, @ApiParam(value = "创建时间（终止位置）") @RequestParam(required = false) String endCreateTime,
-            @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-            @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+                                      @ApiParam(value = "创建时间（起始位置）") @RequestParam(required = false) String startCreateTime, @ApiParam(value = "创建时间（终止位置）") @RequestParam(required = false) String endCreateTime,
+                                      @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                      @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         return ResultUtil.ok(basicCourseService.basicCoursePage(SystemConstant.convertIdToLong(belongOrgId), courseName,
                 SystemConstant.convertIdToLong(startCreateTime), SystemConstant.convertIdToLong(endCreateTime),
                 pageNumber, pageSize));
@@ -88,8 +85,8 @@ public class BasicCourseController {
 
     @ApiOperation(value = "课程管理-新增/编辑")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "更新成功", response = EditResult.class) })
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = EditResult.class)})
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     @Transactional
     public Result saveBasicCourse(@Valid @RequestBody BasicCourseParams basicCourseParams, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -105,21 +102,21 @@ public class BasicCourseController {
 
     @ApiOperation(value = "课程管理-批量删除")
     @RequestMapping(value = "/delete_batch", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "删除成功", response = EditResult.class) })
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = EditResult.class)})
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result enableBasicCourse(@ApiParam(value = "选择的要删除的课程id集合", required = true) @RequestParam List<Long> idList) {
         return ResultUtil.ok(basicCourseService.removeBasicCourseBatch(idList));
     }
 
     @ApiOperation(value = "课程管理-根据查询条件批量删除")
     @RequestMapping(value = "/delete_by_query", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "删除成功", response = EditResult.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = EditResult.class)})
     @OperationLogDetail(detail =
             "根据查询条件[所属机构id[{{belongOrgId}}],课程名称（模糊查询）[{{courseName}}],创建时间（起始位置）[{{startCreateTime}}],"
-                    + "创建时间（终止位置）[{{endCreateTime}}],状态[{{enable}}],启用&禁用操作[{{enableOperate}}]]批量启用/禁用课程", level = LevelEnum.TERTIARY, operationType = OperationTypeEnum.EDIT, customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+                    + "创建时间（终止位置）[{{endCreateTime}}],状态[{{enable}}],启用&禁用操作[{{enableOperate}}]]批量启用/禁用课程", operationType = OperationTypeEnum.DELETE)
     public Result enableBasicCourseByQuery(@ApiParam(value = "所属机构id") @RequestParam(required = false) String belongOrgId,
-            @ApiParam(value = "课程名称（模糊查询）") @RequestParam(required = false) String courseName, @ApiParam(value = "创建时间（起始位置）") @RequestParam(required = false) String startCreateTime,
-            @ApiParam(value = "创建时间（终止位置）") @RequestParam(required = false) String endCreateTime) {
+                                           @ApiParam(value = "课程名称（模糊查询）") @RequestParam(required = false) String courseName, @ApiParam(value = "创建时间（起始位置）") @RequestParam(required = false) String startCreateTime,
+                                           @ApiParam(value = "创建时间（终止位置）") @RequestParam(required = false) String endCreateTime) {
         // 禁用条件
         if (!SystemConstant.strNotNull(belongOrgId) && !SystemConstant.strNotNull(courseName) && !SystemConstant.strNotNull(startCreateTime) && !SystemConstant.strNotNull(endCreateTime)) {
             throw ExceptionResultEnum.ERROR.exception("请选择要禁用的条件");
@@ -131,8 +128,8 @@ public class BasicCourseController {
 
     @ApiOperation(value = "课程基本信息管理-批量导入")
     @RequestMapping(value = "/data_import", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "返回信息", response = EditResult.class) })
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.IMPORT)
+    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
+    @OperationLogDetail(operationType = OperationTypeEnum.IMPORT)
     @Transactional
     public Result basicCourseImportAsync(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file)
             throws Exception {
@@ -142,19 +139,19 @@ public class BasicCourseController {
 
     @ApiOperation(value = "课程管理-导出")
     @RequestMapping(value = "/export", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "返回信息") })
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EXPORT)
+    @ApiResponses({@ApiResponse(code = 200, message = "返回信息")})
+    @OperationLogDetail(operationType = OperationTypeEnum.EXPORT)
     public void export(@ApiParam(value = "所属机构id") @RequestParam(required = false) String belongOrgId, @ApiParam(value = "课程名称（模糊查询）") @RequestParam(required = false) String courseName,
-            @ApiParam(value = "创建时间（起始位置）") @RequestParam(required = false) String startCreateTime, @ApiParam(value = "创建时间（终止位置）") @RequestParam(required = false) String endCreateTime,
-            HttpServletResponse response) throws Exception {
+                       @ApiParam(value = "创建时间（起始位置）") @RequestParam(required = false) String startCreateTime, @ApiParam(value = "创建时间（终止位置）") @RequestParam(required = false) String endCreateTime,
+                       HttpServletResponse response) throws Exception {
         basicCourseService.exportData(response, SystemConstant.convertIdToLong(belongOrgId), courseName, SystemConstant.convertIdToLong(startCreateTime), SystemConstant.convertIdToLong(endCreateTime));
     }
 
     @ApiOperation(value = "课程管理-查询")
     @RequestMapping(value = "/list_by_org", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = Result.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
     public Result findBasicCourseListByOrg(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
-            @ApiParam(value = "所属机构id", required = true) @RequestParam String belongOrgId) {
+                                           @ApiParam(value = "所属机构id", required = true) @RequestParam String belongOrgId) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         return ResultUtil.ok(basicCourseService.listByOrgId(SystemConstant.convertIdToLong(belongOrgId), SystemConstant.convertIdToLong(examId), sysUser));
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicExamController.java

@@ -8,7 +8,7 @@ import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicExam;
 import com.qmth.teachcloud.common.enums.ExamModelEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.*;
@@ -70,7 +70,7 @@ public class BasicExamController {
     @ApiOperation(value = "考试管理-新增/编辑")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result saveBasicExam(@Valid @RequestBody BasicExam basicExam, BindingResult bindingResult) throws IllegalAccessException {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -86,7 +86,7 @@ public class BasicExamController {
      */
     @ApiOperation(value = "启用/禁用")
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result enable(@ApiParam(value = "考试ID", required = true) @RequestParam Long id,
                          @ApiParam(value = "启用/禁用", required = true) @RequestParam Boolean enable) {
         boolean isSuccess = basicExamService.enable(id, enable);
@@ -101,7 +101,7 @@ public class BasicExamController {
     @ApiOperation(value = "考试管理-删除")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result deleteBasicSemester(@ApiParam(value = "考试id", required = true) @RequestParam String id) {
         return ResultUtil.ok(basicExamService.deleteBasicExamById(SystemConstant.convertIdToLong(id)));
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicExamRuleController.java

@@ -6,12 +6,11 @@ import com.qmth.distributed.print.business.entity.BasicExamRule;
 import com.qmth.distributed.print.business.service.BasicExamRuleService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -54,7 +53,7 @@ public class BasicExamRuleController {
      */
     @ApiOperation(value = "新增/修改")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result save(@RequestBody BasicExamRule examRule) {
         return ResultUtil.ok(String.valueOf(basicExamRuleService.saveExamRule(examRule)), null);
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicExamStudentController.java

@@ -10,7 +10,7 @@ import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.TaskTypeEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -72,7 +72,7 @@ public class BasicExamStudentController {
     @ApiOperation(value = "新增/编辑")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = Result.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result saveBasicExamStudent(@Valid @RequestBody BasicExamStudentParam basicExamStudentParam, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -84,7 +84,7 @@ public class BasicExamStudentController {
     @ApiOperation(value = "批量导入（同步）")
     @RequestMapping(value = "/import", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Result.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.IMPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.IMPORT)
     public Result basicExamStudentImportSync(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
                                              @ApiParam(value = "考试id", required = true) @RequestParam String examId) throws Exception {
         Map<String, Object> map = printCommonService.saveTask(file, SystemConstant.convertIdToLong(examId), TaskTypeEnum.BASIC_EXAM_STUDENT_IMPORT);
@@ -95,7 +95,7 @@ public class BasicExamStudentController {
     @ApiOperation(value = "导出")
     @RequestMapping(value = "/export", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Result.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EXPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.EXPORT)
     public void export(@ApiParam(value = "学期id") @RequestParam(required = false) String semesterId,
                        @ApiParam(value = "考试id") @RequestParam(required = false) String examId,
                        @ApiParam(value = "课程编号") @RequestParam(required = false) String courseCode,
@@ -112,7 +112,7 @@ public class BasicExamStudentController {
     @ApiOperation(value = "删除")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = Result.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result deleteBasicExamStudent(@ApiParam(value = "选择要删除的考生id集合", required = true) @RequestParam List<String> idList) {
         basicExamStudentService.deleteBatch(
                 idList.stream().map(SystemConstant::convertIdToLong).collect(Collectors.toList()));

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicMajorController.java

@@ -2,14 +2,14 @@ package com.qmth.distributed.print.api;
 
 
 import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.bean.params.BasicMajorParams;
-import com.qmth.distributed.print.business.bean.result.EditResult;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.service.BasicMajorService;
-import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -52,21 +52,21 @@ public class BasicMajorController {
     @ApiOperation(value = "专业管理-新增/编辑")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result saveBasicMajor(@Valid @RequestBody BasicMajorParams basicMajorParams, BindingResult bindingResult) throws IllegalAccessException {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(basicMajorService.saveBasicMajor(basicMajorParams,sysUser));
+        return ResultUtil.ok(basicMajorService.saveBasicMajor(basicMajorParams, sysUser));
     }
 
     @ApiOperation(value = "专业管理-删除")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result deleteBasicMajor(@ApiParam(value = "专业id", required = true) @RequestParam List<String> idList) {
-        if (idList.size() == 0){
+        if (idList.size() == 0) {
             throw ExceptionResultEnum.ERROR.exception("请选择要删除的专业");
         }
         List<Long> newIdList = idList.stream().map(SystemConstant::convertIdToLong).collect(Collectors.toList());

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicMessageController.java

@@ -8,7 +8,6 @@ import com.qmth.distributed.print.business.service.BasicMessageService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.EnumResult;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicOperationLogController.java

@@ -2,10 +2,9 @@ package com.qmth.distributed.print.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.service.ExamTaskService;
-import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.service.BasicOperationLogService;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
@@ -38,7 +37,7 @@ public class BasicOperationLogController {
     @ApiOperation(value = "日志管理-分页查询")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
-    public Result findOperationLogPage(@ApiParam(value = "操作类型") @RequestParam(required = false) CustomizedOperationTypeEnum customizedOperationType,
+    public Result findOperationLogPage(@ApiParam(value = "操作类型") @RequestParam(required = false) OperationTypeEnum customizedOperationType,
                                        @ApiParam(value = "操作时间 - 起始") @RequestParam(required = false) Long startTime,
                                        @ApiParam(value = "操作时间 - 终止") @RequestParam(required = false) Long endTime,
                                        @ApiParam(value = "操作人姓名") @RequestParam(required = false) String operatorName,

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicPrintConfigController.java

@@ -7,7 +7,7 @@ import com.qmth.distributed.print.business.service.BasicPrintConfigService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicPrintConfig;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
-import java.util.List;
 
 /**
  * <p>
@@ -65,7 +64,7 @@ public class BasicPrintConfigController {
      */
     @ApiOperation(value = "新增/修改")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result save(@RequestBody BasicPrintConfig basicPrintConfig) {
         return ResultUtil.ok(basicPrintConfigService.savePrintConfig(basicPrintConfig));
     }
@@ -75,7 +74,7 @@ public class BasicPrintConfigController {
      */
     @ApiOperation(value = "启用/禁用")
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result enable(@RequestParam(value = "id", required = false) Long id,
                          @RequestParam(value = "enable", required = false) Boolean enable) {
         boolean isSuccess = basicPrintConfigService.enable(id, enable);

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicSemesterController.java

@@ -7,7 +7,7 @@ import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.bean.params.BasicSemesterParams;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicSemester;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.service.BasicSemesterService;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
@@ -61,7 +61,7 @@ public class BasicSemesterController {
     @ApiOperation(value = "学期管理-新增/编辑")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result saveBasicSemester(@Valid @RequestBody BasicSemesterParams basicSemesterParams, BindingResult bindingResult) throws IllegalAccessException {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -72,7 +72,7 @@ public class BasicSemesterController {
     @ApiOperation(value = "学期管理-删除（逻辑）")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result deleteBasicSemester(@ApiParam(value = "学期id", required = true) @RequestParam String id) {
         return ResultUtil.ok(basicSemesterService.deleteBasicSemesterById(SystemConstant.convertIdToLong(id)));
     }
@@ -86,7 +86,7 @@ public class BasicSemesterController {
     @ApiOperation(value = "学期管理-启用/禁用")
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result enable(@RequestBody BasicSemester basicSemester) {
         return ResultUtil.ok(basicSemesterService.enable(basicSemester.getId(), basicSemester.getEnable()));
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicStudentController.java

@@ -7,7 +7,7 @@ import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.bean.params.BasicStudentParams;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.service.BasicStudentService;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
@@ -58,7 +58,7 @@ public class BasicStudentController {
     @ApiOperation(value = "学生管理-新增/编辑")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result saveBasicStudent(@Valid @RequestBody BasicStudentParams basicStudentParams, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -69,7 +69,7 @@ public class BasicStudentController {
     @ApiOperation(value = "学生管理-批量删除")
     @RequestMapping(value = "/delete_batch", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result deleteBasicStudent(@ApiParam(value = "选择的要删除的学生id集合", required = true) @RequestParam List<String> idList) {
         return ResultUtil.ok(basicStudentService.removeBasicStudentBatch(idList.stream().map(SystemConstant::convertIdToLong).collect(Collectors.toList())));
     }
@@ -77,7 +77,7 @@ public class BasicStudentController {
     @ApiOperation(value = "学生管理-根据条件删除")
     @RequestMapping(value = "/delete_by_condition", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result deleteBasicStudentByCondition(@ApiParam(value = "查询参数（学生学号或姓名）") @RequestParam(required = false) String queryParams,
                                                 @ApiParam(value = "学院主键") @RequestParam(required = false) String collegeId,
                                                 @ApiParam(value = "专业主键") @RequestParam(required = false) String majorId,
@@ -97,7 +97,7 @@ public class BasicStudentController {
     @ApiOperation(value = "学生管理-批量导入（异步）")
     @RequestMapping(value = "/data_import", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.IMPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.IMPORT)
     public Result basicStudentImportAysnc(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file) throws Exception {
 //        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
 //        Map<String, Object> map = printCommonService.saveTask(file, TaskTypeEnum.STUDENT_IMPORT);
@@ -114,7 +114,7 @@ public class BasicStudentController {
     @ApiOperation(value = "学生管理-导出")
     @RequestMapping(value = "/export", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EXPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.EXPORT)
     public void export(@ApiParam(value = "查询参数（学生学号或姓名）") @RequestParam(required = false) String queryParams,
                        @ApiParam(value = "学院主键") @RequestParam(required = false) String collegeId,
                        @ApiParam(value = "专业主键") @RequestParam(required = false) String majorId,

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicTemplateController.java

@@ -7,7 +7,7 @@ import com.qmth.distributed.print.business.entity.BasicTemplate;
 import com.qmth.distributed.print.business.service.BasicTemplateService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;
@@ -81,7 +81,7 @@ public class BasicTemplateController {
      */
     @ApiOperation(value = "新增/修改")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result save(@RequestBody String data) throws Exception {
         boolean isSuccess = basicTemplateService.saveTemplate(data);
         return ResultUtil.ok(isSuccess);
@@ -95,7 +95,7 @@ public class BasicTemplateController {
      */
     @ApiOperation(value = "启用/禁用")
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result enable(@RequestBody BasicTemplate template) {
         boolean isSuccess = basicTemplateService.enable(template);
         return ResultUtil.ok(isSuccess);
@@ -109,7 +109,7 @@ public class BasicTemplateController {
      */
     @ApiOperation(value = "删除")
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result enable(@RequestParam(value = "id") Long id) {
         return ResultUtil.ok(basicTemplateService.remove(id));
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/CourseEvaluationController.java

@@ -9,7 +9,7 @@ import com.qmth.distributed.print.business.service.CourseEvaluationService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -49,7 +49,7 @@ public class CourseEvaluationController {
     @ApiOperation(value = "评价方式管理-新增/编辑")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "更新成功", response = Result.class) })
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result saveCourseEvaluation(@Valid @RequestBody CourseEvaluationParam courseEvaluationParam, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -65,7 +65,7 @@ public class CourseEvaluationController {
     @ApiOperation(value = "评价方式管理-删除")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "删除成功", response = Result.class) })
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result deleteCourseEvaluation(@ApiParam(value = "选择要删除的评价方式id", required = true) @RequestParam String id) {
         courseEvaluationService.deleteCourseEvaluation(SystemConstant.convertIdToLong(id));
         return ResultUtil.ok();

distributed-print/src/main/java/com/qmth/distributed/print/api/CourseTargetController.java

@@ -11,7 +11,7 @@ import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -78,7 +78,7 @@ public class CourseTargetController {
     @ApiOperation(value = "课程目标管理-导入课程知识点")
     @RequestMapping(value = "/dimension_import", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "返回信息", response = Result.class) })
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.IMPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.IMPORT)
     public Result courseDimensionImportSync(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
             @ApiParam(value = "教学课程id") @RequestParam(required = false) String teachCourseId) throws Exception {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
@@ -102,7 +102,7 @@ public class CourseTargetController {
     @ApiOperation(value = "课程目标管理-新增/编辑")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "更新成功", response = Result.class) })
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result saveCourseTarget(@Valid @RequestBody CourseTargetParam courseTargetParam, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -115,7 +115,7 @@ public class CourseTargetController {
     @ApiOperation(value = "课程目标管理-删除")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "删除成功", response = Result.class) })
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result deleteCourseTarget(@ApiParam(value = "选择要删除的课程目标id", required = true) @RequestParam String id) {
         courseTargetService.deleteCourseTarget(SystemConstant.convertIdToLong(id));
         return ResultUtil.ok();

distributed-print/src/main/java/com/qmth/distributed/print/api/CourseWeightController.java

@@ -7,7 +7,7 @@ import com.qmth.distributed.print.business.service.CourseWeightService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -44,7 +44,7 @@ public class CourseWeightController {
     @ApiOperation(value = "课程权重管理-新增/编辑")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "更新成功", response = Result.class) })
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(operationType = OperationTypeEnum.ADD)
     public Result saveCourseWeight(@Valid @RequestBody CourseWeightParam courseWeightParam, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());

distributed-print/src/main/java/com/qmth/distributed/print/api/EnumsController.java

@@ -1,14 +1,13 @@
 package com.qmth.distributed.print.api;
 
 import com.alibaba.fastjson.JSON;
-import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.entity.BasicExamRule;
 import com.qmth.distributed.print.business.enums.*;
 import com.qmth.distributed.print.business.service.BasicExamRuleService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.*;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.enums.mark.MarkArbitrateStatus;
 import com.qmth.teachcloud.common.enums.mark.MarkProblemType;
 import com.qmth.teachcloud.common.util.Result;
@@ -113,7 +112,7 @@ public class EnumsController {
             list = TaskStatusEnum.listTypes();
         } else if (type.equals(EnumType.CUSTOMIZED_OPERATION_TYPE_ENUM.name())) {
             // 同步云阅卷日志表状态类型
-            list = CustomizedOperationTypeEnum.listTypes();
+            list = OperationTypeEnum.listTypes();
         } else if (type.equals(EnumType.DATA_PERMISSION_TYPE_ENUM.name())) {
             // 同步云阅卷日志表状态类型
             list = DataPermissionTypeEnum.listTypes();

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamCardController.java

@@ -10,8 +10,7 @@ import com.qmth.distributed.print.business.service.BasicPrintConfigService;
 import com.qmth.distributed.print.business.service.ExamCardService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.BasicPrintConfig;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.*;
@@ -82,7 +81,7 @@ public class ExamCardController {
      */
     @ApiOperation(value = "新增/修改")
     @RequestMapping(value = "/save_generic", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result save(@RequestBody GenericExamCardParams params) throws Exception {
         Map<String, String> map = examCardService.saveGeneric(params);
         return ResultUtil.ok(map);

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamDetailController.java

@@ -1,6 +1,5 @@
 package com.qmth.distributed.print.api;
 
-import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.params.SingleExamStudentAddParam;
 import com.qmth.distributed.print.business.bean.result.EditResult;
@@ -15,7 +14,7 @@ import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.entity.TBTask;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.TaskTypeEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.service.BasicRoleDataPermissionService;
 import com.qmth.teachcloud.common.service.TBTaskService;
 import com.qmth.teachcloud.common.util.Result;
@@ -65,7 +64,7 @@ public class ExamDetailController {
     @ApiOperation(value = "异步考务数据批量导入接口")
     @RequestMapping(value = "/data_import", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.IMPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.IMPORT)
     public Result examinationImportAsync(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
                                          @ApiParam(value = "印刷计划id", required = true) @RequestParam String printPlanId) {
         TBTask tbTask = examDetailService.importData(printPlanId, file);
@@ -207,7 +206,7 @@ public class ExamDetailController {
     @ApiOperation(value = "考务数据导入-结果导出")
     @RequestMapping(value = "/data_export", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EXPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.EXPORT)
     public Result dataExport(@ApiParam(value = "学期ID") @RequestParam(required = false) String semesterId,
                              @ApiParam(value = "考试id") @RequestParam(required = false) String examId,
                              @ApiParam(value = "印刷计划id集合") @RequestParam(required = false) List<String> printPlanIdList,
@@ -255,7 +254,7 @@ public class ExamDetailController {
      */
     @ApiOperation(value = "考务数据导入-删除")
     @RequestMapping(value = "/data_delete", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result dataDelete(@RequestParam Long id) {
         examDetailService.dataDelete(id);
         return ResultUtil.ok(true);
@@ -278,7 +277,7 @@ public class ExamDetailController {
      */
     @ApiOperation(value = "考务数据导入-新增考生-保存")
     @RequestMapping(value = "/add_exam_student", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(operationType = OperationTypeEnum.ADD)
     public Result addExamStudent(@RequestBody SingleExamStudentAddParam singleExamStudentAddParam) {
         return ResultUtil.ok(examDetailCourseService.addExamStudent(singleExamStudentAddParam));
     }
@@ -290,7 +289,7 @@ public class ExamDetailController {
      */
     @ApiOperation(value = "考务数据导入-查看详情-删除考生")
     @RequestMapping(value = "/delete_exam_student", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(operationType = OperationTypeEnum.ADD)
     public Result deleteExamStudent(@RequestParam Long id) {
         return ResultUtil.ok(examDetailCourseService.deleteExamStudent(id));
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamPrintPlanController.java

@@ -17,7 +17,7 @@ import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -101,7 +101,7 @@ public class ExamPrintPlanController {
     @ApiOperation(value = "印刷计划-新增/修改")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = Result.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result savePrintPlan(@Valid @RequestBody PrintPlanParams printPlanParams, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -114,7 +114,7 @@ public class ExamPrintPlanController {
     @ApiOperation(value = "印刷计划-删除")
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = Result.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result removePrintPlan(@Valid @RequestBody DeleteParams deleteParams, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -193,7 +193,7 @@ public class ExamPrintPlanController {
      */
     @ApiOperation(value = "关联试卷管理-批量关联")
     @RequestMapping(value = "/relate_update_batch", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result relateUpdateBatch(@ApiParam(value = "学期ID") @RequestParam(required = false) String semesterId,
                                     @ApiParam(value = "考试id") @RequestParam(required = false) String examId,
                                     @RequestParam(value = "relateType", required = false) String relateType,
@@ -245,7 +245,7 @@ public class ExamPrintPlanController {
      */
     @ApiOperation(value = "关联/更换试卷")
     @RequestMapping(value = "/relate_update", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result relateUpdate(@RequestBody RelatePaperParam paperParam) throws IOException {
         boolean isSuccess = examTaskDetailService.updatePaper(paperParam);
         return ResultUtil.ok(isSuccess);

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamPrintTaskController.java

@@ -18,7 +18,7 @@ import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.entity.TBTask;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.TaskTypeEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.service.TBTaskService;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
@@ -139,7 +139,7 @@ public class ExamPrintTaskController {
      */
     @ApiOperation(value = "印刷任务管理-提交印刷")
     @RequestMapping(value = "/task_submit", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result taskSubmit(@RequestBody ExamDetail examDetail) throws IOException {
         boolean isSuccess = examDetailService.taskSubmit(examDetail);
         return ResultUtil.ok(isSuccess);
@@ -153,7 +153,7 @@ public class ExamPrintTaskController {
      */
     @ApiOperation(value = "印刷任务管理-撤回提交")
     @RequestMapping(value = "/task_cancel", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result taskCancel(@RequestBody ExamDetail examDetail) {
         boolean isSuccess = examDetailService.taskCancel(examDetail.getId());
         return ResultUtil.ok(isSuccess);
@@ -167,7 +167,7 @@ public class ExamPrintTaskController {
      */
     @ApiOperation(value = "印刷任务管理-批量完成/撤回/提交")
     @RequestMapping(value = "/task_batch_cancel", method = RequestMethod.POST)
-    @OperationLogDetail(detail = "批量完成/撤回/提交", customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(detail = "批量完成/撤回/提交", operationType = OperationTypeEnum.UPDATE)
     public Result taskCancel(@RequestBody Map data) {
         boolean isSuccess = examDetailService.taskBatchCancel(data);
         return ResultUtil.ok(isSuccess);
@@ -238,7 +238,7 @@ public class ExamPrintTaskController {
      */
     @ApiOperation(value = "印刷任务管理-作废/恢复")
     @RequestMapping(value = "/task_normal", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result taskNormal(@RequestBody ExamDetail examDetail) {
         boolean isSuccess = examDetailService.taskNormal(examDetail);
         return ResultUtil.ok(isSuccess);

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamTaskApplyController.java

@@ -13,7 +13,7 @@ import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -107,7 +107,7 @@ public class ExamTaskApplyController {
      */
     @ApiOperation(value = "入库申请-删除")
     @RequestMapping(value = "/apply_delete", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result applyDelete(@RequestParam Long id) {
         examTaskService.applyDelete(id);
         return ResultUtil.ok(true);
@@ -159,7 +159,7 @@ public class ExamTaskApplyController {
      */
     @ApiOperation(value = "入库申请-暂存/提交")
     @RequestMapping(value = "/apply_save", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result taskApplySave(@RequestBody ExamTaskDetail examTaskDetail) throws IOException {
         Map<String, Object> map = examTaskService.saveExamTaskDetail(examTaskDetail);
         ExamTask examTask = examTaskService.getById(examTaskDetail.getExamTaskId());
@@ -183,7 +183,7 @@ public class ExamTaskApplyController {
      */
     @ApiOperation(value = "入库申请-撤销申请")
     @RequestMapping(value = "/apply_status", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result taskApplyStatus(@RequestBody ExamTask examTask) {
         Map<String, Object> map = examTaskService.status(examTask);
         activitiService.sendFlowTaskApproveMsg(map);
@@ -199,7 +199,7 @@ public class ExamTaskApplyController {
      */
     @ApiOperation(value = "入库申请-新建任务-保存")
     @RequestMapping(value = "/submit_task_apply", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(operationType = OperationTypeEnum.ADD)
     public Result submitTaskApply(@RequestBody ExamTaskApplyTemp examTaskApplyTemp) throws IOException {
         Map<String, Object> map = examTaskService.submitTaskApply(examTaskApplyTemp);
         ExamTask examTask = (ExamTask) map.get(SystemConstant.EXAM_TASK);
@@ -259,7 +259,7 @@ public class ExamTaskApplyController {
     @RequestMapping(value = "/exam_task_exam_student_import", method = RequestMethod.POST)
     @Transactional(rollbackFor = Exception.class)
     @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.IMPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.IMPORT)
     public Result examTaskExamStudentImport(@RequestParam MultipartFile file) throws Exception {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         return ResultUtil.ok(examTaskService.examTaskExamStudentImport(file, requestUser));

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamTaskAuditController.java

@@ -1,7 +1,6 @@
 package com.qmth.distributed.print.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.distributed.print.business.bean.params.ApproveFormParams;
 import com.qmth.distributed.print.business.bean.params.ExamTaskReApplyParam;
 import com.qmth.distributed.print.business.entity.ExamTask;
 import com.qmth.distributed.print.business.entity.ExamTaskReviewLog;
@@ -14,7 +13,7 @@ import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.entity.TBTask;
 import com.qmth.teachcloud.common.enums.*;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -28,7 +27,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
@@ -69,7 +67,7 @@ public class ExamTaskAuditController {
 
     @ApiOperation(value = "审核-印刷员驳回后命题老师修改")
     @RequestMapping(value = "/apply_resave", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result taskReApplySave(@RequestBody ExamTaskReApplyParam examTaskReApplyParam) {
         Map<String, Object> map = examTaskService.applyResave(examTaskReApplyParam);
         activitiService.sendFlowTaskApproveMsg(map);
@@ -173,7 +171,7 @@ public class ExamTaskAuditController {
      */
     @ApiOperation(value = "审核")
     @RequestMapping(value = "/review_save", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UN_KNOW)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result taskReviewSave(@RequestBody ExamTaskReviewLog taskReviewLog) throws IOException {
         List<Long> examTaskIdList = new ArrayList<>();
         examTaskIdList.add(taskReviewLog.getExamTaskId());
@@ -200,7 +198,7 @@ public class ExamTaskAuditController {
      */
     @ApiOperation(value = "入库审核-批量审核")
     @RequestMapping(value = "/review_save_batch", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UN_KNOW)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result taskReviewSaveBatch(@RequestBody ExamTaskReviewLog taskReviewLog) throws IOException {
         List<Long> examTaskIdList = Arrays.asList(taskReviewLog.getExamTaskIds());
         if (!CollectionUtils.isEmpty(examTaskIdList)) {
@@ -232,7 +230,7 @@ public class ExamTaskAuditController {
 
     @ApiOperation(value = "导出审核样本")
     @RequestMapping(value = "/review_export", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EXPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.EXPORT)
     public Result taskReviewExport(@Valid @RequestBody ArraysParams arraysParams, BindingResult bindingResult) throws
             Exception {
         if (bindingResult.hasErrors()) {

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamTaskController.java

@@ -12,7 +12,7 @@ import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicAttachment;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.UploadFileEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.service.BasicAttachmentService;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
@@ -115,7 +115,7 @@ public class ExamTaskController {
      */
     @ApiOperation(value = "命题任务管理-更改/指派命题老师")
     @RequestMapping(value = "/assign_user", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result assignUser(@RequestBody ExamTask examTask) {
         examTask = examTaskService.assignUser(examTask);
         if (Objects.nonNull(examTask.getFlowId())) {
@@ -129,7 +129,7 @@ public class ExamTaskController {
      */
     @ApiOperation(value = "命题任务管理-启用/禁用")
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result enable(@RequestBody ExamTask examTask) {
         return ResultUtil.ok(examTaskService.enable(examTask));
     }
@@ -139,7 +139,7 @@ public class ExamTaskController {
      */
     @ApiOperation(value = "命题任务管理-新建命题任务")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(operationType = OperationTypeEnum.ADD)
     public Result save(@RequestBody ExamTask examTask) {
         examTaskService.saveExamTaskNew(examTask);
         if (Objects.nonNull(examTask.getFlowId())) {
@@ -153,7 +153,7 @@ public class ExamTaskController {
      */
     @ApiOperation(value = "命题任务管理-删除")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result delete(@RequestParam Long id) {
         examTaskService.delete(id);
         return ResultUtil.ok(true);
@@ -164,7 +164,7 @@ public class ExamTaskController {
      */
     @ApiOperation(value = "命题任务管理-批量新建命题任务-文件导入")
     @RequestMapping(value = "/import", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.IMPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.IMPORT)
     public Result importFile(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file) {
         BasicAttachment basicAttachment = null;
         try {
@@ -193,7 +193,7 @@ public class ExamTaskController {
      */
     @ApiOperation(value = "命题任务管理-批量新建命题任务-保存")
     @RequestMapping(value = "/save_batch", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(operationType = OperationTypeEnum.ADD)
     public Result saveBatch(@RequestBody ExamTask task) {
         examTaskService.saveBatch(task);
         return ResultUtil.ok(true);
@@ -232,7 +232,7 @@ public class ExamTaskController {
      */
     @ApiOperation(value = "命题任务管理-命题申请-暂存")
     @RequestMapping(value = "/stage_task_apply", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result stageTaskApply(@RequestBody ExamTaskApplyTemp examTaskApplyTemp) {
         ExamTaskApplyTemp task = examTaskApplyTempService.stageTaskApply(examTaskApplyTemp);
         return ResultUtil.ok(task);

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamTaskQueryController.java

@@ -12,7 +12,7 @@ import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.entity.TBTask;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.MessageEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -104,7 +104,7 @@ public class ExamTaskQueryController {
      */
     @ApiOperation(value = "卷库查询-启用/禁用")
     @RequestMapping(value = "/paper_enable", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result taskPaperEnable(@RequestBody ExamTaskDetail examTaskDetail) throws IOException {
         boolean isSuccess = examTaskDetailService.enable(examTaskDetail);
         // 启用，触发考场生成pdf
@@ -129,7 +129,7 @@ public class ExamTaskQueryController {
      */
     @ApiOperation(value = "卷库查询-卷库修改")
     @RequestMapping(value = "/paper_update", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result taskPaperUpdate(@RequestBody ExamTaskDetail examTaskDetail) {
         Map<String, Object> map = examTaskDetailService.paperUpdate(examTaskDetail);
         Boolean isSuccess = (Boolean) map.get(SystemConstant.SUCCESS);
@@ -184,7 +184,7 @@ public class ExamTaskQueryController {
      */
     @ApiOperation(value = "卷库查询-作废")
     @RequestMapping(value = "/cancel", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result cancel(@RequestParam Long id,
                          @RequestParam String cancelRemark) {
         boolean isSuccess = examTaskDetailService.cancel(id, cancelRemark);
@@ -193,7 +193,7 @@ public class ExamTaskQueryController {
 
     @ApiOperation(value = "卷库查询-重启流程（打回）")
     @RequestMapping(value = "/restart", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result taskFlowRestart(@RequestBody ExamTaskDetail examTaskDetail) {
         Map<String, Object> map = examTaskDetailService.taskRestart(examTaskDetail);
         Boolean isSuccess = (Boolean) map.get(SystemConstant.SUCCESS);

distributed-print/src/main/java/com/qmth/distributed/print/api/GradeBatchController.java

@@ -11,7 +11,7 @@ import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -65,7 +65,7 @@ public class GradeBatchController {
     @ApiOperation(value = "成绩分析批次-新建")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = Result.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(operationType = OperationTypeEnum.ADD)
     public Result saveGradeBatch(@Valid @RequestBody GradeBatchParam gradeBatchParam, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -77,7 +77,7 @@ public class GradeBatchController {
     @ApiOperation(value = "成绩分析批次-删除")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = SystemConstant.PUSH_OPERATE_NOTICE, response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result deleteGradeBatch(@ApiParam(value = "选择的要删除的成绩分析批次id", required = true) @RequestParam String id) {
         GradeBatch gradeBatch = gradeBatchService.getById(SystemConstant.convertIdToLong(id));
         if (gradeBatch == null) {
@@ -109,7 +109,7 @@ public class GradeBatchController {
     @ApiOperation(value = "成绩分析批次课程-考务数据导入")
     @RequestMapping(value = "/upload", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "上传成功", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.IMPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.IMPORT)
     public Result upload(@RequestParam Long batchId,
                          @RequestParam MultipartFile file) throws IOException, NoSuchFieldException {
         gradeBatchService.uploadFile(batchId, file);
@@ -124,7 +124,7 @@ public class GradeBatchController {
     @ApiOperation(value = "成绩分析批次课程-批次同步")
     @RequestMapping(value = "/push", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "同步成功", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.IMPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.IMPORT)
     public Result batchSync(@RequestParam Long batchId) {
         GradeBatch gradeBatch = gradeBatchService.getById(batchId);
         if (gradeBatch == null) {
@@ -142,7 +142,7 @@ public class GradeBatchController {
     @ApiOperation(value = "成绩分析批次课程-开始计算")
     @RequestMapping(value = "/start_calc", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "同步成功", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UN_KNOW)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result startCalc(@RequestParam Long batchId) {
         GradeBatch gradeBatch = gradeBatchService.getById(batchId);
         if (gradeBatch == null) {

distributed-print/src/main/java/com/qmth/distributed/print/api/GradeBatchPaperController.java

@@ -11,7 +11,7 @@ import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -91,7 +91,7 @@ public class GradeBatchPaperController {
     @ApiOperation(value = "成绩分析批次课程-新建")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = Result.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(operationType = OperationTypeEnum.ADD)
     public Result saveGradeBatchPaper(@Valid @RequestBody GradeBatchPaperParam gradeBatchPaperParam, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -104,7 +104,7 @@ public class GradeBatchPaperController {
     @ApiOperation(value = "成绩分析批次课程-删除")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result deleteGradeBatchPaper(@ApiParam(value = "批次ID", required = true) @RequestParam Long batchId,
                                         @ApiParam(value = "选择的要删除的成绩分析课程id集合", required = true) @RequestParam List<String> idList) {
         gradeBatchPaperService.deleteGradeBatchPaper(batchId, idList.stream().map(SystemConstant::convertIdToLong).collect(Collectors.toList()));
@@ -119,7 +119,7 @@ public class GradeBatchPaperController {
     @ApiOperation(value = "成绩分析批次课程-发布")
     @RequestMapping(value = "/publish", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "发布成功", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result publish(@RequestParam Long batchId, @RequestParam Long gradeBatchPaperId) {
         GradeBatchPaper gradeBatchPaper = gradeBatchPaperService.getById(gradeBatchPaperId);
         if (gradeBatchPaper == null) {

distributed-print/src/main/java/com/qmth/distributed/print/api/GradeModuleEvaluationController.java

@@ -9,7 +9,7 @@ import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -58,7 +58,7 @@ public class GradeModuleEvaluationController {
     @ApiOperation(value = "成绩分析模块评价-新建模块评价")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = Result.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(operationType = OperationTypeEnum.ADD)
     public Result saveGradeModuleEvaluationBatch(@Valid @RequestBody GradeModuleEvaluationParam gradeModuleEvaluationParam, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());

distributed-print/src/main/java/com/qmth/distributed/print/api/GradePaperController.java

@@ -9,7 +9,7 @@ import com.qmth.distributed.print.business.service.GradePaperService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -69,7 +69,7 @@ public class GradePaperController {
     @ApiOperation(value = "成绩分析课程-新建定义")
     @RequestMapping(value = "/save_define", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = Result.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(operationType = OperationTypeEnum.ADD)
     public Result saveGradePaperDefine(@Valid @RequestBody GradePaperDefineParam gradePaperDefineParam, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());

distributed-print/src/main/java/com/qmth/distributed/print/api/GradePaperDimensionController.java

@@ -9,7 +9,7 @@ import com.qmth.distributed.print.business.service.GradePaperDimensionService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -57,7 +57,7 @@ public class GradePaperDimensionController {
     @ApiOperation(value = "成绩分析维度-新建维度")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = Result.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(operationType = OperationTypeEnum.ADD)
     public Result saveGradePaperDimensionBatch(@Valid @RequestBody GradePaperDimensionParam gradePaperDimensionParam, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -70,7 +70,7 @@ public class GradePaperDimensionController {
     @ApiOperation(value = "成绩分析维度-导入")
     @RequestMapping(value = "/import", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.IMPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.IMPORT)
     public Result gradePaperDimensionImport(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
                                             @ApiParam(value = "考试id", required = true) @RequestParam String examId,
                                             @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber,
@@ -99,7 +99,7 @@ public class GradePaperDimensionController {
     @ApiOperation(value = "成绩分析维度-模板导出")
     @RequestMapping(value = "/export", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EXPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.EXPORT)
     public Result gradePaperDimensionExport(@ApiParam(value = "课程编号", required = true) @RequestParam String courseCode,
                                             @ApiParam(value = "课程名称", required = true) @RequestParam String courseName,
                                             @ApiParam(value = "维度类型", required = true) @RequestParam DimensionEnum dimensionType) throws Exception {

distributed-print/src/main/java/com/qmth/distributed/print/api/GradePaperStructController.java

@@ -6,13 +6,13 @@ import com.qmth.distributed.print.business.bean.result.analyze.GradePaperStructR
 import com.qmth.distributed.print.business.service.GradePaperStructService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.entity.MarkQuestion;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
-import com.qmth.teachcloud.common.entity.MarkQuestion;
 import com.qmth.teachcloud.mark.service.MarkQuestionService;
 import io.swagger.annotations.*;
 import org.springframework.validation.BindingResult;
@@ -62,7 +62,7 @@ public class GradePaperStructController {
     @ApiOperation(value = "成绩分析试卷结构-新建试卷结构")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = Result.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(operationType = OperationTypeEnum.ADD)
     public Result saveGradePaperStructBatch(@Valid @RequestBody GradePaperStructParam gradePaperStructParam, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -75,7 +75,7 @@ public class GradePaperStructController {
     @ApiOperation(value = "成绩分析试卷结构-导入")
     @RequestMapping(value = "/import", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.IMPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.IMPORT)
     public Result gradePaperStructImport(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
                                          @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber,
                                          @ApiParam(value = "试卷类型", required = true) @RequestParam String paperType,
@@ -92,7 +92,7 @@ public class GradePaperStructController {
     @ApiOperation(value = "成绩分析试卷结构-模板导出")
     @RequestMapping(value = "/export", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EXPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.EXPORT)
     public Result gradePaperStructExport(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
                                          @ApiParam(value = "课程编号", required = true) @RequestParam String paperNumber,
                                          @ApiParam(value = "课程名称", required = true) @RequestParam String paperType) throws Exception {
@@ -109,7 +109,7 @@ public class GradePaperStructController {
     @ApiOperation(value = "成绩分析试卷结构-更新试卷机构")
     @RequestMapping(value = "/change_paper_structure", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = Result.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result updateExamCloudPaperStruct(@ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
                                              @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber,
                                              @ApiParam(value = "试卷类型") @RequestParam(required = false) String paperType) {

distributed-print/src/main/java/com/qmth/distributed/print/api/SsoController.java

@@ -11,7 +11,7 @@ import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.RoleTypeEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.service.SysOrgService;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
@@ -25,7 +25,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.io.IOException;
-import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -48,7 +47,7 @@ public class SsoController {
     @ApiOperation(value = "题库单点登录")
     @ApiResponses({@ApiResponse(code = 200, message = "题库单点登录", response = Result.class)})
     @RequestMapping(value = "/question_library_login", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UN_KNOW)
+    @OperationLogDetail(operationType = OperationTypeEnum.TIKU_SSO)
     public Result questionLibraryLogin(@ApiParam(value = "登录名", required = true) @RequestParam String loginName,
                                        @ApiParam(value = "真实姓名", required = true) @RequestParam String realName,
                                        @ApiParam(value = "角色", required = true) @RequestParam RoleTypeEnum role,
@@ -72,7 +71,7 @@ public class SsoController {
     @ApiOperation(value = "教研分析单点登录")
     @ApiResponses({@ApiResponse(code = 200, message = "教研分析单点登录", response = Result.class)})
     @RequestMapping(value = "/analysis_login", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UN_KNOW)
+    @OperationLogDetail(operationType = OperationTypeEnum.REPORT_SSO)
     public Result analysisLogin(@ApiParam(value = "登录名", required = true) @RequestParam String loginName,
                                 @ApiParam(value = "角色", required = true) @RequestParam RoleTypeEnum role,
                                 @ApiParam(value = "学院名称", required = true) @RequestParam String orgName,

distributed-print/src/main/java/com/qmth/distributed/print/api/SysAdminSetController.java

@@ -9,13 +9,11 @@ import com.qmth.distributed.print.business.bean.result.SysAdminSetResult;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.bean.dto.PrivilegeDto;
 import com.qmth.teachcloud.common.bean.result.SysConfigResult;
-import com.qmth.teachcloud.common.bean.result.SysConfigResultOption;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.*;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.FlowMsgTypeEnum;
-import com.qmth.teachcloud.common.enums.SyncModeEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.service.*;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
@@ -79,7 +77,7 @@ public class SysAdminSetController {
     @ApiOperation(value = "数据还原")
     @ApiResponses({@ApiResponse(code = 200, message = "数据还原信息", response = ResultUtil.class)})
     @RequestMapping(value = "/backup", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result sysadminBackup(@ApiParam(value = "学校id ", required = true) @RequestParam Long schoolId) throws Exception {
         mySQLDatabaseBackup.exportDatabaseTool();
         mySQLDatabaseBackup.deleteDbTool(SystemConstant.PRINT_DELETE_DATA_FILE_NAME, schoolId);
@@ -133,7 +131,7 @@ public class SysAdminSetController {
     @ApiResponses({@ApiResponse(code = 200, message = "同步配置信息", response = ResultUtil.class)})
     @RequestMapping(value = "/sync/save", method = RequestMethod.POST)
     @Transactional
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result sysadminSyncSave(@Valid @RequestBody SysAdminSetParam sysAdminSetParam, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -189,7 +187,7 @@ public class SysAdminSetController {
     @ApiResponses({@ApiResponse(code = 200, message = "试卷规格配置信息", response = ResultUtil.class)})
     @RequestMapping(value = "/paper/save", method = RequestMethod.POST)
     @Transactional
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result sysadminPaperSave(@Valid @RequestBody SysAdminSetParam sysAdminSetParam, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -235,7 +233,7 @@ public class SysAdminSetController {
     @ApiResponses({@ApiResponse(code = 200, message = "用户验证信息", response = ResultUtil.class)})
     @RequestMapping(value = "/user/save", method = RequestMethod.POST)
     @Transactional
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result sysadminUserSave(@Valid @RequestBody SysAdminSetParam sysAdminSetParam, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -267,7 +265,7 @@ public class SysAdminSetController {
     @ApiResponses({@ApiResponse(code = 200, message = "菜单权限信息", response = ResultUtil.class)})
     @RequestMapping(value = "/menu/custom/save", method = RequestMethod.POST)
     @Transactional
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result schoolPrivilegeSave(@Valid @RequestBody SysAdminSetParam tSchoolPrivilegeParam, BindingResult bindingResult) throws NoSuchAlgorithmException {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -356,7 +354,7 @@ public class SysAdminSetController {
     @ApiResponses({@ApiResponse(code = 200, message = "角色权限信息", response = ResultUtil.class)})
     @RequestMapping(value = "/role/custom/save", method = RequestMethod.POST)
     @Transactional
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result schoolRoleSave(@Valid @RequestBody SysAdminSetParam tSchoolPrivilegeParam, BindingResult bindingResult) throws NoSuchAlgorithmException {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());

distributed-print/src/main/java/com/qmth/distributed/print/api/SysController.java

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.api;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.constant.ApiConstant;
@@ -20,7 +21,7 @@ import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.*;
 import com.qmth.teachcloud.common.enums.*;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.enums.log.SystemEnum;
 import com.qmth.teachcloud.common.service.*;
 import com.qmth.teachcloud.common.util.FileUtil;
@@ -236,7 +237,7 @@ public class SysController {
         LoginResult loginResult = teachcloudCommonService.login(login.getPassword(), sysUser, AppSourceEnum.SYSTEM);
         loginResult.setUiSetting(sysUser.getUiSetting());
         try {
-            basicOperationLogService.saveOperateLogWithNoAuth(sysUser.getSchoolId(), sysUser.getOrgId(), sysUser.getId(), "用户登录", CustomizedOperationTypeEnum.LOGIN, SystemEnum.DISTRIBUTED_PRINT);
+            basicOperationLogService.saveOperateLogWithNoAuth(sysUser.getSchoolId(), sysUser.getId(), "用户登录", OperationTypeEnum.LOGIN, JSON.toJSONString(login));
         } catch (Exception e) {
             log.error(e.getMessage());
         }
@@ -251,7 +252,7 @@ public class SysController {
     @ApiOperation(value = "登出")
     @RequestMapping(value = "/logout", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
-    @OperationLogDetail(detail = "用户登出（注销）", customizedOperationType = CustomizedOperationTypeEnum.LOGOUT)
+    @OperationLogDetail(detail = "用户登出（注销）", operationType = OperationTypeEnum.LOGOUT)
     public Result logout() throws NoSuchAlgorithmException {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         teachcloudCommonService.removeUserInfo(sysUser.getId(), false);

distributed-print/src/main/java/com/qmth/distributed/print/api/SysOrgController.java

@@ -8,7 +8,7 @@ import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.RoleTypeEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.service.SysOrgService;
 import com.qmth.teachcloud.common.service.TeachcloudCommonService;
 import com.qmth.teachcloud.common.util.Result;
@@ -68,7 +68,7 @@ public class SysOrgController {
      */
     @ApiOperation(value = "新增/修改")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result save(@Valid @RequestBody SysOrg org, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -85,7 +85,7 @@ public class SysOrgController {
      */
     @ApiOperation(value = "启用/禁用")
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result enable(@RequestBody SysOrg org) {
         return ResultUtil.ok(printCommonService.enable(org));
     }
@@ -98,7 +98,7 @@ public class SysOrgController {
      */
     @ApiOperation(value = "删除")
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result remove(@RequestBody SysOrg org) {
         return ResultUtil.ok(printCommonService.sysOrgRemove(org.getId()));
     }
@@ -117,7 +117,7 @@ public class SysOrgController {
     @ApiOperation(value = "机构管理-批量导入")
     @RequestMapping(value = "/import", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.IMPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.IMPORT)
     public Result sysOrgImportAsync(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file) throws Exception {
         sysOrgService.executeImportSysOrgLogic(file);
         return ResultUtil.ok();
@@ -126,7 +126,7 @@ public class SysOrgController {
     @ApiOperation(value = "机构管理-导出")
     @RequestMapping(value = "/export", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EXPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.EXPORT)
     public void export(HttpServletResponse response) throws Exception {
         sysOrgService.exportOrgData(response, false);
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/SysPrivilegeController.java

@@ -9,7 +9,7 @@ import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysPrivilege;
 import com.qmth.teachcloud.common.entity.SysRole;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.service.SysPrivilegeService;
 import com.qmth.teachcloud.common.service.SysRoleService;
 import com.qmth.teachcloud.common.util.Result;
@@ -21,7 +21,6 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -76,7 +75,7 @@ public class SysPrivilegeController {
      */
     @ApiOperation(value = "新增/修改")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result save(@RequestBody SysPrivilege privilege) {
         return ResultUtil.ok(sysPrivilegeService.savePrivilege(privilege));
     }
@@ -89,7 +88,7 @@ public class SysPrivilegeController {
      */
     @ApiOperation(value = "删除")
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result remove(@RequestBody SysPrivilege privilege) {
         return ResultUtil.ok(sysPrivilegeService.remove(privilege.getId()));
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/SysRoleController.java

@@ -1,13 +1,11 @@
 package com.qmth.distributed.print.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.teachcloud.common.bean.dto.DataPermissionInfo;
 import com.qmth.teachcloud.common.bean.params.SysRolePrivilegeParams;
-import com.qmth.teachcloud.common.service.BasicRoleDataPermissionService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysRole;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.service.SysRoleService;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
@@ -22,7 +20,6 @@ import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.security.NoSuchAlgorithmException;
-import java.util.List;
 
 /**
  * <p>
@@ -89,7 +86,7 @@ public class SysRoleController {
      */
     @ApiOperation(value = "新增/修改")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result save(@Valid @RequestBody SysRolePrivilegeParams sysRolePrivilegeParams, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -106,7 +103,7 @@ public class SysRoleController {
      */
     @ApiOperation(value = "启用/禁用")
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result enable(@RequestBody SysRole role) throws NoSuchAlgorithmException {
         return ResultUtil.ok(sysRoleService.enableReport(role));
     }
@@ -119,7 +116,7 @@ public class SysRoleController {
      */
     @ApiOperation(value = "删除")
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result remove(@RequestParam(value = "id", required = true) Long id) {
         return ResultUtil.ok(sysRoleService.removeReport(id));
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/SysUserController.java

@@ -11,7 +11,7 @@ import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.entity.TBTask;
 import com.qmth.teachcloud.common.enums.TaskTypeEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.service.SysUserService;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
@@ -117,7 +117,7 @@ public class SysUserController {
      */
     @ApiOperation(value = "新增/修改")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result save(@ApiParam(value = "用户信息", required = true) @Valid @RequestBody UserSaveParams userSaveParams, BindingResult bindingResult) throws IllegalAccessException {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -134,7 +134,7 @@ public class SysUserController {
      */
     @ApiOperation(value = "新增客服")
     @RequestMapping(value = "/save_customer", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(operationType = OperationTypeEnum.ADD)
     public Result saveCustomer(@ApiParam(value = "用户信息", required = true) @Valid @RequestBody UserSaveParams userSaveParams, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -150,7 +150,7 @@ public class SysUserController {
      */
     @ApiOperation(value = "启用/禁用")
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result enable(@RequestBody SysUser user) throws NoSuchAlgorithmException, IllegalAccessException {
         sysUserService.enable(user);
         return ResultUtil.ok();
@@ -159,7 +159,7 @@ public class SysUserController {
     @ApiOperation(value = "课程管理-批量删除")
     @RequestMapping(value = "/delete_batch", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result deleteBatch(@ApiParam(value = "删除对象ID集合", required = true) @RequestParam List<Long> idList) {
         return ResultUtil.ok(sysUserService.removeBasicCourseBatch(idList));
     }
@@ -172,7 +172,7 @@ public class SysUserController {
      */
     @ApiOperation(value = "删除")
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result remove(@RequestParam(value = "id", required = true) Long id) throws NoSuchAlgorithmException {
         return ResultUtil.ok(sysUserService.remove(id));
     }
@@ -185,7 +185,7 @@ public class SysUserController {
      */
     @ApiOperation(value = "重置密码")
     @RequestMapping(value = "/reset_password", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result resetPassword(@RequestBody SysUser user) throws NoSuchAlgorithmException {
         return ResultUtil.ok(sysUserService.resetPassword(user.getId()));
     }
@@ -198,7 +198,7 @@ public class SysUserController {
     @ApiOperation(value = "修改密码")
     @RequestMapping(value = "/update_password", method = RequestMethod.POST)
     @Aac(strict = false, auth = false)
-    @OperationLogDetail(detail = "修改密码", customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(detail = "修改密码", operationType = OperationTypeEnum.UPDATE)
     public Result updatePassword(@RequestBody SysUser user) throws NoSuchAlgorithmException {
         return ResultUtil.ok(sysUserService.updatePassword(user));
     }
@@ -211,7 +211,7 @@ public class SysUserController {
      */
     @ApiOperation(value = "绑定角色")
     @RequestMapping(value = "/bind_roles", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result bindRoles(@RequestBody SysUser sysUser) {
         return ResultUtil.ok(sysUserService.bindRoles(sysUser));
     }
@@ -219,7 +219,7 @@ public class SysUserController {
     @ApiOperation(value = "用户管理-批量导入（异步）")
     @RequestMapping(value = "/import", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.IMPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.IMPORT)
     public Result sysUserImportAysnc(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file) throws Exception {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Map<String, Object> map = printCommonService.saveTask(file, TaskTypeEnum.USER_IMPORT);
@@ -233,7 +233,7 @@ public class SysUserController {
     @ApiOperation(value = "用户管理-导出")
     @RequestMapping(value = "/export", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EXPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.EXPORT)
     public void export(@RequestParam(value = "userInfo", required = false) String userInfo,
                        @RequestParam(value = "orgId", required = false) String orgId,
                        @RequestParam(value = "roleId", required = false) String roleId,

distributed-print/src/main/java/com/qmth/distributed/print/api/TBSyncTaskController.java

@@ -10,7 +10,7 @@ import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.PushTypeEnum;
 import com.qmth.teachcloud.common.enums.TaskResultEnum;
 import com.qmth.teachcloud.common.enums.TaskStatusEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -67,7 +67,7 @@ public class TBSyncTaskController {
     @ApiOperation(value = "重新同步")
     @RequestMapping(value = "/resync", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "重新同步", response = TaskListResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.SYNC)
+    @OperationLogDetail(operationType = OperationTypeEnum.SYNC)
     public Result syncQuery(@ApiParam(value = "任务ID") @RequestParam(required = false) Long id) throws IllegalAccessException {
         tbSyncTaskService.resync(id);
         return ResultUtil.ok(true);

distributed-print/src/main/java/com/qmth/distributed/print/api/TCFinalScoreController.java

@@ -22,7 +22,7 @@ import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.MarkQuestion;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.*;
 import com.qmth.teachcloud.mark.entity.MarkPaper;
 import com.qmth.teachcloud.mark.service.MarkPaperService;
@@ -115,7 +115,7 @@ public class TCFinalScoreController {
 
     @ApiOperation(value = "导入期末成绩")
     @RequestMapping(value = "/final_score/import", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.IMPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.IMPORT)
     @ApiResponses({@ApiResponse(code = 200, message = "导入成功", response = EditResult.class)})
     public Result finalScoreImport(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
                                    @ApiParam(value = "考试id", required = true) @RequestParam Long examId,
@@ -147,7 +147,7 @@ public class TCFinalScoreController {
     @ApiOperation(value = "同步期末成绩选择试卷")
     @RequestMapping(value = "/final_score/choose_paper", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "同步成功", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.SYNC)
+    @OperationLogDetail(operationType = OperationTypeEnum.SYNC)
     public Result finalScoreSyncChoosePaper(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
                                             @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
                                             @ApiParam(value = "教学课程id", required = true) @RequestParam Long teachCourseId) {
@@ -157,7 +157,7 @@ public class TCFinalScoreController {
     @ApiOperation(value = "同步期末成绩")
     @RequestMapping(value = "/final_score/sync", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "同步成功", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.SYNC)
+    @OperationLogDetail(operationType = OperationTypeEnum.SYNC)
     @Aac(rateLimit = @RateLimit(count = 1, period = 1000L))
     public Result finalScoreSync(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
                                  @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
@@ -199,7 +199,7 @@ public class TCFinalScoreController {
 
     @ApiOperation(value = "期末成绩编辑")
     @RequestMapping(value = "/final_score/edit", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     @ApiResponses({@ApiResponse(code = 200, message = "编辑", response = TCFinalScore.class)})
     public Result finalScoreEdit(@ApiParam(value = "主键", required = true) @RequestParam Long id) throws IOException {
         TCFinalScore tcFinalScore = tcFinalScoreService.getById(id);
@@ -209,7 +209,7 @@ public class TCFinalScoreController {
 
     @ApiOperation(value = "期末成绩保存")
     @RequestMapping(value = "/final_score/save", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     @ApiResponses({@ApiResponse(code = 200, message = "保存", response = EditResult.class)})
     @Transactional
     public Result finalScoreSave(@ApiParam(value = "期末考试成绩信息", required = true) @Valid @RequestBody TCFinalScore tcFinalScore, BindingResult bindingResult) throws IOException {
@@ -242,7 +242,7 @@ public class TCFinalScoreController {
 
     @ApiOperation(value = "期末成绩启用/禁用")
     @RequestMapping(value = "/final_score/enable", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     @ApiResponses({@ApiResponse(code = 200, message = "编辑", response = EditResult.class)})
     @Transactional
     public Result finalScoreEnable(@ApiParam(value = "主键", required = true) @RequestParam Long id,

distributed-print/src/main/java/com/qmth/distributed/print/api/TCPaperStructController.java

@@ -20,7 +20,7 @@ import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.MarkQuestion;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.*;
 import com.qmth.teachcloud.mark.entity.MarkPaper;
 import com.qmth.teachcloud.mark.service.MarkQuestionService;
@@ -75,7 +75,7 @@ public class TCPaperStructController {
 
     @ApiOperation(value = "导入试卷结构")
     @RequestMapping(value = "/final_score/paper_struct/import", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.IMPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.IMPORT)
     @ApiResponses({@ApiResponse(code = 200, message = "导入成功", response = EditResult.class)})
     public Result finalScorePaperStructImport(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
                                               @ApiParam(value = "考试id", required = true) @RequestParam Long examId,
@@ -106,7 +106,7 @@ public class TCPaperStructController {
 
     @ApiOperation(value = "同步试卷蓝图结构")
     @RequestMapping(value = "/final_score/paper_struct_dimension/sync", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.SYNC)
+    @OperationLogDetail(operationType = OperationTypeEnum.SYNC)
     @ApiResponses({@ApiResponse(code = 200, message = "同步成功", response = EditResult.class)})
     @Aac(rateLimit = @RateLimit(count = 1, period = 1000L))
     public Result finalScorePaperStructDimensionSync(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
@@ -138,7 +138,7 @@ public class TCPaperStructController {
 
     @ApiOperation(value = "期末成绩试卷蓝图保存")
     @RequestMapping(value = "/final_score/paper_struct/save", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     @ApiResponses({@ApiResponse(code = 200, message = "试卷蓝图保存", response = Object.class)})
     @Transactional
     public Result finalScorePaperStructSave(@ApiParam(value = "试卷蓝图结构", required = true) @Valid @RequestBody PaperStructParams paperStructParams, BindingResult bindingResult) throws IOException {

distributed-print/src/main/java/com/qmth/distributed/print/api/TCStatisticsController.java

@@ -13,7 +13,7 @@ import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.entity.TBTask;
 import com.qmth.teachcloud.common.enums.TaskTypeEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -61,7 +61,7 @@ public class TCStatisticsController {
     @ApiOperation(value = "命题计划统计-导入")
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
     @RequestMapping(value = "/import", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.IMPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.IMPORT)
     public Result dataImport(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
                              @ApiParam(value = "考试id", required = true) @RequestParam String examId) throws Exception {
         Map<String, Object> map = printCommonService.saveTask(file, TaskTypeEnum.STATISTICS_IMPORT);
@@ -90,7 +90,7 @@ public class TCStatisticsController {
     @ApiOperation(value = "命题计划统计-刷新数据")
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
     @RequestMapping(value = "/freshen", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UN_KNOW)
+    @OperationLogDetail(operationType = OperationTypeEnum.OTHER)
     public Result freshen(@ApiParam(value = "考试id", required = true) @RequestParam String examId) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         tcStatisticsService.refreshTCStatisticByExamIdAndRequestUser(SystemConstant.convertIdToLong(examId),sysUser);
@@ -100,7 +100,7 @@ public class TCStatisticsController {
     @ApiOperation(value = "命题计划统计-删除数据")
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result delete(@Valid @RequestBody ArraysParams arraysParams, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());

distributed-print/src/main/java/com/qmth/distributed/print/api/TCUsualScoreController.java

@@ -18,7 +18,7 @@ import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.GsonUtil;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
@@ -79,7 +79,7 @@ public class TCUsualScoreController {
 
     @ApiOperation(value = "导入平时成绩-模板下载")
     @RequestMapping(value = "/usual_score/template_download", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EXPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.EXPORT)
     @ApiResponses({@ApiResponse(code = 200, message = "下载成功", response = Object.class)})
     public void usualScoreTemplateDownload(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
                                            @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
@@ -106,7 +106,7 @@ public class TCUsualScoreController {
 
     @ApiOperation(value = "导入平时成绩")
     @RequestMapping(value = "/usual_score/import", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.IMPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.IMPORT)
     @ApiResponses({@ApiResponse(code = 200, message = "导入成功", response = EditResult.class)})
     public Result usualScoreImport(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
                                    @ApiParam(value = "考试id", required = true) @RequestParam Long examId,
@@ -130,7 +130,7 @@ public class TCUsualScoreController {
 
     @ApiOperation(value = "平时成绩编辑")
     @RequestMapping(value = "/usual_score/edit", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     @ApiResponses({@ApiResponse(code = 200, message = "编辑", response = TCUsualScore.class)})
     public Result usualScoreEdit(@ApiParam(value = "主键", required = true) @RequestParam Long id) throws IOException {
         TCUsualScore tcUsualScore = tcUsualScoreService.getById(id);
@@ -140,7 +140,7 @@ public class TCUsualScoreController {
 
     @ApiOperation(value = "平时成绩保存")
     @RequestMapping(value = "/usual_score/save", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     @ApiResponses({@ApiResponse(code = 200, message = "保存", response = EditResult.class)})
     @Transactional
     public Result usualScoreSave(@ApiParam(value = "平时成绩信息", required = true) @Valid @RequestBody TCUsualScore tcUsualScore, BindingResult bindingResult) throws IOException {
@@ -173,7 +173,7 @@ public class TCUsualScoreController {
 
     @ApiOperation(value = "平时成绩启用/禁用")
     @RequestMapping(value = "/usual_score/enable", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     @ApiResponses({@ApiResponse(code = 200, message = "编辑", response = EditResult.class)})
     @Transactional
     public Result usualScoreEnable(@ApiParam(value = "主键", required = true) @RequestParam Long id,

distributed-print/src/main/java/com/qmth/distributed/print/api/TFCustomFlowController.java

@@ -30,7 +30,7 @@ import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.FieldUniqueEnum;
 import com.qmth.teachcloud.common.enums.FlowStatusEnum;
 import com.qmth.teachcloud.common.enums.TFCustomTypeEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.service.CommonCacheService;
 import com.qmth.teachcloud.common.util.*;
 import io.swagger.annotations.*;
@@ -88,7 +88,7 @@ public class TFCustomFlowController {
     @ApiResponses({@ApiResponse(code = 200, message = "常规信息", response = ResultUtil.class)})
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @Transactional
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(operationType = OperationTypeEnum.ADD)
     public Result save(@Valid @RequestBody CustomFlowSaveDto customFlowSaveDto, BindingResult bindingResult) throws NoSuchAlgorithmException {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -165,7 +165,7 @@ public class TFCustomFlowController {
     @ApiOperation(value = "审批流程")
     @ApiResponses({@ApiResponse(code = 200, message = "常规信息", response = ResultUtil.class)})
     @RequestMapping(value = "/task/approve", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UN_KNOW)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result taskApprove(@Valid @RequestBody FlowTaskApproveParam flowTaskApproveParam, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -211,7 +211,7 @@ public class TFCustomFlowController {
     @ApiOperation(value = "流程编辑")
     @ApiResponses({@ApiResponse(code = 200, message = "流程信息", response = ResultUtil.class)})
     @RequestMapping(value = "/edit", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result edit(@ApiParam(value = "自定义流程id", required = true) @RequestParam String id) {
         TFCustomFlow tfCustomFlow = tfCustomFlowService.getById(SystemConstant.convertIdToLong(id));
         Optional.ofNullable(tfCustomFlow).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("自定义流程数据为空"));
@@ -224,7 +224,7 @@ public class TFCustomFlowController {
     @ApiOperation(value = "流程逻辑删除")
     @ApiResponses({@ApiResponse(code = 200, message = "常规信息", response = ResultUtil.class)})
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result enable(@Valid @RequestBody CustomFlowParam customFlowParam, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -274,7 +274,7 @@ public class TFCustomFlowController {
     @ApiOperation(value = "流程审批记录逻辑删除")
     @ApiResponses({@ApiResponse(code = 200, message = "常规信息", response = ResultUtil.class)})
     @RequestMapping(value = "/approve/enable", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result approveEnable(@Valid @RequestBody CustomFlowParam customFlowParam, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -288,7 +288,7 @@ public class TFCustomFlowController {
     @ApiOperation(value = "流程终止")
     @ApiResponses({@ApiResponse(code = 200, message = "常规信息", response = ResultUtil.class)})
     @RequestMapping(value = "/end", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UN_KNOW)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result end(@ApiParam(value = "流程id", required = true) @RequestParam String flowId) {
         activitiService.flowEnd(flowId);
         return ResultUtil.ok();
@@ -304,7 +304,7 @@ public class TFCustomFlowController {
     @ApiOperation(value = "流程节点转他人审批")
     @ApiResponses({@ApiResponse(code = 200, message = "常规信息", response = ResultUtil.class)})
     @RequestMapping(value = "/task/approver/exchange", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result taskApproverExchange(@ApiParam(value = "审批人id", required = true) @RequestParam String userId,
                                        @ApiParam(value = "流程节点id", required = true) @RequestParam String taskId) {
         Map<String, Object> map = activitiService.taskApproverExchange(userId, taskId);
@@ -322,7 +322,7 @@ public class TFCustomFlowController {
     @ApiOperation(value = "重命名自定义流程名称")
     @ApiResponses({@ApiResponse(code = 200, message = "常规信息", response = ResultUtil.class)})
     @RequestMapping(value = "/rename", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result rename(@Valid @RequestBody CustomFlowRenameParam customFlowRenameParam, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());

distributed-print/src/main/java/com/qmth/distributed/print/api/TRBasicInfoController.java

@@ -35,7 +35,7 @@ import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.FieldUniqueEnum;
 import com.qmth.teachcloud.common.enums.ImportTemplateEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.service.CommonCacheService;
 import com.qmth.teachcloud.common.service.FileUploadService;
 import com.qmth.teachcloud.common.util.*;
@@ -165,7 +165,7 @@ public class TRBasicInfoController {
 
     @ApiOperation(value = "保存报告")
     @RequestMapping(value = "/report/save", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     @ApiResponses({@ApiResponse(code = 200, message = "保存报告", response = Object.class)})
     @Transactional
     public Result reportSave(@ApiParam(value = "保存报告结构", required = true) @Valid @RequestBody TRBasicInfo trBasicInfo, BindingResult bindingResult) {
@@ -201,7 +201,7 @@ public class TRBasicInfoController {
 
     @ApiOperation(value = "导出报告")
     @RequestMapping(value = "/report/export", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EXPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.EXPORT)
     @ApiResponses({@ApiResponse(code = 200, message = "下载成功", response = Object.class)})
     @Aac(rateLimit = @RateLimit(count = 1, period = 1000L))
     public void reportExport(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,

distributed-print/src/main/java/com/qmth/distributed/print/api/TSyncExamStudentScoreController.java

@@ -17,7 +17,7 @@ import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.entity.TBTask;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.TaskTypeEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -79,7 +79,7 @@ public class TSyncExamStudentScoreController {
     @ApiOperation(value = "成绩导出")
     @ApiResponses({@ApiResponse(code = 200, message = "同步信息", response = TBTask.class)})
     @RequestMapping(value = "/score/export", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EXPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.EXPORT)
     public Result export(@ApiParam(value = "学期ID", required = true) @RequestParam String semesterId,
                          @ApiParam(value = "考试ID", required = true) @RequestParam(required = true) String examId,
                          @ApiParam(value = "班级id", required = false) @RequestParam(required = false) String clazzId,

distributed-print/src/main/java/com/qmth/distributed/print/api/TeachClazzController.java

@@ -7,7 +7,7 @@ import com.qmth.distributed.print.business.service.TeachClazzService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -49,7 +49,7 @@ public class TeachClazzController {
     @ApiOperation(value = "教学班级-选择教学班")
     @RequestMapping(value = "/edit", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "创建成功", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result selectTeachClazz(@Valid @RequestBody TeachClazzParams teachClazzParams, BindingResult bindingResult) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         if (bindingResult.hasErrors()) {
@@ -62,7 +62,7 @@ public class TeachClazzController {
     @ApiOperation(value = "教学班级-批量删除")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = EditResult.class)})
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result deleteTeachClazz(@ApiParam(value = "选择的要删除的班级id集合", required = true) @RequestParam List<Long> idList) {
         return ResultUtil.ok(teachClazzService.deleteTeachClazzBatch(idList));
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/TeachCourseController.java

@@ -10,10 +10,7 @@ import com.qmth.distributed.print.business.service.TeachCourseService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
-import com.qmth.teachcloud.common.enums.log.LevelEnum;
 import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
-import com.qmth.teachcloud.common.enums.log.OperationUnitEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -61,7 +58,7 @@ public class TeachCourseController {
     @ApiOperation(value = "教学课程-手动添加课程")
     @RequestMapping(value = "/manual_create", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "创建成功", response = EditResult.class) })
-    @OperationLogDetail(detail = "手动添加教学课程，参数[{{teachCourseParams}}]", customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(detail = "手动添加教学课程，参数[{{teachCourseParams}}]", operationType = OperationTypeEnum.ADD)
     @Deprecated
     public Result manualCreate(@Valid @RequestBody TeachCourseParams teachCourseParams, BindingResult bindingResult) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
@@ -74,7 +71,7 @@ public class TeachCourseController {
     @ApiOperation(value = "教学课程-课程表选择教学课程")
     @RequestMapping(value = "/select_create", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "创建成功", response = EditResult.class) })
-    @OperationLogDetail(detail = "从课程表选择并创建教学课程，参数[{{teachCourseSelectParam}}]", customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(detail = "从课程表选择并创建教学课程，参数[{{teachCourseSelectParam}}]", operationType = OperationTypeEnum.ADD)
     public Result selectCreate(@Valid @RequestBody TeachCourseSelectParam teachCourseSelectParam, BindingResult bindingResult) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         if (bindingResult.hasErrors()) {
@@ -87,7 +84,7 @@ public class TeachCourseController {
     @ApiOperation(value = "教学课程-教学课程批量导入")
     @RequestMapping(value = "/import", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "创建成功", response = EditResult.class) })
-    @OperationLogDetail(detail = "教学课程批量导入", customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(detail = "教学课程批量导入", operationType = OperationTypeEnum.ADD)
     @Deprecated
     public Result importTeachCourse(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file) throws IOException, NoSuchFieldException {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
@@ -106,7 +103,7 @@ public class TeachCourseController {
     @ApiOperation(value = "教学课程-批量删除")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "删除成功", response = EditResult.class) })
-    @OperationLogDetail(detail = "用户根据教学课程id集合[{{idList}}]批量删除教学课程", level = LevelEnum.TERTIARY, operationType = OperationTypeEnum.DELETE, operationUnit = OperationUnitEnum.TEACH_COURSE, customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(detail = "用户根据教学课程id集合[{{idList}}]批量删除教学课程", operationType = OperationTypeEnum.DELETE)
     public Result deleteTeachCourse(@ApiParam(value = "选择的要删除的课程id集合", required = true) @RequestParam List<String> idList) {
         teachCourseService.deleteTeachCourseBatch(
                 idList.stream().map(SystemConstant::convertIdToLong).collect(Collectors.toList()));
@@ -116,7 +113,7 @@ public class TeachCourseController {
     @ApiOperation(value = "教师团队-手动添加教师")
     @RequestMapping(value = "/manual_create_teacher", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "创建成功", response = EditResult.class) })
-    @OperationLogDetail(detail = "手动添加教师，参数[{{teacherTeamParam}}]", customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(detail = "手动添加教师，参数[{{teacherTeamParam}}]", operationType = OperationTypeEnum.ADD)
     public Result manualCreateTeacher(@Valid @RequestBody TeacherTeamParam teacherTeamParam, BindingResult bindingResult) throws IllegalAccessException {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         if (bindingResult.hasErrors()) {
@@ -129,7 +126,7 @@ public class TeachCourseController {
     @ApiOperation(value = "教师团队-用户表选择教师")
     @RequestMapping(value = "/select_create_teacher", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "创建成功", response = EditResult.class) })
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(operationType = OperationTypeEnum.ADD)
     public Result selectCreate(@ApiParam(value = "考试id", required = true) @RequestParam String teachCourseId,
             @ApiParam(value = "教师id集合", required = true) @RequestParam List<String> userIdList) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
@@ -141,7 +138,7 @@ public class TeachCourseController {
     @ApiOperation(value = "教师团队-批量导入教师")
     @RequestMapping(value = "/import_teacher", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "创建成功", response = EditResult.class) })
-    @OperationLogDetail(detail = "教学课程批量导入", customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(detail = "教学课程批量导入", operationType = OperationTypeEnum.ADD)
     @Deprecated
     public Result importTeacherTeam(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file, @ApiParam(value = "基础课程", required = true) @RequestParam Long basicCourseId)
             throws IOException, NoSuchFieldException, IllegalAccessException {
@@ -190,7 +187,7 @@ public class TeachCourseController {
     @ApiOperation(value = "教师团队管理-分配班级")
     @RequestMapping(value = "/assign_clazz", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "创建成功", response = EditResult.class) })
-    @OperationLogDetail(detail = "分配班级，参数[{{assignClazzParam}}]", customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(detail = "分配班级，参数[{{assignClazzParam}}]", operationType = OperationTypeEnum.ADD)
     public Result assignClazz(@Valid @RequestBody AssignClazzParam assignClazzParam, BindingResult bindingResult) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         if (bindingResult.hasErrors()) {

distributed-print/src/main/java/com/qmth/distributed/print/api/TeachStudentController.java

@@ -8,7 +8,7 @@ import com.qmth.distributed.print.business.service.TeachStudentService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -54,7 +54,7 @@ public class TeachStudentController {
     @ApiOperation(value = "教学学生-创建教学学生")
     @RequestMapping(value = "/create", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "创建成功", response = EditResult.class) })
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(operationType = OperationTypeEnum.ADD)
     @Deprecated
     public Result createTeachStudent(@Valid @RequestBody TeachStudentParams teachStudentParams, BindingResult bindingResult) throws IllegalAccessException {
         if (bindingResult.hasErrors()) {
@@ -69,7 +69,7 @@ public class TeachStudentController {
     @ApiOperation(value = "教学学生-从课程班级批量添加学生")
     @RequestMapping(value = "/create_batch", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "创建成功", response = EditResult.class) })
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(operationType = OperationTypeEnum.ADD)
     public Result createTeachStudentBatchByDictionary(@Valid @RequestBody TeachStudentBatchParam teachStudentBatchParam,
             BindingResult bindingResult) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
@@ -83,7 +83,7 @@ public class TeachStudentController {
     @ApiOperation(value = "教学学生-批量导入")
     @RequestMapping(value = "/import", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "返回信息", response = EditResult.class) })
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.IMPORT)
+    @OperationLogDetail(operationType = OperationTypeEnum.IMPORT)
     @Deprecated
     public Result teachStudentImport(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file, @ApiParam(value = "教学班级id", required = true) @RequestParam String teachClazzId)
             throws IOException, NoSuchFieldException {
@@ -98,7 +98,7 @@ public class TeachStudentController {
     @ApiOperation(value = "教学学生-批量删除")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "删除成功", response = EditResult.class) })
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result deleteTeachStudent(@ApiParam(value = "选择的要删除的学生id集合", required = true) @RequestParam List<Long> idList) {
         return ResultUtil.ok(teachStudentService.deleteTeachStudentBatch(idList));
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/admin/ClientUpgradeController.java

@@ -2,41 +2,21 @@ package com.qmth.distributed.print.api.admin;
 
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.service.ClientUpgradeService;
-import com.qmth.distributed.print.business.service.PrintCommonService;
-import com.qmth.distributed.print.business.service.TeachCourseService;
-import com.qmth.teachcloud.common.annotation.OperationLogDetail;
-import com.qmth.teachcloud.common.bean.params.BasicCourseParams;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.BasicCourse;
-import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.clientpackage.ClientPackageEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
-import com.qmth.teachcloud.common.enums.log.LevelEnum;
-import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
-import com.qmth.teachcloud.common.service.BasicCourseService;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
-import com.qmth.teachcloud.common.util.ServletUtil;
-import io.swagger.annotations.*;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * 客户端升级 前端控制器

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/MarkClassController.java

@@ -6,7 +6,7 @@ import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.mark.dto.mark.setting.MarkUserClassDto;
 import com.qmth.teachcloud.common.bean.params.mark.setting.MarkClassUserParams;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.mark.service.MarkUserClassService;
@@ -16,7 +16,6 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 /**
  * <p>
@@ -50,7 +49,7 @@ public class MarkClassController extends BaseController {
      */
     @ApiOperation(value = "提交")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(operationType = OperationTypeEnum.ADD)
     public Result save(@RequestBody MarkClassUserParams markClassUserParams) {
         validMarkPaperForMark(markClassUserParams.getExamId(), markClassUserParams.getPaperNumber());
         return ResultUtil.ok(markUserClassService.saveMarkClassUser(markClassUserParams));

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/MarkGroupController.java

@@ -12,7 +12,7 @@ import com.qmth.teachcloud.mark.dto.mark.setting.MarkGroupSingleDto;
 import com.qmth.teachcloud.mark.dto.mark.setting.MarkGroupTaskDto;
 import com.qmth.teachcloud.common.bean.params.mark.setting.GroupPictureConfigParams;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.mark.service.MarkGroupService;
@@ -56,7 +56,7 @@ public class MarkGroupController extends BaseController {
      */
     @ApiOperation(value = "新增")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(operationType = OperationTypeEnum.ADD)
     public Result add(@RequestBody MarkGroupSingleDto markGroupSingleDto) {
         validMarkPaperForMark(markGroupSingleDto.getExamId(), markGroupSingleDto.getPaperNumber());
         return ResultUtil.ok(markGroupService.saveGroup(markGroupSingleDto));
@@ -67,7 +67,7 @@ public class MarkGroupController extends BaseController {
      */
     @ApiOperation(value = "修改")
     @RequestMapping(value = "/update", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result update(@RequestBody MarkGroupSingleDto markGroupSingleDto) {
         validMarkPaperForMark(markGroupSingleDto.getExamId(), markGroupSingleDto.getPaperNumber());
         return ResultUtil.ok(markGroupService.updateGroup(markGroupSingleDto));
@@ -78,7 +78,7 @@ public class MarkGroupController extends BaseController {
      */
     @ApiOperation(value = "删除")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
     public Result delete(@ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
                          @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber,
                          @ApiParam(value = "分组号", required = true) @RequestParam Integer groupNumber) {
@@ -92,7 +92,7 @@ public class MarkGroupController extends BaseController {
      */
     @ApiOperation(value = "评卷区设置")
     @RequestMapping(value = "/update_picture_config", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result updatePictureConfig(@RequestBody GroupPictureConfigParams groupPictureConfigParams) {
         validMarkPaperForMark(groupPictureConfigParams.getExamId(), groupPictureConfigParams.getPaperNumber());
         markGroupService.updatePicListByExamIdAndPaperNumberAndGroupNumber(groupPictureConfigParams);
@@ -104,7 +104,7 @@ public class MarkGroupController extends BaseController {
      */
     @ApiOperation(value = "开启/关闭分班阅")
     @RequestMapping(value = "/update_open_mark_class", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
     public Result delete(@ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
                          @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber,
                          @ApiParam(value = "是否开启分班阅", required = true) @RequestParam Boolean openMarkClass) {

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/MarkPaperController.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.enums.mark.MarkPaperStatus;
 import com.qmth.teachcloud.mark.dto.mark.score.MarkPaperPackageDto;
 import com.qmth.teachcloud.mark.service.MarkPaperService;
@@ -46,7 +46,7 @@ public class MarkPaperController {
      */
     @ApiOperation(value = "结束/开始阅卷")
     @RequestMapping(value = "/finish", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result finish(@ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
                          @ApiParam(value = "试卷编号", required = true) @RequestParam List<String> paperNumbers,
                          @ApiParam(value = "状态", required = true) @RequestParam MarkPaperStatus status) {

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/MarkQuestionController.java

@@ -11,7 +11,7 @@ import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.MarkQuestion;
 import com.qmth.teachcloud.common.enums.CardCreateMethodEnum;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.ExamTaskUtil;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
@@ -88,7 +88,7 @@ public class MarkQuestionController extends BaseController {
      */
     @ApiOperation(value = "提交")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(operationType = OperationTypeEnum.ADD)
     public Result save(@RequestBody MarkQuestionParams markQuestionParams) {
         validMarkPaperForMark(markQuestionParams.getExamId(), markQuestionParams.getPaperNumber());
         markQuestionService.saveQuestions(markQuestionParams);
@@ -111,7 +111,7 @@ public class MarkQuestionController extends BaseController {
      */
     @ApiOperation(value = "客观题标答提交")
     @RequestMapping(value = "/objective/save", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(operationType = OperationTypeEnum.ADD)
     public Result saveObjective(@RequestBody MarkObjectiveQuestionParams markObjectiveQuestionParams) {
         markQuestionService.saveObjectiveQuestions(markObjectiveQuestionParams);
         return ResultUtil.ok(true);
@@ -164,7 +164,7 @@ public class MarkQuestionController extends BaseController {
      */
     @ApiOperation(value = "主观题标答文件上传")
     @RequestMapping(value = "/subjective/upload", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.ADD)
+    @OperationLogDetail(operationType = OperationTypeEnum.ADD)
     public Result uploadSubjective(@ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
                                    @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber,
                                    @ApiParam(value = "文件", required = true) @RequestParam MultipartFile file,

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/MarkSettingController.java

@@ -13,11 +13,10 @@ import com.qmth.teachcloud.common.bean.vo.PaperInfoVo;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.TaskTypeEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.ExamTaskUtil;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
-import com.qmth.teachcloud.common.util.ServletUtil;
 import com.qmth.teachcloud.mark.dto.mark.manage.MarkManageDto;
 import com.qmth.teachcloud.mark.dto.mark.score.CheckScoreListDto;
 import com.qmth.teachcloud.mark.entity.MarkPaper;
@@ -102,7 +101,7 @@ public class MarkSettingController {
      */
     @ApiOperation(value = "评卷设置数据保存")
     @RequestMapping(value = "/paper/save", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
     public Result paperSave(@RequestBody MarkPaper markPaper) {
         markPaperService.savePaperSetting(markPaper);
         return ResultUtil.ok(true);

distributed-print/src/main/resources/application.properties

@@ -12,7 +12,7 @@ spring.application.name=teachcloud
 #\u6570\u636E\u6E90\u914D\u7F6E
 db.host=localhost
 db.port=3306
-db.name=teachcloud-3.3.2
+db.name=teachcloud-3.4.0
 db.username=root
 db.password=12345678
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/annotation/OperationLogDetail.java

@@ -19,28 +19,15 @@ public @interface OperationLogDetail {
      */
     String detail() default "";
 
-    /**
-     * 日志记录 - 日志等级（默认为第四级（普通信息））
-     */
-    LevelEnum level() default LevelEnum.QUATERNARY;
-
-    /**
-     * 日志记录 - 自定义记录操作类型（默认 - 未知）
-     */
-    CustomizedOperationTypeEnum customizedOperationType() default CustomizedOperationTypeEnum.UN_KNOW;
-
     /**
      * 日志记录 - 操作类型（主要是 'SELECT,EDIT,DELETE',默认为'未知'）
      */
-    OperationTypeEnum operationType() default OperationTypeEnum.UN_KNOW;
+    OperationTypeEnum operationType() default OperationTypeEnum.OTHER;
 
     /**
-     * 日志记录 - 被操作对象（主要是表，默认为'未知'）
+     * 日志记录 - 操作功能名称（默认为空）
      */
-    OperationUnitEnum operationUnit() default OperationUnitEnum.UN_KNOW;
 
-    /**
-     * 日志记录 - 被记录日志的系统（默认为'分布式印刷系统'）
-     */
-    SystemEnum system() default SystemEnum.DISTRIBUTED_PRINT;
+    String functionName() default "";
+
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/aspect/LogAspect.java

@@ -11,7 +11,6 @@ import com.qmth.teachcloud.common.entity.BasicOperationLog;
 import com.qmth.teachcloud.common.entity.SysPrivilege;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.PrivilegeEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
 import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.service.BasicOperationLogService;
 import com.qmth.teachcloud.common.service.SysPrivilegeService;
@@ -66,17 +65,10 @@ public class LogAspect {
      */
     @Around(value = "operationLog()")
     public Object aroundOperationLogPoint(ProceedingJoinPoint joinPoint) throws Throwable {
-        Object res = null;
-        long beginTime = System.currentTimeMillis();
-        long endTime = 0;
         String runStatus = "成功";
         try {
-            res = joinPoint.proceed();
-            endTime = System.currentTimeMillis();
-            return res;
+            return joinPoint.proceed();
         } catch (Exception e) {
-            endTime = System.currentTimeMillis();
-            res = "Exception: " + e.getMessage();
             runStatus = "失败";
             log.error(SystemConstant.LOG_ERROR, e);
             if (e instanceof ApiException) {
@@ -87,7 +79,7 @@ public class LogAspect {
         } finally {
             try {
                 //方法执行完成后增加日志
-                addOperationLog(joinPoint, res, endTime - beginTime, runStatus);
+                addOperationLog(joinPoint, runStatus);
             } catch (Exception e) {
                 log.error("LogAspect 操作失败：" + e.getMessage());
                 e.printStackTrace();
@@ -100,18 +92,13 @@ public class LogAspect {
      * 记录日志操作
      *
      * @param joinPoint joinPoint
-     * @param res       返回值
-     * @param time      方法执行时间
      * @param runStatus 方法执行状态
      */
-    private void addOperationLog(JoinPoint joinPoint, Object res, long time, String runStatus) throws IllegalAccessException {
-        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        String userName = requestUser.getLoginName();
+    private void addOperationLog(JoinPoint joinPoint, String runStatus) throws IllegalAccessException {
+        Long userId = ServletUtil.getRequestUserId();
         HttpServletRequest request = ServletUtil.getRequest();
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
         Long privilegeId = ServletUtil.getCurrentPrivilegeId();
-        String clazzName = signature.getDeclaringTypeName();
-        String methodName = signature.getName();
         Object[] args = joinPoint.getArgs();
         String[] paramsName = signature.getParameterNames();
 
@@ -120,127 +107,99 @@ public class LogAspect {
         // 方法中的信息
         operationLog.setId(SystemConstant.getDbUuid());
         operationLog.setSchoolId(Objects.nonNull(ServletUtil.getRequestHeaderSchoolIdByNotVaild()) ? Long.valueOf(ServletUtil.getRequestHeaderSchoolIdByNotVaild().toString()) : null);
+        operationLog.setUserId(userId);
+        operationLog.setIp(ServletUtil.getIP());
         operationLog.setUrl(request.getServletPath());
-        operationLog.setClazzName(clazzName);
-        operationLog.setMethod(methodName);
-        operationLog.setArgs(this.getTranslateArgs(paramsName, args));
-        operationLog.setRunTime(time);
+        operationLog.setArgs(JSON.toJSONString(getTranslateArgs(paramsName, args)));
         operationLog.setRunStatus(runStatus);
-        operationLog.setReturnValue(JSON.toJSONString(res));
-        operationLog.setUserId(requestUser.getId());
-        operationLog.setUserName(userName);
-        operationLog.setIp(ServletUtil.getIP());
         operationLog.setCreateTime(System.currentTimeMillis());
-        operationLog.setOrgId(requestUser.getOrgId());
-        operationLog.setPrivilegeId(privilegeId);
 
         // 注解中的信息
         OperationLogDetail annotation = signature.getMethod().getAnnotation(OperationLogDetail.class);
         if (annotation != null) {
-            String detail = annotation.detail();
-            if (SystemConstant.strNotNull(detail)) {
-                operationLog.setDetail(getDetail(((MethodSignature) joinPoint.getSignature()).getParameterNames(), joinPoint.getArgs(), annotation));
-            } else {
-                operationLog.setDetail(autoCreateOperationLogDetailByUrlAndPrivilegeId(request.getServletPath(),privilegeId));
+            OperationTypeEnum operationType = annotation.operationType();
+            operationLog.setOperationType(operationType);
+
+            if (OperationTypeEnum.SAVE.equals(operationType)) {
+                operationType = this.getAddOrUpdateByParam(args);
             }
-            operationLog.setLevel(annotation.level());
-            CustomizedOperationTypeEnum customizedOperationType = annotation.customizedOperationType();
-            if (CustomizedOperationTypeEnum.EDIT.equals(customizedOperationType)) {
-                customizedOperationType = this.getAddOrUpdateByParam(args);
+            // 退出登录，不绑定权限ID
+            if (!OperationTypeEnum.LOGOUT.equals(operationType)) {
+                operationLog.setPrivilegeId(privilegeId);
             }
 
-            operationLog.setCustomizedOperationType(customizedOperationType);
-
+            // functionName
+            String functionName = annotation.functionName();
+            if (SystemConstant.strNotNull(functionName)) {
+                operationLog.setFunctionName(functionName);
+            } else {
+                operationLog.setFunctionName(getUrlName(request.getServletPath()));
+            }
 
-            OperationTypeEnum operationType = annotation.operationType();
-            if (OperationTypeEnum.UN_KNOW.equals(operationType)) {
-                operationType = customizedOperationType.getOperationType();
+            // detail
+            String detail = annotation.detail();
+            if (SystemConstant.strNotNull(detail)) {
+                operationLog.setDetail(getDetail(paramsName, args, detail));
+            } else {
+                operationLog.setDetail(autoCreateOperationLogDetailByUrlAndPrivilegeId(request.getServletPath(), privilegeId));
             }
-            operationLog.setOperationType(operationType);
-            operationLog.setOperationUnit(annotation.operationUnit());
-            operationLog.setSystemType(annotation.system());
         }
         // 保存操作日志
         basicOperationLogService.save(operationLog);
     }
 
-    private String getTranslateArgs(String[] paramsName, Object[] args) {
-        List<LogArgsDto> logArgsDtoList = new ArrayList<>();
+    private Map<Object, Object> getTranslateArgs(String[] paramsName, Object[] args) {
+        Map<Object, Object> map = new HashMap<>();
         for (int i = 0; i < args.length; i++) {
-            if (Objects.nonNull(args[i]) && (args[i] instanceof HttpServletRequest || args[i] instanceof HttpServletResponse || args[i] instanceof CommonsMultipartFile || args[i] instanceof MultipartFile || args[i] instanceof BeanPropertyBindingResult)) {
+            if (Objects.isNull(args[i]) || (Objects.nonNull(args[i]) && (args[i] instanceof HttpServletRequest || args[i] instanceof HttpServletResponse || args[i] instanceof CommonsMultipartFile || args[i] instanceof MultipartFile || args[i] instanceof BeanPropertyBindingResult))) {
                 continue;
             }
-            LogArgsDto logArgsDto = new LogArgsDto();
-            logArgsDto.setArg(args[i]);
-            logArgsDto.setParamName(paramsName[i]);
-            logArgsDtoList.add(logArgsDto);
+            map.put(paramsName[i], args[i]);
         }
-        return JSON.toJSONString(logArgsDtoList);
+        return map;
     }
 
-    private CustomizedOperationTypeEnum getAddOrUpdateByParam(Object[] args) throws IllegalAccessException {
+    /**
+     * 处理SAVE类型方法，解析出新增或者修改
+     *
+     * @param args 请求参数
+     */
+    private OperationTypeEnum getAddOrUpdateByParam(Object[] args) throws IllegalAccessException {
+        boolean isAdd = false;
         for (Object arg : args) {
             if (Objects.nonNull(arg) && (arg instanceof HttpServletRequest || arg instanceof HttpServletResponse || arg instanceof MultipartFile || arg instanceof BeanPropertyBindingResult)) {
                 continue;
             }
-            Class<?> clazz = arg.getClass();
-            Field[] fields = clazz.getDeclaredFields();
+            Field[] fields = arg.getClass().getFields();
             for (Field field : fields) {
                 EditKey editKey = field.getAnnotation(EditKey.class);
                 if (editKey != null) {
                     // 捕捉到编辑对象的id
                     field.setAccessible(true);
                     Object obj = field.get(arg);
-                    if (Objects.nonNull(obj)) {
-                        return CustomizedOperationTypeEnum.UPDATE;
-                    } else {
-                        return CustomizedOperationTypeEnum.ADD;
-                    }
-                }
-            }
-            Class<?> supperClazz = clazz.getSuperclass();
-            if (Objects.nonNull(supperClazz)) {
-                Field[] supperFields = supperClazz.getDeclaredFields();
-                for (Field field : supperFields) {
-                    EditKey editKey = field.getAnnotation(EditKey.class);
-                    if (editKey != null) {
-                        // 捕捉到编辑对象的id
-                        field.setAccessible(true);
-                        Object obj = field.get(arg);
-                        if (Objects.nonNull(obj)) {
-                            return CustomizedOperationTypeEnum.UPDATE;
-                        } else {
-                            return CustomizedOperationTypeEnum.ADD;
-                        }
+                    if (Objects.isNull(obj)) {
+                        isAdd = true;
                     }
                 }
             }
         }
-        return CustomizedOperationTypeEnum.UPDATE;
+        return isAdd ? OperationTypeEnum.ADD : OperationTypeEnum.UPDATE;
     }
 
     /**
      * 对当前登录用户和占位符处理
      *
-     * @param argNames   方法参数名称数组
+     * @param paramsName 方法参数名称数组
      * @param args       方法参数数组
-     * @param annotation 注解信息
+     * @param detail     注解信息
      * @return 返回处理后的描述
      */
-    private String getDetail(String[] argNames, Object[] args, OperationLogDetail annotation) {
+    private String getDetail(String[] paramsName, Object[] args, String detail) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
 
-        Map<Object, Object> map = new HashMap<>();
-        for (int i = 0; i < argNames.length; i++) {
-            if (Objects.nonNull(args[i]) && (args[i] instanceof HttpServletRequest || args[i] instanceof HttpServletResponse || args[i] instanceof CommonsMultipartFile || args[i] instanceof MultipartFile || args[i] instanceof BeanPropertyBindingResult)) {
-                continue;
-            }
-            map.put(argNames[i], args[i]);
-        }
-
-        String detail = annotation.detail();
+        Map<Object, Object> map = getTranslateArgs(paramsName, args);
         try {
-            detail = "'" + requestUser.getRealName() + "'=》" + annotation.detail();
+            detail = "'" + requestUser.getRealName() + "'=》" + detail;
             for (Map.Entry<Object, Object> entry : map.entrySet()) {
                 Object k = entry.getKey();
                 Object v = entry.getValue();
@@ -252,34 +211,6 @@ public class LogAspect {
         return detail;
     }
 
-    /**
-     * 根据权限url自动创建操作日志详情
-     *
-     * @param url url
-     * @return 操作日志详情
-     */
-    private String autoCreateOperationLogDetailByUrl(String url) {
-        String detail = "";
-        List<SysPrivilege> sysPrivilegeList = sysPrivilegeService.list(new QueryWrapper<SysPrivilege>()
-                .lambda()
-                .eq(SysPrivilege::getUrl, url)
-                .eq(SysPrivilege::getType, PrivilegeEnum.URL)
-                .orderByAsc(SysPrivilege::getId));
-        if (sysPrivilegeList.size() > 0) {
-            SysPrivilege sysPrivilege = sysPrivilegeList.get(0);
-            Long parentId = sysPrivilege.getParentId();
-            String operationName = sysPrivilege.getName();
-            String path = sysPrivilegeService.findPrivilegeUrlCatalog(parentId);
-            if (SystemConstant.strNotNull(path)) {
-                path = path.substring(0, path.length() - SystemConstant.CATALOG_LINK.length());
-                detail = path + SystemConstant.OPERATE_LINK + operationName;
-            } else {
-                detail = operationName;
-            }
-        }
-        return detail;
-    }
-
     /**
      * 根据权限url和所在菜单的权限id自动创建操作日志详情
      *
@@ -305,6 +236,20 @@ public class LogAspect {
         return result;
     }
 
+    /**
+     * 根据url获取url名称
+     *
+     * @param url url
+     * @return url名称
+     */
+    private String getUrlName(String url) {
+        SysPrivilege sysPrivilege = sysPrivilegeService.getOne(new QueryWrapper<SysPrivilege>()
+                .lambda()
+                .eq(SysPrivilege::getUrl, url)
+                .eq(SysPrivilege::getType, PrivilegeEnum.URL));
+        return sysPrivilege == null ? null : sysPrivilege.getName();
+    }
+
     @Before(value = "operationLog()")
     public void doBeforeAdvice(JoinPoint joinPoint) {
         log.info("进入方法前执行.....");

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/result/BasicOperationLogResult.java

@@ -2,7 +2,7 @@ package com.qmth.teachcloud.common.bean.result;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
@@ -34,7 +34,7 @@ public class BasicOperationLogResult implements Serializable {
     private String ip;
 
     @ApiModelProperty("自定义操作类型")
-    private CustomizedOperationTypeEnum customizedOperationType;
+    private OperationTypeEnum operationType;
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty("创建时间")
@@ -88,12 +88,12 @@ public class BasicOperationLogResult implements Serializable {
         this.ip = ip;
     }
 
-    public CustomizedOperationTypeEnum getCustomizedOperationType() {
-        return customizedOperationType;
+    public OperationTypeEnum getOperationType() {
+        return operationType;
     }
 
-    public void setCustomizedOperationType(CustomizedOperationTypeEnum customizedOperationType) {
-        this.customizedOperationType = customizedOperationType;
+    public void setOperationType(OperationTypeEnum operationType) {
+        this.operationType = operationType;
     }
 
     public Long getCreateTime() {

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/BasicOperationLog.java

@@ -20,69 +20,29 @@ public class BasicOperationLog implements Serializable {
     @ApiModelProperty(value = "id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
-
-    @ApiModelProperty(value = "机构id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long orgId;
-
     @ApiModelProperty(value = "学校id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long schoolId;
-
-    @ApiModelProperty(value = "日志详情")
-    private String detail;
-
-    @ApiModelProperty(value = "日志等级（PRIMARY(\"一级日志：敏感信息\"),SECONDARY(\"二级日志：重要信息\"),TERTIARY(\"三级日志：次要信息\"),QUATERNARY(\"四级日志：普通信息\")）")
-    private LevelEnum level;
-
-    @ApiModelProperty(value = "自定义记录日志操作类型（LOGIN(\"用户登录\"),LOGOUT(\"用户登出\"),ADD(\"新增\"),DELETE(\"删除\"),UPDATE(\"修改\"),IMPORT(\"导入\"),EXPORT(\"导出\"),UN_KNOW(\"未知\")）")
-    private CustomizedOperationTypeEnum customizedOperationType;
-
-    @ApiModelProperty(value = "操作类型（UN_KNOW(\"未知\"),SELECT(\"查询\"),EDIT(\"新增或更新\"),DELETE(\"删除\")）")
-    private OperationTypeEnum operationType;
-
-    @ApiModelProperty(value = "操作对象（略）")
-    private OperationUnitEnum operationUnit;
-
-    @ApiModelProperty(value = "日志系统类型")
-    private SystemEnum systemType;
-
-    @ApiModelProperty(value = "请求地址url")
-    private String url;
-
     @ApiModelProperty(value = "父菜单权限id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long privilegeId;
-
-    @ApiModelProperty(value = "类名称")
-    private String clazzName;
-
-    @ApiModelProperty(value = "方法名称")
-    private String method;
-
+    @ApiModelProperty(value = "操作类型")
+    private OperationTypeEnum operationType;
+    @ApiModelProperty(value = "功能名称")
+    private String functionName;
+    @ApiModelProperty(value = "请求地址url")
+    private String url;
+    @ApiModelProperty(value = "日志详情")
+    private String detail;
     @ApiModelProperty(value = "参数")
     private String args;
-
-    @ApiModelProperty(value = "方法运行时间")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long runTime;
-
     @ApiModelProperty(value = "运行状态")
     private String runStatus;
-
-    @ApiModelProperty(value = "方法返回值")
-    private String returnValue;
-
     @ApiModelProperty(value = "用户对象id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long userId;
-
-    @ApiModelProperty(value = "用户名称")
-    private String userName;
-
     @ApiModelProperty(value = "ip地址")
     private String ip;
-
     @ApiModelProperty(value = "日志记录时间")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long createTime;
@@ -95,14 +55,6 @@ public class BasicOperationLog implements Serializable {
         this.id = id;
     }
 
-    public Long getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(Long orgId) {
-        this.orgId = orgId;
-    }
-
     public Long getSchoolId() {
         return schoolId;
     }
@@ -111,28 +63,12 @@ public class BasicOperationLog implements Serializable {
         this.schoolId = schoolId;
     }
 
-    public String getDetail() {
-        return detail;
-    }
-
-    public void setDetail(String detail) {
-        this.detail = detail;
-    }
-
-    public LevelEnum getLevel() {
-        return level;
-    }
-
-    public void setLevel(LevelEnum level) {
-        this.level = level;
-    }
-
-    public CustomizedOperationTypeEnum getCustomizedOperationType() {
-        return customizedOperationType;
+    public Long getPrivilegeId() {
+        return privilegeId;
     }
 
-    public void setCustomizedOperationType(CustomizedOperationTypeEnum customizedOperationType) {
-        this.customizedOperationType = customizedOperationType;
+    public void setPrivilegeId(Long privilegeId) {
+        this.privilegeId = privilegeId;
     }
 
     public OperationTypeEnum getOperationType() {
@@ -143,20 +79,12 @@ public class BasicOperationLog implements Serializable {
         this.operationType = operationType;
     }
 
-    public OperationUnitEnum getOperationUnit() {
-        return operationUnit;
+    public String getFunctionName() {
+        return functionName;
     }
 
-    public void setOperationUnit(OperationUnitEnum operationUnit) {
-        this.operationUnit = operationUnit;
-    }
-
-    public SystemEnum getSystemType() {
-        return systemType;
-    }
-
-    public void setSystemType(SystemEnum systemType) {
-        this.systemType = systemType;
+    public void setFunctionName(String functionName) {
+        this.functionName = functionName;
     }
 
     public String getUrl() {
@@ -167,28 +95,12 @@ public class BasicOperationLog implements Serializable {
         this.url = url;
     }
 
-    public Long getPrivilegeId() {
-        return privilegeId;
-    }
-
-    public void setPrivilegeId(Long privilegeId) {
-        this.privilegeId = privilegeId;
-    }
-
-    public String getClazzName() {
-        return clazzName;
-    }
-
-    public void setClazzName(String clazzName) {
-        this.clazzName = clazzName;
-    }
-
-    public String getMethod() {
-        return method;
+    public String getDetail() {
+        return detail;
     }
 
-    public void setMethod(String method) {
-        this.method = method;
+    public void setDetail(String detail) {
+        this.detail = detail;
     }
 
     public String getArgs() {
@@ -199,14 +111,6 @@ public class BasicOperationLog implements Serializable {
         this.args = args;
     }
 
-    public Long getRunTime() {
-        return runTime;
-    }
-
-    public void setRunTime(Long runTime) {
-        this.runTime = runTime;
-    }
-
     public String getRunStatus() {
         return runStatus;
     }
@@ -215,14 +119,6 @@ public class BasicOperationLog implements Serializable {
         this.runStatus = runStatus;
     }
 
-    public String getReturnValue() {
-        return returnValue;
-    }
-
-    public void setReturnValue(String returnValue) {
-        this.returnValue = returnValue;
-    }
-
     public Long getUserId() {
         return userId;
     }
@@ -231,14 +127,6 @@ public class BasicOperationLog implements Serializable {
         this.userId = userId;
     }
 
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
     public String getIp() {
         return ip;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/log/CustomizedOperationTypeEnum.java

@@ -1,52 +0,0 @@
-package com.qmth.teachcloud.common.enums.log;
-
-import com.qmth.teachcloud.common.enums.EnumResult;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Description: 系统自定义日志操作类型
- * @Author: CaoZixuan
- * @Date: 2022-11-29
- */
-public enum CustomizedOperationTypeEnum {
-    LOGIN("用户登录", OperationTypeEnum.UN_KNOW),
-    LOGOUT("用户登出", OperationTypeEnum.UN_KNOW),
-    EDIT("编辑",OperationTypeEnum.EDIT),
-    ADD("新增", OperationTypeEnum.EDIT),
-    DELETE("删除", OperationTypeEnum.DELETE),
-    UPDATE("修改", OperationTypeEnum.EDIT),
-    IMPORT("导入", OperationTypeEnum.EDIT),
-    EXPORT("导出", OperationTypeEnum.SELECT),
-    SYNC("同步", OperationTypeEnum.EDIT),
-    PREVIEW("预览", OperationTypeEnum.UN_KNOW),
-    UN_KNOW("未知", OperationTypeEnum.UN_KNOW);
-    private final String desc;
-    private final OperationTypeEnum operationType;
-
-    CustomizedOperationTypeEnum(String desc, OperationTypeEnum operationType) {
-        this.desc = desc;
-        this.operationType = operationType;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public OperationTypeEnum getOperationType() {
-        return operationType;
-    }
-
-    public static List<EnumResult> listTypes() {
-        List<EnumResult> list = new ArrayList<EnumResult>();
-        for (CustomizedOperationTypeEnum value : CustomizedOperationTypeEnum.values()) {
-            EnumResult result = new EnumResult();
-            result.setName(value.getDesc());
-            result.setOrdinal(value.ordinal());
-            result.setCode(value.name());
-            list.add(result);
-        }
-        return list;
-    }
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/log/LevelEnum.java

@@ -1,40 +0,0 @@
-package com.qmth.teachcloud.common.enums.log;
-
-import java.util.Objects;
-
-/**
- * @Description: 日志等级枚举类
- * @Author: CaoZixuan
- * @Date: 2022-02-14
- */
-public enum LevelEnum {
-    PRIMARY("一级日志：敏感信息"),
-    SECONDARY("二级日志：重要信息"),
-    TERTIARY("三级日志：次要信息"),
-    QUATERNARY("四级日志：普通信息"),
-    ;
-    private final String desc;
-
-    LevelEnum(String desc) {
-        this.desc = desc;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    /**
-     * 状态转换 toName
-     *
-     * @param p desc
-     * @return name
-     */
-    public static String convertToName(String p) {
-        for (LevelEnum e : LevelEnum.values()) {
-            if (Objects.equals(p, e.getDesc())) {
-                return e.name();
-            }
-        }
-        return null;
-    }
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/log/OperationTypeEnum.java

@@ -1,39 +1,48 @@
 package com.qmth.teachcloud.common.enums.log;
 
-import java.util.Objects;
+import com.qmth.teachcloud.common.enums.EnumResult;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
- * @Description: 操作类型枚举
+ * @Description: 系统自定义日志操作类型
  * @Author: CaoZixuan
- * @Date: 2022-02-14
+ * @Date: 2022-11-29
  */
 public enum OperationTypeEnum {
-    UN_KNOW("未知"),
-    SELECT("查询"),
-    EDIT("新增或更新"),
-    DELETE("删除");
-    private final String desc;
+    LOGIN("用户登录"),
+    LOGOUT("用户登出"),
+    SAVE("新增或修改"),
+    ADD("新增"),
+    DELETE("删除"),
+    UPDATE("修改"),
+    IMPORT("导入"),
+    EXPORT("导出"),
+    SYNC("同步"),
+    PREVIEW("预览"),
+    TIKU_SSO("题库单点登录"),
+    REPORT_SSO("教研分析单点登录"),
+    OTHER("其它");
+    private final String name;
 
-    OperationTypeEnum(String desc) {
-        this.desc = desc;
+    OperationTypeEnum(String name) {
+        this.name = name;
     }
 
-    public String getDesc() {
-        return desc;
+    public String getName() {
+        return name;
     }
 
-    /**
-     * 状态转换 toName
-     *
-     * @param p desc
-     * @return name
-     */
-    public static String convertToName(String p) {
-        for (OperationTypeEnum e : OperationTypeEnum.values()) {
-            if (Objects.equals(p, e.getDesc())) {
-                return e.name();
-            }
+    public static List<EnumResult> listTypes() {
+        List<EnumResult> list = new ArrayList<EnumResult>();
+        for (OperationTypeEnum value : OperationTypeEnum.values()) {
+            EnumResult result = new EnumResult();
+            result.setName(value.getName());
+            result.setOrdinal(value.ordinal());
+            result.setCode(value.name());
+            list.add(result);
         }
-        return null;
+        return list;
     }
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/log/OperationUnitEnum.java

@@ -1,50 +0,0 @@
-package com.qmth.teachcloud.common.enums.log;
-
-import java.util.Objects;
-
-/**
- * @Description: 被操作对象枚举类
- * @Author: CaoZixuan
- * @Date: 2022-02-14
- */
-public enum OperationUnitEnum {
-    UN_KNOW("未知", "", ""),
-    TEACH_COURSE("操作'teach_course'表", "teach_course", "TeachCourse"),
-    ;
-    private final String desc;
-    private final String table;
-    private final String object;
-
-    OperationUnitEnum(String desc, String table, String object) {
-        this.desc = desc;
-        this.table = table;
-        this.object = object;
-    }
-
-    public String getTable() {
-        return table;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public String getObject() {
-        return object;
-    }
-
-    /**
-     * 状态转换 toName
-     *
-     * @param p desc
-     * @return name
-     */
-    public static String convertToName(String p) {
-        for (OperationUnitEnum e : OperationUnitEnum.values()) {
-            if (Objects.equals(p, e.getDesc())) {
-                return e.name();
-            }
-        }
-        return null;
-    }
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/BasicOperationLogMapper.java

@@ -7,7 +7,7 @@ import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
 import com.qmth.teachcloud.common.bean.result.BasicMajorResult;
 import com.qmth.teachcloud.common.bean.result.BasicOperationLogResult;
 import com.qmth.teachcloud.common.entity.BasicOperationLog;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -31,7 +31,7 @@ public interface BasicOperationLogMapper extends BaseMapper<BasicOperationLog> {
      */
     IPage<BasicOperationLogResult> findOperationLogPage(@Param("iPage") Page<BasicMajorResult> iPage,
                                                         @Param("schoolId") Long schoolId,
-                                                        @Param("customizedOperationType") CustomizedOperationTypeEnum customizedOperationType,
+                                                        @Param("customizedOperationType") OperationTypeEnum customizedOperationType,
                                                         @Param("startTime") Long startTime,
                                                         @Param("endTime") Long endTime,
                                                         @Param("operatorName") String operatorName,

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/BasicOperationLogService.java

@@ -2,12 +2,10 @@ package com.qmth.teachcloud.common.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.bean.result.BasicOperationLogResult;
 import com.qmth.teachcloud.common.entity.BasicOperationLog;
 import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
-import com.qmth.teachcloud.common.enums.log.SystemEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 
 /**
  * @Description: 操作日志记录服务类
@@ -28,7 +26,7 @@ public interface BasicOperationLogService extends IService<BasicOperationLog> {
      * @param pageSize                分页容量
      * @return 分页结果
      */
-    IPage<BasicOperationLogResult> findOperationLogPage(CustomizedOperationTypeEnum customizedOperationType, Long startTime, Long endTime, String operatorName, SysUser requestUser, int pageNumber, int pageSize);
+    IPage<BasicOperationLogResult> findOperationLogPage(OperationTypeEnum customizedOperationType, Long startTime, Long endTime, String operatorName, SysUser requestUser, int pageNumber, int pageSize);
 
-    void saveOperateLogWithNoAuth(Long schoolId, Long orgId, Long userId, String detail, CustomizedOperationTypeEnum customizedOperationType, SystemEnum systemType);
+    void saveOperateLogWithNoAuth(Long schoolId, Long userId, String detail, OperationTypeEnum operationTypeEnum, String args);
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicOperationLogServiceImpl.java

@@ -8,18 +8,15 @@ import com.qmth.teachcloud.common.bean.result.BasicOperationLogResult;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicOperationLog;
 import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
-import com.qmth.teachcloud.common.enums.log.SystemEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.mapper.BasicOperationLogMapper;
 import com.qmth.teachcloud.common.service.BasicOperationLogService;
 import com.qmth.teachcloud.common.service.BasicRoleDataPermissionService;
-import com.qmth.teachcloud.common.service.SysUserService;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.Objects;
 
 /**
  * @Description: 基础操作日志服务实现类
@@ -28,13 +25,11 @@ import java.util.Objects;
  */
 @Service
 public class BasicOperationLogServiceImpl extends ServiceImpl<BasicOperationLogMapper, BasicOperationLog> implements BasicOperationLogService {
-    @Resource
-    private SysUserService sysUserService;
     @Resource
     private BasicRoleDataPermissionService basicRoleDataPermissionService;
 
     @Override
-    public IPage<BasicOperationLogResult> findOperationLogPage(CustomizedOperationTypeEnum customizedOperationType, Long startTime, Long endTime, String operatorName, SysUser requestUser, int pageNumber, int pageSize) {
+    public IPage<BasicOperationLogResult> findOperationLogPage(OperationTypeEnum customizedOperationType, Long startTime, Long endTime, String operatorName, SysUser requestUser, int pageNumber, int pageSize) {
         Long schoolId = requestUser.getSchoolId();
         if (SystemConstant.strNotNull(operatorName)) {
             operatorName = SystemConstant.translateSpecificSign(operatorName);
@@ -44,22 +39,17 @@ public class BasicOperationLogServiceImpl extends ServiceImpl<BasicOperationLogM
     }
 
     @Override
-    public void saveOperateLogWithNoAuth(Long schoolId, Long orgId, Long userId, String detail, CustomizedOperationTypeEnum customizedOperationType, SystemEnum systemType) {
+    public void saveOperateLogWithNoAuth(Long schoolId, Long userId, String detail, OperationTypeEnum operationTypeEnum, String args) {
         HttpServletRequest request = ServletUtil.getRequest();
         BasicOperationLog operationLog = new BasicOperationLog();
         operationLog.setId(SystemConstant.getDbUuid());
+        operationLog.setOperationType(operationTypeEnum);
         operationLog.setDetail(detail);
         operationLog.setSchoolId(schoolId);
         operationLog.setUrl(request.getServletPath());
         operationLog.setUserId(userId);
-        operationLog.setOrgId(orgId);
-        operationLog.setCustomizedOperationType(customizedOperationType);
-
-        SysUser requestUser = sysUserService.getById(userId);
-        if (Objects.nonNull(requestUser)) {
-            operationLog.setUserName(requestUser.getRealName());
-        }
-        operationLog.setUserId(userId);
+        operationLog.setArgs(args);
+        operationLog.setRunStatus("成功");
         operationLog.setIp(ServletUtil.getIP());
         operationLog.setCreateTime(System.currentTimeMillis());
         this.save(operationLog);

teachcloud-common/src/main/resources/mapper/BasicOperationLogMapper.xml

@@ -11,7 +11,7 @@
             su.login_name loginName,
             su.real_name realName,
             bol.ip,
-            bol.customized_operation_type AS customizedOperationType,
+            bol.operation_type AS operationType,
             bol.create_time AS createTime
         FROM
             basic_operation_log  bol
@@ -21,7 +21,7 @@
                 AND bol.school_id = #{schoolId}
             </if>
             <if test="customizedOperationType != null">
-                AND bol.customized_operation_type = #{customizedOperationType}
+                AND bol.operation_type = #{operationType}
             </if>
             <if test="startTime != null">
                 AND bol.create_time >= #{startTime}
@@ -37,7 +37,7 @@
                     AND bol.user_id = #{dpr.requestUserId}
                 </if>
                 <if test="dpr.orgIdSet != null and dpr.orgIdSet != '' and dpr.orgIdSet.size > 0">
-                    AND bol.org_id IN
+                    AND su.org_id IN
                     <foreach collection="dpr.orgIdSet" item="item" index="index" open="(" separator="," close=")">
                         #{item}
                     </foreach>