微调
This commit is contained in:
@@ -667,19 +667,19 @@ public class DataServiceImpl implements IDataService {
|
||||
BeanUtils.copyProperties(vo1,vo);
|
||||
RealTimeDataVo phaseA = v.stream().filter(s->Objects.equals(s.getPhase(),"A") || Objects.equals(s.getPhase(),"AB")).findFirst().orElse(null);
|
||||
if (Objects.nonNull(phaseA)) {
|
||||
vo.setValueA(phaseA.getAvgValue());
|
||||
vo.setValueA(Objects.isNull(phaseA.getAvgValue()) ? 3.14159 : phaseA.getAvgValue());
|
||||
}
|
||||
RealTimeDataVo phaseB = v.stream().filter(s->Objects.equals(s.getPhase(),"B") || Objects.equals(s.getPhase(),"BC")).findFirst().orElse(null);
|
||||
if (Objects.nonNull(phaseB)) {
|
||||
vo.setValueB(phaseB.getAvgValue());
|
||||
vo.setValueB(Objects.isNull(phaseB.getAvgValue()) ? 3.14159 : phaseB.getAvgValue());
|
||||
}
|
||||
RealTimeDataVo phaseC = v.stream().filter(s->Objects.equals(s.getPhase(),"C") || Objects.equals(s.getPhase(),"CA")).findFirst().orElse(null);
|
||||
if (Objects.nonNull(phaseC)) {
|
||||
vo.setValueC(phaseC.getAvgValue());
|
||||
vo.setValueC(Objects.isNull(phaseC.getAvgValue()) ? 3.14159 : phaseC.getAvgValue());
|
||||
}
|
||||
RealTimeDataVo phaseM = v.stream().filter(s->Objects.equals(s.getPhase(),"M")).findFirst().orElse(null);
|
||||
if (Objects.nonNull(phaseM)) {
|
||||
vo.setValueM(phaseM.getAvgValue());
|
||||
vo.setValueM(Objects.isNull(phaseM.getAvgValue()) ? 3.14159 : phaseM.getAvgValue());
|
||||
}
|
||||
vo.setPhase("/");
|
||||
vo.setAvgValue(null);
|
||||
|
||||
Reference in New Issue
Block a user