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 6d71d6a..5adceea 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 @@ -219,12 +219,12 @@ public class MqttMessageHandler { switch (rspDataDto.getDataType()){ case 1: RspDataDto.SoftInfo softInfo = JSON.parseObject(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.SoftInfo.class); - redisUtil.saveByKeyWithExpire("SOFTINFO"+nDid,softInfo,60L); + redisUtil.saveByKeyWithExpire("SOFTINFO"+nDid,softInfo,600L); break; case 2: List ldevInfo = JSON.parseArray(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.LdevInfo.class); //fixme 默认第一个监测点是负载侧,第二个是电网测,后期数据错误可以在移动端调整 - redisUtil.saveByKeyWithExpire("LINEDATA"+nDid,ldevInfo,60L); + redisUtil.saveByKeyWithExpire("LINEDATA"+nDid,ldevInfo,600L); break; default: break; diff --git a/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java b/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java index c6cc409..5919b6b 100644 --- a/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java +++ b/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import com.alibaba.nacos.shaded.com.google.gson.Gson; import com.njcn.access.enums.AccessResponseEnum; import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.PubUtils; import com.njcn.csdevice.api.CsLineFeignClient; import com.njcn.csdevice.api.DataArrayFeignClient; @@ -162,6 +163,9 @@ public class StatServiceImpl implements IStatService { throw new BusinessException(StatResponseEnum.ARRAY_DATA_NOT_MATCH); } for (int i = 0; i < dataArrayList.size(); i++) { + if (Objects.isNull(redisUtil.getObjectByKey("ELEEPDPQD"))){ + saveData(); + } String tableName = new Gson().fromJson(String.valueOf(redisUtil.getObjectByKey("ELEEPDPQD")), Map.class).get(dataArrayList.get(i).getName()).toString(); Map tags = new HashMap<>(); tags.put(InfluxDBTableConstant.LINE_ID,lineId);