fit: debug

app/cmd/organization/internal/logic/multiAddItemHistoryDataLogic.go

@@ -6,7 +6,6 @@ import (
 	"GtDataStore/app/model"
 	"GtDataStore/common/xerr"
 	"context"
-	"fmt"
 	"github.com/pkg/errors"
 	"time"
 
@@ -32,16 +31,16 @@ func (l *MultiAddItemHistoryDataLogic) MultiAddItemHistoryData(in *pb.MultiAddIt
 	layout := "2006-01-02 15:04:05"
 	for i, data := range in.List {
 		t, _ := time.Parse(layout, data.HTime)
-		fmt.Println("t:", t)
-		fmt.Println("data.HTime:", data.HTime)
+		//fmt.Println("t:", t)
+		//fmt.Println("data.HTime:", data.HTime)
 		ts[i] = model.DcItemHistoryData{
-			ProjectId: data.ProjectId,
-			ItemName:  data.ItemName,
-			Val:       data.Val,
-			HTime:     t,
+			ItemName: data.ItemName,
+			Val:      data.Val,
+			HTime:    t,
 		}
 	}
-	_, err := l.svcCtx.ItemHistoryData.MultiInsert(l.ctx, ts)
+
+	_, err := l.svcCtx.ItemHistoryData.MultiInsert(l.ctx, in.List[0].ProjectId, ts)
 	if err != nil {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "item history data table multi Insert err:%v", err)
 	}

app/model/dcitemhistorydatamodel.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"github.com/zeromicro/go-zero/core/stores/sqlc"
 	"github.com/zeromicro/go-zero/core/stores/sqlx"
-	"strconv"
 	"strings"
 	"time"
 )
@@ -19,7 +18,7 @@ type (
 	// and implement the added methods in customDcItemHistoryDataModel.
 	DcItemHistoryDataModel interface {
 		dcItemHistoryDataModel
-		MultiInsert(ctx context.Context, datas []DcItemHistoryData) (int64, error)
+		MultiInsert(ctx context.Context, projectId int64, datas []DcItemHistoryData) (int64, error)
 		QueryHistoryDataByTime(ctx context.Context, in *pb.ItemHistoryDataByTimeReq) ([]ItemHistoryData, error)
 		QueryHistoryDataMaxMinByTime(ctx context.Context, in *pb.ItemHistoryDataByTimeReq) (*MaxMinData, error)
 	}
@@ -47,8 +46,8 @@ func NewDcItemHistoryDataModel(conn sqlx.SqlConn) DcItemHistoryDataModel {
 	}
 }
 
