|
|
@@ -364,7 +364,7 @@ func DeleteDeviceDataByDeviceDataRList(datas []DeviceData_R) {
|
|
|
}
|
|
|
|
|
|
// ImportDeviceData 批量导入
|
|
|
-func ImportDeviceData(reader *excelize.File, sn string) {
|
|
|
+func ImportDeviceData(reader *excelize.File, sn string) string {
|
|
|
sheetName := reader.GetSheetName(0)
|
|
|
rows, err := reader.GetRows(sheetName)
|
|
|
if err != nil {
|
|
|
@@ -378,6 +378,10 @@ func ImportDeviceData(reader *excelize.File, sn string) {
|
|
|
}
|
|
|
|
|
|
t_sp := Read_device_sensor_parameter(sn, row[0])
|
|
|
+ if t_sp == "" {
|
|
|
+ sprintf := fmt.Sprintf("当前sn或探头参数ID不存在：%s,%s", sn, row[0])
|
|
|
+ return sprintf
|
|
|
+ }
|
|
|
|
|
|
// t_id,t_t,t_rh,t_time
|
|
|
//传感器 传感器参数ID 温度 湿度 GPS 采集时间 创建时间
|
|
|
@@ -391,10 +395,13 @@ func ImportDeviceData(reader *excelize.File, sn string) {
|
|
|
exec, err := o.Raw(sqlStatement).Exec()
|
|
|
if err != nil {
|
|
|
fmt.Println("执行失败")
|
|
|
+ return "请检查表格是否具有重复数据！！！"
|
|
|
} else {
|
|
|
rowsAffected, _ := exec.RowsAffected()
|
|
|
fmt.Println("插入", rowsAffected, "条数据")
|
|
|
+ return "导入成功"
|
|
|
}
|
|
|
+ return "导入失败"
|
|
|
}
|
|
|
|
|
|
// ExportDeviceData 导出 未完成
|
|
|
@@ -494,11 +501,18 @@ func Read_device_sensor_parameter(SN, t_id string) string {
|
|
|
//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 ID FROM device_sensor_parameter WHERE `t_sn` = '" + SN + "' AND `t_id` = '" + t_id + "' AND `t__state` = '1' ORDER BY `ID` DESC LIMIT 0,2;"
|
|
|
fmt.Println(sql)
|
|
|
- o.Raw(sql).ValuesList(&maps_z)
|
|
|
-
|
|
|
+ list, err := o.Raw(sql).ValuesList(&maps_z)
|
|
|
+ if err != nil {
|
|
|
+ return ""
|
|
|
+ }
|
|
|
+ if list == 0 {
|
|
|
+ fmt.Println("没有数据")
|
|
|
+ return ""
|
|
|
+ } else {
|
|
|
+ return maps_z[0][0].(string)
|
|
|
+ }
|
|
|
//value, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", cnt), 64)
|
|
|
//key,_ := strconv.Atoi(maps_z[0][0].(string))
|
|
|
- return maps_z[0][0].(string)
|
|
|
}
|
|
|
func Read_DeviceData_ById_Day_List(SN string) []orm2.ParamsList {
|
|
|
o := orm.NewOrm()
|
