Merge branch 'aj_mysteel'

controllers/base_from_smm.go

@@ -4,12 +4,13 @@ import (
 	"encoding/json"
 	"hongze/hongze_edb_lib/logic"
 	"hongze/hongze_edb_lib/models"
+	"hongze/hongze_edb_lib/services"
 	"hongze/hongze_edb_lib/utils"
 	"strconv"
 	"time"
 )
 
-//有色
+// 有色
 type SmmController struct {
 	BaseAuthController
 }
@@ -130,3 +131,31 @@ func (this *SmmController) Refresh() {
 	br.Success = true
 	br.Msg = "获取成功"
 }
+
+// HandleExcelData
+// @Title 处理有色指标的接口
+// @Description 处理有色指标的接口
+// @Success 200 string "操作成功"
+// @router /handle/excel_data [post]
+func (this *SmmController) HandleExcelData() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	var req models.HandleSmmExcelDataReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+
+	// 处理excel表数据
+	services.SmmIndexHandle(req.BaseFilePath, req.RenameFilePath, req.IndexName, req.IndexCode, req.Unit, req.Frequency, req.ExcelDataMap)
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "处理成功"
+}

models/base_from_smm.go

@@ -21,6 +21,12 @@ type BaseFromSmmData struct {
 	DataTimestamp      int64
 }
 
+func AddBaseFromSmmData(item []*BaseFromSmmData) (err error) {
+	o := orm.NewOrm()
+	_, err = o.InsertMulti(len(item), item)
+	return
+}
+
 func GetBaseFromSmmDataByCondition(condition string, pars []interface{}) (list []*BaseFromSmmData, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_smm_data WHERE 1=1 `
@@ -182,3 +188,80 @@ func RefreshEdbDataFromSmm(edbInfoId int, edbCode, startDate string) (err error)
 	}
 	return
 }
+
+type BaseFromSmmIndex struct {
+	BaseFromSmmIndexId int64 `orm:"column(base_from_smm_index_id);pk"`
+	Interface          string
+	Name               string
+	IndexCode          string
+	IndexName          string
+	Type1              string `orm:"column(type_1)"`
+	Type2              string `orm:"column(type_2)"`
+	Type3              string `orm:"column(type_3)"`
+	Frequency          string
+	Unit               string
+	ApiStartTime       string
+	ApiUpdateTime      string
+	StartTime          string
+	FinishTime         string
+	BaseFileName       string
+	RenameFileName     string
+	StartDate          string
+	EndDate            string
+	CreateTime         time.Time
+	ModifyTime         time.Time
+}
+
+func (d *BaseFromSmmIndex) AddBaseFromSmmIndex() (lastId int64, err error) {
+	o := orm.NewOrm()
+	lastId, err = o.Insert(d)
+	return
+}
+
+func (d *BaseFromSmmIndex) GetSmmIndexItem(indexCode string) (item *BaseFromSmmIndex, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT * FROM base_from_smm_index WHERE index_code=? `
+
+	fmt.Println(sql, indexCode)
+	err = o.Raw(sql, indexCode).QueryRow(&item)
+	return
+}
+
+func GetBaseFromSmmDataBySmmCode(smmCode string) (list []*BaseFromSmmData, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT * FROM base_from_smm_data WHERE index_code=? `
+	_, err = o.Raw(sql, smmCode).QueryRows(&list)
+	return
+}
+
+func ModifySmmIndexSort(baseFromSmmIndexId int64) (err error) {
+	o := orm.NewOrm()
+	sql := ` UPDATE base_from_smm_index SET sort=? WHERE base_from_smm_index_id=? `
+	_, err = o.Raw(sql, baseFromSmmIndexId, baseFromSmmIndexId).Exec()
+	return
+}
+
+func GetSmmIndexInfoMaxAndMinInfo(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_smm_data WHERE index_code=? `
+	err = o.Raw(sql, indexCode).QueryRow(&item)
+	return
+}
+
+func ModifySmmIndexMaxAndMinInfo(indexCode string, item *EdbInfoMaxAndMinInfo) (err error) {
+	o := orm.NewOrm()
+	sql := ` UPDATE base_from_smm_index SET start_date=?,end_date=?,modify_time=NOW() WHERE index_code=? `
+	_, err = o.Raw(sql, item.MinDate, item.MaxDate, indexCode).Exec()
+	return
+}
+
+// HandleSmmExcelDataReq SMM的excel数据
+type HandleSmmExcelDataReq struct {
+	BaseFilePath   string
+	RenameFilePath string
+	IndexName      string
+	IndexCode      string
+	Unit           string
+	Frequency      string
+	ExcelDataMap   map[string]string
+}

models/db.go

@@ -93,5 +93,7 @@ func initBaseIndex() {
 		new(BaseFromSciData),
 		new(BaseFromBaiinfoIndex),
 		new(BaseFromBaiinfoData),
+		new(BaseFromSmmIndex),
+		new(BaseFromSmmData),
 	)
 }

routers/commentsRouter.go

