fix:替换orm

models/chart.go

@@ -3,7 +3,7 @@ package models
 import (
 	"errors"
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_chart_lib/utils"
 	"strconv"
 	"time"
@@ -58,7 +58,7 @@ type ChartEdbInfoMapping struct {
 	IsOrder     bool    `description:"true:正序,false:逆序"`
 	IsAxis      int     `description:"1:左轴,0:右轴"`
 	EdbInfoType int     `description:"1:标准指标,0:领先指标"`
-	EdbType int     `description:"指标类型:1:基础指标,2:计算指标"`
+	EdbType     int     `description:"指标类型:1:基础指标,2:计算指标"`
 	LeadValue   int     `description:"领先值"`
 	LeadUnit    string  `description:"领先单位"`
 	ChartStyle  string  `description:"图表类型"`
@@ -446,4 +446,4 @@ func AddCalculateQuarterV5(dataList []*EdbDataList) (result *EdbDataResult, err
 		}
 	}
 	return
-}
+}

models/data_manage/base_from_smm.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -160,4 +160,4 @@ func GetBaseFromSmmIndexByIndexCode(indexCode string) (list *BaseFromSmmIndex, e
 	sql := ` SELECT * FROM base_from_smm_index WHERE index_code=? `
 	err = o.Raw(sql, indexCode).QueryRow(&list)
 	return
-}
+}

