|
@@ -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,11 +504,12 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
|
|
|
deviceStatus.setStatusTime(new Date());
|
|
|
deviceStatus.setSiteId(siteId);
|
|
|
deviceStatusService.save(deviceStatus);
|
|
|
- }catch (Exception e){
|
|
|
+// }catch (Exception e){
|
|
|
// err="文件导入失败,第"+rot+"行数据导入失败";
|
|
|
- throw new BusinessException("文件导入失败,第"+rot+"行数据导入失败");
|
|
|
- }
|
|
|
+
|
|
|
+// }
|
|
|
rot++;
|
|
|
+ throw new BusinessException("文件导入失败,第"+rot+"行数据导入失败");
|
|
|
}
|
|
|
}else {
|
|
|
// err="文件不能为空";
|