3.3.3 update

distributed-print/install/config.ini

@@ -1,5 +1,5 @@
 [app]
-version=3.3.0
+version=3.3.3
 name=֪ѧ֪¿¼
 portal=http://localhost:7400/
 module=print,task

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

@@ -86,7 +86,7 @@ public class BasicExamController {
      */
     @ApiOperation(value = "启用/禁用")
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
-    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE, detail = "启用/禁用：{{id}}")
+    @OperationLogDetail(operationType = OperationTypeEnum.ENABLE, detail = "启用/禁用：{{id}}")
     public Result enable(@ApiParam(value = "考试ID", required = true) @RequestParam Long id,
                          @ApiParam(value = "启用/禁用", required = true) @RequestParam Boolean enable) {
         boolean isSuccess = basicExamService.enable(id, enable);

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

@@ -61,7 +61,7 @@ public class BasicSemesterController {
     @ApiOperation(value = "学期管理-新增/编辑")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = EditResult.class)})
-    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE, detail = "新增/编辑操作，学期ID：{{basicSemesterParams.id}}、学期名称：{{basicSemesterParams.semesterName}}")
     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(operationType = OperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE, detail = "删除操作，学期ID：{{id}}")
     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(operationType = OperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.ENABLE, detail = "启用/禁用操作，学期ID：{{basicSemester.id}}、启用/禁用状态：{{basicSemester.enable}}")
     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/ExamTaskApplyController.java

@@ -107,7 +107,7 @@ public class ExamTaskApplyController {
      */
     @ApiOperation(value = "入库申请-删除")
     @RequestMapping(value = "/apply_delete", method = RequestMethod.POST)
-    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE, detail = "删除操作，命题任务ID：{{id}}")
     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(operationType = OperationTypeEnum.SAVE)
