From ba0dae92a0eb14b378fd44c91ed2ccb481c164e3 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期一, 15 十二月 2025 09:53:06 +0800
Subject: [PATCH] #
---
src/main/webapp/views/ai/diagnosis.html | 17 ++++++--
src/main/java/com/zy/ai/service/LlmChatService.java | 89 ++++++++++++++++++++++++++++++++------------
src/main/java/com/zy/ai/service/WcsDiagnosisService.java | 1
src/main/java/com/zy/core/task/MakeMainProcessPseudocodeScheduler.java | 2
src/main/resources/application.yml | 3 +
5 files changed, 82 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/ai/service/LlmChatService.java b/src/main/java/com/zy/ai/service/LlmChatService.java
index 0736951..5077247 100644
--- a/src/main/java/com/zy/ai/service/LlmChatService.java
+++ b/src/main/java/com/zy/ai/service/LlmChatService.java
@@ -14,6 +14,9 @@
import java.util.List;
import java.util.function.Consumer;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -80,7 +83,6 @@
req.setMax_tokens(maxTokens != null ? maxTokens : 1024);
req.setStream(true);
- System.out.println(JSON.toJSONString(req));
Flux<String> flux = llmWebClient.post()
.uri("/chat/completions")
@@ -92,35 +94,74 @@
.bodyToFlux(String.class)
.doOnError(ex -> log.error("璋冪敤 LLM 娴佸紡澶辫触", ex));
- flux.subscribe(payload -> {
- String s = payload;
- if (s == null || s.isEmpty()) return;
- if (s.startsWith("data:")) {
- s = s.substring(5);
- if (s.startsWith(" ")) s = s.substring(1);
- }
- // 淇濈暀妯″瀷杈撳嚭涓殑鎹㈣锛屽彧鍦ㄥ垽鏂粨鏉熸爣璁版椂蹇界暐绌虹櫧
- if ("[DONE]".equals(s.trim())) return;
+ AtomicBoolean doneSeen = new AtomicBoolean(false);
+ AtomicBoolean errorSeen = new AtomicBoolean(false);
+ LinkedBlockingQueue<String> queue = new LinkedBlockingQueue<>();
+
+ Thread drain = new Thread(() -> {
try {
- JSONObject obj = JSON.parseObject(s);
- JSONArray choices = obj.getJSONArray("choices");
- if (choices != null && !choices.isEmpty()) {
- JSONObject c0 = choices.getJSONObject(0);
- JSONObject delta = c0.getJSONObject("delta");
- if (delta != null) {
- String content = delta.getString("content");
-// log.info("chunk = [{}] len = {}", content, content.length());
-// for (char ch : content.toCharArray()) {
-// log.info("char: {} ({})", (int) ch, ch == '\n' ? "\\n" : ch);
-// }
- if (content != null) onChunk.accept(content);
+ while (true) {
+ String s = queue.poll(2, TimeUnit.SECONDS);
+ if (s != null) {
+ try { onChunk.accept(s); } catch (Exception ignore) {}
+ }
+ if (doneSeen.get() && queue.isEmpty()) {
+ if (!errorSeen.get()) {
+ try { if (onComplete != null) onComplete.run(); } catch (Exception ignore) {}
+ }
+ break;
}
}
- } catch (Exception ignore) {}
+ } catch (InterruptedException ignore) {
+ ignore.printStackTrace();
+ }
+ });
+ drain.setDaemon(true);
+ drain.start();
+
+ flux.subscribe(payload -> {
+ if (payload == null || payload.isEmpty()) return;
+ String[] events = payload.split("\\r?\\n\\r?\\n");
+ for (String part : events) {
+ String s = part;
+ if (s == null || s.isEmpty()) continue;
+ if (s.startsWith("data:")) {
+ s = s.substring(5);
+ if (s.startsWith(" ")) s = s.substring(1);
+ }
+ if ("[DONE]".equals(s.trim())) {
+ doneSeen.set(true);
+ continue;
+ }
+ try {
+ JSONObject obj = JSON.parseObject(s);
+ JSONArray choices = obj.getJSONArray("choices");
+ if (choices != null && !choices.isEmpty()) {
+ JSONObject c0 = choices.getJSONObject(0);
+ JSONObject delta = c0.getJSONObject("delta");
+ if (delta != null) {
+ String content = delta.getString("content");
+ if (content != null) {
+ try { queue.offer(content); } catch (Exception ignore) {}
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
}, err -> {
+ errorSeen.set(true);
+ doneSeen.set(true);
if (onError != null) onError.accept(err);
}, () -> {
- if (onComplete != null) onComplete.run();
+ if (!doneSeen.get()) {
+ errorSeen.set(true);
+ doneSeen.set(true);
+ if (onError != null) onError.accept(new RuntimeException("LLM 娴佹剰澶栧畬鎴�"));
+ } else {
+ doneSeen.set(true);
+ }
});
}
}
diff --git a/src/main/java/com/zy/ai/service/WcsDiagnosisService.java b/src/main/java/com/zy/ai/service/WcsDiagnosisService.java
index e3850c6..507bd31 100644
--- a/src/main/java/com/zy/ai/service/WcsDiagnosisService.java
+++ b/src/main/java/com/zy/ai/service/WcsDiagnosisService.java
@@ -90,7 +90,6 @@
llmChatService.chatStream(messages, 0.2, 2048, s -> {
try {
- // SSE 鍗忚涓嶅厑璁稿師鏍锋惡甯︽崲琛岋紝鍏堣浆涓� \n 浼犺緭锛屽墠绔啀杩樺師
String safe = s == null ? "" : s.replace("\r", "").replace("\n", "\\n");
if (!safe.isEmpty()) {
emitter.send(SseEmitter.event().data(safe));
diff --git a/src/main/java/com/zy/core/task/MakeMainProcessPseudocodeScheduler.java b/src/main/java/com/zy/core/task/MakeMainProcessPseudocodeScheduler.java
index 11f4727..6643279 100644
--- a/src/main/java/com/zy/core/task/MakeMainProcessPseudocodeScheduler.java
+++ b/src/main/java/com/zy/core/task/MakeMainProcessPseudocodeScheduler.java
@@ -25,7 +25,7 @@
@Autowired
private RedisUtil redisUtil;
- @Scheduled(cron = "1 * * * * ? ")
+ @Scheduled(cron = "0/3 * * * * ? ")
public void refreshPseudocodeDaily() {
try {
initMainProcessPseudocode();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index eac702e..6824914 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -74,3 +74,6 @@
base-url: http://47.76.147.249:9998/e/7g7kqxxt1ei2un71
api-key: app-mP0O6aY5WpbfaHs7BNnjVkli
model: deepseek-ai/DeepSeek-V3.2
+# base-url: http://34.2.134.223:3000/v1
+# api-key: sk-WabrmtOezCFwVo7XvVOrO3QkmfcKG7T7jy0BaVnmQTWm5GXh
+# model: gemini-3-pro-preview
\ No newline at end of file
diff --git a/src/main/webapp/views/ai/diagnosis.html b/src/main/webapp/views/ai/diagnosis.html
index 612b817..0c07ae0 100644
--- a/src/main/webapp/views/ai/diagnosis.html
+++ b/src/main/webapp/views/ai/diagnosis.html
@@ -27,6 +27,7 @@
.avatar { width: 24px; height: 24px; display: flex; align-items: center; margin-right: 8px; }
.time { font-size: 12px; color: #909399; text-align: right; margin-top: 6px; }
.output .el-card__body { height: 100%; padding: 0; }
+ .assistant-running { display: flex; align-items: center; gap: 8px; color: #909399; }
</style>
</head>
<body>
@@ -40,7 +41,7 @@
<div class="actions" style="flex-wrap: wrap;">
<el-button type="primary" :loading="loading" :disabled="streaming" @click="start">涓�閿瘖鏂郴缁�</el-button>
<el-button type="warning" :disabled="!streaming" @click="stop">鍋滄</el-button>
- <el-button @click="clear">娓呯┖褰撳墠鑱婂ぉ</el-button>
+ <!-- <el-button @click="clear">娓呯┖褰撳墠鑱婂ぉ</el-button> -->
<span class="status" style="margin-right: 12px;">{{ statusText }}</span>
<el-select v-model="currentChatId" placeholder="閫夋嫨浼氳瘽" style="min-width:240px;" @change="switchChat" :disabled="streaming">
<el-option v-for="c in chats" :key="c.chatId" :label="(c.title||('浼氳瘽 '+c.chatId)) + '锛�'+(c.size||0)+'锛�'" :value="c.chatId" />
@@ -56,7 +57,11 @@
<div v-for="(m,i) in messages" :key="i" class="msg" :class="m.role">
<div class="avatar" v-html="m.role === 'assistant' ? assistantIcon : userIcon"></div>
<div class="bubble">
- <div v-if="m.role === 'assistant'" class="markdown-body" v-html="m.html"></div>
+ <div v-if="m.role === 'assistant' && m.html" class="markdown-body" v-html="m.html"></div>
+ <div v-else-if="m.role === 'assistant' && streaming && i === messages.length - 1" class="assistant-running">
+ <span v-html="assistantIcon"></span>
+ <span>AI鍔╂墜姝ｅ湪杩愯涓�</span>
+ </div>
<div v-else v-text="m.text"></div>
<div class="time">{{ m.ts }}</div>
</div>
@@ -281,15 +286,19 @@
this.source.close();
this.source = null;
}
+ var last = this.messages.length > 0 ? this.messages[this.messages.length - 1] : null;
+ if (last && last.role === 'assistant' && this.pendingText && this.pendingText.length > 0) {
+ last.md = (last.md || '') + this.pendingText;
+ this.pendingText = '';
+ }
this.streaming = false;
this.loading = false;
if (this.typingTimer) {
clearInterval(this.typingTimer);
this.typingTimer = null;
}
- var last = this.messages.length > 0 ? this.messages[this.messages.length - 1] : null;
if (last && last.role === 'assistant') {
- var renderSource = (last.md || '').replace(/\\n/g, '\n');
+ var renderSource = (last.md || '').replace(/\n/g, '\n');
last.html = DOMPurify.sanitize(marked.parse(renderSource));
}
this.$nextTick(function() { this.scrollToBottom(true); }.bind(this));
--
Gitblit v1.9.1