外呼

src/main/java/com/care/outcall/controller/KoalaOutCallController.java

@@ -8,7 +8,7 @@ import com.care.common.util.JsonUtil;
 import com.care.common.util.JwtUtils;
 import com.care.common.util.Result;
 import com.care.common.vo.UserLogindConvertVO;
-import com.care.outcall.entity.KoalaLogDomain;
+import com.care.outcall.entity.CcKoalaLog;
 import com.care.outcall.service.KoalaOutCallService;
 
 import io.jsonwebtoken.Claims;
@@ -39,7 +39,7 @@ public class KoalaOutCallController {
     @Autowired
     private CcCallResultService ccCallResultService;
 
-    @ApiOperation(value = "考拉外呼--手动外呼--坐席基础信息接口", notes = "考拉外呼--手动外呼--坐席基础信息接口")
+    @ApiOperation(value = "获取坐席基础信息接口", notes = "获取坐席基础信息接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "token", value = "放在请求头中的令牌", dataType = "String", paramType = "header", required = true)
     })
@@ -64,12 +64,12 @@ public class KoalaOutCallController {
 
     @ApiOperation(value = "记录呼叫日志API", notes = "记录呼叫日志API")
     @PostMapping(value = "/koala/addOptLog", produces = "application/json;charset=UTF-8", consumes = "application/json;charset=UTF-8")
-    public Result addOptLog(@RequestBody KoalaLogDomain koalaLogDomain) {
+    public Result addOptLog(@RequestBody CcKoalaLog ccKoalaLog) {
         try {
             if (logger.isDebugEnabled()) {
-                logger.debug(JsonUtil.toJson(koalaLogDomain));
+                logger.debug(JsonUtil.toJson(ccKoalaLog));
             }
-            koalaOutCallService.addOptLog(koalaLogDomain);
+            koalaOutCallService.addOptLog(ccKoalaLog);
         } catch (Exception e) {
             logger.error("记录日志接口异常，异常信息：" + e.getMessage());
         }
@@ -84,15 +84,15 @@ public class KoalaOutCallController {
                 logger.debug(JsonUtil.toJson(ccCallResult));
             }
             //找到sessionId
-            KoalaLogDomain koalaLogDomain = new KoalaLogDomain();
-            koalaLogDomain.setOrgId(ccCallResult.getOrgId().toString());
-            koalaLogDomain.setStationId(ccCallResult.getStationId().toString());
-            koalaLogDomain.setOlderId(ccCallResult.getOlderId().toString());
-            koalaLogDomain.setOrderId(ccCallResult.getOrderId().toString());
-            koalaLogDomain.setCalledId(ccCallResult.getCalledId().toString());
-            koalaLogDomain.setCalledType(ccCallResult.getCalledType());
-            koalaLogDomain.setPhone(ccCallResult.getPhone());
-            String sessionId = koalaOutCallService.getSessionId(koalaLogDomain);
+            CcKoalaLog ccKoalaLog = new CcKoalaLog();
+            ccKoalaLog.setOrgId(ccCallResult.getOrgId().toString());
+            ccKoalaLog.setStationId(ccCallResult.getStationId().toString());
+            ccKoalaLog.setOlderId(ccCallResult.getOlderId().toString());
+            ccKoalaLog.setOrderId(ccCallResult.getOrderId().toString());
+            ccKoalaLog.setCalledId(ccCallResult.getCalledId().toString());
+            ccKoalaLog.setCalledType(ccCallResult.getCalledType());
+            ccKoalaLog.setPhone(ccCallResult.getPhone());
+            String sessionId = koalaOutCallService.getSessionId(ccKoalaLog);
             if(sessionId == null){
                 throw new Exception("会话ID为空，不能保存");
             }
@@ -106,4 +106,6 @@ public class KoalaOutCallController {
         }
         return Result.success();
     }
+
+
 }

src/main/java/com/care/outcall/entity/KoalaLogDomain.java

@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @version 2.7.0 创建于 2019/7/15
  **/
 @Data
-public class KoalaLogDomain implements Serializable {
+public class CcKoalaLog implements Serializable {
     private String id;
 
     @ApiModelProperty(dataType = "String", name = "orgId", value = "机构ID")

src/main/java/com/care/outcall/entity/KoalaOutCallBill.java

@@ -14,7 +14,7 @@ import java.util.Date;
  * @Modified By:
  */
 @Data
-public class KoalaOutCallBill implements Serializable{
+public class CcTrafficBilled implements Serializable{
     // '主键值为uuid',
     private String id;
     //业务字段

src/main/java/com/care/outcall/mapper/KoalaOutCallDao.java

@@ -1,9 +1,9 @@
 package com.care.outcall.mapper;
 
 
-import com.care.outcall.entity.KoalaOutCallBill;
-import com.care.outcall.entity.KoalaLogDomain;
-import com.care.outcall.entity.KoalaOlderDto;
+import com.care.outcall.entity.CcTrafficBilled;
+import com.care.outcall.entity.CcKoalaLog;
+import com.care.outcall.vo.CallOlderVO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -28,18 +28,18 @@ public interface KoalaOutCallDao {
      * 记录考拉外呼日志
      * @param kaoLaLogDomain
      */
-    void addOptLog(KoalaLogDomain kaoLaLogDomain);
+    void addOptLog(CcKoalaLog kaoLaLogDomain);
 
-    String getSessionId(KoalaLogDomain koalaLogDomain);
+    String getSessionId(CcKoalaLog ccKoalaLog);
 
-    List<KoalaLogDomain> getAllBillInfo();
+    List<CcKoalaLog> getAllBillInfo();
 
     int checkSession(@Param("sessionId") String sessionId);
 
-    int addBill(KoalaOutCallBill koalaOutCallBill);
+    int addBill(CcTrafficBilled ccTrafficBilled);
 
 
-    int updatePhoneBillBySessionIdNew(KoalaOutCallBill params);
+    int updatePhoneBillBySessionIdNew(CcTrafficBilled params);
 
     void updateComputeTraffic(List<Map<String, String>> logList);
 
@@ -48,7 +48,7 @@ public interface KoalaOutCallDao {
 
     void updateComputeTrafficToFinish();
 
-    List<KoalaOlderDto> getOlderInfoBySessionId(@Param("sessionId") String sessionId);
+    List<CallOlderVO> getOlderInfoBySessionId(@Param("sessionId") String sessionId);
 
 
 

src/main/java/com/care/outcall/schedule/KoalaOutCallBillSchuding.java

@@ -1,9 +1,9 @@
 package com.care.outcall.schedule;
 
 
-import com.care.outcall.entity.KoalaOlderDto;
-import com.care.outcall.entity.KoalaOutCallBill;
-import com.care.outcall.entity.KoalaLogDomain;
+import com.care.outcall.vo.CallOlderVO;
+import com.care.outcall.entity.CcTrafficBilled;
+import com.care.outcall.entity.CcKoalaLog;
 import com.care.outcall.mapper.KoalaOutCallDao;
 import com.care.common.util.CommonConfUtil;
 import com.care.common.util.DateUtils;
@@ -62,59 +62,59 @@ public class KoalaOutCallBillSchuding {
      * @throws Exception
      */
     private void buildBill() throws Exception {
-        Map<String, List<KoalaLogDomain>> map = new HashMap();
+        Map<String, List<CcKoalaLog>> map = new HashMap();
         List<Map<String, String>> idList = new ArrayList<>();
         List<String> makeCallIds = new ArrayList<>();
         //获取所有未计算的话单
-        List<KoalaLogDomain> logList = koalaOutCallDao.getAllBillInfo();
+        List<CcKoalaLog> logList = koalaOutCallDao.getAllBillInfo();
         //重新构建话单日志结构
         reBuildBill(map, logList);
 
         //遍历每一条sessionId
         for (String sid : map.keySet()) {
-            List<KoalaLogDomain> logDomains = map.get(sid);
+            List<CcKoalaLog> logDomains = map.get(sid);
             //1：只拼接会话结束的日志,通话成功的
             //描述事件的生存周期：1.坐席振铃,2.坐席接通,3.客户振铃,4.客户接通,5.坐席挂断,6.客户挂断,7.未接通
             if (logDomains.size() > 2) {
                 //构建大有话单 关于成功话单部分
-                KoalaOutCallBill koalaOutCallBill = buildDataUBill(sid, logDomains);
-                if (koalaOutCallBill == null) {
+                CcTrafficBilled ccTrafficBilled = buildDataUBill(sid, logDomains);
+                if (ccTrafficBilled == null) {
                     continue;
                 }
-                if (StringUtils.isEmpty(koalaOutCallBill.getOutCallRadioStatus())) {
-                    koalaOutCallBill.setOutCallRadioStatus("1");
+                if (StringUtils.isEmpty(ccTrafficBilled.getOutCallRadioStatus())) {
+                    ccTrafficBilled.setOutCallRadioStatus("1");
                 }
-                koalaOutCallBill.setCallResultStatus("1");
+                ccTrafficBilled.setCallResultStatus("1");
                 //判断话单表是否已存在该数据，不存在则新增，存在则更新状态
-                int count = koalaOutCallDao.checkSession(koalaOutCallBill.getSessionId());
+                int count = koalaOutCallDao.checkSession(ccTrafficBilled.getSessionId());
                 if (count == 0) {
                     //不存在则新增
                     try {
-                        koalaOutCallDao.addBill(koalaOutCallBill);
+                        koalaOutCallDao.addBill(ccTrafficBilled);
                     } catch (Exception e) {
                         logger.error("生成考拉话单异常，信息为：" + e.getMessage());
                     }
                 } else {
-                    koalaOutCallDao.updatePhoneBillBySessionIdNew(koalaOutCallBill);
+                    koalaOutCallDao.updatePhoneBillBySessionIdNew(ccTrafficBilled);
                 }
                 Map<String, String> idMap = new HashMap<>();
                 idMap.put("id", sid);
                 idList.add(idMap);
             } else if (logDomains.size() >= 1 && logDomains.size() <= 2) {
                 //构建大有话单 关于未接通的话单部分
-                KoalaOutCallBill koalaOutCallBill = buildDataUBill(sid, logDomains);
-                if (koalaOutCallBill == null) {
+                CcTrafficBilled ccTrafficBilled = buildDataUBill(sid, logDomains);
+                if (ccTrafficBilled == null) {
                     continue;
                 }
-                koalaOutCallBill.setOrigOutCallStatus("2");
-                koalaOutCallBill.setOutCallRadioStatus("2");
-                koalaOutCallBill.setOutCallStatus("2");
+                ccTrafficBilled.setOrigOutCallStatus("2");
+                ccTrafficBilled.setOutCallRadioStatus("2");
+                ccTrafficBilled.setOutCallStatus("2");
 
-                int count = koalaOutCallDao.checkSession(koalaOutCallBill.getSessionId());
+                int count = koalaOutCallDao.checkSession(ccTrafficBilled.getSessionId());
                 if (count == 0) {
-                    koalaOutCallDao.addBill(koalaOutCallBill);
+                    koalaOutCallDao.addBill(ccTrafficBilled);
                 } else {
-                    koalaOutCallDao.updatePhoneBillBySessionIdNew(koalaOutCallBill);
+                    koalaOutCallDao.updatePhoneBillBySessionIdNew(ccTrafficBilled);
                 }
                 Map<String, String> idMap = new HashMap<>();
                 idMap.put("id", sid);
@@ -130,9 +130,9 @@ public class KoalaOutCallBillSchuding {
     }
 
     //构建大有话单
-    private synchronized KoalaOutCallBill buildDataUBill(String sessionId, List<KoalaLogDomain> logDomains) {
+    private synchronized CcTrafficBilled buildDataUBill(String sessionId, List<CcKoalaLog> logDomains) {
         try {
-            KoalaOutCallBill koalaOutCallBill = new KoalaOutCallBill();
+            CcTrafficBilled ccTrafficBilled = new CcTrafficBilled();
 
             //通话计费开始时间
             String callStartTime = "";
@@ -158,12 +158,12 @@ public class KoalaOutCallBillSchuding {
             String dialingTime = "";
             //话单变量，标记该话单为正确话单
             boolean isBill = false;
-            for (KoalaLogDomain logDomain : logDomains) {
+            for (CcKoalaLog logDomain : logDomains) {
                 tenantId = logDomain.getTenantId();
                 calledNumber = logDomain.getPhone();
                 break;
             }
-            for (KoalaLogDomain logDomain : logDomains) {
+            for (CcKoalaLog logDomain : logDomains) {
                 //通话计费开始时间
                 if ("1".equals(logDomain.getEventStatus())) {
                     clientAlterTime = logDomain.getReceiveTime();
@@ -213,51 +213,51 @@ public class KoalaOutCallBillSchuding {
             //构建考拉外呼录音文件路径
             String audioUrl = audioUri + "/" + tenantId + "/" + audioCreateTime + "/" + sessionId + "_" + calledNumber + ".mp3";
             //根据 sessionId 获取 sessionId 对应的流水号，和电信任务的具体信息
-            List<KoalaOlderDto> koalaOlderDtoList = koalaOutCallDao.getOlderInfoBySessionId(sessionId);
-            if (koalaOlderDtoList == null || koalaOlderDtoList.isEmpty()) {
+            List<CallOlderVO> callOlderVOList = koalaOutCallDao.getOlderInfoBySessionId(sessionId);
+            if (callOlderVOList == null || callOlderVOList.isEmpty()) {
                 logger.info("没有找到 sessionId={} 对应信息的流水号信息", sessionId);
                 return null;
             }
-            KoalaOlderDto koalaOlderDto = getNewOne(koalaOlderDtoList);
+            CallOlderVO callOlderVO = getNewOne(callOlderVOList);
 
             //新增，内容----
             //屏蔽内容 ----
-            KoalaLogDomain logDomain = logDomains.get(0);
+            CcKoalaLog logDomain = logDomains.get(0);
             //该会话的坐席号
             String agentId = logDomain.getAgentId();
             //该会话的企业id
-            koalaOutCallBill.setPhone(koalaOlderDto.getPhone());
-            koalaOutCallBill.setCallStartTime(callStartTime);
-            koalaOutCallBill.setOutCallStatus("1");
-            koalaOutCallBill.setOrigOutCallStatus("1");
-            koalaOutCallBill.setCallResultStatus(callResultStatus);
-            koalaOutCallBill.setCallEndTime(callEndTime);
-            koalaOutCallBill.setAudioUrl(audioUrl);
-            koalaOutCallBill.setOutCallRadioStatus("2");//录件获取状态。1未获取，2已获取
-            koalaOutCallBill.setOlderId(koalaOlderDto.getOlderId());
-            koalaOutCallBill.setOrderId(koalaOlderDto.getOrderId());
-            koalaOutCallBill.setStationId(koalaOlderDto.getStationId());
-            koalaOutCallBill.setCalledId(koalaOlderDto.getCalledId());
-            koalaOutCallBill.setCalledType(koalaOlderDto.getCalledType());
-            koalaOutCallBill.setSessionId(sessionId);
-            koalaOutCallBill.setTeleAgentId(agentId);
+            ccTrafficBilled.setPhone(callOlderVO.getPhone());
+            ccTrafficBilled.setCallStartTime(callStartTime);
+            ccTrafficBilled.setOutCallStatus("1");
+            ccTrafficBilled.setOrigOutCallStatus("1");
+            ccTrafficBilled.setCallResultStatus(callResultStatus);
+            ccTrafficBilled.setCallEndTime(callEndTime);
+            ccTrafficBilled.setAudioUrl(audioUrl);
+            ccTrafficBilled.setOutCallRadioStatus("2");//录件获取状态。1未获取，2已获取
+            ccTrafficBilled.setOlderId(callOlderVO.getOlderId());
+            ccTrafficBilled.setOrderId(callOlderVO.getOrderId());
+            ccTrafficBilled.setStationId(callOlderVO.getStationId());
+            ccTrafficBilled.setCalledId(callOlderVO.getCalledId());
+            ccTrafficBilled.setCalledType(callOlderVO.getCalledType());
+            ccTrafficBilled.setSessionId(sessionId);
+            ccTrafficBilled.setTeleAgentId(agentId);
 
-            koalaOutCallBill.setClientAlertStartTime(clientAlterTime);
+            ccTrafficBilled.setClientAlertStartTime(clientAlterTime);
             if (callFlag && !unCalledFlag) {
-                koalaOutCallBill.setCallDuration("0");
+                ccTrafficBilled.setCallDuration("0");
             } else {
                 try {
                     long callDuration = DateUtils.compute_yyyy_MM_ddHHmmssTime(callStartTime, callEndTime);
-                    koalaOutCallBill.setCallDuration(String.valueOf(callDuration));
+                    ccTrafficBilled.setCallDuration(String.valueOf(callDuration));
                 } catch (Exception e) {
                     logger.error("时间处理异常,异常信息为==>" + e.getMessage());
-                    koalaOutCallBill.setCallDuration("0");
+                    ccTrafficBilled.setCallDuration("0");
                 }
             }
 
-            koalaOutCallBill.setHangupType(hangupType);
-            koalaOutCallBill.setOrgId(koalaOlderDto.getOrgId());
-            return koalaOutCallBill;
+            ccTrafficBilled.setHangupType(hangupType);
+            ccTrafficBilled.setOrgId(callOlderVO.getOrgId());
+            return ccTrafficBilled;
         } catch (Exception e) {
             logger.error("计算话单失败,失败原因={}", e.getMessage());
             //e.printStackTrace();
@@ -266,19 +266,19 @@ public class KoalaOutCallBillSchuding {
     }
 
     //重新构建日志格式，去重
-    private void reBuildBill(Map<String, List<KoalaLogDomain>> map, List<KoalaLogDomain> logList) {
+    private void reBuildBill(Map<String, List<CcKoalaLog>> map, List<CcKoalaLog> logList) {
         Set<String> set = new HashSet<>();
         Map<String, Set<String>> noRepeatSetMap = new HashMap<>();
 
         //所有sessionId放入内存
-        for (KoalaLogDomain logDomain : logList) {
+        for (CcKoalaLog logDomain : logList) {
             set.add(logDomain.getSessionId());
             noRepeatSetMap.put(logDomain.getSessionId(), null);
         }
         //遍历sessionId
         for (String sid : set) {
-            List<KoalaLogDomain> resulList = new ArrayList<>();
-            for (KoalaLogDomain logDomain : logList) {
+            List<CcKoalaLog> resulList = new ArrayList<>();
+            for (CcKoalaLog logDomain : logList) {
                 if (sid.equals(logDomain.getSessionId())) {
                     //去重
                     String apiMethod = logDomain.getApiMethod();
@@ -299,7 +299,7 @@ public class KoalaOutCallBillSchuding {
             boolean isBill2 = false;
             //判断是不是可计算的话单
             //同一个sessionId话单数据中，如果既有振铃又有挂断，则表示是可计算的话单
-            for (KoalaLogDomain logDomain : resulList) {
+            for (CcKoalaLog logDomain : resulList) {
                 if ("4,5,6,7".contains(logDomain.getEventStatus())) {
                     isBill1 = true;
                 }
@@ -317,14 +317,14 @@ public class KoalaOutCallBillSchuding {
         noRepeatSetMap.clear();
     }
 
-    private KoalaOlderDto getNewOne(List<KoalaOlderDto> koalaOlderDtoList) {
-        koalaOlderDtoList.sort(new Comparator<KoalaOlderDto>() {
+    private CallOlderVO getNewOne(List<CallOlderVO> callOlderVOList) {
+        callOlderVOList.sort(new Comparator<CallOlderVO>() {
             @Override
-            public int compare(KoalaOlderDto o1, KoalaOlderDto o2) {
+            public int compare(CallOlderVO o1, CallOlderVO o2) {
                 return Integer.valueOf(String.valueOf(Long.parseLong(o2.getCreateTime()) - Long.parseLong(o1.getCreateTime())));
             }
         });
-        return koalaOlderDtoList.get(0);
+        return callOlderVOList.get(0);
     }
 
 }

src/main/java/com/care/outcall/service/KoalaOutCallService.java

@@ -1,7 +1,7 @@
 package com.care.outcall.service;
 
 
-import com.care.outcall.entity.KoalaLogDomain;
+import com.care.outcall.entity.CcKoalaLog;
 
 import java.util.Map;
 
@@ -19,17 +19,18 @@ public interface KoalaOutCallService {
 
     /**
      * 保存外呼日志
-     * @param koalaLogDomain
+     * @param ccKoalaLog
      * @throws Exception
      */
-    void addOptLog(KoalaLogDomain koalaLogDomain) throws Exception;
+    void addOptLog(CcKoalaLog ccKoalaLog) throws Exception;
 
     /**
      * 获取sessionId
-     * @param koalaLogDomain
+     * @param ccKoalaLog
      * @return
      * @throws Exception
      */
-    String getSessionId(KoalaLogDomain koalaLogDomain) throws Exception;
+    String getSessionId(CcKoalaLog ccKoalaLog) throws Exception;
+
 
 }

src/main/java/com/care/outcall/service/impl/KoalaOutCallServiceImpl.java

@@ -1,7 +1,7 @@
 package com.care.outcall.service.impl;
 
 
-import com.care.outcall.entity.KoalaLogDomain;
+import com.care.outcall.entity.CcKoalaLog;
 import com.care.outcall.mapper.KoalaOutCallDao;
 import com.care.outcall.service.KoalaOutCallService;
 import com.care.common.util.DateUtils;
@@ -23,32 +23,32 @@ public class KoalaOutCallServiceImpl implements KoalaOutCallService {
     private KoalaOutCallDao koalaOutCallDao;
 
     @Override
-    public void addOptLog(KoalaLogDomain koalaLogDomain) throws Exception {
-        koalaOutCallDao.addOptLog(makeLog(koalaLogDomain));
+    public void addOptLog(CcKoalaLog ccKoalaLog) throws Exception {
+        koalaOutCallDao.addOptLog(makeLog(ccKoalaLog));
     }
 
     private static Map<String, Object> parseJson(String json) throws Exception {
         return JsonUtil.fromJson(json, Map.class);
     }
 
-    private KoalaLogDomain makeLog(KoalaLogDomain koalaLogDomain) throws Exception {
+    private CcKoalaLog makeLog(CcKoalaLog ccKoalaLog) throws Exception {
         //前端调用接口即触发日志记录事件
-        KoalaLogDomain domain = new KoalaLogDomain();
-        domain.setResult(koalaLogDomain.getResult());
-        domain.setApiMethod(koalaLogDomain.getApiMethod());
+        CcKoalaLog domain = new CcKoalaLog();
+        domain.setResult(ccKoalaLog.getResult());
+        domain.setApiMethod(ccKoalaLog.getApiMethod());
         domain.setComputeTraffic("0");//话单未被计算
 
-        domain.setAgentId(koalaLogDomain.getAgentId());
-        domain.setOrgId(koalaLogDomain.getOrgId());
-        domain.setStationId(koalaLogDomain.getStationId());
-        domain.setOlderId(koalaLogDomain.getOlderId());
-        domain.setOrderId(koalaLogDomain.getOrderId());
-        domain.setCalledId(koalaLogDomain.getCalledId());
-        domain.setCalledType(koalaLogDomain.getCalledType());
-        domain.setOutDisplayNo(koalaLogDomain.getOutDisplayNo());
+        domain.setAgentId(ccKoalaLog.getAgentId());
+        domain.setOrgId(ccKoalaLog.getOrgId());
+        domain.setStationId(ccKoalaLog.getStationId());
+        domain.setOlderId(ccKoalaLog.getOlderId());
+        domain.setOrderId(ccKoalaLog.getOrderId());
+        domain.setCalledId(ccKoalaLog.getCalledId());
+        domain.setCalledType(ccKoalaLog.getCalledType());
+        domain.setOutDisplayNo(ccKoalaLog.getOutDisplayNo());
 
         //解析请求结果，获取sessionId和坐席分机号等
-        Map<String, Object> map = parseJson(koalaLogDomain.getResult());
+        Map<String, Object> map = parseJson(ccKoalaLog.getResult());
         Object sessionId = map.get("callID");
         Object agentNumber = map.get("thisDN");
         Object receiveTime = map.get("creationTime");
@@ -126,12 +126,12 @@ public class KoalaOutCallServiceImpl implements KoalaOutCallService {
 
     /**
      * 获取sessionId
-     * @param koalaLogDomain
+     * @param ccKoalaLog
      * @return
      * @throws Exception
      */
     @Override
-    public String getSessionId(KoalaLogDomain koalaLogDomain) throws Exception{
-        return this.koalaOutCallDao.getSessionId(koalaLogDomain);
+    public String getSessionId(CcKoalaLog ccKoalaLog) throws Exception{
+        return this.koalaOutCallDao.getSessionId(ccKoalaLog);
     }
 }

src/main/java/com/care/outcall/entity/KoalaOlderDto.java

@@ -1,4 +1,4 @@
-package com.care.outcall.entity;
+package com.care.outcall.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @version 2.7.0 创建于 2019/7/17
  **/
 @Data
-public class KoalaOlderDto implements Serializable {
+public class CallOlderVO implements Serializable {
 
     /**
      * 电话

src/main/resources/mybatis/KoalaOutCallMapper.xml

@@ -11,7 +11,7 @@
         left join cc_user_relations cur on cur.upstream_agent_id = cua.id
         where cur.user_id = #{userId} limit 1
     </select>
-    <insert id="addOptLog" parameterType="com.care.outcall.entity.KoalaLogDomain">
+    <insert id="addOptLog" parameterType="com.care.outcall.entity.CcKoalaLog">
         INSERT INTO cc_koala_log
         <trim prefix="(" suffix=")" suffixOverrides=",">
             create_time,
@@ -130,7 +130,7 @@
     </insert>
 
 
-    <select id="getAllBillInfo" resultType="com.care.outcall.entity.KoalaLogDomain">
+    <select id="getAllBillInfo" resultType="com.care.outcall.entity.CcKoalaLog">
         SELECT
          create_time as createTime,
          update_time as updateTime,
@@ -161,7 +161,7 @@
         WHERE session_id = #{sessionId}
     </select>
 
-    <insert id="addBill" parameterType="com.care.outcall.entity.KoalaOutCallBill">
+    <insert id="addBill" parameterType="com.care.outcall.entity.CcTrafficBilled">
         INSERT INTO cc_traffic_billed
         <trim prefix="(" suffix=")" suffixOverrides=",">
             id,
@@ -304,7 +304,7 @@
         </trim>
     </insert>
 
-    <update id="updatePhoneBillBySessionIdNew" parameterType="com.care.outcall.entity.KoalaOutCallBill">
+    <update id="updatePhoneBillBySessionIdNew" parameterType="com.care.outcall.entity.CcTrafficBilled">
         UPDATE cc_traffic_billed
         <set>
             update_time=now(),
@@ -395,7 +395,7 @@
         where compute_traffic = '0' and DATEDIFF(now(), create_time) >= 2 and older_id &lt;> '-1'
     </update>
 
-    <select id="getOlderInfoBySessionId" resultType="com.care.outcall.entity.KoalaOlderDto">
+    <select id="getOlderInfoBySessionId" resultType="com.care.outcall.vo.CallOlderVO">
         select
         distinct ckl.session_id as sessionId,
         ckl.org_id as orgId,