Merge branch 'master' of http://1.14.104.71:10880/wushubo/easycallcenter365-gui-dev

ruoyi-admin/src/main/java/com/ruoyi/aicall/controller/ApiController.java

@@ -1548,6 +1548,13 @@ public class ApiController extends BaseController {
             try {
                 if(StringUtils.isNotEmpty(data.getCallee())){
                     data.setCallee(DESUtil.encrypt(URLEncoder.encode(data.getCallee(), "UTF-8")));
+                }else{
+                    data.setCallee("");
+                }
+                if(StringUtils.isNotEmpty(data.getCaller())){
+                    data.setCaller(DESUtil.encrypt(URLEncoder.encode(data.getCaller(), "UTF-8")));
+                }else{
+                    data.setCaller("");
                 }
             } catch (Throwable e) {
                 throw new RuntimeException(e);
@@ -1775,18 +1782,23 @@ public class ApiController extends BaseController {
         if(!CollectionUtils.isEmpty(list)){
             list.forEach(callPhoneRecord -> {
                 callPhoneRecord.setBizJson("");
-                try {
+                try{
                     if(StringUtils.isNotEmpty(callPhoneRecord.getTelephone())){
                         callPhoneRecord.setTelephone(DESUtil.encrypt(URLEncoder.encode(callPhoneRecord.getTelephone(), "UTF-8")));
                     }else{
                         callPhoneRecord.setTelephone("");
                     }
+                }catch (Exception e){
+                    callPhoneRecord.setTelephone("");
+                }
+                try{
                     if(StringUtils.isNotEmpty(callPhoneRecord.getCallerNumber())){
                         callPhoneRecord.setCallerNumber(DESUtil.encrypt(URLEncoder.encode(callPhoneRecord.getCallerNumber(), "UTF-8")));
                     }else{
                         callPhoneRecord.setCallerNumber("");
                     }
-                } catch (UnsupportedEncodingException e) {
+                }catch (Exception e){
+                    callPhoneRecord.setCallerNumber("");
                 }
             });
         }
@@ -1916,18 +1928,23 @@ public class ApiController extends BaseController {
         if(!CollectionUtils.isEmpty(callPhoneList)){
             callPhoneList.forEach(callPhoneRecord -> {
                 callPhoneRecord.setBizJson("");
-                try {
+                try{
                     if(StringUtils.isNotEmpty(callPhoneRecord.getTelephone())){
                         callPhoneRecord.setTelephone(DESUtil.encrypt(URLEncoder.encode(callPhoneRecord.getTelephone(), "UTF-8")));
                     }else{
                         callPhoneRecord.setTelephone("");
                     }
+                }catch (Throwable e){
+                    callPhoneRecord.setTelephone("");
+                }
+                try{
                     if(StringUtils.isNotEmpty(callPhoneRecord.getCallerNumber())){
                         callPhoneRecord.setCallerNumber(DESUtil.encrypt(URLEncoder.encode(callPhoneRecord.getCallerNumber(), "UTF-8")));
                     }else{
                         callPhoneRecord.setCallerNumber("");
                     }
-                } catch (UnsupportedEncodingException e) {
+                }catch (Throwable e){
+                    callPhoneRecord.setCallerNumber("");
                 }
             });
         }
@@ -1948,14 +1965,14 @@ public class ApiController extends BaseController {
                     try {
                         outboundCdr.setCaller(DESUtil.encrypt(URLEncoder.encode(outboundCdr.getCaller(), "UTF-8")));
                     } catch (Throwable e) {
-                        outboundCdr.setCaller(null);
+                        outboundCdr.setCaller("");
                     }
                 }
                 if(StringUtils.isNotEmpty(outboundCdr.getCallee())){
                     try {
                         outboundCdr.setCallee(DESUtil.encrypt(URLEncoder.encode(outboundCdr.getCallee(), "UTF-8")));
                     } catch (Throwable e) {
-                        outboundCdr.setCallee(null);
+                        outboundCdr.setCallee("");
                     }
                 }
             }

ruoyi-admin/src/main/resources/mapper/cc/CcOutboundCdrMapper.xml

@@ -141,8 +141,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
 
-    <select id="selectCcOutboundCdrByIds" resultType="com.ruoyi.cc.domain.CcOutboundCdr">
-        <include refid="selectCcOutboundCdrVo"/>
+    <select id="selectCcOutboundCdrByIds" resultMap="CcOutboundCdrResult">
+        select * from cc_outbound_cdr
         <where>
             <if test="ids != null and ids.size() > 0">
                 id IN