查询图引用

models/data_manage/edb_classify.go

@@ -1,7 +1,6 @@
 package data_manage
 
 import (
-	"eta/eta_api/models/data_manage/excel"
 	"eta/eta_api/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
@@ -299,11 +298,20 @@ type EdbClassifyListResp struct {
 }
 
 type ClassifyDeleteCheckResp struct {
-	DeleteStatus int                    `description:"检测状态:0:默认值，如果为0，继续走其他校验，1:若目录关联指标不可删除,2:确认删除当前目录及包含的子目录吗,3:当前指标已用作画图，不可删除"`
-	TipsMsg      string                 `description:"提示信息"`
-	TableList    []*excel.ExcelBaseInfo `description:"关联的表格"`
+	DeleteStatus int              `description:"检测状态:0:默认值，如果为0，继续走其他校验，1:若目录关联指标不可删除,2:确认删除当前目录及包含的子目录吗,3:当前指标已用作画图，不可删除"`
+	TipsMsg      string           `description:"提示信息"`
+	TableList    []*ExcelBaseInfo `description:"关联的表格"`
+}
+type ExcelBaseInfo struct {
+	ExcelInfoId     int    `orm:"column(excel_info_id);pk"`
+	Source          int    `description:"表格来源，1：excel插件的表格，2：自定义表格，3：混合表格，4：自定义分析，默认：1"`
+	ExcelType       int    `description:"表格类型，1：指标列，2：日期列，默认：1"`
+	ExcelName       string `description:"表格名称"`
+	UniqueCode      string `description:"表格唯一编码"`
+	ExcelClassifyId int    `description:"表格分类id"`
+	SysUserId       int    `description:"操作人id"`
+	SysUserRealName string `description:"操作人真实姓名"`
 }
-
 type ClassifyDeleteCheckReq struct {
 	ClassifyId int `description:"分类id"`
 	EdbInfoId  int `description:"指标id"`

models/data_manage/excel/excel_info.go

@@ -1,6 +1,7 @@
 package excel
 
 import (
+	"eta/eta_api/models/data_manage"
 	"eta/eta_api/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
@@ -53,17 +54,6 @@ type MyExcelInfoList struct {
 	HaveOperaAuth    bool      `description:"是否有数据权限"`
 }
 
-type ExcelBaseInfo struct {
-	ExcelInfoId     int    `orm:"column(excel_info_id);pk"`
-	Source          int    `description:"表格来源，1：excel插件的表格，2：自定义表格，3：混合表格，4：自定义分析，默认：1"`
-	ExcelType       int    `description:"表格类型，1：指标列，2：日期列，默认：1"`
-	ExcelName       string `description:"表格名称"`
-	UniqueCode      string `description:"表格唯一编码"`
-	ExcelClassifyId int    `description:"表格分类id"`
-	SysUserId       int    `description:"操作人id"`
-	SysUserRealName string `description:"操作人真实姓名"`
-}
-
 // AddExcelInfo 新增表格
 func AddExcelInfo(excelInfo *ExcelInfo, excelEdbMappingList []*ExcelEdbMapping) (err error) {
 	o, err := orm.NewOrmUsingDB("data").Begin()
@@ -636,7 +626,7 @@ func ModifyExcelInfoUserIdByOldUserId(oldUserIdList []int, userId int, userName
 	return
 }
 
-func GetExcelBaseInfoByExcelInfoIdList(excelInfoIdList []int) (items []*ExcelBaseInfo, err error) {
+func GetExcelBaseInfoByExcelInfoIdList(excelInfoIdList []int) (items []*data_manage.ExcelBaseInfo, err error) {
 	num := len(excelInfoIdList)
 	if num <= 0 {
 		return

services/data/edb_classify.go

@@ -449,7 +449,7 @@ func EditEdbClassify(classifyId int, classifyName, lang string, sysUser *system.
 }
 
 // DeleteCheck 删除检测
-func DeleteCheck(classifyId, edbInfoId int, sysUser *system.Admin) (deleteStatus int, tipsMsg string, tableList []*excel.ExcelBaseInfo, err error, errMsg string) {
+func DeleteCheck(classifyId, edbInfoId int, sysUser *system.Admin) (deleteStatus int, tipsMsg string, tableList []*data_manage.ExcelBaseInfo, err error, errMsg string) {
 	//删除分类
 	if classifyId > 0 && edbInfoId == 0 {
 		// 查找分类
@@ -645,7 +645,7 @@ func DeleteCheck(classifyId, edbInfoId int, sysUser *system.Admin) (deleteStatus
 }
 
 // Delete 删除分类/指标
-func Delete(classifyId, edbInfoId int, sysUser *system.Admin, requestBody, requestUrl string) (nextItem *data_manage.EdbInfo, tableList []*excel.ExcelBaseInfo, err error, errMsg string) {
+func Delete(classifyId, edbInfoId int, sysUser *system.Admin, requestBody, requestUrl string) (nextItem *data_manage.EdbInfo, tableList []*data_manage.ExcelBaseInfo, err error, errMsg string) {
 	//删除分类
 	if classifyId > 0 && edbInfoId == 0 {
 		// 查找分类