Microservice/iot
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改日志插入的UserName字段

Browse Source
This commit is contained in:
hzj
2024-10-15 09:18:27 +08:00
parent 30fddbf252
commit 1ef08ad393
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java
View File

@@ -102,10 +102,10 @@ public class MqttMessageHandler {
//日志记录 //日志记录
DeviceLogDTO logDto = new DeviceLogDTO(); DeviceLogDTO logDto = new DeviceLogDTO();
try{ try{
logDto.setUserName(RequestUtil.getUsername()); logDto.setUserName(RequestUtil.getUserNickname());
logDto.setLoginName(RequestUtil.getLoginName()); logDto.setLoginName(RequestUtil.getLoginName());
} catch (Exception e) { } catch (Exception e) {
logDto.setUserName("设备主题录入"); logDto.setUserName(RequestUtil.getUserNickname());
logDto.setLoginName(null); logDto.setLoginName(null);
} }
logDto.setOperate(nDid + "设备主题录入"); logDto.setOperate(nDid + "设备主题录入");
@@ -167,7 +167,7 @@ public class MqttMessageHandler {
logDto.setUserName(RequestUtil.getUsername()); logDto.setUserName(RequestUtil.getUsername());
logDto.setLoginName(RequestUtil.getLoginName()); logDto.setLoginName(RequestUtil.getLoginName());
} catch (Exception e) { } catch (Exception e) {
logDto.setUserName("设备注册应答响应"); logDto.setUserName(RequestUtil.getUserNickname());
logDto.setLoginName(null); logDto.setLoginName(null);
} }
logDto.setOperate("收到设备"+nDid+"注册应答响应"); logDto.setOperate("收到设备"+nDid+"注册应答响应");
@@ -307,7 +307,7 @@ public class MqttMessageHandler {
logDto.setUserName(RequestUtil.getUsername()); logDto.setUserName(RequestUtil.getUsername());
logDto.setLoginName(RequestUtil.getLoginName()); logDto.setLoginName(RequestUtil.getLoginName());
} catch (Exception e) { } catch (Exception e) {
logDto.setUserName("系统重启或定时任务创建"); logDto.setUserName(RequestUtil.getUserNickname());
logDto.setLoginName(null); logDto.setLoginName(null);
} }
logDto.setResult(1); logDto.setResult(1);
@@ -518,7 +518,7 @@ public class MqttMessageHandler {
break; break;
case 48: case 48:
log.info("询问装置项目列表"); log.info("询问装置项目列表");
logDto.setUserName("询问装置项目列表"); logDto.setUserName(RequestUtil.getUserNickname());
logDto.setOperate("监测点:" + (nDid + rspDataDto.getClDid()) + "询问项目列表"); logDto.setOperate("监测点:" + (nDid + rspDataDto.getClDid()) + "询问项目列表");
List<RspDataDto.ProjectInfo> projectInfoList = JSON.parseArray(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.ProjectInfo.class); List<RspDataDto.ProjectInfo> projectInfoList = JSON.parseArray(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.ProjectInfo.class);
String key3 = AppRedisKey.PROJECT_INFO + nDid + rspDataDto.getClDid(); String key3 = AppRedisKey.PROJECT_INFO + nDid + rspDataDto.getClDid();

5
iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java
View File

@@ -20,6 +20,7 @@ import com.njcn.redis.utils.RedisUtil;
import com.njcn.user.api.AppUserFeignClient; import com.njcn.user.api.AppUserFeignClient;
import com.njcn.user.api.UserFeignClient; import com.njcn.user.api.UserFeignClient;
import com.njcn.user.pojo.po.User; import com.njcn.user.pojo.po.User;
import com.njcn.web.utils.RequestUtil;
import com.njcn.zlevent.pojo.dto.NoticeUserDto; import com.njcn.zlevent.pojo.dto.NoticeUserDto;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@@ -124,7 +125,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
private void executeMainTask(ScheduledExecutorService scheduler, String nDid, String version) { private void executeMainTask(ScheduledExecutorService scheduler, String nDid, String version) {
log.info("正在执行主任务..."); log.info("正在执行主任务...");
DeviceLogDTO logDto = new DeviceLogDTO(); DeviceLogDTO logDto = new DeviceLogDTO();
logDto.setUserName("装置失去心跳触发"); logDto.setUserName(RequestUtil.getUserNickname());
//判断mqtt //判断mqtt
String clientName = "NJCN-" + nDid.substring(nDid.length() - 6); String clientName = "NJCN-" + nDid.substring(nDid.length() - 6);
boolean mqttClient = mqttUtil.judgeClientOnline(clientName); boolean mqttClient = mqttUtil.judgeClientOnline(clientName);
@@ -251,7 +252,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
//日志记录 //日志记录
private void addLogs(NoticeUserDto noticeUserDto) { private void addLogs(NoticeUserDto noticeUserDto) {
DeviceLogDTO dto = new DeviceLogDTO(); DeviceLogDTO dto = new DeviceLogDTO();
dto.setUserName(noticeUserDto.getTitle()); dto.setUserName(RequestUtil.getUserNickname());
dto.setOperate(noticeUserDto.getContent()); dto.setOperate(noticeUserDto.getContent());
csLogsFeignClient.addUserLog(dto); csLogsFeignClient.addUserLog(dto);
} }