|
|
@ -1,10 +1,9 @@
|
|
|
|
package com.baiye.modules.telemarkting.service.impl;
|
|
|
|
package com.baiye.modules.telemarkting.service.impl;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
|
import com.baiye.constant.DefaultNumberConstants;
|
|
|
|
import com.baiye.constant.DefaultNumberConstants;
|
|
|
|
import com.baiye.exception.BadRequestException;
|
|
|
|
import com.baiye.exception.BadRequestException;
|
|
|
|
import com.baiye.http.CommonResponse;
|
|
|
|
import com.baiye.http.CommonResponse;
|
|
|
|
import com.baiye.modules.system.domain.Organize;
|
|
|
|
|
|
|
|
import com.baiye.modules.system.repository.OrganizeRepository;
|
|
|
|
|
|
|
|
import com.baiye.modules.telemarkting.dao.ExtensionNumberRepository;
|
|
|
|
import com.baiye.modules.telemarkting.dao.ExtensionNumberRepository;
|
|
|
|
import com.baiye.modules.telemarkting.dao.ExtensionUserRepository;
|
|
|
|
import com.baiye.modules.telemarkting.dao.ExtensionUserRepository;
|
|
|
|
import com.baiye.modules.telemarkting.entity.ExtensionNumber;
|
|
|
|
import com.baiye.modules.telemarkting.entity.ExtensionNumber;
|
|
|
@ -18,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* @author wujingtao
|
|
|
|
* @author wujingtao
|
|
|
@ -28,9 +28,6 @@ import java.util.List;
|
|
|
|
public class ExtensionNumberServiceImpl implements ExtensionNumberService {
|
|
|
|
public class ExtensionNumberServiceImpl implements ExtensionNumberService {
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
private ExtensionNumberRepository extensionNumberRepository;
|
|
|
|
private ExtensionNumberRepository extensionNumberRepository;
|
|
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
|
|
|
private OrganizeRepository organizeRepository;
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
private ExtensionUserRepository extensionUserRepository;
|
|
|
|
private ExtensionUserRepository extensionUserRepository;
|
|
|
|
|
|
|
|
|
|
|
@ -73,6 +70,18 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
|
|
|
|
return CommonResponse.createBySuccess();
|
|
|
|
return CommonResponse.createBySuccess();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
|
|
|
|
public void unbindExtension(Long organizeId) {
|
|
|
|
|
|
|
|
List<ExtensionUser> byAndOrganizeId = extensionUserRepository.findByAndOrganizeId(organizeId);
|
|
|
|
|
|
|
|
if (CollUtil.isNotEmpty(byAndOrganizeId)) {
|
|
|
|
|
|
|
|
List<Integer> numbers = byAndOrganizeId.stream().map(ExtensionUser::getNumber).collect(Collectors.toList());
|
|
|
|
|
|
|
|
extensionNumberRepository.updateByNumber(DefaultNumberConstants.ZERO_NUMBER, numbers);
|
|
|
|
|
|
|
|
extensionUserRepository.deleteByOrganizeId(organizeId);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private List<ExtensionNumber> getNumbers(Integer minNumber, Integer maxNumber, Long display, Long companyId) {
|
|
|
|
private List<ExtensionNumber> getNumbers(Integer minNumber, Integer maxNumber, Long display, Long companyId) {
|
|
|
|
List<ExtensionNumber> list = new ArrayList<>();
|
|
|
|
List<ExtensionNumber> list = new ArrayList<>();
|
|
|
|
for (int i = minNumber; i <= maxNumber; i++) {
|
|
|
|
for (int i = minNumber; i <= maxNumber; i++) {
|
|
|
|