Merge commit 'c3690aead3a0f0ac6d2273f11dfd9ff7d50378fc' into fix

controllers/base_auth.go

@@ -607,6 +607,9 @@ func (c *BaseAuthController) Prepare() {
 			api += v.Api + "&"
 		}
 	}
+	if publicApi, ok := models.BusinessConfMap["PublicApi"]; ok {
+		api += "&" + publicApi
+	}
 
 	//fmt.Println(api)
 	//处理uri请求，去除前缀和参数

controllers/data_manage/cross_variety/tag.go

@@ -50,7 +50,7 @@ func (c *TagController) Add() {
 		br.ErrMsg = "添加失败，Err:" + err.Error()
 		return
 	}
-	if item != nil {
+	if item != nil && item.ChartTagId > 0 {
 		br.Msg = "添加失败，标签名称不能重复"
 		br.IsSendEmail = false
 		return

models/ai_summary/ai_summary_classify.go

@@ -216,7 +216,7 @@ func UpdateAiSummaryClassifySortByParentId(parentId, classifyId, nowSort int, up
 }
 
 func GetAiSummaryClassify(aiSummaryClassify int) (aiSummaryClassifyIds string, err error) {
-	sql := `SELECT GROUP_CONCAT(t.ai_summary_classify_id) AS ai_summary_classify_id FROM (
+	sql := `SELECT LISTAGG(t.ai_summary_classify_id) AS ai_summary_classify_id FROM (
 			SELECT a.ai_summary_classify_id FROM ai_summary_classify AS a 
 			WHERE a.ai_summary_classify_id=?
 			UNION ALL

models/business_conf.go

@@ -9,6 +9,10 @@ import (
 	"time"
 )
 
+var (
+	BusinessConfMap map[string]string
+)
+
 const (
 	BusinessConfUseXf                     = "UseXf"
 	BusinessConfXfAppid                   = "XfAppid"
@@ -238,3 +242,11 @@ func InitUseMongoConf() {
 		utils.UseMongo = true
 	}
 }
+
+func InitBusinessConf() {
+	var e error
+	BusinessConfMap, e = GetBusinessConf()
+	if e != nil {
+		return
+	}
+}

models/data_manage/chart_info.go

@@ -1660,25 +1660,6 @@ type BalanceSeasonChartLegendPreviewResp struct {
 	List QuarterDataList
 }
 
-// 判断图表指标是否已经存在
-func ChartInfoExist(condition, edbInfoIdStr string) (count int, err error) {
-	sql := `SELECT COUNT(1) AS count FROM (
-		SELECT GROUP_CONCAT(edb_info_id ORDER BY edb_info_id ASC  SEPARATOR ',') AS edb_info_id_str 
-		 FROM chart_edb_mapping AS a
-         WHERE 1=1`
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` GROUP BY chart_info_id 
-		)AS t
-		WHERE t.edb_info_id_str=? 
-        GROUP BY t.edb_info_id_str `
-	o := global.DmSQL["data"]
-	err = o.Raw(sql, edbInfoIdStr).Scan(&count).Error
-
-	return
-}
-
 func ChartInfoSearchByKeyWord(keyword string, showSysId int) (searchList []*ChartInfo, err error) {
 	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM chart_info WHERE 1=1 `

models/data_manage/my_chart.go

@@ -423,7 +423,7 @@ func GetMyChartListByAdminId(adminId int) (item []*MyChartView, err error) {
 }
 
 func GetMyChartSearchByCondition(condition string, pars []interface{}) (item []*MyChartList, err error) {
-	sql := ` SELECT a.my_chart_id,c.sort,b.*,GROUP_CONCAT(DISTINCT d.my_chart_classify_name) AS my_chart_classify_name,GROUP_CONCAT(DISTINCT d.my_chart_classify_id) AS my_chart_classify_id
+	sql := ` SELECT a.my_chart_id,c.sort,b.*,LISTAGG(DISTINCT d.my_chart_classify_name) AS my_chart_classify_name,LISTAGG(DISTINCT d.my_chart_classify_id) AS my_chart_classify_id
 			FROM  my_chart AS a
 			INNER JOIN chart_info AS b ON a.chart_info_id=b.chart_info_id
 			INNER JOIN my_chart_classify_mapping AS c ON a.my_chart_id=c.my_chart_id

models/data_manage/supply_analysis/variety.go

@@ -175,13 +175,14 @@ a.last_update_sys_user_real_name,a.production_day,a.sys_user_id,a.sys_user_real_
 
 // GetListByPage 获取分页数据
 func (item Variety) GetListByPage(condition string, pars []interface{}, startSize, pageSize int) (total int, items []*VarietyItem, err error) {
-	baseSql := ` FROM ( SELECT a.*, GROUP_CONCAT(DISTINCT b.sys_user_id ORDER BY b.sys_user_id ASC SEPARATOR ',') AS permission_user_id FROM variety a 
+	baseSql := ` FROM ( SELECT a.variety_id,a."variety_name",a."production_day",a."last_update_sys_user_id",a."last_update_sys_user_real_name",a."modify_time",a."create_time", LISTAGG(DISTINCT b.sys_user_id , ',') WITHIN GROUP (ORDER BY b.sys_user_id asc)  AS permission_user_id
+FROM variety a 
 				JOIN variety_admin_permission b on a.variety_id=b.variety_id 
 				JOIN variety_edb_info c on a.variety_id=c.variety_id WHERE 1=1 `
 	if condition != "" {
 		baseSql += condition
 	}
-	baseSql += ` GROUP BY a.variety_id ) d `
+	baseSql += ` GROUP BY a.variety_id,a."variety_name",a."production_day",a."last_update_sys_user_id",a."last_update_sys_user_real_name",a."modify_time",a."create_time" ) d `
 	// 数据总数
 	totalSql := `SELECT COUNT(1) total ` + baseSql
 	err = global.DmSQL["data"].Raw(totalSql, pars...).Scan(&total).Error

models/db.go

@@ -12,4 +12,7 @@ func AfterInitTable() {
 
 	// 初始化是否启用mongo配置
 	InitUseMongoConf()
+
+	// 初始化商家基本配置
+	InitBusinessConf()
 }

services/data/chart_classify.go

@@ -404,7 +404,7 @@ func MoveChartClassify(req data_manage.MoveChartClassifyReq, sysUser *system.Adm
 			return
 		}
 		// 如果是移动目录, 那么校验一下父级目录下是否有重名目录
-		exists, e := data_manage.GetChartClassifyByParentIdAndName(utils.CHART_SOURCE_RANGE_ANALYSIS, parentClassifyId, chartClassifyInfo.ChartClassifyName, classifyId)
+		exists, e := data_manage.GetChartClassifyByParentIdAndName(source, parentClassifyId, chartClassifyInfo.ChartClassifyName, classifyId)
 		if e != nil && !utils.IsErrNoRow(e) {
 			errMsg = "移动失败"
 			err = fmt.Errorf("获取父级分类下的同名分类失败, Err: %s", e.Error())

services/data/data_manage_permission/edb_permission.go

@@ -61,12 +61,12 @@ func SetEdbChartPermission(source, subSource, userId int, authUserList []int, is
 	dataList := make([]data_manage_permission.DataItem, 0)
 
 	switch source {
-	case 3, 4, utils.EdbPermissionSourceCalculate:
+	case utils.EdbPermissionSourceBase, utils.EdbPermissionSourcePredict, utils.EdbPermissionSourceCalculate:
 		//ETA指标库、ETA预测指标
-		if source == 3 {
+		if source == utils.EdbPermissionSourceBase {
 			content += `（数据查看）`
 		}
-		if source == 4 {
+		if source == utils.EdbPermissionSourcePredict {
 			content += `（衍生指标）`
 		}
 		if source == utils.EdbPermissionSourceCalculate {
@@ -90,13 +90,13 @@ func SetEdbChartPermission(source, subSource, userId int, authUserList []int, is
 			}
 			// 重新设置权限
 			edbInfoType := 0
-			if source == 4 {
+			if source == utils.EdbPermissionSourcePredict {
 				edbInfoType = 1
 			}
 			err = data_manage_permission.SetPermissionByEdbIdList(dataIdList, authUserList, edbInfoType)
 		}
 
-	case 5:
+	case utils.ChartPermissionSource:
 		//图库
 		content += `（图库）`
 		tmpList, tmpErr := data_manage.GetChartInfoListByChartIdList(dataIdList)
@@ -120,7 +120,7 @@ func SetEdbChartPermission(source, subSource, userId int, authUserList []int, is
 			err = data_manage_permission.SetPermissionByChartIdList(dataIdList, authUserList, chartSource)
 		}
 
-	case 6:
+	case utils.TablePermissionSource:
 		// ETA表格
 		content += `（表格）`
 		tmpList := make([]*excel.MyExcelInfoList, 0)
@@ -216,12 +216,12 @@ func SetDataClassifyIsPermission(source, subSource int, classifyIdList []int, op
 	classifyDataList := make([]data_manage_permission.ClassifyDataItem, 0)
 
 	switch source {
-	case 3, 4, utils.EdbPermissionSourceCalculate:
+	case utils.EdbPermissionSourceBase, utils.EdbPermissionSourcePredict, utils.EdbPermissionSourceCalculate:
 		//ETA指标库、ETA预测指标
-		if source == 3 {
+		if source == utils.EdbPermissionSourceBase {
 			content += `（数据查看）`
 		}
-		if source == 4 {
+		if source == utils.EdbPermissionSourcePredict {
 			content += `（衍生指标）`
 		}
 		if source == utils.EdbPermissionSourceCalculate {
@@ -244,7 +244,7 @@ func SetDataClassifyIsPermission(source, subSource int, classifyIdList []int, op
 
 		// 重新设置权限
 		classifyType := 0
-		if source == 4 {
+		if source == utils.EdbPermissionSourcePredict {
 			classifyType = 1
 		}
 		if source == utils.EdbPermissionSourceCalculate {
@@ -252,7 +252,7 @@ func SetDataClassifyIsPermission(source, subSource int, classifyIdList []int, op
 		}
 		err = data_manage_permission.SetIsPermissionEdbChartByEdbClassifyIdList(classifyIdList, classifyType)
 
-	case 5:
+	case utils.ChartPermissionSource:
 		//图库
 		content += `（图库）`
 		{
@@ -274,7 +274,7 @@ func SetDataClassifyIsPermission(source, subSource int, classifyIdList []int, op
 		chartClassifySource := utils.CHART_SOURCE_DEFAULT
 		err = data_manage_permission.SetIsPermissionByChartClassifyIdList(classifyIdList, chartClassifySource)
 
-	case 6:
+	case utils.TablePermissionSource:
 		// ETA表格
 		content += `（表格）`
 		{
@@ -359,13 +359,13 @@ func SetEdbChartClassifyPermission(source, subSource int, authUserList []int, cl
 	// 先获取所有的涉密分类，然后根据用户去判断那些分类给权限了
 
 	switch source {
-	case 3, 4, utils.EdbPermissionSourceCalculate: //ETA指标库、ETA预测指标
+	case utils.EdbPermissionSourceBase, utils.EdbPermissionSourcePredict, utils.EdbPermissionSourceCalculate: //ETA指标库、ETA预测指标
 
 		//ETA指标库、ETA预测指标
-		if source == 3 {
+		if source == utils.EdbPermissionSourceBase {
 			content += `（数据查看）`
 		}
-		if source == 4 {
+		if source == utils.EdbPermissionSourcePredict {
 			content += `（衍生指标）`
 		}
 		if source == utils.EdbPermissionSourceCalculate {
@@ -373,7 +373,7 @@ func SetEdbChartClassifyPermission(source, subSource int, authUserList []int, cl
 		}
 
 		classifyType := 0
-		if source == 4 {
+		if source == utils.EdbPermissionSourcePredict {
 			classifyType = 1
 		}
 		if source == utils.EdbPermissionSourceCalculate {
@@ -396,7 +396,7 @@ func SetEdbChartClassifyPermission(source, subSource int, authUserList []int, cl
 		}
 		// 重新设置权限
 		err = data_manage_permission.SetPermissionByEdbClassifyIdList(classifyIdList, authUserList, classifyType)
-	case 5:
+	case utils.ChartPermissionSource:
 		subSource = utils.CHART_SOURCE_DEFAULT
 		//图库
 		content += `（图库）`
@@ -417,7 +417,7 @@ func SetEdbChartClassifyPermission(source, subSource int, authUserList []int, cl
 
 		// 重新设置权限
 		err = data_manage_permission.SetPermissionByChartClassifyIdList(classifyIdList, authUserList, subSource)
-	case 6:
+	case utils.TablePermissionSource:
 		// ETA表格
 		content += `（表格）`
 		{
@@ -483,7 +483,7 @@ func SetEdbChartClassifyPermission(source, subSource int, authUserList []int, cl
 // @return err error
 func GetEdbChartClassifyIdListPermissionByUserId(source, subSource, userId int) (idList []int, err error) {
 	switch source {
-	case 3, 4, utils.EdbPermissionSourceCalculate: //ETA指标库、ETA预测指标
+	case utils.EdbPermissionSourceBase, utils.EdbPermissionSourcePredict, utils.EdbPermissionSourceCalculate: //ETA指标库、ETA预测指标
 		//tmpList, tmpErr := data_manage.GetEdbInfoListGroupByUserId(dataId)
 		//if tmpErr != nil {
 		//	err = tmpErr
@@ -493,18 +493,18 @@ func GetEdbChartClassifyIdListPermissionByUserId(source, subSource, userId int)
 		//}
 		// 重新设置权限
 		classifyType := 0
-		if source == 4 {
+		if source == utils.EdbPermissionSourcePredict {
 			classifyType = 1
 		}
 		if source == utils.EdbPermissionSourceCalculate {
 			classifyType = utils.EdbClassifyTypeCalculate
 		}
 		idList, err = data_manage_permission.GetPermissionEdbClassifyIdListByUserId(userId, classifyType)
-	case 5:
+	case utils.ChartPermissionSource:
 		//图库
 		chartClassifySource := utils.CHART_SOURCE_DEFAULT
 		idList, err = data_manage_permission.GetPermissionChartClassifyIdListByUserId(userId, chartClassifySource)
-	case 6:
+	case utils.TablePermissionSource:
 		// ETA表格
 		idList, err = data_manage_permission.GetPermissionExcelClassifyIdListByUserId(userId, subSource)
 	default:
@@ -524,10 +524,10 @@ func GetEdbChartClassifyIdListPermissionByUserId(source, subSource, userId int)
 // @return err error
 func GetUserIdListPermissionByDataId(source, subSource, dataId int) (idList []int, err error) {
 	switch source {
-	case 3, 4, utils.EdbPermissionSourceCalculate:
+	case utils.EdbPermissionSourceBase, utils.EdbPermissionSourcePredict, utils.EdbPermissionSourceCalculate:
 		// ETA指标库、ETA预测指标
 		edbInfoType := 0
-		if source == 4 {
+		if source == utils.EdbPermissionSourcePredict {
 			edbInfoType = 1
 		}
 		//edbType := 1
@@ -535,11 +535,11 @@ func GetUserIdListPermissionByDataId(source, subSource, dataId int) (idList []in
 		//	edbType = 2
 		//}
 		idList, err = data_manage_permission.GetPermissionUserIdListByEdbId(dataId, edbInfoType)
-	case 5:
+	case utils.ChartPermissionSource:
 		// 图库
 		chartClassifySource := utils.CHART_SOURCE_DEFAULT
 		idList, err = data_manage_permission.GetPermissionUserIdListByChartId(dataId, chartClassifySource)
-	case 6:
+	case utils.TablePermissionSource:
 		// ETA表格
 		idList, err = data_manage_permission.GetPermissionUserIdListByExcelId(dataId, subSource)
 	default:
@@ -562,10 +562,10 @@ func GetUserIdListNoPermissionByDataId(source, subSource, dataId int) (idList []
 	authIdList := make([]int, 0)
 
 	switch source {
-	case 3, 4, utils.EdbPermissionSourceCalculate:
+	case utils.EdbPermissionSourceBase, utils.EdbPermissionSourcePredict, utils.EdbPermissionSourceCalculate:
 		// ETA指标库、ETA预测指标
 		edbInfoType := 0
-		if source == 4 {
+		if source == utils.EdbPermissionSourcePredict {
 			edbInfoType = 1
 		}
 
@@ -588,7 +588,7 @@ func GetUserIdListNoPermissionByDataId(source, subSource, dataId int) (idList []
 
 		// 获取已经配置分类权限的用户ID列表
 		authIdList, err = data_manage_permission.GetPermissionUserIdListByEdbClassifyId(dataId, edbInfoType)
-	case 5:
+	case utils.ChartPermissionSource:
 		// 图库
 
 		// 获取图表
@@ -611,7 +611,7 @@ func GetUserIdListNoPermissionByDataId(source, subSource, dataId int) (idList []
 
 		chartClassifySource := utils.CHART_SOURCE_DEFAULT
 		authIdList, err = data_manage_permission.GetPermissionUserIdListByChartClassifyId(dataId, chartClassifySource)
-	case 6:
+	case utils.TablePermissionSource:
 		// ETA表格
 
 		// 获取图表
@@ -685,7 +685,7 @@ func InheritParentClassify(source, subSource, classifyId, parentClassifyId int,
 	}
 	uniqueCode := uuid.NewUUID().Hex32()
 	switch source {
-	case 3, 4, utils.EdbPermissionSourceCalculate:
+	case utils.EdbPermissionSourceBase, utils.EdbPermissionSourcePredict, utils.EdbPermissionSourceCalculate:
 		//ETA指标库、ETA预测指标
 		// 分类信息
 		parentClassifyInfo, tmpErr := data_manage.GetEdbClassifyById(parentClassifyId)
@@ -699,14 +699,17 @@ func InheritParentClassify(source, subSource, classifyId, parentClassifyId int,
 		}
 
 		// 重新设置权限
-		classifyType := 0
-		if source == 4 {
-			classifyType = 1
+		classifyType := utils.EdbClassifyTypeBase
+		switch source {
+		case utils.EdbPermissionSourcePredict:
+			classifyType = utils.EdbClassifyTypePredict
+		case utils.EdbPermissionSourceCalculate:
+			classifyType = utils.EdbClassifyTypeCalculate
 		}
 
 		err = data_manage_permission.InheritParentClassifyByEdbClassifyId(source, classifyType, classifyId, parentClassifyId, classifyName, uniqueCode)
 
-	case 5:
+	case utils.ChartPermissionSource:
 		//图库
 		// 分类信息
 		parentClassifyInfo, tmpErr := data_manage.GetChartClassifyById(parentClassifyId)
@@ -723,7 +726,7 @@ func InheritParentClassify(source, subSource, classifyId, parentClassifyId int,
 		chartClassifySource := utils.CHART_SOURCE_DEFAULT
 		err = data_manage_permission.InheritParentClassifyByChartClassifyId(source, chartClassifySource, classifyId, parentClassifyId, classifyName, uniqueCode)
 
-	case 6:
+	case utils.TablePermissionSource:
 		// ETA表格
 
 		// 分类信息

services/data/edb_classify.go

@@ -328,9 +328,9 @@ func AddEdbClassify(classifyName string, parentId, level int, classifyType uint8
 
 	// 继承分类权限
 	{
-		source := 3
+		source := utils.EdbPermissionSourceBase
 		if classifyType == 1 {
-			source = 4
+			source = utils.EdbPermissionSourcePredict
 		}
 		if classifyType == utils.EdbClassifyTypeCalculate {
 			source = utils.EdbPermissionSourceCalculate

utils/constants.go

@@ -469,6 +469,10 @@ const (
 )
 
 const (
+	EdbPermissionSourceBase      = 3 // 指标权限来源-基础指标（数据查看）
+	EdbPermissionSourcePredict   = 4 // 指标权限来源-预测指标（衍生指标）
+	ChartPermissionSource        = 5 // 图库权限来源
+	TablePermissionSource        = 6 // 表格权限来源
 	EdbPermissionSourceCalculate = 7 // 指标权限来源-计算指标
 )