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 1/3] =?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 { From 65fe66cd2ad0476005e9c7d7988ecdc64740c9c1 Mon Sep 17 00:00:00 2001 From: wsm <2746563060@qq.com> Date: Wed, 5 Aug 2026 10:48:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(syslog):=20=E4=BF=AE=E6=AD=A3=E6=97=A2?= =?UTF-8?q?=E6=9C=89=E6=97=A5=E5=BF=97=E6=B3=A8=E8=A7=A3=E7=9A=84=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=93=8D=E4=BD=9C=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 既有写操作方法注解未写 operateType，因方法名不以 add/edit/delete/import/export 开头， 会被自动推断为 1(查询)。补充显式 operateType： - 定点联系单/习总书记讲话/党委会/我为四所把把脉 的 saveBpmForm、saveSubApprove → 编辑(3) - 撤回流程 withdrawProcess/withDrawFixContact/withDrawXiSpeak → 删除(4) - 任务清单表 移动/重命名/权限 → 编辑(3)，移除收藏/协作人 → 删除(4) --- .../FixedContact20260730Controller.java | 6 +++--- .../xispeak/controller/BgXiSpeakController.java | 7 ++++--- .../controller/BgPartymatterController.java | 3 ++- .../controller/BgTakepulseController.java | 3 ++- .../ImprovementProposalController.java | 2 +- .../tasklist/controller/TaskListController.java | 17 +++++++++-------- 6 files changed, 21 insertions(+), 17 deletions(-) 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 25d4f07..ad1680f 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 @@ -201,7 +201,7 @@ public class FixedContact20260730Controller extends JeecgController saveBpmForm(@RequestBody FixedContact20260730BpmSaveDTO dto) { @@ -217,7 +217,7 @@ public class FixedContact20260730Controller extends JeecgController saveSubApprove(@RequestBody Map params) { @@ -258,7 +258,7 @@ public class FixedContact20260730Controller extends JeecgController withDrawFixContact(@RequestParam("id") String id) { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/BgXiSpeakController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/BgXiSpeakController.java index 2ce1241..9bf6bd7 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/BgXiSpeakController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/BgXiSpeakController.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; /** @@ -288,7 +289,7 @@ public class BgXiSpeakController extends JeecgController saveBpmForm(@RequestBody BgXiSpeakBpmSaveDTO dto) { @@ -323,7 +324,7 @@ public class BgXiSpeakController extends JeecgController saveSubApprove(@RequestBody Map params) { @@ -345,7 +346,7 @@ public class BgXiSpeakController extends JeecgController withDrawXiSpeak(@RequestParam("id") String id) { 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 2d68c9b..9b4cfb7 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 @@ -38,6 +38,7 @@ import org.jeecg.modules.demo.bgpartymatter.constant.BgPartymatterConstant; 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.SecurityUtils; import org.jeecg.common.system.vo.LoginUser; import org.jeecgframework.poi.excel.ExcelImportUtil; @@ -185,7 +186,7 @@ public class BgPartymatterController extends JeecgController saveBpmForm(@RequestBody BgPartymatterBpmSaveDTO dto) { 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 34e57ce..728a987 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 @@ -48,6 +48,7 @@ import lombok.extern.slf4j.Slf4j; 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; @@ -201,7 +202,7 @@ public class BgTakepulseController extends JeecgController saveBpmForm(@RequestBody BgTakepulseBpmSaveDTO dto) { 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 c95e476..27c647f 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 @@ -186,7 +186,7 @@ public class ImprovementProposalController { /** * 删除运行中的流程并回退草稿。提案基本信息和业务附件会保留，流程产生的评分、投票数据会清空。 */ - @AutoLog(value = "改善提案-删除流程并回退草稿") + @AutoLog(value = "改善提案-删除流程并回退草稿", operateType = CommonConstant.OPERATE_TYPE_4) @Operation(summary = "改善提案-删除流程并回退草稿") @RequiresPermissions("improvementproposal:improvement_proposal:withdrawProcess") @PostMapping(value = "/withdrawProcess") 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 11b93c4..f661c01 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 @@ -52,6 +52,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; @@ -207,7 +208,7 @@ public class TaskListController { } } - @AutoLog(value = "任务清单表-拖拽移动任务清单") + @AutoLog(value = "任务清单表-拖拽移动任务清单", operateType = CommonConstant.OPERATE_TYPE_3) @Operation(summary = "拖拽移动任务清单") @PostMapping(value = "/moveTaskList") public Result moveTaskList(@RequestBody MoveTaskListReq req) { @@ -219,7 +220,7 @@ public class TaskListController { } } - @AutoLog(value = "任务清单表-拖拽移动分组") + @AutoLog(value = "任务清单表-拖拽移动分组", operateType = CommonConstant.OPERATE_TYPE_3) @Operation(summary = "拖拽移动分组") @PostMapping(value = "/moveGroup") public Result moveGroup(@RequestBody Map params) { @@ -253,7 +254,7 @@ public class TaskListController { } } - @AutoLog(value = "任务清单表-移除收藏") + @AutoLog(value = "任务清单表-移除收藏", operateType = CommonConstant.OPERATE_TYPE_4) @Operation(summary = "从收藏栏移除") @PostMapping(value = "/removeFavorite") public Result removeFavorite(@RequestBody Map params) { @@ -277,7 +278,7 @@ public class TaskListController { } } - @AutoLog(value = "任务清单表-移除分组") + @AutoLog(value = "任务清单表-移除分组", operateType = CommonConstant.OPERATE_TYPE_4) @Operation(summary = "从收藏栏移除分组及子项") @PostMapping(value = "/removeFavoriteGroup") public Result removeFavoriteGroup(@RequestBody Map params) { @@ -289,7 +290,7 @@ public class TaskListController { } } - @AutoLog(value = "任务清单表-重命名分组") + @AutoLog(value = "任务清单表-重命名分组", operateType = CommonConstant.OPERATE_TYPE_3) @Operation(summary = "重命名任务清单分组") @PostMapping(value = "/renameGroup") public Result renameGroup(@RequestBody Map params) { @@ -301,7 +302,7 @@ public class TaskListController { } } - @AutoLog(value = "任务清单表-重命名清单") + @AutoLog(value = "任务清单表-重命名清单", operateType = CommonConstant.OPERATE_TYPE_3) @Operation(summary = "重命名任务清单") @PostMapping(value = "/renameTaskList") public Result renameTaskList(@RequestBody Map params) { @@ -384,7 +385,7 @@ public class TaskListController { } } - @AutoLog(value = "任务清单表-移除协作人") + @AutoLog(value = "任务清单表-移除协作人", operateType = CommonConstant.OPERATE_TYPE_4) @Operation(summary = "移除协作人") @PostMapping(value = "/removeCollaborator") public Result removeCollaborator(@RequestBody Map params) { @@ -396,7 +397,7 @@ public class TaskListController { } } - @AutoLog(value = "任务清单表-修改协作人权限") + @AutoLog(value = "任务清单表-修改协作人权限", operateType = CommonConstant.OPERATE_TYPE_3) @Operation(summary = "修改协作人权限") @PostMapping(value = "/updateCollaboratorPermission") public Result updateCollaboratorPermission(@RequestBody Map params) { From 1663c04759b48dcffc04280c7f7fcc018af4de0f Mon Sep 17 00:00:00 2001 From: wsm <2746563060@qq.com> Date: Wed, 5 Aug 2026 11:04:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat(syslog):=20=E5=85=A8=E9=87=8F=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E6=A8=A1=E5=9D=97=E8=A1=A5=E5=85=A8=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E5=8F=8A=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=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/FixedContact20260730Controller.java | 5 +++++ .../bg/xispeak/controller/BgXiSpeakController.java | 13 +++++++++---- .../feedback/BgXiSpeakFeedbackController.java | 6 +++++- .../controller/BgPartymatterController.java | 10 ++++++++-- .../controller/BgTakepulseController.java | 11 ++++++++--- .../demo/check/controller/DjCheckController.java | 5 +++-- .../controller/DjDemoLifeMeetingController.java | 5 +++-- .../controller/DqInspectProblemController.java | 13 +++++++++---- .../controller/DqInspectProgressController.java | 3 +++ .../controller/DqInspectTaskController.java | 10 +++++++--- .../controller/DjPeopleServiceController.java | 5 +++-- .../DjInspectionRectifyListController.java | 11 +++++++---- .../controller/SupervisionTestController.java | 5 +++-- .../controller/DjMeetingRecordController.java | 5 +++-- .../controller/DjInspectImproveController.java | 13 +++++++++---- .../controller/ImprovementProposalController.java | 12 ++++++++---- .../tasklist/controller/TaskListController.java | 11 ++++++----- .../controller/TaskListDetialController.java | 3 +++ 18 files changed, 102 insertions(+), 44 deletions(-) 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 ad1680f..a1897a2 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 @@ -49,6 +49,7 @@ public class FixedContact20260730Controller extends JeecgController> queryPageList(FixedContact20260730 fixedContact20260730, @@ -144,6 +145,7 @@ public class FixedContact20260730Controller extends JeecgController queryById(@RequestParam(name = "id", required = true) String id) { @@ -154,6 +156,7 @@ public class FixedContact20260730Controller extends JeecgController> queryFixedContactFeedback20260730ListByMainId(@RequestParam(name = "id", required = true) String id) { @@ -161,6 +164,7 @@ public class FixedContact20260730Controller extends JeecgController checkExcelByEasyExcel(HttpServletRequest request) { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/BgXiSpeakController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/BgXiSpeakController.java index 9bf6bd7..ed084c8 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/BgXiSpeakController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/BgXiSpeakController.java @@ -77,7 +77,7 @@ public class BgXiSpeakController extends JeecgController> queryPageList(BgXiSpeak bgXiSpeak, @@ -160,6 +160,7 @@ public class BgXiSpeakController extends JeecgController> getRootListWithDept(@RequestParam(name = "dept_ids") String deptIds) { @@ -179,6 +180,7 @@ public class BgXiSpeakController extends JeecgController> loadTreeRoot(@RequestParam(name = "async") Boolean async, @RequestParam(name = "pcode") String pcode) { Result> result = new Result<>(); @@ -218,7 +220,7 @@ public class BgXiSpeakController extends JeecgController> queryPageList(BgXiSpeak bgXiSpeak,HttpServletRequest req) { @@ -236,7 +238,7 @@ public class BgXiSpeakController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { @@ -409,6 +411,7 @@ public class BgXiSpeakController extends JeecgController checkExcelByEasyExcel(HttpServletRequest request) { @@ -457,6 +461,7 @@ public class BgXiSpeakController extends JeecgController> queryPageList(BgXiSpeakFeedback bgXiSpeakFeedback, @@ -82,6 +83,7 @@ public class BgXiSpeakFeedbackController extends JeecgController> queryPageListWithUserDept(BgXiSpeakFeedback bgXiSpeakFeedback, @@ -178,6 +180,7 @@ public class BgXiSpeakFeedbackController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { @@ -194,6 +197,7 @@ public class BgXiSpeakFeedbackController extends JeecgController> queryPageList(BgPartymatter bgPartymatter, @@ -131,6 +131,7 @@ public class BgPartymatterController extends JeecgController queryById(@RequestParam(name = "id", required = true) String id) { BgPartymatter bgPartymatter = bgPartymatterService.getById(id); @@ -277,6 +278,7 @@ public class BgPartymatterController extends JeecgController> listBgPartymatterFeedbackByMainId(BgPartymatterFeedback bgPartymatterFeedback, @@ -382,6 +384,7 @@ public class BgPartymatterController extends JeecgController checkExcelByEasyExcel(HttpServletRequest request) { @@ -481,6 +485,7 @@ public class BgPartymatterController extends JeecgController> queryPageList(BgTakepulse bgTakepulse, @@ -254,7 +254,7 @@ public class BgTakepulseController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { @@ -272,7 +272,7 @@ public class BgTakepulseController extends JeecgController> queryBgTakepulseFeedbackListByMainId(@RequestParam(name="id",required=true) String id) { @@ -285,6 +285,7 @@ public class BgTakepulseController extends JeecgController> listBgTakepulseFeedbackByMainId(BgTakepulseFeedback bgTakepulseFeedback, @@ -362,6 +363,7 @@ public class BgTakepulseController extends JeecgController checkExcelByEasyExcel(HttpServletRequest request) { @@ -467,6 +470,7 @@ public class BgTakepulseController extends JeecgController * @param req * @return */ - //@AutoLog(value = "党建检查台账-分页列表查询") + @AutoLog(value = "党建检查台账-分页列表查询") @Operation(summary="党建检查台账-分页列表查询") @GetMapping(value = "/list") public Result> queryPageList(DjCheck djCheck, @@ -143,7 +143,7 @@ public class DjCheckController extends JeecgController * @param id * @return */ - //@AutoLog(value = "党建检查台账-通过id查询") + @AutoLog(value = "党建检查台账-通过id查询") @Operation(summary="党建检查台账-通过id查询") @GetMapping(value = "/queryById") public Result queryById(@RequestParam(name="id",required=true) String id) { @@ -160,6 +160,7 @@ public class DjCheckController extends JeecgController * @param request * @param djCheck */ + @AutoLog(value = "党建检查台账-通过excel导出") @RequiresPermissions("check:dj_check:exportXls") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, DjCheck djCheck) { 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 857b8e4..16f9e23 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 @@ -61,7 +61,7 @@ public class DjDemoLifeMeetingController extends JeecgController> queryPageList(DjDemoLifeMeeting djDemoLifeMeeting, @@ -143,7 +143,7 @@ public class DjDemoLifeMeetingController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { @@ -160,6 +160,7 @@ public class DjDemoLifeMeetingController extends JeecgController> queryPageList(DqInspectProblem dqInspectProblem, @@ -96,6 +96,7 @@ public class DqInspectProblemController extends JeecgController> loadTreeChildren(@RequestParam(name = "pid") String pid) { Result> result = new Result<>(); @@ -118,6 +119,7 @@ public class DqInspectProblemController extends JeecgController> loadTreeRoot(@RequestParam(name = "async") Boolean async, @RequestParam(name = "pcode") String pcode) { Result> result = new Result<>(); @@ -157,7 +159,7 @@ public class DqInspectProblemController extends JeecgController> queryPageList(DqInspectProblem dqInspectProblem,HttpServletRequest req) { @@ -175,7 +177,7 @@ public class DqInspectProblemController extends JeecgController>> parentOptions(@RequestParam(name = "nodeType") String nodeType) { @@ -208,6 +211,7 @@ public class DqInspectProblemController extends JeecgController>> specificOptions() { @@ -280,7 +284,7 @@ public class DqInspectProblemController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { @@ -297,6 +301,7 @@ public class DqInspectProblemController extends JeecgController> queryPageList(DqInspectProgress dqInspectProgress, @@ -130,6 +131,7 @@ public class DqInspectProgressController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { @@ -146,6 +148,7 @@ public class DqInspectProgressController extends JeecgController> queryPageList(DqInspectTask dqInspectTask, @@ -93,6 +93,7 @@ public class DqInspectTaskController extends JeecgController> queryLedgerList(DqInspectTask dqInspectTask, @@ -221,7 +222,7 @@ public class DqInspectTaskController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { @@ -239,7 +240,7 @@ public class DqInspectTaskController extends JeecgController> queryDqInspectProgressListByMainId(@RequestParam(name="id",required=true) String id) { @@ -253,6 +254,7 @@ public class DqInspectTaskController extends JeecgController> queryPageList(DjPeopleService djPeopleService, @@ -143,7 +143,7 @@ public class DjPeopleServiceController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { @@ -160,6 +160,7 @@ public class DjPeopleServiceController extends JeecgController> queryPageList(DjInspectionRectifyList djInspectionRectifyList, @@ -96,6 +96,7 @@ public class DjInspectionRectifyListController extends JeecgController> loadTreeChildren(@RequestParam(name = "pid") String pid) { Result> result = new Result<>(); @@ -118,6 +119,7 @@ public class DjInspectionRectifyListController extends JeecgController> loadTreeRoot(@RequestParam(name = "async") Boolean async, @RequestParam(name = "pcode") String pcode) { Result> result = new Result<>(); @@ -157,7 +159,7 @@ public class DjInspectionRectifyListController extends JeecgController> queryPageList(DjInspectionRectifyList djInspectionRectifyList,HttpServletRequest req) { @@ -175,7 +177,7 @@ public class DjInspectionRectifyListController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { @@ -276,6 +278,7 @@ public class DjInspectionRectifyListController extends JeecgController> queryPageList(SupervisionTest supervisionTest, @@ -143,7 +143,7 @@ public class SupervisionTestController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { @@ -160,6 +160,7 @@ public class SupervisionTestController extends JeecgController> queryPageList(DjMeetingRecord djMeetingRecord, @@ -143,7 +143,7 @@ public class DjMeetingRecordController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { @@ -160,6 +160,7 @@ public class DjMeetingRecordController extends JeecgController> queryPageList(DjInspectImprove djInspectImprove, @@ -99,6 +99,7 @@ public class DjInspectImproveController extends JeecgController> loadTreeChildren(@RequestParam(name = "pid") String pid) { Result> result = new Result<>(); @@ -121,6 +122,7 @@ public class DjInspectImproveController extends JeecgController> loadTreeRoot(@RequestParam(name = "async") Boolean async, @RequestParam(name = "pcode") String pcode) { Result> result = new Result<>(); @@ -160,7 +162,7 @@ public class DjInspectImproveController extends JeecgController> queryPageList(DjInspectImprove djInspectImprove,HttpServletRequest req) { @@ -178,7 +180,7 @@ public class DjInspectImproveController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { @@ -279,6 +281,7 @@ public class DjInspectImproveController extends JeecgController checkExcelByEasyExcel(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 27c647f..acd4714 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 @@ -86,7 +86,7 @@ public class ImprovementProposalController { * @param req * @return */ - //@AutoLog(value = "improvement_proposal-分页列表查询") + @AutoLog(value = "improvement_proposal-分页列表查询") @Operation(summary="improvement_proposal-分页列表查询") @GetMapping(value = "/list") public Result> queryPageList(ImprovementProposal improvementProposal, @@ -131,6 +131,7 @@ public class ImprovementProposalController { /** * 获取当前登录用户可作为改善提案归属的业务部门。 */ + @AutoLog(value = "improvement_proposal-获取我的提案部门") @GetMapping(value = "/myProposalDepartments") @RequiresPermissions("improvementproposal:improvement_proposal:add") public Result> getMyProposalDepartments() { @@ -206,6 +207,7 @@ public class ImprovementProposalController { return handleBpmAction(() -> improvementProposalService.saveInitialReview(action, currentUser())); } + @AutoLog(value = "improvement_proposal-获取部门评分") @GetMapping(value = "/bpm/myDeptScore") @Operation(summary = "查询当前部门评委个人评分") public Result getMyDeptScore(@RequestParam String mainId, @RequestParam String processInstanceId, @@ -242,6 +244,7 @@ public class ImprovementProposalController { return handleBpmAction(() -> improvementProposalService.saveLeaderAward(action, currentUser())); } + @AutoLog(value = "improvement_proposal-获取所级评议投票候选人") @GetMapping(value = "/bpm/instituteVoteCandidates") @Operation(summary = "查询所级评议投票候选人") public Result> getInstituteVoteCandidates(@RequestParam String mainId, @@ -414,7 +417,7 @@ public class ImprovementProposalController { * @param id * @return */ - //@AutoLog(value = "improvement_proposal-通过id查询") + @AutoLog(value = "improvement_proposal-通过id查询") @Operation(summary="improvement_proposal-通过id查询") @GetMapping(value = "/queryById") public Result queryById(@RequestParam(name="id",required=true) String id) { @@ -432,7 +435,7 @@ public class ImprovementProposalController { * @param id * @return */ - //@AutoLog(value = "部门评议评分表通过主表ID查询") + @AutoLog(value = "部门评议评分表通过主表ID查询") @Operation(summary="部门评议评分表主表ID查询") @GetMapping(value = "/queryImprovementDeptScoreByMainId") public Result> queryImprovementDeptScoreListByMainId(@RequestParam(name="id",required=true) String id) { @@ -445,7 +448,7 @@ public class ImprovementProposalController { * @param id * @return */ - //@AutoLog(value = "所级评议投票表通过主表ID查询") + @AutoLog(value = "所级评议投票表通过主表ID查询") @Operation(summary="所级评议投票表主表ID查询") @GetMapping(value = "/queryImprovementInstituteVoteByMainId") public Result> queryImprovementInstituteVoteListByMainId(@RequestParam(name="id",required=true) String id) { @@ -467,6 +470,7 @@ public class ImprovementProposalController { * @param request * @param improvementProposal */ + @AutoLog(value = "improvement_proposal-通过excel导出") @RequiresPermissions("improvementproposal:improvement_proposal:exportXls") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, ImprovementProposal improvementProposal) { 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 f661c01..913dce3 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 @@ -85,7 +85,7 @@ public class TaskListController { * @param req * @return */ - //@AutoLog(value = "任务清单表-分页列表查询") + @AutoLog(value = "任务清单表-分页列表查询") @Operation(summary="任务清单表-分页列表查询") @GetMapping(value = "/list") public Result> queryPageList(TaskList taskList, @@ -172,7 +172,7 @@ public class TaskListController { * @param id * @return */ - //@AutoLog(value = "任务清单表-通过id查询") + @AutoLog(value = "任务清单表-通过id查询") @Operation(summary="任务清单表-通过id查询") @GetMapping(value = "/queryById") public Result queryById(@RequestParam(name="id",required=true) String id) { @@ -423,7 +423,7 @@ public class TaskListController { * @param id * @return */ - //@AutoLog(value = "任务清单详情表通过主表ID查询") + @AutoLog(value = "任务清单详情表通过主表ID查询") @Operation(summary="任务清单详情表主表ID查询") @GetMapping(value = "/queryTaskListDetialByMainId") public Result> queryTaskListDetialListByMainId(@RequestParam(name="id",required=true) String id) { @@ -436,7 +436,7 @@ public class TaskListController { * @param id * @return */ - //@AutoLog(value = "任务清单权限表通过主表ID查询") + @AutoLog(value = "任务清单权限表通过主表ID查询") @Operation(summary="任务清单权限表主表ID查询") @GetMapping(value = "/queryTaskListPermissionByMainId") public Result> queryTaskListPermissionListByMainId(@RequestParam(name="id",required=true) String id) { @@ -449,7 +449,7 @@ public class TaskListController { * @param id * @return */ - //@AutoLog(value = "任务清单收藏表通过主表ID查询") + @AutoLog(value = "任务清单收藏表通过主表ID查询") @Operation(summary="任务清单收藏表主表ID查询") @GetMapping(value = "/queryTaskListFavoriteByMainId") public Result> queryTaskListFavoriteListByMainId(@RequestParam(name="id",required=true) String id) { @@ -463,6 +463,7 @@ public class TaskListController { * @param request * @param taskList */ + @AutoLog(value = "任务清单表-通过excel导出") @RequiresPermissions("tasklist:task_list:exportXls") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, TaskList taskList) { 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 022b941..136cf4a 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 @@ -57,12 +57,14 @@ public class TaskListDetialController { } } + @AutoLog(value = "任务清单详情表-通过主表ID查询") @GetMapping(value = "/listByMainId") public Result> listByMainId(@RequestParam(name = "mainId") String mainId) { List list = taskListDetialService.queryTopLevelByMainId(mainId); return Result.OK(list); } + @AutoLog(value = "任务清单详情表-通过主表ID查询全部") @GetMapping(value = "/listAllByMainId") public Result> listAllByMainId( @RequestParam(name = "mainId") String mainId) { @@ -135,6 +137,7 @@ public class TaskListDetialController { } } + @AutoLog(value = "任务清单详情表-加载子任务") @GetMapping(value = "/loadSubTasks") public Result> loadSubTasks( @RequestParam(name = "parentTaskId") String parentTaskId,