+    @OperationLogDetail(operationType = OperationTypeEnum.SAVE, detail = "提交操作，命题任务ID：{{examTaskDetail.examTaskId}}")
     public Result taskApplySave(@RequestBody ExamTaskDetail examTaskDetail) throws IOException {
         Map<String, Object> map = examTaskService.saveExamTaskDetail(examTaskDetail);
         ExamTask examTask = examTaskService.getById(examTaskDetail.getExamTaskId());
@@ -181,9 +181,9 @@ public class ExamTaskApplyController {
      * @param examTask 命题任务对象
      * @return Result
      */
-    @ApiOperation(value = "入库申请-撤销申请")
+    @ApiOperation(value = "入库申请-撤回申请")
     @RequestMapping(value = "/apply_status", method = RequestMethod.POST)
-    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE, detail = "撤回申请操作，命题任务ID：{{examTask.id}}")
     public Result taskApplyStatus(@RequestBody ExamTask examTask) {
         Map<String, Object> map = examTaskService.status(examTask);
         activitiService.sendFlowTaskApproveMsg(map);
@@ -269,6 +269,7 @@ public class ExamTaskApplyController {
     @RequestMapping(value = "/page_tiku_paper", method = RequestMethod.POST)
     @Transactional(rollbackFor = Exception.class)
     @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
+    @OperationLogDetail(operationType = OperationTypeEnum.SELECT, detail = "查询题库试卷列表，课程代码：{{courseCode}}、试卷名称：{{paperName}}、教师工号：{{account}}")
     public Result pageTikuPaper(@ApiParam(value = "课程代码") @RequestParam(required = false) String courseCode,
                                 @ApiParam(value = "试卷名称") @RequestParam(value = "paperName", required = false) String paperName,
                                 @ApiParam(value = "教师工号") @RequestParam(value = "account", required = false) String account,
@@ -281,6 +282,7 @@ public class ExamTaskApplyController {
     @RequestMapping(value = "/get_tiku_paper_data", method = RequestMethod.POST)
     @Transactional(rollbackFor = Exception.class)
     @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
+    @OperationLogDetail(operationType = OperationTypeEnum.SELECT, detail = "查询题库试卷包，考试ID：{{examId}}、题库试卷ID：{{paperId}}、唯一标识：{{uuid}}")
     public Result getTikuPaperData(@ApiParam(value = "考试ID", required = true) @RequestParam(value = "examId") Long examId,
                                    @ApiParam(value = "题库试卷ID", required = true) @RequestParam(value = "paperId") Long paperId,
                                    @ApiParam(value = "唯一标识") @RequestParam(value = "uuid", required = false) String uuid) {
@@ -299,6 +301,7 @@ public class ExamTaskApplyController {
     @ApiOperation(value = "入库申请-下载审批表-下载审批表PDF")
     @RequestMapping(value = "/find_approve_form_pdf", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "下载成功", response = Result.class)})
+    @OperationLogDetail(operationType = OperationTypeEnum.EXPORT, detail = "下载审批表PDF，命题任务ID：{{approveFormParams.examTaskId}}")
     public void findApproveFormPdf(@Valid @RequestBody ApproveFormParams approveFormParams, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw ExceptionResultEnum.ERROR.exception(bindingResult.getAllErrors().get(0).getDefaultMessage());

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

@@ -92,6 +92,7 @@ public class ExamTaskQueryController {
      */
     @ApiOperation(value = "下载")
     @RequestMapping(value = "/paper_download", method = RequestMethod.POST)
+    @OperationLogDetail(operationType = OperationTypeEnum.EXPORT, detail = "下载操作，命题任务ID：{{examTaskId}}")
     public void taskPaperDownload(HttpServletResponse response, @RequestParam Long examTaskId) throws Exception {
         examTaskService.paperDownload(response, examTaskId);
     }
@@ -104,7 +105,7 @@ public class ExamTaskQueryController {
      */
     @ApiOperation(value = "卷库查询-启用/禁用")
     @RequestMapping(value = "/paper_enable", method = RequestMethod.POST)
-    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.ENABLE, detail = "启用/禁用操作，命题任务ID：{{examTaskDetail.examTaskId}}")
     public Result taskPaperEnable(@RequestBody ExamTaskDetail examTaskDetail) throws IOException {
         boolean isSuccess = examTaskDetailService.enable(examTaskDetail);
         // 启用，触发考场生成pdf
@@ -129,7 +130,7 @@ public class ExamTaskQueryController {
      */
     @ApiOperation(value = "卷库查询-卷库修改")
     @RequestMapping(value = "/paper_update", method = RequestMethod.POST)
-    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE, detail = "卷库修改操作，命题任务ID：{{examTaskDetail.examTaskId}}")
     public Result taskPaperUpdate(@RequestBody ExamTaskDetail examTaskDetail) {
         Map<String, Object> map = examTaskDetailService.paperUpdate(examTaskDetail);
         Boolean isSuccess = (Boolean) map.get(SystemConstant.SUCCESS);
@@ -161,6 +162,7 @@ public class ExamTaskQueryController {
     @ApiOperation(value = "卷库查询-批量下载试卷PDF、题卡")
     @RequestMapping(value = "/paper_card_download_pdf", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
+    @OperationLogDetail(operationType = OperationTypeEnum.EXPORT, detail = "批量下载试卷PDF、题卡操作，考试ID：{{examId}}、课程代码：{{courseCode}}、试卷编号：{{paperNumber}}")
     public Result paperCardDownloadPdf(@RequestParam(value = "semesterId", required = false) Long semesterId,
                                        @RequestParam(value = "examId", required = false) Long examId,
                                        @RequestParam(value = "courseCode", required = false) String courseCode,
@@ -193,7 +195,7 @@ public class ExamTaskQueryController {
 
     @ApiOperation(value = "卷库查询-重启流程（打回）")
     @RequestMapping(value = "/restart", method = RequestMethod.POST)
-    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE, detail = "打回操作，命题任务ID：{{examTaskDetail.examTaskId}}")
     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/SysOrgController.java

@@ -85,7 +85,7 @@ public class SysOrgController {
      */
     @ApiOperation(value = "启用/禁用")
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
-    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE, detail = "启用/禁用操作，机构ID：{{org.id}}，启用/禁用状态：{{org.enable}}")
+    @OperationLogDetail(operationType = OperationTypeEnum.ENABLE, detail = "启用/禁用操作，机构ID：{{org.id}}，启用/禁用状态：{{org.enable}}")
     public Result enable(@RequestBody SysOrg org) {
         return ResultUtil.ok(printCommonService.enable(org));
     }

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

@@ -150,7 +150,7 @@ public class SysUserController {
      */
     @ApiOperation(value = "启用/禁用")
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
-    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE, detail = "启用/禁用操作，用户ID：{{user.id}}、启用/状态：{{user.enable}}")
+    @OperationLogDetail(operationType = OperationTypeEnum.ENABLE, detail = "启用/禁用操作，用户ID：{{user.id}}、启用/状态：{{user.enable}}")
     public Result enable(@RequestBody SysUser user) throws NoSuchAlgorithmException, IllegalAccessException {
         sysUserService.enable(user);
         return ResultUtil.ok();

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

@@ -13,12 +13,14 @@ import java.util.List;
 public enum OperationTypeEnum {
     LOGIN("用户登录"),
     LOGOUT("用户登出"),
+    SELECT("查询"),
+    ENABLE("启用/禁用"),
     SAVE("新增/修改"),
     ADD("新增"),
     DELETE("删除"),
     UPDATE("修改"),
     IMPORT("导入"),
-    EXPORT("导出"),
+    EXPORT("导出/下载"),
     APPROVE("审核"),
     SYNC("同步"),
     PREVIEW("预览"),