From 03169f4bff24d1812bc169ab54a21ff31ae9c3f5 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Mon, 16 Dec 2024 14:44:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E8=AE=A1=E6=97=A5=E5=BF=97=20?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/controller/TokenController.java | 2 +- .../auth/service/SysRecordLogService.java | 2 +- .../interceptor/ParamSecureHandler.java | 2 +- .../system/controller/SysLogsController.java | 45 ++----------------- .../system/mapper/SysLogsDao.java | 8 +++- .../system/service/SysLogsService.java | 7 ++- .../service/impl/SysLogsServiceImpl.java | 41 ++++++++++++++--- .../resources/mapper/system/SysLogsMapper.xml | 25 ++++++++--- 8 files changed, 74 insertions(+), 58 deletions(-) diff --git a/securityControl-auth/src/main/java/com/securityControl/auth/controller/TokenController.java b/securityControl-auth/src/main/java/com/securityControl/auth/controller/TokenController.java index 41313d1..3994fb2 100644 --- a/securityControl-auth/src/main/java/com/securityControl/auth/controller/TokenController.java +++ b/securityControl-auth/src/main/java/com/securityControl/auth/controller/TokenController.java @@ -242,7 +242,7 @@ public class TokenController { redisUtil.delete("userId:" + userId); redisUtil.delete("ISCUserId:" + iscUser); redisUtil.delete("userName:" + userName); - sysRecordLogService.exitLos("userName",startTime); + sysRecordLogService.exitLos(userName,startTime); }catch (Exception e){ sysRecordLogService.exitLos("-",startTime); } diff --git a/securityControl-auth/src/main/java/com/securityControl/auth/service/SysRecordLogService.java b/securityControl-auth/src/main/java/com/securityControl/auth/service/SysRecordLogService.java index d0d593e..33b646a 100644 --- a/securityControl-auth/src/main/java/com/securityControl/auth/service/SysRecordLogService.java +++ b/securityControl-auth/src/main/java/com/securityControl/auth/service/SysRecordLogService.java @@ -79,7 +79,7 @@ public class SysRecordLogService { sysLogsInfo.setOperIp(IpUtils.getIpAddr(ServletUtils.getRequest())); sysLogsInfo.setOperResult("1"); sysLogsInfo.setEventType("正常事件"); - + sysLogsInfo.setUserName(username); sysLogsInfo.setOperParam("{username:"+username+"}"); sysLogsInfo.setOperMeth("/auth/logout"); sysLogsInfo.setLogType(0); diff --git a/securityControl-common/securityControl-common-security/src/main/java/com/securityControl/common/security/interceptor/ParamSecureHandler.java b/securityControl-common/securityControl-common-security/src/main/java/com/securityControl/common/security/interceptor/ParamSecureHandler.java index e89ace3..ed0c3fc 100644 --- a/securityControl-common/securityControl-common-security/src/main/java/com/securityControl/common/security/interceptor/ParamSecureHandler.java +++ b/securityControl-common/securityControl-common-security/src/main/java/com/securityControl/common/security/interceptor/ParamSecureHandler.java @@ -69,7 +69,7 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor { /** * 越权白名单路径->指定的路径 */ - public static String[] WHITE_URLS= new String[]{"/sys/logs/addLogs"}; + public static String[] WHITE_URLS= new String[]{"/sys/logs/addLogs","/sys/logs/logWarn"}; @Resource private RemoteLogService remoteLogService; diff --git a/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/controller/SysLogsController.java b/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/controller/SysLogsController.java index c63327c..e034dde 100644 --- a/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/controller/SysLogsController.java +++ b/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/controller/SysLogsController.java @@ -65,8 +65,6 @@ public class SysLogsController extends BaseController { return logService.saveLogs(sysLog); } - - /** * 分页查询（系统日志、业务日志） * @@ -180,38 +178,6 @@ public class SysLogsController extends BaseController { return map; } - /** - * 分页查询运行日志 - * - * @param sysLogQo - * @return - */ - @ApiOperation(value = "分页查询运行日志") - @PostMapping("getRunningLog") - @SysLog(title = "日志管理", model = "日志管理->运行日志", operaType = OperaType.QUERY, details = "查询系统运行日志",logType = 0) - public Map getRunningLog(SysLogQo sysLogQo) { - PageHelper.startPage(Integer.parseInt(sysLogQo.getPage()), Integer.parseInt(sysLogQo.getLimit())); - Map map = new HashMap(16); - try { - List list = logService.getRunningLog(sysLogQo); - PageInfo pageInfo = new PageInfo<>(list); - map.put("code", 200); - map.put("msg", "获取数据成功"); - map.put("count", pageInfo.getTotal()); - map.put("curr", Integer.parseInt(sysLogQo.getPage())); - map.put("limit", Integer.parseInt(sysLogQo.getLimit())); - map.put("data", pageInfo.getList()); - } catch (Exception e) { - map.put("code", 1); - map.put("msg", "获取数据失败"); - map.put("count", 0); - map.put("curr", Integer.parseInt(sysLogQo.getPage())); - map.put("limit", Integer.parseInt(sysLogQo.getLimit())); - map.put("data", null); - e.printStackTrace(); - } - return map; - } /** @@ -312,13 +278,10 @@ public class SysLogsController extends BaseController { } - /** - * 查询今日越权 - */ - @GetMapping("/getYueQuan") - public AjaxResult getYueQuan(String logType) { - return AjaxResult.success(logService.getYueQuan()); + @ApiOperation(value = "查询日志告警") + @PostMapping("logWarn") + public AjaxResult logWarn() { + return logService.logWarn(); } - } diff --git a/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/mapper/SysLogsDao.java b/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/mapper/SysLogsDao.java index de5779b..008dfc5 100644 --- a/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/mapper/SysLogsDao.java +++ b/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/mapper/SysLogsDao.java @@ -88,7 +88,7 @@ public interface SysLogsDao { void saveRestoreLog(SysOperLog sysLog); - Map getYueQuan(); + void addSaveSysLog(SysLogsInfo sysLog); @@ -100,4 +100,10 @@ public interface SysLogsDao { * @return */ List getLogsLists(@Param("logType") String logType); + + int getErrorLogs(); + + String getLogsRl(); + + String getLogsSet(); } diff --git a/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/service/SysLogsService.java b/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/service/SysLogsService.java index d2ac66a..ba6f64c 100644 --- a/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/service/SysLogsService.java +++ b/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/service/SysLogsService.java @@ -57,7 +57,6 @@ public interface SysLogsService { */ void restoreLog(String logType); - Map getYueQuan(); /** * 新增数据 @@ -72,4 +71,10 @@ public interface SysLogsService { * @return */ void addLogs(SysLogsInfo sysLog); + + /** + * 日志告警查询 + * @return + */ + AjaxResult logWarn(); } diff --git a/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/service/impl/SysLogsServiceImpl.java b/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/service/impl/SysLogsServiceImpl.java index f2e4b49..e1d080c 100644 --- a/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/service/impl/SysLogsServiceImpl.java +++ b/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/service/impl/SysLogsServiceImpl.java @@ -1,5 +1,6 @@ package com.securityControl.system.service.impl; +import com.google.common.collect.Maps; import com.securityControl.common.core.utils.DateUtils; import com.securityControl.common.core.utils.ServletUtils; import com.securityControl.common.core.utils.aes.DateTimeHelper; @@ -95,6 +96,41 @@ public class SysLogsServiceImpl implements SysLogsService { } } + /** + * 审计日志告警弹框 + * @return + */ + @Override + public AjaxResult logWarn() { + Map map= Maps.newHashMap(); + try { + double bfb=0.9; + //查询当日的告警 + int num =dao.getErrorLogs(); + if(num>0){ + map.put("logWarn","1"); + map.put("err","您有新的异常告警:"+num +",请及时处理!"); + }else{ + map.put("logWarn","0"); + } + String rl=dao.getLogsRl(); + String city=dao.getLogsSet(); + double d=Double.parseDouble(rl); + double max=Double.parseDouble(city)*bfb; + if(d>=max){ + map.put("warnType","1"); + map.put("warnError","日志容量告警,当日日志内存为"+d+"MB,日志内存超过总内存的90%,请及时处理!"); + }else { + map.put("warnType","0"); + } + }catch (Exception e){ + map.put("logWarn","0"); + map.put("warnType","0"); + log.error(e.toString(),e); + } + return AjaxResult.success(map); + } + public void setModelTitle(SysLogsInfo sysLog){ try{ @@ -190,7 +226,6 @@ public class SysLogsServiceImpl implements SysLogsService { double rate = b2.divide(b1, RoundingMode.HALF_UP).doubleValue(); if (rate >= 0.90) { - log.warn("内存报警发送邮件！！！"); addWaringLog("基建视频安全管控系统日志容量已超过" + rate * 100 + "%"); } resultMap.put("maxLogSize", maxLogSize); @@ -240,10 +275,6 @@ public class SysLogsServiceImpl implements SysLogsService { dao.updateLastCopyTime(logType, DateUtils.getTime()); } - @Override - public Map getYueQuan() { - return dao.getYueQuan(); - } diff --git a/securityControl-modules/securityControl-system/src/main/resources/mapper/system/SysLogsMapper.xml b/securityControl-modules/securityControl-system/src/main/resources/mapper/system/SysLogsMapper.xml index f6b26ed..1e1372d 100644 --- a/securityControl-modules/securityControl-system/src/main/resources/mapper/system/SysLogsMapper.xml +++ b/securityControl-modules/securityControl-system/src/main/resources/mapper/system/SysLogsMapper.xml @@ -270,13 +270,7 @@ AND create_time < #{updateDate} - + + + + \ No newline at end of file