fix:表格拆分

controllers/data_manage/excel_classify.go

@@ -20,6 +20,7 @@ type ExcelClassifyController struct {
 // List
 // @Title excel表格分类列表
 // @Description excel表格分类列表接口
+// @Param   Source   query   int  true       "格来源，1：excel插件的表格，2：自定义表格，3：混合表格，默认：1"
 // @Success 200 {object} response.ExcelClassifyListResp
 // @router /excel_classify/list [get]
 func (this *ExcelClassifyController) List() {
@@ -29,8 +30,13 @@ func (this *ExcelClassifyController) List() {
 		this.ServeJSON()
 	}()
 
+	source, _ := this.GetInt("Source")
+	if source <= 0 {
+		source = utils.EXCEL_DEFAULT
+	}
+
 	// 获取一级分类
-	rootList, err := data_manage.GetExcelClassifyByParentId(0)
+	rootList, err := data_manage.GetExcelClassifyByParentId(0, source)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()
@@ -82,6 +88,7 @@ func (this *ExcelClassifyController) List() {
 // ExcelClassifyItems
 // @Title 获取所有excel表格分类接口-不包含表格
 // @Description 获取所有excel表格分类接口-不包含表格
+// @Param   Source   query   int  true       "格来源，1：excel插件的表格，2：自定义表格，3：混合表格，默认：1"
 // @Success 200 {object} response.ExcelClassifyListResp
 // @router /excel_classify/items [get]
 func (this *ExcelClassifyController) ExcelClassifyItems() {
@@ -90,7 +97,12 @@ func (this *ExcelClassifyController) ExcelClassifyItems() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	rootList, err := data_manage.GetExcelClassifyByParentId(0)
+
+	source, _ := this.GetInt("Source")
+	if source <= 0 {
+		source = utils.EXCEL_DEFAULT
+	}
+	rootList, err := data_manage.GetExcelClassifyByParentId(0, source)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()
@@ -135,8 +147,13 @@ func (this *ExcelClassifyController) AddExcelClassify() {
 		return
 	}
 
+	source := req.Source
+	if source <= 0 {
+		source = utils.EXCEL_DEFAULT
+	}
+
 	// 获取同级分类下存在同名分类的数量
-	count, err := data_manage.GetExcelClassifyCount(req.ExcelClassifyName, req.ParentId)
+	count, err := data_manage.GetExcelClassifyCount(req.ExcelClassifyName, req.ParentId, source)
 	if err != nil {
 		br.Msg = "判断名称是否已存在失败"
 		br.ErrMsg = "判断名称是否已存在失败，Err:" + err.Error()
@@ -222,7 +239,7 @@ func (this *ExcelClassifyController) EditExcelClassify() {
 	}
 
 	// 获取同级分类下存在同名分类的数量
-	count, err := data_manage.GetExcelClassifyCount(req.ExcelClassifyName, item.ParentId)
+	count, err := data_manage.GetExcelClassifyCount(req.ExcelClassifyName, item.ParentId, item.Source)
 	if err != nil {
 		br.Msg = "判断名称是否已存在失败"
 		br.ErrMsg = "判断名称是否已存在失败，Err:" + err.Error()
@@ -463,30 +480,7 @@ func (this *ExcelClassifyController) DeleteExcelClassify() {
 					return
 				}
 
-				//var condition string
-				//var pars []interface{}
-				//condition += " AND level=3 "
-				//pars = append(pars, chartInfo.ExcelClassifyId)
-
-				//condition += " AND (sort>? OR (sort=? and excel_classify_id >?) ) "
-				//pars = append(pars, currClassifyInfo.Sort, currClassifyInfo.Sort, currClassifyInfo.ExcelClassifyId)
-				//
-				//classifyItem, err := data_manage.GetNextExcelClassifyByCondition(condition, pars)
-				//if err != nil && err.Error() != utils.ErrNoRow() {
-				//	br.Msg = "删除失败"
-				//	br.ErrMsg = "获取下一级表格分类信息失败，Err:" + err.Error()
-				//	return
-				//}
-				//if classifyItem != nil {
-				//	nextItem, err = data_manage.GetNextExcelInfo(excelInfo.ExcelClassifyId)
-				//	if err != nil && err.Error() != utils.ErrNoRow() {
-				//		br.Msg = "删除失败"
-				//		br.ErrMsg = "获取下一级表格信息失败，Err:" + err.Error()
-				//		return
-				//	}
-				//}
-
-				nextItem, err = data_manage.GetNextExcelInfo(excelInfo.ExcelClassifyId, currClassifyInfo.Sort)
+				nextItem, err = data_manage.GetNextExcelInfo(excelInfo.ExcelClassifyId, currClassifyInfo.Sort, currClassifyInfo.Source)
 				if err != nil && err.Error() != utils.ErrNoRow() {
 					br.Msg = "删除失败"
 					br.ErrMsg = "获取下一级表格信息失败，Err:" + err.Error()

controllers/data_manage/excel_info.go

@@ -233,6 +233,7 @@ func (c *ExcelInfoController) Add() {
 // @Param   ExcelClassifyId   query   int  true       "分类id"
 // @Param   Keyword   query   string  true       "搜索关键词"
 // @Param   AdminId   query   int  false       "创建人id"
+// @Param   Source   query   int  true       "格来源，1：excel插件的表格，2：自定义表格，3：混合表格，默认：1"
 // @Success 200 {object} response.ExcelListResp
 // @router /excel_info/list [get]
 func (c *ExcelInfoController) List() {
@@ -255,6 +256,10 @@ func (c *ExcelInfoController) List() {
 	currentIndex, _ := c.GetInt("CurrentIndex")
 	keyword := c.GetString("Keyword")
 	adminId, _ := c.GetInt("AdminId")
+	source, _ := c.GetInt("Source")
+	if source <= 0 {
+		source = utils.EXCEL_DEFAULT
+	}
 
 	var total int
 	page := paging.GetPaging(currentIndex, pageSize, total)
@@ -878,7 +883,7 @@ func (c *ExcelInfoController) Delete() {
 			//	}
 			//}
 
-			nextItem, err = data_manage.GetNextExcelInfo(excelInfo.ExcelClassifyId, currClassifyInfo.Sort)
+			nextItem, err = data_manage.GetNextExcelInfo(excelInfo.ExcelClassifyId, currClassifyInfo.Sort, currClassifyInfo.Source)
 			if err != nil && err.Error() != utils.ErrNoRow() {
 				br.Msg = "删除失败"
 				br.ErrMsg = "获取下一级表格信息失败，Err:" + err.Error()
@@ -2101,7 +2106,7 @@ func (c *ExcelInfoController) Copy() {
 //	//utils.FileLog.Info(string(byteStr))
 //}
 
-func init() {
-	filePath := `static/tmpFile/化工23.05.24.xlsx`
-	excel.ConvToLuckySheet(filePath)
-}
+//func init() {
+//	filePath := `static/tmpFile/化工23.05.24.xlsx`
+//	excel.ConvToLuckySheet(filePath)
+//}

models/data_manage/excel_classify.go

@@ -9,6 +9,7 @@ import (
 // ExcelClassify excel表格分类
 type ExcelClassify struct {
 	ExcelClassifyId   int       `orm:"column(excel_classify_id);pk"`
+	Source            int       `description:"表格来源，1：excel插件的表格，2：自定义表格，3：混合表格，默认：1"`
 	ExcelClassifyName string    `description:"分类名称"`
 	ParentId          int       `description:"父级id"`
 	SysUserId         int       `description:"创建人id"`
@@ -29,10 +30,10 @@ func AddExcelClassify(item *ExcelClassify) (lastId int64, err error) {
 }
 
 // GetExcelClassifyCount 获取同级分类下存在同名分类的数量
-func GetExcelClassifyCount(ExcelClassifyName string, parentId int) (count int, err error) {
+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 excel_classify_name=? AND is_delete=0 `
-	err = o.Raw(sql, parentId, 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 = o.Raw(sql, parentId, source, ExcelClassifyName).QueryRow(&count)
 	return
 }
 
@@ -43,10 +44,10 @@ func GetExcelClassifyById(classifyId int) (item *ExcelClassify, err error) {
 	return
 }
 
-func GetExcelClassifyByParentId(parentId int) (items []*ExcelClassifyItems, err error) {
+func GetExcelClassifyByParentId(parentId, source int) (items []*ExcelClassifyItems, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM excel_classify WHERE parent_id=? AND is_delete=0 order by sort asc,excel_classify_id asc`
-	_, err = o.Raw(sql, parentId).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 = o.Raw(sql, parentId, source).QueryRows(&items)
 	return
 }
 

models/data_manage/excel_info.go

@@ -136,14 +136,15 @@ func GetNextExcelInfoByCondition(condition string, pars []interface{}) (item *Ex
 }
 
 // GetNextExcelInfo 根据分类id获取下一个excel表格
-func GetNextExcelInfo(classifyId, classifySort int) (item *ExcelInfo, err error) {
+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).QueryRow(&item)
+	err = o.Raw(sql, classifySort, classifySort, classifyId, source, source).QueryRow(&item)
 	return
 }
 

models/data_manage/request/excel_classify.go

@@ -5,6 +5,7 @@ type AddExcelClassifyReq struct {
 	ExcelClassifyName string `description:"分类名称"`
 	ParentId          int    `description:"父级id,第一级传0" json:"-"`
 	Level             int    `description:"层级,第一级传0，其余传上一级的层级" json:"-"`
+	Source            int    `description:"1：excel插件的表格，2：自定义表格，3：混合表格，默认：1" json:"-"`
 }
 
 // EditExcelClassifyReq 修改excel分类请求

utils/constants.go

@@ -265,6 +265,13 @@ const (
 	CHART_MULTIPLE_GRAPH_LINE_FEATURE_FREQUENCY          = 10 // 统计特征-频率分布图表
 )
 
+// ETA表格
+const (
+	EXCEL_DEFAULT = 1 // 自定义excel
+	TIME_TABLE    = 2 // 时间序列表格
+	MIXED_TABLE   = 3 // 混合表格
+)
+
 // 图表样式类型
 const (
 	CHART_TYPE_CURVE           = 1  //曲线图

utils/logs.go

@@ -8,7 +8,6 @@ import (
 
 var FileLog *logs.BeeLogger
 var FileLogData *logs.BeeLogger
-var FileLogChat *logs.BeeLogger
 var Binlog *logs.BeeLogger
 
 func init() {
@@ -19,9 +18,6 @@ func init() {
 	FileLogData = logs.NewLogger(1000000)
 	FileLogData.SetLogger(logs.AdapterFile, `{"filename":"./rdlucklog/eta_api_data.log"}`)
 
-	FileLogChat = logs.NewLogger(1000000)
-	FileLogChat.SetLogger(logs.AdapterFile, `{"filename":"./rdlucklog/eta_api_chat.log"}`)
-
 	//初始化binlog日志
 	initBinlog()
 }