Merge remote-tracking branch 'origin/master'

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

@@ -88,7 +88,7 @@ public class TelephoneCallController {
             if (ObjectUtil.isEmpty(doubleCallReq) || StrUtil.isEmpty(doubleCallReq.getSessionId())) {
                 return CommonResponse.createByErrorMessage("参数为空");
             }
-            log.info("=======双呼回调话单： {}", doubleCallReq);
+            log.info("双呼话单回调 {}", doubleCallReq);
             telephoneCallService.doubleCallBack(doubleCallReq);
         } catch (Exception e) {
             log.error("双呼回调话单错误 参数 ：{}", json);
@@ -106,7 +106,7 @@ public class TelephoneCallController {
             if (ObjectUtil.isEmpty(doubleCallBack) || StrUtil.isEmpty(doubleCallBack.getSessionId())) {
                 return CommonResponse.createByErrorMessage("参数为空");
             }
-            log.info("=====双呼回调状态 ：{}", doubleCallBack);
+            log.info("双呼状态回调 {}", doubleCallBack);
             telephoneCallService.doubleCallBackStatus(doubleCallBack);
         } catch (Exception e) {
             log.error("双呼回调状态错误 参数 ：{}", json);

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

@@ -47,7 +47,7 @@ public class DoubleCallReq {
         doubleCallSystemDTO.setCompanyName(telephoneCallReqDTO.getCompanyName());
         doubleCallSystemDTO.setCdrUrl(cdrUrl);
         doubleCallSystemDTO.setStatusUrl(statusUrl);
-        log.info("请求对象：{}", JSONUtil.toJsonPrettyStr(doubleCallSystemDTO));
+        log.info("双呼请求对象：{}", JSONUtil.toJsonPrettyStr(doubleCallSystemDTO));
 
         //设置重试机制
         int count = 0;
@@ -55,13 +55,13 @@ public class DoubleCallReq {
         while (count <= flag) {
             try {
                 HttpResponse httpResponse = sendCallReq(JSONUtil.toJsonPrettyStr(doubleCallSystemDTO), reqUrl);
-                log.info("返回值：{}", httpResponse);
+                log.info("双呼返回值：{}", httpResponse);
                 DoubleCallResponse doubleCallResponse = JSONUtil.toBean(httpResponse.body(), DoubleCallResponse.class);
                 if (String.valueOf(DefaultNumberConstants.ZERO_NUMBER).equals(doubleCallResponse.getResult())) {
                     return doubleCallResponse.getSessionId();
                 } else {
                     count++;
-                    log.error("请求失败,response==={}", doubleCallResponse.getReason());
+                    log.error("双呼请求失败,response==={}", doubleCallResponse.getReason());
                     Thread.sleep(3000);
                 }
             } catch (Exception e) {

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

@@ -55,7 +55,7 @@ public class RollCallReq {
         rollCallSystemDTO.setCdr_url(cdrUrl);
         rollCallSystemDTO.setDisplay_callee(String.valueOf(doubleCallReq.getDisplay()));
         rollCallSystemDTO.setDisplay_caller(String.valueOf(doubleCallReq.getDisplay()));
-        log.info("请求对象：{}", BeanUtil.beanToMap(rollCallSystemDTO));
+        log.info("点呼请求对象：{}", BeanUtil.beanToMap(rollCallSystemDTO));
 
         //设置重试机制
         int count = 0;
@@ -63,7 +63,7 @@ public class RollCallReq {
         while (count <= flag) {
             try {
                 String httpResponse = sendCallReq(BeanUtil.beanToMap(rollCallSystemDTO), reqUrl, authorization);
-                log.info("返回值为 {}", httpResponse);
+                log.info("点呼返回值为 {}", httpResponse);
                 RollCallResponse doubleCallResponse = JSONUtil.toBean(httpResponse, RollCallResponse.class);
                 if (String.valueOf
                         (DefaultNumberConstants.ZERO_NUMBER)
@@ -71,7 +71,7 @@ public class RollCallReq {
                     return doubleCallResponse.getReqid();
                 } else {
                     count++;
-                    log.error("请求失败,response==={}", doubleCallResponse.getReason());
+                    log.error("点呼请求失败,response==={}", doubleCallResponse.getReason());
                     Thread.sleep(3000);
                 }
             } catch (Exception e) {

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

@@ -78,7 +78,6 @@ public class TelephoneCallServiceImpl implements TelephoneCallService {
             log.error("Method 【doubleCallReq】 query Clue details error：{},time:{} ", e.getMessage(), DateUtil.now());
             throw new BadRequestException("查询线索详情错误");
         }
-
         if (ObjectUtil.isNull(body) || StrUtil.isEmpty(body.getNid())) {
             return CommonResponse.createByErrorMessage("未获取到号码");
         }