修复高斯数据库兼容

controllers/data_manage/supply_analysis/variety_edb.go

@@ -251,6 +251,7 @@ func (this *VarietyController) AddToEdb() {
 	edbCode := fmt.Sprint(prefixCode, varietyEdbInfo.Source, suffixCode)
 	edbInfo, err, errMsg, isSendEmail := data.EdbInfoAdd(utils.DATA_SOURCE_STOCK_PLANT, utils.DATA_SUB_SOURCE_EDB, req.ClassifyId, edbCode, req.EdbName, req.Frequency, req.Unit, varietyEdbInfo.StartDate.Format(utils.FormatDate), varietyEdbInfo.EndDate.Format(utils.FormatDate), sysUser.AdminId, sysUser.RealName, this.Lang)
 	if err != nil {
+		fmt.Println("EdbInfoAdd Err:" + err.Error())
 		br.Msg = "保存失败"
 		if errMsg != `` {
 			br.Msg = errMsg
@@ -268,6 +269,7 @@ func (this *VarietyController) AddToEdb() {
 		varietyEdbInfo.ModifyTime = time.Now()
 		err = varietyEdbInfo.Update([]string{"EdbInfoId", "EdbCode", "EdbName", "ModifyTime"})
 		if err != nil {
+			fmt.Println("varietyEdbInfo.Update Err:" + err.Error())
 			br.Msg = "保存失败"
 			br.ErrMsg = "修改指标信息失败,err:" + err.Error()
 			return

models/db.go

@@ -90,8 +90,8 @@ func init() {
 		orm.SetMaxIdleConns("ai", 50)
 		orm.SetMaxOpenConns("ai", 100)
 
-		weeklyDb, _ := orm.GetDB("ai")
-		weeklyDb.SetConnMaxLifetime(10 * time.Minute)
+		aiDb, _ := orm.GetDB("ai")
+		aiDb.SetConnMaxLifetime(10 * time.Minute)
 	}
 
 	orm.Debug = true

services/data/edb_info.go

@@ -1878,13 +1878,15 @@ func EdbInfoAdd(source, subSource, classifyId int, edbCode, edbName, frequency,
 	edbInfo.Frequency = frequency
 	edbInfo.Unit = unit
 	edbInfo.UnitEn = unit
-	edbInfo.StartDate = startDate
-	edbInfo.EndDate = endDate
+	edbInfo.StartDate = utils.BASE_START_DATE
+	edbInfo.EndDate = utils.BASE_START_DATE
 	edbInfo.ClassifyId = classifyId
 	edbInfo.SysUserId = sysUserId
 	edbInfo.SysUserRealName = sysUserRealName
 	edbInfo.CreateTime = time.Now()
 	edbInfo.ModifyTime = time.Now()
+	edbInfo.BaseModifyTime = time.Now()
+	edbInfo.SetUpdateTime = time.Now()
 	edbInfo.ServerUrl = serverUrl
 	edbInfo.Sort = maxSort + 1
 	edbInfo.DataDateType = `交易日`
@@ -1898,8 +1900,12 @@ func EdbInfoAdd(source, subSource, classifyId int, edbCode, edbName, frequency,
 		edbInfo.MinValue = itemVal.MinValue
 	}
 	edbInfo.EdbType = edbType
+	edbInfo.LatestDate = utils.BASE_START_DATE
+	edbInfo.ErDataUpdateDate = utils.BASE_START_DATE
+	edbInfo.DataUpdateTime = time.Now().Format(utils.FormatDateTime)
 	edbInfoId, err := data_manage.AddEdbInfo(edbInfo)
 	if err != nil {
+		fmt.Println("AddEdbInfo Err:" + err.Error())
 		errMsg = "保存失败"
 		err = errors.New("保存失败，Err:" + err.Error())
 		return
@@ -1910,13 +1916,19 @@ func EdbInfoAdd(source, subSource, classifyId int, edbCode, edbName, frequency,
 
 	maxAndMinItem, _ := data_manage.GetEdbInfoMaxAndMinInfo(source, subSource, edbCode)
 	if maxAndMinItem != nil {
+		if maxAndMinItem.MinDate == "" {
+			maxAndMinItem.MinDate = utils.BASE_START_DATE
+		}
+		if maxAndMinItem.MaxDate == "" {
+			maxAndMinItem.MaxDate = utils.BASE_START_DATE
+		}
 		err = data_manage.ModifyEdbInfoMaxAndMinInfo(int(edbInfoId), maxAndMinItem)
 	}
 
-	//添加es
-	AddOrEditEdbInfoToEs(int(edbInfoId))
-
-	go handleByAddEdbInfo(edbInfo)
+	////添加es
+	//AddOrEditEdbInfoToEs(int(edbInfoId))
+	//
+	//go handleByAddEdbInfo(edbInfo)
 
 	return
 }

services/residual_analysis_service/residual_analysis_service.go

@@ -741,8 +741,15 @@ func SaveResidualAnalysis(req residual_analysis_model.ResidualAnalysisIndexSaveR
 			return fmt.Errorf("指标名称重复")
 		}
 
+		if startDate == "" {
+			startDate = utils.BASE_START_DATE
+		}
+		if indexLatestDate == "" {
+			indexLatestDate = utils.BASE_START_DATE
+		}
 		// 须补充更新指标最大值，最小值，数据最新时间，数据最新值
 		edbInfo.StartDate = startDate
+		edbInfo.StartDate = utils.BASE_START_DATE
 		edbInfo.EndDate = indexLatestDate
 		edbInfo.MaxValue = indexMax
 		edbInfo.MinValue = indexMin
@@ -776,30 +783,35 @@ func SaveResidualAnalysis(req residual_analysis_model.ResidualAnalysisIndexSaveR
 		timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 
 		edbInfoId, err = data_manage.AddEdbInfo(&data_manage.EdbInfo{
-			EdbCode:         edbCode,
-			UniqueCode:      utils.MD5(utils.CHART_PREFIX + "_" + timestamp),
-			EdbName:         req.EdbName,
-			EdbNameEn:       req.EdbNameEn,
-			ClassifyId:      req.ClassifyId,
-			EdbType:         2,
-			Unit:            req.Unit,
-			UnitEn:          req.UnitEn,
-			Frequency:       req.Frequency,
-			Source:          req.Source,
-			SourceName:      "残差分析",
-			Calendar:        req.Calendar,
-			SysUserRealName: sysUser.RealName,
-			SysUserId:       sysUser.AdminId,
-			StartDate:       startDate,
-			EndDate:         indexLatestDate,
-			LatestDate:      indexLatestDate,
-			LatestValue:     indexLatestValue,
-			MinValue:        indexMin,
-			MaxValue:        indexMax,
-			CreateTime:      time.Now(),
-			ModifyTime:      time.Now(),
+			EdbCode:          edbCode,
+			UniqueCode:       utils.MD5(utils.CHART_PREFIX + "_" + timestamp),
+			EdbName:          req.EdbName,
+			EdbNameEn:        req.EdbNameEn,
+			ClassifyId:       req.ClassifyId,
+			EdbType:          2,
+			Unit:             req.Unit,
+			UnitEn:           req.UnitEn,
+			Frequency:        req.Frequency,
+			Source:           req.Source,
+			SourceName:       "残差分析",
+			Calendar:         req.Calendar,
+			SysUserRealName:  sysUser.RealName,
+			SysUserId:        sysUser.AdminId,
+			StartDate:        startDate,
+			EndDate:          indexLatestDate,
+			LatestDate:       indexLatestDate,
+			LatestValue:      indexLatestValue,
+			MinValue:         indexMin,
+			MaxValue:         indexMax,
+			CreateTime:       time.Now(),
+			ModifyTime:       time.Now(),
+			ErDataUpdateDate: utils.BASE_START_DATE,
+			DataUpdateTime:   time.Now().Format(utils.FormatDateTime),
+			BaseModifyTime:   time.Now(),
+			SetUpdateTime:    time.Now(),
 		})
 		if err != nil {
+			fmt.Println("AddEdbInfo Err:" + err.Error())
 			return err
 		}