清理不需要的代码

models/ai_summary/ai_pormpt.go

@@ -36,8 +36,6 @@ func GetAiPromptList(sysUserId, isShare int) (items []*AiPromptItem, err error)
 	} else {
 		sql = ` SELECT * FROM ai_prompt WHERE sys_admin_id=? ORDER BY sort  `
 	}
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sql, sysUserId).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, sysUserId).Find(&items).Error
 	return
 }
@@ -45,9 +43,6 @@ func GetAiPromptList(sysUserId, isShare int) (items []*AiPromptItem, err error)
 func GetAiPromptShareList() (items []*AiPromptItem, err error) {
 	sql := ``
 	sql = ` SELECT * FROM ai_prompt WHERE is_share=1 ORDER BY create_time DESC `
-
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sql).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	return
 }
@@ -66,8 +61,6 @@ type AiPromptAddReq struct {
 }
 
 func AddPropmt(item *AiPrompt) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
 	err = global.DEFAULT_DmSQL.Create(item).Error
 	lastId = int64(item.AiPromptId)
 	return
@@ -80,26 +73,18 @@ type AiPromptEditReq struct {
 }
 
 func (aiPrompt *AiPrompt) Update(cols []string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Update(aiPrompt, cols...)
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(aiPrompt).Error
 	return
 }
 
 // DelAiPromptyId 根据纪要id删除纪要
 func DelAiPromptyId(aiPromptId int) (err error) {
-	//o := orm.NewOrm()
-	//sql := `delete from ai_prompt where ai_prompt_id = ? `
-	//_, err = o.Raw(sql, aiPromptId).Exec()
 	sql := `delete from ai_prompt where ai_prompt_id = ? `
 	err = global.DEFAULT_DmSQL.Exec(sql, aiPromptId).Error
 	return
 }
 
 func GetAiPromptById(promptId int) (item *AiPrompt, err error) {
-	//o := orm.NewOrm()
-	//sql := `SELECT * FROM ai_prompt WHERE 1=1 AND ai_prompt_id=? `
-	//err = o.Raw(sql, promptId).QueryRow(&item)
 	sql := `SELECT * FROM ai_prompt WHERE 1=1 AND ai_prompt_id=? `
 	err = global.DEFAULT_DmSQL.Raw(sql, promptId).First(&item).Error
 	return
@@ -117,9 +102,6 @@ type ReqMovePrompt struct {
 
 // GetAiPromptMaxSort 获取ai提示词下最大的排序数
 func GetAiPromptMaxSort(adminId int) (sort int, err error) {
-	//o := orm.NewOrm()
-	//sql := `SELECT Max(sort) AS sort FROM ai_prompt WHERE sys_admin_id=? `
-	//err = o.Raw(sql, adminId).QueryRow(&sort)
 	sql := `SELECT  COALESCE(MAX(sort), 0) AS sort FROM ai_prompt WHERE sys_admin_id=? `
 	err = global.DEFAULT_DmSQL.Raw(sql, adminId).First(&sort).Error
 	return
@@ -127,9 +109,6 @@ func GetAiPromptMaxSort(adminId int) (sort int, err error) {
 
 // MoveDownPromptBySort 往下移动提示词
 func MoveDownPromptBySort(sysAdminId, prevSort, currentSort int) (err error) {
-	//o := orm.NewOrm()
-	//sql := `update ai_prompt set sort = sort - 1 where sys_admin_id = ? and sort <= ? and sort> ? `
-	//_, err = o.Raw(sql, sysAdminId, prevSort, currentSort).Exec()
 	sql := `update ai_prompt set sort = sort - 1 where sys_admin_id = ? and sort <= ? and sort> ? `
 	err = global.DEFAULT_DmSQL.Exec(sql, sysAdminId, prevSort, currentSort).Error
 	return
@@ -137,9 +116,6 @@ func MoveDownPromptBySort(sysAdminId, prevSort, currentSort int) (err error) {
 
 // MoveUpPromptBySort 往上移动提示词
 func MoveUpPromptBySort(sysAdminId, nextSort, currentSort int) (err error) {
-	//o := orm.NewOrm()
-	//sql := `update ai_prompt set sort = sort + 1 where sys_admin_id = ? and sort >= ? and sort< ?`
-	//_, err = o.Raw(sql, sysAdminId, nextSort, currentSort).Exec()
 	sql := `update ai_prompt set sort = sort + 1 where sys_admin_id = ? and sort >= ? and sort< ?`
 	err = global.DEFAULT_DmSQL.Exec(sql, sysAdminId, nextSort, currentSort).Error
 	return

models/ai_summary/ai_summary.go

@@ -41,18 +41,8 @@ type AiSummaryItems struct {
 	ParentIds       string `gorm:"-"`
 }
 
-//func GetAiChatTopicList(sysUserId int) (item []*AiSummary, err error) {
-//	sql := ` SELECT * FROM ai_summary WHERE classify_id=? ORDER BY create_time DESC `
-//	o := orm.NewOrm()
-//	_, err = o.Raw(sql, sysUserId).QueryRows(&item)
-//	return
-//}
-
 // GetAiSummaryById 根据纪要id获取详情
 func GetAiSummaryById(aiSummaryId int) (sandboxInfo *AiSummary, err error) {
-	//o := orm.NewOrm()
-	//sql := `select * from ai_summary where ai_summary_id = ? `
-	//err = o.Raw(sql, aiSummaryId).QueryRow(&sandboxInfo)
 	sql := `select * from ai_summary where ai_summary_id = ? `
 	err = global.DEFAULT_DmSQL.Raw(sql, aiSummaryId).First(&sandboxInfo).Error
 	return
@@ -60,9 +50,6 @@ func GetAiSummaryById(aiSummaryId int) (sandboxInfo *AiSummary, err error) {
 
 // GetAiSummaryItemById 根据纪要id获取详情
 func GetAiSummaryItemById(aiSummaryId int) (sandboxInfo *AiSummaryItems, err error) {
-	//o := orm.NewOrm()
-	//sql := `select * from ai_summary where ai_summary_id = ? `
-	//err = o.Raw(sql, aiSummaryId).QueryRow(&sandboxInfo)
 	sql := `select * from ai_summary where ai_summary_id = ? `
 	err = global.DEFAULT_DmSQL.Raw(sql, aiSummaryId).First(&sandboxInfo).Error
 	return
@@ -70,21 +57,12 @@ func GetAiSummaryItemById(aiSummaryId int) (sandboxInfo *AiSummaryItems, err err
 
 // DelAiSummaryById 根据纪要id删除纪要
 func DelAiSummaryById(aiSummaryId int) (err error) {
-	//o := orm.NewOrm()
-	//sql := `delete from ai_summary where ai_summary_id = ? `
-	//_, err = o.Raw(sql, aiSummaryId).Exec()
 	sql := `delete from ai_summary where ai_summary_id = ? `
 	err = global.DEFAULT_DmSQL.Exec(sql, aiSummaryId).Error
 	return
 }
 
 func MoveAiSummary(aiSummaryId, classifyId int) (err error) {
-	//o := orm.NewOrm()
-	//sql := ` UPDATE  ai_summary
-	//		SET
-	//		  classify_id = ?
-	//		WHERE ai_summary_id = ?`
-	//_, err = o.Raw(sql, classifyId, aiSummaryId).Exec()
 	sql := `UPDATE ai_summary SET classify_id = ? WHERE ai_summary_id = ?`
 	err = global.DEFAULT_DmSQL.Exec(sql, classifyId, aiSummaryId).Error
 	return
@@ -92,29 +70,18 @@ func MoveAiSummary(aiSummaryId, classifyId int) (err error) {
 
 // GetFirstAiSummaryByClassifyId 获取当前分类下，且排序数相同 的排序第一条的数据
 func GetFirstAiSummaryByClassifyId(classifyId int) (item *AiSummary, err error) {
-	//o := orm.NewOrm()
-	//sql := ` SELECT * FROM ai_summary WHERE classify_id=? order by sort asc,ai_summary_id asc limit 1`
-	//err = o.Raw(sql, classifyId).QueryRow(&item)
 	sql := ` SELECT * FROM ai_summary WHERE classify_id=? order by sort asc,ai_summary_id asc limit 1`
 	err = global.DEFAULT_DmSQL.Raw(sql, classifyId).First(&item).Error
 	return
 }
 
 func (aiSummary *AiSummary) Update(cols []string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Update(aiSummary, cols...)
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(aiSummary).Error
 	return
 }
 
 // UpdateAiSummarySortByClassifyId 根据纪要id更新排序
 func UpdateAiSummarySortByClassifyId(classifyId, nowSort, prevAiSummaryId int, updateSort string) (err error) {
-	//o := orm.NewOrm()
-	//sql := ` update ai_summary set sort = ` + updateSort + ` WHERE classify_id=?  AND `
-	//if prevAiSummaryId > 0 {
-	//	sql += ` (sort > ? or (ai_summary_id > ` + fmt.Sprint(prevAiSummaryId) + ` and sort = ` + fmt.Sprint(nowSort) + `))`
-	//}
-	//_, err = o.Raw(sql, classifyId, nowSort).Exec()
 	sql := ` update ai_summary set sort = ` + updateSort + ` WHERE classify_id=?  AND `
 	if prevAiSummaryId > 0 {
 		sql += ` (sort > ? or (ai_summary_id > ` + fmt.Sprint(prevAiSummaryId) + ` and sort = ` + fmt.Sprint(nowSort) + `))`
@@ -124,13 +91,6 @@ func UpdateAiSummarySortByClassifyId(classifyId, nowSort, prevAiSummaryId int, u
 }
 
 func GetAiSummaryListByCondition(condition string, pars []interface{}, startSize, pageSize int) (item []*AiSummaryItems, err error) {
-	//o := orm.NewOrm()
-	//sql := ` SELECT * FROM ai_summary WHERE 1=1 `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//sql += " ORDER BY create_time DESC LIMIT ?,? "
-	//_, err = o.Raw(sql, pars...).QueryRows(&item)
 	sql := ` SELECT * FROM ai_summary WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -144,12 +104,6 @@ func GetAiSummaryListByCondition(condition string, pars []interface{}, startSize
 }
 
 func GetAiSummaryListCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrm()
-	//sql := ` SELECT COUNT(1) AS count FROM ai_summary WHERE 1=1 `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//err = o.Raw(sql, pars).QueryRow(&count)
 	sql := ` SELECT COUNT(1) AS count FROM ai_summary WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -159,8 +113,6 @@ func GetAiSummaryListCountByCondition(condition string, pars []interface{}) (cou
 }
 
 func AddAiSummary(item *AiSummary) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
 	err = global.DEFAULT_DmSQL.Create(item).Error
 	lastId = int64(item.AiSummaryId)
 	return
@@ -188,9 +140,6 @@ type GenerateAiSummaryReq struct {
 
 // GetAiSummaryMaxSort 获取ai纪要下最大的排序数
 func GetAiSummaryMaxSort(classifyId int) (sort int, err error) {
-	//o := orm.NewOrm()
-	//sql := `SELECT Max(sort) AS sort FROM ai_summary WHERE parent_id=? `
-	//err = o.Raw(sql, classifyId).QueryRow(&sort)
 	sql := `SELECT  COALESCE(MAX(sort), 0) AS sort FROM ai_summary WHERE parent_id=? `
 	err = global.DEFAULT_DmSQL.Raw(sql, classifyId).Scan(&sort).Error
 	return

models/ai_summary/ai_summary_classify.go

@@ -23,8 +23,6 @@ type AiSummaryClassify struct {
 }
 
 func AddAiSummaryClassify(item *AiSummaryClassify) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
 	err = global.DEFAULT_DmSQL.Create(item).Error
 	lastId = int64(item.AiSummaryClassifyId)
 	return
@@ -53,9 +51,6 @@ type AiSummaryClassifyListResp struct {
 
 // GetAiSummaryClassifyByParentId
 func GetAiSummaryClassifyByParentId(parentId int) (items []*AiSummaryClassifyItems, err error) {
-	//o := orm.NewOrm()
-	//sql := ` SELECT * FROM ai_summary_classify WHERE parent_id=? order by sort asc,ai_summary_classify_id asc`
-	//_, err = o.Raw(sql, parentId).QueryRows(&items)
 	sql := ` SELECT * FROM ai_summary_classify WHERE parent_id=? order by sort asc,ai_summary_classify_id asc`
 	err = global.DEFAULT_DmSQL.Raw(sql, parentId).Find(&items).Error
 	return
@@ -63,20 +58,6 @@ func GetAiSummaryClassifyByParentId(parentId int) (items []*AiSummaryClassifyIte
 
 // GetAiSummaryInfoByAdminId 获取所有我创建的纪要，用于分类展示
 func GetAiSummaryInfoByAdminId(adminId int) (items []*AiSummaryClassifyItems, err error) {
-	//	o := orm.NewOrm()
-	//	sql := ` SELECT
-	//	a.*,
-	//	b.ai_summary_classify_id,
-	//	b.classify_name
-	//FROM
-	//	ai_summary AS a
-	//	JOIN ai_summary_classify AS b ON a.classify_id = b.ai_summary_classify_id
-	//WHERE
-	//	a.sys_user_id = ?
-	//ORDER BY
-	//	a.sort ASC,
-	//	a.create_time ASC `
-	//	_, err = o.Raw(sql, adminId).QueryRows(&items)
 	sql := ` SELECT
 	a.*,
 	b.ai_summary_classify_id,
@@ -95,41 +76,6 @@ ORDER BY
 
 // GetAiSummaryClassifyAndInfoByParentId
 func GetAiSummaryClassifyAndInfoByParentId(parentId int) (items []*AiSummaryClassifyItems, err error) {
-	//o := orm.NewOrm()
-	//	sql := ` SELECT
-	//	0 AS ai_summary_id,
-	//	ai_summary_classify_id,
-	//	classify_name,
-	//	parent_id,
-	//	create_time,
-	//	modify_time,
-	//	sys_user_id,
-	//	sys_user_real_name AS sys_user_real_name,
-	//	sort,
-	//	level
-	//FROM
-	//	ai_summary_classify
-	//WHERE
-	//	parent_id = ? UNION ALL
-	//SELECT
-	//	ai_summary_id,
-	//	classify_id as ai_summary_classify_id,
-	//	title AS classify_name,
-	//	0 AS parent_id,
-	//	create_time,
-	//	modify_time,
-	//	sys_user_id,
-	//	sys_user_real_name,
-	//	sort,
-	//	0 AS level
-	//FROM
-	//	ai_summary
-	//WHERE
-	//	classify_id = ?
-	//ORDER BY
-	//	sort ASC,
-	//	ai_summary_classify_id ASC`
-	//	_, err = o.Raw(sql, parentId, parentId).QueryRows(&items)
 	sql := ` SELECT
 	0 AS ai_summary_id,
 	ai_summary_classify_id,
@@ -174,9 +120,6 @@ type AddAiSummaryClassifyReq struct {
 }
 
 func GetAiSummaryClassifyCount(classifyName string, parentId int) (count int, err error) {
-	//o := orm.NewOrm()
-	//sql := `SELECT COUNT(1) AS count FROM ai_summary_classify WHERE parent_id=? AND classify_name=? `
-	//err = o.Raw(sql, parentId, classifyName).QueryRow(&count)
 	sql := `SELECT COUNT(1) AS count FROM ai_summary_classify WHERE parent_id=? AND classify_name=? `
 	err = global.DEFAULT_DmSQL.Raw(sql, parentId, classifyName).Scan(&count).Error
 	return
@@ -184,9 +127,6 @@ func GetAiSummaryClassifyCount(classifyName string, parentId int) (count int, er
 
 // GetAiSummaryClassifyMaxSort 获取ai纪要下最大的排序数
 func GetAiSummaryClassifyMaxSort(parentId int) (sort int, err error) {
-	//o := orm.NewOrm()
-	//sql := `SELECT Max(sort) AS sort FROM ai_summary_classify WHERE parent_id=? `
-	//err = o.Raw(sql, parentId).QueryRow(&sort)
 	sql := `SELECT  COALESCE(MAX(sort), 0) AS sort FROM ai_summary_classify WHERE parent_id=? `
 	err = global.DEFAULT_DmSQL.Raw(sql, parentId).Scan(&sort).Error
 	return
@@ -198,9 +138,6 @@ type EditAiSummaryClassifyReq struct {
 }
 
 func EditSandboxClassify(classifyId int, classifyName string) (err error) {
-	//o := orm.NewOrm()
-	//sql := `UPDATE ai_summary_classify SET classify_name=?, modify_time=NOW() WHERE ai_summary_classify_id=? `
-	//_, err = o.Raw(sql, classifyName, classifyId).Exec()
 	sql := `UPDATE ai_summary_classify SET classify_name=?, modify_time=NOW() WHERE ai_summary_classify_id=? `
 	err = global.DEFAULT_DmSQL.Exec(sql, classifyName, classifyId).Error
 	return
@@ -211,20 +148,6 @@ type AiSummaryClassifyDeleteCheckReq struct {
 }
 
 func GetAiSummaryInfoCountByClassifyId(classifyId int) (count int, err error) {
-	//o := orm.NewOrm()
-	//sql := ` SELECT COUNT(1) AS count FROM ai_summary AS a
-	//			WHERE a.classify_id IN(
-	//			SELECT t.ai_summary_classify_id FROM
-	//			(
-	//			SELECT rd.*
-	//			FROM (SELECT * FROM ai_summary_classify WHERE parent_id IS NOT NULL) rd,
-	//				 (SELECT @pid := ?) pd
-	//			WHERE FIND_IN_SET(parent_id, @pid) > 0
-	//			  AND @pid := CONCAT(@pid, ',', ai_summary_classify_id)
-	//			UNION SELECT * FROM ai_summary_classify WHERE ai_summary_classify_id = @pid
-	//			)AS t
-	//			) `
-	//err = o.Raw(sql, classifyId).QueryRow(&count)
 	sql := ` SELECT COUNT(1) AS count FROM ai_summary AS a
 				WHERE a.classify_id IN(
 				SELECT t.ai_summary_classify_id FROM 
@@ -246,37 +169,6 @@ type DeleteAiSummaryClassifyReq struct {
 	AiSummaryId         int `description:"纪要id"`
 }
 
-func DeleteAiSummaryClassify(classifyId int) (err error) {
-	//o := orm.NewOrm()
-	//sql := ` DELETE FROM ai_summary_classify
-	//			WHERE ai_summary_classify_id IN(
-	//			SELECT t.ai_summary_classify_id FROM
-	//			(
-	//			SELECT rd.*
-	//			FROM (SELECT * FROM ai_summary_classify WHERE parent_id IS NOT NULL) rd,
-	//			(SELECT @pid := ?) pd
-	//			WHERE FIND_IN_SET(parent_id, @pid) > 0
-	//			AND @pid := CONCAT(@pid, ',', ai_summary_classify_id)
-	//			UNION SELECT * FROM ai_summary_classify WHERE ai_summary_classify_id = @pid
-	//			)AS t
-	//			) `
-	//_, err = o.Raw(sql, classifyId).Exec()
-	sql := ` DELETE FROM ai_summary_classify
-				WHERE ai_summary_classify_id IN(
-				SELECT t.ai_summary_classify_id FROM
-				(
-				SELECT rd.*
-				FROM (SELECT * FROM ai_summary_classify WHERE parent_id IS NOT NULL) rd,
-				(SELECT @pid := ?) pd
-				WHERE FIND_IN_SET(parent_id, @pid) > 0
-				AND @pid := CONCAT(@pid, ',', ai_summary_classify_id)
-				UNION SELECT * FROM ai_summary_classify WHERE ai_summary_classify_id = @pid
-				)AS t
-				) `
-	err = global.DEFAULT_DmSQL.Exec(sql, classifyId).Error
-	return
-}
-
 // MoveAiSummaryClassifyReq 移动纪要分类请求参数
 type MoveAiSummaryClassifyReq struct {
 	AiSummaryClassifyId int `description:"分类id"`
@@ -289,18 +181,12 @@ type MoveAiSummaryClassifyReq struct {
 }
 
 func GetAiSummaryClassifyById(classifyId int) (item *AiSummaryClassify, err error) {
-	//o := orm.NewOrm()
-	//sql := `SELECT * FROM ai_summary_classify WHERE ai_summary_classify_id=? `
-	//err = o.Raw(sql, classifyId).QueryRow(&item)
 	sql := `SELECT * FROM ai_summary_classify WHERE ai_summary_classify_id=? `
 	err = global.DEFAULT_DmSQL.Raw(sql, classifyId).First(&item).Error
 	return
 }
 
 func GetAiSummaryClassifyCountById(classifyId int) (count int, err error) {
-	//o := orm.NewOrm()
-	//sql := `SELECT count(1) AS count FROM ai_summary_classify WHERE ai_summary_classify_id=? `
-	//err = o.Raw(sql, classifyId).QueryRow(&count)
 	sql := `SELECT count(1) AS count FROM ai_summary_classify WHERE ai_summary_classify_id=? `
 	err = global.DEFAULT_DmSQL.Raw(sql, classifyId).Scan(&count).Error
 	return
@@ -308,17 +194,12 @@ func GetAiSummaryClassifyCountById(classifyId int) (count int, err error) {
 
 // Update 更新沙盘分类基础信息
 func (aiSummaryClassify *AiSummaryClassify) Update(cols []string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Update(aiSummaryClassify, cols...)
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(aiSummaryClassify).Error
 	return
 }
 
 // GetFirstAiSummaryClassifyByParentId 获取当前父级沙盘分类下的排序第一条的数据
 func GetFirstAiSummaryClassifyByParentId(parentId int) (item *AiSummaryClassify, err error) {
-	//o := orm.NewOrm()
-	//sql := ` SELECT * FROM ai_summary_classify WHERE parent_id=? order by sort asc,ai_summary_classify_id asc limit 1`
-	//err = o.Raw(sql, parentId).QueryRow(&item)
 	sql := ` SELECT * FROM ai_summary_classify WHERE parent_id=? order by sort asc,ai_summary_classify_id asc limit 1`
 	err = global.DEFAULT_DmSQL.Raw(sql, parentId).First(&item).Error
 	return
@@ -326,12 +207,6 @@ func GetFirstAiSummaryClassifyByParentId(parentId int) (item *AiSummaryClassify,
 
 // UpdateAiSummaryClassifySortByParentId 根据沙盘父类id更新排序
 func UpdateAiSummaryClassifySortByParentId(parentId, classifyId, nowSort int, updateSort string) (err error) {
-	//o := orm.NewOrm()
-	//sql := ` update ai_summary_classify set sort = ` + updateSort + ` WHERE parent_id=? and sort > ? `
-	//if classifyId > 0 {
-	//	sql += ` or ( ai_summary_classify_id > ` + fmt.Sprint(classifyId) + ` and sort= ` + fmt.Sprint(nowSort) + `)`
-	//}
-	//_, err = o.Raw(sql, parentId, nowSort).Exec()
 	sql := ` update ai_summary_classify set sort = ` + updateSort + ` WHERE parent_id=? and sort > ? `
 	if classifyId > 0 {
 		sql += ` or ( ai_summary_classify_id > ` + fmt.Sprint(classifyId) + ` and sort= ` + fmt.Sprint(nowSort) + `)`
@@ -340,38 +215,7 @@ func UpdateAiSummaryClassifySortByParentId(parentId, classifyId, nowSort int, up
 	return
 }
 
-// 获取所有子级分类id
-//func GetAiSummaryClassifySubcategories(classifyId int) (Ids string, err error) {
-//	o := orm.NewOrm()
-//	sql := `SELECT GROUP_CONCAT(ai_summary_classify_id) AS ids
-//FROM (
-//SELECT @pv := ? AS ai_summary_classify_id
-//UNION ALL
-//SELECT sc.ai_summary_classify_id
-//FROM ai_summary_classify sc
-//JOIN (SELECT @pv := ?) initial
-//WHERE sc.parent_id = @pv
-//) subcategories; `
-//	err = o.Raw(sql, classifyId, classifyId).QueryRow(&Ids)
-//	return
-//}
-
 func GetAiSummaryClassify(aiSummaryClassify int) (aiSummaryClassifyIds string, err error) {
-	//	o := orm.NewOrm()
-	//	sql := `SELECT GROUP_CONCAT(t.ai_summary_classify_id) AS ai_summary_classify_id FROM (
-	//			SELECT a.ai_summary_classify_id FROM ai_summary_classify AS a
-	//			WHERE a.ai_summary_classify_id=?
-	//			UNION ALL
-	//			SELECT a.ai_summary_classify_id FROM ai_summary_classify AS a
-	//			WHERE a.parent_id=? UNION ALL
-	//	SELECT
-	//		ai_summary_classify_id
-	//	FROM
-	//		ai_summary_classify
-	//WHERE
-	//	parent_id IN ( SELECT ai_summary_classify_id FROM ai_summary_classify WHERE parent_id = ? )
-	//			)AS t`
-	//	err = o.Raw(sql, aiSummaryClassify, aiSummaryClassify, aiSummaryClassify).QueryRow(&aiSummaryClassifyIds)
 	sql := `SELECT GROUP_CONCAT(t.ai_summary_classify_id) AS ai_summary_classify_id FROM (
 			SELECT a.ai_summary_classify_id FROM ai_summary_classify AS a 
 			WHERE a.ai_summary_classify_id=?
@@ -389,75 +233,6 @@ WHERE
 	return
 }
 
-func GetAiSummaryAllParentByClassifyId(aiSummaryClassifyId int) (ids string, err error) {
-	//	o := orm.NewOrm()
-	//	sql := `SELECT
-	//	GROUP_CONCAT(DISTINCT m.ai_summary_classify_id  ORDER BY m.level) AS ids
-	//FROM
-	//	(
-	//	SELECT
-	//		@id AS _id,(
-	//		SELECT
-	//			@id := parent_id
-	//		FROM
-	//			ai_summary_classify
-	//		WHERE
-	//			ai_summary_classify_id = _id
-	//		)
-	//	FROM
-	//		(
-	//		SELECT
-	//			@id :=(
-	//			SELECT
-	//				parent_id
-	//			FROM
-	//				ai_summary_classify
-	//			WHERE
-	//				ai_summary_classify_id = ?
-	//			)) vm,
-	//		ai_summary_classify m
-	//	WHERE
-	//		@id IS NOT NULL
-	//	) vm
-	//	INNER JOIN ai_summary_classify m
-	//WHERE
-	//	ai_summary_classify_id = vm._id `
-	//	err = o.Raw(sql, aiSummaryClassifyId).QueryRow(&ids)
-	sql := `SELECT
-	GROUP_CONCAT(DISTINCT m.ai_summary_classify_id  ORDER BY m.level) AS ids 
-FROM
-	(
-	SELECT
-		@id AS _id,(
-		SELECT
-			@id := parent_id 
-		FROM
-			ai_summary_classify 
-		WHERE
-			ai_summary_classify_id = _id 
-		) 
-	FROM
-		(
-		SELECT
-			@id :=(
-			SELECT
-				parent_id 
-			FROM
-				ai_summary_classify 
-			WHERE
-				ai_summary_classify_id = ? 
-			)) vm,
-		ai_summary_classify m 
-	WHERE
-		@id IS NOT NULL 
-	) vm
-	INNER JOIN ai_summary_classify m 
-WHERE
-	ai_summary_classify_id = vm._id `
-	err = global.DEFAULT_DmSQL.Raw(sql, aiSummaryClassifyId).Scan(&ids).Error
-	return
-}
-
 type AiSummaryListResp struct {
 	Paging *paging.PagingItem
 	List   []*AiSummaryItems
@@ -465,9 +240,6 @@ type AiSummaryListResp struct {
 
 // GetAiSummaryClassifyAll
 func GetAiSummaryClassifyAll() (items []*AiSummaryClassifyItems, err error) {
-	//o := orm.NewOrm()
-	//sql := ` SELECT * FROM ai_summary_classify WHERE parent_id<>0 order by sort asc,ai_summary_classify_id asc`
-	//_, err = o.Raw(sql).QueryRows(&items)
 	sql := ` SELECT * FROM ai_summary_classify WHERE parent_id<>0 order by sort asc,ai_summary_classify_id asc`
 	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	return
@@ -475,9 +247,6 @@ func GetAiSummaryClassifyAll() (items []*AiSummaryClassifyItems, err error) {
 
 // delBYids
 func DeleteAiSummaryClassifyByIds(ids []int) (err error) {
-	//o := orm.NewOrm()
-	//sql := ` DELETE FROM ai_summary_classify WHERE ai_summary_classify_id in (?)`
-	//_, err = o.Raw(sql, ids).Exec()
 	sql := ` DELETE FROM ai_summary_classify WHERE ai_summary_classify_id in (` + utils.GetOrmInReplace(len(ids)) + `)`
 	err = global.DEFAULT_DmSQL.Exec(sql, ids).Error
 	return

models/aimod/ai.go

@@ -5,17 +5,6 @@ import (
 	"time"
 )
 
-//type AiChatTopic struct {
-//	AiChatTopicId   int `orm:"column(ai_chat_topic_id);pk"`
-//	TopicName       string
-//	SysUserId       int
-//	SysUserRealName string
-//	AssistantId     string
-//	ThreadId        string
-//	CreateTime      time.Time
-//	ModifyTime      time.Time
-//}
-
 type AiChatTopic struct {
 	AiChatTopicId   int       `gorm:"primaryKey;column:ai_chat_topic_id;type:int(11);not null"`
 	TopicName       string    `gorm:"column:topic_name;type:varchar(255);default:''"`         // 话题名称
@@ -27,22 +16,6 @@ type AiChatTopic struct {
 	ThreadId        string    `gorm:"column:thread_id;type:varchar(255);default:''"`          // 进程id
 }
 
-//type AiChat struct {
-//	AiChatId        int `orm:"column(ai_chat_id);pk"`
-//	AiChatTopicId   int
-//	Ask             string
-//	AskUuid         string
-//	Answer          string
-//	Model           string
-//	SysUserId       int
-//	SysUserRealName string `description:"提问人名称"`
-//	OpenaiFileId    string `description:"openai返回的文件id"`
-//	OpenaiFileName  string `description:"文件名称"`
-//	OpenaiFilePath  string `description:"文件路径"`
-//	CreateTime      time.Time
-//	ModifyTime      time.Time
-//}
-
 type AiChat struct {
 	AiChatId        int       `gorm:"primaryKey;column:ai_chat_id;type:int(11);not null"`
 	AiChatTopicId   int       `gorm:"column:ai_chat_topic_id;type:int(11);default:0"`
@@ -66,9 +39,6 @@ type ChatReq struct {
 }
 
 func GetAiChatByAsk(askUuid string) (item *AiChat, err error) {
-	//sql := `SELECT * FROM ai_chat WHERE ask_uuid=?`
-	//o := orm.NewOrmUsingDB("ai")
-	//err = o.Raw(sql, askUuid).QueryRow(&item)
 	sql := `SELECT * FROM ai_chat WHERE ask_uuid=?`
 	err = global.DmSQL["ai"].Raw(sql, askUuid).First(&item).Error
 	return
@@ -83,8 +53,6 @@ type ChatResp struct {
 
 // AddAiChatTopic 新增主题
 func AddAiChatTopic(item *AiChatTopic) (lastId int64, err error) {
-	//o := orm.NewOrmUsingDB("ai")
-	//lastId, err = o.Insert(item)
 	err = global.DmSQL["ai"].Create(item).Error
 	lastId = int64(item.AiChatTopicId)
 	return
@@ -92,37 +60,21 @@ func AddAiChatTopic(item *AiChatTopic) (lastId int64, err error) {
 
 // AddAiChat 新增聊天
 func AddAiChat(item *AiChat) (lastId int64, err error) {
-	//o := orm.NewOrmUsingDB("ai")
-	//lastId, err = o.Insert(item)
 	err = global.DmSQL["ai"].Create(item).Error
 	lastId = int64(item.AiChatId)
 	return
 }
 
-//type AiChatTopicView struct {
-//	AiChatTopicId int    `description:"主题id"`
-//	TopicName     string `description:"主题名称"`
-//	CreateTime    string `description:"创建时间"`
-//	ModifyTime    string `description:"修改时间"`
-//	AssistantId   string
-//	ThreadId      string
-//}
-
 type AiChatTopicView struct {
-	AiChatTopicId int    `gorm:"primaryKey;column:ai_chat_topic_id;type:int(11);not null"`
-	TopicName     string `gorm:"column:topic_name;type:varchar(255);default:''"` // 话题名称
-	//SysUserId       int       `gorm:"column:sys_user_id;type:int(11);default:0"`              // 创建人id
-	//SysUserRealName string    `gorm:"column:sys_user_real_name;type:varchar(100);default:''"` // 创建人姓名
-	CreateTime  *global.LocalTime `gorm:"column:create_time;type:datetime"`                 // 创建时间
-	ModifyTime  *global.LocalTime `gorm:"column:modify_time;type:datetime"`                 // 修改时间
-	AssistantId string            `gorm:"column:assistant_id;type:varchar(255);default:''"` // 助手id
-	ThreadId    string            `gorm:"column:thread_id;type:varchar(255);default:''"`    // 进程id
+	AiChatTopicId int               `gorm:"primaryKey;column:ai_chat_topic_id;type:int(11);not null"`
+	TopicName     string            `gorm:"column:topic_name;type:varchar(255);default:''"`   // 话题名称
+	CreateTime    *global.LocalTime `gorm:"column:create_time;type:datetime"`                 // 创建时间
+	ModifyTime    *global.LocalTime `gorm:"column:modify_time;type:datetime"`                 // 修改时间
+	AssistantId   string            `gorm:"column:assistant_id;type:varchar(255);default:''"` // 助手id
+	ThreadId      string            `gorm:"column:thread_id;type:varchar(255);default:''"`    // 进程id
 }
 
 func GetAiChatTopicList(sysUserId int) (item []*AiChatTopicView, err error) {
-	//sql := ` SELECT * FROM ai_chat_topic WHERE sys_user_id=? ORDER BY create_time DESC `
-	//o := orm.NewOrmUsingDB("ai")
-	//_, err = o.Raw(sql, sysUserId).QueryRows(&item)
 	sql := ` SELECT * FROM ai_chat_topic WHERE sys_user_id=? ORDER BY create_time DESC `
 	err = global.DmSQL["ai"].Raw(sql, sysUserId).Find(&item).Error
 	return
@@ -132,27 +84,11 @@ type AiChatTopicListResp struct {
 	List []*AiChatTopicView
 }
 
-//type AiChatView struct {
-//	AiChatId       int    `description:"记录id"`
-//	AiChatTopicId  int    `description:"主题id"`
-//	Ask            string `description:"提问"`
-//	Answer         string `description:"答案"`
-//	Model          string
-//	OpenaiFileId   string `description:"文件ID"`
-//	OpenaiFileName string `description:"文件名称"`
-//	OpenaiFilePath string `description:"文件路径"`
-//	CreateTime     string `description:"创建时间"`
-//	ModifyTime     string `description:"修改时间"`
-//}
-
 type AiChatView struct {
-	AiChatId      int    `gorm:"primaryKey;column:ai_chat_id;type:int(11);not null"`
-	AiChatTopicId int    `gorm:"column:ai_chat_topic_id;type:int(11);default:0"`
-	Ask           string `gorm:"column:ask;type:text"` // 提问
-	//AskUuid         string    `gorm:"index:idx_ask_uuid;column:ask_uuid;type:varchar(50);default:''"` // ask,md5值
-	Answer string `gorm:"column:answer;type:text"` // 答案
-	//SysUserId       int       `gorm:"column:sys_user_id;type:int(11);default:0"`                      // 提问人id
-	//SysUserRealName string    `gorm:"column:sys_user_real_name;type:varchar(100);default:''"`         // 提问人名称
+	AiChatId       int    `gorm:"primaryKey;column:ai_chat_id;type:int(11);not null"`
+	AiChatTopicId  int    `gorm:"column:ai_chat_topic_id;type:int(11);default:0"`
+	Ask            string `gorm:"column:ask;type:text"`                     // 提问
+	Answer         string `gorm:"column:answer;type:text"`                  // 答案
 	Model          string `gorm:"column:model;type:varchar(20);default:''"` // 模型
 	CreateTime     string `gorm:"column:create_time;type:datetime"`
 	ModifyTime     string `gorm:"column:modify_time;type:datetime"`
@@ -164,13 +100,9 @@ type AiChatView struct {
 var ModelViewMap = map[string]string{
 	"gpt-4-1106-preview": "GPT-4 Turbo",
 	"moonshot-v1-32k":    "Kimi",
-	// "moonshot-v1-8k":     "Kimi",
 }
 
 func GetAiChatList(aiChatTopicId int) (item []*AiChatView, err error) {
-	//sql := ` SELECT * FROM ai_chat WHERE ai_chat_topic_id=? ORDER BY create_time ASC `
-	//o := orm.NewOrmUsingDB("ai")
-	//_, err = o.Raw(sql, aiChatTopicId).QueryRows(&item)
 	sql := ` SELECT * FROM ai_chat WHERE ai_chat_topic_id=? ORDER BY create_time ASC `
 	err = global.DmSQL["ai"].Raw(sql, aiChatTopicId).Find(&item).Error
 	return
@@ -185,26 +117,6 @@ type TopicDeleteReq struct {
 }
 
 func DeleteTopic(topicId int) (err error) {
-	//o := orm.NewOrmUsingDB("ai")
-	//tx, err := o.Begin()
-	//defer func() {
-	//	if err != nil {
-	//		tx.Rollback()
-	//	} else {
-	//		tx.Commit()
-	//	}
-	//}()
-	//sql := ` DELETE FROM ai_chat_topic WHERE  ai_chat_topic_id=? `
-	//_, err = tx.Raw(sql, topicId).Exec()
-	//if err != nil {
-	//	return err
-	//}
-	//sql = ` DELETE FROM ai_chat WHERE  ai_chat_topic_id=? `
-	//_, err = tx.Raw(sql, topicId).Exec()
-	//if err != nil {
-	//	return err
-	//}
-
 	tx := global.DmSQL["ai"].Begin()
 	defer func() {
 		if err != nil {
@@ -232,27 +144,18 @@ type TopicEditReq struct {
 }
 
 func GetAiChatTopicByTopicName(topicName string) (item *AiChatTopicView, err error) {
-	//sql := ` SELECT * FROM ai_chat_topic WHERE topic_name=? `
-	//o := orm.NewOrmUsingDB("ai")
-	//err = o.Raw(sql, topicName).QueryRow(&item)
 	sql := ` SELECT * FROM ai_chat_topic WHERE topic_name=? `
 	err = global.DmSQL["ai"].Raw(sql, topicName).First(&item).Error
 	return
 }
 
 func EditTopic(topicId int, topicName string) (err error) {
-	//o := orm.NewOrmUsingDB("ai")
-	//sql := ` UPDATE ai_chat_topic SET topic_name=? WHERE  ai_chat_topic_id=? `
-	//_, err = o.Raw(sql, topicName, topicId).Exec()
 	sql := ` UPDATE ai_chat_topic SET topic_name=? WHERE  ai_chat_topic_id=? `
 	err = global.DmSQL["ai"].Exec(sql, topicName, topicId).Error
 	return
 }
 
 func (obj *AiChatTopic) GetAiChatTopicById() (item *AiChatTopicView, err error) {
-	//o := orm.NewOrmUsingDB("ai")
-	//sql := ` SELECT * FROM ai_chat_topic WHERE ai_chat_topic_id=? `
-	//err = o.Raw(sql, obj.AiChatTopicId).QueryRow(&item)
 	sql := ` SELECT * FROM ai_chat_topic WHERE ai_chat_topic_id=? `
 	err = global.DmSQL["ai"].Raw(sql, obj.AiChatTopicId).Find(&item).Error
 	return
@@ -264,27 +167,7 @@ type HistoryChat struct {
 	OpenaiFileId []string `description:"文件ID"`
 }
 
-// 修改
-//func (obj *AiChatTopic) Update(updateParams, whereParam map[string]interface{}) (err error) {
-//	to := orm.NewOrmUsingDB("ai")
-//	ptrStructOrTableName := "ai_chat_topic"
-//
-//	qs := to.QueryTable(ptrStructOrTableName)
-//	for expr, exprV := range whereParam {
-//		qs = qs.Filter(expr, exprV)
-//	}
-//	_, err = qs.Update(updateParams)
-//	return
-//}
-
 func (obj *AiChatTopic) UpdateAssistantAndThreadId(assistantId, threadId string, topicId int) (err error) {
-	//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
 	sql := `UPDATE ai_chat_topic SET assistant_id = ?, thread_id = ?, modify_time = NOW() WHERE ai_chat_topic_id = ?`
 	err = global.DmSQL["ai"].Exec(sql, assistantId, threadId, topicId).Error
 	return

models/aimod/file_upload_record.go

@@ -5,22 +5,6 @@ import (
 	"time"
 )
 
-//type FileUploadRecord struct {
-//	FileUploadRecordId  int       `orm:"column(file_upload_record_id);pk"`
-//	AdminId             int       `description:"用户id"`
-//	FileUrl             string    `description:"文件地址"`
-//	FileName            string    `description:"文件名称"`
-//	OpenaiFileId        string    `description:"openai返回的文件id"`
-//	OpenaiFileName      string    `description:"openai返回的文件名称"`
-//	OpenaiObject        string    `description:"openai返回的文件对象"`
-//	OpenaiStatus        string    `description:"openai返回的文件状态"`
-//	OpenaiPurpose       string    `description:"openai返回的提示词"`
-//	OpenaiStatusDetails string    `description:"openai返回的文件状态详情"`
-//	OpenaiCreatedAt     int64     `description:"openai返回的创建时间"`
-//	CreateTime          time.Time `description:"创建时间"`
-//	ModifyTime          time.Time `description:"修改时间"`
-//}
-
 type FileUploadRecord struct {
 	FileUploadRecordId  int       `gorm:"primaryKey;column:file_upload_record_id;type:int(11);not null"`
 	AdminId             int       `gorm:"column:admin_id;type:int(11);default:0"`                    // 用户id
@@ -39,8 +23,6 @@ type FileUploadRecord struct {
 
 // AddFileUploadRecord 新增上传文件记录
 func (obj *FileUploadRecord) AddFileUploadRecord() (lastId int64, err error) {
-	//o := orm.NewOrmUsingDB("ai")
-	//lastId, err = o.Insert(obj)
 	err = global.DmSQL["ai"].Create(obj).Error
 	lastId = int64(obj.FileUploadRecordId)
 	return

models/bi_dashboard/bi_dashboard.go

@@ -34,18 +34,6 @@ func AddBiDashboard(item *BiDashboard) (lastId int64, err error) {
 	return
 }
 
-// GetShareDashboard 获取公开分享的看板
-func GetShareDashboard() (items []*BiDashboard, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT * FROM bi_dashboard WHERE 1=1 AND state = 6 `
-
-	sql += `ORDER BY create_time DESC`
-	//sql += `ORDER BY create_time DESC LIMIT ?,?`
-	//_, err = o.Raw(sql).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
-	return
-}
-
 func GetBiDashboardList(condition string, pars []interface{}) (items []*BiDashboard, err error) {
 	sql := `SELECT * FROM bi_dashboard WHERE 1=1 `
 	if condition != "" {
@@ -53,19 +41,13 @@ func GetBiDashboardList(condition string, pars []interface{}) (items []*BiDashbo
 	}
 	//
 	sql += `ORDER BY modify_time DESC `
-	//sql += `ORDER BY create_time DESC LIMIT ?,?`
-	//_, err = o.Raw(sql, pars...).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // GetDashboardById 获取看板
 func GetDashboardById(id int) (item *BiDashboard, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM bi_dashboard WHERE bi_dashboard_id = ? limit 1`
-
-	//sql += `ORDER BY create_time DESC LIMIT ?,?`
-	//_, err = o.Raw(sql).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }
@@ -86,9 +68,9 @@ type BiDashboardEditingCache struct {
 // DashboardDetailResp 详情响应体
 type DashboardDetailResp struct {
 	*BiDashboard
-	IsGrant   int                     `description:"是否共享，0：不是，1：是"`
-	Editor    BiDashboardEditingCache `description:"编辑人信息"`
-	List      []*BiDashboardDetail
+	IsGrant int                     `description:"是否共享，0：不是，1：是"`
+	Editor  BiDashboardEditingCache `description:"编辑人信息"`
+	List    []*BiDashboardDetail
 }
 
 type AddDashboardReq struct {
@@ -117,16 +99,6 @@ type DelDashboardReq struct {
 	BiDashboardId int `description:"看板id"`
 }
 
-func GetDashboradByIds(dashboradIds []int) (list []*BiDashboard, err error) {
-	//_, err = orm.NewOrmUsingDB("rddp").
-	//	QueryTable("ppt_v2").
-	//	Filter("ppt_id__in", pptIds).
-	//	All(&list)
-	err = global.DEFAULT_DmSQL.Table("bi_dashboard").Where("bi_dashboard_id IN ?", dashboradIds).Find(&list).Error
-
-	return
-}
-
 // GetAllGrantList 获取已经有权限的看板列表
 func GetAllGrantList(sysUserId int) (list []*BiDashboard, err error) {
 	sql := `SELECT a.* FROM bi_dashboard a JOIN bi_dashboard_grant b on a.bi_dashboard_id=b.bi_dashboard_id 
@@ -139,11 +111,10 @@ func SaveDashboard(item *BiDashboard) (err error) {
 	return global.DEFAULT_DmSQL.Save(item).Error
 }
 
-
 // BiDashboardEditingReq 标记编辑中请求体
 type BiDashboardEditingReq struct {
-	BiDashboardId  int `description:"看板主键ID"`
-	Status int `description:"标记状态: 1-编辑中; 2-编辑完成"`
+	BiDashboardId int `description:"看板主键ID"`
+	Status        int `description:"标记状态: 1-编辑中; 2-编辑完成"`
 }
 
 // GetAllMyShareList 获取我共享的看板
@@ -160,4 +131,4 @@ func GetDashboardByName(name string) (item *BiDashboard, err error) {
 	sql := `SELECT * FROM bi_dashboard WHERE bi_dashboard_name = ? limit 1`
 	err = global.DEFAULT_DmSQL.Raw(sql, name).First(&item).Error
 	return
-}
+}

models/bi_dashboard/bi_dashboard_detail.go

@@ -20,12 +20,6 @@ func (m *BiDashboardDetail) TableName() string {
 	return "bi_dashboard_detail"
 }
 
-// add
-func AddBiDashboardDetail(item *BiDashboardDetail) (err error) {
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	return
-}
-
 func GetBiDashboardDetailById(id int) (list []*BiDashboardDetail, err error) {
 	err = global.DEFAULT_DmSQL.Table("bi_dashboard_detail").Where("bi_dashboard_id IN ?", id).Find(&list).Error
 
@@ -51,7 +45,7 @@ type MoveDashboardDetailReq struct {
 }
 
 // update
-func EditBiDashboardDetail(item *BiDashboardDetail) (err error){
+func EditBiDashboardDetail(item *BiDashboardDetail) (err error) {
 	return global.DEFAULT_DmSQL.Model(item).Where("bi_dashboard_detail_id = ?", item.BiDashboardDetailId).Updates(item).Error
 }
 
@@ -59,8 +53,7 @@ type DelDashboardDetailReq struct {
 	BiDashboardDetailId int `description:"看板详情id"`
 }
 
-
 // del
 func DeleteBiDashboardDetailByDetailId(id int) (err error) {
 	return global.DEFAULT_DmSQL.Where("bi_dashboard_detail_id = ?", id).Delete(&BiDashboardDetail{}).Error
-}
+}

models/company/company.go

@@ -1,55 +0,0 @@
-package company
-
-//type Company struct {
-//	CompanyId       int       `orm:"column(company_id);pk"`
-//	CompanyName     string    `description:"客户名称"`
-//	CompanyType     int       `orm:"column(type)"`
-//	CreditCode      string    `description:"社会统一信用码"`
-//	CompanyCode     string    `description:"客户编码"`
-//	Sort            int       `description:"优先级"`
-//	IsFeeCustomer   int       `description:"是否付费用户"`
-//	Country         string    `description:"国家编码"`
-//	Province        string    `description:"省"`
-//	City            string    `description:"市"`
-//	Address         string    `description:"详细地址"`
-//	Enabled         int       `description:"用户状态"`
-//	CreatedTime     time.Time `description:"创建时间"`
-//	LastUpdatedTime time.Time `description:"最后一次阅读时间"`
-//	Seller          string    `description:"销售员"`
-//	SellsId         int       `description:"销售员id"`
-//	ShareSeller     string    `description:"共享销售员"`
-//	ShareSellerId   int       `description:"共享销售员id"`
-//	CompanyBelong   string    `description:"客户所属，ficc：ficc客户，public_offering：公募客户，partner：合作伙伴"`
-//	StartDate       string    `description:"合同开始日期"`
-//	EndDate         string    `description:"合同结束日期"`
-//	LastType        int       `description:"原客户标签"`
-//	IsVip           int       `description:"0:普通用户,1:大客户"`
-//	IsShare         int       `description:"0:非共享用户,1:共享客户"`
-//	FirstStartDate  string    `description:"首次设置为试用客户开始时间"`
-//	FirstEndDate    string    `description:"首次设置为试用客户结束时间"`
-//	DateType        int       `description:"设置流失类型，1：1个月，2：2个月，3：3个月"`
-//	Remark          string    `description:"备注信息"`
-//	RegionType      string    `description:"地区类型，国内，国外"`
-//	OpenCompanyCode string    `description:"开放给第三方的客户编码，不让第三方定位我们的客户信息"`
-//}
-
-// 更新客户基础信息
-//func (company *Company) Update(cols []string) (err error) {
-//	o := orm.NewOrm()
-//	_, err = o.Update(company, cols...)
-//	return
-//}
-
-//func ModifyCompanyGroupId(sellerId, groupId int) (err error) {
-//	o := orm.NewOrm()
-//	sql := `UPDATE company_product SET group_id=? WHERE seller_id=? `
-//	_, err = o.Raw(sql, groupId, sellerId).Exec()
-//	return
-//}
-
-//func ModifyCompanyDepartmentId(sellerId, departmentId int) (err error) {
-//	o := orm.NewOrm()
-//	sql := `UPDATE company_product SET department_id=? WHERE seller_id=? `
-//	_, err = o.Raw(sql, departmentId, sellerId).Exec()
-//	return
-//}

models/company/company_config.go

@@ -13,10 +13,6 @@ const (
 	ConfEnAuthRoleKey   = "en_auth_role"   // 英文权限角色配置Key
 )
 
-//type CrmConfig struct {
-//	ConfigValue string `description:"详情"`
-//}
-
 type CrmConfig struct {
 	ConfigId    int       `gorm:"primaryKey;column:config_id;type:int(11);not null"`
 	ConfigCode  string    `gorm:"column:config_code;type:varchar(50);default:''"` // 配置编码
@@ -25,25 +21,7 @@ type CrmConfig struct {
 	CreateTime  time.Time `gorm:"column:create_time;type:datetime"`               // 创建时间
 }
 
-//func GetConfigValueByCode(configCode string) (total int, err error) {
-//	o := orm.NewOrm()
-//	sql := ` SELECT config_value FROM crm_config WHERE config_code=? `
-//	err = o.Raw(sql, configCode).QueryRow(&total)
-//	return
-//}
-
-// 修改
-//func CrmConfigUpdate(newValue, configCode string) (err error) {
-//	o := orm.NewOrm()
-//	sql := `UPDATE crm_config SET  config_value=?   WHERE config_code=  ?`
-//	_, err = o.Raw(sql, newValue, configCode).Exec()
-//	return
-//}
-
 func GetConfigDetailByCode(configCode string) (item CrmConfig, err error) {
-	//o := orm.NewOrm()
-	//sql := ` SELECT config_value FROM crm_config WHERE config_code=? `
-	//err = o.Raw(sql, configCode).QueryRow(&item)
 	sql := ` SELECT config_value FROM crm_config WHERE config_code=? `
 	err = global.DEFAULT_DmSQL.Raw(sql, configCode).First(&item).Error
 	return

models/company/company_permission.go

@@ -5,21 +5,6 @@ import (
 	"time"
 )
 
-//type ChartPermission struct {
-//	ChartPermissionId   int       `description:"权限id"`
-//	ChartPermissionName string    `description:"权限名称（旧）"`
-//	PermissionName      string    `description:"权限名称"`
-//	Sort                int       `description:"排序"`
-//	Enabled             int       `description:"是否可用"`
-//	CreatedTime         time.Time `description:"创建时间"`
-//	LastUpdatedTime     time.Time `description:"最后更新时间"`
-//	TeleconferenceSort  int       `description:"电话会排序"`
-//	Remark              string    `description:"备注"`
-//	ClassifyName        string    `description:"分类"`
-//	PermissionType      int       `description:"1主观，2客观"`
-//	Checked             bool      `description:"选中状态"`
-//}
-
 type ChartPermission struct {
 	ChartPermissionId     int       `gorm:"primaryKey;column:chart_permission_id;type:bigint(20) unsigned;not null"`        // 主键
 	ChartPermissionName   string    `gorm:"column:chart_permission_name;type:varchar(20)"`                                  // 名称
@@ -77,18 +62,10 @@ type PermissionSetListType struct {
 }
 
 type PermissionSetResp struct {
-	List []*PermissionSetList
-	//ListUpgrade []*PermissionSetList     `description:"升级权限列表"`
+	List     []*PermissionSetList
 	ListType []*PermissionSetListType `description:"主观客观列表"`
 }
 
-//func GetPermissionSetItems(productId int, classifyName string) (items []*PermissionSetItem, err error) {
-//	o := orm.NewOrmUsingDB("rddp")
-//	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=?  AND permission_type=0 ORDER BY sort ASC `
-//	_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
-//	return
-//}
-
 type PermissionLookItem struct {
 	ChartPermissionId  int                   `description:"权限id"`
 	PermissionName     string                `description:"权限名称"`
@@ -111,11 +88,6 @@ type PermissionVarietyResp struct {
 	List []*PermissionVarietyList
 }
 
-//type PermissionVarietyItem struct {
-//	ChartPermissionId int    `description:"权限id"`
-//	ClassifyName      string `orm:"column(permission_name)" description:"权限名称"`
-//}
-
 type PermissionVarietyItem struct {
 	ChartPermissionId int    `gorm:"column:chart_permission_id;type:bigint(20) unsigned;not null"`
 	ClassifyName      string `gorm:"column:classify_name;type:varchar(50)"`
@@ -128,9 +100,6 @@ type PermissionVarietyList struct {
 }
 
 func GetPermissionVarietyItems(productId int, classifyName string) (items []*PermissionVarietyItem, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? GROUP BY permission_name ORDER BY sort ASC `
-	//_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
 	sql := ` SELECT chart_permission_id, chart_permission_name, permission_name, sort, enabled, created_time, last_updated_time, teleconference_sort, remark, classify_name, product_name, product_id, image_url, show_type, is_other, is_report, cygx_auth, permission_type, yb_img_url, product_permission_name, price_driven_state, image_url_m, parent_id, is_public 
   	 FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? 
 
@@ -143,27 +112,18 @@ func GetPermissionVarietyItems(productId int, classifyName string) (items []*Per
 
 // GetChartPermissionListById 根据权限id获取产品权限详情
 func GetChartPermissionListById(chartPermissionId int) (item *ChartPermission, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//sql := `SELECT * FROM chart_permission WHERE chart_permission_id =? `
-	//err = o.Raw(sql, chartPermissionId).QueryRow(&item)
 	sql := `SELECT * FROM chart_permission WHERE chart_permission_id =? `
 	err = global.DmSQL["rddp"].Raw(sql, chartPermissionId).First(&item).Error
 	return
 }
 
 func GetParentIdFromGroup(gid int) (items *int, err error) {
-	//o := orm.NewOrm()
-	//sql := `SELECT parent_id FROM sys_group WHERE group_id=? `
-	//err = o.Raw(sql, gid).QueryRow(&items)
 	sql := `SELECT parent_id FROM sys_group WHERE group_id=? `
 	err = global.DEFAULT_DmSQL.Raw(sql, gid).Scan(&items).Error
 	return
 }
 
 func GetGroupNamesById(gid int) (items *string, err error) {
-	//o := orm.NewOrm()
-	//sql := `SELECT group_name FROM sys_group WHERE group_id=? `
-	//err = o.Raw(sql, gid).QueryRow(&items)
 	sql := `SELECT group_name FROM sys_group WHERE group_id=? `
 	err = global.DEFAULT_DmSQL.Raw(sql, gid).Scan(&items).Error
 	return

models/company/company_seller.go

@@ -1,23 +1,12 @@
 package company
 
-//type CompanySellers struct {
-//	AdminId   int    `description:"系统用户id"`
-//	AdminName string `description:"系统用户名称"`
-//	RealName  string `description:"用户真实名称"`
-//}
-
-//type CompanySellerResp struct {
-//	List []*CompanySellers
-//}
-
 // DepartmentGroupSellersResp 销售列表（根据部门、分组来）
 type DepartmentGroupSellersResp struct {
 	List []DepartmentGroupSellers
 }
 
 type DepartmentGroupSellers struct {
-	AdminId string `description:"系统用户id"`
-	//AdminName string `description:"系统用户名称"`
+	AdminId      string                   `description:"系统用户id"`
 	RealName     string                   `description:"用户真实名称"`
 	ChildrenList []DepartmentGroupSellers `gorm:"-" description:"销售列表"`
 	RoleTypeCode string                   `description:"角色编码"`
@@ -25,8 +14,7 @@ type DepartmentGroupSellers struct {
 }
 
 type DepartmentGroupAdmins struct {
-	AdminId string `description:"系统用户id"`
-	//AdminName string `description:"系统用户名称"`
+	AdminId      string                   `description:"系统用户id"`
 	RealName     string                   `description:"用户真实名称"`
 	ChildrenList []*DepartmentGroupAdmins `gorm:"-" description:"角色列表"`
 	RoleTypeCode string                   `description:"角色编码"`

models/data_manage/chart_theme/chart_theme.go

@@ -30,10 +30,6 @@ type ChartTheme struct {
 // @return item *ChartTheme
 // @return err error
 func GetChartThemeId(chartThemeId int) (item *ChartTheme, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM chart_theme where chart_theme_id = ? AND is_delete = 0`
-	//err = o.Raw(sql, chartThemeId).QueryRow(&item)
-
 	sql := `SELECT * FROM chart_theme where chart_theme_id = ? AND is_delete = 0`
 	err = global.DmSQL["data"].Raw(sql, chartThemeId).First(&item).Error
 	return
@@ -53,12 +49,6 @@ func (m *ChartTheme) Add() (err error) {
 		err = errors.New("该配置已存在")
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//lastId, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.ChartThemeId = int(lastId)
 	err = global.DmSQL["data"].Create(m).Error
 	return
 }
@@ -71,53 +61,18 @@ func (m *ChartTheme) Add() (err error) {
 // @param cols []string
 // @return err error
 func (m *ChartTheme) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(m, cols...)
 	err = global.DmSQL["data"].Select(cols).Updates(m).Error
 	return
 }
 
-// GetChartThemeListByTypeId
-// @Description: 根据图表类型获取关联的图表主题列表
-// @author: Roc
-// @datetime 2023-12-13 17:39:48
-// @return list []*ChartTheme
-// @return err error
-func GetChartThemeListByTypeId(chartThemeTypeId int) (list []*ChartTheme, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM chart_theme WHERE chart_theme_type_id = ? AND  is_delete=0 ORDER BY chart_theme_id ASC `
-	//_, err = o.Raw(sql, chartThemeTypeId).QueryRows(&list)
-
-	sql := `SELECT * FROM chart_theme WHERE chart_theme_type_id = ? AND  is_delete=0 ORDER BY chart_theme_id ASC `
-	err = global.DmSQL["data"].Raw(sql, chartThemeTypeId).Find(&list).Error
-	return
-}
-
-// GetAllChartThemeList
-// @Description: 获取所有图表主题列表
-// @author: Roc
-// @datetime 2023-12-13 17:39:48
-// @return list []*ChartTheme
-// @return err error
-func GetAllChartThemeList() (list []*ChartTheme, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM chart_theme WHERE  is_delete=0 ORDER BY chart_theme_id ASC `
-	//_, err = o.Raw(sql).QueryRows(&list)
-
-	sql := `SELECT * FROM chart_theme WHERE  is_delete=0 ORDER BY chart_theme_id ASC `
-	err = global.DmSQL["data"].Raw(sql).Find(&list).Error
-	return
-}
-
 // ChartThemeItem
 // @Description: 图表主题配置
 type ChartThemeItem struct {
-	ChartThemeId     int    `description:"图表主题类型ID" orm:"column(chart_theme_id);pk" gorm:"primaryKey" `
-	ChartThemeName   string `description:"图表主题名称"`
-	ChartThemeTypeId int    `description:"图表主题类型ID"`
-	Config           string `description:"配置"`
-	ChartImage       string `description:"缩略图"`
-	//IsDelete            int       `description:"是否删除，0：未删除；1：已删除"`
+	ChartThemeId        int       `description:"图表主题类型ID" orm:"column(chart_theme_id);pk" gorm:"primaryKey" `
+	ChartThemeName      string    `description:"图表主题名称"`
+	ChartThemeTypeId    int       `description:"图表主题类型ID"`
+	Config              string    `description:"配置"`
+	ChartImage          string    `description:"缩略图"`
 	IsSystemTheme       int       `description:"是否是系统主题，0：不是；1：是"`
 	SysUserId           int       `description:"操作人"`
 	SysUserRealName     string    `description:"操作人的真实名称"`
@@ -134,12 +89,6 @@ type ChartThemeItem struct {
 // @return list []*ChartThemeConfig
 // @return err error
 func GetChartThemeItemList(chartThemeTypeId int) (list []*ChartThemeItem, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT a.*,b.default_chart_theme_id FROM chart_theme a
-	//     JOIN chart_theme_type b on a.chart_theme_type_id =b.chart_theme_type_id
-	//     WHERE a.chart_theme_type_id = ? AND a.is_delete=0 ORDER BY a.chart_theme_id ASC `
-	//_, err = o.Raw(sql, chartThemeTypeId).QueryRows(&list)
-
 	sql := `SELECT a.*,b.default_chart_theme_id FROM chart_theme a
 	    JOIN chart_theme_type b on a.chart_theme_type_id =b.chart_theme_type_id
 	    WHERE a.chart_theme_type_id = ? AND a.is_delete=0 ORDER BY a.chart_theme_id ASC `
@@ -155,11 +104,6 @@ func GetChartThemeItemList(chartThemeTypeId int) (list []*ChartThemeItem, err er
 // @return item *ChartTheme
 // @return err error
 func GetSystemChartTheme(chartThemeTypeId int) (item *ChartTheme, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT a.* FROM chart_theme a
-	//     WHERE a.chart_theme_type_id = ? AND a.is_system_theme=1 ORDER BY a.chart_theme_id ASC `
-	//err = o.Raw(sql, chartThemeTypeId).QueryRow(&item)
-
 	sql := `SELECT a.* FROM chart_theme a
 	    WHERE a.chart_theme_type_id = ? AND a.is_system_theme=1 ORDER BY a.chart_theme_id ASC `
 

models/data_manage/chart_theme/chart_theme_default_data.go

@@ -20,27 +20,6 @@ type ChartThemeDefaultData struct {
 	CreateTime    time.Time `description:"创建时间"`
 }
 
-// GetChartThemeDefaultDataList
-// @Description: 获取指标的数据（日期正序返回）
-// @author: Roc
-// @datetime 2023-12-13 16:40:14
-// @param endInfoId int
-// @return list []*ChartThemeDefaultData
-// @return err error
-func GetChartThemeDefaultDataList(endInfoId int) (list []*ChartThemeDefaultData, err error) {
-	//sql := `SELECT * FROM chart_theme_default_data WHERE edb_info_id=? `
-	//
-	//sql += ` ORDER BY data_time ASC `
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Raw(sql, endInfoId).QueryRows(&list)
-
-	sql := `SELECT * FROM chart_theme_default_data WHERE edb_info_id=? `
-
-	sql += ` ORDER BY data_time ASC `
-	err = global.DmSQL["data"].Raw(sql, endInfoId).Find(&list).Error
-	return
-}
-
 // Update
 // @Description: 更新
 // @author: Roc
@@ -49,8 +28,6 @@ func GetChartThemeDefaultDataList(endInfoId int) (list []*ChartThemeDefaultData,
 // @param cols []string
 // @return err error
 func (m *ChartThemeDefaultData) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(m, cols...)
 	err = global.DmSQL["data"].Select(cols).Updates(m).Error
 	return
 }
@@ -63,17 +40,6 @@ func (m *ChartThemeDefaultData) Update(cols []string) (err error) {
 // @return list []*ChartThemeDefaultDataItem
 // @return err error
 func GetChartThemeDefaultDataItemList(endInfoId int, startDate string) (list []*data_manage.EdbDataList, err error) {
-	//sql := `SELECT edb_data_id,edb_info_id,data_time,value,data_timestamp FROM chart_theme_default_data WHERE edb_info_id=? `
-	//var pars []interface{}
-	//if startDate != "" {
-	//	sql += ` AND data_time>=? `
-	//	pars = append(pars, startDate)
-	//}
-	//
-	//sql += ` ORDER BY data_time ASC `
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Raw(sql, endInfoId, pars).QueryRows(&list)
-
 	sql := `SELECT edb_data_id,edb_info_id,data_time,"value",data_timestamp FROM chart_theme_default_data WHERE edb_info_id=? `
 	var pars []interface{}
 	if startDate != "" {
@@ -99,11 +65,6 @@ func GetChartEdbMappingListByEdbInfoId(edbInfoIdList []int) (list []*data_manage
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM chart_theme_default_edb_info WHERE edb_info_id IN(` + utils.GetOrmInReplace(num) + `)
-	//          `
-	//_, err = o.Raw(sql, edbInfoIdList).QueryRows(&list)
-
 	sql := ` SELECT * FROM chart_theme_default_edb_info WHERE edb_info_id IN(` + utils.GetOrmInReplace(num) + `) `
 	err = global.DmSQL["data"].Raw(sql, edbInfoIdList).Find(&list).Error
 	return

models/data_manage/chart_theme/chart_theme_type.go

@@ -36,9 +36,6 @@ type ChartThemeTypeList struct {
 // @param cols []string
 // @return err error
 func (m *ChartThemeType) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(m, cols...)
-
 	err = global.DmSQL["data"].Select(cols).Updates(m).Error
 	return
 }
@@ -50,12 +47,6 @@ func (m *ChartThemeType) Update(cols []string) (err error) {
 // @return list []*ChartThemeType
 // @return err error
 func GetAllChartThemeTypeList() (list []*ChartThemeTypeList, err error) {
-	//	o := orm.NewOrmUsingDB("data")
-	//	sql := `SELECT c.chart_type_id AS chart_type, c.chart_type_name,c.chart_type_name_en, parent_id, t.chart_theme_type_id,t.chart_source,t.default_chart_theme_id FROM chart_type c
-	//left JOIN chart_theme_type t on c.chart_type_id=t.chart_type
-	//ORDER BY c.sort ASC`
-	//	_, err = o.Raw(sql).QueryRows(&list)
-
 	sql := `SELECT c.chart_type_id AS chart_type, c.chart_type_name,c.chart_type_name_en, parent_id, t.chart_theme_type_id,t.chart_source,t.default_chart_theme_id FROM chart_type c 
 	left JOIN chart_theme_type t on c.chart_type_id=t.chart_type
 	ORDER BY c.sort ASC`
@@ -71,10 +62,6 @@ func GetAllChartThemeTypeList() (list []*ChartThemeTypeList, err error) {
 // @return list []*ChartThemeType
 // @return err error
 func GetChartThemeTypeListBySource(source int) (list []*ChartThemeType, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM chart_theme_type WHERE chart_source = ?  ORDER BY chart_theme_type_id ASC `
-	//_, err = o.Raw(sql, source).QueryRows(&list)
-
 	sql := `SELECT * FROM chart_theme_type WHERE chart_source = ?  ORDER BY chart_theme_type_id ASC `
 	err = global.DmSQL["data"].Raw(sql, source).Find(&list).Error
 	return
@@ -88,10 +75,6 @@ func GetChartThemeTypeListBySource(source int) (list []*ChartThemeType, err erro
 // @return item *ChartThemeType
 // @return err error
 func GetChartThemeTypeById(chartThemeTypeId int) (item *ChartThemeType, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM chart_theme_type where chart_theme_type_id = ? `
-	//err = o.Raw(sql, chartThemeTypeId).QueryRow(&item)
-
 	sql := `SELECT * FROM chart_theme_type where chart_theme_type_id = ? `
 
 	err = global.DmSQL["data"].Raw(sql, chartThemeTypeId).First(&item).Error
@@ -106,10 +89,6 @@ func GetChartThemeTypeById(chartThemeTypeId int) (item *ChartThemeType, err erro
 // @return item *ChartThemeType
 // @return err error
 func GetChartThemeTypeByChartTypeAndSource(chartType, source int) (item *ChartThemeType, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM chart_theme_type where chart_type = ? AND chart_source = ? `
-	//err = o.Raw(sql, chartType, source).QueryRow(&item)
-
 	sql := `SELECT * FROM chart_theme_type where chart_type = ? AND chart_source = ? `
 	err = global.DmSQL["data"].Raw(sql, chartType, source).First(&item).Error
 	return
@@ -123,10 +102,6 @@ func GetChartThemeTypeByChartTypeAndSource(chartType, source int) (item *ChartTh
 // @return item *ChartThemeType
 // @return err error
 func GetChartThemeTypeByChartType(chartType int) (item *ChartThemeType, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM chart_theme_type where chart_type = ?`
-	//err = o.Raw(sql, chartType).QueryRow(&item)
-
 	sql := `SELECT * FROM chart_theme_type where chart_type = ?`
 	err = global.DmSQL["data"].Raw(sql, chartType).First(&item).Error
 	return

models/data_manage/cross_variety/chart_info_cross_variety.go

@@ -31,12 +31,6 @@ type ChartInfoCrossVariety struct {
 // @return total int64
 // @return err error
 func GetCountChartByTagId(tagId int) (total int64, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT count(1) total FROM chart_info AS a JOIN
-	//chart_info_cross_variety AS b on a.chart_info_id = b.chart_info_id
-	//WHERE b.chart_x_tag_id = ? or b.chart_y_tag_id=?`
-	//err = o.Raw(sql, tagId, tagId).QueryRow(&total)
-
 	sql := `SELECT count(1) total FROM chart_info AS a JOIN
 	chart_info_cross_variety AS b on a.chart_info_id = b.chart_info_id
 	WHERE b.chart_x_tag_id = ? or b.chart_y_tag_id=?`
@@ -52,12 +46,6 @@ func GetCountChartByTagId(tagId int) (total int64, err error) {
 // @return items []*ChartInfoCrossVariety
 // @return err error
 func GeChartInfoCrossVarietyListByTagId(tagId int) (items []*ChartInfoCrossVariety, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT b.* FROM chart_info AS a JOIN
-	//chart_info_cross_variety AS b on a.chart_info_id = b.chart_info_id
-	//WHERE b.chart_x_tag_id = ? or b.chart_y_tag_id=?`
-	//_, err = o.Raw(sql, tagId, tagId).QueryRows(&items)
-
 	sql := `SELECT b.* FROM chart_info AS a JOIN
 	chart_info_cross_variety AS b on a.chart_info_id = b.chart_info_id 
 	WHERE b.chart_x_tag_id = ? or b.chart_y_tag_id=?`
@@ -74,21 +62,12 @@ func GeChartInfoCrossVarietyListByTagId(tagId int) (items []*ChartInfoCrossVarie
 // @return item *ChartInfoCrossVariety
 // @return err error
 func GetChartInfoCrossVarietyByChartInfoId(id int) (item *ChartInfoCrossVariety, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM chart_info_cross_variety WHERE chart_info_id = ?`
-	//err = o.Raw(sql, id).QueryRow(&item)
-
 	sql := `SELECT * FROM chart_info_cross_variety WHERE chart_info_id = ?`
 	err = global.DmSQL["data"].Raw(sql, id).First(&item).Error
 	return
 }
 
 func GetChartInfoCrossVarietyByXEdbInfoId(edbInfoId int) (items []*ChartInfoCrossVariety, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT a.* FROM chart_info_cross_variety a
-	//     join chart_tag_variety b on a.chart_x_tag_id=b.chart_tag_id WHERE b.edb_info_id = ? `
-	//_, err = o.Raw(sql, edbInfoId).QueryRows(&items)
-
 	sql := `SELECT a.* FROM chart_info_cross_variety a
 	    join chart_tag_variety b on a.chart_x_tag_id=b.chart_tag_id WHERE b.edb_info_id = ? `
 	err = global.DmSQL["data"].Raw(sql, edbInfoId).Find(&items).Error
@@ -96,11 +75,6 @@ func GetChartInfoCrossVarietyByXEdbInfoId(edbInfoId int) (items []*ChartInfoCros
 }
 
 func GetChartInfoCrossVarietyByYEdbInfoId(edbInfoId int) (items []*ChartInfoCrossVariety, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT a.* FROM chart_info_cross_variety a
-	//     join chart_tag_variety b on a.chart_y_tag_id=b.chart_tag_id WHERE b.edb_info_id = ? `
-	//_, err = o.Raw(sql, edbInfoId).QueryRows(&items)
-	//return
 	sql := `SELECT a.* FROM chart_info_cross_variety a
 	    join chart_tag_variety b on a.chart_y_tag_id=b.chart_tag_id WHERE b.edb_info_id = ? `
 	err = global.DmSQL["data"].Raw(sql, edbInfoId).Find(&items).Error
@@ -118,19 +92,6 @@ func GetChartInfoCrossVarietyByYEdbInfoId(edbInfoId int) (items []*ChartInfoCros
 // @return chartInfoId int
 // @return err error
 func CreateChart(chartInfo *data_manage.ChartInfo, classify *data_manage.ChartClassify, chartVarietyMappingList []*ChartVarietyMapping, chartInfoCrossVariety *ChartInfoCrossVariety) (chartInfoId int, err error) {
-	////o := orm.NewOrmUsingDB("data")
-	//tx, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = tx.Rollback()
-	//	} else {
-	//		_ = tx.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
@@ -180,19 +141,6 @@ func CreateChart(chartInfo *data_manage.ChartInfo, classify *data_manage.ChartCl
 
 // EditChart 修改相关性图表的 图表与指标 的关系
 func EditChart(chartInfo *data_manage.ChartInfo, chartVarietyMappingList []*ChartVarietyMapping, chartInfoCrossVariety *ChartInfoCrossVariety, chartUpdateCols, chartInfoCrossVarietyUpdateCols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = to.Rollback()
-	//	} else {
-	//		_ = to.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -262,9 +210,6 @@ func EditChart(chartInfo *data_manage.ChartInfo, chartVarietyMappingList []*Char
 		}
 	}
 
-	// 跨品种分析图表配置
-	//_, err = to.Update(chartInfoCrossVariety, chartInfoCrossVarietyUpdateCols...)
-
 	err = to.Select(chartInfoCrossVarietyUpdateCols).Updates(chartInfoCrossVariety).Error
 	return
 }
@@ -277,19 +222,6 @@ func EditChart(chartInfo *data_manage.ChartInfo, chartVarietyMappingList []*Char
 // @param req request.EditChartEnInfoReq
 // @return err error
 func EditChartEn(chartInfo *data_manage.ChartInfo, req request.EditChartEnInfoReq) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = to.Rollback()
-	//	} else {
-	//		_ = to.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -303,19 +235,10 @@ func EditChartEn(chartInfo *data_manage.ChartInfo, req request.EditChartEnInfoRe
 	// 更新图表信息
 	chartInfo.ChartNameEn = req.ChartNameEn
 	chartInfo.ModifyTime = time.Now().Local()
-	//_, err = to.Update(chartInfo, "ChartNameEn", "ModifyTime")
-	//if err != nil {
-	//	fmt.Println("UPDATE  chart_info Err:", err.Error())
-	//	return err
-	//}
-
 	err = to.Select("ChartNameEn", "ModifyTime").Updates(chartInfo).Error
 
 	// 更新标签英文名
 	for _, v := range req.TagList {
-		//sql := `UPDATE chart_tag SET chart_tag_name_en = ?,modify_time= NOW() WHERE chart_tag_id = ? `
-		//_, err = o.Raw(sql, v.TagNameEn, v.ChartTagId).Exec()
-
 		sql := `UPDATE chart_tag SET chart_tag_name_en = ?,modify_time= NOW() WHERE chart_tag_id = ? `
 
 		err = to.Exec(sql, v.TagNameEn, v.ChartTagId).Error
@@ -326,12 +249,6 @@ func EditChartEn(chartInfo *data_manage.ChartInfo, req request.EditChartEnInfoRe
 
 	// 更新品种英文名
 	for _, v := range req.VarietyList {
-		//sql := `UPDATE chart_variety SET chart_variety_name_en = ?,modify_time= NOW() WHERE chart_variety_id = ? `
-		//_, err = o.Raw(sql, v.VarietyNameEn, v.ChartVarietyId).Exec()
-		//if err != nil {
-		//	return
-		//}
-
 		sql := `UPDATE chart_variety SET chart_variety_name_en = ?,modify_time= NOW() WHERE chart_variety_id = ? `
 		err = to.Exec(sql, v.VarietyNameEn, v.ChartVarietyId).Error
 		if err != nil {
@@ -351,19 +268,6 @@ func EditChartEn(chartInfo *data_manage.ChartInfo, req request.EditChartEnInfoRe
 // @param lang string
 // @return err error
 func EditChartBase(chartInfo *data_manage.ChartInfo, req request.EditChartBaseInfoReq, lang string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = to.Rollback()
-	//	} else {
-	//		_ = to.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -382,12 +286,6 @@ func EditChartBase(chartInfo *data_manage.ChartInfo, req request.EditChartBaseIn
 		chartInfo.ChartName = req.ChartName
 	}
 	chartInfo.ModifyTime = time.Now().Local()
-	//_, err = to.Update(chartInfo, "ChartName", "ChartNameEn", "ModifyTime")
-	//if err != nil {
-	//	fmt.Println("UPDATE  chart_info Err:", err.Error())
-	//	return err
-	//}
-
 	err = to.Select("ChartName", "ChartNameEn", "ModifyTime").Updates(chartInfo).Error
 	if err != nil {
 		fmt.Println("UPDATE  chart_info Err:", err.Error())
@@ -396,20 +294,6 @@ func EditChartBase(chartInfo *data_manage.ChartInfo, req request.EditChartBaseIn
 
 	// 更新标签名
 	for _, v := range req.TagList {
-		//var sql string
-		//switch lang {
-		//case utils.EnLangVersion:
-		//	sql = `UPDATE chart_tag SET chart_tag_name_en = ?,modify_time= NOW() WHERE chart_tag_id = ? `
-		//default:
-		//	sql = `UPDATE chart_tag SET chart_tag_name = ?,modify_time= NOW() WHERE chart_tag_id = ? `
-		//}
-		//if sql != `` {
-		//	_, err = o.Raw(sql, v.TagName, v.ChartTagId).Exec()
-		//	if err != nil {
-		//		return
-		//	}
-		//}
-
 		var sql string
 		switch lang {
 		case utils.EnLangVersion:
@@ -418,11 +302,6 @@ func EditChartBase(chartInfo *data_manage.ChartInfo, req request.EditChartBaseIn
 			sql = `UPDATE chart_tag SET chart_tag_name = ?,modify_time= NOW() WHERE chart_tag_id = ? `
 		}
 		if sql != `` {
-			//_, err = o.Raw(sql, v.TagName, v.ChartTagId).Exec()
-			//if err != nil {
-			//	return
-			//}
-
 			err = to.Exec(sql, v.TagName, v.ChartTagId).Error
 			if err != nil {
 				return
@@ -432,18 +311,6 @@ func EditChartBase(chartInfo *data_manage.ChartInfo, req request.EditChartBaseIn
 
 	// 更新品种名
 	for _, v := range req.VarietyList {
-		//var sql string
-		//switch lang {
-		//case utils.EnLangVersion:
-		//	sql = `UPDATE chart_variety SET chart_variety_name_en = ?,modify_time= NOW() WHERE chart_variety_id = ? `
-		//default:
-		//	sql = `UPDATE chart_variety SET chart_variety_name = ?,modify_time= NOW() WHERE chart_variety_id = ? `
-		//}
-		//_, err = o.Raw(sql, v.VarietyName, v.ChartVarietyId).Exec()
-		//if err != nil {
-		//	return
-		//}
-
 		var sql string
 		switch lang {
 		case utils.EnLangVersion:

models/data_manage/cross_variety/chart_tag.go

@@ -26,10 +26,6 @@ type ChartTag struct {
 // @return item *ChartTag
 // @return err error
 func GetTagById(id int) (item *ChartTag, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM chart_tag WHERE chart_tag_id = ?`
-	//err = o.Raw(sql, id).QueryRow(&item)
-
 	sql := `SELECT * FROM chart_tag WHERE chart_tag_id = ?`
 	err = global.DmSQL["data"].Raw(sql, id).First(&item).Error
 	return
@@ -43,10 +39,6 @@ func GetTagById(id int) (item *ChartTag, err error) {
 // @return item *ChartTag
 // @return err error
 func GetTagByName(name string) (item *ChartTag, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM chart_tag WHERE chart_tag_name = ?`
-	//err = o.Raw(sql, name).QueryRow(&item)
-
 	sql := `SELECT * FROM chart_tag WHERE chart_tag_name = ?`
 	err = global.DmSQL["data"].Raw(sql, name).First(&item).Error
 	return
@@ -59,33 +51,10 @@ func GetTagByName(name string) (item *ChartTag, err error) {
 // @param item *ChartTag
 // @return err error
 func AddTag(item *ChartTag) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//lastId, err := o.Insert(item)
-	//if err != nil {
-	//	return
-	//}
-	//
-	//item.ChartTagId = int(lastId)
 	err = global.DmSQL["data"].Create(item).Error
 	return
 }
 
-// GetTagList
-// @Description: 获取所有标签列表
-// @author: Roc
-// @datetime 2023-11-22 10:44:35
-// @return items []*ChartTag
-// @return err error
-func GetTagList() (items []*ChartTag, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM chart_tag WHERE 1 = 1 `
-	//_, err = o.Raw(sql).QueryRows(&items)
-
-	sql := `SELECT * FROM chart_tag WHERE 1 = 1 `
-	err = global.DmSQL["data"].Raw(sql).Find(&items).Error
-	return
-}
-
 // Update
 // @Description: 更新标签
 // @author: Roc
@@ -94,17 +63,12 @@ func GetTagList() (items []*ChartTag, err error) {
 // @param updateColList []string
 // @return err error
 func (item *ChartTag) Update(updateColList []string) (err error) {
-	//to := orm.NewOrmUsingDB("data")
-	//_, err = to.Update(item, updateColList...)
 	err = global.DmSQL["data"].Select(updateColList).Updates(item).Error
 	return
 }
 
 // Delete 删除
 func (item *ChartTag) Delete() (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Delete(item)
-
 	err = global.DmSQL["data"].Exec("DELETE FROM chart_tag WHERE chart_tag_id = ?", item.ChartTagId).Error
 	return
 }
@@ -121,10 +85,6 @@ func GetTagListByIdList(idList []int) (items []*ChartTag, err error) {
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM chart_tag WHERE 1 = 1 AND chart_tag_id in (` + utils.GetOrmInReplace(num) + `)`
-	//_, err = o.Raw(sql, idList).QueryRows(&items)
-
 	sql := `SELECT * FROM chart_tag WHERE 1 = 1 AND chart_tag_id in (` + utils.GetOrmInReplace(num) + `)`
 	err = global.DmSQL["data"].Raw(sql, idList).Find(&items).Error
 	return
@@ -150,10 +110,6 @@ type ChartTagItem struct {
 // @return items []*ChartTag
 // @return err error
 func GetTagItemList() (items []*ChartTagItem, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM chart_tag WHERE 1 = 1 `
-	//_, err = o.Raw(sql).QueryRows(&items)
-
 	sql := `SELECT * FROM chart_tag WHERE 1 = 1 `
 	err = global.DmSQL["data"].Raw(sql).Find(&items).Error
 	return

models/data_manage/cross_variety/chart_tag_variety.go

@@ -22,41 +22,6 @@ type ChartTagVariety struct {
 	CreateTime                time.Time `description:"创建时间"`
 }
 
-// GetChartTagVarietyByTagAndVariety
-// @Description: 根据标签id和品种id获取关系
-// @author: Roc
-// @datetime 2023-11-22 10:42:50
-// @param chartTagId int
-// @param chartVarietyId int
-// @return item *ChartTagVariety
-// @return err error
-func GetChartTagVarietyByTagAndVariety(chartTagId, chartVarietyId int) (item *ChartTagVariety, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM chart_tag_variety WHERE chart_tag_id = ? AND chart_variety_id = ?`
-	//err = o.Raw(sql, chartTagId, chartVarietyId).QueryRow(&item)
-	sql := `SELECT * FROM chart_tag_variety WHERE chart_tag_id = ? AND chart_variety_id = ?`
-	err = global.DmSQL["data"].Raw(sql, chartTagId, chartVarietyId).First(&item).Error
-	return
-}
-
-// GetChartTagVarietyListByTag
-// @Description: 根据标签id获取所有绑定的品种列表
-// @author: Roc
-// @datetime 2023-11-22 10:44:35
-// @param chartTagId int
-// @param chartVarietyId int
-// @return items []*ChartTagVariety
-// @return err error
-func GetChartTagVarietyListByTag(chartTagId int) (items []*ChartTagVariety, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM chart_tag_variety WHERE chart_tag_id = ? `
-	//_, err = o.Raw(sql, chartTagId).QueryRows(&items)
-
-	sql := `SELECT * FROM chart_tag_variety WHERE chart_tag_id = ? `
-	err = global.DmSQL["data"].Raw(sql, chartTagId).Find(&items).Error
-	return
-}
-
 // GetChartTagVarietyListByTagAndVariety
 // @Description: 根据标签id和品种id列表获取所绑定的品种列表
 // @author: Roc
@@ -70,9 +35,6 @@ func GetChartTagVarietyListByTagAndVariety(chartTagId int, varietyIdList []int)
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM chart_tag_variety WHERE chart_tag_id = ? AND chart_variety_id in (` + utils.GetOrmInReplace(num) + `) `
-	//_, err = o.Raw(sql, chartTagId, varietyIdList).QueryRows(&items)
 	sql := `SELECT * FROM chart_tag_variety WHERE chart_tag_id = ? AND chart_variety_id in (` + utils.GetOrmInReplace(num) + `) `
 	err = global.DmSQL["data"].Raw(sql, chartTagId, varietyIdList).Find(&items).Error
 	return
@@ -100,11 +62,6 @@ type ChartTagVarietyItem struct {
 // @return items []*ChartTagVariety
 // @return err error
 func GetChartTagVarietyItemListByTag(chartTagId int) (items []*ChartTagVarietyItem, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT a.*,b.edb_code,b.edb_name,b.end_date,b.end_value FROM chart_tag_variety a
-	//     join edb_info b on a.edb_info_id=b.edb_info_id WHERE chart_tag_id = ? `
-	//_, err = o.Raw(sql, chartTagId).QueryRows(&items)
-
 	sql := `SELECT a.*,b.edb_code,b.edb_name,b.end_date,b.end_value FROM chart_tag_variety a 
 	    join edb_info b on a.edb_info_id=b.edb_info_id WHERE chart_tag_id = ? `
 	err = global.DmSQL["data"].Raw(sql, chartTagId).Find(&items).Error
@@ -125,11 +82,6 @@ type ChartTagVarietyCount struct {
 // @return items []*ChartTagVarietyCount
 // @return err error
 func GetCountChartTagVarietyItemListByTag() (items []*ChartTagVarietyCount, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT chart_tag_id,count(1) total FROM chart_tag_variety a
-	//     join edb_info b on a.edb_info_id=b.edb_info_id  group by chart_tag_id`
-	//_, err = o.Raw(sql).QueryRows(&items)
-
 	sql := `SELECT chart_tag_id,count(1) total FROM chart_tag_variety a 
 	    join edb_info b on a.edb_info_id=b.edb_info_id  group by chart_tag_id`
 	err = global.DmSQL["data"].Raw(sql).Find(&items).Error
@@ -146,18 +98,6 @@ func GetCountChartTagVarietyItemListByTag() (items []*ChartTagVarietyCount, err
 // @param sysUserName string
 // @return err error
 func SaveVarietyEdb(chartTagId int, list []request.VarietyEdbReq, sysUserId int, sysUserName string) (err error) {
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//	} else {
-	//		_ = o.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -242,29 +182,6 @@ func SaveVarietyEdb(chartTagId int, list []request.VarietyEdbReq, sysUserId int,
 	return
 }
 
-// GetCountByEdbInfoId
-// @Description: 根据指标id获取其关联的品种数量
-// @author: Roc
-// @datetime 2023-11-28 19:43:42
-// @param edbInfoId int
-// @return total int
-// @return err error
-func GetCountByEdbInfoId(edbInfoId int) (total int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT count(1) total FROM chart_tag_variety a
-	//        INNER JOIN edb_info b ON a.edb_info_id=b.edb_info_id
-	//        INNER JOIN chart_tag AS c ON a.chart_tag_id=c.chart_tag_id
-	//        WHERE a.edb_info_id = ?`
-	//err = o.Raw(sql, edbInfoId).QueryRow(&total)
-
-	sql := `SELECT count(1) total FROM chart_tag_variety a 
-	       INNER JOIN edb_info b ON a.edb_info_id=b.edb_info_id 
-	       INNER JOIN chart_tag AS c ON a.chart_tag_id=c.chart_tag_id
-	       WHERE a.edb_info_id = ?`
-	err = global.DmSQL["data"].Raw(sql).Scan(&total).Error
-	return
-}
-
 // GetChartTagVarietyListByTagIdList
 // @Description: 根据标签id列表获取所有绑定的品种列表
 // @author: Roc
@@ -278,26 +195,8 @@ func GetChartTagVarietyListByTagIdList(chartTagIdList []int) (items []*ChartTagV
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT a.* FROM chart_tag_variety a
-	//     join chart_variety b on a.chart_variety_id=b.chart_variety_id WHERE chart_tag_id in (` + utils.GetOrmInReplace(num) + `) `
-	//_, err = o.Raw(sql, chartTagIdList).QueryRows(&items)
-
 	sql := `SELECT a.* FROM chart_tag_variety a 
 	     join chart_variety b on a.chart_variety_id=b.chart_variety_id WHERE chart_tag_id in (` + utils.GetOrmInReplace(num) + `) `
 	err = global.DmSQL["data"].Raw(sql).Find(&items).Error
 	return
 }
-
-func DeleteChartTagVarietyByEdbInfoId(edbInfoId int) (err error) {
-	// 删除不存在的品种
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` DELETE FROM chart_tag_variety WHERE edb_info_id=?`
-	//_, err = o.Raw(sql, edbInfoId, edbInfoId).Exec()
-	//if err != nil {
-	//	return
-	//}
-	sql := ` DELETE FROM chart_tag_variety WHERE edb_info_id=?`
-	err = global.DmSQL["data"].Exec(sql, edbInfoId).Error
-	return
-}

models/data_manage/cross_variety/chart_variety.go

@@ -26,9 +26,6 @@ type ChartVariety struct {
 // @return item *ChartVariety
 // @return err error
 func GetVarietyById(id int) (item *ChartVariety, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM chart_variety WHERE chart_variety_id = ?`
-	//err = o.Raw(sql, id).QueryRow(&item)
 	sql := `SELECT * FROM chart_variety WHERE chart_variety_id = ?`
 	err = global.DmSQL["data"].Raw(sql, id).First(&item).Error
 	return
@@ -42,9 +39,6 @@ func GetVarietyById(id int) (item *ChartVariety, err error) {
 // @return item *ChartVariety
 // @return err error
 func GetVarietyByName(name string) (item *ChartVariety, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM chart_variety WHERE chart_variety_name = ?`
-	//err = o.Raw(sql, name).QueryRow(&item)
 	sql := `SELECT * FROM chart_variety WHERE chart_variety_name = ?`
 	err = global.DmSQL["data"].Raw(sql, name).First(&item).Error
 	return
@@ -57,13 +51,6 @@ func GetVarietyByName(name string) (item *ChartVariety, err error) {
 // @param item *ChartVariety
 // @return err error
 func AddVariety(item *ChartVariety) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//lastId, err := o.Insert(item)
-	//if err != nil {
-	//	return
-	//}
-	//
-	//item.ChartVarietyId = int(lastId)
 	err = global.DmSQL["data"].Create(item).Error
 	return
 }
@@ -76,16 +63,12 @@ func AddVariety(item *ChartVariety) (err error) {
 // @param updateColList []string
 // @return err error
 func (item *ChartVariety) Update(updateColList []string) (err error) {
-	//to := orm.NewOrmUsingDB("data")
-	//_, err = to.Update(item, updateColList...)
 	err = global.DmSQL["data"].Select(updateColList).Updates(item).Error
 	return
 }
 
 // Delete 删除
 func (item *ChartVariety) Delete() (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Delete(item)
 	sql := ` DELETE FROM chart_variety WHERE chart_variety_id=? `
 	err = global.DmSQL["data"].Exec(sql, item.ChartVarietyId).Error
 	return
@@ -98,9 +81,6 @@ func (item *ChartVariety) Delete() (err error) {
 // @return items []*ChartVariety
 // @return err error
 func GetVarietyList() (items []*ChartVariety, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM chart_variety WHERE 1 = 1 `
-	//_, err = o.Raw(sql).QueryRows(&items)
 	sql := `SELECT * FROM chart_variety WHERE 1 = 1 `
 	err = global.DmSQL["data"].Raw(sql).Find(&items).Error
 	return
@@ -118,9 +98,6 @@ func GetVarietyListByIdList(idList []int) (items []*ChartVariety, err error) {
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM chart_variety WHERE 1 = 1 AND chart_variety_id in (` + utils.GetOrmInReplace(num) + `)`
-	//_, err = o.Raw(sql, idList).QueryRows(&items)
 	sql := `SELECT * FROM chart_variety WHERE 1 = 1 AND chart_variety_id in (` + utils.GetOrmInReplace(num) + `)`
 	err = global.DmSQL["data"].Raw(sql, idList).Find(&items).Error
 	return

models/data_manage/cross_variety/chart_variety_mapping.go

@@ -16,23 +16,6 @@ type ChartVarietyMapping struct {
 	CreateTime     time.Time `description:"创建时间"`
 }
 
-// GetChartVarietyMappingList
-// @Description: 获取图表与品种的关系列表表
-// @author: Roc
-// @datetime 2023-11-24 15:22:36
-// @param chartInfoId int
-// @return items []*ChartVarietyMapping
-// @return err error
-func GetChartVarietyMappingList(chartInfoId int) (items []*ChartVarietyMapping, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM chart_variety_mapping WHERE chart_info_id = ? `
-	//_, err = o.Raw(sql, chartInfoId).QueryRows(&items)
-
-	sql := `SELECT * FROM chart_variety_mapping WHERE chart_info_id = ? `
-	err = global.DmSQL["data"].Raw(sql, chartInfoId).Find(&items).Error
-	return
-}
-
 // GetCountChartByVarietyId
 // @Description: 根据品种id获取引用该标签的图表数量
 // @author: Roc
@@ -41,12 +24,6 @@ func GetChartVarietyMappingList(chartInfoId int) (items []*ChartVarietyMapping,
 // @return total int64
 // @return err error
 func GetCountChartByVarietyId(varietyId int) (total int64, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT count(1) total FROM chart_info AS a JOIN
-	//chart_variety_mapping AS b on a.chart_info_id = b.chart_info_id
-	//WHERE b.chart_variety_id = ? `
-	//err = o.Raw(sql, varietyId).QueryRow(&total)
-
 	sql := `SELECT count(1) total FROM chart_info AS a JOIN
 	chart_variety_mapping AS b on a.chart_info_id = b.chart_info_id
 	WHERE b.chart_variety_id = ? `
@@ -66,10 +43,6 @@ func GetChartVarietyMappingListByChartInfoIdList(chartInfoIdList []int) (items [
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM chart_variety_mapping WHERE chart_info_id in (` + utils.GetOrmInReplace(num) + `) `
-	//_, err = o.Raw(sql, chartInfoIdList).QueryRows(&items)
-
 	sql := `SELECT * FROM chart_variety_mapping WHERE chart_info_id in (` + utils.GetOrmInReplace(num) + `) `
 	err = global.DmSQL["data"].Raw(sql, chartInfoIdList).Find(&chartInfoIdList).Error
 	return

models/data_manage/data_manage_permission/chart.go

@@ -39,17 +39,6 @@ type ChartClassifyPermission struct {
 // @return err error
 func SetIsPermissionByChartClassifyIdList(classifyIdList []int, chartClassifySource int) (err error) {
 	num := len(classifyIdList)
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//	} else {
-	//		_ = o.Commit()
-	//	}
-	//}()
 
 	to := global.DmSQL["data"].Begin()
 
@@ -61,37 +50,12 @@ func SetIsPermissionByChartClassifyIdList(classifyIdList []int, chartClassifySou
 		}
 	}()
 
-	//// 获取已经配置涉密的分类权限
-	//chartClassifyList := make([]*ChartClassify, 0)
-	//sql := `SELECT * FROM chart_classify WHERE is_join_permission = ? `
-	//_, err = o.Raw(sql, 1).QueryRows(&chartClassifyList)
-	//if err != nil {
-	//	return
-	//}
-	//chartClassifyMap := make(map[int]*ChartClassify)
-	//for _, v := range chartClassifyList {
-	//	chartClassifyMap[v.ClassifyId] = v
-	//}
-
-	// 先将所有已经设置了涉密的分类设置为不涉密
-	//sql := `UPDATE chart_classify SET is_join_permission=?,modify_time=now() WHERE is_join_permission = 1 AND source = ?`
-	//_, err = o.Raw(sql, 0, chartClassifySource).Exec()
-	//if err != nil {
-	//	return
-	//}
 	sql := `UPDATE chart_classify SET is_join_permission=?,modify_time=now() WHERE is_join_permission = 1 AND source = ?`
 	err = to.Exec(sql, 0, chartClassifySource).Error
 	if err != nil {
 		return
 	}
 	if num > 0 {
-		// 将对应的分类设置为涉密
-		//sql = `UPDATE chart_classify SET is_join_permission=?,modify_time=now() WHERE source = ? AND chart_classify_id in (` + utils.GetOrmInReplace(num) + `) `
-		//_, err = o.Raw(sql, 1, chartClassifySource, classifyIdList).Exec()
-		//if err != nil {
-		//	return
-		//}
-
 		sql = `UPDATE chart_classify SET is_join_permission=?,modify_time=now() WHERE source = ? AND chart_classify_id in (` + utils.GetOrmInReplace(num) + `) `
 		err = to.Exec(sql, 1, chartClassifySource, classifyIdList).Error
 		if err != nil {
@@ -115,18 +79,6 @@ func SetPermissionByChartIdList(chartIdList []string, userIdList []int, source i
 	if chartNum <= 0 {
 		return
 	}
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//	} else {
-	//		_ = o.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -139,8 +91,6 @@ func SetPermissionByChartIdList(chartIdList []string, userIdList []int, source i
 
 	// 获取已经配置的图表权限用户
 	chartInfoPermissionList := make([]*ChartInfoPermission, 0)
-	//sql := `SELECT * FROM chart_info_permission WHERE source = ? AND chart_info_id in (` + utils.GetOrmInReplace(chartNum) + `) `
-	//_, err = o.Raw(sql, source, chartIdList).QueryRows(&chartInfoPermissionList)
 	sql := `SELECT * FROM chart_info_permission WHERE source = ? AND chart_info_id in (` + utils.GetOrmInReplace(chartNum) + `) `
 	err = to.Raw(sql, source, chartIdList).Find(&chartInfoPermissionList).Error
 	if err != nil {
@@ -160,11 +110,6 @@ func SetPermissionByChartIdList(chartIdList []string, userIdList []int, source i
 			// 标记图表为不纳入权限管控
 			isJoinPermission = 0
 		}
-		//sql = `UPDATE chart_info SET is_join_permission=?,modify_time=now() WHERE source = ? AND chart_info_id in (` + utils.GetOrmInReplace(chartNum) + `) `
-		//_, err = o.Raw(sql, isJoinPermission, source, chartIdList).Exec()
-		//if err != nil {
-		//	return
-		//}
 		sql = `UPDATE chart_info SET is_join_permission=?,modify_time=now() WHERE source = ? AND chart_info_id in (` + utils.GetOrmInReplace(chartNum) + `) `
 		err = to.Exec(sql, isJoinPermission, source, chartIdList).Error
 		if err != nil {
@@ -203,11 +148,6 @@ func SetPermissionByChartIdList(chartIdList []string, userIdList []int, source i
 
 	// 添加待配置项
 	if len(addList) > 0 {
-		//_, err = o.InsertMulti(500, addList)
-		//if err != nil {
-		//	return
-		//}
-
 		err = to.CreateInBatches(addList, utils.MultiAddNum).Error
 		if err != nil {
 			return
@@ -224,12 +164,6 @@ func SetPermissionByChartIdList(chartIdList []string, userIdList []int, source i
 
 		deletePermissionIdNum := len(deletePermissionIdList)
 		if deletePermissionIdNum > 0 {
-			//sql = "DELETE FROM chart_info_permission WHERE chart_info_permission_id in (" + utils.GetOrmInReplace(deletePermissionIdNum) + ")"
-			//_, err = o.Raw(sql, deletePermissionIdList).Exec()
-			//if err != nil {
-			//	return
-			//}
-
 			sql = "DELETE FROM chart_info_permission WHERE chart_info_permission_id in (" + utils.GetOrmInReplace(deletePermissionIdNum) + ")"
 			err = to.Exec(sql, deletePermissionIdList).Error
 			if err != nil {
@@ -253,18 +187,6 @@ func SetPermissionByChartClassifyIdList(classifyIdList []int, userIdList []int,
 	if userNum <= 0 {
 		return
 	}
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//	} else {
-	//		_ = o.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -277,8 +199,6 @@ func SetPermissionByChartClassifyIdList(classifyIdList []int, userIdList []int,
 
 	// 获取当前选择用户已经配置的图表分类权限
 	classifyPermissionList := make([]*ChartClassifyPermission, 0)
-	//sql := `SELECT * FROM chart_classify_permission WHERE source = ? AND sys_user_id in (` + utils.GetOrmInReplace(userNum) + `) `
-	//_, err = o.Raw(sql, classifyType, userIdList).QueryRows(&classifyPermissionList)
 	sql := `SELECT * FROM chart_classify_permission WHERE source = ? AND sys_user_id in (` + utils.GetOrmInReplace(userNum) + `) `
 	err = to.Raw(sql, classifyType, userIdList).Find(&classifyPermissionList).Error
 	if err != nil {
@@ -315,10 +235,6 @@ func SetPermissionByChartClassifyIdList(classifyIdList []int, userIdList []int,
 
 	// 添加待配置项
 	if len(addList) > 0 {
-		//_, err = o.InsertMulti(500, addList)
-		//if err != nil {
-		//	return
-		//}
 		err = to.CreateInBatches(addList, utils.MultiAddNum).Error
 		if err != nil {
 			return
@@ -335,12 +251,6 @@ func SetPermissionByChartClassifyIdList(classifyIdList []int, userIdList []int,
 
 		deletePermissionIdNum := len(deletePermissionIdList)
 		if deletePermissionIdNum > 0 {
-			//sql = "DELETE FROM chart_classify_permission WHERE chart_classify_permission_id in (" + utils.GetOrmInReplace(deletePermissionIdNum) + ")"
-			//_, err = o.Raw(sql, deletePermissionIdList).Exec()
-			//if err != nil {
-			//	return
-			//}
-
 			sql = "DELETE FROM chart_classify_permission WHERE chart_classify_permission_id in (" + utils.GetOrmInReplace(deletePermissionIdNum) + ")"
 			err = to.Exec(sql, deletePermissionIdList).Error
 			if err != nil {
@@ -361,9 +271,6 @@ func SetPermissionByChartClassifyIdList(classifyIdList []int, userIdList []int,
 // @return chartClassifyIdList []int
 // @return err error
 func GetPermissionChartClassifyIdListByUserId(userId int, classifyType int) (chartClassifyIdList []int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT chart_classify_id FROM chart_classify_permission WHERE source = ? AND sys_user_id = ? `
-	//_, err = o.Raw(sql, classifyType, userId).QueryRows(&chartClassifyIdList)
 	sql := `SELECT chart_classify_id FROM chart_classify_permission WHERE source = ? AND sys_user_id = ? `
 	err = global.DmSQL["data"].Raw(sql, classifyType, userId).Find(&chartClassifyIdList).Error
 	return
@@ -378,9 +285,6 @@ func GetPermissionChartClassifyIdListByUserId(userId int, classifyType int) (cha
 // @return chartIdList []int
 // @return err error
 func GetPermissionUserIdListByChartId(dataId int, source int) (userIdList []int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT sys_user_id FROM chart_info_permission WHERE source = ? AND chart_info_id= ? `
-	//_, err = o.Raw(sql, source, dataId).QueryRows(&userIdList)
 	sql := `SELECT sys_user_id FROM chart_info_permission WHERE source = ? AND chart_info_id= ? `
 	err = global.DmSQL["data"].Raw(sql, source, dataId).Find(&userIdList).Error
 	return
@@ -395,9 +299,6 @@ func GetPermissionUserIdListByChartId(dataId int, source int) (userIdList []int,
 // @return userIdList []int
 // @return err error
 func GetPermissionUserIdListByChartClassifyId(classifyId int, source int) (userIdList []int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT sys_user_id FROM chart_classify_permission WHERE source = ? AND chart_classify_id= ? `
-	//_, err = o.Raw(sql, source, classifyId).QueryRows(&userIdList)
 	sql := `SELECT sys_user_id FROM chart_classify_permission WHERE source = ? AND chart_classify_id= ? `
 	err = global.DmSQL["data"].Raw(sql, source, classifyId).Find(&userIdList).Error
 	return
@@ -413,14 +314,6 @@ func GetPermissionUserIdListByChartClassifyId(classifyId int, source int) (userI
 // @return err error
 func GetPermissionChartIdList(userId, chartInfoId int) (idList []int, err error) {
 	pars := []interface{}{userId}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT chart_info_id FROM chart_info_permission WHERE sys_user_id = ? `
-	//if chartInfoId > 0 {
-	//	sql += ` AND chart_info_id = ? `
-	//	pars = append(pars, chartInfoId)
-	//}
-	//_, err = o.Raw(sql, pars).QueryRows(&idList)
-
 	sql := `SELECT chart_info_id FROM chart_info_permission WHERE sys_user_id = ? `
 	if chartInfoId > 0 {
 		sql += ` AND chart_info_id = ? `
@@ -440,14 +333,6 @@ func GetPermissionChartIdList(userId, chartInfoId int) (idList []int, err error)
 // @return err error
 func GetPermissionChartClassifyIdList(userId, classifyId int) (idList []int, err error) {
 	pars := []interface{}{userId}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT chart_classify_id FROM chart_classify_permission WHERE sys_user_id = ? `
-	//if classifyId > 0 {
-	//	sql += ` AND chart_classify_id = ? `
-	//	pars = append(pars, classifyId)
-	//}
-	//_, err = o.Raw(sql, pars).QueryRows(&idList)
-
 	sql := `SELECT chart_classify_id FROM chart_classify_permission WHERE sys_user_id = ? `
 	if classifyId > 0 {
 		sql += ` AND chart_classify_id = ? `
@@ -469,18 +354,6 @@ func GetPermissionChartClassifyIdList(userId, classifyId int) (idList []int, err
 // @param uniqueCode string
 // @return err error
 func InheritParentClassifyByChartClassifyId(dataSource, chartSource, classifyId, parentClassifyId int, classifyName, uniqueCode string) (err error) {
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//	} else {
-	//		_ = o.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -491,13 +364,6 @@ func InheritParentClassifyByChartClassifyId(dataSource, chartSource, classifyId,
 		}
 	}()
 
-	// 将对应的分类设置为涉密
-	//sql := `UPDATE chart_classify SET is_join_permission=?,modify_time=now() WHERE source = ? AND chart_classify_id = ? `
-	//_, err = o.Raw(sql, 1, chartSource, classifyId).Exec()
-	//if err != nil {
-	//	return
-	//}
-
 	sql := `UPDATE chart_classify SET is_join_permission=?,modify_time=now() WHERE source = ? AND chart_classify_id = ? `
 	err = to.Exec(sql, 1, chartSource, classifyId).Error
 	if err != nil {
@@ -508,8 +374,6 @@ func InheritParentClassifyByChartClassifyId(dataSource, chartSource, classifyId,
 	{
 		// 获取父级未授权的用户记录
 		var parentRecordItems []*ChartInfoClassifyPermissionNoAuthRecord
-		//sql = `SELECT * FROM data_permission_classify_no_auth_record WHERE classify_id = ? AND source = ? AND sub_source = ? ORDER BY data_permission_classify_no_auth_record_id desc LIMIT ?,? `
-		//_, err = o.Raw(sql, parentClassifyId, dataSource, chartSource).QueryRows(&parentRecordItems)
 
 		sql = `SELECT * FROM data_permission_classify_no_auth_record WHERE classify_id = ? AND source = ? AND sub_source = ? ORDER BY data_permission_classify_no_auth_record_id desc LIMIT ?,? `
 		err = to.Raw(sql, parentClassifyId, dataSource, chartSource).Find(&parentRecordItems).Error
@@ -529,10 +393,6 @@ func InheritParentClassifyByChartClassifyId(dataSource, chartSource, classifyId,
 
 		// 添加待配置项
 		if len(addNoAuthRecordItems) > 0 {
-			//_, err = o.InsertMulti(500, addNoAuthRecordItems)
-			//if err != nil {
-			//	return
-			//}
 
 			err = to.CreateInBatches(addNoAuthRecordItems, len(addNoAuthRecordItems)).Error
 			if err != nil {
@@ -546,12 +406,6 @@ func InheritParentClassifyByChartClassifyId(dataSource, chartSource, classifyId,
 	{
 		// 获取父级分类已经授权的用户
 		parentClassifyPermissionList := make([]*ChartClassifyPermission, 0)
-		//sql = `SELECT * FROM chart_classify_permission WHERE source = ? AND chart_classify_id = ? `
-		//_, err = o.Raw(sql, chartSource, parentClassifyId).QueryRows(&parentClassifyPermissionList)
-		//if err != nil {
-		//	return
-		//}
-
 		sql = `SELECT * FROM chart_classify_permission WHERE source = ? AND chart_classify_id = ? `
 		err = to.Raw(sql, chartSource, parentClassifyId).Find(&parentClassifyPermissionList).Error
 		if err != nil {
@@ -572,11 +426,6 @@ func InheritParentClassifyByChartClassifyId(dataSource, chartSource, classifyId,
 		}
 		// 添加待配置项
 		if len(addList) > 0 {
-			//_, err = o.InsertMulti(500, addList)
-			//if err != nil {
-			//	return
-			//}
-
 			err = to.CreateInBatches(addList, utils.MultiAddNum).Error
 			if err != nil {
 				return
@@ -625,18 +474,6 @@ func AddChartInfoPermissionNoAuthRecordBySourceAndDataIdList(source, chartSource
 	if userNum <= 0 {
 		return
 	}
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//	} else {
-	//		_ = o.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -649,12 +486,6 @@ func AddChartInfoPermissionNoAuthRecordBySourceAndDataIdList(source, chartSource
 
 	// 根据指标获取已经存在的未授权记录
 	var existList []*ChartInfoPermissionNoAuthRecord
-	//sql := `SELECT * FROM chart_info_permission_no_auth_record WHERE  source = ? AND chart_info_id in (` + utils.GetOrmInReplace(num) + `)`
-	//_, err = o.Raw(sql, chartSource, dataIdList).QueryRows(&existList)
-	//if err != nil {
-	//	return
-	//}
-
 	sql := `SELECT * FROM chart_info_permission_no_auth_record WHERE  source = ? AND chart_info_id in (` + utils.GetOrmInReplace(num) + `)`
 	err = to.Raw(sql, chartSource, dataIdList).Find(&existList).Error
 	if err != nil {
@@ -724,11 +555,6 @@ func AddChartInfoPermissionNoAuthRecordBySourceAndDataIdList(source, chartSource
 
 	// 添加消息
 	if len(addMessageList) > 0 {
-		//_, err = o.InsertMulti(500, addMessageList)
-		//if err != nil {
-		//	return
-		//}
-
 		err = to.CreateInBatches(addMessageList, utils.MultiAddNum).Error
 		if err != nil {
 			return
@@ -737,11 +563,6 @@ func AddChartInfoPermissionNoAuthRecordBySourceAndDataIdList(source, chartSource
 
 	// 添加记录
 	if len(addRecordList) > 0 {
-		//_, err = o.InsertMulti(500, addRecordList)
-		//if err != nil {
-		//	return
-		//}
-
 		err = to.CreateInBatches(addRecordList, utils.MultiAddNum).Error
 		if err != nil {
 			return
@@ -751,9 +572,6 @@ func AddChartInfoPermissionNoAuthRecordBySourceAndDataIdList(source, chartSource
 	// 已经授权了的用户，需要删除未授权记录
 	authUserIdNum := len(authUserIdList)
 	if authUserIdNum > 0 {
-		//sql = `DELETE FROM chart_info_permission_no_auth_record WHERE  source = ? AND sys_user_id in (` + utils.GetOrmInReplace(authUserIdNum) + `) AND chart_info_id in (` + utils.GetOrmInReplace(num) + `)`
-		//_, err = o.Raw(sql, chartSource, authUserIdList, dataIdList).Exec()
-
 		sql = `DELETE FROM chart_info_permission_no_auth_record WHERE  source = ? AND sys_user_id in (` + utils.GetOrmInReplace(authUserIdNum) + `) AND chart_info_id in (` + utils.GetOrmInReplace(num) + `)`
 		err = to.Exec(sql, chartSource, authUserIdList, dataIdList).Error
 	}
@@ -773,29 +591,12 @@ func DeleteChartInfoPermissionNoAuthRecordBySourceAndDataIdList(chartSource int,
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//
-	//sql := `DELETE FROM chart_info_permission_no_auth_record WHERE source = ? AND chart_info_id in (` + utils.GetOrmInReplace(num) + `)`
-	//_, err = o.Raw(sql, chartSource, dataIdList).Exec()
-
 	sql := `DELETE FROM chart_info_permission_no_auth_record WHERE source = ? AND chart_info_id in (` + utils.GetOrmInReplace(num) + `)`
 	err = global.DmSQL["data"].Exec(sql, chartSource, dataIdList).Error
 	return
 }
 
 func GetChartInfoDataPermissionNoAuthRecordListByUserId(userId int32, chartSource, startSize, pageSize int) (total int, items []*DataPermissionNoAuthRecord, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//
-	//// 获取总数
-	//sql := `SELECT count(1) AS total FROM chart_info_permission_no_auth_record WHERE sys_user_id = ? AND source = ? `
-	//err = o.Raw(sql, userId, chartSource).QueryRow(&total)
-	//if err != nil {
-	//	return
-	//}
-	//
-	//sql = `SELECT chart_info_permission_no_auth_record_id as data_permission_no_auth_record_id,op_unique_code,source as sub_source,chart_info_id as data_id,chart_name as data_name,sys_user_id,create_time FROM chart_info_permission_no_auth_record WHERE sys_user_id = ? AND source = ? ORDER BY chart_info_permission_no_auth_record_id desc LIMIT ?,? `
-	//_, err = o.Raw(sql, userId, chartSource, startSize, pageSize).QueryRows(&items)
-
 	// 获取总数
 	sql := `SELECT count(1) AS total FROM chart_info_permission_no_auth_record WHERE sys_user_id = ? AND source = ? `
 	err = global.DmSQL["data"].Raw(sql, userId, chartSource).Scan(&total).Error
@@ -845,18 +646,6 @@ func AddChartInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, chartSour
 	if userNum <= 0 {
 		return
 	}
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//	} else {
-	//		_ = o.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -869,12 +658,6 @@ func AddChartInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, chartSour
 
 	// 根据分类获取已经存在的未授权记录
 	var existList []*ChartInfoClassifyPermissionNoAuthRecord
-	//sql := `SELECT * FROM chart_info_classify_permission_no_auth_record WHERE source = ? AND classify_id in (` + utils.GetOrmInReplace(num) + `)`
-	//_, err = o.Raw(sql, chartSource, classifyIdList).QueryRows(&existList)
-	//if err != nil {
-	//	return
-	//}
-
 	sql := `SELECT * FROM chart_info_classify_permission_no_auth_record WHERE source = ? AND classify_id in (` + utils.GetOrmInReplace(num) + `)`
 	err = to.Raw(sql, chartSource, classifyIdList).Find(&existList).Error
 	if err != nil {
@@ -944,11 +727,6 @@ func AddChartInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, chartSour
 
 	// 添加消息
 	if len(addMessageList) > 0 {
-		//_, err = o.InsertMulti(500, addMessageList)
-		//if err != nil {
-		//	return
-		//}
-
 		err = to.CreateInBatches(addMessageList, utils.MultiAddNum).Error
 		if err != nil {
 			return
@@ -957,11 +735,6 @@ func AddChartInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, chartSour
 
 	// 添加记录
 	if len(addRecordList) > 0 {
-		//_, err = o.InsertMulti(500, addRecordList)
-		//if err != nil {
-		//	return
-		//}
-
 		err = to.CreateInBatches(addRecordList, utils.MultiAddNum).Error
 		if err != nil {
 			return
@@ -971,9 +744,6 @@ func AddChartInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, chartSour
 	// 移除已经公开了的分类权限，需要删除未授权记录
 	authUserIdNum := len(classifyIdList)
 	if authUserIdNum > 0 {
-		//sql = `DELETE FROM chart_info_classify_permission_no_auth_record WHERE source = ? AND classify_id not in (` + utils.GetOrmInReplace(num) + `)`
-		//_, err = o.Raw(sql, chartSource, classifyIdList).Exec()
-
 		sql = `DELETE FROM chart_info_classify_permission_no_auth_record WHERE source = ? AND classify_id not in (` + utils.GetOrmInReplace(num) + `)`
 		err = to.Exec(sql, chartSource, classifyIdList).Error
 	}
@@ -1000,24 +770,6 @@ func AddChartInfoClassifyNoAuthRecordBySourceAndUserIdList(source, chartSource i
 		return
 	}
 
-	//// 总共的涉密分类
-	//noAuthClassifyInfoNum := len(noAuthClassifyMap)
-	//if noAuthClassifyInfoNum <= 0 {
-	//	return
-	//}
-
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//	} else {
-	//		_ = o.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -1030,12 +782,6 @@ func AddChartInfoClassifyNoAuthRecordBySourceAndUserIdList(source, chartSource i
 
 	// 根据当前配置用户获取已经存在的未授权记录
 	var existList []*ChartInfoClassifyPermissionNoAuthRecord
-	//sql := `SELECT * FROM chart_info_classify_permission_no_auth_record WHERE source = ? AND sys_user_id in (` + utils.GetOrmInReplace(configUserNum) + `)`
-	//_, err = o.Raw(sql, chartSource, configUserIdList).QueryRows(&existList)
-	//if err != nil {
-	//	return
-	//}
-
 	sql := `SELECT * FROM chart_info_classify_permission_no_auth_record WHERE source = ? AND sys_user_id in (` + utils.GetOrmInReplace(configUserNum) + `)`
 	err = to.Raw(sql, chartSource, configUserIdList).Find(&existList).Error
 	if err != nil {
@@ -1109,11 +855,6 @@ func AddChartInfoClassifyNoAuthRecordBySourceAndUserIdList(source, chartSource i
 
 	// 添加消息
 	if len(addMessageList) > 0 {
-		//_, err = o.InsertMulti(500, addMessageList)
-		//if err != nil {
-		//	return
-		//}
-
 		err = to.CreateInBatches(addMessageList, utils.MultiAddNum).Error
 		if err != nil {
 			return
@@ -1122,10 +863,6 @@ func AddChartInfoClassifyNoAuthRecordBySourceAndUserIdList(source, chartSource i
 
 	// 添加记录
 	if len(addRecordList) > 0 {
-		//_, err = o.InsertMulti(500, addRecordList)
-		//if err != nil {
-		//	return
-		//}
 		err = to.CreateInBatches(addRecordList, utils.MultiAddNum).Error
 		if err != nil {
 			return
@@ -1139,8 +876,6 @@ func AddChartInfoClassifyNoAuthRecordBySourceAndUserIdList(source, chartSource i
 		for _, v := range delRecordIdMap {
 			delRecordIdList = append(delRecordIdList, v)
 		}
-		//sql = `DELETE FROM chart_info_classify_permission_no_auth_record WHERE chart_info_classify_permission_no_auth_record_id in (` + utils.GetOrmInReplace(delRecordIdNum) + `) `
-		//_, err = o.Raw(sql, delRecordIdList).Exec()
 		sql = `DELETE FROM chart_info_classify_permission_no_auth_record WHERE chart_info_classify_permission_no_auth_record_id in (` + utils.GetOrmInReplace(delRecordIdNum) + `) `
 		err = to.Exec(sql, delRecordIdList).Error
 	}
@@ -1155,11 +890,6 @@ func AddChartInfoClassifyNoAuthRecordBySourceAndUserIdList(source, chartSource i
 // @param chartSource int
 // @return err error
 func DeleteChartInfoClassifyNoAuthRecordBySourceAndClassifyIdList(chartSource int) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//
-	//sql := `DELETE FROM chart_info_classify_permission_no_auth_record WHERE source = ?`
-	//_, err = o.Raw(sql, chartSource).Exec()
-
 	sql := `DELETE FROM chart_info_classify_permission_no_auth_record WHERE source = ?`
 	err = global.DmSQL["data"].Exec(sql, chartSource).Error
 	return
@@ -1178,18 +908,6 @@ func DeleteChartInfoClassifyNoAuthRecordBySourceAndClassifyIdList(chartSource in
 // @return items []*DataPermissionClassifyNoAuthRecord
 // @return err error
 func GetChartInfoDataPermissionClassifyNoAuthRecordListByUserId(userId int32, chartSource, startSize, pageSize int) (total int, items []*DataPermissionClassifyNoAuthRecord, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//
-	//// 获取总数
-	//sql := `SELECT count(1) AS total FROM chart_info_classify_permission_no_auth_record WHERE sys_user_id = ? AND source = ? `
-	//err = o.Raw(sql, userId, chartSource).QueryRow(&total)
-	//if err != nil {
-	//	return
-	//}
-	//
-	//sql = `SELECT chart_info_classify_permission_no_auth_record_id as data_permission_classify_no_auth_record_id,source as sub_source,op_unique_code,classify_id,classify_name,sys_user_id,create_time  FROM chart_info_classify_permission_no_auth_record WHERE sys_user_id = ? AND source = ? ORDER BY chart_info_classify_permission_no_auth_record_id desc LIMIT ?,? `
-	//_, err = o.Raw(sql, userId, chartSource, startSize, pageSize).QueryRows(&items)
-
 	sql := `SELECT count(1) AS total FROM chart_info_classify_permission_no_auth_record WHERE sys_user_id = ? AND source = ? `
 	err = global.DmSQL["data"].Raw(sql, userId, chartSource).Scan(&total).Error
 	if err != nil {

models/data_manage/data_manage_permission/classify_no_auth_record.go

@@ -24,327 +24,6 @@ type ClassifyDataItem struct {
 	ClassifyName string // 资产名称（指标、图表、表格）
 }
 
-//
-//// AddClassifyNoAuthRecordBySourceAndClassifyIdList
-//// @Description: 根据分类添加用户分类未授权记录
-//// @author: Roc
-//// @datetime 2024-04-07 16:44:21
-//// @param source int
-//// @param subSource int
-//// @param classifyInfoList []ClassifyDataItem
-//// @param noAuthUserIdList []int
-//// @param uniqueCode string
-//// @param content string
-//// @param opUserId int
-//// @return err error
-//func AddClassifyNoAuthRecordBySourceAndClassifyIdList(source, subSource int, classifyInfoList []ClassifyDataItem, noAuthUserIdList []int, uniqueCode, content string, opUserId int) (err error) {
-//	num := len(classifyInfoList)
-//	if num <= 0 {
-//		return
-//	}
-//	// 分类id
-//	classifyIdList := make([]int, 0)
-//	for _, v := range classifyInfoList {
-//		classifyIdList = append(classifyIdList, v.ClassifyId)
-//	}
-//
-//	userNum := len(noAuthUserIdList)
-//	if userNum <= 0 {
-//		return
-//	}
-//	o, err := orm.NewOrmUsingDB("data").Begin()
-//	if err != nil {
-//		return
-//	}
-//	defer func() {
-//		if err != nil {
-//			_ = o.Rollback()
-//		} else {
-//			_ = o.Commit()
-//		}
-//	}()
-//
-//	// 根据分类获取已经存在的未授权记录
-//	var existList []*DataPermissionClassifyNoAuthRecord
-//	sql := `SELECT * FROM data_permission_classify_no_auth_record WHERE source = ? AND sub_source = ? AND classify_id in (` + utils.GetOrmInReplace(num) + `)`
-//	_, err = o.Raw(sql, source, subSource, classifyIdList).QueryRows(&existList)
-//	if err != nil {
-//		return
-//	}
-//
-//	// 已经标记了的数据
-//	existMap := make(map[int32]map[string]*DataPermissionClassifyNoAuthRecord)
-//	for _, v := range existList {
-//		tmpUserExistMap, ok := existMap[v.SysUserId]
-//		if !ok {
-//			tmpUserExistMap = make(map[string]*DataPermissionClassifyNoAuthRecord)
-//		}
-//
-//		key := fmt.Sprint(v.Source, "_", v.SubSource, "_", v.ClassifyId)
-//		tmpUserExistMap[key] = v
-//		existMap[v.SysUserId] = tmpUserExistMap
-//	}
-//
-//	addMessageList := make([]*DataPermissionMessage, 0)
-//	addRecordList := make([]*DataPermissionClassifyNoAuthRecord, 0)
-//	for _, userId := range noAuthUserIdList {
-//		isAdd := false
-//
-//		tmpUserExistMap, userExistOk := existMap[int32(userId)]
-//
-//		for _, dataItem := range classifyInfoList {
-//			// 判断是否已经存在，已经存在就过滤
-//			if userExistOk {
-//				key := fmt.Sprint(source, "_", subSource, "_", dataItem.ClassifyId)
-//				_, ok := tmpUserExistMap[key]
-//				if ok {
-//					continue
-//				}
-//			}
-//
-//			isAdd = true
-//			addRecordList = append(addRecordList, &DataPermissionClassifyNoAuthRecord{
-//				DataPermissionClassifyNoAuthRecordId: 0,
-//				Source:                               int32(source),
-//				SubSource:                            int32(subSource),
-//				OpUniqueCode:                         uniqueCode,
-//				ClassifyId:                           fmt.Sprint(dataItem.ClassifyId),
-//				ClassifyName:                         dataItem.ClassifyName,
-//				SysUserId:                            int32(userId),
-//				CreateTime:                           time.Now(),
-//			})
-//		}
-//
-//		// 有记录的话，需要添加消息
-//		if isAdd {
-//			addMessageList = append(addMessageList, &DataPermissionMessage{
-//				DataPermissionMessageId: 0,
-//				SendUserId:              int32(opUserId),
-//				ReceiveUserId:           int32(userId),
-//				Content:                 content,
-//				Remark:                  content,
-//				OpType:                  4,
-//				Source:                  int32(source),
-//				SubSource:               int32(subSource),
-//				OpUniqueCode:            uniqueCode,
-//				IsRead:                  0,
-//				CreateTime:              time.Now(),
-//				ModifyTime:              time.Now(),
-//			})
-//		}
-//	}
-//
-//	// 添加消息
-//	if len(addMessageList) > 0 {
-//		_, err = o.InsertMulti(500, addMessageList)
-//		if err != nil {
-//			return
-//		}
-//	}
-//
-//	// 添加记录
-//	if len(addRecordList) > 0 {
-//		_, err = o.InsertMulti(500, addRecordList)
-//		if err != nil {
-//			return
-//		}
-//	}
-//
-//	// 移除已经公开了的分类权限，需要删除未授权记录
-//	authUserIdNum := len(classifyIdList)
-//	if authUserIdNum > 0 {
-//		sql = `DELETE FROM data_permission_classify_no_auth_record WHERE source = ? AND sub_source = ? AND classify_id not in (` + utils.GetOrmInReplace(num) + `)`
-//		_, err = o.Raw(sql, source, subSource, classifyIdList).Exec()
-//	}
-//
-//	return
-//}
-//
-//// AddClassifyNoAuthRecordBySourceAndUserIdList
-//// @Description: 根据用户添加用户分类未授权记录
-//// @author: Roc
-//// @datetime 2024-04-07 20:12:44
-//// @param source int
-//// @param subSource int
-//// @param noAuthClassifyMap map[int]ClassifyDataItem
-//// @param configUserIdList []int
-//// @param uniqueCode string
-//// @param content string
-//// @param opUserId int
-//// @return err error
-//func AddClassifyNoAuthRecordBySourceAndUserIdList(source, subSource int, noAuthClassifyMap map[int]ClassifyDataItem, configUserIdList []int, uniqueCode, content string, opUserId int) (err error) {
-//	// 当前配置用户
-//	configUserNum := len(configUserIdList)
-//	if configUserNum <= 0 {
-//		return
-//	}
-//
-//	//// 总共的涉密分类
-//	//noAuthClassifyInfoNum := len(noAuthClassifyMap)
-//	//if noAuthClassifyInfoNum <= 0 {
-//	//	return
-//	//}
-//
-//	o, err := orm.NewOrmUsingDB("data").Begin()
-//	if err != nil {
-//		return
-//	}
-//	defer func() {
-//		if err != nil {
-//			_ = o.Rollback()
-//		} else {
-//			_ = o.Commit()
-//		}
-//	}()
-//
-//	// 根据当前配置用户获取已经存在的未授权记录
-//	var existList []*DataPermissionClassifyNoAuthRecord
-//	sql := `SELECT * FROM data_permission_classify_no_auth_record WHERE source = ? AND sub_source = ? AND sys_user_id in (` + utils.GetOrmInReplace(configUserNum) + `)`
-//	_, err = o.Raw(sql, source, subSource, configUserIdList).QueryRows(&existList)
-//	if err != nil {
-//		return
-//	}
-//
-//	// 已经标记了的数据
-//	existMap := make(map[int32]map[string]*DataPermissionClassifyNoAuthRecord)
-//	delRecordIdMap := make(map[int64]int64)
-//	for _, v := range existList {
-//		tmpUserExistMap, ok := existMap[v.SysUserId]
-//		if !ok {
-//			tmpUserExistMap = make(map[string]*DataPermissionClassifyNoAuthRecord)
-//		}
-//
-//		tmpUserExistMap[v.ClassifyId] = v
-//		existMap[v.SysUserId] = tmpUserExistMap
-//
-//		// 已经配置了的记录id
-//		delRecordIdMap[v.DataPermissionClassifyNoAuthRecordId] = v.DataPermissionClassifyNoAuthRecordId
-//	}
-//
-//	addMessageList := make([]*DataPermissionMessage, 0)
-//	addRecordList := make([]*DataPermissionClassifyNoAuthRecord, 0)
-//	for _, userId := range configUserIdList {
-//		isAdd := false
-//
-//		tmpUserExistMap, userExistOk := existMap[int32(userId)]
-//
-//		for _, dataItem := range noAuthClassifyMap {
-//			// 判断是否已经存在，已经存在就过滤
-//			if userExistOk {
-//				key := fmt.Sprint(dataItem.ClassifyId)
-//				tmpUserRecord, ok := tmpUserExistMap[key]
-//				if ok {
-//					delete(delRecordIdMap, tmpUserRecord.DataPermissionClassifyNoAuthRecordId)
-//					continue
-//				}
-//			}
-//
-//			isAdd = true
-//			addRecordList = append(addRecordList, &DataPermissionClassifyNoAuthRecord{
-//				DataPermissionClassifyNoAuthRecordId: 0,
-//				Source:                               int32(source),
-//				SubSource:                            int32(subSource),
-//				OpUniqueCode:                         uniqueCode,
-//				ClassifyId:                           fmt.Sprint(dataItem.ClassifyId),
-//				ClassifyName:                         dataItem.ClassifyName,
-//				SysUserId:                            int32(userId),
-//				CreateTime:                           time.Now(),
-//			})
-//		}
-//
-//		// 有记录的话，需要添加消息
-//		if isAdd {
-//			addMessageList = append(addMessageList, &DataPermissionMessage{
-//				DataPermissionMessageId: 0,
-//				SendUserId:              int32(opUserId),
-//				ReceiveUserId:           int32(userId),
-//				Content:                 content,
-//				Remark:                  content,
-//				OpType:                  4,
-//				Source:                  int32(source),
-//				SubSource:               int32(subSource),
-//				OpUniqueCode:            uniqueCode,
-//				IsRead:                  0,
-//				CreateTime:              time.Now(),
-//				ModifyTime:              time.Now(),
-//			})
-//		}
-//	}
-//
-//	// 添加消息
-//	if len(addMessageList) > 0 {
-//		_, err = o.InsertMulti(500, addMessageList)
-//		if err != nil {
-//			return
-//		}
-//	}
-//
-//	// 添加记录
-//	if len(addRecordList) > 0 {
-//		_, err = o.InsertMulti(500, addRecordList)
-//		if err != nil {
-//			return
-//		}
-//	}
-//
-//	// 需要删除未授权记录
-//	delRecordIdNum := len(delRecordIdMap)
-//	if delRecordIdNum > 0 {
-//		delRecordIdList := make([]int64, 0)
-//		for _, v := range delRecordIdMap {
-//			delRecordIdList = append(delRecordIdList, v)
-//		}
-//		sql = `DELETE FROM data_permission_classify_no_auth_record WHERE data_permission_classify_no_auth_record_id in (` + utils.GetOrmInReplace(delRecordIdNum) + `) `
-//		_, err = o.Raw(sql, delRecordIdList).Exec()
-//	}
-//
-//	return
-//}
-//
-//// DeleteClassifyNoAuthRecordBySourceAndClassifyIdList
-//// @Description: 根据来源和删除分类授权记录
-//// @author: Roc
-//// @datetime 2024-04-07 14:47:37
-//// @param source int
-//// @param subSource int
-//// @return err error
-//func DeleteClassifyNoAuthRecordBySourceAndClassifyIdList(source, subSource int) (err error) {
-//	o := orm.NewOrmUsingDB("data")
-//
-//	sql := `DELETE FROM data_permission_classify_no_auth_record WHERE source = ? AND sub_source = ?`
-//	_, err = o.Raw(sql, source, subSource).Exec()
-//
-//	return
-//}
-//
-//// GetDataPermissionClassifyNoAuthRecordListByUserId
-//// @Description: 根据用户获取未授权的资产分类记录
-//// @author: Roc
-//// @datetime 2024-04-07 20:14:49
-//// @param userId int
-//// @param source int
-//// @param subSource int
-//// @param startSize int
-//// @param pageSize int
-//// @return total int
-//// @return items []*DataPermissionClassifyNoAuthRecord
-//// @return err error
-//func GetDataPermissionClassifyNoAuthRecordListByUserId(userId, source, subSource int32, startSize, pageSize int) (total int, items []*DataPermissionClassifyNoAuthRecord, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//
-//	// 获取总数
-//	sql := `SELECT count(1) AS total FROM data_permission_classify_no_auth_record WHERE sys_user_id = ? AND source = ? AND sub_source = ? `
-//	err = o.Raw(sql, userId, source, subSource).QueryRow(&total)
-//	if err != nil {
-//		return
-//	}
-//
-//	sql = `SELECT * FROM data_permission_classify_no_auth_record WHERE sys_user_id = ? AND source = ? AND sub_source = ? ORDER BY data_permission_classify_no_auth_record_id desc LIMIT ?,? `
-//	_, err = o.Raw(sql, userId, source, subSource, startSize, pageSize).QueryRows(&items)
-//
-//	return
-//}
-
 // AddClassifyNoAuthRecordBySourceAndClassifyIdList
 // @Description: 根据分类添加用户分类未授权记录
 // @author: Roc

models/data_manage/data_manage_permission/edb.go

@@ -37,18 +37,6 @@ type EdbClassifyPermission struct {
 // @param classifyIdList []int
 func SetIsPermissionEdbChartByEdbClassifyIdList(classifyIdList []int, classifyType int) (err error) {
 	num := len(classifyIdList)
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//	} else {
-	//		_ = o.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -59,25 +47,6 @@ func SetIsPermissionEdbChartByEdbClassifyIdList(classifyIdList []int, classifyTy
 		}
 	}()
 
-	//// 获取已经配置涉密的分类权限
-	//edbClassifyList := make([]*EdbClassify, 0)
-	//sql := `SELECT * FROM edb_classify WHERE is_join_permission = ? `
-	//_, err = o.Raw(sql, 1).QueryRows(&edbClassifyList)
-	//if err != nil {
-	//	return
-	//}
-	//edbClassifyMap := make(map[int]*EdbClassify)
-	//for _, v := range edbClassifyList {
-	//	edbClassifyMap[v.ClassifyId] = v
-	//}
-
-	// 先将所有已经设置了涉密的分类设置为不涉密
-	//sql := `UPDATE edb_classify SET is_join_permission=?,modify_time=now() WHERE is_join_permission = 1 AND classify_type = ?`
-	//_, err = o.Raw(sql, 0, classifyType).Exec()
-	//if err != nil {
-	//	return
-	//}
-
 	sql := `UPDATE edb_classify SET is_join_permission=?,modify_time=now() WHERE is_join_permission = 1 AND classify_type = ?`
 	err = to.Exec(sql, 0, classifyType).Error
 	if err != nil {
@@ -85,13 +54,6 @@ func SetIsPermissionEdbChartByEdbClassifyIdList(classifyIdList []int, classifyTy
 	}
 
 	if num > 0 {
-		// 将对应的分类设置为涉密
-		//sql = `UPDATE edb_classify SET is_join_permission=?,modify_time=now() WHERE classify_type = ? AND classify_id in (` + utils.GetOrmInReplace(num) + `) `
-		//_, err = o.Raw(sql, 1, classifyType, classifyIdList).Exec()
-		//if err != nil {
-		//	return
-		//}
-
 		sql = `UPDATE edb_classify SET is_join_permission=?,modify_time=now() WHERE classify_type = ? AND classify_id in (` + utils.GetOrmInReplace(num) + `) `
 		err = to.Exec(sql, 1, classifyType, classifyIdList).Error
 		if err != nil {
@@ -115,18 +77,6 @@ func SetPermissionByEdbIdList(edbIdList []string, userIdList []int, edbInfoType
 	if edbNum <= 0 {
 		return
 	}
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//	} else {
-	//		_ = o.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -139,12 +89,6 @@ func SetPermissionByEdbIdList(edbIdList []string, userIdList []int, edbInfoType
 
 	// 获取已经配置的指标权限用户
 	edbInfoPermissionList := make([]*EdbInfoPermission, 0)
-	//sql := `SELECT * FROM edb_info_permission WHERE edb_info_type = ? AND edb_info_id in (` + utils.GetOrmInReplace(edbNum) + `) `
-	//_, err = o.Raw(sql, edbInfoType, edbIdList).QueryRows(&edbInfoPermissionList)
-	//if err != nil {
-	//	return
-	//}
-
 	sql := `SELECT * FROM edb_info_permission WHERE edb_info_type = ? AND edb_info_id in (` + utils.GetOrmInReplace(edbNum) + `) `
 	err = to.Raw(sql, edbInfoType, edbIdList).Find(&edbInfoPermissionList).Error
 	if err != nil {
@@ -165,12 +109,6 @@ func SetPermissionByEdbIdList(edbIdList []string, userIdList []int, edbInfoType
 			// 标记指标为不纳入权限管控
 			isJoinPermission = 0
 		}
-		//sql = `UPDATE edb_info SET is_join_permission=?,modify_time=now() WHERE edb_info_type = ? AND edb_info_id in (` + utils.GetOrmInReplace(edbNum) + `) `
-		//_, err = o.Raw(sql, isJoinPermission, edbInfoType, edbIdList).Exec()
-		//if err != nil {
-		//	return
-		//}
-
 		sql = `UPDATE edb_info SET is_join_permission=?,modify_time=now() WHERE edb_info_type = ? AND edb_info_id in (?) `
 		err = to.Exec(sql, isJoinPermission, edbInfoType, edbIdList).Error
 		if err != nil {
@@ -209,11 +147,6 @@ func SetPermissionByEdbIdList(edbIdList []string, userIdList []int, edbInfoType
 
 	// 添加待配置项
 	if len(addList) > 0 {
-		//_, err = o.InsertMulti(500, addList)
-		//if err != nil {
-		//	return
-		//}
-
 		err = to.CreateInBatches(addList, utils.MultiAddNum).Error
 		if err != nil {
 			return
@@ -231,12 +164,6 @@ func SetPermissionByEdbIdList(edbIdList []string, userIdList []int, edbInfoType
 
 		deletePermissionIdNum := len(deletePermissionIdList)
 		if deletePermissionIdNum > 0 {
-			//sql = "DELETE FROM edb_info_permission WHERE edb_info_permission_id in (" + utils.GetOrmInReplace(deletePermissionIdNum) + ")"
-			//_, err = o.Raw(sql, deletePermissionIdList).Exec()
-			//if err != nil {
-			//	return
-			//}
-
 			sql = `DELETE FROM edb_info_permission WHERE edb_info_permission_id in (?)`
 			err = to.Exec(sql, deletePermissionIdList).Error
 			if err != nil {
@@ -260,18 +187,6 @@ func SetPermissionByEdbClassifyIdList(classifyIdList []int, userIdList []int, cl
 	if userNum <= 0 {
 		return
 	}
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//	} else {
-	//		_ = o.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -320,11 +235,6 @@ func SetPermissionByEdbClassifyIdList(classifyIdList []int, userIdList []int, cl
 
 	// 添加待配置项
 	if len(addList) > 0 {
-		//_, err = o.InsertMulti(500, addList)
-		//if err != nil {
-		//	return
-		//}
-
 		err = to.CreateInBatches(addList, utils.MultiAddNum).Error
 		if err != nil {
 			return
@@ -341,12 +251,6 @@ func SetPermissionByEdbClassifyIdList(classifyIdList []int, userIdList []int, cl
 
 		deletePermissionIdNum := len(deletePermissionIdList)
 		if deletePermissionIdNum > 0 {
-			//sql = "DELETE FROM edb_classify_permission WHERE edb_classify_permission_id in (" + utils.GetOrmInReplace(deletePermissionIdNum) + ")"
-			//_, err = o.Raw(sql, deletePermissionIdList).Exec()
-			//if err != nil {
-			//	return
-			//}
-
 			sql = "DELETE FROM edb_classify_permission WHERE edb_classify_permission_id in (" + utils.GetOrmInReplace(deletePermissionIdNum) + ")"
 			err = to.Exec(sql, deletePermissionIdList).Error
 			if err != nil {
@@ -367,10 +271,6 @@ func SetPermissionByEdbClassifyIdList(classifyIdList []int, userIdList []int, cl
 // @return edbClassifyIdList []int
 // @return err error
 func GetPermissionEdbClassifyIdListByUserId(userId int, classifyType int) (edbClassifyIdList []int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT edb_classify_id FROM edb_classify_permission WHERE edb_classify_type = ? AND sys_user_id = ? `
-	//_, err = o.Raw(sql, classifyType, userId).QueryRows(&edbClassifyIdList)
-
 	sql := `SELECT edb_classify_id FROM edb_classify_permission WHERE edb_classify_type = ? AND sys_user_id = ? `
 	err = global.DmSQL["data"].Raw(sql, classifyType, userId).Find(&edbClassifyIdList).Error
 	return
@@ -385,10 +285,6 @@ func GetPermissionEdbClassifyIdListByUserId(userId int, classifyType int) (edbCl
 // @return userIdList []int
 // @return err error
 func GetPermissionUserIdListByEdbId(dataId int, edbInfoType int) (userIdList []int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT sys_user_id FROM edb_info_permission WHERE edb_info_type = ? AND edb_info_id= ? `
-	//_, err = o.Raw(sql, edbInfoType, dataId).QueryRows(&userIdList)
-
 	sql := `SELECT sys_user_id FROM edb_info_permission WHERE edb_info_type = ? AND edb_info_id= ? `
 	err = global.DmSQL["data"].Raw(sql, edbInfoType, dataId).Find(&userIdList).Error
 
@@ -404,10 +300,6 @@ func GetPermissionUserIdListByEdbId(dataId int, edbInfoType int) (userIdList []i
 // @return userIdList []int
 // @return err error
 func GetPermissionUserIdListByEdbClassifyId(classifyId int, edbClassifyType int) (userIdList []int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT sys_user_id FROM edb_classify_permission WHERE edb_classify_type = ? AND edb_classify_id= ? `
-	//_, err = o.Raw(sql, edbClassifyType, classifyId).QueryRows(&userIdList)
-
 	sql := `SELECT sys_user_id FROM edb_classify_permission WHERE edb_classify_type = ? AND edb_classify_id= ? `
 	err = global.DmSQL["data"].Raw(sql, edbClassifyType, classifyId).Find(&userIdList).Error
 
@@ -424,14 +316,6 @@ func GetPermissionUserIdListByEdbClassifyId(classifyId int, edbClassifyType int)
 // @return err error
 func GetPermissionEdbIdList(userId, edbInfoId int) (idList []int, err error) {
 	pars := []interface{}{userId}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT edb_info_id FROM edb_info_permission WHERE sys_user_id = ? `
-	//if edbInfoId > 0 {
-	//	sql += ` AND edb_info_id = ? `
-	//	pars = append(pars, edbInfoId)
-	//}
-	//_, err = o.Raw(sql, pars).QueryRows(&idList)
-
 	sql := `SELECT edb_info_id FROM edb_info_permission WHERE sys_user_id = ? `
 	if edbInfoId > 0 {
 		sql += ` AND edb_info_id = ? `
@@ -452,13 +336,6 @@ func GetPermissionEdbIdList(userId, edbInfoId int) (idList []int, err error) {
 // @return err error
 func GetPermissionEdbClassifyIdList(userId, classifyId int) (idList []int, err error) {
 	pars := []interface{}{userId}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT edb_classify_id FROM edb_classify_permission WHERE sys_user_id = ? `
-	//if classifyId > 0 {
-	//	sql += ` AND edb_classify_id = ? `
-	//	pars = append(pars, classifyId)
-	//}
-	//_, err = o.Raw(sql, pars).QueryRows(&idList)
 
 	sql := `SELECT edb_classify_id FROM edb_classify_permission WHERE sys_user_id = ? `
 	if classifyId > 0 {
@@ -481,18 +358,6 @@ func GetPermissionEdbClassifyIdList(userId, classifyId int) (idList []int, err e
 // @param uniqueCode string
 // @return err error
 func InheritParentClassifyByEdbClassifyId(source, classifyType, classifyId, parentClassifyId int, classifyName, uniqueCode string) (err error) {
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//	} else {
-	//		_ = o.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -503,13 +368,6 @@ func InheritParentClassifyByEdbClassifyId(source, classifyType, classifyId, pare
 		}
 	}()
 
-	// 将对应的分类设置为涉密
-	//sql := `UPDATE edb_classify SET is_join_permission=?,modify_time=now() WHERE classify_type = ? AND classify_id = ? `
-	//_, err = o.Raw(sql, 1, classifyType, classifyId).Exec()
-	//if err != nil {
-	//	return
-	//}
-
 	sql := `UPDATE edb_classify SET is_join_permission=?,modify_time=now() WHERE classify_type = ? AND classify_id = ? `
 	err = to.Exec(sql, 1, classifyType, classifyId).Error
 	if err != nil {
@@ -520,9 +378,6 @@ func InheritParentClassifyByEdbClassifyId(source, classifyType, classifyId, pare
 	{
 		// 获取父级未授权的用户记录
 		var parentRecordItems []*EdbInfoClassifyPermissionNoAuthRecord
-		//sql = `SELECT * FROM edb_info_classify_permission_no_auth_record WHERE classify_id = ? AND edb_classify_type = ? ORDER BY edb_info_classify_permission_no_auth_record_id desc LIMIT ?,? `
-		//_, err = o.Raw(sql, parentClassifyId, source, classifyType).QueryRows(&parentRecordItems)
-
 		sql = `SELECT * FROM edb_info_classify_permission_no_auth_record WHERE classify_id = ? AND edb_classify_type = ? ORDER BY edb_info_classify_permission_no_auth_record_id desc LIMIT ?,? `
 		err = to.Raw(sql, parentClassifyId, source, classifyType).Find(&parentRecordItems).Error
 
@@ -541,11 +396,6 @@ func InheritParentClassifyByEdbClassifyId(source, classifyType, classifyId, pare
 
 		// 添加待配置项
 		if len(addNoAuthRecordItems) > 0 {
-			//_, err = o.InsertMulti(500, addNoAuthRecordItems)
-			//if err != nil {
-			//	return
-			//}
-
 			err = to.CreateInBatches(addNoAuthRecordItems, utils.MultiAddNum).Error
 			if err != nil {
 				return
@@ -558,12 +408,6 @@ func InheritParentClassifyByEdbClassifyId(source, classifyType, classifyId, pare
 	{
 		// 获取父级分类已经授权的用户
 		parentClassifyPermissionList := make([]*EdbClassifyPermission, 0)
-		//sql = `SELECT * FROM edb_classify_permission WHERE edb_classify_type = ? AND edb_classify_id = ? `
-		//_, err = o.Raw(sql, classifyType, parentClassifyId).QueryRows(&parentClassifyPermissionList)
-		//if err != nil {
-		//	return
-		//}
-
 		sql = `SELECT * FROM edb_classify_permission WHERE edb_classify_type = ? AND edb_classify_id = ? `
 		err = to.Raw(sql, classifyType, parentClassifyId).Find(&parentClassifyPermissionList).Error
 		if err != nil {
@@ -584,11 +428,6 @@ func InheritParentClassifyByEdbClassifyId(source, classifyType, classifyId, pare
 		}
 		// 添加待配置项
 		if len(addList) > 0 {
-			//_, err = o.InsertMulti(500, addList)
-			//if err != nil {
-			//	return
-			//}
-
 			err = to.CreateInBatches(addList, utils.MultiAddNum).Error
 			if err != nil {
 				return
@@ -638,18 +477,6 @@ func AddEdbInfoPermissionNoAuthRecordBySourceAndDataIdList(source, edbInfoType i
 	if userNum <= 0 {
 		return
 	}
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//	} else {
-	//		_ = o.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -662,12 +489,6 @@ func AddEdbInfoPermissionNoAuthRecordBySourceAndDataIdList(source, edbInfoType i
 
 	// 根据指标获取已经存在的未授权记录
 	var existList []*EdbInfoPermissionNoAuthRecord
-	//sql := `SELECT * FROM edb_info_permission_no_auth_record WHERE  edb_info_type = ? AND edb_info_id in (` + utils.GetOrmInReplace(num) + `)`
-	//_, err = o.Raw(sql, edbInfoType, dataIdList).QueryRows(&existList)
-	//if err != nil {
-	//	return
-	//}
-
 	sql := `SELECT * FROM edb_info_permission_no_auth_record WHERE  edb_info_type = ? AND edb_info_id in (` + utils.GetOrmInReplace(num) + `)`
 	err = to.Raw(sql, edbInfoType, dataIdList).Find(&existList).Error
 	if err != nil {
@@ -738,11 +559,6 @@ func AddEdbInfoPermissionNoAuthRecordBySourceAndDataIdList(source, edbInfoType i
 
 	// 添加消息
 	if len(addMessageList) > 0 {
-		//_, err = o.InsertMulti(500, addMessageList)
-		//if err != nil {
-		//	return
-		//}
-
 		err = to.CreateInBatches(addMessageList, utils.MultiAddNum).Error
 		if err != nil {
 			return
@@ -751,10 +567,6 @@ func AddEdbInfoPermissionNoAuthRecordBySourceAndDataIdList(source, edbInfoType i
 
 	// 添加记录
 	if len(addRecordList) > 0 {
-		//_, err = o.InsertMulti(500, addRecordList)
-		//if err != nil {
-		//	return
-		//}
 
 		err = to.CreateInBatches(addRecordList, utils.MultiAddNum).Error
 		if err != nil {
@@ -765,9 +577,6 @@ func AddEdbInfoPermissionNoAuthRecordBySourceAndDataIdList(source, edbInfoType i
 	// 已经授权了的用户，需要删除未授权记录
 	authUserIdNum := len(authUserIdList)
 	if authUserIdNum > 0 {
-		//sql = `DELETE FROM edb_info_permission_no_auth_record WHERE  edb_info_type = ? AND sys_user_id in (` + utils.GetOrmInReplace(authUserIdNum) + `) AND edb_info_id in (` + utils.GetOrmInReplace(num) + `)`
-		//_, err = o.Raw(sql, edbInfoType, authUserIdList, dataIdList).Exec()
-
 		sql = `DELETE FROM edb_info_permission_no_auth_record WHERE  edb_info_type = ? AND sys_user_id in (` + utils.GetOrmInReplace(authUserIdNum) + `) AND edb_info_id in (` + utils.GetOrmInReplace(num) + `)`
 		err = to.Exec(sql, edbInfoType, authUserIdList, dataIdList).Error
 	}
@@ -788,11 +597,6 @@ func DeleteEdbInfoPermissionNoAuthRecordBySourceAndDataIdList(edbInfoType int, d
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//
-	//sql := `DELETE FROM edb_info_permission_no_auth_record WHERE edb_info_type = ? AND edb_info_id in (` + utils.GetOrmInReplace(num) + `)`
-	//_, err = o.Raw(sql, edbInfoType, dataIdList).Exec()
-
 	sql := `DELETE FROM edb_info_permission_no_auth_record WHERE edb_info_type = ? AND edb_info_id in (` + utils.GetOrmInReplace(num) + `)`
 	err = global.DmSQL["data"].Exec(sql, edbInfoType, dataIdList).Error
 	return
@@ -810,18 +614,6 @@ func DeleteEdbInfoPermissionNoAuthRecordBySourceAndDataIdList(edbInfoType int, d
 // @return items []*DataPermissionNoAuthRecord
 // @return err error
 func GetEdbInfoDataPermissionNoAuthRecordListByUserId(userId int32, edbInfoType, startSize, pageSize int) (total int, items []*DataPermissionNoAuthRecord, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//
-	//// 获取总数
-	//sql := `SELECT count(1) AS total FROM edb_info_permission_no_auth_record WHERE sys_user_id = ? AND edb_info_type = ? `
-	//err = o.Raw(sql, userId, edbInfoType).QueryRow(&total)
-	//if err != nil {
-	//	return
-	//}
-	//
-	//sql = `SELECT edb_info_permission_no_auth_record_id as data_permission_no_auth_record_id,op_unique_code,edb_info_type as sub_source,edb_info_id as data_id,edb_code as data_code,edb_name as data_name,sys_user_id,create_time FROM edb_info_permission_no_auth_record WHERE sys_user_id = ? AND edb_info_type = ? ORDER BY edb_info_permission_no_auth_record_id desc LIMIT ?,? `
-	//_, err = o.Raw(sql, userId, edbInfoType, startSize, pageSize).QueryRows(&items)
-
 	// 获取总数
 	sql := `SELECT count(1) AS total FROM edb_info_permission_no_auth_record WHERE sys_user_id = ? AND edb_info_type = ? `
 	err = global.DmSQL["data"].Raw(sql, userId, edbInfoType).First(&total).Error
@@ -871,18 +663,6 @@ func AddEdbInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, edbClassify
 	if userNum <= 0 {
 		return
 	}
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//	} else {
-	//		_ = o.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -895,11 +675,6 @@ func AddEdbInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, edbClassify
 
 	// 根据分类获取已经存在的未授权记录
 	var existList []*EdbInfoClassifyPermissionNoAuthRecord
-	//sql := `SELECT * FROM edb_info_classify_permission_no_auth_record WHERE edb_classify_type = ? AND classify_id in (` + utils.GetOrmInReplace(num) + `)`
-	//_, err = o.Raw(sql, edbClassifyType, classifyIdList).QueryRows(&existList)
-	//if err != nil {
-	//	return
-	//}
 
 	sql := `SELECT * FROM edb_info_classify_permission_no_auth_record WHERE edb_classify_type = ? AND classify_id in (` + utils.GetOrmInReplace(num) + `)`
 	err = to.Raw(sql, edbClassifyType, classifyIdList).Find(&existList).Error
@@ -970,10 +745,6 @@ func AddEdbInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, edbClassify
 
 	// 添加消息
 	if len(addMessageList) > 0 {
-		//_, err = o.InsertMulti(500, addMessageList)
-		//if err != nil {
-		//	return
-		//}
 		err = to.CreateInBatches(addMessageList, utils.MultiAddNum).Error
 		if err != nil {
 			return
@@ -983,10 +754,6 @@ func AddEdbInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, edbClassify
 
 	// 添加记录
 	if len(addRecordList) > 0 {
-		//_, err = o.InsertMulti(500, addRecordList)
-		//if err != nil {
-		//	return
-		//}
 		err = to.CreateInBatches(addRecordList, utils.MultiAddNum).Error
 		if err != nil {
 			return
@@ -996,8 +763,6 @@ func AddEdbInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, edbClassify
 	// 移除已经公开了的分类权限，需要删除未授权记录
 	authUserIdNum := len(classifyIdList)
 	if authUserIdNum > 0 {
-		//sql = `DELETE FROM edb_info_classify_permission_no_auth_record WHERE edb_classify_type = ? AND classify_id not in (` + utils.GetOrmInReplace(num) + `)`
-		//_, err = o.Raw(sql, edbClassifyType, classifyIdList).Exec()
 
 		sql = `DELETE FROM edb_info_classify_permission_no_auth_record WHERE edb_classify_type = ? AND classify_id not in (` + utils.GetOrmInReplace(num) + `)`
 		err = to.Exec(sql, edbClassifyType, classifyIdList).Error
@@ -1025,24 +790,6 @@ func AddEdbInfoClassifyNoAuthRecordBySourceAndUserIdList(source, edbClassifyType
 		return
 	}
 
-	//// 总共的涉密分类
-	//noAuthClassifyInfoNum := len(noAuthClassifyMap)
-	//if noAuthClassifyInfoNum <= 0 {
-	//	return
-	//}
-
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//	} else {
-	//		_ = o.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -1055,11 +802,6 @@ func AddEdbInfoClassifyNoAuthRecordBySourceAndUserIdList(source, edbClassifyType
 
 	// 根据当前配置用户获取已经存在的未授权记录
 	var existList []*EdbInfoClassifyPermissionNoAuthRecord
-	//sql := `SELECT * FROM edb_info_classify_permission_no_auth_record WHERE edb_classify_type = ? AND sys_user_id in (` + utils.GetOrmInReplace(configUserNum) + `)`
-	//_, err = o.Raw(sql, edbClassifyType, configUserIdList).QueryRows(&existList)
-	//if err != nil {
-	//	return
-	//}
 
 	sql := `SELECT * FROM edb_info_classify_permission_no_auth_record WHERE edb_classify_type = ? AND sys_user_id in (` + utils.GetOrmInReplace(configUserNum) + `)`
 	err = to.Raw(sql, edbClassifyType, configUserIdList).Find(&existList).Error
@@ -1134,11 +876,6 @@ func AddEdbInfoClassifyNoAuthRecordBySourceAndUserIdList(source, edbClassifyType
 
 	// 添加消息
 	if len(addMessageList) > 0 {
-		//_, err = o.InsertMulti(500, addMessageList)
-		//if err != nil {
-		//	return
-		//}
-
 		err = to.CreateInBatches(addMessageList, utils.MultiAddNum).Error
 		if err != nil {
 			return
@@ -1147,11 +884,6 @@ func AddEdbInfoClassifyNoAuthRecordBySourceAndUserIdList(source, edbClassifyType
 
 	// 添加记录
 	if len(addRecordList) > 0 {
-		//_, err = o.InsertMulti(500, addRecordList)
-		//if err != nil {
-		//	return
-		//}
-
 		err = to.CreateInBatches(addRecordList, utils.MultiAddNum).Error
 		if err != nil {
 			return
@@ -1165,8 +897,6 @@ func AddEdbInfoClassifyNoAuthRecordBySourceAndUserIdList(source, edbClassifyType
 		for _, v := range delRecordIdMap {
 			delRecordIdList = append(delRecordIdList, v)
 		}
-		//sql = `DELETE FROM edb_info_classify_permission_no_auth_record WHERE edb_info_classify_permission_no_auth_record_id in (` + utils.GetOrmInReplace(delRecordIdNum) + `) `
-		//_, err = o.Raw(sql, delRecordIdList).Exec()
 		sql = `DELETE FROM edb_info_classify_permission_no_auth_record WHERE edb_info_classify_permission_no_auth_record_id in (` + utils.GetOrmInReplace(delRecordIdNum) + `) `
 		err = to.Exec(sql, delRecordIdList).Error
 	}
@@ -1182,11 +912,6 @@ func AddEdbInfoClassifyNoAuthRecordBySourceAndUserIdList(source, edbClassifyType
 // @param edbClassifyType int
 // @return err error
 func DeleteEdbInfoClassifyNoAuthRecordBySourceAndClassifyIdList(edbClassifyType int) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//
-	//sql := `DELETE FROM edb_info_classify_permission_no_auth_record WHERE edb_classify_type = ?`
-	//_, err = o.Raw(sql, edbClassifyType).Exec()
-
 	sql := `DELETE FROM edb_info_classify_permission_no_auth_record WHERE edb_classify_type = ?`
 	err = global.DmSQL["data"].Exec(sql, edbClassifyType).Error
 
@@ -1206,18 +931,6 @@ func DeleteEdbInfoClassifyNoAuthRecordBySourceAndClassifyIdList(edbClassifyType
 // @return items []*DataPermissionClassifyNoAuthRecord
 // @return err error
 func GetEdbInfoDataPermissionClassifyNoAuthRecordListByUserId(userId int32, edbClassifyType, startSize, pageSize int) (total int, items []*DataPermissionClassifyNoAuthRecord, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//
-	//// 获取总数
-	//sql := `SELECT count(1) AS total FROM edb_info_classify_permission_no_auth_record WHERE sys_user_id = ? AND edb_classify_type = ? `
-	//err = o.Raw(sql, userId, edbClassifyType).QueryRow(&total)
-	//if err != nil {
-	//	return
-	//}
-	//
-	//sql = `SELECT edb_info_classify_permission_no_auth_record_id as data_permission_classify_no_auth_record_id,edb_classify_type as sub_source,op_unique_code,classify_id,classify_name,sys_user_id,create_time  FROM edb_info_classify_permission_no_auth_record WHERE sys_user_id = ? AND edb_classify_type = ? ORDER BY edb_info_classify_permission_no_auth_record_id desc LIMIT ?,? `
-	//_, err = o.Raw(sql, userId, edbClassifyType, startSize, pageSize).QueryRows(&items)
-
 	// 获取总数
 	sql := `SELECT count(1) AS total FROM edb_info_classify_permission_no_auth_record WHERE sys_user_id = ? AND edb_classify_type = ? `
 	err = global.DmSQL["data"].Raw(sql, userId, edbClassifyType).Scan(&total).Error

models/data_manage/data_manage_permission/excel.go

@@ -44,19 +44,6 @@ func SetIsPermissionByExcelClassifyIdList(classifyIdList []int, excelClassifySou
 			_ = o.Commit()
 		}
 	}()
-
-	//// 获取已经配置涉密的分类权限
-	//excelClassifyList := make([]*ExcelClassify, 0)
-	//sql := `SELECT * FROM excel_classify WHERE is_join_permission = ? `
-	//_, err = o.Raw(sql, 1).QueryRows(&excelClassifyList)
-	//if err != nil {
-	//	return
-	//}
-	//excelClassifyMap := make(map[int]*ExcelClassify)
-	//for _, v := range excelClassifyList {
-	//	excelClassifyMap[v.ClassifyId] = v
-	//}
-
 	// 先将所有已经设置了涉密的分类设置为不涉密
 	sql := `UPDATE excel_classify SET is_join_permission=?,modify_time=now() WHERE is_join_permission = 1 AND source = ?`
 	err = o.Exec(sql, 0, excelClassifySource).Error
@@ -783,11 +770,6 @@ func AddExcelInfoClassifyNoAuthRecordBySourceAndUserIdList(source, excelSource i
 	}
 
 	//// 总共的涉密分类
-	//noAuthClassifyInfoNum := len(noAuthClassifyMap)
-	//if noAuthClassifyInfoNum <= 0 {
-	//	return
-	//}
-
 	o := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {

models/data_manage/data_manage_permission/no_auth_record.go

@@ -63,141 +63,6 @@ func AddRecordBySourceAndDataIdList(source, subSource int, dataList []DataItem,
 	return
 }
 
-// AddRecordBySourceAndDataIdList
-// @Description: 添加未授权用户记录
-// @author: Roc
-// @datetime 2024-04-07 15:25:49
-// @param source int
-// @param subSource int
-// @param dataList []DataItem
-// @param noAuthUserIdList []int 未授权用户
-// @param authUserIdList []int 已授权用户
-// @param uniqueCode
-// @param content string
-// @param opUserId int
-// @return err error
-//func AddRecordBySourceAndDataIdList(source, subSource int, dataList []DataItem, noAuthUserIdList, authUserIdList []int, uniqueCode, content string, opUserId int) (err error) {
-//	num := len(dataList)
-//	if num <= 0 {
-//		return
-//	}
-//	dataIdList := make([]string, 0)
-//	for _, v := range dataList {
-//		dataIdList = append(dataIdList, v.DataId)
-//	}
-//	userNum := len(noAuthUserIdList)
-//	if userNum <= 0 {
-//		return
-//	}
-//	o, err := orm.NewOrmUsingDB("data").Begin()
-//	if err != nil {
-//		return
-//	}
-//	defer func() {
-//		if err != nil {
-//			_ = o.Rollback()
-//		} else {
-//			_ = o.Commit()
-//		}
-//	}()
-//
-//	// 根据指标获取已经存在的未授权记录
-//	var existList []*DataPermissionNoAuthRecord
-//	sql := `SELECT * FROM data_permission_no_auth_record WHERE source = ? AND sub_source = ? AND data_id in (` + utils.GetOrmInReplace(num) + `)`
-//	_, err = o.Raw(sql, source, subSource, dataIdList).QueryRows(&existList)
-//	if err != nil {
-//		return
-//	}
-//
-//	// 已经标记了的数据
-//	existMap := make(map[int32]map[string]*DataPermissionNoAuthRecord)
-//	for _, v := range existList {
-//		tmpUserExistMap, ok := existMap[v.SysUserId]
-//		if !ok {
-//			tmpUserExistMap = make(map[string]*DataPermissionNoAuthRecord)
-//		}
-//
-//		key := fmt.Sprint(v.Source, "_", v.SubSource, "_", v.DataId)
-//		tmpUserExistMap[key] = v
-//		existMap[v.SysUserId] = tmpUserExistMap
-//	}
-//
-//	addMessageList := make([]*DataPermissionMessage, 0)
-//	addRecordList := make([]*DataPermissionNoAuthRecord, 0)
-//	for _, userId := range noAuthUserIdList {
-//		isAdd := false
-//
-//		tmpUserExistMap, userExistOk := existMap[int32(userId)]
-//
-//		for _, dataItem := range dataList {
-//			// 判断是否已经存在，已经存在就过滤
-//			if userExistOk {
-//				key := fmt.Sprint(source, "_", subSource, "_", dataItem.DataId)
-//				_, ok := tmpUserExistMap[key]
-//				if ok {
-//					continue
-//				}
-//			}
-//
-//			isAdd = true
-//			addRecordList = append(addRecordList, &DataPermissionNoAuthRecord{
-//				DataPermissionNoAuthRecordId: 0,
-//				Source:                       int32(source),
-//				SubSource:                    int32(subSource),
-//				OpUniqueCode:                 uniqueCode,
-//				DataId:                       dataItem.DataId,
-//				DataCode:                     dataItem.DataCode,
-//				DataName:                     dataItem.DataName,
-//				SysUserId:                    int32(userId),
-//				CreateTime:                   time.Now(),
-//			})
-//		}
-//
-//		// 有记录的话，需要添加消息
-//		if isAdd {
-//			addMessageList = append(addMessageList, &DataPermissionMessage{
-//				DataPermissionMessageId: 0,
-//				SendUserId:              int32(opUserId),
-//				ReceiveUserId:           int32(userId),
-//				Content:                 content,
-//				Remark:                  content,
-//				OpType:                  3,
-//				Source:                  int32(source),
-//				SubSource:               int32(subSource),
-//				OpUniqueCode:            uniqueCode,
-//				IsRead:                  0,
-//				CreateTime:              time.Now(),
-//				ModifyTime:              time.Now(),
-//			})
-//		}
-//	}
-//
-//	// 添加消息
-//	if len(addMessageList) > 0 {
-//		_, err = o.InsertMulti(500, addMessageList)
-//		if err != nil {
-//			return
-//		}
-//	}
-//
-//	// 添加记录
-//	if len(addRecordList) > 0 {
-//		_, err = o.InsertMulti(500, addRecordList)
-//		if err != nil {
-//			return
-//		}
-//	}
-//
-//	// 已经授权了的用户，需要删除未授权记录
-//	authUserIdNum := len(authUserIdList)
-//	if authUserIdNum > 0 {
-//		sql = `DELETE FROM data_permission_no_auth_record WHERE  source = ? AND sub_source = ? AND sys_user_id in (` + utils.GetOrmInReplace(authUserIdNum) + `) AND data_id in (` + utils.GetOrmInReplace(num) + `)`
-//		_, err = o.Raw(sql, source, subSource, authUserIdList, dataIdList).Exec()
-//	}
-//
-//	return
-//}
-
 // DeleteRecordBySourceAndDataIdList
 // @Description: 根据来源和数据id列表删除记录
 // @author: Roc
@@ -229,55 +94,6 @@ func DeleteRecordBySourceAndDataIdList(source, subSource int, dataIdList []strin
 	return
 }
 
-// DeleteRecordBySourceAndDataIdList
-// @Description: 根据来源和数据id列表删除记录
-// @author: Roc
-// @datetime 2024-04-07 14:47:37
-// @param source int
-// @param subSource int
-// @param dataIdList []string
-// @return err error
-//func DeleteRecordBySourceAndDataIdList(source, subSource int, dataIdList []string) (err error) {
-//	num := len(dataIdList)
-//	if num <= 0 {
-//		return
-//	}
-//	o := orm.NewOrmUsingDB("data")
-//
-//	sql := `DELETE FROM data_permission_no_auth_record WHERE source = ? AND sub_source = ? AND data_id in (` + utils.GetOrmInReplace(num) + `)`
-//	_, err = o.Raw(sql, source, subSource, dataIdList).Exec()
-//
-//	return
-//}
-
-// GetDataPermissionNoAuthRecordListByUserId
-// @Description: 根据用户获取未授权的资产记录
-// @author: Roc
-// @datetime 2024-04-07 20:15:01
-// @param userId int
-// @param source int
-// @param subSource int
-// @param startSize int
-// @param pageSize int
-// @return total int
-// @return items []*DataPermissionNoAuthRecord
-// @return err error
-//func GetDataPermissionNoAuthRecordListByUserId(userId, source, subSource int32, startSize, pageSize int) (total int, items []*DataPermissionNoAuthRecord, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//
-//	// 获取总数
-//	sql := `SELECT count(1) AS total FROM data_permission_no_auth_record WHERE sys_user_id = ? AND source = ? AND sub_source = ? `
-//	err = o.Raw(sql, userId, source, subSource).QueryRow(&total)
-//	if err != nil {
-//		return
-//	}
-//
-//	sql = `SELECT * FROM data_permission_no_auth_record WHERE sys_user_id = ? AND source = ? AND sub_source = ? ORDER BY data_permission_no_auth_record_id desc LIMIT ?,? `
-//	_, err = o.Raw(sql, userId, source, subSource, startSize, pageSize).QueryRows(&items)
-//
-//	return
-//}
-
 // GetDataPermissionNoAuthRecordListByUserId
 // @Description: 根据用户获取未授权的资产记录
 // @author: Roc

models/data_manage/edb_refresh/edb_refresh_config.go

@@ -32,13 +32,6 @@ func (m *EdbRefreshConfig) Add() (err error) {
 		err = errors.New("该配置已存在")
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//lastId, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.EdbRefreshConfigId = int(lastId)
-
 	err = global.DmSQL["data"].Create(m).Error
 	return
 }
@@ -51,8 +44,6 @@ func (m *EdbRefreshConfig) Add() (err error) {
 // @param cols []string
 // @return err error
 func (m *EdbRefreshConfig) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(m, cols...)
 	err = global.DmSQL["data"].Select(cols).Updates(m).Error
 	return
 }
@@ -64,9 +55,6 @@ func (m *EdbRefreshConfig) Update(cols []string) (err error) {
 // @datetime 2023-12-14 16:11:10
 // @return err error
 func (m *EdbRefreshConfig) Delete() (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Delete(m)
-
 	sql := ` DELETE FROM edb_refresh_config WHERE edb_refresh_config_id=?`
 	err = global.DmSQL["data"].Exec(sql, m.EdbRefreshConfigId).Error
 	return
@@ -84,11 +72,6 @@ func (m *EdbRefreshConfig) Delete() (err error) {
 // @return item *EdbRefreshConfig
 // @return err error
 func GetEdbRefreshConfigListByCondition(refreshFrequency, refreshTime string, refreshFrequencyDay, refreshAllData, refreshDataNum int) (item *EdbRefreshConfig, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM edb_refresh_config
-	//     WHERE refresh_frequency = ? AND refresh_frequency_day = ? AND refresh_time = ? AND refresh_all_data = ? AND refresh_data_num = ? ORDER BY edb_refresh_config_id ASC `
-	//err = o.Raw(sql, refreshFrequency, refreshFrequencyDay, refreshTime, refreshAllData, refreshDataNum).QueryRow(&item)
-
 	sql := `SELECT * FROM edb_refresh_config
 	     WHERE refresh_frequency = ? AND refresh_frequency_day = ? AND refresh_time = ? AND refresh_all_data = ? AND refresh_data_num = ? ORDER BY edb_refresh_config_id ASC `
 
@@ -113,18 +96,6 @@ func SaveEdbRefreshConfig(source, subSource, sysUserId int, sysUserRealName stri
 	if num <= 0 {
 		return
 	}
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//		return
-	//	}
-	//	_ = o.Commit()
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -136,12 +107,6 @@ func SaveEdbRefreshConfig(source, subSource, sysUserId int, sysUserRealName stri
 	}()
 
 	for _, v := range newConfigList {
-		//lastId, tmpErr := o.Insert(v)
-		//if tmpErr != nil {
-		//	err = tmpErr
-		//	return
-		//}
-
 		tmpErr := to.Create(v).Error
 		if tmpErr != nil {
 			err = tmpErr
@@ -164,9 +129,6 @@ func SaveEdbRefreshConfig(source, subSource, sysUserId int, sysUserRealName stri
 	}
 
 	// 先删除
-	//sql := `DELETE FROM edb_refresh_mapping WHERE source =? AND sub_source =? AND edb_info_id in (` + utils.GetOrmInReplace(num) + `)`
-	//_, err = o.Raw(sql, source, subSource, edbIdList).Exec()
-
 	sql := `DELETE FROM edb_refresh_mapping WHERE source =? AND sub_source =? AND edb_info_id in (` + utils.GetOrmInReplace(num) + `)`
 	err = to.Exec(sql, source, subSource, edbIdList).Error
 
@@ -178,10 +140,6 @@ func SaveEdbRefreshConfig(source, subSource, sysUserId int, sysUserRealName stri
 			tmpAddDataList = append(tmpAddDataList, v)
 			i++
 			if i >= 500 {
-				//_, err = o.InsertMulti(len(tmpAddDataList), tmpAddDataList)
-				//if err != nil {
-				//	return
-				//}
 				err = to.CreateInBatches(tmpAddDataList, utils.MultiAddNum).Error
 				if err != nil {
 					return
@@ -193,11 +151,6 @@ func SaveEdbRefreshConfig(source, subSource, sysUserId int, sysUserRealName stri
 		}
 
 		if len(tmpAddDataList) > 0 {
-			//_, err = o.InsertMulti(len(tmpAddDataList), tmpAddDataList)
-			//if err != nil {
-			//	return
-			//}
-
 			err = to.CreateInBatches(tmpAddDataList, utils.MultiAddNum).Error
 			if err != nil {
 				return
@@ -229,12 +182,6 @@ type EdbRefreshConfigItem struct {
 // @return list []*EdbRefreshDefaultConfig
 // @return err error
 func GetEdbRefreshConfigListBySourceAndeEdbInfoId(source, subSource, edbInfoId int) (list []*EdbRefreshConfigItem, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT a.* FROM edb_refresh_config a
-	//     JOIN  edb_refresh_mapping b ON a.edb_refresh_config_id = b.edb_refresh_config_id
-	//     WHERE b.source = ? AND b.sub_source = ? AND b.edb_info_id = ? ORDER BY a.edb_refresh_config_id ASC `
-	//_, err = o.Raw(sql, source, subSource, edbInfoId).QueryRows(&list)
-
 	sql := `SELECT a.* FROM edb_refresh_config a 
 	    JOIN  edb_refresh_mapping b ON a.edb_refresh_config_id = b.edb_refresh_config_id
 	    WHERE b.source = ? AND b.sub_source = ? AND b.edb_info_id = ? ORDER BY a.edb_refresh_config_id ASC `
@@ -270,12 +217,6 @@ func GetEdbRefreshConfigAndEdbListBySourceAndeEdbInfoId(source, subSource int, e
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT a.*,b.source,b.sub_source,b.edb_info_id FROM edb_refresh_config a
-	//     JOIN  edb_refresh_mapping b ON a.edb_refresh_config_id = b.edb_refresh_config_id
-	//     WHERE b.source = ? AND b.sub_source = ? AND b.edb_info_id in (` + utils.GetOrmInReplace(num) + `)  ORDER BY a.edb_refresh_config_id ASC `
-	//_, err = o.Raw(sql, source, subSource, edbInfoIdList).QueryRows(&list)
-
 	sql := `SELECT a.*,b.source,b.sub_source,b.edb_info_id FROM edb_refresh_config a 
 	    JOIN  edb_refresh_mapping b ON a.edb_refresh_config_id = b.edb_refresh_config_id
 	    WHERE b.source = ? AND b.sub_source = ? AND b.edb_info_id in (` + utils.GetOrmInReplace(num) + `)  ORDER BY a.edb_refresh_config_id ASC `

models/data_manage/edb_refresh/edb_refresh_default_config.go

@@ -35,12 +35,6 @@ func (m *EdbRefreshDefaultConfig) Add() (err error) {
 		err = errors.New("该配置已存在")
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//lastId, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.Id = int(lastId)
 	err = global.DmSQL["data"].Create(m).Error
 	return
 }
@@ -53,8 +47,6 @@ func (m *EdbRefreshDefaultConfig) Add() (err error) {
 // @param cols []string
 // @return err error
 func (m *EdbRefreshDefaultConfig) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(m, cols...)
 	err = global.DmSQL["data"].Select(cols).Updates(m).Error
 	return
 }
@@ -66,9 +58,6 @@ func (m *EdbRefreshDefaultConfig) Update(cols []string) (err error) {
 // @datetime 2023-12-14 16:11:10
 // @return err error
 func (m *EdbRefreshDefaultConfig) Delete() (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Delete(m)
-
 	sql := ` DELETE FROM edb_refresh_default_config WHERE id=? `
 	err = global.DmSQL["data"].Exec(sql, m.Id).Error
 	return
@@ -84,11 +73,6 @@ func (m *EdbRefreshDefaultConfig) Delete() (err error) {
 // @return list []*EdbRefreshDefaultConfig
 // @return err error
 func GetListBySourceAndFrequency(source, subSource int, frequency string) (list []*EdbRefreshDefaultConfig, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM edb_refresh_default_config
-	//     WHERE source = ? AND sub_source = ? AND frequency = ? ORDER BY id ASC `
-	//_, err = o.Raw(sql, source, subSource, frequency).QueryRows(&list)
-
 	sql := `SELECT * FROM edb_refresh_default_config
 	    WHERE source = ? AND sub_source = ? AND frequency = ? ORDER BY id ASC `
 	err = global.DmSQL["data"].Raw(sql, source, subSource, frequency).Find(&list).Error
@@ -104,11 +88,6 @@ func GetListBySourceAndFrequency(source, subSource int, frequency string) (list
 // @return list []*EdbRefreshDefaultConfig
 // @return err error
 func GetAllListBySourceList(source, subSource int) (list []*EdbRefreshDefaultConfig, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM edb_refresh_default_config
-	//     WHERE source = ? AND sub_source = ? ORDER BY id ASC `
-	//_, err = o.Raw(sql, source, subSource).QueryRows(&list)
-
 	sql := `SELECT * FROM edb_refresh_default_config
 	    WHERE source = ? AND sub_source = ? ORDER BY id ASC `
 	err = global.DmSQL["data"].Raw(sql, source, subSource).Find(&list).Error
@@ -125,18 +104,6 @@ func GetAllListBySourceList(source, subSource int) (list []*EdbRefreshDefaultCon
 // @param newList []*EdbRefreshDefaultConfig
 // @return err error
 func SaveEdbRefreshDefaultConfig(source, subSource int, frequency string, newList []*EdbRefreshDefaultConfig) (err error) {
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//		return
-	//	}
-	//	_ = o.Commit()
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -147,13 +114,6 @@ func SaveEdbRefreshDefaultConfig(source, subSource int, frequency string, newLis
 		}
 	}()
 
-	//// 先删除
-	//sql := `DELETE FROM edb_refresh_default_config WHERE source =? AND sub_source =? AND frequency =?`
-	//_, err = o.Raw(sql, source, subSource, frequency).Exec()
-	//
-	//// 再写入
-	//_, err = o.InsertMulti(len(newList), newList)
-
 	sql := `DELETE FROM edb_refresh_default_config WHERE source =? AND sub_source =? AND frequency =?`
 	err = to.Exec(sql, source, subSource, frequency).Error
 	if err != nil {

models/data_manage/edb_refresh/edb_refresh_mapping.go

@@ -32,12 +32,6 @@ func (m *EdbRefreshMapping) Add() (err error) {
 		err = errors.New("该配置已存在")
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//lastId, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.EdbRefreshMappingId = int(lastId)
 	err = global.DmSQL["data"].Create(m).Error
 	return
 }
@@ -50,8 +44,6 @@ func (m *EdbRefreshMapping) Add() (err error) {
 // @param cols []string
 // @return err error
 func (m *EdbRefreshMapping) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(m, cols...)
 	err = global.DmSQL["data"].Select(cols).Updates(m).Error
 	return
 }
@@ -63,9 +55,6 @@ func (m *EdbRefreshMapping) Update(cols []string) (err error) {
 // @datetime 2023-12-14 16:11:10
 // @return err error
 func (m *EdbRefreshMapping) Delete() (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Delete(m)
-
 	sql := ` DELETE FROM edb_refresh_mapping WHERE edb_refresh_mapping_id=? `
 	err = global.DmSQL["data"].Exec(sql, m.EdbRefreshConfigId).Error
 	return

models/data_manage/edb_refresh/edb_refresh_source.go

@@ -40,10 +40,6 @@ type EdbRefreshSourceList struct {
 // @return items []*EdbRefreshSource
 // @return err error
 func (m EdbRefreshSource) GetAllList() (items []*EdbRefreshSource, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT *  FROM edb_refresh_source ORDER BY id ASC `
-	//_, err = o.Raw(sql).QueryRows(&items)
-
 	sql := ` SELECT *  FROM edb_refresh_source ORDER BY id ASC `
 	err = global.DmSQL["data"].Raw(sql).Find(&items).Error
 	return

models/data_manage/excel/excel_chart_data.go

@@ -26,26 +26,18 @@ func (e *ExcelChartData) TableName() string {
 
 // 新增
 func (e *ExcelChartData) Add() (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Insert(e)
-	//return
 	err = global.DmSQL["data"].Create(e).Error
 	return
 }
 
 // 修改
 func (e *ExcelChartData) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(e, cols...)
 	err = global.DmSQL["data"].Select(cols).Updates(e).Error
 	return
 }
 
 // 删除
 func (e *ExcelChartData) Delete() (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Delete(e)
-
 	sql := ` DELETE FROM excel_chart_data WHERE excel_chart_data_id=? `
 	err = global.DmSQL["data"].Exec(sql, e.ExcelChartDataId).Error
 	return
@@ -53,13 +45,6 @@ func (e *ExcelChartData) Delete() (err error) {
 
 // 查询
 func GetExcelChartDataByExcelInfoId(excelInfoId int) (list []*ExcelChartData, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT *
-	//         FROM excel_chart_data
-	//		 WHERE excel_info_id=?
-	//         ORDER BY excel_chart_edb_id ASC, data_time desc, excel_chart_data_id ASC `
-	//_, err = o.Raw(sql, excelInfoId).QueryRows(&list)
-
 	sql := ` SELECT *
 	        FROM excel_chart_data
 			 WHERE excel_info_id=? 
@@ -69,18 +54,6 @@ func GetExcelChartDataByExcelInfoId(excelInfoId int) (list []*ExcelChartData, er
 }
 
 func BatchUpdateChartEdbData(excelInfoId int, excelEdbMap map[int]*ExcelChartEdb, excelDataMap map[int][]*data_manage.EdbDataList) (err error) {
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//	} else {
-	//		_ = o.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -90,14 +63,6 @@ func BatchUpdateChartEdbData(excelInfoId int, excelEdbMap map[int]*ExcelChartEdb
 			_ = to.Commit()
 		}
 	}()
-
-	//如果有数据则删除所有的数据
-	//sql := `delete from excel_chart_data where excel_info_id = ?`
-	//_, err = o.Raw(sql, excelInfoId).Exec()
-	//if err != nil {
-	//	return
-	//}
-
 	sql := `delete from excel_chart_data where excel_info_id = ?`
 	err = to.Exec(sql, excelInfoId).Error
 	if err != nil {
@@ -126,12 +91,6 @@ func BatchUpdateChartEdbData(excelInfoId int, excelEdbMap map[int]*ExcelChartEdb
 			addList = append(addList, chartData)
 			// data信息入库
 			if len(addList) > 1000 {
-				//_, err = o.InsertMulti(len(addList), addList)
-				//if err != nil {
-				//	return
-				//}
-				//addList = addList[:0]
-
 				err = to.CreateInBatches(addList, utils.MultiAddNum).Error
 				if err != nil {
 					return
@@ -143,11 +102,6 @@ func BatchUpdateChartEdbData(excelInfoId int, excelEdbMap map[int]*ExcelChartEdb
 
 	// data信息入库
 	if len(addList) > 0 {
-		//_, err = o.InsertMulti(len(addList), addList)
-		//if err != nil {
-		//	return
-		//}
-
 		err = to.CreateInBatches(addList, utils.MultiAddNum).Error
 		if err != nil {
 			return
@@ -157,13 +111,6 @@ func BatchUpdateChartEdbData(excelInfoId int, excelEdbMap map[int]*ExcelChartEdb
 }
 
 func GetExcelChartDataByChartInfoId(chartInfoId int) (list []*ExcelChartData, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT *
-	//         FROM excel_chart_Data
-	//		 WHERE chart_info_id=?
-	//         ORDER BY excel_chart_edb_id ASC `
-	//_, err = o.Raw(sql, chartInfoId).QueryRows(&list)
-
 	sql := ` SELECT *
 	        FROM excel_chart_Data
 			 WHERE chart_info_id=? 

models/data_manage/excel/excel_chart_edb.go

@@ -45,14 +45,7 @@ type ExcelChartEdbView struct {
 	EdbName         string `description:"指标名称"`
 	DateSequenceStr string `description:"日期序列选区"`
 	DataSequenceStr string `description:"数据序列选区"`
-	/*MaxData         float64 `description:"上限"`
-	MinData         float64 `description:"下限"`
-	IsOrder         bool    `description:"true:正序,false:逆序"`
-	IsAxis          int     `description:"true:左轴,false:右轴"`
-	EdbInfoType     int     `description:"true:标准指标,false:领先指标"`
-	LeadValue       int     `description:"领先值"`
-	LeadUnit        string  `description:"领先单位"`*/
-	FromTag string `description:"标签"`
+	FromTag         string `description:"标签"`
 }
 
 type BalanceTableChart struct {
@@ -71,7 +64,6 @@ type BalanceTableChart struct {
 	ChartImage        string `description:"封面图" json:"-"`
 	SeasonExtraConfig string `description:"季节性图表中的配置,json数据"`
 	SourcesFrom       string `description:"图表来源"`
-	//	ChartEdbInfoList  []ExcelChartEdbView
 }
 
 func (e *ExcelChartEdb) TableName() string {
@@ -80,24 +72,18 @@ func (e *ExcelChartEdb) TableName() string {
 
 // 新增
 func (e *ExcelChartEdb) Add() (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Insert(e)
 	err = global.DmSQL["data"].Create(e).Error
 	return
 }
 
 // 修改
 func (e *ExcelChartEdb) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(e, cols...)
 	err = global.DmSQL["data"].Select(cols).Updates(e).Error
 	return
 }
 
 // 删除
 func (e *ExcelChartEdb) Delete() (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Delete(e)
 	sql := ` DELETE FROM excel_chart_edb WHERE excel_chart_edb_id=? `
 	err = global.DmSQL["data"].Exec(sql, e.ExcelChartEdbId).Error
 	return
@@ -110,18 +96,6 @@ type AddChartEdbAndDataItem struct {
 
 // 同时添加指标和指标数据
 func (e *ExcelChartEdb) AddChartEdbAndData(list []*AddChartEdbAndDataItem, chartInfo *data_manage.ChartInfo, deleteEdbIds []int) (err error) {
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//	} else {
-	//		_ = o.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -134,13 +108,6 @@ func (e *ExcelChartEdb) AddChartEdbAndData(list []*AddChartEdbAndDataItem, chart
 
 	// 先删除原先的绑定的指标
 	if len(deleteEdbIds) > 0 && chartInfo.ChartInfoId > 0 {
-		//sql := `DELETE FROM excel_chart_edb WHERE chart_info_id = ? AND excel_chart_edb_id in (` + utils.GetOrmInReplace(len(deleteEdbIds)) + `)`
-		//_, err = o.Raw(sql, chartInfo.ChartInfoId, deleteEdbIds).Exec()
-		//if err != nil {
-		//	err = fmt.Errorf("删除原先的指标失败：%v", err)
-		//	return
-		//}
-
 		sql := `DELETE FROM excel_chart_edb WHERE chart_info_id = ? AND excel_chart_edb_id in (` + utils.GetOrmInReplace(len(deleteEdbIds)) + `)`
 		err = to.Exec(sql, chartInfo.ChartInfoId, deleteEdbIds).Error
 		if err != nil {
@@ -163,12 +130,6 @@ func (e *ExcelChartEdb) AddChartEdbAndData(list []*AddChartEdbAndDataItem, chart
 	//新增图表
 	chartInfoId := chartInfo.ChartInfoId
 	if chartInfo.ChartInfoId <= 0 {
-		//lastId, e := o.Insert(chartInfo)
-		//if e != nil {
-		//	err = fmt.Errorf("新增图表失败，AddChartEdbAndData: %v", e)
-		//	return
-		//}
-		//chartInfoId = int(lastId)
 		e := to.Create(chartInfo).Error
 		if e != nil {
 			err = fmt.Errorf("新增图表失败，AddChartEdbAndData: %v", e)
@@ -176,12 +137,6 @@ func (e *ExcelChartEdb) AddChartEdbAndData(list []*AddChartEdbAndDataItem, chart
 		}
 		chartInfoId = chartInfo.ChartInfoId
 	} else {
-		//_, err = o.Update(chartInfo)
-		//if err != nil {
-		//	err = fmt.Errorf("更新图表失败，AddChartEdbAndData: %v", e)
-		//	return
-		//}
-
 		err = to.Updates(chartInfo).Error
 		if err != nil {
 			err = fmt.Errorf("更新图表失败，AddChartEdbAndData: %v", e)
@@ -190,13 +145,6 @@ func (e *ExcelChartEdb) AddChartEdbAndData(list []*AddChartEdbAndDataItem, chart
 	}
 
 	//更新图表id
-	//sql := `update excel_chart_edb set chart_info_id = ? where excel_chart_edb_id in (` + utils.GetOrmInReplace(len(updateIds)) + `) and chart_info_id=0`
-	//_, err = o.Raw(sql, chartInfoId, updateIds).Exec()
-	//if err != nil {
-	//	err = fmt.Errorf("更新图表id失败，AddChartEdbAndData: %v", err)
-	//	return
-	//}
-
 	sql := `update excel_chart_edb set chart_info_id = ? where excel_chart_edb_id in (` + utils.GetOrmInReplace(len(updateIds)) + `) and chart_info_id=0`
 	err = to.Exec(sql, chartInfoId, updateIds).Error
 	if err != nil {
@@ -207,21 +155,12 @@ func (e *ExcelChartEdb) AddChartEdbAndData(list []*AddChartEdbAndDataItem, chart
 	if len(edbInfoIdArrStr) > 0 {
 		edbInfoIdStr := strings.Join(edbInfoIdArrStr, ",")
 		//更新图表关联的指标id
-		//sql = `update chart_info set edb_info_ids = ? where chart_info_id = ?`
-		//_, err = o.Raw(sql, edbInfoIdStr, chartInfoId).Exec()
-
 		sql = `update chart_info set edb_info_ids = ? where chart_info_id = ?`
 		err = to.Exec(sql, edbInfoIdStr, chartInfoId).Error
 	}
 
 	if len(updateIds) > 0 {
 		//更新图表数据
-		//sql = `update excel_chart_data set chart_info_id = ? where excel_chart_edb_id in (` + utils.GetOrmInReplace(len(updateIds)) + `) and chart_info_id=0`
-		//_, err = o.Raw(sql, chartInfoId, updateIds).Exec()
-		//if err != nil {
-		//	err = fmt.Errorf("更新图表id失败，AddChartEdbAndData: %v", err)
-		//	return
-		//}
 		sql = `update excel_chart_data set chart_info_id = ? where excel_chart_edb_id in (` + utils.GetOrmInReplace(len(updateIds)) + `) and chart_info_id=0`
 		err = to.Exec(sql, chartInfoId, updateIds).Error
 		if err != nil {
@@ -243,24 +182,12 @@ func addChartEdbAndData(o *gorm.DB, chartEdb *ExcelChartEdb, dataList []*ExcelCh
 		}
 		excelChartEdbId = chartEdb.ExcelChartEdbId
 	} else {
-		//_, e := o.Update(chartEdb)
-		//if e != nil {
-		//	err = fmt.Errorf("更新指标失败，addChartEdbAndData: %v", e)
-		//	return
-		//}
-
 		e := o.Updates(chartEdb).Error
 		if e != nil {
 			err = fmt.Errorf("更新指标失败，addChartEdbAndData: %v", e)
 			return
 		}
 		//如果有数据则删除所有的数据
-		//sql := `delete from excel_chart_data where excel_chart_edb_id = ?`
-		//_, err = o.Raw(sql, excelChartEdbId).Exec()
-		//if err != nil {
-		//	return
-		//}
-
 		sql := `delete from excel_chart_data where excel_chart_edb_id = ?`
 		err = o.Exec(sql, excelChartEdbId).Error
 		if err != nil {
@@ -287,12 +214,6 @@ func addChartEdbAndData(o *gorm.DB, chartEdb *ExcelChartEdb, dataList []*ExcelCh
 			addList = append(addList, chartData)
 			// data信息入库
 			if len(addList) > 1000 {
-				//_, err = o.InsertMulti(len(addList), addList)
-				//if err != nil {
-				//	return
-				//}
-				//addList = addList[:0]
-
 				err = o.CreateInBatches(addList, utils.MultiAddNum).Error
 				if err != nil {
 					return
@@ -304,11 +225,6 @@ func addChartEdbAndData(o *gorm.DB, chartEdb *ExcelChartEdb, dataList []*ExcelCh
 
 	// data信息入库
 	if len(addList) > 0 {
-		//_, err = o.InsertMulti(len(addList), addList)
-		//if err != nil {
-		//	return
-		//}
-
 		err = o.CreateInBatches(addList, utils.MultiAddNum).Error
 		if err != nil {
 			return
@@ -318,13 +234,6 @@ func addChartEdbAndData(o *gorm.DB, chartEdb *ExcelChartEdb, dataList []*ExcelCh
 }
 
 func GetExcelChartEdbMappingByExcelInfoId(excelInfoId int) (list []*ExcelChartEdb, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT *
-	//         FROM excel_chart_edb
-	//		 WHERE excel_info_id=?
-	//         ORDER BY chart_info_id asc, excel_chart_edb_id ASC `
-	//_, err = o.Raw(sql, excelInfoId).QueryRows(&list)
-
 	sql := ` SELECT *
 	        FROM excel_chart_edb
 			 WHERE excel_info_id=?
@@ -334,12 +243,6 @@ func GetExcelChartEdbMappingByExcelInfoId(excelInfoId int) (list []*ExcelChartEd
 }
 
 func GetExcelChartEdbMappingByExcelInfoIds(excelInfoIds []int) (list []*ExcelChartEdb, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT *
-	//         FROM excel_chart_edb
-	//		 WHERE excel_info_id in (` + utils.GetOrmInReplace(len(excelInfoIds)) + `)`
-	//_, err = o.Raw(sql, excelInfoIds).QueryRows(&list)
-
 	sql := ` SELECT *
 	        FROM excel_chart_edb 
 			 WHERE excel_info_id in (` + utils.GetOrmInReplace(len(excelInfoIds)) + `)`
@@ -348,23 +251,12 @@ func GetExcelChartEdbMappingByExcelInfoIds(excelInfoIds []int) (list []*ExcelCha
 }
 
 func GetExcelChartEdbById(id int) (item *ExcelChartEdb, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM excel_chart_edb WHERE excel_chart_edb_id=? `
-	//err = o.Raw(sql, id).QueryRow(&item)
-
 	sql := ` SELECT * FROM excel_chart_edb WHERE excel_chart_edb_id=? `
 	err = global.DmSQL["data"].Raw(sql, id).Find(&item).Error
 	return
 }
 
 func GetExcelChartEdbMappingByChartInfoId(chartInfoId int) (list []*ExcelChartEdb, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT *
-	//         FROM excel_chart_edb
-	//		 WHERE chart_info_id=?
-	//         ORDER BY excel_chart_edb_id ASC `
-	//_, err = o.Raw(sql, chartInfoId).QueryRows(&list)
-
 	sql := ` SELECT *
 	        FROM excel_chart_edb 
 			 WHERE chart_info_id=? 
@@ -374,12 +266,6 @@ func GetExcelChartEdbMappingByChartInfoId(chartInfoId int) (list []*ExcelChartEd
 }
 
 func GetExcelInfoByChartInfoId(chartInfoId int) (item *ExcelInfo, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT i.*
-	//         FROM excel_chart_edb e left join excel_info i on e.excel_info_id=i.excel_info_id
-	//		 WHERE e.chart_info_id=? limit 1`
-	//err = o.Raw(sql, chartInfoId).QueryRow(&item)
-
 	sql := ` SELECT i.*
 	        FROM excel_chart_edb e left join excel_info i on e.excel_info_id=i.excel_info_id
 			 WHERE e.chart_info_id=? limit 1`
@@ -389,18 +275,6 @@ func GetExcelInfoByChartInfoId(chartInfoId int) (item *ExcelInfo, err error) {
 
 // 同时删除指标和指标数据
 func DeleteExcelChartEdbAndData(excelInfoIds []int, chartInfoIds []int) (err error) {
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//	} else {
-	//		_ = o.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -421,13 +295,6 @@ func DeleteExcelChartEdbAndData(excelInfoIds []int, chartInfoIds []int) (err err
 	}
 	// 把删除图表状态
 	if len(chartInfoIds) > 0 {
-		//sql := `DELETE FROM chart_info WHERE  chart_info_id in (` + utils.GetOrmInReplace(len(chartInfoIds)) + `)`
-		//_, err = o.Raw(sql, chartInfoIds).Exec()
-		//if err != nil {
-		//	err = fmt.Errorf("删除原先的指标失败：%v", err)
-		//	return
-		//}
-
 		sql := `DELETE FROM chart_info WHERE  chart_info_id in (` + utils.GetOrmInReplace(len(chartInfoIds)) + `)`
 		err = to.Exec(sql, chartInfoIds).Error
 		if err != nil {
@@ -438,13 +305,6 @@ func DeleteExcelChartEdbAndData(excelInfoIds []int, chartInfoIds []int) (err err
 		// todo 如果加入到我的图库中，则删除我的图库中的数据
 	}
 	// 删除原先的绑定的指标
-	//sql = `DELETE FROM excel_chart_edb WHERE  excel_info_id in (` + utils.GetOrmInReplace(len(excelInfoIds)) + `)`
-	//_, err = o.Raw(sql, excelInfoIds).Exec()
-	//if err != nil {
-	//	err = fmt.Errorf("删除原先的指标失败：%v", err)
-	//	return
-	//}
-
 	sql = `DELETE FROM excel_chart_edb WHERE  excel_info_id in (` + utils.GetOrmInReplace(len(excelInfoIds)) + `)`
 	err = to.Exec(sql, excelInfoIds).Error
 	if err != nil {
@@ -453,13 +313,6 @@ func DeleteExcelChartEdbAndData(excelInfoIds []int, chartInfoIds []int) (err err
 	}
 
 	// 删除指标数据
-	//sql = `DELETE FROM excel_chart_data WHERE  excel_info_id in (` + utils.GetOrmInReplace(len(excelInfoIds)) + `)`
-	//_, err = o.Raw(sql, excelInfoIds).Exec()
-	//if err != nil {
-	//	err = fmt.Errorf("删除原先的指标失败：%v", err)
-	//	return
-	//}
-
 	sql = `DELETE FROM excel_chart_data WHERE  excel_info_id in (` + utils.GetOrmInReplace(len(excelInfoIds)) + `)`
 	err = to.Exec(sql, excelInfoIds).Error
 	if err != nil {
@@ -471,19 +324,6 @@ func DeleteExcelChartEdbAndData(excelInfoIds []int, chartInfoIds []int) (err err
 
 // 删除平衡表中的指标和数据
 func DeleteBalanceExcelChartInfoAndData(chartInfoId int) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = to.Rollback()
-	//	} else {
-	//		_ = to.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -494,26 +334,12 @@ func DeleteBalanceExcelChartInfoAndData(chartInfoId int) (err error) {
 		}
 	}()
 
-	//sql := ` DELETE FROM chart_info WHERE chart_info_id=? `
-	//_, err = to.Raw(sql, chartInfoId).Exec()
-	//if err != nil {
-	//	err = fmt.Errorf("删除平衡表图表失败 %s", err.Error())
-	//	return
-	//}
 	sql := ` DELETE FROM chart_info WHERE chart_info_id=? `
 	err = to.Exec(sql, chartInfoId).Error
 	if err != nil {
 		err = fmt.Errorf("删除平衡表图表失败 %s", err.Error())
 		return
 	}
-
-	//sql = ` DELETE FROM  excel_chart_edb WHERE chart_info_id=? `
-	//_, err = to.Raw(sql, chartInfoId).Exec()
-	//if err != nil {
-	//	err = fmt.Errorf("删除平衡表图表指标失败 %s", err.Error())
-	//	return
-	//}
-
 	sql = ` DELETE FROM  excel_chart_edb WHERE chart_info_id=? `
 	err = to.Exec(sql, chartInfoId).Error
 	if err != nil {
@@ -522,12 +348,6 @@ func DeleteBalanceExcelChartInfoAndData(chartInfoId int) (err error) {
 	}
 
 	// 删除表格里的数据
-	//sql = ` DELETE FROM  excel_chart_data WHERE chart_info_id=? `
-	//_, err = to.Raw(sql, chartInfoId).Exec()
-	//if err != nil {
-	//	err = fmt.Errorf("删除平衡表图表指标失败 %s", err.Error())
-	//	return
-	//}
 	sql = ` DELETE FROM  excel_chart_data WHERE chart_info_id=? `
 	err = to.Exec(sql, chartInfoId).Error
 	if err != nil {

models/data_manage/excel/excel_classify.go

@@ -31,32 +31,18 @@ type ExcelClassify struct {
 
 // AddExcelClassify 添加excel分类
 func AddExcelClassify(item *ExcelClassify) (lastId int64, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//lastId, err = o.Insert(item)
-	//if err != nil {
-	//	return
-	//}
-	//item.ExcelClassifyId = int(lastId)
 	err = global.DmSQL["data"].Create(item).Error
 	return
 }
 
 // GetExcelClassifyCount 获取同级分类下存在同名分类的数量
 func GetExcelClassifyCount(ExcelClassifyName string, parentId, source int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT COUNT(1) AS count FROM excel_classify WHERE parent_id=? AND source = ? AND excel_classify_name=? AND is_delete=0 `
-	//err = o.Raw(sql, parentId, source, ExcelClassifyName).QueryRow(&count)
-
 	sql := `SELECT COUNT(1) AS count FROM excel_classify WHERE parent_id=? AND source = ? AND excel_classify_name=? AND is_delete=0 `
 	err = global.DmSQL["data"].Raw(sql, parentId, source, ExcelClassifyName).Scan(&count).Error
 	return
 }
 
 func GetExcelClassifyById(classifyId int) (item *ExcelClassify, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM excel_classify WHERE excel_classify_id=? AND is_delete=0 `
-	//err = o.Raw(sql, classifyId).QueryRow(&item)
-
 	sql := `SELECT * FROM excel_classify WHERE excel_classify_id=? AND is_delete=0 `
 	err = global.DmSQL["data"].Raw(sql, classifyId).First(&item).Error
 	return
@@ -74,10 +60,6 @@ func GetExcelClassifyByIdList(classifyIdList []int) (items []*ExcelClassify, err
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM excel_classify WHERE excel_classify_id in (` + utils.GetOrmInReplace(num) + `) AND is_delete=0 `
-	//_, err = o.Raw(sql, classifyIdList).QueryRows(&items)
-
 	sql := `SELECT * FROM excel_classify WHERE excel_classify_id in (` + utils.GetOrmInReplace(num) + `) AND is_delete=0 `
 	err = global.DmSQL["data"].Raw(sql, classifyIdList).Find(&items).Error
 	return
@@ -91,63 +73,34 @@ func GetExcelClassifyByIdList(classifyIdList []int) (items []*ExcelClassify, err
 // @return items []*ExcelClassify
 // @return err error
 func GetExcelClassifyBySourceAndIsJoinPermission(source, isJoinPermission int) (items []*ExcelClassify, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM excel_classify WHERE source = ? AND is_join_permission = ? `
-	//_, err = o.Raw(sql, source, isJoinPermission).QueryRows(&items)
-
 	sql := `SELECT * FROM excel_classify WHERE source = ? AND is_join_permission = ? `
 	err = global.DmSQL["data"].Raw(sql, source, isJoinPermission).Find(&items).Error
 	return
 }
 
 func GetChildClassifyById(classifyId int) (items []*ExcelClassify, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM excel_classify WHERE parent_id=? AND is_delete=0 `
-	//_, err = o.Raw(sql, classifyId).QueryRows(&items)
-
 	sql := `SELECT * FROM excel_classify WHERE parent_id=? AND is_delete=0 `
 	err = global.DmSQL["data"].Raw(sql, classifyId).Find(&items).Error
 	return
 }
 
 func GetExcelClassifyByParentId(parentId, source int) (items []*ExcelClassifyItems, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM excel_classify WHERE parent_id=? AND source = ? AND is_delete=0 order by sort asc,excel_classify_id asc`
-	//_, err = o.Raw(sql, parentId, source).QueryRows(&items)
-
 	sql := ` SELECT * FROM excel_classify WHERE parent_id=? AND source = ? AND is_delete=0 order by sort asc,excel_classify_id asc`
 	err = global.DmSQL["data"].Raw(sql, parentId, source).Find(&items).Error
 	return
 }
 
 func GetExcelClassifyBySource(source int) (items []*ExcelClassifyItems, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM excel_classify WHERE  source = ? AND is_delete=0 order by sort asc,excel_classify_id asc`
-	//_, err = o.Raw(sql, source).QueryRows(&items)
-
 	sql := ` SELECT * FROM excel_classify WHERE  source = ? AND is_delete=0 order by sort asc,excel_classify_id asc`
 	err = global.DmSQL["data"].Raw(sql, source).Find(&items).Error
 	return
 }
 
 func GetExcelClassifyBySourceOrderByLevel(source int) (items []*ExcelClassifyItems, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM excel_classify WHERE  source = ? AND is_delete=0 order by level asc, sort asc,excel_classify_id asc`
-	//_, err = o.Raw(sql, source).QueryRows(&items)
-
 	sql := ` SELECT * FROM excel_classify WHERE  source = ? AND is_delete=0 order by level asc, sort asc,excel_classify_id asc`
 	err = global.DmSQL["data"].Raw(sql, source).Find(&items).Error
 	return
 }
-func GetExcelClassifyAll() (items []*ExcelClassifyItems, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM excel_classify WHERE parent_id<>0 AND is_delete=0 order by sort asc,excel_classify_id asc`
-	//_, err = o.Raw(sql).QueryRows(&items)
-
-	sql := ` SELECT * FROM excel_classify WHERE parent_id<>0 AND is_delete=0 order by sort asc,excel_classify_id asc`
-	err = global.DmSQL["data"].Raw(sql).Find(&items).Error
-	return
-}
 
 type ExcelClassifyItems struct {
 	ExcelClassifyId   int `description:"分类id"`
@@ -168,36 +121,10 @@ type ExcelClassifyItems struct {
 }
 
 func GetExcelClassifyByCondition(condition string, pars []interface{}) (item *ExcelClassify, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM excel_classify WHERE 1=1 AND is_delete=0 `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//err = o.Raw(sql, pars).QueryRow(&item)
-
-	sql := ` SELECT * FROM excel_classify WHERE 1=1 AND is_delete=0 `
-	if condition != "" {
-		sql += condition
-	}
-	err = global.DmSQL["data"].Raw(sql, pars...).First(&item).Error
-	return
-}
-
-// GetNextExcelClassifyByCondition 获取下一个分类
-func GetNextExcelClassifyByCondition(condition string, pars []interface{}) (item *ExcelClassify, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM excel_classify WHERE 1=1 AND is_delete=0 `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//sql += " ORDER BY sort asc , create_time ASC LIMIT 1 "
-	//err = o.Raw(sql, pars).QueryRow(&item)
-
 	sql := ` SELECT * FROM excel_classify WHERE 1=1 AND is_delete=0 `
 	if condition != "" {
 		sql += condition
 	}
-	sql += " ORDER BY sort asc , create_time ASC LIMIT 1 "
 	err = global.DmSQL["data"].Raw(sql, pars...).First(&item).Error
 	return
 }
@@ -215,13 +142,6 @@ func GetFirstExcelClassifyByParentId(parentId int) (item *ExcelClassify, err err
 
 // UpdateExcelClassifySortByParentId 根据图表父类id更新排序
 func UpdateExcelClassifySortByParentId(parentId, classifyId, nowSort int, updateSort string, source int) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` update excel_classify set sort = ` + updateSort + ` WHERE parent_id=? and source=? and sort > ? AND is_delete=0 `
-	//if classifyId > 0 {
-	//	sql += ` or ( excel_classify_id > ` + fmt.Sprint(classifyId) + ` and sort= ` + fmt.Sprint(nowSort) + `)`
-	//}
-	//_, err = o.Raw(sql, parentId, source, nowSort).Exec()
-
 	sql := ` update excel_classify set sort = ` + updateSort + ` WHERE parent_id=? and source=? and sort > ? AND is_delete=0 `
 	if classifyId > 0 {
 		sql += ` or ( excel_classify_id > ` + fmt.Sprint(classifyId) + ` and sort= ` + fmt.Sprint(nowSort) + `)`
@@ -232,19 +152,12 @@ func UpdateExcelClassifySortByParentId(parentId, classifyId, nowSort int, update
 
 // Update 更新图表分类基础信息
 func (ExcelClassify *ExcelClassify) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(ExcelClassify, cols...)
-
 	err = global.DmSQL["data"].Select(cols).Updates(ExcelClassify).Error
 	return
 }
 
 // GetExcelClassifyMaxSort 获取图表分类下最大的排序数
 func GetExcelClassifyMaxSort(parentId int, source int) (sort int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT Max(sort) AS sort FROM excel_classify WHERE parent_id=? AND source = ? AND is_delete=0 `
-	//err = o.Raw(sql, parentId, source).QueryRow(&sort)
-
 	sql := `SELECT COALESCE(Max(sort), 0) AS sort FROM excel_classify WHERE parent_id=? AND source = ? AND is_delete=0 `
 	err = global.DmSQL["data"].Raw(sql, parentId, source).Scan(&sort).Error
 	return
@@ -256,16 +169,6 @@ type ExcelClassifyView struct {
 	ParentId          int    `description:"父级id"`
 }
 
-func GetExcelClassifyViewById(classifyId int) (item *ExcelClassifyView, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM excel_classify WHERE excel_classify_id=? AND is_delete=0 `
-	//err = o.Raw(sql, classifyId).QueryRow(&item)
-
-	sql := `SELECT * FROM excel_classify WHERE excel_classify_id=? AND is_delete=0 `
-	err = global.DmSQL["data"].Raw(sql, classifyId).First(&item).Error
-	return
-}
-
 // ExcelClassifyItemBySort 自定义比较函数，按年龄从小到大排序
 func ExcelClassifyItemBySort(p1, p2 *ExcelClassifyItems) bool {
 	return p1.Sort < p2.Sort
@@ -283,41 +186,18 @@ func GetClassifyByIdList(classifyIdList []int) (items []*ExcelClassify, err erro
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM excel_classify WHERE excel_classify_id in (` + utils.GetOrmInReplace(num) + `) AND is_delete=0 `
-	//_, err = o.Raw(sql, classifyIdList).QueryRows(&items)
-
 	sql := `SELECT * FROM excel_classify WHERE excel_classify_id in (` + utils.GetOrmInReplace(num) + `) AND is_delete=0 `
 	err = global.DmSQL["data"].Raw(sql, classifyIdList).Find(&items).Error
 	return
 }
 
 func GetAdminExcelClassifyBySource(source, adminId int) (items []*ExcelClassifyItems, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM excel_classify WHERE source = ? AND sys_user_id = ? AND is_delete = 0 ORDER BY sort ASC, excel_classify_id ASC;`
-	//_, err = o.Raw(sql, source, adminId).QueryRows(&items)
-
 	sql := `SELECT * FROM excel_classify WHERE source = ? AND sys_user_id = ? AND is_delete = 0 ORDER BY sort ASC, excel_classify_id ASC;`
 	err = global.DmSQL["data"].Raw(sql, source, adminId).Find(&items).Error
 	return
 }
 
-func GetExcelClassifyModelBySource(source int) (items []*ExcelClassify, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM excel_classify WHERE source = ? AND is_delete = 0 ORDER BY sort ASC, excel_classify_id ASC`
-	//_, err = o.Raw(sql, source).QueryRows(&items)
-	//return
-
-	sql := `SELECT * FROM excel_classify WHERE source = ? AND is_delete = 0 ORDER BY sort ASC, excel_classify_id ASC`
-	err = global.DmSQL["data"].Raw(sql, source).Find(&items).Error
-	return
-}
-
 func GetCustomAnalysisExcelClassifyCount(classifyName string, parentId, source, adminId int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT COUNT(1) AS count FROM excel_classify WHERE parent_id = ? AND source = ? AND excel_classify_name = ? AND is_delete = 0 AND sys_user_id = ?`
-	//err = o.Raw(sql, parentId, source, classifyName, adminId).QueryRow(&count)
-
 	sql := `SELECT COUNT(1) AS count FROM excel_classify WHERE parent_id = ? AND source = ? AND excel_classify_name = ? AND is_delete = 0 AND sys_user_id = ?`
 	err = global.DmSQL["data"].Raw(sql, parentId, source, classifyName, adminId).Scan(&count).Error
 	return

models/data_manage/excel/excel_draft.go

@@ -18,24 +18,6 @@ type ExcelDraft struct {
 
 // AddExcelDraft 添加一个新的excel表格草稿
 func AddExcelDraft(excelDraft *ExcelDraft) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//// 新增草稿
-	//id, err := o.Insert(excelDraft)
-	//if err != nil {
-	//	return
-	//}
-	//excelDraft.ExcelDraftId = int(id)
 	err = global.DmSQL["data"].Create(excelDraft).Error
 	return
 }
-
-// GetLastExcelDraftById 根据沙盘id获取最后一条沙盘草稿详情
-func GetLastExcelDraftById(excelId int) (excelDraft *ExcelDraft, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `select * from excel_draft where excel_id = ? order by excel_draft_id desc `
-	//err = o.Raw(sql, excelId).QueryRow(&excelDraft)
-
-	sql := `select * from excel_draft where excel_id = ? order by excel_draft_id desc `
-	err = global.DmSQL["data"].Raw(sql, excelId).First(&excelDraft).Error
-	return
-}

models/data_manage/excel/excel_edb_mapping.go

@@ -17,19 +17,8 @@ type ExcelEdbMapping struct {
 	ModifyTime        time.Time `description:"修改时间"`
 }
 
-// AddExcelEdbMappingMulti 批量添加excel与指标的关系
-func AddExcelEdbMappingMulti(items []*ExcelEdbMapping) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.InsertMulti(len(items), items)
-	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
-	return
-}
-
 // Add 添加excel与指标的关系
 func (e *ExcelEdbMapping) Add() (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Insert(e)
-
 	err = global.DmSQL["data"].Create(e).Error
 
 	return
@@ -37,32 +26,12 @@ func (e *ExcelEdbMapping) Add() (err error) {
 
 // Update 更新 excel表格基础信息
 func (e *ExcelEdbMapping) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(e, cols...)
 	err = global.DmSQL["data"].Select(cols).Updates(e).Error
 	return
 }
 
-// GetExcelEdbMappingByEdbInfoId 根据指标id获取配置关系
-func GetExcelEdbMappingByEdbInfoId(edbInfoId int) (items []*ExcelEdbMapping, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT *  FROM excel_edb_mapping WHERE 1=1 AND edb_info_id = ? `
-	//
-	//_, err = o.Raw(sql, edbInfoId).QueryRows(&items)
-
-	sql := ` SELECT *  FROM excel_edb_mapping WHERE 1=1 AND edb_info_id = ? `
-	err = global.DmSQL["data"].Raw(sql, edbInfoId).Find(&items).Error
-	return
-}
-
 // GetExcelEdbMappingByExcelInfoId 根据excel的id获取配置关系
 func GetExcelEdbMappingByExcelInfoId(excelInfoId int) (items []*ExcelEdbMapping, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT *  FROM excel_edb_mapping AS a
-	//       join edb_info as b on a.edb_info_id = b.edb_info_id
-	//       WHERE 1=1 AND a.excel_info_id = ? `
-	//_, err = o.Raw(sql, excelInfoId).QueryRows(&items)
-
 	sql := ` SELECT *  FROM excel_edb_mapping AS a
 	      join edb_info as b on a.edb_info_id = b.edb_info_id
 	      WHERE 1=1 AND a.excel_info_id = ? `
@@ -91,12 +60,6 @@ type CalculateFormula struct {
 
 // GetAllExcelEdbMappingItemByExcelInfoId 根据品种id获取所有的指标结果集
 func GetAllExcelEdbMappingItemByExcelInfoId(excelInfoId int) (items []*ExcelEdbMappingItem, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT a.edb_info_id,a.unique_code,a.edb_name,a.classify_id,a.frequency,a.unit,calculate_formula FROM edb_info AS a
-	//     JOIN excel_edb_mapping AS b ON a.edb_info_id=b.edb_info_id
-	//     WHERE b.excel_info_id = ? ORDER BY b.excel_edb_mapping_id ASC `
-	//_, err = o.Raw(sql, excelInfoId).QueryRows(&items)
-
 	sql := `SELECT a.edb_info_id,a.unique_code,a.edb_name,a.classify_id,a.frequency,a.unit,calculate_formula FROM edb_info AS a 
 	    JOIN excel_edb_mapping AS b ON a.edb_info_id=b.edb_info_id 
 	    WHERE b.excel_info_id = ? ORDER BY b.excel_edb_mapping_id ASC `
@@ -105,32 +68,12 @@ func GetAllExcelEdbMappingItemByExcelInfoId(excelInfoId int) (items []*ExcelEdbM
 	return
 }
 
-// GetNoCustomAnalysisExcelEdbMappingCount 根据指标id获取非自定义分析的关联关系
-func GetNoCustomAnalysisExcelEdbMappingCount(edbInfoId int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT COUNT(1) AS count FROM excel_edb_mapping a
-	//                      join excel_info b on a.excel_info_id=b.excel_info_id
-	//                      WHERE edb_info_id=? AND a.source != 4 AND b.is_delete = 0`
-	//err = o.Raw(sql, edbInfoId).QueryRow(&count)
-
-	sql := ` SELECT COUNT(1) AS count FROM excel_edb_mapping a 
-	                     join excel_info b on a.excel_info_id=b.excel_info_id
-	                     WHERE edb_info_id=? AND a.source != 4 AND b.is_delete = 0`
-	err = global.DmSQL["data"].Raw(sql, edbInfoId).Scan(&count).Error
-	return
-}
-
 type ExcelEdbMappingWithParentIdItem struct {
 	ExcelInfoId int
 	ParentId    int
 }
 
 func GetNoCustomAnalysisExcelEdbMapping(edbInfoId int) (items []ExcelEdbMappingWithParentIdItem, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT b.excel_info_id, b.parent_id FROM excel_edb_mapping a
-	//                      join excel_info b on a.excel_info_id=b.excel_info_id
-	//                      WHERE edb_info_id=? AND a.source != 4 AND b.is_delete = 0`
-	//_, err = o.Raw(sql, edbInfoId).QueryRows(&items)
 	sql := ` SELECT b.excel_info_id, b.parent_id FROM excel_edb_mapping a 
 	                     join excel_info b on a.excel_info_id=b.excel_info_id
 	                     WHERE edb_info_id=? AND a.source != 4 AND b.is_delete = 0`
@@ -140,11 +83,6 @@ func GetNoCustomAnalysisExcelEdbMapping(edbInfoId int) (items []ExcelEdbMappingW
 
 // GetAllExcelEdbMappingByExcelInfoId 根据excel的id获取所有的指标
 func GetAllExcelEdbMappingByExcelInfoId(excelInfoId int) (items []*ExcelEdbMapping, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT a.* FROM  excel_edb_mapping a
-	//     WHERE a.excel_info_id = ? ORDER BY a.excel_edb_mapping_id ASC `
-	//_, err = o.Raw(sql, excelInfoId).QueryRows(&items)
-
 	sql := `SELECT a.* FROM  excel_edb_mapping a
 	    WHERE a.excel_info_id = ? ORDER BY a.excel_edb_mapping_id ASC `
 	err = global.DmSQL["data"].Raw(sql, excelInfoId).Find(&items).Error
@@ -153,11 +91,6 @@ func GetAllExcelEdbMappingByExcelInfoId(excelInfoId int) (items []*ExcelEdbMappi
 
 // GetAllExcelEdbMappingByExcelInfoIds 根据excel的id获取所有的指标
 func GetAllExcelEdbMappingByExcelInfoIds(excelInfoIds []int) (items []*ExcelEdbMapping, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT a.* FROM  excel_edb_mapping a
-	//     WHERE a.excel_info_id in (` + utils.GetOrmInReplace(len(excelInfoIds)) + `) ORDER BY a.excel_edb_mapping_id ASC `
-	//_, err = o.Raw(sql, excelInfoIds).QueryRows(&items)
-
 	sql := `SELECT a.* FROM  excel_edb_mapping a
 	    WHERE a.excel_info_id in (` + utils.GetOrmInReplace(len(excelInfoIds)) + `) ORDER BY a.excel_edb_mapping_id ASC `
 	err = global.DmSQL["data"].Raw(sql, excelInfoIds).Find(&items).Error
@@ -166,11 +99,6 @@ func GetAllExcelEdbMappingByExcelInfoIds(excelInfoIds []int) (items []*ExcelEdbM
 
 // GetExcelEdbMappingByEdbInfoIdAndSource 根据指标id获取配置关系
 func GetExcelEdbMappingByEdbInfoIdAndSource(edbInfoId int, sources []int) (items []*ExcelEdbMapping, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT *  FROM excel_edb_mapping WHERE 1=1 AND edb_info_id = ? AND source in (` + utils.GetOrmInReplace(len(sources)) + `) `
-	//
-	//_, err = o.Raw(sql, edbInfoId, sources).QueryRows(&items)
-
 	sql := ` SELECT *  FROM excel_edb_mapping WHERE 1=1 AND edb_info_id = ? AND source in (` + utils.GetOrmInReplace(len(sources)) + `) `
 	err = global.DmSQL["data"].Raw(sql, edbInfoId, sources).Find(&items).Error
 	return
@@ -183,10 +111,6 @@ func GetExcelEdbMappingByEdbInfoIdAndSource(edbInfoId int, sources []int) (items
 // @param edbInfoId int
 // @return err error
 func DeleteCustomAnalysisExcelEdbMappingByEdbInfoId(edbInfoId int) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `DELETE FROM excel_edb_mapping WHERE source = ? AND edb_info_id = ? LIMIT 1`
-	//_, err = o.Raw(sql, utils.CUSTOM_ANALYSIS_TABLE, edbInfoId).Exec()
-
 	sql := `DELETE FROM excel_edb_mapping WHERE source = ? AND edb_info_id = ? LIMIT 1`
 	err = global.DmSQL["data"].Exec(sql, utils.CUSTOM_ANALYSIS_TABLE, edbInfoId).Error
 	return
@@ -194,31 +118,6 @@ func DeleteCustomAnalysisExcelEdbMappingByEdbInfoId(edbInfoId int) (err error) {
 
 // GetExcelEdbMappingItemByExcelInfoIdOrKeyword 根据表格ID或关键词获取指标
 func GetExcelEdbMappingItemByExcelInfoIdOrKeyword(excelInfoId int, keyword string) (items []*ExcelEdbMappingItem, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//cond := `b.excel_info_id = ?`
-	//pars := make([]interface{}, 0)
-	//pars = append(pars, excelInfoId)
-	//if keyword != "" {
-	//	cond += ` AND (a.edb_code LIKE ? OR a.edb_name LIKE ?)`
-	//	pars = append(pars, keyword, keyword)
-	//}
-	//sql := fmt.Sprintf(`SELECT
-	//		a.edb_info_id,
-	//		a.unique_code,
-	//		a.edb_name,
-	//		a.classify_id,
-	//		a.frequency,
-	//		a.unit,
-	//		calculate_formula
-	//	FROM
-	//		edb_info AS a
-	//	JOIN excel_edb_mapping AS b ON a.edb_info_id = b.edb_info_id
-	//	WHERE
-	//		%s
-	//	ORDER BY
-	//		b.excel_edb_mapping_id ASC`, cond)
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
-
 	cond := `b.excel_info_id = ?`
 	pars := make([]interface{}, 0)
 	pars = append(pars, excelInfoId)

models/data_manage/excel/excel_info.go

@@ -38,8 +38,6 @@ type ExcelInfo struct {
 
 // Update 更新 excel表格基础信息
 func (excelInfo *ExcelInfo) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(excelInfo, cols...)
 	err = global.DmSQL["data"].Select(cols).Updates(excelInfo).Error
 	return
 }
@@ -69,18 +67,6 @@ type MyExcelInfoList struct {
 
 // AddExcelInfo 新增表格
 func AddExcelInfo(excelInfo *ExcelInfo, excelEdbMappingList []*ExcelEdbMapping, childExcel *ExcelInfo) (err error) {
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//	} else {
-	//		_ = o.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -101,12 +87,6 @@ func AddExcelInfo(excelInfo *ExcelInfo, excelEdbMappingList []*ExcelEdbMapping,
 	if childExcel != nil {
 		// 表格信息入库
 		childExcel.ParentId = excelInfo.ExcelInfoId
-		//_, err = o.Insert(childExcel)
-		//if err != nil {
-		//	err = fmt.Errorf("新增子表失败：%v", err)
-		//	return
-		//}
-
 		err = to.Create(childExcel).Error
 		if err != nil {
 			err = fmt.Errorf("新增子表失败：%v", err)
@@ -120,8 +100,6 @@ func AddExcelInfo(excelInfo *ExcelInfo, excelEdbMappingList []*ExcelEdbMapping,
 			v.ExcelInfoId = excelInfo.ExcelInfoId
 			excelEdbMappingList[k] = v
 		}
-		//_, err = o.InsertMulti(dataNum, excelEdbMappingList)
-
 		err = to.CreateInBatches(excelEdbMappingList, utils.MultiAddNum).Error
 	}
 
@@ -130,17 +108,6 @@ func AddExcelInfo(excelInfo *ExcelInfo, excelEdbMappingList []*ExcelEdbMapping,
 
 // EditExcelInfo 编辑表格
 func EditExcelInfo(excelInfo *ExcelInfo, updateExcelInfoParams []string, excelEdbMappingList []*ExcelEdbMapping) (err error) {
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//	} else {
-	//		_ = o.Commit()
-	//	}
-	//}()
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -158,15 +125,10 @@ func EditExcelInfo(excelInfo *ExcelInfo, updateExcelInfoParams []string, excelEd
 	//更新父级分类时，同时更新子集分类
 	if excelInfo.Source == utils.BALANCE_TABLE && excelInfo.ParentId == 0 {
 		// 同步更新子表分类
-		//sql := `UPDATE FROM excel_info set excel_classify_id = ? WHERE parent_id=? `
-		//_, err = o.Raw(sql, excelInfo.ExcelClassifyId, excelInfo.ExcelInfoId).Exec()
-
 		sql := `UPDATE FROM excel_info set excel_classify_id = ? WHERE parent_id=? `
 		err = to.Exec(sql, excelInfo.ExcelClassifyId, excelInfo.ExcelInfoId).Error
 	}
 	// 删除关系表
-	//sql := `DELETE FROM excel_edb_mapping WHERE excel_info_id=? `
-	//_, err = o.Raw(sql, excelInfo.ExcelInfoId).Exec()
 
 	sql := `DELETE FROM excel_edb_mapping WHERE excel_info_id=? `
 	err = to.Exec(sql, excelInfo.ExcelInfoId).Error
@@ -178,44 +140,14 @@ func EditExcelInfo(excelInfo *ExcelInfo, updateExcelInfoParams []string, excelEd
 			v.ExcelInfoId = excelInfo.ExcelInfoId
 			excelEdbMappingList[k] = v
 		}
-		//_, err = o.InsertMulti(dataNum, excelEdbMappingList)
 		err = to.CreateInBatches(excelEdbMappingList, utils.MultiAddNum).Error
 	}
 
 	return
 }
 
-// GetExcelInfoAll 获取所有表格列表，用于分类展示
-func GetExcelInfoAll() (items []*ExcelClassifyItems, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT excel_info_id,excel_classify_id,excel_name AS excel_classify_name,
-	//         unique_code,sys_user_id,sys_user_real_name,is_join_permission
-	//        FROM excel_info where is_delete=0 ORDER BY sort asc,create_time ASC `
-	//_, err = o.Raw(sql).QueryRows(&items)
-
-	sql := ` SELECT excel_info_id,excel_classify_id,excel_name AS excel_classify_name,
-	        unique_code,sys_user_id,sys_user_real_name,is_join_permission
-	       FROM excel_info where is_delete=0 ORDER BY sort asc,create_time ASC `
-	err = global.DmSQL["data"].Raw(sql).Find(&items).Error
-	return
-}
-
 // GetNoContentExcelInfoAll 获取不含content的表格列表 用于分类展示
 func GetNoContentExcelInfoAll(source, userId int) (items []*ExcelClassifyItems, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT excel_info_id,excel_classify_id,excel_name AS excel_classify_name,
-	//         unique_code,sys_user_id,sys_user_real_name,sort,is_join_permission
-	//        FROM excel_info where is_delete=0 AND source = ?  `
-	//
-	//pars := []interface{}{source}
-	//
-	//if userId > 0 {
-	//	sql += ` AND sys_user_id = ? `
-	//	pars = append(pars, userId)
-	//}
-	//sql += `  ORDER BY sort asc,excel_info_id desc `
-	//_, err = o.Raw(sql, pars...).QueryRows(&items)
-
 	sql := ` SELECT excel_info_id,excel_classify_id,excel_name AS excel_classify_name,
 	        unique_code,sys_user_id,sys_user_real_name,sort,is_join_permission
 	       FROM excel_info where is_delete=0 AND source = ?  `
@@ -233,26 +165,6 @@ func GetNoContentExcelInfoAll(source, userId int) (items []*ExcelClassifyItems,
 
 // GetBalanceNoContentExcelInfoAll 获取不含content的平衡表表格列表 用于分类展示
 func GetBalanceNoContentExcelInfoAll(source int, excelInfoIds []int, userId int) (items []*ExcelClassifyItems, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT excel_info_id,excel_classify_id,excel_name AS excel_classify_name,
-	//         unique_code,sys_user_id,sys_user_real_name,sort,is_join_permission
-	//        FROM excel_info where is_delete=0 AND source = ?  AND parent_id = 0 AND balance_type=0 `
-	//
-	//pars := []interface{}{source}
-	//
-	//if userId > 0 {
-	//	if len(excelInfoIds) > 0 {
-	//		sql += ` AND (excel_info_id in (` + utils.GetOrmInReplace(len(excelInfoIds)) + `) or sys_user_id = ?)`
-	//		pars = append(pars, excelInfoIds, userId)
-	//	} else {
-	//		sql += ` AND sys_user_id = ? `
-	//		pars = append(pars, userId)
-	//	}
-	//}
-	//
-	//sql += `  ORDER BY sort asc,excel_info_id desc `
-	//_, err = o.Raw(sql, pars...).QueryRows(&items)
-
 	sql := ` SELECT excel_info_id,excel_classify_id,excel_name AS excel_classify_name,
 	        unique_code,sys_user_id,sys_user_real_name,sort,is_join_permission
 	       FROM excel_info where is_delete=0 AND source = ?  AND parent_id = 0 AND balance_type=0 `
@@ -274,23 +186,8 @@ func GetBalanceNoContentExcelInfoAll(source int, excelInfoIds []int, userId int)
 	return
 }
 
-// GetAllExcelInfoBySource 根据来源获取包含content的表格列表
-func GetAllExcelInfoBySource(source int) (items []*ExcelInfo, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM excel_info where is_delete=0  AND source = ?  ORDER BY sort asc,create_time desc `
-	//_, err = o.Raw(sql, source).QueryRows(&items)
-
-	sql := ` SELECT * FROM excel_info where is_delete=0  AND source = ?  ORDER BY sort asc,create_time desc `
-	err = global.DmSQL["data"].Raw(sql, source).Find(&items).Error
-	return
-}
-
 // GetExcelInfoById 根据id 获取eta表格详情
 func GetExcelInfoById(excelInfoId int) (item *ExcelInfo, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM excel_info WHERE excel_info_id=? AND is_delete=0 `
-	//err = o.Raw(sql, excelInfoId).QueryRow(&item)
-
 	sql := ` SELECT * FROM excel_info WHERE excel_info_id=? AND is_delete=0 `
 	err = global.DmSQL["data"].Raw(sql, excelInfoId).First(&item).Error
 	return
@@ -298,33 +195,12 @@ func GetExcelInfoById(excelInfoId int) (item *ExcelInfo, err error) {
 
 // GetExcelInfoByUnicode 编码获取表格
 func GetExcelInfoByUnicode(unicode string) (item *ExcelInfo, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM excel_info WHERE unique_code = ? AND is_delete = 0 `
-	//err = o.Raw(sql, unicode).QueryRow(&item)
-
 	sql := ` SELECT * FROM excel_info WHERE unique_code = ? AND is_delete = 0 `
 	err = global.DmSQL["data"].Raw(sql, unicode).First(&item).Error
 	return
 }
 
-func GetExcelInfoViewById(excelInfoId int) (item *ExcelInfoView, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM excel_info WHERE excel_info_id=? AND is_delete=0 `
-	//err = o.Raw(sql, excelInfoId).QueryRow(&item)
-
-	sql := ` SELECT * FROM excel_info WHERE excel_info_id=? AND is_delete=0 `
-	err = global.DmSQL["data"].Raw(sql, excelInfoId).First(&item).Error
-	return
-}
-
 func GetExcelInfoCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT COUNT(1) AS count FROM excel_info WHERE 1=1 AND is_delete=0 `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//err = o.Raw(sql, pars).QueryRow(&count)
-
 	sql := ` SELECT COUNT(1) AS count FROM excel_info WHERE 1=1 AND is_delete=0 `
 	if condition != "" {
 		sql += condition
@@ -334,16 +210,6 @@ func GetExcelInfoCountByCondition(condition string, pars []interface{}) (count i
 }
 
 func GetNoContentExcelInfoListByCondition(condition string, pars []interface{}, startSize, pageSize int) (items []*ExcelClassifyItems, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT excel_info_id,excel_classify_id,excel_name AS excel_classify_name,
-	//         unique_code,sys_user_id,sys_user_real_name,sort,is_join_permission FROM excel_info WHERE 1=1 `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//
-	//sql += ` AND is_delete=0 ORDER BY excel_info_id DESC LIMIT ?,? `
-	//_, err = o.Raw(sql, pars...).QueryRows(&items)
-
 	sql := `SELECT excel_info_id,excel_classify_id,excel_name AS excel_classify_name,
 	        unique_code,sys_user_id,sys_user_real_name,sort,is_join_permission FROM excel_info WHERE 1=1 `
 	if condition != "" {
@@ -359,16 +225,6 @@ func GetNoContentExcelInfoListByCondition(condition string, pars []interface{},
 }
 
 func GetNoContentExcelInfoListByConditionNoPage(condition string, pars []interface{}) (items []*ExcelInfo, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT excel_info_id,excel_classify_id,excel_name,
-	//         unique_code,sys_user_id,sys_user_real_name,sort,is_join_permission, parent_id, balance_type, update_user_id,update_user_real_name,rel_excel_info_id,version_name FROM excel_info WHERE is_delete=0 `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//
-	//sql += ` ORDER BY excel_info_id DESC `
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
-
 	sql := `SELECT excel_info_id,excel_classify_id,excel_name,
 	        unique_code,sys_user_id,sys_user_real_name,sort,is_join_permission, parent_id, balance_type, update_user_id,update_user_real_name,rel_excel_info_id,version_name FROM excel_info WHERE is_delete=0 `
 	if condition != "" {
@@ -382,14 +238,6 @@ func GetNoContentExcelInfoListByConditionNoPage(condition string, pars []interfa
 }
 
 func GetExcelInfoListByCondition(condition string, pars []interface{}) (items []*ExcelInfo, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM excel_info WHERE 1=1 AND is_delete=0 `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//sql += ` ORDER BY sort asc, excel_info_id asc`
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
-
 	sql := ` SELECT * FROM excel_info WHERE 1=1 AND is_delete=0 `
 	if condition != "" {
 		sql += condition
@@ -401,14 +249,6 @@ func GetExcelInfoListByCondition(condition string, pars []interface{}) (items []
 
 // GetNextExcelInfoByCondition 根据条件获取下一个表格
 func GetNextExcelInfoByCondition(condition string, pars []interface{}) (item *ExcelInfo, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM excel_info WHERE 1=1 AND is_delete=0 `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//sql += " ORDER BY sort asc , create_time desc LIMIT 1 "
-	//err = o.Raw(sql, pars).QueryRow(&item)
-
 	sql := ` SELECT * FROM excel_info WHERE 1=1 AND is_delete=0 `
 	if condition != "" {
 		sql += condition
@@ -420,15 +260,6 @@ func GetNextExcelInfoByCondition(condition string, pars []interface{}) (item *Ex
 
 // GetNextExcelInfo 根据分类id获取下一个excel表格
 func GetNextExcelInfo(classifyId, classifySort, source int) (item *ExcelInfo, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT b.* FROM excel_classify AS a
-	//		INNER JOIN excel_info AS b ON a.excel_classify_id=b.excel_classify_id
-	//		WHERE (a.sort>? OR (a.sort=? and a.excel_classify_id>?) ) AND a.is_delete=0 AND b.is_delete=0
-	//		AND a.source = ? AND b.source = ?
-	//		ORDER BY a.sort ASC,b.sort asc,b.create_time desc
-	//		LIMIT 1 `
-	//err = o.Raw(sql, classifySort, classifySort, classifyId, source, source).QueryRow(&item)
-
 	sql := ` SELECT b.* FROM excel_classify AS a
 			INNER JOIN excel_info AS b ON a.excel_classify_id=b.excel_classify_id
 			WHERE (a.sort>? OR (a.sort=? and a.excel_classify_id>?) ) AND a.is_delete=0 AND b.is_delete=0
@@ -439,33 +270,8 @@ func GetNextExcelInfo(classifyId, classifySort, source int) (item *ExcelInfo, er
 	return
 }
 
-// EditExcelInfoImage 修改excel表格的图片
-func EditExcelInfoImage(excelInfoId int, imageUrl string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//
-	//sql := ` UPDATE  excel_info SET excel_image=?, modify_time = NOW() WHERE excel_info_id = ? AND is_delete=0 `
-	//_, err = o.Raw(sql, imageUrl, excelInfoId).Exec()
-	//if err != nil {
-	//	fmt.Println("EditExcelInfoImage Err:", err.Error())
-	//	return err
-	//}
-
-	sql := ` UPDATE  excel_info SET excel_image=?, modify_time = NOW() WHERE excel_info_id = ? AND is_delete=0 `
-	err = global.DmSQL["data"].Exec(sql, imageUrl, excelInfoId).Error
-	if err != nil {
-		fmt.Println("EditExcelInfoImage Err:", err.Error())
-		return err
-	}
-
-	return
-}
-
 // GetExcelInfoByUniqueCode 根据unique_code来获取excel表格详情
 func GetExcelInfoByUniqueCode(uniqueCode string) (item *ExcelInfo, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM excel_info WHERE unique_code=? AND is_delete=0 `
-	//err = o.Raw(sql, uniqueCode).QueryRow(&item)
-
 	sql := ` SELECT * FROM excel_info WHERE unique_code=? AND is_delete=0 `
 	err = global.DmSQL["data"].Raw(sql, uniqueCode).First(&item).Error
 	return
@@ -473,10 +279,6 @@ func GetExcelInfoByUniqueCode(uniqueCode string) (item *ExcelInfo, err error) {
 
 // GetFirstExcelInfoByClassifyId 获取当前分类下，且排序数相同 的排序第一条的数据
 func GetFirstExcelInfoByClassifyId(classifyId int) (item *ExcelInfo, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM excel_info WHERE excel_classify_id=? AND is_delete=0 order by sort asc,excel_info_id desc limit 1`
-	//err = o.Raw(sql, classifyId).QueryRow(&item)
-
 	sql := ` SELECT * FROM excel_info WHERE excel_classify_id=? AND is_delete=0 order by sort asc,excel_info_id desc limit 1`
 	err = global.DmSQL["data"].Raw(sql, classifyId).First(&item).Error
 	return
@@ -484,15 +286,6 @@ func GetFirstExcelInfoByClassifyId(classifyId int) (item *ExcelInfo, err error)
 
 // UpdateExcelInfoSortByClassifyId 根据表格id更新排序
 func UpdateExcelInfoSortByClassifyId(classifyId, nowSort, prevExcelInfoId int, updateSort string, source int) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` update excel_info set sort = ` + updateSort + ` WHERE excel_classify_id=? AND source=? AND is_delete=0 AND ( sort > ? `
-	//// todo 前一个兄弟节点后移
-	//if prevExcelInfoId > 0 {
-	//	sql += ` or (excel_info_id < ` + fmt.Sprint(prevExcelInfoId) + ` and sort = ` + fmt.Sprint(nowSort) + `)`
-	//}
-	//sql += `)`
-	//_, err = o.Raw(sql, classifyId, source, nowSort).Exec()
-
 	sql := ` update excel_info set sort = ` + updateSort + ` WHERE excel_classify_id=? AND source=? AND is_delete=0 AND ( sort > ? `
 	// todo 前一个兄弟节点后移
 	if prevExcelInfoId > 0 {
@@ -535,29 +328,8 @@ type ExcelInfoView struct {
 	RightMax          string `description:"表格右侧最大值"`
 }
 
-// GetExcelInfoByClassifyIdAndName 根据分类id和表格名获取表格信息
-func GetExcelInfoByClassifyIdAndName(classifyId int, excelName string) (item *ExcelInfo, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM excel_info WHERE excel_classify_id = ? and excel_name=? AND is_delete=0 `
-	//err = o.Raw(sql, classifyId, excelName).QueryRow(&item)
-
-	sql := ` SELECT * FROM excel_info WHERE excel_classify_id = ? and excel_name=? AND is_delete=0 `
-	err = global.DmSQL["data"].Raw(sql, classifyId, excelName).First(&item).Error
-	return
-}
-
 // GetNoContentExcelListByCondition 获取没有content的excel表格列表数据
 func GetNoContentExcelListByCondition(condition string, pars []interface{}, startSize, pageSize int) (item []*MyExcelInfoList, err error) {
-	//	o := orm.NewOrmUsingDB("data")
-	//	sql := ` SELECT excel_info_id,source,excel_type,excel_name,unique_code,excel_classify_id,sys_user_id,sys_user_real_name,excel_image,file_url,sort,create_time,modify_time,is_join_permission,update_user_id,update_user_real_name
-	//FROM excel_info WHERE 1=1 AND is_delete=0 `
-	//	if condition != "" {
-	//		sql += condition
-	//	}
-	//	//sql += " ORDER BY sort ASC,chart_info_id DESC LIMIT ?,? "
-	//	sql += " ORDER BY create_time DESC LIMIT ?,? "
-	//	_, err = o.Raw(sql, pars...).QueryRows(&item)
-
 	sql := ` SELECT excel_info_id,source,excel_type,excel_name,unique_code,excel_classify_id,sys_user_id,sys_user_real_name,excel_image,file_url,sort,create_time,modify_time,is_join_permission,update_user_id,update_user_real_name
 	FROM excel_info WHERE 1=1 AND is_delete=0 `
 	if condition != "" {
@@ -574,16 +346,6 @@ func GetNoContentExcelListByCondition(condition string, pars []interface{}, star
 
 // GetNoContentExcelListByConditionNoPage 获取没有content的excel表格列表数据
 func GetNoContentExcelListByConditionNoPage(condition string, pars []interface{}) (item []*MyExcelInfoList, err error) {
-	//	o := orm.NewOrmUsingDB("data")
-	//	sql := ` SELECT excel_info_id,source,excel_type,excel_name,unique_code,excel_classify_id,sys_user_id,sys_user_real_name,excel_image,file_url,sort,create_time,modify_time,is_join_permission,update_user_id,update_user_real_name
-	//FROM excel_info WHERE 1=1 AND is_delete=0 `
-	//	if condition != "" {
-	//		sql += condition
-	//	}
-	//	//sql += " ORDER BY sort ASC,chart_info_id DESC LIMIT ?,? "
-	//	sql += " ORDER BY create_time DESC"
-	//	_, err = o.Raw(sql, pars).QueryRows(&item)
-
 	sql := ` SELECT excel_info_id,source,excel_type,excel_name,unique_code,excel_classify_id,sys_user_id,sys_user_real_name,excel_image,file_url,sort,create_time,modify_time,is_join_permission,update_user_id,update_user_real_name
 	FROM excel_info WHERE 1=1 AND is_delete=0 `
 	if condition != "" {
@@ -596,13 +358,6 @@ func GetNoContentExcelListByConditionNoPage(condition string, pars []interface{}
 }
 
 func GetExcelListCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT COUNT(1) AS count FROM excel_info WHERE 1=1 AND is_delete=0 `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//err = o.Raw(sql, pars).QueryRow(&count)
-
 	sql := ` SELECT COUNT(1) AS count FROM excel_info WHERE 1=1 AND is_delete=0 `
 	if condition != "" {
 		sql += condition
@@ -611,46 +366,15 @@ func GetExcelListCountByCondition(condition string, pars []interface{}) (count i
 	return
 }
 
-// GetExcelViewInfoByExcelInfoId 根据excelInfoId 获取ETA表格详情
-func GetExcelViewInfoByExcelInfoId(excelInfoId int) (item *MyExcelInfoList, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT excel_info_id,source,excel_type,excel_name,unique_code,excel_classify_id,sys_user_id,sys_user_real_name,excel_image,file_url,sort,create_time,modify_time,is_join_permission FROM excel_info WHERE excel_info_id = ? AND is_delete=0 `
-	//err = o.Raw(sql, excelInfoId).QueryRow(&item)
-
-	sql := ` SELECT excel_info_id,source,excel_type,excel_name,unique_code,excel_classify_id,sys_user_id,sys_user_real_name,excel_image,file_url,sort,create_time,modify_time,is_join_permission FROM excel_info WHERE excel_info_id = ? AND is_delete=0 `
-	err = global.DmSQL["data"].Raw(sql, excelInfoId).First(&item).Error
-	return
-}
-
 // GetExcelInfoCountByClassifyId 根据分类id获取名下表格数量
 func GetExcelInfoCountByClassifyId(classifyId int) (total int64, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT count(1) total FROM excel_info WHERE excel_classify_id = ? AND is_delete=0 `
-	//err = o.Raw(sql, classifyId).QueryRow(&total)
-
 	sql := ` SELECT count(1) total FROM excel_info WHERE excel_classify_id = ? AND is_delete=0 `
 	err = global.DmSQL["data"].Raw(sql, classifyId).First(&total).Error
 	return
 }
 
-// UpdateExcelInfoClassifyId 更改表格分类
-func UpdateExcelInfoClassifyId(classifyId, excelInfoId int) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` update excel_info set excel_classify_id = ? WHERE excel_info_id=? `
-	//_, err = o.Raw(sql, classifyId, excelInfoId).Exec()
-
-	sql := ` update excel_info set excel_classify_id = ? WHERE excel_info_id=? `
-	err = global.DmSQL["data"].Exec(sql, classifyId, excelInfoId).Error
-	return
-}
-
 // GetNoContentExcelInfoByName 根据名称 获取eta表格详情
 func GetNoContentExcelInfoByName(excelName string, source, adminId int) (item *MyExcelInfoList, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT excel_info_id,source,excel_type,excel_name,unique_code,excel_classify_id,sys_user_id,sys_user_real_name,excel_image,file_url,sort,create_time,modify_time,is_join_permission,update_user_id,update_user_real_name
-	//FROM excel_info WHERE excel_name = ? AND source = ? AND is_delete=0 AND sys_user_id = ? `
-	//err = o.Raw(sql, excelName, source, adminId).QueryRow(&item)
-
 	sql := ` SELECT excel_info_id,source,excel_type,excel_name,unique_code,excel_classify_id,sys_user_id,sys_user_real_name,excel_image,file_url,sort,create_time,modify_time,is_join_permission,update_user_id,update_user_real_name 
 	FROM excel_info WHERE excel_name = ? AND source = ? AND is_delete=0 AND sys_user_id = ? `
 	err = global.DmSQL["data"].Raw(sql, excelName, source, adminId).First(&item).Error
@@ -659,11 +383,6 @@ func GetNoContentExcelInfoByName(excelName string, source, adminId int) (item *M
 
 // GetNoContentExcelInfoByUniqueCode 根据unique_code来获取excel表格详情
 func GetNoContentExcelInfoByUniqueCode(uniqueCode string) (item *MyExcelInfoList, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT excel_info_id,source,excel_type,excel_name,unique_code,excel_classify_id,sys_user_id,sys_user_real_name,excel_image,file_url,sort,create_time,modify_time,is_join_permission,update_user_id,update_user_real_name
-	//FROM excel_info WHERE unique_code=? AND is_delete=0 `
-	//err = o.Raw(sql, uniqueCode).QueryRow(&item)
-
 	sql := ` SELECT excel_info_id,source,excel_type,excel_name,unique_code,excel_classify_id,sys_user_id,sys_user_real_name,excel_image,file_url,sort,create_time,modify_time,is_join_permission,update_user_id,update_user_real_name 
 	FROM excel_info WHERE unique_code=? AND is_delete=0 `
 	err = global.DmSQL["data"].Raw(sql, uniqueCode).First(&item).Error
@@ -672,11 +391,6 @@ func GetNoContentExcelInfoByUniqueCode(uniqueCode string) (item *MyExcelInfoList
 
 // GetNoContentExcelInfoByExcelId 根据表格id来获取excel表格详情
 func GetNoContentExcelInfoByExcelId(excelInfoId int) (item *MyExcelInfoList, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT excel_info_id,source,excel_type,excel_name,unique_code,excel_classify_id,sys_user_id,sys_user_real_name,excel_image,file_url,sort,create_time,modify_time,is_join_permission,update_user_id,update_user_real_name
-	//FROM excel_info WHERE excel_info_id=? AND is_delete=0 `
-	//err = o.Raw(sql, excelInfoId).QueryRow(&item)
-
 	sql := ` SELECT excel_info_id,source,excel_type,excel_name,unique_code,excel_classify_id,sys_user_id,sys_user_real_name,excel_image,file_url,sort,create_time,modify_time,is_join_permission,update_user_id,update_user_real_name 
 	FROM excel_info WHERE excel_info_id=? AND is_delete=0 `
 	err = global.DmSQL["data"].Raw(sql, excelInfoId).First(&item).Error
@@ -685,18 +399,6 @@ func GetNoContentExcelInfoByExcelId(excelInfoId int) (item *MyExcelInfoList, err
 
 // AddExcelInfoAndSheet 新增excel
 func AddExcelInfoAndSheet(excelInfo *ExcelInfo, sheetParamsList []AddExcelSheetParams) (err error) {
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//	} else {
-	//		_ = o.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -712,8 +414,6 @@ func AddExcelInfoAndSheet(excelInfo *ExcelInfo, sheetParamsList []AddExcelSheetP
 	if err != nil {
 		return
 	}
-	//excelInfo.ExcelInfoId = int(lastId)
-
 	// sheet信息入库
 	for _, sheetInfo := range sheetParamsList {
 		dataNum := len(sheetInfo.DataList)
@@ -731,11 +431,6 @@ func AddExcelInfoAndSheet(excelInfo *ExcelInfo, sheetParamsList []AddExcelSheetP
 			ModifyTime:   time.Now(),
 			CreateTime:   time.Now(),
 		}
-		//sheetId, tmpErr := o.Insert(excelSheetInfo)
-		//if tmpErr != nil {
-		//	err = tmpErr
-		//	return
-		//}
 
 		tmpErr := to.Create(excelSheetInfo).Error
 		if tmpErr != nil {
@@ -743,19 +438,12 @@ func AddExcelInfoAndSheet(excelInfo *ExcelInfo, sheetParamsList []AddExcelSheetP
 			return
 		}
 
-		//excelSheetInfo.ExcelSheetId = int(sheetId)
-
 		// data信息入库
 		if dataNum > 0 {
 			for k, _ := range sheetInfo.DataList {
 				sheetInfo.DataList[k].ExcelSheetId = excelSheetInfo.ExcelSheetId
 				sheetInfo.DataList[k].ExcelInfoId = excelSheetInfo.ExcelInfoId
 			}
-			//_, tmpErr = o.InsertMulti(dataNum, sheetInfo.DataList)
-			//if tmpErr != nil {
-			//	err = tmpErr
-			//	return
-			//}
 
 			tmpErr = to.CreateInBatches(sheetInfo.DataList, utils.MultiAddNum).Error
 			if tmpErr != nil {
@@ -770,18 +458,6 @@ func AddExcelInfoAndSheet(excelInfo *ExcelInfo, sheetParamsList []AddExcelSheetP
 
 // SaveExcelInfoAndSheet 编辑保存
 func SaveExcelInfoAndSheet(excelInfo *ExcelInfo, updateExcelInfoParam []string, sheetParamsList []AddExcelSheetParams) (err error) {
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//	} else {
-	//		_ = o.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -806,11 +482,6 @@ func SaveExcelInfoAndSheet(excelInfo *ExcelInfo, updateExcelInfoParam []string,
 	}
 
 	// 再删除历史sheet中的cell data信息
-	//sql = `DELETE FROM excel_sheet_data WHERE excel_info_id = ?`
-	//_, err = o.Raw(sql, excelInfo.ExcelInfoId).Exec()
-	//if err != nil {
-	//	return
-	//}
 
 	sql = `DELETE FROM excel_sheet_data WHERE excel_info_id = ?`
 	err = to.Exec(sql, excelInfo.ExcelInfoId).Error
@@ -835,12 +506,6 @@ func SaveExcelInfoAndSheet(excelInfo *ExcelInfo, updateExcelInfoParam []string,
 			ModifyTime:   time.Now(),
 			CreateTime:   time.Now(),
 		}
-		//sheetId, tmpErr := o.Insert(excelSheetInfo)
-		//if tmpErr != nil {
-		//	err = tmpErr
-		//	return
-		//}
-		//excelSheetInfo.ExcelSheetId = int(sheetId)
 
 		tmpErr := to.Create(excelSheetInfo).Error
 		if tmpErr != nil {
@@ -853,12 +518,6 @@ func SaveExcelInfoAndSheet(excelInfo *ExcelInfo, updateExcelInfoParam []string,
 				sheetInfo.DataList[k].ExcelSheetId = excelSheetInfo.ExcelSheetId
 				sheetInfo.DataList[k].ExcelInfoId = excelSheetInfo.ExcelInfoId
 			}
-			//_, tmpErr = o.InsertMulti(dataNum, sheetInfo.DataList)
-			//if tmpErr != nil {
-			//	err = tmpErr
-			//	return
-			//}
-
 			tmpErr = to.CreateInBatches(sheetInfo.DataList, utils.MultiAddNum).Error
 		}
 	}
@@ -876,10 +535,6 @@ type BatchRefreshExcelReq struct {
 
 // GetExcelMaxSortByClassifyId 获取当前分类下，且排序数最大的excel
 func GetExcelMaxSortByClassifyId(classifyId int, source int) (sort int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT Max(sort) AS sort FROM excel_info WHERE excel_classify_id=? AND source = ? AND is_delete=0 order by sort desc,excel_info_id desc limit 1`
-	//err = o.Raw(sql, classifyId, source).QueryRow(&sort)
-
 	sql := ` SELECT COALESCE(MAX(sort),0) AS sort FROM excel_info WHERE excel_classify_id=? AND source = ? AND is_delete=0 order by sort desc,excel_info_id desc limit 1`
 	err = global.DmSQL["data"].Raw(sql, classifyId, source).Scan(&sort).Error
 	return
@@ -895,10 +550,6 @@ func GetNoContentExcelListByExcelInfoIdList(excelInfoIdList []string) (items []*
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM excel_info WHERE excel_info_id in (` + utils.GetOrmInReplace(num) + `) order by excel_info_id DESC `
-	//_, err = o.Raw(sql, excelInfoIdList).QueryRows(&items)
-
 	sql := ` SELECT * FROM excel_info WHERE excel_info_id in (` + utils.GetOrmInReplace(num) + `) order by excel_info_id DESC `
 	err = global.DmSQL["data"].Raw(sql, excelInfoIdList).Find(&items).Error
 	return
@@ -909,10 +560,6 @@ func GetNoContentExcelListByExcelInfoIdAndParentId(excelInfoIdList []string) (it
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM excel_info WHERE excel_info_id in (` + utils.GetOrmInReplace(num) + `) OR parent_id in (` + utils.GetOrmInReplace(num) + `)   order by excel_info_id DESC `
-	//_, err = o.Raw(sql, excelInfoIdList, excelInfoIdList).QueryRows(&items)
-
 	sql := ` SELECT * FROM excel_info WHERE excel_info_id in (` + utils.GetOrmInReplace(num) + `) OR parent_id in (` + utils.GetOrmInReplace(num) + `)   order by excel_info_id DESC `
 	err = global.DmSQL["data"].Raw(sql, excelInfoIdList, excelInfoIdList).Find(&items).Error
 	return
@@ -928,10 +575,6 @@ func GetNoContentExcelListByUserId(userIdList []int) (items []*MyExcelInfoList,
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM excel_info WHERE sys_user_id in (` + utils.GetOrmInReplace(num) + `) order by excel_info_id DESC `
-	//_, err = o.Raw(sql, userIdList).QueryRows(&items)
-
 	sql := ` SELECT * FROM excel_info WHERE sys_user_id in (` + utils.GetOrmInReplace(num) + `) order by excel_info_id DESC `
 	err = global.DmSQL["data"].Raw(sql, userIdList).Find(&items).Error
 
@@ -951,10 +594,6 @@ func ModifyExcelInfoUserIdByCodeList(excelIdList []string, userId int, userName
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `UPDATE excel_info SET sys_user_id=?,sys_user_real_name=? WHERE excel_info_id in (` + utils.GetOrmInReplace(num) + `) `
-	//_, err = o.Raw(sql, userId, userName, excelIdList).Exec()
-
 	sql := `UPDATE excel_info SET sys_user_id=?,sys_user_real_name=? WHERE excel_info_id in (` + utils.GetOrmInReplace(num) + `) `
 	err = global.DmSQL["data"].Exec(sql, userId, userName, excelIdList).Error
 	return
@@ -973,9 +612,6 @@ func ModifyExcelInfoUserIdByOldUserId(oldUserIdList []int, userId int, userName
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `UPDATE excel_info SET sys_user_id=?,sys_user_real_name=? WHERE is_delete=0 AND sys_user_id in (` + utils.GetOrmInReplace(num) + `) `
-	//_, err = o.Raw(sql, userId, userName, oldUserIdList).Exec()
 
 	sql := `UPDATE excel_info SET sys_user_id=?,sys_user_real_name=? WHERE is_delete=0 AND sys_user_id in (` + utils.GetOrmInReplace(num) + `) `
 	err = global.DmSQL["data"].Exec(sql, userId, userName, oldUserIdList).Error
@@ -987,9 +623,6 @@ func GetExcelBaseInfoByExcelInfoIdList(excelInfoIdList []int) (items []*data_man
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT excel_info_id,source,excel_type,excel_name,unique_code,excel_classify_id,sys_user_id,sys_user_real_name FROM excel_info WHERE excel_info_id in (` + utils.GetOrmInReplace(num) + `) order by excel_info_id DESC `
-	//_, err = o.Raw(sql, excelInfoIdList).QueryRows(&items)
 
 	sql := ` SELECT excel_info_id,source,excel_type,excel_name,unique_code,excel_classify_id,sys_user_id,sys_user_real_name FROM excel_info WHERE excel_info_id in (` + utils.GetOrmInReplace(num) + `) order by excel_info_id DESC `
 	err = global.DmSQL["data"].Raw(sql, excelInfoIdList).Find(&items).Error
@@ -1001,28 +634,6 @@ func ReplaceEdbInExcel(oldEdbInfoId, newEdbInfoId int, updateExcelList []*ExcelI
 	var errmsg string
 	logMsg := `` // 记录替换的日志
 	replaceTotal := 0
-	//o := orm.NewOrmUsingDB("data")
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = to.Rollback()
-	//	} else {
-	//		_ = to.Commit()
-	//		if logMsg != `` {
-	//			utils.FileLog.Info(fmt.Sprintf("替换表格中的指标记录，替换总表格数：%d,旧的指标id:%d，新的指标id:%d;%s", replaceTotal, oldEdbInfoId, newEdbInfoId, logMsg))
-	//		}
-	//	}
-	//	if errmsg != "" {
-	//		fmt.Println("errmsg:" + errmsg)
-	//	}
-	//	if err != nil && errmsg != "" {
-	//		//go alarm_msg.SendAlarmMsg("替换替换配置中的指标记录失败提醒,errmsg："+errmsg, 3)
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -1039,18 +650,11 @@ func ReplaceEdbInExcel(oldEdbInfoId, newEdbInfoId int, updateExcelList []*ExcelI
 			fmt.Println("errmsg:" + errmsg)
 		}
 		if err != nil && errmsg != "" {
-			//go alarm_msg.SendAlarmMsg("替换替换配置中的指标记录失败提醒,errmsg："+errmsg, 3)
 		}
 	}()
 	// 替换表格中的内容
 	for _, excelInfo := range updateExcelList {
 		//更新配置中的指标A
-		//sql := `UPDATE excel_info SET content=?, modify_time=? WHERE excel_info_id=?`
-		//_, err = to.Raw(sql, excelInfo.Content, time.Now(), excelInfo.ExcelInfoId).Exec()
-		//if err != nil {
-		//	errmsg = "更新表格内容失败：Err:" + err.Error()
-		//	return
-		//}
 
 		sql := `UPDATE excel_info SET content=?, modify_time=? WHERE excel_info_id=?`
 		err = to.Exec(sql, excelInfo.Content, time.Now(), excelInfo.ExcelInfoId).Error
@@ -1068,13 +672,6 @@ func ReplaceEdbInExcel(oldEdbInfoId, newEdbInfoId int, updateExcelList []*ExcelI
 			return
 		}
 		// 插入新的绑定
-		//sql = `UPDATE excel_edb_mapping SET edb_info_id=?, modify_time=? WHERE excel_info_id=? and edb_info_id=?`
-		//_, err = to.Raw(sql, newEdbInfoId, time.Now(), excelInfo.ExcelInfoId, oldEdbInfoId).Exec()
-		//if err != nil {
-		//	errmsg = "更新指标B关联图表配置信息失败：Err:" + err.Error()
-		//	return
-		//}
-
 		sql = `UPDATE excel_edb_mapping SET edb_info_id=?, modify_time=? WHERE excel_info_id=? and edb_info_id=?`
 		err = to.Exec(sql, newEdbInfoId, time.Now(), excelInfo.ExcelInfoId, oldEdbInfoId).Error
 		if err != nil {
@@ -1090,10 +687,6 @@ func ReplaceEdbInExcel(oldEdbInfoId, newEdbInfoId int, updateExcelList []*ExcelI
 
 // GetChildExcelInfoByParentId 根据id 获取eta表格详情
 func GetChildExcelInfoByParentId(parentId int) (items []*ExcelInfo, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT excel_info_id,source,excel_type,excel_name,unique_code,excel_classify_id,sys_user_id,sys_user_real_name,excel_image,file_url,sort,create_time,modify_time,is_join_permission, parent_id, balance_type, update_user_id,update_user_real_name FROM excel_info WHERE parent_id=? AND is_delete=0 order by sort asc, excel_info_id asc`
-	//_, err = o.Raw(sql, parentId).QueryRows(&items)
-
 	sql := ` SELECT excel_info_id,source,excel_type,excel_name,unique_code,excel_classify_id,sys_user_id,sys_user_real_name,excel_image,file_url,sort,create_time,modify_time,is_join_permission, parent_id, balance_type, update_user_id,update_user_real_name FROM excel_info WHERE parent_id=? AND is_delete=0 order by sort asc, excel_info_id asc`
 	err = global.DmSQL["data"].Raw(sql, parentId).Find(&items).Error
 	return
@@ -1115,10 +708,6 @@ func UpdateExcelInfoClassifyIdByIds(classifyId int, excelIds []int) (err error)
 	if len(excelIds) == 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := fmt.Sprintf(`UPDATE excel_info SET excel_classify_id = ? WHERE excel_info_id IN (%s)`, utils.GetOrmInReplace(len(excelIds)))
-	//_, err = o.Raw(sql, classifyId, excelIds).Exec()
-
 	sql := fmt.Sprintf(`UPDATE excel_info SET excel_classify_id = ? WHERE excel_info_id IN (%s)`, utils.GetOrmInReplace(len(excelIds)))
 	err = global.DmSQL["data"].Exec(sql, classifyId, excelIds).Error
 	return

models/data_manage/excel/excel_info_rule_mapping.go

@@ -46,25 +46,17 @@ type ExcelInfoRuleMappingView struct {
 }
 
 func (e *ExcelInfoRuleMapping) Insert() (insertId int64, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//insertId, err = o.Insert(e)
 	err = global.DmSQL["data"].Create(e).Error
 	return
 }
 
 func (e *ExcelInfoRuleMapping) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(e, cols...)
 	err = global.DmSQL["data"].Select(cols).Updates(e).Error
 	return
 }
 
 // GetExcelRuleMappingByExcelInfoId 根据excelInfoId获取规则映射信息
 func GetExcelRuleMappingByExcelInfoId(id int) (items []*ExcelInfoRuleMappingView, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM excel_info_rule_mapping WHERE excel_info_id = ? ORDER BY create_time ASC`
-	//_, err = o.Raw(sql, id).QueryRows(&items)
-
 	sql := `SELECT * FROM excel_info_rule_mapping WHERE excel_info_id = ? ORDER BY create_time ASC`
 	err = global.DmSQL["data"].Raw(sql, id).Find(&items).Error
 	return
@@ -72,20 +64,12 @@ func GetExcelRuleMappingByExcelInfoId(id int) (items []*ExcelInfoRuleMappingView
 
 // GetExcelRuleMappingById 根据主键Id获取规则映射信息
 func GetExcelRuleMappingById(id int) (item *ExcelInfoRuleMappingView, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM excel_info_rule_mapping WHERE excel_info_rule_mapping_id = ?`
-	//err = o.Raw(sql, id).QueryRow(&item)
-
 	sql := `SELECT * FROM excel_info_rule_mapping WHERE excel_info_rule_mapping_id = ?`
 	err = global.DmSQL["data"].Raw(sql, id).First(&item).Error
 	return
 }
 
 func DeleteExcelRuleMappingById(id int) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `DELETE FROM excel_info_rule_mapping WHERE excel_info_rule_mapping_id = ?`
-	//_, err = o.Raw(sql, id).Exec()
-
 	sql := `DELETE FROM excel_info_rule_mapping WHERE excel_info_rule_mapping_id = ?`
 	err = global.DmSQL["data"].Exec(sql, id).Error
 	return

models/data_manage/excel/excel_sheet.go

@@ -21,34 +21,12 @@ type ExcelSheet struct {
 
 // Update 更新 excel表格的sheet基础信息
 func (excelSheet *ExcelSheet) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(excelSheet, cols...)
 	err = global.DmSQL["data"].Select(cols).Updates(excelSheet).Error
 	return
 }
 
-// AddExcelSheet 新增excel表格的sheet基础信息
-func AddExcelSheet(excelInfo *ExcelSheet) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//// 表格信息入库
-	//lastId, err := o.Insert(excelInfo)
-	//if err != nil {
-	//	return
-	//}
-	//excelInfo.ExcelInfoId = int(lastId)
-
-	err = global.DmSQL["data"].Create(excelInfo).Error
-	return
-}
-
 // GetAllSheetList 根据excel_id获取所有的sheet
 func GetAllSheetList(excelInfoId int) (item []*ExcelSheet, err error) {
-	//	o := orm.NewOrmUsingDB("data")
-	//	sql := ` SELECT *
-	//FROM excel_sheet WHERE 1=1 AND excel_info_id = ? `
-	//	sql += " ORDER BY sort asc "
-	//	_, err = o.Raw(sql, excelInfoId).QueryRows(&item)
-
 	sql := ` SELECT *
 	FROM excel_sheet WHERE 1=1 AND excel_info_id = ? `
 	sql += " ORDER BY sort asc "
@@ -73,12 +51,6 @@ type SheetItem struct {
 
 // GetAllSheetItemList 根据excel_id获取所有的sheet详情
 func GetAllSheetItemList(excelInfoId int) (item []*SheetItem, err error) {
-	//	o := orm.NewOrmUsingDB("data")
-	//	sql := ` SELECT *
-	//FROM excel_sheet WHERE 1=1 AND excel_info_id = ? `
-	//	sql += " ORDER BY sort asc "
-	//	_, err = o.Raw(sql, excelInfoId).QueryRows(&item)
-
 	sql := ` SELECT *
 	FROM excel_sheet WHERE 1=1 AND excel_info_id = ? `
 	sql += " ORDER BY sort asc "
@@ -88,12 +60,6 @@ func GetAllSheetItemList(excelInfoId int) (item []*SheetItem, err error) {
 
 // GetAllNoConfigSheetItemList 根据excel_id获取所有的sheet详情
 func GetAllNoConfigSheetItemList(excelInfoId int) (item []*SheetItem, err error) {
-	//	o := orm.NewOrmUsingDB("data")
-	//	sql := ` SELECT excel_sheet_id,excel_info_id,sheet_name,sort,page_num,create_time
-	//FROM excel_sheet WHERE 1=1 AND excel_info_id = ? `
-	//	sql += " ORDER BY sort asc "
-	//	_, err = o.Raw(sql, excelInfoId).QueryRows(&item)
-
 	sql := ` SELECT excel_sheet_id,excel_info_id,sheet_name,sort,page_num,create_time
 	FROM excel_sheet WHERE 1=1 AND excel_info_id = ? `
 	sql += " ORDER BY sort asc "

models/data_manage/excel/request/balance_table.go

@@ -16,51 +16,26 @@ type AddBalanceTableChartEdbItem struct {
 	LeadUnit        string  `description:"领先单位"`
 	FromTag         string  `description:"标签"`
 	ExcelChartEdbId int
-
-	/*	ChartStyle        string  `description:"图表类型"`
-		ChartColor        string  `description:"颜色"`
-		PredictChartColor string  `description:"预测数据的颜色"`
-		ChartWidth        float64 `description:"线条大小"`
-		Source            int     `description:"1：ETA图库；2：商品价格曲线"`
-		EdbAliasName      string  `description:"中文别名"`
-		IsConvert         int     `description:"是否数据转换 0不转 1转"`
-		ConvertType       int     `description:"数据转换类型 1乘 2除 3对数"`
-		ConvertValue      float64 `description:"数据转换值"`
-		ConvertUnit       string  `description:"数据转换单位"`
-		ConvertEnUnit     string  `description:"数据转换单位"`*/
 }
 
 type AddBalanceTableChartReq struct {
-	ExcelInfoId int `description:"表格ID"`
-	ChartInfoId int `description:"图表id,新增时传0"`
-	//ChartClassifyId int    `description:"分类id"`
-	ChartName string `description:"图表名称"`
-	ChartType int    `description:"生成样式:1:曲线图,2:季节性图,3:面积图，4：柱状图，5：散点图，6：组合图，7：柱方图"`
-	//DateType        int    `description:"日期类型:1:00年至今,2:10年至今,3:15年至今，4：年初至今，5:自定义时间,6:起始日期至今"`
-	//StartDate       string `description:"自定义开始日期"`
-	//EndDate         string `description:"自定义结束日期"`
-	Calendar   string `description:"公历/农历"`
-	LeftMin    string `description:"图表左侧最小值"`
-	LeftMax    string `description:"图表左侧最大值"`
-	RightMin   string `description:"图表右侧最小值"`
-	RightMax   string `description:"图表右侧最大值"`
-	Right2Min  string `description:"图表右侧2最小值"`
-	Right2Max  string `description:"图表右侧2最大值"`
-	MinMaxSave int    `description:"是否手动保存过上下限：0-否；1-是"`
-	//BarChartInfo         BarChartInfoReq         `description:"柱方图的配置"`
-	//CorrelationChartInfo CorrelationChartInfoReq `description:"相关性图表配置"`
+	ExcelInfoId       int                         `description:"表格ID"`
+	ChartInfoId       int                         `description:"图表id,新增时传0"`
+	ChartName         string                      `description:"图表名称"`
+	ChartType         int                         `description:"生成样式:1:曲线图,2:季节性图,3:面积图，4：柱状图，5：散点图，6：组合图，7：柱方图"`
+	Calendar          string                      `description:"公历/农历"`
+	LeftMin           string                      `description:"图表左侧最小值"`
+	LeftMax           string                      `description:"图表左侧最大值"`
+	RightMin          string                      `description:"图表右侧最小值"`
+	RightMax          string                      `description:"图表右侧最大值"`
+	Right2Min         string                      `description:"图表右侧2最小值"`
+	Right2Max         string                      `description:"图表右侧2最大值"`
+	MinMaxSave        int                         `description:"是否手动保存过上下限：0-否；1-是"`
 	ExtraConfig       string                      `description:"图表额外配置信息,json字符串"`
 	ChartImage        string                      `description:"封面图" json:"-"`
 	SeasonExtraConfig data_manage.SeasonExtraItem `description:"季节性图表中的配置,json数据"`
-	//StartYear         int                         `description:"当选择的日期类型为最近N年类型时，即date_type=20, 用start_year表示N"`
-	//ChartThemeId int    `description:"图表应用主题ID"`
-	SourcesFrom string `description:"图表来源"`
-	//Instructions      string          `description:"图表说明"`
-	//MarkersLines      string          `description:"标识线"`
-	//MarkersAreas      string          `description:"标识区"`
-	//Unit              string          `description:"中文单位名称"`
-	//UnitEn            string          `description:"英文单位名称"`
-	ChartEdbInfoList []AddBalanceTableChartEdbItem
+	SourcesFrom       string                      `description:"图表来源"`
+	ChartEdbInfoList  []AddBalanceTableChartEdbItem
 }
 
 type BalanceSeasonChartLegendPreviewReq struct {

models/data_manage/excel/request/mixed_table.go

@@ -61,8 +61,6 @@ type MixedTableCellDataReq struct {
 // @Description: 单元格的关系配置结构体
 type CellRelationConf struct {
 	CellRelation
-	//Type         int          `json:"type" description:"数据类型，跟MixedTableCellDataReq的DataType保持一致"`
-	//Key          string       `json:"key" description:"单元格的唯一标识"`
 	RelationDate CellRelation `json:"relation_date"`
 	RelationEdb  CellRelation `json:"relation_edb"`
 }