github/cosin
1
0
Fork 0
mirror of https://github.com/chatopera/cosin.git synced 2025-08-01 16:38:02 +08:00
Code Issues Releases Wiki Activity

Closed #45 创建默认的文件夹

Browse Source
This commit is contained in:
Hai Liang Wang 2018-09-05 20:37:28 +08:00
parent c9a3baea30
commit acabb18dd1
7 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cc-switch/app/test/callout.answer.test.js
View File

@ -30,11 +30,11 @@ test.only("Redis Test # 外呼接通", async(t) => {
let payload = { let payload = {
"uuid": "9a0cbc81-ccae-425e-8d3d-369b872a6481", "uuid": "9a0cbc81-ccae-425e-8d3d-369b872a6481",
"to": "13294561471", "to": "15801213121",
"from": "1002", "from": "1002",
"type": "callout", "type": "callout",
"channel": "bxzq", "channel": "bxzq",
"dialplan": "40288251657fca8b01657fcb3a1104c6", "dialplan": "4028825165a9b23a0165a9b4de1c04c9",
"createtime": now.valueOf(), "createtime": now.valueOf(),
"ops": "answer" "ops": "answer"
} }

4
cc-switch/app/test/callout.hangup.test.js
View File

@ -26,11 +26,11 @@ test.only("Redis Test # 外呼挂断", async(t) => {
console.log("挂断时间：", now); console.log("挂断时间：", now);
let payload = { let payload = {
"uuid": "9a0cbc81-ccae-425e-8d3d-369b872a6481", "uuid": "9a0cbc81-ccae-425e-8d3d-369b872a6481",
"to": "13294561478", "to": "15801213121",
"from": "1002", "from": "1002",
"type": "callout", "type": "callout",
"channel": "bxzq", "channel": "bxzq",
"dialplan": "40288251657fca8b01657fcb3a1104c6", "dialplan": "4028825165a9b23a0165a9b4de1c04c9",
"createtime": now.valueOf(), "createtime": now.valueOf(),
"ops": "hangup", "ops": "hangup",
"record":"chatopera/376bf70a-9449-46c8-ad3e-03ac41953946.wav" "record":"chatopera/376bf70a-9449-46c8-ad3e-03ac41953946.wav"

5
contact-center/app/src/main/java/com/chatopera/cc/webim/service/es/ContactsRepository.java
View File

@ -23,7 +23,6 @@ import com.chatopera.cc.webim.web.model.Contacts;
import java.util.List; import java.util.List;
public interface ContactsRepository extends ElasticsearchRepository<Contacts, String> , ContactsEsCommonRepository { public interface ContactsRepository extends ElasticsearchRepository<Contacts, String> , ContactsEsCommonRepository {
public int countByPhoneAndOrgi(String phone,String orgi); public int countByDatastatusIsFalseAndPhoneAndOrgi(String phone,String orgi);
public int countByMobilenoAndOrgi(String mobileno, String orgi); public List<Contacts> findOneByDatastatusIsFalseAndPhoneAndOrgi(String phone, String orgi);
public List<Contacts> findOneByPhoneAndOrgiAndDatastatusIsFalse(String phone, String orgi);
} }

2
contact-center/app/src/main/java/com/chatopera/cc/webim/service/task/CallOutSheetTask.java
View File

@ -208,7 +208,7 @@ public class CallOutSheetTask {
String phone = StringUtils.trim(lastContents); String phone = StringUtils.trim(lastContents);
if (StringUtils.isNumeric(phone)) { if (StringUtils.isNumeric(phone)) {
if (StringUtils.length(phone) == 11) { if (StringUtils.length(phone) == 11) {
if (contactsRes.countByMobilenoAndOrgi(phone, orgi) == 0) { if (contactsRes.countByDatastatusIsFalseAndPhoneAndOrgi(phone, orgi) == 0) {
// 不是已有联系人 // 不是已有联系人
CallOutTarget ct = new CallOutTarget(); CallOutTarget ct = new CallOutTarget();
MobileAddress ma = MobileNumberUtils.getAddress(phone); MobileAddress ma = MobileNumberUtils.getAddress(phone);

2
contact-center/app/src/main/java/com/chatopera/cc/webim/service/task/CallOutWireTask.java
View File

@ -271,7 +271,7 @@ public class CallOutWireTask implements MessageListener {
onlineUser.setSessionid(onlineUser.getId()); onlineUser.setSessionid(onlineUser.getId());
// 获取该访客对应的联系人 // 获取该访客对应的联系人
List<Contacts> lxrs = contactsRes.findOneByPhoneAndOrgiAndDatastatusIsFalse(visitorPhoneNumber, UKDataContext.SYSTEM_ORGI); List<Contacts> lxrs = contactsRes.findOneByDatastatusIsFalseAndPhoneAndOrgi(visitorPhoneNumber, UKDataContext.SYSTEM_ORGI);
Contacts lxr = null; Contacts lxr = null;
if (lxrs.size() >= 1) { if (lxrs.size() >= 1) {
lxr = lxrs.get(0); lxr = lxrs.get(0);

1
contact-center/data/.gitignore vendored
View File

@ -1,2 +1,3 @@
* *
!.gitignore !.gitignore
!upload/

2
contact-center/data/upload/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
*
!.gitignore