From b62eacdbd69b370f0be5da8e3bc2c34872c828ae Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Thu, 17 Oct 2024 15:18:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83-=E6=8E=A5=E5=8F=A3=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E5=A4=B1=E8=B4=A5=E7=9A=84=EF=BC=8C=E5=AE=A1=E8=AE=A1?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=A5=E9=87=8D=E5=BA=A6=E5=9D=87=E4=B8=BA?= =?UTF-8?q?=E4=B8=A5=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/web/service/impl/LogServiceImpl.java | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/service/impl/LogServiceImpl.java b/pqs-common/common-web/src/main/java/com/njcn/web/service/impl/LogServiceImpl.java index 8ef2944aa..7db21aaaf 100644 --- a/pqs-common/common-web/src/main/java/com/njcn/web/service/impl/LogServiceImpl.java +++ b/pqs-common/common-web/src/main/java/com/njcn/web/service/impl/LogServiceImpl.java @@ -80,8 +80,8 @@ public class LogServiceImpl implements ILogService { String type = ReflectCommonUtil.getOperateInfoByMethod(returnType.getMethod()).getOperateType(); String level = ReflectCommonUtil.getOperateInfoByMethod(returnType.getMethod()).getOperateLevel(); String operateType = ReflectCommonUtil.getOperateTypeByMethod(returnType.getMethod()); - Integer severity = levelStringToNumber(level); - LogInfoDTO logInfoDTO = new LogInfoDTO(loginName, userName, ip, methodDescribe, operateType, result.equalsIgnoreCase("失败") ? 0 : 1, "", severity, type.equalsIgnoreCase("业务事件") ? 0 : 1, generalInfo.getMicroServiceName(), userIndex, LocalDateTime.now()); + Integer severity = levelStringToNumber(level,result); + LogInfoDTO logInfoDTO = new LogInfoDTO(loginName, userName, ip, methodDescribe, operateType, result.equalsIgnoreCase(CommonResponseEnum.FAIL.getMessage()) ? 0 : 1, "", severity, type.equalsIgnoreCase("业务事件") ? 0 : 1, generalInfo.getMicroServiceName(), userIndex, LocalDateTime.now()); publisher.send("/userLog", PubUtils.obj2json(logInfoDTO), 2, false); //推送审计消息功能 if(severity!=0){ @@ -96,7 +96,7 @@ public class LogServiceImpl implements ILogService { //如果存在设备日志注解，则记录设备日志 if(Objects.nonNull((returnType.getMethod()))&& (returnType.getMethod()).isAnnotationPresent(DeviceLog.class)){ String deviceOperate = returnType.getMethod().getAnnotation(DeviceLog.class).operateType(); - DeviceLogDTO deviceLogDTO = new DeviceLogDTO(userName,deviceOperate,result.equalsIgnoreCase("失败") ? 0 : 1,"",loginName,userIndex); + DeviceLogDTO deviceLogDTO = new DeviceLogDTO(userName,deviceOperate,result.equalsIgnoreCase(CommonResponseEnum.FAIL.getMessage()) ? 0 : 1,"",loginName,userIndex); publisher.send("/deviceLog", PubUtils.obj2json(deviceLogDTO), 2, false); } @@ -133,8 +133,8 @@ public class LogServiceImpl implements ILogService { String type = ReflectCommonUtil.getOperateInfoByMethod(method).getOperateType(); String level = ReflectCommonUtil.getOperateInfoByMethod(method).getOperateLevel(); String operateType = ReflectCommonUtil.getOperateTypeByMethod(method); - Integer severity = levelStringToNumber(level); - LogInfoDTO logInfoDTO = new LogInfoDTO(tempLogInfo.getLoginName(), tempLogInfo.getUserName(), tempLogInfo.getIp(), ReflectCommonUtil.getMethodDescribeByMethod(method), operateType, result.equalsIgnoreCase("失败") ? 0 : 1, message, severity, type.equalsIgnoreCase("业务事件") ? 0 : 1, generalInfo.getMicroServiceName(), userIndex, LocalDateTime.now()); + Integer severity = levelStringToNumber(level,result); + LogInfoDTO logInfoDTO = new LogInfoDTO(tempLogInfo.getLoginName(), tempLogInfo.getUserName(), tempLogInfo.getIp(), ReflectCommonUtil.getMethodDescribeByMethod(method), operateType, result.equalsIgnoreCase(CommonResponseEnum.FAIL.getMessage()) ? 0 : 1, message, severity, type.equalsIgnoreCase("业务事件") ? 0 : 1, generalInfo.getMicroServiceName(), userIndex, LocalDateTime.now()); publisher.send("/userLog", PubUtils.obj2json(logInfoDTO), 1, false); auditPush(severity, logInfoDTO); } @@ -160,9 +160,9 @@ public class LogServiceImpl implements ILogService { String ip = RequestUtil.getRealIp(request); String type = ReflectCommonUtil.getOperateInfoByMethod(method).getOperateType(); String level = ReflectCommonUtil.getOperateInfoByMethod(method).getOperateLevel(); - Integer severity = levelStringToNumber(level); + Integer severity = levelStringToNumber(level,result); String operateType = ReflectCommonUtil.getOperateTypeByMethod(method); - LogInfoDTO logInfoDTO = new LogInfoDTO(loginName, "", ip, ReflectCommonUtil.getMethodDescribeByMethod(method), operateType, result.equalsIgnoreCase("失败") ? 0 : 1, message, severity, type.equalsIgnoreCase("业务事件") ? 0 : 1, generalInfo.getMicroServiceName(), loginName, LocalDateTime.now()); + LogInfoDTO logInfoDTO = new LogInfoDTO(loginName, "", ip, ReflectCommonUtil.getMethodDescribeByMethod(method), operateType, result.equalsIgnoreCase(CommonResponseEnum.FAIL.getMessage()) ? 0 : 1, message, severity, type.equalsIgnoreCase("业务事件") ? 0 : 1, generalInfo.getMicroServiceName(), loginName, LocalDateTime.now()); publisher.send("/userLog", PubUtils.obj2json(logInfoDTO), 1, false); auditPush(severity, logInfoDTO); } @@ -183,15 +183,23 @@ public class LogServiceImpl implements ILogService { /** * 严重度 文字 转 数字 */ - private Integer levelStringToNumber(String level) { + private Integer levelStringToNumber(String level,String result) { + int levelNumber; switch (level) { case "中等": - return 1; + levelNumber = 1; + break; case "严重": - return 2; + levelNumber = 2; + break; default: - return 0; + levelNumber = 0; + break; } + if(result.equalsIgnoreCase(CommonResponseEnum.FAIL.getMessage())){ + levelNumber = 2; + } + return levelNumber; }