From bc30484ac7a5feea3162d56b9ff76a9c976aba48 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 25 四月 2024 15:06:41 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java | 4 +++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java | 14 ++++++++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/hanler/ChatWebSocketHandler.java | 2 +-
smartor/src/main/java/com/smartor/config/PhoneUtils.java | 13 ++++++++-----
4 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/hanler/ChatWebSocketHandler.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/hanler/ChatWebSocketHandler.java
index 18fb07f..058f5f7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/hanler/ChatWebSocketHandler.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/hanler/ChatWebSocketHandler.java
@@ -144,7 +144,7 @@
returnQues.setNowQuestion(ivrLibaTemplateScriptVO);
// returnQues.setCode(ivrLibaTemplateScriptVO.getTargetid() + 1);
}
-// returnQues.setKcb("浣犲ソ,澶у偦鐙�,鎴戜滑鏄煇鏌愭煇鍖婚櫌,鐜板湪闇�瑕佸仛涓�娆￠殢璁�;");
+// 璁剧疆寮�鍦虹櫧
returnQues.setKcb(ivrLibaTemplateVO1.getRevisitBefore());
//璁板綍鍝嶅簲
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java
index dba7a42..6829dd0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java
@@ -113,7 +113,9 @@
List<IvrLibaTargetVO> ivrLibaTargetVOS = ivrLibaTargetService.targetInfo(ivrLibaTarget);
//鐢ㄤ簬鍒嗛〉
- List<IvrLibaTarget> ivrLibaTargets = ivrLibaTargetService.selectIvrLibaTargetList(null);
+ ivrLibaTarget.setPageNum(null);
+ ivrLibaTarget.setPageSize(null);
+ List<IvrLibaTarget> ivrLibaTargets = ivrLibaTargetService.selectIvrLibaTargetList(ivrLibaTarget);
//鍒嗛〉
TableDataInfo rspData = new TableDataInfo();
rspData.setCode(HttpStatus.SUCCESS);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java
index 19a3480..8500f89 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java
@@ -9,6 +9,7 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.smartor.config.PhoneUtils;
import com.smartor.config.RabbitMqConfig;
import com.smartor.domain.IvrLibaTemplate;
import com.smartor.domain.IvrLibaTemplateVO;
@@ -48,6 +49,9 @@
@Autowired
private RabbitTemplate rabbitTemplate;
+
+ @Autowired
+ private PhoneUtils phoneUtils;
/**
* 鏌ヨ妯℃澘搴撳垪琛�
@@ -173,4 +177,14 @@
log.info("-------------寤惰繜闃熷垪{}ms鍚庢墽琛�.-------------", test1Vo.getTimes());
return success();
}
+
+
+ /**
+ * 寮�濮嬫墽琛�(娴嬭瘯鐢�)
+ */
+ @GetMapping("/addUser2")
+ public AjaxResult addUser2() {
+ String s = phoneUtils.ob("","","","","","","","3001","",true);
+ return AjaxResult.success(s);
+ }
}
diff --git a/smartor/src/main/java/com/smartor/config/PhoneUtils.java b/smartor/src/main/java/com/smartor/config/PhoneUtils.java
index df4a3dc..526587a 100644
--- a/smartor/src/main/java/com/smartor/config/PhoneUtils.java
+++ b/smartor/src/main/java/com/smartor/config/PhoneUtils.java
@@ -1,17 +1,13 @@
package com.smartor.config;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.utils.HttpUtil;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpEntity;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.params.HttpMethodParams;
-import org.apache.http.util.EntityUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
-import sun.net.www.http.HttpClient;
import javax.mail.Multipart;
+import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
@@ -274,6 +270,13 @@
phonePort = "8001";
}
HttpEntity<String> stringHttpEntity = HttpUtil.postJsonRequestV2(phoneIP + ":" + phonePort + path, req, String.class);
+ String responseBody = null;
+ try {
+ responseBody = new String(stringHttpEntity.getBody().getBytes("ISO-8859-1"), "UTF-8");
+ System.out.println(responseBody);
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
return new String(stringHttpEntity.getBody().getBytes(StandardCharsets.UTF_8));
}
--
Gitblit v1.9.3