Changes

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

@@ -4,6 +4,7 @@ import com.baiye.http.CommonResponse;
 import com.baiye.modules.telemarkting.service.ExtensionNumberService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -19,8 +20,11 @@ public class ExtensionNumberController {
     private ExtensionNumberService extensionNumberService;
 
     @GetMapping("/add/extension")
-    public CommonResponse<String> addNumbers(Integer minNumber, Integer maxNumber) {
-        extensionNumberService.addNumbers(minNumber, maxNumber);
+    public CommonResponse<String> addNumbers(@RequestParam("minNumber") Integer minNumber,
+                                             @RequestParam("maxNumber") Integer maxNumber,
+                                             @RequestParam("display") Integer display
+    ) {
+        extensionNumberService.addNumbers(minNumber, maxNumber,display);
         return CommonResponse.createBySuccess();
     }
 }

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

@@ -25,4 +25,7 @@ public interface ExtensionNumberRepository extends JpaRepository<ExtensionNumber
     @Modifying
     @Query(value = "update ExtensionNumber c set c.status =?1 where c.number = ?2")
     void updateStatusById(Integer status, Integer id);
+
+    @Query(value = "select n.* from tb_extension_number n left join tb_extension_user u on n.number = u.number where u.member_id = ?1", nativeQuery = true)
+    ExtensionNumber selectByMemberId(Long memberId);
 }

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

@@ -11,6 +11,5 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface ExtensionUserRepository extends JpaRepository<ExtensionUser, Long>, JpaSpecificationExecutor<ExtensionUser> {
-
     Integer findNumberByMemberId(Long memberId);
 }

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

