Merge branch 'table' into debug

controllers/table.go

@@ -0,0 +1,82 @@
+package controllers
+
+import (
+	"encoding/json"
+	"fmt"
+	"hongze/hongze_chart_lib/models"
+	"hongze/hongze_chart_lib/utils"
+	"time"
+)
+
+// TableController 表格
+type TableController struct {
+	BaseAuthController
+}
+
+// TableInfoDetail
+// @Title 获取表格详情
+// @Description 获取表格详情接口
+// @Param   UniqueCode   query   string  true       "表格唯一编码,如果是管理后台访问，传固定字符串:7c69b590249049942070ae9dcd5bf6dc"
+// @Success 200 {object} data_manage.TableInfoDetailResp
+// @router /detail [get]
+func (this *TableController) TableInfoDetail() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	uniqueCode := this.GetString("UniqueCode")
+	if uniqueCode == "" {
+		br.Msg = "参数错误"
+		br.ErrMsg = "参数错误,uniqueCode is empty"
+		return
+	}
+	key := utils.HZ_TABLE_LIB_DETAIL + uniqueCode
+	resp := new(models.TableInfoDetailResp)
+	//判断是否有缓存
+	if utils.Re == nil {
+		if utils.Re == nil && utils.Rc.IsExist(key) {
+			if data, err1 := utils.Rc.RedisBytes(key); err1 == nil {
+				err := json.Unmarshal(data, &resp)
+				if err == nil && resp != nil {
+					br.Ret = 200
+					br.Success = true
+					br.Msg = "获取成功"
+					br.Data = resp
+					fmt.Println("source redis")
+					return
+				}
+			}
+		}
+	}
+
+	tableInfo, err := models.GetTableInfoByUniqueCode(uniqueCode)
+	if err != nil {
+		if err.Error() == utils.ErrNoRow() {
+			br.Msg = "该表格已被删除，请刷新页面"
+			br.ErrMsg = "该表格已被删除，请刷新页面，Err:" + err.Error()
+			return
+		}
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取表格信息失败，Err:" + err.Error()
+		return
+	}
+
+	dataList,err := models.GetTableDataListByTableInfoId(tableInfo.TableInfoId)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取表格数据失败，Err:" + err.Error()
+		return
+	}
+	resp.TableInfo = tableInfo
+	resp.TableDataList = dataList
+	if utils.Re == nil {
+		data, _ := json.Marshal(resp)
+		utils.Rc.Put(key, data, 10*time.Minute)
+	}
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}

models/table.go

@@ -0,0 +1,38 @@
+package models
+
+import (
+	"github.com/rdlucklib/rdluck_tools/orm"
+	"time"
+)
+
+type TableInfo struct {
+	TableInfoId     int       `orm:"column(table_info_id);pk"`
+	TableName       string    `description:"表格名称"`
+	UniqueCode      string    `description:"表格唯一编码"`
+	TableClassifyId int       `description:"表格分类id"`
+	SysUserId       int       `description:"操作人id"`
+	SysUserRealName string    `description:"操作人真实姓名"`
+	StartDate       time.Time `description:"开始日期"`
+	EdbInfoIds      string    `description:"指标id"`
+	TableType       int       `description:"表格类型，1：指标+日期"`
+	TableImage      string    `description:"图表图片"`
+	Sort            int       `description:"排序字段，数字越小越排前面"`
+	EdbEndDate      time.Time `description:"指标最后更新日期"`
+	ModifyTime      time.Time
+	CreateTime      time.Time
+}
+
+// GetTableInfoByUniqueCode 根据union_code 获取表格信息
+func GetTableInfoByUniqueCode(uniqueCode string) (item *TableInfo, err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	sql := ` SELECT * FROM table_info WHERE unique_code=? `
+	err = o.Raw(sql, uniqueCode).QueryRow(&item)
+	return
+}
+
+// TableInfoDetailResp 表格详情返回
+type TableInfoDetailResp struct {
+	TableInfo   *TableInfo
+	TableDataList []*TableData
+}

models/table_data.go

@@ -0,0 +1,41 @@
+package models
+
+import (
+	"github.com/rdlucklib/rdluck_tools/orm"
+	"time"
+)
+
+type TableData struct {
+	TableDataId       int       `orm:"column(table_data_id);pk"`
+	TableInfoId       int       `description:"表格id"`
+	Date              time.Time `description:"指标时间"`
+	DataCol1          string    `orm:"column(data_col_1);" description:"第1个表格的数据"`
+	DataCol2          string    `orm:"column(data_col_2);" description:"第2个表格的数据"`
+	DataCol3          string    `orm:"column(data_col_3);" description:"第3个表格的数据"`
+	DataCol4          string    `orm:"column(data_col_4);" description:"第4个表格的数据"`
+	DataCol5          string    `orm:"column(data_col_5);" description:"第5个表格的数据"`
+	DataCol6          string    `orm:"column(data_col_6);" description:"第6个表格的数据"`
+	DataCol7          string    `orm:"column(data_col_7);" description:"第7个表格的数据"`
+	DataCol8          string    `orm:"column(data_col_8);" description:"第8个表格的数据"`
+	DataCol9          string    `orm:"column(data_col_9);" description:"第9个表格的数据"`
+	DataCol10         string    `orm:"column(data_col_10);" description:"第10个表格的数据"`
+	DataType          int8      `description:"数据类型，默认的区间数据是 1；插入数据是 2"`
+	Sort              int       `description:"排序字段，越小越靠前"`
+	AfterTableDataId  int       `description:"在某个表格数据id后面"`
+	BeforeTableDataId int       `description:"在某个表格数据id前面"`
+	ModifyTime        time.Time `description:"修改时间"`
+	CreateTime        time.Time `description:"创建时间"`
+}
+
+// GetTableDataListByTableInfoId 根据表格id获取数据列表
+func GetTableDataListByTableInfoId(tableInfoId int) (items []*TableData, err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	pars := make([]interface{}, 0)
+	pars = append(pars, tableInfoId)
+
+	sql := ` SELECT * FROM table_data WHERE table_info_id = ? order by sort asc `
+
+	_, err = o.Raw(sql, tableInfoId).QueryRows(&items)
+	return
+}

utils/constants.go

@@ -85,7 +85,8 @@ const (
 )
 
 const (
-	HZ_CHART_LIB_DETAIL = "HZ_CHART_LIB_DETAIL_"
+	HZ_CHART_LIB_DETAIL = "HZ_CHART_LIB_DETAIL_"	//图表
+	HZ_TABLE_LIB_DETAIL = "HZ_TABLE_LIB_DETAIL_"	//表格
 )
 
 var (