From f2f8c6f3f1089e29c470874d1f70ffc61046e1b9 Mon Sep 17 00:00:00 2001 From: chenjiale Date: Tue, 9 Dec 2025 14:47:11 +0800 Subject: [PATCH] =?UTF-8?q?refactor(alert):=20=E9=87=8D=E5=91=BD=E5=90=8D?= =?UTF-8?q?=20AssessRowVO=20=E4=B8=BA=20Assess=20=E5=B9=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=9B=B8=E5=85=B3=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将类名从 AssessRowVO 更改为 Assess - 更新所有引用 AssessRowVO 的地方为 Assess - 修改 buildAssessRows 方法返回类型为 List - 更新 mapAssessResultByIndex 方法参数类型为 List - 在 Point 类中添加 Unit 字段的 JSON 属性映射 --- .../vo/{AssessRowVO.java => Assess.java} | 2 +- .../assessreport/vo/AssessEvaluateReqVO.java | 2 +- .../assessreport/vo/AssessInitRespVO.java | 2 +- .../controller/admin/model/model/Point.java | 2 ++ .../impl/AssessReportServiceImpl.java | 20 +++++++++---------- 5 files changed, 15 insertions(+), 13 deletions(-) rename yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/assessreport/vo/{AssessRowVO.java => Assess.java} (90%) diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/assessreport/vo/AssessRowVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/assessreport/vo/Assess.java similarity index 90% rename from yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/assessreport/vo/AssessRowVO.java rename to yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/assessreport/vo/Assess.java index 25c7fd8..4cbc98d 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/assessreport/vo/AssessRowVO.java +++ b/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 @EqualsAndHashCode(callSuper = true) -public class AssessRowVO extends AssessPointVO { +public class Assess extends AssessPointVO { @Schema(description = "诊出率 正/反 含 %") private String fdr; diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/assessreport/vo/AssessEvaluateReqVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/assessreport/vo/AssessEvaluateReqVO.java index c3ead47..9882857 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/assessreport/vo/AssessEvaluateReqVO.java +++ b/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 timeRange; @Schema(description = "评估列表") - private List assessRows; + private List assess; @Schema(description = "全部点信息") private List pointRows; diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/assessreport/vo/AssessInitRespVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/assessreport/vo/AssessInitRespVO.java index ff86e32..04a2829 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/assessreport/vo/AssessInitRespVO.java +++ b/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 pointRows; @Schema(description = "评估参数表") - private List assessRows; + private List assess; @Schema(description = "评估结果表") private List assessResult; diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/model/Point.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/model/Point.java index 3567144..039645b 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/model/Point.java +++ b/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") @JsonAlias("description") private String Description; + @JsonProperty("Unit") + @JsonAlias("unit") private String Unit; @JsonProperty("Lower") private BigDecimal Lower; diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/assessreport/impl/AssessReportServiceImpl.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/assessreport/impl/AssessReportServiceImpl.java index 24994f3..a139b2d 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/assessreport/impl/AssessReportServiceImpl.java +++ b/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 modelInfo = JsonUtils.parseObject(modelInfoStr, new TypeReference>() { }); List pointRows = buildPointRows(modelInfo); - List assessRows = buildAssessRows(pointRows); + List 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 buildAssessRows(List points) { + private List buildAssessRows(List 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 mapAssessResultByIndex(List assessRows, TestReturn tr) { + private List mapAssessResultByIndex(List assessRows, TestReturn tr) { List 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();