删除注释

controllers/ai/ai.go

@@ -17,10 +17,6 @@ type AiController struct {
 	controllers.BaseAuthController
 }
 
-// @Title 聊天接口
-// @Description 聊天接口
-// @Param	request	body aimod.ChatReq true "type json string"
-// @Success 200 {object} response.ListResp
 // @router /chat [post]
 func (this *AiController) List() {
 	br := new(models.BaseResponse).Init()
@@ -68,7 +64,6 @@ func (this *AiController) List() {
 		utils.Rc.Put(key, putVal, lastSecond)
 	}
 
-	//根据提问，获取信息
 	askUuid := utils.MD5(req.Ask)
 	chatMode, err := aimod.GetAiChatByAsk(askUuid)
 	if err != nil && !utils.IsErrNoRow(err) {
@@ -78,15 +73,10 @@ func (this *AiController) List() {
 	}
 	resp := new(aimod.ChatResp)
 	var answer string
-	//answerArr := []string{
-	//	"周度数据显示，成品油现货市场价格跟随原油下跌，但近期相对抗跌，裂解价差走扩。批零价差方面汽油收窄，柴油走扩",
-	//	"出口利润在原油下跌海外成品油矛盾更大的情况下汽柴油出口窗口完全关闭",
-	//	"汽油需求在经历五一假期的一段高峰后将回归平稳，总体没有明显矛盾，后期我们担心更多的还是柴油。"}
+
 	if chatMode != nil && chatMode.Answer != "" {
 		answer = chatMode.Answer
 	} else {
-		//获取主题下的所有信息
-		//AiChatTopicId
 		historyList, err := aimod.GetAiChatList(req.AiChatTopicId)
 		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取主题历史数据失败！"
@@ -174,9 +164,6 @@ func (this *AiController) List() {
 	br.Data = resp
 }
 
-// @Title 获取话题列表
-// @Description 获取话题列表接口
-// @Success 200 {object} aimod.AiChatTopicListResp
 // @router /topic/list [get]
 func (this *AiController) TopicList() {
 	br := new(models.BaseResponse).Init()
@@ -206,10 +193,6 @@ func (this *AiController) TopicList() {
 	br.Data = resp
 }
 
-// @Title 获取话题详情
-// @Description 获取话题详情接口
-// @Param   AiChatTopicId   query   int  true       "主题id"
-// @Success 200 {object} aimod.AiChatDetailResp
 // @router /topic/detail [get]
 func (this *AiController) TopicDetail() {
 	br := new(models.BaseResponse).Init()
@@ -244,10 +227,6 @@ func (this *AiController) TopicDetail() {
 	br.Data = resp
 }
 
-// @Title 删除话题接口
-// @Description 删除话题接口
-// @Param	request	body aimod.TopicDeleteReq true "type json string"
-// @Success Ret=200 删除成功
 // @router /topic/delete [post]
 func (this *AiController) TopicDelete() {
 	br := new(models.BaseResponse).Init()
@@ -289,10 +268,6 @@ func (this *AiController) TopicDelete() {
 	br.IsAddLog = true
 }
 
-// @Title 编辑话题接口
-// @Description 编辑话题接口
-// @Param	request	body aimod.TopicEditReq true "type json string"
-// @Success Ret=200 编辑成功
 // @router /topic/edit [post]
 func (this *AiController) TopicEdit() {
 	br := new(models.BaseResponse).Init()

controllers/ai/ai_file.go

@@ -20,11 +20,6 @@ type AiFileController struct {
 	controllers.BaseAuthController
 }
 
-// @Title 文件上传
-// @Description 文件上传接口
-// @Param   File   query   file  true       "文件"
-// @Param   AiChatTopicId   query   int  true       "主题id"
-// @Success 200 {object} models.ResourceResp
 // @router /file/upload [post]
 func (this *AiFileController) FileUpload() {
 	br := new(models.BaseResponse).Init()
@@ -218,10 +213,6 @@ func (this *AiFileController) FileUpload() {
 	return
 }
 
-// @Title 文件检索
-// @Description 文件检索接口
-// @Param	request	body aimod.FileRetrieveReq true "type json string"
-// @Success 200 {object} models.ResourceResp
 // @router /file/retrieve [post]
 func (this *AiFileController) FileRetrieve() {
 	br := new(models.BaseResponse).Init()
@@ -268,14 +259,7 @@ func (this *AiFileController) FileRetrieve() {
 		utils.Rc.Put(key, putVal, lastSecond)
 	}
 
-	//根据提问，获取信息
 	askUuid := utils.MD5(req.Ask)
-	//chatMode, err := aimod.GetAiChatByAsk(askUuid)
-	//if err != nil && err.Error() != utils.ErrNoRow() {
-	//	br.Msg = "获取数据失败！"
-	//	br.ErrMsg = "获取数据失败,GetAiChatByAsk，Err:" + err.Error()
-	//	return
-	//}
 
 	var assistantId, threadId string
 	if req.AiChatTopicId > 0 {
@@ -298,8 +282,6 @@ func (this *AiFileController) FileRetrieve() {
 
 	resp := new(aimod.ChatResp)
 	var answer string
-	//获取主题下的所有信息
-	//AiChatTopicId
 	historyList, err := aimod.GetAiChatList(req.AiChatTopicId)
 	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取主题历史数据失败！"
@@ -309,8 +291,6 @@ func (this *AiFileController) FileRetrieve() {
 
 	frList := make([]aimod.HistoryChat, 0)
 	tmpFileIdList := make([]string, 0)
-
-	// 历史消息
 	for _, v := range historyList {
 		if v.OpenaiFileId != "" {
 			tmpFileIdList = append(tmpFileIdList, v.OpenaiFileId)
@@ -323,7 +303,6 @@ func (this *AiFileController) FileRetrieve() {
 			tmpFileIdList = []string{}
 		}
 	}
-	// 当前的消息
 	{
 		frItem := new(aimod.HistoryChat)
 		frItem.Ask = req.Ask
@@ -406,17 +385,7 @@ func (this *AiFileController) FileRetrieve() {
 			br.ErrMsg = "生成话题记录失败，Err:" + err.Error()
 			return
 		}
-		//更新	assistantId,threadId
 		aiChatTopicObj := new(aimod.AiChatTopic)
-
-		//updateParams := make(map[string]interface{})
-		//updateParams["assistant_id"] = assistantId
-		//updateParams["thread_id"] = threadId
-		//updateParams["modify_time"] = time.Now()
-		//
-		//whereParam := make(map[string]interface{})
-		//whereParam["ai_chat_topic_id"] = req.AiChatTopicId
-
 		err = aiChatTopicObj.UpdateAssistantAndThreadId(assistantId, threadId, req.AiChatTopicId)
 		if err != nil {
 			br.Msg = "获取失败！"

controllers/ai/ai_pormpt.go

@@ -11,10 +11,6 @@ import (
 	"time"
 )
 
-// AiPromptList
-// @Title 获取所有ai纪要分类接口-包含沙盘
-// @Description 获取所有ai纪要分类接口-包含沙盘
-// @Success 200 {object} data_manage.ChartClassifyListResp
 // @router /prompt/list [get]
 func (this *AiController) AiPromptList() {
 	br := new(models.BaseResponse).Init()
@@ -36,10 +32,6 @@ func (this *AiController) AiPromptList() {
 	br.Data = list
 }
 
-// PromptGroupList
-// @Title 获取可见的目录列表
-// @Description 获取可见的目录列表接口
-// @Success 200 {object} ppt_english.RespGroupList
 // @router /prompt/groups [get]
 func (this *AiController) PromptGroupList() {
 	br := new(models.BaseResponse).Init()
@@ -99,11 +91,6 @@ func (this *AiController) PromptGroupList() {
 	return
 }
 
-// AddPpt
-// @Title 新增提示词
-// @Description 新增提示词接口
-// @Param	request	body ppt_english.AddPptEnglishReq true "type json string"
-// @Success 200 Ret=200 新增成功
 // @router /prompt/add [post]
 func (this *AiController) AddPrompt() {
 	br := new(models.BaseResponse).Init()
@@ -124,7 +111,6 @@ func (this *AiController) AddPrompt() {
 	}
 
 	var msg string
-	//获取该层级下最大的排序数
 	maxSort, err := ai_summary.GetAiPromptMaxSort(this.SysUser.AdminId)
 
 	prompt := &ai_summary.AiPrompt{
@@ -150,11 +136,6 @@ func (this *AiController) AddPrompt() {
 	br.Msg = msg
 }
 
-// EditPpt
-// @Title 编辑提示词
-// @Description 编辑提示词接口
-// @Param	request	body ppt_english.AddPptEnglishReq true "type json string"
-// @Success 200 Ret=200 编辑成功
 // @router /prompt/edit [post]
 func (this *AiController) EditPrompt() {
 	br := new(models.BaseResponse).Init()
@@ -195,11 +176,6 @@ func (this *AiController) EditPrompt() {
 	br.IsAddLog = true
 }
 
-// DeletePpt
-// @Title 删除提示词
-// @Description 删除ppt接口
-// @Param	request	body ppt_english.DeletePptEnglishReq true "type json string"
-// @Success 200 Ret=200 删除成功
 // @router /prompt/delete [post]
 func (this *AiController) DeletePrompt() {
 	br := new(models.BaseResponse).Init()
@@ -240,11 +216,6 @@ func (this *AiController) DeletePrompt() {
 	br.Msg = "删除成功"
 }
 
-// DetailPrompt
-// @Title 获取提示词详情
-// @Description 获取提示词详情接口
-// @Param   AiPromptId   query   int  true       "提示词id"
-// @Success 200 {object} ppt_english.PptEnglish
 // @router /prompt/detail [get]
 func (this *AiController) DetailPrompt() {
 	br := new(models.BaseResponse).Init()
@@ -276,11 +247,6 @@ func (this *AiController) DetailPrompt() {
 	br.Data = promptInfo
 }
 
-// MoveAiPrompt
-// @Title 移动提示词
-// @Description 移动提示词接口
-// @Param	request	body models.ReqMoveGroupPpt true "type json string"
-// @Success 200 Ret=200 移动成功
 // @router /prompt/move [post]
 func (this *AiController) MoveAiPrompt() {
 	br := new(models.BaseResponse).Init()
@@ -346,9 +312,7 @@ func (this *AiController) MoveAiPrompt() {
 
 	updateStr = append(updateStr, "sort")
 
-	//移到两个排序值中间操作
 	if prevSort >= currentSort {
-		//往下移动
 		err = ai_summary.MoveDownPromptBySort(this.SysUser.AdminId, prevSort, currentSort)
 		if err != nil {
 			err = errors.New("向下移动提示词出错:" + err.Error())
@@ -356,7 +320,6 @@ func (this *AiController) MoveAiPrompt() {
 		}
 		prompt.Sort = prevSort
 	} else if nextSort <= currentSort && nextSort != 0 {
-		//往上移动
 		err = ai_summary.MoveUpPromptBySort(this.SysUser.AdminId, nextSort, currentSort)
 		if err != nil {
 			err = errors.New("向上移动提示词出错:" + err.Error())
@@ -364,7 +327,6 @@ func (this *AiController) MoveAiPrompt() {
 		}
 		prompt.Sort = nextSort
 	}
-	//更新当前排序
 	err = prompt.Update(updateStr)
 	if err != nil {
 		err = errors.New("移动提示词出错:" + err.Error())
@@ -375,11 +337,6 @@ func (this *AiController) MoveAiPrompt() {
 	br.Msg = "移动成功"
 }
 
-// SharePrompt
-// @Title 共享/取消共享单个提示词
-// @Description 共享/取消共享单个提示词接口
-// @Param	request	body models.ReqPptShare true "type json string"
-// @Success 200 {object} models.RespPptShare
 // @router /prompt/share [post]
 func (this *AiController) SharePrompt() {
 	br := new(models.BaseResponse).Init()

controllers/ai/ai_summary.go

@@ -17,11 +17,6 @@ import (
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
-// AiSummaryClassifyItems
-// @Title 获取所有ai纪要分类接口
-// @Description 获取所有ai纪要分类接口
-// @Param   IsShowMe   query   bool  true       "是否只看我的，true、false"
-// @Success 200 {object} data_manage.ChartClassifyListResp
 // @router /summary/classify/list [get]
 func (this *AiController) AiSummaryClassifyItems() {
 	br := new(models.BaseResponse).Init()
@@ -84,10 +79,6 @@ func (this *AiController) AiSummaryClassifyItems() {
 	br.Data = resp
 }
 
-// @Title 新增ai纪要分类
-// @Description 新增ai纪要分类接口
-// @Param	request	body data_manage.AddChartClassifyReq true "type json string"
-// @Success 200 Ret=200 保存成功
 // @router /summary/classify/add [post]
 func (this *AiController) AddAiSummaryClassify() {
 	br := new(models.BaseResponse).Init()
@@ -124,7 +115,6 @@ func (this *AiController) AddAiSummaryClassify() {
 		br.IsSendEmail = false
 		return
 	}
-	//获取该层级下最大的排序数
 	maxSort, err := ai_summary.GetAiSummaryClassifyMaxSort(req.ParentId)
 
 	classify := new(ai_summary.AiSummaryClassify)
@@ -149,10 +139,6 @@ func (this *AiController) AddAiSummaryClassify() {
 	br.Success = true
 }
 
-// @Title 修改ai纪要分类
-// @Description 修改ai纪要分类接口
-// @Param	request	body data_manage.EditChartClassifyReq true "type json string"
-// @Success 200 Ret=200 修改成功
 // @router /summary/classify/edit [post]
 func (this *AiController) EditAiSummaryClassify() {
 	br := new(models.BaseResponse).Init()
@@ -192,10 +178,6 @@ func (this *AiController) EditAiSummaryClassify() {
 	br.IsAddLog = true
 }
 
-// @Title 删除纪要分类检测接口
-// @Description 删除纪要分类检测接口
-// @Param	request	body data_manage.ChartClassifyDeleteCheckResp true "type json string"
-// @Success 200 Ret=200 检测成功
 // @router /summary/classify/delete/check [post]
 func (this *AiController) DeleteSandboxClassifyCheck() {
 	br := new(models.BaseResponse).Init()
@@ -218,9 +200,7 @@ func (this *AiController) DeleteSandboxClassifyCheck() {
 	}
 	var deleteStatus int
 	var tipsMsg string
-	//删除分类
 	if req.AiSummaryClassifyId > 0 {
-		//判断分类下，是否含有纪要
 		count, err := ai_summary.GetAiSummaryInfoCountByClassifyId(req.AiSummaryClassifyId)
 		if err != nil {
 			br.Msg = "删除失败"
@@ -259,10 +239,6 @@ func (this *AiController) DeleteSandboxClassifyCheck() {
 	br.Data = resp
 }
 
-// @Title 删除纪要分类/纪要
-// @Description 删除纪要分类/纪要接口
-// @Param	request	body data_manage.DeleteChartClassifyReq true "type json string"
-// @Success 200 Ret=200 删除成功
 // @router /summary/classify/delete [post]
 func (this *AiController) DeleteAiSummaryClassify() {
 	br := new(models.BaseResponse).Init()
@@ -293,9 +269,7 @@ func (this *AiController) DeleteAiSummaryClassify() {
 		return
 	}
 
-	//删除分类
 	if req.AiSummaryClassifyId > 0 && req.AiSummaryId == 0 {
-		//判断是否含有纪要
 		childIds := make([]int, 0)
 		classifyAll, err := ai_summary.GetAiSummaryClassifyAll()
 		if err != nil && !utils.IsErrNoRow(err) {
@@ -323,12 +297,6 @@ func (this *AiController) DeleteAiSummaryClassify() {
 			br.ErrMsg = "判断分类下是否有纪要失败，Err:" + err.Error()
 			return
 		}
-		//count, err := ai_summary.GetAiSummaryInfoCountByClassifyId(req.AiSummaryClassifyId)
-		//if err != nil && !utils.IsErrNoRow(err) {
-		//	br.Msg = "删除失败"
-		//	br.ErrMsg = "判断名称是否已存在失败，Err:" + err.Error()
-		//	return
-		//}
 
 		if count > 0 {
 			br.Msg = "该目录下存在纪要，不可删除"
@@ -345,7 +313,6 @@ func (this *AiController) DeleteAiSummaryClassify() {
 		}
 	}
 
-	//删除纪要
 	if req.AiSummaryId > 0 {
 		summaryInfo, err := ai_summary.GetAiSummaryById(req.AiSummaryId)
 		if err != nil {
@@ -379,10 +346,6 @@ func (this *AiController) DeleteAiSummaryClassify() {
 	br.IsAddLog = true
 }
 
-// AiSummaryClassifyMove
-// @Title 纪要分类移动接口
-// @Description 纪要分类移动接口
-// @Success 200 {object} data_manage.MoveChartClassifyReq
 // @router /summary/classify/move [post]
 func (this *AiController) AiSummaryClassifyMove() {
 	br := new(models.BaseResponse).Init()
@@ -412,7 +375,6 @@ func (this *AiController) AiSummaryClassifyMove() {
 		br.ErrMsg = "分类id小于等于0"
 		return
 	}
-	//判断分类是否存在
 	aiSummaryClassifyInfo, err := ai_summary.GetAiSummaryClassifyById(req.AiSummaryClassifyId)
 	if err != nil {
 		br.Msg = "移动失败"
@@ -422,9 +384,7 @@ func (this *AiController) AiSummaryClassifyMove() {
 
 	updateCol := make([]string, 0)
 
-	// 判断移动的是分类还是沙盘
 	if req.AiSummaryId > 0 {
-		//判断分类是否存在
 		count, _ := ai_summary.GetAiSummaryClassifyCountById(req.AiSummaryClassifyId)
 		if count <= 0 {
 			br.Msg = "分类已被删除，不可移动，请刷新页面"
@@ -437,22 +397,7 @@ func (this *AiController) AiSummaryClassifyMove() {
 			br.ErrMsg = "获取沙盘信息失败,Err:" + err.Error()
 			return
 		}
-
-		//如果改变了分类，那么移动该图表数据
-		// 11/22 ETA逻辑优化去除名称重复限制
 		if aiSummaryInfo.ClassifyId != req.ParentClassifyId {
-			////查询需要修改的分类下是否存在同一个图表名称
-			//tmpSandboxInfo, tmpErr := sandbox.GetSandboxByClassifyIdAndName(req.ParentClassifyId, aiSummaryInfo.Name)
-			//if tmpErr != nil && !utils.IsErrNoRow(tmpErr) {
-			//	br.Msg = "移动失败"
-			//	br.ErrMsg = "移动失败,Err:" + tmpErr.Error()
-			//	return
-			//}
-			//if tmpSandboxInfo != nil {
-			//	br.Msg = "移动失败，同一个分类下沙盘名称不允许重复"
-			//	br.ErrMsg = "移动失败，同一个分类下沙盘名称不允许重复"
-			//	return
-			//}
 			err = ai_summary.MoveAiSummary(req.AiSummaryId, req.ParentClassifyId)
 			if err != nil {
 				br.Msg = "移动失败"
@@ -461,12 +406,9 @@ func (this *AiController) AiSummaryClassifyMove() {
 			}
 		}
 
-		//移动排序
 		updateCol := make([]string, 0)
-		//如果有传入 上一个兄弟节点分类id
 		if req.PrevId > 0 {
 			if req.PrevType == 1 {
-				//上一个兄弟节点
 				prevClassify, err := ai_summary.GetAiSummaryClassifyById(req.PrevId)
 				if err != nil {
 					br.Msg = "移动失败"
@@ -474,51 +416,38 @@ func (this *AiController) AiSummaryClassifyMove() {
 					return
 				}
 
-				//如果是移动在两个兄弟节点之间
 				if req.NextId > 0 {
 					if req.NextType == 1 {
-						//上一个节点是分类 下一个节点是分类的情况
-						//下一个兄弟节点
 						nextClassify, err := ai_summary.GetAiSummaryClassifyById(req.NextId)
 						if err != nil {
 							br.Msg = "移动失败"
 							br.ErrMsg = "获取下一个兄弟节点分类信息失败,Err:" + err.Error()
 							return
 						}
-						//如果上一个兄弟与下一个兄弟的排序权重是一致的，那么需要将下一个兄弟（以及下个兄弟的同样排序权重）的排序权重+2，自己变成上一个兄弟的排序权重+1
 						if prevClassify.Sort == nextClassify.Sort || prevClassify.Sort == aiSummaryClassifyInfo.Sort {
-							//变更兄弟节点的排序
 							updateSortStr := `sort + 2`
 							_ = ai_summary.UpdateAiSummaryClassifySortByParentId(prevClassify.ParentId, prevClassify.AiSummaryClassifyId, prevClassify.Sort, updateSortStr)
 							_ = ai_summary.UpdateAiSummarySortByClassifyId(prevClassify.AiSummaryClassifyId, prevClassify.Sort, 0, updateSortStr)
 						} else {
-							//如果下一个兄弟的排序权重正好是上个兄弟节点的下一层，那么需要再加一层了
 							if nextClassify.Sort-prevClassify.Sort == 1 {
-								//变更兄弟节点的排序
 								updateSortStr := `sort + 1`
 								_ = ai_summary.UpdateAiSummaryClassifySortByParentId(prevClassify.ParentId, 0, prevClassify.Sort, updateSortStr)
 								_ = ai_summary.UpdateAiSummarySortByClassifyId(prevClassify.AiSummaryClassifyId, prevClassify.Sort, 0, updateSortStr)
 							}
 						}
 					} else {
-						//上一个节点是分类 下一个节点是沙盘的情况
-						//下一个兄弟节点
 						nextChartInfo, err := ai_summary.GetAiSummaryById(req.NextId)
 						if err != nil {
 							br.Msg = "移动失败"
 							br.ErrMsg = "获取下一个兄弟节点分类信息失败,Err:" + err.Error()
 							return
 						}
-						//如果上一个兄弟(分类)与下一个兄弟(沙盘)的排序权重是一致的，那么需要将下一个兄弟(沙盘)（以及下个兄弟(沙盘)的同样排序权重）的排序权重+2，自己变成上一个兄弟(分类)的排序权重+1
 						if prevClassify.Sort == nextChartInfo.Sort || prevClassify.Sort == aiSummaryInfo.Sort {
-							//变更兄弟节点的排序
 							updateSortStr := `sort + 2`
 							_ = ai_summary.UpdateAiSummaryClassifySortByParentId(prevClassify.ParentId, prevClassify.AiSummaryClassifyId, prevClassify.Sort, updateSortStr)
 							_ = ai_summary.UpdateAiSummarySortByClassifyId(prevClassify.AiSummaryClassifyId, prevClassify.Sort, 0, updateSortStr)
 						} else {
-							//如果下一个兄弟(沙盘)的排序权重正好是上个兄弟节点(分类)的下一层，那么需要再加一层了
 							if nextChartInfo.Sort-prevClassify.Sort == 1 {
-								//变更兄弟节点的排序
 								updateSortStr := `sort + 1`
 								_ = ai_summary.UpdateAiSummaryClassifySortByParentId(prevClassify.ParentId, 0, prevClassify.AiSummaryClassifyId, updateSortStr)
 								_ = ai_summary.UpdateAiSummarySortByClassifyId(prevClassify.AiSummaryClassifyId, prevClassify.Sort, 0, updateSortStr)
@@ -540,51 +469,38 @@ func (this *AiController) AiSummaryClassifyMove() {
 					return
 				}
 
-				//如果是移动在两个兄弟节点之间
 				if req.NextId > 0 {
 					if req.NextType == 1 {
-						//上一个节点是沙盘 下一个节点是分类的情况
-						//下一个兄弟节点
 						nextClassify, err := ai_summary.GetAiSummaryClassifyById(req.NextId)
 						if err != nil {
 							br.Msg = "移动失败"
 							br.ErrMsg = "获取下一个兄弟节点分类信息失败,Err:" + err.Error()
 							return
 						}
-						//如果上一个兄弟(沙盘)与下一个兄弟(分类)的排序权重是一致的，那么需要将下一个兄弟(分类)（以及下个兄弟(分类)的同样排序权重）的排序权重+2，自己变成上一个兄弟(沙盘)的排序权重+1
 						if prevAiSumary.Sort == nextClassify.Sort || prevAiSumary.Sort == aiSummaryClassifyInfo.Sort {
-							//变更兄弟节点的排序
 							updateSortStr := `sort + 2`
 							_ = ai_summary.UpdateAiSummaryClassifySortByParentId(prevAiSumary.ClassifyId, 0, prevAiSumary.Sort, updateSortStr)
 							_ = ai_summary.UpdateAiSummarySortByClassifyId(prevAiSumary.ClassifyId, prevAiSumary.Sort, prevAiSumary.AiSummaryId, updateSortStr)
 						} else {
-							//如果下一个兄弟(分类)的排序权重正好是上个兄弟(沙盘)节点的下一层，那么需要再加一层了
 							if nextClassify.Sort-prevAiSumary.Sort == 1 {
-								//变更兄弟节点的排序
 								updateSortStr := `sort + 1`
 								_ = ai_summary.UpdateAiSummaryClassifySortByParentId(prevAiSumary.ClassifyId, 0, prevAiSumary.Sort, updateSortStr)
 								_ = ai_summary.UpdateAiSummarySortByClassifyId(prevAiSumary.ClassifyId, prevAiSumary.Sort, prevAiSumary.AiSummaryId, updateSortStr)
 							}
 						}
 					} else {
-						//上一个节点是沙盘 下一个节点是沙盘的情况
-						//下一个兄弟节点
 						nextChartInfo, err := ai_summary.GetAiSummaryById(req.NextId)
 						if err != nil {
 							br.Msg = "移动失败"
 							br.ErrMsg = "获取下一个兄弟节点分类信息失败,Err:" + err.Error()
 							return
 						}
-						//如果上一个兄弟(沙盘)与下一个兄弟(分类)的排序权重是一致的，那么需要将下一个兄弟(分类)（以及下个兄弟(分类)的同样排序权重）的排序权重+2，自己变成上一个兄弟(沙盘)的排序权重+1
 						if prevAiSumary.Sort == nextChartInfo.Sort || prevAiSumary.Sort == aiSummaryInfo.Sort {
-							//变更兄弟节点的排序
 							updateSortStr := `sort + 2`
 							_ = ai_summary.UpdateAiSummaryClassifySortByParentId(prevAiSumary.ClassifyId, 0, prevAiSumary.Sort, updateSortStr)
 							_ = ai_summary.UpdateAiSummarySortByClassifyId(prevAiSumary.ClassifyId, prevAiSumary.Sort, prevAiSumary.AiSummaryId, updateSortStr)
 						} else {
-							//如果下一个兄弟(分类)的排序权重正好是上个兄弟(沙盘)节点的下一层，那么需要再加一层了
 							if nextChartInfo.Sort-prevAiSumary.Sort == 1 {
-								//变更兄弟节点的排序
 								updateSortStr := `sort + 1`
 								_ = ai_summary.UpdateAiSummaryClassifySortByParentId(prevAiSumary.ClassifyId, 0, prevAiSumary.Sort, updateSortStr)
 								_ = ai_summary.UpdateAiSummarySortByClassifyId(prevAiSumary.ClassifyId, prevAiSumary.Sort, prevAiSumary.AiSummaryId, updateSortStr)
@@ -600,7 +516,6 @@ func (this *AiController) AiSummaryClassifyMove() {
 			}
 
 		} else {
-			// prevId为0，也就是沙盘移到最前端
 			firstClassify, err := ai_summary.GetFirstAiSummaryByClassifyId(req.AiSummaryClassifyId)
 			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "移动失败"
@@ -608,7 +523,6 @@ func (this *AiController) AiSummaryClassifyMove() {
 				return
 			}
 
-			//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
 			if firstClassify != nil && firstClassify.ClassifyId > 0 && firstClassify.Sort == 0 {
 				updateSortStr := ` sort + 1 `
 				_ = ai_summary.UpdateAiSummarySortByClassifyId(firstClassify.ClassifyId, 0, firstClassify.AiSummaryId-1, updateSortStr)
@@ -620,7 +534,6 @@ func (this *AiController) AiSummaryClassifyMove() {
 
 		}
 
-		//更新
 		if len(updateCol) > 0 {
 			err = aiSummaryInfo.Update(updateCol)
 			if err != nil {
@@ -630,8 +543,6 @@ func (this *AiController) AiSummaryClassifyMove() {
 			}
 		}
 	} else {
-		//移动的是分类
-		//判断上级id是否一致，如果不一致的话，那么需要移动该分类层级
 		if aiSummaryClassifyInfo.ParentId != req.ParentClassifyId && req.ParentClassifyId != 0 {
 			parentChartClassifyInfo, err := ai_summary.GetAiSummaryClassifyById(req.ParentClassifyId)
 			if err != nil {
@@ -644,18 +555,14 @@ func (this *AiController) AiSummaryClassifyMove() {
 			aiSummaryClassifyInfo.ModifyTime = time.Now()
 			updateCol = append(updateCol, "ParentId", "Level", "ModifyTime")
 		} else if aiSummaryClassifyInfo.ParentId != req.ParentClassifyId && req.ParentClassifyId == 0 {
-			//改为一级分类
 			aiSummaryClassifyInfo.ParentId = req.ParentClassifyId
 			aiSummaryClassifyInfo.Level = 1
 			aiSummaryClassifyInfo.ModifyTime = time.Now()
 			updateCol = append(updateCol, "ParentId", "Level", "ModifyTime")
 		}
 
-		//如果有传入 上一个兄弟节点分类id
 		if req.PrevId > 0 {
 			if req.PrevType == 1 {
-				//上一个节点是分类
-				//上一个兄弟节点
 				prevClassify, err := ai_summary.GetAiSummaryClassifyById(req.PrevId)
 				if err != nil {
 					br.Msg = "移动失败"
@@ -663,51 +570,38 @@ func (this *AiController) AiSummaryClassifyMove() {
 					return
 				}
 
-				//如果是移动在两个兄弟节点之间
 				if req.NextId > 0 {
 					if req.NextType == 1 {
-						//上一个节点是分类 下一个节点是分类的情况
-						//下一个兄弟节点
 						nextClassify, err := ai_summary.GetAiSummaryClassifyById(req.NextId)
 						if err != nil {
 							br.Msg = "移动失败"
 							br.ErrMsg = "获取下一个兄弟节点分类信息失败,Err:" + err.Error()
 							return
 						}
-						//如果上一个兄弟与下一个兄弟的排序权重是一致的，那么需要将下一个兄弟（以及下个兄弟的同样排序权重）的排序权重+2，自己变成上一个兄弟的排序权重+1
 						if prevClassify.Sort == nextClassify.Sort || prevClassify.Sort == aiSummaryClassifyInfo.Sort {
-							//变更兄弟节点的排序
 							updateSortStr := `sort + 2`
 							_ = ai_summary.UpdateAiSummaryClassifySortByParentId(prevClassify.ParentId, prevClassify.AiSummaryClassifyId, prevClassify.Sort, updateSortStr)
 							_ = ai_summary.UpdateAiSummarySortByClassifyId(prevClassify.AiSummaryClassifyId, prevClassify.Sort, 0, updateSortStr)
 						} else {
-							//如果下一个兄弟的排序权重正好是上个兄弟节点的下一层，那么需要再加一层了
 							if nextClassify.Sort-prevClassify.Sort == 1 {
-								//变更兄弟节点的排序
 								updateSortStr := `sort + 1`
 								_ = ai_summary.UpdateAiSummaryClassifySortByParentId(prevClassify.ParentId, 0, prevClassify.Sort, updateSortStr)
 								_ = ai_summary.UpdateAiSummarySortByClassifyId(prevClassify.AiSummaryClassifyId, prevClassify.Sort, 0, updateSortStr)
 							}
 						}
 					} else {
-						//上一个节点是分类 下一个节点是沙盘的情况
-						//下一个兄弟节点
 						nextChartInfo, err := ai_summary.GetAiSummaryById(req.NextId)
 						if err != nil {
 							br.Msg = "移动失败"
 							br.ErrMsg = "获取下一个兄弟节点分类信息失败,Err:" + err.Error()
 							return
 						}
-						//如果上一个兄弟(分类)与下一个兄弟(沙盘)的排序权重是一致的，那么需要将下一个兄弟(沙盘)（以及下个兄弟(沙盘)的同样排序权重）的排序权重+2，自己变成上一个兄弟(分类)的排序权重+1
 						if prevClassify.Sort == nextChartInfo.Sort || prevClassify.Sort == aiSummaryClassifyInfo.Sort {
-							//变更兄弟节点的排序
 							updateSortStr := `sort + 2`
 							_ = ai_summary.UpdateAiSummaryClassifySortByParentId(prevClassify.ParentId, prevClassify.AiSummaryClassifyId, prevClassify.Sort, updateSortStr)
 							_ = ai_summary.UpdateAiSummarySortByClassifyId(prevClassify.AiSummaryClassifyId, prevClassify.Sort, 0, updateSortStr)
 						} else {
-							//如果下一个兄弟(沙盘)的排序权重正好是上个兄弟节点(分类)的下一层，那么需要再加一层了
 							if nextChartInfo.Sort-prevClassify.Sort == 1 {
-								//变更兄弟节点的排序
 								updateSortStr := `sort + 1`
 								_ = ai_summary.UpdateAiSummaryClassifySortByParentId(prevClassify.ParentId, 0, prevClassify.AiSummaryClassifyId, updateSortStr)
 								_ = ai_summary.UpdateAiSummarySortByClassifyId(prevClassify.AiSummaryClassifyId, prevClassify.Sort, 0, updateSortStr)
@@ -722,7 +616,6 @@ func (this *AiController) AiSummaryClassifyMove() {
 				updateCol = append(updateCol, "Sort", "ModifyTime")
 
 			} else {
-				//上一个节点是沙盘
 				prevAiSumary, err := ai_summary.GetAiSummaryById(req.PrevId)
 				if err != nil {
 					br.Msg = "移动失败"
@@ -730,51 +623,38 @@ func (this *AiController) AiSummaryClassifyMove() {
 					return
 				}
 
-				//如果是移动在两个兄弟节点之间
 				if req.NextId > 0 {
 					if req.NextType == 1 {
-						//上一个节点是沙盘 下一个节点是分类的情况
-						//下一个兄弟节点
 						nextClassify, err := ai_summary.GetAiSummaryClassifyById(req.NextId)
 						if err != nil {
 							br.Msg = "移动失败"
 							br.ErrMsg = "获取下一个兄弟节点分类信息失败,Err:" + err.Error()
 							return
 						}
-						//如果上一个兄弟(沙盘)与下一个兄弟(分类)的排序权重是一致的，那么需要将下一个兄弟(分类)（以及下个兄弟(分类)的同样排序权重）的排序权重+2，自己变成上一个兄弟(沙盘)的排序权重+1
 						if prevAiSumary.Sort == nextClassify.Sort || prevAiSumary.Sort == aiSummaryClassifyInfo.Sort {
-							//变更兄弟节点的排序
 							updateSortStr := `sort + 2`
 							_ = ai_summary.UpdateAiSummaryClassifySortByParentId(prevAiSumary.ClassifyId, 0, prevAiSumary.Sort, updateSortStr)
 							_ = ai_summary.UpdateAiSummarySortByClassifyId(prevAiSumary.ClassifyId, prevAiSumary.Sort, prevAiSumary.AiSummaryId, updateSortStr)
 						} else {
-							//如果下一个兄弟(分类)的排序权重正好是上个兄弟(沙盘)节点的下一层，那么需要再加一层了
 							if nextClassify.Sort-prevAiSumary.Sort == 1 {
-								//变更兄弟节点的排序
 								updateSortStr := `sort + 1`
 								_ = ai_summary.UpdateAiSummaryClassifySortByParentId(prevAiSumary.ClassifyId, 0, prevAiSumary.Sort, updateSortStr)
 								_ = ai_summary.UpdateAiSummarySortByClassifyId(prevAiSumary.ClassifyId, prevAiSumary.Sort, prevAiSumary.AiSummaryId, updateSortStr)
 							}
 						}
 					} else {
-						//上一个节点是沙盘 下一个节点是沙盘的情况
-						//下一个兄弟节点
 						nextChartInfo, err := ai_summary.GetAiSummaryById(req.NextId)
 						if err != nil {
 							br.Msg = "移动失败"
 							br.ErrMsg = "获取下一个兄弟节点分类信息失败,Err:" + err.Error()
 							return
 						}
-						//如果上一个兄弟(沙盘)与下一个兄弟(分类)的排序权重是一致的，那么需要将下一个兄弟(分类)（以及下个兄弟(分类)的同样排序权重）的排序权重+2，自己变成上一个兄弟(沙盘)的排序权重+1
 						if prevAiSumary.Sort == nextChartInfo.Sort || prevAiSumary.Sort == aiSummaryClassifyInfo.Sort {
-							//变更兄弟节点的排序
 							updateSortStr := `sort + 2`
 							_ = ai_summary.UpdateAiSummaryClassifySortByParentId(prevAiSumary.ClassifyId, 0, prevAiSumary.Sort, updateSortStr)
 							_ = ai_summary.UpdateAiSummarySortByClassifyId(prevAiSumary.ClassifyId, prevAiSumary.Sort, prevAiSumary.AiSummaryId, updateSortStr)
 						} else {
-							//如果下一个兄弟(分类)的排序权重正好是上个兄弟(沙盘)节点的下一层，那么需要再加一层了
 							if nextChartInfo.Sort-prevAiSumary.Sort == 1 {
-								//变更兄弟节点的排序
 								updateSortStr := `sort + 1`
 								_ = ai_summary.UpdateAiSummaryClassifySortByParentId(prevAiSumary.ClassifyId, 0, prevAiSumary.Sort, updateSortStr)
 								_ = ai_summary.UpdateAiSummarySortByClassifyId(prevAiSumary.ClassifyId, prevAiSumary.Sort, prevAiSumary.AiSummaryId, updateSortStr)
@@ -797,7 +677,6 @@ func (this *AiController) AiSummaryClassifyMove() {
 				return
 			}
 
-			//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
 			if firstClassify != nil && firstClassify.AiSummaryClassifyId > 0 && firstClassify.Sort == 0 {
 				updateSortStr := ` sort + 1 `
 				_ = ai_summary.UpdateAiSummaryClassifySortByParentId(firstClassify.ParentId, firstClassify.AiSummaryClassifyId-1, 0, updateSortStr)
@@ -808,7 +687,6 @@ func (this *AiController) AiSummaryClassifyMove() {
 			updateCol = append(updateCol, "Sort", "ModifyTime")
 		}
 
-		//更新
 		if len(updateCol) > 0 {
 			err = aiSummaryClassifyInfo.Update(updateCol)
 			if err != nil {
@@ -824,14 +702,6 @@ func (this *AiController) AiSummaryClassifyMove() {
 	br.Msg = "移动成功"
 }
 
-// @Title Ai纪要列表接口
-// @Description Ai纪要列表接口
-// @Param   PageSize   query   int  true       "每页数据条数"
-// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
-// @Param   AiSummaryClassifyId   query   int  true       "分类id"
-// @Param   KeyWord   query   string  true       "搜索关键词"
-// @Param   IsShowMe   query   bool  true       "是否只看我的，true、false"
-// @Success 200 {object} data_manage.ChartListResp
 // @router /summary/list [get]
 func (this *AiController) AiSummaryList() {
 	br := new(models.BaseResponse).Init()
@@ -887,20 +757,17 @@ func (this *AiController) AiSummaryList() {
 			return
 		}
 		condition += " AND ai_summary_classify_id IN(" + sandboxClassifyIds + ") "
-		//pars = append(pars, chartClassifyId)
 	}
 	if keyWord != "" {
 		condition += ` AND  ( title LIKE '%` + keyWord + `%' )`
 	}
 
-	//只看我的
 	isShowMe, _ := this.GetBool("IsShowMe")
 	if isShowMe {
 		condition += ` AND sys_user_id = ? `
 		pars = append(pars, sysUser.AdminId)
 	}
 
-	//获取图表信息
 	list, err := ai_summary.GetAiSummaryListByCondition(condition, pars, startSize, pageSize)
 	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
@@ -913,12 +780,6 @@ func (this *AiController) AiSummaryList() {
 		parentIds := make([]int, 0)
 		aiSummaryService.GetSummaryParentIds(v.ClassifyId, classifyAllMap, &parentIds)
 		ids := utils.IntArr2joinString(parentIds, ",")
-		//ids, err := ai_summary.GetAiSummaryAllParentByClassifyId(v.ClassifyId)
-		//if err != nil {
-		//	br.Msg = "获取父级信息错误！"
-		//	br.ErrMsg = "获取父级信息错误，Err:" + err.Error()
-		//	return
-		//}
 		list[i].ParentIds = ids
 	}
 	resp := new(ai_summary.AiSummaryListResp)
@@ -947,10 +808,6 @@ func (this *AiController) AiSummaryList() {
 	br.Data = resp
 }
 
-// @Title Ai纪要详情接口
-// @Description Ai纪要详情接口
-// @Param   AiSummaryId   query   int  true       "详情id"
-// @Success 200 {object} data_manage.ChartListResp
 // @router /summary/detail [get]
 func (this *AiController) AiSummaryDetail() {
 	br := new(models.BaseResponse).Init()
@@ -1001,10 +858,6 @@ func (this *AiController) AiSummaryDetail() {
 	br.Msg = "获取成功"
 }
 
-// @Title 新增ai纪要
-// @Description 新增ai纪要接口
-// @Param	request	body data_manage.AddChartClassifyReq true "type json string"
-// @Success 200 Ret=200 保存成功
 // @router /summary/add [post]
 func (this *AiController) AddAiSummary() {
 	br := new(models.BaseResponse).Init()
@@ -1034,7 +887,6 @@ func (this *AiController) AddAiSummary() {
 		br.IsSendEmail = false
 		return
 	}
-	//获取该层级下最大的排序数
 	maxSort, err := ai_summary.GetAiSummaryMaxSort(req.ClassifyId)
 
 	summary := &ai_summary.AiSummary{
@@ -1078,10 +930,6 @@ func (this *AiController) AddAiSummary() {
 	br.Data = resp
 }
 
-// @Title 生成ai纪要
-// @Description 生成ai纪要接口
-// @Param	request	body data_manage.AddChartClassifyReq true "type json string"
-// @Success 200 Ret=200 保存成功
 // @router /summary/generate [post]
 func (this *AiController) GenerateAiSummary() {
 	br := new(models.BaseResponse).Init()
@@ -1168,21 +1016,9 @@ func (this *AiController) GenerateAiSummary() {
 	resp := new(aimod.ChatResp)
 
 	if req.OriginContent != "" {
-		// 直接提问的方式
-
-		//根据提问，获取信息
 		ask := req.Prompt + req.OriginContent
 
 		var answer string
-		//answerArr := []string{
-		//	"周度数据显示，成品油现货市场价格跟随原油下跌，但近期相对抗跌，裂解价差走扩。批零价差方面汽油收窄，柴油走扩",
-		//	"出口利润在原油下跌海外成品油矛盾更大的情况下汽柴油出口窗口完全关闭",
-		//	"汽油需求在经历五一假期的一段高峰后将回归平稳，总体没有明显矛盾，后期我们担心更多的还是柴油。"}
-		//获取主题下的所有信息
-		//AiChatTopicId
-
-		//获取主题下的所有信息
-		//AiChatTopicId
 		historyList, err := aimod.GetAiChatList(req.AiChatTopicId)
 		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取主题历史数据失败！"
@@ -1266,8 +1102,6 @@ func (this *AiController) GenerateAiSummary() {
 		}
 
 	} else if len(req.OpenaiFileId) > 0 {
-		// 走文件上传的方式
-		//根据提问，获取信息
 
 		ask := req.Prompt
 		askUuid := utils.MD5(ask)
@@ -1292,32 +1126,9 @@ func (this *AiController) GenerateAiSummary() {
 		}
 
 		var answer string
-		//获取主题下的所有信息
-		//AiChatTopicId
-		//historyList, err := aimod.GetAiChatList(req.AiChatTopicId)
-		//if err != nil && !utils.IsErrNoRow(err) {
-		//	br.Msg = "获取主题历史数据失败！"
-		//	br.ErrMsg = "获取主题历史数据失败，Err:" + err.Error()
-		//	return
-		//}
-
 		frList := make([]aimod.HistoryChat, 0)
 		tmpFileIdList := make([]string, 0)
 		tmpFileIdList = append(tmpFileIdList, req.OpenaiFileId...)
-		//// 历史消息
-		//for _, v := range historyList {
-		//	if v.OpenaiFileId != "" {
-		//		tmpFileIdList = append(tmpFileIdList, v.OpenaiFileId)
-		//	} else {
-		//		historyFr := new(aimod.HistoryChat)
-		//		historyFr.Ask = v.Ask
-		//		historyFr.Answer = v.Answer
-		//		historyFr.OpenaiFileId = tmpFileIdList
-		//		frList = append(frList, *historyFr)
-		//		tmpFileIdList = []string{}
-		//	}
-		//}
-		// 当前的消息
 		{
 			frItem := new(aimod.HistoryChat)
 			frItem.Ask = ask
@@ -1400,17 +1211,7 @@ func (this *AiController) GenerateAiSummary() {
 				br.ErrMsg = "生成话题记录失败，Err:" + err.Error()
 				return
 			}
-			//更新	assistantId,threadId
 			aiChatTopicObj := new(aimod.AiChatTopic)
-
-			//updateParams := make(map[string]interface{})
-			//updateParams["assistant_id"] = assistantId
-			//updateParams["thread_id"] = threadId
-			//updateParams["modify_time"] = time.Now()
-			//
-			//whereParam := make(map[string]interface{})
-			//whereParam["ai_chat_topic_id"] = req.AiChatTopicId
-
 			err = aiChatTopicObj.UpdateAssistantAndThreadId(assistantId, threadId, req.AiChatTopicId)
 			if err != nil {
 				br.Msg = "获取失败！"
@@ -1430,209 +1231,6 @@ func (this *AiController) GenerateAiSummary() {
 	br.Data = resp
 }
 
-//// @Title 文件上传
-//// @Description 文件上传接口
-//// @Param   File   query   file  true       "文件"
-//// @Param   AiChatTopicId   query   int  true       "主题id"
-//// @Success 200 {object} models.ResourceResp
-//// @router /file/upload [post]
-//func (this *AiFileController) FileUpload2() {
-//	br := new(models.BaseResponse).Init()
-//	defer func() {
-//		this.Data["json"] = br
-//		this.ServeJSON()
-//	}()
-//
-//	f, h, err := this.GetFile("File")
-//	if err != nil {
-//		br.Msg = "获取资源信息失败"
-//		br.ErrMsg = "获取资源信息失败,Err:" + err.Error()
-//		return
-//	}
-//	model := this.GetString("Model")
-//
-//	aiChatTopicId, _ := this.GetInt("AiChatTopicId")
-//
-//	uploadFileName := h.Filename //上传的文件名
-//	ext := path.Ext(h.Filename)
-//	dateDir := time.Now().Format("20060102")
-//	uploadDir := utils.STATIC_DIR + "ai/" + dateDir
-//	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
-//	if err != nil {
-//		br.Msg = "存储目录创建失败"
-//		br.ErrMsg = "存储目录创建失败,Err:" + err.Error()
-//		return
-//	}
-//	randStr := utils.GetRandStringNoSpecialChar(28)
-//	fileName := randStr + ext
-//	fpath := uploadDir + "/" + fileName
-//	defer f.Close() //关闭上传文件
-//	err = this.SaveToFile("File", fpath)
-//	if err != nil {
-//		br.Msg = "文件上传失败"
-//		br.ErrMsg = "文件上传失败，Err:" + err.Error()
-//		return
-//	}
-//	resourceUrl := ``
-//	ossClient := services.NewOssClient()
-//	if ossClient == nil {
-//		br.Msg = "上传失败"
-//		br.ErrMsg = "初始化OSS服务失败"
-//		return
-//	}
-//	resourceUrl, err = ossClient.UploadFile(fileName, fpath, "")
-//	if err != nil {
-//		br.Msg = "文件上传失败"
-//		br.ErrMsg = "文件上传失败，Err:" + err.Error()
-//		return
-//	}
-//
-//	defer func() {
-//		os.Remove(fpath)
-//	}()
-//
-//	item := new(models.Resource)
-//	item.ResourceUrl = resourceUrl
-//	item.ResourceType = 1
-//	item.CreateTime = time.Now()
-//	newId, err := models.AddResource(item)
-//	if err != nil {
-//		br.Msg = "资源上传失败"
-//		br.ErrMsg = "资源上传失败,Err:" + err.Error()
-//		return
-//	}
-//	//调用AI接口，上传文件
-//	resp := models.ResourceResp{
-//		Id:           newId,
-//		ResourceUrl:  resourceUrl,
-//		ResourceName: uploadFileName,
-//	}
-//	uploadResult, err := aiser.OpenAiFileUpload(resourceUrl, uploadFileName, model)
-//	if err != nil {
-//		br.Msg = "文件上传失败"
-//		br.ErrMsg = "文件上传失败,Err:" + err.Error()
-//		return
-//	}
-//
-//	var assistantId, threadId string
-//	if aiChatTopicId > 0 {
-//		aiChatTopicObj := new(aimod.AiChatTopic)
-//		aiChatTopicObj.AiChatTopicId = aiChatTopicId
-//		topic, err := aiChatTopicObj.GetAiChatTopicById()
-//		if err != nil {
-//			if utils.IsErrNoRow(err) {
-//				br.Msg = "获取数据失败！"
-//				br.ErrMsg = "获取数据失败,主题不存在，Err:" + err.Error()
-//				return
-//			}
-//			br.Msg = "获取数据失败！"
-//			br.ErrMsg = "获取数据失败,GetAiChatTopicById，Err:" + err.Error()
-//			return
-//		}
-//		assistantId = topic.AssistantId
-//		threadId = topic.ThreadId
-//	}
-//
-//	if aiChatTopicId <= 0 { //新增
-//		topic := new(aimod.AiChatTopic)
-//		var filenameWithSuffix string
-//		filenameWithSuffix = path.Base(uploadFileName)
-//		var fileSuffix string
-//		fileSuffix = path.Ext(filenameWithSuffix)
-//		var filenameOnly string
-//		filenameOnly = strings.TrimSuffix(filenameWithSuffix, fileSuffix)
-//		topic.TopicName = filenameOnly
-//		topic.SysUserId = this.SysUser.AdminId
-//		topic.SysUserRealName = this.SysUser.RealName
-//		topic.CreateTime = time.Now()
-//		topic.ModifyTime = time.Now()
-//		topic.AssistantId = assistantId
-//		topic.ThreadId = threadId
-//		topicId, err := aimod.AddAiChatTopic(topic)
-//		if err != nil {
-//			br.Msg = "获取数据失败！"
-//			br.ErrMsg = "生成话题失败，Err:" + err.Error()
-//			return
-//		}
-//		aiChatTopicId = int(topicId)
-//		chatItem := new(aimod.AiChat)
-//		chatItem.AiChatTopicId = aiChatTopicId
-//		chatItem.Ask = uploadFileName
-//		chatItem.AskUuid = utils.MD5(uploadFileName)
-//		chatItem.Model = EnabledModelsForMap[model]
-//		chatItem.SysUserId = this.SysUser.AdminId
-//		chatItem.SysUserRealName = this.SysUser.RealName
-//		if uploadResult != nil && uploadResult.Data != nil {
-//			chatItem.OpenaiFileId = uploadResult.Data.ID
-//			chatItem.OpenaiFileName = uploadFileName
-//		}
-//		chatItem.OpenaiFilePath = resourceUrl
-//		chatItem.CreateTime = time.Now()
-//		chatItem.ModifyTime = time.Now()
-//		_, err = aimod.AddAiChat(chatItem)
-//		if err != nil {
-//			br.Msg = "获取数据失败！"
-//			br.ErrMsg = "生成话题记录失败，Err:" + err.Error()
-//			return
-//		}
-//	} else {
-//		chatItem := new(aimod.AiChat)
-//		chatItem.AiChatTopicId = aiChatTopicId
-//		chatItem.Ask = uploadFileName
-//		chatItem.AskUuid = utils.MD5(fileName)
-//		chatItem.Model = EnabledModelsForMap[model]
-//		chatItem.SysUserId = this.SysUser.AdminId
-//		chatItem.SysUserRealName = this.SysUser.RealName
-//		if uploadResult != nil && uploadResult.Data != nil {
-//			chatItem.OpenaiFileId = uploadResult.Data.ID
-//			chatItem.OpenaiFileName = uploadFileName
-//		}
-//		chatItem.OpenaiFilePath = resourceUrl
-//		chatItem.CreateTime = time.Now()
-//		chatItem.ModifyTime = time.Now()
-//		_, err = aimod.AddAiChat(chatItem)
-//		if err != nil {
-//			br.Msg = "获取数据失败！"
-//			br.ErrMsg = "生成话题记录失败，Err:" + err.Error()
-//			return
-//		}
-//	}
-//
-//	if uploadResult != nil && uploadResult.Data != nil && uploadResult.Data.ID != "" {
-//		uploadObj := new(aimod.FileUploadRecord)
-//		uploadObj.AdminId = this.SysUser.AdminId
-//		uploadObj.FileUrl = resourceUrl
-//		uploadObj.FileName = uploadFileName
-//		uploadObj.OpenaiFileId = uploadResult.Data.ID
-//		uploadObj.OpenaiFileName = uploadResult.Data.FileName
-//		uploadObj.OpenaiObject = uploadResult.Data.Object
-//		uploadObj.OpenaiStatus = uploadResult.Data.Status
-//		uploadObj.OpenaiPurpose = uploadResult.Data.Purpose
-//		uploadObj.OpenaiStatusDetails = uploadResult.Data.StatusDetails
-//		uploadObj.OpenaiCreatedAt = uploadResult.Data.CreatedAt
-//		uploadObj.CreateTime = time.Now()
-//		uploadObj.ModifyTime = time.Now()
-//		_, err = uploadObj.AddFileUploadRecord()
-//		if err != nil {
-//			br.Msg = "上传失败"
-//			br.ErrMsg = "上传失败,Err:" + err.Error()
-//			return
-//		}
-//		resp.OpenaiFileId = uploadObj.OpenaiFileId
-//	}
-//	resp.AiChatTopicId = aiChatTopicId
-//	br.Msg = "上传成功"
-//	br.Ret = 200
-//	br.Success = true
-//	br.Data = resp
-//	return
-//}
-
-// AiSummaryClassifyList
-// @Title 获取所有纪要分类接口-不包含沙盘
-// @Description 获取所有纪要分类接口-不包含沙盘
-// @Param   IsShowMe   query   bool  true       "是否只看我的，true、false"
-// @Success 200 {object} data_manage.ChartClassifyListResp
 // @router /summary/classifyList [get]
 func (this *AiController) AiSummaryClassifyList() {
 	br := new(models.BaseResponse).Init()

controllers/bi_approve/bi_approve.go

@@ -17,21 +17,6 @@ type BiApproveController struct {
 	controllers.BaseAuthController
 }
 
-// List
-// @Title 审批列表
-// @Description 审批列表
-// @Param   PageSize			query	int		true	"每页数据条数"
-// @Param   CurrentIndex		query	int		true	"当前页页码"
-// @Param   ListType			query   int     true	"列表类型：1-待处理；2-已处理；3-我发起的"
-// @Param   ClassifyId			query	int		false	"分类ID"
-// @Param   Keyword				query	string	false	"搜索关键词"
-// @Param   ApproveState		query	int		false	"审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回"
-// @Param   TimeType			query	int		false	"时间类型：1-提交时间；2-处理时间；3-审批时间"
-// @Param   StartTime			query	string	false	"开始时间"
-// @Param   EndTime				query	string	false	"结束时间"
-// @Param   SortField			query	int		false	"排序字段：1-提交时间；2-处理时间；3-审批时间"
-// @Param   SortRule			query	int		false	"排序方式: 1-正序; 2-倒序(默认)"
-// @Success 200 {object} report_approve.BiApproveListResp
 // @router /list [get]
 func (this *BiApproveController) List() {
 	br := new(models.BaseResponse).Init()
@@ -119,10 +104,6 @@ func (this *BiApproveController) List() {
 	br.Success = true
 }
 
-// list
-// @Title 公共看板分类列表
-// @Description 公共看板分类列表
-// @Success 200 {object} report_approve.BiApproveFlowDetailItem
 // @router /classify/list [get]
 func (this *BiApproveController) ClassifyList() {
 	br := new(models.BaseResponse).Init()
@@ -150,11 +131,6 @@ func (this *BiApproveController) ClassifyList() {
 	br.Success = true
 }
 
-// Approve
-// @Title 通过审批
-// @Description 通过审批
-// @Param	request	body report_approve.BiApprovePassReq true "type json string"
-// @Success 200 string "操作成功"
 // @router /approve [post]
 func (this *BiApproveController) Approve() {
 	br := new(models.BaseResponse).Init()
@@ -201,11 +177,6 @@ func (this *BiApproveController) Approve() {
 	br.Msg = "操作成功"
 }
 
-// Detail
-// @Title 审批详情
-// @Description 审批详情
-// @Param   BiApproveId  query  int  true  "审批ID"
-// @Success 200 {object} report_approve.BiApproveDetail
 // @router /detail [get]
 func (this *BiApproveController) Detail() {
 	br := new(models.BaseResponse).Init()
@@ -247,11 +218,6 @@ func (this *BiApproveController) Detail() {
 	br.Msg = "获取成功"
 }
 
-// Refuse
-// @Title 驳回审批
-// @Description 驳回审批
-// @Param	request	body request.BiApproveRefuseReq true "type json string"
-// @Success 200 string "操作成功"
 // @router /refuse [post]
 func (this *BiApproveController) Refuse() {
 	br := new(models.BaseResponse).Init()
@@ -302,11 +268,6 @@ func (this *BiApproveController) Refuse() {
 	br.Msg = "操作成功"
 }
 
-// Cancel
-// @Title 撤销审批
-// @Description 撤销审批
-// @Param	request	body report_approve.BiApproveCancelReq true "type json string"
-// @Success 200 string "操作成功"
 // @router /cancel [post]
 func (this *BiApproveController) Cancel() {
 	br := new(models.BaseResponse).Init()
@@ -353,12 +314,6 @@ func (this *BiApproveController) Cancel() {
 	br.Msg = "操作成功"
 }
 
-// MessageList
-// @Title 审批消息列表
-// @Description 审批消息列表
-// @Param   PageSize			query	int		true	"每页数据条数"
-// @Param   CurrentIndex		query	int		true	"当前页页码"
-// @Success 200 {object} report_approve.BiApproveMessageListResp
 // @router /message/list [get]
 func (this *BiApproveController) MessageList() {
 	br := new(models.BaseResponse).Init()
@@ -411,11 +366,6 @@ func (this *BiApproveController) MessageList() {
 	br.Msg = "获取成功"
 }
 
-// MessageRead
-// @Title 消息已读
-// @Description 消息已读
-// @Param	request	body report_approve.BiApproveMessageReadReq true "type json string"
-// @Success 200 string "操作成功"
 // @router /message/read [post]
 func (this *BiApproveController) MessageRead() {
 	br := new(models.BaseResponse).Init()
@@ -461,11 +411,6 @@ func (this *BiApproveController) MessageRead() {
 	br.Msg = "操作成功"
 }
 
-// CheckApproveOpen
-// @Title 校验分类是否开启审批
-// @Description 校验分类是否开启审批
-// @Param	request	body report_approve.BiApproveCheckApproveOpenReq true "type json string"
-// @Success 200 string "操作成功"
 // @router /classify/check_open [post]
 func (this *BiApproveController) CheckApproveOpen() {
 	br := new(models.BaseResponse).Init()
@@ -490,7 +435,6 @@ func (this *BiApproveController) CheckApproveOpen() {
 		return
 	}
 
-	// 校验是否开启了审批流
 	opening, e := biapprove.CheckBiOpenApprove(req.ClassifyId)
 	if e != nil {
 		br.Msg = "操作失败"

controllers/bi_approve/bi_approve_flow.go

@@ -17,15 +17,6 @@ type BiApproveFlowController struct {
 	controllers.BaseAuthController
 }
 
-// List
-// @Title 审批流列表
-// @Description 审批流列表
-// @Param   PageSize			query	int		true	"每页数据条数"
-// @Param   CurrentIndex		query	int		true	"当前页页码"
-// @Param   ClassifyId		query	int		false	"分类ID"
-// @Param   Keyword				query	string	false	"搜索关键词"
-// @Param   SortRule			query	int		false	"排序方式: 1-正序; 2-倒序(默认)"
-// @Success 200 {object} report_approve.ReportApproveListResp
 // @router /flow/list [get]
 func (c *BiApproveFlowController) List() {
 	br := new(models.BaseResponse).Init()
@@ -85,11 +76,6 @@ func (c *BiApproveFlowController) List() {
 	br.Ret = 200
 }
 
-// Add
-// @Title 新增审批流
-// @Description 新增审批流
-// @Param	request	body request.BiApproveFlowSaveReq true "type json string"
-// @Success 200
 // @router /flow/add [post]
 func (c *BiApproveFlowController) Add() {
 	br := new(models.BaseResponse).Init()
@@ -146,11 +132,6 @@ func (c *BiApproveFlowController) Add() {
 	br.Ret = 200
 }
 
-// edit
-// @Title 新增审批流
-// @Description 新增审批流
-// @Param	request	body request.BiApproveFlowSaveReq true "type json string"
-// @Success 200 {object} report_approve.ReportApproveFlowDetailItem
 // @router /flow/edit [post]
 func (c *BiApproveFlowController) Edit() {
 	br := new(models.BaseResponse).Init()
@@ -211,11 +192,6 @@ func (c *BiApproveFlowController) Edit() {
 	br.Ret = 200
 }
 
-// delete
-// @Title 新增审批流
-// @Description 新增审批流
-// @Param	request	body request.BiApproveFlowRemoveResp true "type json string"
-// @Success 200 {object} report_approve.ReportApproveFlowDetailItem
 // @router /flow/remove [post]
 func (c *BiApproveFlowController) Remove() {
 	br := new(models.BaseResponse).Init()
@@ -256,11 +232,6 @@ func (c *BiApproveFlowController) Remove() {
 	br.Ret = 200
 }
 
-// Detail
-// @Title 审批流详情
-// @Description 审批流详情
-// @Param	request	body request.BiApproveFlowRemoveResp true "type json string"
-// @Success 200 {object} report_approve.ReportApproveFlowDetailItem
 // @router /flow/detail [get]
 func (c *BiApproveFlowController) Detail() {
 	br := new(models.BaseResponse).Init()

controllers/data_manage/correlation/correlation_chart_classify.go

@@ -15,18 +15,10 @@ import (
 	"time"
 )
 
-// CorrelationChartClassifyController 相关性图表分类
 type CorrelationChartClassifyController struct {
 	controllers.BaseAuthController
 }
 
-// ChartClassifyList
-// @Title 相关性图表分类列表
-// @Description 相关性图表分类列表接口
-// @Param   IsShowMe   query   bool  false       "是否只看我的，true、false"
-// @Param   ParentId   query   bool  false       "父级ID"
-// @Param   Source   query   int  false       "图表类型，3：相关性，4：滚动相关性"
-// @Success 200 {object} data_manage.ChartClassifyListResp
 // @router /chart_classify/list [get]
 func (this *CorrelationChartClassifyController) ChartClassifyList() {
 	br := new(models.BaseResponse).Init()
@@ -39,21 +31,6 @@ func (this *CorrelationChartClassifyController) ChartClassifyList() {
 	}()
 	resp := new(data_manage.ChartClassifyListResp)
 
-	// 获取当前账号的不可见指标
-	//noPermissionChartIdMap := make(map[int]bool)
-	//{
-	//	obj := data_manage.EdbInfoNoPermissionAdmin{}
-	//	confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-	//	if err != nil && !utils.IsErrNoRow(err) {
-	//		br.Msg = "获取失败"
-	//		br.ErrMsg = "获取不可见指标配置数据失败，Err:" + err.Error()
-	//		return
-	//	}
-	//	for _, v := range confList {
-	//		noPermissionChartIdMap[v.ChartInfoId] = true
-	//	}
-	//}
-
 	isShowMe, _ := this.GetBool("IsShowMe")
 	parentId, _ := this.GetInt("ParentId")
 	source, _ := this.GetInt("Source", utils.CHART_SOURCE_CORRELATION)
@@ -87,9 +64,7 @@ func (this *CorrelationChartClassifyController) ChartClassifyList() {
 		}
 	}
 
-	// 查询图表节点, ParentId=0时说明仅查询一级目录节点
 	if parentId > 0 {
-		// 查询当前分类信息
 		currClassify, e := data_manage.GetChartClassifyById(parentId)
 		if e != nil {
 			br.Msg = "获取失败"
@@ -97,7 +72,6 @@ func (this *CorrelationChartClassifyController) ChartClassifyList() {
 			return
 		}
 
-		// 获取所有有权限的指标和分类
 		permissionEdbIdList, permissionClassifyIdList, e := data_manage_permission.GetUserChartAndClassifyPermissionList(this.SysUser.AdminId, 0, 0)
 		if e != nil {
 			br.Msg = "获取失败"
@@ -117,7 +91,6 @@ func (this *CorrelationChartClassifyController) ChartClassifyList() {
 			return
 		}
 		for _, v := range charts {
-			// 操作按钮权限
 			v.HaveOperaAuth = data_manage_permission.CheckChartPermissionByPermissionIdList(v.IsJoinPermission, currClassify.IsJoinPermission, v.ChartInfoId, v.ChartClassifyId, permissionEdbIdList, permissionClassifyIdList)
 			button := data.GetChartOpButton(this.SysUser, v.SysUserId, v.HaveOperaAuth)
 			button.AddButton = false //不管有没有权限，图表都是没有添加按钮的
@@ -129,7 +102,6 @@ func (this *CorrelationChartClassifyController) ChartClassifyList() {
 		}
 	}
 
-	// 整体排序
 	if len(nodeAll) > 0 {
 		sort.Slice(nodeAll, func(i, j int) bool {
 			return nodeAll[i].Sort < nodeAll[j].Sort
@@ -143,10 +115,6 @@ func (this *CorrelationChartClassifyController) ChartClassifyList() {
 	br.Data = resp
 }
 
-// ChartClassifyItems
-// @Title 获取所有相关性图表分类接口-不包含图表
-// @Description 获取所有相关性图表分类接口-不包含图表
-// @Success 200 {object} data_manage.ChartClassifyListResp
 // @router /chart_classify/items [get]
 func (this *CorrelationChartClassifyController) ChartClassifyItems() {
 	br := new(models.BaseResponse).Init()
@@ -174,11 +142,6 @@ func (this *CorrelationChartClassifyController) ChartClassifyItems() {
 	br.Data = resp
 }
 
-// AddChartClassify
-// @Title 新增相关性图表分类
-// @Description 新增相关性图表分类接口
-// @Param	request	body data_manage.AddChartClassifyReq true "type json string"
-// @Success 200 Ret=200 保存成功
 // @router /chart_classify/add [post]
 func (this *CorrelationChartClassifyController) AddChartClassify() {
 	br := new(models.BaseResponse).Init()
@@ -204,7 +167,6 @@ func (this *CorrelationChartClassifyController) AddChartClassify() {
 		return
 	}
 
-	// 新增图表分类
 	_, err, errMsg, isSendEmail := data.AddChartClassify(req.ChartClassifyName, req.ParentId, req.Level, utils.CHART_SOURCE_CORRELATION, this.Lang, this.SysUser)
 	if err != nil {
 		br.Msg = errMsg
@@ -218,11 +180,6 @@ func (this *CorrelationChartClassifyController) AddChartClassify() {
 	br.Success = true
 }
 
-// EditChartClassify
-// @Title 修改相关性图表分类
-// @Description 修改相关性图表分类接口
-// @Param	request	body data_manage.EditChartClassifyReq true "type json string"
-// @Success 200 Ret=200 修改成功
 // @router /chart_classify/edit [post]
 func (this *CorrelationChartClassifyController) EditChartClassify() {
 	br := new(models.BaseResponse).Init()
@@ -249,7 +206,6 @@ func (this *CorrelationChartClassifyController) EditChartClassify() {
 		return
 	}
 
-	// 编辑图表分类
 	_, err, errMsg, isSendEmail := data.EditChartClassify(req.ChartClassifyId, utils.CHART_SOURCE_CORRELATION, req.ChartClassifyName, this.Lang, this.SysUser)
 	if err != nil {
 		br.Msg = errMsg
@@ -264,11 +220,6 @@ func (this *CorrelationChartClassifyController) EditChartClassify() {
 	br.IsAddLog = true
 }
 
-// DeleteChartClassifyCheck
-// @Title 删除图表检测接口
-// @Description 删除图表检测接口
-// @Param	request	body data_manage.ChartClassifyDeleteCheckResp true "type json string"
-// @Success 200 Ret=200 检测成功
 // @router /chart_classify/delete/check [post]
 func (this *CorrelationChartClassifyController) DeleteChartClassifyCheck() {
 	br := new(models.BaseResponse).Init()
@@ -292,9 +243,7 @@ func (this *CorrelationChartClassifyController) DeleteChartClassifyCheck() {
 	var deleteStatus int
 	var tipsMsg string
 	childIds := make([]int, 0)
-	//删除分类
 	if req.ChartClassifyId > 0 && req.ChartInfoId == 0 {
-		//判断相关性图表分类下，是否含有图表
 		classifyAll, err := data_manage.GetChartClassifyAllBySource(utils.CHART_SOURCE_CORRELATION)
 		if err != nil {
 			br.Msg = "删除失败"
@@ -321,13 +270,6 @@ func (this *CorrelationChartClassifyController) DeleteChartClassifyCheck() {
 			br.ErrMsg = "判断图表名称是否存在失败,Err:" + err.Error()
 			return
 		}
-		//count, err := data_manage.GetChartInfoCountByClassifyId(req.ChartClassifyId)
-		//if err != nil {
-		//	br.Msg = "删除失败"
-		//	br.ErrMsg = "分类下是否含有图表失败，Err:" + err.Error()
-		//	return
-		//}
-
 		if count > 0 {
 			deleteStatus = 1
 			tipsMsg = "该分类下关联图表不可删除"
@@ -335,12 +277,7 @@ func (this *CorrelationChartClassifyController) DeleteChartClassifyCheck() {
 	}
 
 	if deleteStatus != 1 && req.ChartInfoId == 0 {
-		//classifyCount, err := data_manage.GetChartClassifyCountByClassifyId(req.ChartClassifyId)
-		//if err != nil && !utils.IsErrNoRow(err) {
-		//	br.Msg = "删除失败"
-		//	br.ErrMsg = "分类下是否含有图表失败，Err:" + err.Error()
-		//	return
-		//}
+
 		if len(childIds) > 0 {
 			deleteStatus = 2
 			tipsMsg = "确认删除当前目录及包含的子目录吗"
@@ -359,11 +296,6 @@ func (this *CorrelationChartClassifyController) DeleteChartClassifyCheck() {
 	br.Data = resp
 }
 
-// DeleteChartClassify
-// @Title 删除相关性图表分类/图表
-// @Description 删除相关性图表分类/图表接口
-// @Param	request	body data_manage.DeleteChartClassifyReq true "type json string"
-// @Success 200 Ret=200 删除成功
 // @router /chart_classify/delete [post]
 func (this *CorrelationChartClassifyController) DeleteChartClassify() {
 	br := new(models.BaseResponse).Init()
@@ -394,9 +326,7 @@ func (this *CorrelationChartClassifyController) DeleteChartClassify() {
 		return
 	}
 
-	//删除分类
 	if req.ChartClassifyId > 0 && req.ChartInfoId == 0 {
-		//判断是否含有指标
 		childIds := make([]int, 0)
 		classifyAll, err := data_manage.GetChartClassifyAllBySource(utils.CHART_SOURCE_CORRELATION)
 		if err != nil {
@@ -424,13 +354,6 @@ func (this *CorrelationChartClassifyController) DeleteChartClassify() {
 			br.ErrMsg = "判断图表名称是否存在失败,Err:" + err.Error()
 			return
 		}
-		//count, err := data_manage.GetChartInfoCountByClassifyId(req.ChartClassifyId)
-		//if err != nil && !utils.IsErrNoRow(err) {
-		//	br.Msg = "删除失败"
-		//	br.ErrMsg = "判断名称是否已存在失败，Err:" + err.Error()
-		//	return
-		//}
-
 		if count > 0 {
 			br.Msg = "该目录下存在关联指标，不可删除"
 			br.IsSendEmail = false
@@ -440,7 +363,6 @@ func (this *CorrelationChartClassifyController) DeleteChartClassify() {
 		delIds := append(childIds, req.ChartClassifyId)
 
 		err = data_manage.DeleteChartClassifyByIds(delIds)
-		//err = data_manage.DeleteChartClassify(req.ChartClassifyId)
 		if err != nil {
 			br.Msg = "删除失败"
 			br.ErrMsg = "删除失败,Err:" + err.Error()
@@ -448,7 +370,6 @@ func (this *CorrelationChartClassifyController) DeleteChartClassify() {
 		}
 	}
 	resp := new(data_manage.AddChartInfoResp)
-	//删除图表
 	if req.ChartInfoId > 0 {
 		chartInfo, err := data_manage.GetChartInfoById(req.ChartInfoId)
 		if err != nil {
@@ -466,7 +387,6 @@ func (this *CorrelationChartClassifyController) DeleteChartClassify() {
 			br.Msg = "图表已删除，请刷新页面"
 			return
 		}
-		//图表操作权限
 		ok := data.CheckOpChartPermission(sysUser, chartInfo.SysUserId, true)
 		if !ok {
 			br.Msg = "没有该图表的操作权限"
@@ -474,7 +394,6 @@ func (this *CorrelationChartClassifyController) DeleteChartClassify() {
 			return
 		}
 
-		// 获取引用该图表的MyCharts, 用于ES删除
 		var myCond string
 		var myPars []interface{}
 		myCond += ` AND a.chart_info_id = ? `
@@ -491,18 +410,14 @@ func (this *CorrelationChartClassifyController) DeleteChartClassify() {
 		}
 
 		source := chartInfo.Source // 相关性图表(滚动相关性)
-		//删除图表及关联指标
 		err = data_manage.DeleteChartInfoAndData(chartInfo.ChartInfoId)
 		if err != nil {
 			br.Msg = "删除失败"
 			br.ErrMsg = "删除失败，Err:" + err.Error()
 			return
 		}
-		//删除ES
 		{
 			go data.EsDeleteChartInfo(chartInfo.ChartInfoId)
-			// 删除MY ETA 图表 es数据
-			//go data.EsDeleteMyChartInfoByChartInfoId(chartInfo.ChartInfoId)
 			go data.EsDeleteMyChartInfoByMyChartIds(myIds)
 		}
 
@@ -529,8 +444,6 @@ func (this *CorrelationChartClassifyController) DeleteChartClassify() {
 			var pars []interface{}
 
 			condition += " AND level=1 "
-			//pars = append(pars, chartInfo.ChartClassifyId)
-
 			condition += " AND chart_classify_id>? ORDER BY chart_classify_id ASC LIMIT 1 "
 			pars = append(pars, chartInfo.ChartClassifyId)
 
@@ -554,7 +467,6 @@ func (this *CorrelationChartClassifyController) DeleteChartClassify() {
 			}
 		}
 
-		// 删除图表关联
 		e = correlationServ.RemoveCorrelationRelate(chartInfo.ChartInfoId)
 		if e != nil {
 			br.Msg = "删除失败"
@@ -562,7 +474,6 @@ func (this *CorrelationChartClassifyController) DeleteChartClassify() {
 			return
 		}
 
-		//新增操作日志
 		{
 			chartLog := new(data_manage.ChartInfoLog)
 			chartLog.ChartName = chartInfo.ChartName
@@ -586,10 +497,6 @@ func (this *CorrelationChartClassifyController) DeleteChartClassify() {
 	br.IsAddLog = true
 }
 
-// ChartClassifyMove
-// @Title 相关性图表分类移动接口
-// @Description 相关性图表分类移动接口
-// @Success 200 {object} data_manage.MoveChartClassifyReq
 // @router /chart_classify/move [post]
 func (this *CorrelationChartClassifyController) ChartClassifyMove() {
 	br := new(models.BaseResponse).Init()
@@ -631,116 +538,11 @@ func (this *CorrelationChartClassifyController) ChartClassifyMove() {
 		}
 		return
 	}
-
-	//if req.ClassifyId <= 0 {
-	//	br.Msg = "参数错误"
-	//	br.ErrMsg = "分类id小于等于0"
-	//	return
-	//}
-	//
-	////判断分类是否存在
-	//chartClassifyInfo, err := data_manage.GetChartClassifyById(req.ClassifyId)
-	//if err != nil {
-	//	br.Msg = "移动失败"
-	//	br.ErrMsg = "获取分类信息失败,Err:" + err.Error()
-	//	return
-	//}
-	//if chartClassifyInfo.Source != utils.CHART_SOURCE_CORRELATION {
-	//	br.Msg = "分类异常"
-	//	br.ErrMsg = "分类异常,不是相关性图表的分类"
-	//	return
-	//}
-	//updateCol := make([]string, 0)
-	//
-	////判断上级id是否一致，如果不一致的话，那么需要移动该分类层级
-	//if chartClassifyInfo.ParentId != req.ParentClassifyId && req.ParentClassifyId != 0 {
-	//	parentChartClassifyInfo, err := data_manage.GetChartClassifyById(req.ParentClassifyId)
-	//	if err != nil {
-	//		br.Msg = "移动失败"
-	//		br.ErrMsg = "获取上级分类信息失败,Err:" + err.Error()
-	//		return
-	//	}
-	//	chartClassifyInfo.ParentId = parentChartClassifyInfo.ChartClassifyId
-	//	chartClassifyInfo.Level = parentChartClassifyInfo.Level + 1
-	//	chartClassifyInfo.ModifyTime = time.Now()
-	//	updateCol = append(updateCol, "ParentId", "Level", "ModifyTime")
-	//}
-	//
-	////如果有传入 上一个兄弟节点分类id
-	//if req.PrevClassifyId > 0 {
-	//	//上一个兄弟节点
-	//	prevClassify, err := data_manage.GetChartClassifyById(req.PrevClassifyId)
-	//	if err != nil {
-	//		br.Msg = "移动失败"
-	//		br.ErrMsg = "获取上一个兄弟节点分类信息失败,Err:" + err.Error()
-	//		return
-	//	}
-	//
-	//	//如果是移动在两个兄弟节点之间
-	//	if req.NextClassifyId > 0 {
-	//		//下一个兄弟节点
-	//		nextClassify, err := data_manage.GetChartClassifyById(req.NextClassifyId)
-	//		if err != nil {
-	//			br.Msg = "移动失败"
-	//			br.ErrMsg = "获取下一个兄弟节点分类信息失败,Err:" + err.Error()
-	//			return
-	//		}
-	//		//如果上一个兄弟与下一个兄弟的排序权重是一致的，那么需要将下一个兄弟（以及下个兄弟的同样排序权重）的排序权重+2，自己变成上一个兄弟的排序权重+1
-	//		if prevClassify.Sort == nextClassify.Sort || prevClassify.Sort == chartClassifyInfo.Sort {
-	//			//变更兄弟节点的排序
-	//			updateSortStr := `sort + 2`
-	//			_ = data_manage.UpdateChartClassifySortByParentId(prevClassify.ParentId, prevClassify.ChartClassifyId, prevClassify.Sort, updateSortStr)
-	//		} else {
-	//			//如果下一个兄弟的排序权重正好是上个兄弟节点的下一层，那么需要再加一层了
-	//			if nextClassify.Sort-prevClassify.Sort == 1 {
-	//				//变更兄弟节点的排序
-	//				updateSortStr := `sort + 1`
-	//				_ = data_manage.UpdateChartClassifySortByParentId(prevClassify.ParentId, 0, prevClassify.Sort, updateSortStr)
-	//			}
-	//		}
-	//	}
-	//
-	//	chartClassifyInfo.Sort = prevClassify.Sort + 1
-	//	chartClassifyInfo.ModifyTime = time.Now()
-	//	updateCol = append(updateCol, "Sort", "ModifyTime")
-	//
-	//} else {
-	//	firstClassify, err := data_manage.GetFirstChartClassifyByParentId(chartClassifyInfo.ParentId)
-	//	if err != nil && !utils.IsErrNoRow(err) {
-	//		br.Msg = "移动失败"
-	//		br.ErrMsg = "获取获取当前父级分类下的排序第一条的分类信息失败,Err:" + err.Error()
-	//		return
-	//	}
-	//
-	//	//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-	//	if firstClassify != nil && firstClassify.ChartClassifyId > 0 && firstClassify.Sort == 0 {
-	//		updateSortStr := ` sort + 1 `
-	//		_ = data_manage.UpdateChartClassifySortByParentId(firstClassify.ParentId, firstClassify.ChartClassifyId-1, 0, updateSortStr)
-	//	}
-	//
-	//	chartClassifyInfo.Sort = 0 //那就是排在第一位
-	//	chartClassifyInfo.ModifyTime = time.Now()
-	//	updateCol = append(updateCol, "Sort", "ModifyTime")
-	//}
-	//
-	////更新
-	//if len(updateCol) > 0 {
-	//	err = chartClassifyInfo.Update(updateCol)
-	//	if err != nil {
-	//		br.Msg = "移动失败"
-	//		br.ErrMsg = "修改失败,Err:" + err.Error()
-	//		return
-	//	}
-	//}
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "移动成功"
 }
 
-// ClassifyTree
-// @Title 多层分类列表树
-// @Description 多层分类列表树
-// @Success 200 {object} data_manage.ChartClassifyListResp
 // @router /chart_classify/tree [get]
 func (this *CorrelationChartClassifyController) ClassifyTree() {
 	br := new(models.BaseResponse).Init()
@@ -761,7 +563,6 @@ func (this *CorrelationChartClassifyController) ClassifyTree() {
 	nodeAll := make([]*data_manage.ChartClassifyItems, 0)
 
 	if len(allList) > 0 {
-		// 已授权分类id
 		permissionClassifyIdList, e := data_manage_permission.GetUserChartClassifyPermissionList(this.SysUser.AdminId, 0)
 		if e != nil {
 			br.Msg = "获取失败"
@@ -770,22 +571,18 @@ func (this *CorrelationChartClassifyController) ClassifyTree() {
 		}
 
 		for k, v := range allList {
-			// 数据权限
 			v.HaveOperaAuth = data_manage_permission.CheckChartClassifyPermissionByPermissionIdList(v.IsJoinPermission, v.ChartClassifyId, permissionClassifyIdList)
-			// 按钮权限
 			button := data.GetChartClassifyOpButton(this.SysUser, v.SysUserId, v.HaveOperaAuth)
 			allList[k].Button = button
 		}
 
 		nodeAll = data.GetChartClassifyTreeRecursive(allList, 0)
-		//根据sort值排序
 		sort.Slice(nodeAll, func(i, j int) bool {
 			return nodeAll[i].Sort < nodeAll[j].Sort
 		})
 	}
 
 	language := `CN`
-	// 显示的语言
 	{
 		configDetail, _ := system.GetConfigDetailByCode(this.SysUser.AdminId, system.ChartLanguageVar)
 		if configDetail != nil {
@@ -798,7 +595,6 @@ func (this *CorrelationChartClassifyController) ClassifyTree() {
 		}
 	}
 
-	// 是否允许添加一级分类
 	canOpClassify := true
 	button := data.GetChartClassifyOpButton(this.SysUser, 0, true)
 	if !button.AddButton {

controllers/data_manage/cross_variety/chart_info.go

@@ -14,28 +14,17 @@ import (
 	"eta_gn/eta_api/services/data/data_manage_permission"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
-// ChartInfoController
-// @Description: 跨品种分析图表
 type ChartInfoController struct {
 	controllers.BaseAuthController
 }
 
-// List
-// @Title 跨品种分析图表列表接口
-// @Description 跨品种分析图表列表接口
-// @Param   PageSize   query   int  true       "每页数据条数"
-// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
-// @Param   ChartClassifyId   query   int  true       "分类id"
-// @Param   Keyword   query   string  true       "搜索关键词"
-// @Param   IsShowMe   query   bool  true       "是否只看我的，true、false"
-// @Param   Source   query   int  true       "图表类型，10：跨品种分析
-// @Success 200 {object} data_manage.ChartListResp
 // @router /chart_info/list [get]
 func (c *ChartInfoController) List() {
 	br := new(models.BaseResponse).Init()
@@ -77,7 +66,6 @@ func (c *ChartInfoController) List() {
 	var condition string
 	var pars []interface{}
 
-	// 普通图表
 	condition += ` AND source = ? `
 	pars = append(pars, source)
 
@@ -94,14 +82,12 @@ func (c *ChartInfoController) List() {
 		condition += ` AND  ( chart_name LIKE '%` + keyword + `%' )`
 	}
 
-	//只看我的
 	isShowMe, _ := c.GetBool("IsShowMe")
 	if isShowMe {
 		condition += ` AND sys_user_id = ? `
 		pars = append(pars, sysUser.AdminId)
 	}
 
-	// 获取当前账号的不可见指标
 	noPermissionChartIdList := make([]int, 0)
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
@@ -122,7 +108,6 @@ func (c *ChartInfoController) List() {
 		pars = append(pars, noPermissionChartIdList)
 	}
 
-	//获取图表信息
 	list, err := data_manage.GetChartListByCondition(condition, pars, startSize, pageSize)
 	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
@@ -150,7 +135,6 @@ func (c *ChartInfoController) List() {
 		}
 		if chartInfoIds != "" {
 			chartInfoIds = strings.Trim(chartInfoIds, ",")
-			//判断是否需要展示英文标识
 			edbList, e := data_manage.GetChartEdbMappingListByChartInfoIds(chartInfoIds)
 			if e != nil {
 				br.Msg = "获取失败"
@@ -163,7 +147,6 @@ func (c *ChartInfoController) List() {
 		}
 	}
 	for i := 0; i < listLen; i++ {
-		//判断是否需要展示英文标识
 		if edbTmpList, ok := chartEdbMap[list[i].ChartInfoId]; ok {
 			list[i].IsEnChart = data.CheckIsEnChart(list[i].ChartNameEn, edbTmpList, list[i].Source, list[i].ChartType)
 		}
@@ -201,11 +184,6 @@ func (c *ChartInfoController) List() {
 	br.Data = resp
 }
 
-// Preview
-// @Title 跨品种分析图表-预览数据
-// @Description 跨品种分析图表-获取预览数据
-// // @Param	request	body request.ChartConfigReq true "type json string"
-// @Success 200 {object} data_manage.ChartEdbInfoDetailResp
 // @router /chart_info/preview [post]
 func (c *ChartInfoController) Preview() {
 	br := new(models.BaseResponse).Init()
@@ -250,7 +228,6 @@ func (c *ChartInfoController) Preview() {
 		return
 	}
 
-	// 品种配置
 	varietyListList := len(req.VarietyList)
 	if varietyListList < 0 {
 		br.Msg = "请选择品种"
@@ -258,7 +235,6 @@ func (c *ChartInfoController) Preview() {
 		return
 	}
 
-	// 日期配置
 	dateConfigList := len(req.DateConfigList)
 	if dateConfigList < 0 {
 		br.Msg = "请选择日期"
@@ -274,7 +250,6 @@ func (c *ChartInfoController) Preview() {
 	chartInfo := new(data_manage.ChartInfoView)
 	chartInfo.ChartType = utils.CHART_SOURCE_CROSS_HEDGING
 
-	// 获取图表x轴y轴
 	edbInfoList, dataResp, err, errMsg, isSendEmail := cross_variety.GetChartData(0, req)
 	if err != nil {
 		br.IsSendEmail = isSendEmail
@@ -290,18 +265,12 @@ func (c *ChartInfoController) Preview() {
 		EdbInfoList: edbInfoList,
 		DataResp:    dataResp,
 	}
-	//resp.EdbInfoList = edbList
 	br.Data = resp
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
 }
 
-// Add
-// @Title 新增图表接口
-// @Description 新增图表接口
-// @Param	request	body request.AddChartInfoReq true "type json string"
-// @Success 200 {object} data_manage.AddChartInfoResp
 // @router /chart_info/add [post]
 func (c *ChartInfoController) Add() {
 	br := new(models.BaseResponse).Init()
@@ -336,7 +305,6 @@ func (c *ChartInfoController) Add() {
 		return
 	}
 
-	// 添加图表
 	req.ChartNameEn = req.ChartName
 	chartInfo, err, errMsg, isSendEmail := cross_variety.AddChartInfo(req, sysUser, c.Lang)
 	if err != nil {
@@ -349,7 +317,6 @@ func (c *ChartInfoController) Add() {
 		return
 	}
 
-	//新增操作日志
 	{
 		chartLog := new(data_manage.ChartInfoLog)
 		chartLog.ChartInfoId = chartInfo.ChartInfoId
@@ -376,11 +343,6 @@ func (c *ChartInfoController) Add() {
 	br.IsAddLog = true
 }
 
-// Edit
-// @Title 编辑图表接口
-// @Description 编辑图表接口
-// @Param	request	body request.EditChartInfoReq true "type json string"
-// @Success Ret=200 保存成功
 // @router /chart_info/edit [post]
 func (c *ChartInfoController) Edit() {
 	br := new(models.BaseResponse).Init()
@@ -419,9 +381,6 @@ func (c *ChartInfoController) Edit() {
 	resp := new(data_manage.AddChartInfoResp)
 	resp.ChartInfoId = chartItem.ChartInfoId
 	resp.UniqueCode = chartItem.UniqueCode
-	//resp.ChartType = req.ChartType
-
-	//新增操作日志
 	{
 		chartLog := new(data_manage.ChartInfoLog)
 		chartLog.ChartName = chartItem.ChartName
@@ -444,11 +403,6 @@ func (c *ChartInfoController) Edit() {
 	br.IsAddLog = true
 }
 
-// Detail
-// @Title 获取图表详情
-// @Description 获取图表详情接口
-// @Param   ChartInfoId   query   int  true       "图表id"
-// @Success 200 {object} data_manage.ChartInfoDetailResp
 // @router /chart_info/detail [get]
 func (c *ChartInfoController) Detail() {
 	br := new(models.BaseResponse).Init()
@@ -483,7 +437,6 @@ func (c *ChartInfoController) Detail() {
 		return
 	}
 
-	// 获取主题样式
 	chartTheme, err := data.GetChartThemeConfig(chartInfo.ChartThemeId, utils.CHART_SOURCE_DEFAULT, 5)
 	if err != nil {
 		br.Msg = "获取失败"
@@ -506,36 +459,6 @@ func (c *ChartInfoController) Detail() {
 		br.ErrMsg = "解析跨品种分析配置失败，Err:" + err.Error()
 		return
 	}
-
-	//mappingList, err := cross_varietyModel.GetChartVarietyMappingList(chartInfo.ChartInfoId)
-	//if err != nil {
-	//	br.Msg = "获取品种失败"
-	//	br.ErrMsg = "获取品种失败，Err:" + err.Error()
-	//	return
-	//}
-	// 获取跨品种分析配置
-	//chartInfoCrossVariety, err := cross_varietyModel.GetChartInfoCrossVarietyByChartInfoId(chartInfo.ChartInfoId)
-	//if err != nil {
-	//	br.Msg = "获取跨品种分析配置失败"
-	//	br.ErrMsg = "获取跨品种分析配置失败，Err:" + err.Error()
-	//	return
-	//}
-	//
-	//varietyIdList := make([]int,0)
-	//for _,v:=range mappingList{
-	//	varietyIdList = append(varietyIdList,v.ChartVarietyId)
-	//}
-	//config := request.ChartConfigReq{
-	//	TagX:           chartInfoCrossVariety.ChartXTagId,
-	//	TagY:           chartInfoCrossVariety.ChartYTagId,
-	//	CalculateValue: chartInfoCrossVariety.CalculateValue,
-	//	CalculateUnit:  chartInfoCrossVariety.CalculateUnit,
-	//	DateConfigList: config.DateConfigList,
-	//	VarietyList:    varietyIdList,
-	//}
-	//config.TagX =
-
-	// 获取图表x轴y轴
 	edbList, dataResp, err, errMsg, isSendEmail := cross_variety.GetChartData(0, config)
 	if err != nil {
 		br.IsSendEmail = isSendEmail
@@ -547,15 +470,6 @@ func (c *ChartInfoController) Detail() {
 		return
 	}
 
-	// 完善指标信息
-	//edbList, e := correlationServ.GetChartEdbInfoFormat(chartInfo.ChartInfoId, edbInfoMappingA, edbInfoMappingB)
-	//if e != nil {
-	//	br.Msg = "获取失败"
-	//	br.ErrMsg = "获取跨品种分析图表, 完善指标信息失败, Err:" + e.Error()
-	//	return
-	//}
-
-	// 判断是否加入我的图库
 	if chartInfoId > 0 && chartInfo != nil {
 		{
 			var myChartCondition string
@@ -579,13 +493,7 @@ func (c *ChartInfoController) Detail() {
 		}
 	}
 
-	//图表操作权限
 	chartInfo.IsEdit = data.CheckOpChartPermission(sysUser, chartInfo.SysUserId, true)
-	////判断是否需要展示英文标识
-	//chartInfo.IsEnChart = data.CheckIsEnChart(chartInfo.ChartNameEn, edbList[0:1], chartInfo.Source, chartInfo.ChartType)
-	//chartInfo.UnitEn = edbInfoMappingA.UnitEn
-
-	// 另存为
 	chartInfo.Button = data_manage.ChartViewButton{
 		IsEdit:    chartInfo.IsEdit,
 		IsEnChart: chartInfo.IsEnChart,
@@ -595,11 +503,9 @@ func (c *ChartInfoController) Detail() {
 	}
 
 	chartInfo.HaveOperaAuth = true
-	// 指标权限
 	{
 		edbClassifyPermissionMap := make(map[int]data_manage_permission.EdbClassifyPermission)
 		classifyMap := make(map[int]*data_manage.EdbClassify)
-		// 分类
 		{
 			classifyIdList := make([]int, 0)
 			for _, v := range edbList {
@@ -616,7 +522,6 @@ func (c *ChartInfoController) Detail() {
 			}
 		}
 
-		// 遍历到校验map
 		for _, v := range edbList {
 			edbClassifyPermissionMap[v.EdbInfoId] = data_manage_permission.EdbClassifyPermission{
 				ClassifyId:       v.ClassifyId,
@@ -625,7 +530,6 @@ func (c *ChartInfoController) Detail() {
 			}
 		}
 
-		// 获取所有有权限的指标和分类
 		permissionEdbIdList, permissionClassifyIdList, err := data_manage_permission.GetUserEdbAndClassifyPermissionList(sysUser.AdminId, 0, 0)
 		if err != nil {
 			br.Msg = "获取失败"
@@ -634,7 +538,6 @@ func (c *ChartInfoController) Detail() {
 		}
 
 		for _, v := range edbList {
-			// 数据权限
 			edbItem, ok := edbClassifyPermissionMap[v.EdbInfoId]
 			if !ok {
 				continue
@@ -656,11 +559,6 @@ func (c *ChartInfoController) Detail() {
 	br.Data = resp
 }
 
-// Relation
-// @Title 获取图表的关联信息
-// @Description 获取图表的关联信息
-// @Param   ChartInfoId   query   int  true       "图表id"
-// @Success 200 {object} data_manage.ChartInfoDetailResp
 // @router /chart_info/relation [get]
 func (c *ChartInfoController) Relation() {
 	br := new(models.BaseResponse).Init()
@@ -728,7 +626,6 @@ func (c *ChartInfoController) Relation() {
 		xTag, yTag,
 	}
 
-	// 获取品种列表
 	varietyList, err := cross_varietyModels.GetVarietyListByIdList(config.VarietyList)
 	if err != nil {
 		br.Msg = "获取品种信息失败"
@@ -746,11 +643,6 @@ func (c *ChartInfoController) Relation() {
 	br.Data = resp
 }
 
-// Copy
-// @Title 复制并新增图表接口
-// @Description 新增图表接口
-// @Param	request	body data_manage.CopyAddChartInfoReq true "type json string"
-// @Success 200 {object} data_manage.AddChartInfoResp
 // @router /chart_info/copy [post]
 func (c *ChartInfoController) Copy() {
 	br := new(models.BaseResponse).Init()
@@ -787,7 +679,6 @@ func (c *ChartInfoController) Copy() {
 		return
 	}
 
-	// 获取原图表信息
 	oldChartInfo, err := data_manage.GetChartInfoById(req.ChartInfoId)
 	if err != nil {
 		br.Msg = "获取原图表信息失败"
@@ -811,7 +702,6 @@ func (c *ChartInfoController) Copy() {
 	config.MarkersAreas = oldChartInfo.MarkersAreas
 	config.ChartNameEn = oldChartInfo.ChartNameEn
 
-	// 添加图表
 	chartInfo, err, errMsg, isSendEmail := cross_variety.AddChartInfo(config, sysUser, c.Lang)
 	if err != nil {
 		br.Msg = "保存失败"
@@ -833,7 +723,6 @@ func (c *ChartInfoController) Copy() {
 		return
 	}
 
-	//新增操作日志
 	{
 		chartLog := new(data_manage.ChartInfoLog)
 		chartLog.ChartInfoId = chartInfo.ChartInfoId
@@ -860,10 +749,6 @@ func (c *ChartInfoController) Copy() {
 	br.IsAddLog = true
 }
 
-// Move
-// @Title 移动图表接口
-// @Description 移动图表接口
-// @Success 200 {object} data_manage.MoveChartInfoReq
 // @router /chart_info/move [post]
 func (c *ChartInfoController) Move() {
 	br := new(models.BaseResponse).Init()
@@ -908,9 +793,7 @@ func (c *ChartInfoController) Move() {
 		return
 	}
 
-	//移动排序
 	updateCol := make([]string, 0)
-	//如果有传入 上一个兄弟节点分类id
 	if req.PrevChartInfoId > 0 {
 		prevChartInfo, err := data_manage.GetChartInfoById(req.PrevChartInfoId)
 		if err != nil {
@@ -925,24 +808,18 @@ func (c *ChartInfoController) Move() {
 			return
 		}
 
-		//如果是移动在两个兄弟节点之间
 		if req.NextChartInfoId > 0 {
-			//下一个兄弟节点
 			nextChartInfo, err := data_manage.GetChartInfoById(req.NextChartInfoId)
 			if err != nil {
 				br.Msg = "移动失败"
 				br.ErrMsg = "获取下一个兄弟节点分类信息失败,Err:" + err.Error()
 				return
 			}
-			//如果上一个兄弟与下一个兄弟的排序权重是一致的，那么需要将下一个兄弟（以及下个兄弟的同样排序权重）的排序权重+2，自己变成上一个兄弟的排序权重+1
 			if prevChartInfo.Sort == nextChartInfo.Sort || prevChartInfo.Sort == chartInfo.Sort {
-				//变更兄弟节点的排序
 				updateSortStr := `sort + 2`
 				_ = data_manage.UpdateChartInfoSortByClassifyId(prevChartInfo.ChartClassifyId, prevChartInfo.Sort, prevChartInfo.ChartInfoId, []int{chartInfo.Source}, updateSortStr)
 			} else {
-				//如果下一个兄弟的排序权重正好是上个兄弟节点的下一层，那么需要再加一层了
 				if nextChartInfo.Sort-prevChartInfo.Sort == 1 {
-					//变更兄弟节点的排序
 					updateSortStr := `sort + 1`
 					_ = data_manage.UpdateChartInfoSortByClassifyId(prevChartInfo.ChartClassifyId, prevChartInfo.Sort, prevChartInfo.ChartInfoId, []int{chartInfo.Source}, updateSortStr)
 				}
@@ -968,7 +845,6 @@ func (c *ChartInfoController) Move() {
 			return
 		}
 
-		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
 		if firstClassify != nil && firstClassify.ChartClassifyId > 0 && firstClassify.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = data_manage.UpdateChartInfoSortByClassifyId(firstClassify.ChartClassifyId, 0, firstClassify.ChartInfoId-1, []int{chartInfo.Source}, updateSortStr)
@@ -979,7 +855,6 @@ func (c *ChartInfoController) Move() {
 		updateCol = append(updateCol, "Sort", "ModifyTime")
 	}
 
-	//更新
 	if len(updateCol) > 0 {
 		err = chartInfo.Update(updateCol)
 		if err != nil {
@@ -995,12 +870,9 @@ func (c *ChartInfoController) Move() {
 		return
 	}
 
-	//添加es数据
 	go data.EsAddOrEditChartInfo(req.ChartInfoId)
-	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(req.ChartInfoId)
 
-	//新增操作日志
 	{
 		chartLog := new(data_manage.ChartInfoLog)
 		chartLog.ChartName = chartInfo.ChartName
@@ -1021,12 +893,6 @@ func (c *ChartInfoController) Move() {
 	br.Msg = "移动成功"
 }
 
-// Refresh
-// @Title 图表刷新接口
-// @Description 图表刷新接口
-// @Param   ChartInfoId   query   int  true       "图表id"
-// @Param   UniqueCode   query   string  true       "唯一code"
-// @Success Ret=200 刷新成功
 // @router /chart_info/refresh [get]
 func (c *ChartInfoController) Refresh() {
 	br := new(models.BaseResponse).Init()
@@ -1075,7 +941,6 @@ func (c *ChartInfoController) Refresh() {
 		return
 	}
 
-	// 获取关联的指标信息
 	_, _, edbInfoIdList, err := cross_variety.GetXYEdbIdList(config.TagX, config.TagY, config.VarietyList)
 	if err != nil {
 		br.Msg = "刷新失败，获取指标信息失败"
@@ -1083,13 +948,11 @@ func (c *ChartInfoController) Refresh() {
 		return
 	}
 
-	// 批量刷新
 	err, isAsync := data.EdbInfoRefreshAllFromBaseV3(edbInfoIdList, false, false, false)
 	if err != nil {
 		return
 	}
 
-	//清除图表缓存
 	{
 		key := utils.HZ_CHART_LIB_DETAIL + chartInfo.UniqueCode
 		_ = utils.Rc.Delete(key)
@@ -1103,11 +966,6 @@ func (c *ChartInfoController) Refresh() {
 	}
 }
 
-// EnInfoEdit
-// @Title 编辑图表英文信息接口
-// @Description 编辑图表英文信息接口
-// @Param	request	body data_manage.EditChartEnInfoReq true "type json string"
-// @Success Ret=200 编辑成功
 // @router /chart_info/en/edit [post]
 func (c *ChartInfoController) EnInfoEdit() {
 	br := new(models.BaseResponse).Init()
@@ -1139,7 +997,6 @@ func (c *ChartInfoController) EnInfoEdit() {
 		return
 	}
 
-	//判断指标名称是否存在
 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
 	if err != nil {
 		if utils.IsErrNoRow(err) {
@@ -1152,26 +1009,6 @@ func (c *ChartInfoController) EnInfoEdit() {
 		return
 	}
 
-	// 校验名称是否有重复
-	//{
-	//	var condition string
-	//	var pars []interface{}
-	//	condition += " AND chart_info_id <> ?  AND chart_name_en = ? AND source = ?"
-	//	pars = append(pars, req.ChartInfoId, req.ChartNameEn, utils.CHART_SOURCE_CROSS_HEDGING)
-	//	existItem, err := data_manage.GetChartInfoByCondition(condition, pars)
-	//	if err != nil {
-	//		if !utils.IsErrNoRow(err) {
-	//			br.Msg = "判断英文图表名称是否存在失败"
-	//			br.ErrMsg = "判断英文图表名称是否存在失败,Err:" + err.Error()
-	//			return
-	//		}
-	//	}
-	//	if err == nil && existItem.ChartInfoId > 0 {
-	//		br.Msg = existItem.ChartName + "：" + req.ChartNameEn + "图表名称已存在"
-	//		return
-	//	}
-	//}
-
 	chartItem.ChartNameEn = req.ChartNameEn
 	chartItem.ModifyTime = time.Now().Local()
 	if e := chartItem.Update([]string{"ChartNameEn", "ModifyTime"}); e != nil {
@@ -1187,15 +1024,9 @@ func (c *ChartInfoController) EnInfoEdit() {
 		return
 	}
 
-	//添加es数据
 	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
-	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 
-	//指标 修改es信息
-	//go data.AddOrEditEdbInfoToEs(edbInfo.EdbInfoId)
-
-	//新增操作日志
 	{
 		chartLog := new(data_manage.ChartInfoLog)
 		chartLog.ChartName = chartItem.ChartName
@@ -1210,7 +1041,6 @@ func (c *ChartInfoController) EnInfoEdit() {
 		chartLog.Method = c.Ctx.Input.URL()
 		go data_manage.AddChartInfoLog(chartLog)
 	}
-	// 清除缓存
 	if utils.Re == nil && utils.Rc != nil {
 		_ = utils.Rc.Delete(utils.HZ_CHART_LIB_DETAIL + chartItem.UniqueCode) //图表分享链接缓存
 		_ = utils.Rc.Delete(data.GetChartInfoDataKey(req.ChartInfoId))
@@ -1222,11 +1052,6 @@ func (c *ChartInfoController) EnInfoEdit() {
 	br.IsAddLog = true
 }
 
-// DeleteChart
-// @Title 删除跨品种分析分类/图表
-// @Description 删除跨品种分析分类/图表接口
-// @Param	request	body data_manage.DeleteChartClassifyReq true "type json string"
-// @Success 200 Ret=200 删除成功
 // @router /chart_info/delete [post]
 func (c *ChartInfoController) DeleteChart() {
 	br := new(models.BaseResponse).Init()
@@ -1258,7 +1083,6 @@ func (c *ChartInfoController) DeleteChart() {
 	}
 
 	resp := new(data_manage.AddChartInfoResp)
-	//删除图表
 	chartInfo, err := data_manage.GetChartInfoById(req.ChartInfoId)
 	if err != nil {
 		if utils.IsErrNoRow(err) {
@@ -1275,7 +1099,6 @@ func (c *ChartInfoController) DeleteChart() {
 		br.Msg = "图表已删除，请刷新页面"
 		return
 	}
-	//图表操作权限
 	ok := data.CheckOpChartPermission(sysUser, chartInfo.SysUserId, true)
 	if !ok {
 		br.Msg = "没有该图表的操作权限"
@@ -1285,7 +1108,6 @@ func (c *ChartInfoController) DeleteChart() {
 
 	myIds := make([]int, 0)
 	{
-		// 获取引用该图表的MyCharts, 用于ES删除
 		var myCond string
 		var myPars []interface{}
 		myCond += ` AND a.chart_info_id = ? `
@@ -1300,17 +1122,14 @@ func (c *ChartInfoController) DeleteChart() {
 			myIds = append(myIds, m.MyChartId)
 		}
 	}
-	//删除图表及关联指标
 	err = data_manage.DeleteChartInfoAndData(chartInfo.ChartInfoId)
 	if err != nil {
 		br.Msg = "删除失败"
 		br.ErrMsg = "删除失败，Err:" + err.Error()
 		return
 	}
-	//删除ES
 	{
 		go data.EsDeleteChartInfo(chartInfo.ChartInfoId)
-		// 删除MY ETA 图表 es数据
 		go data.EsDeleteMyChartInfoByMyChartIds(myIds)
 	}
 
@@ -1338,8 +1157,6 @@ func (c *ChartInfoController) DeleteChart() {
 		var tmpPars []interface{}
 
 		tmpCondition += " AND level=1 "
-		//pars = append(pars, chartInfo.ChartClassifyId)
-
 		tmpCondition += " AND chart_classify_id>? ORDER BY chart_classify_id ASC LIMIT 1 "
 		tmpPars = append(tmpPars, chartInfo.ChartClassifyId)
 
@@ -1362,7 +1179,6 @@ func (c *ChartInfoController) DeleteChart() {
 			}
 		}
 	}
-	//新增操作日志
 	{
 		chartLog := new(data_manage.ChartInfoLog)
 		chartLog.ChartName = chartInfo.ChartName
@@ -1385,13 +1201,6 @@ func (c *ChartInfoController) DeleteChart() {
 	br.IsAddLog = true
 }
 
-// SearchByEs
-// @Title 图表模糊搜索（从es获取）
-// @Description  图表模糊搜索（从es获取）
-// @Param   Keyword   query   string  true       "图表名称"
-// @Param   IsShowMe   query   bool  true       "是否只看我的，true、false"
-// @Param   Source   query   int  true       "来源，3：拟合方程，4：滚动拟合方程，默认0：全部"
-// @Success 200 {object} data_manage.ChartInfo
 // @router /chart_info/search_by_es [get]
 func (c *ChartInfoController) SearchByEs() {
 	br := new(models.BaseResponse).Init()
@@ -1424,7 +1233,6 @@ func (c *ChartInfoController) SearchByEs() {
 		keyword = c.GetString("KeyWord")
 	}
 
-	//只看我的
 	isShowMe, _ := c.GetBool("IsShowMe")
 	showSysId := 0
 	if isShowMe {
@@ -1437,7 +1245,6 @@ func (c *ChartInfoController) SearchByEs() {
 	var total int64
 	var err error
 
-	// 获取当前账号的不可见指标
 	noPermissionChartIdList := make([]int, 0)
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
@@ -1472,7 +1279,6 @@ func (c *ChartInfoController) SearchByEs() {
 		}
 		if chartInfoIds != "" {
 			chartInfoIds = strings.Trim(chartInfoIds, ",")
-			//判断是否需要展示英文标识
 			edbList, e := data_manage.GetChartEdbMappingListByChartInfoIds(chartInfoIds)
 			if e != nil {
 				br.Msg = "获取失败"
@@ -1487,16 +1293,13 @@ func (c *ChartInfoController) SearchByEs() {
 		for _, v := range searchList {
 			tmp := new(data_manage.ChartInfoMore)
 			tmp.ChartInfo = *v
-			// 图表数据权限
 			tmp.HaveOperaAuth = true
-			//判断是否需要展示英文标识
 			if _, ok := chartEdbMap[v.ChartInfoId]; ok {
 				tmp.IsEnChart = data.CheckIsEnChart(v.ChartNameEn, []*data_manage.ChartEdbInfoMapping{}, v.Source, v.ChartType)
 			}
 			finalList = append(finalList, tmp)
 		}
 	}
-	//新增搜索词记录
 	{
 		searchKeyword := new(data_manage.SearchKeyword)
 		searchKeyword.KeyWord = keyword
@@ -1515,19 +1318,15 @@ func (c *ChartInfoController) SearchByEs() {
 	br.Data = resp
 }
 
-// GetChartInfoDetailFromUniqueCode 根据编码获取图表详情
 func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCache bool, sysUser *system.Admin) (resp *data_manage.ChartInfoDetailFromUniqueCodeResp, isOk bool, msg, errMsg string) {
 	resp = new(data_manage.ChartInfoDetailFromUniqueCodeResp)
 
 	adminId := sysUser.AdminId
 
-	// 指标数据map
 	edbClassifyPermissionMap := make(map[int]data_manage_permission.EdbClassifyPermission)
 	defer func() {
 		if isOk {
-			// 这里跟当前用户相关的信息重新查询写入resp, 不使用缓存中的
 			{
-				//判断是否加入我的图库
 				var myChartCondition string
 				var myChartPars []interface{}
 				myChartCondition += ` AND a.admin_id=? `
@@ -1550,10 +1349,8 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 
 			resp.ChartInfo.HaveOperaAuth = true
 
-			// 指标权限
 			{
 				classifyMap := make(map[int]*data_manage.EdbClassify)
-				// 分类
 				{
 					classifyIdList := make([]int, 0)
 					for _, v := range resp.EdbInfoList {
@@ -1569,7 +1366,6 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 					}
 				}
 
-				// 指标
 				if len(edbClassifyPermissionMap) < 0 {
 					edbInfoIdList := make([]int, 0)
 					for _, v := range resp.EdbInfoList {
@@ -1589,7 +1385,6 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 					}
 				}
 
-				// 获取所有有权限的指标和分类
 				permissionEdbIdList, permissionClassifyIdList, err := data_manage_permission.GetUserEdbAndClassifyPermissionList(sysUser.AdminId, 0, 0)
 				if err != nil {
 					errMsg = "获取所有有权限的指标和分类失败，Err:" + err.Error()
@@ -1597,7 +1392,6 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 				}
 
 				for _, v := range resp.EdbInfoList {
-					// 数据权限
 					edbItem, ok := edbClassifyPermissionMap[v.EdbInfoId]
 					if !ok {
 						continue
@@ -1611,7 +1405,6 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 		}
 	}()
 
-	//判断是否存在缓存，如果存在缓存，那么直接从缓存中获取
 	key := data.GetChartInfoDataKey(chartInfo.ChartInfoId)
 	if utils.Re == nil && isCache {
 		if utils.Re == nil && utils.Rc.IsExist(key) {
@@ -1627,7 +1420,6 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 		}
 	}
 
-	// 获取主题样式
 	chartTheme, err := data.GetChartThemeConfig(chartInfo.ChartThemeId, utils.CHART_SOURCE_DEFAULT, 5)
 	if err != nil {
 		msg = "获取失败"
@@ -1651,14 +1443,12 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 		errMsg = "解析跨品种分析配置失败，Err:" + err.Error()
 		return
 	}
-	// 获取图表x轴y轴
 	edbList, dataResp, err, msg, _ := cross_variety.GetChartData(0, config)
 	if err != nil {
 		errMsg = "获取图表，指标信息失败，Err:" + err.Error()
 		return
 	}
 	if chartInfoId > 0 && chartInfo != nil {
-		//判断是否加入我的图库
 		{
 			var myChartCondition string
 			var myChartPars []interface{}
@@ -1681,14 +1471,7 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 		}
 	}
 
-	//图表操作权限
 	chartInfo.IsEdit = data.CheckOpChartPermission(sysUser, chartInfo.SysUserId, true)
-	//判断是否需要展示英文标识
-	//chartInfo.IsEnChart = data.CheckIsEnChart(chartInfo.ChartNameEn, edbList[0:1], chartInfo.Source, chartInfo.ChartType)
-	//chartInfo.UnitEn = edbInfoMappingA.UnitEn
-
-	//isSaveAs := true
-	// 另存为
 	chartInfo.Button = data_manage.ChartViewButton{
 		IsEdit:    chartInfo.IsEdit,
 		IsEnChart: chartInfo.IsEnChart,
@@ -1697,7 +1480,6 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 		IsSetName: chartInfo.IsSetName,
 	}
 
-	// 图表的指标来源
 	sourceNameList, sourceNameEnList := data.GetEdbSourceByEdbInfoIdList(edbList)
 	chartInfo.ChartSource = strings.Join(sourceNameList, ",")
 	chartInfo.ChartSourceEn = strings.Join(sourceNameEnList, ",")
@@ -1707,7 +1489,6 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 	resp.EdbInfoList = edbList
 	resp.Status = true
 
-	// 遍历到校验map
 	for _, v := range edbList {
 		edbClassifyPermissionMap[v.EdbInfoId] = data_manage_permission.EdbClassifyPermission{
 			ClassifyId:       v.ClassifyId,
@@ -1716,7 +1497,6 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 		}
 	}
 
-	// 将数据加入缓存
 	if utils.Re == nil {
 		d, _ := json.Marshal(resp)
 		_ = utils.Rc.Put(key, d, 2*time.Hour)
@@ -1725,11 +1505,6 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 	return
 }
 
-// Save
-// @Title 保存图表
-// @Description 保存图表
-// @Param	request	body request.SaveChartReq true "type json string"
-// @Success Ret=200 保存成功
 // @router /chart_info/save [post]
 func (c *ChartInfoController) Save() {
 	br := new(models.BaseResponse).Init()
@@ -1772,7 +1547,6 @@ func (c *ChartInfoController) Save() {
 		return
 	}
 
-	// 更新图表上下限
 	chartItem.LeftMin = req.LeftMin
 	chartItem.LeftMax = req.LeftMax
 	chartItem.XMin = req.XMin
@@ -1788,7 +1562,6 @@ func (c *ChartInfoController) Save() {
 	resp.ChartInfoId = chartItem.ChartInfoId
 	resp.UniqueCode = chartItem.UniqueCode
 
-	// 新增操作日志
 	{
 		chartLog := new(data_manage.ChartInfoLog)
 		chartLog.ChartName = chartItem.ChartName
@@ -1811,11 +1584,6 @@ func (c *ChartInfoController) Save() {
 	br.IsAddLog = true
 }
 
-// BaseInfoEdit
-// @Title 编辑图表基础信息接口
-// @Description 编辑图表基础信息接口
-// @Param	request	body data_manage.EditChartBaseInfoReq true "type json string"
-// @Success Ret=200 编辑成功
 // @router /chart_info/base/edit [post]
 func (c *ChartInfoController) BaseInfoEdit() {
 	br := new(models.BaseResponse).Init()
@@ -1847,7 +1615,6 @@ func (c *ChartInfoController) BaseInfoEdit() {
 		return
 	}
 
-	//判断指标名称是否存在
 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
 	if err != nil {
 		if utils.IsErrNoRow(err) {
@@ -1867,15 +1634,8 @@ func (c *ChartInfoController) BaseInfoEdit() {
 		return
 	}
 
-	//添加es数据
 	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
-	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
-
-	//指标 修改es信息
-	//go data.AddOrEditEdbInfoToEs(edbInfo.EdbInfoId)
-
-	//新增操作日志
 	{
 		chartLog := new(data_manage.ChartInfoLog)
 		chartLog.ChartName = chartItem.ChartName
@@ -1891,7 +1651,6 @@ func (c *ChartInfoController) BaseInfoEdit() {
 		go data_manage.AddChartInfoLog(chartLog)
 	}
 
-	// 清除缓存
 	if utils.Re == nil && utils.Rc != nil {
 		_ = utils.Rc.Delete(utils.HZ_CHART_LIB_DETAIL + chartItem.UniqueCode) //图表分享链接缓存
 		_ = utils.Rc.Delete(data.GetChartInfoDataKey(req.ChartInfoId))

controllers/data_manage/cross_variety/classify.go

@@ -10,18 +10,10 @@ import (
 	"time"
 )
 
-// ClassifyController
-// @Description: 跨品种分析分类
 type ClassifyController struct {
 	controllers.BaseAuthController
 }
 
-// List
-// @Title 跨品种分析分类列表
-// @Description 跨品种分析分类列表接口
-// @Param   IsShowMe   query   bool  true       "是否只看我的，true、false"
-// @Param   Source   query   int  true       "图表类型，3：跨品种分析，4：滚动跨品种分析"
-// @Success 200 {object} data_manage.ChartClassifyListResp
 // @router /classify/list [get]
 func (c *ClassifyController) List() {
 	br := new(models.BaseResponse).Init()
@@ -31,7 +23,6 @@ func (c *ClassifyController) List() {
 	}()
 	resp := new(data_manage.ChartClassifyListResp)
 
-	// 获取当前账号的不可见指标
 	noPermissionChartIdMap := make(map[int]bool)
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
@@ -80,7 +71,6 @@ func (c *ClassifyController) List() {
 	}
 	rootChildMap := make(map[int][]*data_manage.ChartClassifyItems)
 
-	// 移除没有图表的分类
 	allNodes := make([]*data_manage.ChartClassifyItems, 0)
 	for _, v := range rootList {
 		if v.SysUserId == c.SysUser.AdminId || c.SysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_ADMIN {
@@ -94,7 +84,6 @@ func (c *ClassifyController) List() {
 		}
 	}
 
-	// 移除没有权限的图表
 	allNodes = data.HandleNoPermissionChart(allNodes, noPermissionChartIdMap, c.SysUser.AdminId)
 	resp.AllNodes = allNodes
 
@@ -104,11 +93,6 @@ func (c *ClassifyController) List() {
 	br.Data = resp
 }
 
-// EditChartClassify
-// @Title 修改跨品种分析图表分类
-// @Description 修改跨品种分析图表分类接口
-// @Param	request	body data_manage.EditChartClassifyReq true "type json string"
-// @Success 200 Ret=200 修改成功
 // @router /classify/edit [post]
 func (c *ClassifyController) EditChartClassify() {
 	br := new(models.BaseResponse).Init()
@@ -135,7 +119,6 @@ func (c *ClassifyController) EditChartClassify() {
 		return
 	}
 
-	// 编辑图表分类
 	_, err, errMsg, isSendEmail := data.EditChartClassify(req.ChartClassifyId, utils.CHART_SOURCE_CROSS_HEDGING, req.ChartClassifyName, c.Lang, c.SysUser)
 	if err != nil {
 		br.Msg = errMsg
@@ -150,11 +133,6 @@ func (c *ClassifyController) EditChartClassify() {
 	br.IsAddLog = true
 }
 
-// DeleteChartClassifyCheck
-// @Title 删除图表检测接口
-// @Description 删除图表检测接口
-// @Param	request	body data_manage.ChartClassifyDeleteCheckResp true "type json string"
-// @Success 200 Ret=200 检测成功
 // @router /classify/delete/check [post]
 func (c *ClassifyController) DeleteChartClassifyCheck() {
 	br := new(models.BaseResponse).Init()
@@ -178,9 +156,7 @@ func (c *ClassifyController) DeleteChartClassifyCheck() {
 	var deleteStatus int
 	var tipsMsg string
 	childIds := make([]int, 0)
-	//删除分类
 	if req.ChartClassifyId > 0 && req.ChartInfoId == 0 {
-		//判断跨品种分析图表分类下，是否含有图表
 
 		classifyAll, err := data_manage.GetChartClassifyAllBySource(utils.CHART_SOURCE_CROSS_HEDGING)
 		if err != nil {
@@ -208,12 +184,6 @@ func (c *ClassifyController) DeleteChartClassifyCheck() {
 			br.ErrMsg = "判断图表名称是否存在失败,Err:" + err.Error()
 			return
 		}
-		//count, err := data_manage.GetChartInfoCountByClassifyId(req.ChartClassifyId)
-		//if err != nil {
-		//	br.Msg = "删除失败"
-		//	br.ErrMsg = "分类下是否含有图表失败，Err:" + err.Error()
-		//	return
-		//}
 
 		if count > 0 {
 			deleteStatus = 1
@@ -222,12 +192,6 @@ func (c *ClassifyController) DeleteChartClassifyCheck() {
 	}
 
 	if deleteStatus != 1 && req.ChartInfoId == 0 {
-		//classifyCount, err := data_manage.GetChartClassifyCountByClassifyId(req.ChartClassifyId)
-		//if err != nil && !utils.IsErrNoRow(err) {
-		//	br.Msg = "删除失败"
-		//	br.ErrMsg = "分类下是否含有图表失败，Err:" + err.Error()
-		//	return
-		//}
 		if len(childIds) > 0 {
 			deleteStatus = 2
 			tipsMsg = "确认删除当前目录及包含的子目录吗"
@@ -246,11 +210,6 @@ func (c *ClassifyController) DeleteChartClassifyCheck() {
 	br.Data = resp
 }
 
-// DeleteChartClassify
-// @Title 删除跨品种分析图表分类/图表
-// @Description 删除跨品种分析图表分类/图表接口
-// @Param	request	body data_manage.DeleteChartClassifyReq true "type json string"
-// @Success 200 Ret=200 删除成功
 // @router /classify/delete [post]
 func (c *ClassifyController) DeleteChartClassify() {
 	br := new(models.BaseResponse).Init()
@@ -281,9 +240,7 @@ func (c *ClassifyController) DeleteChartClassify() {
 		return
 	}
 
-	//删除分类
 	if req.ChartClassifyId > 0 && req.ChartInfoId == 0 {
-		//判断是否含有指标
 		childIds := make([]int, 0)
 		classifyAll, err := data_manage.GetChartClassifyAllBySource(utils.CHART_SOURCE_CROSS_HEDGING)
 		if err != nil {
@@ -311,13 +268,6 @@ func (c *ClassifyController) DeleteChartClassify() {
 			br.ErrMsg = "判断图表名称是否存在失败,Err:" + err.Error()
 			return
 		}
-		//count, err := data_manage.GetChartInfoCountByClassifyId(req.ChartClassifyId)
-		//if err != nil && !utils.IsErrNoRow(err) {
-		//	br.Msg = "删除失败"
-		//	br.ErrMsg = "判断名称是否已存在失败，Err:" + err.Error()
-		//	return
-		//}
-
 		if count > 0 {
 			br.Msg = "该目录下存在关联指标，不可删除"
 			br.IsSendEmail = false
@@ -327,7 +277,6 @@ func (c *ClassifyController) DeleteChartClassify() {
 		delIds := append(childIds, req.ChartClassifyId)
 
 		err = data_manage.DeleteChartClassifyByIds(delIds)
-		//err = data_manage.DeleteChartClassify(req.ChartClassifyId)
 		if err != nil {
 			br.Msg = "删除失败"
 			br.ErrMsg = "删除失败,Err:" + err.Error()
@@ -335,7 +284,6 @@ func (c *ClassifyController) DeleteChartClassify() {
 		}
 	}
 	resp := new(data_manage.AddChartInfoResp)
-	//删除图表
 	if req.ChartInfoId > 0 {
 		chartInfo, err := data_manage.GetChartInfoById(req.ChartInfoId)
 		if err != nil {
@@ -353,7 +301,6 @@ func (c *ClassifyController) DeleteChartClassify() {
 			br.Msg = "图表已删除，请刷新页面"
 			return
 		}
-		//图表操作权限
 		ok := data.CheckOpChartPermission(sysUser, chartInfo.SysUserId, true)
 		if !ok {
 			br.Msg = "没有该图表的操作权限"
@@ -361,7 +308,6 @@ func (c *ClassifyController) DeleteChartClassify() {
 			return
 		}
 
-		// 获取引用该图表的MyCharts, 用于ES删除
 		var myCond string
 		var myPars []interface{}
 		myCond += ` AND a.chart_info_id = ? `
@@ -378,18 +324,14 @@ func (c *ClassifyController) DeleteChartClassify() {
 		}
 
 		source := chartInfo.Source // 跨品种分析图表(滚动跨品种分析)
-		//删除图表及关联指标
 		err = data_manage.DeleteChartInfoAndData(chartInfo.ChartInfoId)
 		if err != nil {
 			br.Msg = "删除失败"
 			br.ErrMsg = "删除失败，Err:" + err.Error()
 			return
 		}
-		//删除ES
 		{
 			go data.EsDeleteChartInfo(chartInfo.ChartInfoId)
-			// 删除MY ETA 图表 es数据
-			//go data.EsDeleteMyChartInfoByChartInfoId(chartInfo.ChartInfoId)
 			go data.EsDeleteMyChartInfoByMyChartIds(myIds)
 		}
 
@@ -416,7 +358,6 @@ func (c *ClassifyController) DeleteChartClassify() {
 			var pars []interface{}
 
 			condition += " AND level=1 "
-			//pars = append(pars, chartInfo.ChartClassifyId)
 
 			condition += " AND chart_classify_id>? ORDER BY chart_classify_id ASC LIMIT 1 "
 			pars = append(pars, chartInfo.ChartClassifyId)
@@ -440,7 +381,6 @@ func (c *ClassifyController) DeleteChartClassify() {
 				}
 			}
 		}
-		//新增操作日志
 		{
 			chartLog := new(data_manage.ChartInfoLog)
 			chartLog.ChartName = chartInfo.ChartName
@@ -463,10 +403,6 @@ func (c *ClassifyController) DeleteChartClassify() {
 	br.IsAddLog = true
 }
 
-// ChartClassifyMove
-// @Title 相关性图表分类移动接口
-// @Description 相关性图表分类移动接口
-// @Success 200 {object} data_manage.MoveChartClassifyReq
 // @router /classify/move [post]
 func (c *ClassifyController) ChartClassifyMove() {
 	br := new(models.BaseResponse).Init()
@@ -496,7 +432,6 @@ func (c *ClassifyController) ChartClassifyMove() {
 		br.ErrMsg = "分类id小于等于0"
 		return
 	}
-	//判断分类是否存在
 	chartClassifyInfo, err := data_manage.GetChartClassifyById(req.ClassifyId)
 	if err != nil {
 		br.Msg = "移动失败"
@@ -510,9 +445,7 @@ func (c *ClassifyController) ChartClassifyMove() {
 	}
 	updateCol := make([]string, 0)
 
-	//如果有传入 上一个兄弟节点分类id
 	if req.PrevClassifyId > 0 {
-		//上一个兄弟节点
 		prevClassify, err := data_manage.GetChartClassifyById(req.PrevClassifyId)
 		if err != nil {
 			br.Msg = "移动失败"
@@ -525,24 +458,18 @@ func (c *ClassifyController) ChartClassifyMove() {
 			return
 		}
 
-		//如果是移动在两个兄弟节点之间
 		if req.NextClassifyId > 0 {
-			//下一个兄弟节点
 			nextClassify, err := data_manage.GetChartClassifyById(req.NextClassifyId)
 			if err != nil {
 				br.Msg = "移动失败"
 				br.ErrMsg = "获取下一个兄弟节点分类信息失败,Err:" + err.Error()
 				return
 			}
-			//如果上一个兄弟与下一个兄弟的排序权重是一致的，那么需要将下一个兄弟（以及下个兄弟的同样排序权重）的排序权重+2，自己变成上一个兄弟的排序权重+1
 			if prevClassify.Sort == nextClassify.Sort || prevClassify.Sort == chartClassifyInfo.Sort {
-				//变更兄弟节点的排序
 				updateSortStr := `sort + 2`
 				_ = data_manage.UpdateChartClassifySortByParentId(prevClassify.ParentId, prevClassify.ChartClassifyId, prevClassify.Sort, updateSortStr)
 			} else {
-				//如果下一个兄弟的排序权重正好是上个兄弟节点的下一层，那么需要再加一层了
 				if nextClassify.Sort-prevClassify.Sort == 1 {
-					//变更兄弟节点的排序
 					updateSortStr := `sort + 1`
 					_ = data_manage.UpdateChartClassifySortByParentId(prevClassify.ParentId, 0, prevClassify.Sort, updateSortStr)
 				}
@@ -566,7 +493,6 @@ func (c *ClassifyController) ChartClassifyMove() {
 			return
 		}
 
-		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
 		if firstClassify != nil && firstClassify.ChartClassifyId > 0 && firstClassify.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = data_manage.UpdateChartClassifySortByParentId(firstClassify.ParentId, firstClassify.ChartClassifyId-1, 0, updateSortStr)
@@ -577,7 +503,6 @@ func (c *ClassifyController) ChartClassifyMove() {
 		updateCol = append(updateCol, "Sort", "ModifyTime")
 	}
 
-	//更新
 	if len(updateCol) > 0 {
 		err = chartClassifyInfo.Update(updateCol)
 		if err != nil {

controllers/data_manage/cross_variety/tag.go

@@ -9,21 +9,15 @@ import (
 	"eta_gn/eta_api/models/data_manage/cross_variety/response"
 	cross_varietyService "eta_gn/eta_api/services/data/cross_variety"
 	"eta_gn/eta_api/utils"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
+
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
-// TagController
-// @Description: 标签列表
 type TagController struct {
 	controllers.BaseAuthController
 }
 
-// Add
-// @Title 新增标签
-// @Description 新增标签接口
-// @Param	request	body request.AddTagReq true "type json string"
-// @Success 200 Ret=200 添加成功
 // @router /tag/add [post]
 func (c *TagController) Add() {
 	br := new(models.BaseResponse).Init()
@@ -78,11 +72,6 @@ func (c *TagController) Add() {
 	br.Success = true
 }
 
-// Edit
-// @Title 编辑标签接口
-// @Description 编辑标签接口
-// @Param	request	body request.EditTagReq true "type json string"
-// @Success 200 Ret=200 修改成功
 // @router /tag/edit [post]
 func (c *TagController) Edit() {
 	br := new(models.BaseResponse).Init()
@@ -121,7 +110,6 @@ func (c *TagController) Edit() {
 		return
 	}
 
-	// 获取标签详情
 	varietyInfo, err := cross_variety.GetTagById(req.ChartTagId)
 	if err != nil {
 		br.Msg = "查询标签失败"
@@ -129,7 +117,6 @@ func (c *TagController) Edit() {
 		return
 	}
 
-	// 编辑
 	switch c.Lang {
 	case utils.EnLangVersion:
 		varietyInfo.ChartTagNameEn = TagName
@@ -150,11 +137,6 @@ func (c *TagController) Edit() {
 	br.Success = true
 }
 
-// DeleteCheck
-// @Title 删除标签检测接口
-// @Description 删除标签检测接口
-// @Param	request	body request.DelTagReq true "type json string"
-// @Success 200 Ret=200 检测成功
 // @router /tag/delete/check [post]
 func (c *TagController) DeleteCheck() {
 	br := new(models.BaseResponse).Init()
@@ -178,7 +160,6 @@ func (c *TagController) DeleteCheck() {
 	var deleteStatus int
 	var tipsMsg string
 
-	// 获取该标签关联的图表数
 	count, err := cross_variety.GetCountChartByTagId(req.ChartTagId)
 	if err != nil {
 		br.Msg = "检测异常"
@@ -205,11 +186,6 @@ func (c *TagController) DeleteCheck() {
 	br.Data = resp
 }
 
-// Delete
-// @Title 删除标签
-// @Description 删除标签接口
-// @Param	request	body request.DeleteChartClassifyReq true "type json string"
-// @Success 200 Ret=200 删除成功
 // @router /tag/delete [post]
 func (c *TagController) Delete() {
 	br := new(models.BaseResponse).Init()
@@ -231,7 +207,6 @@ func (c *TagController) Delete() {
 		return
 	}
 
-	// 获取该标签关联的图表数
 	count, err := cross_variety.GetCountChartByTagId(req.ChartTagId)
 	if err != nil {
 		br.Msg = "检测异常"
@@ -270,11 +245,6 @@ func (c *TagController) Delete() {
 	br.IsAddLog = true
 }
 
-// List
-// @Title 获取标签中的指标与品种的映射关系
-// @Description 获取标签中的指标与品种的映射关系
-// @Param   ChartTagId   query   int  true       "标签id"
-// @Success 200 Ret=200 保存成功
 // @router /tag/list [get]
 func (c *TagController) List() {
 	br := new(models.BaseResponse).Init()
@@ -282,7 +252,6 @@ func (c *TagController) List() {
 		c.Data["json"] = br
 		c.ServeJSON()
 	}()
-	// 获取数据
 	list, err := cross_variety.GetTagItemList()
 	if err != nil {
 		br.Msg = "获取标签失败"
@@ -292,7 +261,6 @@ func (c *TagController) List() {
 	dataCount := len(list)
 	page := paging.GetPaging(1, dataCount, dataCount)
 
-	// 获取标签绑定的品种数量
 	tagTotalList, err := cross_variety.GetCountChartTagVarietyItemListByTag()
 	if err != nil {
 		br.Msg = "获取失败"
@@ -320,11 +288,6 @@ func (c *TagController) List() {
 	br.Data = resp
 }
 
-// VarietyEdbList
-// @Title 获取标签中的指标与品种的映射关系
-// @Description 获取标签中的指标与品种的映射关系
-// @Param   ChartTagId   query   int  true       "标签id"
-// @Success 200 Ret=200 保存成功
 // @router /tag/variety_edb/list [get]
 func (c *TagController) VarietyEdbList() {
 	br := new(models.BaseResponse).Init()
@@ -340,7 +303,6 @@ func (c *TagController) VarietyEdbList() {
 		return
 	}
 
-	// 获取数据
 	list, err := cross_variety.GetChartTagVarietyItemListByTag(chartTagId)
 	if err != nil {
 		br.Msg = "保存失败"
@@ -361,11 +323,6 @@ func (c *TagController) VarietyEdbList() {
 	br.Data = resp
 }
 
-// SaveVarietyEdb
-// @Title 配置标签中的指标与品种的映射关系
-// @Description 配置标签中的指标与品种的映射关系
-// @Param	request	body request.SaveTagVarietyEdbReq true "type json string"
-// @Success 200 Ret=200 保存成功
 // @router /tag/variety_edb/save [post]
 func (c *TagController) SaveVarietyEdb() {
 	br := new(models.BaseResponse).Init()
@@ -387,7 +344,6 @@ func (c *TagController) SaveVarietyEdb() {
 		return
 	}
 
-	// 过滤未配置的品种
 	varietyEdbList := make([]request.VarietyEdbReq, 0)
 	for _, v := range req.VarietyEdb {
 		if v.EdbInfoId <= 0 {
@@ -396,7 +352,6 @@ func (c *TagController) SaveVarietyEdb() {
 		varietyEdbList = append(varietyEdbList, v)
 	}
 
-	// 保存配置
 	err = cross_variety.SaveVarietyEdb(req.ChartTagId, varietyEdbList, c.SysUser.AdminId, c.SysUser.RealName)
 	if err != nil {
 		br.Msg = "保存失败"
@@ -404,7 +359,6 @@ func (c *TagController) SaveVarietyEdb() {
 		return
 	}
 
-	// 修改跨品种分析图表的关联指标
 	go cross_varietyService.ModifyChartEdbMapping(req.ChartTagId)
 
 	br.Ret = 200

controllers/data_manage/cross_variety/variety.go

@@ -8,21 +8,15 @@ import (
 	"eta_gn/eta_api/models/data_manage/cross_variety/request"
 	"eta_gn/eta_api/models/data_manage/cross_variety/response"
 	"eta_gn/eta_api/utils"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
+
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
-// VarietyController
-// @Description: 品种列表
 type VarietyController struct {
 	controllers.BaseAuthController
 }
 
-// Add
-// @Title 新增品种
-// @Description 新增品种接口
-// @Param	request	body request.AddVarietyReq true "type json string"
-// @Success 200 Ret=200 添加成功
 // @router /variety/add [post]
 func (c *VarietyController) Add() {
 	br := new(models.BaseResponse).Init()
@@ -77,11 +71,6 @@ func (c *VarietyController) Add() {
 	br.Success = true
 }
 
-// Edit
-// @Title 编辑品种接口
-// @Description 编辑品种接口
-// @Param	request	body request.EditVarietyReq true "type json string"
-// @Success 200 Ret=200 修改成功
 // @router /variety/edit [post]
 func (c *VarietyController) Edit() {
 	br := new(models.BaseResponse).Init()
@@ -120,7 +109,6 @@ func (c *VarietyController) Edit() {
 		return
 	}
 
-	// 获取品种详情
 	varietyInfo, err := cross_variety.GetVarietyById(req.ChartVarietyId)
 	if err != nil {
 		br.Msg = "查询品种失败"
@@ -128,7 +116,6 @@ func (c *VarietyController) Edit() {
 		return
 	}
 
-	// 编辑
 	switch c.Lang {
 	case utils.EnLangVersion:
 		varietyInfo.ChartVarietyNameEn = varietyName
@@ -149,11 +136,6 @@ func (c *VarietyController) Edit() {
 	br.Success = true
 }
 
-// DeleteCheck
-// @Title 删除品种检测接口
-// @Description 删除品种检测接口
-// @Param	request	body request.DelVarietyReq true "type json string"
-// @Success 200 Ret=200 检测成功
 // @router /variety/delete/check [post]
 func (c *VarietyController) DeleteCheck() {
 	br := new(models.BaseResponse).Init()
@@ -177,7 +159,6 @@ func (c *VarietyController) DeleteCheck() {
 	var deleteStatus int
 	var tipsMsg string
 
-	// 获取该品种关联的图表数
 	count, err := cross_variety.GetCountChartByVarietyId(req.ChartVarietyId)
 	if err != nil {
 		br.Msg = "检测异常"
@@ -203,11 +184,6 @@ func (c *VarietyController) DeleteCheck() {
 	br.Data = resp
 }
 
-// Delete
-// @Title 删除品种
-// @Description 删除品种接口
-// @Param	request	body request.DeleteChartClassifyReq true "type json string"
-// @Success 200 Ret=200 删除成功
 // @router /variety/delete [post]
 func (c *VarietyController) Delete() {
 	br := new(models.BaseResponse).Init()
@@ -229,7 +205,6 @@ func (c *VarietyController) Delete() {
 		return
 	}
 
-	// 获取该品种关联的图表数
 	count, err := cross_variety.GetCountChartByVarietyId(req.ChartVarietyId)
 	if err != nil {
 		br.Msg = "检测异常"
@@ -268,10 +243,6 @@ func (c *VarietyController) Delete() {
 	br.IsAddLog = true
 }
 
-// List
-// @Title 获取标签中的指标与品种的映射关系
-// @Description 获取标签中的指标与品种的映射关系
-// @Success 200 Ret=200 保存成功
 // @router /variety/list [get]
 func (c *VarietyController) List() {
 	br := new(models.BaseResponse).Init()
@@ -279,7 +250,6 @@ func (c *VarietyController) List() {
 		c.Data["json"] = br
 		c.ServeJSON()
 	}()
-	// 获取数据
 	list, err := cross_variety.GetVarietyList()
 	if err != nil {
 		br.Msg = "保存失败"

controllers/data_manage/data_manage_permission/data_manage_permission.go

@@ -9,18 +9,10 @@ import (
 	"eta_gn/eta_api/utils"
 )
 
-// 资产的含义：指标/图表/表格
-
-// DataMangePermissionController 数据权限管理
 type DataMangePermissionController struct {
 	controllers.BaseAuthController
 }
 
-// SetEdbChartPermission
-// @Title 指标/图表/表格权限设置接口
-// @Description 指标/图表/表格权限设置接口
-// @Param	request	body data_manage.SetEdbChartPermissionReq true "type json string"
-// @Success 200 {object} data_manage.ChartListResp
 // @router /edb_chart/permission/set [post]
 func (c *DataMangePermissionController) SetEdbChartPermission() {
 	br := new(models.BaseResponse).Init()
@@ -50,7 +42,6 @@ func (c *DataMangePermissionController) SetEdbChartPermission() {
 		return
 	}
 
-	// 子来源（目前作用于ETA表格，2024-3-26 14:12:09）
 	if req.Source == 6 && (req.SubSource <= utils.EXCEL_DEFAULT || req.SubSource > utils.BALANCE_TABLE) {
 		br.Msg = "错误的子来源"
 		br.IsSendEmail = false
@@ -65,7 +56,6 @@ func (c *DataMangePermissionController) SetEdbChartPermission() {
 
 	err, errMsg := data_manage_permission.SetEdbChartPermission(req.Source, req.SubSource, req.UserId, req.UserList, req.IsSelectAll, req.DataIdList, req.NoDataIdList, req.Keyword, req.Classify, sysUser.AdminId)
 	if err != nil {
-		//br.Success = true
 		br.Msg = "设置失败"
 		if errMsg != `` {
 			br.Msg = errMsg
@@ -79,11 +69,6 @@ func (c *DataMangePermissionController) SetEdbChartPermission() {
 	br.Msg = "设置成功"
 }
 
-// SetPermissionEdbChartClassifyIsPermission
-// @Title 指标/图表/表格分类是否涉密设置接口
-// @Description 指标/图表/表格分类是否涉密设置接口
-// @Param	request	body data_manage.MoveEdbChartReq true "type json string"
-// @Success 200 {object} data_manage.ChartListResp
 // @router /edb_chart/classify/permission/is_permission/set [post]
 func (c *DataMangePermissionController) SetPermissionEdbChartClassifyIsPermission() {
 	br := new(models.BaseResponse).Init()
@@ -113,7 +98,6 @@ func (c *DataMangePermissionController) SetPermissionEdbChartClassifyIsPermissio
 		return
 	}
 
-	// 子来源（目前作用于ETA表格，2024-3-26 14:12:09）
 	if req.Source == 6 && (req.SubSource <= utils.EXCEL_DEFAULT || req.SubSource > utils.BALANCE_TABLE) {
 		br.Msg = "错误的子来源"
 		br.IsSendEmail = false
@@ -122,7 +106,6 @@ func (c *DataMangePermissionController) SetPermissionEdbChartClassifyIsPermissio
 
 	err, errMsg := data_manage_permission.SetDataClassifyIsPermission(req.Source, req.SubSource, req.ClassifyIdList, sysUser.AdminId)
 	if err != nil {
-		//br.Success = true
 		br.Msg = "设置失败"
 		if errMsg != `` {
 			br.Msg = errMsg
@@ -137,11 +120,6 @@ func (c *DataMangePermissionController) SetPermissionEdbChartClassifyIsPermissio
 	br.Msg = "设置成功"
 }
 
-// SetEdbChartClassifyPermission
-// @Title 指标/图表/表格分类权限设置接口
-// @Description 指标/图表/表格分类权限设置接口
-// @Param	request	body data_manage.SetEdbChartClassifyPermissionReq true "type json string"
-// @Success 200 {object} data_manage.ChartListResp
 // @router /edb_chart/classify/permission/set [post]
 func (c *DataMangePermissionController) SetEdbChartClassifyPermission() {
 	br := new(models.BaseResponse).Init()
@@ -171,7 +149,6 @@ func (c *DataMangePermissionController) SetEdbChartClassifyPermission() {
 		return
 	}
 
-	// 子来源（目前作用于ETA表格，2024-3-26 14:12:09）
 	if req.Source == 6 && (req.SubSource <= utils.EXCEL_DEFAULT || req.SubSource > utils.BALANCE_TABLE) {
 		br.Msg = "错误的子来源"
 		br.IsSendEmail = false
@@ -186,7 +163,6 @@ func (c *DataMangePermissionController) SetEdbChartClassifyPermission() {
 
 	err, errMsg := data_manage_permission.SetEdbChartClassifyPermission(req.Source, req.SubSource, req.UserList, req.ClassifyIdList, sysUser.AdminId)
 	if err != nil {
-		//br.Success = true
 		br.Msg = "设置失败"
 		if errMsg != `` {
 			br.Msg = errMsg
@@ -200,13 +176,6 @@ func (c *DataMangePermissionController) SetEdbChartClassifyPermission() {
 	br.Msg = "设置成功"
 }
 
-// GetEdbChartPermission
-// @Title 指标/图表/表格权限设置接口
-// @Description 指标/图表/表格权限设置接口
-// @Param   Source   query   int  false       "来源 ：1：手工数据指标 2：钢联化工数据库 3：ETA指标库 4：ETA预测指标 5：图库 6：ETA表格"
-// @Param   SubSource   query   int  false       "子来源 ：目前作用于ETA表格，2024-3-26 14:12:09"
-// @Param   DataId   query   int  false       "资产id"
-// @Success 200 {object} data_manage.ChartListResp
 // @router /edb_chart/permission/show_by_data [get]
 func (c *DataMangePermissionController) GetEdbChartPermission() {
 	br := new(models.BaseResponse).Init()
@@ -229,7 +198,6 @@ func (c *DataMangePermissionController) GetEdbChartPermission() {
 		return
 	}
 
-	// 子来源（目前作用于ETA表格，2024-3-26 14:12:09）
 	subSource, _ := c.GetInt("SubSource")
 	if source == 6 && (subSource <= utils.EXCEL_DEFAULT || subSource > utils.BALANCE_TABLE) {
 		br.Msg = "错误的子来源"
@@ -238,17 +206,14 @@ func (c *DataMangePermissionController) GetEdbChartPermission() {
 	}
 
 	dataId, _ := c.GetInt("DataId")
-	// 用户判断
 	if dataId <= 0 {
 		br.Msg = "请选择数据"
 		br.IsSendEmail = false
 		return
 	}
 
-	// 获取已经配置了的资产id列表
 	idList, err := data_manage_permission.GetUserIdListPermissionByDataId(source, subSource, dataId)
 	if err != nil {
-		//br.Success = true
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败,Err:" + err.Error()
 		return
@@ -259,13 +224,6 @@ func (c *DataMangePermissionController) GetEdbChartPermission() {
 	br.Data = idList
 }
 
-// GetEdbChartClassifyPermission
-// @Title 获取指标/图表/表格分类权限设置接口
-// @Description 获取指标/图表/表格分类权限设置接口
-// @Param   Source   query   int  false       "来源 ：1：手工数据指标 2：钢联化工数据库 3：ETA指标库 4：ETA预测指标 5：图库 6：ETA表格"
-// @Param   SubSource   query   int  false       "子来源 ：目前作用于ETA表格，2024-3-26 14:12:09"
-// @Param   UserId   query   int  false       "用户id"
-// @Success 200 {object} data_manage.ChartListResp
 // @router /edb_chart/classify/permission/show_by_user [get]
 func (c *DataMangePermissionController) GetEdbChartClassifyPermission() {
 	br := new(models.BaseResponse).Init()
@@ -288,7 +246,6 @@ func (c *DataMangePermissionController) GetEdbChartClassifyPermission() {
 		return
 	}
 
-	// 子来源（目前作用于ETA表格，2024-3-26 14:12:09）
 	subSource, _ := c.GetInt("SubSource")
 	if source == 6 && (subSource <= utils.EXCEL_DEFAULT || subSource > utils.BALANCE_TABLE) {
 		br.Msg = "错误的子来源"
@@ -298,17 +255,14 @@ func (c *DataMangePermissionController) GetEdbChartClassifyPermission() {
 
 	userId, _ := c.GetInt("UserId")
 
-	// 用户判断
 	if userId <= 0 {
 		br.Msg = "请选择用户"
 		br.IsSendEmail = false
 		return
 	}
 
-	// 获取已经配置了的分类id列表
 	idList, err := data_manage_permission.GetEdbChartClassifyIdListPermissionByUserId(source, subSource, userId)
 	if err != nil {
-		//br.Success = true
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败,Err:" + err.Error()
 		return
@@ -319,13 +273,6 @@ func (c *DataMangePermissionController) GetEdbChartClassifyPermission() {
 	br.Data = idList
 }
 
-// GetEdbChartNoPermission
-// @Title 根据资产id获取其分类没有权限的用户id列表接口
-// @Description 根据资产id获取其分类没有权限的用户id列表接口
-// @Param   Source   query   int  false       "来源 ：1：手工数据指标 2：钢联化工数据库 3：ETA指标库 4：ETA预测指标 5：图库 6：ETA表格"
-// @Param   SubSource   query   int  false       "子来源 ：目前作用于ETA表格，2024-3-26 14:12:09"
-// @Param   DataId   query   int  false       "资产id"
-// @Success 200 {object} data_manage.ChartListResp
 // @router /edb_chart/no_classify_permission/show_by_data [get]
 func (c *DataMangePermissionController) GetEdbChartNoPermission() {
 	br := new(models.BaseResponse).Init()
@@ -348,7 +295,6 @@ func (c *DataMangePermissionController) GetEdbChartNoPermission() {
 		return
 	}
 
-	// 子来源（目前作用于ETA表格，2024-3-26 14:12:09）
 	subSource, _ := c.GetInt("SubSource")
 	if source == 6 && (subSource <= utils.EXCEL_DEFAULT || subSource > utils.BALANCE_TABLE) {
 		br.Msg = "错误的子来源"
@@ -358,17 +304,14 @@ func (c *DataMangePermissionController) GetEdbChartNoPermission() {
 
 	dataId, _ := c.GetInt("DataId")
 
-	// 用户判断
 	if dataId <= 0 {
 		br.Msg = "请选择数据"
 		br.IsSendEmail = false
 		return
 	}
 
-	// 获取已经配置了的资产id列表
 	idList, err := data_manage_permission.GetUserIdListNoPermissionByDataId(source, subSource, dataId)
 	if err != nil {
-		//br.Success = true
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败,Err:" + err.Error()
 		return

controllers/data_manage/data_manage_permission/data_move.go

@@ -7,15 +7,10 @@ import (
 	data_manage_permissionModel "eta_gn/eta_api/models/data_manage/data_manage_permission"
 	"eta_gn/eta_api/services/data/data_manage_permission"
 	"eta_gn/eta_api/utils"
+
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
-// EdbChartClassifyList
-// @Title 获取指标/图表分类列表数据接口
-// @Description 获取指标/图表分类列表数据接口
-// @Param   Source   query   int  false       "来源 ：1：手工数据指标 2：钢联化工数据库 3：ETA指标库 4：ETA预测指标 5：图库 6：ETA表格；7-计算指标"
-// @Param   SubSource   query   int  false       "子来源 ：ETA表格中的各种表格类型，以及图表的来源（这个是后续的扩展方向）"
-// @Success 200 {object} data_manage.ChartListResp
 // @router /edb_chart/classify [get]
 func (c *DataMangePermissionController) EdbChartClassifyList() {
 	br := new(models.BaseResponse).Init()
@@ -38,7 +33,6 @@ func (c *DataMangePermissionController) EdbChartClassifyList() {
 		return
 	}
 
-	// 子来源（目前作用于ETA表格，2024-3-26 14:12:09）
 	subSource, _ := c.GetInt("SubSource")
 	if source == 6 && (subSource <= utils.EXCEL_DEFAULT || subSource > utils.BALANCE_TABLE) {
 		br.Msg = "错误的子来源"
@@ -48,7 +42,6 @@ func (c *DataMangePermissionController) EdbChartClassifyList() {
 
 	list, err := data_manage_permission.GetEdbChartClassifyList(source, subSource)
 	if err != nil {
-		//br.Success = true
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败,Err:" + err.Error()
 		return
@@ -60,12 +53,6 @@ func (c *DataMangePermissionController) EdbChartClassifyList() {
 	br.Data = list
 }
 
-// SecretEdbChartClassifyList
-// @Title 获取涉密的指标/图表分类列表数据接口
-// @Description 获取指标/图表分类列表数据接口
-// @Param   Source   query   int  false       "来源 ：1：手工数据指标 2：钢联化工数据库 3：ETA指标库 4：ETA预测指标 5：图库 6：ETA表格"
-// @Param   SubSource   query   int  false       "子来源 ：ETA表格中的各种表格类型，以及图表的来源（这个是后续的扩展方向）"
-// @Success 200 {object} data_manage.ChartListResp
 // @router /edb_chart/classify/secret [get]
 func (c *DataMangePermissionController) SecretEdbChartClassifyList() {
 	br := new(models.BaseResponse).Init()
@@ -88,7 +75,6 @@ func (c *DataMangePermissionController) SecretEdbChartClassifyList() {
 		return
 	}
 
-	// 子来源（目前作用于ETA表格，2024-3-26 14:12:09）
 	subSource, _ := c.GetInt("SubSource")
 	if source == 6 && (subSource <= utils.EXCEL_DEFAULT || subSource > utils.BALANCE_TABLE) {
 		br.Msg = "错误的子来源"
@@ -98,7 +84,6 @@ func (c *DataMangePermissionController) SecretEdbChartClassifyList() {
 
 	resp, err := data_manage_permission.GetEdbChartClassifyList(source, subSource)
 	if err != nil {
-		//br.Success = true
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败,Err:" + err.Error()
 		return
@@ -128,17 +113,6 @@ func removeNodesWithNoJoinPermissionAndEmptyChildRecursively(nodes []*data_manag
 	return newListNode
 }
 
-// MoveEdbChartList
-// @Title 获取指标/图表创建人列表数据接口
-// @Description 获取指标/图表创建人列表数据接口
-// @Param   PageSize   query   int  true       "每页数据条数"
-// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
-// @Param   Source   query   int  false       "来源 ：1：手工数据指标 2：钢联化工数据库 3：ETA指标库 4：ETA预测指标 5：图库 6：ETA表格"
-// @Param   SubSource   query   int  false       "子来源 ：目前作用于ETA表格，2024-3-26 14:12:09"
-// @Param   Keyword   query   string  false       "关键字，code或者名称"
-// @Param   Classify   query   string  false       "分类id"
-// @Param   UserId   query   int  false       "创建人id"
-// @Success 200 {object} data_manage.ChartListResp
 // @router /edb_chart/list [get]
 func (c *DataMangePermissionController) MoveEdbChartList() {
 	br := new(models.BaseResponse).Init()
@@ -161,7 +135,6 @@ func (c *DataMangePermissionController) MoveEdbChartList() {
 		return
 	}
 
-	// 子来源（目前作用于ETA表格，2024-3-26 14:12:09）
 	subSource, _ := c.GetInt("SubSource")
 	if source == 6 && (subSource <= utils.EXCEL_DEFAULT || subSource > utils.BALANCE_TABLE) {
 		br.Msg = "错误的子来源"
@@ -189,18 +162,8 @@ func (c *DataMangePermissionController) MoveEdbChartList() {
 	defaultList := make([]data_manage.MoveEdbChartList, 0)
 	resp.List = defaultList
 	resp.Paging = page
-	// 没有传入条件，那就默认自动返回
-	//if userId <= 0 && keyword == `` && classify == `` {
-	//	br.Ret = 200
-	//	br.Success = true
-	//	br.Msg = "获取成功"
-	//	br.Data = resp
-	//	return
-	//}
-
 	list, total, err := data_manage_permission.GetMoveEdbChartList(source, subSource, userId, keyword, classify, startSize, pageSize)
 	if err != nil {
-		//br.Success = true
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败,Err:" + err.Error()
 		return
@@ -219,11 +182,6 @@ func (c *DataMangePermissionController) MoveEdbChartList() {
 	br.Data = resp
 }
 
-// MoveEdbChartUser
-// @Title 指标/图表创建人变更接口
-// @Description 指标/图表创建人变更接口
-// @Param	request	body data_manage_permissionModel.MoveEdbChartReq true "type json string"
-// @Success 200 {object} data_manage.ChartListResp
 // @router /edb_chart/change_user [post]
 func (c *DataMangePermissionController) MoveEdbChartUser() {
 	br := new(models.BaseResponse).Init()
@@ -253,7 +211,6 @@ func (c *DataMangePermissionController) MoveEdbChartUser() {
 		return
 	}
 
-	// 子来源（目前作用于ETA表格，2024-3-26 14:12:09）
 	if req.Source == 6 && (req.SubSource <= utils.EXCEL_DEFAULT || req.SubSource > utils.BALANCE_TABLE) {
 		br.Msg = "错误的子来源"
 		br.IsSendEmail = false
@@ -273,7 +230,6 @@ func (c *DataMangePermissionController) MoveEdbChartUser() {
 
 	err, errMsg := data_manage_permission.MoveEdbChart(req.Source, req.SubSource, req.UserId, req.NewUserId, req.IsSelectAll, req.DataIdList, req.NoDataIdList, req.Keyword, req.Classify, sysUser.AdminId, sysUser.RealName)
 	if err != nil {
-		//br.Success = true
 		br.Msg = "移动失败"
 		if errMsg != `` {
 			br.Msg = errMsg
@@ -287,11 +243,6 @@ func (c *DataMangePermissionController) MoveEdbChartUser() {
 	br.Msg = "修改成功"
 }
 
-// MoveAllEdbChartUser
-// @Title 通过原创建人转移指标/图表创建人接口
-// @Description 通过原创建人转移指标/图表创建人接口
-// @Param request body data_manage_permission.MoveAllEdbChartReq true "type json string"
-// @Success 200 {object} data_manage.ChartListResp
 // @router /edb_chart/all/change_user [post]
 func (c *DataMangePermissionController) MoveAllEdbChartUser() {
 	br := new(models.BaseResponse).Init()
@@ -335,7 +286,6 @@ func (c *DataMangePermissionController) MoveAllEdbChartUser() {
 
 	err, errMsg := data_manage_permission.MoveAllEdbChart(req.Source, req.OldUserId, req.NewUserId, sysUser.AdminId)
 	if err != nil {
-		//br.Success = true
 		br.Msg = "移动失败"
 		if errMsg != `` {
 			br.Msg = errMsg
@@ -349,12 +299,6 @@ func (c *DataMangePermissionController) MoveAllEdbChartUser() {
 	br.Msg = "移动成功"
 }
 
-// MoveEdbChartCount
-// @Title 获取指标/图表创建人汇总数据接口
-// @Description 获取指标/图表创建人汇总数据接口
-// @Param   UserId   query   int  false       "创建人id"
-// @Param   CountType   query   int  false       "来源 ：1：设置资产权限；2：设置数据权限"
-// @Success 200 {object} data_manage.ChartListResp
 // @router /edb_chart/count [get]
 func (c *DataMangePermissionController) MoveEdbChartCount() {
 	br := new(models.BaseResponse).Init()
@@ -373,18 +317,15 @@ func (c *DataMangePermissionController) MoveEdbChartCount() {
 	userId, _ := c.GetInt("UserId")
 	countType, _ := c.GetInt("CountType", 1)
 
-	// 没有传入条件，那就默认自动返回
 	if userId <= 0 {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "获取成功"
-		//br.Data = resp
 		return
 	}
 
 	resp, err := data_manage_permission.GetMoveEdbChartCount(userId, countType)
 	if err != nil {
-		//br.Success = true
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败,Err:" + err.Error()
 		return

controllers/data_manage/data_manage_permission/message.go

@@ -7,16 +7,11 @@ import (
 	data_manage_permissionServ "eta_gn/eta_api/services/data/data_manage_permission"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
+
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
-// MessageList
-// @Title 资产消息列表
-// @Description 资产消息列表
-// @Param   PageSize			query	int		true	"每页数据条数"
-// @Param   CurrentIndex		query	int		true	"当前页页码"
-// @Success 200 {object} data_manage_permission.DataPermissionMessageListResp
 // @router /message/list [get]
 func (c *DataMangePermissionController) MessageList() {
 	br := new(models.BaseResponse).Init()
@@ -35,7 +30,6 @@ func (c *DataMangePermissionController) MessageList() {
 		return
 	}
 
-	// 分页
 	pageSize, _ := c.GetInt("PageSize")
 	currentIndex, _ := c.GetInt("CurrentIndex")
 
@@ -73,7 +67,6 @@ func (c *DataMangePermissionController) MessageList() {
 		resp.List = append(resp.List, t)
 	}
 
-	// 未读消息数
 	cond += fmt.Sprintf(` AND %s = ?`, data_manage_permission.DataPermissionMessageCols.IsRead)
 	pars = append(pars, 0)
 	unreadTotal, e := messageOb.GetCountByCondition(cond, pars)
@@ -92,11 +85,6 @@ func (c *DataMangePermissionController) MessageList() {
 	br.Msg = "获取成功"
 }
 
-// MessageRead
-// @Title 消息已读
-// @Description 消息已读
-// @Param	request	body data_manage_permission.DataPermissionMessageReadReq true "type json string"
-// @Success 200 string "操作成功"
 // @router /message/read [post]
 func (c *DataMangePermissionController) MessageRead() {
 	br := new(models.BaseResponse).Init()
@@ -138,7 +126,6 @@ func (c *DataMangePermissionController) MessageRead() {
 		return
 	}
 
-	// 不等于0的时候，说明已经操作过了，就不重复操作了
 	if messageItem.IsRead != 0 {
 		br.Ret = 200
 		br.Success = true
@@ -166,15 +153,6 @@ func (c *DataMangePermissionController) MessageRead() {
 	br.Msg = "操作成功"
 }
 
-// MessageDetail
-// @Title 资产消息详情
-// @Description 资产消息详情
-// @Param   MessageId			query	int		true	"消息ID"
-// @Param   PageSize   query   int  true       "每页数据条数"
-// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
-// @Param   Source   query   int  false       "来源 ：1：手工数据指标 2：钢联化工数据库 3：ETA指标库 4：ETA预测指标 5：图库 6：ETA表格"
-// @Param   SubSource   query   int  false       "子来源 ：目前作用于ETA表格，2024-3-26 14:12:09"
-// @Success 200 {object} data_manage_permission.MessageDetailListResp
 // @router /message/detail [get]
 func (c *DataMangePermissionController) MessageDetail() {
 	br := new(models.BaseResponse).Init()
@@ -200,7 +178,6 @@ func (c *DataMangePermissionController) MessageDetail() {
 		return
 	}
 	source, _ := c.GetInt("Source")
-	// 子来源（目前作用于ETA表格，2024-3-26 14:12:09）
 	subSource, _ := c.GetInt("SubSource")
 
 	pageSize, _ := c.GetInt("PageSize")
@@ -232,7 +209,6 @@ func (c *DataMangePermissionController) MessageDetail() {
 
 	total, list, err := data_manage_permissionServ.GetMessageDetail(messageItem, source, subSource, startSize, pageSize)
 	if err != nil {
-		//br.Success = true
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败,Err:" + err.Error()
 		return

controllers/data_manage/excel/balance_table.go

@@ -16,19 +16,16 @@ import (
 	excel2 "eta_gn/eta_api/services/excel"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/tealeg/xlsx"
 	"io/ioutil"
 	"os"
 	"sort"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/tealeg/xlsx"
 )
 
-// GetChildTable
-// @Title 获取子表
-// @Description 获取子表
-// @Param	request	body request.MixedTableCellDataReq true "type json string"
 // @router /excel_info/child_table [get]
 func (c *ExcelInfoController) GetChildTable() {
 	br := new(models.BaseResponse).Init()
@@ -51,7 +48,6 @@ func (c *ExcelInfoController) GetChildTable() {
 		return
 	}
 	list := make([]*excel.ExcelInfo, 0)
-	// 查询所有子表
 	childList, err := excel.GetChildExcelInfoByParentId(parentId)
 	if err != nil {
 		br.Msg = "查询子表失败"
@@ -69,11 +65,6 @@ func (c *ExcelInfoController) GetChildTable() {
 	br.Data = resp
 }
 
-// Rename
-// @Title 表格重命名接口
-// @Description 表格重命名接口
-// @Param	request	body request.EditExcelInfoReq true "type json string"
-// @Success 200 {object} response.AddExcelInfoResp
 // @router /excel_info/rename [post]
 func (c *ExcelInfoController) Rename() {
 	br := new(models.BaseResponse).Init()
@@ -115,13 +106,11 @@ func (c *ExcelInfoController) Rename() {
 		br.ErrMsg = "获取ETA表格失败,Err:" + err.Error()
 		return
 	}
-	//判断表格是否存在
 	var condition string
 	var pars []interface{}
 	condition += " AND excel_info_id != ? AND excel_classify_id=? AND excel_name=?  AND parent_id=?"
 	pars = append(pars, req.ExcelInfoId, excelInfo.ExcelClassifyId, req.ExcelName, excelInfo.ParentId)
 
-	// 获取分类下是否存在该表格名称
 	count, err := excel.GetExcelInfoCountByCondition(condition, pars)
 	if err != nil {
 		br.Msg = "ETA判断表格名称是否存在失败"
@@ -134,7 +123,6 @@ func (c *ExcelInfoController) Rename() {
 		return
 	}
 
-	// 操作权限校验, 增加协作人判断
 	{
 		checkExcelInfo := excelInfo
 		if excelInfo.Source == utils.BALANCE_TABLE {
@@ -155,7 +143,6 @@ func (c *ExcelInfoController) Rename() {
 				}
 			}
 		}
-		// 数据权限
 		haveOperaAuth, e := data_manage_permission.CheckExcelPermissionByExcelInfoId(checkExcelInfo.ExcelInfoId, checkExcelInfo.ExcelClassifyId, checkExcelInfo.IsJoinPermission, c.SysUser.AdminId)
 		if e != nil {
 			br.Msg = "获取ETA表格权限失败"
@@ -175,7 +162,6 @@ func (c *ExcelInfoController) Rename() {
 	excelInfo.ExcelName = req.ExcelName
 	excelInfo.UpdateUserId = sysUser.AdminId
 	excelInfo.UpdateUserRealName = sysUser.RealName
-	// 自动保存时不会传缩略图，也就不更新这个字段
 	updateExcelInfoParams := []string{"ModifyTime", "ExcelName", "UpdateUserId", "UpdateUserRealName"}
 
 	err = excelInfo.Update(updateExcelInfoParams)
@@ -190,7 +176,6 @@ func (c *ExcelInfoController) Rename() {
 		UniqueCode:  excelInfo.UniqueCode,
 	}
 
-	//删除公共图库那边的缓存
 	_ = utils.Rc.Delete(utils.HZ_CHART_LIB_EXCEL_TABLE_DETAIL + ":" + excelInfo.UniqueCode)
 
 	br.Ret = 200
@@ -200,11 +185,6 @@ func (c *ExcelInfoController) Rename() {
 	br.IsAddLog = true
 }
 
-// SaveExcelWorker
-// @Title 新增编辑表格协作人接口
-// @Description 新增编辑表格协作人接口
-// @Param	request	body request.EditExcelInfoReq true "type json string"
-// @Success 200 {object} response.AddExcelInfoResp
 // @router /excel_info/worker/save [post]
 func (c *ExcelInfoController) SaveExcelWorker() {
 	br := new(models.BaseResponse).Init()
@@ -244,9 +224,7 @@ func (c *ExcelInfoController) SaveExcelWorker() {
 		br.ErrMsg = "您没有权限操作！"
 		return
 	}
-	// 操作权限校验, 增加协作人判断
 	{
-		// 数据权限
 		haveOperaAuth, err := data_manage_permission.CheckExcelPermissionByExcelInfoId(excelInfo.ExcelInfoId, excelInfo.ExcelClassifyId, excelInfo.IsJoinPermission, c.SysUser.AdminId)
 		if err != nil {
 			br.Msg = "获取ETA表格失败"
@@ -282,7 +260,6 @@ func (c *ExcelInfoController) SaveExcelWorker() {
 			addIds = append(addIds, id)
 		}
 	}
-	// 查询协作人姓名
 	adminList, err := system.GetAdminListByIdListWithoutEnable(addIds)
 	addList := make([]*excel.ExcelWorker, 0)
 	for _, v := range adminList {
@@ -294,7 +271,6 @@ func (c *ExcelInfoController) SaveExcelWorker() {
 			ModifyTime:      time.Now(),
 		})
 	}
-	// 保存协作人
 	err = obj.AddWorker(req.ExcelInfoId, addList, notDeleteWorkerIds)
 	if err != nil {
 		br.Msg = "保存失败"
@@ -307,11 +283,6 @@ func (c *ExcelInfoController) SaveExcelWorker() {
 	br.Msg = "操作成功"
 }
 
-// GetWorker
-// @Title 查询协作人接口
-// @Description 新增编辑表格协作人接口
-// @Param	request	body request.EditExcelInfoReq true "type json string"
-// @Success 200 {object} response.AddExcelInfoResp
 // @router /excel_info/worker [get]
 func (c *ExcelInfoController) GetWorker() {
 	br := new(models.BaseResponse).Init()
@@ -351,11 +322,6 @@ func (c *ExcelInfoController) GetWorker() {
 	br.Msg = "操作成功"
 }
 
-// BalanceChartInfoAdd
-// @Title 新增图表接口
-// @Description 新增图表接口
-// @Param	request	body data_manage.AddChartInfoReq true "type json string"
-// @Success 200 {object} data_manage.AddChartInfoResp
 // @router /excel_info/balance/chart_add [post]
 func (c *ExcelInfoController) BalanceChartInfoAdd() {
 	br := new(models.BaseResponse).Init()
@@ -396,7 +362,6 @@ func (c *ExcelInfoController) BalanceChartInfoAdd() {
 		br.Msg = "请填写图表名称！"
 		return
 	}
-	// 获取表格信息
 	excelInfo, err := excel.GetExcelInfoById(req.ExcelInfoId)
 	if err != nil {
 		br.Msg = "获取ETA表格失败"
@@ -407,7 +372,6 @@ func (c *ExcelInfoController) BalanceChartInfoAdd() {
 		br.Msg = "EXCEL类型错误！"
 		return
 	}
-	// 操作权限校验, 增加协作人判断
 	{
 		checkExcelInfo := excelInfo
 		if excelInfo.Source == utils.BALANCE_TABLE {
@@ -428,7 +392,6 @@ func (c *ExcelInfoController) BalanceChartInfoAdd() {
 				}
 			}
 		}
-		// 数据权限
 		haveOperaAuth, e := data_manage_permission.CheckExcelPermissionByExcelInfoId(checkExcelInfo.ExcelInfoId, checkExcelInfo.ExcelClassifyId, checkExcelInfo.IsJoinPermission, c.SysUser.AdminId)
 		if e != nil {
 			br.Msg = "获取ETA表格权限失败"
@@ -443,7 +406,6 @@ func (c *ExcelInfoController) BalanceChartInfoAdd() {
 			return
 		}
 	}
-	// 判断如果是静态表，则查询表数据，落库
 	dataListMap := make(map[int][]*data_manage.EdbDataList)
 	if excelInfo.BalanceType == 1 {
 		newExcelDataMap, excelAllRows, excelAllCols, e, errMsg := excelService.GetBalanceExcelData(excelInfo, c.Lang)
@@ -484,7 +446,6 @@ func (c *ExcelInfoController) BalanceChartInfoAdd() {
 	resp.UniqueCode = chartInfo.UniqueCode
 	resp.ChartType = req.ChartType
 
-	//新增操作日志
 	{
 		chartLog := new(data_manage.ChartInfoLog)
 		chartLog.ChartInfoId = chartInfo.ChartInfoId
@@ -507,11 +468,6 @@ func (c *ExcelInfoController) BalanceChartInfoAdd() {
 	br.IsAddLog = true
 }
 
-// BalanceChartInfoEdit
-// @Title 编辑图表接口
-// @Description 新增图表接口
-// @Param	request	body data_manage.AddChartInfoReq true "type json string"
-// @Success 200 {object} data_manage.AddChartInfoResp
 // @router /excel_info/balance/chart_edit [post]
 func (c *ExcelInfoController) BalanceChartInfoEdit() {
 	br := new(models.BaseResponse).Init()
@@ -556,7 +512,6 @@ func (c *ExcelInfoController) BalanceChartInfoEdit() {
 		br.Msg = "请选择图表"
 		return
 	}
-	// 获取表格信息
 	excelInfo, err := excel.GetExcelInfoById(req.ExcelInfoId)
 	if err != nil {
 		br.Msg = "获取ETA表格失败"
@@ -567,7 +522,6 @@ func (c *ExcelInfoController) BalanceChartInfoEdit() {
 		br.Msg = "EXCEL类型错误！"
 		return
 	}
-	// 操作权限校验, 增加协作人判断
 	{
 		checkExcelInfo := excelInfo
 		if excelInfo.Source == utils.BALANCE_TABLE {
@@ -588,7 +542,6 @@ func (c *ExcelInfoController) BalanceChartInfoEdit() {
 				}
 			}
 		}
-		// 数据权限
 		haveOperaAuth, e := data_manage_permission.CheckExcelPermissionByExcelInfoId(checkExcelInfo.ExcelInfoId, checkExcelInfo.ExcelClassifyId, checkExcelInfo.IsJoinPermission, c.SysUser.AdminId)
 		if e != nil {
 			br.Msg = "获取ETA表格权限失败"
@@ -603,7 +556,6 @@ func (c *ExcelInfoController) BalanceChartInfoEdit() {
 			return
 		}
 	}
-	// 判断如果是静态表，则查询表数据，落库
 	dataListMap := make(map[int][]*data_manage.EdbDataList)
 	if excelInfo.BalanceType == 1 {
 		newExcelDataMap, excelAllRows, excelAllCols, e, errMsg := excelService.GetBalanceExcelData(excelInfo, c.Lang)
@@ -645,7 +597,6 @@ func (c *ExcelInfoController) BalanceChartInfoEdit() {
 	resp.UniqueCode = chartItem.UniqueCode
 	resp.ChartType = req.ChartType
 
-	//新增操作日志
 	{
 		chartLog := new(data_manage.ChartInfoLog)
 		chartLog.ChartName = chartItem.ChartName
@@ -668,10 +619,6 @@ func (c *ExcelInfoController) BalanceChartInfoEdit() {
 	br.IsAddLog = true
 }
 
-// GetBalanceChartList
-// @Title 获取平衡表表关联的图表
-// @Description 获取平衡表表关联的图表
-// @Param	request	body request.MixedTableCellDataReq true "type json string"
 // @router /excel_info/balance/chart_list [get]
 func (c *ExcelInfoController) GetBalanceChartList() {
 	br := new(models.BaseResponse).Init()
@@ -693,7 +640,6 @@ func (c *ExcelInfoController) GetBalanceChartList() {
 		br.Msg = "请选择平衡表"
 		return
 	}
-	// 查询所有子表
 	excelInfo, err := excel.GetExcelInfoById(excelInfoId)
 	if err != nil {
 		if utils.IsErrNoRow(err) {
@@ -756,11 +702,6 @@ func (c *ExcelInfoController) GetBalanceChartList() {
 	br.Data = ret
 }
 
-// DeleteBalanceChart
-// @Title 删除平衡表图表
-// @Description 删除平衡表图表
-// @Param	request	body data_manage.DeleteChartClassifyReq true "type json string"
-// @Success 200 Ret=200 删除成功
 // @router /excel_info/balance/chart_del [post]
 func (c *ExcelInfoController) DeleteBalanceChart() {
 	br := new(models.BaseResponse).Init()
@@ -790,7 +731,6 @@ func (c *ExcelInfoController) DeleteBalanceChart() {
 		br.IsSendEmail = false
 		return
 	}
-	//删除图表
 	if req.ChartInfoId > 0 {
 		chartInfo, err := data_manage.GetChartInfoById(req.ChartInfoId)
 		if err != nil {
@@ -809,9 +749,7 @@ func (c *ExcelInfoController) DeleteBalanceChart() {
 			return
 		}
 
-		// 操作权限校验, 增加协作人判断
 		{
-			// 获取表格信息
 			excelInfo, e := excel.GetExcelInfoByChartInfoId(req.ChartInfoId)
 			if e != nil {
 				br.Msg = "获取ETA表格失败"
@@ -836,7 +774,6 @@ func (c *ExcelInfoController) DeleteBalanceChart() {
 					}
 				}
 			}
-			// 数据权限
 			haveOperaAuth, e := data_manage_permission.CheckExcelPermissionByExcelInfoId(checkExcelInfo.ExcelInfoId, checkExcelInfo.ExcelClassifyId, checkExcelInfo.IsJoinPermission, c.SysUser.AdminId)
 			if e != nil {
 				br.Msg = "获取ETA表格权限失败"
@@ -852,7 +789,6 @@ func (c *ExcelInfoController) DeleteBalanceChart() {
 			}
 		}
 
-		// 获取引用该图表的MyCharts, 用于ES删除
 		var myCond string
 		var myPars []interface{}
 		myCond += ` AND a.chart_info_id = ? `
@@ -868,22 +804,17 @@ func (c *ExcelInfoController) DeleteBalanceChart() {
 			myIds = append(myIds, m.MyChartId)
 		}
 
-		//删除图表及关联指标
 		e = excel.DeleteBalanceExcelChartInfoAndData(req.ChartInfoId)
 		if e != nil {
 			br.Msg = "删除失败"
 			br.ErrMsg = "删除失败，Err:" + e.Error()
 			return
 		}
-		//删除ES
 		{
 			go data.EsDeleteChartInfo(req.ChartInfoId)
-			// 删除MY ETA 图表 es数据
-			//go data.EsDeleteMyChartInfoByChartInfoId(req.ChartInfoId)
 			go data.EsDeleteMyChartInfoByMyChartIds(myIds)
 		}
 
-		//新增操作日志
 		{
 			chartLog := new(data_manage.ChartInfoLog)
 			chartLog.ChartName = chartInfo.ChartName
@@ -905,11 +836,6 @@ func (c *ExcelInfoController) DeleteBalanceChart() {
 	br.IsAddLog = true
 }
 
-// BalanceSeasonChartLegendPreview
-// @Title 季节性图例预览接口
-// @Description 季节性图例预览接口
-// @Param	request	body request.BalanceSeasonChartLegendPreviewReq true "type json string"
-// @Success 200 {object} data_manage.BalanceSeasonChartLegendPreviewResp
 // @router /excel_info/balance/chartLegend/preview [post]
 func (c *ExcelInfoController) BalanceSeasonChartLegendPreview() {
 	br := new(models.BaseResponse).Init()
@@ -947,7 +873,6 @@ func (c *ExcelInfoController) BalanceSeasonChartLegendPreview() {
 		}
 		newDataMap[i] = fv
 	}
-	//组装成excelEdbData
 	dataList := make([]*data_manage.EdbDataList, 0)
 
 	for i, v := range req.DateArr {
@@ -967,7 +892,6 @@ func (c *ExcelInfoController) BalanceSeasonChartLegendPreview() {
 		dataList = append(dataList, tmp)
 	}
 
-	// 对dataList 根据dataTimestamp 进行排序
 	sort.Slice(dataList, func(i, j int) bool {
 		return dataList[i].DataTimestamp < dataList[j].DataTimestamp
 	})
@@ -990,11 +914,6 @@ func (c *ExcelInfoController) BalanceSeasonChartLegendPreview() {
 	br.Msg = "操作成功"
 }
 
-// AddStaticExcel
-// @Title 新增静态表
-// @Description 新增静态表
-// @Param	request	body request.EditExcelInfoReq true "type json string"
-// @Success 200 {object} response.AddExcelInfoResp
 // @router /excel_info/balance/static/add [post]
 func (c *ExcelInfoController) AddStaticExcel() {
 	br := new(models.BaseResponse).Init()
@@ -1039,15 +958,12 @@ func (c *ExcelInfoController) AddStaticExcel() {
 		return
 	}
 
-	// 获取原ETA表格信息
 	oldExcelInfo, err := excel.GetExcelInfoById(req.ExcelInfoId)
 	if err != nil {
 		br.Msg = "获取ETA表格失败"
 		return
 	}
-	// 操作权限校验, 增加协作人判断
 	{
-		// 数据权限
 		haveOperaAuth, err := data_manage_permission.CheckExcelPermissionByExcelInfoId(oldExcelInfo.ExcelInfoId, oldExcelInfo.ExcelClassifyId, oldExcelInfo.IsJoinPermission, c.SysUser.AdminId)
 		if err != nil {
 			br.Msg = "获取ETA表格失败"
@@ -1061,9 +977,7 @@ func (c *ExcelInfoController) AddStaticExcel() {
 			return
 		}
 	}
-	// 查询出每个子表的内容，并将内容转为静态版本
 	excelDataMap := make(map[int]map[int][]*data_manage.EdbDataList)
-	//查询动态表所有的子表，并复制为静态表
 	condition := " AND parent_id = ? AND balance_type = 0 "
 	var pars []interface{}
 	pars = append(pars, req.ExcelInfoId)
@@ -1074,8 +988,6 @@ func (c *ExcelInfoController) AddStaticExcel() {
 		return
 	}
 	for k, childExcelInfo := range childExcelList {
-		//得到表格数据并落库
-
 		newExcelDataMap, excelAllRows, excelAllCols, e, errMsg := excelService.GetBalanceExcelData(childExcelInfo, c.Lang)
 		if e != nil {
 			br.Msg = "获取表格数据失败"
@@ -1137,11 +1049,6 @@ func (c *ExcelInfoController) AddStaticExcel() {
 	br.IsAddLog = true
 }
 
-// BalanceVersionList
-// @Title 查询平衡表版本号列表
-// @Description 查询平衡表版本号列表
-// @Param	request	body request.EditExcelInfoReq true "type json string"
-// @Success 200 {object} response.AddExcelInfoResp
 // @router /excel_info/balance/version [get]
 func (c *ExcelInfoController) BalanceVersionList() {
 	br := new(models.BaseResponse).Init()
@@ -1187,7 +1094,6 @@ func (c *ExcelInfoController) BalanceVersionList() {
 		RelExcelInfoId: excelInfo.RelExcelInfoId,
 		VersionName:    "动态表", //todo 有个默认的版本名称
 	})
-	//查询动态表所有的子表，并复制为静态表
 	condition := " AND rel_excel_info_id=? AND parent_id = 0 AND balance_type = 1 "
 	var pars []interface{}
 	pars = append(pars, excelInfoId)
@@ -1216,11 +1122,6 @@ func (c *ExcelInfoController) BalanceVersionList() {
 	br.Msg = "操作成功"
 }
 
-// ModifyBalanceExcelVersion
-// @Title 版本号重命名
-// @Description 版本号重命名
-// @Param	request	body request.AddBalanceStaticExcelInfoReq true "type json string"
-// @Success 200 {object} response.AddExcelInfoResp
 // @router /excel_info/balance/version/modify [post]
 func (c *ExcelInfoController) ModifyBalanceExcelVersion() {
 	br := new(models.BaseResponse).Init()
@@ -1269,7 +1170,6 @@ func (c *ExcelInfoController) ModifyBalanceExcelVersion() {
 		return
 	}
 
-	// 操作权限校验, 增加协作人判断
 	{
 		checkExcelInfo := excelInfo
 		if excelInfo.Source == utils.BALANCE_TABLE {
@@ -1290,7 +1190,6 @@ func (c *ExcelInfoController) ModifyBalanceExcelVersion() {
 				}
 			}
 		}
-		// 数据权限
 		haveOperaAuth, e := data_manage_permission.CheckExcelPermissionByExcelInfoId(checkExcelInfo.ExcelInfoId, checkExcelInfo.ExcelClassifyId, checkExcelInfo.IsJoinPermission, c.SysUser.AdminId)
 		if e != nil {
 			br.Msg = "获取ETA表格权限失败"
@@ -1305,7 +1204,6 @@ func (c *ExcelInfoController) ModifyBalanceExcelVersion() {
 			return
 		}
 	}
-	// 检验分类下是否存在该版本号
 	{
 		var condition string
 		var pars []interface{}
@@ -1331,8 +1229,7 @@ func (c *ExcelInfoController) ModifyBalanceExcelVersion() {
 	excelInfo.ModifyTime = time.Now()
 	excelInfo.VersionName = req.VersionName
 	updateExcelInfoParams := []string{"ModifyTime", "VersionName"}
-	// todo 同步修改静态表中的图表和指标名称
-	// ETA表格信息变更
+
 	err = excelInfo.Update(updateExcelInfoParams)
 	if err != nil {
 		br.Msg = "操作失败"
@@ -1359,7 +1256,6 @@ func downloadBalanceTable(excelInfo *excel.ExcelInfo, lang string) (savePath, zi
 		err = fmt.Errorf("平衡表类型错误 ")
 		return
 	}
-	//复制静态表
 	staticCondition := " AND parent_id = 0 AND balance_type = 1 AND rel_excel_info_id=? "
 	var staticPars []interface{}
 	staticPars = append(staticPars, excelInfo.ExcelInfoId)
@@ -1404,21 +1300,17 @@ func downloadBalanceTable(excelInfo *excel.ExcelInfo, lang string) (savePath, zi
 				return
 			}
 
-			// 将单个sheet的数据写入到excel
 			err = tableData.WriteExcelSheetData(xlsxFile, childExcelInfo.ExcelName)
 			if err != nil {
 				return
 			}
 		}
-		//处理excel文件
-		//return
 		err = xlsxFile.Save(fpath)
 		if err != nil {
 			return
 		}
 		fileList = append(fileList, fileName)
 	}
-	// 创建zip
 	zipName = excelInfo.ExcelName + ".zip"
 
 	savePath = uploadDir + "/" + zipName
@@ -1428,15 +1320,12 @@ func downloadBalanceTable(excelInfo *excel.ExcelInfo, lang string) (savePath, zi
 		return
 	}
 	zipWriter := zip.NewWriter(zipFile)
-	// 生成zip过程中报错关闭
 	defer func() {
 		if err != nil {
 			zipWriter.Close()
 			zipFile.Close()
 		}
-		//os.Remove(savePath)
 	}()
-	//写入zip
 	for i := 0; i < len(fileList); i++ {
 		ioWriter, e := zipWriter.Create(fileList[i])
 		if e != nil {
@@ -1455,10 +1344,8 @@ func downloadBalanceTable(excelInfo *excel.ExcelInfo, lang string) (savePath, zi
 		}
 		ioWriter.Write(content)
 	}
-	// 生成zip后关闭,否则下载文件会损坏
 	zipWriter.Close()
 	zipFile.Close()
-	//this.Ctx.Output.Download(downLoadnFilePath, downloadFileName)
 	return
 }
 
@@ -1479,13 +1366,11 @@ func refreshBalanceTable(excelDetail response.ExcelInfoDetail, lang string) (err
 			}
 		}
 
-		// 清除缓存
 		key := utils.HZ_CHART_LIB_EXCEL_TABLE_DETAIL + ":" + excelDetail.UniqueCode
 		if utils.Re == nil {
 			_ = utils.Rc.Delete(key)
 		}
 	} else {
-		//查询父表和子表
 		cCondition := " AND parent_id = ? AND balance_type=0"
 		var cPars []interface{}
 		cPars = append(cPars, excelDetail.ExcelInfoId)
@@ -1494,7 +1379,6 @@ func refreshBalanceTable(excelDetail response.ExcelInfoDetail, lang string) (err
 			err = fmt.Errorf("获取子表失败 %s", err.Error())
 			return
 		}
-		// 遍历
 		for _, child := range childList {
 			var result request.MixedTableReq
 			err = json.Unmarshal([]byte(child.Content), &result)
@@ -1519,7 +1403,6 @@ func refreshBalanceTable(excelDetail response.ExcelInfoDetail, lang string) (err
 				}
 			}
 
-			// 清除缓存
 			key := utils.HZ_CHART_LIB_EXCEL_TABLE_DETAIL + ":" + child.UniqueCode
 			if utils.Re == nil {
 				_ = utils.Rc.Delete(key)
@@ -1537,11 +1420,6 @@ func refreshBalanceTable(excelDetail response.ExcelInfoDetail, lang string) (err
 	return
 }
 
-// BalanceChartInfoBaseEdit
-// @Title 编辑图表基础信息接口
-// @Description 编辑图表基础信息接口
-// @Param	request	body data_manage.EditChartEnInfoBaseReq true "type json string"
-// @Success Ret=200 编辑成功
 // @router /excel_info/balance/chart_base_edit [post]
 func (this *ExcelInfoController) BalanceChartInfoBaseEdit() {
 	br := new(models.BaseResponse).Init()
@@ -1571,7 +1449,6 @@ func (this *ExcelInfoController) BalanceChartInfoBaseEdit() {
 		return
 	}
 
-	//判断指标名称是否存在
 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
 	if err != nil {
 		if utils.IsErrNoRow(err) {
@@ -1584,7 +1461,6 @@ func (this *ExcelInfoController) BalanceChartInfoBaseEdit() {
 		return
 	}
 
-	// 判断是否有传入对应的指标配置
 	noEdbInfoType := []int{10}
 	if len(req.ChartEdbInfoList) <= 0 && !utils.InArrayByInt(noEdbInfoType, chartItem.ChartType) {
 		br.Msg = "请选择指标！"
@@ -1613,7 +1489,6 @@ func (this *ExcelInfoController) BalanceChartInfoBaseEdit() {
 			return
 		}
 
-		//判断指标名称是否重复
 		if v.EdbName != "" {
 			edbCondition = ""
 			edbPars = make([]interface{}, 0)
@@ -1683,12 +1558,9 @@ func (this *ExcelInfoController) BalanceChartInfoBaseEdit() {
 		br.ErrMsg = "保存失败,Err:" + err.Error()
 		return
 	}
-	//添加es数据
 	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
-	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
 
-	//新增操作日志
 	{
 		chartLog := new(data_manage.ChartInfoLog)
 		chartLog.ChartName = chartItem.ChartName
@@ -1703,7 +1575,6 @@ func (this *ExcelInfoController) BalanceChartInfoBaseEdit() {
 		chartLog.Method = this.Ctx.Input.URL()
 		go data_manage.AddChartInfoLog(chartLog)
 	}
-	//清除缓存
 	if utils.Re == nil && utils.Rc != nil {
 		utils.Rc.Delete(utils.HZ_CHART_LIB_DETAIL + chartItem.UniqueCode) //图表分享链接缓存
 		utils.Rc.Delete(data.GetChartInfoDataKey(req.ChartInfoId))

controllers/data_manage/excel/custom_analysis.go

@@ -15,23 +15,18 @@ import (
 	excel2 "eta_gn/eta_api/services/data/excel"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"sort"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
-// CustomAnalysisController 自定义分析
 type CustomAnalysisController struct {
 	controllers.BaseAuthController
 }
 
-// ExcelByName
-// @Title 根据excel名称获取表格详情（基础信息+第一页初始化数据）
-// @Description 根据excel名称获取表格详情（基础信息+第一页初始化数据）
-// @Param   ExcelName   query   string  true       "搜索关键词"
-// @Success 200 {object} response.ExcelListResp
 // @router /excel_by_name [get]
 func (c *CustomAnalysisController) ExcelByName() {
 	br := new(models.BaseResponse).Init()
@@ -58,7 +53,6 @@ func (c *CustomAnalysisController) ExcelByName() {
 	resp := response.FindExcelInfoResp{}
 
 	excelName = utils.TrimLRStr(excelName)
-	// 获取数据详情
 	excelDetail, err := excelModel.GetNoContentExcelInfoByName(excelName, utils.CUSTOM_ANALYSIS_TABLE, sysUser.AdminId)
 	if err != nil {
 		if utils.IsErrNoRow(err) {
@@ -73,7 +67,6 @@ func (c *CustomAnalysisController) ExcelByName() {
 		return
 	}
 
-	// 数据权限
 	haveOperaAuth, err := data_manage_permission.CheckExcelPermissionByExcelInfoId(excelDetail.ExcelInfoId, excelDetail.ExcelClassifyId, excelDetail.IsJoinPermission, c.SysUser.AdminId)
 	if err != nil {
 		br.Msg = "获取ETA表格失败"
@@ -111,22 +104,12 @@ func (c *CustomAnalysisController) ExcelByName() {
 		resp.SheetList = sheetList
 	}
 
-	//resp := response.ExcelListResp{
-	//	Paging: page,
-	//	List:   list,
-	//}
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
 	br.Data = resp
 }
 
-// Add
-// @Title 新增表格接口
-// @Description 新增表格接口
-// @Param	request	body request.AddExcelInfoReq true "type json string"
-// @Success 200 {object} response.AddExcelInfoResp
 // @router /add [post]
 func (c *CustomAnalysisController) Add() {
 	br := new(models.BaseResponse).Init()
@@ -169,7 +152,6 @@ func (c *CustomAnalysisController) Add() {
 		return
 	}
 
-	// 获取是否存在该表格名称
 	{
 		var condition string
 		var pars []interface{}
@@ -212,36 +194,12 @@ func (c *CustomAnalysisController) Add() {
 		return
 	}
 
-	// 更新excel下载地址(默认的EXCEL需要更新，自定义表格不需要更新）
-	//if req.Source == 1 {
-	//	go UpdateExcelInfoFileUrl(excelInfo)
-	//}
-	//
 	resp := new(response.AddExcelInfoResp)
 	resp.ExcelInfoId = excelInfo.ExcelInfoId
 	resp.UniqueCode = excelInfo.UniqueCode
 
-	// 生成excel文件
 	go excel.UpdateExcelInfoFileUrl(excelInfo)
 
-	//新增操作日志
-	//{
-	//	excelLog := &data_manage.ExcelInfoLog{
-	//		//ExcelInfoLogId:  0,
-	//		ExcelInfoId:     excelInfo.ExcelInfoId,
-	//		ExcelName:       req.ExcelName,
-	//		ExcelClassifyId: req.ExcelClassifyId,
-	//		SysUserId:       sysUser.AdminId,
-	//		SysUserRealName: sysUser.RealName,
-	//		UniqueCode:      excelInfo.UniqueCode,
-	//		CreateTime:      time.Now(),
-	//		Content:         string(c.Ctx.Input.RequestBody),
-	//		Status:          "新增表格",
-	//		Method:          c.Ctx.Input.URI(),
-	//	}
-	//	go data_manage.AddExcelInfoLog(excelLog)
-	//}
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "保存成功"
@@ -249,11 +207,6 @@ func (c *CustomAnalysisController) Add() {
 	br.IsAddLog = false //数据量太大了，不写入日志吧
 }
 
-// Save
-// @Title 保存表格接口
-// @Description 保存表格接口
-// @Param	request	body request.AddExcelInfoReq true "type json string"
-// @Success 200 {object} response.AddExcelInfoResp
 // @router /save [post]
 func (c *CustomAnalysisController) Save() {
 	br := new(models.BaseResponse).Init()
@@ -332,36 +285,12 @@ func (c *CustomAnalysisController) Save() {
 		return
 	}
 
-	// 更新excel下载地址(默认的EXCEL需要更新，自定义表格不需要更新）
-	//if req.Source == 1 {
-	//	go UpdateExcelInfoFileUrl(excelInfo)
-	//}
-	//
 	resp := new(response.AddExcelInfoResp)
 	resp.ExcelInfoId = excelInfo.ExcelInfoId
 	resp.UniqueCode = excelInfo.UniqueCode
 
-	// 生成excel文件
 	go excel.UpdateExcelInfoFileUrl(excelInfo)
 
-	//新增操作日志
-	//{
-	//	excelLog := &data_manage.ExcelInfoLog{
-	//		//ExcelInfoLogId:  0,
-	//		ExcelInfoId:     excelInfo.ExcelInfoId,
-	//		ExcelName:       req.ExcelName,
-	//		ExcelClassifyId: req.ExcelClassifyId,
-	//		SysUserId:       sysUser.AdminId,
-	//		SysUserRealName: sysUser.RealName,
-	//		UniqueCode:      excelInfo.UniqueCode,
-	//		CreateTime:      time.Now(),
-	//		Content:         string(c.Ctx.Input.RequestBody),
-	//		Status:          "新增表格",
-	//		Method:          c.Ctx.Input.URI(),
-	//	}
-	//	go data_manage.AddExcelInfoLog(excelLog)
-	//}
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "保存成功"
@@ -369,11 +298,6 @@ func (c *CustomAnalysisController) Save() {
 	br.IsAddLog = false //数据量太大了，不写入日志吧
 }
 
-// BaseExcelDetail
-// @Title 根据excel名称获取表格详情（基础信息+第一页初始化数据）
-// @Description 根据excel名称获取表格详情（基础信息+第一页初始化数据）
-// @Param   UniqueCode   query   string  true       "excel唯一编码"
-// @Success 200 {object} response.ExcelListResp
 // @router /excel/base [get]
 func (c *CustomAnalysisController) BaseExcelDetail() {
 	br := new(models.BaseResponse).Init()
@@ -399,7 +323,6 @@ func (c *CustomAnalysisController) BaseExcelDetail() {
 
 	resp := response.FindExcelInfoResp{}
 
-	// 获取数据详情
 	excelDetail, err := excelModel.GetNoContentExcelInfoByUniqueCode(uniqueCode)
 	if err != nil {
 		if utils.IsErrNoRow(err) {
@@ -413,7 +336,6 @@ func (c *CustomAnalysisController) BaseExcelDetail() {
 		br.ErrMsg = err.Error()
 		return
 	}
-	// 编辑状态
 	markStatus, err := services.UpdateExcelEditMark(excelDetail.ExcelInfoId, sysUser.AdminId, 2, sysUser.RealName)
 	if err != nil {
 		br.Msg = "查询标记状态失败"
@@ -421,15 +343,6 @@ func (c *CustomAnalysisController) BaseExcelDetail() {
 		return
 	}
 
-	// 数据权限
-	//haveOperaAuth, err := data_manage_permission.CheckExcelPermissionByExcelInfoId(excelDetail.ExcelInfoId, excelDetail.ExcelClassifyId, excelDetail.IsJoinPermission, c.SysUser.AdminId)
-	//if err != nil {
-	//	br.Msg = "获取ETA表格失败"
-	//	br.ErrMsg = "获取ETA表格权限失败,Err:" + err.Error()
-	//	return
-	//}
-
-	// 自定义分析权限与其他表格略有差别...
 	permissions, e := excelPermissionModel.GetExcelPermissionByExcelIdAndUserId(excelDetail.ExcelInfoId, sysUser.AdminId)
 	if e != nil {
 		br.Msg = "获取失败"
@@ -479,7 +392,6 @@ func (c *CustomAnalysisController) BaseExcelDetail() {
 			for _, v := range sheetList {
 				sheetIdList = append(sheetIdList, v.ExcelSheetId)
 			}
-			// 获取所有sheet的第一页的数据
 			sheetDataList, err := excelModel.GetSheetDataListBySheetIdListAndPage(sheetIdList, 1)
 			if err != nil {
 				br.Msg = "获取sheet中的数据失败"
@@ -503,28 +415,15 @@ func (c *CustomAnalysisController) BaseExcelDetail() {
 
 		}
 
-		// TODO 合并单元格信息、计算公式
-
 		resp.SheetList = sheetList
 	}
 
-	//resp := response.ExcelListResp{
-	//	Paging: page,
-	//	List:   list,
-	//}
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
 	br.Data = resp
 }
 
-// ExcelDataList
-// @Title 根据excel名称获取表格详情（基础信息+第一页初始化数据）
-// @Description 根据excel名称获取表格详情（基础信息+第一页初始化数据）
-// @Param   UniqueCode   query   string  true       "excel唯一编码"
-// @Param   Page   query   int  true       "页码"
-// @Success 200 {object} response.ExcelListResp
 // @router /excel/data [get]
 func (c *CustomAnalysisController) ExcelDataList() {
 	br := new(models.BaseResponse).Init()
@@ -557,7 +456,6 @@ func (c *CustomAnalysisController) ExcelDataList() {
 	}
 
 	sheetList := make([]*excelModel.SheetItem, 0)
-	// 获取数据详情
 	excelDetail, err := excelModel.GetNoContentExcelInfoByUniqueCode(uniqueCode)
 	if err != nil {
 		if utils.IsErrNoRow(err) {
@@ -592,7 +490,6 @@ func (c *CustomAnalysisController) ExcelDataList() {
 			for _, v := range sheetList {
 				sheetIdList = append(sheetIdList, v.ExcelSheetId)
 			}
-			// 获取所有sheet的第一页的数据
 			sheetDataList, err := excelModel.GetSheetDataListBySheetIdListAndPage(sheetIdList, page)
 			if err != nil {
 				br.Msg = "获取sheet中的数据失败"
@@ -615,27 +512,14 @@ func (c *CustomAnalysisController) ExcelDataList() {
 			}
 
 		}
-
-		// TODO 合并单元格信息、计算公式
-
 	}
 
-	//resp := response.ExcelListResp{
-	//	Paging: page,
-	//	List:   list,
-	//}
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
 	br.Data = sheetList
 }
 
-// ClassifyList
-// @Title 分类列表
-// @Description 分类列表
-// @Param   IsShare  query  bool  false  "是否共享表格: true-是; false-否(默认)"
-// @Success 200 {object} response.ExcelClassifyListResp
 // @router /excel_classify/list [get]
 func (c *CustomAnalysisController) ClassifyList() {
 	br := new(models.BaseResponse).Init()
@@ -659,7 +543,6 @@ func (c *CustomAnalysisController) ClassifyList() {
 
 	resp := new(response.ExcelClassifyListResp)
 
-	// 查询我分享的/分享给我的表格
 	excels, e := excelPermissionModel.GetAdminAuthExcelInfoPermission(source, sysUser.AdminId, "")
 	if e != nil {
 		br.Msg = "获取失败"
@@ -673,7 +556,6 @@ func (c *CustomAnalysisController) ClassifyList() {
 		}
 	}
 
-	// 共享
 	if isShare {
 		shareExcel := new(excelModel.ExcelClassifyItems)
 		shareExcel.ExcelClassifyId = excelModel.CustomAnalysisMenuShareId
@@ -693,7 +575,6 @@ func (c *CustomAnalysisController) ClassifyList() {
 		sharedExcel.HaveOperaAuth = true
 		sharedExcel.Children = make([]*excelModel.ExcelClassifyItems, 0)
 
-		// 收到共享细分目录
 		sharedUserClassify := make(map[int]*excelModel.ExcelClassifyItems)
 		adminIdName := make(map[int]string)
 		{
@@ -718,7 +599,6 @@ func (c *CustomAnalysisController) ClassifyList() {
 			item.UniqueCode = v.UniqueCode
 			item.HaveOperaAuth = true
 			item.HasShare = hasShareMap[int(v.ExcelInfoId)]
-			// 我共享的
 			if v.CreateUserId == sysUser.AdminId && !shareExists[int(v.ExcelInfoId)] {
 				shareExists[int(v.ExcelInfoId)] = true
 				item.Level = 2
@@ -728,10 +608,8 @@ func (c *CustomAnalysisController) ClassifyList() {
 				continue
 			}
 
-			// 收到共享
 			if int(v.SysUserId) == sysUser.AdminId {
 				if adminIdName[v.CreateUserId] == "" {
-					// 分享人用户不存在, 那么不显示该分类
 					continue
 				}
 				if !utils.InArrayByInt(sortUser, v.CreateUserId) {
@@ -753,7 +631,6 @@ func (c *CustomAnalysisController) ClassifyList() {
 				sharedUserClassify[v.CreateUserId].Children = append(sharedUserClassify[v.CreateUserId].Children, item)
 			}
 		}
-		// 按照分享人第一次分享时间降序=_=!, 查询的时候是升序, 这里反过来
 		for i, j := 0, len(sortUser)-1; i < j; i, j = i+1, j-1 {
 			sortUser[i], sortUser[j] = sortUser[j], sortUser[i]
 		}
@@ -772,7 +649,6 @@ func (c *CustomAnalysisController) ClassifyList() {
 		return
 	}
 
-	// 我的表格
 	classifyList, err := excelModel.GetAdminExcelClassifyBySource(source, sysUser.AdminId)
 	if err != nil {
 		br.Msg = "获取失败"
@@ -835,15 +711,6 @@ func (c *CustomAnalysisController) ClassifyList() {
 	br.Data = resp
 }
 
-// List
-// @Title 自定义分析列表
-// @Description ETA表格列表接口
-// @Param   PageSize   query   int  true       "每页数据条数"
-// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
-// @Param   ExcelClassifyId   query   int  true       "分类id"
-// @Param   Keyword   query   string  true       "搜索关键词"
-// @Param   IsShare  query  bool  false  "是否共享表格: true-是; false-否(默认)"
-// @Success 200 {object} response.ExcelListResp
 // @router /excel/list [get]
 func (c *CustomAnalysisController) List() {
 	br := new(models.BaseResponse).Init()
@@ -875,13 +742,10 @@ func (c *CustomAnalysisController) List() {
 	var pars []interface{}
 	condition += " AND source = ?"
 	pars = append(pars, source)
-	// 共享的
-	//hasShareMap := make(map[int]bool)
 	if isShare {
 		if keyword != "" {
 			keyword = fmt.Sprint("%", keyword, "%")
 		}
-		// 查询我分享的/分享给我的表格
 		excels, e := excelPermissionModel.GetAdminAuthExcelInfoPermission(source, adminId, keyword)
 		if e != nil {
 			br.Msg = "获取失败"
@@ -892,23 +756,18 @@ func (c *CustomAnalysisController) List() {
 		var excelIds, shareIds, sharedIds, userIds []int
 		for _, v := range excels {
 			id := int(v.ExcelInfoId)
-			// 无分类ID
 			if excelClassifyId <= 0 && !utils.InArrayByInt(excelIds, id) {
 				excelIds = append(excelIds, id)
 				continue
 			}
-			// 用户分类
 			if excelClassifyId == v.CreateUserId {
 				userIds = append(userIds, id)
 				continue
 			}
-			// 我共享的
 			if excelClassifyId == excelModel.CustomAnalysisMenuShareId && v.CreateUserId == sysUser.AdminId {
 				shareIds = append(shareIds, id)
-				//hasShareMap[id] = true
 				continue
 			}
-			// 收到共享
 			if excelClassifyId == excelModel.CustomAnalysisMenuSharedId && int(v.SysUserId) == sysUser.AdminId {
 				sharedIds = append(sharedIds, id)
 				continue
@@ -945,7 +804,6 @@ func (c *CustomAnalysisController) List() {
 		pars = append(pars, adminId)
 	}
 
-	// 筛选分类
 	if !isShare && excelClassifyId > 0 {
 		_, err := excelModel.GetExcelClassifyById(excelClassifyId)
 		if err != nil && !utils.IsErrNoRow(err) {
@@ -977,7 +835,6 @@ func (c *CustomAnalysisController) List() {
 		pars = utils.GetLikeKeywordPars(pars, keyword, 1)
 	}
 
-	// 获取表格信息
 	var total int
 	page := paging.GetPaging(currentIndex, pageSize, total)
 	var startSize int
@@ -997,10 +854,8 @@ func (c *CustomAnalysisController) List() {
 	}
 	for _, v := range list {
 		v.HaveOperaAuth = true
-		//v.Button.CancelShareButton = hasShareMap[v.ExcelInfoId]
 	}
 
-	// 总数据量
 	dataCount, err := excelModel.GetExcelListCountByCondition(condition, pars)
 	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取表格列表信息失败"
@@ -1019,11 +874,6 @@ func (c *CustomAnalysisController) List() {
 	br.Data = resp
 }
 
-// Share
-// @Title 分享表格
-// @Description 分享表格
-// @Param	request	body request.ShareExcelInfoReq true "type json string"
-// @Success 200 string "操作成功"
 // @router /excel/share [post]
 func (c *CustomAnalysisController) Share() {
 	br := new(models.BaseResponse).Init()
@@ -1102,11 +952,6 @@ func (c *CustomAnalysisController) Share() {
 	br.Msg = "操作成功"
 }
 
-// ShareDetail
-// @Title 分享表格-详情
-// @Description 分享表格-详情
-// @Param   ExcelInfoId  query  int  true  "表格ID"
-// @Success 200 {object} response.ShareExcelInfoDetail
 // @router /excel/share_detail [get]
 func (c *CustomAnalysisController) ShareDetail() {
 	br := new(models.BaseResponse).Init()

controllers/data_manage/excel/custom_analysis_edb.go

@@ -15,12 +15,6 @@ import (
 	"time"
 )
 
-// EdbList
-// @Title 指标列表
-// @Description 指标列表
-// @Param   ExcelInfoId   query   int  true       "excel的id"
-// @Param   Keyword   query   string  false	"指标关键词"
-// @Success 200 {object} []excel.ExcelEdbMappingItem
 // @router /edb/list [get]
 func (c *CustomAnalysisController) EdbList() {
 	br := new(models.BaseResponse).Init()
@@ -41,7 +35,6 @@ func (c *CustomAnalysisController) EdbList() {
 		keyword = fmt.Sprint("%", keyword, "%")
 	}
 
-	// 获取excel表详情
 	excelInfo, err := excelModel.GetExcelInfoById(excelInfoId)
 	if err != nil {
 		br.Msg = "找不到该EXCEL！"
@@ -81,11 +74,6 @@ func (c *CustomAnalysisController) EdbList() {
 	br.Data = list
 }
 
-// AddEdb
-// @Title 新增指标接口
-// @Description 新增指标接口
-// @Param	request	body request.AddEdb true "type json string"
-// @Success 200 {object} data_manage.AddEdbInfoResp
 // @router /edb/add [post]
 func (c *CustomAnalysisController) AddEdb() {
 	br := new(models.BaseResponse).Init()
@@ -153,8 +141,6 @@ func (c *CustomAnalysisController) AddEdb() {
 		return
 	}
 
-	//excel.GetCustomAnalysisExcelData(excelInfo)
-
 	dateList, dataList, err, errMsg := excel.HandleEdbSequenceVal(req.DateSequenceVal, req.DataSequenceVal)
 	if err != nil {
 		br.Msg = "时间序列或数据序列异常！"
@@ -202,7 +188,6 @@ func (c *CustomAnalysisController) AddEdb() {
 		},
 	}
 
-	// 调用指标库去更新
 	reqJson, err := json.Marshal(req2)
 	if err != nil {
 		br.Msg = "参数解析异常！"
@@ -223,7 +208,6 @@ func (c *CustomAnalysisController) AddEdb() {
 
 	resp := respItem.Data
 
-	//添加es
 	data.AddOrEditEdbInfoToEs(resp.EdbInfoId)
 
 	br.Ret = 200
@@ -232,11 +216,6 @@ func (c *CustomAnalysisController) AddEdb() {
 	br.Data = resp
 }
 
-// EditEdb
-// @Title 编辑指标接口
-// @Description 编辑指标接口
-// @Param	request	body request.EditEdb true "type json string"
-// @Success 200 {object} data_manage.AddEdbInfoResp
 // @router /edb/edit [post]
 func (c *CustomAnalysisController) EditEdb() {
 	br := new(models.BaseResponse).Init()
@@ -322,8 +301,6 @@ func (c *CustomAnalysisController) EditEdb() {
 		return
 	}
 
-	//excel.GetCustomAnalysisExcelData(excelInfo)
-
 	dateList, dataList, err, errMsg := excel.HandleEdbSequenceVal(req.DateSequenceVal, req.DataSequenceVal)
 	if err != nil {
 		br.Msg = "时间序列或数据序列异常！"
@@ -355,7 +332,6 @@ func (c *CustomAnalysisController) EditEdb() {
 		return
 	}
 
-	// 构造请求
 	req2 := &data_manage.EdbInfoCalculateBatchEditReqByEdbLib{
 		EdbInfoId:  req.EdbInfoId,
 		EdbName:    req.EdbName,
@@ -371,7 +347,6 @@ func (c *CustomAnalysisController) EditEdb() {
 		},
 	}
 
-	// 调用指标库去更新
 	reqJson, err := json.Marshal(req2)
 	if err != nil {
 		br.Msg = "参数解析异常！"
@@ -392,10 +367,8 @@ func (c *CustomAnalysisController) EditEdb() {
 
 	resp := respItem.Data
 
-	//添加es
 	data.AddOrEditEdbInfoToEs(resp.EdbInfoId)
 
-	// 修改关联的预测指标基础信息
 	go data.ModifyPredictEdbBaseInfoBySourceEdb(edbInfo, req.Frequency, req.Unit)
 
 	br.Ret = 200
@@ -404,11 +377,6 @@ func (c *CustomAnalysisController) EditEdb() {
 	br.Data = resp
 }
 
-// EdbRefresh
-// @Title 指标列表
-// @Description 指标列表
-// @Param   ExcelInfoId   query   int  true       "excel的id"
-// @Success 200 {object} []excel.ExcelEdbMappingItem
 // @router /edb/refresh [get]
 func (c *CustomAnalysisController) EdbRefresh() {
 	br := new(models.BaseResponse).Init()
@@ -432,7 +400,6 @@ func (c *CustomAnalysisController) EdbRefresh() {
 		_ = utils.Rc.Delete(cacheKey)
 	}()
 
-	// 获取excel表详情
 	excelInfo, err := excelModel.GetExcelInfoById(excelInfoId)
 	if err != nil {
 		br.Msg = "找不到该EXCEL！"
@@ -461,16 +428,3 @@ func (c *CustomAnalysisController) EdbRefresh() {
 	br.Success = true
 	br.Msg = "刷新成功"
 }
-
-//func init() {
-//	excelInfo, err := excelModel.GetExcelInfoById(160)
-//	if err != nil {
-//		fmt.Println("查找excel失败：", err)
-//		return
-//	}
-//	_, err, _ = excel.GenerateExcelCustomAnalysisExcel(excelInfo)
-//	if err != nil {
-//		fmt.Println("生成excel失败：", err)
-//		return
-//	}
-//}

controllers/data_manage/excel/excel_classify.go

@@ -16,17 +16,10 @@ import (
 	"time"
 )
 
-// ExcelClassifyController ETA表格分类
 type ExcelClassifyController struct {
 	controllers.BaseAuthController
 }
 
-// List
-// @Title excel表格分类列表
-// @Description excel表格分类列表接口
-// @Param   Source   query   int  true       "格来源，1：excel插件的表格，2：自定义表格，3：混合表格，默认：1"
-// @Param   IsShowMe   query   bool  true       "是否只看我的，true、false"
-// @Success 200 {object} response.ExcelClassifyListResp
 // @router /excel_classify/list [get]
 func (this *ExcelClassifyController) List() {
 	br := new(models.BaseResponse).Init()
@@ -39,14 +32,7 @@ func (this *ExcelClassifyController) List() {
 	if source <= 0 {
 		source = utils.EXCEL_DEFAULT
 	}
-	//只看我的
 	isShowMe, _ := this.GetBool("IsShowMe")
-	// 自定义分析只看自己的
-	//if source == utils.CUSTOM_ANALYSIS_TABLE {
-	//	br = AnalysisClassifyList(this)
-	//	return
-	//}
-
 	showUserId := 0
 	if isShowMe {
 		showUserId = this.SysUser.AdminId
@@ -58,18 +44,13 @@ func (this *ExcelClassifyController) List() {
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()
 		return
 	}
-	// 分类map
 	classifyMap := make(map[int]*excel.ExcelClassifyItems)
 	for _, v := range classifyList {
 		classifyMap[v.ExcelClassifyId] = v
 	}
 
-	// 获取二级分类
-	// 获取三级分类
-	// 根据来源获取所有excel表格（无内容）
 	allExcelInfo := make([]*excel.ExcelClassifyItems, 0)
 	if source == utils.BALANCE_TABLE {
-		//找到当前协作人相关的表格ID
 		var excelIds []int
 		if isShowMe {
 			obj := new(excel.ExcelWorker)
@@ -101,7 +82,6 @@ func (this *ExcelClassifyController) List() {
 		}
 	}
 
-	// 获取所有有权限的指标和分类
 	permissionEdbIdList, permissionClassifyIdList, err := data_manage_permission.GetUserExcelAndClassifyPermissionList(this.SysUser.AdminId, 0, 0)
 	if err != nil {
 		br.Msg = "获取失败"
@@ -111,7 +91,6 @@ func (this *ExcelClassifyController) List() {
 
 	ExcelInfoMap := make(map[int][]*excel.ExcelClassifyItems)
 	for _, v := range allExcelInfo {
-		// 数据权限
 		if classifyInfo, ok := classifyMap[v.ExcelClassifyId]; ok {
 			v.HaveOperaAuth = data_manage_permission.CheckExcelPermissionByPermissionIdList(v.IsJoinPermission, classifyInfo.IsJoinPermission, v.ExcelInfoId, v.ExcelClassifyId, permissionEdbIdList, permissionClassifyIdList)
 		}
@@ -123,7 +102,6 @@ func (this *ExcelClassifyController) List() {
 
 	classifyListMap := make(map[int][]*excel.ExcelClassifyItems)
 	for _, v := range classifyList {
-		// 数据权限
 		v.HaveOperaAuth = data_manage_permission.CheckExcelClassifyPermissionByPermissionIdList(v.IsJoinPermission, v.ExcelClassifyId, permissionClassifyIdList)
 		if existItems, ok := ExcelInfoMap[v.ExcelClassifyId]; ok {
 			v.Children = existItems
@@ -135,7 +113,6 @@ func (this *ExcelClassifyController) List() {
 			classifyListMap[v.ParentId] = append(classifyListMap[v.ParentId], v)
 		}
 	}
-	//组装三级分类
 	for key, classify := range classifyList {
 		subList, ok := classifyListMap[classify.ExcelClassifyId]
 		if ok {
@@ -174,7 +151,6 @@ func AnalysisClassifyList(this *ExcelClassifyController) (br *models.BaseRespons
 	if source <= 0 {
 		source = utils.EXCEL_DEFAULT
 	}
-	//只看我的
 	showUserId := this.SysUser.AdminId
 
 	classifyList, err := excel.GetExcelClassifyBySource(source)
@@ -183,15 +159,10 @@ func AnalysisClassifyList(this *ExcelClassifyController) (br *models.BaseRespons
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()
 		return
 	}
-	// 分类map
 	classifyMap := make(map[int]*excel.ExcelClassifyItems)
 	for _, v := range classifyList {
 		classifyMap[v.ExcelClassifyId] = v
 	}
-
-	// 获取二级分类
-	// 获取三级分类
-	// 根据来源获取所有excel表格（无内容）
 	allExcelInfo, err := excel.GetNoContentExcelInfoAll(source, showUserId)
 	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
@@ -199,7 +170,6 @@ func AnalysisClassifyList(this *ExcelClassifyController) (br *models.BaseRespons
 		return
 	}
 
-	// 获取所有有权限的指标和分类
 	permissionEdbIdList, permissionClassifyIdList, err := data_manage_permission.GetUserExcelAndClassifyPermissionList(this.SysUser.AdminId, 0, 0)
 	if err != nil {
 		br.Msg = "获取失败"
@@ -209,7 +179,6 @@ func AnalysisClassifyList(this *ExcelClassifyController) (br *models.BaseRespons
 
 	ExcelInfoMap := make(map[int][]*excel.ExcelClassifyItems)
 	for _, v := range allExcelInfo {
-		// 数据权限
 		if classifyInfo, ok := classifyMap[v.ExcelClassifyId]; ok {
 			v.HaveOperaAuth = data_manage_permission.CheckExcelPermissionByPermissionIdList(v.IsJoinPermission, classifyInfo.IsJoinPermission, v.ExcelInfoId, v.ExcelClassifyId, permissionEdbIdList, permissionClassifyIdList)
 		}
@@ -219,7 +188,6 @@ func AnalysisClassifyList(this *ExcelClassifyController) (br *models.BaseRespons
 
 	classifyListMap := make(map[int][]*excel.ExcelClassifyItems)
 	for _, v := range classifyList {
-		// 数据权限
 		v.HaveOperaAuth = data_manage_permission.CheckExcelClassifyPermissionByPermissionIdList(v.IsJoinPermission, v.ExcelClassifyId, permissionClassifyIdList)
 		if existItems, ok := ExcelInfoMap[v.ExcelClassifyId]; ok {
 			v.Children = existItems
@@ -231,7 +199,6 @@ func AnalysisClassifyList(this *ExcelClassifyController) (br *models.BaseRespons
 			classifyListMap[v.ParentId] = append(classifyListMap[v.ParentId], v)
 		}
 	}
-	//组装三级分类
 	for key, classify := range classifyList {
 		subList, ok := classifyListMap[classify.ExcelClassifyId]
 		if ok {
@@ -250,7 +217,6 @@ func AnalysisClassifyList(this *ExcelClassifyController) (br *models.BaseRespons
 		}
 	}
 
-	// 自定义分析只看自己的分类
 	nodeAll = removeNodesWithAnalysisClassify(nodeAll, this.SysUser.AdminId)
 
 	resp := response2.ExcelClassifyListResp{
@@ -264,13 +230,6 @@ func AnalysisClassifyList(this *ExcelClassifyController) (br *models.BaseRespons
 	return
 }
 
-// removeNodesWithAnalysisClassify
-// @Description:  自定义分析只看自己的分类，所以需要移除分类
-// @author: Roc
-// @datetime 2024-04-09 13:46:51
-// @param nodes []*excel.ExcelClassifyItems
-// @param adminId int
-// @return []*excel.ExcelClassifyItems
 func removeNodesWithAnalysisClassify(nodes []*excel.ExcelClassifyItems, adminId int) []*excel.ExcelClassifyItems {
 	var newListNode []*excel.ExcelClassifyItems
 
@@ -279,19 +238,16 @@ func removeNodesWithAnalysisClassify(nodes []*excel.ExcelClassifyItems, adminId
 			node.Children = removeNodesWithAnalysisClassify(node.Children, adminId)
 		}
 
-		// 如果是ETA表格，那么就保留
 		if node.ExcelInfoId > 0 {
 			newListNode = append(newListNode, node)
 			continue
 		}
 
-		// 如果是公共分类，且名下的ETA表格不为空，那么就保留
 		if node.SysUserId == 0 && node.Children != nil && len(node.Children) > 0 {
 			newListNode = append(newListNode, node)
 			continue
 		}
 
-		// 如果是自己的分类，那么就保留
 		if node.SysUserId == adminId {
 			newListNode = append(newListNode, node)
 			continue
@@ -301,11 +257,6 @@ func removeNodesWithAnalysisClassify(nodes []*excel.ExcelClassifyItems, adminId
 	return newListNode
 }
 
-// ExcelClassifyItems
-// @Title 获取所有excel表格分类接口-不包含表格
-// @Description 获取所有excel表格分类接口-不包含表格
-// @Param   Source   query   int  true       "格来源，1：excel插件的表格，2：自定义表格，3：混合表格，默认：1"
-// @Success 200 {object} response.ExcelClassifyListResp
 // @router /excel_classify/items [get]
 func (this *ExcelClassifyController) ExcelClassifyItems() {
 	br := new(models.BaseResponse).Init()
@@ -325,15 +276,12 @@ func (this *ExcelClassifyController) ExcelClassifyItems() {
 		return
 	}
 
-	// 获取二级分类
-	// 获取三级分类
 	classifyMap := make(map[int][]*excel.ExcelClassifyItems)
 	for _, v := range classifyList {
 		if v.ParentId > 0 {
 			classifyMap[v.ParentId] = append(classifyMap[v.ParentId], v)
 		}
 	}
-	//组装三级分类
 	for key, classify := range classifyList {
 		subList, ok := classifyMap[classify.ExcelClassifyId]
 		if ok {
@@ -356,11 +304,6 @@ func (this *ExcelClassifyController) ExcelClassifyItems() {
 	br.Data = resp
 }
 
-// AddExcelClassify
-// @Title 新增excel表格分类
-// @Description 新增excel表格分类接口
-// @Param	request	body request.AddExcelClassifyReq true "type json string"
-// @Success 200 Ret=200 保存成功
 // @router /excel_classify/add [post]
 func (this *ExcelClassifyController) AddExcelClassify() {
 	br := new(models.BaseResponse).Init()
@@ -391,10 +334,8 @@ func (this *ExcelClassifyController) AddExcelClassify() {
 		source = utils.EXCEL_DEFAULT
 	}
 
-	// 获取同级分类下存在同名分类的数量
 	var count int
 	if source == utils.CUSTOM_ANALYSIS_TABLE {
-		// 自定义分析分类私有化了
 		ct, e := excel.GetCustomAnalysisExcelClassifyCount(req.ExcelClassifyName, req.ParentId, source, this.SysUser.AdminId)
 		if e != nil {
 			br.Msg = "操作失败"
@@ -416,7 +357,6 @@ func (this *ExcelClassifyController) AddExcelClassify() {
 		br.IsSendEmail = false
 		return
 	}
-	//获取该层级下最大的排序数
 	maxSort, err := excel2.GetExcelClassifyMaxSort(req.ParentId, req.Source)
 	if err != nil {
 		br.Msg = "获取失败"
@@ -424,7 +364,6 @@ func (this *ExcelClassifyController) AddExcelClassify() {
 		return
 	}
 	level := 1
-	// 查询父级分类是否存在
 	if req.ParentId > 0 {
 		var parent *excel.ExcelClassify
 		parent, err = excel.GetExcelClassifyById(req.ParentId)
@@ -439,10 +378,8 @@ func (this *ExcelClassifyController) AddExcelClassify() {
 		}
 		level = parent.Level + 1
 	}
-	// 入库
 	timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 	classify := &excel.ExcelClassify{
-		//ExcelClassifyId:   0,
 		ExcelClassifyName: req.ExcelClassifyName,
 		ParentId:          req.ParentId,
 		Source:            source,
@@ -460,7 +397,6 @@ func (this *ExcelClassifyController) AddExcelClassify() {
 		br.ErrMsg = "保存分类失败,Err:" + err.Error()
 		return
 	}
-	// 继承分类权限
 	{
 		go data_manage_permission.InheritParentClassify(6, source, classify.ExcelClassifyId, classify.ParentId, classify.ExcelClassifyName)
 	}
@@ -469,11 +405,6 @@ func (this *ExcelClassifyController) AddExcelClassify() {
 	br.Success = true
 }
 
-// EditExcelClassify
-// @Title 修改excel表格分类
-// @Description 修改excel表格分类
-// @Param	request	body request.EditExcelClassifyReq true "type json string"
-// @Success 200 Ret=200 修改成功
 // @router /excel_classify/edit [post]
 func (this *ExcelClassifyController) EditExcelClassify() {
 	br := new(models.BaseResponse).Init()
@@ -507,7 +438,6 @@ func (this *ExcelClassifyController) EditExcelClassify() {
 		return
 	}
 
-	// 名字一致的话，直接返回成功
 	if item.ExcelClassifyName == req.ExcelClassifyName {
 		br.Ret = 200
 		br.Msg = "保存成功"
@@ -515,7 +445,6 @@ func (this *ExcelClassifyController) EditExcelClassify() {
 		return
 	}
 
-	// 获取同级分类下存在同名分类的数量
 	count, err := excel.GetExcelClassifyCount(req.ExcelClassifyName, item.ParentId, item.Source)
 	if err != nil {
 		br.Msg = "判断名称是否已存在失败"
@@ -528,7 +457,6 @@ func (this *ExcelClassifyController) EditExcelClassify() {
 		return
 	}
 
-	// 修改分类名称
 	item.ExcelClassifyName = req.ExcelClassifyName
 	err = item.Update([]string{"ExcelClassifyName"})
 	if err != nil {
@@ -543,11 +471,6 @@ func (this *ExcelClassifyController) EditExcelClassify() {
 	br.IsAddLog = true
 }
 
-// DeleteExcelClassifyCheck
-// @Title 删除表格检测接口
-// @Description 删除表格检测接口
-// @Param	request	body request.ExcelClassifyDeleteCheckReq true "type json string"
-// @Success 200 {object} response.ExcelClassifyDeleteCheckResp
 // @router /excel_classify/delete/check [post]
 func (this *ExcelClassifyController) DeleteExcelClassifyCheck() {
 	br := new(models.BaseResponse).Init()
@@ -571,7 +494,6 @@ func (this *ExcelClassifyController) DeleteExcelClassifyCheck() {
 	var deleteStatus int
 	var tipsMsg string
 
-	// 校验是否存在该分类
 	ExcelClassifyInfo, err := excel.GetExcelClassifyById(req.ExcelClassifyId)
 	if err != nil {
 		if utils.IsErrNoRow(err) {
@@ -589,9 +511,7 @@ func (this *ExcelClassifyController) DeleteExcelClassifyCheck() {
 		br.IsSendEmail = false
 		return
 	}
-	//删除分类
 	if req.ExcelClassifyId > 0 && req.ExcelInfoId == 0 {
-		//判断表格分类下，是否含有表格
 		count, err := excel.GetExcelInfoCountByClassifyId(req.ExcelClassifyId)
 		if err != nil {
 			br.Msg = "删除失败"
@@ -632,19 +552,6 @@ func (this *ExcelClassifyController) DeleteExcelClassifyCheck() {
 		}
 	}
 
-	//if deleteStatus != 1 && req.ExcelInfoId == 0 {
-	//	classifyCount, err := data_manage.GetExcelClassifyCountByClassifyId(req.ExcelClassifyId)
-	//	if err != nil && !utils.IsErrNoRow(err) {
-	//		br.Msg = "删除失败"
-	//		br.ErrMsg = "分类下是否含有表格失败，Err:" + err.Error()
-	//		return
-	//	}
-	//	if classifyCount > 0 {
-	//		deleteStatus = 2
-	//		tipsMsg = "确认删除当前目录及包含的子目录吗？"
-	//	}
-	//}
-
 	if deleteStatus == 0 {
 		tipsMsg = "可删除，进行删除操作"
 	}
@@ -659,11 +566,6 @@ func (this *ExcelClassifyController) DeleteExcelClassifyCheck() {
 	br.Data = resp
 }
 
-// DeleteExcelClassify
-// @Title 删除表格分类/表格
-// @Description 删除表格分类/表格接口
-// @Param	request	body request.DeleteExcelClassifyReq true "type json string"
-// @Success 200 Ret=200 删除成功
 // @router /excel_classify/delete [post]
 func (this *ExcelClassifyController) DeleteExcelClassify() {
 	br := new(models.BaseResponse).Init()
@@ -694,9 +596,7 @@ func (this *ExcelClassifyController) DeleteExcelClassify() {
 		return
 	}
 
-	//删除分类
 	if req.ExcelClassifyId > 0 && req.ExcelInfoId == 0 {
-		//判断是否含有指标
 		count, err := excel.GetExcelInfoCountByClassifyId(req.ExcelClassifyId)
 		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
@@ -757,7 +657,6 @@ func (this *ExcelClassifyController) DeleteExcelClassify() {
 	}
 
 	resp := response2.AddExcelInfoResp{}
-	//删除表格
 	if req.ExcelInfoId > 0 {
 		excelInfo, err := excel.GetExcelInfoById(req.ExcelInfoId)
 		if err != nil {
@@ -777,7 +676,6 @@ func (this *ExcelClassifyController) DeleteExcelClassify() {
 			return
 		}
 
-		// 删除excel
 		err, errMsg, isSendEmail := excel2.Delete(excelInfo, sysUser)
 		if err != nil {
 			br.Msg = "删除失败"
@@ -789,7 +687,6 @@ func (this *ExcelClassifyController) DeleteExcelClassify() {
 			return
 		}
 
-		// 返回下一个表格的信息
 		{
 			var nextItem *excel.ExcelInfo
 			var condition string
@@ -811,7 +708,6 @@ func (this *ExcelClassifyController) DeleteExcelClassify() {
 				return
 			}
 
-			// 如果没找到，那么查找下一个分类的第一个表格
 			if nextItem == nil {
 				currClassifyInfo, err := excel.GetExcelClassifyById(excelInfo.ExcelClassifyId)
 				if err != nil && !utils.IsErrNoRow(err) {
@@ -828,7 +724,6 @@ func (this *ExcelClassifyController) DeleteExcelClassify() {
 				}
 			}
 
-			// 如果找到下一个表格了，那么就返回
 			if nextItem != nil {
 				resp = response2.AddExcelInfoResp{
 					ExcelInfoId: nextItem.ExcelInfoId,
@@ -836,22 +731,6 @@ func (this *ExcelClassifyController) DeleteExcelClassify() {
 				}
 			}
 		}
-
-		//新增操作日志
-		//{
-		//	ExcelLog := new(data_manage.ExcelInfoLog)
-		//	ExcelLog.ExcelName = ExcelInfo.ExcelName
-		//	ExcelLog.ExcelInfoId = req.ExcelInfoId
-		//	ExcelLog.ExcelClassifyId = ExcelInfo.ExcelClassifyId
-		//	ExcelLog.SysUserId = sysUser.AdminId
-		//	ExcelLog.SysUserRealName = sysUser.RealName
-		//	ExcelLog.UniqueCode = ExcelInfo.UniqueCode
-		//	ExcelLog.CreateTime = time.Now()
-		//	ExcelLog.Content = string(this.Ctx.Input.RequestBody)
-		//	ExcelLog.Status = "删除表格"
-		//	ExcelLog.Method = this.Ctx.Input.URI()
-		//	go data_manage.AddExcelInfoLog(ExcelLog)
-		//}
 	}
 	br.Ret = 200
 	br.Msg = "删除成功"
@@ -860,10 +739,6 @@ func (this *ExcelClassifyController) DeleteExcelClassify() {
 	br.IsAddLog = true
 }
 
-// ExcelClassifyMove
-// @Title 表格分类移动接口
-// @Description 表格分类移动接口
-// @Success 200 {object} request.MoveExcelClassifyReq
 // @router /excel_classify/move [post]
 func (this *ExcelClassifyController) ExcelClassifyMove() {
 	br := new(models.BaseResponse).Init()
@@ -893,7 +768,6 @@ func (this *ExcelClassifyController) ExcelClassifyMove() {
 		br.ErrMsg = "请选择拖动目标，分类目录或者指标"
 		return
 	}
-	//判断分类是否存在
 	err, errMsg := excel2.MoveExcelClassify(req)
 	if err != nil {
 		br.Msg = err.Error()

controllers/data_manage/excel/mixed_table.go

@@ -15,10 +15,6 @@ import (
 	"time"
 )
 
-// GetSystemDate
-// @Title 获取系统日期（包含计算日期）
-// @Description 获取系统日期（包含计算日期）
-// @Param	request	body request.MixedTableCellDataReq true "type json string"
 // @router /excel_info/get_system_date [post]
 func (c *ExcelInfoController) GetSystemDate() {
 	br := new(models.BaseResponse).Init()
@@ -89,7 +85,6 @@ func (c *ExcelInfoController) GetSystemDate() {
 			date = req.DataTime //选择表格中的日期
 		}
 		if date != "" {
-			// 开始做日期变换
 			date, err = excel2.HandleMixTableDateChange(date, req.Value)
 			if err != nil {
 				br.Msg = "日期变换失败！"
@@ -110,10 +105,6 @@ func (c *ExcelInfoController) GetSystemDate() {
 	}
 }
 
-// CalculateData
-// @Title 公式计算（混合表格）
-// @Description 公式计算（混合表格）
-// @Param	request	body request.CalculateConf true "type json string"
 // @router /excel_info/mixed/calculate [post]
 func (c *ExcelInfoController) CalculateData() {
 	br := new(models.BaseResponse).Init()
@@ -157,9 +148,6 @@ func (c *ExcelInfoController) CalculateData() {
 		return
 	}
 
-	//获取所有数据，计算所有数据
-	//获取部分数据，计算部分数据
-	// BaseCalculate 数据计算的结构体
 	type BaseCalculate struct {
 		DataList      []*data_manage.EdbDataList
 		Frequency     string `description:"需要转换的频度"`
@@ -182,7 +170,6 @@ func (c *ExcelInfoController) CalculateData() {
 		Source:        req.Source,
 	}
 
-	// 调用指标库去更新
 	reqJson, tmpErr := json.Marshal(req2)
 	if tmpErr != nil {
 		err = tmpErr
@@ -200,7 +187,6 @@ func (c *ExcelInfoController) CalculateData() {
 		return
 	}
 
-	// 数据处理成需要返回的样式
 	num := 5
 	lenDate := len(respItem.Data.DateList)
 	if lenDate < 5 {
@@ -220,7 +206,6 @@ func (c *ExcelInfoController) CalculateData() {
 		newDate = req.DataTime //选择表格中的日期
 		if strings.Count(newDate, "-") == 1 {
 			newDate = newDate + "-01"
-			// 查找这个月早的时间作为起始时间
 			for _, v := range respItem.Data.DateList {
 				if v >= newDate {
 					newDate = v
@@ -228,7 +213,6 @@ func (c *ExcelInfoController) CalculateData() {
 			}
 		}
 	}
-	// 开始做日期变换
 	newDate, err = excel2.HandleMixTableDateChange(newDate, requestBody)
 	if err != nil {
 		return
@@ -253,7 +237,6 @@ func (c *ExcelInfoController) CalculateData() {
 			}
 		}
 	} else {
-		// todo 如果选择了表格中的日期应该如何处理
 		if val, ok := respItem.Data.DataMap[newDate]; ok {
 			showValue = utils.FormatMixTableDataShowValue(val)
 			for i, tmpDate := range respItem.Data.DateList {
@@ -261,7 +244,6 @@ func (c *ExcelInfoController) CalculateData() {
 					if i+3 <= lenDate {
 						t1Date := respItem.Data.DateList[i+2]
 						if tmpVal, ok2 := respItem.Data.DataMap[t1Date]; ok2 {
-							// 当前日期
 							dataListResp = append(dataListResp, &data_manage.EdbDataList{
 								Value:    tmpVal,
 								DataTime: t1Date,
@@ -272,7 +254,6 @@ func (c *ExcelInfoController) CalculateData() {
 					if i+2 <= lenDate {
 						t1Date := respItem.Data.DateList[i+1]
 						if tmpVal, ok2 := respItem.Data.DataMap[t1Date]; ok2 {
-							// 当前日期
 							dataListResp = append(dataListResp, &data_manage.EdbDataList{
 								Value:    tmpVal,
 								DataTime: t1Date,
@@ -280,7 +261,6 @@ func (c *ExcelInfoController) CalculateData() {
 						}
 					}
 
-					// 当前日期
 					dataListResp = append(dataListResp, &data_manage.EdbDataList{
 						Value:    val,
 						DataTime: newDate,
@@ -288,7 +268,6 @@ func (c *ExcelInfoController) CalculateData() {
 					if i >= 1 {
 						t1Date := respItem.Data.DateList[i-1]
 						if tmpVal, ok2 := respItem.Data.DataMap[t1Date]; ok2 {
-							// 当前日期
 							dataListResp = append(dataListResp, &data_manage.EdbDataList{
 								Value:    tmpVal,
 								DataTime: t1Date,
@@ -298,7 +277,6 @@ func (c *ExcelInfoController) CalculateData() {
 					if i >= 2 {
 						t1Date := respItem.Data.DateList[i-2]
 						if tmpVal, ok2 := respItem.Data.DataMap[t1Date]; ok2 {
-							// 当前日期
 							dataListResp = append(dataListResp, &data_manage.EdbDataList{
 								Value:    tmpVal,
 								DataTime: t1Date,
@@ -320,10 +298,6 @@ func (c *ExcelInfoController) CalculateData() {
 	br.Data = resp
 }
 
-// GetMixDateCalculate
-// @Title 获取混合表格日期计算
-// @Description 获取混合表格日期计算
-// @Param	request	body request.MixedTableCellDataReq true "type json string"
 // @router /excel_info/mixed/date_calculate [post]
 func (c *ExcelInfoController) GetMixDateCalculate() {
 	br := new(models.BaseResponse).Init()
@@ -350,21 +324,17 @@ func (c *ExcelInfoController) GetMixDateCalculate() {
 
 	valMap := make(map[string]int)
 	for _, v := range req.DateList {
-		// 查找单元格数据
-		// 如果不是基础计算单元格,直接返回
+
 		_, err = time.ParseInLocation(utils.FormatDate, v.Date, time.Local)
 		if err != nil {
 			br.Msg = "日期计算失败！"
 			br.ErrMsg = fmt.Sprintf("%s 的单元格非日期类型, Err: %s", v.Date, err.Error())
 			return
 		}
-		// todo 把日期转换成excel里的天数
 		realDiffDay := utils.GetDaysDiff1900(v.Date)
 
 		valMap[strings.ToUpper(v.Tag)] = realDiffDay
 	}
-
-	// 计算
 	val, errMsg, err := excel2.DateCalculateFormula(valMap, strings.ToUpper(req.Formula))
 	if err != nil {
 		br.Msg = errMsg
@@ -385,10 +355,6 @@ func (c *ExcelInfoController) GetMixDateCalculate() {
 	}
 }
 
-// GetBaseEdbInfo
-// @Title 获取指标的基本信息
-// @Description 获取指标的基本信息
-// @Param	EdbInfoIds	string  "指标ID用英文逗号分割"
 // @router /excel_info/base_edb_info [get]
 func (c *ExcelInfoController) GetBaseEdbInfo() {
 	br := new(models.BaseResponse).Init()
@@ -433,9 +399,7 @@ func (c *ExcelInfoController) GetBaseEdbInfo() {
 		for _, v := range edbInfoList {
 			classifyIdList = append(classifyIdList, v.ClassifyId)
 		}
-		// 指标权限
 		{
-			// 当前的分类
 			classifyMap := make(map[int]*data_manage.EdbClassify)
 			classifyList, err := data_manage.GetEdbClassifyByIdList(classifyIdList)
 			if err != nil {
@@ -450,7 +414,6 @@ func (c *ExcelInfoController) GetBaseEdbInfo() {
 				classifyMap[v.ClassifyId] = v
 			}
 
-			// 获取所有有权限的指标和分类
 			permissionEdbIdList, permissionClassifyIdList, err := data_manage_permission.GetUserEdbAndClassifyPermissionList(c.SysUser.AdminId, 0, 0)
 			if err != nil {
 				br.Msg = "获取失败"
@@ -461,7 +424,6 @@ func (c *ExcelInfoController) GetBaseEdbInfo() {
 			for _, v := range edbInfoList {
 				tmp := new(data_manage.BaseEdbNameItem)
 
-				// 指标权限
 				if currClassify, ok := classifyMap[v.ClassifyId]; ok {
 					tmp.HaveOperaAuth = data_manage_permission.CheckEdbPermissionByPermissionIdList(v.IsJoinPermission, currClassify.IsJoinPermission, v.EdbInfoId, v.ClassifyId, permissionEdbIdList, permissionClassifyIdList)
 				}

controllers/data_manage/future_good/future_good_chart_classify.go

@@ -12,16 +12,10 @@ import (
 	"time"
 )
 
-// FutureGoodChartClassifyController 期货指标分类
 type FutureGoodChartClassifyController struct {
 	controllers.BaseAuthController
 }
 
-// ChartClassifyList
-// @Title 商品价格图表分类列表
-// @Description 商品价格图表分类列表接口
-// @Param   IsShowMe   query   bool  true       "是否只看我的，true、false"
-// @Success 200 {object} data_manage.ChartClassifyListResp
 // @router /chart_classify/list [get]
 func (this *FutureGoodChartClassifyController) ChartClassifyList() {
 	br := new(models.BaseResponse).Init()
@@ -31,7 +25,6 @@ func (this *FutureGoodChartClassifyController) ChartClassifyList() {
 	}()
 	resp := new(data_manage.ChartClassifyListResp)
 
-	// 获取当前账号的不可见指标
 	noPermissionChartIdMap := make(map[int]bool)
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
@@ -54,7 +47,6 @@ func (this *FutureGoodChartClassifyController) ChartClassifyList() {
 			br.ErrMsg = err.Error()
 			return
 		}
-		// 移除没有权限的图表
 		allNodes := data.HandleNoPermissionChart(resp.AllNodes, noPermissionChartIdMap, this.SysUser.AdminId)
 		resp.AllNodes = allNodes
 
@@ -95,7 +87,6 @@ func (this *FutureGoodChartClassifyController) ChartClassifyList() {
 		}
 	}
 
-	// 移除没有权限的图表
 	allNodes := data.HandleNoPermissionChart(rootList, noPermissionChartIdMap, this.SysUser.AdminId)
 	resp.AllNodes = allNodes
 
@@ -105,7 +96,6 @@ func (this *FutureGoodChartClassifyController) ChartClassifyList() {
 	br.Data = resp
 }
 
-// getChartClassifyListForMe 获取我创建的图表
 func getChartClassifyListForMe(adminInfo system.Admin, resp *data_manage.ChartClassifyListResp) (errMsg string, err error) {
 	rootList, err := data_manage.GetChartClassifyByParentId(0, utils.CHART_SOURCE_FUTURE_GOOD)
 	if err != nil && !utils.IsErrNoRow(err) {
@@ -138,10 +128,6 @@ func getChartClassifyListForMe(adminInfo system.Admin, resp *data_manage.ChartCl
 	return
 }
 
-// ChartClassifyItems
-// @Title 获取所有商品价格图表分类接口-不包含图表
-// @Description 获取所有商品价格图表分类接口-不包含图表
-// @Success 200 {object} data_manage.ChartClassifyListResp
 // @router /chart_classify/items [get]
 func (this *FutureGoodChartClassifyController) ChartClassifyItems() {
 	br := new(models.BaseResponse).Init()
@@ -169,11 +155,6 @@ func (this *FutureGoodChartClassifyController) ChartClassifyItems() {
 	br.Data = resp
 }
 
-// AddChartClassify
-// @Title 新增商品价格图表分类
-// @Description 新增商品价格图表分类接口
-// @Param	request	body data_manage.AddChartClassifyReq true "type json string"
-// @Success 200 Ret=200 保存成功
 // @router /chart_classify/add [post]
 func (this *FutureGoodChartClassifyController) AddChartClassify() {
 	br := new(models.BaseResponse).Init()
@@ -199,7 +180,6 @@ func (this *FutureGoodChartClassifyController) AddChartClassify() {
 		return
 	}
 
-	// 新增图表分类
 	_, err, errMsg, isSendEmail := data.AddChartClassify(req.ChartClassifyName, 0, req.Level, utils.CHART_SOURCE_FUTURE_GOOD, this.Lang, this.SysUser)
 	if err != nil {
 		br.Msg = errMsg
@@ -213,11 +193,6 @@ func (this *FutureGoodChartClassifyController) AddChartClassify() {
 	br.Success = true
 }
 
-// EditChartClassify
-// @Title 修改商品价格图表分类
-// @Description 修改商品价格图表分类接口
-// @Param	request	body data_manage.EditChartClassifyReq true "type json string"
-// @Success 200 Ret=200 修改成功
 // @router /chart_classify/edit [post]
 func (this *FutureGoodChartClassifyController) EditChartClassify() {
 	br := new(models.BaseResponse).Init()
@@ -244,7 +219,6 @@ func (this *FutureGoodChartClassifyController) EditChartClassify() {
 		return
 	}
 
-	// 编辑图表分类
 	_, err, errMsg, isSendEmail := data.EditChartClassify(req.ChartClassifyId, utils.CHART_SOURCE_FUTURE_GOOD, req.ChartClassifyName, this.Lang, this.SysUser)
 	if err != nil {
 		br.Msg = errMsg
@@ -259,11 +233,6 @@ func (this *FutureGoodChartClassifyController) EditChartClassify() {
 	br.IsAddLog = true
 }
 
-// DeleteChartClassifyCheck
-// @Title 删除图表检测接口
-// @Description 删除图表检测接口
-// @Param	request	body data_manage.ChartClassifyDeleteCheckResp true "type json string"
-// @Success 200 Ret=200 检测成功
 // @router /chart_classify/delete/check [post]
 func (this *FutureGoodChartClassifyController) DeleteChartClassifyCheck() {
 	br := new(models.BaseResponse).Init()
@@ -287,9 +256,7 @@ func (this *FutureGoodChartClassifyController) DeleteChartClassifyCheck() {
 	var deleteStatus int
 	var tipsMsg string
 	childIds := make([]int, 0)
-	//删除分类
 	if req.ChartClassifyId > 0 && req.ChartInfoId == 0 {
-		//判断商品价格图表分类下，是否含有图表
 		classifyAll, err := data_manage.GetChartClassifyAllBySource(utils.CHART_SOURCE_FUTURE_GOOD)
 		if err != nil {
 			br.Msg = "删除失败"
@@ -316,13 +283,6 @@ func (this *FutureGoodChartClassifyController) DeleteChartClassifyCheck() {
 			br.ErrMsg = "判断图表名称是否存在失败,Err:" + err.Error()
 			return
 		}
-		//count, err := data_manage.GetChartInfoCountByClassifyId(req.ChartClassifyId)
-		//if err != nil {
-		//	br.Msg = "删除失败"
-		//	br.ErrMsg = "分类下是否含有指标失败，Err:" + err.Error()
-		//	return
-		//}
-
 		if count > 0 {
 			deleteStatus = 1
 			tipsMsg = "该分类下关联图表不可删除"
@@ -330,12 +290,7 @@ func (this *FutureGoodChartClassifyController) DeleteChartClassifyCheck() {
 	}
 
 	if deleteStatus != 1 && req.ChartInfoId == 0 {
-		//classifyCount, err := data_manage.GetChartClassifyCountByClassifyId(req.ChartClassifyId)
-		//if err != nil && !utils.IsErrNoRow(err) {
-		//	br.Msg = "删除失败"
-		//	br.ErrMsg = "分类下是否含有图表失败，Err:" + err.Error()
-		//	return
-		//}
+
 		if len(childIds) > 0 {
 			deleteStatus = 2
 			tipsMsg = "确认删除当前目录及包含的子目录吗"
@@ -354,11 +309,6 @@ func (this *FutureGoodChartClassifyController) DeleteChartClassifyCheck() {
 	br.Data = resp
 }
 
-// DeleteChartClassify
-// @Title 删除商品价格图表分类/图表
-// @Description 删除商品价格图表分类/图表接口
-// @Param	request	body data_manage.DeleteChartClassifyReq true "type json string"
-// @Success 200 Ret=200 删除成功
 // @router /chart_classify/delete [post]
 func (this *FutureGoodChartClassifyController) DeleteChartClassify() {
 	br := new(models.BaseResponse).Init()
@@ -389,9 +339,7 @@ func (this *FutureGoodChartClassifyController) DeleteChartClassify() {
 		return
 	}
 
-	//删除分类
 	if req.ChartClassifyId > 0 && req.ChartInfoId == 0 {
-		//判断是否含有指标
 		childIds := make([]int, 0)
 		classifyAll, err := data_manage.GetChartClassifyAllBySource(utils.CHART_SOURCE_FUTURE_GOOD)
 		if err != nil {
@@ -419,13 +367,6 @@ func (this *FutureGoodChartClassifyController) DeleteChartClassify() {
 			br.ErrMsg = "判断图表名称是否存在失败,Err:" + err.Error()
 			return
 		}
-		//count, err := data_manage.GetChartInfoCountByClassifyId(req.ChartClassifyId)
-		//if err != nil && !utils.IsErrNoRow(err) {
-		//	br.Msg = "删除失败"
-		//	br.ErrMsg = "判断名称是否已存在失败，Err:" + err.Error()
-		//	return
-		//}
-
 		if count > 0 {
 			br.Msg = "该目录下存在关联指标，不可删除"
 			br.IsSendEmail = false
@@ -435,7 +376,6 @@ func (this *FutureGoodChartClassifyController) DeleteChartClassify() {
 		delIds := append(childIds, req.ChartClassifyId)
 
 		err = data_manage.DeleteChartClassifyByIds(delIds)
-		//err = data_manage.DeleteChartClassify(req.ChartClassifyId)
 		if err != nil {
 			br.Msg = "删除失败"
 			br.ErrMsg = "删除失败,Err:" + err.Error()
@@ -443,7 +383,6 @@ func (this *FutureGoodChartClassifyController) DeleteChartClassify() {
 		}
 	}
 	resp := new(data_manage.AddChartInfoResp)
-	//删除图表
 	if req.ChartInfoId > 0 {
 		chartInfo, err := data_manage.GetChartInfoById(req.ChartInfoId)
 		if err != nil {
@@ -461,7 +400,6 @@ func (this *FutureGoodChartClassifyController) DeleteChartClassify() {
 			br.Msg = "图表已删除，请刷新页面"
 			return
 		}
-		//图表操作权限
 		ok := data.CheckOpChartPermission(sysUser, chartInfo.SysUserId, true)
 		if !ok {
 			br.Msg = "没有该图表的操作权限"
@@ -469,7 +407,6 @@ func (this *FutureGoodChartClassifyController) DeleteChartClassify() {
 			return
 		}
 
-		// 获取引用该图表的MyCharts, 用于ES删除
 		var myCond string
 		var myPars []interface{}
 		myCond += ` AND a.chart_info_id = ? `
@@ -485,18 +422,14 @@ func (this *FutureGoodChartClassifyController) DeleteChartClassify() {
 			myIds = append(myIds, m.MyChartId)
 		}
 
-		//删除图表及关联指标
 		err = data_manage.DeleteChartInfoAndData(req.ChartInfoId)
 		if err != nil {
 			br.Msg = "删除失败"
 			br.ErrMsg = "删除失败，Err:" + err.Error()
 			return
 		}
-		//删除ES
 		{
 			go data.EsDeleteChartInfo(req.ChartInfoId)
-			// 删除MY ETA 图表 es数据
-			//go data.EsDeleteMyChartInfoByChartInfoId(req.ChartInfoId)
 			go data.EsDeleteMyChartInfoByMyChartIds(myIds)
 		}
 
@@ -523,8 +456,6 @@ func (this *FutureGoodChartClassifyController) DeleteChartClassify() {
 			var pars []interface{}
 
 			condition += " AND level=1 "
-			//pars = append(pars, chartInfo.ChartClassifyId)
-
 			condition += " AND chart_classify_id>? ORDER BY chart_classify_id ASC LIMIT 1 "
 			pars = append(pars, chartInfo.ChartClassifyId)
 
@@ -547,7 +478,6 @@ func (this *FutureGoodChartClassifyController) DeleteChartClassify() {
 				}
 			}
 		}
-		//新增操作日志
 		{
 			chartLog := new(data_manage.ChartInfoLog)
 			chartLog.ChartName = chartInfo.ChartName
@@ -570,10 +500,6 @@ func (this *FutureGoodChartClassifyController) DeleteChartClassify() {
 	br.IsAddLog = true
 }
 
-// ChartClassifyMove
-// @Title 商品价格图表分类移动接口
-// @Description 商品价格图表分类移动接口
-// @Success 200 {object} data_manage.MoveChartClassifyReq
 // @router /chart_classify/move [post]
 func (this *FutureGoodChartClassifyController) ChartClassifyMove() {
 	br := new(models.BaseResponse).Init()
@@ -603,7 +529,6 @@ func (this *FutureGoodChartClassifyController) ChartClassifyMove() {
 		br.ErrMsg = "分类id小于等于0"
 		return
 	}
-	//判断分类是否存在
 	chartClassifyInfo, err := data_manage.GetChartClassifyById(req.ClassifyId)
 	if err != nil {
 		br.Msg = "移动失败"
@@ -617,7 +542,6 @@ func (this *FutureGoodChartClassifyController) ChartClassifyMove() {
 	}
 	updateCol := make([]string, 0)
 
-	//判断上级id是否一致，如果不一致的话，那么需要移动该分类层级
 	if chartClassifyInfo.ParentId != req.ParentClassifyId && req.ParentClassifyId != 0 {
 		parentChartClassifyInfo, err := data_manage.GetChartClassifyById(req.ParentClassifyId)
 		if err != nil {
@@ -631,9 +555,7 @@ func (this *FutureGoodChartClassifyController) ChartClassifyMove() {
 		updateCol = append(updateCol, "ParentId", "Level", "ModifyTime")
 	}
 
-	//如果有传入 上一个兄弟节点分类id
 	if req.PrevClassifyId > 0 {
-		//上一个兄弟节点
 		prevClassify, err := data_manage.GetChartClassifyById(req.PrevClassifyId)
 		if err != nil {
 			br.Msg = "移动失败"
@@ -641,24 +563,18 @@ func (this *FutureGoodChartClassifyController) ChartClassifyMove() {
 			return
 		}
 
-		//如果是移动在两个兄弟节点之间
 		if req.NextClassifyId > 0 {
-			//下一个兄弟节点
 			nextClassify, err := data_manage.GetChartClassifyById(req.NextClassifyId)
 			if err != nil {
 				br.Msg = "移动失败"
 				br.ErrMsg = "获取下一个兄弟节点分类信息失败,Err:" + err.Error()
 				return
 			}
-			//如果上一个兄弟与下一个兄弟的排序权重是一致的，那么需要将下一个兄弟（以及下个兄弟的同样排序权重）的排序权重+2，自己变成上一个兄弟的排序权重+1
 			if prevClassify.Sort == nextClassify.Sort || prevClassify.Sort == chartClassifyInfo.Sort {
-				//变更兄弟节点的排序
 				updateSortStr := `sort + 2`
 				_ = data_manage.UpdateChartClassifySortByParentId(prevClassify.ParentId, prevClassify.ChartClassifyId, prevClassify.Sort, updateSortStr)
 			} else {
-				//如果下一个兄弟的排序权重正好是上个兄弟节点的下一层，那么需要再加一层了
 				if nextClassify.Sort-prevClassify.Sort == 1 {
-					//变更兄弟节点的排序
 					updateSortStr := `sort + 1`
 					_ = data_manage.UpdateChartClassifySortByParentId(prevClassify.ParentId, 0, prevClassify.Sort, updateSortStr)
 				}
@@ -677,7 +593,6 @@ func (this *FutureGoodChartClassifyController) ChartClassifyMove() {
 			return
 		}
 
-		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
 		if firstClassify != nil && firstClassify.ChartClassifyId > 0 && firstClassify.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = data_manage.UpdateChartClassifySortByParentId(firstClassify.ParentId, firstClassify.ChartClassifyId-1, 0, updateSortStr)
@@ -688,7 +603,6 @@ func (this *FutureGoodChartClassifyController) ChartClassifyMove() {
 		updateCol = append(updateCol, "Sort", "ModifyTime")
 	}
 
-	//更新
 	if len(updateCol) > 0 {
 		err = chartClassifyInfo.Update(updateCol)
 		if err != nil {

controllers/data_manage/future_good/future_good_edb_info.go

@@ -5,21 +5,14 @@ import (
 	"eta_gn/eta_api/models"
 	future_good2 "eta_gn/eta_api/models/data_manage/future_good"
 	"eta_gn/eta_api/utils"
+
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
-// FutureGoodEdbInfoController 期货数据
 type FutureGoodEdbInfoController struct {
 	controllers.BaseAuthController
 }
 
-// FutureGoodEdbInfoList
-// @Title 期货指标列表接口
-// @Description 期货指标列表接口
-// @Param   Keyword   query   string  false       "搜索关键词:期货指标ID/期货指标名称"
-// @Param   RegionType   query   string  false       "交易所来源，海外还是国内"
-// @Param   Exchange   query   string  false       "交易所"
-// @Success 200 {object} []future_good.FutureGoodEdbInfo
 // @router /edb_info/list [get]
 func (this *FutureGoodEdbInfoController) FutureGoodEdbInfoList() {
 	br := new(models.BaseResponse).Init()
@@ -38,21 +31,18 @@ func (this *FutureGoodEdbInfoController) FutureGoodEdbInfoList() {
 	var condition string
 	var pars []interface{}
 
-	// @Param   Keyword   query   string  false       "搜索关键词:期货指标ID/期货指标名称"
 	keyword := this.GetString("Keyword")
 	if keyword != `` {
 		condition += ` AND ( future_good_edb_name like ? or future_good_edb_name_en like ?  or future_good_edb_code like ? ) `
 		pars = utils.GetLikeKeywordPars(pars, keyword, 3)
 	}
 
-	// @Param   RegionType   query   string  false       "交易所来源，海外还是国内"
 	regionType := this.GetString("RegionType")
 	if regionType != `` {
 		condition += ` AND region_type = ? `
 		pars = append(pars, regionType)
 	}
 
-	// @Param   Exchange   query   string  false       "交易所"
 	exchange := this.GetString("Exchange")
 	if exchange != `` {
 		condition += ` AND exchange = ? `
@@ -75,16 +65,6 @@ func (this *FutureGoodEdbInfoController) FutureGoodEdbInfoList() {
 	br.Data = list
 }
 
-// FutureGoodEdbInfoDataList
-// @Title 期货商品数据列表
-// @Description 期货商品数据列表接口
-// @Param   CurrentIndex   query   int  true       "当前页码"
-// @Param   PageSize   query   int  true       "每页数据数"
-// @Param   FutureGoodEdbInfoId   query   string  true       "指标id"
-// @Param   FutureGoodEdbCode   query   string  true       "指标code"
-// @Param   StartDate   query   string  true       "开始日期"
-// @Param   EndDate   query   string  true       "结束日期"
-// @Success 200 {object} future_good.FutureGoodEdbDataListResp
 // @router /edb_info/data/list [get]
 func (this *FutureGoodEdbInfoController) FutureGoodEdbInfoDataList() {
 	br := new(models.BaseResponse).Init()
@@ -115,25 +95,21 @@ func (this *FutureGoodEdbInfoController) FutureGoodEdbInfoDataList() {
 	var condition string
 	var pars []interface{}
 
-	// @Param   FutureGoodEdbInfoId   query   string  true       "指标id"
 	futureGoodEdbInfoId := this.GetString("FutureGoodEdbInfoId")
 	if futureGoodEdbInfoId != `` {
 		condition += ` AND future_good_edb_info_id = ? `
 		pars = append(pars, futureGoodEdbInfoId)
 	}
-	// @Param   FutureGoodEdbCode   query   string  true       "指标code"
 	futureGoodEdbCode := this.GetString("FutureGoodEdbCode")
 	if futureGoodEdbCode != `` {
 		condition += ` AND future_good_edb_code = ? `
 		pars = append(pars, futureGoodEdbCode)
 	}
-	// @Param   StartDate   query   string  true       "开始日期"
 	startDate := this.GetString("StartDate")
 	if startDate != `` {
 		condition += ` AND data_time >= ? `
 		pars = append(pars, startDate)
 	}
-	// @Param   EndDate   query   string  true       "结束日期"
 	endDate := this.GetString("EndDate")
 	if endDate != `` {
 		condition += ` AND data_time <= ? `
@@ -154,7 +130,6 @@ func (this *FutureGoodEdbInfoController) FutureGoodEdbInfoDataList() {
 		return
 	}
 
-	// 获取用到的指标信息
 	futureGoodEdbInfoList, err := future_good2.GetAllFutureGoodEdbInfoList()
 	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
@@ -167,7 +142,6 @@ func (this *FutureGoodEdbInfoController) FutureGoodEdbInfoDataList() {
 	}
 
 	if len(list) > 0 {
-		// 给指标数据赋值指标名称
 		for _, v := range list {
 			if futureGoodEdbInfo, ok := futureGoodEdbInfoMap[v.FutureGoodEdbInfoId]; ok {
 				v.FutureGoodEdbName = futureGoodEdbInfo.FutureGoodEdbName
@@ -185,11 +159,6 @@ func (this *FutureGoodEdbInfoController) FutureGoodEdbInfoDataList() {
 	br.Data = resp
 }
 
-// FutureGoodEdbInfoGroupList
-// @Title 期货指标列表接口
-// @Description 期货指标列表接口
-// @Param   RegionType   query   string  false       "交易所来源，海外还是国内"
-// @Success 200 {object} data_manage.EdbInfoListResp
 // @router /edb_info/group/list [get]
 func (this *FutureGoodEdbInfoController) FutureGoodEdbInfoGroupList() {
 	br := new(models.BaseResponse).Init()
@@ -211,7 +180,6 @@ func (this *FutureGoodEdbInfoController) FutureGoodEdbInfoGroupList() {
 	condition += ` AND parent_id = ? `
 	pars = append(pars, 0)
 
-	// @Param   RegionType   query   string  false       "交易所来源，海外还是国内"
 	regionType := this.GetString("RegionType")
 	if regionType != `` {
 		condition += ` AND region_type = ? `
@@ -262,7 +230,6 @@ func (this *FutureGoodEdbInfoController) FutureGoodEdbInfoGroupList() {
 						FutureGoodEdbInfoId:     v.FutureGoodEdbInfoId,
 						FutureGoodEdbInfoName:   v.FutureGoodEdbName,
 						FutureGoodEdbInfoNameEn: v.FutureGoodEdbNameEn,
-						//Child:                 make([]future_good.FutureGoodEdbInfoGroupListResp, 0),
 					},
 				},
 			}
@@ -274,7 +241,6 @@ func (this *FutureGoodEdbInfoController) FutureGoodEdbInfoGroupList() {
 				FutureGoodEdbInfoId:     v.FutureGoodEdbInfoId,
 				FutureGoodEdbInfoName:   v.FutureGoodEdbName,
 				FutureGoodEdbInfoNameEn: v.FutureGoodEdbNameEn,
-				//Child:                 make([]future_good.FutureGoodEdbInfoGroupListResp, 0),
 			})
 			child[tmpKey] = tmpList
 		}
@@ -286,11 +252,6 @@ func (this *FutureGoodEdbInfoController) FutureGoodEdbInfoGroupList() {
 	br.Data = resp
 }
 
-// FutureGoodEdbExchangeList
-// @Title 交易所列表接口
-// @Description 交易所列表接口
-// @Param   RegionType   query   string  false       "交易所来源，海外还是国内"
-// @Success 200 {object} data_manage.EdbInfoListResp
 // @router /exchange/list [get]
 func (this *FutureGoodEdbInfoController) FutureGoodEdbExchangeList() {
 	br := new(models.BaseResponse).Init()
@@ -312,7 +273,6 @@ func (this *FutureGoodEdbInfoController) FutureGoodEdbExchangeList() {
 	condition += ` AND parent_id = ? `
 	pars = append(pars, 0)
 
-	// @Param   RegionType   query   string  false       "交易所来源，海外还是国内"
 	regionType := this.GetString("RegionType")
 	if regionType != `` {
 		condition += ` AND region_type = ? `
@@ -334,407 +294,3 @@ func (this *FutureGoodEdbInfoController) FutureGoodEdbExchangeList() {
 	br.Msg = "获取成功"
 	br.Data = list
 }
-
-//func init() {
-//	var condition string
-//	var pars []interface{}
-//
-//	condition += ` AND parent_id = ? `
-//	pars = append(pars, 0)
-//
-//	list, err := future_good2.GetFutureGoodEdbInfoList(condition, pars)
-//	if err != nil && !utils.IsErrNoRow(err) {
-//		fmt.Println("err:", err)
-//		return
-//	}
-//
-//	monthMap := map[string]string{
-//		`(1月`:  "(Jan",
-//		`(2月`:  "(Feb",
-//		`(3月`:  "(Mar",
-//		`(4月`:  "(Apr",
-//		`(5月`:  "(May",
-//		`(6月`:  "(Jun",
-//		`(7月`:  "(Jul",
-//		`(8月`:  "(Aug",
-//		`(9月`:  "(Sep",
-//		`(10月`: "(Oct",
-//		`(11月`: "(Nov",
-//		`(12月`: "(Dec",
-//	}
-//	for _, v := range list {
-//		fmt.Println(v)
-//		var tmpCondition string
-//		var tmpPars []interface{}
-//
-//		tmpCondition += ` AND parent_id = ? `
-//		tmpPars = append(tmpPars, v.FutureGoodEdbInfoId)
-//		tmpList, tmpErr := future_good2.GetFutureGoodEdbInfoList(tmpCondition, tmpPars)
-//		if tmpErr != nil && !utils.IsErrNoRow(tmpErr) {
-//			fmt.Println("err:", tmpErr)
-//			return
-//		}
-//
-//		for _, child := range tmpList {
-//			child.FutureGoodEdbNameEn = strings.Replace(child.FutureGoodEdbNameEn, v.FutureGoodEdbName, v.FutureGoodEdbNameEn, -1)
-//
-//			for k, month := range monthMap {
-//				if strings.Contains(child.FutureGoodEdbNameEn, k) {
-//					child.FutureGoodEdbNameEn = strings.Replace(child.FutureGoodEdbNameEn, k, month, -1)
-//					fmt.Println(child.FutureGoodEdbNameEn)
-//					//os.Exit(-1)
-//					child.Update([]string{"FutureGoodEdbNameEn"})
-//				}
-//			}
-//		}
-//	}
-//
-//	fmt.Println("end")
-//}
-
-//func init() {
-//
-//	edbCodeMap := map[string]string{
-//		//"沪深300指数期货": "IF",
-//		//"上证50指数期货": "IH",
-//		//"中证500指数期货": "IC",
-//		//"中证1000指数期货": "IM",
-//		//"2年期国债期货": "TS",
-//		//"5年期国债期货": "TF",
-//		"10年期国债期货": "T",
-//	}
-//	//T03
-//	suffix := "M.CFE"
-//	monthList := []string{"01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"}
-//	monthStrList := []string{"(1月)", "(2月)", "(3月)", "(4月)", "(5月)", "(6月)", "(7月)", "(8月)", "(9月)", "(10月)", "(11月)", "(12月)"}
-//
-//	for k, v := range edbCodeMap {
-//		code := v + "CFE"
-//		tmpFutureGoodEdbInfo := &future_good2.FutureGoodEdbInfo{
-//			//FutureGoodEdbInfoId: 0,
-//			FutureGoodEdbCode:   code,
-//			FutureGoodEdbName:   k,
-//			FutureGoodEdbNameEn: k,
-//			ParentId:            0,
-//			Exchange:            "中金所",
-//			Month:               0,
-//			StartDate:           "",
-//			EndDate:             "",
-//			MinValue:            0,
-//			MaxValue:            0,
-//			LatestValue:         0,
-//			//LatestDate:          time.Time{},
-//			ServerUrl:  "",
-//			CreateTime: time.Now(),
-//			ModifyTime: time.Now(),
-//		}
-//		err := future_good2.AddFutureGoodEdbInfo(tmpFutureGoodEdbInfo)
-//		if err != nil {
-//			fmt.Println("添加指标:", k, "失败,err:", err)
-//			continue
-//		}
-//
-//		for index, month := range monthList {
-//			code2 := v + month + suffix
-//			name := tmpFutureGoodEdbInfo.FutureGoodEdbName + monthStrList[index]
-//			tmpFutureGoodEdbInfo2 := &future_good2.FutureGoodEdbInfo{
-//				//FutureGoodEdbInfoId: 0,
-//				FutureGoodEdbCode:   code2,
-//				FutureGoodEdbName:   name,
-//				FutureGoodEdbNameEn: name,
-//				ParentId:            tmpFutureGoodEdbInfo.FutureGoodEdbInfoId,
-//				Exchange:            "中金所",
-//				Month:               0,
-//				StartDate:           "",
-//				EndDate:             "",
-//				MinValue:            0,
-//				MaxValue:            0,
-//				LatestValue:         0,
-//				//LatestDate:          time.Time{},
-//				ServerUrl:  "",
-//				CreateTime: time.Now(),
-//				ModifyTime: time.Now(),
-//			}
-//			err = future_good2.AddFutureGoodEdbInfo(tmpFutureGoodEdbInfo2)
-//			if err != nil {
-//				fmt.Println("添加子指标:", name, "失败,err:", err)
-//				continue
-//			}
-//		}
-//	}
-//
-//	fmt.Println("end")
-//}
-
-//func init() {
-//	var condition string
-//	var pars []interface{}
-//
-//	condition += ` AND parent_id > ? AND start_date= ? `
-//	pars = append(pars, 0, "0000-00-00")
-//
-//	list, err := future_good2.GetFutureGoodEdbInfoList(condition, pars)
-//	if err != nil && !utils.IsErrNoRow(err) {
-//		fmt.Println("err:", err)
-//		return
-//	}
-//
-//	for _, v := range list {
-//		fmt.Println(v)
-//		resp, err := future_good.AddEdbData(v.FutureGoodEdbCode)
-//		if err != nil {
-//			fmt.Println(v.FutureGoodEdbName, "添加 异常 ,err:", err)
-//			continue
-//		}
-//		if resp.Ret != 200 {
-//			fmt.Println(v.FutureGoodEdbName, "添加 失败 ,msg:", resp.Msg, ";errMsg:", resp.ErrMsg)
-//		}
-//	}
-//
-//	fmt.Println("end")
-//}
-
-//func init() {
-//	var condition string
-//	var pars []interface{}
-//
-//	condition += ` AND parent_id = ? AND start_date= ? `
-//	pars = append(pars, 0, "0000-00-00")
-//
-//	list, err := future_good2.GetFutureGoodEdbInfoList(condition, pars)
-//	if err != nil && !utils.IsErrNoRow(err) {
-//		fmt.Println("err:", err)
-//		return
-//	}
-//
-//	for _, v := range list {
-//		fmt.Println(v)
-//		//v.FutureGoodEdbCode = strings.Replace(v.FutureGoodEdbCode, ".", "ZL.", -1)
-//		//v.Update([]string{"FutureGoodEdbCode"})
-//		resp, err := future_good.AddEdbData(v.FutureGoodEdbCode)
-//		if err != nil {
-//			fmt.Println(v.FutureGoodEdbName, "添加 异常 ,err:", err)
-//			continue
-//		}
-//		if resp.Ret != 200 {
-//			fmt.Println(v.FutureGoodEdbName, "添加 失败 ,msg:", resp.Msg, ";errMsg:", resp.ErrMsg)
-//		}
-//	}
-//
-//	fmt.Println("end")
-//}
-
-// 添加海外交易所
-//func init() {
-//	exchangeName := `新加坡证券（SGX）`
-//	suffix := ".SGX"
-//	type TmpStruct struct {
-//		Name  string
-//		Code  string
-//		Year  int
-//		Month int
-//	}
-//	str := `TSI铁矿石指数	FEF	SGX	2612`
-//	list := make([]TmpStruct, 0)
-//
-//	strList := strings.Split(str, `
-//`)
-//	//fmt.Println(strList)
-//	for _, v := range strList {
-//		v = strings.TrimPrefix(v, "\t")
-//		tmp := strings.Split(v, `	`)
-//		fmt.Println(tmp)
-//
-//		year, err := strconv.Atoi(tmp[3][0:2])
-//		if err != nil {
-//			fmt.Println(err)
-//			return
-//		}
-//		//fmt.Println(year)
-//		month, err := strconv.Atoi(tmp[3][2:4])
-//		if err != nil {
-//			fmt.Println(err)
-//			return
-//		}
-//		//fmt.Println(month)
-//
-//		tmpStruct := TmpStruct{
-//			Name:  tmp[0],
-//			Code:  tmp[1],
-//			Year:  year,
-//			Month: month,
-//		}
-//		list = append(list, tmpStruct)
-//	}
-//
-//	//T03
-//	//suffix := ".CMX"
-//	//1、@CL0W.NMX[NYMEX美原油电子盘主力（持仓量）合约]
-//	//2、@CL23J.NMX[NYMEX美原油电子盘2304]
-//	//yearList := []int{2023, 2024, 2025, 2026, 2027, 2028}
-//	monthList := []int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}
-//	startMonth := 3
-//	//endMonth := 5
-//
-//	monthCodeStrList := []string{"F", "G", "H", "J", "K", "M", "N", "Q", "U", "V", "X", "Z"}
-//	//monthStrList := []string{"(1月)", "(2月)", "(3月)", "(4月)", "(5月)", "(6月)", "(7月)", "(8月)", "(9月)", "(10月)", "(11月)", "(12月)"}
-//
-//	for k, v := range list {
-//		yearList := make([]int, 0)
-//		for i := 23; i <= v.Year; i++ {
-//			yearList = append(yearList, i+2000)
-//		}
-//		//fmt.Println(yearList)
-//		//return
-//		endMonth := v.Month
-//
-//		code := v.Code + `0W` + suffix
-//		tmpFutureGoodEdbInfo := &future_good2.FutureGoodEdbInfo{
-//			//FutureGoodEdbInfoId: 0,
-//			FutureGoodEdbCode:   code,
-//			FutureGoodEdbName:   v.Name,
-//			FutureGoodEdbNameEn: v.Name,
-//			ParentId:            0,
-//			RegionType:          `海外`,
-//			Exchange:            exchangeName,
-//			Year:                0,
-//			Month:               0,
-//			StartDate:           "",
-//			EndDate:             "",
-//			MinValue:            0,
-//			MaxValue:            0,
-//			LatestValue:         0,
-//			//LatestDate:          time.Time{},
-//			ServerUrl:  "",
-//			CreateTime: time.Now(),
-//			ModifyTime: time.Now(),
-//		}
-//		err := future_good2.AddFutureGoodEdbInfo(tmpFutureGoodEdbInfo)
-//		if err != nil {
-//			fmt.Println("添加指标:", k, "失败,err:", err)
-//			continue
-//		}
-//
-//		lastYearIndex := len(yearList) - 1
-//		for yearIndex, year := range yearList {
-//			for index, month := range monthList {
-//				// 如果第一年的开始月份早于约定的开始月份，那么就退出这个循环，进入下一个循环
-//				if yearIndex == 0 && month < startMonth {
-//					continue
-//				}
-//				// 如果最一年的结束月份晚于约定的开始月份，那么就退出这个循环，进入下一个循环
-//				if lastYearIndex == yearIndex && month > endMonth {
-//					break
-//				}
-//				monthStr := strconv.Itoa(month)
-//				if month < 10 {
-//					monthStr = `0` + monthStr
-//				}
-//				yearStr := strconv.Itoa(year - 2000)
-//				yearMonthStr := yearStr + monthStr
-//
-//				code2 := v.Code + yearStr + monthCodeStrList[index] + suffix
-//				name := tmpFutureGoodEdbInfo.FutureGoodEdbName + `(` + yearMonthStr + `)`
-//				tmpFutureGoodEdbInfo2 := &future_good2.FutureGoodEdbInfo{
-//					//FutureGoodEdbInfoId: 0,
-//					FutureGoodEdbCode:   code2,
-//					FutureGoodEdbName:   name,
-//					FutureGoodEdbNameEn: name,
-//					ParentId:            tmpFutureGoodEdbInfo.FutureGoodEdbInfoId,
-//					RegionType:          `海外`,
-//					Exchange:            exchangeName,
-//					Year:                year,
-//					Month:               month,
-//					StartDate:           "",
-//					EndDate:             "",
-//					MinValue:            0,
-//					MaxValue:            0,
-//					LatestValue:         0,
-//					//LatestDate:          time.Time{},
-//					ServerUrl:  "",
-//					CreateTime: time.Now(),
-//					ModifyTime: time.Now(),
-//				}
-//				err = future_good2.AddFutureGoodEdbInfo(tmpFutureGoodEdbInfo2)
-//				if err != nil {
-//					fmt.Println("添加子指标:", name, "失败,err:", err)
-//					continue
-//				}
-//			}
-//		}
-//
-//	}
-//
-//	fmt.Println("end")
-//}
-
-// 刷新海外交易所数据
-//func init() {
-//	var condition string
-//	var pars []interface{}
-//
-//	//condition += ` AND parent_id > ? AND start_date= ? `
-//	condition += ` AND region_type = ? AND start_date= ?  AND exchange = ? `
-//	pars = append(pars, "海外", "0000-00-00", "伦敦金属（LME）")
-//	//condition += ` AND region_type = ? AND start_date= ?  `
-//	//pars = append(pars, "海外", "0000-00-00")
-//
-//	list, err := future_good2.GetFutureGoodEdbInfoList(condition, pars)
-//	if err != nil && !utils.IsErrNoRow(err) {
-//		fmt.Println("err:", err)
-//		return
-//	}
-//
-//	errIdList := make([]string, 0)
-//	for _, v := range list {
-//		fmt.Println(v)
-//		resp, err := future_good.AddEdbData(v.FutureGoodEdbCode)
-//		if err != nil {
-//			fmt.Println(v.FutureGoodEdbName, "添加 异常 ,err:", err)
-//			continue
-//		}
-//		if resp.Ret != 200 {
-//			errIdList = append(errIdList, fmt.Sprint(v.FutureGoodEdbInfoId))
-//			fmt.Println(v.FutureGoodEdbName, "添加 失败 ,msg:", resp.Msg, ";errMsg:", resp.ErrMsg)
-//		}
-//	}
-//
-//	fmt.Println("end")
-//	fmt.Println(strings.Join(errIdList, ","))
-//}
-
-// 刷新海外交易所数据
-//func init() {
-//	var condition string
-//	var pars []interface{}
-//
-//	//condition += ` AND parent_id > ? AND start_date= ? `
-//	condition += ` AND region_type = ? AND parent_id != 0 and future_good_edb_type = 1`
-//	pars = append(pars, "海外")
-//	//condition += ` AND region_type = ? AND start_date= ?  `
-//	//pars = append(pars, "海外", "0000-00-00")
-//
-//	list, err := future_good2.GetFutureGoodEdbInfoList(condition, pars)
-//	if err != nil && !utils.IsErrNoRow(err) {
-//		fmt.Println("err:", err)
-//		return
-//	}
-//	for _, v := range list {
-//		//fmt.Println(v.FutureGoodEdbName)
-//		tmpList := strings.Split(v.FutureGoodEdbName, "(")
-//		//fmt.Println(tmpList)
-//		//fmt.Println(tmpList[1])
-//		year, err := strconv.Atoi(tmpList[1][0:2])
-//		if err != nil {
-//			fmt.Println(err)
-//			return
-//		}
-//		v.Year = year + 2000
-//		err = v.Update([]string{"Year"})
-//		if err != nil {
-//			fmt.Println(err)
-//			return
-//		}
-//	}
-//	fmt.Println("end")
-//}

controllers/data_manage/future_good/future_good_profit_chart_info.go

@@ -19,11 +19,6 @@ import (
 	"time"
 )
 
-// ProfitChartInfoAdd
-// @Title 新增图表接口
-// @Description 新增图表接口
-// @Param	request	body data_manage.AddChartInfoReq true "type json string"
-// @Success 200 {object} data_manage.AddChartInfoResp
 // @router /chart_info/profit/add [post]
 func (this *FutureGoodChartInfoController) ProfitChartInfoAdd() {
 	br := new(models.BaseResponse).Init()
@@ -87,7 +82,6 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoAdd() {
 		return
 	}
 
-	//额外的配置信息
 	extraReq := req.Extra
 	if len(extraReq.DateList) <= 0 {
 		br.Msg = "请选择日期"
@@ -119,14 +113,12 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoAdd() {
 
 	var edbInfoIdArr []int
 	baseEdbInfo := new(data_manage.EdbInfo)
-	// ETA指标
 	edbInfoListTmp, err := data_manage.GetEdbInfoByIdList(extraReq.EdbInfoIdList)
 	if err != nil {
 		br.Msg = "获取指标信息失败！"
 		br.ErrMsg = "获取图表的指标信息失败，Err:" + err.Error()
 		return
 	}
-	//按照请求顺序排序
 	edbInfoMap := make(map[int]*data_manage.EdbInfo)
 	for _, v := range edbInfoListTmp {
 		edbInfoMap[v.EdbInfoId] = v
@@ -153,7 +145,6 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoAdd() {
 		}
 	}
 
-	// 期货商品指标（主力合约）
 	futureGoodEdbInfoMap := make(map[int]*future_good.FutureGoodEdbInfo)
 	zlFutureGoodEdbInfoList := make([]*future_good.FutureGoodEdbInfo, 0)
 	for _, v := range extraReq.FutureGoodEdbInfoIdList {
@@ -243,7 +234,6 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoAdd() {
 	chartInfo.ExtraConfig = extraConf
 	chartInfo.Source = utils.CHART_SOURCE_FUTURE_GOOD_PROFIT
 
-	// 关联指标
 	mapList := make([]*data_manage.ChartEdbMapping, 0)
 	{
 		for _, v := range edbInfoList {
@@ -253,17 +243,11 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoAdd() {
 				CreateTime:        time.Now(),
 				ModifyTime:        time.Now(),
 				UniqueCode:        utils.MD5(utils.CHART_PREFIX + "_" + strconv.FormatInt(time.Now().UnixNano(), 10) + "_" + strconv.Itoa(v.EdbInfoId)),
-				//MaxData:           0,
-				//MinData:           0,
+
 				IsOrder:     true,
 				IsAxis:      1,
 				EdbInfoType: 1,
-				//LeadValue:         0,
-				//LeadUnit:          "",
-				//ChartStyle:        "",
-				//ChartColor:        "",
-				//PredictChartColor: "",
-				//ChartWidth:        0,
+
 				Source: 1,
 			})
 		}
@@ -275,23 +259,16 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoAdd() {
 				CreateTime:        time.Now(),
 				ModifyTime:        time.Now(),
 				UniqueCode:        utils.MD5(utils.CHART_PREFIX + "_" + strconv.FormatInt(time.Now().UnixNano(), 10) + "_" + strconv.Itoa(v.FutureGoodEdbInfoId)),
-				//MaxData:           0,
-				//MinData:           0,
+
 				IsOrder:     true,
 				IsAxis:      1,
 				EdbInfoType: 1,
-				//LeadValue:         0,
-				//LeadUnit:          "",
-				//ChartStyle:        "",
-				//ChartColor:        "",
-				//PredictChartColor: "",
-				//ChartWidth:        0,
+
 				Source: 2,
 			})
 		}
 	}
 
-	// 获取图表中的指标数据
 	_, _, _, xDataList, yDataList, err := future_goodServ.GetProfitChartEdbData(baseEdbInfo, edbInfoList, zlFutureGoodEdbInfoList, extraReq.DateList, extraReq.CalculateFormula, extraReq.FutureGoodEdbInfoIdList, extraReq.XDataList)
 	if err != nil {
 		br.Msg = "保存失败"
@@ -332,12 +309,9 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoAdd() {
 	resp.UniqueCode = chartInfo.UniqueCode
 	resp.ChartType = req.ChartType
 
-	// 添加指标引用记录
 	_ = data.SaveChartEdbInfoRelation(edbInfoIdArr, chartInfo)
-	//添加es数据
 	go data.EsAddOrEditChartInfo(chartInfo.ChartInfoId)
 
-	//新增操作日志
 	{
 		chartLog := new(data_manage.ChartInfoLog)
 		chartLog.ChartInfoId = chartInfo.ChartInfoId
@@ -360,11 +334,6 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoAdd() {
 	br.IsAddLog = true
 }
 
-// ProfitChartInfoEdit
-// @Title 编辑图表接口
-// @Description 编辑图表接口
-// @Param	request	body data_manage.EditChartInfoReq true "type json string"
-// @Success Ret=200 保存成功
 // @router /chart_info/profit/edit [post]
 func (this *FutureGoodChartInfoController) ProfitChartInfoEdit() {
 	br := new(models.BaseResponse).Init()
@@ -428,7 +397,6 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoEdit() {
 		return
 	}
 
-	//图表操作权限
 	ok := data.CheckOpChartPermission(sysUser, chartItem.SysUserId, true)
 	if !ok {
 		br.Msg = "没有该图表的操作权限"
@@ -436,7 +404,6 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoEdit() {
 		return
 	}
 
-	// 查找商品利润图表的扩展信息
 	chartInfoFutureGoodProfit := new(future_good.ChartInfoFutureGoodProfit)
 	if e := chartInfoFutureGoodProfit.GetItemById(chartItem.ChartInfoId); e != nil {
 		br.Msg = "获取失败"
@@ -444,7 +411,6 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoEdit() {
 		return
 	}
 
-	//额外的配置信息
 	extraReq := req.Extra
 	if len(extraReq.DateList) <= 0 {
 		br.Msg = "请选择日期"
@@ -474,14 +440,12 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoEdit() {
 
 	var edbInfoIdArr []int
 	baseEdbInfo := new(data_manage.EdbInfo)
-	// ETA指标
 	edbInfoListTmp, err := data_manage.GetEdbInfoByIdList(extraReq.EdbInfoIdList)
 	if err != nil {
 		br.Msg = "获取指标信息失败！"
 		br.ErrMsg = "获取图表的指标信息失败，Err:" + err.Error()
 		return
 	}
-	//按照请求顺序排序
 	edbInfoMap := make(map[int]*data_manage.EdbInfo)
 	for _, v := range edbInfoListTmp {
 		edbInfoMap[v.EdbInfoId] = v
@@ -508,7 +472,6 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoEdit() {
 		}
 	}
 
-	// 期货商品指标（主力合约）
 	futureGoodEdbInfoMap := make(map[int]*future_good.FutureGoodEdbInfo)
 	zlFutureGoodEdbInfoList := make([]*future_good.FutureGoodEdbInfo, 0)
 	for _, v := range extraReq.FutureGoodEdbInfoIdList {
@@ -559,7 +522,6 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoEdit() {
 	}
 	edbInfoIdStr := strings.Join(edbInfoIdArrStr, ",")
 
-	// 图表启用与否
 	disableVal := data.CheckIsDisableChart(edbInfoIdArr)
 
 	chartItem.ChartName = req.ChartName
@@ -572,7 +534,6 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoEdit() {
 	chartItem.ExtraConfig = extraConf
 	chartItemUpdateCol := []string{"ChartName", "EdbInfoIds", "ChartClassifyId", "ModifyTime", "Disabled", "LeftMin", "LeftMax", "ExtraConfig"}
 
-	// 关联指标
 	mapList := make([]*data_manage.ChartEdbMapping, 0)
 	{
 		for _, v := range edbInfoList {
@@ -582,18 +543,10 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoEdit() {
 				CreateTime:        time.Now(),
 				ModifyTime:        time.Now(),
 				UniqueCode:        utils.MD5(utils.CHART_PREFIX + "_" + strconv.FormatInt(time.Now().UnixNano(), 10) + "_" + strconv.Itoa(v.EdbInfoId)),
-				//MaxData:           0,
-				//MinData:           0,
-				IsOrder:     true,
-				IsAxis:      1,
-				EdbInfoType: 1,
-				//LeadValue:         0,
-				//LeadUnit:          "",
-				//ChartStyle:        "",
-				//ChartColor:        "",
-				//PredictChartColor: "",
-				//ChartWidth:        0,
-				Source: 1,
+				IsOrder:           true,
+				IsAxis:            1,
+				EdbInfoType:       1,
+				Source:            1,
 			})
 		}
 		for _, v := range futureGoodEdbInfoMap {
@@ -603,23 +556,14 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoEdit() {
 				CreateTime:        time.Now(),
 				ModifyTime:        time.Now(),
 				UniqueCode:        utils.MD5(utils.CHART_PREFIX + "_" + strconv.FormatInt(time.Now().UnixNano(), 10) + "_" + strconv.Itoa(v.FutureGoodEdbInfoId)),
-				//MaxData:           0,
-				//MinData:           0,
-				IsOrder:     true,
-				IsAxis:      1,
-				EdbInfoType: 1,
-				//LeadValue:         0,
-				//LeadUnit:          "",
-				//ChartStyle:        "",
-				//ChartColor:        "",
-				//PredictChartColor: "",
-				//ChartWidth:        0,
-				Source: 2,
+				IsOrder:           true,
+				IsAxis:            1,
+				EdbInfoType:       1,
+				Source:            2,
 			})
 		}
 	}
 
-	// 获取图表中的指标数据
 	_, _, _, xDataList, yDataList, err := future_goodServ.GetProfitChartEdbData(baseEdbInfo, edbInfoList, zlFutureGoodEdbInfoList, extraReq.DateList, extraReq.CalculateFormula, extraReq.FutureGoodEdbInfoIdList, extraReq.XDataList)
 	if err != nil {
 		br.Msg = "保存失败"
@@ -666,14 +610,9 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoEdit() {
 	resp.UniqueCode = chartItem.UniqueCode
 	resp.ChartType = req.ChartType
 
-	// 添加指标引用记录
 	_ = data.SaveChartEdbInfoRelation(edbInfoIdArr, chartItem)
-	//添加es数据
 	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
-	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
-
-	//新增操作日志
 	{
 		chartLog := new(data_manage.ChartInfoLog)
 		chartLog.ChartName = chartItem.ChartName
@@ -696,11 +635,9 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoEdit() {
 	br.IsAddLog = true
 }
 
-// copyProfitChartInfo 复制商品利润曲线图
 func copyProfitChartInfo(oldChartInfo *data_manage.ChartInfo, chartClassifyId int, chartName string, sysUser *system.Admin, br *models.BaseResponse) (chartInfo *data_manage.ChartInfo) {
 	chartInfoId := oldChartInfo.ChartInfoId
 
-	//校验图表名称是否重复
 	chartName = strings.Trim(chartName, " ")
 	if chartName == "" {
 		br.Msg = "请填写图表名称！"
@@ -726,17 +663,6 @@ func copyProfitChartInfo(oldChartInfo *data_manage.ChartInfo, chartClassifyId in
 		br.ErrMsg = "分类不存在"
 		return
 	}
-	//count, err := data_manage.ChartInfoExist("", edbInfoIdStr)
-	//if err != nil && !utils.IsErrNoRow(err) {
-	//	br.Msg = "保存失败"
-	//	br.ErrMsg = "判断图表名称是否存在失败,Err:" + err.Error()
-	//	return
-	//}
-	//if count > 0 {
-	//	br.Msg = "所选指标已存在相同指标"
-	//	return
-	//}
-	//判断图表是否存在
 	var condition string
 	var pars []interface{}
 	condition += " AND chart_classify_id=? "
@@ -758,7 +684,6 @@ func copyProfitChartInfo(oldChartInfo *data_manage.ChartInfo, chartClassifyId in
 		return
 	}
 
-	//获取原图表关联的指标信息列表
 	edbMappingList, err := data_manage.GetChartEdbMappingListV2(chartInfoId)
 	if err != nil {
 		br.Msg = "获取图表关联的指标信息失败！"
@@ -766,7 +691,6 @@ func copyProfitChartInfo(oldChartInfo *data_manage.ChartInfo, chartClassifyId in
 		return
 	}
 
-	//添加图表
 	timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 	chartInfo = &data_manage.ChartInfo{
 		ChartInfoId:     0,
@@ -789,22 +713,18 @@ func copyProfitChartInfo(oldChartInfo *data_manage.ChartInfo, chartClassifyId in
 		ChartImage:      oldChartInfo.ChartImage,
 		BarConfig:       oldChartInfo.BarConfig,
 		ExtraConfig:     oldChartInfo.ExtraConfig,
-		//Sort:     sort,
-		LeftMin:  oldChartInfo.LeftMin,
-		LeftMax:  oldChartInfo.LeftMax,
-		RightMin: oldChartInfo.RightMin,
-		RightMax: oldChartInfo.RightMax,
-		Disabled: oldChartInfo.Disabled,
-		Source:   oldChartInfo.Source,
+		LeftMin:         oldChartInfo.LeftMin,
+		LeftMax:         oldChartInfo.LeftMax,
+		RightMin:        oldChartInfo.RightMin,
+		RightMax:        oldChartInfo.RightMax,
+		Disabled:        oldChartInfo.Disabled,
+		Source:          oldChartInfo.Source,
 	}
 
-	// 添加图表与指标的关联关系
 	mapList := make([]*data_manage.ChartEdbMapping, 0)
 	{
 		for _, v := range edbMappingList {
 			mapItem := &data_manage.ChartEdbMapping{
-				//ChartEdbMappingId: 0,
-				//ChartInfoId: chartInfo.ChartInfoId,
 				EdbInfoId:   v.EdbInfoId,
 				CreateTime:  time.Now(),
 				ModifyTime:  time.Now(),
@@ -825,7 +745,6 @@ func copyProfitChartInfo(oldChartInfo *data_manage.ChartInfo, chartClassifyId in
 		}
 	}
 
-	// 查找商品利润图表的扩展信息
 	oldChartInfoFutureGoodProfit := new(future_good.ChartInfoFutureGoodProfit)
 	if e := oldChartInfoFutureGoodProfit.GetItemById(oldChartInfo.ChartInfoId); e != nil {
 		br.Msg = "复制失败"
@@ -833,7 +752,6 @@ func copyProfitChartInfo(oldChartInfo *data_manage.ChartInfo, chartClassifyId in
 		return
 	}
 
-	// 保存
 	err = future_good.CreateChartInfoFutureGoodProfitAndEdb(chartInfo, mapList, &future_good.ChartInfoFutureGoodProfit{
 		ChartInfoId:  0,
 		ProfitName:   oldChartInfoFutureGoodProfit.ProfitName,
@@ -848,34 +766,19 @@ func copyProfitChartInfo(oldChartInfo *data_manage.ChartInfo, chartClassifyId in
 		br.ErrMsg = "保存商品利润图表失败，Err:" + err.Error()
 		return
 	}
-	// 添加指标引用记录
 	edbInfoIdArr := make([]int, 0)
 	edbInfoIdArrStr := strings.Split(oldChartInfo.EdbInfoIds, ",")
 	for _, v := range edbInfoIdArrStr {
 		i, _ := strconv.Atoi(v)
 		edbInfoIdArr = append(edbInfoIdArr, i)
 	}
-	//保存图表与指标的关系
 	_ = data.SaveChartEdbInfoRelation(edbInfoIdArr, chartInfo)
-	//添加es数据
 	go data.EsAddOrEditChartInfo(chartInfo.ChartInfoId)
-	//修改my eta es数据
 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartInfo.ChartInfoId)
 
 	return
 }
 
-// PreviewProfitChartInfo
-// @Title 图表-获取预览的商品利润曲线图数据
-// @Description 图表-获取指标详情接口
-// @Param   EdbInfoId   query   int  true       "指标ID"
-// @Param   DateType   query   int  true       "日期类型:1:00年至今,2:10年至今,3:15年至今，4：年初至今，5:自定义时间,6:自定义起始时间至今，7：18年至今,8:19年至今,9:20年至今"
-// @Param   StartDate   query   string  true       "自定义开始日期"
-// @Param   EndDate   query   string  true       "自定义结束日期"
-// @Param   EdbInfoType  query int  true     "1:标准指标,0:领先指标，默认为标准指标"
-// @Param   LeadValue    query   int  true       "领先值"
-// @Param   LeadUnit     query   string  true        "领先单位:天，月，季，周"
-// @Success 200 {object} data_manage.ChartEdbInfoDetailResp
 // @router /chart_info/profit/preview [post]
 func (this *FutureGoodChartInfoController) PreviewProfitChartInfo() {
 	br := new(models.BaseResponse).Init()
@@ -910,14 +813,12 @@ func (this *FutureGoodChartInfoController) PreviewProfitChartInfo() {
 	}
 	chartInfo := new(data_manage.ChartInfoView)
 
-	//var edbInfoMapping, futureGoodEdbInfoMapping *data_manage.ChartEdbInfoMapping
 	baseEdbInfo, err := data_manage.GetEdbInfoById(req.BaseEdbInfoId)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取图表，指标信息失败，Err:" + err.Error()
 		return
 	}
-	// 商品数据库指标
 	futureGoodEdbInfoMap := make(map[int]*future_good.FutureGoodEdbInfo)
 	zlFutureGoodEdbInfoList := make([]*future_good.FutureGoodEdbInfo, 0)
 	for _, v := range req.FutureGoodEdbInfoIdList {
@@ -954,7 +855,6 @@ func (this *FutureGoodChartInfoController) PreviewProfitChartInfo() {
 		br.IsSendEmail = false
 		return
 	}
-	//查询基本指标信息
 	edbInfoListTmp, err := data_manage.GetEdbInfoByIdList(req.EdbInfoIdList)
 	if err != nil {
 		br.Msg = "获取失败"
@@ -969,7 +869,6 @@ func (this *FutureGoodChartInfoController) PreviewProfitChartInfo() {
 	for _, v := range req.EdbInfoIdList {
 		edbInfoList = append(edbInfoList, edbInfoMap[v])
 	}
-	// 获取图表中的指标数据
 	barConfigEdbInfoIdList, _, _, xDataList, yDataList, err := future_goodServ.GetProfitChartEdbData(baseEdbInfo, edbInfoList, zlFutureGoodEdbInfoList, req.DateList, req.CalculateFormula, req.FutureGoodEdbInfoIdList, req.XDataList)
 	if err != nil {
 		br.Msg = "获取失败"
@@ -1016,11 +915,9 @@ func (this *FutureGoodChartInfoController) PreviewProfitChartInfo() {
 		chartInfo.WarnMsg = `图表引用指标异常，异常指标：` + strings.Join(warnEdbList, "，")
 	}
 
-	//图表操作权限
 	chartInfo.IsEdit = data.CheckOpChartPermission(sysUser, chartInfo.SysUserId, true)
 	chartInfo.Button.IsEdit = chartInfo.IsEdit
 	chartInfo.Button.IsCopy = true
-	//判断是否需要展示英文标识
 	chartInfo.IsEnChart = data.CheckIsEnChart(chartInfo.ChartNameEn, edbList, chartInfo.Source, chartInfo.ChartType)
 
 	resp := new(data_manage.ChartInfoDetailResp)
@@ -1038,11 +935,9 @@ func (this *FutureGoodChartInfoController) PreviewProfitChartInfo() {
 	br.Data = resp
 }
 
-// getFutureGoodProfitChartInfo 获取商品利润曲线的数据
 func getFutureGoodProfitChartInfo(chartInfo *data_manage.ChartInfoView, sysUser *system.Admin, br *models.BaseResponse) {
 	chartInfoId := chartInfo.ChartInfoId
 
-	// 商品利润曲线图的一些配置
 	var extraConf request.ChartInfoReq
 	err := json.Unmarshal([]byte(chartInfo.ExtraConfig), &extraConf)
 	if err != nil {
@@ -1078,7 +973,6 @@ func getFutureGoodProfitChartInfo(chartInfo *data_manage.ChartInfoView, sysUser
 	xDataList := make([]data_manage.XData, 0)
 	yDataList := make([]data_manage.YData, 0)
 
-	// 查找商品利润图表的扩展信息
 	chartInfoFutureGoodProfit := new(future_good.ChartInfoFutureGoodProfit)
 	if err = chartInfoFutureGoodProfit.GetItemById(chartInfo.ChartInfoId); err != nil {
 		br.Msg = "获取失败"
@@ -1112,7 +1006,6 @@ func getFutureGoodProfitChartInfo(chartInfo *data_manage.ChartInfoView, sysUser
 		chartInfo.WarnMsg = `图表引用指标异常，异常指标：` + strings.Join(warnEdbList, "，")
 	}
 	if chartInfoId > 0 && chartInfo != nil {
-		//判断是否加入我的图库
 		{
 			var myChartCondition string
 			var myChartPars []interface{}
@@ -1135,15 +1028,12 @@ func getFutureGoodProfitChartInfo(chartInfo *data_manage.ChartInfoView, sysUser
 		}
 	}
 
-	//图表操作权限
 	chartInfo.IsEdit = data.CheckOpChartPermission(sysUser, chartInfo.SysUserId, true)
 	chartInfo.Button.IsEdit = chartInfo.IsEdit
 	chartInfo.Button.IsCopy = true
-	//判断是否需要展示英文标识
 	chartInfo.IsEnChart = data.CheckIsEnChart(chartInfo.ChartNameEn, edbList[0:1], chartInfo.Source, chartInfo.ChartType)
 	chartInfo.UnitEn = baseEdbInfo.UnitEn
 
-	// 图表的指标来源
 	sourceNameList, sourceNameEnList := data.GetEdbSourceByEdbInfoIdList(edbList)
 	chartInfo.ChartSource = strings.Join(sourceNameList, ",")
 	chartInfo.ChartSourceEn = strings.Join(sourceNameEnList, ",")
@@ -1165,19 +1055,15 @@ func getFutureGoodProfitChartInfo(chartInfo *data_manage.ChartInfoView, sysUser
 	br.Data = resp
 }
 
-// GetFutureGoodProfitChartInfoDetailFromUniqueCode 根据编码获取图表详情
 func GetFutureGoodProfitChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCache bool, sysUser *system.Admin) (resp *data_manage.ChartInfoDetailFromUniqueCodeResp, isOk bool, msg, errMsg string) {
 	resp = new(data_manage.ChartInfoDetailFromUniqueCodeResp)
 
 	adminId := sysUser.AdminId
 
-	// 指标数据map
 	edbClassifyPermissionMap := make(map[int]data_manage_permission.EdbClassifyPermission)
 	defer func() {
 		if isOk {
-			// 这里跟当前用户相关的信息重新查询写入resp, 不使用缓存中的
 			{
-				//判断是否加入我的图库
 				var myChartCondition string
 				var myChartPars []interface{}
 				myChartCondition += ` AND a.admin_id=? `
@@ -1200,10 +1086,8 @@ func GetFutureGoodProfitChartInfoDetailFromUniqueCode(chartInfo *data_manage.Cha
 
 			resp.ChartInfo.HaveOperaAuth = true
 
-			// 指标权限
 			{
 				classifyMap := make(map[int]*data_manage.EdbClassify)
-				// 分类
 				{
 					classifyIdList := make([]int, 0)
 					for _, v := range resp.EdbInfoList {
@@ -1219,7 +1103,6 @@ func GetFutureGoodProfitChartInfoDetailFromUniqueCode(chartInfo *data_manage.Cha
 					}
 				}
 
-				// 指标
 				if len(edbClassifyPermissionMap) < 0 {
 					edbInfoIdList := make([]int, 0)
 					for _, v := range resp.EdbInfoList {
@@ -1239,7 +1122,6 @@ func GetFutureGoodProfitChartInfoDetailFromUniqueCode(chartInfo *data_manage.Cha
 					}
 				}
 
-				// 获取所有有权限的指标和分类
 				permissionEdbIdList, permissionClassifyIdList, err := data_manage_permission.GetUserEdbAndClassifyPermissionList(sysUser.AdminId, 0, 0)
 				if err != nil {
 					errMsg = "获取所有有权限的指标和分类失败，Err:" + err.Error()
@@ -1247,7 +1129,6 @@ func GetFutureGoodProfitChartInfoDetailFromUniqueCode(chartInfo *data_manage.Cha
 				}
 
 				for _, v := range resp.EdbInfoList {
-					// 数据权限
 					edbItem, ok := edbClassifyPermissionMap[v.EdbInfoId]
 					if !ok {
 						continue
@@ -1261,7 +1142,6 @@ func GetFutureGoodProfitChartInfoDetailFromUniqueCode(chartInfo *data_manage.Cha
 		}
 	}()
 
-	//判断是否存在缓存，如果存在缓存，那么直接从缓存中获取
 	key := data.GetChartInfoDataKey(chartInfo.ChartInfoId)
 	if utils.Re == nil && isCache {
 		if utils.Re == nil && utils.Rc.IsExist(key) {
@@ -1279,7 +1159,6 @@ func GetFutureGoodProfitChartInfoDetailFromUniqueCode(chartInfo *data_manage.Cha
 
 	chartInfoId := chartInfo.ChartInfoId
 
-	// 获取主题样式
 	chartTheme, err := data.GetChartThemeConfig(chartInfo.ChartThemeId, utils.CHART_SOURCE_DEFAULT, 1)
 	if err != nil {
 		msg = "获取失败"
@@ -1289,7 +1168,6 @@ func GetFutureGoodProfitChartInfoDetailFromUniqueCode(chartInfo *data_manage.Cha
 	chartInfo.ChartThemeStyle = chartTheme.Config
 	chartInfo.ChartThemeId = chartTheme.ChartThemeId
 
-	// 商品利润曲线图的一些配置
 	var extraConf request.ChartInfoReq
 	err = json.Unmarshal([]byte(chartInfo.ExtraConfig), &extraConf)
 	if err != nil {
@@ -1331,7 +1209,6 @@ func GetFutureGoodProfitChartInfoDetailFromUniqueCode(chartInfo *data_manage.Cha
 	xDataList := make([]data_manage.XData, 0)
 	yDataList := make([]data_manage.YData, 0)
 
-	// 查找商品利润图表的扩展信息
 	chartInfoFutureGoodProfit := new(future_good.ChartInfoFutureGoodProfit)
 	if err = chartInfoFutureGoodProfit.GetItemById(chartInfo.ChartInfoId); err != nil {
 		msg = "获取失败"
@@ -1364,7 +1241,6 @@ func GetFutureGoodProfitChartInfoDetailFromUniqueCode(chartInfo *data_manage.Cha
 		chartInfo.WarnMsg = `图表引用指标异常，异常指标：` + strings.Join(warnEdbList, "，")
 	}
 	if chartInfoId > 0 && chartInfo != nil {
-		//判断是否加入我的图库
 		{
 			var myChartCondition string
 			var myChartPars []interface{}
@@ -1387,15 +1263,12 @@ func GetFutureGoodProfitChartInfoDetailFromUniqueCode(chartInfo *data_manage.Cha
 		}
 	}
 
-	//图表操作权限
 	chartInfo.IsEdit = data.CheckOpChartPermission(sysUser, chartInfo.SysUserId, true)
 	chartInfo.Button.IsEdit = chartInfo.IsEdit
 	chartInfo.Button.IsCopy = true
-	//判断是否需要展示英文标识
 	chartInfo.IsEnChart = data.CheckIsEnChart(chartInfo.ChartNameEn, edbList[0:1], chartInfo.Source, chartInfo.ChartType)
 	chartInfo.UnitEn = baseEdbInfo.UnitEn
 
-	// 图表的指标来源
 	sourceNameList, sourceNameEnList := data.GetEdbSourceByEdbInfoIdList(edbList)
 	chartInfo.ChartSource = strings.Join(sourceNameList, ",")
 	chartInfo.ChartSourceEn = strings.Join(sourceNameEnList, ",")
@@ -1411,7 +1284,6 @@ func GetFutureGoodProfitChartInfoDetailFromUniqueCode(chartInfo *data_manage.Cha
 	}
 	resp.Status = true
 
-	// 遍历到校验map
 	for _, v := range edbList {
 		edbClassifyPermissionMap[v.EdbInfoId] = data_manage_permission.EdbClassifyPermission{
 			ClassifyId:       v.ClassifyId,
@@ -1420,7 +1292,6 @@ func GetFutureGoodProfitChartInfoDetailFromUniqueCode(chartInfo *data_manage.Cha
 		}
 	}
 
-	// 将数据加入缓存
 	if utils.Re == nil {
 		data, _ := json.Marshal(resp)
 		utils.Rc.Put(key, data, 2*time.Hour)

controllers/data_manage/line_equation/line_chart_classify.go

@@ -11,17 +11,10 @@ import (
 	"time"
 )
 
-// LineEquationChartClassifyController 拟合方程图表分类
 type LineEquationChartClassifyController struct {
 	controllers.BaseAuthController
 }
 
-// ChartClassifyList
-// @Title 拟合方程图表分类列表
-// @Description 拟合方程图表分类列表接口
-// @Param   IsShowMe   query   bool  true       "是否只看我的，true、false"
-// @Param   Source   query   int  true       "图表类型，3：拟合方程，4：滚动拟合方程"
-// @Success 200 {object} data_manage.ChartClassifyListResp
 // @router /chart_classify/list [get]
 func (this *LineEquationChartClassifyController) ChartClassifyList() {
 	br := new(models.BaseResponse).Init()
@@ -31,7 +24,6 @@ func (this *LineEquationChartClassifyController) ChartClassifyList() {
 	}()
 	resp := new(data_manage.ChartClassifyListResp)
 
-	// 获取当前账号的不可见指标
 	noPermissionChartIdMap := make(map[int]bool)
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
@@ -99,7 +91,6 @@ func (this *LineEquationChartClassifyController) ChartClassifyList() {
 		}
 	}
 
-	// 移除没有权限的图表
 	allNodes := data.HandleNoPermissionChart(rootList, noPermissionChartIdMap, this.SysUser.AdminId)
 	resp.AllNodes = allNodes
 
@@ -109,16 +100,13 @@ func (this *LineEquationChartClassifyController) ChartClassifyList() {
 	br.Data = resp
 }
 
-// getChartClassifyListForMe 获取我创建的图表
 func getChartClassifyListForMe(adminInfo system.Admin, resp *data_manage.ChartClassifyListResp) (errMsg string, err error) {
-	// 获取所有的分类
 	rootList, err := data_manage.GetChartClassifyByParentId(0, utils.CHART_SOURCE_LINE_EQUATION)
 	if err != nil && !utils.IsErrNoRow(err) {
 		errMsg = "获取失败"
 		return
 	}
 
-	// /获取所有的图表
 	allChartInfo, err := data_manage.GetChartInfoByAdminId([]int{utils.CHART_SOURCE_LINE_EQUATION}, adminInfo.AdminId)
 	if err != nil && !utils.IsErrNoRow(err) {
 		errMsg = "获取失败"
@@ -143,10 +131,6 @@ func getChartClassifyListForMe(adminInfo system.Admin, resp *data_manage.ChartCl
 	return
 }
 
-// ChartClassifyItems
-// @Title 获取所有拟合方程图表分类接口-不包含图表
-// @Description 获取所有拟合方程图表分类接口-不包含图表
-// @Success 200 {object} data_manage.ChartClassifyListResp
 // @router /chart_classify/items [get]
 func (this *LineEquationChartClassifyController) ChartClassifyItems() {
 	br := new(models.BaseResponse).Init()
@@ -174,11 +158,6 @@ func (this *LineEquationChartClassifyController) ChartClassifyItems() {
 	br.Data = resp
 }
 
-// AddChartClassify
-// @Title 新增拟合方程图表分类
-// @Description 新增拟合方程图表分类接口
-// @Param	request	body data_manage.AddChartClassifyReq true "type json string"
-// @Success 200 Ret=200 保存成功
 // @router /chart_classify/add [post]
 func (this *LineEquationChartClassifyController) AddChartClassify() {
 	br := new(models.BaseResponse).Init()
@@ -204,7 +183,6 @@ func (this *LineEquationChartClassifyController) AddChartClassify() {
 		return
 	}
 
-	// 新增图表分类
 	_, err, errMsg, isSendEmail := data.AddChartClassify(req.ChartClassifyName, req.ParentId, req.Level, utils.CHART_SOURCE_LINE_EQUATION, this.Lang, this.SysUser)
 	if err != nil {
 		br.Msg = errMsg
@@ -218,11 +196,6 @@ func (this *LineEquationChartClassifyController) AddChartClassify() {
 	br.Success = true
 }
 
-// EditChartClassify
-// @Title 修改拟合方程图表分类
-// @Description 修改拟合方程图表分类接口
-// @Param	request	body data_manage.EditChartClassifyReq true "type json string"
-// @Success 200 Ret=200 修改成功
 // @router /chart_classify/edit [post]
 func (this *LineEquationChartClassifyController) EditChartClassify() {
 	br := new(models.BaseResponse).Init()
@@ -249,7 +222,6 @@ func (this *LineEquationChartClassifyController) EditChartClassify() {
 		return
 	}
 
-	// 编辑图表分类
 	_, err, errMsg, isSendEmail := data.EditChartClassify(req.ChartClassifyId, utils.CHART_SOURCE_LINE_EQUATION, req.ChartClassifyName, this.Lang, this.SysUser)
 	if err != nil {
 		br.Msg = errMsg
@@ -264,11 +236,6 @@ func (this *LineEquationChartClassifyController) EditChartClassify() {
 	br.IsAddLog = true
 }
 
-// DeleteChartClassifyCheck
-// @Title 删除图表检测接口
-// @Description 删除图表检测接口
-// @Param	request	body data_manage.ChartClassifyDeleteCheckResp true "type json string"
-// @Success 200 Ret=200 检测成功
 // @router /chart_classify/delete/check [post]
 func (this *LineEquationChartClassifyController) DeleteChartClassifyCheck() {
 	br := new(models.BaseResponse).Init()
@@ -292,9 +259,7 @@ func (this *LineEquationChartClassifyController) DeleteChartClassifyCheck() {
 	var deleteStatus int
 	var tipsMsg string
 	childIds := make([]int, 0)
-	//删除分类
 	if req.ChartClassifyId > 0 && req.ChartInfoId == 0 {
-		//判断拟合方程图表分类下，是否含有图表
 		classifyAll, err := data_manage.GetChartClassifyAllBySource(utils.CHART_SOURCE_LINE_EQUATION)
 		if err != nil {
 			br.Msg = "删除失败"
@@ -321,13 +286,6 @@ func (this *LineEquationChartClassifyController) DeleteChartClassifyCheck() {
 			br.ErrMsg = "判断图表名称是否存在失败,Err:" + err.Error()
 			return
 		}
-		//count, err := data_manage.GetChartInfoCountByClassifyId(req.ChartClassifyId)
-		//if err != nil {
-		//	br.Msg = "删除失败"
-		//	br.ErrMsg = "分类下是否含有图表失败，Err:" + err.Error()
-		//	return
-		//}
-
 		if count > 0 {
 			deleteStatus = 1
 			tipsMsg = "该分类下关联图表不可删除"
@@ -335,12 +293,6 @@ func (this *LineEquationChartClassifyController) DeleteChartClassifyCheck() {
 	}
 
 	if deleteStatus != 1 && req.ChartInfoId == 0 {
-		//classifyCount, err := data_manage.GetChartClassifyCountByClassifyId(req.ChartClassifyId)
-		//if err != nil && !utils.IsErrNoRow(err) {
-		//	br.Msg = "删除失败"
-		//	br.ErrMsg = "分类下是否含有图表失败，Err:" + err.Error()
-		//	return
-		//}
 		if len(childIds) > 0 {
 			deleteStatus = 2
 			tipsMsg = "确认删除当前目录及包含的子目录吗"
@@ -359,11 +311,6 @@ func (this *LineEquationChartClassifyController) DeleteChartClassifyCheck() {
 	br.Data = resp
 }
 
-// DeleteChartClassify
-// @Title 删除拟合方程图表分类/图表
-// @Description 删除拟合方程图表分类/图表接口
-// @Param	request	body data_manage.DeleteChartClassifyReq true "type json string"
-// @Success 200 Ret=200 删除成功
 // @router /chart_classify/delete [post]
 func (this *LineEquationChartClassifyController) DeleteChartClassify() {
 	br := new(models.BaseResponse).Init()
@@ -394,9 +341,7 @@ func (this *LineEquationChartClassifyController) DeleteChartClassify() {
 		return
 	}
 
-	//删除分类
 	if req.ChartClassifyId > 0 && req.ChartInfoId == 0 {
-		//判断是否含有指标
 		childIds := make([]int, 0)
 		classifyAll, err := data_manage.GetChartClassifyAllBySource(utils.CHART_SOURCE_LINE_EQUATION)
 		if err != nil {
@@ -424,12 +369,6 @@ func (this *LineEquationChartClassifyController) DeleteChartClassify() {
 			br.ErrMsg = "判断图表名称是否存在失败,Err:" + err.Error()
 			return
 		}
-		//count, err := data_manage.GetChartInfoCountByClassifyId(req.ChartClassifyId)
-		//if err != nil && !utils.IsErrNoRow(err) {
-		//	br.Msg = "删除失败"
-		//	br.ErrMsg = "判断名称是否已存在失败，Err:" + err.Error()
-		//	return
-		//}
 
 		if count > 0 {
 			br.Msg = "该目录下存在关联指标，不可删除"
@@ -440,7 +379,6 @@ func (this *LineEquationChartClassifyController) DeleteChartClassify() {
 		delIds := append(childIds, req.ChartClassifyId)
 
 		err = data_manage.DeleteChartClassifyByIds(delIds)
-		//err = data_manage.DeleteChartClassify(req.ChartClassifyId)
 		if err != nil {
 			br.Msg = "删除失败"
 			br.ErrMsg = "删除失败,Err:" + err.Error()
@@ -448,7 +386,6 @@ func (this *LineEquationChartClassifyController) DeleteChartClassify() {
 		}
 	}
 	resp := new(data_manage.AddChartInfoResp)
-	//删除图表
 	if req.ChartInfoId > 0 {
 		chartInfo, err := data_manage.GetChartInfoById(req.ChartInfoId)
 		if err != nil {
@@ -466,7 +403,6 @@ func (this *LineEquationChartClassifyController) DeleteChartClassify() {
 			br.Msg = "图表已删除，请刷新页面"
 			return
 		}
-		//图表操作权限
 		ok := data.CheckOpChartPermission(sysUser, chartInfo.SysUserId, true)
 		if !ok {
 			br.Msg = "没有该图表的操作权限"
@@ -476,7 +412,6 @@ func (this *LineEquationChartClassifyController) DeleteChartClassify() {
 
 		myIds := make([]int, 0)
 		{
-			// 获取引用该图表的MyCharts, 用于ES删除
 			var myCond string
 			var myPars []interface{}
 			myCond += ` AND a.chart_info_id = ? `
@@ -491,17 +426,14 @@ func (this *LineEquationChartClassifyController) DeleteChartClassify() {
 				myIds = append(myIds, m.MyChartId)
 			}
 		}
-		//删除图表及关联指标
 		err = data_manage.DeleteChartInfoAndData(chartInfo.ChartInfoId)
 		if err != nil {
 			br.Msg = "删除失败"
 			br.ErrMsg = "删除失败，Err:" + err.Error()
 			return
 		}
-		//删除ES
 		{
 			go data.EsDeleteChartInfo(chartInfo.ChartInfoId)
-			// 删除MY ETA 图表 es数据
 			go data.EsDeleteMyChartInfoByMyChartIds(myIds)
 		}
 
@@ -529,8 +461,6 @@ func (this *LineEquationChartClassifyController) DeleteChartClassify() {
 			var pars []interface{}
 
 			condition += " AND level=1 "
-			//pars = append(pars, chartInfo.ChartClassifyId)
-
 			condition += " AND chart_classify_id>? ORDER BY chart_classify_id ASC LIMIT 1 "
 			pars = append(pars, chartInfo.ChartClassifyId)
 
@@ -553,7 +483,6 @@ func (this *LineEquationChartClassifyController) DeleteChartClassify() {
 				}
 			}
 		}
-		//新增操作日志
 		{
 			chartLog := new(data_manage.ChartInfoLog)
 			chartLog.ChartName = chartInfo.ChartName
@@ -576,10 +505,6 @@ func (this *LineEquationChartClassifyController) DeleteChartClassify() {
 	br.IsAddLog = true
 }
 
-// ChartClassifyMove
-// @Title 拟合方程图表分类移动接口
-// @Description 拟合方程图表分类移动接口
-// @Success 200 {object} data_manage.MoveChartClassifyReq
 // @router /chart_classify/move [post]
 func (this *LineEquationChartClassifyController) ChartClassifyMove() {
 	br := new(models.BaseResponse).Init()
@@ -609,7 +534,6 @@ func (this *LineEquationChartClassifyController) ChartClassifyMove() {
 		br.ErrMsg = "分类id小于等于0"
 		return
 	}
-	//判断分类是否存在
 	chartClassifyInfo, err := data_manage.GetChartClassifyById(req.ClassifyId)
 	if err != nil {
 		br.Msg = "移动失败"
@@ -623,7 +547,6 @@ func (this *LineEquationChartClassifyController) ChartClassifyMove() {
 	}
 	updateCol := make([]string, 0)
 
-	//判断上级id是否一致，如果不一致的话，那么需要移动该分类层级
 	if chartClassifyInfo.ParentId != req.ParentClassifyId && req.ParentClassifyId != 0 {
 		parentChartClassifyInfo, err := data_manage.GetChartClassifyById(req.ParentClassifyId)
 		if err != nil {
@@ -637,9 +560,7 @@ func (this *LineEquationChartClassifyController) ChartClassifyMove() {
 		updateCol = append(updateCol, "ParentId", "Level", "ModifyTime")
 	}
 
-	//如果有传入 上一个兄弟节点分类id
 	if req.PrevClassifyId > 0 {
-		//上一个兄弟节点
 		prevClassify, err := data_manage.GetChartClassifyById(req.PrevClassifyId)
 		if err != nil {
 			br.Msg = "移动失败"
@@ -647,24 +568,18 @@ func (this *LineEquationChartClassifyController) ChartClassifyMove() {
 			return
 		}
 
-		//如果是移动在两个兄弟节点之间
 		if req.NextClassifyId > 0 {
-			//下一个兄弟节点
 			nextClassify, err := data_manage.GetChartClassifyById(req.NextClassifyId)
 			if err != nil {
 				br.Msg = "移动失败"
 				br.ErrMsg = "获取下一个兄弟节点分类信息失败,Err:" + err.Error()
 				return
 			}
-			//如果上一个兄弟与下一个兄弟的排序权重是一致的，那么需要将下一个兄弟（以及下个兄弟的同样排序权重）的排序权重+2，自己变成上一个兄弟的排序权重+1
 			if prevClassify.Sort == nextClassify.Sort || prevClassify.Sort == chartClassifyInfo.Sort {
-				//变更兄弟节点的排序
 				updateSortStr := `sort + 2`
 				_ = data_manage.UpdateChartClassifySortByParentId(prevClassify.ParentId, prevClassify.ChartClassifyId, prevClassify.Sort, updateSortStr)
 			} else {
-				//如果下一个兄弟的排序权重正好是上个兄弟节点的下一层，那么需要再加一层了
 				if nextClassify.Sort-prevClassify.Sort == 1 {
-					//变更兄弟节点的排序
 					updateSortStr := `sort + 1`
 					_ = data_manage.UpdateChartClassifySortByParentId(prevClassify.ParentId, 0, prevClassify.Sort, updateSortStr)
 				}
@@ -683,7 +598,6 @@ func (this *LineEquationChartClassifyController) ChartClassifyMove() {
 			return
 		}
 
-		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
 		if firstClassify != nil && firstClassify.ChartClassifyId > 0 && firstClassify.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = data_manage.UpdateChartClassifySortByParentId(firstClassify.ParentId, firstClassify.ChartClassifyId-1, 0, updateSortStr)
@@ -694,7 +608,6 @@ func (this *LineEquationChartClassifyController) ChartClassifyMove() {
 		updateCol = append(updateCol, "Sort", "ModifyTime")
 	}
 
-	//更新
 	if len(updateCol) > 0 {
 		err = chartClassifyInfo.Update(updateCol)
 		if err != nil {

controllers/data_manage/line_equation/line_chart_info.go

@@ -13,22 +13,17 @@ import (
 	"eta_gn/eta_api/services/data/line_equation"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
-// LineEquationChartInfoController 拟合方程图表管理
 type LineEquationChartInfoController struct {
 	controllers.BaseAuthController
 }
 
-// Preview
-// @Title 拟合方程图表-预览数据
-// @Description 拟合方程图表-获取预览数据
-// // @Param	request	body request.LineChartInfoReq true "type json string"
-// @Success 200 {object} data_manage.ChartEdbInfoDetailResp
 // @router /chart_info/preview [post]
 func (this *LineEquationChartInfoController) Preview() {
 	br := new(models.BaseResponse).Init()
@@ -70,7 +65,6 @@ func (this *LineEquationChartInfoController) Preview() {
 	chartInfo := new(data_manage.ChartInfoView)
 	chartInfo.ChartType = 9
 
-	// 获取图表x轴y轴
 	_, dataResp, err, errMsg := line_equation.GetChartEdbData(0, req, true, true, true)
 	if err != nil {
 		br.Msg = "获取失败"
@@ -117,11 +111,6 @@ func (this *LineEquationChartInfoController) Preview() {
 	br.Msg = "获取成功"
 }
 
-// Save
-// @Title 新增图表接口
-// @Description 新增图表接口
-// @Param	request	body data_manage.AddChartInfoReq true "type json string"
-// @Success 200 {object} data_manage.AddChartInfoResp
 // @router /chart_info/save [post]
 func (this *LineEquationChartInfoController) Save() {
 	br := new(models.BaseResponse).Init()
@@ -175,7 +164,6 @@ func (this *LineEquationChartInfoController) Save() {
 		resp.UniqueCode = batchAddChartList[0].ChartInfo.UniqueCode
 		resp.ChartType = batchAddChartList[0].ChartInfo.ChartType
 
-		//新增操作日志
 		{
 			for _, v := range batchAddChartList {
 				chartInfo := v.ChartInfo
@@ -209,7 +197,6 @@ func (this *LineEquationChartInfoController) Save() {
 		resp.UniqueCode = batchAddChartList[0].ChartInfo.UniqueCode
 		resp.ChartType = batchAddChartList[0].ChartInfo.ChartType
 
-		//新增操作日志
 		{
 			for _, v := range batchAddChartList {
 				chartInfo := v.ChartInfo
@@ -236,11 +223,6 @@ func (this *LineEquationChartInfoController) Save() {
 	br.IsAddLog = true
 }
 
-// GetMultipleGraphConfig
-// @Title 保存配置接口
-// @Description 保存配置接口
-// @Param   UniqueCode   query   int  true       "图表唯一编码,如果是管理后台访问，传固定字符串:7c69b590249049942070ae9dcd5bf6dc"
-// @Success Ret=200 返回图表id
 // @router /multiple_graph/config/detail [get]
 func (this *LineEquationChartInfoController) GetMultipleGraphConfig() {
 	br := new(models.BaseResponse).Init()
@@ -288,7 +270,6 @@ func (this *LineEquationChartInfoController) GetMultipleGraphConfig() {
 		return
 	}
 
-	// 图表的配置
 	var lineChartInfoConfig request.LineChartInfoReq
 	if err := json.Unmarshal([]byte(multipleGraphConfig.Curve), &lineChartInfoConfig); err != nil {
 		br.Msg = "参数解析异常！"
@@ -296,7 +277,6 @@ func (this *LineEquationChartInfoController) GetMultipleGraphConfig() {
 		return
 	}
 
-	// 生成的图表
 	multipleGraphConfigChartMappingList := make([]response.MultipleGraphConfigChartMapping, 0)
 	{
 		chartMappingList, err := data_manage.GetMultipleGraphConfigChartMappingListById(multipleGraphConfigChartMapping.MultipleGraphConfigId)
@@ -329,7 +309,6 @@ func (this *LineEquationChartInfoController) GetMultipleGraphConfig() {
 		}
 	}
 
-	// 关联指标
 	mappingList, _, _, err, _ := line_equation.GetConfigData(lineChartInfoConfig)
 	if err != nil {
 		br.Msg = "获取失败"
@@ -350,10 +329,6 @@ func (this *LineEquationChartInfoController) GetMultipleGraphConfig() {
 	br.IsAddLog = true
 }
 
-// Move
-// @Title 移动图表接口
-// @Description 移动图表接口
-// @Success 200 {object} data_manage.MoveChartInfoReq
 // @router /chart_info/move [post]
 func (this *LineEquationChartInfoController) Move() {
 	br := new(models.BaseResponse).Init()
@@ -408,9 +383,7 @@ func (this *LineEquationChartInfoController) Move() {
 		return
 	}
 
-	//如果改变了分类，那么移动该图表数据
 	if chartInfo.ChartClassifyId != req.ChartClassifyId {
-		//查询需要修改的分类下是否存在同一个图表名称
 		tmpChartInfo, tmpErr := data_manage.GetChartInfoByClassifyIdAndName(req.ChartClassifyId, chartInfo.ChartName)
 		if tmpErr != nil && !utils.IsErrNoRow(tmpErr) {
 			br.Msg = "移动失败"