fix

controllers/data_manage/chart_info.go

@@ -3552,282 +3552,6 @@ func (this *EdbInfoController) GetBatchChartRefreshResult() {
 
 }
 
-//
-//修复数据时间戳
-
-//func init() {
-//	fmt.Println("start")
-//	edbInfoList,err:=data_manage.GetEdbInfo()
-//	if err!=nil {
-//		fmt.Println("Err:",err.Error())
-//		return
-//	}
-//	startDate:=time.Now().AddDate(-40,0,0).Format(utils.FormatDate)
-//	endDate:=time.Now().Format(utils.FormatDate)
-//	for _,v:=range edbInfoList{
-//		dataList,err:=data_manage.GetEdbDataList(v.Source,v.EdbInfoId,startDate,endDate)
-//		if err!=nil {
-//			fmt.Println("GetEdbDataList Err:",err.Error())
-//			return
-//		}
-//		for _,dv:=range dataList{
-//			dataTime,err:=time.Parse(utils.FormatDate,dv.DataTime)
-//			if err!=nil {
-//				fmt.Println("time.Parse Err:"+err.Error())
-//				return
-//			}
-//			timestamp:=dataTime.UnixNano()/1e6
-//			err=data_manage.ModifyEdbDatadTimestamp(v.Source,dv.EdbDataId,timestamp)
-//			if err!=nil{
-//				fmt.Println("ModifyEdbDatadTimestamp Err:"+err.Error())
-//				return
-//			}
-//			fmt.Println(v.Source,dv.EdbDataId,timestamp)
-//		}
-//	}
-//	//time.Sleep(2*time.Minute)
-//
-//	//startDate:=time.Now().AddDate(-30,0,0).Format(utils.FormatDate)
-//	//endDate:=time.Now().Format(utils.FormatDate)
-//	//dataList,err:=data_manage.GetEdbDataList(1,100099,startDate,endDate)
-//	//if err!=nil {
-//	//	fmt.Println("GetEdbDataList Err:",err.Error())
-//	//	return
-//	//}
-//	//for _,dv:=range dataList{
-//	//	dataTime,err:=time.Parse(utils.FormatDate,dv.DataTime)
-//	//	if err!=nil {
-//	//		fmt.Println("time.Parse Err:"+err.Error())
-//	//		return
-//	//	}
-//	//	timestamp:=dataTime.UnixNano()/1e6
-//	//	err=data_manage.ModifyEdbDatadTimestamp(2,dv.EdbDataId,timestamp)
-//	//	if err!=nil{
-//	//		fmt.Println("ModifyEdbDatadTimestamp Err:"+err.Error())
-//	//		return
-//	//	}
-//	//	fmt.Println(2,dv.EdbDataId,timestamp)
-//	//}
-//
-//	fmt.Println("end")
-//}
-
-//修复指标配置数据
-//func init() {
-//	fmt.Println("start")
-//	edbInfo, err := data_manage.GetEdbInfoAll()
-//	fmt.Println(err)
-//	for k, v := range edbInfoAll {
-//		fmt.Println(k, v.EdbInfoId)
-//		item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
-//		fmt.Println(item, err)
-//		err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
-//		if err != nil {
-//			fmt.Println("ModifyEdbInfoMaxAndMinInfo Err:" + err.Error())
-//		}
-//	}
-//	fmt.Println("end")
-//}
-
-//func init() {
-//	fmt.Println("start")
-//	var yearArr []int
-//	yearArr = append(yearArr, 2021)
-//	yearArr = append(yearArr, 2010)
-//	yearArr = append(yearArr, 2020)
-//	yearArr = append(yearArr, 2017)
-//	yearArr = append(yearArr, 2019)
-//	sort.Sort(sort.Reverse(sort.IntSlice(yearArr)))
-//	fmt.Println(yearArr)
-//	fmt.Println("end")
-//}
-
-//季度指标数据计算(公历转农历)
-//func init() {
-//	fmt.Println("start AddCalculateQuarter")
-//	list:=make([]*data_manage.EdbDataList,0)
-//	data_manage.AddCalculateQuarterV4(list)
-//	fmt.Println("end AddCalculateQuarter")
-//	//return
-//}
-
-/*
-{
-  "ChartClassifyId": 58,
-  "ChartName": "公历转农历6",
-  "ChartType": 2,
-  "ChartEdbInfoList": [
-    {
-      "ChartColor": "#00f",
-      "ChartStyle": "spline",
-      "ChartWidth": 3,
-      "EdbInfoId": 100466,
-      "EdbInfoType": 1,
-      "IsAxis": 1,
-      "IsOrder": false,
-      "LeadUnit": "",
-      "LeadValue": 0,
-      "MaxData": 0.2943,
-      "MinData": -0.2448
-    }
-  ]
-}
-*/
-//func init() {
-//	fmt.Println("start")
-//	data_manage.AddCalculateQuarter(100466,6,"C2108252836")
-//	fmt.Println("end")
-//}
-
-//func init() {
-//	data.AddAllChartInfo()
-//}
-
-// 截面散点示例数据
-//func init() {
-//
-//	seriesList := []data_manage.SectionScatterSeriesItemReq{
-//		{
-//			Name:  "系列1名称",
-//			Color: "红红火火色",
-//			EdbList: []data_manage.SectionScatterEdbItemReq{
-//				{
-//					XEdbInfoId: 1,
-//					YEdbInfoId: 2,
-//					Name:       "破铜",
-//					NameEn:     "Po Tong",
-//					XDateType:  1,
-//					XDate:      "",
-//					XDateValue: 0,
-//					YDateType:  2,
-//					YDate:      "",
-//					YDateValue: 30,
-//					IsShow:     false,
-//				},
-//				{
-//					XEdbInfoId: 3,
-//					YEdbInfoId: 4,
-//					Name:       "烂铁",
-//					NameEn:     "Lan Tie",
-//					XDateType:  2,
-//					XDate:      "",
-//					XDateValue: 30,
-//					YDateType:  3,
-//					YDate:      "2023-02-17",
-//					YDateValue: 0,
-//					IsShow:     false,
-//				},
-//			},
-//			ShowLine:     false,
-//			ShowEquation: false,
-//			ShowR:        false,
-//		},
-//		{
-//			Name:  "系列2名称",
-//			Color: "恍恍惚惚色",
-//			EdbList: []data_manage.SectionScatterEdbItemReq{
-//				{
-//					XEdbInfoId: 1,
-//					YEdbInfoId: 2,
-//					Name:       "破铜",
-//					NameEn:     "Po Tong",
-//					XDateType:  3,
-//					XDate:      "2023-02-17",
-//					XDateValue: 0,
-//					YDateType:  2,
-//					YDate:      "",
-//					YDateValue: 60,
-//					IsShow:     true,
-//				},
-//				{
-//					XEdbInfoId: 3,
-//					YEdbInfoId: 4,
-//					Name:       "烂铁",
-//					NameEn:     "Lan Tie",
-//					XDateType:  3,
-//					XDate:      "2023-02-17",
-//					XDateValue: 0,
-//					YDateType:  2,
-//					YDate:      "",
-//					YDateValue: 60,
-//					IsShow:     false,
-//				},
-//			},
-//			ShowLine:     false,
-//			ShowEquation: false,
-//			ShowR:        false,
-//		},
-//	}
-//	rel := data_manage.SectionScatter{
-//		XName:       "X轴名称",
-//		XNameEn:     "X english name",
-//		XUnitName:   "X轴单位",
-//		XUnitNameEn: "X unit english name",
-//		YName:       "Y轴名称",
-//		YNameEn:     "Y english name",
-//		YUnitName:   "Y轴单位",
-//		YUnitNameEn: "Y unit english name",
-//		SeriesList:  seriesList,
-//	}
-//	jsonByte, _ := json.Marshal(rel)
-//	utils.FileLog.Info(string(jsonByte))
-//}
-
-//	func init() {
-//		var a, b float64
-//
-//		testX := []float64{1, 3, 8, 7, 9}
-//		testY := []float64{10, 12, 24, 21, 34}
-//		{
-//			coordinateData := make([]utils.Coordinate, 0)
-//			for k, x := range testX {
-//				tmpCoordinate1 := utils.Coordinate{
-//					X: x,
-//					Y: testY[k],
-//				}
-//				coordinateData = append(coordinateData, tmpCoordinate1)
-//			}
-//			a, b = utils.GetLinearResult(coordinateData)
-//			trendLine := fmt.Sprintf("y=%sx+%s", utils.SubFloatToString(a, 4), utils.SubFloatToString(b, 4))
-//
-//			fmt.Println(trendLine)
-//		}
-//
-//		{
-//			r2 := utils.CalculationDecisive(testX, testY)
-//			fmt.Println(r2)
-//		}
-//	}
-
-// FixChart 修复季节性图的日期数据
-//func FixChart() {
-//	var condition string
-//	var pars []interface{}
-//
-//	// 普通图表
-//	condition += ` AND chart_type = ? AND season_start_date != "" `
-//	pars = append(pars, 2)
-//
-//	//获取图表信息
-//	list, err := data_manage.GetChartInfoListByCondition(condition, pars, 0, 10000)
-//	if err != nil {
-//		fmt.Println("err:", err)
-//		return
-//	}
-//
-//	for _, v := range list {
-//		fmt.Println(v)
-//		v.SeasonStartDate = v.SeasonStartDate + "-01"
-//		v.SeasonEndDate = v.SeasonEndDate + "-12"
-//		err = v.Update([]string{"SeasonStartDate", "SeasonEndDate"})
-//		if err != nil {
-//			fmt.Println(v.ChartInfoId, ";", v.ChartName, "修改失敗")
-//		}
-//		data.EsAddOrEditChartInfo(v.ChartInfoId)
-//		data.EsAddOrEditMyChartInfoByChartInfoId(v.ChartInfoId)
-//	}
-//}
-
 // PreviewRadarChartInfo
 // @Title 图表-获取预览的雷达图
 // @Description 图表-获取预览的雷达图
