Merge branch 'hotfix/correl_chart_edb_delete' into debug

controllers/data_manage/chart_common.go

@@ -11,6 +11,7 @@ import (
 	"eta/eta_api/models"
 	"eta/eta_api/models/data_manage"
 	"eta/eta_api/models/system"
+	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/services/data"
 	"eta/eta_api/services/data/excel"
 	"eta/eta_api/utils"
@@ -297,7 +298,19 @@ func (this *ChartInfoController) CommonChartInfoDetailFromUniqueCode() {
 
 func getBalanceChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCache bool, sysUser *system.Admin) (resp *data_manage.ChartInfoDetailFromUniqueCodeResp, isOk bool, msg, errMsg string) {
 	resp = new(data_manage.ChartInfoDetailFromUniqueCodeResp)
-
+	defer func() {
+		if !isOk {
+			if errMsg != "" {
+				uniqueCode := ""
+				if chartInfo != nil {
+					uniqueCode = chartInfo.UniqueCode
+				}
+				tmpTip := fmt.Sprintf("查询图表详情失败，getBalanceChartInfoDetailFromUniqueCode UniqueCode:%s,err:%s", uniqueCode, errMsg)
+				utils.FileLog.Info(tmpTip)
+				go alarm_msg.SendAlarmMsg(tmpTip, 3)
+			}
+		}
+	}()
 	resp, isOk, msg, errMsg = data.CheckBalanceChartCacheAndPermission(chartInfo, isCache, sysUser)
 	if isOk {
 		return

controllers/data_manage/chart_info.go

@@ -8,6 +8,7 @@ import (
 	"eta/eta_api/models/data_manage/response"
 	"eta/eta_api/models/system"
 	"eta/eta_api/services"
+	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/services/data"
 	"eta/eta_api/services/data/data_manage_permission"
 	"eta/eta_api/services/data/excel"
@@ -2680,6 +2681,12 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 				}
 			}
 		}
+		if !isOk {
+			if errMsg != "" {
+				utils.FileLog.Info("查询图表详情失败，GetChartInfoDetailFromUniqueCode err:" + errMsg)
+				go alarm_msg.SendAlarmMsg("查询图表详情失败，GetChartInfoDetailFromUniqueCode,errmsg："+errMsg, 3)
+			}
+		}
 	}()
 
 	//判断是否存在缓存，如果存在缓存，那么直接从缓存中获取

controllers/data_manage/correlation/correlation_chart_info.go

@@ -7,6 +7,7 @@ import (
 	"eta/eta_api/models/data_manage"
 	"eta/eta_api/models/data_manage/correlation/request"
 	"eta/eta_api/models/system"
+	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/services/data"
 	correlationServ "eta/eta_api/services/data/correlation"
 	"eta/eta_api/services/data/data_manage_permission"
@@ -1559,6 +1560,17 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 				}
 			}
 		}
+		if !isOk {
+			if errMsg != "" {
+				uniqueCode := ""
+				if chartInfo != nil {
+					uniqueCode = chartInfo.UniqueCode
+				}
+				tmpTip := fmt.Sprintf("查询图表详情失败，correlation.GetChartInfoDetailFromUniqueCode UniqueCode:%s,err:%s", uniqueCode, errMsg)
+				utils.FileLog.Info(tmpTip)
+				go alarm_msg.SendAlarmMsg(tmpTip, 3)
+			}
+		}
 	}()
 
 	//判断是否存在缓存，如果存在缓存，那么直接从缓存中获取

controllers/data_manage/cross_variety/chart_info.go

@@ -9,6 +9,7 @@ import (
 	"eta/eta_api/models/data_manage/cross_variety/request"
 	"eta/eta_api/models/data_manage/cross_variety/response"
 	"eta/eta_api/models/system"
+	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/services/data"
 	"eta/eta_api/services/data/cross_variety"
 	"eta/eta_api/services/data/data_manage_permission"
@@ -1610,6 +1611,17 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 				}
 			}
 		}
+		if !isOk {
+			if errMsg != "" {
+				uniqueCode := ""
+				if chartInfo != nil {
+					uniqueCode = chartInfo.UniqueCode
+				}
+				tmpTip := fmt.Sprintf("查询图表详情失败，cross_variety.GetChartInfoDetailFromUniqueCode UniqueCode:%s,err:%s", uniqueCode, errMsg)
+				utils.FileLog.Info(tmpTip)
+				go alarm_msg.SendAlarmMsg(tmpTip, 3)
+			}
+		}
 	}()
 
 	//判断是否存在缓存，如果存在缓存，那么直接从缓存中获取

controllers/data_manage/future_good/future_good_chart_info.go

@@ -9,6 +9,7 @@ import (
 	"eta/eta_api/models/data_manage/future_good/request"
 	"eta/eta_api/models/system"
 	"eta/eta_api/services"
+	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/services/data"
 	"eta/eta_api/services/data/data_manage_permission"
 	future_goodServ "eta/eta_api/services/data/future_good"
@@ -1644,6 +1645,17 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 				}
 			}
 		}
