1.审计管理修改
2.数据中心bug修改
This commit is contained in:
@@ -78,7 +78,7 @@ public class RunManageServiceImpl implements RunManageService {
|
||||
if (!CollectionUtils.isEmpty(lineIndexes)) {
|
||||
return deviceMapper.getRunManageList(lineIndexes, runManageParam.getComFlag(),runManageParam.getSearchValue());
|
||||
} else {
|
||||
throw new BusinessException(CommonResponseEnum.FAIL);
|
||||
return new ArrayList<>();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -113,11 +113,44 @@ public class RunManageServiceImpl implements RunManageService {
|
||||
// InfluxDBResultMapper inCn = new InfluxDBResultMapper();
|
||||
// List<LineInfluxDbOnlineVO> lineInfluxDbOnlineVOList = inCn.toPOJO(queryResult,LineInfluxDbOnlineVO.class);
|
||||
runManageDevList = runManageDevList.stream().peek(item-> lineInfluxDbOnlineVOList.stream().filter(it-> Objects.equals(item.getId(),it.getDevIndex())).findFirst().ifPresent(i->item.setOnlineEvaluate(i.getOnlineRate()))).collect(Collectors.toList());
|
||||
String evaluate = runManageParam.getEvaluate();
|
||||
if(StrUtil.isNotBlank(evaluate)){
|
||||
runManageDevList=runManageDevList.stream().filter(x->filterOnlineEvaluate(evaluate,x.getOnlineEvaluate())).collect(Collectors.toList());
|
||||
}
|
||||
}
|
||||
}
|
||||
return runManageDevList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 评价筛选
|
||||
* @param evaluate
|
||||
* @param onlineEvaluate
|
||||
* @return
|
||||
*/
|
||||
private boolean filterOnlineEvaluate(String evaluate, Double onlineEvaluate) {
|
||||
if(onlineEvaluate!=null){
|
||||
onlineEvaluate=onlineEvaluate*100;
|
||||
switch (evaluate){
|
||||
case "优":
|
||||
if(onlineEvaluate>90){
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
case "良":
|
||||
if(60<onlineEvaluate&&onlineEvaluate<=90){
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
case "差":
|
||||
if(onlineEvaluate<=60){
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<TerminalLedgerVO> getTerminalLedger(DeviceInfoParam deviceInfoParam) {
|
||||
|
||||
Reference in New Issue
Block a user