提交 ae67d55d authored 作者: 马晨俊's avatar 马晨俊

mcj:更新导入excel表格

上级 96183acd
...@@ -30,6 +30,8 @@ public class Details { ...@@ -30,6 +30,8 @@ public class Details {
@ApiModelProperty(value = "操作系统 枚举") @ApiModelProperty(value = "操作系统 枚举")
private OperateSystem operateSystem = OperateSystem.NONE; private OperateSystem operateSystem = OperateSystem.NONE;
@ApiModelProperty(value = "操作系统 code")
private Integer code;
/** /**
* 台数 * 台数
*/ */
......
...@@ -94,6 +94,7 @@ public class ExcelUtil { ...@@ -94,6 +94,7 @@ public class ExcelUtil {
} }
excelDataTemps.add(excelDataTemp); excelDataTemps.add(excelDataTemp);
SystemStructure systemStructure = reform.getSystemStructure(); SystemStructure systemStructure = reform.getSystemStructure();
ExcelDataTemp deployTemp = new ExcelDataTemp(); ExcelDataTemp deployTemp = new ExcelDataTemp();
...@@ -624,7 +625,7 @@ public class ExcelUtil { ...@@ -624,7 +625,7 @@ public class ExcelUtil {
ArrayList<ExcelDataEntity> excelDataEntities = new ArrayList<>(); ArrayList<ExcelDataEntity> excelDataEntities = new ArrayList<>();
if (application != null) { if (application != null) {
excelDataEntities.add(exportEntity(name + "部署情况", getDeploy(application.getDeploy()))); excelDataEntities.add(exportEntity(name + "部署情况", getDeploy(application.getDeploy())));
excelDataEntities.add(exportEntity(name + "操作系统", application.getOperateSystem().getCode())); excelDataEntities.add(exportEntity(name + "操作系统", application.getOperateSystem().getName()));
excelDataEntities.add(exportEntity(name + "台数", application.getNum())); excelDataEntities.add(exportEntity(name + "台数", application.getNum()));
excelDataEntities.add(exportEntity(name + "cpu个数", application.getCpuNum())); excelDataEntities.add(exportEntity(name + "cpu个数", application.getCpuNum()));
excelDataEntities.add(exportEntity(name + "主频", application.getGhz())); excelDataEntities.add(exportEntity(name + "主频", application.getGhz()));
...@@ -649,6 +650,7 @@ public class ExcelUtil { ...@@ -649,6 +650,7 @@ public class ExcelUtil {
String slbsys = getExcelCell(rowNum, cellNum + 2, sheetAt); String slbsys = getExcelCell(rowNum, cellNum + 2, sheetAt);
OperateSystem slbByName = OperateSystem.getByName(slbsys); OperateSystem slbByName = OperateSystem.getByName(slbsys);
details.setOperateSystem(slbByName); details.setOperateSystem(slbByName);
details.setCode(slbByName.getCode());
String cpu3 = getExcelCell(rowNum, cellNum + 3, sheetAt); String cpu3 = getExcelCell(rowNum, cellNum + 3, sheetAt);
details.setCpuNum(returnNum(cpu3)); details.setCpuNum(returnNum(cpu3));
String ghz3 = getExcelCell(rowNum, cellNum + 4, sheetAt); String ghz3 = getExcelCell(rowNum, cellNum + 4, sheetAt);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论