change gorm

controllers/data_manage/chart_info.go

@@ -3854,10 +3854,6 @@ func (this *EdbInfoController) GetBatchChartRefreshResult() {
 //	fmt.Println("end")
 //}
 
-//func init() {
-//	data.AddAllChartInfo()
-//}
-
 // 截面散点示例数据
 //func init() {
 //

controllers/data_manage/fix.go

@@ -0,0 +1,15 @@
+package data_manage
+
+func init() {
+
+	// 刷新指标
+	//data.AddOrEditAllEdbInfoToEs()
+
+	// 修复ETA图库
+	//data.AddAllChartInfo()
+
+	// 修复我的图库
+	//data.AddAllMyChartInfo()
+	//
+	//fmt.Println("修复完成")
+}

controllers/data_manage/line_feature/chart_info.go

@@ -226,7 +226,7 @@ func (this *LineFeaturesChartInfoController) MultipleGraphPreview() {
 	// 标准差图表信息
 	{
 		// 配置了数据才有返回
-		if req.StandardDeviation.CalculateValue > 0 {
+		if req.StandardDeviation.CalculateValue > 1 {
 			tmpChartInfo := *chartInfo
 			tmpChartInfo.ChartName = fmt.Sprintf("%s%d期滚动标准差", edbInfoMapping.EdbName, req.StandardDeviation.CalculateValue)
 
@@ -816,7 +816,7 @@ func (this *LineFeaturesChartInfoController) MultipleGraphConfigSaveChart() {
 			br.ErrMsg = "保存配置与图表的关联关系失败，ERR:" + err.Error()
 			return
 		}
-	} else if multipleGraphConfigChartMapping != nil {
+	} else if multipleGraphConfigChartMapping != nil && multipleGraphConfigChartMapping.MultipleGraphConfigId > 0 {
 		multipleGraphConfigChartMapping.ChartInfoId = chartInfo.ChartInfoId
 		multipleGraphConfigChartMapping.ModifyTime = time.Now()
 		err = multipleGraphConfigChartMapping.Update([]string{"ChartInfoId", "ModifyTime"})
@@ -1086,7 +1086,7 @@ func (this *LineFeaturesChartInfoController) MultipleGraphConfigSaveEdb() {
 			return
 		}
 		// 说明指标还在，没有被删除
-		if edbInfo != nil && !req.IsSaveAs {
+		if edbInfo != nil && edbInfo.EdbInfoId > 0 && !req.IsSaveAs {
 			edbInfoId = multipleGraphConfigEdbMapping.EdbInfoId
 			req.EdbName = edbInfo.EdbName
 			req.ClassifyId = edbInfo.ClassifyId
@@ -1472,7 +1472,7 @@ func (this *LineFeaturesChartInfoController) Move() {
 			br.ErrMsg = "移动失败,Err:" + tmpErr.Error()
 			return
 		}
-		if tmpChartInfo != nil {
+		if tmpChartInfo != nil && tmpChartInfo.ChartInfoId > 0 {
 			br.Msg = "移动失败，同一个分类下图表名称不允许重复"
 			br.ErrMsg = "移动失败，同一个分类下图表名称不允许重复"
 			return
@@ -1533,7 +1533,7 @@ func (this *LineFeaturesChartInfoController) Move() {
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstClassify != nil && firstClassify.Sort == 0 {
+		if firstClassify != nil && firstClassify.ChartClassifyId > 0 && firstClassify.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = data_manage.UpdateChartInfoSortByClassifyId(firstClassify.ChartClassifyId, 0, firstClassify.ChartInfoId-1, []int{utils.CHART_SOURCE_LINE_FEATURE_STANDARD_DEVIATION, utils.CHART_SOURCE_LINE_FEATURE_PERCENTILE, utils.CHART_SOURCE_LINE_FEATURE_FREQUENCY}, updateSortStr)
 		}
@@ -1924,7 +1924,7 @@ func (this *LineFeaturesChartInfoController) Detail() {
 	}
 
 	// 判断是否加入我的图库
-	if chartInfoId > 0 && chartInfo != nil {
+	if chartInfoId > 0 && chartInfo != nil && chartInfo.ChartInfoId > 0 {
 		{
 			var myChartCondition string
 			var myChartPars []interface{}
@@ -2418,7 +2418,7 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 		if !isOk {
 			if errMsg != "" {
 				uniqueCode := ""
-				if chartInfo != nil {
+				if chartInfo != nil && chartInfo.ChartInfoId > 0 {
 					uniqueCode = chartInfo.UniqueCode
 				}
 				tmpTip := fmt.Sprintf("查询图表详情失败，line_feature.GetChartInfoDetailFromUniqueCode UniqueCode:%s,err:%s", uniqueCode, errMsg)
@@ -2536,7 +2536,7 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 		return
 	}
 
-	if chartInfo.ChartInfoId > 0 && chartInfo != nil {
+	if chartInfo != nil && chartInfo.ChartInfoId > 0 {
 		//判断是否加入我的图库
 		{
 			var myChartCondition string

controllers/data_manage/my_chart.go

@@ -2293,10 +2293,6 @@ func (this *MyChartController) CompanyPublicClassifyList() {
 	br.Data = resp
 }
 
-//func init() {
-//	data.AddAllMyChartInfo()
-//}
-
 // ClassifyFrameworkNodeList
 // @Title 我的图表分类-关联的框架节点列表
 // @Description 我的图表分类-关联的框架节点列表

controllers/data_manage/predict_edb_info.go

@@ -2050,10 +2050,6 @@ func (this *PredictEdbInfoController) Modify() {
 //
 //}
 
-//func init() {
-//	data.AddOrEditAllEdbInfoToEs()
-//}
-
 // ClassifyEdbInfoItems
 // @Title 获取分类下指标接口
 // @Description 获取分类下指标接口

models/data_manage/chart_edb_mapping.go

@@ -110,9 +110,20 @@ func GetChartEdbMappingListByEdbInfoIdList(edbIdList []int) (list []*ChartEdbInf
 			unique_code, edb_info_type AS edb_info_category_type, max_value, min_value, edb_type, classify_id, 
 			is_join_permission
 			FROM edb_info
-			WHERE edb_info_id IN (` + utils.GetOrmInReplace(num) + `)
-			ORDER BY FIELD(edb_info_id, ` + utils.GetOrmInReplace(num) + `)`
-	err = o.Raw(sql, edbIdList).Find(&list).Error
+			WHERE edb_info_id IN (` + utils.GetOrmInReplace(num) + `)`
+
+	template := make([]string, num)
+	for i := 0; i < num; i++ {
+		template[i] = "?"
+	}
+	sql += ` ORDER BY FIELD(edb_info_id, ` + strings.Join(template, ",") + `) `
+	pars := make([]interface{}, 0)
+	pars = append(pars, edbIdList)
+	for _, v := range edbIdList {
+		pars = append(pars, v)
+	}
+
+	err = o.Raw(sql, pars...).Find(&list).Error
 	return
 }
 

models/data_manage/multiple_graph_config_chart_mapping.go

@@ -47,7 +47,7 @@ func GetMultipleGraphConfigChartMappingByIdAndSource(configId, source int) (item
 // GetMultipleGraphConfigChartMappingByChartId 根据图表id和来源获取关联关系
 func GetMultipleGraphConfigChartMappingByChartId(chartId int) (item *MultipleGraphConfigChartMapping, err error) {
 	o := global.DbMap[utils.DbNameIndex]
-	sql := `SELECT * FROM multiple_graph_config_chart_mapping WHERE chart_info_id = ?  `
+	sql := `SELECT * FROM multiple_graph_config_chart_mapping WHERE chart_info_id = ?  ORDER BY id desc`
 	err = o.Raw(sql, chartId).Find(&item).Error
 
 	return

models/data_manage/my_chart.go

@@ -318,27 +318,27 @@ type MyChartList struct {
 	UniqueCode          string `description:"图表唯一编码"`
 	CreateTime          time.Time
 	ModifyTime          time.Time
-	DateType            int    `description:"日期类型:1:00年至今,2:10年至今,3:15年至今，4：年初至今，5:自定义时间"`
-	StartDate           string `description:"自定义开始日期"`
-	EndDate             string `description:"自定义结束日期"`
-	IsSetName           int    `description:"设置名称"`
-	EdbInfoIds          string `description:"指标id"`
-	ChartType           int    `description:"生成样式:1:曲线图,2:季节性图"`
-	Calendar            string `description:"公历/农历"`
-	SeasonStartDate     string `description:"季节性图开始日期"`
-	SeasonEndDate       string `description:"季节性图开始日期"`
-	ChartImage          string `description:"图表图片"`
-	Sort                int    `description:"排序字段，数字越小越排前面"`
-	IsAdd               bool   `description:"true:已加入我的图库,false:未加入我的图库"`
-	MyChartClassifyName string `description:"分类名称，多个用英文逗号分割"`
-	MyChartClassifyId   string `description:"分类id，多个用英文逗号分割"`
-	EdbEndDate          string `description:"指标最新更新日期"`
-	IsEnChart           bool   `description:"是否展示英文标识"`
-	Disabled            int    `description:"是否禁用，0：启用，1：禁用，默认：0"`
-	Source              int    `description:"1：ETA图库；2：商品价格曲线"`
-	IsJoinPermission    int    `description:"是否加入权限管控，0：不加入；1：加入；默认：0"`
-	HaveOperaAuth       bool   `description:"是否有数据权限，默认：false"`
-	SearchText          string `description:"搜索结果（含高亮）"`
+	DateType            int     `description:"日期类型:1:00年至今,2:10年至今,3:15年至今，4：年初至今，5:自定义时间"`
+	StartDate           string  `description:"自定义开始日期"`
+	EndDate             string  `description:"自定义结束日期"`
+	IsSetName           int     `description:"设置名称"`
+	EdbInfoIds          string  `description:"指标id"`
+	ChartType           int     `description:"生成样式:1:曲线图,2:季节性图"`
+	Calendar            string  `description:"公历/农历"`
+	SeasonStartDate     string  `description:"季节性图开始日期"`
+	SeasonEndDate       string  `description:"季节性图开始日期"`
+	ChartImage          string  `description:"图表图片"`
+	Sort                float64 `description:"排序字段，数字越小越排前面"`
+	IsAdd               bool    `description:"true:已加入我的图库,false:未加入我的图库"`
+	MyChartClassifyName string  `description:"分类名称，多个用英文逗号分割"`
+	MyChartClassifyId   string  `description:"分类id，多个用英文逗号分割"`
+	EdbEndDate          string  `description:"指标最新更新日期"`
+	IsEnChart           bool    `description:"是否展示英文标识"`
+	Disabled            int     `description:"是否禁用，0：启用，1：禁用，默认：0"`
+	Source              int     `description:"1：ETA图库；2：商品价格曲线"`
+	IsJoinPermission    int     `description:"是否加入权限管控，0：不加入；1：加入；默认：0"`
+	HaveOperaAuth       bool    `gorm:"-" description:"是否有数据权限，默认：false"`
+	SearchText          string  `description:"搜索结果（含高亮）"`
 }
 
 type MyChartListResp struct {
@@ -1006,12 +1006,12 @@ func GetChartClassifyByIds(chartClassifyIds []string) (chart_classify_ids string
 FROM (
     SELECT chart_classify_id
     FROM chart_classify
-    WHERE chart_classify_id IN (` + utils.GetOrmInReplace(len(chartClassifyIds)) + `)
-    OR parent_id IN (` + utils.GetOrmInReplace(len(chartClassifyIds)) + `)
+    WHERE chart_classify_id IN (`+utils.GetOrmInReplace(len(chartClassifyIds))+`)
+    OR parent_id IN (`+utils.GetOrmInReplace(len(chartClassifyIds))+`)
     OR parent_id IN (
         SELECT chart_classify_id
         FROM chart_classify
-        WHERE parent_id IN (` + utils.GetOrmInReplace(len(chartClassifyIds)) + `)
+        WHERE parent_id IN (`+utils.GetOrmInReplace(len(chartClassifyIds))+`)
     )
 ) AS t;`, utils.GroupUnitFunc(utils.DbDriverName, "chart_classify_id", ",", false, "", "", true))
 	err = o.Raw(sql, chartClassifyIds, chartClassifyIds, chartClassifyIds).Scan(&chart_classify_ids).Error
@@ -1024,7 +1024,7 @@ func GetChartClassifyByIdsNoSubClassify(chartClassifyIds []string) (chart_classi
 FROM (
     SELECT chart_classify_id
     FROM chart_classify
-    WHERE chart_classify_id IN (` + utils.GetOrmInReplace(len(chartClassifyIds)) + `)
+    WHERE chart_classify_id IN (`+utils.GetOrmInReplace(len(chartClassifyIds))+`)
 ) AS t;`, utils.GroupUnitFunc(utils.DbDriverName, "chart_classify_id", ",", false, "", "", true))
 	err = o.Raw(sql, chartClassifyIds).Scan(&chart_classify_ids).Error
 	return