Merge branch 'master' of http://8.136.199.33:3000/eta_server/eta_api

controllers/data_manage/chart_info.go

@@ -1719,7 +1719,7 @@ func (this *ChartInfoController) ChartInfoSearchByEs() {
 	if keyword != "" {
 		searchList, total, err = data.EsSearchChartInfo(keyword, showSysId, []int{utils.CHART_SOURCE_DEFAULT}, noPermissionChartIdList, startSize, pageSize)
 	} else {
-		total, searchList, err = data_manage.ChartInfoSearchByEmptyKeyWord(showSysId, []int{utils.CHART_SOURCE_DEFAULT}, noPermissionChartIdList)
+		total, searchList, err = data_manage.ChartInfoSearchByEmptyKeyWord(showSysId, []int{utils.CHART_SOURCE_DEFAULT}, noPermissionChartIdList, startSize, pageSize)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取图表信息失败，Err:" + err.Error()

controllers/data_manage/correlation/correlation_chart_info.go

@@ -1461,7 +1461,7 @@ func (this *CorrelationChartInfoController) SearchByEs() {
 	if keyword != "" {
 		searchList, total, err = data.EsSearchChartInfo(keyword, showSysId, sourceList, noPermissionChartIdList, startSize, pageSize)
 	} else {
-		total, searchList, err = data_manage.ChartInfoSearchByEmptyKeyWord(showSysId, sourceList, noPermissionChartIdList)
+		total, searchList, err = data_manage.ChartInfoSearchByEmptyKeyWord(showSysId, sourceList, noPermissionChartIdList, startSize, pageSize)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取图表信息失败，Err:" + err.Error()

controllers/data_manage/future_good/future_good_chart_info.go

@@ -2164,7 +2164,7 @@ func (this *FutureGoodChartInfoController) ChartInfoSearchByEs() {
 	if keyword != "" {
 		searchList, total, err = data.EsSearchChartInfo(keyword, showSysId, []int{utils.CHART_SOURCE_FUTURE_GOOD, utils.CHART_SOURCE_FUTURE_GOOD_PROFIT}, noPermissionChartIdList, startSize, pageSize)
 	} else {
-		total, searchList, err = data_manage.ChartInfoSearchByEmptyKeyWord(showSysId, []int{utils.CHART_SOURCE_FUTURE_GOOD, utils.CHART_SOURCE_FUTURE_GOOD_PROFIT}, noPermissionChartIdList)
+		total, searchList, err = data_manage.ChartInfoSearchByEmptyKeyWord(showSysId, []int{utils.CHART_SOURCE_FUTURE_GOOD, utils.CHART_SOURCE_FUTURE_GOOD_PROFIT}, noPermissionChartIdList, startSize, pageSize)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取图表信息失败，Err:" + err.Error()

controllers/data_manage/line_equation/line_chart_info.go

@@ -1446,7 +1446,7 @@ func (this *LineEquationChartInfoController) SearchByEs() {
 	if keyword != "" {
 		searchList, total, err = data.EsSearchChartInfo(keyword, showSysId, sourceList, noPermissionChartIdList, startSize, pageSize)
 	} else {
-		total, searchList, err = data_manage.ChartInfoSearchByEmptyKeyWord(showSysId, sourceList, noPermissionChartIdList)
+		total, searchList, err = data_manage.ChartInfoSearchByEmptyKeyWord(showSysId, sourceList, noPermissionChartIdList, startSize, pageSize)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取图表信息失败，Err:" + err.Error()

controllers/data_manage/line_feature/chart_info.go

@@ -2583,7 +2583,7 @@ func (this *LineFeaturesChartInfoController) SearchByEs() {
 	if keyword != "" {
 		searchList, total, err = data.EsSearchChartInfo(keyword, showSysId, sourceList, noPermissionChartIdList, startSize, pageSize)
 	} else {
-		total, searchList, err = data_manage.ChartInfoSearchByEmptyKeyWord(showSysId, sourceList, noPermissionChartIdList)
+		total, searchList, err = data_manage.ChartInfoSearchByEmptyKeyWord(showSysId, sourceList, noPermissionChartIdList, startSize, pageSize)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取图表信息失败，Err:" + err.Error()

models/data_manage/chart_info.go

@@ -1126,27 +1126,39 @@ func ChartInfoSearchByKeyWord(KeyWord string, showSysId int) (searchList []*Char
 }
 
 // ChartInfoSearchByEmptyKeyWord 没有关键字的时候获取默认100条数据
-func ChartInfoSearchByEmptyKeyWord(showSysId int, sourceList []int, noPermissionChartIdList []int) (total int64, searchList []*ChartInfo, err error) {
+func ChartInfoSearchByEmptyKeyWord(showSysId int, sourceList []int, noPermissionChartIdList []int, startSize, pageSize int) (total int64, searchList []*ChartInfo, err error) {
 	num := len(sourceList)
 	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM chart_info WHERE 1=1 AND source in (` + utils.GetOrmInReplace(num) + `)`
 
-	var pars []interface{}
-	pars = append(pars, sourceList)
+	baseSql := `  FROM chart_info WHERE 1=1 AND source in (` + utils.GetOrmInReplace(num) + `)`
+
+	var basePars []interface{}
+	basePars = append(basePars, sourceList)
 
 	if showSysId > 0 {
-		sql += ` AND sys_user_id = ? `
-		pars = append(pars, showSysId)
+		baseSql += ` AND sys_user_id = ? `
+		basePars = append(basePars, showSysId)
 	}
 
 	lenNoPermissionChartIdList := len(noPermissionChartIdList)
 	if lenNoPermissionChartIdList > 0 {
-		sql += ` AND chart_info_id not in (` + utils.GetOrmInReplace(lenNoPermissionChartIdList) + `) `
-		pars = append(pars, noPermissionChartIdList)
+		baseSql += ` AND chart_info_id not in (` + utils.GetOrmInReplace(lenNoPermissionChartIdList) + `) `
+		basePars = append(basePars, noPermissionChartIdList)
 	}
 
-	sql += ` ORDER BY create_time DESC LIMIT 100 `
-	total, err = o.Raw(sql, pars).QueryRows(&searchList)
+	// 查找数量
+	totalSql := " SELECT count(1) as total " + baseSql
+	err = o.Raw(totalSql, basePars).QueryRow(&total)
+	if err != nil {
+		return
+	}
+
+	// 查找列表数据
+	sql := " SELECT *  " + baseSql + ` ORDER BY create_time DESC LIMIT ?,? `
+	basePars = append(basePars, startSize, pageSize)
+
+	_, err = o.Raw(sql, basePars).QueryRows(&searchList)
+
 	return
 }
 
@@ -1847,4 +1859,4 @@ func EditChartInfoExtraConfig(chartId int, extraConfig string) (err error) {
 	}
 
 	return
-}
+}

services/data/excel/custom_analysis_edb.go

@@ -260,17 +260,19 @@ func Refresh(excelInfo *excel.ExcelInfo) (err error, errMsg string, isSendEmail
 				return
 			}
 
+			startNum = startNum - 1
+			endNum = endNum - 1
 			// 选择行的数据
 			if isRow {
+				// 因为是选择一行的数据，所以开始行和结束行时一样的
+				//endNum = startNum - 1
+
 				// 开始列名、结束列
 				var startColumn, endColumn int
 				if isAll {
 					// 结束列（其实也就是整列的个数）
 					endColumn = len(sheetInfo.Cols) - 1
 				} else {
-					//startNum = startNum - 1
-					//endNum = endNum - 1
-
 					tmpStartColumn, tmpErr := excelize.ColumnNameToNumber(startColumnName)
 					if tmpErr != nil {
 						errMsg = "列名异常:" + startColumnName
@@ -300,11 +302,8 @@ func Refresh(excelInfo *excel.ExcelInfo) (err error, errMsg string, isSendEmail
 
 			} else if isColumn { // 选择列的数据
 				if isAll {
-					// 结束行（其实也就是整个sheet有多少行）
+					// 选择一整列的话，结束行得根据实际情况调整（其实也就是整个sheet有多少行）
 					endNum = len(sheetInfo.Rows) - 1
-				} else {
-					startNum = startNum - 1
-					endNum = endNum - 1
 				}
 
 				startColumn, tmpErr := excelize.ColumnNameToNumber(startColumnName)
@@ -344,6 +343,8 @@ func Refresh(excelInfo *excel.ExcelInfo) (err error, errMsg string, isSendEmail
 				return
 			}
 
+			startNum = startNum - 1
+			endNum = endNum - 1
 			// 选择行的数据
 			if isRow {
 				// 开始列名、结束列
@@ -352,8 +353,6 @@ func Refresh(excelInfo *excel.ExcelInfo) (err error, errMsg string, isSendEmail
 					// 结束列（其实也就是整列的个数）
 					endColumn = len(sheetInfo.Cols) - 1
 				} else {
-					//startNum = startNum - 1
-					//endNum = endNum - 1
 
 					tmpStartColumn, tmpErr := excelize.ColumnNameToNumber(startColumnName)
 					if tmpErr != nil {
@@ -384,11 +383,8 @@ func Refresh(excelInfo *excel.ExcelInfo) (err error, errMsg string, isSendEmail
 
 			} else if isColumn { // 选择列的数据
 				if isAll {
-					// 结束行（其实也就是整个sheet有多少行）
+					// 选择一整列的话，结束行得根据实际情况调整（其实也就是整个sheet有多少行）
 					endNum = len(sheetInfo.Rows) - 1
-				} else {
-					startNum = startNum - 1
-					endNum = endNum - 1
 				}
 
 				startColumn, tmpErr := excelize.ColumnNameToNumber(startColumnName)