+		if !isOk {
+			if errMsg != "" {
+				uniqueCode := ""
+				if chartInfo != nil {
+					uniqueCode = chartInfo.UniqueCode
+				}
+				tmpTip := fmt.Sprintf("查询图表详情失败，future_good.GetChartInfoDetailFromUniqueCode UniqueCode:%s,err:%s", uniqueCode, errMsg)
+				utils.FileLog.Info(tmpTip)
+				go alarm_msg.SendAlarmMsg(tmpTip, 3)
+			}
+		}
 	}()
 
 	//判断是否存在缓存，如果存在缓存，那么直接从缓存中获取

controllers/data_manage/future_good/future_good_profit_chart_info.go

@@ -8,6 +8,7 @@ import (
 	"eta/eta_api/models/data_manage/future_good/request"
 	"eta/eta_api/models/data_manage/future_good/response"
 	"eta/eta_api/models/system"
+	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/services/data"
 	"eta/eta_api/services/data/data_manage_permission"
 	future_goodServ "eta/eta_api/services/data/future_good"
@@ -1260,6 +1261,17 @@ func GetFutureGoodProfitChartInfoDetailFromUniqueCode(chartInfo *data_manage.Cha
 				}
 			}
 		}
+		if !isOk {
+			if errMsg != "" {
+				uniqueCode := ""
+				if chartInfo != nil {
+					uniqueCode = chartInfo.UniqueCode
+				}
+				tmpTip := fmt.Sprintf("查询图表详情失败，future_good.GetFutureGoodProfitChartInfoDetailFromUniqueCode UniqueCode:%s,err:%s", uniqueCode, errMsg)
+				utils.FileLog.Info(tmpTip)
+				go alarm_msg.SendAlarmMsg(tmpTip, 3)
+			}
+		}
 	}()
 
 	//判断是否存在缓存，如果存在缓存，那么直接从缓存中获取

controllers/data_manage/line_equation/line_chart_info.go

@@ -8,6 +8,7 @@ import (
 	"eta/eta_api/models/data_manage/line_equation/request"
 	"eta/eta_api/models/data_manage/line_equation/response"
 	"eta/eta_api/models/system"
+	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/services/data"
 	"eta/eta_api/services/data/data_manage_permission"
 	"eta/eta_api/services/data/line_equation"
@@ -1292,6 +1293,17 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 				}
 			}
 		}
+		if !isOk {
+			if errMsg != "" {
+				uniqueCode := ""
+				if chartInfo != nil {
+					uniqueCode = chartInfo.UniqueCode
+				}
+				tmpTip := fmt.Sprintf("查询图表详情失败，line_equation.GetChartInfoDetailFromUniqueCode UniqueCode:%s,err:%s", uniqueCode, errMsg)
+				utils.FileLog.Info(tmpTip)
+				go alarm_msg.SendAlarmMsg(tmpTip, 3)
+			}
+		}
 	}()
 
 	//判断是否存在缓存，如果存在缓存，那么直接从缓存中获取

controllers/data_manage/line_feature/chart_info.go

@@ -9,6 +9,7 @@ import (
 	"eta/eta_api/models/data_manage/line_feature/request"
 	"eta/eta_api/models/data_manage/line_feature/response"
 	"eta/eta_api/models/system"
+	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/services/data"
 	"eta/eta_api/services/data/data_manage_permission"
 	lineFeatureServ "eta/eta_api/services/data/line_feature"
@@ -2389,6 +2390,17 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 				}
 			}
 		}
+		if !isOk {
+			if errMsg != "" {
+				uniqueCode := ""
+				if chartInfo != nil {
+					uniqueCode = chartInfo.UniqueCode
+				}
+				tmpTip := fmt.Sprintf("查询图表详情失败，line_feature.GetChartInfoDetailFromUniqueCode UniqueCode:%s,err:%s", uniqueCode, errMsg)
+				utils.FileLog.Info(tmpTip)
+				go alarm_msg.SendAlarmMsg(tmpTip, 3)
+			}
+		}
 	}()
 
 	//判断是否存在缓存，如果存在缓存，那么直接从缓存中获取

controllers/data_manage/range_analysis/chart_info.go

@@ -7,6 +7,7 @@ import (
 	"eta/eta_api/models/data_manage"
 	"eta/eta_api/models/data_manage/chart_theme"
 	"eta/eta_api/models/system"
+	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/services/data"
 	"eta/eta_api/services/data/data_manage_permission"
 	rangeServ "eta/eta_api/services/data/range_analysis"
@@ -731,6 +732,17 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 				}
 			}
 		}
+		if !isOk {
+			if errMsg != "" {
+				uniqueCode := ""
+				if chartInfo != nil {
+					uniqueCode = chartInfo.UniqueCode
+				}
+				tmpTip := fmt.Sprintf("查询图表详情失败，range_analysis.GetChartInfoDetailFromUniqueCode UniqueCode:%s,err:%s", uniqueCode, errMsg)
+				utils.FileLog.Info(tmpTip)
+				go alarm_msg.SendAlarmMsg(tmpTip, 3)
+			}
+		}
 	}()
 
 	//判断是否存在缓存，如果存在缓存，那么直接从缓存中获取