代码调整

This commit is contained in:
2023-07-11 10:22:06 +08:00
parent feb30c71dd
commit 147aef0bfd
20 changed files with 711 additions and 14 deletions

View File

@@ -108,7 +108,8 @@ public class MqttMessageHandler {
ReqAndResDto.Res res = gson.fromJson(new String(message.getPayload(), StandardCharsets.UTF_8), ReqAndResDto.Res.class);
if (Objects.equals(res.getCode(),AccessEnum.SUCCESS.getCode())){
if (Objects.equals(res.getType(),TypeEnum.TYPE_17.getCode())){
equipmentFeignClient.updateStatusBynDid(nDid, AccessEnum.REGISTERED.getCode());
//这边用redis缓存来判断是否接收响应
redisUtil.saveByKeyWithExpire(nDid,AccessEnum.SUCCESS.getCode(),600L);
//询问模板数据
ReqAndResDto.Req reqAndResParam = new ReqAndResDto.Req();
reqAndResParam.setMid(1);
@@ -117,8 +118,6 @@ public class MqttMessageHandler {
reqAndResParam.setType(TypeEnum.TYPE_3.getCode());
reqAndResParam.setExpire(-1);
publisher.send("/Pfm/DevCmd/V1/"+nDid,new Gson().toJson(reqAndResParam),1,false);
//这边用redis缓存来判断是否接收响应
redisUtil.saveByKey(nDid,AccessEnum.SUCCESS.getCode());
} else {
log.info(AccessResponseEnum.MESSAGE_TYPE_ERROR.getMessage());
}
@@ -160,13 +159,12 @@ public class MqttMessageHandler {
List<CsLineModel> lineList = csLineModelService.getMonitorNumByModelId(modelId);
String key = "LINE" + nDid;
//存储监测点模板信息,用于界面回显
redisUtil.saveByKey(key,lineList);
redisUtil.saveByKeyWithExpire(key,lineList,600L);
//存储模板id
//todo 这边也是要调整的
String key2 = "MODEL" + nDid;
redisUtil.saveByKey(key2,modelId);
redisUtil.saveByKeyWithExpire(key2,modelId,600L);
redisUtil.delete(nDid);
}