diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java index f4a3057..2f2d691 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java @@ -192,24 +192,6 @@ } catch (IOException e) { e.printStackTrace(); } - List list = busConcentratorService.addDeviceBatch(results); - if (CollectionUtil.isNotEmpty(list)) { - //获取第校验报错信息 - return new ErrorResponseData(list.get(0)); - } - return ResponseData.success(); + return busConcentratorService.addDeviceBatch(results); } - - private ResponseData catchMybatisPlusException(Exception e, String errorMsg) { - if (e instanceof MybatisPlusException) { - MybatisPlusException mybatisPlusException = (MybatisPlusException) e; - String message = mybatisPlusException.getCause().getCause().getCause().getMessage(); - if (message.contains("Duplicate entry '")) { - return new ErrorResponseData("集中器编号重复:" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'CONCENCODE'", "")); - } - } - logger.error(errorMsg, e); - return new ErrorResponseData(errorMsg); - } - } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java index f4a3057..2f2d691 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java @@ -192,24 +192,6 @@ } catch (IOException e) { e.printStackTrace(); } - List list = busConcentratorService.addDeviceBatch(results); - if (CollectionUtil.isNotEmpty(list)) { - //获取第校验报错信息 - return new ErrorResponseData(list.get(0)); - } - return ResponseData.success(); + return busConcentratorService.addDeviceBatch(results); } - - private ResponseData catchMybatisPlusException(Exception e, String errorMsg) { - if (e instanceof MybatisPlusException) { - MybatisPlusException mybatisPlusException = (MybatisPlusException) e; - String message = mybatisPlusException.getCause().getCause().getCause().getMessage(); - if (message.contains("Duplicate entry '")) { - return new ErrorResponseData("集中器编号重复:" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'CONCENCODE'", "")); - } - } - logger.error(errorMsg, e); - return new ErrorResponseData(errorMsg); - } - } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConcentratorService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConcentratorService.java index 9d16e97..ac11187 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConcentratorService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConcentratorService.java @@ -2,9 +2,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusConcentrator; import com.casic.missiles.core.datascope.DataScope; +import javax.xml.ws.Response; import java.util.List; /** @@ -33,7 +35,7 @@ * @param results * @return */ - List addDeviceBatch(List results); + ResponseData addDeviceBatch(List results); void deleteByIds(List ids); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java index f4a3057..2f2d691 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java @@ -192,24 +192,6 @@ } catch (IOException e) { e.printStackTrace(); } - List list = busConcentratorService.addDeviceBatch(results); - if (CollectionUtil.isNotEmpty(list)) { - //获取第校验报错信息 - return new ErrorResponseData(list.get(0)); - } - return ResponseData.success(); + return busConcentratorService.addDeviceBatch(results); } - - private ResponseData catchMybatisPlusException(Exception e, String errorMsg) { - if (e instanceof MybatisPlusException) { - MybatisPlusException mybatisPlusException = (MybatisPlusException) e; - String message = mybatisPlusException.getCause().getCause().getCause().getMessage(); - if (message.contains("Duplicate entry '")) { - return new ErrorResponseData("集中器编号重复:" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'CONCENCODE'", "")); - } - } - logger.error(errorMsg, e); - return new ErrorResponseData(errorMsg); - } - } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConcentratorService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConcentratorService.java index 9d16e97..ac11187 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConcentratorService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConcentratorService.java @@ -2,9 +2,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusConcentrator; import com.casic.missiles.core.datascope.DataScope; +import javax.xml.ws.Response; import java.util.List; /** @@ -33,7 +35,7 @@ * @param results * @return */ - List addDeviceBatch(List results); + ResponseData addDeviceBatch(List results); void deleteByIds(List ids); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java index 16bfe18..09bcf46 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java @@ -5,11 +5,14 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.log.LogObjectHolder; +import com.casic.missiles.model.response.ErrorResponseData; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.constant.DeviceConst; import com.casic.missiles.modular.system.dao.BusConcentratorMapper; import com.casic.missiles.modular.system.model.BusConcentrator; @@ -64,7 +67,7 @@ } @Override - public List addDeviceBatch(List results) { + public ResponseData addDeviceBatch(List results) { BeanPropertyBindingResult beanPropertyBindingResult = new BeanPropertyBindingResult(Device.class, "集中器导入校验"); List list = new ArrayList<>(); if (!CollectionUtil.isEmpty(results)) { @@ -108,17 +111,33 @@ busConcentrator.setStatus(DeviceConst.NO); }); if (CollectionUtil.isNotEmpty(list)) { - return list; + return ResponseData.success(); } try { this.saveBatch(results); - }catch (DataAccessException ex){ - log.error("主题,集中器批量导入模板保存数据库出现异常,异常信息为{}",ex); + } catch (DataAccessException ex) { + log.error("主题,集中器批量导入模板保存数据库出现异常,异常信息为{}", ex); list.add("保存出现异常,集中器编号重复"); + return catchMybatisPlusException(ex, "导入集中器失败"); } } + if (CollectionUtil.isNotEmpty(list)) { + //获取第校验报错信息 + return new ErrorResponseData(list.get(0)); + } + return ResponseData.success(); + } - return list; + private ResponseData catchMybatisPlusException(Exception e, String errorMsg) { + if (e instanceof MybatisPlusException) { + MybatisPlusException mybatisPlusException = (MybatisPlusException) e; + String message = mybatisPlusException.getCause().getCause().getCause().getMessage(); + if (message.contains("Duplicate entry '")) { + return new ErrorResponseData("集中器编号重复:" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'CONCENCODE'", "")); + } + } + logger.error(errorMsg, e); + return new ErrorResponseData(errorMsg); } @Transactional