models/data_manage/base_from_trade_index.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -32,69 +32,69 @@ type BaseFromTradeShanghaiIndex struct {
 }
 type BaseFromTradeCffexIndex struct {
 	BaseFromTradeCffexIndexId int `orm:"column(base_from_trade_cffex_index_id);pk"`
-	Rank                         int
-	DealShortName                string
-	DealName                     string
-	DealCode                     string
-	DealValue                    string
-	DealChange                   string
-	BuyShortName                 string
-	BuyName                      string
-	BuyCode                      string
-	BuyValue                     string
-	BuyChange                    string
-	SoldShortName                string
-	SoldName                     string
-	SoldCode                     string
-	SoldValue                    string
-	SoldChange                   string
-	Frequency                    string
-	ClassifyName                 string
-	ClassifyType                 string
-	CreateTime                   time.Time
-	ModifyTime                   time.Time
-	DataTime                     string
+	Rank                      int
+	DealShortName             string
+	DealName                  string
+	DealCode                  string
+	DealValue                 string
+	DealChange                string
+	BuyShortName              string
+	BuyName                   string
+	BuyCode                   string
+	BuyValue                  string
+	BuyChange                 string
+	SoldShortName             string
+	SoldName                  string
+	SoldCode                  string
+	SoldValue                 string
+	SoldChange                string
+	Frequency                 string
+	ClassifyName              string
+	ClassifyType              string
+	CreateTime                time.Time
+	ModifyTime                time.Time
+	DataTime                  string
 }
 
 type BaseFromTradeIneIndex struct {
 	BaseFromTradeIneIndexId int `orm:"column(base_from_trade_ine_index_id);pk"`
-	Rank                         int
-	DealShortName                string
-	DealName                     string
-	DealCode                     string
-	DealValue                    string
-	DealChange                   string
-	BuyShortName                 string
-	BuyName                      string
-	BuyCode                      string
-	BuyValue                     string
-	BuyChange                    string
-	SoldShortName                string
-	SoldName                     string
-	SoldCode                     string
-	SoldValue                    string
-	SoldChange                   string
-	Frequency                    string
-	ClassifyName                 string
-	ClassifyType                 string
-	CreateTime                   time.Time
-	ModifyTime                   time.Time
-	DataTime                     string
+	Rank                    int
+	DealShortName           string
+	DealName                string
+	DealCode                string
+	DealValue               string
+	DealChange              string
+	BuyShortName            string
+	BuyName                 string
+	BuyCode                 string
+	BuyValue                string
+	BuyChange               string
+	SoldShortName           string
+	SoldName                string
+	SoldCode                string
+	SoldValue               string
+	SoldChange              string
+	Frequency               string
+	ClassifyName            string
+	ClassifyType            string
+	CreateTime              time.Time
+	ModifyTime              time.Time
+	DataTime                string
 }
 
 func GetBaseFromTradeIndexByParam(exchange, date, classifyName, classifyType string) (list []*BaseFromTradeShanghaiIndex, err error) {
 	o := orm.NewOrm()
 	o.Using("data")
-	if classifyName == ""{
-		sql := "SELECT * FROM base_from_trade_"+exchange+"_index where data_time=?"
+	if classifyName == "" {
+		sql := "SELECT * FROM base_from_trade_" + exchange + "_index where data_time=?"
 		_, err = o.Raw(sql, date).QueryRows(&list)
 		return
-	}else if classifyType == ""{
-		sql := "SELECT * FROM base_from_trade_"+exchange+"_index where data_time=? and classify_name=? ORDER BY classify_type,rank"
+	} else if classifyType == "" {
+		sql := "SELECT * FROM base_from_trade_" + exchange + "_index where data_time=? and classify_name=? ORDER BY classify_type,rank"
 		_, err = o.Raw(sql, date, classifyName).QueryRows(&list)
 		return
-	}else {
-		sql := "SELECT * FROM base_from_trade_"+exchange+"_index where data_time=? and classify_name=? and classify_type=?"
+	} else {
+		sql := "SELECT * FROM base_from_trade_" + exchange + "_index where data_time=? and classify_name=? and classify_type=?"
 		_, err = o.Raw(sql, date, classifyName, classifyType).QueryRows(&list)
 		return
 	}
@@ -103,7 +103,7 @@ func GetBaseFromTradeIndexByParam(exchange, date, classifyName, classifyType str
 func GetExchangeClassify(exchange string) (classifyName []*string, err error) {
 	o := orm.NewOrm()
 	o.Using("data")
-	sql := "SELECT DISTINCT classify_name FROM base_from_trade_"+exchange+"_index ORDER BY CONVERT(classify_name using gbk) DESC"
+	sql := "SELECT DISTINCT classify_name FROM base_from_trade_" + exchange + "_index ORDER BY CONVERT(classify_name using gbk) DESC"
 	_, err = o.Raw(sql).QueryRows(&classifyName)
 	return
 }
@@ -111,7 +111,7 @@ func GetExchangeClassify(exchange string) (classifyName []*string, err error) {
 func GetLatestDate(exchange string) (date []*BaseFromTradeIneIndex, err error) {
 	o := orm.NewOrm()
 	o.Using("data")
-	sql := "SELECT * FROM base_from_trade_"+exchange+"_index ORDER BY data_time desc limit 1"
+	sql := "SELECT * FROM base_from_trade_" + exchange + "_index ORDER BY data_time desc limit 1"
 	_, err = o.Raw(sql).QueryRows(&date)
 	return
 }
@@ -119,7 +119,7 @@ func GetLatestDate(exchange string) (date []*BaseFromTradeIneIndex, err error) {
 func GetExchangeClassifyContract(exchange, Classify, dataTime string) (classifyName []*string, err error) {
 	o := orm.NewOrm()
 	o.Using("data")
-	sql := "SELECT DISTINCT classify_type FROM base_from_trade_"+exchange+"_index where classify_name=? and data_time=?"
+	sql := "SELECT DISTINCT classify_type FROM base_from_trade_" + exchange + "_index where classify_name=? and data_time=?"
 	_, err = o.Raw(sql, Classify, dataTime).QueryRows(&classifyName)
 	return
-}
+}

models/data_manage/chart_classify.go

@@ -2,7 +2,7 @@ package data_manage
 
 import (
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -239,9 +239,9 @@ func GetChartClassifyMaxSort(parentId int) (sort int, err error) {
 }
 
 type ChartClassifyView struct {
-	ChartClassifyId   int       `orm:"column(chart_classify_id);pk"`
-	ChartClassifyName string    `description:"分类名称"`
-	ParentId          int       `description:"父级id"`
+	ChartClassifyId   int    `orm:"column(chart_classify_id);pk"`
+	ChartClassifyName string `description:"分类名称"`
+	ParentId          int    `description:"父级id"`
 }
 
 func GetChartClassifyViewById(classifyId int) (item *ChartClassifyView, err error) {

models/data_manage/chart_edb_mapping.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/data_manage/chart_info.go

@@ -3,9 +3,9 @@ package data_manage
 import (
 	"errors"
 	"fmt"
-	"hongze/hongze_chart_lib/utils"
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"hongze/hongze_chart_lib/utils"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/chart_info_log.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/data_manage/edb_classify.go

@@ -2,7 +2,7 @@ package data_manage
 
 import (
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/data_manage/edb_data_base.go

@@ -2,7 +2,7 @@ package data_manage
 
 import (
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_chart_lib/utils"
 	"time"
 )

models/data_manage/edb_data_calculate.go

@@ -3,9 +3,9 @@ package data_manage
 import (
 	"errors"
 	"fmt"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/yidane/formula"
 	"hongze/hongze_chart_lib/utils"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_data_calculate_ljztbpj.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/data_manage/edb_data_calculate_time_shift.go

@@ -3,9 +3,9 @@ package data_manage
 import (
 	"errors"
 	"fmt"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/shopspring/decimal"
 	"hongze/hongze_chart_lib/utils"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_data_calculate_zjpj.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/data_manage/edb_data_cffex.go

@@ -2,8 +2,8 @@ package data_manage
 
 import (
 	"fmt"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_chart_lib/utils"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_data_coal.go

@@ -2,7 +2,7 @@ package data_manage
 
 import (
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_chart_lib/utils"
 	"strconv"
 	"strings"

models/data_manage/edb_data_dl.go

@@ -2,8 +2,8 @@ package data_manage
 
 import (
 	"fmt"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_chart_lib/utils"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_data_gl.go

@@ -2,8 +2,8 @@ package data_manage
 
 import (
 	"fmt"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_chart_lib/utils"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"
@@ -333,4 +333,4 @@ func RefreshAllEdbDataByGl(edbInfoId, source int, edbCode, startDate, endDate st
 		}
 	}
 	return
-}
+}

models/data_manage/edb_data_lt.go

@@ -3,8 +3,8 @@ package data_manage
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/http"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"hongze/hongze_chart_lib/utils"
 	"reflect"
 	"strconv"

models/data_manage/edb_data_lz.go

@@ -2,8 +2,8 @@ package data_manage
 
 import (
 	"fmt"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_chart_lib/utils"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_data_manual.go

@@ -2,8 +2,8 @@ package data_manage
 
 import (
 	"fmt"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_chart_lib/utils"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"
@@ -318,4 +318,4 @@ func DeleteEdbDataByIdAndSource(edbDataId, source int) (err error) {
 	o.Using("data")
 	_, err = o.Raw(sql, edbDataId).Exec()
 	return
-}
+}

models/data_manage/edb_data_pb.go

@@ -3,10 +3,10 @@ package data_manage
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/beego/beego/v2/client/orm"
+	"github.com/rdlucklib/rdluck_tools/http"
 	"hongze/hongze_chart_lib/utils"
 	"net/url"
-	"github.com/rdlucklib/rdluck_tools/http"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_data_quarter.go

@@ -3,8 +3,8 @@ package data_manage
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_chart_lib/utils"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"sort"
 	"strconv"
 	"strings"

models/data_manage/edb_data_sh.go

@@ -2,8 +2,8 @@ package data_manage
 
 import (
 	"fmt"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_chart_lib/utils"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_data_shfe.go

@@ -2,8 +2,8 @@ package data_manage
 
 import (
 	"fmt"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_chart_lib/utils"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_data_ths.go

@@ -4,9 +4,9 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"hongze/hongze_chart_lib/utils"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/http"
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"hongze/hongze_chart_lib/utils"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_data_wind.go

@@ -3,9 +3,9 @@ package data_manage
 import (
 	"encoding/json"
 	"fmt"
-	"hongze/hongze_chart_lib/utils"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/http"
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"hongze/hongze_chart_lib/utils"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_data_ys.go

@@ -11,11 +11,11 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_chart_lib/utils"
 	"io/ioutil"
 	"net/http"
 	"net/url"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_data_zz.go

@@ -2,8 +2,8 @@ package data_manage
 
 import (
 	"fmt"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_chart_lib/utils"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_info.go

@@ -2,9 +2,9 @@ package data_manage
 
 import (
 	"fmt"
-	"hongze/hongze_chart_lib/utils"
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"hongze/hongze_chart_lib/utils"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_info_calculate.go

@@ -3,9 +3,9 @@ package data_manage
 import (
 	"errors"
 	"fmt"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/yidane/formula"
 	"hongze/hongze_chart_lib/utils"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_info_calculate_bp.go

@@ -3,9 +3,9 @@ package data_manage
 import (
 	"errors"
 	"fmt"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/shopspring/decimal"
 	"hongze/hongze_chart_lib/utils"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"
@@ -83,11 +83,11 @@ func AddCalculateBp(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo, edb
 	} else {
 		edbInfoId = req.EdbInfoId
 		dataTableName := GetEdbDataTableName(utils.DATA_SOURCE_CALCULATE_BP)
-		fmt.Println("dataTableName:"+dataTableName)
+		fmt.Println("dataTableName:" + dataTableName)
 		deleteSql := ` DELETE FROM %s WHERE edb_info_id=? `
 		deleteSql = fmt.Sprintf(deleteSql, dataTableName)
 		_, err = o.Raw(deleteSql, req.EdbInfoId).Exec()
-		if err!=nil {
+		if err != nil {
 			return 0, err
 		}
 	}

models/data_manage/edb_info_calculate_hbz.go

@@ -3,8 +3,8 @@ package data_manage
 import (
 	"errors"
 	"fmt"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_chart_lib/utils"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_info_calculate_hcz.go

@@ -3,9 +3,9 @@ package data_manage
 import (
 	"errors"
 	"fmt"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/shopspring/decimal"
 	"hongze/hongze_chart_lib/utils"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"
@@ -206,7 +206,7 @@ func EditCalculateHcz(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbInfo, e
 
 	if count <= 0 || strconv.Itoa(formulaInt) != calculateFormula {
 		//删除，计算指标关联的，基础指标的关联关系
-		if count<=0 {
+		if count <= 0 {
 			sql = ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id = ? `
 			_, err = o.Raw(sql, edbInfoId).Exec()
 			if err != nil {

models/data_manage/edb_info_calculate_ljztbpj.go

@@ -3,9 +3,9 @@ package data_manage
 import (
 	"errors"
 	"fmt"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/shopspring/decimal"
 	"hongze/hongze_chart_lib/utils"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"sort"
 	"strings"
 	"time"

models/data_manage/edb_info_calculate_ljzzy.go

@@ -3,9 +3,9 @@ package data_manage
 import (
 	"errors"
 	"fmt"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/shopspring/decimal"
 	"hongze/hongze_chart_lib/utils"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_info_calculate_mapping.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/data_manage/edb_info_calculate_nszydpjjs.go

@@ -3,9 +3,9 @@ package data_manage
 import (
 	"errors"
 	"fmt"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/shopspring/decimal"
 	"hongze/hongze_chart_lib/utils"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_info_calculate_tbz.go

@@ -3,9 +3,9 @@ package data_manage
 import (
 	"errors"
 	"fmt"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/shopspring/decimal"
 	"hongze/hongze_chart_lib/utils"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"

models/data_manage/edb_info_calculate_tcz.go

@@ -3,9 +3,9 @@ package data_manage
 import (
 	"errors"
 	"fmt"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/shopspring/decimal"
 	"hongze/hongze_chart_lib/utils"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"strconv"
 	"strings"
 	"time"
@@ -346,9 +346,9 @@ func EditCalculateTcz(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbInfo, e
 
 		//清空原有数据
 		sql = ` DELETE FROM edb_data_calculate_tcz WHERE edb_info_id = ? `
-		_,err=o.Raw(sql, edbInfoId).Exec()
-		if err!=nil {
-			return edbInfoId,err
+		_, err = o.Raw(sql, edbInfoId).Exec()
+		if err != nil {
+			return edbInfoId, err
 		}
 
 		//关联关系

models/data_manage/edb_info_calculate_zjpj.go

@@ -3,8 +3,8 @@ package data_manage
 import (
 	"errors"
 	"fmt"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_chart_lib/utils"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"strings"
 	"time"
 )

models/data_manage/edb_info_log.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/data_manage/edb_info_updates.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 

models/data_manage/gl_data.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 

models/data_manage/lz_data.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/data_manage/manual.go

@@ -1,6 +1,6 @@
 package data_manage
 
-import "github.com/rdlucklib/rdluck_tools/orm"
+import "github.com/beego/beego/v2/client/orm"
 
 type ManualSysUser struct {
 	ItemId   int    `description:"部门/组/用户 id"`

models/data_manage/manual_classify.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/data_manage/manual_user.go

@@ -2,7 +2,7 @@ package data_manage
 
 import (
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -41,7 +41,7 @@ func GetManualUserList() (list []*ManualUserItem, err error) {
 	sql := ` SELECT admin_id,admin_real_name FROM manual_user
 			GROUP BY admin_id
 			ORDER BY create_time DESC `
-	fmt.Println("GetManualUserList:",sql)
+	fmt.Println("GetManualUserList:", sql)
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
 }

models/data_manage/my_chart.go

@@ -2,7 +2,7 @@ package data_manage
 
 import (
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )

models/data_manage/my_chart_log.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/data_manage/search_keyword.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -16,4 +16,4 @@ func AddSearchKeyword(item *SearchKeyword) (err error) {
 	o.Using("data")
 	_, err = o.Insert(item)
 	return
-}
+}

models/data_manage/smm_data.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"strings"
 )

models/db.go

@@ -6,7 +6,7 @@ import (
 	"hongze/hongze_chart_lib/utils"
 	"time"
 
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 )
 
 func init() {
@@ -67,6 +67,6 @@ func init() {
 		new(data_manage.EdbInfoCalculateMapping),
 		new(data_manage.EdbDataCalculateZjpj),    //直接拼接
 		new(data_manage.EdbDataCalculateLjztbpj), //累计同比值拼接
-		new(ShareChartRefreshLog),	//分享图表刷新日志表
+		new(ShareChartRefreshLog),                //分享图表刷新日志表
 	)
 }

models/share_chart_refresh_log.go

@@ -1,16 +1,16 @@
 package models
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 // ShareChartRefreshLog 分享图表的日志
 type ShareChartRefreshLog struct {
-	Id     int    `orm:"column(id);pk"`
-	Ip       string `description:"来源ip"`
-	ChartId int    `description:"图表分类id"`
-	CreateTime      time.Time
+	Id         int    `orm:"column(id);pk"`
+	Ip         string `description:"来源ip"`
+	ChartId    int    `description:"图表分类id"`
+	CreateTime time.Time
 }
 
 // AddShareChartRefreshLog 添加日志
@@ -19,4 +19,4 @@ func AddShareChartRefreshLog(item *ShareChartRefreshLog) (lastId int64, err erro
 	o.Using("data")
 	lastId, err = o.Insert(item)
 	return
-}
+}

models/target.go

@@ -2,9 +2,9 @@ package models
 
 import (
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/orm"
-	"hongze/hongze_chart_lib/utils"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"hongze/hongze_chart_lib/utils"
 	"sort"
 	"strconv"
 	"strings"