Merge branch 'bzq1/sci_hq_custom_cf' of eta_server/eta_index_lib into debug

controllers/base_from_sci_hq.go

@@ -5,6 +5,7 @@ import (
 	"eta/eta_index_lib/logic"
 	"eta/eta_index_lib/models"
 	"eta/eta_index_lib/utils"
+	"fmt"
 	"strconv"
 	"time"
 )
@@ -115,8 +116,8 @@ func (this *SciHqController) Refresh() {
 }
 
 // HandleExcelData
-// @Title 处理卓创（红桃3）指标的接口
-// @Description 处理卓创（红桃3）指标的接口
+// @Title 处理卓创红期指标的接口
+// @Description 处理卓创红期指标的接口
 // @Success 200 {object} models.HandleMysteelIndexResp
 // @router /handle/excel_data [post]
 func (this *SciHqController) HandleExcelData() {
@@ -235,6 +236,15 @@ func (this *SciHqController) HandleExcelData() {
 					continue
 				}
 			}
+
+			//修改最大最小日期
+			sciHqIndexMaxItem, err := models.GetSciHqIndexInfoMaxAndMinInfo(indexInfo.IndexCode)
+			if err == nil && sciHqIndexMaxItem != nil {
+				e := models.ModifySciHqIndexMaxAndMinInfo(indexInfo.IndexCode, sciHqIndexMaxItem)
+				if e != nil {
+					fmt.Println("ModifySciHqIndexMaxAndMinInfo Err:" + e.Error())
+				}
+			}
 			// 同步刷新ETA图库卓创红期的指标
 			{
 				// 获取指标详情

controllers/commodity_coal.go

@@ -1172,6 +1172,7 @@ func (this *CoalMineDataController) Coastal() {
 					codeMap[v.IndexName] = v.IndexCode
 					newId, err := models.AddBaseFromCoalmineMapping(v)
 					if err != nil {
+						utils.FileLog.Info("再次添加公司指标名称错误：", err)
 						fmt.Println("再次添加公司指标名称错误", err)
 						continue
 					} else {
@@ -1184,6 +1185,7 @@ func (this *CoalMineDataController) Coastal() {
 			}
 		}
 	}
+	utils.FileLog.Info("指标操作完成")
 	fmt.Println("指标操作完成")
 
 	//给indexItem中的code赋值并插入index表
@@ -1193,6 +1195,7 @@ func (this *CoalMineDataController) Coastal() {
 			newId, err := models.AddBaseFromCoalCoastalIndex(v)
 			if err != nil {
 				fmt.Println("添加数据错误", err)
+				utils.FileLog.Info("添加数据错误：", err)
 			} else {
 				fmt.Println("新增成功", newId)
 			}
@@ -1200,6 +1203,7 @@ func (this *CoalMineDataController) Coastal() {
 			if indexMap[v.IndexName+v.DataTime] != v.DealValue && v.DealValue != "" {
 				err = models.UpdateBaseFromCoalCoastalIndex(v)
 				if err != nil {
+					utils.FileLog.Info("修改数据错误错误：", err)
 					fmt.Println("修改数据错误错误", err)
 					return
 				}
@@ -1341,6 +1345,7 @@ func (this *CoalMineDataController) Inland() {
 								if err != nil {
 									parsedTime, err = time.Parse("2006/01/02", text)
 									if err != nil {
+										utils.FileLog.Info("解析时间字符串出错：", err)
 										fmt.Println("解析时间字符串出错:", err)
 										return
 									}
@@ -1378,6 +1383,7 @@ func (this *CoalMineDataController) Inland() {
 					codeMap[v.IndexName] = v.IndexCode
 					newId, err := models.AddBaseFromCoalmineMapping(v)
 					if err != nil {
+						utils.FileLog.Info("再次添加公司指标名称错误：", err)
 						fmt.Println("再次添加公司指标名称错误", err)
 						continue
 					} else {
@@ -1390,6 +1396,7 @@ func (this *CoalMineDataController) Inland() {
 			}
 		}
 	}
+	utils.FileLog.Info("指标操作完成：")
 	fmt.Println("指标操作完成")
 
 	//给indexItem中的code赋值并插入index表
@@ -1398,6 +1405,7 @@ func (this *CoalMineDataController) Inland() {
 		if indexMap[v.IndexName+v.DataTime] == "" && v.DealValue != "" {
 			newId, err := models.AddBaseFromCoalInlandIndex(v)
 			if err != nil {
+				utils.FileLog.Info("添加数据错误：", err)
 				fmt.Println("添加数据错误", err)
 			} else {
 				fmt.Println("新增成功", newId)
@@ -1406,6 +1414,7 @@ func (this *CoalMineDataController) Inland() {
 			if indexMap[v.IndexName+v.DataTime] != v.DealValue && v.DealValue != "" {
 				err = models.UpdateBaseFromCoalInlandIndex(v)
 				if err != nil {
+					utils.FileLog.Info("修改数据错误错误：", err)
 					fmt.Println("修改数据错误错误", err)
 					return
 				}

controllers/edb_info.go

@@ -70,15 +70,17 @@ func (this *EdbInfoController) Add() {
 		br.ErrMsg = "请输入指标名称"
 		return
 	}
-	if req.Frequency == "" {
-		br.Msg = "请输入指标频度！"
-		br.ErrMsg = "请输入指标频度"
-		return
-	}
-	if req.Unit == "" {
-		br.Msg = "请输入指标单位！"
-		br.ErrMsg = "请输入指标单位"
-		return
+	if req.Source != utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
+		if req.Frequency == "" {
+			br.Msg = "请输入指标频度！"
+			br.ErrMsg = "请输入指标频度"
+			return
+		}
+		if req.Unit == "" {
+			br.Msg = "请输入指标单位！"
+			br.ErrMsg = "请输入指标单位"
+			return
+		}
 	}
 	var isAdd bool
 	item, err := models.GetEdbInfoByEdbCode(req.Source, req.EdbCode)

models/base_from_sci_hq.go

@@ -240,3 +240,31 @@ func BatchAddBaseFromSciHqData(list []*BaseFromSciHqData) (err error) {
 	_, err = o.InsertMulti(500, list)
 	return
 }
+
+func GetSciHqIndexInfoMaxAndMinInfo(indexCode string) (item *EdbInfoMaxAndMinInfo, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date,MIN(value) AS min_value,MAX(value) AS max_value FROM base_from_sci_hq_data WHERE index_code=? `
+	err = o.Raw(sql, indexCode).QueryRow(&item)
+
+	if err != nil {
+		return
+	}
+
+	// 获取最新值
+	var latest_value float64
+	sql = ` SELECT value AS latest_value FROM base_from_sci_hq_data WHERE index_code=? ORDER BY data_time DESC LIMIT 1 `
+	err = o.Raw(sql, indexCode).QueryRow(&latest_value)
+	if err != nil {
+		return
+	}
+	item.LatestValue = latest_value
+
+	return
+}
+
+func ModifySciHqIndexMaxAndMinInfo(indexCode string, item *EdbInfoMaxAndMinInfo) (err error) {
+	o := orm.NewOrm()
+	sql := ` UPDATE base_from_sci_hq_index SET start_date=?,end_date=?,modify_time=NOW() WHERE index_code=? `
+	_, err = o.Raw(sql, item.MinDate, item.MaxDate, indexCode).Exec()
+	return
+}

services/base_from_mysteel_chemical.go

@@ -633,7 +633,6 @@ func RefreshDataFromMysteelChemical(edbCode, startDate, endDate string) (err err
 	if err != nil {
 		return
 	}
-	alarm_msg.SendAlarmMsg(fmt.Sprintf("开始刷新钢联化工接口数据, %s", edbCode), 1)
 
 	terminal, err := GetTerminal(utils.DATA_SOURCE_MYSTEEL_CHEMICAL, tmpIndex.TerminalCode)
 	if err != nil {
@@ -658,7 +657,6 @@ func RefreshDataFromMysteelChemical(edbCode, startDate, endDate string) (err err
 			err = errors.New(resp.Message)
 			return
 		}
-		alarm_msg.SendAlarmMsg("获取钢联化工接口数据", 1)
 
 		dataObj := new(models.BaseFromMysteelChemicalData)
 		exitDataList, er := dataObj.GetIndexDataList(edbCode)
@@ -690,7 +688,6 @@ func RefreshDataFromMysteelChemical(edbCode, startDate, endDate string) (err err
 		}
 		// 因为只有一个指标，所以取第一个就可以了
 		items := mysteelChemicalDatas[0]
-		alarm_msg.SendAlarmMsg("钢联化工接口数据转化成功", 1)
 		for _, v := range items {
 			dateStr := v.DataTime.Format(utils.FormatDate)
 			if findData, ok := existDataMap[dateStr]; !ok {
@@ -709,7 +706,6 @@ func RefreshDataFromMysteelChemical(edbCode, startDate, endDate string) (err err
 				}
 			}
 		}
-		alarm_msg.SendAlarmMsg("开始添加数据", 1)
 		err = dataObj.AddV2(addItems)
 		if err != nil {
 			return

services/base_from_sci_hq.go

@@ -1,8 +0,0 @@
-package services
-
-import "eta/eta_index_lib/models"
-
-// HandleSciHqIndex 处理卓创红期的Excel数据
-func HandleSciHqIndex([]*models.HandleSciHqExcelDataReq) {
-
-}

services/base_from_ths_hf.go

@@ -376,6 +376,7 @@ func RefreshThsHfBaseIndex(indexItem *models.BaseFromThsHfIndex, codeWithData *m
 			origin.Value = newVal
 			origin.ModifyTime = time.Now().Local()
 			updateData = append(updateData, origin)
+			continue
 		}
 
 		// 新增的数据去重