Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

pms加上数据验证

Browse Source
This commit is contained in:
wr
2023-06-07 09:46:01 +08:00
parent 6d2cc5860a
commit 22c09b7cfe
3 changed files with 60 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgMServiceImpl.java
View File

@@ -1,6 +1,7 @@
package com.njcn.harmonic.service.majornetwork.impl; package com.njcn.harmonic.service.majornetwork.impl;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.njcn.common.pojo.param.StatisticsBizBaseParam; import com.njcn.common.pojo.param.StatisticsBizBaseParam;
@@ -72,19 +73,35 @@ public class RStatOrgMServiceImpl extends ServiceImpl<RStatOrgMMapper, RStatOrgM
DeptDTO deptDTO = deptMap.get(key); DeptDTO deptDTO = deptMap.get(key);
RStatOrgVO rStatOrgVO = new RStatOrgVO(); RStatOrgVO rStatOrgVO = new RStatOrgVO();
rStatOrgVO.setOrgName(deptDTO.getName()); rStatOrgVO.setOrgName(deptDTO.getName());
Float averageOverDay = Float.parseFloat( if(rStatOrgM.getOverDayAccrued()!=null&&rStatOrgM.getEffectiveMeasurementAccrued()!=null&&
df.format(rStatOrgM.getOverDayAccrued() / (rStatOrgM.getEffectiveMeasurementAccrued() * 1.0))); rStatOrgM.getOverDayAccrued()!=0&&rStatOrgM.getEffectiveMeasurementAccrued()!=0){
rStatOrgVO.setAverageOverDay(averageOverDay); Float averageOverDay = Float.parseFloat(
df.format(rStatOrgM.getOverDayAccrued() / (rStatOrgM.getEffectiveMeasurementAccrued() * 1.0)));
rStatOrgVO.setAverageOverDay(averageOverDay);
}else{
rStatOrgVO.setAverageOverDay(0.0f);
}
rStatOrgVO.setEffectiveMeasurementAverage(rStatOrgM.getEffectiveMeasurementAverage()); rStatOrgVO.setEffectiveMeasurementAverage(rStatOrgM.getEffectiveMeasurementAverage());
rStatOrgVO.setEffectiveMeasurementAccrued(rStatOrgM.getEffectiveMeasurementAccrued()); rStatOrgVO.setEffectiveMeasurementAccrued(rStatOrgM.getEffectiveMeasurementAccrued());
rStatOrgVO.setOverLimitMeasurementAverage(rStatOrgM.getHarmonicMeasurementAverage()); rStatOrgVO.setOverLimitMeasurementAverage(rStatOrgM.getHarmonicMeasurementAverage());
rStatOrgVO.setOverLimitMeasurementAccrued(rStatOrgM.getHarmonicMeasurementAccrued()); rStatOrgVO.setOverLimitMeasurementAccrued(rStatOrgM.getHarmonicMeasurementAccrued());
Float harmonicMeasurementRatioAverage = Float.parseFloat( if(rStatOrgM.getHarmonicMeasurementAverage()!=null&&rStatOrgM.getEffectiveMeasurementAverage()!=null&&
df.format(rStatOrgM.getHarmonicMeasurementAverage() / (rStatOrgM.getEffectiveMeasurementAverage() * 1.0))); rStatOrgM.getHarmonicMeasurementAverage()!=0&&rStatOrgM.getEffectiveMeasurementAverage()!=0){
rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage); Float harmonicMeasurementRatioAverage = Float.parseFloat(
Float harmonicMeasurementRatioAccrued = Float.parseFloat( df.format(rStatOrgM.getHarmonicMeasurementAverage() / (rStatOrgM.getEffectiveMeasurementAverage() * 1.0)));
df.format(rStatOrgM.getHarmonicMeasurementAccrued() / (rStatOrgM.getEffectiveMeasurementAccrued() * 1.0))); rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage);
rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued); }else{
rStatOrgVO.setHarmonicMeasurementRatioAverage(0.0f);
}
if(rStatOrgM.getHarmonicMeasurementAccrued()!=null&&rStatOrgM.getEffectiveMeasurementAccrued()!=null&&
rStatOrgM.getHarmonicMeasurementAccrued()!=0&&rStatOrgM.getEffectiveMeasurementAccrued()!=0){
Float harmonicMeasurementRatioAccrued = Float.parseFloat(
df.format(rStatOrgM.getHarmonicMeasurementAccrued() / (rStatOrgM.getEffectiveMeasurementAccrued() * 1.0)));
rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued);
}else{
rStatOrgVO.setHarmonicMeasurementRatioAccrued(0.0f);
}
newList.add(rStatOrgVO); newList.add(rStatOrgVO);
} }
} }

24
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgQServiceImpl.java
View File

