Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改一次值二次值bug

Browse Source
This commit is contained in:
hzj
2024-12-18 16:23:54 +08:00
parent 6f38ddf068
commit 86d21f984c
1 changed files with 133 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java
View File

@@ -499,28 +499,60 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
vo.setTime(temp.getTime()); vo.setTime(temp.getTime());
vo.setStatMethod(temp.getValueType()); vo.setStatMethod(temp.getValueType());
if(temp.getValue()!=null) { if(temp.getValue()!=null) {
double re; double re = 0;
if (Objects.equals("Primary",commonStatisticalQueryParam.getDataLevel())) { if (Objects.equals("Primary",commonStatisticalQueryParam.getDataLevel())) {
if (Objects.equals("Primary",csDataSet.getDataLevel())) { if (Objects.equals("Primary",csDataSet.getDataLevel())) {
vo.setStatisticalData(Double.valueOf(df.format(temp.getValue()))); vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
unit = epdPqd.getUnit(); unit = epdPqd.getUnit();
} else { } else {
if (HarmonicConstant.POWER_LIST.contains(epdPqd.getShowName())) { if(Objects.nonNull(epdPqd.getPrimaryFormula())){
re = DataChangeUtil.secondaryToPrimary(epdPqd.getPrimaryFormula(), temp.getValue(), pt, ct) / 1000; switch (epdPqd.getPrimaryFormula()) {
vo.setStatisticalData(Double.valueOf(df.format(re))); case "*PT":
re = temp.getValue() * pt / 1000;
unit = "k" + epdPqd.getUnit(); unit = "k" + epdPqd.getUnit();
} else { break;
vo.setStatisticalData(Double.valueOf(df.format(temp.getValue()))); case "*CT":
re = temp.getValue() * ct;
unit = epdPqd.getUnit(); unit = epdPqd.getUnit();
break;
case "*PT*CT":
re = temp.getValue() * pt * ct / 1000;
unit = "k" + epdPqd.getUnit();
break;
default:
re = temp.getValue();
unit = epdPqd.getUnit();
break;
} }
vo.setStatisticalData(Double.valueOf(df.format(re)));
}else {
re = temp.getValue();
unit = epdPqd.getUnit();
vo.setStatisticalData(Double.valueOf(df.format(re)));
}
} }
} else { } else {
if (Objects.equals("Primary",csDataSet.getDataLevel())) { if (Objects.equals("Primary",csDataSet.getDataLevel())) {
if (HarmonicConstant.POWER_LIST.contains(epdPqd.getShowName())) { if(Objects.nonNull(epdPqd.getPrimaryFormula())){
re = DataChangeUtil.primaryToSecondary(epdPqd.getPrimaryFormula(), temp.getValue(), pt, ct); switch (epdPqd.getPrimaryFormula()) {
case "*PT":
re = temp.getValue() / pt;
break;
case "*CT":
re = temp.getValue() / ct;
break;
case "*PT*CT":
re = temp.getValue() / pt / ct;
break;
default:
re = temp.getValue();
break;
}
vo.setStatisticalData(Double.valueOf(df.format(re))); vo.setStatisticalData(Double.valueOf(df.format(re)));
}else { }else {
vo.setStatisticalData(Double.valueOf(df.format(temp.getValue()))); re = temp.getValue();
vo.setStatisticalData(Double.valueOf(df.format(re)));
} }
} else { } else {
vo.setStatisticalData(Double.valueOf(df.format(temp.getValue()))); vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
@@ -533,8 +565,21 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
if (Objects.equals("Primary",csDataSet.getDataLevel())) { if (Objects.equals("Primary",csDataSet.getDataLevel())) {
unit = epdPqd.getUnit(); unit = epdPqd.getUnit();
} else { } else {
if (HarmonicConstant.POWER_LIST.contains(epdPqd.getShowName())) { if(Objects.nonNull(epdPqd.getPrimaryFormula())){
switch (epdPqd.getPrimaryFormula()) {
case "*PT":
unit = "k" + epdPqd.getUnit(); unit = "k" + epdPqd.getUnit();
break;
case "*CT":
unit = epdPqd.getUnit();
break;
case "*PT*CT":
unit = "k" + epdPqd.getUnit();
break;
default:
unit = epdPqd.getUnit();
break;
}
}else { }else {
unit = epdPqd.getUnit(); unit = epdPqd.getUnit();
} }
@@ -557,6 +602,7 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
return result; return result;
} }
@Override @Override
public WlRecord findDevBaseData(WlRecordParam.Record param) { public WlRecord findDevBaseData(WlRecordParam.Record param) {
LambdaQueryWrapper<WlRecord> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<WlRecord> lambdaQueryWrapper = new LambdaQueryWrapper<>();