@@ -565,6 +565,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:SmmController"] = append(beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:SmmController"],
+        beego.ControllerComments{
+            Method: "HandleExcelData",
+            Router: `/handle/excel_data`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:SmmController"] = append(beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:SmmController"],
         beego.ControllerComments{
             Method: "Refresh",

services/base_from_smm.go

@@ -0,0 +1,151 @@
+package services
+
+import (
+	"fmt"
+	"hongze/hongze_edb_lib/logic"
+	"hongze/hongze_edb_lib/models"
+	"hongze/hongze_edb_lib/services/alarm_msg"
+	"hongze/hongze_edb_lib/utils"
+	"strings"
+	"time"
+)
+
+func SmmIndexHandle(baseFilePath, renameFilePath, indexName, indexCode, unit, frequency string, excelDataMap map[string]string) {
+	var err error
+
+	errMsgList := make([]string, 0)
+	defer func() {
+		if len(errMsgList) > 0 {
+			fmt.Println(fmt.Sprint("SMM有色实际数据处理失败,err:", strings.Join(errMsgList, "\n")))
+			go alarm_msg.SendAlarmMsg(fmt.Sprint("SMM有色实际数据处理失败,err:", strings.Join(errMsgList, "\n")), 3)
+		}
+	}()
+
+	indexObj := new(models.BaseFromSmmIndex)
+	var indexId int64
+
+	addDataList := make([]*models.BaseFromSmmData, 0)
+
+	exitDataMap := make(map[string]*models.BaseFromSmmData)
+
+	// 修改指标信息
+	if indexName == "" {
+		utils.FileLog.Info("未刷新到指标数据:indexName:" + indexName)
+		return
+	}
+	//判断指标是否存在
+	var isAdd int
+	item, err := indexObj.GetSmmIndexItem(indexCode)
+	if err != nil {
+		if err.Error() == utils.ErrNoRow() {
+			isAdd = 1
+		} else {
+			isAdd = -1
+			fmt.Println("GetSmmIndexItem Err:" + err.Error())
+			return
+		}
+	}
+	if item != nil && item.BaseFromSmmIndexId > 0 {
+		fmt.Println("item:", item)
+		isAdd = 2
+	} else {
+		isAdd = 1
+	}
+
+	fmt.Println("isAdd:", isAdd)
+	if !strings.Contains(frequency, "度") {
+		frequency = frequency + "度"
+	}
+
+	if isAdd == 1 {
+		indexObj.IndexCode = indexCode
+		indexObj.IndexName = indexName
+		indexObj.Unit = unit
+		indexObj.Frequency = frequency
+		indexObj.ModifyTime = time.Now()
+		indexObj.CreateTime = time.Now()
+		indexObj.BaseFileName = baseFilePath
+		indexObj.RenameFileName = renameFilePath
+		lastId, err := indexObj.AddBaseFromSmmIndex()
+		if err != nil {
+			fmt.Println("add err:" + err.Error())
+			return
+		}
+		indexId = lastId
+		go models.ModifySmmIndexSort(indexId)
+	} else if isAdd == 2 {
+		//获取已存在的所有数据
+		exitDataList, err := models.GetBaseFromSmmDataBySmmCode(indexCode)
+		if err != nil {
+			fmt.Println("GetIndexDataList Err:" + err.Error())
+			return
+		}
+		fmt.Println("exitDataListLen:", len(exitDataList))
+		for _, v := range exitDataList {
+			//dateStr := v.DataTime.Format(utils.FormatDate)
+			exitDataMap[v.DataTime] = v
+		}
+		indexId = item.BaseFromSmmIndexId
+	}
+
+	// 遍历excel数据，然后跟现有的数据做校验，不存在则入库
+	for date, value := range excelDataMap {
+		if _, ok := exitDataMap[date]; !ok {
+			dateTime, err := time.ParseInLocation(utils.FormatDate, date, time.Local)
+			if err != nil {
+				fmt.Println("time.ParseInLocation Err:" + err.Error())
+				return
+			}
+			if !strings.Contains(value, "#N/A") {
+				var saveDataTime time.Time
+				if strings.Contains(date, "00:00:00") {
+					saveDataTime, err = time.Parse(utils.FormatDateTime, date)
+				} else {
+					saveDataTime, err = time.Parse(utils.FormatDate, date)
+				}
+				if err != nil {
+					errMsg := "saveDataTime parse err:" + err.Error() + " dataTime:" + date
+					fmt.Println(errMsg)
+					continue
+				}
+				timestamp := saveDataTime.UnixNano() / 1e6
+
+				dataItem := new(models.BaseFromSmmData)
+				dataItem.BaseFromSmmIndexId = int(indexId)
+				dataItem.IndexCode = indexCode
+				dataItem.DataTime = dateTime.Format(utils.FormatDate)
+				dataItem.Value = value
+				dataItem.CreateTime = time.Now()
+				dataItem.ModifyTime = time.Now()
+				dataItem.DataTimestamp = timestamp
+				addDataList = append(addDataList, dataItem)
+			}
+		}
+	}
+
+	if len(addDataList) > 0 {
+		err = models.AddBaseFromSmmData(addDataList)
+		if err != nil {
+			fmt.Println("dataObj.Add() Err:" + err.Error())
+		}
+	}
+
+	itemInfo, err := models.GetSmmIndexInfoMaxAndMinInfo(indexCode)
+	if err == nil && item != nil {
+		go models.ModifySmmIndexMaxAndMinInfo(indexCode, itemInfo)
+	}
+
+	// 同步刷新ETA图库有色的指标
+	{
+		// 获取指标详情
+		edbInfo, err := models.GetEdbInfoByEdbCode(utils.DATA_SOURCE_YS, indexCode)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			errMsgList = append(errMsgList, fmt.Sprint("刷新ETA指标异常，指标编码：", indexCode, err.Error()))
+		}
+
+		// 已经加入到指标库的话，那么就去更新ETA指标库吧
+		if edbInfo != nil {
+			go logic.RefreshBaseEdbInfo(edbInfo, ``)
+		}
+	}
+}