Merge branch 'ETA_2.3.2' into debug

# Conflicts:
#	utils/constants.go

controllers/data_manage/clarksons_data.go

@@ -410,7 +410,7 @@ func (this *ClarksonsDataController) SingleData() {
 		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
 		return
 	}
-	edbInfo, err := data_manage.GetEdbInfoByEdbCode(utils.DATA_SOURCE_SCI_HQ, indexInfo.IndexCode)
+	edbInfo, err := data_manage.GetEdbInfoByEdbCode(utils.DATA_SOURCE_CLARKSONS, indexInfo.IndexCode)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取指标数据失败"
 		br.ErrMsg = "获取指标库数据失败,Err:" + err.Error()
@@ -509,38 +509,38 @@ func (this *ClarksonsDataController) MoveClarksonsData() {
 // @Param	request	body data_manage.DelBaseFromSciReq true "type json string"
 // @Success 200 Ret=200 操作成功
 // @router /clarksons/reset [post]
-func (this *ClarksonsDataController) ResetClarksonsIndex() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req request.ResetBaseFromClarksonsReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-
-	if req.BaseFromClarksonsIndexId < 0 {
-		br.Msg = "参数错误"
-		br.IsSendEmail = false
-		return
-	}
-
-	err = data.ResetClarksonsIndex(req.BaseFromClarksonsIndexId)
-	if err != nil {
-		br.Msg = "移动失败"
-		br.ErrMsg = "移动失败，Err:" + err.Error()
-		return
-	}
-
-	br.Ret = 200
-	br.Msg = "操作成功"
-	br.Success = true
-	br.IsAddLog = true
-}
+//func (this *ClarksonsDataController) ResetClarksonsIndex() {
+//	br := new(models.BaseResponse).Init()
+//	defer func() {
+//		this.Data["json"] = br
+//		this.ServeJSON()
+//	}()
+//	var req request.ResetBaseFromClarksonsReq
+//	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+//	if err != nil {
+//		br.Msg = "参数解析异常！"
+//		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+//		return
+//	}
+//
+//	if req.BaseFromClarksonsIndexId < 0 {
+//		br.Msg = "参数错误"
+//		br.IsSendEmail = false
+//		return
+//	}
+//
+//	err = data.ResetClarksonsIndex(req.BaseFromClarksonsIndexId)
+//	if err != nil {
+//		br.Msg = "移动失败"
+//		br.ErrMsg = "移动失败，Err:" + err.Error()
+//		return
+//	}
+//
+//	br.Ret = 200
+//	br.Msg = "操作成功"
+//	br.Success = true
+//	br.IsAddLog = true
+//}
 
 // AddEdbInfo
 // @Title 新增指标接口
@@ -621,7 +621,7 @@ func (this *ClarksonsDataController) AddEdbInfo() {
 		br.ErrMsg = "获取失败,Err:" + err.Error()
 		return
 	}
-	source := utils.DATA_SOURCE_SCI_HQ
+	source := utils.DATA_SOURCE_CLARKSONS
 	// 指标入库
 	edbInfo, err, errMsg, isSendEmail := data.EdbInfoAdd(source, utils.DATA_SUB_SOURCE_EDB, req.ClassifyId, req.EdbCode, req.EdbName, req.Frequency, req.Unit, req.StartDate, req.EndDate, sysUser.AdminId, sysUser.RealName, this.Lang)
 	if err != nil {
@@ -725,7 +725,7 @@ func (this *ClarksonsDataController) AddCheck() {
 		return
 	}
 	// 获取指标库已有指标
-	existsEdb, e := data_manage.GetEdbCodesBySource(utils.DATA_SOURCE_SCI_HQ)
+	existsEdb, e := data_manage.GetEdbCodesBySource(utils.DATA_SOURCE_CLARKSONS)
 	if e != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取自有数据已添加的指标失败, Err: " + e.Error()
@@ -823,14 +823,14 @@ func (c *ClarksonsDataController) NameCheck() {
 			EdbCode: v.EdbCode,
 			EdbName: v.EdbName,
 		})
