|
|
@@ -66,16 +66,16 @@ func (m *defaultDcItemHistoryDataModel) MultiInsert(ctx context.Context, project
|
|
|
func (m *defaultDcItemHistoryDataModel) QueryHistoryDataByTime(ctx context.Context, in *pb.ItemHistoryDataByTimeReq) ([]ItemHistoryData, error) {
|
|
|
resp := make([]ItemHistoryData, 0)
|
|
|
var err error
|
|
|
- ItemNames := strings.Split(in.ItemName, ",")
|
|
|
- var ItemNameStrs []string
|
|
|
- for range ItemNames {
|
|
|
- ItemNameStrs = append(ItemNameStrs, "?")
|
|
|
- }
|
|
|
- inClause := strings.Join(ItemNameStrs, ",")
|
|
|
query := fmt.Sprintf("SELECT * FROM %s AS hd "+
|
|
|
" LEFT JOIN dc_item_config as ic ON hd.item_name = ic.item_name "+
|
|
|
" WHERE hd.val > ic.min_val AND hd.val < ic.max_val AND hd.item_name in (?) AND h_time BETWEEN ? AND ? AND (ic.item_name IS NOT NULL OR ic.item_name IS NULL)", m.getTableName(in.ProjectId))
|
|
|
if strings.Index(in.ItemName, ",") > 0 {
|
|
|
+ ItemNames := strings.Split(in.ItemName, ",")
|
|
|
+ var ItemNameStrs []string
|
|
|
+ for range ItemNames {
|
|
|
+ ItemNameStrs = append(ItemNameStrs, "?")
|
|
|
+ }
|
|
|
+ inClause := strings.Join(ItemNameStrs, ",")
|
|
|
err = m.conn.QueryRowsCtx(ctx, &resp, query, inClause, in.Stime, in.Etime)
|
|
|
} else {
|
|
|
err = m.conn.QueryRowsCtx(ctx, &resp, query, in.ItemName, in.Stime, in.Etime)
|
songxiaohang