Merge branch 'master' of http://1.14.104.71:10880/wushubo/callcenter-private-master

src/main/java/com/telerobot/fs/global/CdrPush.java

@@ -55,13 +55,11 @@ public class CdrPush implements ApplicationListener<ApplicationReadyEvent> {
 
     private boolean postCdr(CdrDetail cdr){
         try {
-            logger.info("{} postCdr入参数", cdr);
-            logger.info("{} postCdrType: {}", cdr.getCdrType(), JSON.toJSONString(cdr));
             String url = SystemConfig.getValue("post_cdr_url");
-            if ("inbound".equals(cdr.getCdrType())) {
-                logger.info("{} is inbound cdr.", cdr.getUuid());
+            if ("inbound".equalsIgnoreCase(cdr.getCdrType())) {
                 //如果有自定义回调地址 替换回调地址为自定义回调地址 否则默认回调
                 InboundCallInfo info = getInboundCallBackUrlByUuid(cdr.getUuid());
+                logger.info("呼入日志cdrUUid:{} ,InboundCallInfo: {}", cdr.getUuid(), JSON.toJSONString(info));
                 if (null != info && org.apache.commons.lang3.StringUtils.isNotBlank(info.getCallBackUrl())) {
                     String callBackUrl = info.getCallBackUrl();
                     logger.info("呼入日志cdrUUid:{} ,getInboundCallBackUrlByUuid: {}", cdr.getUuid(), callBackUrl);
@@ -77,8 +75,6 @@ public class CdrPush implements ApplicationListener<ApplicationReadyEvent> {
                     url = callBackUrl;
                 }
             }
-
-            logger.info("测试日志最后请求的url:{}",url);
             if (StringUtils.isNullOrEmpty(url)) {
                 logger.error("post_cdr_url  has not been configured yet.");
                 return false;

src/main/resources/com/telerobot/fs/mybatis/persistence/SysMapper.xml

@@ -255,9 +255,9 @@
 	<select id="getInboundCallInfoByUuid" resultType="com.telerobot.fs.entity.dao.InboundCallInfo">
 		select
 			t1.uuid,
-			t2.call_back_url,
-			t2.fs_company_id,
-			t2.fs_scene_type
+			t2.call_back_url as callBackUrl,
+			t2.fs_company_id as fsCompanyId,
+			t2.fs_scene_type as fsSceneType
 		from cc_inbound_cdr t1
 				 inner join cc_inbound_llm_account t2 on t1.callee = t2.callee
 		where  t1.uuid = #{uuid}