|
@@ -292,7 +292,7 @@ func (this *ChartInfoController) CommonChartInfoDetailFromUniqueCode() {
|
|
|
br.Msg = "获取成功"
|
|
|
br.Data = resp
|
|
|
case utils.CHART_SOURCE_AI_PREDICT_MODEL_DAILY, utils.CHART_SOURCE_AI_PREDICT_MODEL_MONTHLY:
|
|
|
- resp, isOk, msg, errMsg := GetAiPredictChartInfoDetailFromUniqueCode(chartInfo, isCache)
|
|
|
+ resp, isOk, msg, errMsg := GetAiPredictChartInfoDetailFromUniqueCode(chartInfo, isCache, sysUser.AdminId)
|
|
|
if !isOk {
|
|
|
if strings.Contains(errMsg, utils.ErrNoRow()) {
|
|
|
endInfoList := make([]*data_manage.ChartEdbInfoMapping, 0)
|
|
@@ -436,7 +436,7 @@ func (this *ChartInfoController) GeneralChartToken() {
|
|
|
}
|
|
|
|
|
|
// GetAiPredictChartInfoDetailFromUniqueCode 根据编码获取AI预测模型图表详情
|
|
|
-func GetAiPredictChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCache bool) (resp *data_manage.ChartInfoDetailFromUniqueCodeResp, isOk bool, msg, errMsg string) {
|
|
|
+func GetAiPredictChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCache bool, adminId int) (resp *data_manage.ChartInfoDetailFromUniqueCodeResp, isOk bool, msg, errMsg string) {
|
|
|
var err error
|
|
|
msg = "获取成功"
|
|
|
defer func() {
|
|
@@ -446,6 +446,25 @@ func GetAiPredictChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoV
|
|
|
errMsg = fmt.Sprintf(tips)
|
|
|
utils.FileLog.Info(tips)
|
|
|
}
|
|
|
+ // 判断是否加入我的图库
|
|
|
+ if isOk {
|
|
|
+ var myChartCondition string
|
|
|
+ var myChartPars []interface{}
|
|
|
+ myChartCondition += ` AND a.admin_id = ? AND a.chart_info_id = ?`
|
|
|
+ myChartPars = append(myChartPars, adminId, chartInfo.ChartInfoId)
|
|
|
+
|
|
|
+ myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
|
|
|
+ if err != nil && !utils.IsErrNoRow(err) {
|
|
|
+ msg = "获取失败"
|
|
|
+ errMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if myChartList != nil && len(myChartList) > 0 && resp != nil && resp.ChartInfo != nil {
|
|
|
+ resp.ChartInfo.IsAdd = true
|
|
|
+ resp.ChartInfo.MyChartId = myChartList[0].MyChartId
|
|
|
+ resp.ChartInfo.MyChartClassifyId = myChartList[0].MyChartClassifyId
|
|
|
+ }
|
|
|
+ }
|
|
|
}()
|
|
|
if chartInfo == nil {
|
|
|
err = fmt.Errorf("图表信息不存在")
|
|
@@ -528,6 +547,7 @@ func GetAiPredictChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoV
|
|
|
}
|
|
|
if chartDetail != nil && chartDetail.ChartInfo != nil {
|
|
|
chartDetail.ChartInfo.HaveOperaAuth = true
|
|
|
+ chartDetail.ChartInfo.UniqueCode = chartInfo.UniqueCode
|
|
|
}
|
|
|
resp.ChartInfo = chartDetail.ChartInfo
|
|
|
resp.EdbInfoList = chartDetail.EdbInfoList
|