Merge branch 'master' into feature/eta1.1.0_edb_classify

controllers/data_manage/edb_classify.go

@@ -723,7 +723,7 @@ func (this *EdbClassifyController) ClassifyEdbInfoList() {
 		noPermissionEdbInfoIdMap[v.EdbInfoId] = true
 	}
 
-	allEdbInfo, err := data_manage.GetEdbInfoByClassifyId(classifyId, 0)
+	allEdbInfo, err := data_manage.GetEdbInfoByClassifyId(classifyId, 0, 0)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()

controllers/data_manage/predict_edb_info.go

@@ -1767,9 +1767,11 @@ func (this *PredictEdbInfoController) Modify() {
 //	data.AddOrEditAllEdbInfoToEs()
 //}
 
+// ClassifyEdbInfoItems
 // @Title 获取分类下指标接口
 // @Description 获取分类下指标接口
 // @Param   ClassifyId   query   int  true       "分类id"
+// @Param   IsShowMe   query   bool  false       "是否只看我的"
 // @Success 200 {object} data_manage.EdbClassifyListResp
 // @router /predict_edb_info/items [get]
 func (this *PredictEdbInfoController) ClassifyEdbInfoItems() {
@@ -1785,6 +1787,9 @@ func (this *PredictEdbInfoController) ClassifyEdbInfoItems() {
 		return
 	}
 
+	// 是否只看我的
+	isShowMe, _ := this.GetBool("IsShowMe")
+
 	// 获取当前账号的不可见指标
 	obj := data_manage.EdbInfoNoPermissionAdmin{}
 	confList, err := obj.GetAllListByAdminId(this.SysUser.AdminId)
@@ -1798,7 +1803,13 @@ func (this *PredictEdbInfoController) ClassifyEdbInfoItems() {
 		noPermissionEdbInfoIdMap[v.EdbInfoId] = true
 	}
 
-	allEdbInfo, err := data_manage.GetEdbInfoByClassifyId(classifyId, 1)
+	// 如果选择了只看我的，那么只查询归属于我的账号
+	sysUserId := 0
+	if isShowMe {
+		sysUserId = this.SysUser.AdminId
+	}
+
+	allEdbInfo, err := data_manage.GetEdbInfoByClassifyId(classifyId, 1, sysUserId)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()
@@ -1811,6 +1822,7 @@ func (this *PredictEdbInfoController) ClassifyEdbInfoItems() {
 		if _, ok := noPermissionEdbInfoIdMap[v.EdbInfoId]; ok {
 			continue
 		}
+
 		button := data.GetEdbOpButton(this.SysUser, v.SysUserId, v.EdbType, utils.EDB_INFO_TYPE)
 		button.AddButton = false //不管有没有权限，指标都是没有添加按钮的
 		v.Button = button

models/data_manage/edb_info.go

@@ -1710,11 +1710,19 @@ type SetEdbDataInsertConfigReq struct {
 	Value     float64 `description:"值"`
 }
 
-// GetEdbInfoAll 用于分类展示
-func GetEdbInfoByClassifyId(classifyId, edbInfoType int) (items []*EdbClassifyItems, err error) {
+// GetEdbInfoByClassifyId 用于分类展示
+func GetEdbInfoByClassifyId(classifyId, edbInfoType, adminId int) (items []*EdbClassifyItems, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT edb_info_id,classify_id,edb_name_source AS classify_name,edb_name_en AS classify_name_en,unique_code,source_name,source,sys_user_id,sys_user_real_name,start_date,edb_code,edb_type FROM edb_info WHERE classify_id = ? AND edb_info_type = ? order by sort asc,edb_info_id asc`
-	_, err = o.Raw(sql, classifyId, edbInfoType).QueryRows(&items)
+	sql := ` SELECT edb_info_id,classify_id,edb_name_source AS classify_name,edb_name_en AS classify_name_en,unique_code,source_name,source,sys_user_id,sys_user_real_name,start_date,edb_code,edb_type FROM edb_info WHERE classify_id = ? AND edb_info_type = ?`
+
+	pars := []interface{}{classifyId, edbInfoType}
+	// 如果筛选了用户id
+	if adminId > 0 {
+		sql += ` AND sys_user_id = ? `
+		pars = append(pars, adminId)
+	}
+	sql += ` order by sort asc,edb_info_id asc `
+	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
 

services/data/trade_analysis/trade_analysis.go

@@ -222,16 +222,24 @@ func getZhengzhouClassifyName(code string) (name string) {
 		name = "苹果"
 		return
 	}
+	if strings.HasPrefix(code, "PX") {
+		name = "PX"
+		return
+	}
+	if strings.HasPrefix(code, "SH") {
+		name = "烧碱"
+		return
+	}
 	return
 }
 
 func GetPositionTopDetail(req trade_analysis.GetPositionTopReq) (ret trade_analysis.GetPositionTopResp, err error, errMsg string) {
 	//定义交易所
 	exchanges := map[string]string{
-		"郑商所":   "zhengzhou",
-		"大商所":   "dalian",
-		"上期所":   "shanghai",
-		"中金所":   "cffex",
+		"郑商所":  "zhengzhou",
+		"大商所":  "dalian",
+		"上期所":  "shanghai",
+		"中金所":  "cffex",
 		"上期能源": "ine",
 	}
 	exchange, ok := exchanges[req.Exchange]
@@ -263,7 +271,7 @@ func GetPositionTopDetail(req trade_analysis.GetPositionTopReq) (ret trade_analy
 		}
 	}
 	dataTimeStr = dataTime.Format(utils.FormatDate)
-	
+
 	ret.DataTime = dataTimeStr
 	ret.LastDataTime = lastDataTime.Format(utils.FormatDate)