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 15:34:18 +08:00
parent bdcdaf181e
commit 8793e0b6fd
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/AccessDto.java
View File

@@ -15,9 +15,10 @@ import java.io.Serializable;
@Data @Data
public class AccessDto implements Serializable { public class AccessDto implements Serializable {
//fixme 自定义注解有问题，后期要调整
@ParamName("Ndid") @ParamName("Ndid")
private String nDid; private String Ndid;
@ParamName("DevType") @ParamName("DevType")
private String devType; private String DevType;
} }

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

@@ -357,7 +357,7 @@ public class MqttMessageHandler {
ReqAndResDto.Res reqAndResParam = new ReqAndResDto.Res(); ReqAndResDto.Res reqAndResParam = new ReqAndResDto.Res();
HeartBeatDto heartBeatDto = new HeartBeatDto(); HeartBeatDto heartBeatDto = new HeartBeatDto();
heartBeatDto.setTime(System.currentTimeMillis()/1000); heartBeatDto.setTime(System.currentTimeMillis()/1000);
reqAndResParam.setMid(1); reqAndResParam.setMid(res.getMid());
reqAndResParam.setDid(0); reqAndResParam.setDid(0);
reqAndResParam.setPri(AccessEnum.FIRST_CHANNEL.getCode()); reqAndResParam.setPri(AccessEnum.FIRST_CHANNEL.getCode());
reqAndResParam.setType(Integer.parseInt(TypeEnum.TYPE_29.getCode())); reqAndResParam.setType(Integer.parseInt(TypeEnum.TYPE_29.getCode()));

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

@@ -373,7 +373,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
reqAndResParam.setType(Integer.parseInt(TypeEnum.TYPE_2.getCode())); reqAndResParam.setType(Integer.parseInt(TypeEnum.TYPE_2.getCode()));
reqAndResParam.setExpire(-1); reqAndResParam.setExpire(-1);
AccessDto accessDto = new AccessDto(); AccessDto accessDto = new AccessDto();
accessDto.setNDid(nDid); accessDto.setNdid(nDid);
accessDto.setDevType(devType); accessDto.setDevType(devType);
reqAndResParam.setMsg(accessDto); reqAndResParam.setMsg(accessDto);
publisher.send("/Pfm/DevReg/"+nDid, new Gson().toJson(reqAndResParam),1,false); publisher.send("/Pfm/DevReg/"+nDid, new Gson().toJson(reqAndResParam),1,false);