From 811b27a6f7eaa1821f24da0da5b5e0c2c1b64233 Mon Sep 17 00:00:00 2001 From: chenjiale Date: Mon, 1 Dec 2025 14:47:07 +0800 Subject: [PATCH] =?UTF-8?q?fix(alert):=20=E4=BF=AE=E5=A4=8D=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E6=8A=A5=E5=91=8A=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 调整 import 语句顺序，统一数据对象和映射器引用 - 修复 uplow 字段空值处理逻辑，避免空指针异常 - 注释掉重复的 low_f 和 high_f 属性设置 - 精简 JSON 序列化注解中的别名配置，去除冗余映射 - 统一模型测试类属性命名规则，提高代码可读性 --- .../impl/AssessReportServiceImpl.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) 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 1943044..b819a0d 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 @@ -6,16 +6,16 @@ import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.common.util.http.HttpUtils; import cn.iocoder.yudao.framework.common.util.json.JsonUtils; import cn.iocoder.yudao.module.alert.controller.admin.assessreport.vo.*; -import cn.iocoder.yudao.module.alert.dao.domain.ModelCfg; +import cn.iocoder.yudao.module.alert.dal.dataobject.assessreport.AssessReportDO; +import cn.iocoder.yudao.module.alert.dal.dataobject.model.ModelConditionDO; +import cn.iocoder.yudao.module.alert.dal.mysql.assessreport.AssessReportMapper; +import cn.iocoder.yudao.module.alert.dal.mysql.model.ModelConditionMapper; import cn.iocoder.yudao.module.alert.dao.domain.AssessReportCfg; +import cn.iocoder.yudao.module.alert.dao.domain.ModelCfg; import cn.iocoder.yudao.module.alert.dao.domain.ModelVersion; import cn.iocoder.yudao.module.alert.dao.mapper.AssessReportCfgMapper; import cn.iocoder.yudao.module.alert.dao.service.ModelCfgService; import cn.iocoder.yudao.module.alert.dao.service.ModelVersionService; -import cn.iocoder.yudao.module.alert.dal.dataobject.assessreport.AssessReportDO; -import cn.iocoder.yudao.module.alert.dal.mysql.assessreport.AssessReportMapper; -import cn.iocoder.yudao.module.alert.dal.dataobject.model.ModelConditionDO; -import cn.iocoder.yudao.module.alert.dal.mysql.model.ModelConditionMapper; import cn.iocoder.yudao.module.alert.service.assessreport.AssessReportService; import com.alibaba.excel.util.DateUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -488,7 +488,7 @@ public class AssessReportServiceImpl implements AssessReportService { AssessPointVO p = pointRows.get(i); dead[i] = Boolean.TRUE.equals(p.getDead()) ? 0 : 1; limit[i] = Boolean.TRUE.equals(p.getLimit()) ? 1 : 0; - uplow[i] = (p.getLower() == null ? "" : p.getLower()) + "," + (p.getUpper() == null ? "" : p.getUpper()); + uplow[i] = String.valueOf(p.getLower()) + "," + String.valueOf(p.getUpper()); } } if (!CollectionUtils.isEmpty(reqVO.getAssessRows())) { @@ -530,8 +530,8 @@ public class AssessReportServiceImpl implements AssessReportService { payload.setVersion(reqVO.getVersion()); payload.setCoverage(fetchCoverage(modelInfo)); payload.setTest_Data(buildTestData(reqVO, modelInfo, pointRows)); - payload.setLow_f(joinDouble(hi)); - payload.setHigh_f(joinDouble(hi)); +// payload.setLow_f(joinDouble(hi)); +// payload.setHigh_f(joinDouble(hi)); return payload; } @@ -671,17 +671,17 @@ class TestData { class ModelTestNew { private boolean expand; @com.fasterxml.jackson.annotation.JsonProperty("Test_Data") - @com.fasterxml.jackson.annotation.JsonAlias({"Test_Data", "test_data"}) + @com.fasterxml.jackson.annotation.JsonAlias({"Test_Data"}) private TestData Test_Data; @com.fasterxml.jackson.annotation.JsonProperty("dead") private String dead; @com.fasterxml.jackson.annotation.JsonProperty("limit") private String limit; @com.fasterxml.jackson.annotation.JsonProperty("Model_id") - @com.fasterxml.jackson.annotation.JsonAlias({"Model_id", "model_id"}) + @com.fasterxml.jackson.annotation.JsonAlias({"Model_id"}) private String Model_id; @com.fasterxml.jackson.annotation.JsonProperty("Model_alg") - @com.fasterxml.jackson.annotation.JsonAlias({"Model_alg", "model_alg"}) + @com.fasterxml.jackson.annotation.JsonAlias({"Model_alg"}) private String Model_alg; @com.fasterxml.jackson.annotation.JsonProperty("number_sample") private int number_sample; @@ -690,10 +690,10 @@ class ModelTestNew { @com.fasterxml.jackson.annotation.JsonProperty("condition") private String condition; @com.fasterxml.jackson.annotation.JsonProperty("Test_Type") - @com.fasterxml.jackson.annotation.JsonAlias({"Test_Type", "test_type"}) + @com.fasterxml.jackson.annotation.JsonAlias({"Test_Type"}) private String Test_Type; @com.fasterxml.jackson.annotation.JsonProperty("Limit_Value") - @com.fasterxml.jackson.annotation.JsonAlias({"Limit_Value", "limit_value"}) + @com.fasterxml.jackson.annotation.JsonAlias({"Limit_Value"}) private double Limit_Value; @com.fasterxml.jackson.annotation.JsonProperty("uplow") private String uplow;