|
|
@ -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.http.HttpUtils; |
|
|
import cn.iocoder.yudao.framework.common.util.json.JsonUtils; |
|
|
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.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.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.domain.ModelVersion; |
|
|
import cn.iocoder.yudao.module.alert.dao.mapper.AssessReportCfgMapper; |
|
|
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.ModelCfgService; |
|
|
import cn.iocoder.yudao.module.alert.dao.service.ModelVersionService; |
|
|
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 cn.iocoder.yudao.module.alert.service.assessreport.AssessReportService; |
|
|
import com.alibaba.excel.util.DateUtils; |
|
|
import com.alibaba.excel.util.DateUtils; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
@ -488,7 +488,7 @@ public class AssessReportServiceImpl implements AssessReportService { |
|
|
AssessPointVO p = pointRows.get(i); |
|
|
AssessPointVO p = pointRows.get(i); |
|
|
dead[i] = Boolean.TRUE.equals(p.getDead()) ? 0 : 1; |
|
|
dead[i] = Boolean.TRUE.equals(p.getDead()) ? 0 : 1; |
|
|
limit[i] = Boolean.TRUE.equals(p.getLimit()) ? 1 : 0; |
|
|
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())) { |
|
|
if (!CollectionUtils.isEmpty(reqVO.getAssessRows())) { |
|
|
@ -530,8 +530,8 @@ public class AssessReportServiceImpl implements AssessReportService { |
|
|
payload.setVersion(reqVO.getVersion()); |
|
|
payload.setVersion(reqVO.getVersion()); |
|
|
payload.setCoverage(fetchCoverage(modelInfo)); |
|
|
payload.setCoverage(fetchCoverage(modelInfo)); |
|
|
payload.setTest_Data(buildTestData(reqVO, modelInfo, pointRows)); |
|
|
payload.setTest_Data(buildTestData(reqVO, modelInfo, pointRows)); |
|
|
payload.setLow_f(joinDouble(hi)); |
|
|
// payload.setLow_f(joinDouble(hi));
|
|
|
payload.setHigh_f(joinDouble(hi)); |
|
|
// payload.setHigh_f(joinDouble(hi));
|
|
|
return payload; |
|
|
return payload; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -671,17 +671,17 @@ class TestData { |
|
|
class ModelTestNew { |
|
|
class ModelTestNew { |
|
|
private boolean expand; |
|
|
private boolean expand; |
|
|
@com.fasterxml.jackson.annotation.JsonProperty("Test_Data") |
|
|
@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; |
|
|
private TestData Test_Data; |
|
|
@com.fasterxml.jackson.annotation.JsonProperty("dead") |
|
|
@com.fasterxml.jackson.annotation.JsonProperty("dead") |
|
|
private String dead; |
|
|
private String dead; |
|
|
@com.fasterxml.jackson.annotation.JsonProperty("limit") |
|
|
@com.fasterxml.jackson.annotation.JsonProperty("limit") |
|
|
private String limit; |
|
|
private String limit; |
|
|
@com.fasterxml.jackson.annotation.JsonProperty("Model_id") |
|
|
@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; |
|
|
private String Model_id; |
|
|
@com.fasterxml.jackson.annotation.JsonProperty("Model_alg") |
|
|
@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; |
|
|
private String Model_alg; |
|
|
@com.fasterxml.jackson.annotation.JsonProperty("number_sample") |
|
|
@com.fasterxml.jackson.annotation.JsonProperty("number_sample") |
|
|
private int number_sample; |
|
|
private int number_sample; |
|
|
@ -690,10 +690,10 @@ class ModelTestNew { |
|
|
@com.fasterxml.jackson.annotation.JsonProperty("condition") |
|
|
@com.fasterxml.jackson.annotation.JsonProperty("condition") |
|
|
private String condition; |
|
|
private String condition; |
|
|
@com.fasterxml.jackson.annotation.JsonProperty("Test_Type") |
|
|
@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; |
|
|
private String Test_Type; |
|
|
@com.fasterxml.jackson.annotation.JsonProperty("Limit_Value") |
|
|
@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; |
|
|
private double Limit_Value; |
|
|
@com.fasterxml.jackson.annotation.JsonProperty("uplow") |
|
|
@com.fasterxml.jackson.annotation.JsonProperty("uplow") |
|
|
private String uplow; |
|
|
private String uplow; |
|
|
|