Roc пре 4 месеци
родитељ
комит
7941d32dba
3 измењених фајлова са 12 додато и 10 уклоњено
  1. 4 1
      controllers/base_auth.go
  2. 1 1
      models/data_manage/edb_info.go
  3. 7 8
      services/data/edb_info.go

+ 4 - 1
controllers/base_auth.go

@@ -681,8 +681,11 @@ func checkToken(c *BaseAuthController) (isOk bool, token string, resp models.Bas
 
 	// 单点登录逻辑
 	aiUser := c.Ctx.GetCookie("ai_user")
+	if aiUser == `` {
+		aiUser = c.Ctx.GetCookie("ai_token")
+	}
 	fmt.Println("ai_user:", aiUser)
-	fmt.Println("token:", token)
+	//fmt.Println("token:", token)
 	if aiUser != "" {
 		// Token空了, 以Cookie为准重新登录
 		if token == `` {

+ 1 - 1
models/data_manage/edb_info.go

@@ -202,7 +202,7 @@ func GetEdbInfoByIdList(edbInfoIdList []int) (items []*EdbInfo, err error) {
 	}
 	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM edb_info WHERE edb_info_id in (` + utils.GetOrmInReplace(num) + `) `
-	err = o.Raw(sql, edbInfoIdList).Scan(&items).Error
+	err = o.Raw(sql, edbInfoIdList).Find(&items).Error
 
 	return
 }

+ 7 - 8
services/data/edb_info.go

@@ -239,10 +239,10 @@ func edbInfoRefreshAll(refreshAll bool, newBaseEdbInfoArr, newBasePredictEdbInfo
 		//source := bv.Source
 		//edbInfoId := bv.EdbInfoId
 		//edbCode := bv.EdbCode
-		fmt.Println(bv.StartDate)
-		if utils.TimeToFormatDate(bv.StartDate) == "0000-00-00" {
-			continue
-		}
+		//fmt.Println(bv.StartDate)
+		//if utils.TimeToFormatDate(bv.StartDate) == "0000-00-00" {
+		//	continue
+		//}
 		//开始时间
 		startDate = ``
 		if refreshAll { //刷新所有数据,那么就是从配置的开始时间开始刷新
@@ -284,7 +284,7 @@ func edbInfoRefreshAll(refreshAll bool, newBaseEdbInfoArr, newBasePredictEdbInfo
 			return fmt.Errorf("刷新失败, err:", errmsg)
 		}
 
-		fmt.Println("end newBaseEdbInfoArr:", bv, time.Now())
+		//fmt.Println("end newBaseEdbInfoArr:", bv, time.Now())
 	}
 
 	//刷新相关普通计算指标
@@ -395,7 +395,6 @@ func edbInfoRefreshAll(refreshAll bool, newBaseEdbInfoArr, newBasePredictEdbInfo
 		for _, v := range newBasePredictEdbInfoArr {
 			predictEdbInfoIdList = append(predictEdbInfoIdList, v.EdbInfoId)
 		}
-		fmt.Println("predictEdbConfCalculateMappingDetailList:", predictEdbInfoIdList)
 		predictEdbConfCalculateMappingDetailList, err := data_manage.GetPredictEdbConfCalculateMappingDetailListByEdbInfoId(predictEdbInfoIdList)
 		if err != nil {
 			errmsg = fmt.Sprint("更新动态环差值时,获取数据失败:" + err.Error())
@@ -413,7 +412,7 @@ func edbInfoRefreshAll(refreshAll bool, newBaseEdbInfoArr, newBasePredictEdbInfo
 				errmsg = fmt.Sprint(bv.EdbInfoId, "RefreshBasePredictEdbData err;msg:", result.Msg, ";errMsg:", result.ErrMsg)
 				return fmt.Errorf("刷新失败, err:%s", errmsg)
 			}
-			fmt.Println("end predictEdbConfCalculateMappingDetailList:", bv, time.Now())
+			//fmt.Println("end predictEdbConfCalculateMappingDetailList:", bv, time.Now())
 		}
 	}
 
@@ -632,7 +631,7 @@ func EdbInfoRefresh(edbInfo *data_manage.EdbInfoView, refreshAll bool) (err erro
 						errmsg = fmt.Sprint(bv.EdbInfoId, "RefreshBasePredictEdbData err;msg:", result.Msg, ";errMsg:", result.ErrMsg)
 						return fmt.Errorf("刷新失败, err:%s", errmsg)
 					}
-					fmt.Println("end predictEdbConfCalculateMappingDetailList:", bv, time.Now())
+					//fmt.Println("end predictEdbConfCalculateMappingDetailList:", bv, time.Now())
 				}
 			}
 		}