|
@@ -127,7 +127,7 @@ func CREATE_DeviceData(SN string) bool {
|
|
|
// // 查看是否 有记录
|
|
|
// var maps_z []orm2.ParamsList
|
|
|
//
|
|
|
-// sql := "SELECT COUNT(ID) FROM z_device_data_" + SN + " WHERE t_time = '" + t_time + "' AND t_id = " + t_id
|
|
|
+// sql := "SELECT COUNT(ID) FROM z_devicedata_" + SN + " WHERE t_time = '" + t_time + "' AND t_id = " + t_id
|
|
|
// //fmt.Println(sql)
|
|
|
// _, err := o.Raw(sql).ValuesList(&maps_z)
|
|
|
//
|
|
@@ -142,7 +142,7 @@ func CREATE_DeviceData(SN string) bool {
|
|
|
// return true
|
|
|
// }
|
|
|
// // 开始插入数据
|
|
|
-// sql = "INSERT INTO z_device_data_" + SN + " (`t_id`, `t_t`, `t_rh`, `t_time`) VALUES (" + t_id + ", " + t_t + ", " + t_rh + ", '" + t_time + "')"
|
|
|
+// sql = "INSERT INTO z_devicedata_" + SN + " (`t_id`, `t_t`, `t_rh`, `t_time`) VALUES (" + t_id + ", " + t_t + ", " + t_rh + ", '" + t_time + "')"
|
|
|
// // 这里有时间优化 用于一次 prepare 多次 exec,以提高批量执行的速度
|
|
|
// //fmt.Println(sql)
|
|
|
// res, err := o.Raw(sql).Exec()
|
|
@@ -194,7 +194,7 @@ func Read_DeviceSensorData_ById_List(SN string, T_id int, Time_start_ string, Ti
|
|
|
sql_time += " t_time <= '" + Time_end_ + "' AND "
|
|
|
}
|
|
|
|
|
|
- sql := "SELECT COUNT(ID) FROM z_device_data_" + SN + " WHERE " + sql_time + " t_id = " + strconv.Itoa(T_id)
|
|
|
+ sql := "SELECT COUNT(ID) FROM z_devicedata_" + SN + " WHERE " + sql_time + " t_id = " + strconv.Itoa(T_id)
|
|
|
fmt.Println(sql)
|
|
|
_, err := o.Raw(sql).ValuesList(&maps_z)
|
|
|
if err != nil {
|
|
@@ -204,7 +204,7 @@ func Read_DeviceSensorData_ById_List(SN string, T_id int, Time_start_ string, Ti
|
|
|
return maps, 0
|
|
|
}
|
|
|
//fmt.Println("maps_z;",maps_z[0][0])
|
|
|
- sql = "SELECT t_name,t_id,t_t,t_rh,t_tl,t_tu,t_rhl,t_rhu,t_site,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time FROM z_device_data_" + SN + " WHERE " + sql_time + " t_id = " + strconv.Itoa(T_id) + " ORDER BY t_time DESC "
|
|
|
+ sql = "SELECT t_name,t_id,t_t,t_rh,t_tl,t_tu,t_rhl,t_rhu,t_site,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time FROM z_devicedata_" + SN + " WHERE " + sql_time + " t_id = " + strconv.Itoa(T_id) + " ORDER BY t_time DESC "
|
|
|
if page_z != 9999 {
|
|
|
sql = sql + " LIMIT " + strconv.Itoa(offset) + "," + strconv.Itoa(pagez)
|
|
|
}
|
|
@@ -235,7 +235,7 @@ func Read_DeviceData_By_snid(SN string, T_id int, Time_start_ string, Time_end_
|
|
|
sql_time += " t_time <= '" + Time_end_ + "' AND "
|
|
|
}
|
|
|
|
|
|
- sql := "SELECT t_id,t_t,t_rh,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time FROM z_device_data_" + SN + " WHERE " + sql_time + " t_id = " + strconv.Itoa(T_id) + " ORDER BY t_time DESC "
|
|
|
+ sql := "SELECT t_id,t_t,t_rh,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time FROM z_devicedata_" + SN + " WHERE " + sql_time + " t_id = " + strconv.Itoa(T_id) + " ORDER BY t_time DESC "
|
|
|
sql = sql + " LIMIT " + strconv.Itoa(offset) + "," + strconv.Itoa(limit)
|
|
|
fmt.Println(sql)
|
|
|
_, err := o.Raw(sql).QueryRows(&maps)
|
|
@@ -261,7 +261,7 @@ func Read_DeviceData_Count_By_snid(SN string, T_id int, Time_start_ string, Time
|
|
|
sql_time += " t_time <= '" + Time_end_ + "' AND "
|
|
|
}
|
|
|
|
|
|
- sql := "SELECT COUNT(ID) FROM z_device_data_" + SN + " WHERE " + sql_time + " t_id = " + strconv.Itoa(T_id)
|
|
|
+ sql := "SELECT COUNT(ID) FROM z_devicedata_" + SN + " WHERE " + sql_time + " t_id = " + strconv.Itoa(T_id)
|
|
|
fmt.Println(sql)
|
|
|
_, err := o.Raw(sql).ValuesList(&maps_z)
|
|
|
if err != nil {
|
|
@@ -296,7 +296,7 @@ func Read_DeviceSensorData_List(SN string, Time_start_ string, Time_end_ string,
|
|
|
sql_time += " t_time <= '" + Time_end_ + "' "
|
|
|
}
|
|
|
|
|
|
- sql := "SELECT COUNT(ID) FROM z_device_data_" + SN + " " + sql_time
|
|
|
+ sql := "SELECT COUNT(ID) FROM z_devicedata_" + SN + " " + sql_time
|
|
|
fmt.Println(sql)
|
|
|
_, err := o.Raw(sql).ValuesList(&maps_z)
|
|
|
if err != nil {
|
|
@@ -306,7 +306,7 @@ func Read_DeviceSensorData_List(SN string, Time_start_ string, Time_end_ string,
|
|
|
return maps, 0
|
|
|
}
|
|
|
//fmt.Println("maps_z;",maps_z[0][0])
|
|
|
- sql = "SELECT t_id,t_t,t_rh,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time FROM z_device_data_" + SN + " " + sql_time + " ORDER BY t_time DESC "
|
|
|
+ sql = "SELECT t_id,t_t,t_rh,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time FROM z_devicedata_" + SN + " " + sql_time + " ORDER BY t_time DESC "
|
|
|
if page_z != 9999 {
|
|
|
sql = sql + " LIMIT " + strconv.Itoa(offset) + "," + strconv.Itoa(pagez)
|
|
|
}
|
|
@@ -334,7 +334,7 @@ func Read_DeviceSensorData_List_z(SN string, Time_start_ string) int {
|
|
|
//sql_time += " t_time <= '" + Time_end_ + "' AND "
|
|
|
}
|
|
|
|
|
|
- sql := "SELECT COUNT(ID) FROM z_device_data_" + SN + " " + sql_time
|
|
|
+ sql := "SELECT COUNT(ID) FROM z_devicedata_" + SN + " " + sql_time
|
|
|
fmt.Println(sql)
|
|
|
_, err := o.Raw(sql).ValuesList(&maps_z)
|
|
|
if err != nil {
|
|
@@ -360,7 +360,7 @@ func Read_DeviceSensorData_ById_New(SN string, T_id int) (DeviceData_New, bool)
|
|
|
}
|
|
|
|
|
|
//fmt.Println("maps_z;",maps_z[0][0])
|
|
|
- sql := "SELECT t_id,t_t,t_rh,t_time FROM z_device_data_" + SN + " WHERE " + " t_id = " + strconv.Itoa(T_id) + " ORDER BY t_time DESC "
|
|
|
+ sql := "SELECT t_id,t_t,t_rh,t_time FROM z_devicedata_" + SN + " WHERE " + " t_id = " + strconv.Itoa(T_id) + " ORDER BY t_time DESC "
|
|
|
sql = sql + " LIMIT 0,1 "
|
|
|
|
|
|
fmt.Println(sql)
|
|
@@ -415,8 +415,8 @@ func Read_DeviceData_ById_Year_List(SN string) []orm2.ParamsList {
|
|
|
|
|
|
var maps_z []orm2.ParamsList
|
|
|
|
|
|
- //sql = "SELECT t_name,t_t,t_rh,t_tl,t_tu,t_rhl,t_rhu,t_site,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time FROM z_device_data_"+SN+" WHERE "+sql_time+" t_id = "+ strconv.Itoa(T_id) +" ORDER BY t_time DESC "
|
|
|
- sql := "SELECT DATE_FORMAT(t_time,\"%m\") AS m ,DATE_FORMAT(t_time,\"%d\") AS d FROM z_device_data_" + SN + " WHERE t_time > '" + strconv.Itoa(time.Now().Year()) + "-0-0 00:00:00' GROUP BY DATE_FORMAT(t_time,\"%m\");"
|
|
|
+ //sql = "SELECT t_name,t_t,t_rh,t_tl,t_tu,t_rhl,t_rhu,t_site,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time FROM z_devicedata_"+SN+" WHERE "+sql_time+" t_id = "+ strconv.Itoa(T_id) +" ORDER BY t_time DESC "
|
|
|
+ sql := "SELECT DATE_FORMAT(t_time,\"%m\") AS m ,DATE_FORMAT(t_time,\"%d\") AS d FROM z_devicedata_" + SN + " WHERE t_time > '" + strconv.Itoa(time.Now().Year()) + "-0-0 00:00:00' GROUP BY DATE_FORMAT(t_time,\"%m\");"
|
|
|
fmt.Println(sql)
|
|
|
num, err := o.Raw(sql).ValuesList(&maps_z)
|
|
|
if err == nil && num > 0 {
|
|
@@ -434,8 +434,8 @@ func Read_DeviceData_ById_Month_List(SN string) []orm2.ParamsList {
|
|
|
|
|
|
time_x := currentTime.Format("2006-01") + "-00 00:00:00"
|
|
|
|
|
|
- //sql = "SELECT t_name,t_t,t_rh,t_tl,t_tu,t_rhl,t_rhu,t_site,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time FROM z_device_data_"+SN+" WHERE "+sql_time+" t_id = "+ strconv.Itoa(T_id) +" ORDER BY t_time DESC "
|
|
|
- sql := "SELECT DATE_FORMAT(t_time,\"%d\") AS d FROM z_device_data_" + SN + " WHERE t_time > '" + time_x + "' GROUP BY DATE_FORMAT(t_time,\"%d\");"
|
|
|
+ //sql = "SELECT t_name,t_t,t_rh,t_tl,t_tu,t_rhl,t_rhu,t_site,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time FROM z_devicedata_"+SN+" WHERE "+sql_time+" t_id = "+ strconv.Itoa(T_id) +" ORDER BY t_time DESC "
|
|
|
+ sql := "SELECT DATE_FORMAT(t_time,\"%d\") AS d FROM z_devicedata_" + SN + " WHERE t_time > '" + time_x + "' GROUP BY DATE_FORMAT(t_time,\"%d\");"
|
|
|
fmt.Println(sql)
|
|
|
o.Raw(sql).ValuesList(&maps_z)
|
|
|
|
|
@@ -451,8 +451,8 @@ func Read_DeviceSensorData_ById_Day_List(SN string) []orm2.ParamsList {
|
|
|
|
|
|
time_x := currentTime.Format("2006-01-02") + " 00:00:00"
|
|
|
|
|
|
- //sql = "SELECT t_name,t_t,t_rh,t_tl,t_tu,t_rhl,t_rhu,t_site,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time FROM z_device_data_"+SN+" WHERE "+sql_time+" t_id = "+ strconv.Itoa(T_id) +" ORDER BY t_time DESC "
|
|
|
- sql := "SELECT DATE_FORMAT(t_time,\"%H\") AS m FROM z_device_data_" + SN + " WHERE t_time > '" + time_x + "' GROUP BY DATE_FORMAT(t_time,\"%H\");"
|
|
|
+ //sql = "SELECT t_name,t_t,t_rh,t_tl,t_tu,t_rhl,t_rhu,t_site,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time FROM z_devicedata_"+SN+" WHERE "+sql_time+" t_id = "+ strconv.Itoa(T_id) +" ORDER BY t_time DESC "
|
|
|
+ sql := "SELECT DATE_FORMAT(t_time,\"%H\") AS m FROM z_devicedata_" + SN + " WHERE t_time > '" + time_x + "' GROUP BY DATE_FORMAT(t_time,\"%H\");"
|
|
|
fmt.Println(sql)
|
|
|
o.Raw(sql).ValuesList(&maps_z)
|
|
|
|
|
@@ -471,7 +471,7 @@ func Read_DeviceSensorData_List_GROUP_BY_t_time(SN string, Time_start_ string, T
|
|
|
sql_time += " t_time >= '" + Time_start_ + "' AND " + " t_time <= '" + Time_end_ + "' "
|
|
|
}
|
|
|
|
|
|
- sql := "SELECT DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time FROM z_device_data_" + SN + " WHERE " + sql_time + " GROUP BY t_time ORDER BY t_time DESC "
|
|
|
+ sql := "SELECT DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time FROM z_devicedata_" + SN + " WHERE " + sql_time + " GROUP BY t_time ORDER BY t_time DESC "
|
|
|
fmt.Println(sql)
|
|
|
o.Raw(sql).ValuesList(&maps_z)
|
|
|
return maps_z
|