diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/plugin/build/webservice/WebServiceQuery.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/plugin/build/webservice/WebServiceQuery.java index efefce08d..91e4a182a 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/plugin/build/webservice/WebServiceQuery.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/plugin/build/webservice/WebServiceQuery.java @@ -88,10 +88,10 @@ public class WebServiceQuery extends PluginSemanticQuery { restTemplate = ContextUtils.getBean(RestTemplate.class); try { responseEntity = - restTemplate.exchange(requestUrl, HttpMethod.POST, entity, Object.class); + restTemplate.exchange(requestUrl, HttpMethod.POST, entity, String.class); objectResponse = responseEntity.getBody(); log.info("objectResponse:{}", objectResponse); - Map response = JsonUtil.objectToMap(objectResponse); + Map response = JSON.parseObject(objectResponse.toString()); webServiceResponse.setResult(response); } catch (Exception e) { log.info("Exception:{}", e.getMessage()); diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/pojo/ParseContext.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/pojo/ParseContext.java index 5e97c83d2..d7e11d0e4 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/pojo/ParseContext.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/pojo/ParseContext.java @@ -19,7 +19,7 @@ public class ParseContext { } public boolean enableNL2SQL() { - return Objects.nonNull(agent) && agent.containsDatasetTool(); + return Objects.nonNull(agent) && agent.containsDatasetTool()&&response.getSelectedParses().size() == 0; } public boolean enableLLM() {