网关层

app/cmd/organization/etc/organization.yaml

@@ -13,7 +13,8 @@ Log:
 GtServerIp: 172.16.69.188:8900
 
 DtDataStoreDB:
-  DataSource: ws_data:c712f89fc4f8edaf30e41b828f4e3d26@tcp(192.168.60.201:4000)/ws_data?charset=utf8mb4&parseTime=True&loc=&loc=Asia%2FShanghai
+#  DataSource: ws_data:c712f89fc4f8edaf30e41b828f4e3d26@tcp(192.168.60.201:4000)/ws_data?charset=utf8mb4&parseTime=True&loc=&loc=Asia%2FShanghai
+  DataSource: ws_data:c712f89fc4f8edaf30e41b828f4e3d26@tcp(172.16.0.194:4000)/ws_data?charset=utf8mb4&parseTime=True&loc=&loc=Asia%2FShanghai
 
 Redis:
   Host: 172.16.69.193:36379

app/model/dcitemhistorydatamodel.go

@@ -33,11 +33,11 @@ func NewDcItemHistoryDataModel(conn sqlx.SqlConn) DcItemHistoryDataModel {
 }
 
 func (m *defaultDcItemHistoryDataModel) MultiInsert(ctx context.Context, datas []DcItemHistoryData) (int64, error) {
-	query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?)", m.table, dcItemHistoryDataRowsExpectAutoSet)
+	query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?)", m.table, dcItemHistoryDataRowsExpectAutoSet)
 
 	if bulk, err := sqlx.NewBulkInserter(m.conn, query); err == nil {
 		for _, data := range datas {
-			if err = bulk.Insert(data.ProjectId, data.ItemName, data.Val, data.CTime); err != nil {
+			if err = bulk.Insert(data.ProjectId, data.ItemName, data.Val, data.HTime, data.CTime); err != nil {
 				return 0, err
 			}
 		}
@@ -52,7 +52,7 @@ func (m *defaultDcItemHistoryDataModel) MultiInsert(ctx context.Context, datas [
 func (m *defaultDcItemHistoryDataModel) QueryHistoryDataByTime(ctx context.Context, in *pb.ItemHistoryDataByTimeReq) ([]DcItemHistoryData, error) {
 	resp := make([]DcItemHistoryData, 0)
 	var err error
-	query := fmt.Sprintf("SELECT * FROM %s WHERE project_id = ? AND item_name in (?) AND c_time BETWEEN ? AND ? ORDER BY id desc", m.table)
+	query := fmt.Sprintf("SELECT * FROM %s WHERE project_id = ? AND item_name in (?) AND h_time BETWEEN ? AND ? ORDER BY id desc", m.table)
 	if strings.Index(in.ItemName, ",") > 0 {
 		err = m.conn.QueryRowsCtx(ctx, &resp, query, in.ProjectId, strings.Split(in.ItemName, ","), in.Stime, in.Etime)
 	} else {