feat(syslog): 督办业务模块控制器补全日志注解
为督办业务模块各 controller 的写操作方法补充 @AutoLog 注解: - 24 个导入端点(excel导入/EasyExcel导入/反馈导入)加导入日志 - 任务清单详情新增/编辑/删除/移动/关注等 8 个方法 - 改善提案审批流程 startProcess 及各 BPM 环节 9 个方法
This commit is contained in:
+4
@@ -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<FixedContact
|
||||
return super.exportXls(request, fixedContact20260730, FixedContact20260730.class, "定点联系单");
|
||||
}
|
||||
|
||||
@AutoLog(value = "定点联系单-通过excel导入")
|
||||
@RequiresPermissions("bg.fixcontact:fixed_contact_20260730:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> 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<FixedContact
|
||||
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 {
|
||||
|
||||
+2
@@ -421,6 +421,7 @@ public class BgXiSpeakController extends JeecgController<BgXiSpeak, IBgXiSpeakSe
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "习总书记重要讲话指示批示情况-通过excel导入")
|
||||
@RequiresPermissions("bg.xispeak:bg_xi_speak:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
@@ -430,6 +431,7 @@ public class BgXiSpeakController extends JeecgController<BgXiSpeak, IBgXiSpeakSe
|
||||
/**
|
||||
* 通过EasyExcel导入数据
|
||||
*/
|
||||
@AutoLog(value = "习总书记重要讲话指示批示情况-通过EasyExcel导入")
|
||||
@RequiresPermissions("bg.xispeak:bg_xi_speak:importExcel")
|
||||
@RequestMapping(value = "/importExcelByEasyExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcelByEasyExcel(HttpServletRequest request) {
|
||||
|
||||
+1
@@ -206,6 +206,7 @@ public class BgXiSpeakFeedbackController extends JeecgController<BgXiSpeakFeedba
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "习总书记重要讲话反馈表-通过excel导入")
|
||||
@RequestMapping(value = "/importBgXiSpeakFeedback", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") String mainId) {
|
||||
return super.importExcel(request, response, BgXiSpeakFeedback.class);
|
||||
|
||||
+3
@@ -288,6 +288,7 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "党委会-通过excel导入")
|
||||
@RequiresPermissions(value = {"bgpartymatter:bg_partymatter:importExcel", "bgofficematter:bg_officematter:importExcel"}, logical = Logical.OR)
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
@@ -414,6 +415,7 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "党委会反馈表-通过excel导入")
|
||||
@RequestMapping(value = "/importBgPartymatterFeedback/{mainId}")
|
||||
public Result<?> importBgPartymatterFeedback(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") String mainId) {
|
||||
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
|
||||
@@ -462,6 +464,7 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
|
||||
/**
|
||||
* 通过EasyExcel导入数据,支持字典校验和Hibernate Validator,通过 meetingType 参数指定导入类型
|
||||
*/
|
||||
@AutoLog(value = "党委会-通过EasyExcel导入")
|
||||
@RequiresPermissions("bgpartymatter:bg_partymatter:importExcel")
|
||||
@PostMapping(value = "/importExcelByEasyExcel")
|
||||
public Result<?> importExcelByEasyExcel(HttpServletRequest request,
|
||||
|
||||
+2
@@ -404,6 +404,7 @@ public class BgTakepulseController extends JeecgController<BgTakepulse, IBgTakep
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "我为四所把把脉-通过excel导入")
|
||||
@RequiresPermissions("bqtakepulse:bg_takepulse:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
@@ -450,6 +451,7 @@ public class BgTakepulseController extends JeecgController<BgTakepulse, IBgTakep
|
||||
/**
|
||||
* 通过EasyExcel导入数据,支持字典校验和Hibernate Validator
|
||||
*/
|
||||
@AutoLog(value = "我为四所把把脉-通过EasyExcel导入")
|
||||
@RequiresPermissions("bqtakepulse:bg_takepulse:importExcel")
|
||||
@PostMapping(value = "/importExcelByEasyExcel")
|
||||
public Result<?> importExcelByEasyExcel(HttpServletRequest request) {
|
||||
|
||||
+1
@@ -173,6 +173,7 @@ public class DjCheckController extends JeecgController<DjCheck, IDjCheckService>
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "党建检查台账-通过excel导入")
|
||||
@RequiresPermissions("check:dj_check:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
|
||||
+1
@@ -173,6 +173,7 @@ public class DjDemoLifeMeetingController extends JeecgController<DjDemoLifeMeeti
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "所领导板子民主生活会问题台账-通过excel导入")
|
||||
@RequiresPermissions("demoMetting:dj_demo_life_meeting:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
|
||||
+1
@@ -310,6 +310,7 @@ public class DqInspectProblemController extends JeecgController<DqInspectProblem
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "dq_inspect_problem-通过excel导入")
|
||||
@RequiresPermissions("dqinspectproblem:dq_inspect_problem:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
|
||||
+1
@@ -158,6 +158,7 @@ public class DqInspectProgressController extends JeecgController<DqInspectProgre
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "工作进展反馈-通过excel导入")
|
||||
@RequestMapping(value = "/importDqInspectProgress", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, DqInspectProgress.class);
|
||||
|
||||
+2
@@ -296,6 +296,7 @@ public class DqInspectTaskController extends JeecgController<DqInspectTask, IDqI
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "dq_inspect_task-通过excel导入")
|
||||
@RequiresPermissions("dqinspecttask:dq_inspect_task:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
@@ -333,6 +334,7 @@ public class DqInspectTaskController extends JeecgController<DqInspectTask, IDqI
|
||||
/**
|
||||
* 通过EasyExcel导入数据,支持字典校验和Hibernate Validator
|
||||
*/
|
||||
@AutoLog(value = "dq_inspect_task-通过EasyExcel导入")
|
||||
@RequiresPermissions("dqinspecttask:dq_inspect_task:importExcel")
|
||||
@PostMapping(value = "/importExcelByEasyExcel")
|
||||
public Result<?> importExcelByEasyExcel(HttpServletRequest request) {
|
||||
|
||||
+1
@@ -173,6 +173,7 @@ public class DjPeopleServiceController extends JeecgController<DjPeopleService,
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "我为群众办实事台账-通过excel导入")
|
||||
@RequiresPermissions("peopleService:dj_people_service:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
|
||||
+1
@@ -289,6 +289,7 @@ public class DjInspectionRectifyListController extends JeecgController<DjInspect
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "党建巡视整改提升工作台账-通过excel导入")
|
||||
@RequiresPermissions("rectifylist:dj_inspection_rectify_list:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
|
||||
+1
@@ -173,6 +173,7 @@ public class SupervisionTestController extends JeecgController<SupervisionTest,
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "supervision_test-通过excel导入")
|
||||
@RequiresPermissions("supervisiontest:supervision_test:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
|
||||
+1
@@ -173,6 +173,7 @@ public class DjMeetingRecordController extends JeecgController<DjMeetingRecord,
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "统战座谈会意见台账及督办反馈-通过excel导入")
|
||||
@RequiresPermissions("tzMetting:dj_meeting_record:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
|
||||
+2
@@ -293,6 +293,7 @@ public class DjInspectImproveController extends JeecgController<DjInspectImprove
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "巡视整改台账-通过excel导入")
|
||||
@RequiresPermissions("dj.inspectimprove:dj_inspect_improve:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
@@ -310,6 +311,7 @@ public class DjInspectImproveController extends JeecgController<DjInspectImprove
|
||||
/**
|
||||
* 通过EasyExcel导入数据
|
||||
*/
|
||||
@AutoLog(value = "巡视整改台账-通过EasyExcel导入")
|
||||
@RequiresPermissions("dj.inspectimprove:dj_inspect_improve:importExcel")
|
||||
@RequestMapping(value = "/importExcelByEasyExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcelByEasyExcel(HttpServletRequest request) {
|
||||
|
||||
+11
@@ -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<String> startProcess(@RequestBody(required = false) Map<String, String> 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<String> 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<String> 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<String> 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<String> 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<String> 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<String> 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<String> 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<String> 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) {
|
||||
|
||||
+1
@@ -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) {
|
||||
|
||||
+10
@@ -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<TaskListDetial> 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<String, String> 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<String, Object> params) {
|
||||
try {
|
||||
@@ -101,6 +109,7 @@ public class TaskListDetialController {
|
||||
}
|
||||
}
|
||||
|
||||
@AutoLog(value = "任务清单详情表-关注任务", operateType = CommonConstant.OPERATE_TYPE_2)
|
||||
@PostMapping(value = "/follow")
|
||||
public Result<?> follow(@RequestBody Map<String, String> body) {
|
||||
try {
|
||||
@@ -113,6 +122,7 @@ public class TaskListDetialController {
|
||||
}
|
||||
}
|
||||
|
||||
@AutoLog(value = "任务清单详情表-取消关注任务", operateType = CommonConstant.OPERATE_TYPE_4)
|
||||
@PostMapping(value = "/unfollow")
|
||||
public Result<?> unfollow(@RequestBody Map<String, String> body) {
|
||||
try {
|
||||
|
||||
Reference in New Issue
Block a user