From f211713f2e6d518d178730825b4de2180a8a996b Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Mon, 23 Dec 2024 17:41:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E5=80=BC=20=E4=BA=8C=E6=AC=A1=E5=80=BC=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/rt/service/impl/RtServiceImpl.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) 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 ce6a9df..ed2f386 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 @@ -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 dataArrayList, AppAutoDataMessage.DataArray dataArray) { + public HarmRealDataSet harmData(List dataArrayList, AppAutoDataMessage.DataArray dataArray, String dataLevel, Double ct) { HarmRealDataSet harmRealDataSet = new HarmRealDataSet(); List 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);