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-30 14:22:47 +08:00
parent 5d733e5e3f
commit bdcdaf181e
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
iot-access/access-boot/src/main/java/com/njcn/access/controller/CsDeviceController.java
View File

@@ -7,8 +7,6 @@ import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.HttpResultUtil;
import com.njcn.csdevice.enums.DeviceOperate;
import com.njcn.web.advice.DeviceLog;
import com.njcn.web.annotation.ReturnMsg; import com.njcn.web.annotation.ReturnMsg;
import com.njcn.web.controller.BaseController; import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;

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

@@ -86,8 +86,13 @@ 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.setUserName(RequestUtil.getUsername()); try{
logDto.setLoginName(RequestUtil.getLoginName()); logDto.setUserName(RequestUtil.getUsername());
logDto.setLoginName(RequestUtil.getLoginName());
} catch (Exception e) {
logDto.setUserName("设备主题录入");
logDto.setLoginName(null);
}
logDto.setOperate(nDid + "设备主题录入"); logDto.setOperate(nDid + "设备主题录入");
logDto.setResult(1); logDto.setResult(1);
//业务流程开始 //业务流程开始
@@ -143,8 +148,13 @@ public class MqttMessageHandler {
log.info("收到注册应答响应--->" + nDid); log.info("收到注册应答响应--->" + nDid);
//日志记录 //日志记录
DeviceLogDTO logDto = new DeviceLogDTO(); DeviceLogDTO logDto = new DeviceLogDTO();
logDto.setUserName(RequestUtil.getUsername()); try{
logDto.setLoginName(RequestUtil.getLoginName()); logDto.setUserName(RequestUtil.getUsername());
logDto.setLoginName(RequestUtil.getLoginName());
} catch (Exception e) {
logDto.setUserName("设备注册应答响应");
logDto.setLoginName(null);
}
logDto.setOperate("收到设备"+nDid+"注册应答响应"); logDto.setOperate("收到设备"+nDid+"注册应答响应");
logDto.setResult(1); logDto.setResult(1);
//业务处理 //业务处理