浏览代码

fix:挪动common位置

Roc 10 月之前
父节点
当前提交
38e166567e
共有 4 个文件被更改,包括 5 次插入8 次删除
  1. 2 3
      models/data_manage/chart_info.go
  2. 1 2
      models/data_manage/edb_info.go
  3. 1 1
      models/mgo/common.go
  4. 1 2
      services/data/edb_data.go

+ 2 - 3
models/data_manage/chart_info.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"eta/eta_api/models/mgo"
 	"eta/eta_api/utils"
-	"eta/eta_api/utils/mgodb"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
@@ -461,7 +460,7 @@ func getEdbDataListByMongo(source, subSource, edbInfoId int, startDate, endDate
 	}
 
 	// 数据日期
-	dateCondition, err := mgodb.BuildDateCondition(startDate, endDate)
+	dateCondition, err := mgo.BuildDateCondition(startDate, endDate)
 	if err != nil {
 		return
 	}
@@ -584,7 +583,7 @@ func getEdbDataListMinAndMaxByMongo(source, subSource, edbInfoId int, startDate,
 		"edb_info_id": edbInfoId,
 	}
 	// 日期
-	dateCondition, err := mgodb.BuildDateCondition(startDate, endDate)
+	dateCondition, err := mgo.BuildDateCondition(startDate, endDate)
 	if err != nil {
 		return
 	}

+ 1 - 2
models/data_manage/edb_info.go

@@ -4,7 +4,6 @@ import (
 	"eta/eta_api/models/mgo"
 	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/utils"
-	"eta/eta_api/utils/mgodb"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
@@ -1627,7 +1626,7 @@ func getAllDataByMongo(edbInfoId, source, subSource int, startDataTime string) (
 	}
 
 	// 开始日期
-	dateCondition, err := mgodb.BuildDateCondition(startDataTime, "")
+	dateCondition, err := mgo.BuildDateCondition(startDataTime, "")
 	if err != nil {
 		return
 	}

+ 1 - 1
utils/mgodb/common.go → models/mgo/common.go

@@ -1,4 +1,4 @@
-package mgodb
+package mgo
 
 import (
 	"eta/eta_api/utils"

+ 1 - 2
services/data/edb_data.go

@@ -6,7 +6,6 @@ import (
 	"eta/eta_api/models/data_manage"
 	"eta/eta_api/models/mgo"
 	"eta/eta_api/utils"
-	"eta/eta_api/utils/mgodb"
 	"fmt"
 	"github.com/shopspring/decimal"
 	"go.mongodb.org/mongo-driver/bson"
@@ -483,7 +482,7 @@ func getPageDataByMongo(edbInfoId, source, subSource int, endDataTime string, st
 	}
 
 	// 结束日期
-	dateCondition, err := mgodb.BuildDateCondition("", endDataTime)
+	dateCondition, err := mgo.BuildDateCondition("", endDataTime)
 	if err != nil {
 		return
 	}