|
|
|
@ -61,13 +61,13 @@ public class AssessReportServiceImpl implements AssessReportService { |
|
|
|
Map<String, Object> modelInfo = JsonUtils.parseObject(modelInfoStr, new TypeReference<Map<String, Object>>() { |
|
|
|
}); |
|
|
|
List<AssessPointVO> pointRows = buildPointRows(modelInfo); |
|
|
|
List<AssessRowVO> assessRows = buildAssessRows(pointRows); |
|
|
|
List<Assess> assessRows = buildAssessRows(pointRows); |
|
|
|
AssessInitRespVO respVO = new AssessInitRespVO(); |
|
|
|
respVO.setModelName(modelCfg.getModelName()); |
|
|
|
respVO.setModelInfo(modelInfo); |
|
|
|
respVO.setModeRows(buildModeRows(modelInfo, reqVO.getTimeRange())); |
|
|
|
respVO.setPointRows(pointRows); |
|
|
|
respVO.setAssessRows(assessRows); |
|
|
|
respVO.setAssess(assessRows); |
|
|
|
respVO.setAssessResult(defaultAssessResult()); |
|
|
|
respVO.setBottomScore(fetchBottomScore(modelInfo)); |
|
|
|
respVO.setCoverage(fetchCoverage(modelInfo)); |
|
|
|
@ -187,7 +187,7 @@ public class AssessReportServiceImpl implements AssessReportService { |
|
|
|
tr.getReconstruction_precision().add(0d); |
|
|
|
} |
|
|
|
} |
|
|
|
respVO.setPoints(mapAssessResultByIndex(reqVO.getAssessRows(), tr)); |
|
|
|
respVO.setPoints(mapAssessResultByIndex(reqVO.getAssess(), tr)); |
|
|
|
respVO.setCleanDurationSeconds(message.getCleanTime() != null ? message.getCleanTime() : 0d); |
|
|
|
respVO.setDurationSeconds(message.getAssessTime() != null ? message.getAssessTime() : 0d); |
|
|
|
} else { |
|
|
|
@ -365,14 +365,14 @@ public class AssessReportServiceImpl implements AssessReportService { |
|
|
|
return pointRows; |
|
|
|
} |
|
|
|
|
|
|
|
private List<AssessRowVO> buildAssessRows(List<AssessPointVO> points) { |
|
|
|
private List<Assess> buildAssessRows(List<AssessPointVO> points) { |
|
|
|
if (CollUtil.isEmpty(points)) { |
|
|
|
return Collections.emptyList(); |
|
|
|
} |
|
|
|
return points.stream() |
|
|
|
.filter(p -> Boolean.TRUE.equals(p.getAlarm())) |
|
|
|
.map(p -> { |
|
|
|
AssessRowVO row = new AssessRowVO(); |
|
|
|
Assess row = new Assess(); |
|
|
|
row.setDescription(p.getDescription()); |
|
|
|
row.setPointId(p.getPointId()); |
|
|
|
row.setUnit(p.getUnit()); |
|
|
|
@ -486,8 +486,8 @@ public class AssessReportServiceImpl implements AssessReportService { |
|
|
|
uplow[i] = String.valueOf(p.getLower()) + "," + String.valueOf(p.getUpper()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (!CollectionUtils.isEmpty(reqVO.getAssessRows())) { |
|
|
|
for (AssessRowVO row : reqVO.getAssessRows()) { |
|
|
|
if (!CollectionUtils.isEmpty(reqVO.getAssess())) { |
|
|
|
for (Assess row : reqVO.getAssess()) { |
|
|
|
int idx = row.getIndex() != null ? row.getIndex() : pointRows.indexOf(row); |
|
|
|
if (idx >= 0 && idx < hi.length) { |
|
|
|
selectedIndex.add(idx); |
|
|
|
@ -515,7 +515,7 @@ public class AssessReportServiceImpl implements AssessReportService { |
|
|
|
payload.setAssess(assessInfos); |
|
|
|
payload.setModel_id(String.valueOf(modelId)); |
|
|
|
payload.setModel_alg(stringVal(modelInfo, "Algorithm_ShortName", "algorithm")); |
|
|
|
payload.setNumber_sample(reqVO.getAssessRows() != null ? reqVO.getAssessRows().size() : 0); |
|
|
|
payload.setNumber_sample(reqVO.getAssess() != null ? reqVO.getAssess().size() : 0); |
|
|
|
payload.setCondition(resolveCondition(modelInfo)); |
|
|
|
payload.setTest_Type("FAI"); |
|
|
|
payload.setLimit_Value(resolveLimitValue(modelInfo)); |
|
|
|
@ -601,13 +601,13 @@ public class AssessReportServiceImpl implements AssessReportService { |
|
|
|
return data; |
|
|
|
} |
|
|
|
|
|
|
|
private List<AssessEvaluateRowRespVO> mapAssessResultByIndex(List<AssessRowVO> assessRows, TestReturn tr) { |
|
|
|
private List<AssessEvaluateRowRespVO> mapAssessResultByIndex(List<Assess> assessRows, TestReturn tr) { |
|
|
|
List<AssessEvaluateRowRespVO> list = new ArrayList<>(); |
|
|
|
if (CollectionUtils.isEmpty(assessRows) || tr == null) { |
|
|
|
return list; |
|
|
|
} |
|
|
|
int len = tr.getFar_variable().size() / 2; |
|
|
|
for (AssessRowVO row : assessRows) { |
|
|
|
for (Assess row : assessRows) { |
|
|
|
Integer idx = row.getIndex(); |
|
|
|
if (idx == null) continue; |
|
|
|
AssessEvaluateRowRespVO vo = new AssessEvaluateRowRespVO(); |
|
|
|
|