change gorm

controllers/data_manage/chart_info.go

@@ -369,7 +369,7 @@ func (this *ChartInfoController) ChartEnInfoEdit() {
 				return
 			}
 		}
-		if edbInfo == nil {
+		if edbInfo == nil || edbInfo.EdbInfoId <= 0 {
 			br.Msg = "指标不存在！"
 			br.ErrMsg = "指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoId)
 			return
@@ -459,7 +459,7 @@ func (this *ChartInfoController) ChartEnInfoEdit() {
 				return
 			}
 		}
-		if edbInfo != nil {
+		if edbInfo != nil && edbInfo.EdbInfoId > 0 {
 			go data.AddOrEditEdbInfoToEs(edbInfoId)
 		}
 	}
@@ -657,7 +657,7 @@ func (this *ChartInfoController) ChartInfoBaseEdit() {
 				return
 			}
 		}
-		if edbInfo != nil {
+		if edbInfo != nil && edbInfo.EdbInfoId > 0 {
 			go data.AddOrEditEdbInfoToEs(edbInfoId)
 		}
 	}
@@ -793,7 +793,7 @@ func (this *ChartInfoController) ChartInfoMove() {
 			br.ErrMsg = "移动失败,Err:" + tmpErr.Error()
 			return
 		}
-		if tmpChartInfo != nil {
+		if tmpChartInfo != nil && tmpChartInfo.ChartInfoId > 0 {
 			br.Msg = "移动失败，同一个分类下图表名称不允许重复"
 			br.ErrMsg = "移动失败，同一个分类下图表名称不允许重复"
 			return
@@ -854,7 +854,7 @@ func (this *ChartInfoController) ChartInfoMove() {
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于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{chartInfo.Source}, updateSortStr)
 		}
@@ -1030,7 +1030,7 @@ func (this *ChartInfoController) ChartInfoDetail() {
 	extraConfigStr := chartInfo.ExtraConfig
 	// 柱方图的一些配置
 	var barConfig data_manage.BarChartInfoReq
-	if chartInfo != nil && chartInfo.ChartType == 7 {
+	if chartInfo != nil && chartInfo.ChartInfoId > 0 && chartInfo.ChartType == 7 {
 		if chartInfo.BarConfig == `` {
 			br.Msg = "柱方图未配置"
 			br.ErrMsg = "柱方图未配置"
@@ -1130,7 +1130,7 @@ func (this *ChartInfoController) ChartInfoDetail() {
 		if len(warnEdbList) > 0 {
 			chartInfo.WarnMsg = `图表引用指标异常，异常指标：` + strings.Join(warnEdbList, "，")
 		}
-		if chartInfoId > 0 && chartInfo != nil {
+		if chartInfoId > 0 && chartInfo != nil && chartInfo.ChartInfoId > 0 {
 			//判断是否加入我的图库
 			{
 				var myChartCondition string
@@ -1361,7 +1361,7 @@ func (this *ChartInfoController) PreviewChartInfoDetail() {
 	extraConfigStr := chartInfo.ExtraConfig
 	// 柱方图的一些配置
 	var barConfig data_manage.BarChartInfoReq
-	if chartInfo != nil && chartInfo.ChartType == 7 {
+	if chartInfo != nil && chartInfo.ChartInfoId > 0 && chartInfo.ChartType == 7 {
 		if chartInfo.BarConfig == `` {
 			br.Msg = "柱方图未配置"
 			br.ErrMsg = "柱方图未配置"
@@ -1374,9 +1374,9 @@ func (this *ChartInfoController) PreviewChartInfoDetail() {
 			return
 		}
 		extraConfigStr = chartInfo.BarConfig
-	} else if chartInfo != nil && chartInfo.ChartType == utils.CHART_TYPE_SECTION_COMBINE {
+	} else if chartInfo != nil && chartInfo.ChartInfoId > 0 && chartInfo.ChartType == utils.CHART_TYPE_SECTION_COMBINE {
 		extraConfigStr = req.ExtraConfig
-	} else if chartInfo != nil && chartInfo.ChartType == utils.CHART_TYPE_AREA {
+	} else if chartInfo != nil && chartInfo.ChartInfoId > 0 && chartInfo.ChartType == utils.CHART_TYPE_AREA {
 		extraConfigStr = req.ExtraConfig
 	}
 
@@ -1700,7 +1700,7 @@ func (this *ChartInfoController) ChartInfoDetailV2() {
 	extraConfigStr := chartInfo.ExtraConfig
 	// 柱方图的一些配置
 	var barConfig data_manage.BarChartInfoReq
-	if chartInfo != nil && chartInfo.ChartType == 7 {
+	if chartInfo != nil && chartInfo.ChartInfoId > 0 && chartInfo.ChartType == 7 {
 		if chartInfo.BarConfig == `` {
 			br.Msg = "柱方图未配置"
 			br.ErrMsg = "柱方图未配置"
@@ -1740,7 +1740,7 @@ func (this *ChartInfoController) ChartInfoDetailV2() {
 		if len(warnEdbList) > 0 {
 			chartInfo.WarnMsg = `图表引用指标异常，异常指标：` + strings.Join(warnEdbList, "，")
 		}
-		if chartInfoId > 0 && chartInfo != nil {
+		if chartInfoId > 0 && chartInfo != nil && chartInfo.ChartInfoId > 0 {
 			//判断是否加入我的图库
 			{
 				var myChartCondition string
@@ -2842,7 +2842,7 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 	extraConfigStr := chartInfo.ExtraConfig //图表额外数据参数
 	var barConfig data_manage.BarChartInfoReq
 	// 柱方图的一些配置
-	if chartInfo != nil && chartInfo.ChartType == 7 {
+	if chartInfo != nil && chartInfo.ChartInfoId > 0 && chartInfo.ChartType == 7 {
 		if chartInfo.BarConfig == `` {
 			msg = "柱方图未配置"
 			errMsg = "柱方图未配置"
@@ -2888,7 +2888,7 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 	*/
 
 	chartViewClassify, _ := data_manage.GetChartClassifyViewById(chartInfo.ChartClassifyId)
-	if chartViewClassify != nil {
+	if chartViewClassify != nil && chartViewClassify.ChartClassifyId > 0 {
 		chartClassifyParent, _ := data_manage.GetChartClassifyViewById(chartClassify.ParentId)
 		chartInfo.ChartClassify = append(chartInfo.ChartClassify, chartClassifyParent)
 	}
@@ -3317,7 +3317,7 @@ func (this *ChartInfoController) CopyChartInfo() {
 				ChartStyle:    v.ChartStyle,
 				ChartColor:    v.ChartColor,
 				ChartWidth:    v.ChartWidth,
-				Source:        v.Source,
+				Source:        oldChartInfo.Source,
 				EdbAliasName:  v.EdbAliasName,
 				IsConvert:     v.IsConvert,
 				ConvertType:   v.ConvertType,
@@ -4247,7 +4247,7 @@ func (this *ChartInfoController) ChartInfoConvertDetail() {
 		extraConfigStr := chartInfo.ExtraConfig
 		// 柱方图的一些配置
 		var barConfig data_manage.BarChartInfoReq
-		if chartInfo != nil && chartInfo.ChartType == 7 {
+		if chartInfo != nil && chartInfo.ChartInfoId > 0 && chartInfo.ChartType == 7 {
 			if chartInfo.BarConfig == `` {
 				br.Msg = "柱方图未配置"
 				br.ErrMsg = "柱方图未配置"
@@ -4308,7 +4308,7 @@ func (this *ChartInfoController) ChartInfoConvertDetail() {
 		if len(warnEdbList) > 0 {
 			chartInfo.WarnMsg = `图表引用指标异常，异常指标：` + strings.Join(warnEdbList, "，")
 		}
-		if chartInfoId > 0 && chartInfo != nil {
+		if chartInfoId > 0 && chartInfo != nil && chartInfo.ChartInfoId > 0 {
 			//判断是否加入我的图库
 			{
 				var myChartCondition string

controllers/data_manage/excel/excel_info.go

@@ -3098,7 +3098,7 @@ func (c *ExcelInfoController) BatchRefresh() {
 	syncing, e := data.BatchRefreshEdbByEdbIds(edbIds, redisKey, refreshKeys)
 	if e != nil {
 		br.Msg = "刷新失败"
-		br.ErrMsg = "刷新表格关联指标信息失败，Err:" + err.Error()
+		br.ErrMsg = "刷新表格关联指标信息失败，Err:" + e.Error()
 		return
 	}
 

models/data_manage/chart_edb_mapping.go

@@ -276,9 +276,10 @@ func GetChartEdbMappingByFutureGoodEdbInfoId(edbInfoId int) (item *ChartEdbInfoM
 // @author: Roc
 // @datetime 2023-12-11 17:23:32
 // @param chartInfoId int
+// @param chartSource int
 // @param edbInfoList []*EdbInfo
 // @return err error
-func ModifyChartEdbMapping(chartInfoId int, edbInfoList []*EdbInfo) (err error) {
+func ModifyChartEdbMapping(chartInfoId, chartSource int, edbInfoList []*EdbInfo) (err error) {
 	o := global.DbMap[utils.DbNameIndex].Begin()
 	if err != nil {
 		return
@@ -336,7 +337,7 @@ func ModifyChartEdbMapping(chartInfoId int, edbInfoList []*EdbInfo) (err error)
 			//ChartStyle:  v.ChartStyle,
 			//ChartColor:  v.ChartColor,
 			//ChartWidth:  v.ChartWidth,
-			Source: v.Source,
+			Source: chartSource,
 		})
 	}
 

models/data_manage/chart_info.go

@@ -1138,7 +1138,7 @@ func EditChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr string, calenda
 			fmt.Println("QueryRow Err:", err.Error())
 			return err
 		}
-		if tmpChartEdbMapping != nil {
+		if tmpChartEdbMapping != nil && tmpChartEdbMapping.ChartEdbMappingId > 0 {
 			chartEdbMappingIdList = append(chartEdbMappingIdList, strconv.Itoa(tmpChartEdbMapping.ChartEdbMappingId))
 			tmpChartEdbMapping.ModifyTime = time.Now()
 			tmpChartEdbMapping.MaxData = v.MaxData

models/data_manage/lz_data.go

@@ -94,8 +94,8 @@ type LzProductList struct {
 }
 
 type LzProductData struct {
-	InputValue string `description:"日期"`
-	DataTime   string `description:"值"`
+	InputValue float64 `description:"日期"`
+	DataTime   string  `description:"值"`
 }
 
 func (m *LzProductData) AfterFind(db *gorm.DB) (err error) {

models/english_company.go

@@ -160,7 +160,7 @@ FROM
 	english_company_todo 
 WHERE
 	is_delete = 0 
-	AND STATUS != "已作废"
+	AND STATUS != '已作废'
 GROUP BY
 	company_id 
 	) AS a

services/data/chart_info.go

@@ -73,7 +73,7 @@ func ChartInfoRefreshV1(chartInfoId int) (err error) {
 	// 刷新相关计算指标
 	for _, v := range calculateArr {
 		edbInfo := calculateMap[v]
-		if edbInfo == nil {
+		if edbInfo == nil || edbInfo.EdbInfoId <= 0 {
 			return err
 		}
 		err, errmsg = refreshCalculateEdbInfo(edbInfo)
@@ -145,7 +145,7 @@ func BatchChartInfoRefresh(chartInfoList []*data_manage.ChartInfo) (err error) {
 	// 刷新相关计算指标
 	for _, v := range calculateArr {
 		edbInfo := calculateMap[v]
-		if edbInfo == nil {
+		if edbInfo == nil || edbInfo.EdbInfoId <= 0 {
 			return err
 		}
 		err, errmsg = refreshCalculateEdbInfo(edbInfo)
@@ -2318,7 +2318,7 @@ func AddChartInfo(req data_manage.AddChartInfoReq, sysUserId int, sysUserRealNam
 		errMsg = "获取分类信息失败"
 		return
 	}
-	if chartClassify == nil {
+	if chartClassify == nil || chartClassify.ChartClassifyId <= 0 {
 		errMsg = "分类不存在"
 		err = errors.New(errMsg)
 		return
@@ -2353,7 +2353,7 @@ func AddChartInfo(req data_manage.AddChartInfoReq, sysUserId int, sysUserRealNam
 				}
 			}
 
-			if edbInfo == nil {
+			if edbInfo == nil || edbInfo.EdbInfoId <= 0 {
 				errMsg = "指标已被删除，请重新选择！"
 				err = errors.New("指标不存在，edbInfoId:" + strconv.Itoa(edbInfoId))
 				return
@@ -2699,7 +2699,7 @@ func EditChartInfo(req data_manage.EditChartInfoReq, sysUser *system.Admin, lang
 		errMsg = "获取分类信息失败"
 		return
 	}
-	if chartClassify == nil {
+	if chartClassify == nil || chartClassify.ChartClassifyId <= 0 {
 		errMsg = "分类不存在"
 		err = errors.New(errMsg)
 		return
@@ -2749,7 +2749,7 @@ func EditChartInfo(req data_manage.EditChartInfoReq, sysUser *system.Admin, lang
 				}
 			}
 
-			if edbInfo == nil {
+			if edbInfo == nil || edbInfo.EdbInfoId <= 0 {
 				errMsg = "指标已被删除，请重新选择！"
 				err = errors.New("指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoId))
 				return

services/data/cross_variety/chart.go

@@ -1182,7 +1182,7 @@ func ModifyChartEdbMapping(tagId int) {
 			}
 		}
 
-		tmpErr := data_manage.ModifyChartEdbMapping(v.ChartInfoId, edbInfoList)
+		tmpErr := data_manage.ModifyChartEdbMapping(v.ChartInfoId, utils.CHART_SOURCE_CROSS_HEDGING, edbInfoList)
 		if tmpErr != nil {
 			errMsgList = append(errMsgList, fmt.Sprint("修改", v.ChartInfoId, "失败，err:", tmpErr))
 		}

services/data/range_analysis/chart_info.go

@@ -1569,7 +1569,7 @@ func CopyChartInfo(classifyId int, chartName string, oldChartInfo *data_manage.C
 				ChartStyle:    v.ChartStyle,
 				ChartColor:    v.ChartColor,
 				ChartWidth:    v.ChartWidth,
-				Source:        v.Source,
+				Source:        oldChartInfo.Source,
 				EdbAliasName:  v.EdbAliasName,
 				IsConvert:     v.IsConvert,
 				ConvertType:   v.ConvertType,