Skip to content

P
Pangea-Agent
Commit b48aa988 authored by youxiaoji's avatar youxiaoji
Browse files
Options

* [增加差旅助手智能体]

parent 53570949
Expand all Show whitespace changes
Inline Side-by-side
Showing with 531 additions and 16 deletions
backend/src/main/java/pangea/hiagent/controller/AgentChatController.java
View file @ b48aa988
package pangea.hiagent.controller; package pangea.hiagent.controller;
import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
...@@ -84,7 +85,6 @@ public class AgentChatController { ...@@ -84,7 +85,6 @@ public class AgentChatController {
} }
return emitter; return emitter;
} }
String userId = getCurrentUserId(); String userId = getCurrentUserId();
if (userId == null) { if (userId == null) {
log.error("用户未认证"); log.error("用户未认证");
......
backend/src/main/java/pangea/hiagent/core/AgentChatService.java
View file @ b48aa988
...@@ -587,7 +587,7 @@ public class AgentChatService { ...@@ -587,7 +587,7 @@ public class AgentChatService {
// 这里只需要等待足够的时间让异步的onComplete回调执行完成 // 这里只需要等待足够的时间让异步的onComplete回调执行完成
try { try {
// 通过轮询检查是否已完成，最多等待5秒 // 通过轮询检查是否已完成，最多等待5秒
long maxWaitTime = 5000; long maxWaitTime = 10*60*1000;
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
while (!isCompleted.get() && (System.currentTimeMillis() - startTime) < maxWaitTime) { while (!isCompleted.get() && (System.currentTimeMillis() - startTime) < maxWaitTime) {
Thread.sleep(100); // 每100ms检查一次 Thread.sleep(100); // 每100ms检查一次
......
backend/src/main/java/pangea/hiagent/react/DefaultReactExecutor.java
View file @ b48aa988
...@@ -8,6 +8,9 @@ import org.springframework.ai.chat.prompt.Prompt; ...@@ -8,6 +8,9 @@ import org.springframework.ai.chat.prompt.Prompt;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import pangea.hiagent.service.AgentService;
import pangea.hiagent.service.InfoCollectorService;
import pangea.hiagent.tools.HisenseTripTool;
import pangea.hiagent.workpanel.IWorkPanelDataCollector; import pangea.hiagent.workpanel.IWorkPanelDataCollector;
import pangea.hiagent.core.AgentChatService; import pangea.hiagent.core.AgentChatService;
import pangea.hiagent.memory.MemoryService; import pangea.hiagent.memory.MemoryService;
...@@ -41,6 +44,12 @@ public class DefaultReactExecutor implements ReactExecutor { ...@@ -41,6 +44,12 @@ public class DefaultReactExecutor implements ReactExecutor {
@Autowired @Autowired
private MemoryService memoryService; private MemoryService memoryService;
@Autowired
private AgentService agentService;
@Autowired
private InfoCollectorService infoCollectorService;
/** /**
* 添加ReAct回调 * 添加ReAct回调
* @param callback ReAct回调 * @param callback ReAct回调
...@@ -213,10 +222,12 @@ public class DefaultReactExecutor implements ReactExecutor { ...@@ -213,10 +222,12 @@ public class DefaultReactExecutor implements ReactExecutor {
// 构建Prompt，包含历史对话记录 // 构建Prompt，包含历史对话记录
Prompt prompt = buildPromptWithHistory(systemPrompt, userInput, agent); Prompt prompt = buildPromptWithHistory(systemPrompt, userInput, agent);
HisenseTripTool tripTool = new HisenseTripTool(agentService,infoCollectorService);
tripTool.initialize();
// 订阅流式响应 // 订阅流式响应
chatClient.prompt(prompt) chatClient.prompt(prompt)
.tools(tools.toArray()) .tools(tripTool)
.stream() .stream()
.chatResponse() .chatResponse()
.subscribe( .subscribe(
......
backend/src/main/java/pangea/hiagent/service/InfoCollectorService.java 0 → 100644
View file @ b48aa988
package pangea.hiagent.service;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import pangea.hiagent.tools.HisenseTripTool;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
@Service
@Slf4j
public class InfoCollectorService {
private static final ConcurrentHashMap<String, JSONArray> infos = new ConcurrentHashMap<>(16);
private static final ConcurrentHashMap<String, Object> values = new ConcurrentHashMap<>(16);
public void register(String pageId, JSONArray info) {
infos.put(pageId, info);
}
public boolean exists(String pageId) {
return infos.containsKey(pageId);
}
public JSONArray getInfo(String pageId) {
return infos.get(pageId);
}
public void saveValue(String key, Object value) {
log.info("key {} value {}",key,value);
values.put(key, value);
}
public Object getValue(String key) {
return values.get(key);
}
public Set<String> findLackInfo() {
Set<String> valueKeys = values.keySet();
Set<String> allKeys = infos.get(HisenseTripTool.pageId).stream().map(t -> ((JSONObject) t).getString("field_name")).collect(Collectors.toSet());
allKeys.removeAll(valueKeys);
log.info("lack keys {}", allKeys);
return allKeys;
}
}
backend/src/main/java/pangea/hiagent/utils/Contants.java 0 → 100644
View file @ b48aa988
package pangea.hiagent.utils;
public class Contants {
public static final String LOCATOR_SCHEMA = "{\n" +
" \"$schema\": \"http://json-schema.org/draft-07/schema#\",\n" +
" \"type\": \"array\",\n" +
" \"items\": {\n" +
" \"type\": \"object\",\n" +
" \"properties\": {\n" +
" \"field_name\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"locator\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"attributes\": {\n" +
" \"type\": \"object\",\n" +
" \"properties\": {\n" +
" \"type\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"maxlength\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"class\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"name\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"value\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"autocomplete\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"placeholder\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"readonly\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"id\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"droptreeids\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"vetitle\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"contenteditable\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"style\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"tipstext\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"fylx\": {\n" +
" \"type\": \"string\"\n" +
" }\n" +
" },\n" +
" \"additionalProperties\": false,\n" +
" \"required\": [\n" +
" \"class\",\n" +
" \"value\"\n" +
" ]\n" +
" }\n" +
" },\n" +
" \"additionalProperties\": false,\n" +
" \"required\": [\n" +
" \"field_name\",\n" +
" \"locator\",\n" +
" \"attributes\"\n" +
" ]\n" +
" }\n" +
"}";
}
backend/src/main/resources/application.yml
View file @ b48aa988
...@@ -4,7 +4,7 @@ spring: ...@@ -4,7 +4,7 @@ spring:
# 数据源配置 # 数据源配置
datasource: datasource:
url: jdbc:mysql://${DB_HOST:192.168.219.129}:3306/hiagent?allowMultiQueries=true&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai url: jdbc:mysql://${DB_HOST:127.0.0.1}:3306/hiagent?allowMultiQueries=true&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai
driver-class-name: ${DB_DRIVER:com.mysql.cj.jdbc.Driver} driver-class-name: ${DB_DRIVER:com.mysql.cj.jdbc.Driver}
username: ${DB_NAME:root} username: ${DB_NAME:root}
password: ${DB_PASSWORD:123456Aa?} password: ${DB_PASSWORD:123456Aa?}
...@@ -195,7 +195,7 @@ hiagent: ...@@ -195,7 +195,7 @@ hiagent:
llm: llm:
providers: providers:
deepseek: deepseek:
default-api-key: ${DEEPSEEK_API_KEY:} default-api-key: ${DEEPSEEK_API_KEY:sk-e8ef4359d20b413696512db21c09db87}
default-model: deepseek-chat default-model: deepseek-chat
base-url: https://api.deepseek.com base-url: https://api.deepseek.com
openai: openai:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment