From 1ef08ad393ad4d86c79ea90f82278a51b3dd7ac9 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Tue, 15 Oct 2024 09:18:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E6=8F=92?= =?UTF-8?q?=E5=85=A5=E7=9A=84UserName=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/access/handler/MqttMessageHandler.java | 10 +++++----- .../access/listener/RedisKeyExpirationListener.java | 5 +++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java b/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java index a60626e..1b594a1 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java @@ -102,10 +102,10 @@ public class MqttMessageHandler { //日志记录 DeviceLogDTO logDto = new DeviceLogDTO(); try{ - logDto.setUserName(RequestUtil.getUsername()); + logDto.setUserName(RequestUtil.getUserNickname()); logDto.setLoginName(RequestUtil.getLoginName()); } catch (Exception e) { - logDto.setUserName("设备主题录入"); + logDto.setUserName(RequestUtil.getUserNickname()); logDto.setLoginName(null); } logDto.setOperate(nDid + "设备主题录入"); @@ -167,7 +167,7 @@ public class MqttMessageHandler { logDto.setUserName(RequestUtil.getUsername()); logDto.setLoginName(RequestUtil.getLoginName()); } catch (Exception e) { - logDto.setUserName("设备注册应答响应"); + logDto.setUserName(RequestUtil.getUserNickname()); logDto.setLoginName(null); } logDto.setOperate("收到设备"+nDid+"注册应答响应"); @@ -307,7 +307,7 @@ public class MqttMessageHandler { logDto.setUserName(RequestUtil.getUsername()); logDto.setLoginName(RequestUtil.getLoginName()); } catch (Exception e) { - logDto.setUserName("系统重启或定时任务创建"); + logDto.setUserName(RequestUtil.getUserNickname()); logDto.setLoginName(null); } logDto.setResult(1); @@ -518,7 +518,7 @@ public class MqttMessageHandler { break; case 48: log.info("询问装置项目列表"); - logDto.setUserName("询问装置项目列表"); + logDto.setUserName(RequestUtil.getUserNickname()); logDto.setOperate("监测点:" + (nDid + rspDataDto.getClDid()) + "询问项目列表"); List projectInfoList = JSON.parseArray(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.ProjectInfo.class); String key3 = AppRedisKey.PROJECT_INFO + nDid + rspDataDto.getClDid(); diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java b/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java index 3f454f7..3c4968f 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java @@ -20,6 +20,7 @@ import com.njcn.redis.utils.RedisUtil; import com.njcn.user.api.AppUserFeignClient; import com.njcn.user.api.UserFeignClient; import com.njcn.user.pojo.po.User; +import com.njcn.web.utils.RequestUtil; import com.njcn.zlevent.pojo.dto.NoticeUserDto; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -124,7 +125,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene private void executeMainTask(ScheduledExecutorService scheduler, String nDid, String version) { log.info("正在执行主任务..."); DeviceLogDTO logDto = new DeviceLogDTO(); - logDto.setUserName("装置失去心跳触发"); + logDto.setUserName(RequestUtil.getUserNickname()); //判断mqtt String clientName = "NJCN-" + nDid.substring(nDid.length() - 6); boolean mqttClient = mqttUtil.judgeClientOnline(clientName); @@ -251,7 +252,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene //日志记录 private void addLogs(NoticeUserDto noticeUserDto) { DeviceLogDTO dto = new DeviceLogDTO(); - dto.setUserName(noticeUserDto.getTitle()); + dto.setUserName(RequestUtil.getUserNickname()); dto.setOperate(noticeUserDto.getContent()); csLogsFeignClient.addUserLog(dto); }