diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/NewDutyController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/NewDutyController.java index 572225e..775c31c 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/NewDutyController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/NewDutyController.java @@ -42,9 +42,7 @@ public class NewDutyController { * @return */ @PostMapping(value = "getPageList") - @SysLog(title = "综合展示", model = "综合展示->日计划", operaType = OperaType.EXPORT, details = "导出日计划数据信息") - - @Log(title = "今日任务", menu = "值班任务->值班任务", businessType = BusinessType.QUERY, details = "今日任务列表") + @SysLog(title = "值班员", model = "值班任务->值班员", operaType = OperaType.QUERY, details = "查询值班员",logType = 1) public Map getPageList(NewDutyVo vo) { PageHelper.startPage(vo.getPage(), vo.getLimit()); List deviceList = service.getPageList(vo); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/StagingController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/StagingController.java index b248c94..fee96c1 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/StagingController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/StagingController.java @@ -2,6 +2,8 @@ package com.sercurityControl.proteam.controller; import com.securityControl.common.core.web.domain.AjaxResult; +import com.securityControl.common.log.annotation.SysLog; +import com.securityControl.common.log.enums.OperaType; import com.sercurityControl.proteam.domain.dto.LoginDto; import com.sercurityControl.proteam.service.StagingService; import lombok.extern.slf4j.Slf4j; @@ -30,6 +32,7 @@ public class StagingController { * @return map */ @PostMapping("getWorkPlan") + @SysLog(title = "工作台", model = "值班任务->工作台", operaType = OperaType.QUERY, details = "查询工作台",logType = 1) public Map getWorkPlan(LoginDto loginDto) { return service.getWorkPlan(loginDto); } diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/DutyStatisticsController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/DutyStatisticsController.java index bc5c013..6082a89 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/DutyStatisticsController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/DutyStatisticsController.java @@ -8,7 +8,9 @@ import com.github.pagehelper.PageInfo; import com.securityControl.common.core.utils.StringUtils; import com.securityControl.common.core.utils.aes.DateTimeHelper; import com.securityControl.common.log.annotation.Log; +import com.securityControl.common.log.annotation.SysLog; import com.securityControl.common.log.enums.BusinessType; +import com.securityControl.common.log.enums.OperaType; import com.securityControl.common.log.enums.OperationType; import com.sercurityControl.proteam.dutyTask.domain.DutyStatisticsEntity; import com.sercurityControl.proteam.dutyTask.service.DutyStatisticsService; @@ -46,7 +48,7 @@ public class DutyStatisticsController { Logger logger = LoggerFactory.getLogger(TodayTaskController.class); @PostMapping(value = "getDutyStatisticsList") - @Log(title = "值班统计", menu = "值班任务->值班统计", businessType = BusinessType.QUERY, details = "值班统计列表") + @SysLog(title = "值班统计", model = "值班任务->值班统计", operaType = OperaType.QUERY, details = "查询值班统计",logType = 1) public Map getDutyStatisticsList(DutyStatisticsEntity entity) { if (StringUtils.isBlank(entity.getCreateTime())) { entity.setCreateTime(DateTimeHelper.getNowDate()); @@ -84,7 +86,7 @@ public class DutyStatisticsController { * @date 2022-12-21 16:58 */ @GetMapping("exportData") - @Log(title = "值班统计", menu = "值班任务->值班统计", businessType = BusinessType.EXPORT, details = "值班统计导出", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "值班统计", model = "值班任务->值班统计", operaType = OperaType.DOWNLOAD, details = "导出值班统计",logType = 1) public void exportData(HttpServletRequest request, HttpServletResponse response, DutyStatisticsEntity entity) { if (StringUtils.isBlank(entity.getCreateTime())) { entity.setCreateTime(DateTimeHelper.getNowDate()); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/NewDailyReportController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/NewDailyReportController.java index 9a0197a..13c1295 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/NewDailyReportController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/NewDailyReportController.java @@ -3,7 +3,9 @@ package com.sercurityControl.proteam.dutyTask.controller; import com.securityControl.common.core.utils.StringUtils; import com.securityControl.common.core.web.domain.AjaxResult; import com.securityControl.common.log.annotation.Log; +import com.securityControl.common.log.annotation.SysLog; import com.securityControl.common.log.enums.BusinessType; +import com.securityControl.common.log.enums.OperaType; import com.securityControl.common.log.enums.OperationType; import com.sercurityControl.proteam.dutyTask.domain.*; import com.sercurityControl.proteam.dutyTask.service.DayPaperService; @@ -44,7 +46,7 @@ public class NewDailyReportController { private DayPaperService dayPaperService; @GetMapping("downloadDaily") - @Log(title = "值班日报", menu = "值班任务->值班日报", businessType = BusinessType.EXPORT, details = "值班日报导出", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "值班日报", model = "值班任务->值班日报", operaType = OperaType.DOWNLOAD, details = "下载值班日报",logType = 1) public void downloadDaily(HttpServletRequest request, HttpServletResponse response, String currentDay, String chineseDate) { download(request, response, currentDay, chineseDate); } @@ -56,6 +58,7 @@ public class NewDailyReportController { * @date 2024/10/26 15:48 */ @PostMapping("getDailyData") + @SysLog(title = "值班日报", model = "值班任务->值班日报", operaType = OperaType.QUERY, details = "查询值班日报",logType = 1) public AjaxResult getDailyData(String currentDay) { Map map = null; try { diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/SuperStatisticsController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/SuperStatisticsController.java index fcb817f..4774f62 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/SuperStatisticsController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/SuperStatisticsController.java @@ -12,7 +12,9 @@ import com.securityControl.common.core.utils.aes.DateTimeHelper; import com.securityControl.common.core.utils.aes.SM4Utils; import com.securityControl.common.core.web.domain.AjaxResult; import com.securityControl.common.log.annotation.Log; +import com.securityControl.common.log.annotation.SysLog; import com.securityControl.common.log.enums.BusinessType; +import com.securityControl.common.log.enums.OperaType; import com.securityControl.common.log.enums.OperationType; import com.securityControl.common.security.utils.SecurityUtils; import com.securityControl.system.api.model.LoginUser; @@ -84,7 +86,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-19 16:33 */ @PostMapping(value = "getSuperStatisticsList") - @Log(title = "违章统计", menu = "值班任务->违章统计", businessType = BusinessType.QUERY, details = "违章统计列表") + @SysLog(title = "违章统计", model = "值班任务->违章统计", operaType = OperaType.QUERY, details = "查询违章统计",logType = 1) public Map getSuperStatisticsList(NoticeVioEntity noticeVioEntity) { if (StringUtils.isBlank(noticeVioEntity.getCreateTime())) { Calendar cal = Calendar.getInstance(); @@ -180,7 +182,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-19 17:39 */ @PostMapping(value = "getNoticeVoiById") - @Log(title = "违章统计", menu = "值班任务->违章统计", businessType = BusinessType.QUERY, details = "违章详情查看") + @SysLog(title = "违章统计", model = "值班任务->违章统计", operaType = OperaType.QUERY, details = "查询违章详情",logType = 1) public AjaxResult getNoticeVoiById(String params) { try { NoticeVioEntity noticeVioEntity = service.getNoticeVoiById(params); @@ -203,7 +205,7 @@ public class SuperStatisticsController extends BaseController { */ @PostMapping(value = "editUploadNoticeVio", headers = "content-type=multipart/form-data") @ResponseBody - @Log(title = "违章统计", menu = "值班任务->违章统计", businessType = BusinessType.UPDATE, details = "修改违章", grade = OperationType.UPDATE_BUSINESS) + @SysLog(title = "违章统计", model = "值班任务->违章统计", operaType = OperaType.UPDATE, details = "修改违章",logType = 1) public AjaxResult uploadNoticeVio(HttpServletRequest request, @RequestParam(value = "file[]", required = false) MultipartFile[] files) { CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(); MultipartHttpServletRequest multiReq = multipartResolver.resolveMultipart(request); @@ -266,7 +268,7 @@ public class SuperStatisticsController extends BaseController { */ @PostMapping("delNoticeVoiById") @ResponseBody - @Log(title = "违章统计", menu = "值班任务->违章统计", businessType = BusinessType.DELETE, details = "删除违章", grade = OperationType.DELETE_BUSINESS) + @SysLog(title = "违章统计", model = "值班任务->违章统计", operaType = OperaType.DELETE, details = "删除违章",logType = 1) public AjaxResult delNoticeVoiById(String params, String type) { try { service.delNoticeVoiById(params, type); @@ -288,7 +290,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-20 14:49 */ @PostMapping(value = "getVoiTypeList") - @Log(title = "违章类别", menu = "值班任务->违章统计", businessType = BusinessType.QUERY, details = "违章类别列表") + @SysLog(title = "违章类别", model = "值班任务->违章统计->违章类别", operaType = OperaType.QUERY, details = "查询违章类别",logType = 1) public Map getVoiTypeList(VoiTypeEntity voiTypeEntity) { PageHelper.startPage(Integer.parseInt(voiTypeEntity.getPage()), Integer.parseInt(voiTypeEntity.getLimit())); Map map = new HashMap(16); @@ -320,7 +322,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-20 15:26 */ @PostMapping(value = "addOrUpdateVoiType") - @Log(title = "违章类别", menu = "值班任务->违章统计", businessType = BusinessType.QUERY, details = "新增/修改违章类别", grade = OperationType.ADD_BUSINESS) + @SysLog(title = "违章类别", model = "值班任务->违章统计->违章类别", operaType = OperaType.INSERT, details = "新增违章类别",logType = 1) public AjaxResult addOrUpdateVoiType(VoiTypeEntity voiTypeEntity) { try { int result = service.voiTypeIsExist(voiTypeEntity.getCode()); @@ -359,7 +361,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-20 15:47 */ @PostMapping("getVoiTypeById") - @Log(title = "违章类别", menu = "值班任务->违章统计", businessType = BusinessType.QUERY, details = "违章类别详情查看") + @SysLog(title = "违章类别", model = "值班任务->违章统计->违章类别", operaType = OperaType.QUERY, details = "查询违章类别详情",logType = 1) public AjaxResult getVoiTypeById(String params) { try { VoiTypeEntity entity = service.getVoiTypeById(params); @@ -378,7 +380,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-20 15:47 */ @PostMapping("delVoiTypeById") - @Log(title = "违章类别", menu = "值班任务->违章统计", businessType = BusinessType.DELETE, details = "删除违章类别", grade = OperationType.DELETE_BUSINESS) + @SysLog(title = "违章类别", model = "值班任务->违章统计->违章类别", operaType = OperaType.DELETE, details = "删除违章类别",logType = 1) public AjaxResult delVoiTypeById(String params) { try { int result = service.isHasVoiInfo(params); @@ -403,7 +405,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-20 16:47 */ @PostMapping(value = "getVoiInfoList") - @Log(title = "违章依据", menu = "值班任务->违章统计", businessType = BusinessType.QUERY, details = "违章依据列表") + @SysLog(title = "违章依据", model = "值班任务->违章统计->违章依据", operaType = OperaType.QUERY, details = "查询违章违章依据",logType = 1) public Map getVoiInfoList(VoiInfoEntity voiInfoEntity) { PageHelper.startPage(Integer.parseInt(voiInfoEntity.getPage()), Integer.parseInt(voiInfoEntity.getLimit())); Map map = new HashMap(16); @@ -435,7 +437,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-20 15:26 */ @PostMapping(value = "addOrUpdateVoiInfo") - @Log(title = "违章依据", menu = "值班任务->违章统计", businessType = BusinessType.INSERT, details = "新增/修改违章依据") + @SysLog(title = "违章依据", model = "值班任务->违章统计->违章依据", operaType = OperaType.INSERT, details = "新增违章依据",logType = 1) public AjaxResult addOrUpdateVoiInfo(VoiInfoEntity voiInfoEntity) { try { int result = service.voiInfoIsExist(voiInfoEntity); @@ -484,7 +486,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-20 15:47 */ @PostMapping("getVoiInfoById") - @Log(title = "违章依据", menu = "值班任务->违章统计", businessType = BusinessType.QUERY, details = "违章依据详情查看") + @SysLog(title = "违章依据", model = "值班任务->违章统计->违章依据", operaType = OperaType.QUERY, details = "查询违章依据详情",logType = 1) public AjaxResult getVoiInfoById(String params) { try { VoiInfoEntity entity = service.getVoiInfoById(params); @@ -503,7 +505,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-20 15:47 */ @PostMapping("delVoiInfoById") - @Log(title = "违章依据", menu = "值班任务->违章统计", businessType = BusinessType.DELETE, details = "删除违章依据") + @SysLog(title = "违章依据", model = "值班任务->违章统计->违章依据", operaType = OperaType.DELETE, details = "删除违章依据",logType = 1) public AjaxResult delVoiInfoById(String params) { try { service.delVoiInfoById(params); @@ -523,7 +525,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-21 9:29 */ @GetMapping("downLoadExcelModel") - @Log(title = "违章依据", menu = "值班任务->违章统计", businessType = BusinessType.QUERY, details = "违章依据导入模板下载", grade = OperationType.DOWNLOAD_BUSINESS) + @SysLog(title = "违章依据", model = "值班任务->违章统计->违章依据", operaType = OperaType.DOWNLOAD, details = "违章依据导入模板下载",logType = 1) public void downLoadExcelModel(HttpServletRequest request, HttpServletResponse response) { InputStream inputStream = null; ServletOutputStream servletOutputStream = null; @@ -565,7 +567,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-21 9:45 */ @PostMapping("/importExcel") - @Log(title = "违章依据", menu = "值班任务->违章统计", businessType = BusinessType.IMPORT, details = "导入违章依据", grade = OperationType.IMPORT_BUSINESS) + @SysLog(title = "违章依据", model = "值班任务->违章统计->违章依据", operaType = OperaType.IMPORT, details = "导入违章依据",logType = 1) public void importExcel(MultipartFile file, HttpServletRequest request, HttpServletResponse response) { try { CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(); @@ -741,7 +743,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-21 16:58 */ @GetMapping("exportData") - @Log(title = "违章统计", menu = "值班任务->违章统计", businessType = BusinessType.EXPORT, details = "违章统计导出", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "违章统计", model = "值班任务->违章统计", operaType = OperaType.EXPORT, details = "导出违章统计",logType = 1) public void exportData(HttpServletRequest request, HttpServletResponse response, NoticeVioEntity noticeVioEntity) { if (StringUtils.isBlank(noticeVioEntity.getCreateTime())) { Calendar cal = Calendar.getInstance(); @@ -831,7 +833,7 @@ public class SuperStatisticsController extends BaseController { */ @PostMapping(value = "uploadNoticeVioRect", headers = "content-type=multipart/form-data") @ResponseBody - @Log(title = "违章统计", menu = "值班任务->违章统计", businessType = BusinessType.INSERT, details = "违章整改") + @SysLog(title = "违章统计", model = "值班任务->违章统计", operaType = OperaType.UPDATE, details = "违章整改",logType = 1) public AjaxResult uploadNoticeVioRect(HttpServletRequest request, @RequestParam(value = "file[]") MultipartFile[] files) { CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(); MultipartHttpServletRequest multiReq = multipartResolver.resolveMultipart(request); @@ -917,7 +919,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-22 13:58 */ @PostMapping(value = "rectCheck") - @Log(title = "违章依据", menu = "值班任务->违章统计", businessType = BusinessType.UPDATE, details = "违章审核") + @SysLog(title = "违章统计", model = "值班任务->违章统计", operaType = OperaType.UPDATE, details = "违章审核",logType = 1) public AjaxResult rectCheck(NoticeVoiRectEntity entity) { try { service.rectCheck(entity); @@ -936,7 +938,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-30 10:33 */ @PostMapping("getNoticeSheet") - @Log(title = "违章统计", menu = "值班任务->违章统计", businessType = BusinessType.QUERY, details = "违章通知单查看") + @SysLog(title = "违章统计", model = "值班任务->违章统计", operaType = OperaType.QUERY, details = "查询违章通知单",logType = 1) public AjaxResult getNoticeSheet(NoticeVioEntity entity) { try { Map map = service.getNoticeSheet(entity); @@ -957,7 +959,7 @@ public class SuperStatisticsController extends BaseController { * @date 2022-12-30 14:06 */ @GetMapping("downLoadNoticeSheet") - @Log(title = "违章统计", menu = "值班任务->违章统计", businessType = BusinessType.EXPORT, details = "通知单导出") + @SysLog(title = "违章统计", model = "值班任务->违章统计", operaType = OperaType.DOWNLOAD, details = "下载违章通知单",logType = 1) public void downLoadNoticeSheet(HttpServletRequest request, HttpServletResponse response, NoticeVioEntity entity) { Map data = new HashMap<>(16); List> voiImgList = new ArrayList<>(); @@ -1099,7 +1101,7 @@ public class SuperStatisticsController extends BaseController { } @PostMapping(value = "getVoiRecordList") - @Log(title = "今日站班会", menu = "值班任务->今日站班会", businessType = BusinessType.QUERY, details = "违章记录列表") + @SysLog(title = "违章记录", model = "值班任务->违章统计->违章记录", operaType = OperaType.QUERY, details = "查询违章记录",logType = 1) public Map getVoiRecordList(NoticeVioEntity noticeVioEntity) { PageHelper.startPage(Integer.parseInt(noticeVioEntity.getPage()), Integer.parseInt(noticeVioEntity.getLimit())); Map map = new HashMap(16); @@ -1131,7 +1133,7 @@ public class SuperStatisticsController extends BaseController { * @date 2023-07-21 16:08 */ @PostMapping(value = "getProVoiRecordList") - @Log(title = "今日站班会", menu = "值班任务->今日站班会", businessType = BusinessType.QUERY, details = "累计违章记录列表") + @SysLog(title = "累计违章记录", model = "值班任务->违章统计->累计违章记录", operaType = OperaType.QUERY, details = "查询累计违章记录",logType = 1) public Map getProVoiRecordList(NoticeVioEntity noticeVioEntity) { if (StringUtils.isNotEmpty(noticeVioEntity.getCreateTime())) { String[] dateArr = noticeVioEntity.getCreateTime().split(" - "); @@ -1312,7 +1314,7 @@ public class SuperStatisticsController extends BaseController { @PostMapping(value = "getVoiCheckLists") - @Log(title = "违章审核记录列表", menu = "违章审核记录列表", businessType = BusinessType.QUERY, details = "违章审核记录列表") + @SysLog(title = "违章审核记录", model = "值班任务->违章统计->违章审核记录", operaType = OperaType.QUERY, details = "查询违章审核记录",logType = 1) public Map getVoiCheckLists(NoticeVioEntity vo) { PageHelper.startPage(Integer.parseInt(vo.getPage()), Integer.parseInt(vo.getLimit())); Map map = new HashMap(6); @@ -1483,6 +1485,7 @@ public class SuperStatisticsController extends BaseController { * @date 2024/12/3 11:09 */ @GetMapping(value = "exportExcel") + @SysLog(title = "违章统计", model = "值班任务->违章统计", operaType = OperaType.EXPORT, details = "导出违章统计",logType = 1) public void exportExcel(HttpServletRequest request, HttpServletResponse response, NoticeVioEntity dto) { try { AjaxResult ajaxResult = service.getVioStatistics(dto);