@@ -74,12 +74,24 @@ public class RStatOrgQServiceImpl extends ServiceImpl<RStatOrgQMapper, RStatOrgQ
rStatOrgVO.setOverLimitMeasurementAverage(rStatOrgQ.getHarmonicMeasurementAverage()); rStatOrgVO.setOverLimitMeasurementAverage(rStatOrgQ.getHarmonicMeasurementAverage());
rStatOrgVO.setOverLimitMeasurementAccrued(rStatOrgQ.getHarmonicMeasurementAccrued()); rStatOrgVO.setOverLimitMeasurementAccrued(rStatOrgQ.getHarmonicMeasurementAccrued());
DecimalFormat df = new DecimalFormat("###.00"); DecimalFormat df = new DecimalFormat("###.00");
Float harmonicMeasurementRatioAverage = Float.parseFloat( if(rStatOrgQ.getHarmonicMeasurementAverage()!=null&&rStatOrgQ.getEffectiveMeasurementAverage()!=null&&
df.format(rStatOrgQ.getHarmonicMeasurementAverage() / (rStatOrgQ.getEffectiveMeasurementAverage() * 1.0))); rStatOrgQ.getHarmonicMeasurementAverage()!=0&&rStatOrgQ.getEffectiveMeasurementAverage()!=0){
rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage); Float harmonicMeasurementRatioAverage = Float.parseFloat(
Float harmonicMeasurementRatioAccrued = Float.parseFloat( df.format(rStatOrgQ.getHarmonicMeasurementAverage() / (rStatOrgQ.getEffectiveMeasurementAverage() * 1.0)));
df.format(rStatOrgQ.getHarmonicMeasurementAccrued() / (rStatOrgQ.getEffectiveMeasurementAccrued() * 1.0))); rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage);
rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued); }else{
rStatOrgVO.setHarmonicMeasurementRatioAverage(0.0f);
}
if(rStatOrgQ.getHarmonicMeasurementAccrued()!=null&&rStatOrgQ.getEffectiveMeasurementAccrued()!=null&&
rStatOrgQ.getHarmonicMeasurementAccrued()!=0&&rStatOrgQ.getEffectiveMeasurementAccrued()!=0){
Float harmonicMeasurementRatioAccrued = Float.parseFloat(
df.format(rStatOrgQ.getHarmonicMeasurementAccrued() / (rStatOrgQ.getEffectiveMeasurementAccrued() * 1.0)));
rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued);
}else{
rStatOrgVO.setHarmonicMeasurementRatioAccrued(0.0f);
}
newList.add(rStatOrgVO); newList.add(rStatOrgVO);
} }
} }

22
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgYServiceImpl.java
View File

@@ -99,12 +99,22 @@ public class RStatOrgYServiceImpl extends ServiceImpl<RStatOrgYMapper, RStatOrgY
rStatOrgVO.setOverLimitMeasurementAverage(rStatOrgY.getOverLimitMeasurementAverage()); rStatOrgVO.setOverLimitMeasurementAverage(rStatOrgY.getOverLimitMeasurementAverage());
rStatOrgVO.setOverLimitMeasurementAccrued(rStatOrgY.getOverLimitMeasurementAccrued()); rStatOrgVO.setOverLimitMeasurementAccrued(rStatOrgY.getOverLimitMeasurementAccrued());
DecimalFormat df = new DecimalFormat("###.00"); DecimalFormat df = new DecimalFormat("###.00");
Float harmonicMeasurementRatioAverage = Float.parseFloat( if(rStatOrgY.getOverLimitMeasurementAverage()!=null&&rStatOrgY.getEffectiveMeasurementAverage()!=null&&
df.format(rStatOrgY.getOverLimitMeasurementAverage() / (rStatOrgY.getEffectiveMeasurementAverage() * 1.0))); rStatOrgY.getOverLimitMeasurementAverage()!=0&&rStatOrgY.getEffectiveMeasurementAverage()!=0){
rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage); Float harmonicMeasurementRatioAverage = Float.parseFloat(
Float harmonicMeasurementRatioAccrued = Float.parseFloat( df.format(rStatOrgY.getOverLimitMeasurementAverage() / (rStatOrgY.getEffectiveMeasurementAverage() * 1.0)));
df.format(rStatOrgY.getOverLimitMeasurementAccrued() / (rStatOrgY.getEffectiveMeasurementAccrued() * 1.0))); rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage);
rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued); }else{
rStatOrgVO.setHarmonicMeasurementRatioAverage(0.0f);
}
if(rStatOrgY.getOverLimitMeasurementAccrued()!=null&&rStatOrgY.getEffectiveMeasurementAccrued()!=null&&
rStatOrgY.getOverLimitMeasurementAccrued()!=0&&rStatOrgY.getEffectiveMeasurementAccrued()!=0){
Float harmonicMeasurementRatioAccrued = Float.parseFloat(
df.format(rStatOrgY.getOverLimitMeasurementAccrued() / (rStatOrgY.getEffectiveMeasurementAccrued() * 1.0)));
rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued);
}else{
rStatOrgVO.setHarmonicMeasurementRatioAccrued(0.0f);
}
newList.add(rStatOrgVO); newList.add(rStatOrgVO);
} }
} }