-		dataItems, err := data_manage.GetEdbDataAllByEdbCode(v.EdbCode, utils.DATA_SOURCE_SCI_HQ, 0, utils.EDB_DATA_LIMIT)
+		dataItems, err := data_manage.GetEdbDataAllByEdbCode(v.EdbCode, utils.DATA_SOURCE_CLARKSONS, 0, utils.EDB_DATA_LIMIT)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取克拉克森已存在信息失败,Err:" + err.Error()
 			return
 		}
 		if len(dataItems) <= 0 {
-			respItem, err := data.AddEdbData(utils.DATA_SOURCE_SCI_HQ, v.EdbCode, v.Frequency)
+			respItem, err := data.AddEdbData(utils.DATA_SOURCE_CLARKSONS, v.EdbCode, v.Frequency)
 			if err != nil {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -891,7 +891,7 @@ func (this *ClarksonsDataController) BatchAdd() {
 	}
 
 	deleteCache := true
-	cacheKey := "CACHE_EDB_INFO_BATCH_ADD_SCI_HQ_" + strconv.Itoa(sysUser.AdminId)
+	cacheKey := "CACHE_EDB_INFO_BATCH_ADD_CLARKSONS_" + strconv.Itoa(sysUser.AdminId)
 	defer func() {
 		if deleteCache {
 			_ = utils.Rc.Delete(cacheKey)
@@ -1259,7 +1259,7 @@ func (this *ClarksonsDataController) DeleteClarksonsData() {
 // @Param   BaseFromClassifyId   query   int  true       "关键字搜索"
 // @Param   IndexCode   query   string  true       "指标编码"
 // @Success 200  导出成功
-// @router /export/sciHqList [get]
+// @router /export/clarksonsList [get]
 func (this *ClarksonsDataController) ExportClarksonsList() {
 	br := new(models.BaseResponse).Init()
 	defer func() {

models/data_manage/base_from_clarksons_index.go

@@ -17,10 +17,6 @@ type BaseFromClarksonsIndex struct {
 	StartDate            string    `description:"开始日期"`
 	EndDate              string    `description:"结束日期"`
 	Sort                 int       `description:"排序"`
-	LatestValue          float64   `description:"最新值"`
-	LatestDate           time.Time `description:"最后更新时间"`
-	TerminalCode         string
-	FilePath             string `json:"-"`
 	CreateTime           time.Time
 	ModifyTime           time.Time
 }
@@ -37,7 +33,6 @@ type BaseFromClarksonsIndexView struct {
 	StartDate            string  `description:"开始日期"`
 	EndDate              string  `description:"结束日期"`
 	Sort                 int     `description:"排序"`
-	LatestValue          float64 `description:"最新值"`
 	LatestDate           string  `description:"最后更新时间"`
 	EdbExist             int     `description:"edb是否存在"`
 	ModifyTime           string
@@ -49,7 +44,7 @@ func (b *BaseFromClarksonsIndex) Update(cols []string) (err error) {
 	return
 }
 
-// GetClarksonsIndexByCondition 根据条件获取卓创红期指标列表
+// GetClarksonsIndexByCondition 根据条件获取克拉克森指标列表
 func GetClarksonsIndexByCondition(condition string, pars []interface{}) (items []*BaseFromClarksonsIndex, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_clarksons_index WHERE 1=1 `
@@ -62,7 +57,7 @@ func GetClarksonsIndexByCondition(condition string, pars []interface{}) (items [
 	return
 }
 
-// GetClarksonsIndexByCondition 根据条件获取卓创红期指标列表
+// GetClarksonsIndexByCondition 根据条件获取克拉克森指标列表
 func GetClarksonsIndexByConditionAndFrequency(condition, frequency string, pars []interface{}) (items []*BaseFromClarksonsIndex, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_clarksons_index WHERE 1=1 `
@@ -88,7 +83,7 @@ func GetClarksonsIndexCountByCondition(condition string, pars []interface{}) (co
 	return
 }
 
-// GetClarksonsIndexAndEdbInfoByCondition 根据条件获取卓创红期index和指标库的信息
+// GetClarksonsIndexAndEdbInfoByCondition 根据条件获取克拉克森index和指标库的信息
 func GetClarksonsIndexAndEdbInfoByCondition(condition string, pars []interface{}) (items []*BaseFromClarksonsIndexView, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT b.*, e.edb_info_id FROM base_from_clarksons_index AS b LEFT JOIN edb_info AS e ON b.index_code=e.edb_code AND e.source=? WHERE 1=1 `
@@ -140,7 +135,7 @@ func GetClarksonsIndexCountByClassifyIds(classifyIds []int) (count int, err erro
 	return
 }
 
-// GetClarksonsIndexByClassifyId 根据分类id获取卓创红期指标列表
+// GetClarksonsIndexByClassifyId 根据分类id获取克拉克森指标列表
 func GetClarksonsIndexByClassifyId(classifyIds []int, startSize, pageSize int) (items []*BaseFromClarksonsIndexView, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT b.*, e.edb_info_id,
@@ -152,7 +147,7 @@ func GetClarksonsIndexByClassifyId(classifyIds []int, startSize, pageSize int) (
 	return
 }
 
-// GetClarksonsIndexCountByClassifyId 根据分类id获取卓创红期指标数量
+// GetClarksonsIndexCountByClassifyId 根据分类id获取克拉克森指标数量
 func GetClarksonsIndexCountByClassifyId(classifyIds []int) (count int, err error) {
 	if len(classifyIds) == 0 {
 		return
@@ -163,7 +158,7 @@ func GetClarksonsIndexCountByClassifyId(classifyIds []int) (count int, err error
 	return
 }
 
-// GetClarksonsIndexCount 获取卓创红期指标数量
+// GetClarksonsIndexCount 获取克拉克森指标数量
 func GetClarksonsIndexCount() (count int, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(*) AS count FROM base_from_clarksons_index `
@@ -182,7 +177,7 @@ func GetClarksonsIndexByPage(startSize, pageSize int) (items []*BaseFromClarkson
 	return
 }
 
-// GetClarksonsIndexBaseInfoByClassifyId 根据分类id获取卓创红期指标列表
+// GetClarksonsIndexBaseInfoByClassifyId 根据分类id获取克拉克森指标列表
 func GetClarksonsIndexBaseInfoByClassifyId(classifyId int) (items []*BaseFromClarksonsIndexView, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT base_from_clarksons_index_id, classify_id, index_code, index_name, CONCAT(classify_id, '_', base_from_clarksons_index_id) AS unique_code  FROM base_from_clarksons_index WHERE classify_id = ? ORDER BY sort ASC `
@@ -190,7 +185,7 @@ func GetClarksonsIndexBaseInfoByClassifyId(classifyId int) (items []*BaseFromCla
 	return
 }
 
-// GetClarksonsIndexBaseInfoByClassifyId 根据分类id获取卓创红期指标列表
+// GetClarksonsIndexBaseInfoByClassifyId 根据分类id获取克拉克森指标列表
 func GetClarksonsIndexBaseInfoByCondition(condition string, pars []interface{}) (items []*BaseFromClarksonsIndex, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT base_from_clarksons_index_id, index_code, index_name  FROM base_from_clarksons_index WHERE 1=1 `
@@ -252,11 +247,11 @@ func GetClarksonsClassifyMaxSortByClassifyIds(classifyIds []int) (items []*BaseF
 		return
 	}
 	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT bc.classify_id, COALESCE(MAX(bi.sort), 0) AS max_sort FROM base_from_clarksons_classify  AS bc
+	sql := `SELECT bc.base_from_clarksons_classify_id, COALESCE(MAX(bi.sort), 0) AS max_sort FROM base_from_clarksons_classify  AS bc
 	LEFT JOIN base_from_clarksons_index AS bi
-	ON bc.classify_id=bi.classify_id  
-	WHERE bc.classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `)
-	GROUP BY bc.classify_id
+	ON bc.base_from_clarksons_classify_id=bi.classify_id  
+	WHERE bc.base_from_clarksons_classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `)
+	GROUP BY bc.base_from_clarksons_classify_id
 	`
 	// sql = ` SELECT classify_id, MAX(sort) AS max_sort FROM base_from_clarksons_index WHERE classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `) GROUP BY classify_id `
 	_, err = o.Raw(sql, classifyIds).QueryRows(&items)

models/db.go

@@ -384,6 +384,8 @@ func initEdbData() {
 		new(data_manage.BaseFromSciHqIndex),
 		new(data_manage.BaseFromSciHqData),
 		new(data_manage.BaseFromClarksonsClassify),
+		new(data_manage.BaseFromClarksonsIndex),
+		new(data_manage.BaseFromClarksonsData),
 	)
 }
 

routers/commentsRouter.go

@@ -4093,15 +4093,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:ClarksonsDataController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:ClarksonsDataController"],
-        beego.ControllerComments{
-            Method: "ResetClarksonsIndex",
-            Router: `/clarksons/reset`,
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:ClarksonsDataController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:ClarksonsDataController"],
         beego.ControllerComments{
             Method: "SearchList",

services/data/base_from_clarksons.go

@@ -606,3 +606,22 @@ func GetClarksonsIndexInfo(keyWord string, classifyIdList []string, frequencyLis
 	indexPage.Paging = page
 	return &indexPage, nil
 }
+
+
+// GetClarkssonsIndexList 获取指标列表
+func GetClarkssonsIndexList(searchParams string) (rzdIndexInfoList []*data_manage.BaseFromRzdIndexList, err error) {
+
+	// 获取指标
+	var condition string
+	var pars []interface{}
+	if searchParams != "" {
+		condition += ` and index_code like ? or index_name like ?`
+		pars = append(pars, "%"+searchParams+"%", "%"+searchParams+"%")
+	}
+	rzdIndexList, err := data_manage.GetRzdIndex(condition, pars)
+	if err != nil {
+		return nil, err
+	}
+
+	return rzdIndexList, nil
+}

utils/constants.go

@@ -190,6 +190,7 @@ const (
 	DATA_SOURCE_CALCULATE_STL                        = 98       // 泛糖科技 -> 93
 	DATA_SOURCE_MAPPING_RESIDUAL                     = 99       // 映射残差
 	DATA_SOURCE_FIT_RESIDUAL                         = 100      // 拟合残差
+	DATA_SOURCE_CLARKSONS                            = 101      // 克拉克森数据
 )
 
 // 数据刷新频率