实时数据一次值 二次值判断
This commit is contained in:
@@ -85,7 +85,7 @@ public class RtServiceImpl implements IRtService {
|
||||
}
|
||||
//fixme 目前实时数据只有基础数据和谐波数据,后期拓展,这边需要再判断
|
||||
else {
|
||||
HarmRealDataSet harmRealDataSet = harmData(dataArrayList,item);
|
||||
HarmRealDataSet harmRealDataSet = harmData(dataArrayList,item,dataSet.getDataLevel(),po.getCtRatio());
|
||||
harmRealDataSet.setUserId(userId);
|
||||
harmRealDataSet.setLineId(lineId);
|
||||
harmRealDataSet.setPt(po.getPtRatio().floatValue());
|
||||
@@ -228,7 +228,7 @@ public class RtServiceImpl implements IRtService {
|
||||
return baseRealDataSet;
|
||||
}
|
||||
|
||||
public HarmRealDataSet harmData(List<CsDataArray> dataArrayList, AppAutoDataMessage.DataArray dataArray) {
|
||||
public HarmRealDataSet harmData(List<CsDataArray> dataArrayList, AppAutoDataMessage.DataArray dataArray, String dataLevel, Double ct) {
|
||||
HarmRealDataSet harmRealDataSet = new HarmRealDataSet();
|
||||
List<HarmData> harmDataList = new ArrayList<>();
|
||||
//解码
|
||||
@@ -259,7 +259,14 @@ public class RtServiceImpl implements IRtService {
|
||||
//通过反射将数据赋值
|
||||
Class<?> clazz = HarmRealDataSet.class;
|
||||
maxDataList.forEach(item->{
|
||||
if (Objects.equals(item.getHarmName(),"Pq_RmsFundI") || Objects.equals(item.getHarmName(),"Pq_RmsFundU")) {
|
||||
if (Objects.equals(item.getHarmName(),"Pq_RmsFundI")) {
|
||||
if ("Secondary".equals(dataLevel)) {
|
||||
double data = item.getData() * ct;
|
||||
harmRealDataSet.setData1(FloatUtils.get2Float((float)data));
|
||||
} else {
|
||||
harmRealDataSet.setData1(FloatUtils.get2Float(item.getData()));
|
||||
}
|
||||
} else if (Objects.equals(item.getHarmName(),"Pq_RmsFundU")) {
|
||||
harmRealDataSet.setData1(FloatUtils.get2Float(item.getData()));
|
||||
} else {
|
||||
String numberStr = item.getHarmName().substring(item.getHarmName().lastIndexOf('_') + 1);
|
||||
|
||||
Reference in New Issue
Block a user