通信设备导入数据

fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceServiceImpl.java

@@ -484,20 +484,26 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
             List<DeviceImportVo> deviceImportVos = ExcelImportUtil.importExcel(multipartFile.getInputStream(),
                     DeviceImportVo.class, params);
             if (CollectionUtils.isNotEmpty(deviceImportVos)){
+                int rot=0;
                 for (DeviceImportVo deviceImportVo:deviceImportVos) {
                     DeviceStatus deviceStatus = new DeviceStatus();
                     Device device = BeanMapperUtils.map(deviceImportVo, Device.class);
                     device.setEnable(1);
                     device.setCreator(user.getUserName());
                     device.setInstallTime(new Date());
-                    this.save(device);
-                    String deviceCode = device.getDeviceCode();
-                    Integer siteId = device.getSiteId();
-                    deviceStatus.setDeviceStatus(1);
-                    deviceStatus.setDeviceCode(deviceCode);
-                    deviceStatus.setStatusTime(new Date());
-                    deviceStatus.setSiteId(siteId);
-                    deviceStatusService.save(deviceStatus);
+                    try{
+                        this.save(device);
+                        String deviceCode = device.getDeviceCode();
+                        Integer siteId = device.getSiteId();
+                        deviceStatus.setDeviceStatus(1);
+                        deviceStatus.setDeviceCode(deviceCode);
+                        deviceStatus.setStatusTime(new Date());
+                        deviceStatus.setSiteId(siteId);
+                        deviceStatusService.save(deviceStatus);
+                    }catch (Exception e){
+                        throw  new BusinessException("文件导入失败，第"+rot+"行数据导入失败");
+                    }
+                    rot++;
                 }
             }else {
                 throw new BusinessException("文件不能为空");