diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java index 711134592..b9a233e05 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java @@ -38,6 +38,7 @@ import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; +import org.springblade.common.exception.CustomerException; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.log.exception.ServiceException; @@ -292,9 +293,14 @@ public class BasicdataDriverArteryController extends BladeController { @ApiOperation(value = "导入司机信息", notes = "传入excel") public R importDriverArteryEntry(MultipartFile file) { log.info("传入>>>>>>>{}", file); - BasicdataDriverArteryImporter basicdataDriverArteryImporter = new BasicdataDriverArteryImporter(basicdataDriverArteryService); - ExcelUtil.save(file, basicdataDriverArteryImporter, BasicdataDriverArteryImproterExcel.class); - return R.success("操作成功"); + try { + BasicdataDriverArteryImporter basicdataDriverArteryImporter = new BasicdataDriverArteryImporter(basicdataDriverArteryService); + ExcelUtil.save(file, basicdataDriverArteryImporter, BasicdataDriverArteryImproterExcel.class); + return R.success("操作成功"); + } catch (CustomerException e) { + log.error("导入失败", e); + return R.fail(e.getMessage()); + } } /** diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java index b872b50dd..05e76453b 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java @@ -44,6 +44,7 @@ import org.springblade.common.constant.driver.DriverApprovedDrivingModelConstant import org.springblade.common.constant.driver.DriverBankTypeConverter; import org.springblade.common.constant.driver.DriverPositionTypeConstant; import org.springblade.common.constant.driver.DriverTypeStatusConstant; +import org.springblade.common.exception.CustomerException; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.BladeUser; @@ -268,7 +269,7 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl { message.getMessageProperties().setHeader("x-delay", 2000); return message; }); - } +// } // R r = factoryDataService.handleStatusData(orderStatusDTO); return R.success("调用成功");