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

日志记录调整

Browse Source
This commit is contained in:
xuyang
2023-08-28 17:38:09 +08:00
parent 7384af08db
commit 5ac70b96ac
4 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,7 +86,6 @@ public class MqttMessageHandler {
public void devTopic(String topic, MqttMessage message, @NamedValue("edgeId") String nDid, @Payload String payload){ public void devTopic(String topic, MqttMessage message, @NamedValue("edgeId") String nDid, @Payload String payload){
//日志记录 //日志记录
DeviceLogDTO logDto = new DeviceLogDTO(); DeviceLogDTO logDto = new DeviceLogDTO();
logDto.setUserIndex(RequestUtil.getUserIndex());
logDto.setUserName(RequestUtil.getUsername()); logDto.setUserName(RequestUtil.getUsername());
logDto.setLoginName(RequestUtil.getLoginName()); logDto.setLoginName(RequestUtil.getLoginName());
logDto.setOperate(nDid + "设备主题录入"); logDto.setOperate(nDid + "设备主题录入");
@@ -144,7 +143,6 @@ public class MqttMessageHandler {
log.info("收到注册应答响应--->" + nDid); log.info("收到注册应答响应--->" + nDid);
//日志记录 //日志记录
DeviceLogDTO logDto = new DeviceLogDTO(); DeviceLogDTO logDto = new DeviceLogDTO();
logDto.setUserIndex(RequestUtil.getUserIndex());
logDto.setUserName(RequestUtil.getUsername()); logDto.setUserName(RequestUtil.getUsername());
logDto.setLoginName(RequestUtil.getLoginName()); logDto.setLoginName(RequestUtil.getLoginName());
logDto.setOperate("收到设备"+nDid+"注册应答响应"); logDto.setOperate("收到设备"+nDid+"注册应答响应");
@@ -191,11 +189,14 @@ public class MqttMessageHandler {
@MqttSubscribe(value = "/Pfm/DevRsp/{version}/{edgeId}",qos = 1) @MqttSubscribe(value = "/Pfm/DevRsp/{version}/{edgeId}",qos = 1)
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void devModelOperation(String topic, MqttMessage message, @NamedValue("version") String version, @NamedValue("edgeId") String nDid, @Payload String payload){ public void devModelOperation(String topic, MqttMessage message, @NamedValue("version") String version, @NamedValue("edgeId") String nDid, @Payload String payload){
//日志记录
DeviceLogDTO logDto = new DeviceLogDTO(); DeviceLogDTO logDto = new DeviceLogDTO();
logDto.setUserIndex(RequestUtil.getUserIndex()); try{
logDto.setUserName(RequestUtil.getUsername()); logDto.setUserName(RequestUtil.getUsername());
logDto.setLoginName(RequestUtil.getLoginName()); logDto.setLoginName(RequestUtil.getLoginName());
} catch (Exception e) {
logDto.setUserName("系统重启或定时任务创建");
logDto.setLoginName(null);
}
logDto.setOperate(nDid + "设备类型模板应答"); logDto.setOperate(nDid + "设备类型模板应答");
logDto.setResult(1); logDto.setResult(1);
//业务处理 //业务处理
@@ -266,13 +267,16 @@ public class MqttMessageHandler {
* @param payload * @param payload
*/ */
@MqttSubscribe(value = "/Pfm/DevRsp/{version}/{edgeId}",qos = 1) @MqttSubscribe(value = "/Pfm/DevRsp/{version}/{edgeId}",qos = 1)
@Transactional(rollbackFor = Exception.class)
public void devAccessOperation(String topic, MqttMessage message, @NamedValue("version") String version, @NamedValue("edgeId") String nDid, @Payload String payload){ public void devAccessOperation(String topic, MqttMessage message, @NamedValue("version") String version, @NamedValue("edgeId") String nDid, @Payload String payload){
//日志实体 //日志实体
DeviceLogDTO logDto = new DeviceLogDTO(); DeviceLogDTO logDto = new DeviceLogDTO();
logDto.setUserIndex(RequestUtil.getUserIndex()); try{
logDto.setUserName(RequestUtil.getUsername()); logDto.setUserName(RequestUtil.getUsername());
logDto.setLoginName(RequestUtil.getLoginName()); logDto.setLoginName(RequestUtil.getLoginName());
} catch (Exception e) {
logDto.setUserName("系统重启或定时任务创建");
logDto.setLoginName(null);
}
logDto.setResult(1); logDto.setResult(1);
//业务处理 //业务处理
Gson gson = new Gson(); Gson gson = new Gson();

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

@@ -8,8 +8,6 @@ import com.njcn.common.pojo.dto.DeviceLogDTO;
import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.csdevice.api.CsLogsFeignClient; import com.njcn.csdevice.api.CsLogsFeignClient;
import com.njcn.csdevice.enums.DeviceOperate;
import com.njcn.web.advice.DeviceLog;
import com.njcn.web.utils.RequestUtil; import com.njcn.web.utils.RequestUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@@ -60,9 +58,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
} }
//日志实体 //日志实体
DeviceLogDTO logDto = new DeviceLogDTO(); DeviceLogDTO logDto = new DeviceLogDTO();
logDto.setUserIndex(RequestUtil.getUserIndex()); logDto.setUserName(RequestUtil.getUserNickname());
logDto.setUserName(RequestUtil.getUsername()); logDto.setLoginName(RequestUtil.getUsername());
logDto.setLoginName(RequestUtil.getLoginName());
logDto.setResult(1); logDto.setResult(1);
//判断失效的key是否为MQTT消费端存入的 //判断失效的key是否为MQTT消费端存入的
String expiredKey = message.toString(); String expiredKey = message.toString();

15
iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java
View File

@@ -79,9 +79,8 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
public void addModel(MultipartFile file) { public void addModel(MultipartFile file) {
//日志实体 //日志实体
DeviceLogDTO logDto = new DeviceLogDTO(); DeviceLogDTO logDto = new DeviceLogDTO();
logDto.setUserIndex(RequestUtil.getUserIndex()); logDto.setUserName(RequestUtil.getUserNickname());
logDto.setUserName(RequestUtil.getUsername()); logDto.setLoginName(RequestUtil.getUsername());
logDto.setLoginName(RequestUtil.getLoginName());
logDto.setResult(1); logDto.setResult(1);
String json = null; String json = null;
try { try {
@@ -111,9 +110,8 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
public void addDict(MultipartFile file) { public void addDict(MultipartFile file) {
//日志实体 //日志实体
DeviceLogDTO logDto = new DeviceLogDTO(); DeviceLogDTO logDto = new DeviceLogDTO();
logDto.setUserIndex(RequestUtil.getUserIndex()); logDto.setUserName(RequestUtil.getUserNickname());
logDto.setUserName(RequestUtil.getUsername()); logDto.setLoginName(RequestUtil.getUsername());
logDto.setLoginName(RequestUtil.getLoginName());
logDto.setResult(1); logDto.setResult(1);
String json = null; String json = null;
try { try {
@@ -137,9 +135,8 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
private CsDevModelPO addCsDevModel(TemplateDto templateDto, String filePath){ private CsDevModelPO addCsDevModel(TemplateDto templateDto, String filePath){
//日志实体 //日志实体
DeviceLogDTO logDto = new DeviceLogDTO(); DeviceLogDTO logDto = new DeviceLogDTO();
logDto.setUserIndex(RequestUtil.getUserIndex()); logDto.setUserName(RequestUtil.getUserNickname());
logDto.setUserName(RequestUtil.getUsername()); logDto.setLoginName(RequestUtil.getUsername());
logDto.setLoginName(RequestUtil.getLoginName());
logDto.setOperate("新增"+templateDto.getDevType()+"模板数据"); logDto.setOperate("新增"+templateDto.getDevType()+"模板数据");
logDto.setResult(1); logDto.setResult(1);
CsDevModelPO po = devModelFeignClient.findModel(templateDto.getDevType(),templateDto.getVersion(),templateDto.getTime()).getData(); CsDevModelPO po = devModelFeignClient.findModel(templateDto.getDevType(),templateDto.getVersion(),templateDto.getTime()).getData();

15
iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java
View File

@@ -98,9 +98,8 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
public void devRegister(String nDid) { public void devRegister(String nDid) {
//日志实体 //日志实体
DeviceLogDTO logDto = new DeviceLogDTO(); DeviceLogDTO logDto = new DeviceLogDTO();
logDto.setUserIndex(RequestUtil.getUserIndex()); logDto.setUserName(RequestUtil.getUserNickname());
logDto.setUserName(RequestUtil.getUsername()); logDto.setLoginName(RequestUtil.getUsername());
logDto.setLoginName(RequestUtil.getLoginName());
logDto.setOperate("当前设备"+nDid+"状态判断"); logDto.setOperate("当前设备"+nDid+"状态判断");
logDto.setResult(1); logDto.setResult(1);
//1.判断nDid是否存在 //1.判断nDid是否存在
@@ -156,9 +155,8 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
public Object getModel(String nDid) { public Object getModel(String nDid) {
//日志实体 //日志实体
DeviceLogDTO logDto = new DeviceLogDTO(); DeviceLogDTO logDto = new DeviceLogDTO();
logDto.setUserIndex(RequestUtil.getUserIndex()); logDto.setUserName(RequestUtil.getUserNickname());
logDto.setUserName(RequestUtil.getUsername()); logDto.setLoginName(RequestUtil.getUsername());
logDto.setLoginName(RequestUtil.getLoginName());
logDto.setOperate("获取"+nDid+"设备模板信息"); logDto.setOperate("获取"+nDid+"设备模板信息");
logDto.setResult(1); logDto.setResult(1);
Object model = null; Object model = null;
@@ -184,9 +182,8 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
public void devAccess(DevAccessParam devAccessParam) { public void devAccess(DevAccessParam devAccessParam) {
//日志实体 //日志实体
DeviceLogDTO logDto = new DeviceLogDTO(); DeviceLogDTO logDto = new DeviceLogDTO();
logDto.setUserIndex(RequestUtil.getUserIndex()); logDto.setUserName(RequestUtil.getUserNickname());
logDto.setUserName(RequestUtil.getUsername()); logDto.setLoginName(RequestUtil.getUsername());
logDto.setLoginName(RequestUtil.getLoginName());
logDto.setOperate("设备"+devAccessParam.getNDid()+"注册"); logDto.setOperate("设备"+devAccessParam.getNDid()+"注册");
logDto.setResult(1); logDto.setResult(1);
try { try {