Browse Source

新增钢联,计算指标

hongze 3 years ago
parent
commit
28569f302f

+ 14 - 0
models/data_manage/edb_data_base.go

@@ -33,6 +33,14 @@ func GetEdbDataTableName(source int) (tableName string) {
 		tableName = "edb_data_lz"
 	case utils.DATA_SOURCE_YS:
 		tableName = "edb_data_ys"
+	case utils.DATA_SOURCE_CALCULATE_HBZ:
+		tableName = "edb_data_calculate_hbz"
+	case utils.DATA_SOURCE_CALCULATE_HCZ:
+		tableName = "edb_data_calculate_hcz"
+	case utils.DATA_SOURCE_CALCULATE_BP:
+		tableName = "edb_data_calculate_bp"
+	case utils.DATA_SOURCE_GL:
+		tableName = "edb_data_gl"
 	default:
 		tableName = ""
 		errors.New("无效的渠道:" + strconv.Itoa(source))
@@ -53,6 +61,12 @@ func GetEdbInfoCalculateTableName(source int) (tableName string) {
 		tableName = "edb_info_calculate_tcz"
 	case utils.DATA_SOURCE_CALCULATE_NSZYDPJJS:
 		tableName = "edb_info_calculate_nszydpjjs"
+	case utils.DATA_SOURCE_CALCULATE_HBZ:
+		tableName = "edb_info_calculate_hbz"
+	case utils.DATA_SOURCE_CALCULATE_HCZ:
+		tableName = "edb_info_calculate_hcz"
+	case utils.DATA_SOURCE_CALCULATE_BP:
+		tableName = "edb_info_calculate_bp"
 	default:
 		tableName = ""
 		errors.New("无效的渠道:" + strconv.Itoa(source))

+ 129 - 0
models/data_manage/edb_data_gl.go

@@ -0,0 +1,129 @@
+package data_manage
+
+import (
+	"fmt"
+	"hongze/hongze_task/utils"
+	"rdluck_tools/orm"
+	"strconv"
+	"strings"
+	"time"
+)
+
+func AddEdbDataGlBySql(sqlStr string) (err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	_, err = o.Raw(sqlStr).Exec()
+	return
+}
+
+
+type GlData struct {
+	InputValue string `orm:"column(DATA_VALUE)" description:"日期"`
+	DataTime   string `orm:"column(DATA_DATE)" description:"值"`
+}
+
+func GetGlDataByTradeCode(condition string, pars []interface{}) (item []*GlData, err error) {
+	sql := ` SELECT * FROM mb_index_main_data WHERE 1=1 `
+	o := orm.NewOrm()
+	o.Using("gl")
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` ORDER BY PUBLISH_TIME DESC `
+	_, err = o.Raw(sql, pars).QueryRows(&item)
+	return
+}
+
+func GetEdbDataGlByCodeAndDate(edbCode string, startDate string) (count int, err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	sql := ` SELECT COUNT(1) AS count FROM edb_data_gl WHERE edb_code=? AND data_time=? `
+	err = o.Raw(sql, edbCode, startDate).QueryRow(&count)
+	return
+}
+
+func ModifyEdbDataGl(edbInfoId int64, dataTime, value string) (err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	sql := ` UPDATE edb_data_gl SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
+	_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
+	return
+}
+
+//刷新钢联指标数据
+func RefreshEdbDataByGl(edbInfoId int, edbCode, startDate, endDate string) (err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	o.Begin()
+	defer func() {
+		if err != nil {
+			o.Rollback()
+		} else {
+			o.Commit()
+		}
+	}()
+
+	if err != nil {
+		return
+	}
+	edbInfoIdStr := strconv.Itoa(edbInfoId)
+	//计算数据
+	var condition string
+	var pars []interface{}
+
+	if edbCode != "" {
+		condition += " AND INDEX_CODE=? "
+		pars = append(pars, edbCode)
+	}
+
+	if startDate != "" {
+		condition += " AND DATA_DATE>=? "
+		pars = append(pars, startDate)
+	}
+
+	if endDate != "" {
+		condition += " AND DATA_DATE<=? "
+		pars = append(pars, endDate)
+	}
+
+	glDataList, err := GetGlDataByTradeCode(condition, pars)
+
+	addSql := ` INSERT INTO edb_data_gl(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	var isAdd bool
+	existMap := make(map[string]string)
+	for _, v := range glDataList {
+		item := v
+		if _, ok := existMap[v.DataTime]; !ok {
+			count, err := GetEdbDataGlByCodeAndDate(edbCode, v.DataTime)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				return err
+			}
+			if count <= 0 {
+				eDate := item.DataTime
+				sValue := item.InputValue
+				dataTime, err := time.Parse(utils.FormatDate, eDate)
+				if err != nil {
+					return err
+				}
+				timestamp := dataTime.UnixNano() / 1e6
+				timeStr := fmt.Sprintf("%d", timestamp)
+				addSql += GetAddSql(edbInfoIdStr, edbCode, eDate, timeStr, sValue)
+				isAdd = true
+			} else {
+				err = ModifyEdbDataGl(int64(edbInfoId), v.DataTime, v.InputValue)
+				if err != nil {
+					return err
+				}
+			}
+		}
+		existMap[v.DataTime] = v.InputValue
+	}
+	if isAdd {
+		addSql = strings.TrimRight(addSql, ",")
+		_, err = o.Raw(addSql).Exec()
+		if err != nil {
+			return err
+		}
+	}
+	return
+}

+ 0 - 1
models/data_manage/edb_info_calculate_bp.go

@@ -1,7 +1,6 @@
 package data_manage
 
 import (
-	"errors"
 	"fmt"
 	"github.com/shopspring/decimal"
 	"hongze/hongze_task/utils"

+ 0 - 1
models/data_manage/edb_info_calculate_hbz.go

@@ -1,7 +1,6 @@
 package data_manage
 
 import (
-	"errors"
 	"fmt"
 	"github.com/shopspring/decimal"
 	"hongze/hongze_task/utils"

+ 0 - 1
models/data_manage/edb_info_calculate_hcz.go

@@ -1,7 +1,6 @@
 package data_manage
 
 import (
-	"errors"
 	"fmt"
 	"github.com/shopspring/decimal"
 	"hongze/hongze_task/utils"

+ 7 - 0
models/db.go

@@ -41,6 +41,13 @@ func init() {
 	data_db, _ := orm.GetDB("data")
 	data_db.SetConnMaxLifetime(10 * time.Minute)
 
+	_ = orm.RegisterDataBase("gl", "mysql", utils.MYSQL_URL_GL)
+	orm.SetMaxIdleConns("gl", 50)
+	orm.SetMaxOpenConns("gl", 100)
+
+	gl, _ := orm.GetDB("gl")
+	gl.SetConnMaxLifetime(10 * time.Minute)
+
 	//注册对象
 	orm.RegisterModel(
 		new(EdbinfoSendMsgRecord),

+ 55 - 0
services/data/edb_info.go

@@ -563,3 +563,58 @@ func RefreshDataFromYs(wg *sync.WaitGroup) (err error) {
 	wg.Done()
 	return err
 }
+
+
+//刷新钢联数据
+func RefreshDataFromGl(wg *sync.WaitGroup) (err error) {
+	defer func() {
+		if err != nil {
+			fmt.Println("RefreshDataFromGl Err:" + err.Error())
+			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromYs ErrMsg:"+err.Error(), utils.EmailSendToUsers)
+		}
+	}()
+	var condition string
+	var pars []interface{}
+	condition += " AND source=? "
+	pars = append(pars, utils.DATA_SOURCE_GL)
+	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
+	if err != nil {
+		return errors.New("GetEdbInfoByCondition:" + err.Error())
+	}
+
+	var endDate string
+	endDate = time.Now().Format(utils.FormatDateUnSpace)
+	for _, v := range items {
+		startDate := ""
+		if v.Frequency == "日度" {
+			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
+		} else if v.Frequency == "周度" {
+			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
+		} else if v.Frequency == "月度" {
+			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
+		} else if v.Frequency == "季度" {
+			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
+		} else if v.Frequency == "年度" {
+			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
+		} else {
+			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
+		}
+		fmt.Println(startDate, endDate)
+		err = data_manage.RefreshEdbDataByGl(v.EdbInfoId, v.EdbCode, startDate, endDate)
+		if err != nil {
+			return errors.New("RefreshEdbDataByGl:" + err.Error())
+		}
+		item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
+		if err != nil {
+			return err
+		}
+		if item != nil {
+			err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	wg.Done()
+	return err
+}

+ 3 - 2
services/task.go

@@ -144,7 +144,7 @@ func OneMinute(cont context.Context) (err error) {
 
 func RefreshData(cont context.Context) (err error) {
 	wg := sync.WaitGroup{}
-	wg.Add(6)
+	wg.Add(7)
 	//wind
 	go data.RefreshDataFromWind(&wg)
 	//同花顺
@@ -157,8 +157,9 @@ func RefreshData(cont context.Context) (err error) {
 	go data.RefreshDataFromLz(&wg)
 	//有色
 	go data.RefreshDataFromYs(&wg)
+	//钢联
+	go data.RefreshDataFromGl(&wg)
 	wg.Wait()
-
 	data.RefreshDataFromCalculateAll()
 	time.Sleep(2 * time.Second)
 	data.RefreshNotice()

+ 2 - 0
utils/config.go

@@ -10,6 +10,7 @@ var (
 	MYSQL_URL_RDDP string //数据库连接
 	MYSQL_URL_EDB  string
 	MYSQL_URL_DATA string
+	MYSQL_URL_GL   string
 )
 
 var (
@@ -53,6 +54,7 @@ func init() {
 	MYSQL_URL_RDDP = config["mysql_url_rddp"]
 	MYSQL_URL_EDB = config["mysql_url_edb"]
 	MYSQL_URL_DATA = config["mysql_url_data"]
+	MYSQL_URL_GL = config["mysql_url_gl"]
 
 	//同花顺公钥
 	THS_PubKey = `-----BEGIN PUBLIC KEY-----

+ 1 - 0
utils/constants.go

@@ -77,6 +77,7 @@ const (
 	DATA_SOURCE_CALCULATE_HBZ                  //环比值->12
 	DATA_SOURCE_CALCULATE_HCZ                  //环差值->13
 	DATA_SOURCE_CALCULATE_BP                   //变频->14
+	DATA_SOURCE_GL                             //钢联->15
 )
 
 //http://datawind.hzinsights.com:8040/hz_server