From acabb18dd1a006c2d1290e3d907a00eef6a83098 Mon Sep 17 00:00:00 2001 From: Hai Liang Wang Date: Wed, 5 Sep 2018 20:37:28 +0800 Subject: [PATCH] =?UTF-8?q?Closed=20#45=20=E5=88=9B=E5=BB=BA=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E7=9A=84=E6=96=87=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cc-switch/app/test/callout.answer.test.js | 4 ++-- cc-switch/app/test/callout.hangup.test.js | 4 ++-- .../chatopera/cc/webim/service/es/ContactsRepository.java | 5 ++--- .../chatopera/cc/webim/service/task/CallOutSheetTask.java | 2 +- .../com/chatopera/cc/webim/service/task/CallOutWireTask.java | 2 +- contact-center/data/.gitignore | 1 + contact-center/data/upload/.gitignore | 2 ++ 7 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 contact-center/data/upload/.gitignore diff --git a/cc-switch/app/test/callout.answer.test.js b/cc-switch/app/test/callout.answer.test.js index 7bbd7f9c..cb2c833f 100644 --- a/cc-switch/app/test/callout.answer.test.js +++ b/cc-switch/app/test/callout.answer.test.js @@ -30,11 +30,11 @@ test.only("Redis Test # 外呼接通", async(t) => { let payload = { "uuid": "9a0cbc81-ccae-425e-8d3d-369b872a6481", - "to": "13294561471", + "to": "15801213121", "from": "1002", "type": "callout", "channel": "bxzq", - "dialplan": "40288251657fca8b01657fcb3a1104c6", + "dialplan": "4028825165a9b23a0165a9b4de1c04c9", "createtime": now.valueOf(), "ops": "answer" } diff --git a/cc-switch/app/test/callout.hangup.test.js b/cc-switch/app/test/callout.hangup.test.js index 2d93db4f..5808bc8f 100644 --- a/cc-switch/app/test/callout.hangup.test.js +++ b/cc-switch/app/test/callout.hangup.test.js @@ -26,11 +26,11 @@ test.only("Redis Test # 外呼挂断", async(t) => { console.log("挂断时间：", now); let payload = { "uuid": "9a0cbc81-ccae-425e-8d3d-369b872a6481", - "to": "13294561478", + "to": "15801213121", "from": "1002", "type": "callout", "channel": "bxzq", - "dialplan": "40288251657fca8b01657fcb3a1104c6", + "dialplan": "4028825165a9b23a0165a9b4de1c04c9", "createtime": now.valueOf(), "ops": "hangup", "record":"chatopera/376bf70a-9449-46c8-ad3e-03ac41953946.wav" diff --git a/contact-center/app/src/main/java/com/chatopera/cc/webim/service/es/ContactsRepository.java b/contact-center/app/src/main/java/com/chatopera/cc/webim/service/es/ContactsRepository.java index 8e30f93c..800dca9d 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/webim/service/es/ContactsRepository.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/webim/service/es/ContactsRepository.java @@ -23,7 +23,6 @@ import com.chatopera.cc.webim.web.model.Contacts; import java.util.List; public interface ContactsRepository extends ElasticsearchRepository , ContactsEsCommonRepository { - public int countByPhoneAndOrgi(String phone,String orgi); - public int countByMobilenoAndOrgi(String mobileno, String orgi); - public List findOneByPhoneAndOrgiAndDatastatusIsFalse(String phone, String orgi); + public int countByDatastatusIsFalseAndPhoneAndOrgi(String phone,String orgi); + public List findOneByDatastatusIsFalseAndPhoneAndOrgi(String phone, String orgi); } diff --git a/contact-center/app/src/main/java/com/chatopera/cc/webim/service/task/CallOutSheetTask.java b/contact-center/app/src/main/java/com/chatopera/cc/webim/service/task/CallOutSheetTask.java index a5765393..5827c519 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/webim/service/task/CallOutSheetTask.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/webim/service/task/CallOutSheetTask.java @@ -208,7 +208,7 @@ public class CallOutSheetTask { String phone = StringUtils.trim(lastContents); if (StringUtils.isNumeric(phone)) { if (StringUtils.length(phone) == 11) { - if (contactsRes.countByMobilenoAndOrgi(phone, orgi) == 0) { + if (contactsRes.countByDatastatusIsFalseAndPhoneAndOrgi(phone, orgi) == 0) { // 不是已有联系人 CallOutTarget ct = new CallOutTarget(); MobileAddress ma = MobileNumberUtils.getAddress(phone); diff --git a/contact-center/app/src/main/java/com/chatopera/cc/webim/service/task/CallOutWireTask.java b/contact-center/app/src/main/java/com/chatopera/cc/webim/service/task/CallOutWireTask.java index 04c6e3de..b98843ab 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/webim/service/task/CallOutWireTask.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/webim/service/task/CallOutWireTask.java @@ -271,7 +271,7 @@ public class CallOutWireTask implements MessageListener { onlineUser.setSessionid(onlineUser.getId()); // 获取该访客对应的联系人 - List lxrs = contactsRes.findOneByPhoneAndOrgiAndDatastatusIsFalse(visitorPhoneNumber, UKDataContext.SYSTEM_ORGI); + List lxrs = contactsRes.findOneByDatastatusIsFalseAndPhoneAndOrgi(visitorPhoneNumber, UKDataContext.SYSTEM_ORGI); Contacts lxr = null; if (lxrs.size() >= 1) { lxr = lxrs.get(0); diff --git a/contact-center/data/.gitignore b/contact-center/data/.gitignore index d6b7ef32..c011ded6 100644 --- a/contact-center/data/.gitignore +++ b/contact-center/data/.gitignore @@ -1,2 +1,3 @@ * !.gitignore +!upload/ diff --git a/contact-center/data/upload/.gitignore b/contact-center/data/upload/.gitignore new file mode 100644 index 00000000..d6b7ef32 --- /dev/null +++ b/contact-center/data/upload/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore