Merge branch 'master' into ETA_1.1.5

.gitignore

@@ -3,6 +3,7 @@
 /.idea
 /routers/.DS_Store
 /rdlucklog
+/etalogs
 /conf/*.conf
 /binlog/*
 /*.pdf

controllers/banner.go

@@ -34,7 +34,7 @@ func (this *BannerController) Upload() {
 	ext := path.Ext(h.Filename)
 	dateDir := time.Now().Format("20060102")
 	uploadDir := utils.STATIC_DIR + "hongze/" + dateDir
-	err = os.MkdirAll(uploadDir, 777)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		br.Msg = "存储目录创建失败"
 		br.ErrMsg = "存储目录创建失败,Err:" + err.Error()

controllers/base_common.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"eta/eta_api/cache"
 	"eta/eta_api/models"
+	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/utils"
 	"fmt"
 	"github.com/beego/beego/v2/server/web"
@@ -55,12 +56,14 @@ func (c *BaseCommonController) ServeJSON(encoding ...bool) {
 		hasEncoding = true
 	}
 	if c.Data["json"] == nil {
-		go utils.SendEmail("异常提醒:"+utils.RunMode, "接口:"+"URI:"+c.Ctx.Input.URI()+";无返回值", utils.EmailSendToUsers)
+		//go utils.SendEmail("异常提醒:"+utils.RunMode, "接口:"+"URI:"+c.Ctx.Input.URI()+";无返回值", utils.EmailSendToUsers)
+		go alarm_msg.SendAlarmMsg("接口:URI:"+c.Ctx.Input.URI()+";无返回值", 3)
 		return
 	}
 	baseRes := c.Data["json"].(*models.BaseResponse)
 	if baseRes != nil && !baseRes.Success && baseRes.IsSendEmail {
-		go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "URI:"+c.Ctx.Input.URI()+" ErrMsg:"+baseRes.ErrMsg+";Msg"+baseRes.Msg, utils.EmailSendToUsers)
+		//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "URI:"+c.Ctx.Input.URI()+" ErrMsg:"+baseRes.ErrMsg+";Msg"+baseRes.Msg, utils.EmailSendToUsers)
+		go alarm_msg.SendAlarmMsg("失败提醒:URI:"+c.Ctx.Input.URI()+" ErrMsg:"+baseRes.ErrMsg+";Msg"+baseRes.Msg, 3)
 	}
 
 	//新增uuid记录

controllers/cloud_disk.go

@@ -564,7 +564,7 @@ func (this *CloudDiskController) ResourceUpload() {
 	}
 
 	uploadDir := utils.STATIC_DIR + "hongze/" + time.Now().Format("20060102")
-	if e = os.MkdirAll(uploadDir, 766); e != nil {
+	if e = os.MkdirAll(uploadDir, utils.DIR_MOD); e != nil {
 		br.Msg = "存储目录创建失败"
 		br.ErrMsg = "存储目录创建失败, Err:" + e.Error()
 		return

controllers/data_manage/chart_info.go

@@ -2174,7 +2174,7 @@ func (this *ChartInfoController) ChartInfoBase64Upload() {
 
 	uploadDir := "static/images/"
 	if !utils.FileIsExist(uploadDir) {
-		err := os.MkdirAll(uploadDir, 777)
+		err := os.MkdirAll(uploadDir, utils.DIR_MOD)
 		if err != nil {
 			br.Msg = "图表保存失败"
 			br.ErrMsg = "存储目录创建失败,Err:" + err.Error()
@@ -2218,6 +2218,8 @@ func (this *ChartInfoController) ChartInfoBase64Upload() {
 	case <-doneChannel:
 		fmt.Println("done")
 	case err := <-errorChannel:
+		br.Msg = "文件上传失败"
+		br.ErrMsg = fmt.Sprintf("execute command failure err: %s", err.Error())
 		fmt.Println("execute command failure err:" + err.Error())
 		return
 	}

controllers/data_manage/edb_classify.go

@@ -8,6 +8,7 @@ import (
 	"eta/eta_api/models/system"
 	"eta/eta_api/services/data"
 	"eta/eta_api/utils"
+	"sort"
 )
 
 // EdbClassifyController 数据管理-分类模块
@@ -15,47 +16,6 @@ type EdbClassifyController struct {
 	controllers.BaseAuthController
 }
 
-//
-//// @Title 分类列表
-//// @Description 分类列表接口
-//// @Success 200 {object} data_manage.EdbClassifyListResp
-//// @router /classify/list [get]
-//func (this *EdbClassifyController) List() {
-//	br := new(models.BaseResponse).Init()
-//	defer func() {
-//		this.Data["json"] = br
-//		this.ServeJSON()
-//	}()
-//	rootList, err := data_manage.GetEdbClassifyByParentId(0)
-//	if err != nil {
-//		br.Msg = "获取失败"
-//		br.ErrMsg = "获取数据失败，Err:" + err.Error()
-//		return
-//	}
-//
-//	classifyAll, err := data_manage.GetEdbClassifyAll()
-//	if err != nil {
-//		br.Msg = "获取失败"
-//		br.ErrMsg = "获取数据失败，Err:" + err.Error()
-//		return
-//	}
-//
-//	fmt.Println("start:", time.Now())
-//	nodeAll := make([]*data_manage.EdbClassifyItems, 0)
-//	for k := range rootList {
-//		rootNode := rootList[k]
-//		data.EdbClassifyListMakeTree(classifyAll, rootNode)
-//		nodeAll = append(nodeAll, rootNode)
-//	}
-//	fmt.Println("end:", time.Now())
-//	resp := new(data_manage.EdbClassifyListResp)
-//	resp.AllNodes = nodeAll
-//	br.Ret = 200
-//	br.Success = true
-//	br.Msg = "获取成功"
-//	br.Data = resp
-//}
-
 // ListV2
 // @Title 分类列表
 // @Description 分类列表接口
@@ -527,13 +487,13 @@ func (this *EdbClassifyController) EdbClassifyMove() {
 		return
 	}
 
-	if req.ClassifyId <= 0 {
+	if req.ClassifyId <= 0 && req.EdbInfoId <= 0 {
 		br.Msg = "参数错误"
-		br.ErrMsg = "分类id小于等于0"
+		br.ErrMsg = "请选择拖动目标，分类目录或者指标"
 		return
 	}
 
-	err, errMsg := data.MoveEdbClassify(req.ClassifyId, req.ParentClassifyId, req.PrevClassifyId, req.NextClassifyId, sysUser)
+	err, errMsg := data.MoveEdbClassify(req, sysUser, 0)
 	if errMsg != `` {
 		br.Msg = errMsg
 		br.ErrMsg = errMsg
@@ -897,6 +857,172 @@ func (this *EdbClassifyController) ItemsV3() {
 	br.Data = resp
 }
 
+// SimpleList
+// @Title 单层分类列表
+// @Description 单层分类列表
+// @Success 200 {object} data_manage.EdbClassifyListResp
+// @router /classify/simple [get]
+func (this *EdbClassifyController) SimpleList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	// 默认查一级分类和一级分类下的指标信息，
+	// 如果是 子级分类，查询该子级分类的下一级分类和指标信息
+	// 增加标识判断是文件夹还是指标列表
+	parentId, _ := this.GetInt("ParentId")
+
+	rootList, err := data_manage.GetEdbClassifyByParentId(parentId, 0)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取数据失败，Err:" + err.Error()
+		return
+	}
+	nodeAll := make([]*data_manage.EdbClassifyItems, 0)
+
+	var sortList data_manage.EdbClassifyItemList
+	if parentId > 0 {
+		// 查询挂在当前分类上的指标列表
+		// 获取当前账号的不可见指标
+		obj := data_manage.EdbInfoNoPermissionAdmin{}
+		confList, err := obj.GetAllListByAdminId(this.SysUser.AdminId)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取不可见指标配置数据失败，Err:" + err.Error()
+			return
+		}
+		noPermissionEdbInfoIdMap := make(map[int]bool)
+		for _, v := range confList {
+			noPermissionEdbInfoIdMap[v.EdbInfoId] = true
+		}
+		allEdbInfo, err := data_manage.GetEdbInfoByClassifyId(parentId, 0, 0)
+		if err != nil {
+			br.Msg = "获取指标数据失败"
+			br.ErrMsg = "获取指标数据失败，Err:" + err.Error()
+			return
+		}
+
+		for _, v := range allEdbInfo {
+			// 如果指标不可见，那么就不返回该指标
+			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
+			v.Children = make([]*data_manage.EdbClassifyItems, 0)
+			v.ParentId = parentId
+			nodeAll = append(nodeAll, v)
+		}
+	}
+	if len(rootList) > 0 {
+		for _, v := range rootList {
+			button := data.GetEdbClassifyOpButton(this.SysUser, v.SysUserId)
+			v.Button = button
+			v.Children = make([]*data_manage.EdbClassifyItems, 0)
+			nodeAll = append(nodeAll, v)
+		}
+	}
+	if len(nodeAll) > 0 {
+		//根据sort值排序
+		sortList = nodeAll
+		sort.Sort(sortList)
+	}
+
+	language := `CN`
+	// 指标显示的语言
+	{
+		configDetail, _ := system.GetConfigDetailByCode(this.SysUser.AdminId, system.EdbLanguageVar)
+		if configDetail != nil {
+			language = configDetail.ConfigValue
+		} else {
+			configDetail, _ = system.GetDefaultConfigDetailByCode(system.EdbLanguageVar)
+			if configDetail != nil {
+				language = configDetail.ConfigValue
+			}
+		}
+	}
+
+	// 是否允许添加一级分类
+	canOpClassify := true
+	button := data.GetEdbClassifyOpButton(this.SysUser, 0)
+	if !button.AddButton {
+		canOpClassify = false
+	}
+
+	resp := new(data_manage.EdbClassifyListResp)
+	resp.AllNodes = sortList
+	resp.Language = language
+	resp.CanOpClassify = canOpClassify
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}
+
+// ClassifyTree
+// @Title 多层分类列表树
+// @Description 多层分类列表树
+// @Success 200 {object} data_manage.EdbClassifyListResp
+// @router /classify/tree [get]
+func (this *EdbClassifyController) ClassifyTree() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	allList, err := data_manage.GetNormalEdbClassifyAll()
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取数据失败，Err:" + err.Error()
+		return
+	}
+	nodeAll := make([]*data_manage.EdbClassifyItems, 0)
+	var sortList data_manage.EdbClassifyItemList
+
+	if len(allList) > 0 {
+		for k, v := range allList {
+			button := data.GetEdbClassifyOpButton(this.SysUser, v.SysUserId)
+			allList[k].Button = button
+		}
+		nodeAll = data.GetClassifyTreeRecursive(allList, 0)
+		//根据sort值排序
+		sortList = nodeAll
+		sort.Sort(sortList)
+	}
+	language := `CN`
+	// 指标显示的语言
+	{
+		configDetail, _ := system.GetConfigDetailByCode(this.SysUser.AdminId, system.EdbLanguageVar)
+		if configDetail != nil {
+			language = configDetail.ConfigValue
+		} else {
+			configDetail, _ = system.GetDefaultConfigDetailByCode(system.EdbLanguageVar)
+			if configDetail != nil {
+				language = configDetail.ConfigValue
+			}
+		}
+	}
+
+	// 是否允许添加一级分类
+	canOpClassify := true
+	button := data.GetEdbClassifyOpButton(this.SysUser, 0)
+	if !button.AddButton {
+		canOpClassify = false
+	}
+
+	resp := new(data_manage.EdbClassifyListResp)
+	resp.AllNodes = sortList
+	resp.Language = language
+	resp.CanOpClassify = canOpClassify
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}
+
 // EdbClassifyMoveV2
 // @Title 分类移动接口v2
 // @Description 分类移动接口v2

controllers/data_manage/edb_info.go

@@ -1748,11 +1748,16 @@ func (this *EdbInfoController) EdbInfoList() {
 	//是否展示英文标识
 	edbInfoItem.IsEnEdb = data.CheckIsEnEdb(edbInfoItem.EdbNameEn, edbInfoItem.Unit, edbInfoItem.UnitEn)
 	//查询目录
-	resultList, _ := data_manage.GetClassifyAllByClassifyId(edbInfoItem.ClassifyId)
+	classifyList, err, errMsg := data.GetFullClassifyByClassifyId(edbInfoItem.ClassifyId)
+	if err != nil {
+		br.Msg = err.Error()
+		br.ErrMsg = errMsg
+		return
+	}
 
 	resp.Paging = page
 	resp.Item = edbInfoItem
-	resp.ClassifyList = resultList
+	resp.ClassifyList = classifyList
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
@@ -2444,11 +2449,20 @@ func (this *EdbInfoController) EdbInfoDetail() {
 		br.ErrMsg = "获取指标信息失败，Err:" + err.Error()
 		return
 	}
+	var resp data_manage.EdbInfoFullClassify
+	classifyList, err, errMsg := data.GetFullClassifyByClassifyId(edbInfo.ClassifyId)
+	if err != nil {
+		br.Msg = err.Error()
+		br.ErrMsg = errMsg
+		return
+	}
+	resp.EdbInfo = edbInfo
+	resp.ClassifyList = classifyList
 
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
-	br.Data = edbInfo
+	br.Data = resp
 }
 
 // EdbInfoFilter
@@ -2987,8 +3001,17 @@ func (this *ChartInfoController) EdbInfoData() {
 		br.ErrMsg = "获取失败,Err:" + err.Error()
 		return
 	}
-	resp := new(data_manage.EdbInfoDataResp)
-	resp.EdbInfo = edbInfo
+	fullEdb := new(data_manage.EdbInfoFullClassify)
+	resp := new(data_manage.EdbInfoDataFullClassifyResp)
+	classifyList, err, errMsg := data.GetFullClassifyByClassifyId(edbInfo.ClassifyId)
+	if err != nil {
+		br.Msg = err.Error()
+		br.ErrMsg = errMsg
+		return
+	}
+	fullEdb.EdbInfo = edbInfo
+	fullEdb.ClassifyList = classifyList
+	resp.EdbInfo = fullEdb
 	resp.DataList = dataList
 	br.Ret = 200
 	br.Success = true
@@ -4500,26 +4523,18 @@ func (this *EdbInfoController) EdbChartList() {
 	// 分类筛选
 	classifyId, _ := this.GetInt("ClassifyId")
 	if classifyId > 0 {
-		strClassifyIds, e := data_manage.GetEdbClassify(classifyId)
+		childClassify, e, _ := data.GetChildClassifyByClassifyId(classifyId)
 		if e != nil && e.Error() != utils.ErrNoRow() {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取分类信息失败, GetEdbClassify,Err:" + e.Error()
 			return
 		}
 		var classifyIds []int
-		classifyIdArr := strings.Split(strClassifyIds, ",")
-		for _, v := range classifyIdArr {
-			c, _ := strconv.Atoi(v)
-			if c > 0 {
-				classifyIds = append(classifyIds, c)
-			}
-		}
-		if len(classifyIds) > 0 {
-			condition += fmt.Sprintf(` AND classify_id IN (%s) `, utils.GetOrmInReplace(len(classifyIds)))
-			pars = append(pars, classifyIds)
-		} else {
-			condition += ` AND 1=2 `
+		for _, v := range childClassify {
+			classifyIds = append(classifyIds, v.ClassifyId)
 		}
+		condition += fmt.Sprintf(` AND classify_id IN (%s) `, utils.GetOrmInReplace(len(classifyIds)))
+		pars = append(pars, classifyIds)
 	}
 
 	// 创建人

controllers/data_manage/edb_info_calculate.go

@@ -216,8 +216,61 @@ func (this *ChartInfoController) CalculateDetail() {
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
+
+	fullEdb := new(data_manage.EdbInfoFullClassify)
+	classifyList, err, errMsg := data.GetFullClassifyByClassifyId(edbInfo.ClassifyId)
+	if err != nil {
+		br.Msg = err.Error()
+		br.ErrMsg = errMsg
+		return
+	}
+	fullEdb.EdbInfo = edbInfo
+	fullEdb.ClassifyList = classifyList
+
+	// 拟合残差计算相关系数
+	if edbInfo.Source == utils.DATA_SOURCE_CALCULATE_NHCC {
+		var aEdbInfo, bEdbInfo *data_manage.EdbInfoCalculateDetail
+		for _, v := range calculateList {
+			if v.FromTag == "A" {
+				aEdbInfo = v
+				continue
+			}
+			if v.FromTag == "B" {
+				bEdbInfo = v
+				continue
+			}
+		}
+		if aEdbInfo != nil && bEdbInfo != nil {
+			edbInfoFromTagList := []data_manage.EdbInfoFromTag{
+				{
+					EdbInfoId: aEdbInfo.FromEdbInfoId,
+					FromTag:   aEdbInfo.FromTag,
+					MoveValue: aEdbInfo.MoveValue,
+				}, {
+					EdbInfoId: bEdbInfo.FromEdbInfoId,
+					FromTag:   bEdbInfo.FromTag,
+					MoveValue: bEdbInfo.MoveValue,
+				},
+			}
+
+			req2 := &data_manage.EdbInfoCalculateBatchSaveReqByEdbLib{
+				AdminId:      sysUser.AdminId,
+				AdminName:    sysUser.RealName,
+				Formula:      edbInfo.CalculateFormula,
+				EdbInfoIdArr: edbInfoFromTagList,
+			}
+
+			// 计算
+			val, err, _ := data.CallCalculateComputeCorrelation(req2)
+			if err == nil {
+				fullEdb.CorrelationStr = val
+			}
+		}
+
+	}
+
 	resp := new(data_manage.CalculateDetailResp)
-	resp.EdbInfoDetail = edbInfo
+	resp.EdbInfoDetail = fullEdb
 	resp.CalculateList = calculateList
 	br.Ret = 200
 	br.Success = true
@@ -1872,25 +1925,16 @@ func (this *ChartInfoController) CalculateComputeCorrelation() {
 		Calendar:     req.Calendar,
 	}
 
-	// 调用指标库去更新
-	reqJson, err := json.Marshal(req2)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-	respItem, err := data.CalculateComputeCorrelation(string(reqJson))
+	val, err, errMsg := data.CallCalculateComputeCorrelation(req2)
 	if err != nil {
-		br.Msg = "新增失败"
-		br.ErrMsg = "新增失败,Err:" + err.Error()
+		br.Msg = "计算失败"
+		if errMsg != `` {
+			br.Msg = errMsg
+		}
+		br.ErrMsg = err.Error()
 		return
 	}
-
-	if respItem.Ret == 200 {
-		br.Data = respItem.Data
-	} else {
-		br.Data = ``
-	}
+	br.Data = val
 
 	br.Ret = 200
 	br.Success = true

controllers/data_manage/future_good/future_good_chart_info.go

@@ -1316,7 +1316,6 @@ func getFutureGoodChartInfo(chartInfo *data_manage.ChartInfoView, chartType, dat
 	// 商品价格曲线图的一些配置
 	var barConfig data_manage.BarChartInfoReq
 	barChartInfoDateList := make([]data_manage.BarChartInfoDateReq, 0)
-	barChartInfoSort := data_manage.BarChartInfoSortReq{}
 
 	if chartInfo.BarConfig == `` {
 		br.Msg = "商品价格曲线图未配置"
@@ -1331,10 +1330,9 @@ func getFutureGoodChartInfo(chartInfo *data_manage.ChartInfoView, chartType, dat
 	}
 
 	barChartInfoDateList = barConfig.DateList
-	barChartInfoSort = barConfig.Sort
 
 	// 获取图表中的指标数据
-	barConfigEdbInfoIdList, edbList, xEdbIdValue, xDataList, yDataList, err := future_goodServ.GetChartEdbData(chartInfoId, startDate, endDate, edbInfoMapping, futureGoodEdbInfoMapping, barChartInfoDateList, barChartInfoSort)
+	barConfigEdbInfoIdList, edbList, xEdbIdValue, xDataList, yDataList, err := future_goodServ.GetChartEdbData(chartInfoId, startDate, endDate, edbInfoMapping, futureGoodEdbInfoMapping, barChartInfoDateList, true)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取图表，指标信息失败，Err:" + err.Error()
@@ -1552,7 +1550,6 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 	// 商品价格曲线图的一些配置
 	var barConfig data_manage.BarChartInfoReq
 	barChartInfoDateList := make([]data_manage.BarChartInfoDateReq, 0)
-	barChartInfoSort := data_manage.BarChartInfoSortReq{}
 
 	if chartInfo.BarConfig == `` {
 		msg = "商品价格曲线图未配置"
@@ -1567,10 +1564,9 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 	}
 
 	barChartInfoDateList = barConfig.DateList
-	barChartInfoSort = barConfig.Sort
 
 	// 获取图表中的指标数据
-	barConfigEdbInfoIdList, edbList, xEdbIdValue, xDataList, yDataList, err := future_goodServ.GetChartEdbData(chartInfoId, startDate, endDate, edbInfoMapping, futureGoodEdbInfoMapping, barChartInfoDateList, barChartInfoSort)
+	barConfigEdbInfoIdList, edbList, xEdbIdValue, xDataList, yDataList, err := future_goodServ.GetChartEdbData(chartInfoId, startDate, endDate, edbInfoMapping, futureGoodEdbInfoMapping, barChartInfoDateList, true)
 	if err != nil {
 		msg = "获取失败"
 		errMsg = "获取图表，指标信息失败，Err:" + err.Error()
@@ -1909,6 +1905,198 @@ func (this *FutureGoodChartInfoController) ChartInfoEdbInfoDetail() {
 	br.Data = resp
 }
 
+// BaseChartInfoDetailFromUniqueCode
+// @Title 根据编码获取图表详情（基础信息，没有数据）
+// @Description 根据编码获取图表详情（基础信息，没有数据）
+// @Param   UniqueCode   query   int  true       "图表唯一编码,如果是管理后台访问，传固定字符串:7c69b590249049942070ae9dcd5bf6dc"
+// @Success 200 {object} data_manage.ChartInfoDetailFromUniqueCodeResp
+// @router /chart_info/base_detail/from_unique_code [get]
+func (this *FutureGoodChartInfoController) BaseChartInfoDetailFromUniqueCode() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	uniqueCode := this.GetString("UniqueCode")
+	if uniqueCode == "" {
+		br.Msg = "参数错误"
+		br.ErrMsg = "参数错误,uniqueCode is empty"
+		return
+	}
+
+	status := true
+	chartInfo, err := data_manage.GetChartInfoViewByUniqueCode(uniqueCode)
+	if err != nil {
+		if err.Error() == utils.ErrNoRow() {
+			status = false
+		} else {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取图表信息失败，Err:" + err.Error()
+			return
+		}
+	}
+
+	if chartInfo == nil {
+		status = false
+	}
+
+	if !status {
+		resp := new(data_manage.ChartInfoDetailFromUniqueCodeResp)
+		endInfoList := make([]*data_manage.ChartEdbInfoMapping, 0)
+		resp.EdbInfoList = endInfoList
+		resp.ChartInfo = chartInfo
+		resp.Status = false
+
+		br.Data = resp
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		return
+	}
+
+	switch chartInfo.Source {
+	case utils.CHART_SOURCE_FUTURE_GOOD, utils.CHART_SOURCE_FUTURE_GOOD_PROFIT:
+		// 现货指标
+		edbInfoMapping, err := data_manage.GetEtaEdbChartEdbMapping(chartInfo.ChartInfoId)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取图表，现货指标信息失败，Err:" + err.Error()
+			return
+		}
+		edbList := []*data_manage.ChartEdbInfoMapping{
+			edbInfoMapping,
+		}
+
+		// 期货指标
+		futureGoodEdbInfoMapping, err := data_manage.GetFutureGoodEdbChartEdbMapping(chartInfo.ChartInfoId)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取图表的期货商品指标信息失败，Err:" + err.Error()
+			return
+		}
+		edbList = append(edbList, futureGoodEdbInfoMapping)
+
+		// 商品价格曲线图的一些配置
+		var barConfig data_manage.BarChartInfoReq
+		barChartInfoDateList := make([]data_manage.BarChartInfoDateReq, 0)
+
+		if chartInfo.BarConfig == `` {
+			br.Msg = "商品价格曲线图未配置"
+			br.ErrMsg = "商品价格曲线图未配置"
+			return
+		}
+		err = json.Unmarshal([]byte(chartInfo.BarConfig), &barConfig)
+		if err != nil {
+			br.Msg = "商品价格曲线图配置异常"
+			br.ErrMsg = "商品价格曲线图配置异常"
+			return
+		}
+
+		barChartInfoDateList = barConfig.DateList
+
+		startDate := chartInfo.StartDate
+		endDate := chartInfo.EndDate
+
+		// 兼容日期错误
+		{
+			if strings.Count(startDate, "-") == 1 {
+				startDate = startDate + "-01"
+			}
+			if strings.Count(endDate, "-") == 1 {
+				endDate = endDate + "-01"
+			}
+		}
+
+		// 获取图表中的指标数据
+		barConfigEdbInfoIdList, edbList, xEdbIdValue, xDataList, yDataList, err := future_goodServ.GetChartEdbData(chartInfo.ChartInfoId, startDate, endDate, edbInfoMapping, futureGoodEdbInfoMapping, barChartInfoDateList, false)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取图表，指标信息失败，Err:" + err.Error()
+			return
+		}
+		warnEdbList := make([]string, 0)
+		if len(edbList) <= 0 {
+			br.Msg = "商品价格曲线图表指标异常"
+			br.ErrMsg = "商品价格曲线图表异常"
+			return
+		}
+		baseEdbInfo := edbList[0] //现货指标
+
+		for _, v := range edbList {
+			if v.IsNullData {
+				warnEdbList = append(warnEdbList, v.EdbName+"("+v.EdbCode+")")
+			}
+			// 指标别名
+			if barConfigEdbInfoIdList != nil && len(barConfigEdbInfoIdList) > 0 {
+				for _, reqEdb := range barConfigEdbInfoIdList {
+					if v.EdbInfoId == reqEdb.EdbInfoId {
+						v.EdbAliasName = reqEdb.Name
+						v.EdbAliasNameEn = reqEdb.NameEn
+					}
+				}
+			}
+		}
+		if len(warnEdbList) > 0 {
+			chartInfo.WarnMsg = `图表引用指标异常，异常指标：` + strings.Join(warnEdbList, "，")
+		}
+		//判断是否加入我的图库
+		{
+			var myChartCondition string
+			var myChartPars []interface{}
+			myChartCondition += ` AND a.admin_id=? `
+			myChartPars = append(myChartPars, sysUser.AdminId)
+			myChartCondition += ` AND a.chart_info_id=? `
+			myChartPars = append(myChartPars, chartInfo.ChartInfoId)
+
+			myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取失败"
+				br.ErrMsg = "获取我的图表信息失败，GetMyChartByCondition，Err:" + err.Error()
+				return
+			}
+			if myChartList != nil && len(myChartList) > 0 {
+				chartInfo.IsAdd = true
+				chartInfo.MyChartId = myChartList[0].MyChartId
+				chartInfo.MyChartClassifyId = myChartList[0].MyChartClassifyId
+			}
+		}
+
+		//图表操作权限
+		chartInfo.IsEdit = data.CheckOpChartPermission(sysUser, chartInfo.SysUserId)
+		chartInfo.Button.IsEdit = chartInfo.IsEdit
+		chartInfo.Button.IsCopy = true
+		//判断是否需要展示英文标识
+		chartInfo.IsEnChart = data.CheckIsEnChart(chartInfo.ChartNameEn, edbList[0:1], chartInfo.Source, chartInfo.ChartType)
+		chartInfo.UnitEn = baseEdbInfo.UnitEn
+
+		resp := data_manage.ChartInfoDetailFromUniqueCodeResp{}
+		resp.ChartInfo = chartInfo
+		resp.EdbInfoList = edbList
+		resp.XEdbIdValue = xEdbIdValue
+		resp.YDataList = yDataList
+		resp.XDataList = xDataList
+		resp.BarChartInfo = barConfig
+		resp.Status = true
+
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		br.Data = resp
+	default:
+		br.Msg = "暂未实现"
+		br.ErrMsg = "暂未实现"
+		return
+	}
+}
+
 // ChartInfoSearchByEs
 // @Title 图表模糊搜索（从es获取）
 // @Description  图表模糊搜索（从es获取）
@@ -2163,7 +2351,7 @@ func (this *FutureGoodChartInfoController) ChartInfoBase64Upload() {
 
 	uploadDir := "static/images/"
 	if !utils.FileIsExist(uploadDir) {
-		err := os.MkdirAll(uploadDir, 777)
+		err := os.MkdirAll(uploadDir, utils.DIR_MOD)
 		if err != nil {
 			br.Msg = "图表保存失败"
 			br.ErrMsg = "存储目录创建失败,Err:" + err.Error()
@@ -2207,6 +2395,8 @@ func (this *FutureGoodChartInfoController) ChartInfoBase64Upload() {
 	case <-doneChannel:
 		fmt.Println("done")
 	case err := <-errorChannel:
+		br.Msg = "文件上传失败"
+		br.ErrMsg = fmt.Sprintf("execute command failure err: %s", err.Error())
 		fmt.Println("execute command failure err:" + err.Error())
 		return
 	}
@@ -2642,7 +2832,7 @@ func (this *FutureGoodChartInfoController) PreviewBarChartInfo() {
 	}
 
 	// 获取图表中的指标数据
-	barConfigEdbInfoIdList, edbList, xEdbIdValue, xDataList, yDataList, err := future_goodServ.GetChartEdbData(0, "", "", edbInfoMapping, futureGoodEdbInfoMapping, req.DateList, req.Sort)
+	barConfigEdbInfoIdList, edbList, xEdbIdValue, xDataList, yDataList, err := future_goodServ.GetChartEdbData(0, "", "", edbInfoMapping, futureGoodEdbInfoMapping, req.DateList, true)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取图表，指标信息失败，Err:" + err.Error()

controllers/data_manage/predict_edb_classify.go

@@ -8,6 +8,7 @@ import (
 	"eta/eta_api/models/system"
 	"eta/eta_api/services/data"
 	"eta/eta_api/utils"
+	"sort"
 )
 
 // PredictEdbClassifyController 数据管理-预测指标分类模块
@@ -387,13 +388,13 @@ func (this *PredictEdbClassifyController) Move() {
 		return
 	}
 
-	if req.ClassifyId <= 0 {
+	if req.ClassifyId <= 0 && req.EdbInfoId <= 0 {
 		br.Msg = "参数错误"
-		br.ErrMsg = "分类id小于等于0"
+		br.ErrMsg = "请选择拖动目标，分类目录或者指标"
 		return
 	}
 
-	err, errMsg := data.MoveEdbClassify(req.ClassifyId, req.ParentClassifyId, req.PrevClassifyId, req.NextClassifyId, sysUser)
+	err, errMsg := data.MoveEdbClassify(req, sysUser, 1)
 	if errMsg != `` {
 		br.Msg = errMsg
 		br.ErrMsg = errMsg
@@ -653,3 +654,177 @@ func (this *PredictEdbClassifyController) ListV2() {
 	br.Msg = "获取成功"
 	br.Data = resp
 }
+
+// SimpleList
+// @Title 单层分类列表
+// @Description 单层分类列表
+// @Success 200 {object} data_manage.EdbClassifyListResp
+// @router /predict_classify/simple [get]
+func (this *PredictEdbClassifyController) SimpleList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	// 默认查一级分类和一级分类下的指标信息，
+	// 如果是 子级分类，查询该子级分类的下一级分类和指标信息
+	// 增加标识判断是文件夹还是指标列表
+	parentId, _ := this.GetInt("ParentId")
+	isOnlyMe, _ := this.GetBool("IsOnlyMe")
+	// 如果选择了只看我的，那么只查询归属于我的账号
+	sysUserId := 0
+	if isOnlyMe {
+		sysUserId = this.SysUser.AdminId
+	}
+
+	rootList, err := data_manage.GetEdbClassifyByParentId(parentId, 1)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取数据失败，Err:" + err.Error()
+		return
+	}
+	nodeAll := make([]*data_manage.EdbClassifyItems, 0)
+
+	var sortList data_manage.EdbClassifyItemList
+	if parentId > 0 {
+		// 查询挂在当前分类上的指标列表
+		// 获取当前账号的不可见指标
+		obj := data_manage.EdbInfoNoPermissionAdmin{}
+		confList, err := obj.GetAllListByAdminId(this.SysUser.AdminId)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取不可见指标配置数据失败，Err:" + err.Error()
+			return
+		}
+		noPermissionEdbInfoIdMap := make(map[int]bool)
+		for _, v := range confList {
+			noPermissionEdbInfoIdMap[v.EdbInfoId] = true
+		}
+		allEdbInfo, err := data_manage.GetEdbInfoByClassifyId(parentId, 1, sysUserId)
+		if err != nil {
+			br.Msg = "获取指标数据失败"
+			br.ErrMsg = "获取指标数据失败，Err:" + err.Error()
+			return
+		}
+
+		for _, v := range allEdbInfo {
+			// 如果指标不可见，那么就不返回该指标
+			if _, ok := noPermissionEdbInfoIdMap[v.EdbInfoId]; ok {
+				continue
+			}
+			button := data.GetPredictEdbOpButton(this.SysUser, v.SysUserId)
+			button.AddButton = false //不管有没有权限，指标都是没有添加按钮的
+			button.OpButton = false
+			button.DeleteButton = false
+			v.Button = button
+			v.Children = make([]*data_manage.EdbClassifyItems, 0)
+			v.ParentId = parentId
+			nodeAll = append(nodeAll, v)
+		}
+	}
+	if len(rootList) > 0 {
+		for _, v := range rootList {
+			button := data.GetPredictEdbClassifyOpButton(this.SysUser, v.SysUserId)
+			v.Button = button
+			v.Children = make([]*data_manage.EdbClassifyItems, 0)
+			nodeAll = append(nodeAll, v)
+		}
+	}
+	if len(nodeAll) > 0 {
+		//根据sort值排序
+		sortList = nodeAll
+		sort.Sort(sortList)
+	}
+
+	// 是否允许添加一级分类
+	canOpClassify := true
+	button := data.GetPredictEdbClassifyOpButton(this.SysUser, 0)
+	if !button.AddButton {
+		canOpClassify = false
+	}
+
+	language := `CN`
+	// 指标显示的语言
+	{
+		configDetail, _ := system.GetConfigDetailByCode(this.SysUser.AdminId, system.PredictEdbLanguageVar)
+		if configDetail != nil {
+			language = configDetail.ConfigValue
+		} else {
+			configDetail, _ = system.GetDefaultConfigDetailByCode(system.PredictEdbLanguageVar)
+			if configDetail != nil {
+				language = configDetail.ConfigValue
+			}
+		}
+	}
+
+	resp := new(data_manage.EdbClassifyListResp)
+	resp.AllNodes = sortList
+	resp.Language = language
+	resp.CanOpClassify = canOpClassify
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}
+
+// ClassifyTree
+// @Title 多层分类列表树
+// @Description 多层分类列表树
+// @Success 200 {object} data_manage.EdbClassifyListResp
+// @router /predict_classify/tree [get]
+func (this *PredictEdbClassifyController) ClassifyTree() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	allList, err := data_manage.GetPredictEdbClassifyAll()
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取数据失败，Err:" + err.Error()
+		return
+	}
+	nodeAll := make([]*data_manage.EdbClassifyItems, 0)
+	var sortList data_manage.EdbClassifyItemList
+
+	if len(allList) > 0 {
+		for k, v := range allList {
+			button := data.GetPredictEdbClassifyOpButton(this.SysUser, v.SysUserId)
+			allList[k].Button = button
+		}
+		nodeAll = data.GetClassifyTreeRecursive(allList, 0)
+		//根据sort值排序
+		sortList = nodeAll
+		sort.Sort(sortList)
+	}
+	// 是否允许添加一级分类
+	canOpClassify := true
+	button := data.GetPredictEdbClassifyOpButton(this.SysUser, 0)
+	if !button.AddButton {
+		canOpClassify = false
+	}
+
+	language := `CN`
+	// 指标显示的语言
+	{
+		configDetail, _ := system.GetConfigDetailByCode(this.SysUser.AdminId, system.PredictEdbLanguageVar)
+		if configDetail != nil {
+			language = configDetail.ConfigValue
+		} else {
+			configDetail, _ = system.GetDefaultConfigDetailByCode(system.PredictEdbLanguageVar)
+			if configDetail != nil {
+				language = configDetail.ConfigValue
+			}
+		}
+	}
+
+	resp := new(data_manage.EdbClassifyListResp)
+	resp.AllNodes = sortList
+	resp.Language = language
+	resp.CanOpClassify = canOpClassify
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}

controllers/data_manage/predict_edb_info.go

@@ -10,6 +10,7 @@ import (
 	"eta/eta_api/services/data"
 	"eta/eta_api/services/elastic"
 	"eta/eta_api/utils"
+	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/shopspring/decimal"
 	"sort"
@@ -75,14 +76,18 @@ func (this *PredictEdbInfoController) EdbChartList() {
 
 	// 筛选分类
 	if classifyId > 0 {
-		classifyIds, err := data_manage.GetEdbClassify(classifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "获取分类信息失败"
-			br.ErrMsg = "获取分类信息失败,GetEdbClassifyById,Err:" + err.Error()
+		childClassify, e, _ := data.GetChildClassifyByClassifyId(classifyId)
+		if e != nil && e.Error() != utils.ErrNoRow() {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取分类信息失败, GetEdbClassify,Err:" + e.Error()
 			return
 		}
-		condition += " AND classify_id IN(" + classifyIds + ") "
-
+		var classifyIds []int
+		for _, v := range childClassify {
+			classifyIds = append(classifyIds, v.ClassifyId)
+		}
+		condition += fmt.Sprintf(` AND classify_id IN (%s) `, utils.GetOrmInReplace(len(classifyIds)))
+		pars = append(pars, classifyIds)
 	}
 	if adminId > 0 {
 		condition += " AND sys_user_id = ? "
@@ -219,9 +224,6 @@ func (this *PredictEdbInfoController) List() {
 	//获取英文频度
 	edbInfoItem.FrequencyEn = data.GetFrequencyEn(edbInfoItem.Frequency)
 
-	//查询目录
-	resultList, _ := data_manage.GetClassifyAllByClassifyId(edbInfoItem.ClassifyId)
-
 	// 未来的指标预测数据
 	predictDataList := make([]*data_manage.EdbData, 0)
 
@@ -398,9 +400,17 @@ func (this *PredictEdbInfoController) List() {
 	if edbInfoItem.DataList == nil {
 		edbInfoItem.DataList = make([]*data_manage.EdbData, 0)
 	}
+	//查询目录
+	classifyList, err, errMsg := data.GetFullClassifyByClassifyId(edbInfoItem.ClassifyId)
+	if err != nil {
+		br.Msg = err.Error()
+		br.ErrMsg = errMsg
+		return
+	}
+
 	resp.Paging = page
 	resp.Item = edbInfoItem
-	resp.ClassifyList = resultList
+	resp.ClassifyList = classifyList
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
@@ -965,13 +975,64 @@ func (this *PredictEdbInfoController) Detail() {
 			calculateList[k] = v
 		}
 	}
+	classifyList, err, errMsg := data.GetFullClassifyByClassifyId(edbInfo.ClassifyId)
+	if err != nil {
+		br.Msg = err.Error()
+		br.ErrMsg = errMsg
+		return
+	}
+
+	// 拟合残差计算相关系数
+	var correlationStr string
+	if edbInfo.Source == utils.DATA_SOURCE_PREDICT_CALCULATE_NHCC {
+		var aEdbInfo, bEdbInfo *data_manage.EdbInfoCalculateDetail
+		for _, v := range calculateList {
+			if v.FromTag == "A" {
+				aEdbInfo = v
+				continue
+			}
+			if v.FromTag == "B" {
+				bEdbInfo = v
+				continue
+			}
+		}
+		if aEdbInfo != nil && bEdbInfo != nil {
+			edbInfoFromTagList := []data_manage.EdbInfoFromTag{
+				{
+					EdbInfoId: aEdbInfo.FromEdbInfoId,
+					FromTag:   aEdbInfo.FromTag,
+					MoveValue: aEdbInfo.MoveValue,
+				}, {
+					EdbInfoId: bEdbInfo.FromEdbInfoId,
+					FromTag:   bEdbInfo.FromTag,
+					MoveValue: bEdbInfo.MoveValue,
+				},
+			}
+
+			req2 := &data_manage.EdbInfoCalculateBatchSaveReqByEdbLib{
+				AdminId:      sysUser.AdminId,
+				AdminName:    sysUser.RealName,
+				Formula:      edbInfo.CalculateFormula,
+				EdbInfoIdArr: edbInfoFromTagList,
+			}
+
+			// 计算
+			val, err, _ := data.CallCalculateComputeCorrelation(req2)
+			if err == nil {
+				correlationStr = val
+			}
+		}
+
+	}
 
 	resp := response.PredictEdbInfo{
-		EdbInfo:       *edbInfo,
-		RuleType:      ruleType,
-		FixedValue:    fixedValue,
-		CalculateList: calculateList,
-		RuleList:      predictEdbConfList,
+		EdbInfo:        *edbInfo,
+		RuleType:       ruleType,
+		FixedValue:     fixedValue,
+		CalculateList:  calculateList,
+		RuleList:       predictEdbConfList,
+		CorrelationStr: correlationStr,
+		ClassifyList:   classifyList,
 	}
 	br.Ret = 200
 	br.Success = true
@@ -1293,11 +1354,17 @@ func (this *PredictEdbInfoController) DataList() {
 		br.ErrMsg = "获取失败,Err:" + err.Error()
 		return
 	}
-
+	classifyList, err, errMsg := data.GetFullClassifyByClassifyId(edbInfo.ClassifyId)
+	if err != nil {
+		br.Msg = err.Error()
+		br.ErrMsg = errMsg
+		return
+	}
 	resp := response.PredictEdbInfoDataResp{
-		EdbInfo:  edbInfo,
-		DataList: resultDataList,
-		Button:   button,
+		EdbInfo:      edbInfo,
+		DataList:     resultDataList,
+		Button:       button,
+		ClassifyList: classifyList,
 	}
 	br.Ret = 200
 	br.Success = true

controllers/english_report/email.go

@@ -588,7 +588,12 @@ func (this *EnglishReportEmailController) Send() {
 		br.Msg = "无权操作"
 		return
 	}
-
+	noCompanyIdsMap := make(map[int]struct{})
+	if len(req.NoCompanyIds) > 0 {
+		for _, v := range req.NoCompanyIds {
+			noCompanyIdsMap[v] = struct{}{}
+		}
+	}
 	// 指定品种的客户
 	sendCompanyIds := make([]int, 0)
 	if len(req.EnPermissions) > 0 {
@@ -598,8 +603,13 @@ func (this *EnglishReportEmailController) Send() {
 			br.ErrMsg = "获取指定品种的客户IDs失败, Err: " + e.Error()
 			return
 		}
-		sendCompanyIds = companyIds
+		for _, v := range companyIds {
+			if _, ok := noCompanyIdsMap[v]; !ok {
+				sendCompanyIds = append(sendCompanyIds, v)
+			}
+		}
 	}
+
 	// 指定收件人列表
 	sendEmailIds := make([]int, 0)
 	if req.EmailIds != "" {
@@ -875,7 +885,7 @@ func (this *EnglishReportEmailController) ImportListMatch() {
 	}
 
 	uploadDir := "static/xls"
-	err = os.MkdirAll(uploadDir, 766)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		br.Msg = "存储目录创建失败"
 		br.ErrMsg = "存储目录创建失败,Err:" + err.Error()

controllers/english_report/english_classify.go

@@ -2,12 +2,12 @@ package english_report
 
 import (
 	"encoding/json"
-	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"eta/eta_api/controllers"
 	"eta/eta_api/models"
 	"eta/eta_api/services"
 	"eta/eta_api/utils"
+	"fmt"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	"sort"
 	"time"
 )
@@ -35,7 +35,6 @@ func (this *EnglishReportController) ListClassify() {
 	pageSize, _ := this.GetInt("PageSize")
 	currentIndex, _ := this.GetInt("CurrentIndex")
 	keyWord := this.GetString("KeyWord")
-	classifyType, _ := this.GetInt("ClassifyType", 0)
 
 	var startSize int
 	if pageSize <= 0 {
@@ -50,13 +49,21 @@ func (this *EnglishReportController) ListClassify() {
 	page := paging.GetPaging(currentIndex, pageSize, 0)
 	resp := new(models.EnglishClassifyListResp)
 
-	list, err := models.GetEnglishClassifyList(startSize, pageSize, keyWord, classifyType)
+	// 处理一级分类分页的情况
+	rootList, err := models.GetEnglishClassifyRootId(startSize, pageSize, keyWord)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
-	total, err := models.GetEnglishClassifyListCount(keyWord, classifyType)
+	var ids []int
+	var rootIds []int
+	rootMap := make(map[int]struct{}, 0)
+	for _, v := range rootList {
+		rootIds = append(rootIds, v.Id)
+		rootMap[v.Id] = struct{}{}
+	}
+	total, err := models.GetEnglishClassifyListCount(keyWord)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
@@ -72,65 +79,102 @@ func (this *EnglishReportController) ListClassify() {
 		br.Msg = "获取成功"
 		return
 	}
-	var parentIds []int
-	for _, v := range list {
-		parentIds = append(parentIds, v.Id)
-	}
+	page = paging.GetPaging(currentIndex, pageSize, total)
 
-	childMap := make(map[int][]*models.EnglishClassifyList)
-	tmpList, err := models.GetEnglishClassifyChildByParentIds(parentIds, keyWord, classifyType)
+	//获取相关的分类ID
+	idList, err := models.GetEnglishClassifyListByRootId(rootIds, keyWord)
 	if err != nil {
-		br.Msg = "获取二级分类失败"
-		br.ErrMsg = "获取二级分类失败，Err:" + err.Error()
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
-
-	// 二级分类-品种权限
+	secondListMap := make(map[int][]*models.EnglishClassifyList)
+	thirdListMap := make(map[int][]*models.EnglishClassifyList)
+	var thirdIds []int
+	var sortChildList models.RSChildClassifyList
+	// 三级分类-品种权限
 	permissionMap := make(map[int][]int)
-	{
-		classifyIds := make([]int, 0)
+
+	if len(idList) > 0 {
+		childIdMap := make(map[int]struct{}, 0)
+		for _, v := range idList {
+			if _, ok := childIdMap[v.ParentId]; !ok {
+				ids = append(ids, v.ParentId)
+				childIdMap[v.ParentId] = struct{}{}
+			}
+			if _, ok := childIdMap[v.Id]; !ok {
+				ids = append(ids, v.Id)
+				childIdMap[v.Id] = struct{}{}
+			}
+		}
+		tmpList, err := models.GetEnglishClassifyChildByIds(ids)
+		if err != nil {
+			br.Msg = "获取二级分类失败"
+			br.ErrMsg = "获取二级分类失败，Err:" + err.Error()
+			return
+		}
 		for _, v := range tmpList {
-			classifyIds = append(classifyIds, v.Id)
+			if _, ok := rootMap[v.ParentId]; !ok {
+				thirdIds = append(thirdIds, v.Id)
+			}
 		}
-		if len(classifyIds) > 0 {
-			cond := fmt.Sprintf(` AND %s IN (%s)`, models.EnClassifyPermissionColumns.EnClassifyId, utils.GetOrmInReplace(len(classifyIds)))
-			pars := make([]interface{}, 0)
-			pars = append(pars, classifyIds)
-			ob := new(models.EnClassifyPermission)
-			items, e := ob.GetItemsByCondition(cond, pars, []string{}, "")
-			if e != nil {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取客户权限列表失败, Err: " + e.Error()
-				return
+		{
+			classifyIds := thirdIds
+			if len(classifyIds) > 0 {
+				cond := fmt.Sprintf(` AND %s IN (%s)`, models.EnClassifyPermissionColumns.EnClassifyId, utils.GetOrmInReplace(len(classifyIds)))
+				pars := make([]interface{}, 0)
+				pars = append(pars, classifyIds)
+				ob := new(models.EnClassifyPermission)
+				items, e := ob.GetItemsByCondition(cond, pars, []string{}, "")
+				if e != nil {
+					br.Msg = "获取失败"
+					br.ErrMsg = "获取客户权限列表失败, Err: " + e.Error()
+					return
+				}
+				for _, v := range items {
+					if permissionMap[v.EnClassifyId] == nil {
+						permissionMap[v.EnClassifyId] = make([]int, 0)
+					}
+					permissionMap[v.EnClassifyId] = append(permissionMap[v.EnClassifyId], v.EnPermissionId)
+				}
 			}
-			for _, v := range items {
-				if permissionMap[v.EnClassifyId] == nil {
-					permissionMap[v.EnClassifyId] = make([]int, 0)
+		}
+		// 处理三级分类
+		for _, v := range tmpList {
+			if _, ok := rootMap[v.ParentId]; !ok {
+				if p, ok1 := permissionMap[v.Id]; ok1 {
+					v.EnPermissions = p
 				}
-				permissionMap[v.EnClassifyId] = append(permissionMap[v.EnClassifyId], v.EnPermissionId)
+				thirdListMap[v.ParentId] = append(thirdListMap[v.ParentId], v)
 			}
 		}
-	}
 
-	for _, v := range tmpList {
-		v.EnPermissions = permissionMap[v.Id]
-		childMap[v.ParentId] = append(childMap[v.ParentId], v)
-	}
-	for _, v := range list {
-		if child, ok := childMap[v.Id]; ok {
-			v.Child = child
+		//处理二级分类
+		for _, v := range tmpList {
+			if _, ok := rootMap[v.ParentId]; ok {
+				if child, ok1 := thirdListMap[v.Id]; ok1 {
+					sortChildList = child
+					sort.Sort(sortChildList)
+					v.Child = sortChildList
+				}
+				secondListMap[v.ParentId] = append(secondListMap[v.ParentId], v)
+			}
 		}
 	}
+
+	//处理一级分类
 	var sortList models.RSClassifyList
-	sortList = list
+	for _, v := range rootList {
+		if child, ok := secondListMap[v.Id]; ok {
+			sortChildList = child
+			sort.Sort(sortChildList)
+			v.Child = sortChildList
+		}
+		sortList = append(sortList, v)
+	}
+
 	sort.Sort(sortList)
 
-	for _, item := range sortList {
-		var sortChildList models.RSChildClassifyList
-		sortChildList = item.Child
-		sort.Sort(sortChildList)
-		item.Child = sortChildList
-	}
 	resp.List = sortList
 	resp.Paging = page
 
@@ -155,19 +199,38 @@ func (this *EnglishReportController) AddClassify() {
 	}()
 	classifyName := this.GetString("ClassifyName")
 	parentId, _ := this.GetInt("ParentId")
-	classifyType, _ := this.GetInt("ClassifyType", 0)
 	sort, _ := this.GetInt("Sort")
 
+	// 查新父级分类是否存在
+	rootId := 0
+	if parentId > 0 {
+		parentClassify, err := models.GetEnglishReportClassifyById(parentId)
+		if err != nil {
+			if err.Error() == utils.ErrNoRow() {
+				br.Msg = "上级分类不存在"
+				return
+			}
+			br.Msg = "查询上级分类信息失败"
+			br.ErrMsg = "查询上级分类信息失败,Err:" + err.Error()
+			return
+		}
+		if parentClassify.RootId == 0 {
+			rootId = parentClassify.Id
+		} else {
+			rootId = parentClassify.RootId
+		}
+	}
+
 	item := &models.EnglishClassify{
 		ClassifyName: classifyName,
 		Sort:         sort,
 		ParentId:     parentId,
+		RootId:       rootId,
 		CreateTime:   time.Now(),
 		ModifyTime:   time.Now(),
-		ClassifyType: classifyType,
 		IsShow:       1,
 	}
-	counts, err := models.GetEnglishClassifyCountsByName(classifyName, parentId, classifyType)
+	counts, err := models.GetEnglishClassifyCountsByName(classifyName, parentId)
 	if err != nil {
 		br.Msg = "查询失败"
 		br.ErrMsg = "查询失败,Err:" + err.Error()
@@ -178,12 +241,23 @@ func (this *EnglishReportController) AddClassify() {
 		br.ErrMsg = "该名称已存在!"
 		return
 	}
-	_, err = models.AddEnglishClassify(item)
+	var newId int64
+	newId, err = models.AddEnglishClassify(item)
 	if err != nil {
 		br.Msg = "保存失败"
 		br.ErrMsg = "保存失败,Err:" + err.Error()
 		return
 	}
+	if parentId == 0 { //一级目录的rootId等于自己本身
+		item.Id = int(newId)
+		item.RootId = int(newId)
+		err = item.UpdateEnglishClassify([]string{"RootId"})
+		if err != nil {
+			br.Msg = "保存失败"
+			br.ErrMsg = "保存失败,Err:" + err.Error()
+			return
+		}
+	}
 
 	br.Ret = 200
 	br.Success = true
@@ -223,26 +297,52 @@ func (this *EnglishReportController) EditClassify() {
 	}
 
 	oldItem, err := models.GetEnglishReportClassifyById(classifyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取信息失败,Err:" + err.Error()
-		return
-	}
-	parent, err := models.GetEnglishReportClassifyById(parentId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil {
+		if err.Error() == utils.ErrNoRow() {
+			br.Msg = "当前分类不存在"
+			return
+		}
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取信息失败,Err:" + err.Error()
 		return
 	}
-
 	if oldItem.ParentId == 0 && parentId > 0 {
 		// 一级分类变更为二级分类，禁止
-		br.Msg = "一级分类不允许更改为二级分类"
+		br.Msg = "一级分类不允许更改为二级分类或三级分类"
 		return
 	}
 
+	var parent *models.EnglishClassify
+	rootId := 0
+	if parentId > 0 {
+		parent, err = models.GetEnglishReportClassifyById(parentId)
+		if err != nil {
+			if err.Error() == utils.ErrNoRow() {
+				br.Msg = "上级分类不存在"
+				return
+			}
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取信息失败,Err:" + err.Error()
+			return
+		}
+		//二级分类不允许改成三级分类
+		if oldItem.ParentId > 0 && oldItem.ParentId == oldItem.RootId {
+			if parent.ParentId > 0 {
+				//即将改为为三级分类
+				br.Msg = "二级分类不允许更改为三级分类"
+				return
+			}
+		}
+
+		if parent.RootId == 0 {
+			rootId = parent.Id
+		} else {
+			rootId = parent.RootId
+		}
+	}
+
 	//判断是否已存在同个名称的分类
-	existItem, e := models.GetEnglishClassifyByClassifyNameParentId(classifyName, parentId, oldItem.ClassifyType)
+	existItem, e := models.GetEnglishClassifyByClassifyNameParentId(classifyName, parentId)
 	if e != nil {
 		if e.Error() != utils.ErrNoRow() {
 			br.Msg = "查询已存在的分类出错"
@@ -254,44 +354,52 @@ func (this *EnglishReportController) EditClassify() {
 		br.Msg = "分类名称:" + classifyName + "已存在"
 		return
 	}
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取信息失败,Err:" + err.Error()
-		return
-	}
 
-	//oldParentId := item.ParentId
+	if parentId == 0 { //一级分类的顶级分类为自己的ID
+		rootId = oldItem.Id
+	}
 	item := &models.EnglishClassify{
 		Id:           oldItem.Id,
 		ClassifyName: classifyName,
 		Sort:         sort,
 		ParentId:     parentId,
+		RootId:       rootId,
 		ModifyTime:   time.Now(),
-		ClassifyType: oldItem.ClassifyType,
 		IsShow:       1,
 	}
-	if oldItem.ClassifyType == 1 {
-		err = services.UpdateEnglishVideoClassifyId(oldItem, item, parent, classifyId)
+	{
+		// 更新研报里的分类名称
+		err = services.UpdateEnglishReportClassifyId(oldItem, item, classifyId)
 		if err != nil {
 			br.Msg = err.Error()
 			return
 		}
-	} else {
-		// 更新研报里的分类名称
-		err = services.UpdateEnglishReportClassifyId(oldItem, item, parent, classifyId)
+
+		//更新相关联的路演视频里的分类名称
+		err = services.UpdateEnglishVideoClassifyId(oldItem, item, classifyId)
 		if err != nil {
 			br.Msg = err.Error()
 			return
 		}
 	}
-
 	err = models.ModifyEnglishClassify(item)
 	if err != nil {
 		br.Msg = "保存失败"
 		br.ErrMsg = "保存失败,Err:" + err.Error()
 		return
 	}
-
+	err = models.UpdateEnglishReportClassifyByFirstSecondClassifyId(classifyId, parentId)
+	if err != nil {
+		br.Msg = "保存失败"
+		br.ErrMsg = "保存失败,Err:" + err.Error()
+		return
+	}
+	err = models.UpdateEnglishVideoClassifyByFirstSecondClassifyId(classifyId, parentId)
+	if err != nil {
+		br.Msg = "保存失败"
+		br.ErrMsg = "保存失败,Err:" + err.Error()
+		return
+	}
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "保存成功"
@@ -336,33 +444,29 @@ func (this *EnglishReportController) DelClassify() {
 		br.Ret = 403
 		return
 	}
+	reportCount, e := models.GetEnglishReportCounts(classifyId, classifyInfo.ParentId)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "获取失败，Err:" + e.Error()
+		return
+	}
 
-	if classifyInfo.ClassifyType == 0 {
-		reportCount, e := models.GetEnglishReportCounts(classifyId, classifyInfo.ParentId)
-		if e != nil && e.Error() != utils.ErrNoRow() {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取失败，Err:" + e.Error()
-			return
-		}
-
-		if reportCount > 0 {
-			br.Msg = "该分类有关联报告，不允许删除"
-			br.Ret = 403
-			return
-		}
-	} else {
-		videoCount, e := models.GetEnglishVideoCounts(classifyId, classifyInfo.ParentId)
-		if e != nil && e.Error() != utils.ErrNoRow() {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取失败，Err:" + e.Error()
-			return
-		}
+	if reportCount > 0 {
+		br.Msg = "该分类有关联报告，不允许删除"
+		br.Ret = 403
+		return
+	}
+	videoCount, e := models.GetEnglishVideoCounts(classifyId, classifyInfo.ParentId)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "获取失败，Err:" + e.Error()
+		return
+	}
 
-		if videoCount > 0 {
-			br.Msg = "该分类有关联的路演视频，不允许删除"
-			br.Ret = 403
-			return
-		}
+	if videoCount > 0 {
+		br.Msg = "该分类有关联的路演视频，不允许删除"
+		br.Ret = 403
+		return
 	}
 
 	if err = models.DeleteEnglishClassify(classifyId); err != nil {
@@ -391,7 +495,6 @@ func (this *EnglishReportController) FistListClassify() {
 	}()
 	pageSize, _ := this.GetInt("PageSize")
 	currentIndex, _ := this.GetInt("CurrentIndex")
-	classifyType, _ := this.GetInt("ClassifyType", 0)
 
 	var startSize int
 	if pageSize <= 0 {
@@ -402,22 +505,66 @@ func (this *EnglishReportController) FistListClassify() {
 	}
 
 	startSize = utils.StartIndex(currentIndex, pageSize)
-	list, err := models.GetEnglishFirstClassifyList(classifyType, startSize, pageSize)
+	rootList, err := models.GetEnglishFirstClassifyList(startSize, pageSize)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
-	total, err := models.GetEnglishFirstClassifyListCount(classifyType)
+	total, err := models.GetEnglishFirstClassifyListCount()
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
-
 	page := paging.GetPaging(currentIndex, pageSize, total)
 	resp := new(models.EnglishClassifyListResp)
-	resp.List = list
+
+	if total == 0 {
+		resp.List = make([]*models.EnglishClassifyList, 0)
+		resp.Paging = page
+
+		br.Data = resp
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		return
+	}
+	rootMap := make(map[int]struct{}, 0)
+	var rootIds []int
+	for _, v := range rootList {
+		rootMap[v.Id] = struct{}{}
+		rootIds = append(rootIds, v.Id)
+	}
+	tmpList, err := models.GetEnglishSecondClassifyList(rootIds)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+		return
+	}
+	secondListMap := make(map[int][]*models.EnglishClassifyList)
+	//处理二级分类
+	for _, v := range tmpList {
+		if _, ok := rootMap[v.ParentId]; ok {
+			secondListMap[v.ParentId] = append(secondListMap[v.ParentId], v)
+		}
+	}
+
+	//处理一级分类
+	var sortList models.RSClassifyList
+	var sortChildList models.RSChildClassifyList
+	for _, v := range rootList {
+		if child, ok := secondListMap[v.Id]; ok {
+			sortChildList = child
+			sort.Sort(sortChildList)
+			v.Child = sortChildList
+		}
+		sortList = append(sortList, v)
+	}
+
+	sort.Sort(sortList)
+
+	resp.List = sortList
 	resp.Paging = page
 
 	br.Data = resp

controllers/english_report/report.go

@@ -277,6 +277,24 @@ func (this *EnglishReportController) Detail() {
 	item.Content = html.UnescapeString(item.Content)
 	item.ContentSub = html.UnescapeString(item.ContentSub)
 
+	classifyNameMap := make(map[int]*models.EnglishClassifyFullName)
+	if item.ClassifyIdSecond > 0 {
+		nameList, tErr := models.GetEnglishClassifyFullNameByIds([]int{item.ClassifyIdSecond})
+		if tErr != nil {
+			br.Msg = "获取分类名称失败"
+			br.ErrMsg = "获取分类名称失败, ERR:" + tErr.Error()
+			return
+		}
+		for _, v := range nameList {
+			classifyNameMap[v.Id] = v
+		}
+		//处理分类名
+		if n, ok := classifyNameMap[item.ClassifyIdSecond]; ok {
+			item.ClassifyNameRoot = n.RootName
+			item.ClassifyIdRoot = n.RootId
+		}
+	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
@@ -292,8 +310,8 @@ func (this *EnglishReportController) Detail() {
 // @Param   StartDate   query   string  true       "开始时间"
 // @Param   EndDate   query   string  true       "结束时间"
 // @Param   Frequency   query   string  true       "频度"
-// @Param   ClassifyNameFirst   query   string  true       "一级分类名称"
-// @Param   ClassifyNameSecond   query   string  true       "二级分类名称"
+// @Param   ClassifyIdFirst   query   string  true       "一级分类id"
+// @Param   ClassifyIdSecond   query   string  true       "二级分类id"
 // @Param   State   query   int  true       "状态"
 // @Param   KeyWord   query   string  true       "搜索关键词"
 // @Param   PublishSort   query   string  true       "desc:降序，asc 升序（预留）"
@@ -321,8 +339,9 @@ func (this *EnglishReportController) ListReport() {
 	startDate := this.GetString("StartDate")
 	endDate := this.GetString("EndDate")
 	frequency := this.GetString("Frequency")
-	classifyNameFirst := this.GetString("ClassifyNameFirst")
-	classifyNameSecond := this.GetString("ClassifyNameSecond")
+	classifyIdFirst, _ := this.GetInt("ClassifyIdFirst")
+	classifyIdSecond, _ := this.GetInt("ClassifyIdSecond")
+	classifyIdRoot, _ := this.GetInt("ClassifyIdRoot")
 	state, _ := this.GetInt("State")
 	keyWord := this.GetString("KeyWord")
 	companyType := this.GetString("CompanyType")
@@ -366,19 +385,47 @@ func (this *EnglishReportController) ListReport() {
 		condition += ` AND frequency = ? `
 		pars = append(pars, frequency)
 	}
-	if classifyNameFirst != "" {
-		condition += ` AND classify_name_first = ? `
-		pars = append(pars, classifyNameFirst)
+	if classifyIdFirst != 0 {
+		condition += ` AND classify_id_first = ? `
+		pars = append(pars, classifyIdFirst)
 	}
 
-	if classifyNameSecond != "" {
-		condition += ` AND classify_name_second = ? `
-		pars = append(pars, classifyNameSecond)
+	if classifyIdSecond != 0 {
+		condition += ` AND classify_id_second = ? `
+		pars = append(pars, classifyIdSecond)
 	}
 	if state > 0 {
 		condition += ` AND state = ? `
 		pars = append(pars, state)
 	}
+	if classifyIdRoot > 0 && classifyIdFirst == 0 && classifyIdSecond == 0 {
+		//查询顶级分类下的所有二级分类ID
+		childClassify, err := models.GetEnglishSecondClassifyList([]int{classifyIdRoot})
+		if err != nil {
+			br.Msg = "查询子分类出错"
+			br.ErrMsg = "查询子分类出错， Err:" + err.Error()
+			return
+		}
+		var childClassifyIds []int
+		if len(childClassify) > 0 {
+			for _, v := range childClassify {
+				childClassifyIds = append(childClassifyIds, v.Id)
+			}
+			condition += ` AND classify_id_first IN (` + utils.GetOrmInReplace(len(childClassifyIds)) + `)`
+			pars = append(pars, childClassifyIds)
+		} else {
+			//一级分类下没有子分类，直接返回空列表
+			page := paging.GetPaging(currentIndex, pageSize, 0)
+			resp := new(models.EnglishReportListResp)
+			resp.Paging = page
+			resp.List = make([]*models.EnglishReportList, 0)
+			br.Ret = 200
+			br.Success = true
+			br.Msg = "获取成功"
+			br.Data = resp
+			return
+		}
+	}
 	// 未群发邮件(包含推送邮件失败的)
 	if emailState == 1 {
 		failIds, e := models.GetHasFailEmailLogReportIds()
@@ -516,7 +563,23 @@ func (this *EnglishReportController) ListReport() {
 		br.ErrMsg = errOther.Error()
 		return
 	}
-
+	// 查询分类信息
+	var classifyIdSecondSlice []int
+	for _, item := range list {
+		classifyIdSecondSlice = append(classifyIdSecondSlice, item.ClassifyIdSecond)
+	}
+	classifyNameMap := make(map[int]*models.EnglishClassifyFullName)
+	if len(classifyIdSecondSlice) > 0 {
+		nameList, err := models.GetEnglishClassifyFullNameByIds(classifyIdSecondSlice)
+		if err != nil {
+			br.Msg = "获取分类名称失败"
+			br.ErrMsg = "获取分类名称失败, ERR:" + err.Error()
+			return
+		}
+		for _, v := range nameList {
+			classifyNameMap[v.Id] = v
+		}
+	}
 	for _, item := range list {
 		if item.State == 2 {
 			item.ShareUrl = "https://share.hzinsights.com/reportEn?code=" + item.ReportCode
@@ -557,6 +620,17 @@ func (this *EnglishReportController) ListReport() {
 		} else {
 			item.Editor = ret.Editor
 		}
+
+		//处理分类名
+		if n, ok := classifyNameMap[item.ClassifyIdSecond]; ok {
+			if n.RootId == 0 {
+				item.FullClassifyName = strings.Join([]string{n.ParentName, n.ClassifyName}, "/")
+			} else {
+				item.FullClassifyName = strings.Join([]string{n.RootName, n.ParentName, n.ClassifyName}, "/")
+			}
+			item.ClassifyIdRoot = n.RootId
+			item.ClassifyNameRoot = n.RootName
+		}
 	}
 
 	page := paging.GetPaging(currentIndex, pageSize, total)
@@ -932,7 +1006,26 @@ func (this *EnglishReportController) ClassifyIdDetail() {
 	if item != nil {
 		item.Content = html.UnescapeString(item.Content)
 		item.ContentSub = html.UnescapeString(item.ContentSub)
+
+		classifyNameMap := make(map[int]*models.EnglishClassifyFullName)
+		if item.ClassifyIdSecond > 0 {
+			nameList, tErr := models.GetEnglishClassifyFullNameByIds([]int{item.ClassifyIdSecond})
+			if tErr != nil {
+				br.Msg = "获取分类名称失败"
+				br.ErrMsg = "获取分类名称失败, ERR:" + tErr.Error()
+				return
+			}
+			for _, v := range nameList {
+				classifyNameMap[v.Id] = v
+			}
+			//处理分类名
+			if n, ok := classifyNameMap[item.ClassifyIdSecond]; ok {
+				item.ClassifyNameRoot = n.RootName
+				item.ClassifyIdRoot = n.RootId
+			}
+		}
 	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

controllers/meeting_probabilities.go

@@ -0,0 +1,114 @@
+package controllers
+
+import (
+	"encoding/json"
+	"eta/eta_api/models"
+	"eta/eta_api/models/data_manage/request"
+	"eta/eta_api/utils"
+	"fmt"
+	"github.com/tealeg/xlsx"
+	"os"
+	"path/filepath"
+	"time"
+)
+
+// MeetingProbabilitiesController 加息概率
+type MeetingProbabilitiesController struct {
+	BaseAuthController
+}
+
+// Detail
+// @Title 获取表格详情
+// @Description 获取表格详情接口
+// @Param   ExcelInfoId   query   int  true       "表格id"
+// @Success 200 {object} data_manage.ExcelInfo
+// @router /detail [get]
+func (c *MeetingProbabilitiesController) Detail() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		c.Data["json"] = br
+		c.ServeJSON()
+	}()
+	sysUser := c.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+
+	date := c.GetString("DateTime")
+	isExport, _ := c.GetInt("IsExport")
+
+	// 获取数据详情bu
+	excelDetail, err := models.GetMeetingInfoById(date)
+	if err != nil {
+		if err.Error() == utils.ErrNoRow() {
+			br.Ret = 200
+			br.Msg = "该日期无数据"
+			br.Msg = "该日期无数据，Err:" + err.Error()
+			return
+		}
+		br.ErrMsg = err.Error()
+		return
+	}
+
+	if isExport == 1 {
+		sheet := new(request.ISheet)
+		err = json.Unmarshal([]byte(excelDetail.Content), &sheet)
+
+		MeetingProbabilitiesExport(c,br,sheet)
+		return
+	}
+
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = excelDetail
+}
+
+// MeetingProbabilitiesExport 导出Excel
+func MeetingProbabilitiesExport(this *MeetingProbabilitiesController, br *models.BaseResponse, sheetReq *request.ISheet) {
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请重新登录"
+		return
+	}
+
+	dir, _ := os.Executable()
+	exPath := filepath.Dir(dir)
+	downloadPath := exPath + "/" + time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
+	xlsxFile := xlsx.NewFile()
+	sheet, e := xlsxFile.AddSheet("数据报表")
+	if e != nil {
+		br.Msg = "新增Sheet失败"
+		br.ErrMsg = "新增Sheet失败, Err: " + e.Error()
+		return
+	}
+
+
+	for _, v := range sheetReq.Data {
+		addRow := sheet.AddRow()
+		for _, s := range v {
+			if s != nil {
+				addRow.AddCell().SetString(s.M)
+			}
+		}
+	}
+
+	if e = xlsxFile.Save(downloadPath); e != nil {
+		br.Msg = "导出失败"
+		br.ErrMsg = "保存文件失败"
+		return
+	}
+	fileName := fmt.Sprint("MeetingProbabilities", time.Now().Format("2006.01.02"), ".xlsx")
+	this.Ctx.Output.Download(downloadPath, fileName)
+	defer func() {
+		_ = os.Remove(downloadPath)
+	}()
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "success"
+}
+

controllers/ppt_english.go

@@ -492,7 +492,7 @@ func (this *PptEnglishController) PptUpload() {
 	ext := path.Ext(h.Filename)
 	dateDir := time.Now().Format("20060102")
 	uploadDir := utils.STATIC_DIR + "hongze/" + dateDir
-	err = os.MkdirAll(uploadDir, 766)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		br.Msg = "存储目录创建失败"
 		br.ErrMsg = "存储目录创建失败,Err:" + err.Error()
@@ -536,8 +536,6 @@ func (this *PptEnglishController) PptUpload() {
 		pptxUrl = utils.Imghost + savePptxToOssPath
 	}
 
-
-
 	defer func() {
 		os.Remove(fpath)
 	}()

controllers/ppt_v2.go

@@ -493,7 +493,7 @@ func (this *PptV2Controller) PptUpload() {
 	ext := path.Ext(h.Filename)
 	dateDir := time.Now().Format("20060102")
 	uploadDir := utils.STATIC_DIR + "hongze/" + dateDir
-	err = os.MkdirAll(uploadDir, 766)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		br.Msg = "存储目录创建失败"
 		br.ErrMsg = "存储目录创建失败,Err:" + err.Error()
@@ -537,7 +537,6 @@ func (this *PptV2Controller) PptUpload() {
 		pptxUrl = utils.Imghost + savePptxToOssPath
 	}
 
-
 	defer func() {
 		os.Remove(fpath)
 	}()
@@ -1129,4 +1128,4 @@ func (this *PptV2Controller) TitleCheck() {
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "校验成功"
-}
+}

controllers/report.go

@@ -794,7 +794,7 @@ func (this *ReportController) Upload() {
 	ext := path.Ext(h.Filename)
 	dateDir := time.Now().Format("20060102")
 	uploadDir := utils.STATIC_DIR + "hongze/" + dateDir
-	err = os.MkdirAll(uploadDir, 777)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		br.Msg = "存储目录创建失败"
 		br.ErrMsg = "存储目录创建失败,Err:" + err.Error()
@@ -1113,7 +1113,7 @@ func (this *ReportUploadCommonController) UploadImg() {
 	ext := path.Ext(h.Filename)
 	dateDir := time.Now().Format("20060102")
 	uploadDir := utils.STATIC_DIR + "hongze/" + dateDir
-	err = os.MkdirAll(uploadDir, 777)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		return
 	}

controllers/resource.go

@@ -42,7 +42,7 @@ func (this *ResourceController) Upload() {
 	ext := path.Ext(h.Filename)
 	dateDir := time.Now().Format("20060102")
 	uploadDir := utils.STATIC_DIR + "hongze/" + dateDir
-	err = os.MkdirAll(uploadDir, 766)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		br.Msg = "存储目录创建失败"
 		br.ErrMsg = "存储目录创建失败,Err:" + err.Error()
@@ -128,7 +128,7 @@ func (this *ResourceController) VideoUpload() {
 	uploadDir := utils.STATIC_DIR + "hongze/" + dateDir
 	//uploadDir := "./" + dateDir
 	fmt.Println(uploadDir)
-	err = os.MkdirAll(uploadDir, 777)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		br.Msg = "存储目录创建失败"
 		br.ErrMsg = "存储目录创建失败,Err:" + err.Error()
@@ -262,7 +262,6 @@ func (this *ResourceController) VideoUpload() {
 	utils.FileLog.Info("%s:", time.Now().Format(utils.FormatDateTime))
 	utils.FileLog.Info("end update oss ")
 
-
 	item := new(models.Resource)
 	item.ResourceUrl = resourceUrl
 	item.ResourceType = 3
@@ -324,7 +323,7 @@ func (this *ResourceController) VoiceUpload() {
 	uploadDir := utils.STATIC_DIR + "hongze/" + dateDir
 	//uploadDir := "./" + dateDir
 	fmt.Println(uploadDir)
-	err = os.MkdirAll(uploadDir, 766)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		br.Msg = "存储目录创建失败"
 		br.ErrMsg = "存储目录创建失败,Err:" + err.Error()
@@ -439,7 +438,6 @@ func (this *ResourceController) VoiceUpload() {
 	utils.FileLog.Info(fmt.Sprintf("%s:", time.Now().Format(utils.FormatDateTime)))
 	utils.FileLog.Info("end update oss ")
 
-
 	item := new(models.Resource)
 	item.ResourceUrl = resourceUrl
 	item.ResourceType = 3
@@ -604,8 +602,6 @@ func (this *ResourceController) UploadImageBase64() {
 	utils.FileLog.Info("%s:", time.Now().Format(utils.FormatDateTime))
 	utils.FileLog.Info("end update oss ")
 
-
-
 	item := new(models.Resource)
 	item.ResourceUrl = resourceUrl
 	item.ResourceType = 1
@@ -709,7 +705,7 @@ func (this *ResourceController) UploadV2() {
 	ext := path.Ext(h.Filename)
 	dateDir := time.Now().Format("20060102")
 	uploadDir := utils.STATIC_DIR + "hongze/" + dateDir
-	err = os.MkdirAll(uploadDir, 766)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		br.Msg = "存储目录创建失败"
 		br.ErrMsg = "存储目录创建失败,Err:" + err.Error()

controllers/sys_admin.go

@@ -366,8 +366,13 @@ func (this *SysAdminController) Add() {
 			br.Msg = "邮箱格式有误, 请检查"
 			return
 		}
-		_, e := system.GetSysUserByEmail(req.Email)
-		if e.Error() != utils.ErrNoRow() {
+		emailUser, e := system.GetSysUserByEmail(req.Email)
+		if e != nil && e.Error() != utils.ErrNoRow() {
+			br.Msg = "操作失败"
+			br.ErrMsg = "邮箱获取用户失败"
+			return
+		}
+		if emailUser != nil && emailUser.AdminId > 0 {
 			br.Msg = "邮箱已存在, 请重新填写"
 			return
 		}

controllers/target.go

@@ -3483,6 +3483,17 @@ func (this *TargetController) ExcelDataAdd() {
 						continue
 					}
 					valueListMap[index] = valueMap["m"].(string)
+
+					// 09-27 千位分隔符时用 "m" 取字符串存数据库会把逗号当小数点，现在换用 "v" 直接取数字再转为字符串，看看会不会有问题
+					if ct, ok := valueMap["ct"].(map[string]interface{}); ok{
+						fa, _ := ct["fa"]
+						if fa == "#,##0.000" {
+							value = valueMap["v"]
+							floatValue := valueMap["v"].(float64)
+							valueListMap[index] = strconv.FormatFloat(floatValue, 'f', -1, 64)
+						}
+					}
+
 					//valueList = append(valueList, valueMap["m"].(string))
 					//fmt.Println("valueList:", valueList)
 				}

controllers/voice.go

@@ -2,12 +2,12 @@ package controllers
 
 import (
 	"archive/zip"
-	"fmt"
-	"github.com/rdlucklib/rdluck_tools/file"
-	"github.com/rdlucklib/rdluck_tools/http"
 	"eta/eta_api/models"
 	"eta/eta_api/services"
 	"eta/eta_api/utils"
+	"fmt"
+	"github.com/rdlucklib/rdluck_tools/file"
+	"github.com/rdlucklib/rdluck_tools/http"
 	"io/ioutil"
 	"os"
 	"path"
@@ -56,7 +56,7 @@ func (this *VoiceController) Upload() {
 	ext := path.Ext(h.Filename)
 	dateDir := time.Now().Format("20060102")
 	uploadDir := utils.STATIC_DIR + "hongze/" + dateDir
-	err = os.MkdirAll(uploadDir, 777)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		br.Msg = "存储目录创建失败"
 		br.ErrMsg = "存储目录创建失败,Err:" + err.Error()

models/data_manage/chart_classify.go

@@ -287,3 +287,10 @@ func EditChartClassifySysUser(classifyId, sysUserId int, chartClassifyName strin
 	_, err = o.Raw(sql, sysUserId, chartClassifyName, classifyId).Exec()
 	return
 }
+
+func GetAllChartClassifyItemsBySource(source int) (items []*ChartClassifyItems, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := ` SELECT * FROM chart_classify WHERE source = ? order by sort ASC,chart_classify_id ASC`
+	_, err = o.Raw(sql, source).QueryRows(&items)
+	return
+}

models/data_manage/chart_info.go

@@ -1692,6 +1692,7 @@ type SectionScatterReq struct {
 type SectionScatterSeriesItemReq struct {
 	Name            string `description:"系列名"`
 	NameEn          string `description:"系列名(英文名)"`
+	IsNameDefault   bool   `description:"是否使用默认的系列名 false修改过 true默认  影响自动更新"`
 	Color           string `description:"颜色"`
 	EdbInfoList     []SectionScatterEdbItemReq
 	ShowTrendLine   bool `description:"是否展示趋势线"`
@@ -1735,6 +1736,7 @@ type SectionScatterInfoResp struct {
 type SectionScatterSeriesItemResp struct {
 	Name            string `description:"系列名"`
 	NameEn          string `description:"系列名(英文)"`
+	IsNameDefault   bool   `description:"是否使用默认的系列名 false修改过 true默认  影响自动更新"`
 	Color           string `description:"颜色"`
 	EdbInfoList     []SectionScatterEdbItemResp
 	ShowTrendLine   bool              `description:"是否展示趋势线"`
@@ -1823,3 +1825,26 @@ func GetChartInfoAdminList() (items []int, err error) {
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
+
+// EditChartInfoExtraConfig 修改 ETA图库 的 图表额外配置
+func EditChartInfoExtraConfig(chartId int, extraConfig string) (err error) {
+	o := orm.NewOrmUsingDB("data")
+	var pars []interface{}
+	pars = append(pars, extraConfig)
+
+	sql := ` UPDATE  chart_info
+			SET
+			  modify_time = NOW(),
+              extra_config = ?
+			`
+	sql += `WHERE chart_info_id = ?`
+
+	pars = append(pars, chartId)
+	_, err = o.Raw(sql, pars).Exec()
+	if err != nil {
+		fmt.Println("UPDATE  chart_info Err:", err.Error())
+		return err
+	}
+
+	return
+}

models/data_manage/edb_classify.go

@@ -13,6 +13,7 @@ type EdbClassify struct {
 	ClassifyType    uint8     `description:"分类类型，0：普通指标分类，1：预测指标分类"`
 	ClassifyName    string    `description:"分类名称"`
 	ParentId        int       `description:"父级id"`
+	RootId          int       `description:"顶级id"`
 	HasData         int       `description:"是否含有指标数据"`
 	CreateTime      time.Time `description:"创建时间"`
 	ModifyTime      time.Time `description:"修改时间"`
@@ -117,6 +118,26 @@ func GetEdbClassifyByParentId(parentId int, classifyType int8) (items []*EdbClas
 	return
 }
 
+func GetEdbClassifyByRootIdLevel(rootId int, classifyType uint8, orderStr string) (items []*EdbClassifyItems, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := ` SELECT * FROM edb_classify WHERE root_id=? AND classify_type = ? `
+	if orderStr != "" {
+		sql += orderStr
+	} else {
+		sql += ` order by level desc, sort asc, classify_id asc`
+	}
+
+	_, err = o.Raw(sql, rootId, classifyType).QueryRows(&items)
+	return
+}
+
+func GetEdbClassifyByRootIdLevelOrder(rootId int, classifyType uint8) (items []*EdbClassifyItems, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := ` SELECT * FROM edb_classify WHERE root_id=? AND classify_type = ? order by level desc, sort asc, classify_id asc`
+	_, err = o.Raw(sql, rootId, classifyType).QueryRows(&items)
+	return
+}
+
 // GetEdbClassifyAll 获取普通指标的分类列表
 func GetEdbClassifyAll() (items []*EdbClassifyItems, err error) {
 	o := orm.NewOrmUsingDB("data")
@@ -125,6 +146,14 @@ func GetEdbClassifyAll() (items []*EdbClassifyItems, err error) {
 	return
 }
 
+// GetNormalEdbClassifyAll 获取普通指标的分类列表
+func GetNormalEdbClassifyAll() (items []*EdbClassifyItems, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := ` SELECT * FROM edb_classify WHERE  classify_type = 0  order by sort asc,classify_id asc`
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}
+
 // GetPredictEdbClassifyAll 获取预测指标的分类列表
 func GetPredictEdbClassifyAll() (items []*EdbClassifyItems, err error) {
 	o := orm.NewOrmUsingDB("data")
@@ -133,12 +162,21 @@ func GetPredictEdbClassifyAll() (items []*EdbClassifyItems, err error) {
 	return
 }
 
+// GetAllEdbClassifyByType 根据类型获取分类列表
+func GetAllEdbClassifyByType(classifyType int) (items []*EdbClassifyItems, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := ` SELECT * FROM edb_classify WHERE classify_type = ? order by sort ASC,classify_id ASC`
+	_, err = o.Raw(sql, classifyType).QueryRows(&items)
+	return
+}
+
 type EdbClassifyItems struct {
 	ClassifyId      int `description:"分类id"`
 	EdbInfoId       int `description:"指标id"`
 	ClassifyName    string
 	ClassifyNameEn  string
 	ParentId        int
+	RootId          int    `description:"顶级id"`
 	Level           int    `description:"层级"`
 	Sort            int    `description:"排序字段，越小越靠前，默认值：10"`
 	UniqueCode      string `description:"唯一编码"`
@@ -153,6 +191,29 @@ type EdbClassifyItems struct {
 	Button          EdbClassifyItemsButton `description:"操作权限"`
 }
 
+type EdbClassifyIdItems struct {
+	ClassifyId   int `description:"分类id"`
+	ClassifyName string
+	UniqueCode   string `description:"唯一编码"`
+	ParentId     int    `description:"父级分类id"`
+	Level        int    `description:"层级"`
+	RootId       int    `description:"顶级分类id"`
+}
+
+type EdbClassifyItemList []*EdbClassifyItems
+
+func (m EdbClassifyItemList) Len() int {
+	return len(m)
+}
+
+func (m EdbClassifyItemList) Less(i, j int) bool {
+	return m[i].Sort < m[j].Sort
+}
+
+func (m EdbClassifyItemList) Swap(i, j int) {
+	m[i], m[j] = m[j], m[i]
+}
+
 // EdbClassifyItemsButton 操作按钮
 type EdbClassifyItemsButton struct {
 	AddButton           bool `description:"是否可添加"`
@@ -165,7 +226,7 @@ type EdbClassifyItemsButton struct {
 }
 
 type EdbClassifyListResp struct {
-	AllNodes      []*EdbClassifyItems
+	AllNodes      EdbClassifyItemList
 	CanOpClassify bool   `description:"是否允许操作分类"`
 	Language      string `description:"指标的展示语言，CN：中文，EN：英文"`
 }
@@ -229,6 +290,9 @@ type MoveEdbClassifyReq struct {
 	ParentClassifyId int `description:"父级分类id"`
 	PrevClassifyId   int `description:"上一个兄弟节点分类id"`
 	NextClassifyId   int `description:"下一个兄弟节点分类id"`
+	EdbInfoId        int `description:"指标ID, 如果指标ID有值，则移动对象为指标，否则认为移动对象为分类"`
+	PrevEdbInfoId    int `description:"上一个指标ID"`
+	NextEdbInfoId    int `description:"下一个指标ID"`
 }
 
 // GetFirstEdbClassifyByParentId 获取当前父级分类下，且排序数相同 的排序第一条的数据
@@ -265,6 +329,14 @@ func GetEdbClassifyMaxSort(parentId int, classifyType uint8) (sort int, err erro
 	return
 }
 
+// GetEdbInfoMaxSortByClassifyId 获取分类下指标的最大的排序数
+func GetEdbInfoMaxSortByClassifyId(classifyId int) (sort int, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := `SELECT Max(sort) AS sort FROM edb_info WHERE classify_id=? `
+	err = o.Raw(sql, classifyId).QueryRow(&sort)
+	return
+}
+
 type ClassifyEdbInfoListResp struct {
 	EdbInfoList []*EdbClassifyItems
 }
@@ -448,3 +520,19 @@ func FixPredictEdbClassifySysUser() {
 	}
 	fmt.Println("EditChartClassifySysUser end")
 }
+
+func UpdateEdbClassifyChildByParentClassifyId(classifyIds []int, rootId int, levelStep int) (err error) {
+	o := orm.NewOrmUsingDB("data")
+	var pars []interface{}
+	pars = append(pars, rootId, levelStep)
+	pars = append(pars, classifyIds)
+	// 更新相关联的二级分类的parentId,和classify_name_second
+	sql := `update edb_classify 
+SET root_id = ?, level = level+?
+where classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `)`
+	_, err = o.Raw(sql, pars).Exec()
+	if err != nil {
+		return
+	}
+	return
+}

models/data_manage/edb_data_base.go

@@ -152,6 +152,10 @@ func GetEdbDataTableName(source int) (tableName string) {
 		tableName = "edb_data_calculate_zsxy" // 指数修匀->72
 	case utils.DATA_SOURCE_PREDICT_CALCULATE_ZSXY:
 		tableName = "edb_data_predict_calculate_zsxy" // 预测指数修匀->73
+	case utils.DATA_SOURCE_CALCULATE_ZDYFX:
+		tableName = "edb_data_calculate_zdyfx" // 自定义分析->74
+	case utils.DATA_SOURCE_CALCULATE_RJZ: //日均值->75
+		tableName = "edb_data_calculate_rjz"
 	default:
 		tableName = ""
 	}

models/data_manage/edb_info.go

@@ -47,6 +47,11 @@ type EdbInfo struct {
 	DataDateType     string  `orm:"column(data_date_type);size(255);null;default(交易日)"`
 	ManualSave       int     `description:"是否有手动保存过上下限: 0-否; 1-是"`
 }
+type EdbInfoFullClassify struct {
+	*EdbInfo
+	CorrelationStr string `description:"相关性系数字符串"`
+	ClassifyList   []*EdbClassifyIdItems
+}
 
 func AddEdbInfo(item *EdbInfo) (lastId int64, err error) {
 	o := orm.NewOrmUsingDB("data")
@@ -297,7 +302,7 @@ type EdbData struct {
 type EdbInfoListResp struct {
 	Paging       *paging.PagingItem
 	Item         *EdbInfoList
-	ClassifyList []*EdbClassifySimplify
+	ClassifyList []*EdbClassifyIdItems
 }
 
 func GetEdbInfoByCondition(condition string, pars []interface{}) (item *EdbInfoList, err error) {
@@ -727,9 +732,11 @@ func GetFirstEdbInfoByClassifyId(classifyId int) (item *EdbInfo, err error) {
 // UpdateEdbInfoSortByClassifyId 根据分类id更新排序
 func UpdateEdbInfoSortByClassifyId(classifyId, nowSort int, prevEdbInfoId int, updateSort string) (err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := ` update edb_info set sort = ` + updateSort + ` WHERE classify_id=? AND `
+	sql := ` update edb_info set sort = ` + updateSort + ` WHERE classify_id=?`
 	if prevEdbInfoId > 0 {
-		sql += ` ( sort > ? or ( edb_info_id > ` + fmt.Sprint(prevEdbInfoId) + ` and sort=` + fmt.Sprint(nowSort) + ` )) `
+		sql += ` AND ( sort > ? or ( edb_info_id > ` + fmt.Sprint(prevEdbInfoId) + ` and sort=` + fmt.Sprint(nowSort) + ` )) `
+	} else {
+		sql += ` AND ( sort > ? )`
 	}
 	_, err = o.Raw(sql, classifyId, nowSort).Exec()
 	return
@@ -747,6 +754,11 @@ type EdbInfoDataResp struct {
 	DataList []*EdbDataList
 }
 
+type EdbInfoDataFullClassifyResp struct {
+	EdbInfo  *EdbInfoFullClassify
+	DataList []*EdbDataList
+}
+
 type EdbInfoReplaceReq struct {
 	OldEdbInfoId int `description:"原指标ID"`
 	NewEdbInfoId int `description:"替换为指标ID"`
@@ -1713,7 +1725,7 @@ type SetEdbDataInsertConfigReq struct {
 // 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 = ?`
+	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, sort FROM edb_info WHERE classify_id = ? AND edb_info_type = ?`
 
 	pars := []interface{}{classifyId, edbInfoType}
 	// 如果筛选了用户id

models/data_manage/edb_info_calculate.go

@@ -96,7 +96,7 @@ func GetEdbInfoCalculateDetail(edbInfoId, source int) (list []*EdbInfoCalculateD
 }
 
 type CalculateDetailResp struct {
-	EdbInfoDetail *EdbInfo
+	EdbInfoDetail *EdbInfoFullClassify
 	CalculateList []*EdbInfoCalculateDetail
 }
 

models/data_manage/excel_style.go

@@ -203,4 +203,9 @@ func GetExcelEdbdataMappingCount(classifyId int, tradeCode, frequency string) (c
 //	o := orm.NewOrmUsingDB("edb")
 //	_, err = o.Raw(sql, close, tradeCode, dt).Exec()
 //	return
-//}
+//}
+
+type Ct struct {
+	Fa string `json:"fa"`
+	T  string `json:"t"`
+}

models/data_manage/request/meeting_probabilities.go

@@ -0,0 +1,54 @@
+package request
+
+type ISheet struct {
+	ScrollTop            int        `json:"scrollTop"`
+	ScrollLeft           int        `json:"scrollLeft"`
+	Index                string     `json:"index"`
+	Status               int        `json:"status"`
+	JfGirdSelectSave     []struct{} `json:"jfgird_select_save"`
+	LuckySheetSelectSave []struct{} `json:"luckysheet_select_save"`
+	Data                 [][]*struct {
+		Ct struct {
+			Fa string `json:"fa"`
+			T  string `json:"t"`
+		} `json:"ct"`
+		M string  `json:"m"`
+		V float64 `json:"v"`
+	} `json:"data"`
+	Config map[string]struct {
+	} `json:"config"`
+	VisibleDataRow           []int            `json:"visibledatarow"`
+	VisibleDataColumn        []int            `json:"visibledatacolumn"`
+	ChWidth                  int              `json:"ch_width"`
+	RhHeight                 int              `json:"rh_height"`
+	LuckySheetSelectionRange []int            `json:"luckysheet_selection_range"`
+	ZoomRatio                int              `json:"zoomRatio"`
+	CellData                 []ISheetCellData `json:"celldata"`
+}
+type ISheetData struct {
+	M  string       `json:"m"`
+	Ct ISheetDataCt `json:"ct"`
+	V  string       `json:"v"`
+}
+
+type ISheetDataCt struct {
+	Fa string `json:"fa"`
+	T  string `json:"t"`
+}
+
+type ISheetCellData struct {
+	R int        `json:"r"`
+	C int        `json:"c"`
+	V ISheetData `json:"v"`
+}
+
+type SheetData struct {
+	Data [][]*struct {
+		Ct struct {
+			Fa string `json:"fa"`
+			T  string `json:"t"`
+		} `json:"ct"`
+		M string  `json:"m"`
+		V float64 `json:"v"`
+	} `json:"data"`
+}

models/data_manage/response/predit_edb_info.go

@@ -19,18 +19,21 @@ type PredictEdbInfoListResp struct {
 
 // PredictEdbInfoDataResp 预测指标数据返回
 type PredictEdbInfoDataResp struct {
-	EdbInfo  *data_manage.EdbInfo
-	Button   data_manage.EdbClassifyItemsButton
-	DataList interface{}
+	EdbInfo      *data_manage.EdbInfo
+	Button       data_manage.EdbClassifyItemsButton
+	DataList     interface{}
+	ClassifyList []*data_manage.EdbClassifyIdItems `description:"父级分类列表"`
 }
 
 // PredictEdbInfo 预测指标详情
 type PredictEdbInfo struct {
 	data_manage.EdbInfo
-	RuleType      int                                   `description:"预测规则，1：最新，2：固定值，3：同比，4：同差，5：环比，6：环差，7：N期移动均值，8：N期段线性外推值"`
-	FixedValue    float64                               `description:"固定值"`
-	CalculateList []*data_manage.EdbInfoCalculateDetail `description:"关联指标"`
-	RuleList      []data_manage.PredictEdbConfDetail    `description:"指标规则配置"`
+	RuleType       int                                   `description:"预测规则，1：最新，2：固定值，3：同比，4：同差，5：环比，6：环差，7：N期移动均值，8：N期段线性外推值"`
+	FixedValue     float64                               `description:"固定值"`
+	CalculateList  []*data_manage.EdbInfoCalculateDetail `description:"关联指标"`
+	RuleList       []data_manage.PredictEdbConfDetail    `description:"指标规则配置"`
+	CorrelationStr string                                `description:"相关性系数字符串"`
+	ClassifyList   []*data_manage.EdbClassifyIdItems     `description:"父级分类列表"`
 }
 
 // PredictEdbInfoChartDataResp 获取预测指标绘图数据返回

models/english_report.go

@@ -209,6 +209,8 @@ type EnglishReportDetail struct {
 	Overview           string `description:"英文概述部分"`
 	FromReportId       int    `description:"继承的报告ID（英文策略报告ID）"`
 	KeyTakeaways       string `description:"关键点"`
+	ClassifyIdRoot     int    `description:"顶级分类id"`
+	ClassifyNameRoot   string `description:"顶级分类名称"`
 }
 
 func GetEnglishReportById(reportId int) (item *EnglishReportDetail, err error) {
@@ -259,6 +261,9 @@ type EnglishReportList struct {
 	FromReportId       int       `description:"继承的报告ID（英文策略报告ID）"`
 	AdminId            int       `description:"创建者账号"`
 	AdminRealName      string    `description:"创建者姓名"`
+	FullClassifyName   string    `description:"顶级分类名/父级分类名/当前分类名"`
+	ClassifyIdRoot     int       `description:"顶级分类id"`
+	ClassifyNameRoot   string    `description:"顶级分类名称"`
 }
 
 type EnglishReportListResp struct {
@@ -319,6 +324,17 @@ func GetEnglishReportByCondition(condition string, pars []interface{}) (items []
 	return
 }
 
+func GetEnglishReportCountByCondition(condition string, pars []interface{}) (count int, err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := `SELECT count(*) 
+        FROM english_report WHERE 1=1  `
+	if condition != "" {
+		sql += condition
+	}
+	err = o.Raw(sql, pars).QueryRow(&count)
+	return
+}
+
 // 发布报告
 func PublishEnglishReportById(reportId int, publishTime string) (err error) {
 	o := orm.NewOrmUsingDB("rddp")
@@ -386,13 +402,14 @@ type EnglishClassifyList struct {
 	ClassifyName  string    `description:"分类名称"`
 	Sort          int       `description:"排序"`
 	ParentId      int       `description:"父级分类id"`
+	RootId        int       `description:"一级分类ID"`
 	CreateTime    time.Time `description:"创建时间"`
 	ModifyTime    time.Time `description:"修改时间"`
 	ClassifyLabel string    `description:"分类标签"`
 	ShowType      int       `description:"展示类型：1-列表 2-专栏"`
 	IsShow        int       `description:"是否在小程序显示：1-显示 0-隐藏"`
-	ClassifyType  int       `description:"分类类型：0英文报告，1英文线上路演"`
-	EnPermissions []int     `description:"英文权限IDs"`
+	//ClassifyType  int       `description:"分类类型：0英文报告，1英文线上路演"`
+	EnPermissions []int `description:"英文权限IDs"`
 	Child         []*EnglishClassifyList
 }
 
@@ -401,75 +418,77 @@ type EnglishClassifyListResp struct {
 	Paging *paging.PagingItem `description:"分页数据"`
 }
 
-// 获取分类列表
-func GetEnglishClassifyList(startSize, pageSize int, keyWord string, classifyType int) (items []*EnglishClassifyList, err error) {
+// GetEnglishClassifyRootId 获取一级分类列表
+func GetEnglishClassifyRootId(startSize, pageSize int, keyWord string) (items []*EnglishClassifyList, err error) {
 	sql := ``
 	o := orm.NewOrmUsingDB("rddp")
 	if keyWord != "" {
 		sql = `SELECT * FROM (
-                   SELECT * FROM english_classify
-                   WHERE parent_id=0 AND classify_name LIKE '%` + keyWord + `%' AND classify_type = ?
+			                   SELECT * FROM english_classify
+                   WHERE parent_id=0 AND classify_name LIKE '%` + keyWord + `%'
                    UNION
                    SELECT * FROM english_classify
                    WHERE id IN(SELECT parent_id FROM english_classify
-                   WHERE parent_id>0 AND classify_name LIKE '%` + keyWord + `%') AND classify_type = ?
+                   WHERE parent_id>0 AND classify_name LIKE '%` + keyWord + `%')
                    )AS t
                    ORDER BY sort ASC,create_time ASC
                    LIMIT ?,? `
-		_, err = o.Raw(sql, classifyType, classifyType, startSize, pageSize).QueryRows(&items)
+		_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
 	} else {
-		sql = `SELECT * FROM english_classify WHERE parent_id=0 AND classify_type = ? ORDER BY sort ASC,create_time ASC LIMIT ?,? `
-		_, err = o.Raw(sql, classifyType, startSize, pageSize).QueryRows(&items)
+		sql = `SELECT * FROM english_classify WHERE parent_id=0 ORDER BY sort ASC,create_time ASC LIMIT ?,? `
+		_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
 	}
 	return
 }
 
-func GetEnglishClassifyListCount(keyWord string, classifyType int) (count int, err error) {
+func GetEnglishClassifyListCount(keyWord string) (count int, err error) {
 	sqlCount := ``
 	o := orm.NewOrmUsingDB("rddp")
 	if keyWord != "" {
 		sqlCount = `SELECT  COUNT(1) AS count FROM (
                SELECT * FROM english_classify
-               WHERE parent_id=0 AND classify_name LIKE '%` + keyWord + `%' AND classify_type = ?
+               WHERE parent_id=0 AND classify_name LIKE '%` + keyWord + `%'
                UNION
                SELECT * FROM english_classify
                WHERE id IN(SELECT parent_id FROM english_classify
-               WHERE parent_id>0 AND classify_name LIKE '%` + keyWord + `%' AND classify_type = ?)
+               WHERE parent_id>0 AND classify_name LIKE '%` + keyWord + `%')
                )AS t `
-		err = o.Raw(sqlCount, classifyType, classifyType).QueryRow(&count)
+		err = o.Raw(sqlCount).QueryRow(&count)
 	} else {
-		sqlCount = `SELECT COUNT(1) AS count FROM english_classify WHERE parent_id=0 AND classify_type = ?`
-		err = o.Raw(sqlCount, classifyType).QueryRow(&count)
+		sqlCount = `SELECT COUNT(1) AS count FROM english_classify WHERE parent_id=0`
+		err = o.Raw(sqlCount).QueryRow(&count)
 	}
 
 	return
 }
 
-func GetEnglishClassifyChild(parentId int, keyWord string, classifyType int) (items []*EnglishClassify, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+func GetEnglishClassifyListByRootId(rootIds []int, keyWord string) (items []*EnglishClassifyList, err error) {
 	sql := ``
+	o := orm.NewOrmUsingDB("rddp")
 	if keyWord != "" {
-		sql = `SELECT * FROM english_classify WHERE parent_id=? AND classify_type = ? AND classify_name LIKE '%` + keyWord + `%' ORDER BY create_time ASC `
+		sql = `SELECT
+	a.*
+FROM
+	english_classify a
+	LEFT JOIN english_classify b ON a.root_id = b.id
+	LEFT JOIN english_classify c ON a.parent_id = c.id
+	WHERE a.parent_id>0 and a.classify_name LIKE '%` + keyWord + `%' and a.root_id IN (` + utils.GetOrmInReplace(len(rootIds)) + `)`
+		_, err = o.Raw(sql, rootIds).QueryRows(&items)
 	} else {
-		sql = `SELECT * FROM english_classify WHERE parent_id=? AND classify_type = ? ORDER BY create_time ASC `
+		sql = `SELECT * FROM english_classify WHERE parent_id>0 and root_id IN (` + utils.GetOrmInReplace(len(rootIds)) + `) `
+		_, err = o.Raw(sql, rootIds).QueryRows(&items)
 	}
-	_, err = o.Raw(sql, parentId, classifyType).QueryRows(&items)
 	return
 }
 
-func GetEnglishClassifyChildByParentIds(parentIds []int, keyWord string, classifyType int) (items []*EnglishClassifyList, err error) {
+func GetEnglishClassifyChildByIds(ids []int) (items []*EnglishClassifyList, err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	sql := ``
-	if keyWord != "" {
-		sql = `SELECT * FROM english_classify WHERE parent_id IN (` + utils.GetOrmInReplace(len(parentIds)) + `) AND classify_type = ? AND classify_name LIKE '%` + keyWord + `%' ORDER BY create_time ASC `
-	} else {
-		sql = `SELECT * FROM english_classify WHERE parent_id IN (` + utils.GetOrmInReplace(len(parentIds)) + `) AND classify_type = ? ORDER BY create_time ASC `
-	}
-	_, err = o.Raw(sql, parentIds, classifyType).QueryRows(&items)
+	sql := `SELECT * FROM english_classify WHERE id IN (` + utils.GetOrmInReplace(len(ids)) + `) ORDER BY create_time ASC `
+	_, err = o.Raw(sql, ids).QueryRows(&items)
 	return
 }
 
-func GetEnglishReportDetailByClassifyId(classifyIdFirst, classifyIdSecond int) (item *EnglishReport, err error) {
+func GetEnglishReportDetailByClassifyId(classifyIdFirst, classifyIdSecond int) (item *EnglishReportDetail, err error) {
 	o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM english_report WHERE 1=1 `
 	if classifyIdSecond > 0 {
@@ -506,12 +525,13 @@ type EnglishClassify struct {
 	ClassifyName  string    `description:"分类名称"`
 	Sort          int       `description:"排序"`
 	ParentId      int       `description:"父级分类id"`
+	RootId        int       `description:"一级分类ID"`
 	CreateTime    time.Time `description:"创建时间"`
 	ModifyTime    time.Time `description:"修改时间"`
 	ClassifyLabel string    `description:"分类标签"`
 	ShowType      int       `description:"展示类型：1-列表 2-专栏"`
 	IsShow        int       `description:"是否在小程序显示：1-显示 0-隐藏"`
-	ClassifyType  int       `description:"分类类型：0英文报告，1英文线上路演"`
+	//ClassifyType  int       `description:"分类类型：0英文报告，1英文线上路演"`
 }
 
 func AddEnglishClassify(item *EnglishClassify) (lastId int64, err error) {
@@ -527,9 +547,18 @@ func ModifyEnglishClassify(item *EnglishClassify) (err error) {
 	classify_name = ?,
 	sort = ?,
 	parent_id = ?,
+	root_id = ?,
 	modify_time = ? 
 	WHERE id = ? `
-	_, err = o.Raw(sql, item.ClassifyName, item.Sort, item.ParentId, item.ModifyTime, item.Id).Exec()
+	_, err = o.Raw(sql, item.ClassifyName, item.Sort, item.ParentId, item.RootId, item.ModifyTime, item.Id).Exec()
+	return
+}
+
+// UpdateEnglishClassifyRootIdByParentId 更新报告分类的顶级ID
+func UpdateEnglishClassifyRootIdByParentId(parentId, rootId int) (err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := " UPDATE english_classify SET root_id = ? WHERE parent_id=? "
+	_, err = o.Raw(sql, rootId, parentId).Exec()
 	return
 }
 
@@ -568,30 +597,33 @@ func GetEnglishReportCounts(classifyId, parentId int) (count int, err error) {
 	return
 }
 
-func GetEnglishClassifyCountsByName(name string, parentId int, classifyType int) (count int, err error) {
+func GetEnglishClassifyCountsByName(name string, parentId int) (count int, err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT COUNT(1) AS count FROM english_classify WHERE classify_name=? AND parent_id = ? AND classify_type = ? `
-	err = o.Raw(sql, name, parentId, classifyType).QueryRow(&count)
+	sql := `SELECT COUNT(1) AS count FROM english_classify WHERE classify_name=? AND parent_id = ? `
+	err = o.Raw(sql, name, parentId).QueryRow(&count)
 	return
 }
 
-// 获取分类列表
-func GetEnglishFirstClassifyList(classifyType, startSize, pageSize int) (items []*EnglishClassifyList, err error) {
-	sql := ``
-
-	sql = `SELECT * FROM english_classify WHERE parent_id=0 AND classify_type = ?  ORDER BY sort ASC,create_time ASC LIMIT ?,? `
-
+// GetEnglishFirstClassifyList 获取一级、二级分类列表
+func GetEnglishFirstClassifyList(startSize, pageSize int) (items []*EnglishClassifyList, err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Raw(sql, classifyType, startSize, pageSize).QueryRows(&items)
+	sql := `SELECT * FROM english_classify WHERE parent_id=0  ORDER BY sort ASC,create_time ASC LIMIT ?,? `
+	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
 	return
 }
 
-func GetEnglishFirstClassifyListCount(classifyType int) (count int, err error) {
-	sqlCount := ``
-	sqlCount = `SELECT COUNT(1) AS count FROM english_classify WHERE parent_id=0 AND classify_type = ? `
+// GetEnglishSecondClassifyList 获取一级、二级分类列表
+func GetEnglishSecondClassifyList(rootIds []int) (items []*EnglishClassifyList, err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := `SELECT * FROM english_classify WHERE root_id IN (` + utils.GetOrmInReplace(len(rootIds)) + `) and parent_id>0 and root_id=parent_id ORDER BY sort ASC,create_time ASC`
+	_, err = o.Raw(sql, rootIds).QueryRows(&items)
+	return
+}
 
+func GetEnglishFirstClassifyListCount() (count int, err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	err = o.Raw(sqlCount, classifyType).QueryRow(&count)
+	sqlCount := `SELECT COUNT(1) AS count FROM english_classify WHERE parent_id=0`
+	err = o.Raw(sqlCount).QueryRow(&count)
 	return
 }
 
@@ -633,6 +665,35 @@ func UpdateEnglishReportByClassifyId(classifyFirstName, classifySecondName strin
 	return
 }
 
+func UpdateEnglishReportClassifyByFirstSecondClassifyId(classifyId, parentId int) (err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	// 更新相关联的二级分类的parentId,和classify_name_second
+	sql := `update english_report r
+LEFT JOIN english_classify c ON r.classify_id_second = c.id
+SET r.classify_id_first=c.parent_id, r.classify_name_second=c.classify_name
+where (r.classify_id_first != c.parent_id or r.classify_name_second != c.classify_name) and r.classify_id_second =?`
+	_, err = o.Raw(sql, classifyId).Exec()
+	if err != nil {
+		return
+	}
+	//更新一级分类名
+	sql = `update english_report r
+    LEFT JOIN english_classify c ON r.classify_id_first = c.id
+    SET r.classify_name_first=c.classify_name
+where r.classify_name_first	!= c.classify_name and r.classify_id_first=?`
+	_, err = o.Raw(sql, parentId).Exec()
+	if err != nil {
+		return
+	}
+	//更新一级分类名
+	sql = `update english_report r
+    LEFT JOIN english_classify c ON r.classify_id_first = c.id
+    SET r.classify_name_first=c.classify_name
+where r.classify_name_first	!= c.classify_name and r.classify_id_first=?`
+	_, err = o.Raw(sql, classifyId).Exec()
+	return
+}
+
 // FetchEnglishReportById 主键获取英文报告
 func FetchEnglishReportById(reportId int) (item *EnglishReport, err error) {
 	o := orm.NewOrmUsingDB("rddp")
@@ -650,10 +711,10 @@ func (reportInfo *EnglishReport) UpdateReport(cols []string) (err error) {
 }
 
 // GetAllEnglishClassify 获取所有英文分类
-func GetAllEnglishClassify(classifyType int) (list []*Classify, err error) {
+func GetAllEnglishClassify() (list []*Classify, err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	sql := ` SELECT * FROM english_classify where classify_type = ? `
-	_, err = o.Raw(sql, classifyType).QueryRows(&list)
+	sql := ` SELECT * FROM english_classify `
+	_, err = o.Raw(sql).QueryRows(&list)
 	return
 }
 
@@ -728,9 +789,37 @@ func (m RSChildClassifyList) Swap(i, j int) {
 }
 
 // GetEnglishClassifyByClassifyNameParentId 获取英文分类
-func GetEnglishClassifyByClassifyNameParentId(classifyName string, parentId, classifyType int) (item *Classify, err error) {
+func GetEnglishClassifyByClassifyNameParentId(classifyName string, parentId int) (item *Classify, err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	sql := ` SELECT * FROM english_classify where classify_name = ? and parent_id = ? and classify_type = ? `
-	err = o.Raw(sql, classifyName, parentId, classifyType).QueryRow(&item)
+	sql := ` SELECT * FROM english_classify where classify_name = ? and parent_id = ? `
+	err = o.Raw(sql, classifyName, parentId).QueryRow(&item)
+	return
+}
+
+type EnglishClassifyFullName struct {
+	Id           int    `description:"分类ID"`
+	ParentId     int    `description:"父级分类id"`
+	RootId       int    `description:"一级分类ID"`
+	RootName     string `description:"一级分类名"`
+	ParentName   string `description:"二级分类名"`
+	ClassifyName string `description:"分类名称"`
+}
+
+// GetEnglishClassifyFullNameByIds 获取英文分类名一级/二级/三级
+func GetEnglishClassifyFullNameByIds(classifyIds []int) (list []*EnglishClassifyFullName, err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := ` SELECT
+	a.id,
+	a.parent_id,
+	a.root_id,
+	a.classify_name,
+	b.classify_name AS root_name,
+	c.classify_name AS parent_name 
+FROM
+	english_classify a
+	LEFT JOIN english_classify b ON a.root_id = b.id
+	LEFT JOIN english_classify c ON a.parent_id = c.id 
+where a.id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `)`
+	_, err = o.Raw(sql, classifyIds).QueryRows(&list)
 	return
 }

models/english_report_email.go

@@ -187,6 +187,7 @@ type EnglishReportEmailSendReq struct {
 	EmailIds      string `description:"邮箱IDs"`
 	Theme         string `description:"邮件主题"`
 	EnPermissions []int  `description:"品种权限IDs"`
+	NoCompanyIds  []int  `description:"禁止接收邮件的英文客户IDs"`
 }
 
 // EnglishReportEmailConf 英文研报邮件配置

models/english_video.go

@@ -240,16 +240,32 @@ func DeleteEnglishVideo(Id int) (err error) {
 	return
 }
 
-func GetEnglishVideoDetailByClassifyId(classifyIdFirst, classifyIdSecond int) (item *EnglishVideo, err error) {
+func UpdateEnglishVideoClassifyByFirstSecondClassifyId(classifyId, parentId int) (err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	sql := ` SELECT * FROM english_video WHERE 1=1 `
-	if classifyIdSecond > 0 {
-		sql = sql + ` AND classify_id_second=?   ORDER BY stage DESC LIMIT 1`
-		err = o.Raw(sql, classifyIdSecond).QueryRow(&item)
-	} else {
-		sql = sql + ` AND classify_id_first=?   ORDER BY stage DESC LIMIT 1`
-		err = o.Raw(sql, classifyIdFirst).QueryRow(&item)
+	// 更新相关联的二级分类的parentId,和classify_name_second
+	sql := `update english_video r
+LEFT JOIN english_classify c ON r.classify_id_second = c.id
+SET r.classify_id_first=c.parent_id, r.classify_name_second=c.classify_name
+where (r.classify_id_first != c.parent_id or r.classify_name_second != c.classify_name) and r.classify_id_second =?`
+	_, err = o.Raw(sql, classifyId).Exec()
+	if err != nil {
+		return
+	}
+	//更新一级分类名
+	sql = `update english_video r
+    LEFT JOIN english_classify c ON r.classify_id_first = c.id
+    SET r.classify_name_first=c.classify_name
+where r.classify_name_first	!= c.classify_name and r.classify_id_first=?`
+	_, err = o.Raw(sql, parentId).Exec()
+	if err != nil {
+		return
 	}
+	//更新一级分类名
+	sql = `update english_video r
+    LEFT JOIN english_classify c ON r.classify_id_first = c.id
+    SET r.classify_name_first=c.classify_name
+where r.classify_name_first	!= c.classify_name and r.classify_id_first=?`
+	_, err = o.Raw(sql, classifyId).Exec()
 	return
 }
 

models/meeting_probabilities.go

@@ -0,0 +1,33 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+// MeetingProbabilities 加息表格详情表
+type MeetingProbabilities struct {
+	MeetingInfoId int    `orm:"column(meeting_info_id);pk"`
+	DateTime      string // 数据日期
+	Content       string // 表格内容
+	ExcelImage    string // 表格图片
+	IsDelete      int    // 是否删除，0：未删除，1：已删除
+	CreateTime    time.Time
+	ModifyTime    time.Time
+}
+
+// GetMeetingInfoById 根据id 获取加息概率表格详情
+func GetMeetingInfoById(dateTime string) (item *MeetingProbabilities, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := ``
+	if dateTime == "" {
+		sql = ` SELECT * FROM meeting_probabilities WHERE is_delete=0 ORDER BY create_time DESC LIMIT 1 `
+		err = o.Raw(sql).QueryRow(&item)
+		return
+	} else {
+		sql = ` SELECT * FROM meeting_probabilities WHERE date_time=? AND is_delete=0 `
+		err = o.Raw(sql, dateTime).QueryRow(&item)
+		return
+	}
+}
+

models/response/company.go

@@ -1,17 +0,0 @@
-package response
-
-import (
-	"eta/eta_api/models/company"
-	"github.com/rdlucklib/rdluck_tools/paging"
-)
-
-// 客户所属销售列表
-type CompanySellerListResp struct {
-	List []*company.CompanySellers
-}
-
-// TryOutCompanyListResp 正式转试用客户列表
-type TryOutCompanyListResp struct {
-	List   []*company.TryOutCompanyList
-	Paging *paging.PagingItem
-}

models/response/statistic_report.go

@@ -1,124 +0,0 @@
-package response
-
-import (
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"eta/eta_api/models"
-)
-
-// 首页控制台数据
-type WorktopResp struct {
-	FormalCompanyCount          int                         `description:"正式客户数"`
-	TrialCompanyTotal           int                         `description:"试用客户数"`
-	NewCompanyTotal             int                         `description:"新签客户数"`
-	RenewalCompanyTotal         int                         `description:"续约客户数"`
-	NotRenewalCompanyTotal      int                         `description:"未续约客户数"`
-	IncrementalCompanyChartList IncrementalCompanyChartResp `description:"增量客户图表数据"`
-	WillExpireChartList         WillExpireChartResp         `description:"增量客户图表数据"`
-	IncomeChartList             IncomeChartResp             `description:"收入统计图表数据"`
-	ContractData                ContractChartResp           `description:"当前有效合同存量"`
-}
-
-// 增量客户图表数据
-type IncrementalCompanyChartResp struct {
-	Title               string   `description:"图表名称"`
-	Date                []string `description:"月份"`
-	NewCompanyTotal     []int    `description:"新签客户数"`
-	RenewalCompanyTotal []int    `description:"续约客户数"`
-	//NotRenewalCompanyTotal []int    `description:"未续约客户数"`
-}
-
-// 即将到期客户数
-type WillExpireChartResp struct {
-	Title        string   `description:"图表名称"`
-	Date         []string `description:"月份"`
-	CompanyTotal []int    `description:"客户数"`
-}
-
-// 收入统计图表数据
-type IncomeChartResp struct {
-	Title         string    `description:"图表名称"`
-	Date          []string  `description:"月份"`
-	ContractTotal []int     `description:"合同数"`
-	MoneyTotal    []float64 `description:"合同总金额"`
-}
-
-// 当前有效合同存量
-type ContractChartResp struct {
-	Title              string  `description:"图表名称"`
-	FormalCompanyCount int     `description:"正式客户数"`
-	ContractTotal      int     `description:"合同数"`
-	MoneyTotal         float64 `description:"合同总金额"`
-}
-
-// 即将到期客户
-type WillExpireCompanyListResp struct {
-	List         []*models.WillExpireCompanyList
-	Paging       *paging.PagingItem `description:"分页数据"`
-	TotalCompany int                `description:"总客户数"`
-}
-
-// 合同统计数据接口返回结构体
-type ContractStatListResp struct {
-	List                []*models.ContractStatList
-	TotalContract       int                `description:"合同数量"`
-	TotalMoney          float64            `description:"合同总金额"`
-	TotalCompany        int                `description:"总客户数"`
-	TotalFileContract   int                `description:"总上传附件合同数"`
-	TotalSystemContract int                `description:"总系统生成合同数"`
-	Paging              *paging.PagingItem `description:"分页数据"`
-}
-
-// CompanyContractStatListResp 企业客户的合同统计数据接口返回结构体
-type CompanyContractStatListResp struct {
-	List          []*models.CompanyContractStatList
-	TotalContract int                `description:"合同数量"`
-	TotalMoney    float64            `description:"合同总金额"`
-	TotalCompany  int                `description:"总客户数"`
-	Paging        *paging.PagingItem `description:"分页数据"`
-}
-
-// 收入统计报表返回类
-type IncomeListResp struct {
-	List   []*models.IncomeList
-	Paging *paging.PagingItem `description:"分页数据"`
-	Total  int                `description:"新签合同总数"`
-	Money  float64            `description:"新签合同总金额"`
-}
-
-// 存量客户统计报表返回类
-type StackCompanyListResp struct {
-	List                   []*models.StackCompanyStatisticList
-	Paging                 *paging.PagingItem `description:"分页数据"`
-	NewCompanyTotal        int                `description:"新签客户数"`
-	RenewalCompanyTotal    int                `description:"续约客户数"`
-	NotRenewalCompanyTotal int                `description:"未续约客户数"`
-	NotRenewalTryOut       int                `description:"未续约客户（试用）数"`
-	NotRenewalNotTryOut    int                `description:"未续约客户（非试用）数"`
-}
-
-// 增量客户统计报表返回类
-type IncrementalCompanyListResp struct {
-	List                   []*models.IncrementalList
-	Paging                 *paging.PagingItem `description:"分页数据"`
-	TrialTotal             int                `description:"新增试用客户数"`
-	NewCompanyTotal        int                `description:"新签客户数"`
-	RenewalCompanyTotal    int                `description:"续约客户数"`
-	NotRenewalCompanyTotal int                `description:"未续约客户数"`
-	NotRenewalTryOut       int                `description:"未续约客户（试用）数"`
-	NotRenewalNotTryOut    int                `description:"未续约客户（非试用）数"`
-}
-
-// MoreRenewReasonResp 未续约说明列表返回类
-type MoreRenewReasonResp struct {
-	RenewalReason          string `description:"未续约说明"`
-	RenewalTodo            string `description:"待办事项说明"`
-	CreateTime             string `description:"添加时间"`
-	ExpirationTimeExceeded string `description:"超出到期时间"`
-}
-
-// RenewReasonItemResp 客户未续约说明列表返回类
-type RenewReasonItemResp struct {
-	RenewalReason string `description:"未续约说明"`
-	RenewalTodo   string `description:"待办事项说明"`
-	CreateTime    string `description:"添加时间"`
-}

models/sandbox/sandbox_classify.go

@@ -0,0 +1,93 @@
+package sandbox
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+type SandboxClassify struct {
+	SandboxClassifyId   int       `orm:"column(sandbox_classify_id);pk"`
+	SandboxClassifyName string    `description:"分类名称"`
+	ParentId          int       `description:"父级id"`
+	HasData           int       `description:"是否含有指标数据"`
+	CreateTime        time.Time `description:"创建时间"`
+	ModifyTime        time.Time `description:"修改时间"`
+	SysUserId         int       `description:"创建人id"`
+	SysUserRealName   string    `description:"创建人姓名"`
+	Level             int       `description:"层级"`
+	Sort              int       `description:"排序字段，越小越靠前，默认值：10"`
+}
+
+func AddSandboxClassify(item *SandboxClassify) (lastId int64, err error) {
+	o := orm.NewOrmUsingDB("data")
+	lastId, err = o.Insert(item)
+	return
+}
+
+// GetSandboxClassifyByParentId
+func GetSandboxClassifyByParentId(parentId int) (items []*SandboxClassifyItems, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := ` SELECT * FROM sandbox_classify WHERE parent_id=? order by sort asc,sandbox_classify_id asc`
+	_, err = o.Raw(sql, parentId).QueryRows(&items)
+	return
+}
+
+// GetSandboxClassifyAll
+func GetSandboxClassifyAll() (items []*SandboxClassifyItems, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := ` SELECT * FROM sandbox_classify WHERE parent_id<>0 order by sort asc,sandbox_classify_id asc`
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}
+
+type SandboxClassifyItems struct {
+	SandboxClassifyId   int       `orm:"column(sandbox_classify_id);pk"`
+	SandboxClassifyName string    `description:"分类名称"`
+	ParentId            int       `description:"父级id"`
+	HasData             int       `description:"是否含有指标数据"`
+	CreateTime          time.Time `description:"创建时间"`
+	ModifyTime          time.Time `description:"修改时间"`
+	SysUserId           int       `description:"创建人id"`
+	SysUserRealName     string    `description:"创建人姓名"`
+	Level               int       `description:"层级"`
+	Sort                int       `description:"排序字段，越小越靠前，默认值：10"`
+	SandboxId           int       `description:"沙盘id"`
+	Children            []*SandboxClassifyItems
+}
+
+type SandboxClassifyListResp struct {
+	AllNodes []*SandboxClassifyItems
+}
+
+type AddSandboxClassifyReq struct {
+	SandboxClassifyName string `description:"分类名称"`
+	ParentId            int    `description:"父级id,第一级传0"`
+	Level               int    `description:"层级,第一级传0，其余传上一级的层级"`
+}
+
+func GetSandboxClassifyCount(sandboxClassifyName string, parentId int) (count int, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := `SELECT COUNT(1) AS count FROM sandbox_classify WHERE parent_id=? AND sandbox_classify_name=? `
+	err = o.Raw(sql, parentId, sandboxClassifyName).QueryRow(&count)
+	return
+}
+
+// GetSandboxClassifyMaxSort 获取沙盘分类下最大的排序数
+func GetSandboxClassifyMaxSort(parentId int) (sort int, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := `SELECT Max(sort) AS sort FROM sandbox_classify WHERE parent_id=? `
+	err = o.Raw(sql, parentId).QueryRow(&sort)
+	return
+}
+
+type EditSandboxClassifyReq struct {
+	SandboxClassifyName string `description:"分类名称"`
+	SandboxClassifyId   int    `description:"分类id"`
+}
+
+func GetSandboxClassifyById(classifyId int) (item *SandboxClassify, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := `SELECT * FROM sandbox_classify WHERE sandbox_classify_id=? `
+	err = o.Raw(sql, classifyId).QueryRow(&item)
+	return
+}

routers/commentsRouter.go

@@ -259,6 +259,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/future_good:FutureGoodChartInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/future_good:FutureGoodChartInfoController"],
+        beego.ControllerComments{
+            Method: "BaseChartInfoDetailFromUniqueCode",
+            Router: `/chart_info/base_detail/from_unique_code`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/future_good:FutureGoodChartInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/future_good:FutureGoodChartInfoController"],
         beego.ControllerComments{
             Method: "CopyChartInfo",
@@ -1618,6 +1627,24 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbClassifyController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbClassifyController"],
+        beego.ControllerComments{
+            Method: "SimpleList",
+            Router: `/classify/simple`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbClassifyController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbClassifyController"],
+        beego.ControllerComments{
+            Method: "ClassifyTree",
+            Router: `/classify/tree`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbClassifyController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbClassifyController"],
         beego.ControllerComments{
             Method: "EdbClassifyMove",
@@ -3220,6 +3247,24 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:PredictEdbClassifyController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:PredictEdbClassifyController"],
+        beego.ControllerComments{
+            Method: "SimpleList",
+            Router: `/predict_classify/simple`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:PredictEdbClassifyController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:PredictEdbClassifyController"],
+        beego.ControllerComments{
+            Method: "ClassifyTree",
+            Router: `/predict_classify/tree`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:PredictEdbInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:PredictEdbInfoController"],
         beego.ControllerComments{
             Method: "Add",
@@ -4786,6 +4831,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers:MeetingProbabilitiesController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:MeetingProbabilitiesController"],
+        beego.ControllerComments{
+            Method: "Detail",
+            Router: `/detail`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers:OutLinkController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:OutLinkController"],
         beego.ControllerComments{
             Method: "AllList",

routers/router.go

@@ -282,6 +282,11 @@ func init() {
 				&controllers.UserLoginAuthController{},
 			),
 		),
+		web.NSNamespace("/meeting_probabilities",
+			web.NSInclude(
+				&controllers.MeetingProbabilitiesController{},
+			),
+		),
 	)
 	web.AddNamespace(ns)
 }

services/data/base_edb_lib.go

@@ -293,7 +293,7 @@ type CalculateComputeCorrelationResp struct {
 	Msg         string
 	ErrMsg      string
 	ErrCode     string
-	Data        float64
+	Data        string
 	Success     bool `description:"true 执行成功，false 执行失败"`
 	IsSendEmail bool `json:"-" description:"true 发送邮件，false 不发送邮件"`
 	IsAddLog    bool `json:"-" description:"true 新增操作日志，false 不新增操作日志" `

services/data/chart_info.go

@@ -535,7 +535,9 @@ func GetChartEdbData(chartInfoId, chartType int, calendar, startDate, endDate st
 			err = errors.New(errMsg)
 			return
 		}
+		
 		extraConfig = tmpExtraConfig
+
 	default:
 		xEdbIdValue = make([]int, 0)
 		yDataList = make([]data_manage.YData, 0)
@@ -570,7 +572,20 @@ func GetChartEdbData(chartInfoId, chartType int, calendar, startDate, endDate st
 		}
 	case 10: // 截面散点图
 		sectionScatterConf := extraConfig.(data_manage.SectionScatterReq)
-		xEdbIdValue, dataResp, err = GetSectionScatterChartData(mappingList, edbDataListMap, sectionScatterConf)
+		xEdbIdValue, dataResp, err = GetSectionScatterChartData(chartInfoId, mappingList, edbDataListMap, sectionScatterConf)
+
+		var tmpExtraConfig data_manage.SectionScatterReq
+		if extraConfigStr == `` {
+			errMsg = "截面散点图未配置"
+			err = errors.New(errMsg)
+			return
+		}
+		err = json.Unmarshal([]byte(extraConfigStr), &tmpExtraConfig)
+		if err != nil {
+			errMsg = "截面散点配置异常"
+			err = errors.New(errMsg)
+			return
+		}
 
 		// 这个数据没有必要返回给前端
 		for _, v := range edbList {
@@ -1608,7 +1623,7 @@ func CheckChartExtraConfig(chartType int, extraConfigStr string) (edbIdList []in
 }
 
 // GetSectionScatterChartData 截面散点图的数据处理
-func GetSectionScatterChartData(mappingList []*data_manage.ChartEdbInfoMapping, edbDataListMap map[int][]*data_manage.EdbDataList, extraConfig data_manage.SectionScatterReq) (edbIdList []int, chartDataResp data_manage.SectionScatterInfoResp, err error) {
+func GetSectionScatterChartData(chartInfoId int, mappingList []*data_manage.ChartEdbInfoMapping, edbDataListMap map[int][]*data_manage.EdbDataList, extraConfig data_manage.SectionScatterReq) (edbIdList []int, chartDataResp data_manage.SectionScatterInfoResp, err error) {
 	// 指标数据数组（10086:{"2022-12-02":100.01,"2022-12-01":102.3}）
 	edbDataMap := make(map[int]map[string]float64)
 	for edbInfoId, edbDataList := range edbDataListMap {
@@ -1869,6 +1884,7 @@ func GetSectionScatterChartData(mappingList []*data_manage.ChartEdbInfoMapping,
 		dataListResp = append(dataListResp, data_manage.SectionScatterSeriesItemResp{
 			Name:            seriesItem.Name,
 			NameEn:          seriesItem.NameEn,
+			IsNameDefault:   seriesItem.IsNameDefault,
 			Color:           seriesItem.Color,
 			EdbInfoList:     tmpSeriesEdbInfoList,
 			ShowTrendLine:   seriesItem.ShowTrendLine,
@@ -1880,6 +1896,39 @@ func GetSectionScatterChartData(mappingList []*data_manage.ChartEdbInfoMapping,
 		})
 	}
 
+	// 截面散点图点击详情时自动更新系列名
+	if len(extraConfig.SeriesList) > 0 {
+		// 默认名字的时候才自动更新
+		if extraConfig.SeriesList[0].IsNameDefault {
+			firstXEdbInfoId := extraConfig.SeriesList[0].EdbInfoList[0].XEdbInfoId
+			needUpdate := false
+			if v, ok := edbMappingMap[firstXEdbInfoId]; ok {
+				extraConfig.SeriesList[0].Name = v.LatestDate
+				extraConfig.SeriesList[0].NameEn = v.LatestDate
+				dataListResp[0].Name = v.LatestDate
+				dataListResp[0].NameEn = v.LatestDate
+				needUpdate = true
+			}
+
+			extraConfigByte, e := json.Marshal(extraConfig)
+			if e != nil {
+				errMsg := "截面散点系列更新异常"
+				err = errors.New(errMsg)
+				return
+			}
+			extraConfigStr := string(extraConfigByte)
+
+			if needUpdate {
+				err = data_manage.EditChartInfoExtraConfig(chartInfoId, extraConfigStr)
+				if err != nil {
+					errMsg := "截面散点系列更新异常"
+					err = errors.New(errMsg)
+					return
+				}
+			}
+		}
+	}
+
 	chartDataResp = data_manage.SectionScatterInfoResp{
 		XName:       extraConfig.XName,
 		XNameEn:     extraConfig.XNameEn,

services/data/edb_classify.go

@@ -48,6 +48,125 @@ func edbClassifyHaveChild(allNode []*data_manage.EdbClassifyItems, node *data_ma
 	return
 }
 
+// GetClassifyTreeRecursive 递归获取分类树形结构
+func GetClassifyTreeRecursive(list []*data_manage.EdbClassifyItems, parentId int) []*data_manage.EdbClassifyItems {
+	res := make([]*data_manage.EdbClassifyItems, 0)
+	for _, v := range list {
+		if v.ParentId == parentId {
+			v.Children = GetClassifyTreeRecursive(list, v.ClassifyId)
+			res = append(res, v)
+		}
+	}
+	return res
+}
+
+func GetFullClassifyByClassifyId(targetClassifyId int) (targetList []*data_manage.EdbClassifyIdItems, err error, errMsg string) {
+	//判断是否是挂在顶级目录下
+	targetClassify, err := data_manage.GetEdbClassifyById(targetClassifyId)
+	if err != nil {
+		if err.Error() == utils.ErrNoRow() {
+			errMsg = "当前分类不存在"
+			err = errors.New(errMsg)
+			return
+		}
+		errMsg = "获取失败"
+		err = errors.New("获取分类信息失败，Err:" + err.Error())
+		return
+	}
+	if targetClassify.ParentId == 0 {
+		targetItem := new(data_manage.EdbClassifyIdItems)
+		targetItem.ClassifyId = targetClassify.ClassifyId
+		targetItem.ParentId = targetClassify.ParentId
+		targetItem.RootId = targetClassify.RootId
+		targetItem.UniqueCode = targetClassify.UniqueCode
+		targetItem.Level = targetClassify.Level
+		targetItem.ClassifyName = targetClassify.ClassifyName
+		targetList = append(targetList, targetItem)
+		return
+	}
+	tmpList, err := data_manage.GetEdbClassifyByRootIdLevel(targetClassify.RootId, targetClassify.ClassifyType, "")
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		errMsg = "获取失败"
+		err = errors.New("获取数据失败，Err:" + err.Error())
+		return
+	}
+	idMap := make(map[int]struct{})
+	if len(tmpList) > 0 {
+		for _, v := range tmpList {
+			if v.ClassifyId == targetClassify.ClassifyId {
+				idMap[v.ClassifyId] = struct{}{}
+				idMap[v.ParentId] = struct{}{}
+			}
+		}
+		for _, v := range tmpList {
+			if _, ok := idMap[v.ClassifyId]; ok {
+				idMap[v.ParentId] = struct{}{}
+			}
+		}
+		for _, v := range tmpList {
+			if _, ok := idMap[v.ClassifyId]; ok {
+				targetItem := new(data_manage.EdbClassifyIdItems)
+				targetItem.ClassifyId = v.ClassifyId
+				targetItem.ParentId = v.ParentId
+				targetItem.RootId = v.RootId
+				targetItem.UniqueCode = v.UniqueCode
+				targetItem.Level = v.Level
+				targetItem.ClassifyName = v.ClassifyName
+				targetList = append(targetList, targetItem)
+			}
+		}
+	}
+	return
+}
+
+func GetChildClassifyByClassifyId(targetClassifyId int) (targetList []*data_manage.EdbClassifyIdItems, err error, errMsg string) {
+	//判断是否是挂在顶级目录下
+	targetClassify, err := data_manage.GetEdbClassifyById(targetClassifyId)
+	if err != nil {
+		if err.Error() == utils.ErrNoRow() {
+			errMsg = "当前分类不存在"
+			err = errors.New(errMsg)
+			return
+		}
+		errMsg = "获取失败"
+		err = errors.New("获取分类信息失败，Err:" + err.Error())
+		return
+	}
+	orderStr := ` order by level asc, sort asc, classify_id asc`
+	tmpList, err := data_manage.GetEdbClassifyByRootIdLevel(targetClassify.RootId, targetClassify.ClassifyType, orderStr)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		errMsg = "获取失败"
+		err = errors.New("获取数据失败，Err:" + err.Error())
+		return
+	}
+	idMap := make(map[int]struct{})
+	if len(tmpList) > 0 {
+		for _, v := range tmpList {
+			if v.ClassifyId == targetClassify.ClassifyId {
+				idMap[v.ClassifyId] = struct{}{}
+			}
+		}
+		for _, v := range tmpList {
+			if _, ok := idMap[v.ParentId]; ok {
+				idMap[v.ClassifyId] = struct{}{}
+			}
+		}
+		for _, v := range tmpList {
+			if _, ok := idMap[v.ClassifyId]; ok {
+				targetItem := new(data_manage.EdbClassifyIdItems)
+				targetItem.ClassifyId = v.ClassifyId
+				targetItem.ParentId = v.ParentId
+				targetItem.RootId = v.RootId
+				targetItem.UniqueCode = v.UniqueCode
+				targetItem.Level = v.Level
+				targetItem.ClassifyName = v.ClassifyName
+				targetList = append(targetList, targetItem)
+			}
+		}
+	}
+
+	return
+}
 func GetEdbClassifyEdbInfo() (result map[int][]*data_manage.EdbClassifyItems, err error) {
 	cMap := make(map[int][]*data_manage.EdbClassifyItems)
 	items, err := data_manage.GetEdbInfoAll(0)
@@ -134,8 +253,33 @@ func AddEdbClassify(classifyName string, parentId, level int, classifyType uint8
 		errMsg = `分类名称已存在，请重新输入`
 		return
 	}
+	if level > 6 {
+		errMsg = `最高只支持添加6级分类`
+		return
+	}
 	//获取该层级下最大的排序数
-	maxSort, err := data_manage.GetEdbClassifyMaxSort(parentId, classifyType)
+	maxSort, err := GetEdbClassifyMaxSort(parentId, classifyType)
+	if err != nil {
+		errMsg = "获取失败"
+		err = errors.New("查询排序信息失败，Err:" + err.Error())
+		return
+	}
+	//查询顶级rootId
+	rootId := 0
+	if parentId > 0 {
+		parentClassify, tErr := data_manage.GetEdbClassifyById(parentId)
+		if tErr != nil {
+			if tErr.Error() == utils.ErrNoRow() {
+				errMsg = "父级分类不存在"
+				err = errors.New(errMsg)
+				return
+			}
+			errMsg = "获取失败"
+			err = errors.New("获取分类信息失败，Err:" + tErr.Error())
+			return
+		}
+		rootId = parentClassify.RootId
+	}
 
 	timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 	classifyInfo = &data_manage.EdbClassify{
@@ -143,6 +287,7 @@ func AddEdbClassify(classifyName string, parentId, level int, classifyType uint8
 		ClassifyType:    classifyType,
 		ClassifyName:    classifyName,
 		ParentId:        parentId,
+		RootId:          rootId,
 		HasData:         0,
 		CreateTime:      time.Now(),
 		ModifyTime:      time.Now(),
@@ -150,12 +295,23 @@ func AddEdbClassify(classifyName string, parentId, level int, classifyType uint8
 		SysUserRealName: sysUserName,
 		Level:           level + 1,
 		UniqueCode:      utils.MD5(utils.DATA_PREFIX + "_" + timestamp),
-		Sort:            maxSort,
+		Sort:            maxSort + 1,
 	}
-	_, err = data_manage.AddEdbClassify(classifyInfo)
+	newId, err := data_manage.AddEdbClassify(classifyInfo)
 	if err != nil {
 		errMsg = "保存分类失败"
+		return
 	}
+	if parentId == 0 { //一级目录的rootId等于自己本身
+		classifyInfo.ClassifyId = int(newId)
+		classifyInfo.RootId = int(newId)
+		err = classifyInfo.Update([]string{"RootId"})
+		if err != nil {
+			errMsg = "更新分类失败"
+			return
+		}
+	}
+
 	return
 }
 
@@ -477,113 +633,432 @@ func Delete(classifyId, edbInfoId int, sysUser *system.Admin, requestBody, reque
 }
 
 // MoveEdbClassify 移动指标分类
-func MoveEdbClassify(classifyId, parentClassifyId, prevClassifyId, nextClassifyId int, sysUser *system.Admin) (err error, errMsg string) {
-	//判断分类是否存在
-	edbClassifyInfo, err := data_manage.GetEdbClassifyById(classifyId)
-	if err != nil {
-		errMsg = "移动失败"
-		err = errors.New("获取分类信息失败,Err:" + err.Error())
-		return
+func MoveEdbClassify(req data_manage.MoveEdbClassifyReq, sysUser *system.Admin, classifyType uint8) (err error, errMsg string) {
+	// req.ClassifyId, req.ParentClassifyId, req.PrevClassifyId, req.NextClassifyId
+	classifyId := req.ClassifyId
+	parentClassifyId := req.ParentClassifyId
+	prevClassifyId := req.PrevClassifyId
+	nextClassifyId := req.PrevClassifyId
+
+	edbInfoId := req.EdbInfoId
+	prevEdbInfoId := req.PrevEdbInfoId
+	nextEdbInfoId := req.NextEdbInfoId
+
+	//首先确定移动的对象是分类还是指标
+	//判断上一个节点是分类还是指标
+	//判断下一个节点是分类还是指标
+	//同时更新分类目录下的分类sort和指标sort
+	//更新当前移动的分类或者指标sort
+
+	var parentEdbClassifyInfo *data_manage.EdbClassify
+	if parentClassifyId > 0 {
+		parentEdbClassifyInfo, err = data_manage.GetEdbClassifyById(parentClassifyId)
+		if err != nil {
+			errMsg = "移动失败"
+			err = errors.New("获取上级分类信息失败,Err:" + err.Error())
+			return
+		}
 	}
 
-	// 权限校验
-	{
-		if edbClassifyInfo.ClassifyType == 0 { // 普通指标
-			button := GetEdbClassifyOpButton(sysUser, edbClassifyInfo.SysUserId)
-			if !button.MoveButton {
-				errMsg = "无操作权限"
-				err = errors.New(errMsg)
+	//如果有传入 上一个兄弟节点分类id
+	var (
+		edbClassifyInfo *data_manage.EdbClassify
+		prevClassify    *data_manage.EdbClassify
+		nextClassify    *data_manage.EdbClassify
+
+		edbInfo     *data_manage.EdbInfo
+		prevEdbInfo *data_manage.EdbInfo
+		nextEdbInfo *data_manage.EdbInfo
+		prevSort    int
+		nextSort    int
+	)
+
+	// 移动对象为分类， 判断权限
+	if edbInfoId == 0 {
+		edbClassifyInfo, err = data_manage.GetEdbClassifyById(classifyId)
+		if err != nil {
+			if err.Error() == utils.ErrNoRow() {
+				errMsg = "当前分类不存在"
+				err = errors.New("获取分类信息失败,Err:" + err.Error())
 				return
 			}
-		} else if edbClassifyInfo.ClassifyType == 1 { // 预测指标
-			button := GetPredictEdbClassifyOpButton(sysUser, edbClassifyInfo.SysUserId)
-			if !button.MoveButton {
-				errMsg = "无操作权限"
-				err = errors.New(errMsg)
-				return
+			errMsg = "移动失败"
+			err = errors.New("获取分类信息失败,Err:" + err.Error())
+			return
+		}
+		if parentClassifyId > 0 && parentEdbClassifyInfo.Level == 6 {
+			errMsg = "最高只支持添加6级分类"
+			err = errors.New(errMsg)
+			return
+		}
+		// 权限校验
+		{
+			if edbClassifyInfo.ClassifyType == 0 { // 普通指标
+				button := GetEdbClassifyOpButton(sysUser, edbClassifyInfo.SysUserId)
+				if !button.MoveButton {
+					errMsg = "无操作权限"
+					err = errors.New(errMsg)
+					return
+				}
+			} else if edbClassifyInfo.ClassifyType == 1 { // 预测指标
+				button := GetPredictEdbClassifyOpButton(sysUser, edbClassifyInfo.SysUserId)
+				if !button.MoveButton {
+					errMsg = "无操作权限"
+					err = errors.New(errMsg)
+					return
+				}
 			}
 		}
 
+	} else {
+		edbInfo, err = data_manage.GetEdbInfoById(req.EdbInfoId)
+		if err != nil {
+			if err.Error() == utils.ErrNoRow() {
+				errMsg = "当前指标不存在"
+				err = errors.New("获取分类信息失败,Err:" + err.Error())
+				return
+			}
+			errMsg = "移动失败"
+			err = errors.New("获取分类信息失败,Err:" + err.Error())
+			return
+		}
+		if parentClassifyId == 0 {
+			errMsg = "移动失败,指标必须挂在分类下"
+			err = errors.New(errMsg)
+			return
+		}
+		// 移动权限校验
+		button := GetEdbOpButton(sysUser, edbInfo.SysUserId, edbInfo.EdbType, edbInfo.EdbInfoType)
+		if !button.MoveButton {
+			errMsg = "无操作权限"
+			err = errors.New(errMsg)
+			return
+		}
 	}
 
-	updateCol := make([]string, 0)
-
-	//判断上级id是否一致，如果不一致的话，那么需要移动该分类层级
-	if edbClassifyInfo.ParentId != parentClassifyId && parentClassifyId != 0 {
-		parentEdbClassifyInfo, tmpErr := data_manage.GetEdbClassifyById(parentClassifyId)
-		if tmpErr != nil {
+	if prevClassifyId > 0 {
+		prevClassify, err = data_manage.GetEdbClassifyById(prevClassifyId)
+		if err != nil {
 			errMsg = "移动失败"
-			err = errors.New("获取上级分类信息失败,Err:" + tmpErr.Error())
+			err = errors.New("获取上一个兄弟节点分类信息失败,Err:" + err.Error())
 			return
 		}
-		edbClassifyInfo.ParentId = parentEdbClassifyInfo.ClassifyId
-		edbClassifyInfo.Level = parentEdbClassifyInfo.Level + 1
-		edbClassifyInfo.ModifyTime = time.Now()
-		updateCol = append(updateCol, "ParentId", "Level", "ModifyTime")
+		prevSort = prevClassify.Sort
+	} else if prevEdbInfoId > 0 {
+		prevEdbInfo, err = data_manage.GetEdbInfoById(prevEdbInfoId)
+		if err != nil {
+			errMsg = "移动失败"
+			err = errors.New("获取上一个兄弟节点分类信息失败,Err:" + err.Error())
+			return
+		}
+		prevSort = prevEdbInfo.Sort
 	}
 
-	//如果有传入 上一个兄弟节点分类id
-	if prevClassifyId > 0 {
-		prevClassify, tmpErr := data_manage.GetEdbClassifyById(prevClassifyId)
-		if tmpErr != nil {
+	if nextClassifyId > 0 {
+		//下一个兄弟节点
+		nextClassify, err = data_manage.GetEdbClassifyById(nextClassifyId)
+		if err != nil {
 			errMsg = "移动失败"
-			err = errors.New("获取上一个兄弟节点分类信息失败,Err:" + tmpErr.Error())
+			err = errors.New("获取下一个兄弟节点分类信息失败,Err:" + err.Error())
 			return
 		}
+		nextSort = nextClassify.Sort
+	} else if nextEdbInfoId > 0 {
+		//下一个兄弟节点
+		nextEdbInfo, err = data_manage.GetEdbInfoById(nextEdbInfoId)
+		if err != nil {
+			errMsg = "移动失败"
+			err = errors.New("获取下一个兄弟节点分类信息失败,Err:" + err.Error())
+			return
+		}
+		nextSort = nextEdbInfo.Sort
+	}
 
-		//如果是移动在两个兄弟节点之间
-		if nextClassifyId > 0 {
-			//下一个兄弟节点
-			nextClassify, tmpErr := data_manage.GetEdbClassifyById(nextClassifyId)
-			if tmpErr != nil {
+	err, errMsg = moveEdbClassify(parentEdbClassifyInfo, edbClassifyInfo, prevClassify, nextClassify, edbInfo, prevEdbInfo, nextEdbInfo, parentClassifyId, prevSort, nextSort, classifyType)
+	return
+}
+
+// moveEdbClassify 移动指标分类
+func moveEdbClassify(parentEdbClassifyInfo, edbClassifyInfo, prevClassify, nextClassify *data_manage.EdbClassify, edbInfo, prevEdbInfo, nextEdbInfo *data_manage.EdbInfo, parentClassifyId int, prevSort, nextSort int, classifyType uint8) (err error, errMsg string) {
+	updateCol := make([]string, 0)
+
+	// 移动对象为分类， 判断分类是否存在
+	if edbClassifyInfo != nil {
+		oldParentId := edbClassifyInfo.ParentId
+		oldLevel := edbClassifyInfo.Level
+		var classifyIds []int
+		if oldParentId != parentClassifyId {
+			//更新子分类对应的level
+			childList, e, m := GetChildClassifyByClassifyId(edbClassifyInfo.ClassifyId)
+			if e != nil {
 				errMsg = "移动失败"
-				err = errors.New("获取下一个兄弟节点分类信息失败,Err:" + tmpErr.Error())
+				err = errors.New("查询子分类失败,Err:" + e.Error() + m)
 				return
 			}
-			//如果上一个兄弟与下一个兄弟的排序权重是一致的，那么需要将下一个兄弟（以及下个兄弟的同样排序权重）的排序权重+2，自己变成上一个兄弟的排序权重+1
-			if prevClassify.Sort == nextClassify.Sort || prevClassify.Sort == edbClassifyInfo.Sort {
-				//变更兄弟节点的排序
-				updateSortStr := `sort + 2`
-				_ = data_manage.UpdateEdbClassifySortByParentId(prevClassify.ParentId, prevClassify.ClassifyId, prevClassify.Sort, updateSortStr, edbClassifyInfo.ClassifyType)
-			} else {
-				//如果下一个兄弟的排序权重正好是上个兄弟节点的下一层，那么需要再加一层了
-				if nextClassify.Sort-prevClassify.Sort == 1 {
+
+			if len(childList) > 0 {
+				for _, v := range childList {
+					if v.ClassifyId == edbClassifyInfo.ClassifyId {
+						continue
+					}
+					classifyIds = append(classifyIds, v.ClassifyId)
+				}
+			}
+		}
+		//判断上级id是否一致，如果不一致的话，那么需要移动该分类层级
+		if edbClassifyInfo.ParentId != parentClassifyId && parentClassifyId != 0 {
+			edbClassifyInfo.ParentId = parentEdbClassifyInfo.ClassifyId
+			edbClassifyInfo.RootId = parentEdbClassifyInfo.RootId
+			edbClassifyInfo.Level = parentEdbClassifyInfo.Level + 1
+			edbClassifyInfo.ModifyTime = time.Now()
+			updateCol = append(updateCol, "ParentId", "RootId", "Level", "ModifyTime")
+		} else if edbClassifyInfo.ParentId != parentClassifyId && parentClassifyId == 0 {
+			edbClassifyInfo.ParentId = 0
+			edbClassifyInfo.RootId = edbClassifyInfo.ClassifyId
+			edbClassifyInfo.Level = 1
+			edbClassifyInfo.ModifyTime = time.Now()
+			updateCol = append(updateCol, "ParentId", "RootId", "Level", "ModifyTime")
+		}
+
+		if prevSort > 0 {
+			//如果是移动在两个兄弟节点之间
+			if nextSort > 0 {
+				//下一个兄弟节点
+				//如果上一个兄弟与下一个兄弟的排序权重是一致的，那么需要将下一个兄弟（以及下个兄弟的同样排序权重）的排序权重+2，自己变成上一个兄弟的排序权重+1
+				if prevSort == nextSort || prevSort == edbClassifyInfo.Sort {
 					//变更兄弟节点的排序
-					updateSortStr := `sort + 1`
-					_ = data_manage.UpdateEdbClassifySortByParentId(prevClassify.ParentId, 0, prevClassify.Sort, updateSortStr, edbClassifyInfo.ClassifyType)
+					updateSortStr := `sort + 2`
+
+					//变更分类
+					if prevClassify != nil {
+						_ = data_manage.UpdateEdbClassifySortByParentId(parentClassifyId, prevClassify.ClassifyId, prevClassify.Sort, updateSortStr, classifyType)
+					} else {
+						_ = data_manage.UpdateEdbClassifySortByParentId(parentClassifyId, 0, prevSort, updateSortStr, classifyType)
+					}
+
+					//变更指标
+					if prevEdbInfo != nil {
+						//变更兄弟节点的排序
+						_ = data_manage.UpdateEdbInfoSortByClassifyId(parentClassifyId, prevSort, prevEdbInfo.EdbInfoId, updateSortStr)
+					} else {
+						_ = data_manage.UpdateEdbInfoSortByClassifyId(parentClassifyId, prevSort, 0, updateSortStr)
+					}
+				} else {
+					//如果下一个兄弟的排序权重正好是上个兄弟节点的下一层，那么需要再加一层了
+					if nextSort-prevSort == 1 {
+						//变更兄弟节点的排序
+						updateSortStr := `sort + 1`
+
+						//变更分类
+						if prevClassify != nil {
+							_ = data_manage.UpdateEdbClassifySortByParentId(parentClassifyId, prevClassify.ClassifyId, prevSort, updateSortStr, classifyType)
+						} else {
+							_ = data_manage.UpdateEdbClassifySortByParentId(parentClassifyId, 0, prevSort, updateSortStr, classifyType)
+						}
+
+						//变更指标
+						if prevEdbInfo != nil {
+							//变更兄弟节点的排序
+							_ = data_manage.UpdateEdbInfoSortByClassifyId(parentClassifyId, prevSort, prevEdbInfo.EdbInfoId, updateSortStr)
+						} else {
+							_ = data_manage.UpdateEdbInfoSortByClassifyId(parentClassifyId, prevSort, 0, updateSortStr)
+						}
+
+					}
+				}
+			}
+
+			edbClassifyInfo.Sort = prevSort + 1
+			edbClassifyInfo.ModifyTime = time.Now()
+			updateCol = append(updateCol, "Sort", "ModifyTime")
+		} else if prevClassify == nil && nextClassify == nil && prevEdbInfo == nil && nextEdbInfo == nil && parentClassifyId > 0 {
+			//处理只拖动到目录里，默认放到目录底部的情况
+			var maxSort int
+			maxSort, err = GetEdbClassifyMaxSort(parentClassifyId, classifyType)
+			if err != nil {
+				errMsg = "移动失败"
+				err = errors.New("查询组内排序信息失败,Err:" + err.Error())
+				return
+			}
+			edbClassifyInfo.Sort = maxSort + 1 //那就是排在组内最后一位
+			edbClassifyInfo.ModifyTime = time.Now()
+			updateCol = append(updateCol, "Sort", "ModifyTime")
+		} else {
+			// 拖动到父级分类的第一位
+			firstClassify, tmpErr := data_manage.GetFirstEdbClassifyByParentId(parentClassifyId)
+			if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
+				errMsg = "移动失败"
+				err = errors.New("获取获取当前父级分类下的排序第一条的分类信息失败,Err:" + tmpErr.Error())
+				return
+			}
+
+			//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
+			if firstClassify != nil && firstClassify.Sort == 0 {
+				updateSortStr := ` sort + 1 `
+				_ = data_manage.UpdateEdbClassifySortByParentId(parentClassifyId, firstClassify.ClassifyId-1, 0, updateSortStr, edbClassifyInfo.ClassifyType)
+				//该分类下的所有指标也需要+1
+				_ = data_manage.UpdateEdbInfoSortByClassifyId(parentClassifyId, 0, 0, updateSortStr)
+			} else {
+				//如果该分类下存在指标，且第一个指标的排序等于0，那么需要调整排序
+				firstEdb, tErr := data_manage.GetFirstEdbInfoByClassifyId(parentClassifyId)
+				if tErr != nil && tErr.Error() != utils.ErrNoRow() {
+					errMsg = "移动失败"
+					err = errors.New("获取获取当前父级分类下的排序第一条的分类信息失败,Err:" + tErr.Error())
+					return
+				}
+
+				//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
+				if firstEdb != nil && firstEdb.Sort == 0 {
+					updateSortStr := ` sort + 1 `
+					_ = data_manage.UpdateEdbInfoSortByClassifyId(parentClassifyId, 0, firstEdb.EdbInfoId-1, updateSortStr)
+					_ = data_manage.UpdateEdbClassifySortByParentId(parentClassifyId, 0, 0, updateSortStr, classifyType)
 				}
 			}
+
+			edbClassifyInfo.Sort = 0 //那就是排在第一位
+			edbClassifyInfo.ModifyTime = time.Now()
+			updateCol = append(updateCol, "Sort", "ModifyTime")
 		}
 
-		edbClassifyInfo.Sort = prevClassify.Sort + 1
-		edbClassifyInfo.ModifyTime = time.Now()
-		updateCol = append(updateCol, "Sort", "ModifyTime")
+		//更新
+		if len(updateCol) > 0 {
+			err = edbClassifyInfo.Update(updateCol)
+			if err != nil {
+				errMsg = "移动失败"
+				err = errors.New("修改失败,Err:" + err.Error())
+				return
+			}
+			//更新对应分类的root_id和层级
+			if oldParentId != parentClassifyId {
+				if len(classifyIds) > 0 {
+					levelStep := edbClassifyInfo.Level - oldLevel
+					err = data_manage.UpdateEdbClassifyChildByParentClassifyId(classifyIds, edbClassifyInfo.RootId, levelStep)
+					if err != nil {
+						errMsg = "移动失败"
+						err = errors.New("更新子分类失败,Err:" + err.Error())
+						return
+					}
+				}
+			}
+		}
 	} else {
-		firstClassify, tmpErr := data_manage.GetFirstEdbClassifyByParentId(edbClassifyInfo.ParentId)
-		if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
-			errMsg = "移动失败"
-			err = errors.New("获取获取当前父级分类下的排序第一条的分类信息失败,Err:" + tmpErr.Error())
+		if edbInfo == nil {
+			errMsg = "当前指标不存在"
+			err = errors.New(errMsg)
 			return
 		}
-
-		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstClassify != nil && firstClassify.Sort == 0 {
-			updateSortStr := ` sort + 1 `
-			_ = data_manage.UpdateEdbClassifySortByParentId(firstClassify.ParentId, firstClassify.ClassifyId-1, 0, updateSortStr, edbClassifyInfo.ClassifyType)
+		//如果改变了分类，那么移动该指标数据
+		if edbInfo.ClassifyId != parentClassifyId {
+			edbInfo.ClassifyId = parentClassifyId
+			edbInfo.ModifyTime = time.Now()
+			updateCol = append(updateCol, "ClassifyId", "ModifyTime")
 		}
+		if prevSort > 0 {
+			//如果是移动在两个兄弟节点之间
+			if nextSort > 0 {
+				//下一个兄弟节点
+				//如果上一个兄弟与下一个兄弟的排序权重是一致的，那么需要将下一个兄弟（以及下个兄弟的同样排序权重）的排序权重+2，自己变成上一个兄弟的排序权重+1
+				if prevSort == nextSort || prevSort == edbInfo.Sort {
+					//变更兄弟节点的排序
+					updateSortStr := `sort + 2`
 
-		edbClassifyInfo.Sort = 0 //那就是排在第一位
-		edbClassifyInfo.ModifyTime = time.Now()
-		updateCol = append(updateCol, "Sort", "ModifyTime")
-	}
+					//变更分类
+					if prevClassify != nil {
+						_ = data_manage.UpdateEdbClassifySortByParentId(parentClassifyId, prevClassify.ClassifyId, prevClassify.Sort, updateSortStr, classifyType)
+					} else {
+						_ = data_manage.UpdateEdbClassifySortByParentId(parentClassifyId, 0, prevSort, updateSortStr, classifyType)
+					}
 
-	//更新
-	if len(updateCol) > 0 {
-		err = edbClassifyInfo.Update(updateCol)
-		if err != nil {
-			errMsg = "移动失败"
-			err = errors.New("修改失败,Err:" + err.Error())
-			return
+					//变更指标
+					if prevEdbInfo != nil {
+						//变更兄弟节点的排序
+						_ = data_manage.UpdateEdbInfoSortByClassifyId(parentClassifyId, prevSort, prevEdbInfo.EdbInfoId, updateSortStr)
+					} else {
+						_ = data_manage.UpdateEdbInfoSortByClassifyId(parentClassifyId, prevSort, 0, updateSortStr)
+					}
+				} else {
+					//如果下一个兄弟的排序权重正好是上个兄弟节点的下一层，那么需要再加一层了
+					if nextSort-prevSort == 1 {
+						//变更兄弟节点的排序
+						updateSortStr := `sort + 1`
+						//变更分类
+						if prevClassify != nil {
+							_ = data_manage.UpdateEdbClassifySortByParentId(parentClassifyId, prevClassify.ClassifyId, prevSort, updateSortStr, classifyType)
+						} else {
+							_ = data_manage.UpdateEdbClassifySortByParentId(parentClassifyId, 0, prevSort, updateSortStr, classifyType)
+						}
+
+						//变更指标
+						if prevEdbInfo != nil {
+							//变更兄弟节点的排序
+							_ = data_manage.UpdateEdbInfoSortByClassifyId(parentClassifyId, prevSort, prevEdbInfo.EdbInfoId, updateSortStr)
+						} else {
+							_ = data_manage.UpdateEdbInfoSortByClassifyId(parentClassifyId, prevSort, 0, updateSortStr)
+						}
+					}
+				}
+			}
+
+			edbInfo.Sort = prevSort + 1
+			edbInfo.ModifyTime = time.Now()
+			updateCol = append(updateCol, "Sort", "ModifyTime")
+		} else if prevClassify == nil && nextClassify == nil && prevEdbInfo == nil && nextEdbInfo == nil && parentClassifyId > 0 {
+			//处理只拖动到目录里，默认放到目录底部的情况
+			var maxSort int
+			maxSort, err = GetEdbClassifyMaxSort(parentClassifyId, classifyType)
+			if err != nil {
+				errMsg = "移动失败"
+				err = errors.New("查询组内排序信息失败,Err:" + err.Error())
+				return
+			}
+			edbInfo.Sort = maxSort + 1 //那就是排在组内最后一位
+			edbInfo.ModifyTime = time.Now()
+			updateCol = append(updateCol, "Sort", "ModifyTime")
+		} else {
+			// 拖动到父级分类的第一位
+			firstClassify, tmpErr := data_manage.GetFirstEdbClassifyByParentId(parentClassifyId)
+			if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
+				errMsg = "移动失败"
+				err = errors.New("获取获取当前父级分类下的排序第一条的分类信息失败,Err:" + tmpErr.Error())
+				return
+			}
+
+			//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
+			if firstClassify != nil && firstClassify.Sort == 0 {
+				updateSortStr := ` sort + 1 `
+				_ = data_manage.UpdateEdbClassifySortByParentId(parentClassifyId, firstClassify.ClassifyId-1, 0, updateSortStr, edbClassifyInfo.ClassifyType)
+				//该分类下的所有指标也需要+1
+				_ = data_manage.UpdateEdbInfoSortByClassifyId(parentClassifyId, 0, 0, updateSortStr)
+			} else {
+				//如果该分类下存在指标，且第一个指标的排序等于0，那么需要调整排序
+				firstEdb, tErr := data_manage.GetFirstEdbInfoByClassifyId(parentClassifyId)
+				if tErr != nil && tErr.Error() != utils.ErrNoRow() {
+					errMsg = "移动失败"
+					err = errors.New("获取获取当前父级分类下的排序第一条的分类信息失败,Err:" + tErr.Error())
+					return
+				}
+
+				//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
+				if firstEdb != nil && firstEdb.Sort == 0 {
+					updateSortStr := ` sort + 1 `
+					_ = data_manage.UpdateEdbInfoSortByClassifyId(parentClassifyId, 0, firstEdb.EdbInfoId-1, updateSortStr)
+					_ = data_manage.UpdateEdbClassifySortByParentId(parentClassifyId, 0, 0, updateSortStr, classifyType)
+				}
+			}
+
+			edbInfo.Sort = 0 //那就是排在第一位
+			edbInfo.ModifyTime = time.Now()
+			updateCol = append(updateCol, "Sort", "ModifyTime")
+		}
+
+		//更新
+		if len(updateCol) > 0 {
+			err = edbInfo.Update(updateCol)
+			if err != nil {
+				errMsg = "移动失败"
+				err = errors.New("修改失败,Err:" + err.Error())
+				return
+			}
 		}
 	}
 	return
@@ -650,3 +1125,20 @@ func GetPredictEdbClassifyOpButton(sysUser *system.Admin, belongUserId int) (but
 
 	return
 }
+
+func GetEdbClassifyMaxSort(parentId int, classifyType uint8) (maxSort int, err error) {
+	//获取该层级下最大的排序数
+	classifyMaxSort, err := data_manage.GetEdbClassifyMaxSort(parentId, classifyType)
+	if err != nil {
+		return
+	}
+	maxSort = classifyMaxSort
+	edbMaxSort, err := data_manage.GetEdbInfoMaxSortByClassifyId(parentId)
+	if err != nil {
+		return
+	}
+	if maxSort < edbMaxSort {
+		maxSort = edbMaxSort
+	}
+	return
+}

services/data/edb_info.go

@@ -2337,155 +2337,175 @@ func GetEdbChartClassifyList(source int) (resp data_manage.EdbChartClassifyResp,
 		}
 
 	case 3: //ETA指标库
-		rootList, e := data_manage.GetEdbClassifyByParentId(0, 0)
-		if e != nil && e.Error() != utils.ErrNoRow() {
-			err = e
-			return
-		}
-		classifyAll, e := data_manage.GetEdbClassifyAll()
+		//rootList, e := data_manage.GetEdbClassifyByParentId(0, 0)
+		//if e != nil && e.Error() != utils.ErrNoRow() {
+		//	err = e
+		//	return
+		//}
+
+		// 考虑到后面可以会迭代到10层, 这里直接用递归处理
+		classifyAll, e := data_manage.GetAllEdbClassifyByType(0)
 		if e != nil && e.Error() != utils.ErrNoRow() {
 			err = e
 			return
 		}
-		rootChildMap := make(map[int][]*data_manage.EdbClassifyItems)
-		for _, v := range classifyAll {
-			rootChildMap[v.ParentId] = append(rootChildMap[v.ParentId], v)
-		}
-		nodeAll := make([]*data_manage.EdbClassifyItems, 0)
-		for _, v := range rootList {
-			if existItems, ok := rootChildMap[v.ClassifyId]; ok {
-				v.Children = existItems
-			} else {
-				items := make([]*data_manage.EdbClassifyItems, 0)
-				v.Children = items
-			}
-			nodeAll = append(nodeAll, v)
-		}
+		resp.List = GetEdbMenuTreeRecursive(classifyAll, 0)
 
-		for _, v := range nodeAll {
-			item := data_manage.EdbChartClassify{
-				ClassifyId:   v.ClassifyId,
-				ClassifyName: v.ClassifyName,
-				ParentId:     v.ParentId,
-			}
-			for _, v2 := range v.Children {
-				child := data_manage.EdbChartClassify{
-					ClassifyId:   v2.ClassifyId,
-					ClassifyName: v2.ClassifyName,
-					ParentId:     v2.ParentId,
-				}
-				item.Child = append(item.Child, &child)
-			}
-			resp.List = append(resp.List, &item)
-		}
+		//rootChildMap := make(map[int][]*data_manage.EdbClassifyItems)
+		//for _, v := range classifyAll {
+		//	rootChildMap[v.ParentId] = append(rootChildMap[v.ParentId], v)
+		//}
+		//nodeAll := make([]*data_manage.EdbClassifyItems, 0)
+		//for _, v := range rootList {
+		//	if existItems, ok := rootChildMap[v.ClassifyId]; ok {
+		//		v.Children = existItems
+		//	} else {
+		//		items := make([]*data_manage.EdbClassifyItems, 0)
+		//		v.Children = items
+		//	}
+		//	nodeAll = append(nodeAll, v)
+		//}
+		//
+		//for _, v := range nodeAll {
+		//	item := data_manage.EdbChartClassify{
+		//		ClassifyId:   v.ClassifyId,
+		//		ClassifyName: v.ClassifyName,
+		//		ParentId:     v.ParentId,
+		//	}
+		//	for _, v2 := range v.Children {
+		//		child := data_manage.EdbChartClassify{
+		//			ClassifyId:   v2.ClassifyId,
+		//			ClassifyName: v2.ClassifyName,
+		//			ParentId:     v2.ParentId,
+		//		}
+		//		item.Child = append(item.Child, &child)
+		//	}
+		//	resp.List = append(resp.List, &item)
+		//}
 	case 4: //ETA预测指标
-		rootList, e := data_manage.GetEdbClassifyByParentId(0, 1)
+		// 考虑到后面可以会迭代到10层, 这里直接用递归
+		classifyAll, e := data_manage.GetAllEdbClassifyByType(1)
 		if e != nil && e.Error() != utils.ErrNoRow() {
 			err = e
 			return
 		}
-		nodeAll := make([]*data_manage.EdbClassifyItems, 0)
-		for _, v := range rootList {
-			nodeAll = append(nodeAll, v)
-		}
+		resp.List = GetEdbMenuTreeRecursive(classifyAll, 0)
 
-		for _, v := range nodeAll {
-			item := data_manage.EdbChartClassify{
-				ClassifyId:   v.ClassifyId,
-				ClassifyName: v.ClassifyName,
-				ParentId:     v.ParentId,
-			}
-			for _, v2 := range v.Children {
-				child := data_manage.EdbChartClassify{
-					ClassifyId:   v2.ClassifyId,
-					ClassifyName: v2.ClassifyName,
-					ParentId:     v2.ParentId,
-				}
-				item.Child = append(item.Child, &child)
-			}
-			resp.List = append(resp.List, &item)
-		}
+		//rootList, e := data_manage.GetEdbClassifyByParentId(0, 1)
+		//if e != nil && e.Error() != utils.ErrNoRow() {
+		//	err = e
+		//	return
+		//}
+		//nodeAll := make([]*data_manage.EdbClassifyItems, 0)
+		//for _, v := range rootList {
+		//	nodeAll = append(nodeAll, v)
+		//}
+		//
+		//for _, v := range nodeAll {
+		//	item := data_manage.EdbChartClassify{
+		//		ClassifyId:   v.ClassifyId,
+		//		ClassifyName: v.ClassifyName,
+		//		ParentId:     v.ParentId,
+		//	}
+		//	for _, v2 := range v.Children {
+		//		child := data_manage.EdbChartClassify{
+		//			ClassifyId:   v2.ClassifyId,
+		//			ClassifyName: v2.ClassifyName,
+		//			ParentId:     v2.ParentId,
+		//		}
+		//		item.Child = append(item.Child, &child)
+		//	}
+		//	resp.List = append(resp.List, &item)
+		//}
 	case 5: //图库
 
 		//判断是否存在缓存，如果存在缓存，那么直接从缓存中获取
-		key := utils.CACHE_CHART_CLASSIFY
-		if utils.Re == nil {
-			if utils.Re == nil && utils.Rc.IsExist(key) {
-				rep := new(data_manage.ChartClassifyListResp)
-				if data, err1 := utils.Rc.RedisBytes(key); err1 == nil {
-					e := json.Unmarshal(data, &rep)
-					if e == nil && rep != nil {
-						for _, v := range rep.AllNodes {
-							item := data_manage.EdbChartClassify{
-								ClassifyId:   v.ChartClassifyId,
-								ClassifyName: v.ChartClassifyName,
-								ParentId:     v.ParentId,
-							}
-							for _, v2 := range v.Children {
-								child := data_manage.EdbChartClassify{
-									ClassifyId:   v2.ChartClassifyId,
-									ClassifyName: v2.ChartClassifyName,
-									ParentId:     v2.ParentId,
-								}
-								item.Child = append(item.Child, &child)
-							}
-							resp.List = append(resp.List, &item)
-						}
-						fmt.Println("source redis")
-						return
-					}
-				}
-			}
-		}
-
-		rootList, e := data_manage.GetChartClassifyByParentIdFromETA(0)
-		if e != nil && e.Error() != utils.ErrNoRow() {
-			err = e
-			return
-		}
+		//key := utils.CACHE_CHART_CLASSIFY
+		//if utils.Re == nil {
+		//	if utils.Re == nil && utils.Rc.IsExist(key) {
+		//		rep := new(data_manage.ChartClassifyListResp)
+		//		if data, err1 := utils.Rc.RedisBytes(key); err1 == nil {
+		//			e := json.Unmarshal(data, &rep)
+		//			if e == nil && rep != nil {
+		//				for _, v := range rep.AllNodes {
+		//					item := data_manage.EdbChartClassify{
+		//						ClassifyId:   v.ChartClassifyId,
+		//						ClassifyName: v.ChartClassifyName,
+		//						ParentId:     v.ParentId,
+		//					}
+		//					for _, v2 := range v.Children {
+		//						child := data_manage.EdbChartClassify{
+		//							ClassifyId:   v2.ChartClassifyId,
+		//							ClassifyName: v2.ChartClassifyName,
+		//							ParentId:     v2.ParentId,
+		//						}
+		//						item.Child = append(item.Child, &child)
+		//					}
+		//					resp.List = append(resp.List, &item)
+		//				}
+		//				fmt.Println("source redis")
+		//				return
+		//			}
+		//		}
+		//	}
+		//}
 
-		classifyAll, e := data_manage.GetChartClassifyAllFromETA()
+		// 考虑到后面可以会迭代到10层, 这里直接用递归处理
+		classifyAll, e := data_manage.GetAllChartClassifyItemsBySource(1)
 		if e != nil && e.Error() != utils.ErrNoRow() {
 			err = e
 			return
 		}
+		resp.List = GetChartMenuTreeRecursive(classifyAll, 0)
 
-		rootChildMap := make(map[int][]*data_manage.ChartClassifyItems)
-		for _, v := range classifyAll {
-			rootChildMap[v.ParentId] = append(rootChildMap[v.ParentId], v)
-		}
-		nodeAll := make([]*data_manage.ChartClassifyItems, 0)
-		for _, v := range rootList {
-			if existItems, ok := rootChildMap[v.ChartClassifyId]; ok {
-				v.Children = existItems
-			} else {
-				items := make([]*data_manage.ChartClassifyItems, 0)
-				v.Children = items
-			}
-			nodeAll = append(nodeAll, v)
-		}
-
-		for _, v := range nodeAll {
-			item := data_manage.EdbChartClassify{
-				ClassifyId:   v.ChartClassifyId,
-				ClassifyName: v.ChartClassifyName,
-				ParentId:     v.ParentId,
-			}
-			for _, v2 := range v.Children {
-				child := data_manage.EdbChartClassify{
-					ClassifyId:   v2.ChartClassifyId,
-					ClassifyName: v2.ChartClassifyName,
-					ParentId:     v2.ParentId,
-				}
-				item.Child = append(item.Child, &child)
-			}
-			resp.List = append(resp.List, &item)
-		}
+		//rootList, e := data_manage.GetChartClassifyByParentIdFromETA(0)
+		//if e != nil && e.Error() != utils.ErrNoRow() {
+		//	err = e
+		//	return
+		//}
+		//
+		//classifyAll, e := data_manage.GetChartClassifyAllFromETA()
+		//if e != nil && e.Error() != utils.ErrNoRow() {
+		//	err = e
+		//	return
+		//}
+		//
+		//rootChildMap := make(map[int][]*data_manage.ChartClassifyItems)
+		//for _, v := range classifyAll {
+		//	rootChildMap[v.ParentId] = append(rootChildMap[v.ParentId], v)
+		//}
+		//nodeAll := make([]*data_manage.ChartClassifyItems, 0)
+		//for _, v := range rootList {
+		//	if existItems, ok := rootChildMap[v.ChartClassifyId]; ok {
+		//		v.Children = existItems
+		//	} else {
+		//		items := make([]*data_manage.ChartClassifyItems, 0)
+		//		v.Children = items
+		//	}
+		//	nodeAll = append(nodeAll, v)
+		//}
+		//
+		//for _, v := range nodeAll {
+		//	item := data_manage.EdbChartClassify{
+		//		ClassifyId:   v.ChartClassifyId,
+		//		ClassifyName: v.ChartClassifyName,
+		//		ParentId:     v.ParentId,
+		//	}
+		//	for _, v2 := range v.Children {
+		//		child := data_manage.EdbChartClassify{
+		//			ClassifyId:   v2.ChartClassifyId,
+		//			ClassifyName: v2.ChartClassifyName,
+		//			ParentId:     v2.ParentId,
+		//		}
+		//		item.Child = append(item.Child, &child)
+		//	}
+		//	resp.List = append(resp.List, &item)
+		//}
 
 		// 将数据加入缓存
-		if utils.Re == nil {
-			utils.Rc.Delete(key)
-		}
+		//if utils.Re == nil {
+		//	utils.Rc.Delete(key)
+		//}
 
 	default:
 		return
@@ -2573,6 +2593,14 @@ func EdbInfoAdd(source, classifyId int, edbCode, edbName, frequency, unit, start
 			}
 		}
 	}
+	//获取该层级下最大的排序数
+	maxSort, err := GetEdbClassifyMaxSort(classifyId, 0)
+	if err != nil {
+		errMsg = "获取失败"
+		err = errors.New("查询排序信息失败，Err:" + err.Error())
+		return
+	}
+
 	edbInfo.EdbCode = edbCode
 	edbInfo.EdbName = edbName
 	edbInfo.EdbNameSource = edbName
@@ -2586,6 +2614,7 @@ func EdbInfoAdd(source, classifyId int, edbCode, edbName, frequency, unit, start
 	edbInfo.CreateTime = time.Now()
 	edbInfo.ModifyTime = time.Now()
 	edbInfo.ServerUrl = serverUrl
+	edbInfo.Sort = maxSort + 1
 	edbInfo.DataDateType = `交易日`
 	timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 	edbInfo.UniqueCode = utils.MD5(utils.DATA_PREFIX + "_" + timestamp)
@@ -3009,3 +3038,35 @@ func GetEdbChartAdminList(source int) (list []int, err error) {
 
 	return
 }
+
+// GetEdbMenuTreeRecursive 递归指标库菜单树
+func GetEdbMenuTreeRecursive(list []*data_manage.EdbClassifyItems, parentId int) []*data_manage.EdbChartClassify {
+	res := make([]*data_manage.EdbChartClassify, 0)
+	for _, v := range list {
+		t := new(data_manage.EdbChartClassify)
+		t.ClassifyId = v.ClassifyId
+		t.ClassifyName = v.ClassifyName
+		t.ParentId = v.ParentId
+		if v.ParentId == parentId {
+			t.Child = GetEdbMenuTreeRecursive(list, v.ClassifyId)
+			res = append(res, t)
+		}
+	}
+	return res
+}
+
+// GetChartMenuTreeRecursive 递归指标库菜单树
+func GetChartMenuTreeRecursive(list []*data_manage.ChartClassifyItems, parentId int) []*data_manage.EdbChartClassify {
+	res := make([]*data_manage.EdbChartClassify, 0)
+	for _, v := range list {
+		t := new(data_manage.EdbChartClassify)
+		t.ClassifyId = v.ChartClassifyId
+		t.ClassifyName = v.ChartClassifyName
+		t.ParentId = v.ParentId
+		if v.ParentId == parentId {
+			t.Child = GetChartMenuTreeRecursive(list, v.ChartClassifyId)
+			res = append(res, t)
+		}
+	}
+	return res
+}

services/data/edb_info_calculate.go

@@ -1,6 +1,7 @@
 package data
 
 import (
+	"encoding/json"
 	"errors"
 	"eta/eta_api/models/data_manage"
 	"eta/eta_api/utils"
@@ -683,3 +684,25 @@ func handleDataByLinearRegression(edbInfoDataList []*data_manage.EdbDataList, ha
 
 	return
 }
+
+// CallCalculateComputeCorrelation 调用计算拟合残差的相关系数
+func CallCalculateComputeCorrelation(data *data_manage.EdbInfoCalculateBatchSaveReqByEdbLib) (val string, err error, errMsg string) {
+	errMsg = "计算失败"
+	// 调用指标库去更新
+	reqJson, err := json.Marshal(data)
+	if err != nil {
+		errMsg = "计算相关系数参数解析异常！"
+		err = errors.New("参数解析失败，Err:" + err.Error())
+		return
+	}
+	respItem, err := CalculateComputeCorrelation(string(reqJson))
+	if err != nil {
+		return
+	}
+
+	if respItem.Ret == 200 {
+		val = respItem.Data
+	}
+
+	return
+}

services/data/future_good/chart_info.go

@@ -15,7 +15,7 @@ import (
 )
 
 // GetChartEdbData 获取图表的指标数据
-func GetChartEdbData(chartInfoId int, startDate, endDate string, edbInfoMapping, futureGoodEdbInfoMapping *data_manage.ChartEdbInfoMapping, barChartInfoDateList []data_manage.BarChartInfoDateReq, barChartInfoSort data_manage.BarChartInfoSortReq) (barConfigEdbInfoIdList []data_manage.BarChartInfoEdbItemReq, edbList []*data_manage.ChartEdbInfoMapping, xEdbIdValue []int, xDataList []data_manage.XData, yDataList []data_manage.YData, err error) {
+func GetChartEdbData(chartInfoId int, startDate, endDate string, edbInfoMapping, futureGoodEdbInfoMapping *data_manage.ChartEdbInfoMapping, barChartInfoDateList []data_manage.BarChartInfoDateReq, needData bool) (barConfigEdbInfoIdList []data_manage.BarChartInfoEdbItemReq, edbList []*data_manage.ChartEdbInfoMapping, xEdbIdValue []int, xDataList []data_manage.XData, yDataList []data_manage.YData, err error) {
 	edbList = make([]*data_manage.ChartEdbInfoMapping, 0)
 
 	if futureGoodEdbInfoMapping == nil {
@@ -68,12 +68,6 @@ func GetChartEdbData(chartInfoId int, startDate, endDate string, edbInfoMapping,
 
 	// 普通的指标数据
 	{
-		dataList := make([]*data_manage.EdbDataList, 0)
-
-		dataList, err = data_manage.GetEdbDataList(edbInfoMapping.Source, edbInfoMapping.EdbInfoId, startDate, endDate)
-		edbDataListMap[edbInfoMapping.EdbInfoId] = dataList
-		item.DataList = dataList
-
 		edbList = append(edbList, edbInfoMapping)
 
 		barConfigEdbInfoIdList = append(barConfigEdbInfoIdList, data_manage.BarChartInfoEdbItemReq{
@@ -180,27 +174,6 @@ func GetChartEdbData(chartInfoId int, startDate, endDate string, edbInfoMapping,
 		})
 	}
 
-	// 获取数据
-	for _, v := range futureGoodMappingList {
-		dataList := make([]*data_manage.EdbDataList, 0)
-
-		tmpDataList, tmpErr := future_good2.GetFutureGoodEdbDataListByDate(v.EdbInfoId, startDate, endDate)
-		if tmpErr != nil {
-			return
-		}
-		for _, tmpData := range tmpDataList {
-			dataList = append(dataList, &data_manage.EdbDataList{
-				EdbDataId:     tmpData.FutureGoodEdbDataId,
-				EdbInfoId:     tmpData.FutureGoodEdbInfoId,
-				DataTime:      tmpData.DataTime.Format(utils.FormatDate),
-				DataTimestamp: tmpData.DataTimestamp,
-				Value:         tmpData.Close,
-			})
-		}
-		edbDataListMap[v.EdbInfoId] = dataList
-		v.DataList = dataList
-	}
-
 	if regionType == `海外` {
 		zlFutureGoodEdbMapping := &data_manage.ChartEdbInfoMapping{
 			EdbInfoId:           zlFutureGoodEdbInfo.FutureGoodEdbInfoId,
@@ -248,6 +221,44 @@ func GetChartEdbData(chartInfoId int, startDate, endDate string, edbInfoMapping,
 		edbList = append(edbList, futureGoodMappingList...)
 	}
 
+	if !needData {
+		return
+	}
+
+	// 获取数据
+
+	// 现货数据
+	{
+		dataList := make([]*data_manage.EdbDataList, 0)
+		dataList, err = data_manage.GetEdbDataList(edbInfoMapping.Source, edbInfoMapping.EdbInfoId, startDate, endDate)
+		if err != nil {
+			return
+		}
+		edbDataListMap[edbInfoMapping.EdbInfoId] = dataList
+		item.DataList = dataList
+	}
+
+	// 期货数据
+	for _, v := range futureGoodMappingList {
+		dataList := make([]*data_manage.EdbDataList, 0)
+
+		tmpDataList, tmpErr := future_good2.GetFutureGoodEdbDataListByDate(v.EdbInfoId, startDate, endDate)
+		if tmpErr != nil {
+			return
+		}
+		for _, tmpData := range tmpDataList {
+			dataList = append(dataList, &data_manage.EdbDataList{
+				EdbDataId:     tmpData.FutureGoodEdbDataId,
+				EdbInfoId:     tmpData.FutureGoodEdbInfoId,
+				DataTime:      tmpData.DataTime.Format(utils.FormatDate),
+				DataTimestamp: tmpData.DataTimestamp,
+				Value:         tmpData.Close,
+			})
+		}
+		edbDataListMap[v.EdbInfoId] = dataList
+		v.DataList = dataList
+	}
+
 	xEdbIdValue, yDataList, err = BarChartData(edbList[0], futureGoodEdbInfoList, edbDataListMap, barChartInfoDateList, regionType, latestDate)
 
 	xDataList = []data_manage.XData{

services/english_report.go

@@ -290,6 +290,74 @@ func UpdateEnglishReportEs(reportId int, publishState int) (err error) {
 	return
 }
 
+// ModifyAllEsEnglishReportVideo 批量修改es里的英文研报信息和线上路演信息
+func ModifyAllEsEnglishReportVideo() (err error) {
+	reportList, err := models.GetEnglishReportByCondition("", []interface{}{})
+	if err != nil {
+		return
+	}
+	for _, reportInfo := range reportList {
+		// 新增报告ES
+		esReport := &models.ElasticEnglishReportDetail{
+			Id:                 strconv.Itoa(reportInfo.Id),
+			ReportId:           reportInfo.Id,
+			Title:              reportInfo.Title,
+			Abstract:           reportInfo.Abstract,
+			BodyContent:        utils.TrimHtml(html.UnescapeString(reportInfo.Content)),
+			PublishTime:        reportInfo.PublishTime.Format(utils.FormatDateTime),
+			CreateTime:         reportInfo.CreateTime,
+			ReportCode:         reportInfo.ReportCode,
+			PublishState:       reportInfo.State,
+			Author:             reportInfo.Author,
+			Frequency:          reportInfo.Frequency,
+			ClassifyIdFirst:    reportInfo.ClassifyIdFirst,
+			ClassifyNameFirst:  reportInfo.ClassifyNameFirst,
+			ClassifyIdSecond:   reportInfo.ClassifyIdSecond,
+			ClassifyNameSecond: reportInfo.ClassifyNameSecond,
+			StageStr:           strconv.Itoa(reportInfo.Stage),
+			Overview:           utils.TrimHtml(html.UnescapeString(reportInfo.Overview)),
+			ContentSub:         utils.TrimHtml(html.UnescapeString(reportInfo.ContentSub)),
+		}
+		docId := fmt.Sprintf("%d", reportInfo.Id)
+		if err = EsAddOrEditEnglishReport(utils.EsEnglishReportIndexName, docId, esReport); err != nil {
+			return
+		}
+	}
+
+	videoList, err := models.GetEnglishVideoByCondition("", []interface{}{})
+	if err != nil {
+		return
+	}
+	for _, videoInfo := range videoList {
+		// 新增报告ES
+		esReport := &models.ElasticEnglishReportDetail{
+			Id:                 "v" + strconv.Itoa(videoInfo.Id),
+			VideoId:            videoInfo.Id,
+			Title:              videoInfo.Title,
+			Abstract:           videoInfo.Abstract,
+			BodyContent:        "",
+			PublishTime:        videoInfo.PublishTime.Format(utils.FormatDateTime),
+			CreateTime:         videoInfo.CreateTime.Format(utils.FormatDateTime),
+			ReportCode:         videoInfo.VideoCode,
+			PublishState:       videoInfo.State,
+			Author:             videoInfo.Author,
+			Frequency:          "",
+			ClassifyIdFirst:    videoInfo.ClassifyIdFirst,
+			ClassifyNameFirst:  videoInfo.ClassifyNameFirst,
+			ClassifyIdSecond:   videoInfo.ClassifyIdSecond,
+			ClassifyNameSecond: videoInfo.ClassifyNameSecond,
+			StageStr:           "",
+			Overview:           utils.TrimHtml(html.UnescapeString(videoInfo.Overview)),
+			ContentSub:         "",
+		}
+		docId := fmt.Sprintf("v%d", videoInfo.Id)
+		if err = EsAddOrEditEnglishReport(utils.EsEnglishReportIndexName, docId, esReport); err != nil {
+			return
+		}
+	}
+	return
+}
+
 // UpdateEnglishVideoEs 更新英文线上路演Es
 func UpdateEnglishVideoEs(videoId int, publishState int) (err error) {
 	if videoId <= 0 {
@@ -327,8 +395,7 @@ func UpdateEnglishVideoEs(videoId int, publishState int) (err error) {
 	return
 }
 
-func UpdateEnglishReportClassifyId(oldItem, newItem, newParent *models.EnglishClassify, classifyId int) (err error) {
-	//一级分类改为二级分类
+func UpdateEnglishReportClassifyId(oldItem, newItem *models.EnglishClassify, classifyId int) (err error) {
 	defer func() {
 		if err != nil {
 			go alarm_msg.SendAlarmMsg("英文报告分类改名-同步更新报告表字段及权限表关键词失败3, Err："+err.Error(), 3)
@@ -338,64 +405,51 @@ func UpdateEnglishReportClassifyId(oldItem, newItem, newParent *models.EnglishCl
 	//如果二级分类更换了父级分类，则更新报告中的父级分类ID
 	//如果一级分类更换了名称，则更新所有报告中的一级分类名称
 	//如果二级分类更换了名称，则更新所有报告中的二级分类名称
-	if oldItem.ParentId != newItem.ParentId {
-		parentClassifyName := ""
-		parentId := 0
-
-		//二级分类改为一级分类, 或者二级分类的一级分类有变更
-		if newItem.ParentId > 0 {
-			parentClassifyName = newParent.ClassifyName
-			parentId = newParent.Id
-		}
-
-		// 更新报告表分类字段
-		var condition string
-		var pars []interface{}
-
-		condition += ` AND classify_id_second = ? `
-		pars = append(pars, classifyId)
-		list, e := models.GetEnglishReportByCondition(condition, pars)
-		if e != nil {
-			err = e
-			return
-		}
-		if len(list) > 0 {
-			//二级分类改为一级分类
-			if oldItem.ParentId > 0 && newItem.ParentId == 0 {
-				//查询该二级分类下是否存在关联报告，如果存在则不允许变更
-				err = fmt.Errorf("该分类有关联的报告，不允许变更为一级分类")
-				return
+	if oldItem.ParentId > 0 && oldItem.ParentId != newItem.ParentId {
+		//二级分类下的三级分类如果有报告，则该二级分类不允许改成一级分类
+		if oldItem.ParentId > 0 && oldItem.ParentId == oldItem.RootId {
+			if newItem.ParentId == 0 {
+				// 更新报告表分类字段
+				var condition string
+				var pars []interface{}
+
+				condition += ` AND classify_id_first = ? `
+				pars = append(pars, classifyId)
+				count, e := models.GetEnglishReportCountByCondition(condition, pars)
+				if e != nil {
+					err = e
+					return
+				}
+				if count > 0 {
+					err = fmt.Errorf("该分类有关联的报告，不允许变更为一级分类")
+					return
+				}
 			}
-		}
-		var idSlice []string
-		for _, report := range list {
-			idSlice = append(idSlice, strconv.Itoa(report.Id))
-		}
-		ids := strings.Join(idSlice, ",")
-		if ids != "" {
-			if err = models.UpdateEnglishReportByClassifyId(parentClassifyName, newItem.ClassifyName, parentId, oldItem.Id, ids); err != nil {
-				return
-			}
-		}
-	} else if oldItem.ClassifyName != newItem.ClassifyName {
-		if oldItem.ParentId > 0 {
-			//只对二级分类名称作了修改
-			// 更新报告表分类字段
-			if err = models.UpdateEnglishReportSecondClassifyNameByClassifyId(classifyId, newItem.ClassifyName); err != nil {
-				return
-			}
-		} else if oldItem.ParentId == 0 {
-			//只对一级分类名称作了修改
-			// 更新报告表分类字段
-			if err = models.UpdateEnglishReportFirstClassifyNameByClassifyId(classifyId, newItem.ClassifyName); err != nil {
-				return
+		} else if oldItem.ParentId > 0 && oldItem.ParentId != oldItem.RootId {
+			//三级分类下如果有报告，则该三级分类不允许改成二级或或者一级分类
+			if (newItem.ParentId > 0 && newItem.ParentId == newItem.RootId) || newItem.ParentId == 0 {
+				// 更新报告表分类字段
+				var condition string
+				var pars []interface{}
+
+				condition += ` AND classify_id_second = ? `
+				pars = append(pars, classifyId)
+				count, e := models.GetEnglishReportCountByCondition(condition, pars)
+				if e != nil {
+					err = e
+					return
+				}
+				if count > 0 {
+					err = fmt.Errorf("该分类有关联的报告，不允许变更为二级分类或者一级分类")
+					return
+				}
 			}
 		}
 	}
 	return
 }
 
-func UpdateEnglishVideoClassifyId(oldItem, newItem, newParent *models.EnglishClassify, classifyId int) (err error) {
+func UpdateEnglishVideoClassifyId(oldItem, newItem *models.EnglishClassify, classifyId int) (err error) {
 	//一级分类改为二级分类
 	defer func() {
 		if err != nil {
@@ -406,56 +460,44 @@ func UpdateEnglishVideoClassifyId(oldItem, newItem, newParent *models.EnglishCla
 	//如果二级分类更换了父级分类，则更新报告中的父级分类ID
 	//如果一级分类更换了名称，则更新所有报告中的一级分类名称
 	//如果二级分类更换了名称，则更新所有报告中的二级分类名称
-	if oldItem.ParentId != newItem.ParentId {
-		parentClassifyName := ""
-		parentId := 0
-		//二级分类改为一级分类, 或者二级分类的一级分类有变更
-		if newItem.ParentId > 0 {
-			parentClassifyName = newParent.ClassifyName
-			parentId = newParent.Id
-		}
-
-		// 更新报告表分类字段
-		var condition string
-		var pars []interface{}
-
-		condition += ` AND classify_id_second = ? `
-		pars = append(pars, classifyId)
-		list, e := models.GetEnglishVideoByCondition(condition, pars)
-		if e != nil {
-			err = e
-			return
-		}
-		if len(list) > 0 {
-			//二级分类改为一级分类
-			if oldItem.ParentId > 0 && newItem.ParentId == 0 {
-				//查询该二级分类下是否存在关联报告，如果存在则不允许变更
-				err = fmt.Errorf("该分类有关联的视频，不允许变更为一级分类")
-				return
-			}
-		}
-		var idSlice []string
-		for _, report := range list {
-			idSlice = append(idSlice, strconv.Itoa(report.Id))
-		}
-		ids := strings.Join(idSlice, ",")
-		if ids != "" {
-			if err = models.UpdateEnglishVideoByClassifyId(parentClassifyName, newItem.ClassifyName, parentId, oldItem.Id, ids); err != nil {
-				return
-			}
-		}
-	} else if oldItem.ClassifyName != newItem.ClassifyName {
-		if oldItem.ParentId > 0 {
-			//只对二级分类名称作了修改
-			// 更新报告表分类字段
-			if err = models.UpdateEnglishVideoSecondClassifyNameByClassifyId(classifyId, newItem.ClassifyName); err != nil {
-				return
+	if oldItem.ParentId > 0 && oldItem.ParentId != newItem.ParentId {
+		//二级分类下的三级分类如果有报告，则该二级分类不允许改成一级分类
+		if oldItem.ParentId > 0 && oldItem.ParentId == oldItem.RootId {
+			if newItem.ParentId == 0 {
+				// 更新报告表分类字段
+				var condition string
+				var pars []interface{}
+
+				condition += ` AND classify_id_first = ? `
+				pars = append(pars, classifyId)
+				count, e := models.GetEnglishVideoListCount(condition, pars)
+				if e != nil {
+					err = e
+					return
+				}
+				if count > 0 {
+					err = fmt.Errorf("该分类有关联的视频，不允许变更为一级分类")
+					return
+				}
 			}
-		} else if oldItem.ParentId == 0 {
-			//只对一级分类名称作了修改
-			// 更新报告表分类字段
-			if err = models.UpdateEnglishVideoFirstClassifyNameByClassifyId(classifyId, newItem.ClassifyName); err != nil {
-				return
+		} else if oldItem.ParentId > 0 && oldItem.ParentId != oldItem.RootId {
+			//三级分类下如果有报告，则该三级分类不允许改成二级或或者一级分类
+			if (newItem.ParentId > 0 && newItem.ParentId == newItem.RootId) || newItem.ParentId == 0 {
+				// 更新报告表分类字段
+				var condition string
+				var pars []interface{}
+
+				condition += ` AND classify_id_second = ? `
+				pars = append(pars, classifyId)
+				count, e := models.GetEnglishVideoListCount(condition, pars)
+				if e != nil {
+					err = e
+					return
+				}
+				if count > 0 {
+					err = fmt.Errorf("该分类有关联的视频，不允许变更为二级分类或者一级分类")
+					return
+				}
 			}
 		}
 	}

services/english_video.go

@@ -125,14 +125,9 @@ func SaveEnglishVideo(req models.SaveEnglishVideoReq, adminInfo *system.Admin) (
 	firstClassify := new(models.EnglishClassify)
 	secondClassify := new(models.EnglishClassify)
 	for _, v := range classifyList {
-		if v.ClassifyType != 1 {
-			err = fmt.Errorf("分类类型出错")
-			errMsg = fmt.Sprintf("分类类型出错, Err: %v", err)
-			return
-		}
-		if v.ParentId == 0 {
+		if v.ParentId == v.RootId {
 			firstClassify = v
-		} else {
+		} else if v.ParentId > 0 {
 			secondClassify = v
 		}
 	}

services/excel/lucky_sheet.go

@@ -738,7 +738,7 @@ func (item *LuckySheetData) ToExcel() (downloadFilePath string, err error) {
 func getDownloadPath() (fpath string, err error) {
 	dateDir := time.Now().Format("20060102")
 	uploadDir := "static/xls/" + dateDir
-	err = os.MkdirAll(uploadDir, 0766)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		return
 	}

services/file.go

@@ -14,7 +14,7 @@ import (
 func UploadToOssAndFileName(fileMulti multipart.File, newFileName string) (resourceUrl string, err error) {
 	dateDir := time.Now().Format("20060102")
 	uploadDir := utils.STATIC_DIR + "hongze/" + dateDir
-	err = os.MkdirAll(uploadDir, 766)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		err = errors.New("存储目录创建失败,Err:" + err.Error())
 		return

services/ppt.go

@@ -3,13 +3,13 @@ package services
 import (
 	"encoding/json"
 	"errors"
-	"fmt"
 	"eta/eta_api/models"
 	"eta/eta_api/models/ppt_english"
 	"eta/eta_api/models/system"
 	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/services/ppt2img"
 	"eta/eta_api/utils"
+	"fmt"
 	"sort"
 	"time"
 )
@@ -143,7 +143,29 @@ func pptContent2Html(content string, isEnglish bool) (htm string, err error) {
 	pageLen := len(contents)
 	htmlContent := ``
 	// iframe图表/表格域名
-	chartRoot := utils.PublicChartHost
+
+	// 获取基础配置, 若未配置则直接返回
+
+	// 获取配置好的短信模版
+	smsCond := ` AND conf_key = ? `
+	smsPars := make([]interface{}, 0)
+	smsPars = append(smsPars, "ChartViewUrl")
+	conf := new(models.BusinessConf)
+	conf, e := conf.GetItemByCondition(smsCond, smsPars)
+	if e != nil {
+		if e.Error() == utils.ErrNoRow() {
+			err = fmt.Errorf("请先配置公共图库的地址")
+			return
+		}
+		err = fmt.Errorf("获取聚合短信配置信息失败, Err: %s", e.Error())
+		return
+	}
+	if conf.ConfVal == "" {
+		err = fmt.Errorf("请先配置公共图库的地址")
+		return
+	}
+
+	chartRoot := conf.ConfVal
 	if pageLen > 0 {
 		htmlPrefix := `<p style="text-align: left; margin-top: 10px; font-size: 16px;">`
 		htmlSuffix := `</p>`
@@ -321,7 +343,7 @@ func SaveEnglishPPTReport(pptId, classifyIdFirst, classifyIdSecond int, title, a
 	}
 
 	// 分类
-	classifyList, e := models.GetAllEnglishClassify(0)
+	classifyList, e := models.GetAllEnglishClassify()
 	if e != nil {
 		errMsg = "转换失败"
 		err = errors.New("获取分类列表失败, Err: " + e.Error())

services/task.go

@@ -465,3 +465,14 @@ func FixEnCompanyPermission() {
 	}
 	fmt.Println("修复完成")
 }
+
+// ModifyEsEnglishReport 批量修改es里的英文研报信息和线上路演信息
+func ModifyEsEnglishReport() {
+	fmt.Println("开始")
+	err := ModifyAllEsEnglishReportVideo()
+	if err != nil {
+		err = fmt.Errorf("重置es中的英文研报信息失败：ModifyAllEnglishReportInEs err: %s", err.Error())
+		return
+	}
+	fmt.Println("结束")
+}

utils/common.go

@@ -323,7 +323,7 @@ func DownloadImage(imgUrl string) (filePath string, err error) {
 func DownloadFile(fileUrl, fileDir string) (filePath string, err error) {
 	filePathDir := "./static/imgs/"
 	if fileDir != `` {
-		err = os.MkdirAll(fileDir, 0766)
+		err = os.MkdirAll(fileDir, DIR_MOD)
 		if err != nil {
 			return
 		}

utils/constants.go

@@ -1,5 +1,9 @@
 package utils
 
+import (
+	"io/fs"
+)
+
 // 常量定义
 const (
 	FormatTime                 = "15:04:05"                //时间格式
@@ -162,6 +166,8 @@ const (
 	DATA_SOURCE_FUBAO                                           //富宝->71
 	DATA_SOURCE_CALCULATE_ZSXY                                  // 指数修匀->72
 	DATA_SOURCE_PREDICT_CALCULATE_ZSXY                          // 预测指数修匀->73
+	DATA_SOURCE_CALCULATE_ZDYFX                                 // 自定义分析->74
+	DATA_SOURCE_CALCULATE_RJZ                                   // 日均值计算->75
 )
 
 // 数据刷新频率
@@ -327,3 +333,6 @@ const (
 	STORAGESOURCE_OSS   = 1 //阿里云OSS
 	STORAGESOURCE_MINIO = 2 //MinIo
 )
+
+// DIR_MOD 目录创建权限
+const DIR_MOD fs.FileMode = 0766 // Unix permission bits

utils/logs.go

@@ -2,17 +2,20 @@ package utils
 
 import (
 	"encoding/json"
+	"fmt"
 	"github.com/beego/beego/v2/core/logs"
 	"github.com/sirupsen/logrus"
 	"gopkg.in/natefinch/lumberjack.v2"
 	"os"
 	"path"
+	"time"
 )
 
 const (
-	DefaultLogPath    = "./rdlucklog"
-	DefaultBinlogPath = "./binlog"
-	DefaultBinlogFile = "binlog.log"
+	DefaultLogPath    = "./etalogs/filelog"
+	DefaultBinlogPath = "./etalogs/binlog"
+	DefaultDataPath   = "./etalogs/datalog"
+	DefaultApiLogPath = "./etalogs/apilog"
 )
 
 var FileLog = logrus.New()
@@ -27,14 +30,16 @@ func init() {
 	}
 	logFile := LogFile
 	if logFile == "" {
-		logFile = "eta_api.log"
+		logFile = fmt.Sprintf("%s.log", time.Now().Format(FormatDateUnSpace))
 	}
 	os.MkdirAll(logPath, os.ModePerm)
 
 	// 打开文件
 	logFileName := path.Join(logPath, logFile)
+	logConf := getDefaultLogrusConfig(logFileName)
+	logConf.MaxAge = 1
 	// 使用滚动压缩方式记录日志
-	rolling(FileLog, logFileName)
+	rolling(FileLog, logConf)
 	//rolling(bLogFileName)
 	// 设置日志输出JSON格式
 	jsonFormat := new(logrus.JSONFormatter)
@@ -73,7 +78,7 @@ func initBinlog() {
 	}
 	binlogFile := BinLogFile
 	if binlogFile == "" {
-		binlogFile = DefaultBinlogFile
+		binlogFile = fmt.Sprintf("%s.log", time.Now().Format(FormatDateUnSpace))
 	}
 	os.MkdirAll(binlogPath, os.ModePerm)
 	logFileName := path.Join(binlogPath, binlogFile)
@@ -91,22 +96,19 @@ func initBinlog() {
 func initApiLog() {
 	logPath := ApiLogPath
 	if logPath == "" {
-		if RunMode == "release" {
-			logPath = `/data/etalogs/eta_api`
-		} else {
-			logPath = `./rdlucklog/api`
-		}
+		logPath = DefaultApiLogPath
 	}
 	logFile := ApiLogFile
 	if logFile == "" {
-		logFile = "eta_api_api.log"
+		logFile = fmt.Sprintf("%s.log", time.Now().Format(FormatDateUnSpace))
 	}
 	os.MkdirAll(logPath, os.ModePerm)
 
 	// 打开文件
 	logFileName := path.Join(logPath, logFile)
+	logConf := getDefaultLogrusConfig(logFileName)
 	// 使用滚动压缩方式记录日志
-	rolling(ApiLog, logFileName)
+	rolling(ApiLog, logConf)
 	//rolling(bLogFileName)
 	// 设置日志输出JSON格式
 	jsonFormat := new(logrus.JSONFormatter)
@@ -118,19 +120,19 @@ func initApiLog() {
 func initFileLogData() {
 	logPath := LogDataPath
 	if logPath == "" {
-		logPath = DefaultLogPath
+		logPath = DefaultDataPath
 	}
 	logFile := LogDataFile
 	if logFile == "" {
-		logFile = "eta_api_data.log"
+		logFile = fmt.Sprintf("%s.log", time.Now().Format(FormatDateUnSpace))
 	}
 	os.MkdirAll(logPath, os.ModePerm)
 
 	// 打开文件
 	logFileName := path.Join(logPath, logFile)
+	logConf := getDefaultLogrusConfig(logFileName)
 	// 使用滚动压缩方式记录日志
-	rolling(FileLogData, logFileName)
-	//rolling(bLogFileName)
+	rolling(FileLogData, logConf)
 	// 设置日志输出JSON格式
 	jsonFormat := new(logrus.JSONFormatter)
 	jsonFormat.DisableHTMLEscape = true
@@ -139,16 +141,21 @@ func initFileLogData() {
 }
 
 // 日志滚动设置
-func rolling(fLog *logrus.Logger, logFile string) {
+func rolling(fLog *logrus.Logger, config *lumberjack.Logger) {
 	// 设置输出
-	fLog.SetOutput(&lumberjack.Logger{
+	fLog.SetOutput(config)
+}
+
+func getDefaultLogrusConfig(logFile string) (config *lumberjack.Logger) {
+	config = &lumberjack.Logger{
 		Filename:   logFile, //日志文件位置
-		MaxSize:    100,     // 单文件最大容量,单位是MB
+		MaxSize:    256,     // 单文件最大容量,单位是MB
 		MaxBackups: 3,       // 最大保留过期文件个数
 		MaxAge:     7,       // 保留过期文件的最大时间间隔,单位是天
 		Compress:   true,    // 是否需要压缩滚动日志, 使用的 gzip 压缩
 		LocalTime:  true,
-	})
+	}
+	return
 }
 
 func getDefaultLogConfig() logConfig {