@@ -19,7 +19,7 @@ public interface SystemConstant { | |||
*/ | |||
String[] EXCEL_SECOND_NAME = {"采样点时间","相对高度m","经度", | |||
"纬度","SO2 μg/m³","CO mg/m³","NO2 μg/m³","O3 μg/m³","VOCS μg/m³","PM2.5 μg/m³","PM10 μg/m³", | |||
"设备序列号"}; | |||
"设备序列号","序号"}; | |||
/** | |||
* 顶级部门pid,默认为0 |
@@ -103,20 +103,6 @@ public class AirDataExcelVo { | |||
@ExcelProperty(value = {"PM10 ug/m3"},index = 10) | |||
private String pm_10; | |||
// /** | |||
// * o3+NO2 | |||
// */ | |||
// @ExcelProperty(value = {"o3+NO2 ppm"},index = 11) | |||
// private String ox; | |||
// /** | |||
// * PM1.0(单位ug/m3) | |||
// */ | |||
// @ExcelProperty(value = {"PM1.0 ug/m3"},index = 12) | |||
// private String pm10; | |||
/** | |||
* 设备序列号 | |||
*/ | |||
@@ -126,6 +112,7 @@ public class AirDataExcelVo { | |||
/** | |||
* 序号 | |||
*/ | |||
@ExcelProperty(value = {"设备序列号"},index = 12) | |||
private Integer sequence; | |||
@@ -196,7 +196,7 @@ public class QueryAirDataListService { | |||
public JsonResult easyExcel(List<AirDataExcelVo> voArrayList,Inspection inspection,String filePath) { | |||
log.info("文件输出目录及格式:filePathName={}",filePath); | |||
List<List<String>> heads = new ArrayList<>(); | |||
String totalName = "项目名称:"+ inspection.getName(); | |||
String totalName = "项目名称:"+ inspection.getName() +"+" + inspection.getCode(); | |||
String[] nameString = SystemConstant.EXCEL_SECOND_NAME; | |||
for (String excelName : nameString) { | |||
heads.add(Arrays.asList(totalName,excelName)); |