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

微调

Browse Source
This commit is contained in:
xy
2024-08-08 15:47:12 +08:00
parent 14e81fd795
commit 0233c3e04f
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -504,8 +504,7 @@ public class MqttMessageHandler {
switch (dataDto.getMsg().getDataAttr()) { switch (dataDto.getMsg().getDataAttr()) {
//暂态事件、录波处理 //暂态事件、录波处理
case 0: case 0:
log.info("处理事件"); log.info(nDid + "事件报文为:" + new String(message.getPayload(), StandardCharsets.UTF_8));
log.info("事件报文为:" + 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);
@@ -514,11 +513,11 @@ public class MqttMessageHandler {
break; break;
//实时数据 //实时数据
case 1: case 1:
log.info("处理实时数据"); log.info(nDid + "处理实时数据");
break; break;
//处理主动上送的统计数据 //处理主动上送的统计数据
case 2: case 2:
log.info("处理统计数据"); 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);
@@ -606,6 +605,12 @@ public class MqttMessageHandler {
askDataDto.setCldid(-1); askDataDto.setCldid(-1);
askDataDto.setDataType(2); askDataDto.setDataType(2);
break; break;
//询问工程信息
case 48:
reqAndResParam.setDid(1);
askDataDto.setCldid(1);
askDataDto.setDataType(48);
break;
default: default:
break; break;
} }

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

@@ -324,7 +324,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
param.setNDid(nDid); param.setNDid(nDid);
param.setStatus(1); param.setStatus(1);
param.setRunStatus(1); param.setRunStatus(1);
param.setProcess(2); param.setProcess(1);
csEquipmentDeliveryService.devResetFactory(param); csEquipmentDeliveryService.devResetFactory(param);
//清除关系表 //清除关系表
QueryWrapper<CsLedger> csLedgerQueryWrapper = new QueryWrapper<>(); QueryWrapper<CsLedger> csLedgerQueryWrapper = new QueryWrapper<>();