|
|
@@ -67,8 +67,8 @@ func (m *defaultDcItemHistoryDataModel) QueryHistoryDataByTime(ctx context.Conte
|
|
|
resp := make([]*ItemHistoryData, 0)
|
|
|
var err error
|
|
|
query := fmt.Sprintf("SELECT hd.* 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))
|
|
|
+ " LEFT JOIN dc_item_config as ic ON hd.item_name = ic.item_name AND hd.val > ic.min_val AND hd.val < ic.max_val "+
|
|
|
+ " WHERE 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
|
|
|
@@ -80,7 +80,7 @@ func (m *defaultDcItemHistoryDataModel) QueryHistoryDataByTime(ctx context.Conte
|
|
|
} else {
|
|
|
err = m.conn.QueryRowsCtx(ctx, &resp, query, in.ItemName, in.Stime, in.Etime)
|
|
|
}
|
|
|
- fmt.Println("query:", query)
|
|
|
+
|
|
|
switch err {
|
|
|
case nil:
|
|
|
return resp, nil
|
|
|
@@ -95,8 +95,8 @@ func (m *defaultDcItemHistoryDataModel) QueryHistoryDataMaxMinByTime(ctx context
|
|
|
resp := &MaxMinData{}
|
|
|
var err error
|
|
|
query := fmt.Sprintf("SELECT max(hd.val) as max_val, min(hd.val) as min_val 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 = ? AND h_time BETWEEN ? AND ? AND (ic.item_name IS NOT NULL OR ic.item_name IS NULL)", m.getTableName(in.ProjectId))
|
|
|
+ " LEFT JOIN dc_item_config as ic ON hd.item_name = ic.item_name AND hd.val > ic.min_val AND hd.val < ic.max_val "+
|
|
|
+ " WHERE hd.item_name = ? AND h_time BETWEEN ? AND ? AND (ic.item_name IS NOT NULL OR ic.item_name IS NULL)", m.getTableName(in.ProjectId))
|
|
|
err = m.conn.QueryRowCtx(ctx, resp, query, in.ItemName, in.Stime, in.Etime)
|
|
|
|
|
|
switch err {
|
songxiaohang