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..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 @@ -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; @@ -48,6 +49,7 @@ public class FixedContact20260730Controller extends JeecgController> queryPageList(FixedContact20260730 fixedContact20260730, @@ -143,6 +145,7 @@ public class FixedContact20260730Controller extends JeecgController queryById(@RequestParam(name = "id", required = true) String id) { @@ -153,6 +156,7 @@ public class FixedContact20260730Controller extends JeecgController> queryFixedContactFeedback20260730ListByMainId(@RequestParam(name = "id", required = true) String id) { @@ -160,18 +164,21 @@ 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) { @@ -183,12 +190,14 @@ public class FixedContact20260730Controller extends JeecgController checkExcelByEasyExcel(HttpServletRequest request) { return super.checkExcelByEasyExcel(request, FixedContact20260730.class); } + @AutoLog(value = "定点联系单-通过EasyExcel导出模板") @RequiresPermissions("bg.fixcontact:fixed_contact_20260730:exportXls") @GetMapping(value = "/exportXlsHeaders") public void exportXlsHeaders(HttpServletResponse response) throws IOException { @@ -197,7 +206,7 @@ public class FixedContact20260730Controller extends JeecgController saveBpmForm(@RequestBody FixedContact20260730BpmSaveDTO dto) { @@ -213,7 +222,7 @@ public class FixedContact20260730Controller extends JeecgController saveSubApprove(@RequestBody Map params) { @@ -254,7 +263,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 ce05a92..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 @@ -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; /** @@ -76,7 +77,7 @@ public class BgXiSpeakController extends JeecgController> queryPageList(BgXiSpeak bgXiSpeak, @@ -159,6 +160,7 @@ public class BgXiSpeakController extends JeecgController> getRootListWithDept(@RequestParam(name = "dept_ids") String deptIds) { @@ -178,6 +180,7 @@ public class BgXiSpeakController extends JeecgController> loadTreeRoot(@RequestParam(name = "async") Boolean async, @RequestParam(name = "pcode") String pcode) { Result> result = new Result<>(); @@ -217,7 +220,7 @@ public class BgXiSpeakController extends JeecgController> queryPageList(BgXiSpeak bgXiSpeak,HttpServletRequest req) { @@ -235,7 +238,7 @@ public class BgXiSpeakController extends JeecgController saveBpmForm(@RequestBody BgXiSpeakBpmSaveDTO dto) { @@ -323,7 +326,7 @@ public class BgXiSpeakController extends JeecgController saveSubApprove(@RequestBody Map params) { @@ -345,7 +348,7 @@ public class BgXiSpeakController extends JeecgController withDrawXiSpeak(@RequestParam("id") String id) { @@ -391,7 +394,7 @@ public class BgXiSpeakController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { @@ -408,6 +411,7 @@ public class BgXiSpeakController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { @@ -430,6 +435,7 @@ public class BgXiSpeakController extends JeecgController importExcelByEasyExcel(HttpServletRequest request) { @@ -444,6 +450,7 @@ public class BgXiSpeakController extends JeecgController checkExcelByEasyExcel(HttpServletRequest request) { @@ -454,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 importExcel(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") String mainId) { return super.importExcel(request, response, BgXiSpeakFeedback.class); } -} \ No newline at end of file +} 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..2343cfc 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; @@ -89,7 +90,7 @@ public class BgPartymatterController extends JeecgController> queryPageList(BgPartymatter bgPartymatter, @@ -130,6 +131,7 @@ public class BgPartymatterController extends JeecgController queryById(@RequestParam(name = "id", required = true) String id) { BgPartymatter bgPartymatter = bgPartymatterService.getById(id); @@ -185,7 +187,7 @@ public class BgPartymatterController extends JeecgController saveBpmForm(@RequestBody BgPartymatterBpmSaveDTO dto) { @@ -276,6 +278,7 @@ public class BgPartymatterController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { @@ -303,7 +307,7 @@ public class BgPartymatterController extends JeecgController> listBgPartymatterFeedbackByMainId(BgPartymatterFeedback bgPartymatterFeedback, @@ -380,6 +384,7 @@ public class BgPartymatterController extends JeecgController importBgPartymatterFeedback(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") String mainId) { MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; @@ -453,6 +459,7 @@ public class BgPartymatterController extends JeecgController checkExcelByEasyExcel(HttpServletRequest request) { @@ -462,6 +469,7 @@ public class BgPartymatterController extends JeecgController importExcelByEasyExcel(HttpServletRequest request, @@ -477,6 +485,7 @@ public class BgPartymatterController extends JeecgController> queryPageList(BgTakepulse bgTakepulse, @@ -201,7 +202,7 @@ public class BgTakepulseController extends JeecgController saveBpmForm(@RequestBody BgTakepulseBpmSaveDTO dto) { @@ -253,7 +254,7 @@ public class BgTakepulseController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { @@ -271,7 +272,7 @@ public class BgTakepulseController extends JeecgController> queryBgTakepulseFeedbackListByMainId(@RequestParam(name="id",required=true) String id) { @@ -284,6 +285,7 @@ public class BgTakepulseController extends JeecgController> listBgTakepulseFeedbackByMainId(BgTakepulseFeedback bgTakepulseFeedback, @@ -361,6 +363,7 @@ public class BgTakepulseController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { @@ -441,6 +445,7 @@ public class BgTakepulseController extends JeecgController checkExcelByEasyExcel(HttpServletRequest request) { @@ -450,6 +455,7 @@ public class BgTakepulseController extends JeecgController importExcelByEasyExcel(HttpServletRequest request) { @@ -464,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) { @@ -173,6 +174,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..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 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..cec3add 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 @@ -61,7 +61,7 @@ public class DqInspectProblemController 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 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..d6c4f90 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 @@ -56,6 +56,7 @@ public class DqInspectProgressController 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 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..e5d22e0 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 @@ -72,7 +72,7 @@ public class DqInspectTaskController 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 importExcel(HttpServletRequest request, HttpServletResponse response) { @@ -333,6 +336,7 @@ public class DqInspectTaskController extends JeecgController importExcelByEasyExcel(HttpServletRequest request) { @@ -342,6 +346,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 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..db5a90e 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 @@ -61,7 +61,7 @@ public class DjInspectionRectifyListController 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 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..981cd7d 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 @@ -61,7 +61,7 @@ public class SupervisionTestController 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 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..4f1afa3 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 @@ -61,7 +61,7 @@ public class DjMeetingRecordController 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 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..780c35d 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 @@ -64,7 +64,7 @@ public class DjInspectImproveController 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 importExcel(HttpServletRequest request, HttpServletResponse response) { @@ -302,6 +306,7 @@ public class DjInspectImproveController extends JeecgController importExcelByEasyExcel(HttpServletRequest request) { @@ -324,6 +330,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 90dc855..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 @@ -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; @@ -85,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, @@ -130,6 +131,7 @@ public class ImprovementProposalController { /** * 获取当前登录用户可作为改善提案归属的业务部门。 */ + @AutoLog(value = "improvement_proposal-获取我的提案部门") @GetMapping(value = "/myProposalDepartments") @RequiresPermissions("improvementproposal:improvement_proposal:add") public Result> getMyProposalDepartments() { @@ -161,6 +163,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) { @@ -184,7 +187,7 @@ public class ImprovementProposalController { /** * 删除运行中的流程并回退草稿。提案基本信息和业务附件会保留,流程产生的评分、投票数据会清空。 */ - @AutoLog(value = "改善提案-删除流程并回退草稿") + @AutoLog(value = "改善提案-删除流程并回退草稿", operateType = CommonConstant.OPERATE_TYPE_4) @Operation(summary = "改善提案-删除流程并回退草稿") @RequiresPermissions("improvementproposal:improvement_proposal:withdrawProcess") @PostMapping(value = "/withdrawProcess") @@ -197,12 +200,14 @@ public class ImprovementProposalController { } } + @AutoLog(value = "改善提案-保存部门初审结果", operateType = CommonConstant.OPERATE_TYPE_3) @PostMapping(value = "/bpm/initialReview") @Operation(summary = "保存部门精益专员初审结果") public Result saveInitialReview(@RequestBody ImprovementProposalBpmActionDTO action) { 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, @@ -218,24 +223,28 @@ 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) { return handleBpmAction(() -> improvementProposalService.saveLeaderAward(action, currentUser())); } + @AutoLog(value = "improvement_proposal-获取所级评议投票候选人") @GetMapping(value = "/bpm/instituteVoteCandidates") @Operation(summary = "查询所级评议投票候选人") public Result> getInstituteVoteCandidates(@RequestParam String mainId, @@ -251,24 +260,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) { @@ -404,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) { @@ -422,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) { @@ -435,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) { @@ -457,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) { @@ -503,6 +517,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..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 @@ -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; @@ -84,7 +85,7 @@ public class TaskListController { * @param req * @return */ - //@AutoLog(value = "任务清单表-分页列表查询") + @AutoLog(value = "任务清单表-分页列表查询") @Operation(summary="任务清单表-分页列表查询") @GetMapping(value = "/list") public Result> queryPageList(TaskList taskList, @@ -171,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) { @@ -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) { @@ -422,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) { @@ -435,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) { @@ -448,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) { @@ -462,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) { @@ -509,6 +511,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..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 @@ -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 { @@ -52,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) { @@ -65,6 +72,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 +85,7 @@ public class TaskListDetialController { } } + @AutoLog(value = "任务清单详情表-移动任务", operateType = CommonConstant.OPERATE_TYPE_3) @PostMapping(value = "/moveTask") public Result moveTask(@RequestBody MoveTaskReq req) { try { @@ -88,6 +97,7 @@ public class TaskListDetialController { } } + @AutoLog(value = "任务清单详情表-移动任务分组", operateType = CommonConstant.OPERATE_TYPE_3) @PostMapping(value = "/moveTaskGroup") public Result moveTaskGroup(@RequestBody Map params) { try { @@ -101,6 +111,7 @@ public class TaskListDetialController { } } + @AutoLog(value = "任务清单详情表-关注任务", operateType = CommonConstant.OPERATE_TYPE_2) @PostMapping(value = "/follow") public Result follow(@RequestBody Map body) { try { @@ -113,6 +124,7 @@ public class TaskListDetialController { } } + @AutoLog(value = "任务清单详情表-取消关注任务", operateType = CommonConstant.OPERATE_TYPE_4) @PostMapping(value = "/unfollow") public Result unfollow(@RequestBody Map body) { try { @@ -125,6 +137,7 @@ public class TaskListDetialController { } } + @AutoLog(value = "任务清单详情表-加载子任务") @GetMapping(value = "/loadSubTasks") public Result> loadSubTasks( @RequestParam(name = "parentTaskId") String parentTaskId,