1.综合评估省级趋势展示
2.技术监督-终端周期检测
This commit is contained in:
@@ -200,29 +200,45 @@ public class GridServiceImpl implements IGridService {
|
||||
});
|
||||
}
|
||||
//数据处理
|
||||
deptList.forEach(item->{
|
||||
if (lineDetailMap.containsKey(item.getArea())) {
|
||||
AssessVo.AssessTrendVo vo = new AssessVo.AssessTrendVo();
|
||||
vo.setDeptId(item.getId());
|
||||
vo.setDeptName(item.getName());
|
||||
List<AssessVo> children = new ArrayList<>();
|
||||
List<String> ll = lineDetailMap.get(item.getArea()).stream().map(LineDetail::getId).collect(Collectors.toList());
|
||||
map.forEach((k1,v1)->{
|
||||
AssessVo assessVo = new AssessVo();
|
||||
assessVo.setDataTime(k1);
|
||||
List<PQSComAssesPO> poList = v1.stream().filter(it->ll.contains(it.getLineId())).collect(Collectors.toList());
|
||||
if (CollUtil.isNotEmpty(poList)){
|
||||
if (param.getAreaType() == 0) {
|
||||
AssessVo.AssessTrendVo vo = new AssessVo.AssessTrendVo();
|
||||
vo.setDeptId(param.getDeptIndex());
|
||||
vo.setDeptName("冀北");
|
||||
List<AssessVo> children = new ArrayList<>();
|
||||
map.forEach((k1,v1)->{
|
||||
AssessVo assessVo = new AssessVo();
|
||||
assessVo.setDataTime(k1);
|
||||
List<PqsComasses> communicateList = BeanUtil.copyToList(v1,PqsComasses.class);
|
||||
float synData = comAssesUtil.getAllComAss(communicateList);
|
||||
assessVo.setScore(CollUtil.isEmpty(communicateList)?3.14159f:PubUtils.floatRound(2,synData));
|
||||
assessVo.setLevel(getLevel(assessVo.getScore()));
|
||||
children.add(assessVo);
|
||||
});
|
||||
vo.setChildren(children);
|
||||
result.add(vo);
|
||||
} else {
|
||||
deptList.forEach(item->{
|
||||
if (lineDetailMap.containsKey(item.getArea())) {
|
||||
AssessVo.AssessTrendVo vo = new AssessVo.AssessTrendVo();
|
||||
vo.setDeptId(item.getId());
|
||||
vo.setDeptName(item.getName());
|
||||
List<AssessVo> children = new ArrayList<>();
|
||||
List<String> ll = lineDetailMap.get(item.getArea()).stream().map(LineDetail::getId).collect(Collectors.toList());
|
||||
map.forEach((k1,v1)->{
|
||||
AssessVo assessVo = new AssessVo();
|
||||
assessVo.setDataTime(k1);
|
||||
List<PQSComAssesPO> poList = v1.stream().filter(it->ll.contains(it.getLineId())).collect(Collectors.toList());
|
||||
List<PqsComasses> communicateList = BeanUtil.copyToList(poList,PqsComasses.class);
|
||||
float synData = comAssesUtil.getAllComAss(communicateList);
|
||||
assessVo.setScore(PubUtils.floatRound(2,synData));
|
||||
assessVo.setLevel(getLevel(synData));
|
||||
}
|
||||
children.add(assessVo);
|
||||
});
|
||||
vo.setChildren(children);
|
||||
result.add(vo);
|
||||
}
|
||||
});
|
||||
assessVo.setScore(CollUtil.isEmpty(communicateList)?3.14159f:PubUtils.floatRound(2,synData));
|
||||
assessVo.setLevel(getLevel(assessVo.getScore()));
|
||||
children.add(assessVo);
|
||||
});
|
||||
vo.setChildren(children);
|
||||
result.add(vo);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
@@ -762,10 +778,7 @@ public class GridServiceImpl implements IGridService {
|
||||
*/
|
||||
private String getLevel(float synDatas) {
|
||||
if(synDatas==3.14159f){
|
||||
return "(暂无数据)";
|
||||
}
|
||||
if(synDatas==3.1415f){
|
||||
return "/";
|
||||
return "暂无数据";
|
||||
}
|
||||
if(0<=synDatas&&synDatas<2){
|
||||
return "极差";
|
||||
|
||||
Reference in New Issue
Block a user