@@ -4489,3 +4213,13 @@ func (this *ChartInfoController) ChartInfoImgSetBySvg() {
 	br.Data = resp
 	return
 }
+
+// 修复ES中的指标和图表数据
+//func init() {
+//	// 更新ES中的指标数据
+//	data.AddOrEditAllEdbInfoToEs()
+//	// 更新es中的图表数据
+//	data.AddAllChartInfo()
+//
+//	fmt.Println("全部es数据修复完成")
+//}

controllers/data_manage/predict_edb_info.go

@@ -1865,73 +1865,6 @@ func (this *PredictEdbInfoController) Modify() {
 	br.IsAddLog = true
 }
 
-//func init() {
-//	r := new(regression.Regression)
-//	r.SetObserved("Murders per annum per 1,000,000 inhabitants")
-//	r.SetVar(0, "Inhabitants")
-//	r.SetVar(1, "Percent with incomes below $5000")
-//	r.SetVar(2, "Percent unemployed")
-//	r.Train(
-//		regression.DataPoint(11.2, []float64{587000, 16.5, 6.2}),
-//		regression.DataPoint(13.4, []float64{643000, 20.5, 6.4}),
-//		regression.DataPoint(40.7, []float64{635000, 26.3, 9.3}),
-//		regression.DataPoint(5.3, []float64{692000, 16.5, 5.3}),
-//		regression.DataPoint(24.8, []float64{1248000, 19.2, 7.3}),
-//		regression.DataPoint(12.7, []float64{643000, 16.5, 5.9}),
-//		regression.DataPoint(20.9, []float64{1964000, 20.2, 6.4}),
-//		regression.DataPoint(35.7, []float64{1531000, 21.3, 7.6}),
-//		regression.DataPoint(8.7, []float64{713000, 17.2, 4.9}),
-//		regression.DataPoint(9.6, []float64{749000, 14.3, 6.4}),
-//		regression.DataPoint(14.5, []float64{7895000, 18.1, 6}),
-//		regression.DataPoint(26.9, []float64{762000, 23.1, 7.4}),
-//		regression.DataPoint(15.7, []float64{2793000, 19.1, 5.8}),
-//		regression.DataPoint(36.2, []float64{741000, 24.7, 8.6}),
-//		regression.DataPoint(18.1, []float64{625000, 18.6, 6.5}),
-//		regression.DataPoint(28.9, []float64{854000, 24.9, 8.3}),
-//		regression.DataPoint(14.9, []float64{716000, 17.9, 6.7}),
-//		regression.DataPoint(25.8, []float64{921000, 22.4, 8.6}),
-//		regression.DataPoint(21.7, []float64{595000, 20.2, 8.4}),
-//		regression.DataPoint(25.7, []float64{3353000, 16.9, 6.7}),
-//	)
-//	r.Run()
-//
-//	fmt.Printf("Regression formula:\n%v\n", r.Formula)
-//	//fmt.Printf("Regression:\n%s\n", r)
-//}
-
-//func init() {
-//	//data := []float64{4080, 4070, 4070, 4020, 4020, 4010, 3950, 3980, 4000, 3990, 4020}
-//	//median, _ := stats.Median(data)
-//	//fmt.Println(median) // 3.65
-//	//stats.LinearRegression()
-//
-//	//data := []float64{ , , , , , , , , }
-//
-//	data := []Coordinate{
-//		{1, 4080},
-//		{2, 4070},
-//		{3, 4070},
-//		{4, 4020},
-//		{5, 4020},
-//		{6, 4010},
-//		{7, 3950},
-//		{8, 3980},
-//		{9, 4000},
-//		{10, 3990},
-//		{11, 4020},
-//	}
-//
-//	//r, _ := ct(data)
-//
-//	ct(data)
-//	//fmt.Println(r)
-//
-//}
-
-//func init() {
-//	data.AddOrEditAllEdbInfoToEs()
-//}
-
 // ClassifyEdbInfoItems
 // @Title 获取分类下指标接口
 // @Description 获取分类下指标接口

