修改axb请求方式

3 years ago · f92bdb3856
parent f9c008d81f
commit f92bdb3856
12 changed files with 80 additions and 11 deletions
--- a/ad-platform-pojo/src/main/java/com/baiye/model/vo/ResSourceLabel.java
+++ b/ad-platform-pojo/src/main/java/com/baiye/model/vo/ResSourceLabel.java
@ -1,10 +1,8 @@
 package com.baiye.model.vo;

-import lombok.AllArgsConstructor;
 import lombok.Data;

@Data
-@AllArgsConstructor
 public class ResSourceLabel {

    private String sourceLabel;
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/Company.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/Company.java
@ -77,5 +77,9 @@ public class Company extends BaseEntity implements Serializable {
    @Column(name = "invitation_code")
    private Integer invitationCode;

+    @ApiModelProperty("axb请求字段")
+    @Column(name = "x_group")
+    private String xGroup;
+

 }
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/OrganizeController.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/OrganizeController.java
@ -1,5 +1,6 @@
 package com.baiye.modules.system.rest;

+import cn.hutool.json.JSONUtil;
 import com.baiye.http.CommonResponse;
 import com.baiye.http.ResponseCode;
 import com.baiye.model.dto.OrganizeQueryCriteria;
@ -14,6 +15,7 @@ import com.baiye.util.ValidList;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@ -28,6 +30,7 @@ import java.util.Map;
 * @author YQY
 * @date 2021-12-13
 */
+@Slf4j
@Api(tags = "小组管理")
@RestController
@RequestMapping("/api/organize")
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/OrganizeService.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/OrganizeService.java
@ -143,4 +143,11 @@ public interface OrganizeService {
     * @return
     */
    List<Organize> selectAllOrganize();
+
+    /**
+     * id 查找小组
+     * @param teamId
+     * @return
+     */
+    Organize findByOrganizeId(Long teamId);
 }
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/dto/OrganizeDto.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/dto/OrganizeDto.java
@ -8,6 +8,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;

+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java
@ -23,6 +23,7 @@ import com.google.common.collect.Lists;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@ -88,6 +89,7 @@ public class OrganizeServiceImpl implements OrganizeService {
        if (organize.getOrganizeName() != null) {
            Organize updateOrganize = organizeRepository.findById(organize.getId()).orElseGet(Organize::new);
            updateOrganize.setOrganizeName(organize.getOrganizeName());
+            updateOrganize.setCallMode(organize.getCallMode());
            organizeRepository.save(updateOrganize);
        }
        if (organize.getUserId() != null) {
@ -519,6 +521,12 @@ public class OrganizeServiceImpl implements OrganizeService {
        return organizeRepository.findAll();
    }

+    @Override
+    // @Cacheable(cacheNames = "organizeCache",key = "#teamId")
+    public Organize findByOrganizeId(Long teamId) {
+          return organizeRepository.findById(teamId).orElseGet(Organize::new);
+    }
+
    /**
     * 小组id查询组员用户信息
     */
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/api/TelephoneCallController.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/api/TelephoneCallController.java
@ -6,6 +6,7 @@ import cn.hutool.json.JSONUtil;
 import com.baiye.constant.DefaultNumberConstants;
 import com.baiye.http.CommonResponse;
 import com.baiye.modules.system.domain.Company;
+import com.baiye.modules.system.domain.Organize;
 import com.baiye.modules.system.service.CompanyService;
 import com.baiye.modules.system.service.OrganizeService;
 import com.baiye.modules.telemarkting.entity.dto.TelephoneCallBackDTO;
@ -20,6 +21,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.spring.web.json.Json;

 /**
 * @author wjt
@ -34,6 +36,8 @@ public class TelephoneCallController {

    private final TelephoneCallService telephoneCallService;

+    private final OrganizeService organizeService;
+
    private final CompanyService companyService;


@ -44,13 +48,19 @@ public class TelephoneCallController {
            return CommonResponse.createByError();
        }
        Long companyId = SecurityUtils.getCompanyId();
-        if (companyId != null) {
+        if (companyId != null && telephoneCallReqDTO.getTeamId() != null) {
+            Organize organize = organizeService.findByOrganizeId(telephoneCallReqDTO.getTeamId());
            Company byId = companyService.findById(SecurityUtils.getCompanyId());
-            telephoneCallReqDTO.setCompanyName(byId.getCompanyName());
-            return telephoneCallReqDTO.getCallMode() != null
-                    && telephoneCallReqDTO.getCallMode() > DefaultNumberConstants.ONE_NUMBER
-                        ? telephoneCallService.doubleCallReq(telephoneCallReqDTO)
-                            : telephoneCallService.axbDialNumber(telephoneCallReqDTO);
+            if (organize != null && byId != null) {
+                telephoneCallReqDTO.setCompanyName(byId.getCompanyName());
+                telephoneCallReqDTO.setXGroup(byId.getXGroup());
+                log.info("============= organize as {} =================", JSONUtil.toJsonStr(organize));
+
+                return organize.getCallMode() != null
+                        && organize.getCallMode() > DefaultNumberConstants.ONE_NUMBER
+                        ? telephoneCallService.axbDialNumber(telephoneCallReqDTO)
+                            : telephoneCallService.doubleCallReq(telephoneCallReqDTO);
+            }
        }
        return CommonResponse.createByError();
    }
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/entity/dto/TelephoneCallReqDTO.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/entity/dto/TelephoneCallReqDTO.java
@ -46,6 +46,8 @@ public class TelephoneCallReqDTO implements Serializable {
    @ApiModelProperty("公司名称")
    private String companyName;

+    @ApiModelProperty("axb请求")
+    private String xGroup;

    @ApiModelProperty(value = "组呼叫方式：0:双呼  1:点呼  2:AXB")
    private Integer callMode;
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/httpRequest/AxbRequest.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/httpRequest/AxbRequest.java
@ -31,9 +31,12 @@ public class AxbRequest {
        AxbCallRequestDTO axbCallRequestDTO = new AxbCallRequestDTO();
        BeanUtil.copyProperties(telephoneCallReqDTO, axbCallRequestDTO);
        axbCallRequestDTO.setAppid(axbProperties.getAppid());
-        axbCallRequestDTO.setXGroup(telephoneCallReqDTO.getCompanyName());
+        axbCallRequestDTO.setXGroup(telephoneCallReqDTO.getXGroup());
        axbCallRequestDTO.setCdrUrl(axbProperties.getCdrUrl());
        axbCallRequestDTO.setStatusUrl(axbProperties.getStatusUrl());
+        log.info("================== json as {} ===================",JSONUtil.toJsonPrettyStr
+                (axbCallRequestDTO));
+        log.info("================== json as {} ===================",axbProperties.getBingUrl());
        HttpResponse response =
                HttpRequest.post
                        (axbProperties.getBingUrl())
--- a/manage/ad-platform-management/src/main/resources/config/application-prod.yml
+++ b/manage/ad-platform-management/src/main/resources/config/application-prod.yml
@ -133,5 +133,5 @@ axb:
    appid: app1
    cdrUrl: https://mm.tuoz.net/api/back/cdrUrl
    statusUrl: https://mm.tuoz.net/api/back/status
-    bingUrl: http://ax.hzdaba.cn/callback/Accounts/dbby_hangzhoubaiyehl/Calls/AxbBinding
+    bingUrl: http://ax.hzdaba.cn/callback/Accounts/dbby_hangzhoubaiyehl/Calls/AxbABinding
    unBingUrl: http://ax.hzdaba.cn/callback/Accounts/dbby_hangzhoubaiyehl/Calls/AxbUnBinding
--- a/manage/ad-platform-management/src/test/java/com/baiye/OrganizeTest.java
+++ b/manage/ad-platform-management/src/test/java/com/baiye/OrganizeTest.java
@ -0,0 +1,32 @@
+package com.baiye;
+
+import com.baiye.modules.system.repository.OrganizeUserRepository;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+/**
+ * @author Enzo
+ * @date : 2022/2/14
+ */
+@Slf4j
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = AdPlatformManagementApplication.class,
+        webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class OrganizeTest {
+    @Resource
+    private OrganizeUserRepository organizeUserRepository;
+
+    @Test
+    @Transactional(rollbackFor = Exception.class)
+    public void getSetting() {
+        organizeUserRepository.updateUserId(176L, 50L);
+
+
+    }
+}
--- a/services/ad-platform-source/src/main/resources/application.yml
+++ b/services/ad-platform-source/src/main/resources/application.yml
@ -6,7 +6,7 @@ spring:
  freemarker:
    check-template-location: false
  profiles:
-    active: dev
+    active: prod
  application:
    name: @artifactId@
  jackson: