分机号保存加所属公司

manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/api/ExtensionNumberController.java

@@ -30,9 +30,12 @@ public class ExtensionNumberController {
     @ApiOperation("导入分机号和外显号")
     public CommonResponse<String> addNumbers(@RequestParam("minNumber") Integer minNumber,
                                              @RequestParam("maxNumber") Integer maxNumber,
-                                             @RequestParam("display") Long display
-    ) {
-        extensionNumberService.addNumbers(minNumber, maxNumber, display);
+                                             @RequestParam("display") Long display,
+                                             @RequestParam("companyId") Long companyId
+    )
+
+    {
+        extensionNumberService.addNumbers(minNumber, maxNumber, display,companyId);
         return CommonResponse.createBySuccess();
     }
 

manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/dao/ExtensionNumberRepository.java

@@ -20,7 +20,7 @@ public interface ExtensionNumberRepository extends JpaRepository<ExtensionNumber
      * @param status
      * @return
      */
-    Integer findIdByStatus(Integer status);
+    Integer findIdByStatusAndCompanyId(Integer status,Long companyId);
 
     @Modifying
     @Query(value = "update ExtensionNumber c set c.status =?1 where c.number = ?2")

manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/entity/ExtensionNumber.java

@@ -37,6 +37,10 @@ public class ExtensionNumber implements Serializable {
     @ApiModelProperty(value = "外显号")
     private Long display;
 
+    @Column(name = "company_id")
+    @ApiModelProperty(value = "所属公司")
+    private Long companyId;
+
     @LastModifiedDate
     @Column(name = "create_time")
     @ApiModelProperty(value = "创建时间")

manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/ExtensionNumberService.java

@@ -9,7 +9,7 @@ import com.baiye.modules.telemarkting.entity.ExtensionNumber;
  * @date 2022/02/14
  */
 public interface ExtensionNumberService {
-    void addNumbers(Integer minNumber, Integer maxNumber, Long display);
+    void addNumbers(Integer minNumber, Integer maxNumber, Long display,Long companyId);
 
     ExtensionNumber getExtension(Long memberId);
 

manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/impl/ExtensionNumberServiceImpl.java

@@ -10,6 +10,7 @@ import com.baiye.modules.telemarkting.dao.ExtensionUserRepository;
 import com.baiye.modules.telemarkting.entity.ExtensionNumber;
 import com.baiye.modules.telemarkting.entity.ExtensionUser;
 import com.baiye.modules.telemarkting.service.ExtensionNumberService;
+import com.baiye.util.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -34,8 +35,8 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
     private ExtensionUserRepository extensionUserRepository;
 
     @Override
-    public void addNumbers(Integer minNumber, Integer maxNumber, Long display) {
-        List<ExtensionNumber> numbers = getNumbers(minNumber, maxNumber, display);
+    public void addNumbers(Integer minNumber, Integer maxNumber, Long display, Long companyId) {
+        List<ExtensionNumber> numbers = getNumbers(minNumber, maxNumber, display, companyId);
         extensionNumberRepository.saveAll(numbers);
 
     }
@@ -57,8 +58,10 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
                 log.info("用户 ：{}，已经分配分机号", memberId);
                 throw new BadRequestException("用户已经分配分机号,用户id：" + memberId);
             }
+            //所属公司
+            Long companyId = SecurityUtils.getCompanyId();
             //查一个分机号
-            Integer idByStatus = extensionNumberRepository.findIdByStatus(DefaultNumberConstants.ZERO_NUMBER);
+            Integer idByStatus = extensionNumberRepository.findIdByStatusAndCompanyId(DefaultNumberConstants.ZERO_NUMBER, companyId);
             ExtensionUser extensionUser = new ExtensionUser();
             extensionUser.setMemberId(memberId);
             extensionUser.setNumber(idByStatus);
@@ -74,12 +77,13 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
         return CommonResponse.createBySuccess();
     }
 
-    private List<ExtensionNumber> getNumbers(Integer minNumber, Integer maxNumber, Long display) {
+    private List<ExtensionNumber> getNumbers(Integer minNumber, Integer maxNumber, Long display, Long companyId) {
         List<ExtensionNumber> list = new ArrayList<>();
         for (int i = minNumber; i <= maxNumber; i++) {
             ExtensionNumber extensionNumber = new ExtensionNumber();
             extensionNumber.setNumber(i);
             extensionNumber.setDisplay(display);
+            extensionNumber.setCompanyId(companyId);
             list.add(extensionNumber);
         }
         return list;