增加查询分机号的api

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserMessageServiceImpl.java

@@ -116,6 +116,7 @@ public class UserMessageServiceImpl implements UserMessageService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void deleteAll(List<Long> ids) {
         for (Long id : ids) {
             userMessageRepository.deleteById(id);

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

@@ -2,6 +2,10 @@ package com.baiye.modules.telemarkting.api;
 
 import com.baiye.http.CommonResponse;
 import com.baiye.modules.telemarkting.service.ExtensionNumberService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -13,18 +17,28 @@ import javax.annotation.Resource;
  * @author wujingtao
  * @date 2022/02/14
  */
+@Slf4j
 @RestController
 @RequestMapping("/api")
+@Api(tags = "点呼分机号")
+@RequiredArgsConstructor
 public class ExtensionNumberController {
-    @Resource
-    private ExtensionNumberService extensionNumberService;
+
+    private final ExtensionNumberService extensionNumberService;
 
     @GetMapping("/add/extension")
+    @ApiOperation("导入分机号和外显号")
     public CommonResponse<String> addNumbers(@RequestParam("minNumber") Integer minNumber,
                                              @RequestParam("maxNumber") Integer maxNumber,
                                              @RequestParam("display") Long display
     ) {
-        extensionNumberService.addNumbers(minNumber, maxNumber,display);
+        extensionNumberService.addNumbers(minNumber, maxNumber, display);
         return CommonResponse.createBySuccess();
     }
+
+    @GetMapping("/get/extension")
+    @ApiOperation("获取分机号和外显号")
+    public CommonResponse<Object> getExtension(Long memberId) {
+        return CommonResponse.createBySuccess(extensionNumberService.getExtension(memberId));
+    }
 }

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

@@ -2,13 +2,16 @@ package com.baiye.modules.telemarkting.service;
 
 
 import com.baiye.http.CommonResponse;
+import com.baiye.modules.telemarkting.entity.ExtensionNumber;
 
 /**
  * @author wujingtao
  * @date 2022/02/14
  */
 public interface ExtensionNumberService {
-    void addNumbers(Integer minNumber, Integer maxNumber,Long display);
+    void addNumbers(Integer minNumber, Integer maxNumber, Long display);
+
+    ExtensionNumber getExtension(Long memberId);
 
     CommonResponse<Object> assignExtensionNum(Long organizeId, Long memberId);
 }

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

@@ -35,11 +35,16 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
 
     @Override
     public void addNumbers(Integer minNumber, Integer maxNumber, Long display) {
-        List<ExtensionNumber> numbers = getNumbers(minNumber, maxNumber,display);
+        List<ExtensionNumber> numbers = getNumbers(minNumber, maxNumber, display);
         extensionNumberRepository.saveAll(numbers);
 
     }
 
+    @Override
+    public ExtensionNumber getExtension(Long memberId) {
+        return extensionNumberRepository.selectByMemberId(memberId);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public CommonResponse<Object> assignExtensionNum(Long organizeId, Long memberId) {

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

@@ -100,7 +100,7 @@ public class TelephoneCallServiceImpl implements TelephoneCallService {
         AllCallInfo allCallInfo = allCallInfoRepository.findBySessionId(sessionId);
         if (ObjectUtil.isNotEmpty(allCallInfo)) {
             allCallInfo.setDuration(doubleCallBack.getDuration());
-            allCallInfo.setRecordFlag(doubleCallBack.getRecordFlag());
+            allCallInfo.setRecordFlag(doubleCallBack.getRecordFlag() == null ? DefaultNumberConstants.ZERO_NUMBER : doubleCallBack.getRecordFlag());
             allCallInfo.setRecordFileDownloadUrl(doubleCallBack.getRecordFileDownloadUrl());
             allCallInfoRepository.save(allCallInfo);
         }
@@ -183,14 +183,16 @@ public class TelephoneCallServiceImpl implements TelephoneCallService {
     public CommonResponse<String> rollCallReq(TelephoneCallReqDTO telephoneCallReqDTO) {
         String requestId = RandomUtil.randomString(10);
         telephoneCallReqDTO.setRequestId(requestId);
-        //获取分机号
-        ExtensionNumber extensionNumber = extensionNumberRepository.selectByMemberId(telephoneCallReqDTO.getMemberId());
-        if (extensionNumber == null) {
-            log.error("未配置分机号");
-            return CommonResponse.createByErrorMessage("未配置分机号");
+        if (telephoneCallReqDTO.getDisplay() == null || telephoneCallReqDTO.getTelA() == null) {
+            //获取分机号
+            ExtensionNumber extensionNumber = extensionNumberRepository.selectByMemberId(telephoneCallReqDTO.getMemberId());
+            if (extensionNumber == null) {
+                log.error("未配置分机号");
+                return CommonResponse.createByErrorMessage("未配置分机号");
+            }
+            telephoneCallReqDTO.setTelA(String.valueOf(extensionNumber.getNumber()));
+            telephoneCallReqDTO.setDisplay(extensionNumber.getDisplay());
         }
-        telephoneCallReqDTO.setTelA(String.valueOf(extensionNumber.getNumber()));
-        telephoneCallReqDTO.setDisplay(extensionNumber.getDisplay());
         //获取线索号
         Clue body = sourceClueClient.queryDetails(Long.parseLong(telephoneCallReqDTO.getUserData())).getBody();
         if (ObjectUtil.isNull(body) || StrUtil.isEmpty(body.getNid())) {
@@ -226,6 +228,11 @@ public class TelephoneCallServiceImpl implements TelephoneCallService {
         return CommonResponse.createBySuccess(requestId);
     }
 
+    /**
+     * 点呼回调  会得到两个，一个是针对分机号 一个是针对真实被叫 保存信息取值被叫回调，录音取分机号回调(被叫回调没有录音)
+     *
+     * @param rollCallBackDTO
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void rollCallBack(RollCallBackDTO rollCallBackDTO) {
@@ -250,4 +257,6 @@ public class TelephoneCallServiceImpl implements TelephoneCallService {
             allCallInfoRepository.save(allCallInfo);
         }
     }
+
+
 }