Merge branch 'coal'

controllers/base_from_coal.go

@@ -0,0 +1,107 @@
+package controllers
+
+import (
+	"encoding/json"
+	"hongze/hongze_edb_lib/models"
+	"hongze/hongze_edb_lib/utils"
+	"strconv"
+	"time"
+)
+
+//中国煤炭网
+type CoalController struct {
+	BaseAuthController
+}
+
+// @Title 新增煤炭网指标接口
+// @Description 新增煤炭网指标接口
+// @Success 200 {object} models.AddEdbInfoReq
+// @router /add [post]
+func (this *CoalController) Add() {
+	br := new(models.BaseResponse).Init()
+	var cacheKey string
+	defer func() {
+		utils.Rc.Delete(cacheKey)
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	source := utils.DATA_SOURCE_COAL
+	var req models.AddEdbInfoReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	if req.EdbCode == "" {
+		br.Msg = "请输入指标编码！"
+		br.ErrMsg = "请输入指标编码，指标编码为空"
+		return
+	}
+	cacheKey = utils.CACHE_EDB_DATA_ADD + strconv.Itoa(source) + "_" + req.EdbCode
+	if !utils.Rc.IsExist(cacheKey) {
+		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
+		err = models.AddEdbDataFromCoal(req.EdbCode)
+		if err != nil {
+			br.Msg = "获取指标信息失败！"
+			br.ErrMsg = "获取指标信息失败 AddEdbDataFromZz，Err:" + err.Error()
+			return
+		}
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+	} else {
+		br.Ret = 501
+		br.Success = true
+		br.Msg = "系统处理中，请稍后重试"
+	}
+}
+
+// @Title 刷新中国煤炭网指标接口
+// @Description 刷新中国煤炭网指标接口
+// @Success 200 {object} models.RefreshEdbInfoReq
+// @router /refresh [post]
+func (this *CoalController) Refresh() {
+	br := new(models.BaseResponse).Init()
+	var cacheKey string
+	defer func() {
+		utils.Rc.Delete(cacheKey)
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	source := utils.DATA_SOURCE_ZZ
+	var req models.RefreshEdbInfoReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	if req.EdbCode == "" {
+		br.Msg = "请输入指标编码！"
+		br.ErrMsg = "请输入指标编码，指标编码为空"
+		return
+	}
+	if req.EdbInfoId <= 0 {
+		br.Msg = "请输入指标ID！"
+		br.ErrMsg = "请输入指标ID"
+		return
+	}
+	cacheKey = utils.CACHE_EDB_DATA_REFRESH + strconv.Itoa(source) + "_" + req.EdbCode
+	if !utils.Rc.IsExist(cacheKey) {
+		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
+		err = models.RefreshEdbDataFromCoal(req.EdbInfoId, req.EdbCode, req.StartDate)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			br.Msg = "刷新指标信息失败！"
+			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromZz，Err:" + err.Error()
+			return
+		}
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+	} else {
+		br.Ret = 501
+		br.Success = true
+		br.Msg = "系统处理中，请稍后重试"
+	}
+}

models/base_from_coal.go

@@ -0,0 +1,272 @@
+package models
+
+import (
+	"fmt"
+	"github.com/beego/beego/v2/client/orm"
+	"hongze/hongze_edb_lib/utils"
+	"strconv"
+	"strings"
+	"time"
+)
+
+type BaseFromCoalmineIndex struct {
+	BaseFromCoalmineCompanyIndexId int
+	IndexName                      string `description:"持买单量指标名称"`
+	IndexCode                      string `description:"持买单量指标编码"`
+	DealValue                      string `description:"成交量"`
+	DataTime                       string `description:"数据日期"`
+	Source                         string `description:"来源"`
+	Province                       string `description:"省份"`
+	City                           string `description:"城市"`
+	GroupName                      string `description:"集团名称"`
+	Unit                           string `description:"单位"`
+	Frequency                      string `description:"频率"`
+	CreateTime                     string `description:"插入时间"`
+	ModifyTime                     string `description:"修改时间"`
+}
+
+func GetBaseFromCoalIndexByCode(suffix, indexCode string) (items []*BaseFromCoalmineIndex, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM base_from_coalmine_%s WHERE index_code=? `
+	sql = fmt.Sprintf(sql, suffix)
+	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	return
+}
+
+func GetCoalDataByTradeCode(suffix, condition string, pars []interface{}) (item []*BaseFromCoalmineIndex, err error) {
+	sql := ` SELECT * FROM base_from_trade_%s WHERE 1=1 `
+	sql = fmt.Sprintf(sql, suffix)
+	o := orm.NewOrm()
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` ORDER BY data_time DESC `
+	_, err = o.Raw(sql, pars).QueryRows(&item)
+	return
+}
+
+func AddEdbDataFromCoal(edbCode string) (err error) {
+	var suffix string
+	if strings.Contains(edbCode, "jsm") {
+		suffix = "jsm_index"
+	} else if strings.Contains(edbCode, "company") {
+		suffix = "company_index"
+	} else if strings.Contains(edbCode, "firm") {
+		suffix = "firm_index"
+	} else if strings.Contains(edbCode, "coastal") {
+		suffix = "coastal_index"
+	} else if strings.Contains(edbCode, "inland") {
+		suffix = "inland_index"
+	}
+
+	o := orm.NewOrm()
+
+	coalBaseDataAll, err := GetBaseFromCoalIndexByCode(suffix, edbCode)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		return
+	}
+
+	var isAdd bool
+	addSql := ` INSERT INTO edb_data_coal(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	existMap := make(map[string]string)
+	for _, sv := range coalBaseDataAll {
+		eDate := sv.DataTime
+		var timeStr string
+		var dataTime time.Time
+		var sDataTime string
+		var timestamp int64
+		if suffix == "firm_index"{
+			syear := eDate[:4]
+			year,_ := strconv.Atoi(syear)
+			smonth := eDate[7:]
+			smonth = strings.Split(smonth, "月份")[0]
+			month,_ :=strconv.Atoi(smonth)
+			var day int
+			if strings.Contains(eDate,"上旬"){
+				day = 15
+				currentLocation := time.Now().Location()
+				dataTime = time.Date(year, time.Month(month), day,0,0,0,0,currentLocation)
+				sDataTime = dataTime.Format(utils.FormatDate)
+				timestamp = dataTime.UnixNano() / 1e6
+				timeStr = fmt.Sprintf("%d", timestamp)
+			} else if strings.Contains(eDate,"中旬") {
+				day = 25
+				currentLocation := time.Now().Location()
+				dataTime = time.Date(year, time.Month(month), day,0,0,0,0,currentLocation)
+				sDataTime = dataTime.Format(utils.FormatDate)
+				timestamp = dataTime.UnixNano() / 1e6
+				timeStr = fmt.Sprintf("%d", timestamp)
+			}else {
+				currentLocation := time.Now().Location()
+				firstOfMonth := time.Date(year, time.Month(month),1,0,0,0,0,currentLocation)
+				dataTime = firstOfMonth.AddDate(0,1,-1)
+				sDataTime = dataTime.Format(utils.FormatDate)
+				timestamp = dataTime.UnixNano() / 1e6
+				timeStr = fmt.Sprintf("%d", timestamp)
+			}
+		}else {
+			sDataTime = eDate
+			dataTime, err = time.Parse(utils.FormatDate, eDate)
+			if err != nil {
+				fmt.Println("time.Parse Err:" + eDate)
+				return err
+			}
+			timestamp = dataTime.UnixNano() / 1e6
+			timeStr = fmt.Sprintf("%d", timestamp)
+		}
+
+		value := strings.Replace(sv.DealValue,"%","",-1)
+		if _, ok := existMap[sDataTime]; !ok {
+			addSql += GetAddSql("0", edbCode, sDataTime, timeStr, value)
+			fmt.Println("edbCode：", edbCode)
+			fmt.Println("sDataTime：", sDataTime)
+			fmt.Println("timeStr：", timeStr)
+			fmt.Println("value：", value)
+			isAdd = true
+		}
+		existMap[eDate] = value
+	}
+	if isAdd {
+		addSql = strings.TrimRight(addSql, ",")
+		utils.FileLog.Info("addSql:" + addSql)
+		_, err = o.Raw(addSql).Exec()
+		if err != nil {
+			return err
+		}
+	}
+	return
+}
+
+func RefreshEdbDataFromCoal(edbInfoId int, edbCode, startDate string) (err error) {
+	source := utils.DATA_SOURCE_YS
+	o := orm.NewOrm()
+	if err != nil {
+		return
+	}
+	var suffix string
+	if strings.Contains(edbCode, "jsm") {
+		suffix = "jsm_index"
+	} else if strings.Contains(edbCode, "company") {
+		suffix = "company_index"
+	} else if strings.Contains(edbCode, "firm") {
+		suffix = "firm_index"
+	} else if strings.Contains(edbCode, "coastal") {
+		suffix = "coastal_index"
+	} else if strings.Contains(edbCode, "inland") {
+		suffix = "inland_index"
+	}
+	edbInfoIdStr := strconv.Itoa(edbInfoId)
+	//计算数据
+	var condition string
+	var pars []interface{}
+
+	if edbCode != "" {
+		pars = append(pars, edbCode)
+	}
+
+	if startDate != "" {
+		condition += " AND data_time>=? "
+		pars = append(pars, startDate)
+	}
+
+	glDataList, err := GetCoalDataByTradeCode(suffix, condition, pars)
+
+	//获取指标所有数据
+	var existCondition string
+	var existPars []interface{}
+
+	existCondition += " AND edb_info_id=? "
+	existPars = append(existPars, edbInfoId)
+	if startDate != "" {
+		existCondition += " AND data_time>=? "
+		existPars = append(existPars, startDate)
+	}
+
+	existList, err := GetEdbDataByCondition(source, existCondition, existPars)
+	if err != nil {
+		return err
+	}
+	existMap := make(map[string]*EdbInfoSearchData)
+	for _, v := range existList {
+		existMap[v.DataTime] = v
+	}
+
+	addSql := ` INSERT INTO edb_data_coal(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	var isAdd bool
+	for _, v := range glDataList {
+		var value string
+		value = strings.Replace(v.DealValue,"%","",-1)
+		item := v
+		itemValue := value
+		if _, ok := existMap[v.DataTime]; !ok {
+			eDate := item.DataTime
+			var timeStr string
+			var dataTime time.Time
+			var sDataTime string
+			var timestamp int64
+			if suffix == "firm_index"{
+				syear := eDate[:4]
+				year,_ := strconv.Atoi(syear)
+				smonth := eDate[7:]
+				smonth = strings.Split(smonth, "月份")[0]
+				month,_ :=strconv.Atoi(smonth)
+				var day int
+				if strings.Contains(eDate,"上旬"){
+					day = 15
+					currentLocation := time.Now().Location()
+					dataTime = time.Date(year, time.Month(month), day,0,0,0,0,currentLocation)
+					sDataTime = dataTime.Format(utils.FormatDate)
+					timestamp = dataTime.UnixNano() / 1e6
+					timeStr = fmt.Sprintf("%d", timestamp)
+				} else if strings.Contains(eDate,"中旬") {
+					day = 25
+					currentLocation := time.Now().Location()
+					dataTime = time.Date(year, time.Month(month), day,0,0,0,0,currentLocation)
+					sDataTime = dataTime.Format(utils.FormatDate)
+					timestamp = dataTime.UnixNano() / 1e6
+					timeStr = fmt.Sprintf("%d", timestamp)
+				}else {
+					currentLocation := time.Now().Location()
+					firstOfMonth := time.Date(year, time.Month(month),1,0,0,0,0,currentLocation)
+					dataTime = firstOfMonth.AddDate(0,1,-1)
+					sDataTime = dataTime.Format(utils.FormatDate)
+					timestamp = dataTime.UnixNano() / 1e6
+					timeStr = fmt.Sprintf("%d", timestamp)
+				}
+			}else {
+				sDataTime = eDate
+				dataTime, err = time.Parse(utils.FormatDate, eDate)
+				if err != nil {
+					fmt.Println("time.Parse Err:" + eDate)
+					return err
+				}
+				timestamp = dataTime.UnixNano() / 1e6
+				timeStr = fmt.Sprintf("%d", timestamp)
+			}
+			sValue := itemValue
+			if sValue != "" {
+				saveValue := sValue
+
+				if findItem, ok := existMap[eDate]; !ok {
+					addSql += GetAddSql(edbInfoIdStr, edbCode, sDataTime, timeStr, saveValue)
+					isAdd = true
+				} else {
+					if findItem != nil && utils.SubFloatToString(findItem.Value, 30) != sValue {
+						err = ModifyEdbDataById(source, findItem.EdbDataId, sValue)
+						if err != nil {
+							return err
+						}
+					}
+				}
+			}
+		}
+	}
+	if isAdd {
+		addSql = strings.TrimRight(addSql, ",")
+		_, err = o.Raw(addSql).Exec()
+		if err != nil {
+			return err
+		}
+	}
+	return
+}

routers/commentsRouter_controllers.go

@@ -52,6 +52,24 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:CoalController"] = append(beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:CoalController"],
+        beego.ControllerComments{
+            Method: "Add",
+            Router: "/add",
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:CoalController"] = append(beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:CoalController"],
+        beego.ControllerComments{
+            Method: "Refresh",
+            Router: "/refresh",
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:DlController"] = append(beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:DlController"],
         beego.ControllerComments{
             Method: "Add",

routers/router.go

@@ -90,6 +90,11 @@ func init() {
 				&controllers.GieController{},
 			),
 		),
+		beego.NSNamespace("/coal",
+			beego.NSInclude(
+				&controllers.CoalController{},
+			),
+		),
 	)
 	beego.AddNamespace(ns)
 }

utils/constants.go

@@ -53,6 +53,7 @@ const (
 	DATA_SOURCE_CALCULATE_ZJPJ                  //直接拼接->23
 	DATA_SOURCE_CALCULATE_LJZTBPJ               //累计值同比拼接->24
 	DATA_SOURCE_LT                              //路透->25
+	DATA_SOURCE_COAL                              //中国煤炭网->26
 )
 
 //基础数据初始化日期