Browse Source

残差分析-联调

gmy 5 months ago
parent
commit
fe7d1d109c
1 changed files with 8 additions and 13 deletions
  1. 8 13
      services/residual_analysis_service/residual_analysis_service.go

+ 8 - 13
services/residual_analysis_service/residual_analysis_service.go

@@ -55,15 +55,6 @@ func ResidualAnalysisPreview(req residual_analysis_model.ResidualAnalysisReq) (r
 
 	resp := residual_analysis_model.ResidualAnalysisResp{}
 
-	// 图表基础信息
-	/*baseChartInfo := new(residual_analysis_model.ResidualAnalysisChartInfo)
-	baseChartInfo.Calendar = `公历`
-	baseChartInfo.Source = utils.CHART_SOURCE_DEFAULT
-	baseChartInfo.DateType = req.DateType
-	baseChartInfo.StartDate = startDate
-	baseChartInfo.EndDate = endDate
-	baseChartInfo.ChartType = utils.CHART_TYPE_CURVE*/
-
 	// 原始图表信息
 	originalEdbList := make([]residual_analysis_model.ResidualAnalysisChartEdbInfoMapping, 0)
 
@@ -188,14 +179,17 @@ func fillResidualChartInfo(edbInfoMappingA *data_manage.ChartEdbInfoMapping, edb
 	// 计算R2 公式:R2=1-SSE/SST R2越大,越符合线性  R2 = 1 - 残差平方和/总平方和
 	R2 = 1 - residualQuadraticSum/totalQuadraticSum
 
-	for _, mapping := range mappingEdbList {
+	mappingEdb := make([]residual_analysis_model.ResidualAnalysisChartEdbInfoMapping, len(mappingEdbList))
+	copy(mappingEdb, mappingEdbList)
+
+	for i, mapping := range mappingEdb {
 		if mapping.EdbInfoId != edbInfoMappingA.EdbInfoId {
-			mapping.DataList = edbData
-			mapping.EdbName = edbInfoMappingA.EdbName + "映射残差/" + edbInfoMappingB.EdbName
+			mappingEdb[i].DataList = edbData
+			mappingEdb[i].EdbName = edbInfoMappingA.EdbName + "映射残差/" + edbInfoMappingB.EdbName
 		}
 	}
 
-	return mappingEdbList, R2, nil
+	return mappingEdb, R2, nil
 }
 
 func fillMappingChartInfo(req residual_analysis_model.ResidualAnalysisReq, edbInfoMappingA *data_manage.ChartEdbInfoMapping, edbInfoMappingB *data_manage.ChartEdbInfoMapping, originalEdbList []residual_analysis_model.ResidualAnalysisChartEdbInfoMapping, indexADataMap map[string]*data_manage.EdbDataList) ([]residual_analysis_model.ResidualAnalysisChartEdbInfoMapping, float64, float64, float64, error) {
@@ -299,6 +293,7 @@ func fillMappingChartInfo(req residual_analysis_model.ResidualAnalysisReq, edbIn
 		if mapping.EdbInfoId != req.EdbInfoIdA {
 			mappingEdbList[i].EdbInfoId = 0
 			mappingEdbList[i].EdbCode = ""
+			mappingEdbList[i].IsAxis = 1
 			mappingEdbList[i].EdbName = edbInfoMappingB.EdbName + "映射" + edbInfoMappingA.EdbName
 			mappingEdbList[i].DataList = dataBList
 		}