调整征信解析返回解析和日志

ccdi-lsfx/src/main/java/com/ruoyi/lsfx/client/CreditParseClient.java

@@ -1,5 +1,6 @@
 package com.ruoyi.lsfx.client;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.lsfx.domain.response.CreditParseInvokeResponse;
@@ -20,6 +21,9 @@ public class CreditParseClient {
     @Resource
     private HttpUtil httpUtil;
 
+    @Resource
+    private ObjectMapper objectMapper;
+
     @Value("${credit-parse.api.url}")
     private String creditParseUrl;
 
@@ -39,8 +43,6 @@ public class CreditParseClient {
     public CreditParseInvokeResponse parse(String model, String remotePath) {
         long startTime = System.currentTimeMillis();
         String actualModel = StringUtils.isBlank(model) ? defaultModel : model;
-        log.info("【征信解析】开始调用: model={}, remotePath={}", actualModel, remotePath);
-
         try {
             Map<String, Object> params = new HashMap<>();
             params.put("serialNum", buildSerialNum());
@@ -49,8 +51,11 @@ public class CreditParseClient {
             params.put("remotePath", remotePath);
             params.put("model", actualModel);
 
-            CreditParseInvokeResponse response = httpUtil.postUrlEncodedForm(
-                creditParseUrl, params, null, CreditParseInvokeResponse.class);
+            log.info("【征信解析】调用请求: url={}, params={}", creditParseUrl, toJson(params));
+            String responseJson = httpUtil.postUrlEncodedFormForString(creditParseUrl, params, null);
+            log.info("【征信解析】调用返回JSON: {}", responseJson);
+
+            CreditParseInvokeResponse response = objectMapper.readValue(responseJson, CreditParseInvokeResponse.class);
 
             long elapsed = System.currentTimeMillis() - startTime;
             log.info("【征信解析】调用完成: success={}, code={}, businessStatusCode={}, cost={}ms",
@@ -70,4 +75,12 @@ public class CreditParseClient {
     private String buildSerialNum() {
         return "CCDI_CREDIT_" + System.currentTimeMillis() + "_" + IdUtils.fastSimpleUUID();
     }
+
+    private String toJson(Object value) {
+        try {
+            return objectMapper.writeValueAsString(value);
+        } catch (Exception e) {
+            return String.valueOf(value);
+        }
+    }
 }

ccdi-lsfx/src/main/java/com/ruoyi/lsfx/domain/response/CreditParsePayloadDeserializer.java

@@ -0,0 +1,33 @@
+package com.ruoyi.lsfx.domain.response;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.ObjectCodec;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.DeserializationContext;
+
+import java.io.IOException;
+
+public class CreditParsePayloadDeserializer extends JsonDeserializer<CreditParsePayload> {
+
+    @Override
+    public CreditParsePayload deserialize(JsonParser parser, DeserializationContext context) throws IOException {
+        ObjectCodec codec = parser.getCodec();
+        JsonNode node = codec.readTree(parser);
+        if (node == null || node.isNull()) {
+            return null;
+        }
+        if (node.isTextual()) {
+            String payloadText = node.asText();
+            if (payloadText == null || payloadText.trim().isEmpty()) {
+                return null;
+            }
+            node = codec.readTree(codec.getFactory().createParser(payloadText));
+        }
+        if (!node.isObject()) {
+            throw JsonMappingException.from(parser, "征信解析payload格式不支持");
+        }
+        return codec.treeToValue(node, CreditParsePayload.class);
+    }
+}

ccdi-lsfx/src/main/java/com/ruoyi/lsfx/domain/response/CreditParseResponse.java

@@ -1,6 +1,7 @@
 package com.ruoyi.lsfx.domain.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import lombok.Data;
 
 @Data
@@ -11,5 +12,6 @@ public class CreditParseResponse {
     @JsonProperty("status_code")
     private String statusCode;
 
+    @JsonDeserialize(using = CreditParsePayloadDeserializer.class)
     private CreditParsePayload payload;
 }

ccdi-lsfx/src/main/java/com/ruoyi/lsfx/util/HttpUtil.java

@@ -247,6 +247,45 @@ public class HttpUtil {
         }
     }
 
+    /**
+     * 发送POST请求（application/x-www-form-urlencoded格式）并返回原始JSON字符串
+     * @param url 请求URL
+     * @param params 表单参数
+     * @param headers 请求头
+     * @return 原始响应内容
+     */
+    public String postUrlEncodedFormForString(String url, Map<String, Object> params, Map<String, String> headers) {
+        try {
+            HttpHeaders httpHeaders = createHeaders(headers);
+            httpHeaders.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+
+            MultiValueMap<String, String> body = new LinkedMultiValueMap<>();
+            if (params != null) {
+                params.forEach((key, value) -> {
+                    if (value != null) {
+                        body.add(key, value.toString());
+                    }
+                });
+            }
+
+            HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<>(body, httpHeaders);
+            ResponseEntity<String> response = restTemplate.postForEntity(url, requestEntity, String.class);
+
+            if (!response.getStatusCode().is2xxSuccessful()) {
+                throw new LsfxApiException("API调用失败，HTTP状态码: " + response.getStatusCode());
+            }
+
+            String responseBody = response.getBody();
+            if (responseBody == null) {
+                throw new LsfxApiException("API返回数据为空");
+            }
+
+            return responseBody;
+        } catch (RestClientException e) {
+            throw new LsfxApiException("网络请求失败: " + e.getMessage(), e);
+        }
+    }
+
     /**
      * 上传文件（Multipart格式）
      * @param url 请求URL