opt CDR mapper

This commit is contained in:
Donghuang 2021-09-21 22:03:07 +08:00
parent a71798da69
commit 5e8f51a4ba
4 changed files with 17 additions and 15 deletions

View File

@ -9,8 +9,8 @@ import org.springframework.stereotype.Service;
import com.pudonghot.yo.model.domain.PhoneAlias; import com.pudonghot.yo.model.domain.PhoneAlias;
import com.pudonghot.yo.mapper.PhoneAliasMapper; import com.pudonghot.yo.mapper.PhoneAliasMapper;
import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.RandomStringUtils;
import com.pudonghot.yo.mapper.CallDetailRecordMapper;
import com.pudonghot.yo.cms.service.PhoneAliasService; import com.pudonghot.yo.cms.service.PhoneAliasService;
import com.pudonghot.yo.mapper.CallDetailRecordAllMapper;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import com.pudonghot.yo.cms.form.create.FormCreatePhoneAlias; import com.pudonghot.yo.cms.form.create.FormCreatePhoneAlias;
import com.pudonghot.yo.cms.form.update.FormUpdatePhoneAlias; import com.pudonghot.yo.cms.form.update.FormUpdatePhoneAlias;
@ -34,7 +34,7 @@ public class PhoneAliasServiceImpl
@Value("${yo.cms.phone-alias.length:6}") @Value("${yo.cms.phone-alias.length:6}")
private int aliasLength; private int aliasLength;
@Autowired @Autowired
private CallDetailRecordMapper callDetailRecordMapper; private CallDetailRecordAllMapper callDetailRecordMapper;
/** /**
* {@inheritDoc} * {@inheritDoc}

View File

@ -16,7 +16,7 @@ import com.pudonghot.yo.model.domain.PhoneList;
import com.pudonghot.yo.cms.form.BaseUpdateForm; import com.pudonghot.yo.cms.form.BaseUpdateForm;
import com.pudonghot.yo.cms.form.BaseCreateForm; import com.pudonghot.yo.cms.form.BaseCreateForm;
import com.pudonghot.yo.cms.service.PhoneListService; 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.FormCreateUploadPhoneList;
import com.pudonghot.yo.cms.form.create.FormCreatePhoneList; import com.pudonghot.yo.cms.form.create.FormCreatePhoneList;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -36,7 +36,7 @@ public class PhoneListServiceImpl<M extends PhoneList,
implements PhoneListService<M, FC, FU> { implements PhoneListService<M, FC, FU> {
@Autowired @Autowired
private CallDetailRecordMapper callDetailRecordMapper; private CallDetailRecordAllMapper callDetailRecordMapper;
/** /**
* {@inheritDoc} * {@inheritDoc}

View File

@ -1,8 +1,10 @@
package com.pudonghot.yo.mapper; package com.pudonghot.yo.mapper;
import java.util.List; import java.util.List;
import me.chyxion.tigon.mybatis.Search;
import me.chyxion.tigon.mybatis.BaseMapper; import me.chyxion.tigon.mybatis.BaseMapper;
import org.apache.ibatis.annotations.Param; 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.dbobject.CallDetailReport;
import com.pudonghot.yo.model.domain.CallDetailRecordAll; import com.pudonghot.yo.model.domain.CallDetailRecordAll;
import com.pudonghot.yo.model.domain.CallDetailRecordBase; import com.pudonghot.yo.model.domain.CallDetailRecordBase;
@ -30,4 +32,15 @@ public interface CallDetailRecordAllMapper extends BaseMapper<Integer, CallDetai
*/ */
List<CallDetailReport> accountReport( List<CallDetailReport> accountReport(
@Param("arg") ReqCallDetailRecordAccountReport arg); @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));
}
} }

View File

@ -1,6 +1,5 @@
package com.pudonghot.yo.mapper; package com.pudonghot.yo.mapper;
import me.chyxion.tigon.mybatis.Search;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import me.chyxion.tigon.mybatis.BaseMapper; import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.yo.model.domain.CallDetailRecord; import com.pudonghot.yo.model.domain.CallDetailRecord;
@ -31,14 +30,4 @@ public interface CallDetailRecordMapper extends BaseMapper<Integer, CallDetailRe
@Param("tenantId") Integer tenantId, @Param("tenantId") Integer tenantId,
@Param("calledNumber") String calledNumber); @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));
}
} }