Merge branch 'feature/gn_edb' into dm

controllers/data_manage/edb_classify.go

@@ -1267,8 +1267,8 @@ func (this *EdbClassifyController) ClassifyTree() {
 		//nodeAll = data.GetClassifyTreeRecursive(allList, 0)
 		newNodes := make([]*data_manage.EdbClassifyItems, 0)
 		for _, v := range allList {
-			// TODO:(基础指标分类是否加这个判断待定)分类设定了权限且无权限, 那么忽略掉该节点
-			if classifyType == utils.EdbTypeCalculate && v.IsJoinPermission == 1 && !utils.InArrayByInt(permissionClassifyIdList, v.ClassifyId) {
+			// 分类设定了权限且无权限, 那么忽略掉该节点
+			if v.IsJoinPermission == 1 && !utils.InArrayByInt(permissionClassifyIdList, v.ClassifyId) {
 				continue
 			}
 			newNodes = append(newNodes, v)

controllers/data_manage/predict_edb_classify.go

@@ -769,6 +769,11 @@ func (this *PredictEdbClassifyController) SimpleList() {
 		}
 
 		for _, v := range rootList {
+			// 分类设定了权限且无权限, 那么忽略掉该节点
+			if v.IsJoinPermission == 1 && !utils.InArrayByInt(permissionClassifyIdList, v.ClassifyId) {
+				continue
+			}
+
 			// 数据权限
 			v.HaveOperaAuth = data_manage_permission.CheckEdbClassifyPermissionByPermissionIdList(v.IsJoinPermission, v.ClassifyId, permissionClassifyIdList)
 			// 按钮权限
@@ -846,6 +851,11 @@ func (this *PredictEdbClassifyController) ClassifyTree() {
 		}
 
 		for k, v := range allList {
+			// 分类设定了权限且无权限, 那么忽略掉该节点
+			if v.IsJoinPermission == 1 && !utils.InArrayByInt(permissionClassifyIdList, v.ClassifyId) {
+				continue
+			}
+
 			// 数据权限
 			v.HaveOperaAuth = data_manage_permission.CheckEdbClassifyPermissionByPermissionIdList(v.IsJoinPermission, v.ClassifyId, permissionClassifyIdList)
 			// 按钮权限

services/data/data_manage_permission/data_move.go

@@ -614,13 +614,13 @@ func MoveEdbChart(source, subSource, oldUserId, newUserId int, isSelectAll bool,
 
 	case 3, 4, utils.EdbPermissionSourceCalculate: //ETA指标库、ETA预测指标
 		if source == 3 {
-			content += `（ETA指标库）`
+			content += `（数据查看）`
 		}
 		if source == 4 {
-			content += `（ETA预测指标）`
+			content += `（衍生指标）`
 		}
 		if source == utils.EdbPermissionSourceCalculate {
-			content += `（ETA计算指标）`
+			content += `（指标加工）`
 		}
 		tmpList, tmpErr := data_manage.GetEdbInfoListByEdbInfoId(dataId)
 		if tmpErr != nil {
@@ -663,7 +663,7 @@ func MoveEdbChart(source, subSource, oldUserId, newUserId int, isSelectAll bool,
 			}
 		}
 	case 5: //图库
-		content += `（ETA图库）`
+		content += `（图库）`
 		// 只展示eta图库
 		subSource = utils.CHART_SOURCE_DEFAULT
 
@@ -699,7 +699,7 @@ func MoveEdbChart(source, subSource, oldUserId, newUserId int, isSelectAll bool,
 			err = data_manage.ModifyChartInfoUserIdByCodeList(dataId, adminInfo.AdminId, adminInfo.RealName)
 		}
 	case 6: // ETA表格
-		content += `（ETA表格）`
+		content += `（表格）`
 		tmpList, tmpErr := excel.GetNoContentExcelListByExcelInfoIdList(dataId)
 		if tmpErr != nil {
 			err = tmpErr
@@ -1346,16 +1346,15 @@ func GetMoveEdbChartCount(userId, countType int) (sourceMap map[int]int, err err
 	}
 
 	{
-		// ETA指标库
+		// 基础指标
 		var condition string
 		var pars []interface{}
 		if userId > 0 {
 			condition += ` AND sys_user_id = ? `
 			pars = append(pars, userId)
 		}
-		//ETA指标库
-		condition += ` AND edb_info_type = ? `
-		pars = append(pars, 0)
+		condition += ` AND edb_info_type = ? AND edb_type = ? `
+		pars = append(pars, 0, utils.EdbTypeBase)
 
 		total, tmpErr := data_manage.GetEdbInfoByConditionCount(condition, pars)
 		if tmpErr != nil {
@@ -1431,6 +1430,25 @@ func GetMoveEdbChartCount(userId, countType int) (sourceMap map[int]int, err err
 		sourceMap[6] = total
 	}
 
+	{
+		// 计算指标
+		var condition string
+		var pars []interface{}
+		if userId > 0 {
+			condition += ` AND sys_user_id = ? `
+			pars = append(pars, userId)
+		}
+		condition += ` AND edb_info_type = ? AND edb_type = ? `
+		pars = append(pars, 0, utils.EdbTypeCalculate)
+
+		total, tmpErr := data_manage.GetEdbInfoByConditionCount(condition, pars)
+		if tmpErr != nil {
+			err = tmpErr
+			return
+		}
+		sourceMap[7] = total
+	}
+
 	return
 }
 

services/data/data_manage_permission/edb_permission.go

@@ -64,13 +64,13 @@ func SetEdbChartPermission(source, subSource, userId int, authUserList []int, is
 	case 3, 4, utils.EdbPermissionSourceCalculate:
 		//ETA指标库、ETA预测指标
 		if source == 3 {
-			content += `（ETA指标库）`
+			content += `（数据查看）`
 		}
 		if source == 4 {
-			content += `（ETA预测指标）`
+			content += `（衍生指标）`
 		}
 		if source == utils.EdbPermissionSourceCalculate {
-			content += `（ETA计算指标）`
+			content += `（指标加工）`
 		}
 
 		tmpList, tmpErr := data_manage.GetEdbInfoListByEdbInfoId(dataIdList)
@@ -98,7 +98,7 @@ func SetEdbChartPermission(source, subSource, userId int, authUserList []int, is
 
 	case 5:
 		//图库
-		content += `（ETA图库）`
+		content += `（图库）`
 		tmpList, tmpErr := data_manage.GetChartInfoListByChartIdList(dataIdList)
 		if tmpErr != nil {
 			err = tmpErr
@@ -122,7 +122,7 @@ func SetEdbChartPermission(source, subSource, userId int, authUserList []int, is
 
 	case 6:
 		// ETA表格
-		content += `（ETA表格）`
+		content += `（表格）`
 		tmpList := make([]*excel.MyExcelInfoList, 0)
 		var tmpErr error
 		if subSource == utils.BALANCE_TABLE {
@@ -219,13 +219,13 @@ func SetDataClassifyIsPermission(source, subSource int, classifyIdList []int, op
 	case 3, 4, utils.EdbPermissionSourceCalculate:
 		//ETA指标库、ETA预测指标
 		if source == 3 {
-			content += `（ETA指标库）`
+			content += `（数据查看）`
 		}
 		if source == 4 {
-			content += `（ETA预测指标）`
+			content += `（衍生指标）`
 		}
 		if source == utils.EdbPermissionSourceCalculate {
-			content += `（ETA计算指标）`
+			content += `（指标加工）`
 		}
 		{
 			// 分类信息
@@ -254,7 +254,7 @@ func SetDataClassifyIsPermission(source, subSource int, classifyIdList []int, op
 
 	case 5:
 		//图库
-		content += `（ETA图库）`
+		content += `（图库）`
 		{
 			// 分类信息
 			classifyInfoList, tmpErr := data_manage.GetChartClassifyByIdList(classifyIdList)
@@ -276,7 +276,7 @@ func SetDataClassifyIsPermission(source, subSource int, classifyIdList []int, op
 
 	case 6:
 		// ETA表格
-		content += `（ETA表格）`
+		content += `（表格）`
 		{
 			// 分类信息
 			classifyInfoList, tmpErr := excel.GetExcelClassifyByIdList(classifyIdList)
@@ -363,13 +363,13 @@ func SetEdbChartClassifyPermission(source, subSource int, authUserList []int, cl
 
 		//ETA指标库、ETA预测指标
 		if source == 3 {
-			content += `（ETA指标库）`
+			content += `（数据查看）`
 		}
 		if source == 4 {
-			content += `（ETA预测指标）`
+			content += `（衍生指标）`
 		}
 		if source == utils.EdbPermissionSourceCalculate {
-			content += `（ETA计算指标）`
+			content += `（指标加工）`
 		}
 
 		classifyType := 0
@@ -396,7 +396,7 @@ func SetEdbChartClassifyPermission(source, subSource int, authUserList []int, cl
 	case 5:
 		subSource = utils.CHART_SOURCE_DEFAULT
 		//图库
-		content += `（ETA图库）`
+		content += `（图库）`
 		{
 			// 分类信息
 			classifyInfoList, tmpErr := data_manage.GetChartClassifyBySourceAndIsJoinPermission(subSource, 1)
@@ -416,7 +416,7 @@ func SetEdbChartClassifyPermission(source, subSource int, authUserList []int, cl
 		err = data_manage_permission.SetPermissionByChartClassifyIdList(classifyIdList, authUserList, subSource)
 	case 6:
 		// ETA表格
-		content += `（ETA表格）`
+		content += `（表格）`
 		{
 			// 分类信息
 			classifyInfoList, tmpErr := excel.GetExcelClassifyBySourceAndIsJoinPermission(subSource, 1)