services/data/chart_info_elastic.go

@@ -9,6 +9,23 @@ import (
 	"strings"
 )
 
+// AddAllChartInfo
+// @Description: 更新es中的所有的图表数据
+// @author: Roc
+// @datetime 2024-11-20 13:11:35
+func AddAllChartInfo() {
+	allList, err := data_manage.GetChartInfoAllList()
+	if err != nil {
+		fmt.Println("GetArticleAll Err:", err.Error())
+		return
+	}
+	total := len(allList)
+	for k, v := range allList {
+		EsAddOrEditChartInfo(v.ChartInfoId)
+		fmt.Println("剩余", total-k-1, "条图表数据，当前图表id：", v.ChartInfoId)
+	}
+}
+
 // EsAddOrEditChartInfo 新增和修改ES中的图表数据
 func EsAddOrEditChartInfo(chartInfoId int) {
 	var err error

services/data/edb_info.go

@@ -706,6 +706,16 @@ func AddOrEditEdbInfoToEs(edbInfoId int) {
 	go elastic.EsAddOrEditEdbInfoData(utils.DATA_INDEX_NAME, strconv.Itoa(itemInfo.EdbInfoId), itemInfo)
 }
 
+// AddOrEditAllEdbInfoToEs 修复ES中的所有指标
+func AddOrEditAllEdbInfoToEs() {
+	//添加es
+	total, itemInfoList, _ := data_manage.GetEdbInfoFilterList("", []interface{}{}, 0, 100000)
+	for k, itemInfo := range itemInfoList {
+		elastic.EsAddOrEditEdbInfoData(utils.DATA_INDEX_NAME, strconv.Itoa(itemInfo.EdbInfoId), itemInfo)
+		fmt.Println("剩余", int(total)-k-1, "条指标数据")
+	}
+}
+
 // DeleteEdbInfoToEs 删除ES中的指标
 func DeleteEdbInfoToEs(edbInfoId int) {
 	//添加es