From 257cea70cc1511c4aad223c8e445ccb343e0c116 Mon Sep 17 00:00:00 2001 From: Lenovo Date: Mon, 8 Jul 2024 16:22:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8E=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/business/domain/AiAppendInfo.java | 58 ------------------- .../ruoyi/business/service/IAiService.java | 1 - .../business/service/impl/AiServiceImpl.java | 27 +++------ 3 files changed, 8 insertions(+), 78 deletions(-) delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/business/domain/AiAppendInfo.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/domain/AiAppendInfo.java b/ruoyi-system/src/main/java/com/ruoyi/business/domain/AiAppendInfo.java deleted file mode 100644 index 0ce9e76..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/business/domain/AiAppendInfo.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.ruoyi.business.domain; - -public class AiAppendInfo { - private String phoneNo; - private String virtualPhone; - private String aKey; - private String uSn; - private String pSn; - private String dialTaskMainSn; - - public String getPhoneNo() { - return phoneNo; - } - - public void setPhoneNo(String phoneNo) { - this.phoneNo = phoneNo; - } - - public String getVirtualPhone() { - return virtualPhone; - } - - public void setVirtualPhone(String virtualPhone) { - this.virtualPhone = virtualPhone; - } - - public String getaKey() { - return aKey; - } - - public void setaKey(String aKey) { - this.aKey = aKey; - } - - public String getuSn() { - return uSn; - } - - public void setuSn(String uSn) { - this.uSn = uSn; - } - - public String getpSn() { - return pSn; - } - - public void setpSn(String pSn) { - this.pSn = pSn; - } - - public String getDialTaskMainSn() { - return dialTaskMainSn; - } - - public void setDialTaskMainSn(String dialTaskMainSn) { - this.dialTaskMainSn = dialTaskMainSn; - } -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/IAiService.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/IAiService.java index c7ff80f..d06dbce 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/IAiService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/IAiService.java @@ -16,7 +16,6 @@ public interface IAiService * @param virtualPhone */ R addAiTask(String storeName,String remark,String phoneNo,String virtualPhone); -// R appendAiTask(String phoneNo,String virtualPhone); void queryAiTask(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java index 73624cd..7474650 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java @@ -10,6 +10,7 @@ import com.ruoyi.business.service.*; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.utils.HttpClientUtilT; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -37,8 +38,6 @@ public class AiServiceImpl implements IAiService @Autowired private IBusFifteenInfoService fifteenInfoService; - private List list = new ArrayList<>(); - @Override public R addAiTask(String storeName,String remark,String phoneNo, String virtualPhone) { String url = "https://ai002.ciopaas.com/api/login"; @@ -76,16 +75,9 @@ public class AiServiceImpl implements IAiService System.out.println("建立任务返回： ============taskMainId,taskMainSn==========="+taskMainId+","+taskMainSn); - AiAppendInfo appendInfo = new AiAppendInfo(); - appendInfo.setaKey(apiKey); - appendInfo.setpSn(projectSn1); - appendInfo.setuSn(userSn); - appendInfo.setPhoneNo(phoneNo); - appendInfo.setVirtualPhone(virtualPhone); - appendInfo.setDialTaskMainSn(taskMainSn); - list.add(appendInfo); -// appendAiTask(phoneNo,virtualPhone,apiKey,userSn,projectSn,taskMainSn); + appendAiTask(phoneNo,virtualPhone,apiKey,userSn,projectSn,taskMainSn); + return R.ok(); } else { System.out.println("建立任务接口返回错误： " + jo.toString()); @@ -95,13 +87,10 @@ public class AiServiceImpl implements IAiService } return R.fail(); } - - public void appendAiTask() { - for (AiAppendInfo appendInfo : list) { - String requestJson = "{\"api_key\": \"" + appendInfo.getaKey() + "\",\"user_sn\": \"" + appendInfo.getuSn() + "\",\"source\": \"测试任务\"" + - ",\"project_sn\": \"" + appendInfo.getpSn() + "\",\"ai_user_sn\": \"SYSUSER|2665bcca63a2b5c724095fa01dce0470\",\"is_zidong\": \"on\"" + - ",\"client_info_json\": {\"data\": [{\"姓名\": \"ws测试\",\"电话\": \"" + appendInfo.getPhoneNo() + "\",\"备注\": \"门店新客\",\"虚拟分机号\": \"" + appendInfo.getVirtualPhone() + "\"}]}" + - ",\"is_open_second_dialing\": \"1\",\n" + "\"is_open_remove_duplication\": \"0\",\"dial_task_main_sn\": \"" + appendInfo.getDialTaskMainSn() + "\",\"is_append\": \"1\"}"; + @Async + public void appendAiTask(String phoneNo, String virtualPhone,String aKey, String uSn,String pSn,String dialTaskMainSn) { + String requestJson = "{\"api_key\": \"" + aKey + "\",\"user_sn\": \"" + uSn + "\",\"source\": \"测试任务\",\"project_sn\": \"" + pSn + "\",\"ai_user_sn\": \"SYSUSER|2665bcca63a2b5c724095fa01dce0470\",\"is_zidong\": \"on\",\"client_info_json\": {\"data\": [{\"姓名\": \"ws测试\",\"电话\": \"" + phoneNo + "\",\"备注\": \"门店新客\",\"虚拟分机号\": \"" + virtualPhone + "\"}]},\"is_open_second_dialing\": \"1\",\n" + + "\"is_open_remove_duplication\": \"0\",\"dial_task_main_sn\": \"" + dialTaskMainSn + "\",\"is_append\": \"1\"}"; String requestUrl = "https://ai002.ciopaas.com/api/addJsonOfAsync"; Map header = new HashMap<>(); header.put("Accept", "application/json"); @@ -122,7 +111,7 @@ public class AiServiceImpl implements IAiService } else { System.out.println("追加任务接口返回错误： " + jo.toString()); } - } + } @Override