获取sip密码

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

@@ -1,5 +1,6 @@
 package com.baiye.modules.telemarkting.api;
 
+import com.baiye.annotation.Inner;
 import com.baiye.http.CommonResponse;
 import com.baiye.modules.telemarkting.service.ExtensionNumberService;
 import io.swagger.annotations.Api;
@@ -24,7 +25,7 @@ public class ExtensionNumberController {
 
     @PostMapping("/add/extension")
     @ApiOperation("导入分机号和外显号")
-    public CommonResponse<String> addNumbers(@RequestParam(value = "file",required = false) MultipartFile file,
+    public CommonResponse<String> addNumbers(@RequestParam(value = "file", required = false) MultipartFile file,
                                              @RequestParam("display") Long display,
                                              @RequestParam("dyDisplay") Long dyDisplay,
                                              @RequestParam("deliveryDisplay") Long deliveryDisplay,
@@ -37,7 +38,7 @@ public class ExtensionNumberController {
         if (display == null && dyDisplay == null && deliveryDisplay == null && tokerDisplay == null) {
             return CommonResponse.createByErrorMessage("外显号不能为空，请检查");
         }
-        return extensionNumberService.addNumbers(file, display, dyDisplay, deliveryDisplay, tokerDisplay,companyId);
+        return extensionNumberService.addNumbers(file, display, dyDisplay, deliveryDisplay, tokerDisplay, companyId);
     }
 
     @GetMapping("/get/extension")
@@ -50,4 +51,13 @@ public class ExtensionNumberController {
     public CommonResponse<Object> queryExtensionDisplay(Long companyId) {
         return CommonResponse.createBySuccess(extensionNumberService.queryExtensionDisplay(companyId));
     }
+
+    @GetMapping("/sip")
+    @Inner(value = false)
+    public CommonResponse<Object> sip(@RequestParam("number") String number,
+                                      @RequestParam("name") String name)
+
+    {
+        return CommonResponse.createBySuccess(extensionNumberService.sip(number, name));
+    }
 }

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/httpRequest/NumberSipReq.java

@@ -21,17 +21,17 @@ import java.util.Map;
 public class NumberSipReq {
 
     private static final String REQUEST_ID = "test";
-    private static final String COMPANY_NAME = "杭州大坝科技";
     private static final String URL = "https://ax.hzdaba.cn/v2/Accounts/dbby_hangzhoubaiyehl/Ex/getExtension";
 
-    public String req(String number) {
+    public String req(String number,String name) {
         Map<String, String> map = new HashMap<>(3);
         map.put("requestId", REQUEST_ID);
-        map.put("company_name", COMPANY_NAME);
+        map.put("company_name", name);
         map.put("extension_number", number);
 
         HttpResponse httpResponse = sendReq(JSONUtil.toJsonStr(map));
         JSONObject jsonObject = JSONUtil.parseObj(httpResponse.body());
+        log.info("获取的密码 {}", httpResponse.body());
         if (String.valueOf(DefaultNumberConstants.ZERO_NUMBER).equals(jsonObject.getStr("result"))) {
             return jsonObject.getStr("password");
         } else {

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

@@ -16,6 +16,8 @@ public interface ExtensionNumberService {
 
     ExtensionNumber getExtension(Long memberId);
 
+    String sip(String number, String name);
+
     /**
      * 分配分机号
      *

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

@@ -3,13 +3,16 @@ package com.baiye.modules.telemarkting.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.SerializeUtil;
 import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
 import com.baiye.constant.DefaultNumberConstants;
 import com.baiye.exception.BadRequestException;
 import com.baiye.http.CommonResponse;
+import com.baiye.modules.platform.domain.Company;
 import com.baiye.modules.platform.domain.Organize;
 import com.baiye.modules.platform.repository.OrganizeRepository;
+import com.baiye.modules.platform.service.CompanyService;
 import com.baiye.modules.system.domain.User;
 import com.baiye.modules.system.repository.UserRepository;
 import com.baiye.modules.telemarkting.dao.ExtensionDisplayRepository;
@@ -51,6 +54,14 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
     private OrganizeRepository organizeRepository;
     @Resource
     private NumberSipReq numberSipReq;
+    @Resource
+    private CompanyService companyService;
+
+    @Override
+    public String sip(String number,String name) {
+        String sip = numberSipReq.req(number,name);
+        return sip;
+    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -90,12 +101,15 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
                 if ("xlsx".equals(nameFormat) || "xls".equals(nameFormat)) {
                     ExcelReader reader = ExcelUtil.getReader(file.getInputStream());
                     List<List<Object>> read = reader.read(0, reader.getRowCount());
+                    Company company = companyService.findById(companyId);
+
                     for (List<Object> objects : read) {
                         String number = String.valueOf(objects.get(0));
                         ExtensionNumber extensionNumber = new ExtensionNumber();
                         extensionNumber.setNumber(Integer.valueOf(number));
                         extensionNumber.setCompanyId(companyId);
-                        String sip = numberSipReq.req(number);
+
+                        String sip = numberSipReq.req(number,company.getCompanyName());
                         extensionNumber.setSip(sip);
                         list.add(extensionNumber);
                         numbers.add(Integer.valueOf(number));

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

@@ -310,10 +310,10 @@ public class TelephoneCallServiceImpl implements TelephoneCallService {
         if (ObjectUtil.isNotEmpty(allCallInfo)) {
             //相同说明是分机号的回调
             if (sessionId.equals(otherLeg) && StrUtil.isNotBlank(rollCallBackDTO.getRecord_file_url())) {
-                log.info("分机回调-点呼：sessionId:{},详情:{}", sessionId, rollCallBackDTO);
+                log.info("分机回调-点呼：otherLeg:{},详情:{}", otherLeg, rollCallBackDTO);
                 allCallInfoRepository.updateByRecord(DefaultNumberConstants.ONE_NUMBER, rollCallBackDTO.getRecord_file_url(), allCallInfo.getId());
             } else {
-                log.info("被叫回调-点呼：sessionId:{},详情:{}", sessionId, rollCallBackDTO);
+                log.info("被叫回调-点呼：otherLeg:{},详情:{}", otherLeg, rollCallBackDTO);
                 //拨打线索号的回调
                 if (StrUtil.isNotBlank(rollCallBackDTO.getCallee_answer_time())) {
                     //表示接通,更新线索状态