From f02814d69291e8968b491487b806e3d3a1bed190 Mon Sep 17 00:00:00 2001 From: wsm <2746563060@qq.com> Date: Wed, 5 Aug 2026 10:48:09 +0800 Subject: [PATCH] =?UTF-8?q?feat(syslog):=20=E7=9D=A3=E5=8A=9E=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E6=A8=A1=E5=9D=97=E6=8E=A7=E5=88=B6=E5=99=A8=E8=A1=A5?= =?UTF-8?q?=E5=85=A8=E6=97=A5=E5=BF=97=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 为督办业务模块各 controller 的写操作方法补充 @AutoLog 注解： - 24 个导入端点（excel导入/EasyExcel导入/反馈导入）加导入日志 - 任务清单详情新增/编辑/删除/移动/关注等 8 个方法 - 改善提案审批流程 startProcess 及各 BPM 环节 9 个方法 --- .../controller/FixedContact20260730Controller.java | 4 ++++ .../bg/xispeak/controller/BgXiSpeakController.java | 2 ++ .../feedback/BgXiSpeakFeedbackController.java | 1 + .../controller/BgPartymatterController.java | 3 +++ .../bqtakepulse/controller/BgTakepulseController.java | 2 ++ .../demo/check/controller/DjCheckController.java | 1 + .../controller/DjDemoLifeMeetingController.java | 1 + .../controller/DqInspectProblemController.java | 1 + .../controller/DqInspectProgressController.java | 1 + .../controller/DqInspectTaskController.java | 2 ++ .../controller/DjPeopleServiceController.java | 1 + .../controller/DjInspectionRectifyListController.java | 1 + .../controller/SupervisionTestController.java | 1 + .../controller/DjMeetingRecordController.java | 1 + .../controller/DjInspectImproveController.java | 2 ++ .../controller/ImprovementProposalController.java | 11 +++++++++++ .../tasklist/controller/TaskListController.java | 1 + .../tasklist/controller/TaskListDetialController.java | 10 ++++++++++ 18 files changed, 46 insertions(+) diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/controller/FixedContact20260730Controller.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/controller/FixedContact20260730Controller.java index d7a0a0a..25d4f07 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/controller/FixedContact20260730Controller.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/controller/FixedContact20260730Controller.java @@ -12,6 +12,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.excel.ExcelAnnotationUtils; @@ -166,12 +167,14 @@ public class FixedContact20260730Controller extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, FixedContact20260730.class); } + @AutoLog(value = "定点联系单-通过EasyExcel导入") @RequiresPermissions("bg.fixcontact:fixed_contact_20260730:importExcel") @RequestMapping(value = "/importExcelByEasyExcel", method = RequestMethod.POST) public Result importExcelByEasyExcel(HttpServletRequest request) { @@ -189,6 +192,7 @@ public class FixedContact20260730Controller extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { @@ -430,6 +431,7 @@ public class BgXiSpeakController extends JeecgController importExcelByEasyExcel(HttpServletRequest request) { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/feedback/BgXiSpeakFeedbackController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/feedback/BgXiSpeakFeedbackController.java index 4486d22..7d5e983 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/feedback/BgXiSpeakFeedbackController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/feedback/BgXiSpeakFeedbackController.java @@ -206,6 +206,7 @@ public class BgXiSpeakFeedbackController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") String mainId) { return super.importExcel(request, response, BgXiSpeakFeedback.class); diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/controller/BgPartymatterController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/controller/BgPartymatterController.java index 1bbf7a8..2d68c9b 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/controller/BgPartymatterController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/controller/BgPartymatterController.java @@ -288,6 +288,7 @@ public class BgPartymatterController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { @@ -414,6 +415,7 @@ public class BgPartymatterController extends JeecgController importBgPartymatterFeedback(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") String mainId) { MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; @@ -462,6 +464,7 @@ public class BgPartymatterController extends JeecgController importExcelByEasyExcel(HttpServletRequest request, diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/controller/BgTakepulseController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/controller/BgTakepulseController.java index 6d25a40..34e57ce 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/controller/BgTakepulseController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/controller/BgTakepulseController.java @@ -404,6 +404,7 @@ public class BgTakepulseController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { @@ -450,6 +451,7 @@ public class BgTakepulseController extends JeecgController importExcelByEasyExcel(HttpServletRequest request) { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/check/controller/DjCheckController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/check/controller/DjCheckController.java index 319fd6e..2ac5468 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/check/controller/DjCheckController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/check/controller/DjCheckController.java @@ -173,6 +173,7 @@ public class DjCheckController extends JeecgController * @param response * @return */ + @AutoLog(value = "党建检查台账-通过excel导入") @RequiresPermissions("check:dj_check:importExcel") @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/demoMetting/controller/DjDemoLifeMeetingController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/demoMetting/controller/DjDemoLifeMeetingController.java index 5e210a8..857b8e4 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/demoMetting/controller/DjDemoLifeMeetingController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/demoMetting/controller/DjDemoLifeMeetingController.java @@ -173,6 +173,7 @@ public class DjDemoLifeMeetingController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/controller/DqInspectProblemController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/controller/DqInspectProblemController.java index 19ca86d..ba28710 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/controller/DqInspectProblemController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/controller/DqInspectProblemController.java @@ -310,6 +310,7 @@ public class DqInspectProblemController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectProgressController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectProgressController.java index 5447d53..43386ea 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectProgressController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectProgressController.java @@ -158,6 +158,7 @@ public class DqInspectProgressController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, DqInspectProgress.class); diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectTaskController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectTaskController.java index ed034fa..ccbe2ab 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectTaskController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectTaskController.java @@ -296,6 +296,7 @@ public class DqInspectTaskController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { @@ -333,6 +334,7 @@ public class DqInspectTaskController extends JeecgController importExcelByEasyExcel(HttpServletRequest request) { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/peopleService/controller/DjPeopleServiceController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/peopleService/controller/DjPeopleServiceController.java index c98553c..761dd22 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/peopleService/controller/DjPeopleServiceController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/peopleService/controller/DjPeopleServiceController.java @@ -173,6 +173,7 @@ public class DjPeopleServiceController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/rectifylist/controller/DjInspectionRectifyListController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/rectifylist/controller/DjInspectionRectifyListController.java index 85ad1d1..a910c26 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/rectifylist/controller/DjInspectionRectifyListController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/rectifylist/controller/DjInspectionRectifyListController.java @@ -289,6 +289,7 @@ public class DjInspectionRectifyListController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/supervisiontest/controller/SupervisionTestController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/supervisiontest/controller/SupervisionTestController.java index c694faf..101e63f 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/supervisiontest/controller/SupervisionTestController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/supervisiontest/controller/SupervisionTestController.java @@ -173,6 +173,7 @@ public class SupervisionTestController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/tzMetting/controller/DjMeetingRecordController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/tzMetting/controller/DjMeetingRecordController.java index 3d48616..2c6f3c4 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/tzMetting/controller/DjMeetingRecordController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/tzMetting/controller/DjMeetingRecordController.java @@ -173,6 +173,7 @@ public class DjMeetingRecordController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/controller/DjInspectImproveController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/controller/DjInspectImproveController.java index 534fd17..619bd8b 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/controller/DjInspectImproveController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/controller/DjInspectImproveController.java @@ -293,6 +293,7 @@ public class DjInspectImproveController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { @@ -310,6 +311,7 @@ public class DjInspectImproveController extends JeecgController importExcelByEasyExcel(HttpServletRequest request) { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/controller/ImprovementProposalController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/controller/ImprovementProposalController.java index 90dc855..c95e476 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/controller/ImprovementProposalController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/controller/ImprovementProposalController.java @@ -50,6 +50,7 @@ import com.alibaba.fastjson.JSON; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.constant.CommonConstant; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -161,6 +162,7 @@ public class ImprovementProposalController { /** * 使用改善提案主表作为流程业务数据发起审批，不复用督办任务表。 */ + @AutoLog(value = "改善提案-发起审批流程", operateType = CommonConstant.OPERATE_TYPE_3) @PostMapping(value = "/startProcess") public Result startProcess(@RequestBody(required = false) Map requestBody, @RequestParam(name = "id", required = false) String id) { @@ -197,6 +199,7 @@ public class ImprovementProposalController { } } + @AutoLog(value = "改善提案-保存部门初审结果", operateType = CommonConstant.OPERATE_TYPE_3) @PostMapping(value = "/bpm/initialReview") @Operation(summary = "保存部门精益专员初审结果") public Result saveInitialReview(@RequestBody ImprovementProposalBpmActionDTO action) { @@ -218,18 +221,21 @@ public class ImprovementProposalController { } } + @AutoLog(value = "改善提案-保存部门评委个人评分草稿", operateType = CommonConstant.OPERATE_TYPE_3) @PostMapping(value = "/bpm/deptScore") @Operation(summary = "保存当前部门评委个人评分草稿") public Result saveDeptScore(@RequestBody ImprovementDeptScoreBpmDTO score) { return handleBpmAction(() -> improvementProposalService.saveDeptScore(score, currentUser())); } + @AutoLog(value = "改善提案-锁定部门评委个人评分", operateType = CommonConstant.OPERATE_TYPE_3) @PostMapping(value = "/bpm/submitDeptScore") @Operation(summary = "锁定当前部门评委个人评分") public Result submitDeptScore(@RequestBody ImprovementProposalBpmActionDTO action) { return handleBpmAction(() -> improvementProposalService.submitDeptScore(action, currentUser())); } + @AutoLog(value = "改善提案-保存部门负责人确认奖项", operateType = CommonConstant.OPERATE_TYPE_3) @PostMapping(value = "/bpm/leaderAward") @Operation(summary = "保存部门负责人确认奖项") public Result saveLeaderAward(@RequestBody ImprovementProposalBpmActionDTO action) { @@ -251,24 +257,28 @@ public class ImprovementProposalController { } } + @AutoLog(value = "改善提案-保存所级评议投票人员", operateType = CommonConstant.OPERATE_TYPE_3) @PostMapping(value = "/bpm/instituteVoteMembers") @Operation(summary = "保存所级评议投票人员") public Result saveInstituteVoteMembers(@RequestBody ImprovementProposalBpmActionDTO action) { return handleBpmAction(() -> improvementProposalService.saveInstituteVoteMembers(action, currentUser())); } + @AutoLog(value = "改善提案-保存归档最终奖项", operateType = CommonConstant.OPERATE_TYPE_3) @PostMapping(value = "/bpm/archiveAward") @Operation(summary = "保存归档最终奖项") public Result saveArchiveAward(@RequestBody ImprovementProposalBpmActionDTO action) { return handleBpmAction(() -> improvementProposalService.saveArchiveAward(action, currentUser())); } + @AutoLog(value = "改善提案-记录所级评委投票", operateType = CommonConstant.OPERATE_TYPE_2) @PostMapping(value = "/bpm/instituteVote") @Operation(summary = "记录所级评委投票") public Result castInstituteVote(@RequestBody ImprovementProposalBpmActionDTO action) { return handleBpmAction(() -> improvementProposalService.castInstituteVote(action, currentUser())); } + @AutoLog(value = "改善提案-确认所级评委投票并完成流程", operateType = CommonConstant.OPERATE_TYPE_3) @PostMapping(value = "/bpm/submitInstituteVote") @Operation(summary = "确认所级评委投票并直接完成流程任务") public Result submitInstituteVote(@RequestBody ImprovementProposalBpmActionDTO action, HttpServletRequest request) { @@ -503,6 +513,7 @@ public class ImprovementProposalController { * @param response * @return */ + @AutoLog(value = "改善提案-通过excel导入") @RequiresPermissions("improvementproposal:improvement_proposal:importExcel") @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/controller/TaskListController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/controller/TaskListController.java index 5bb41d6..11b93c4 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/controller/TaskListController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/controller/TaskListController.java @@ -509,6 +509,7 @@ public class TaskListController { * @param response * @return */ + @AutoLog(value = "任务清单表-通过excel导入") @RequiresPermissions("tasklist:task_list:importExcel") @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/controller/TaskListDetialController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/controller/TaskListDetialController.java index f37ffa0..022b941 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/controller/TaskListDetialController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/controller/TaskListDetialController.java @@ -1,6 +1,8 @@ package org.jeecg.modules.demo.tasklist.controller; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.constant.CommonConstant; import org.jeecg.modules.demo.tasklist.entity.TaskListDetial; import org.jeecg.modules.demo.tasklist.service.ITaskListDetialService; import org.jeecg.modules.demo.tasklist.vo.CreateTaskReq; @@ -19,6 +21,7 @@ public class TaskListDetialController { @Autowired private ITaskListDetialService taskListDetialService; + @AutoLog(value = "任务清单详情表-添加任务") @PostMapping(value = "/add") public Result add(@RequestBody CreateTaskReq req) { try { @@ -30,6 +33,7 @@ public class TaskListDetialController { } } + @AutoLog(value = "任务清单详情表-编辑任务") @PostMapping(value = "/edit") public Result edit(@RequestBody TaskListDetial task) { try { @@ -41,6 +45,7 @@ public class TaskListDetialController { } } + @AutoLog(value = "任务清单详情表-删除任务") @DeleteMapping(value = "/delete") public Result delete(@RequestParam(name = "id") String id) { try { @@ -65,6 +70,7 @@ public class TaskListDetialController { return Result.OK(list); } + @AutoLog(value = "任务清单详情表-切换任务完成状态", operateType = CommonConstant.OPERATE_TYPE_3) @PostMapping(value = "/toggleStatus") public Result toggleStatus(@RequestBody Map body) { try { @@ -77,6 +83,7 @@ public class TaskListDetialController { } } + @AutoLog(value = "任务清单详情表-移动任务", operateType = CommonConstant.OPERATE_TYPE_3) @PostMapping(value = "/moveTask") public Result moveTask(@RequestBody MoveTaskReq req) { try { @@ -88,6 +95,7 @@ public class TaskListDetialController { } } + @AutoLog(value = "任务清单详情表-移动任务分组", operateType = CommonConstant.OPERATE_TYPE_3) @PostMapping(value = "/moveTaskGroup") public Result moveTaskGroup(@RequestBody Map params) { try { @@ -101,6 +109,7 @@ public class TaskListDetialController { } } + @AutoLog(value = "任务清单详情表-关注任务", operateType = CommonConstant.OPERATE_TYPE_2) @PostMapping(value = "/follow") public Result follow(@RequestBody Map body) { try { @@ -113,6 +122,7 @@ public class TaskListDetialController { } } + @AutoLog(value = "任务清单详情表-取消关注任务", operateType = CommonConstant.OPERATE_TYPE_4) @PostMapping(value = "/unfollow") public Result unfollow(@RequestBody Map body) { try {