通信设备导入5

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

@@ -495,7 +495,7 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
                     device.setEnable(1);
                     device.setCreator(user.getUserName());
                     device.setInstallTime(new Date());
-//                    try{
+                    try{
                         this.save(device);
                         String deviceCode = device.getDeviceCode();
                         Integer siteId = device.getSiteId();
@@ -504,17 +504,16 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
                         deviceStatus.setStatusTime(new Date());
                         deviceStatus.setSiteId(siteId);
                         deviceStatusService.save(deviceStatus);
-//                    }catch (Exception e){
-//                        err="文件导入失败，第"+rot+"行数据导入失败";
+                    }catch (Exception e){
+                        err="文件导入失败，第"+rot+1+"行数据导入失败";
+                        throw  new BusinessException("文件导入失败，第"+rot+"行数据导入失败");
 
-//                    }
-                    err="文件导入失败，第"+rot+1+"行数据导入失败";
+                    }
                     rot++;
-//                    throw  new BusinessException("文件导入失败，第"+rot+"行数据导入失败");
                 }
             }else {
                 err="文件不能为空";
-//                throw new BusinessException("文件不能为空");
+                throw new BusinessException("文件不能为空");
             }
         }catch (Exception e){
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();