From 2ad7a1b9035321fc16b253ad2cdd73c6d5e15d64 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 22 五月 2026 16:18:52 +0800
Subject: [PATCH] 新增sendstateView（1：待随访（2 待发送）；2：随访中（1 被领取、3 已发送）、3：未完成（5 发送失败、7、超时）、4：已完成（ 6 已完成）、5：无需随访（4 不执行））
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/HttpUtil.java | 74 ++++++++++++++++++++++++++++++++++++
1 files changed, 73 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/HttpUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/HttpUtil.java
index f0713bc..8f21b07 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/HttpUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/HttpUtil.java
@@ -106,11 +106,23 @@
httpMethod.setRequestEntity(entity);
int resultCode = httpClient.executeMethod(httpMethod);
+ // 鑾峰彇鍝嶅簲澶寸殑瀛楃缂栫爜
+ String contentType = httpMethod.getResponseHeader("Content-Type") == null ?
+ null : httpMethod.getResponseHeader("Content-Type").getValue();
+ String charset = "UTF-8"; // 榛樿浣跨敤UTF-8
+
+ if (contentType != null && contentType.contains("charset=")) {
+ String[] parts = contentType.split("charset=");
+ if (parts.length > 1) {
+ charset = parts[1].split(";")[0].trim();
+ }
+ }
+
InputStream inputStream = httpMethod.getResponseBodyAsStream();
if (inputStream == null) {
throw new HttpRequestException(RESPONSE_NULL_ERROR_CODE, "鍝嶅簲涓簄ull");
}
- BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream,charset));
StringBuffer stringBuffer = new StringBuffer();
String str = "";
while ((str = reader.readLine()) != null) {
@@ -145,6 +157,66 @@
* @param respBodyClass 鍝嶅簲浣撶被鍨�
* @return 杩斿洖鐨勫搷搴旂粨鏋�
*/
+ public static String postXmlRequest(String url, String request) throws HttpRequestException {
+ return postXmlRequest(url, request, EMPTY_HEADERS);
+ }
+
+ public static String postXmlRequest(String url, String request, Map<String, String> headers) throws HttpRequestException {
+ Assert.hasLength(url, "鐠囬攱鐪皍rl娑撳秷鍏樻稉铏光敄鐎涙顑佹稉灞傗偓?");
+ Assert.notNull(request, "XML request must not be null");
+ EntityEnclosingMethod httpMethod = new PostMethod(url);
+
+ httpMethod.addRequestHeader(CONTENT_TYPE, TEXT_XML_UTF8);
+ setHeaderRequestId(httpMethod);
+ if (headers != null && headers != EMPTY_HEADERS) {
+ setReqHeaders(headers, httpMethod);
+ }
+
+ try {
+ RequestEntity entity = new StringRequestEntity(request, TEXT_XML, StandardCharsets.UTF_8.name());
+ httpMethod.setRequestEntity(entity);
+
+ int resultCode = httpClient.executeMethod(httpMethod);
+ String contentType = httpMethod.getResponseHeader(CONTENT_TYPE) == null
+ ? null : httpMethod.getResponseHeader(CONTENT_TYPE).getValue();
+ String charset = StandardCharsets.UTF_8.name();
+ if (contentType != null && contentType.contains("charset=")) {
+ String[] parts = contentType.split("charset=");
+ if (parts.length > 1) {
+ charset = parts[1].split(";")[0].trim();
+ }
+ }
+
+ InputStream inputStream = httpMethod.getResponseBodyAsStream();
+ if (inputStream == null) {
+ throw new HttpRequestException(RESPONSE_NULL_ERROR_CODE, "閸濆秴绨叉稉绨剈ll");
+ }
+ BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, charset));
+ StringBuilder stringBuilder = new StringBuilder();
+ String str;
+ while ((str = reader.readLine()) != null) {
+ stringBuilder.append(str);
+ }
+ reader.close();
+ String respXml = stringBuilder.toString();
+ if (resultCode == OK) {
+ return respXml;
+ } else {
+ throw new HttpRequestException(resultCode, respXml);
+ }
+ } catch (UnsupportedEncodingException e) {
+ throw new HttpRequestException(ENCODING_ERROR_CODE, e);
+ } catch (HttpException e) {
+ throw new HttpRequestException(HTTP_ERROR_CODE, e);
+ } catch (IOException e) {
+ throw new HttpRequestException(IO_ERROR_CODE, e);
+ } finally {
+ if (httpMethod != null) {
+ httpMethod.releaseConnection();
+ }
+ }
+ }
+
@SuppressWarnings("unchecked")
public static <RESPBODY> HttpEntity<RESPBODY> postJsonRequestV2(String url, HttpEntity<?> reqEntity, Class<RESPBODY> respBodyClass) {
Assert.hasLength(url, "璇锋眰url涓嶈兘涓虹┖瀛楃涓层��");
--
Gitblit v1.9.3