From b1befdc223c1e8d6a58ac47244aabc5850796eeb Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Thu, 19 Dec 2024 11:28:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dutyTask/controller/AdmittedPersonController.java | 4 +++- .../dutyTask/controller/DailyDutyReportController.java | 6 ++++-- .../dutyTask/controller/ResourceMonitorController.java | 10 ++++++---- .../proteam/dutyTask/controller/TicketController.java | 3 +++ .../supplement/controller/DailyReportController.java | 4 +++- 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/AdmittedPersonController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/AdmittedPersonController.java index 7df6f84..58538b3 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/AdmittedPersonController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/AdmittedPersonController.java @@ -5,7 +5,9 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; 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.sercurityControl.proteam.dutyTask.domain.AdmittedPersonEntity; import com.sercurityControl.proteam.dutyTask.service.AdmittedPersonService; import com.sercurityControl.proteam.util.ImgToBase64Util; @@ -43,7 +45,7 @@ public class AdmittedPersonController { * @date 2023-05-18 14:50 */ @PostMapping(value = "getAdmittedPersonList") - @Log(title = "准入人员", menu = "准入人员->准入人员列表", businessType = BusinessType.QUERY, details = "准入人员列表") + @SysLog(title = "准入人员", model = "准入人员->准入人员列表", operaType = OperaType.QUERY, details = "查询准入人员列表") public Map getAdmittedPersonList(AdmittedPersonEntity entity) { PageHelper.startPage(Integer.parseInt(entity.getPage()), Integer.parseInt(entity.getLimit())); Map map = new HashMap(16); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/DailyDutyReportController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/DailyDutyReportController.java index 14dd947..b3a3db5 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/DailyDutyReportController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/DailyDutyReportController.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.service.DailyDutyReportService; import com.sercurityControl.proteam.util.FileToBase64; @@ -58,7 +60,7 @@ public class DailyDutyReportController { * @date 2022-12-23 9:56 */ @PostMapping("getDailyData") - @Log(title = "值班日报", menu = "值班任务->值班日报", businessType = BusinessType.QUERY, details = "值班日报列表") + @SysLog(title = "值班日报", model = "值班任务->值班日报", operaType = OperaType.QUERY, details = "值班日报列表") public AjaxResult getDailyData(String currentDay) { Map map = new HashMap<>(16); try { @@ -90,7 +92,7 @@ public class DailyDutyReportController { } @GetMapping("downloadDaily") - @Log(title = "值班日报", menu = "值班任务->值班日报", businessType = BusinessType.EXPORT, details = "值班日报导出", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "值班日报", model = "值班任务->值班日报", operaType = OperaType.EXPORT, details = "值班日报导出") public void downloadDaily(HttpServletRequest request, HttpServletResponse response, String currentDay, String chineseDate) { Map map = new HashMap<>(16); Map data = new HashMap<>(16); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/ResourceMonitorController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/ResourceMonitorController.java index 03368ab..dac00a2 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/ResourceMonitorController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/ResourceMonitorController.java @@ -9,7 +9,9 @@ import com.securityControl.common.core.utils.StringUtils; import com.securityControl.common.core.utils.aes.DateTimeHelper; 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.ResourceMonitorService; @@ -52,7 +54,7 @@ public class ResourceMonitorController { * @date 2023-05-30 17:36 */ @PostMapping(value = "getDeviceStatusMonitorList") - @Log(title = "设备状态监测", menu = "资源监测通知->设备状态监测", businessType = BusinessType.QUERY, details = "设备状态监测") + @SysLog(title = "设备状态监测", model = "资源监测通知->设备状态监测", operaType = OperaType.QUERY, details = "设备状态监测") public Map getDeviceStatusMonitorList(ResourceMonitorEntity entity) { PageHelper.startPage(Integer.parseInt(entity.getPage()), Integer.parseInt(entity.getLimit())); Map map = new HashMap(16); @@ -85,7 +87,7 @@ public class ResourceMonitorController { * @date 2023-05-31 15:19 */ @PostMapping(value = "getServerMonitorList") - @Log(title = "服务器状态监测", menu = "资源监测通知->服务器状态监测", businessType = BusinessType.QUERY, details = "服务器状态监测") + @SysLog(title = "服务器状态监测", model = "资源监测通知->设备状态监测", operaType = OperaType.QUERY, details = "服务器状态监测") public Map getServerMonitorList(ServerMonitorEntity entity) { try { List list = new ServerMonitorService().initSystemInfo(); @@ -127,7 +129,7 @@ public class ResourceMonitorController { * @date 2023-06-02 9:56 */ @PostMapping(value = "getAlarmRecordList") - @Log(title = "告警记录", menu = "告警记录->告警记录列表", businessType = BusinessType.QUERY, details = "告警记录列表") + @SysLog(title = "告警记录", model = "告警记录->告警记录列表", operaType = OperaType.QUERY, details = "告警记录列表") public Map getAlarmRecordList(ResourceMonitorEntity entity) { if (StringUtils.isBlank(entity.getCreateDate())) { entity.setCreateDate(DateTimeHelper.getNowDate()); @@ -164,7 +166,7 @@ public class ResourceMonitorController { * @date 2023-06-05 16:14 */ @GetMapping(value = "exportData") - @Log(title = "告警记录列表导出", menu = "告警记录->告警记录列表", businessType = BusinessType.EXPORT, details = "告警记录列表导出", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "告警记录", model = "告警记录->告警记录列表", operaType = OperaType.EXPORT, details = "告警记录列表导出") public void exportData(HttpServletRequest request, HttpServletResponse response, ResourceMonitorEntity entity) { if (StringUtils.isBlank(entity.getCreateDate())) { entity.setCreateDate(DateTimeHelper.getNowDate()); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/TicketController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/TicketController.java index 17787b6..ab431c4 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/TicketController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/TicketController.java @@ -1,6 +1,8 @@ package com.sercurityControl.proteam.dutyTask.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.dutyTask.domain.TicketInfoVo; import com.sercurityControl.proteam.dutyTask.service.TicketService; import lombok.extern.slf4j.Slf4j; @@ -34,6 +36,7 @@ public class TicketController { * @date 2024/12/2 14:07 */ @PostMapping("getTicketInfo") + @SysLog(title = "作业票管理", model = "告警记录->作业票管理", operaType = OperaType.EXPORT, details = "作业票管理记录查询") public AjaxResult getTicketInfo(TicketInfoVo vo){ return service.getTicketInfo(vo); } diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/DailyReportController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/DailyReportController.java index 23ad9a7..d8aefc4 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/DailyReportController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/DailyReportController.java @@ -3,7 +3,9 @@ package com.sercurityControl.proteam.supplement.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 DailyReportController { private DayPaperService dayPaperService; @GetMapping("downloadDaily") - @Log(title = "值班日报", menu = "值班任务->值班日报", businessType = BusinessType.EXPORT, details = "值班日报导出", grade = OperationType.EXPORT_BUSINESS) + @SysLog(title = "值班任务", model = "值班任务->值班日报", operaType = OperaType.EXPORT, details = "值班日报导出") public void downloadDaily(HttpServletRequest request, HttpServletResponse response, String currentDay, String chineseDate) { download(request, response, currentDay, chineseDate); }