Browse Source

refactor(alert): 重命名 AssessRowVO 为 Assess 并更新相关引用

- 将类名从 AssessRowVO 更改为 Assess
- 更新所有引用 AssessRowVO 的地方为 Assess
- 修改 buildAssessRows 方法返回类型为 List<Assess>
- 更新 mapAssessResultByIndex 方法参数类型为 List<Assess>
- 在 Point 类中添加 Unit 字段的 JSON 属性映射
pull/48/head
chenjiale 1 month ago
parent
commit
f2f8c6f3f1
  1. 2
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/assessreport/vo/Assess.java
  2. 2
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/assessreport/vo/AssessEvaluateReqVO.java
  3. 2
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/assessreport/vo/AssessInitRespVO.java
  4. 2
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/model/Point.java
  5. 20
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/assessreport/impl/AssessReportServiceImpl.java

2
yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/assessreport/vo/AssessRowVO.java → yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/assessreport/vo/Assess.java

@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class AssessRowVO extends AssessPointVO { public class Assess extends AssessPointVO {
@Schema(description = "诊出率 正/反 含 %") @Schema(description = "诊出率 正/反 含 %")
private String fdr; private String fdr;

2
yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/assessreport/vo/AssessEvaluateReqVO.java

@ -22,7 +22,7 @@ public class AssessEvaluateReqVO {
private List<String> timeRange; private List<String> timeRange;
@Schema(description = "评估列表") @Schema(description = "评估列表")
private List<AssessRowVO> assessRows; private List<Assess> assess;
@Schema(description = "全部点信息") @Schema(description = "全部点信息")
private List<AssessPointVO> pointRows; private List<AssessPointVO> pointRows;

2
yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/assessreport/vo/AssessInitRespVO.java

@ -22,7 +22,7 @@ public class AssessInitRespVO {
private List<AssessPointVO> pointRows; private List<AssessPointVO> pointRows;
@Schema(description = "评估参数表") @Schema(description = "评估参数表")
private List<AssessRowVO> assessRows; private List<Assess> assess;
@Schema(description = "评估结果表") @Schema(description = "评估结果表")
private List<AssessResultVO> assessResult; private List<AssessResultVO> assessResult;

2
yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/model/Point.java

@ -23,6 +23,8 @@ public class Point {
@JsonProperty("Description") @JsonProperty("Description")
@JsonAlias("description") @JsonAlias("description")
private String Description; private String Description;
@JsonProperty("Unit")
@JsonAlias("unit")
private String Unit; private String Unit;
@JsonProperty("Lower") @JsonProperty("Lower")
private BigDecimal Lower; private BigDecimal Lower;

20
yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/assessreport/impl/AssessReportServiceImpl.java

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

Loading…
Cancel
Save