-func (m *defaultDcItemHistoryDataModel) MultiInsert(ctx context.Context, datas []DcItemHistoryData) (int64, error) {
-	query := fmt.Sprintf("insert ignore into %s (`item_name`,`val`,`h_time`) values (?, ?, ?)", getTableName(datas[0].ProjectId))
+func (m *defaultDcItemHistoryDataModel) MultiInsert(ctx context.Context, projectId int64, datas []DcItemHistoryData) (int64, error) {
+	query := fmt.Sprintf("insert ignore into %s (`item_name`,`val`,`h_time`) values (?, ?, ?)", m.getTableName(projectId))
 
 	if bulk, err := sqlx.NewBulkInserter(m.conn, query); err == nil {
 		for _, data := range datas {
@@ -67,7 +66,7 @@ func (m *defaultDcItemHistoryDataModel) MultiInsert(ctx context.Context, datas [
 func (m *defaultDcItemHistoryDataModel) QueryHistoryDataByTime(ctx context.Context, in *pb.ItemHistoryDataByTimeReq) ([]ItemHistoryData, error) {
 	resp := make([]ItemHistoryData, 0)
 	var err error
-	query := fmt.Sprintf("SELECT * FROM %s WHERE item_name in (?) AND h_time BETWEEN ? AND ?", getTableName(in.ProjectId))
+	query := fmt.Sprintf("SELECT * FROM %s WHERE item_name in (?) AND h_time BETWEEN ? AND ?", m.getTableName(in.ProjectId))
 	if strings.Index(in.ItemName, ",") > 0 {
 		err = m.conn.QueryRowsCtx(ctx, &resp, query, strings.Split(in.ItemName, ","), in.Stime, in.Etime)
 	} else {
@@ -87,7 +86,7 @@ func (m *defaultDcItemHistoryDataModel) QueryHistoryDataByTime(ctx context.Conte
 func (m *defaultDcItemHistoryDataModel) QueryHistoryDataMaxMinByTime(ctx context.Context, in *pb.ItemHistoryDataByTimeReq) (*MaxMinData, error) {
 	resp := &MaxMinData{}
 	var err error
-	query := fmt.Sprintf("SELECT max(val) as max_val, min(val) as min_val FROM %s WHERE item_name = ? AND h_time BETWEEN ? AND ?", getTableName(in.ProjectId))
+	query := fmt.Sprintf("SELECT max(val) as max_val, min(val) as min_val FROM %s WHERE item_name = ? AND h_time BETWEEN ? AND ?", m.getTableName(in.ProjectId))
 	err = m.conn.QueryRowCtx(ctx, resp, query, in.ItemName, in.Stime, in.Etime)
 
 	switch err {
@@ -106,10 +105,11 @@ func (m *defaultDcItemHistoryDataModel) QueryHistoryDataMaxMinByTime(ctx context
 	}
 }
 
-func getTableName(projectId int64) string {
-	itemDataStr := "dc_item_history_data_"
-	projectStr := strconv.Itoa(int(projectId))
-	return itemDataStr + projectStr
+func (m *defaultDcItemHistoryDataModel) getTableName(projectId int64) string {
+	//itemDataStr := "dc_item_history_data_"
+	//projectStr := strconv.Itoa(int(projectId))
+	//return itemDataStr + projectStr
+	return fmt.Sprintf("dc_item_history_data_%d", projectId)
 }
 
 /*

app/model/dcitemhistorydatamodel_gen.go

@@ -3,14 +3,10 @@
 package model
 
 import (
-	"context"
-
-	"fmt"
 	"strings"
 	"time"
 
 	"github.com/zeromicro/go-zero/core/stores/builder"
-	"github.com/zeromicro/go-zero/core/stores/sqlc"
 	"github.com/zeromicro/go-zero/core/stores/sqlx"
 	"github.com/zeromicro/go-zero/core/stringx"
 )
@@ -25,9 +21,9 @@ var (
 type (
 	dcItemHistoryDataModel interface {
 		//Insert(ctx context.Context, data *DcItemHistoryData) (sql.Result, error)
-		FindOne(ctx context.Context, id int64) (*DcItemHistoryData, error)
+		//FindOne(ctx context.Context, id int64) (*DcItemHistoryData, error)
 		//Update(ctx context.Context, data *DcItemHistoryData) error
-		Delete(ctx context.Context, id int64) error
+		//Delete(ctx context.Context, id int64) error
 	}
 
 	defaultDcItemHistoryDataModel struct {
@@ -37,10 +33,10 @@ type (
 
 	DcItemHistoryData struct {
 		//Id        int64     `db:"id"`
-		ProjectId int64     `db:"project_id"` // 项目ID
-		ItemName  string    `db:"item_name"`  // 点位名
-		Val       float64   `db:"val"`        // 值
-		HTime     time.Time `db:"h_time"`     // 采集数据时间
+		//ProjectId int64     `db:"project_id"` // 项目ID
+		ItemName string    `db:"item_name"` // 点位名
+		Val      float64   `db:"val"`       // 值
+		HTime    time.Time `db:"h_time"`    // 采集数据时间
 		//CTime     time.Time `db:"c_time"`     // 创建时间
 	}
 )
@@ -52,25 +48,25 @@ func newDcItemHistoryDataModel(conn sqlx.SqlConn) *defaultDcItemHistoryDataModel
 	}
 }
 
-func (m *defaultDcItemHistoryDataModel) Delete(ctx context.Context, id int64) error {
-	query := fmt.Sprintf("delete from %s where `id` = ?", m.table)
-	_, err := m.conn.ExecCtx(ctx, query, id)
-	return err
-}
-
-func (m *defaultDcItemHistoryDataModel) FindOne(ctx context.Context, id int64) (*DcItemHistoryData, error) {
-	query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", dcItemHistoryDataRows, m.table)
-	var resp DcItemHistoryData
-	err := m.conn.QueryRowCtx(ctx, &resp, query, id)
-	switch err {
-	case nil:
-		return &resp, nil
-	case sqlc.ErrNotFound:
-		return nil, ErrNotFound
-	default:
-		return nil, err
-	}
-}
+//func (m *defaultDcItemHistoryDataModel) Delete(ctx context.Context, id int64) error {
+//	query := fmt.Sprintf("delete from %s where `id` = ?", m.table)
+//	_, err := m.conn.ExecCtx(ctx, query, id)
+//	return err
+//}
+//
+//func (m *defaultDcItemHistoryDataModel) FindOne(ctx context.Context, id int64) (*DcItemHistoryData, error) {
+//	query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", dcItemHistoryDataRows, m.table)
+//	var resp DcItemHistoryData
+//	err := m.conn.QueryRowCtx(ctx, &resp, query, id)
+//	switch err {
+//	case nil:
+//		return &resp, nil
+//	case sqlc.ErrNotFound:
+//		return nil, ErrNotFound
+//	default:
+//		return nil, err
+//	}
+//}
 
 //func (m *defaultDcItemHistoryDataModel) Insert(ctx context.Context, data *DcItemHistoryData) (sql.Result, error) {
 //	query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?)", m.table, dcItemHistoryDataRowsExpectAutoSet)