From 5e8f51a4ba02549394246119ed5fdc93d22f753f Mon Sep 17 00:00:00 2001
From: Donghuang <donghuang.cxn@alibaba-inc.com>
Date: Tue, 21 Sep 2021 22:03:07 +0800
Subject: [PATCH] opt CDR mapper

---
 .../yo/cms/service/impl/PhoneAliasServiceImpl.java  |  4 ++--
 .../yo/cms/service/impl/PhoneListServiceImpl.java   |  4 ++--
 .../yo/mapper/CallDetailRecordAllMapper.java        | 13 +++++++++++++
 .../pudonghot/yo/mapper/CallDetailRecordMapper.java | 11 -----------
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/PhoneAliasServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/PhoneAliasServiceImpl.java
index d4f15d1e..0cde198a 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/PhoneAliasServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/PhoneAliasServiceImpl.java
@@ -9,8 +9,8 @@ import org.springframework.stereotype.Service;
 import com.pudonghot.yo.model.domain.PhoneAlias;
 import com.pudonghot.yo.mapper.PhoneAliasMapper;
 import org.apache.commons.lang3.RandomStringUtils;
-import com.pudonghot.yo.mapper.CallDetailRecordMapper;
 import com.pudonghot.yo.cms.service.PhoneAliasService;
+import com.pudonghot.yo.mapper.CallDetailRecordAllMapper;
 import org.springframework.beans.factory.annotation.Value;
 import com.pudonghot.yo.cms.form.create.FormCreatePhoneAlias;
 import com.pudonghot.yo.cms.form.update.FormUpdatePhoneAlias;
@@ -34,7 +34,7 @@ public class PhoneAliasServiceImpl
     @Value("${yo.cms.phone-alias.length:6}")
     private int aliasLength;
     @Autowired
-    private CallDetailRecordMapper callDetailRecordMapper;
+    private CallDetailRecordAllMapper callDetailRecordMapper;
 
     /**
      * {@inheritDoc}
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/PhoneListServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/PhoneListServiceImpl.java
index 654439af..b0846e19 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/PhoneListServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/PhoneListServiceImpl.java
@@ -16,7 +16,7 @@ import com.pudonghot.yo.model.domain.PhoneList;
 import com.pudonghot.yo.cms.form.BaseUpdateForm;
 import com.pudonghot.yo.cms.form.BaseCreateForm;
 import com.pudonghot.yo.cms.service.PhoneListService;
-import com.pudonghot.yo.mapper.CallDetailRecordMapper;
+import com.pudonghot.yo.mapper.CallDetailRecordAllMapper;
 import com.pudonghot.yo.cms.form.FormCreateUploadPhoneList;
 import com.pudonghot.yo.cms.form.create.FormCreatePhoneList;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +36,7 @@ public class PhoneListServiceImpl<M extends PhoneList,
     implements PhoneListService<M, FC, FU> {
 
     @Autowired
-    private CallDetailRecordMapper callDetailRecordMapper;
+    private CallDetailRecordAllMapper callDetailRecordMapper;
 
     /**
      * {@inheritDoc}
diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallDetailRecordAllMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallDetailRecordAllMapper.java
index 7bedaa44..1c0c3c5b 100644
--- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallDetailRecordAllMapper.java
+++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallDetailRecordAllMapper.java
@@ -1,8 +1,10 @@
 package com.pudonghot.yo.mapper;
 
 import java.util.List;
+import me.chyxion.tigon.mybatis.Search;
 import me.chyxion.tigon.mybatis.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import com.pudonghot.yo.model.domain.CallDetailRecord;
 import com.pudonghot.yo.model.dbobject.CallDetailReport;
 import com.pudonghot.yo.model.domain.CallDetailRecordAll;
 import com.pudonghot.yo.model.domain.CallDetailRecordBase;
@@ -30,4 +32,15 @@ public interface CallDetailRecordAllMapper extends BaseMapper<Integer, CallDetai
      */
     List<CallDetailReport> accountReport(
             @Param("arg") ReqCallDetailRecordAccountReport arg);
+
+    /**
+     * find by conn id
+     *
+     * @param connId conn id
+     * @return cdr
+     */
+    default String findPhoneByConnId(final String connId) {
+        return findCol(CallDetailRecord.CALLED_NUMBER,
+                new Search(CallDetailRecord.CONN_ID, connId).limit(1));
+    }
 }
diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallDetailRecordMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallDetailRecordMapper.java
index c3799a45..6c39e11f 100644
--- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallDetailRecordMapper.java
+++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallDetailRecordMapper.java
@@ -1,6 +1,5 @@
 package com.pudonghot.yo.mapper;
 
-import me.chyxion.tigon.mybatis.Search;
 import org.apache.ibatis.annotations.Param;
 import me.chyxion.tigon.mybatis.BaseMapper;
 import com.pudonghot.yo.model.domain.CallDetailRecord;
@@ -31,14 +30,4 @@ public interface CallDetailRecordMapper extends BaseMapper<Integer, CallDetailRe
         @Param("tenantId") Integer tenantId,
         @Param("calledNumber") String calledNumber);
 
-    /**
-     * find by conn id
-     *
-     * @param connId conn id
-     * @return cdr
-     */
-    default String findPhoneByConnId(final String connId) {
-        return findCol(CallDetailRecord.CALLED_NUMBER,
-            new Search(CallDetailRecord.CONN_ID, connId).limit(1));
-    }
 }