Browse Source

update:优化日志

zoie 11 months ago
parent
commit
0a5bf081b2
2 changed files with 1 additions and 33 deletions
  1. 1 1
      controllers/TaskData.go
  2. 0 32
      models/Task/TaskData.go

+ 1 - 1
controllers/TaskData.go

@@ -1360,7 +1360,7 @@ func (c *TaskDataController) RepairSensorData() {
 			c, _ := time.Parse("2006-01-02 15:04:05", current)
 			n, _ := time.Parse("2006-01-02 15:04:05", next)
 			interval := n.Unix() - c.Unix()
-			logs.Debug("时间间隔:", interval, "保存时间:", saveTime)
+			//logs.Debug("时间间隔:", interval, "保存时间:", saveTime)
 			fmt.Println("当前:", current, "下一个:", next)
 			if int(interval) > saveTime {
 				ttInterval := list[i+1].T_t - list[i].T_t

+ 0 - 32
models/Task/TaskData.go

@@ -930,38 +930,6 @@ func Read_DeviceData_T_Min_Max_Time_Min_Max(T_sn, T_id string, Time_start_ strin
 
 }
 
-// 获取线上设备数据
-func Read_DeviceData_ById_List(T_sn, T_id string, Time_start_ string, Time_end_ string) []TaskData_ {
-	o := orm2.NewOrmUsingDB(conf.Server_AliasName)
-	var maps []TaskData_
-
-	sql_condition := ""
-	if len(Time_start_) > 1 {
-		sql_condition += " AND t_time >= '" + Time_start_ + "'"
-	}
-
-	if len(Time_end_) > 1 {
-		sql_condition += " AND t_time <= '" + Time_end_ + "'"
-	}
-
-	sql_condition += " AND t_id = '" + T_id + "'"
-
-	if len(sql_condition) > 0 {
-		sql_condition = " WHERE " + strings.TrimLeft(sql_condition, " AND ")
-	}
-
-	//fmt.Println("maps_z;",maps_z[0][0])
-	sql := "SELECT ID,t_id,t_t,t_rh,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_times,t_time FROM z_devicedata_" + T_sn + sql_condition + " ORDER BY t_time"
-
-	fmt.Println(sql)
-	_, err := o.Raw(sql).QueryRows(&maps)
-	if err != nil {
-		logs.Error(lib.FuncName(), err)
-	}
-
-	return maps
-}
-
 func Read_TaskData_ByIds_List(T_task_id string, SN []string, T_id []string, Time_start_ string, Time_end_ string) []TaskData {
 	o := orm.NewOrm()
 	var maps []TaskData