Merge branch 'bzq1/pool/257_cf' of eta_server/eta_api into debug

controllers/data_manage/chart_classify.go

@@ -1115,6 +1115,12 @@ func (this *ChartClassifyController) ChartClassifyChartListV3() {
 		}
 		// 移除没有权限的图表
 		allNodes := data.HandleNoPermissionChart(allChartInfo, noPermissionChartIdMap, this.SysUser.AdminId)
+		allNodes, err = data.GetChartClassifyByIsMe(sysUser.AdminId, chartClassifyId, utils.CHART_SOURCE_DEFAULT, allNodes)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取数据失败，Err:" + err.Error()
+			return
+		}
 		resp.AllNodes = allNodes
 
 		br.Ret = 200
@@ -1160,4 +1166,4 @@ func (this *ChartClassifyController) ChartClassifyChartListV3() {
 	br.Success = true
 	br.Msg = "获取成功"
 	br.Data = resp
-}
+}

models/bi_dashboard/bi_dashboard.go

@@ -89,9 +89,9 @@ type BiDashboardEditingCache struct {
 // DashboardDetailResp 详情响应体
 type DashboardDetailResp struct {
 	*BiDashboard
-	IsGrant   int                     `description:"是否共享，0：不是，1：是"`
-	Editor    BiDashboardEditingCache `description:"编辑人信息"`
-	List      []*BiDashboardDetail
+	IsGrant int                     `description:"是否共享，0：不是，1：是"`
+	Editor  BiDashboardEditingCache `description:"编辑人信息"`
+	List    []*BiDashboardDetail
 }
 
 type AddDashboardReq struct {
@@ -115,7 +115,7 @@ type EditDashboardReq struct {
 func EditDashboard(item *BiDashboard) (err error) {
 	o := orm.NewOrm()
 	sql := `UPDATE bi_dashboard SET bi_dashboard_name=?,modify_time=?,state=? WHERE bi_dashboard_id=?`
-	_, err = o.Raw(sql, item.BiDashboardName, time.Now(),item.State, item.BiDashboardId).Exec()
+	_, err = o.Raw(sql, item.BiDashboardName, time.Now(), item.State, item.BiDashboardId).Exec()
 	return
 }
 
@@ -145,11 +145,10 @@ func SaveDashboard(item *BiDashboard) (err error) {
 	return
 }
 
-
 // BiDashboardEditingReq 标记编辑中请求体
 type BiDashboardEditingReq struct {
-	BiDashboardId  int `description:"看板主键ID"`
-	Status int `description:"标记状态: 1-编辑中; 2-编辑完成"`
+	BiDashboardId int `description:"看板主键ID"`
+	Status        int `description:"标记状态: 1-编辑中; 2-编辑完成"`
 }
 
 // GetAllMyShareList 获取我共享的看板
@@ -167,4 +166,4 @@ func GetDashboardByName(name string) (item *BiDashboard, err error) {
 	o := orm.NewOrm()
 	err = o.Raw(sql, name).QueryRow(&item)
 	return
-}
+}

models/bi_dashboard/bi_dashboard_detail.go

@@ -22,8 +22,8 @@ func (m *BiDashboardDetail) TableName() string {
 
 // add
 //func AddBiDashboardDetail(item *BiDashboardDetail) (err error) {
-	//err = global.DEFAULT_DmSQL.Create(item).Error
-	//return
+//err = global.DEFAULT_DmSQL.Create(item).Error
+//return
 //}
 
 func GetBiDashboardDetailById(id int) (list []*BiDashboardDetail, err error) {
@@ -56,7 +56,7 @@ type MoveDashboardDetailReq struct {
 }
 
 // update
-func EditBiDashboardDetail(item *BiDashboardDetail) (err error){
+func EditBiDashboardDetail(item *BiDashboardDetail) (err error) {
 	//return global.DEFAULT_DmSQL.Model(item).Where("bi_dashboard_detail_id = ?", item.BiDashboardDetailId).Updates(item).Error
 	o := orm.NewOrm()
 	_, err = o.Raw("UPDATE bi_dashboard_detail SET bi_dashboard_id=?,type=?,unique_code=?,sort=?,modify_time=? WHERE bi_dashboard_detail_id=?", item.BiDashboardId, item.Type, item.UniqueCode, item.Sort, item.ModifyTime, item.BiDashboardDetailId).Exec()
@@ -67,11 +67,10 @@ type DelDashboardDetailReq struct {
 	BiDashboardDetailId int `description:"看板详情id"`
 }
 
-
 // del
 func DeleteBiDashboardDetailByDetailId(id int) (err error) {
 	//return global.DEFAULT_DmSQL.Where("bi_dashboard_detail_id = ?", id).Delete(&BiDashboardDetail{}).Error
 	o := orm.NewOrm()
 	_, err = o.Raw("DELETE from bi_dashboard_detail where bi_dashboard_detail_id=?", id).Exec()
 	return
-}
+}

models/bi_dashboard/bi_dashboard_grant.go

@@ -72,4 +72,4 @@ func GetDashboardGrantInfo(biDashboardId int) (list []*BiDashboardGrant, err err
 	o := orm.NewOrm()
 	_, err = o.Raw("SELECT * FROM bi_dashboard_grant where bi_dashboard_id=?", biDashboardId).QueryRows(&list)
 	return
-}
+}

models/business_conf.go

@@ -12,6 +12,7 @@ import (
 var (
 	BusinessConfMap map[string]string
 )
+
 const (
 	BusinessConfUseXf                        = "UseXf"
 	BusinessConfXfAppid                      = "XfAppid"

models/data_manage/chart_classify.go

@@ -467,6 +467,25 @@ func GetChartClassifyAllBySource(source int) (items []*ChartClassifyItems, err e
 	return
 }
 
+// GetChartClassifyIdListByAdminId
+// @Description: 根据用户id和指标类型获取其关联的所有指标分类id列表
+// @author: Roc
+// @datetime 2024-09-11 15:52:48
+// @param adminId int
+// @param source int
+// @return chartClassifyIdList []int
+// @return err error
+func GetChartClassifyIdListByAdminId(adminId, source int) (chartClassifyIdList []int, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := ` SELECT chart_classify_id FROM chart_info WHERE sys_user_id = ? AND source = ?`
+
+	pars := []interface{}{adminId, source}
+	sql += ` group by chart_classify_id `
+	_, err = o.Raw(sql, pars).QueryRows(&chartClassifyIdList)
+
+	return
+}
+
 // GetChartClassifyAndInfoByParentId
 func GetChartClassifyAndInfoByParentId(parentId int) (items []*ChartClassifyItems, err error) {
 	o := orm.NewOrmUsingDB("data")
@@ -567,24 +586,6 @@ func GetChartClassifiesById(chartClassifyId int) (items []*ChartClassifyItems, e
         FROM chart_classify
         WHERE parent_id = ?
     );`
-	_,err = o.Raw(sql, chartClassifyId, chartClassifyId, chartClassifyId).QueryRows(&items)
-	return
-}
-// GetChartClassifyIdListByAdminId
-// @Description: 根据用户id和指标类型获取其关联的所有指标分类id列表
-// @author: Roc
-// @datetime 2024-09-11 15:52:48
-// @param adminId int
-// @param source int
-// @return chartClassifyIdList []int
-// @return err error
-func GetChartClassifyIdListByAdminId(adminId, source int) (chartClassifyIdList []int, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT chart_classify_id FROM chart_info WHERE sys_user_id = ? AND source = ?`
-
-	pars := []interface{}{adminId, source}
-	sql += ` group by chart_classify_id `
-	_, err = o.Raw(sql, pars).QueryRows(&chartClassifyIdList)
-
+	_, err = o.Raw(sql, chartClassifyId, chartClassifyId, chartClassifyId).QueryRows(&items)
 	return
 }

services/bi_dashboard.go

@@ -8,9 +8,6 @@ import (
 	"time"
 )
 
-
-
-
 // UpdateBiDashboardEditing 更新看板编辑状态
 func UpdateBiDashboardEditing(boardId, status, userId int, userName string) (ret bi_dashboard.BiDashboardEditingCache, err error) {
 	if boardId <= 0 {

services/data/chart_classify.go

@@ -995,7 +995,7 @@ func EditChartClassifyV2(chartClassifyId, praentId, source int, chartClassifyNam
 			err = e
 			return
 		}
-		if classifyInfo.Level != parentClassifyInfo.Level - 1 {
+		if classifyInfo.Level != parentClassifyInfo.Level-1 {
 			err = errors.New("父级分类层级异常")
 		}
 	}
@@ -1008,7 +1008,6 @@ func EditChartClassifyV2(chartClassifyId, praentId, source int, chartClassifyNam
 		return
 	}
 
-
 	// 需要变更的字段
 	updateCols := make([]string, 0)
 
@@ -1128,3 +1127,57 @@ func GetChartClassifyChildrenRecursiveByParentIds(list []*data_manage.ChartClass
 	}
 	return res
 }
+
+func GetChartClassifyByIsMe(adminId, parentId, source int, classifyList []*data_manage.ChartClassifyItems) (list []*data_manage.ChartClassifyItems, err error) {
+	chartInfoList, err := data_manage.GetChartInfoByAdminId([]int{source}, adminId)
+	if err != nil {
+		return
+	}
+	classifyIdList := make([]int, 0)
+	for _, chartInfo := range chartInfoList {
+		if chartInfo.ChartClassifyId > 0 {
+			classifyIdList = append(classifyIdList, chartInfo.ChartClassifyId)
+		}
+	}
+	if parentId > 0 {
+		for _, v := range classifyList {
+			if v.ChartClassifyId > 0 && v.ChartInfoId == 0 {
+				classifyItems, er, _ := GetChildChartClassifyByClassifyId(v.ChartClassifyId)
+				if er != nil {
+					err = er
+					return
+				}
+				existClassifyMap := make(map[int]struct{})
+				for _, classify := range classifyItems {
+					existClassifyMap[classify.ChartClassifyId] = struct{}{}
+				}
+				for _, chart := range chartInfoList {
+					if _, ok := existClassifyMap[chart.ChartClassifyId]; ok {
+						list = append(list, v)
+						break
+					}
+				}
+			} else {
+				list = append(list, v)
+			}
+		}
+	} else {
+		chartClassifyList, er := data_manage.GetChartClassifyByIdList(classifyIdList)
+		if er != nil {
+			err = er
+			return
+		}
+
+		existClassifyIdMap := make(map[int]struct{})
+		for _, classify := range chartClassifyList {
+			existClassifyIdMap[classify.RootId] = struct{}{}
+		}
+
+		for _, classify := range classifyList {
+			if _, ok := existClassifyIdMap[classify.ChartClassifyId]; ok {
+				list = append(list, classify)
+			}
+		}
+	}
+	return
+}

services/data/chart_info.go

@@ -3904,7 +3904,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 						continue
 					}
 					// 农历时dataTimeList的年份为最新年份，图例时间的年份才是真实年份
-					chartLegend,_ := strconv.Atoi(v.ChartLegend)
+					chartLegend, _ := strconv.Atoi(v.ChartLegend)
 					if chartLegend < startYear {
 						continue
 					}
@@ -4040,7 +4040,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 							continue
 						}
 						// 农历时dataTimeList的年份为最新年份，图例时间的年份才是真实年份
-						chartLegend,_ := strconv.Atoi(v.ChartLegend)
+						chartLegend, _ := strconv.Atoi(v.ChartLegend)
 						if chartLegend < startYear {
 							continue
 						}
@@ -4213,7 +4213,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 						continue
 					}
 					// 农历时dataTimeList的年份为最新年份，图例时间的年份才是真实年份
-					chartLegend,_ := strconv.Atoi(quarterDataList[i].ChartLegend)
+					chartLegend, _ := strconv.Atoi(quarterDataList[i].ChartLegend)
 					if chartLegend < startYear {
 						continue
 					}
@@ -4301,7 +4301,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 						continue
 					}
 					// 农历时dataTimeList的年份为最新年份，图例时间的年份才是真实年份
-					chartLegend,_ := strconv.Atoi(quarterDataList[i].ChartLegend)
+					chartLegend, _ := strconv.Atoi(quarterDataList[i].ChartLegend)
 					if chartLegend < startYear {
 						continue
 					}

services/data/edb_info_calculate.go

@@ -375,7 +375,7 @@ func GetMaxMinEdbInfo(formula string) string {
 }
 
 // HandleDataByLinearRegressionToList 插值法补充数据(线性方程式)
-func HandleDataByLinearRegressionToList (edbInfoDataList []*data_manage.EdbDataList, handleDataMap map[string]float64) (dataTimeList []string,valueList []float64, err error) {
+func HandleDataByLinearRegressionToList(edbInfoDataList []*data_manage.EdbDataList, handleDataMap map[string]float64) (dataTimeList []string, valueList []float64, err error) {
 	if len(edbInfoDataList) < 2 {
 		return
 	}
@@ -514,7 +514,7 @@ func HandleDataByLinearRegressionToListV2(edbInfoDataList []*data_manage.EdbData
 }
 
 // HandleDataByLinearRegressionToListV3 插值法补充数据(线性方程式)-直接补充指标起始日期间的所有数据
-func HandleDataByLinearRegressionToListV3 (edbInfoDataList []*data_manage.EdbDataList, handleDataMap map[string]float64) (newEdbInfoDataList []*data_manage.EdbDataList, dataTimeList []string,valueList []float64, err error) {
+func HandleDataByLinearRegressionToListV3(edbInfoDataList []*data_manage.EdbDataList, handleDataMap map[string]float64) (newEdbInfoDataList []*data_manage.EdbDataList, dataTimeList []string, valueList []float64, err error) {
 	if len(edbInfoDataList) < 2 {
 		return
 	}

services/report.go

@@ -124,18 +124,18 @@ func UpdateChaptersVideo(ids []int) (err error) {
 //	return
 //}
 
-func initp2_838 (){
+func initp2_838() {
 	var condition string
 	var pars []interface{}
 	condition = " AND  state =  2 "
-	list ,err:= models.GetReportByCondition(condition,pars,[]string{},"",false,0,0)
-	if err != nil{
+	list, err := models.GetReportByCondition(condition, pars, []string{}, "", false, 0, 0)
+	if err != nil {
 		fmt.Println(err)
 	}
 	fmt.Println(len(list))
-	for  _,v:=  range  list{
+	for _, v := range list {
 		fmt.Println(v.Id)
-		UpdateReportEs(v.Id,2)
+		UpdateReportEs(v.Id, 2)
 	}
 }