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..de9f0bc 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 = "查询设备状态监测数据",logType = 1) 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 = "查询服务器状态监测数据",logType = 1) public Map getServerMonitorList(ServerMonitorEntity entity) { try { List list = new ServerMonitorService().initSystemInfo(); @@ -105,6 +107,7 @@ public class ResourceMonitorController { * @date 2023-05-31 16:34 */ @PostMapping(value = "addResourceData") + @SysLog(title = "设备状态监测", model = "消息通知->资源检测通知->设备状态监测", operaType = OperaType.INSERT, details = "新增设备状态监测",logType = 1) public AjaxResult addResourceData(ResourceMonitorEntity entity) { try { if (StringUtils.isBlank(entity.getCreateDate())) { @@ -127,7 +130,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 = "查询告警记录数据",logType = 1) public Map getAlarmRecordList(ResourceMonitorEntity entity) { if (StringUtils.isBlank(entity.getCreateDate())) { entity.setCreateDate(DateTimeHelper.getNowDate()); @@ -164,7 +167,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 = "导出告警记录数据",logType = 1) public void exportData(HttpServletRequest request, HttpServletResponse response, ResourceMonitorEntity entity) { if (StringUtils.isBlank(entity.getCreateDate())) { entity.setCreateDate(DateTimeHelper.getNowDate());