Browse Source

睿咨得数据爬取落库-初始化index_lib

gmy 5 months ago
parent
commit
6be7c75c74

+ 73 - 255
controllers/base_from_rzd.go

@@ -12,7 +12,7 @@ import (
 	"time"
 )
 
-type BaseFromRzdSController struct {
+type BaseFromRzdController struct {
 	BaseAuthController
 }
 
@@ -20,7 +20,7 @@ type BaseFromRzdSController struct {
 // @Title 新增睿姿得指标
 // @Description 新增粮油商务网指标
 // @router /add [post]
-func (this *BaseFromRzdSController) Add() {
+func (this *BaseFromRzdController) Add() {
 	br := new(models.BaseResponse).Init()
 	var cacheKey string
 	defer func() {
@@ -65,7 +65,7 @@ func (this *BaseFromRzdSController) Add() {
 // @Description 刷新粮油商务网指标接口
 // @Success 200 {object} models.RefreshEdbInfoReq
 // @router /refresh [post]
-func (this *BaseFromLyController) Refresh() {
+func (this *BaseFromRzdController) Refresh() {
 	br := new(models.BaseResponse).Init()
 	var cacheKey string
 	defer func() {
@@ -140,12 +140,12 @@ func (this *BaseFromLyController) Refresh() {
 	br.Msg = "获取成功"
 }
 
-// GetLyClassifyByName
-// @Title 获取分类
+// AddRzdClassify
+// @Title 新增分类
 // @Description 获取分类
-// @Success 200 {object} models.BaseFromLyClassify
-// @router /get/ly/classify/by/name [post]
-func (this *BaseFromLyController) GetLyClassifyByName() {
+// @Success 200 {object} models.BaseFromRzdClassify
+// @router /add/rzd/classify [post]
+func (this *BaseFromRzdController) AddRzdClassify() {
 	br := new(models.BaseResponse).Init()
 	var cacheKey string
 	defer func() {
@@ -157,21 +157,28 @@ func (this *BaseFromLyController) GetLyClassifyByName() {
 		this.ServeJSON()
 	}()
 	var reqData struct {
-		CategoryName string `json:"CategoryName"`
+		ClassifyName string `json:"ClassifyName"`
+		ParentId     int    `json:"parentId"`
 	}
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &reqData)
 	if err != nil {
 		br.ErrMsg = "无法解析请求体"
 		return
 	}
-	categoryName := reqData.CategoryName
+	categoryName := reqData.ClassifyName
 	if categoryName == "" {
 		br.Msg = "请输入分类!"
 		br.ErrMsg = "请输入分类"
 		return
 	}
+	rzdClassify := models.BaseFromRzdClassify{
+		ClassifyName: categoryName,
+		ParentId:     reqData.ParentId,
+		CreateTime:   utils.GetCurrentTime(),
+		ModifyTime:   utils.GetCurrentTime(),
+	}
 
-	lyClassify, err := models.GetLyClassifyByName(categoryName)
+	lyClassify, err := models.AddRzdClassify(rzdClassify)
 	if err != nil {
 		return
 	}
@@ -182,12 +189,12 @@ func (this *BaseFromLyController) GetLyClassifyByName() {
 	br.Msg = "获取成功"
 }
 
-// GetLyIndexRecordByUrl
-// @Title 根据url获取指标已读取记录
-// @Description 根据url获取指标已读取记录
-// @Success 200 {object} models.BaseFromLyIndexRecord
-// @router /get/ly/index/record/by/url [post]
-func (this *BaseFromLyController) GetLyIndexRecordByUrl() {
+// GetRzdClassifyByName
+// @Title 获取分类
+// @Description 获取分类
+// @Success 200 {object} models.BaseFromRzdClassify
+// @router /get/rzd/classify/by/name [post]
+func (this *BaseFromRzdController) GetRzdClassifyByName() {
 	br := new(models.BaseResponse).Init()
 	var cacheKey string
 	defer func() {
@@ -199,72 +206,37 @@ func (this *BaseFromLyController) GetLyIndexRecordByUrl() {
 		this.ServeJSON()
 	}()
 	var reqData struct {
-		Url string `json:"Url"`
+		ClassifyName string `json:"ClassifyName"`
 	}
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &reqData)
 	if err != nil {
 		br.ErrMsg = "无法解析请求体"
 		return
 	}
-	url := reqData.Url
-	if url == "" {
-		br.Msg = "请输入地址链接!"
-		br.ErrMsg = "请输入地址链接"
+	categoryName := reqData.ClassifyName
+	if categoryName == "" {
+		br.Msg = "请输入分类!"
+		br.ErrMsg = "请输入分类"
 		return
 	}
 
-	lyIndexRecord, err := models.GetLyIndexRecordByUrl(url)
+	lyClassify, err := models.GetRzdClassifyByName(categoryName)
 	if err != nil {
 		return
 	}
 
 	br.Ret = 200
 	br.Success = true
-	br.Data = lyIndexRecord
+	br.Data = lyClassify
 	br.Msg = "获取成功"
 }
 
-// AddLyIndexRecord
-// @Title 维护指标数据读取进度到数据库
-// @Description 维护指标数据读取进度到数据库
-// @Success 200 string "处理成功"
-// @router /add/ly/index/record [post]
-func (this *BaseFromLyController) AddLyIndexRecord() {
-	br := new(models.BaseResponse).Init()
-	var cacheKey string
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		_ = utils.Rc.Delete(cacheKey)
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req models.BaseFromLyIndexRecord
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + err.Error()
-		return
-	}
-
-	id, err := models.AddLyIndexRecord(&req)
-	if err != nil {
-		return
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Data = id
-	br.Msg = "处理成功"
-}
-
-// AddLyDataList
-// @Title 新增指标数据
-// @Description 新增指标数据列表
+// AddBatchRzdData
+// @Title 新增数据源指标数据
+// @Description 新增数据源指标数据
 // @Success 200 string "处理成功"
-// @router /add/ly/data/list [post]
-func (this *BaseFromLyController) AddLyDataList() {
+// @router /add/batch/rzd/data [post]
+func (this *BaseFromRzdController) AddBatchRzdData() {
 	br := new(models.BaseResponse).Init()
 	var cacheKey string
 	defer func() {
@@ -275,7 +247,7 @@ func (this *BaseFromLyController) AddLyDataList() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	var req []models.BaseFromLyData
+	var req []models.BaseFromRzdData
 	fmt.Println(string(this.Ctx.Input.RequestBody))
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
 	if err != nil {
@@ -284,7 +256,7 @@ func (this *BaseFromLyController) AddLyDataList() {
 		return
 	}
 
-	err = models.AddLyDataList(req)
+	err = models.AddRzdDataList(req)
 	if err != nil {
 		br.Msg = "新增指标数据失败!"
 		br.ErrMsg = "新增指标数据失败,Err:" + err.Error()
@@ -296,12 +268,12 @@ func (this *BaseFromLyController) AddLyDataList() {
 	br.Msg = "处理成功"
 }
 
-// AddLyIndex
+// AddRzdIndex
 // @Title 新增指标
 // @Description 新增指标
 // @Success 200 string "处理成功"
-// @router /add/ly/index [post]
-func (this *BaseFromLyController) AddLyIndex() {
+// @router /add/rzd/index [post]
+func (this *BaseFromRzdController) AddRzdIndex() {
 	br := new(models.BaseResponse).Init()
 	var cacheKey string
 	defer func() {
@@ -312,7 +284,7 @@ func (this *BaseFromLyController) AddLyIndex() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	var req models.BaseFromLyIndex
+	var req models.BaseFromRzdIndex
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
 	if err != nil {
 		br.Msg = "参数解析异常!"
@@ -320,7 +292,7 @@ func (this *BaseFromLyController) AddLyIndex() {
 		return
 	}
 
-	indexId, err := models.AddLyIndex(&req)
+	indexId, err := models.AddRzdIndex(&req)
 	if err != nil {
 		return
 	}
@@ -331,12 +303,12 @@ func (this *BaseFromLyController) AddLyIndex() {
 	br.Msg = "处理成功"
 }
 
-// GetLyDataByIndexIdAndDataTime
-// @Title 根据指标id和时间获取指标数据
-// @Description 根据指标id和时间获取指标数据
+// GetRzdIndexDataByIndexIdAndDataTime
+// @Title 根据指标code和时间获取指标数据
+// @Description 根据指标code和时间获取指标数据
 // @Success 200 {object} models.BaseFromLyData
-// @router /get/ly/data/by/index/id/and/data/time [post]
-func (this *BaseFromLyController) GetLyDataByIndexIdAndDataTime() {
+// @router /get/rzd/index/data/by/code/and/time [post]
+func (this *BaseFromRzdController) GetRzdIndexDataByIndexIdAndDataTime() {
 	br := new(models.BaseResponse).Init()
 	var cacheKey string
 	defer func() {
@@ -371,75 +343,23 @@ func (this *BaseFromLyController) GetLyDataByIndexIdAndDataTime() {
 		return
 	}
 
-	lyData, err := models.GetLyDataByIndexIdAndDataTime(indexId, dataTime)
-	if err != nil {
-		return
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Data = lyData
-	br.Msg = "获取成功"
-}
-
-// GetLyDataByIndexIdAndDataTimeYM
-// @Title 根据指标id和年月时间获取指标数据
-// @Description 根据指标id和年月时间获取指标数据
-// @Success 200 {object} models.BaseFromLyData
-// @router /get/ly/data/by/index/id/and/data/time/ym [post]
-func (this *BaseFromLyController) GetLyDataByIndexIdAndDataTimeYM() {
-	br := new(models.BaseResponse).Init()
-	var cacheKey string
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		_ = utils.Rc.Delete(cacheKey)
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var reqData struct {
-		IndexId   int    `json:"IndexId"`
-		YearMonth string `json:"YearMonth"`
-	}
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &reqData)
-	if err != nil {
-		br.ErrMsg = "无法解析请求体"
-		return
-	}
-
-	indexId := reqData.IndexId
-	if indexId == 0 {
-		br.Msg = "请输入指标id!"
-		br.ErrMsg = "请输入指标id"
-		return
-	}
-
-	yearMonth := reqData.YearMonth
-
-	if yearMonth == "" {
-		br.Msg = "请输入时间!"
-		br.ErrMsg = "请输入时间"
-		return
-	}
-
-	lyData, err := models.GetLyDataByIndexIdAndDataTimeYM(indexId, yearMonth)
+	rzdData, err := models.GetRzdDataByIndexCodeAndDataTime(indexId, dataTime)
 	if err != nil {
 		return
 	}
 
 	br.Ret = 200
 	br.Success = true
-	br.Data = lyData
+	br.Data = rzdData
 	br.Msg = "获取成功"
 }
 
-// UpdateLyDataById
+// UpdateRzdDataById
 // @Title 更新数据源指标数据
 // @Description 更新数据源指标数据
 // @Success 200 string "处理成功"
-// @router /update/ly/data/by/id [post]
-func (this *BaseFromLyController) UpdateLyDataById() {
+// @router /update/rzd/data/by/id [post]
+func (this *BaseFromRzdController) UpdateRzdDataById() {
 	br := new(models.BaseResponse).Init()
 	var cacheKey string
 	defer func() {
@@ -474,7 +394,7 @@ func (this *BaseFromLyController) UpdateLyDataById() {
 		return
 	}
 
-	err = models.UpdateLyDataById(id, value)
+	err = models.UpdateRzdDataById(id, value)
 	if err != nil {
 		return
 	}
@@ -484,63 +404,12 @@ func (this *BaseFromLyController) UpdateLyDataById() {
 	br.Msg = "处理成功"
 }
 
-// GetLyEdbDataByIndexCodeAndDataTime
-// @Title 根据指标编码和模糊日期获取指标库数据
-// @Description 根据指标编码和模糊日期获取指标库数据
-// @Success 200 {object} []models.EdbDataLy
-// @router /get/ly/edb/data/by/index/code/and/data/time [post]
-func (this *BaseFromLyController) GetLyEdbDataByIndexCodeAndDataTime() {
-	br := new(models.BaseResponse).Init()
-	var cacheKey string
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		_ = utils.Rc.Delete(cacheKey)
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var reqData struct {
-		IndexCode string `json:"IndexCode"`
-		DataTime  string `json:"DataTime"`
-	}
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &reqData)
-	if err != nil {
-		br.ErrMsg = "无法解析请求体"
-		return
-	}
-
-	indexCode := reqData.IndexCode
-	if indexCode == "" {
-		br.Msg = "请输入指标id!"
-		br.ErrMsg = "请输入指标id"
-		return
-	}
-
-	dataTime := reqData.DataTime
-	if dataTime == "" {
-		br.Msg = "请输入时间!"
-		br.ErrMsg = "请输入时间"
-		return
-	}
-
-	lyEdbData, err := models.GetLyEdbDataByIndexCodeAndDataTime(indexCode, dataTime)
-	if err != nil {
-		return
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Data = lyEdbData
-	br.Msg = "获取成功"
-}
-
-// GetLyEdbDataByIndexCodeAndExactDataTime
+// GetRzdEdbDataByIndexCodeAndDataTime
 // @Title 根据指标编码和精确日期获取指标库数据
 // @Description 根据指标编码和精确日期获取指标库数据
 // @Success 200 {object} []models.EdbDataLy
-// @router /get/ly/edb/data/by/index/code/and/exact/data/time [post]
-func (this *BaseFromLyController) GetLyEdbDataByIndexCodeAndExactDataTime() {
+// @router /get/edb/rzd/data/by/code/and/time [post]
+func (this *BaseFromRzdController) GetRzdEdbDataByIndexCodeAndDataTime() {
 	br := new(models.BaseResponse).Init()
 	var cacheKey string
 	defer func() {
@@ -586,12 +455,12 @@ func (this *BaseFromLyController) GetLyEdbDataByIndexCodeAndExactDataTime() {
 	br.Msg = "获取成功"
 }
 
-// UpdateLyEdbDataById
+// UpdateRzdEdbDataById
 // @Title 更新指标库数据 须根据指标编码和日期更新 仅适合月度数据
 // @Description 更新指标库数据 须根据指标编码和日期更新 仅适合月度数据
 // @Success 200 string "处理成功"
-// @router /update/ly/edb/data/by/id [post]
-func (this *BaseFromLyController) UpdateLyEdbDataById() {
+// @router /update/rzd/edb/data/by/id [post]
+func (this *BaseFromRzdController) UpdateRzdEdbDataById() {
 	br := new(models.BaseResponse).Init()
 	var cacheKey string
 	defer func() {
@@ -626,7 +495,7 @@ func (this *BaseFromLyController) UpdateLyEdbDataById() {
 		return
 	}
 
-	err = models.UpdateLyEdbDataById(id, value)
+	err = models.UpdateRzdEdbDataById(id, value)
 	if err != nil {
 		return
 	}
@@ -636,55 +505,12 @@ func (this *BaseFromLyController) UpdateLyEdbDataById() {
 	br.Msg = "处理成功"
 }
 
-// GetLyIndexByCode
+// GetRzdIndexByCode
 // @Title 查询指标编码是否存在
 // @Description 查询指标编码是否存在
 // @Success 200 {object} models.BaseFromLyIndex
-// @router /get/ly/index/by/code [post]
-func (this *BaseFromLyController) GetLyIndexByCode() {
-	br := new(models.BaseResponse).Init()
-	var cacheKey string
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		_ = utils.Rc.Delete(cacheKey)
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var reqData struct {
-		IndexCode string `json:"IndexCode"`
-	}
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &reqData)
-	if err != nil {
-		br.ErrMsg = "无法解析请求体"
-		return
-	}
-
-	indexCode := reqData.IndexCode
-	if indexCode == "" {
-		br.Msg = "请输入指标id!"
-		br.ErrMsg = "请输入指标id"
-		return
-	}
-
-	lyIndex, err := models.GetLyIndexByCode(indexCode)
-	if err != nil {
-		return
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Data = lyIndex
-	br.Msg = "获取成功"
-}
-
-// GetEdbInfoByIndexCode
-// @Title 根据指标code获取指标信息
-// @Description 根据指标code获取指标信息
-// @Success 200 {object} models.EdbInfo
-// @router /get/edb/info/by/index/code [post]
-func (this *BaseFromLyController) GetEdbInfoByIndexCode() {
+// @router /get/rzd/index/by/code [post]
+func (this *BaseFromRzdController) GetRzdIndexByCode() {
 	br := new(models.BaseResponse).Init()
 	var cacheKey string
 	defer func() {
@@ -695,10 +521,8 @@ func (this *BaseFromLyController) GetEdbInfoByIndexCode() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-
 	var reqData struct {
 		IndexCode string `json:"IndexCode"`
-		Source    int    `json:"Source"`
 	}
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &reqData)
 	if err != nil {
@@ -712,30 +536,24 @@ func (this *BaseFromLyController) GetEdbInfoByIndexCode() {
 		br.ErrMsg = "请输入指标id"
 		return
 	}
-	source := reqData.Source
-	if source == 0 {
-		br.Msg = "请输入来源!"
-		br.ErrMsg = "请输入来源"
-		return
-	}
 
-	lyEdbData, err := models.GetEdbInfoByEdbCode(source, indexCode)
+	rzdIndex, err := models.GetRzdIndexByCode(indexCode)
 	if err != nil {
 		return
 	}
 
 	br.Ret = 200
 	br.Success = true
-	br.Data = lyEdbData
+	br.Data = rzdIndex
 	br.Msg = "获取成功"
 }
 
-// AddBatchLyEdbData
-// @Title 批量增加粮油指标库数据
-// @Description 批量增加粮油指标库数据
+// AddBatchRzdEdbData
+// @Title 批量增加睿咨得指标库数据
+// @Description 批量增加睿咨得指标库数据
 // @Success 200 string "处理成功"
-// @router /add/batch/ly/edb/data [post]
-func (this *BaseFromLyController) AddBatchLyEdbData() {
+// @router /add/batch/rzd/edb/data [post]
+func (this *BaseFromRzdController) AddBatchRzdEdbData() {
 	br := new(models.BaseResponse).Init()
 	var cacheKey string
 	defer func() {
@@ -746,7 +564,7 @@ func (this *BaseFromLyController) AddBatchLyEdbData() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	var req []models.EdbDataLy
+	var req []models.EdbDataRzd
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
 	if err != nil {
 		br.Msg = "参数解析异常!"
@@ -754,7 +572,7 @@ func (this *BaseFromLyController) AddBatchLyEdbData() {
 		return
 	}
 
-	err = models.AddLyEdbDataList(req)
+	err = models.AddRzdEdbDataList(req)
 	if err != nil {
 		return
 	}

+ 42 - 0
models/base_from_rzd_classify.go

@@ -0,0 +1,42 @@
+// @Author gmy 2024/8/7 9:26:00
+package models
+
+import (
+	"errors"
+	"github.com/beego/beego/v2/client/orm"
+)
+
+type BaseFromRzdClassify struct {
+	BaseFromRzdClassifyId int    `orm:"column(base_from_rzd_classify_id);pk"`
+	CreateTime            string `orm:"column(create_time)"`
+	ModifyTime            string `orm:"column(modify_time)"`
+	ClassifyName          string `orm:"column(classify_name)"`
+	ParentId              int    `orm:"column(parent_id)"`
+	Sort                  int    `orm:"column(sort)"`
+	ClassifyNameEn        string `orm:"column(classify_name_en)"`
+}
+
+func init() {
+	orm.RegisterModel(new(BaseFromRzdData))
+}
+
+// GetRzdClassifyByName 根据分类名称查询
+func GetRzdClassifyByName(classifyName string) (item *BaseFromRzdClassify, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM base_from_rzd_classify WHERE classify_name=?`
+	err = o.Raw(sql, classifyName).QueryRow(&item)
+	if errors.Is(err, orm.ErrNoRows) {
+		return nil, nil
+	}
+	return
+}
+
+// AddRzdClassify 新增分类
+func AddRzdClassify(classify BaseFromRzdClassify) (int64, error) {
+	o := orm.NewOrm()
+	id, err := o.Insert(classify)
+	if err != nil {
+		return 0, err
+	}
+	return id, nil
+}

+ 61 - 0
models/base_from_rzd_data.go

@@ -0,0 +1,61 @@
+// @Author gmy 2024/8/7 9:50:00
+package models
+
+import (
+	"errors"
+	"github.com/beego/beego/v2/client/orm"
+)
+
+type BaseFromRzdData struct {
+	BaseFromRzdDataId  int     `orm:"column(base_from_rzd_data_id);pk"`
+	BaseFromRzdIndexId int     `orm:"column(base_from_rzd_index_id)"`
+	CreateTime         string  `orm:"column(create_time)"`
+	DataTime           string  `orm:"column(data_time)"`
+	IndexCode          string  `orm:"column(index_code)"`
+	ModifyTime         string  `orm:"column(modify_time)"`
+	Value              float64 `orm:"column(value)"`
+}
+
+func init() {
+	orm.RegisterModel(new(BaseFromRzdData))
+}
+
+// AddRzdDataList 批量插入数据记录列表
+func AddRzdDataList(items []BaseFromRzdData) (err error) {
+	o := orm.NewOrm()
+	_, err = o.InsertMulti(len(items), items)
+	return
+}
+
+// GetRzdDataByIndexCodeAndDataTime 根据指标id和数据日期查询数据
+func GetRzdDataByIndexCodeAndDataTime(indexId int, dataTime string) (items []BaseFromRzdData, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM base_from_rzd_data WHERE index_code=? AND data_time=?`
+	_, err = o.Raw(sql, indexId, dataTime).QueryRows(&items)
+	if errors.Is(err, orm.ErrNoRows) {
+		return nil, nil
+	}
+	return
+}
+
+// UpdateRzdDataById 根据主键id更新数据
+func UpdateRzdDataById(dataId int, value float64) (err error) {
+	o := orm.NewOrm()
+	sql := `UPDATE base_from_rzd_data SET value=? WHERE base_from_rzd_data_id=?`
+	_, err = o.Raw(sql, value, dataId).Exec()
+	return
+}
+
+// GetBaseFromRzdDataByCondition 添加查询
+func GetBaseFromRzdDataByCondition(condition string, pars []interface{}) (items []BaseFromRzdData, err error) {
+	sql := `SELECT * FROM base_from_rzd_data WHERE 1=1 `
+	o := orm.NewOrm()
+	if condition != "" {
+		sql += condition
+	}
+	_, err = o.Raw(sql, pars...).QueryRows(&items)
+	if errors.Is(err, orm.ErrNoRows) {
+		return nil, nil
+	}
+	return
+}

+ 54 - 0
models/base_from_rzd_index.go

@@ -0,0 +1,54 @@
+// Package models
+// @Author gmy 2024/8/7 9:38:00
+package models
+
+import (
+	"errors"
+	"github.com/beego/beego/v2/client/orm"
+)
+
+type BaseFromRzdIndex struct {
+	BaseFromRzdIndexId   int    `orm:"column(base_from_rzd_index_id);pk"`
+	CreateTime           string `orm:"column(create_time)"`
+	ModifyTime           string `orm:"column(modify_time)"`
+	BaseFromLyClassifyId int    `orm:"column(base_from_ly_classify_id)"`
+	IndexCode            string `orm:"column(index_code)"`
+	IndexName            string `orm:"column(index_name)"`
+	Frequency            string `orm:"column(frequency)"`
+	Unit                 string `orm:"column(unit)"`
+}
+
+// 在 init 函数中注册模型
+func init() {
+	orm.RegisterModel(new(BaseFromRzdIndex))
+}
+
+// AddRzdIndexList 批量插入指标记录列表
+func AddRzdIndexList(items []*BaseFromRzdIndex) (err error) {
+	o := orm.NewOrm()
+	_, err = o.InsertMulti(len(items), items)
+	return
+}
+
+// AddRzdIndex 添加指标
+func AddRzdIndex(item *BaseFromRzdIndex) (int64, error) {
+	o := orm.NewOrm()
+	id, err := o.Insert(item)
+	if err != nil {
+		return 0, err
+	}
+	return id, nil
+}
+
+// GetRzdIndexByCode 查询指标编码是否存在
+func GetRzdIndexByCode(indexCode string) (item *BaseFromRzdIndex, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM base_from_rzd_index WHERE index_code=?`
+	err = o.Raw(sql, indexCode).QueryRow(&item)
+
+	if errors.Is(err, orm.ErrNoRows) {
+		return nil, nil
+	}
+
+	return
+}

+ 223 - 0
models/edb_data_rzd.go

@@ -0,0 +1,223 @@
+// @Author gmy 2024/9/14 16:13:00
+package models
+
+import (
+	"errors"
+	"eta/eta_index_lib/utils"
+	"fmt"
+	"github.com/beego/beego/v2/client/orm"
+	"strconv"
+	"strings"
+	"time"
+)
+
+type EdbDataRzd struct {
+	edbDataId     int     `orm:"column(edb_data_id);pk"`
+	CreateTime    string  `orm:"column(create_time)"`
+	ModifyTime    string  `orm:"column(modify_time)"`
+	EdbInfoId     int     `orm:"column(edb_info_id)"`
+	EdbCode       string  `orm:"column(edb_code)"`
+	DataTime      string  `orm:"column(data_time)"`
+	Value         float64 `orm:"column(value)"`
+	DataTimestamp uint64  `orm:"column(data_timestamp)"`
+}
+
+func init() {
+	orm.RegisterModel(new(EdbDataRzd))
+}
+
+// GetRzdEdbDataByIndexCodeAndDataTime 根据指标编码和时间获取指标库数据
+func GetRzdEdbDataByIndexCodeAndDataTime(indexCode string, dataTime string) (items []EdbDataRzd, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM edb_data_rzd WHERE edb_code=? AND data_time=?`
+	_, err = o.Raw(sql, indexCode, dataTime).QueryRows(&items)
+	if errors.Is(err, orm.ErrNoRows) {
+		return nil, nil
+	}
+	return
+}
+
+// UpdateRzdEdbDataById 更新指标库数据 须根据指标编码和日期更新 仅适合月度数据
+func UpdateRzdEdbDataById(id int, value float64) (err error) {
+	o := orm.NewOrm()
+	sql := `UPDATE edb_data_rzd SET value=? WHERE edb_data_id=?`
+	_, err = o.Raw(sql, value, id).Exec()
+	return
+}
+
+// AddRzdEdbDataList 新增指标库数据
+func AddRzdEdbDataList(items []EdbDataRzd) (err error) {
+	o := orm.NewOrm()
+	_, err = o.InsertMulti(len(items), items)
+	return
+}
+
+// AddEdbDataFromRzd 新增指标数据
+func AddEdbDataFromRzd(edbCode string) (err error) {
+	o := orm.NewOrm()
+
+	var condition string
+	var pars []interface{}
+
+	if edbCode != "" {
+		condition += " AND index_code = ? "
+		pars = append(pars, edbCode)
+	}
+
+	dataAll, err := GetBaseFromRzdDataByCondition(condition, pars)
+	if err != nil {
+		return err
+	}
+	dataLen := len(dataAll)
+
+	existMap := make(map[string]string)
+	if dataLen > 0 {
+		var isAdd bool
+		addSql := ` INSERT INTO edb_data_rzd (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+		for i := 0; i < dataLen; i++ {
+			item := dataAll[i]
+			eDate := item.DataTime
+			sValue := utils.SubFloatToString(item.Value, 4)
+			if sValue != "" {
+				if _, ok := existMap[eDate]; !ok {
+					dataTime, err := time.ParseInLocation(utils.FormatDate, eDate, time.Local)
+					if err != nil {
+						return err
+					}
+					timestamp := dataTime.UnixNano() / 1e6
+					timeStr := fmt.Sprintf("%d", timestamp)
+					addSql += GetAddSql("0", edbCode, eDate, timeStr, sValue)
+					isAdd = true
+				}
+			}
+			existMap[eDate] = eDate
+		}
+		if isAdd {
+			addSql = strings.TrimRight(addSql, ",")
+			utils.FileLog.Info("addSql:" + addSql)
+			_, err = o.Raw(addSql).Exec()
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return
+}
+
+func RefreshEdbDataFromRzd(edbInfoId int, edbCode, startDate string) (err error) {
+	source := utils.DATA_SOURCE_RZD
+	subSource := utils.DATA_SUB_SOURCE_EDB
+
+	o := orm.NewOrm()
+	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_time>=? "
+		pars = append(pars, startDate)
+	}
+
+	dataList, err := GetBaseFromRzdDataByCondition(condition, pars)
+	if err != nil {
+		return
+	}
+
+	// 真实数据的最大日期  , 插入规则配置的日期
+	var realDataMaxDate, edbDataInsertConfigDate time.Time
+	var edbDataInsertConfig *EdbDataInsertConfig
+	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
+	{
+		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			return
+		}
+		if edbDataInsertConfig != nil {
+			edbDataInsertConfigDate = edbDataInsertConfig.Date
+		}
+	}
+
+	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, subSource, 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_rzd(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	var isAdd bool
+	addMap := make(map[string]string)
+	for _, v := range dataList {
+		item := v
+		eDate := item.DataTime
+		sValue := utils.SubFloatToString(item.Value, 4)
+
+		dataTime, err := time.ParseInLocation(utils.FormatDate, eDate, time.Local)
+		if err != nil {
+			return err
+		}
+		if findItem, ok := existMap[v.DataTime]; !ok {
+			if sValue != "" {
+				timestamp := dataTime.UnixNano() / 1e6
+				timeStr := fmt.Sprintf("%d", timestamp)
+				saveValue := sValue
+
+				if _, addOk := addMap[eDate]; !addOk {
+					addSql += GetAddSql(edbInfoIdStr, edbCode, eDate, timeStr, saveValue)
+					isAdd = true
+				}
+			}
+		} else {
+			if findItem != nil && utils.SubFloatToString(findItem.Value, 4) != sValue {
+				err = ModifyEdbDataById(source, subSource, findItem.EdbDataId, sValue)
+				if err != nil {
+					return err
+				}
+			}
+		}
+		addMap[v.DataTime] = v.DataTime
+
+		// 下面代码主要目的是处理掉手动插入的数据判断
+		{
+			if realDataMaxDate.IsZero() || dataTime.After(realDataMaxDate) {
+				realDataMaxDate = dataTime
+			}
+			if edbDataInsertConfigDate.IsZero() || dataTime.Equal(edbDataInsertConfigDate) {
+				isFindConfigDateRealData = true
+			}
+		}
+	}
+
+	// 处理手工数据补充的配置
+	HandleConfigInsertEdbData(realDataMaxDate, edbDataInsertConfig, edbInfoId, source, subSource, existMap, isFindConfigDateRealData)
+
+	if isAdd {
+		addSql = strings.TrimRight(addSql, ",")
+		_, err = o.Raw(addSql).Exec()
+		if err != nil {
+			return err
+		}
+	}
+	return
+}

+ 5 - 0
routers/router.go

@@ -292,6 +292,11 @@ func init() {
 				&controllers.BaseFromLyController{},
 			),
 		),
+		beego.NSNamespace("/rzd",
+			beego.NSInclude(
+				&controllers.BaseFromRzdController{},
+			),
+		),
 		beego.NSNamespace("/oilchem",
 			beego.NSInclude(
 				&controllers.OilchemController{},

+ 5 - 0
utils/common.go

@@ -1500,3 +1500,8 @@ func GetTradingDays(startDate, endDate time.Time) []time.Time {
 	}
 	return tradingDays
 }
+
+// GetCurrentTime 获取当前时间 格式为 2024-08-07 15:29:58
+func GetCurrentTime() string {
+	return time.Now().Format("2006-01-02 15:04:05")
+}

+ 1 - 1
utils/constants.go

@@ -116,7 +116,7 @@ const (
 	DATA_SOURCE_LY                                   = 91 // 粮油商务网
 	DATA_SOURCE_TRADE_ANALYSIS                       = 92 // 持仓分析
 	DATA_SOURCE_HISUGAR                              = 93 // 泛糖科技 -> 93
-	DATA_SOURCE_RZD                                  = 97 // 泛糖科技 -> 93
+	DATA_SOURCE_RZD                                  = 97 // 睿咨得科技 -> 93
 )
 
 // 指标来源的中文展示