Commit d3f1a9c6 authored by 刘林's avatar 刘林

fix(jg):气瓶批量导入功能修改

parent ca41a7e7
...@@ -165,7 +165,7 @@ public class IdxBizJqEquipmentRegisterController extends BaseController { ...@@ -165,7 +165,7 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/importData") @PostMapping(value = "/importData")
@ApiOperation(httpMethod = "POST", value = "气瓶批量导入", notes = "气瓶批量导入") @ApiOperation(httpMethod = "POST", value = "气瓶批量导入", notes = "气瓶批量导入")
public List<EquipInfoCylinderExcelDto> ImportData (@RequestPart("file") MultipartFile multipartFile) throws Exception { public ResponseModel<List<EquipInfoCylinderExcelDto>> ImportData (@RequestPart("file") MultipartFile multipartFile) throws Exception {
List<EquipInfoCylinderExcelDto> aircraftList = new ArrayList<>(); List<EquipInfoCylinderExcelDto> aircraftList = new ArrayList<>();
try { try {
EasyExcel.read(multipartFile.getInputStream(), EquipInfoCylinderExcelDto.class, new AnalysisEventListener<EquipInfoCylinderExcelDto>() { EasyExcel.read(multipartFile.getInputStream(), EquipInfoCylinderExcelDto.class, new AnalysisEventListener<EquipInfoCylinderExcelDto>() {
...@@ -182,7 +182,7 @@ public class IdxBizJqEquipmentRegisterController extends BaseController { ...@@ -182,7 +182,7 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
System.out.println("读取完成"); System.out.println("读取完成");
} }
}).headRowNumber(4).sheet().doRead(); }).headRowNumber(4).sheet().doRead();
return aircraftList; return ResponseHelper.buildResponse(aircraftList);
} catch (Exception e) { } catch (Exception e) {
throw new Exception("系统异常"); throw new Exception("系统异常");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment