代码优化
This commit is contained in:
@@ -336,8 +336,14 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
|
||||
double re = 0;
|
||||
if (Objects.equals("Primary",commonStatisticalQueryParam.getDataLevel())) {
|
||||
if (Objects.equals("Primary",csDataSet.getDataLevel())) {
|
||||
vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
|
||||
unit = epdPqd.getUnit();
|
||||
if (HarmonicConstant.POWER_LIST.contains(epdPqd.getShowName())) {
|
||||
re = Objects.isNull(temp.getValue()) ? 3.14159 : temp.getValue() / 1000;
|
||||
vo.setStatisticalData(Double.valueOf(df.format(re)));
|
||||
unit = "k" + epdPqd.getUnit();
|
||||
} else {
|
||||
vo.setStatisticalData(Objects.isNull(temp.getValue()) ? 3.14159 : Double.parseDouble(df.format(temp.getValue())));
|
||||
unit = epdPqd.getUnit();
|
||||
}
|
||||
} else {
|
||||
if(Objects.nonNull(epdPqd.getPrimaryFormula())){
|
||||
switch (epdPqd.getPrimaryFormula()) {
|
||||
|
||||
Reference in New Issue
Block a user