|
|
|
@ -559,10 +559,10 @@ public class RecordIotenvInstantServiceImpl implements IRecordIotenvInstantServi
|
|
|
|
columns.add("temperature");
|
|
|
|
columns.add("temperature");
|
|
|
|
columns.add("humidity");
|
|
|
|
columns.add("humidity");
|
|
|
|
columns.add("noise");
|
|
|
|
columns.add("noise");
|
|
|
|
columns.add("vibrationSpeed");
|
|
|
|
/* columns.add("vibrationSpeed");
|
|
|
|
columns.add("vibrationDisplacement");
|
|
|
|
columns.add("vibrationDisplacement");
|
|
|
|
columns.add("vibrationAcceleration");
|
|
|
|
columns.add("vibrationAcceleration");
|
|
|
|
columns.add("vibrationTemp");
|
|
|
|
columns.add("vibrationTemp");*/
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
// 单一类型:只导出对应的列
|
|
|
|
// 单一类型:只导出对应的列
|
|
|
|
Integer type = monitorTypes.iterator().next();
|
|
|
|
Integer type = monitorTypes.iterator().next();
|
|
|
|
@ -592,10 +592,10 @@ public class RecordIotenvInstantServiceImpl implements IRecordIotenvInstantServi
|
|
|
|
columns.add("temperature");
|
|
|
|
columns.add("temperature");
|
|
|
|
columns.add("humidity");
|
|
|
|
columns.add("humidity");
|
|
|
|
columns.add("noise");
|
|
|
|
columns.add("noise");
|
|
|
|
columns.add("vibrationSpeed");
|
|
|
|
/* columns.add("vibrationSpeed");
|
|
|
|
columns.add("vibrationDisplacement");
|
|
|
|
columns.add("vibrationDisplacement");
|
|
|
|
columns.add("vibrationAcceleration");
|
|
|
|
columns.add("vibrationAcceleration");
|
|
|
|
columns.add("vibrationTemp");
|
|
|
|
columns.add("vibrationTemp");*/
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|