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-16 11:22:46 +08:00
parent 1d75cce63d
commit 93fb513166
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,12 +219,12 @@ public class MqttMessageHandler {
switch (rspDataDto.getDataType()){ switch (rspDataDto.getDataType()){
case 1: case 1:
RspDataDto.SoftInfo softInfo = JSON.parseObject(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.SoftInfo.class); 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; break;
case 2: case 2:
List<RspDataDto.LdevInfo> ldevInfo = JSON.parseArray(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.LdevInfo.class); List<RspDataDto.LdevInfo> ldevInfo = JSON.parseArray(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.LdevInfo.class);
//fixme 默认第一个监测点是负载侧，第二个是电网测，后期数据错误可以在移动端调整 //fixme 默认第一个监测点是负载侧，第二个是电网测，后期数据错误可以在移动端调整
redisUtil.saveByKeyWithExpire("LINEDATA"+nDid,ldevInfo,60L); redisUtil.saveByKeyWithExpire("LINEDATA"+nDid,ldevInfo,600L);
break; break;
default: default:
break; break;

4
iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java
View File

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.nacos.shaded.com.google.gson.Gson; import com.alibaba.nacos.shaded.com.google.gson.Gson;
import com.njcn.access.enums.AccessResponseEnum; import com.njcn.access.enums.AccessResponseEnum;
import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.PubUtils; import com.njcn.common.utils.PubUtils;
import com.njcn.csdevice.api.CsLineFeignClient; import com.njcn.csdevice.api.CsLineFeignClient;
import com.njcn.csdevice.api.DataArrayFeignClient; import com.njcn.csdevice.api.DataArrayFeignClient;
@@ -162,6 +163,9 @@ public class StatServiceImpl implements IStatService {
throw new BusinessException(StatResponseEnum.ARRAY_DATA_NOT_MATCH); throw new BusinessException(StatResponseEnum.ARRAY_DATA_NOT_MATCH);
} }
for (int i = 0; i < dataArrayList.size(); i++) { 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(); String tableName = new Gson().fromJson(String.valueOf(redisUtil.getObjectByKey("ELEEPDPQD")), Map.class).get(dataArrayList.get(i).getName()).toString();
Map<String, String> tags = new HashMap<>(); Map<String, String> tags = new HashMap<>();
tags.put(InfluxDBTableConstant.LINE_ID,lineId); tags.put(InfluxDBTableConstant.LINE_ID,lineId);