diff --git a/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/AccessDto.java b/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/AccessDto.java index 229c140..501a2d8 100644 --- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/AccessDto.java +++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/AccessDto.java @@ -15,9 +15,10 @@ import java.io.Serializable; @Data public class AccessDto implements Serializable { + //fixme 自定义注解有问题,后期要调整 @ParamName("Ndid") - private String nDid; + private String Ndid; @ParamName("DevType") - private String devType; + private String DevType; } diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java b/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java index 5daee11..4977ded 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java @@ -357,7 +357,7 @@ public class MqttMessageHandler { ReqAndResDto.Res reqAndResParam = new ReqAndResDto.Res(); HeartBeatDto heartBeatDto = new HeartBeatDto(); heartBeatDto.setTime(System.currentTimeMillis()/1000); - reqAndResParam.setMid(1); + reqAndResParam.setMid(res.getMid()); reqAndResParam.setDid(0); reqAndResParam.setPri(AccessEnum.FIRST_CHANNEL.getCode()); reqAndResParam.setType(Integer.parseInt(TypeEnum.TYPE_29.getCode())); diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java index 6f78d7f..38ab07d 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java @@ -373,7 +373,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService { reqAndResParam.setType(Integer.parseInt(TypeEnum.TYPE_2.getCode())); reqAndResParam.setExpire(-1); AccessDto accessDto = new AccessDto(); - accessDto.setNDid(nDid); + accessDto.setNdid(nDid); accessDto.setDevType(devType); reqAndResParam.setMsg(accessDto); publisher.send("/Pfm/DevReg/"+nDid, new Gson().toJson(reqAndResParam),1,false);