Merge remote-tracking branch 'origin/eta/2.3' into debug

controllers/data_manage/edb_info.go

@@ -1796,7 +1796,7 @@ func (this *EdbInfoController) EdbInfoFilterByEs() {
 	var err error
 
 	// 获取es搜索参数
-	noPermissionEdbInfoIdList, noPermissionEdbClassifyIdList, collectEdbInfoIdList, searchClassifyIdList, searchPublicClassifyIdList, edbTypeList, edbInfoType, edbAuth, searchUserId, err, errMsg := data.GetGeneralEdbEsSearchParams(edbTypeStr, this.SysUser.AdminId, edbAuth, edbCollect, classifyId)
+	noPermissionEdbInfoIdList, noPermissionEdbClassifyIdList, collectEdbInfoIdList, searchClassifyIdList, searchPublicClassifyIdList, edbTypeList, edbInfoType, edbAuth, searchUserId, frequencyList, err, errMsg := data.GetGeneralEdbEsSearchParams(edbTypeStr, frequency, this.SysUser.AdminId, edbAuth, edbCollect, classifyId)
 	if err != nil {
 		br.Msg = "获取失败"
 		if errMsg != `` {
@@ -1813,7 +1813,7 @@ func (this *EdbInfoController) EdbInfoFilterByEs() {
 	}
 
 	// 普通的搜索
-	total, edbInfoList, err = elastic.SearchEdbInfoData(keyWord, startSize, pageSize, filterSource, source, []string{frequency}, []string{}, noPermissionEdbInfoIdList, noPermissionEdbClassifyIdList, collectEdbInfoIdList, searchClassifyIdList, searchPublicClassifyIdList, edbTypeList, edbInfoType, edbAuth, searchUserId, sortMap)
+	total, edbInfoList, err = elastic.SearchEdbInfoData(keyWord, startSize, pageSize, filterSource, source, frequencyList, []string{}, noPermissionEdbInfoIdList, noPermissionEdbClassifyIdList, collectEdbInfoIdList, searchClassifyIdList, searchPublicClassifyIdList, edbTypeList, edbInfoType, edbAuth, searchUserId, sortMap)
 
 	if err != nil {
 		edbInfoList = make([]*data_manage.EdbInfoList, 0)
@@ -3194,8 +3194,13 @@ func (this *EdbInfoController) AllEdbInfoByEs() {
 		newKeyWord := strings.Split(keyWord, " ")
 		keyWordArr = append(keyWordArr, newKeyWord...)
 
+		frequencyList := make([]string, 0)
+		if frequency != `` {
+			frequencyList = []string{frequency}
+		}
+
 		// 普通的搜索
-		total, edbInfoList, err = elastic.SearchEdbInfoData(keyWord, startSize, pageSize, filterSource, source, []string{frequency}, []string{}, noPermissionEdbInfoIdList, noPermissionEdbClassifyIdList, []int{}, []int{}, []int{}, []int{1, 2}, -1, 0, this.SysUser.AdminId, map[string]string{})
+		total, edbInfoList, err = elastic.SearchEdbInfoData(keyWord, startSize, pageSize, filterSource, source, frequencyList, []string{}, noPermissionEdbInfoIdList, noPermissionEdbClassifyIdList, []int{}, []int{}, []int{}, []int{1, 2}, -1, 0, this.SysUser.AdminId, map[string]string{})
 		isEs = true
 	} else {
 		var condition string

controllers/data_manage/edb_info_calculate.go

@@ -2285,11 +2285,6 @@ func (this *ChartInfoController) CalculateMultiSearch() {
 
 	var edbIdArr []int
 
-	frequencyList := make([]string, 0)
-	if frequency != "" {
-		frequencyList = strings.Split(frequency, ",")
-	}
-
 	notFrequencyList := make([]string, 0)
 	if notFrequency != "" {
 		notFrequencyList = strings.Split(notFrequency, ",")
@@ -2303,7 +2298,7 @@ func (this *ChartInfoController) CalculateMultiSearch() {
 		edbTypeStr = `3`
 	}
 	// 获取es搜索参数
-	noPermissionEdbInfoIdList, noPermissionEdbClassifyIdList, collectEdbInfoIdList, searchClassifyIdList, searchPublicClassifyIdList, edbTypeList, edbInfoType, edbAuth, searchUserId, err, errMsg := data.GetGeneralEdbEsSearchParams(edbTypeStr, this.SysUser.AdminId, edbAuth, edbCollect, 0)
+	noPermissionEdbInfoIdList, noPermissionEdbClassifyIdList, collectEdbInfoIdList, searchClassifyIdList, searchPublicClassifyIdList, edbTypeList, edbInfoType, edbAuth, searchUserId, frequencyList, err, errMsg := data.GetGeneralEdbEsSearchParams(edbTypeStr, frequency, this.SysUser.AdminId, edbAuth, edbCollect, 0)
 	if err != nil {
 		br.Msg = "获取失败"
 		if errMsg != `` {

controllers/data_manage/predict_edb_info.go

@@ -1101,7 +1101,11 @@ func (this *PredictEdbInfoController) FilterByEs() {
 		newKeyWord := strings.Split(keyWord, " ")
 		keyWordArr = append(keyWordArr, newKeyWord...)
 
-		total, edbInfoList, err = elastic.SearchEdbInfoData(keyWord, startSize, pageSize, filterSource, source, []string{frequency}, []string{}, noPermissionEdbInfoIdList, noPermissionEdbClassifyIdList, []int{}, []int{}, []int{}, []int{1, 2}, 1, 0, this.SysUser.AdminId, map[string]string{})
+		frequencyList := make([]string, 0)
+		if frequency != `` {
+			frequencyList = []string{frequency}
+		}
+		total, edbInfoList, err = elastic.SearchEdbInfoData(keyWord, startSize, pageSize, filterSource, source, frequencyList, []string{}, noPermissionEdbInfoIdList, noPermissionEdbClassifyIdList, []int{}, []int{}, []int{}, []int{1, 2}, 1, 0, this.SysUser.AdminId, map[string]string{})
 
 		isEs = true
 	} else {

services/data/edb_info_es.go

@@ -80,11 +80,16 @@ func DeleteEdbInfoToEs(edbInfoId int) {
 // @return searchUserId int
 // @return err error
 // @return errMsg string
-func GetGeneralEdbEsSearchParams(edbTypeStr string, sysUserId, reqEdbAuth, edbCollect, classifyId int) (noPermissionEdbInfoIdList, noPermissionEdbClassifyIdList, collectEdbInfoIdList, searchClassifyIdList, searchPublicClassifyIdList, edbTypeList []int, edbInfoType, edbAuth, searchUserId int, err error, errMsg string) {
+func GetGeneralEdbEsSearchParams(edbTypeStr, frequency string, sysUserId, reqEdbAuth, edbCollect, classifyId int) (noPermissionEdbInfoIdList, noPermissionEdbClassifyIdList, collectEdbInfoIdList, searchClassifyIdList, searchPublicClassifyIdList, edbTypeList []int, edbInfoType, edbAuth, searchUserId int, frequencyList []string, err error, errMsg string) {
 	// 指标类型数组：1-基础指标；2-计算指标;3-预测指标
 	edbTypeList = make([]int, 0)
 	edbInfoType = -1 // 指标范围
 
+	frequencyList = []string{}
+	if frequency != `` {
+		frequencyList = strings.Split(frequency, `,`)
+	}
+
 	// 搜索用户id
 	searchUserId = sysUserId
 	{
@@ -208,7 +213,7 @@ func GetAllGeneralEdbInfoListByGeneralEdbEsSearchReq(req request.GeneralEdbEsSea
 	}
 
 	// 获取es搜索参数
-	noPermissionEdbInfoIdList, noPermissionEdbClassifyIdList, collectEdbInfoIdList, searchClassifyIdList, searchPublicClassifyIdList, edbTypeList, edbInfoType, edbAuth, searchUserId, err, errMsg := GetGeneralEdbEsSearchParams(req.EdbType, userId, req.EdbAuth, req.EdbCollect, req.ClassifyId)
+	noPermissionEdbInfoIdList, noPermissionEdbClassifyIdList, collectEdbInfoIdList, searchClassifyIdList, searchPublicClassifyIdList, edbTypeList, edbInfoType, edbAuth, searchUserId, frequencyList, err, errMsg := GetGeneralEdbEsSearchParams(req.EdbType, req.Frequency, userId, req.EdbAuth, req.EdbCollect, req.ClassifyId)
 	if err != nil {
 		return
 	}
@@ -219,10 +224,6 @@ func GetAllGeneralEdbInfoListByGeneralEdbEsSearchReq(req request.GeneralEdbEsSea
 		sortMap["EdbInfoId"] = `desc`
 	}
 
-	frequencyList := make([]string, 0)
-	if req.Frequency != "" {
-		frequencyList = strings.Split(req.Frequency, ",")
-	}
 	notFrequencyList := make([]string, 0)
 	if req.NotFrequency != "" {
 		notFrequencyList = strings.Split(req.NotFrequency, ",")

services/elastic/edb_info.go

@@ -337,7 +337,6 @@ func SearchEdbInfoData(keywordStr string, from, size, filterSource, source int,
 		mustMap = append(mustMap, map[string]interface{}{
 			"term": map[string]interface{}{
 				"Frequency.keyword": "月度",
-				//"Frequency.keyword": "月度",
 			},
 		})
 	case 3:
@@ -391,7 +390,6 @@ func SearchEdbInfoData(keywordStr string, from, size, filterSource, source int,
 		mustNotMap = append(mustNotMap, map[string]interface{}{
 			"terms": map[string]interface{}{
 				"EdbInfoId": noPermissionEdbInfoIdList,
-				//"Frequency.keyword": "月度",
 			},
 		})
 	}
@@ -401,7 +399,6 @@ func SearchEdbInfoData(keywordStr string, from, size, filterSource, source int,
 		mustNotMap = append(mustNotMap, map[string]interface{}{
 			"terms": map[string]interface{}{
 				"ClassifyId": noPermissionEdbClassifyIdList,
-				//"Frequency.keyword": "月度",
 			},
 		})
 	}
@@ -461,13 +458,11 @@ func SearchEdbInfoData(keywordStr string, from, size, filterSource, source int,
 				map[string]interface{}{
 					"match": map[string]interface{}{
 						"EdbCode": keywordStr,
-						//"Frequency.keyword": "月度",
 					},
 				},
 				map[string]interface{}{
 					"match": map[string]interface{}{
 						keywordNameKey: keywordStr,
-						//"Frequency.keyword": "月度",
 					},
 				},
 			},