|
|
|
@ -80,6 +80,7 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
|
|
|
|
|
//解析保存分机号
|
|
|
|
|
if (ObjectUtil.isNotEmpty(file) && file.getSize() > 0) {
|
|
|
|
|
List<ExtensionNumber> list = new ArrayList<>();
|
|
|
|
|
List<Integer> numbers = new ArrayList<>();
|
|
|
|
|
try {
|
|
|
|
|
int lastIndexOf = Objects.requireNonNull(file.getOriginalFilename()).lastIndexOf(".");
|
|
|
|
|
String nameFormat = file.getOriginalFilename().substring(lastIndexOf + 1);
|
|
|
|
@ -92,8 +93,11 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
|
|
|
|
|
extensionNumber.setNumber(Integer.valueOf(number));
|
|
|
|
|
extensionNumber.setCompanyId(companyId);
|
|
|
|
|
list.add(extensionNumber);
|
|
|
|
|
numbers.add(Integer.valueOf(number));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//删除以前的旧绑定关系
|
|
|
|
|
extensionUserRepository.deleteByNumbers(numbers);
|
|
|
|
|
extensionNumberRepository.saveAll(list);
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
log.error("读取文件错误:{}", e.getMessage());
|
|
|
|
@ -131,7 +135,7 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
|
|
|
|
|
//查一个分机号
|
|
|
|
|
Integer idByStatus = extensionNumberRepository.findIdByStatusAndCompanyId(DefaultNumberConstants.ZERO_NUMBER, companyId);
|
|
|
|
|
if (idByStatus == null || idByStatus == 0) {
|
|
|
|
|
log.error("可分配的分机号不足,请联系管理员");
|
|
|
|
|
log.error("可分配的分机号不足,请联系管理员 公司id={}", companyId);
|
|
|
|
|
throw new BadRequestException("可分配的分机号不足,请联系管理员");
|
|
|
|
|
}
|
|
|
|
|
ExtensionUser extensionUser = new ExtensionUser();
|
|
|
|
|