diff --git a/iot-analysis/analysis-rt/rt-api/src/main/java/com/njcn/rt/pojo/dto/BaseRealDataSet.java b/iot-analysis/analysis-rt/rt-api/src/main/java/com/njcn/rt/pojo/dto/BaseRealDataSet.java index dbd153c..13588b8 100644 --- a/iot-analysis/analysis-rt/rt-api/src/main/java/com/njcn/rt/pojo/dto/BaseRealDataSet.java +++ b/iot-analysis/analysis-rt/rt-api/src/main/java/com/njcn/rt/pojo/dto/BaseRealDataSet.java @@ -11,6 +11,9 @@ import java.io.Serializable; @Data public class BaseRealDataSet implements Serializable { + @ApiModelProperty("用户ID") + private String userId; + @ApiModelProperty("监测点id") private String lineId; diff --git a/iot-analysis/analysis-rt/rt-api/src/main/java/com/njcn/rt/pojo/dto/HarmRealDataSet.java b/iot-analysis/analysis-rt/rt-api/src/main/java/com/njcn/rt/pojo/dto/HarmRealDataSet.java index 6b78a2c..36276b1 100644 --- a/iot-analysis/analysis-rt/rt-api/src/main/java/com/njcn/rt/pojo/dto/HarmRealDataSet.java +++ b/iot-analysis/analysis-rt/rt-api/src/main/java/com/njcn/rt/pojo/dto/HarmRealDataSet.java @@ -12,6 +12,9 @@ import java.io.Serializable; @Data public class HarmRealDataSet implements Serializable { + @ApiModelProperty("用户ID") + private String userId; + @ApiModelProperty("监测点id") private String lineId; diff --git a/iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/service/impl/RtServiceImpl.java b/iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/service/impl/RtServiceImpl.java index e3419b5..ce6a9df 100644 --- a/iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/service/impl/RtServiceImpl.java +++ b/iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/service/impl/RtServiceImpl.java @@ -52,6 +52,8 @@ public class RtServiceImpl implements IRtService { List dataArrayList; //监测点id String lineId = appAutoDataMessage.getId() + appAutoDataMessage.getMsg().getClDid(); + //用户Id + String userId = redisUtil.getObjectByKey("rtDataUserId:"+lineId).toString(); //获取监测点基础信息 CsLinePO po = csLineFeignClient.getById(lineId).getData(); //获取数据集 dataSet @@ -72,6 +74,7 @@ public class RtServiceImpl implements IRtService { //基础数据 if (dataSet.getName().contains("Ds$Pqd$Rt$Basic$")) { BaseRealDataSet baseRealDataSet = assembleData(dataArrayList,item,po.getConType()); + baseRealDataSet.setUserId(userId); baseRealDataSet.setLineId(lineId); baseRealDataSet.setPt(po.getPtRatio().floatValue()); baseRealDataSet.setCt(po.getCtRatio().floatValue()); @@ -83,6 +86,7 @@ public class RtServiceImpl implements IRtService { //fixme 目前实时数据只有基础数据和谐波数据,后期拓展,这边需要再判断 else { HarmRealDataSet harmRealDataSet = harmData(dataArrayList,item); + harmRealDataSet.setUserId(userId); harmRealDataSet.setLineId(lineId); harmRealDataSet.setPt(po.getPtRatio().floatValue()); harmRealDataSet.setCt(po.getCtRatio().floatValue());