Merge branch 'custom' of http://8.136.199.33:3000/eta_server/eta_api into bzq1/sci_hq_custom

controllers/data_manage/multiple_graph_config.go

@@ -634,6 +634,12 @@ func (this *ChartInfoController) MultipleGraphConfigSaveChart() {
 		_ = utils.Rc.Delete(cacheKey)
 	}()
 
+	if req.MultipleGraphConfigId <= 0 {
+		br.Msg = "配置未保存"
+		br.IsSendEmail = false
+		return
+	}
+
 	if req.IsSaveAs {
 		CopyMultipleGraphConfigSaveChart(req, this, br, sysUser)
 		return

controllers/data_manage/mysteel_chemical_data.go

@@ -874,6 +874,16 @@ func (this *EdbClassifyController) AddMysteelChemical() {
 			br.Msg = "添加指标失败，指标数量不能超过150条"
 			return
 		}
+		ok, errMsg, err := data.HealthCheckMysteelChemicalApi()
+		if err != nil {
+			br.Msg = "添加指标失败"
+			br.ErrMsg = "钢联化工数据接口异常,Err:" + err.Error()
+			return
+		}
+		if !ok {
+			br.Msg = errMsg
+			return
+		}
 		addMySteelList := make([]*data_manage.BaseFromMysteelChemicalIndex, 0)
 		for _, v := range req.List {
 			if v.IndexCode == "" {

controllers/sandbox/sandbox.go

@@ -1832,9 +1832,9 @@ func (this *SandboxController) SaveV2() {
 		//缩略图为空时不更新
 		var updateSandboxColumn = []string{}
 		if req.PicUrl == "" {
-			updateSandboxColumn = []string{"Content", "MindmapData", "ModifyTime", "SandboxClassifyId", "Style"}
+			updateSandboxColumn = []string{"Name", "Content", "MindmapData", "ModifyTime", "SandboxClassifyId", "Style"}
 		} else {
-			updateSandboxColumn = []string{"Content", "MindmapData", "PicUrl", "ModifyTime", "SandboxClassifyId", "Style"}
+			updateSandboxColumn = []string{"Name", "Content", "MindmapData", "PicUrl", "ModifyTime", "SandboxClassifyId", "Style"}
 		}
 		err = sandboxInfo.Update(updateSandboxColumn)
 		if err != nil {

services/data/chart_info.go

@@ -3370,8 +3370,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 		}
 		// 上下限区间
 		if seasonConfig.MaxMinLimits.Year > 0 {
-			yearRange := time.Now().Year() - seasonConfig.MaxMinLimits.Year
-			startYear := time.Now().AddDate(-yearRange, 0, 0).Year()
+			startYear := time.Now().AddDate(-seasonConfig.MaxMinLimits.Year, 0, 0).Year()
 			dataResp.MaxMinLimits.List = make([]*data_manage.MaxMinLimitsData, 0)
 			dataTimeMap := make(map[time.Time]time.Time)
 			dataTimeList := make([]string, 0)
@@ -3539,9 +3538,9 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 						if dateTime.Year() < startYear {
 							continue
 						}
-						// 不包含2月29号
+						// 月度的2月29号日期改为2月28日
 						if dateTime.Month() == 2 && dateTime.Day() == 29 {
-							continue
+							dateTime = dateTime.AddDate(0, 0, -1)
 						}
 						newDate = dateTime.AddDate(time.Now().Year()-dateTime.Year(), 0, 0)
 						if seasonConfig.JumpYear == 1 {
@@ -3689,7 +3688,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 			dataTimeList := make([]string, 0)
 			valueMap := make(map[time.Time]float64)
 			averageDataList := make([]*data_manage.SamePeriodAverageData, 0)
-			for i := len(quarterDataList) - 1; i > len(quarterDataList)-seasonConfig.SamePeriodAverage.Year && i > 0; i-- {
+			for i := len(quarterDataList) - 1; i >= 0; i-- {
 				// 插值成日度
 				dataTimeList, _, err = HandleDataByLinearRegressionToList(quarterDataList[i].DataList, handleDataMap)
 				if err != nil {
@@ -3702,8 +3701,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 						err = errors.New("时间格式化异常, Err:" + e.Error())
 						return
 					}
-					yearRange := time.Now().Year() - seasonConfig.SamePeriodAverage.Year
-					startYear := time.Now().AddDate(-yearRange, 0, 0).Year()
+					startYear := time.Now().AddDate(-seasonConfig.SamePeriodAverage.Year, 0, 0).Year()
 					if dateTime.Year() < startYear {
 						continue
 					}
@@ -3711,6 +3709,10 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 					if dateTime.Month() == 2 && dateTime.Day() == 29 {
 						continue
 					}
+					// 不包含当年
+					if quarterDataList[i].ChartLegend == strconv.Itoa(time.Now().Year()) {
+						continue
+					}
 					newDate := dateTime.AddDate(time.Now().Year()-dateTime.Year(), 0, 0)
 					// 处理均值
 					if value, ok := valueMap[newDate]; ok {
@@ -3753,8 +3755,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 
 		// 自定义同期标准差
 		if seasonConfig.SamePeriodStandardDeviation.Year > 1 && seasonConfig.SamePeriodStandardDeviation.Multiple > 0 {
-			yearRange := time.Now().Year() - seasonConfig.SamePeriodAverage.Year
-			startYear := time.Now().AddDate(-yearRange, 0, 0).Year()
+			startYear := time.Now().AddDate(-seasonConfig.SamePeriodStandardDeviation.Year, 0, 0).Year()
 
 			// 先算均值，再算标准差
 			handleDataMap := make(map[string]float64)

services/data/mysteel_chemical.go

@@ -847,3 +847,26 @@ func RefreshMysteelChemicalData(edbCode string) {
 		errMsg = resp.ErrMsg
 	}
 }
+
+// RefreshMysteelChemicalData 根据手工指标code刷新手工指标数据
+func HealthCheckMysteelChemicalApi() (isEnable bool, ErrMsg string, err error) {
+	url := utils.EDB_LIB_URL + "mysteel_chemical/handle/mysteel/api/check"
+
+	body, err := HttpPost(url, "", utils.ZhLangVersion)
+	if err != nil {
+		return
+	}
+	var resp models.BaseResponse
+	if err = json.Unmarshal(body, &resp); err != nil {
+		return
+	}
+	apiCheck, ok := resp.Data.(map[string]interface{})
+	if ok {
+		isEnable = apiCheck["IsEnable"].(bool)
+		ErrMsg = apiCheck["ErrMsg"].(string)
+	} else {
+		err = errors.New("钢联api接口不可用")
+	}
+
+	return
+}