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

微调

Browse Source
This commit is contained in:
xy
2025-08-20 17:54:58 +08:00
parent 72351c612b
commit f88baa52be
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -168,7 +168,7 @@ public class MqttMessageHandler {
@MqttSubscribe(value = "/Dev/DevReg/{edgeId}",qos = 1) @MqttSubscribe(value = "/Dev/DevReg/{edgeId}",qos = 1)
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void devOperation(String topic, MqttMessage message, @NamedValue("edgeId") String nDid, @Payload String payload){ public void devOperation(String topic, MqttMessage message, @NamedValue("edgeId") String nDid, @Payload String payload){
log.info("收到注册应答响应--->" + nDid); log.info("收到注册应答响应--->{}", nDid);
//日志记录 //日志记录
DeviceLogDTO logDto = new DeviceLogDTO(); DeviceLogDTO logDto = new DeviceLogDTO();
try{ try{
@@ -458,7 +458,6 @@ public class MqttMessageHandler {
default: default:
break; break;
} }
//csLogsFeignClient.addUserLog(logDto);
} else { } else {
String result = getEnum(res.getCode()); String result = getEnum(res.getCode());
log.info(result); log.info(result);
@@ -526,14 +525,14 @@ public class MqttMessageHandler {
response.setPri(AccessEnum.FIRST_CHANNEL.getCode()); response.setPri(AccessEnum.FIRST_CHANNEL.getCode());
response.setType(Integer.parseInt(TypeEnum.TYPE_15.getCode())); response.setType(Integer.parseInt(TypeEnum.TYPE_15.getCode()));
response.setCode(200); response.setCode(200);
log.info("应答事件:" + new Gson().toJson(response)); log.info("应答事件:{}", new Gson().toJson(response));
publisher.send("/Dev/DataRsp/"+version+"/"+nDid,new Gson().toJson(response),1,false); publisher.send("/Dev/DataRsp/"+version+"/"+nDid,new Gson().toJson(response),1,false);
} }
//判断事件类型 //判断事件类型
switch (dataDto.getMsg().getDataAttr()) { switch (dataDto.getMsg().getDataAttr()) {
//暂态事件、录波处理、工程信息 //暂态事件、录波处理、工程信息
case 0: case 0:
log.info(nDid + "处理事件"); log.info("{}处理事件", nDid);
//log.info(nDid + "事件报文为:" + new String(message.getPayload(), StandardCharsets.UTF_8)); //log.info(nDid + "事件报文为:" + new String(message.getPayload(), StandardCharsets.UTF_8));
EventDto eventDto = gson.fromJson(new String(message.getPayload(), StandardCharsets.UTF_8), EventDto.class); EventDto eventDto = gson.fromJson(new String(message.getPayload(), StandardCharsets.UTF_8), EventDto.class);
JSONObject jsonObject0 = JSONObject.parseObject(JSON.toJSONString(eventDto)); JSONObject jsonObject0 = JSONObject.parseObject(JSON.toJSONString(eventDto));
@@ -543,7 +542,7 @@ public class MqttMessageHandler {
break; break;
//实时数据 //实时数据
case 1: case 1:
log.info(nDid + "处理实时数据"); log.info("{}处理实时数据", nDid);
JSONObject jsonObject2 = JSONObject.parseObject(JSON.toJSONString(dataDto)); JSONObject jsonObject2 = JSONObject.parseObject(JSON.toJSONString(dataDto));
AppAutoDataMessage appAutoDataMessage = JSONObject.toJavaObject(jsonObject2, AppAutoDataMessage.class); AppAutoDataMessage appAutoDataMessage = JSONObject.toJavaObject(jsonObject2, AppAutoDataMessage.class);
appAutoDataMessage.setId(nDid); appAutoDataMessage.setId(nDid);
@@ -555,7 +554,7 @@ public class MqttMessageHandler {
AppAutoDataMessage appAutoDataMessage2 = JSONObject.toJavaObject(jsonObject3, AppAutoDataMessage.class); AppAutoDataMessage appAutoDataMessage2 = JSONObject.toJavaObject(jsonObject3, AppAutoDataMessage.class);
appAutoDataMessage2.setId(nDid); appAutoDataMessage2.setId(nDid);
appAutoDataMessage2.getMsg().getDataArray().forEach(item->{ appAutoDataMessage2.getMsg().getDataArray().forEach(item->{
log.info(nDid + "处理统计数据" + item.getDataAttr()); log.info("{}处理统计数据{}", nDid, item.getDataAttr());
}); });
appAutoDataMessageTemplate.sendMember(appAutoDataMessage2); appAutoDataMessageTemplate.sendMember(appAutoDataMessage2);
break; break;
@@ -588,7 +587,7 @@ public class MqttMessageHandler {
//响应请求 //响应请求
switch (fileDto.getType()){ switch (fileDto.getType()){
case 4657: case 4657:
log.info("获取文件信息" + fileDto); log.info("获取文件信息{}", fileDto);
if (Objects.equals(fileDto.getCode(),AccessEnum.SUCCESS.getCode())) { if (Objects.equals(fileDto.getCode(),AccessEnum.SUCCESS.getCode())) {
String key = AppRedisKey.PROJECT_INFO + nDid; String key = AppRedisKey.PROJECT_INFO + nDid;
if (Objects.isNull(fileDto.getMsg().getType())) { if (Objects.isNull(fileDto.getMsg().getType())) {
@@ -669,7 +668,6 @@ public class MqttMessageHandler {
public void devErrorInfo(String topic, MqttMessage message, @NamedValue("version") String version, @NamedValue("edgeId") String nDid, @Payload String payload) { public void devErrorInfo(String topic, MqttMessage message, @NamedValue("version") String version, @NamedValue("edgeId") String nDid, @Payload String payload) {
//解析数据 //解析数据
Gson gson = new Gson(); Gson gson = new Gson();
//log.info(nDid + "事件报文为:" + new String(message.getPayload(), StandardCharsets.UTF_8));
EventDto eventDto = gson.fromJson(new String(message.getPayload(), StandardCharsets.UTF_8), EventDto.class); EventDto eventDto = gson.fromJson(new String(message.getPayload(), StandardCharsets.UTF_8), EventDto.class);
JSONObject jsonObject0 = JSONObject.parseObject(JSON.toJSONString(eventDto)); JSONObject jsonObject0 = JSONObject.parseObject(JSON.toJSONString(eventDto));
AppEventMessage appEventMessage = JSONObject.toJavaObject(jsonObject0, AppEventMessage.class); AppEventMessage appEventMessage = JSONObject.toJavaObject(jsonObject0, AppEventMessage.class);
@@ -742,7 +740,6 @@ public class MqttMessageHandler {
break; break;
} }
reqAndResParam.setMsg(askDataDto); reqAndResParam.setMsg(askDataDto);
//log.info("askDevData的请求报文:" + new Gson().toJson(reqAndResParam));
publisher.send("/Pfm/DevCmd/"+version+"/"+nDid, new Gson().toJson(reqAndResParam),1,false); publisher.send("/Pfm/DevCmd/"+version+"/"+nDid, new Gson().toJson(reqAndResParam),1,false);
} }