@@ -33,6 +33,10 @@ public class ExtensionNumber implements Serializable {
     @ApiModelProperty(value = "分机号")
     private Integer number;
 
+    @Column(name = "display")
+    @ApiModelProperty(value = "外显号")
+    private Integer display;
+
     @LastModifiedDate
     @Column(name = "create_time")
     @ApiModelProperty(value = "创建时间")

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

@@ -3,6 +3,7 @@ package com.baiye.modules.telemarkting.entity.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
@@ -51,5 +52,6 @@ public class TelephoneCallReqDTO implements Serializable {
 
     @ApiModelProperty(value = "组呼叫方式：0:双呼  1:点呼  2:AXB")
     private Integer callMode;
-
+    @ApiModelProperty("分机号")
+    private Integer display;
 }

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

@@ -54,6 +54,8 @@ public class RollCallReq {
         rollCallSystemDTO.setCallee(doubleCallReq.getTelB());
         rollCallSystemDTO.setIs_record(String.valueOf(DefaultNumberConstants.ONE_NUMBER));
         rollCallSystemDTO.setCdr_url(cdrUrl);
+        rollCallSystemDTO.setDisplay_callee(String.valueOf(doubleCallReq.getDisplay()));
+        rollCallSystemDTO.setDisplay_caller(String.valueOf(doubleCallReq.getDisplay()));
         log.info("请求对象：{}", BeanUtil.beanToMap(rollCallSystemDTO));
 
         String httpResponse = sendCallReq(BeanUtil.beanToMap(rollCallSystemDTO), reqUrl, authorization);

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

@@ -8,7 +8,7 @@ import com.baiye.http.CommonResponse;
  * @date 2022/02/14
  */
 public interface ExtensionNumberService {
-    void addNumbers(Integer minNumber, Integer maxNumber);
+    void addNumbers(Integer minNumber, Integer maxNumber,Integer display);
 
     CommonResponse<Object> assignExtensionNum(Long organizeId, Long memberId);
 }

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

@@ -4,7 +4,6 @@ import com.baiye.constant.DefaultNumberConstants;
 import com.baiye.http.CommonResponse;
 import com.baiye.modules.system.domain.Organize;
 import com.baiye.modules.system.repository.OrganizeRepository;
-import com.baiye.modules.system.service.OrganizeService;
 import com.baiye.modules.telemarkting.dao.ExtensionNumberRepository;
 import com.baiye.modules.telemarkting.dao.ExtensionUserRepository;
 import com.baiye.modules.telemarkting.entity.ExtensionNumber;
@@ -34,8 +33,8 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
     private ExtensionUserRepository extensionUserRepository;
 
     @Override
-    public void addNumbers(Integer minNumber, Integer maxNumber) {
-        List<ExtensionNumber> numbers = getNumbers(minNumber, maxNumber);
+    public void addNumbers(Integer minNumber, Integer maxNumber, Integer display) {
+        List<ExtensionNumber> numbers = getNumbers(minNumber, maxNumber,display);
         extensionNumberRepository.saveAll(numbers);
 
     }
@@ -69,11 +68,12 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
         return CommonResponse.createBySuccess();
     }
 
-    private List<ExtensionNumber> getNumbers(Integer minNumber, Integer maxNumber) {
+    private List<ExtensionNumber> getNumbers(Integer minNumber, Integer maxNumber, Integer display) {
         List<ExtensionNumber> list = new ArrayList<>();
         for (int i = minNumber; i <= maxNumber; i++) {
             ExtensionNumber extensionNumber = new ExtensionNumber();
             extensionNumber.setNumber(i);
+            extensionNumber.setDisplay(display);
             list.add(extensionNumber);
         }
         return list;

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

@@ -9,9 +9,11 @@ import com.baiye.http.CommonResponse;
 import com.baiye.modules.system.domain.Clue;
 import com.baiye.modules.telemarkting.dao.AllCallInfoRepository;
 import com.baiye.modules.telemarkting.dao.CallClueRepository;
+import com.baiye.modules.telemarkting.dao.ExtensionNumberRepository;
 import com.baiye.modules.telemarkting.dao.ExtensionUserRepository;
 import com.baiye.modules.telemarkting.entity.AllCallInfo;
 import com.baiye.modules.telemarkting.entity.CallClueInfo;
+import com.baiye.modules.telemarkting.entity.ExtensionNumber;
 import com.baiye.modules.telemarkting.entity.dto.TelephoneCallReqDTO;
 import com.baiye.modules.telemarkting.entity.dto.RollCallBackDTO;
 import com.baiye.modules.telemarkting.httpRequest.RollCallReq;
@@ -39,17 +41,20 @@ public class RollCallServiceImpl implements RollCallService {
     private RollCallReq rollCallReq;
     @Resource
     private ExtensionUserRepository extensionUserRepository;
+    @Resource
+    private ExtensionNumberRepository extensionNumberRepository;
 
     @Override
     public CommonResponse<Object> rollCallReq(TelephoneCallReqDTO telephoneCallReqDTO) {
         String requestId = RandomUtil.randomString(10);
         telephoneCallReqDTO.setRequestId(requestId);
         //获取分机号
-        Integer numberByMemberId = extensionUserRepository.findNumberByMemberId(telephoneCallReqDTO.getMemberId());
-        if (numberByMemberId == null) {
+        ExtensionNumber extensionNumber = extensionNumberRepository.selectByMemberId(telephoneCallReqDTO.getMemberId());
+        if (extensionNumber == null) {
             return CommonResponse.createByErrorMessage("未配置分机号");
         }
-        telephoneCallReqDTO.setTelA(String.valueOf(numberByMemberId));
+        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())) {

services/ad-platform-service/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   application:
-    name: @artifactId@
+    name: ad-platform-service-jt
   profiles:
     active: dev
 server:

services/ad-platform-source/src/main/java/com/baiye/feign/OrganizeClient.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import java.util.List;
 import java.util.Map;
 
-@FeignClient(value = "ad-platform-management",fallback = OrganizeClientFallback.class)
+@FeignClient(value = "ad-platform-management-jt",fallback = OrganizeClientFallback.class)
 public interface OrganizeClient {
 
     String PAY_PREFIX = "/api/organize";

services/ad-platform-source/src/main/java/com/baiye/feign/TaskClient.java

@@ -8,7 +8,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(value = "ad-platform-management",fallback = TaskClientFallback.class)
+@FeignClient(value = "ad-platform-management-jt",fallback = TaskClientFallback.class)
 public interface TaskClient {
 
     String PAY_PREFIX = "/api/task";

services/ad-platform-source/src/main/resources/application.yml

@@ -8,7 +8,8 @@ spring:
   profiles:
     active: prod
   application:
-    name: @artifactId@
+    name: ad-platform-source-jt
+#    name: ad-platform-source-jt
   jackson:
     time-zone: GMT+8
   data:

services/ad-platform-source/src/main/resources/logback.xml

@@ -78,8 +78,8 @@
     <root level="INFO">
         <!-- TODO prod 环境去掉std -->
         <!--fileAppender生成文件===正式环境使用 -->
-        <appender-ref ref="fileAppender"/>
+<!--        <appender-ref ref="fileAppender"/>-->
         <!--stdAppender本地环境日志输出面板打印===本地测试环境使用 -->
-<!--        <appender-ref ref="stdAppender"/>-->
+        <appender-ref ref="stdAppender"/>
     </root>
 </configuration>