'commit'

pom.xml

@@ -16,8 +16,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <!--JFinal版本号-->
-        <jfinal.version>5.2.3</jfinal.version>
-        <jfinal-undertow.version>3.6</jfinal-undertow.version>
+        <jfinal.version>5.2.4</jfinal.version>
+        <jfinal-undertow.version>3.7</jfinal-undertow.version>
         <jfinal-cos.version>2022.2</jfinal-cos.version>
         <!--HikariCP版本号-->
         <HikariCP.version>5.1.0</HikariCP.version>

src/main/java/com/dsideal/base/AI/Controller/YunNanAiController.java

@@ -7,6 +7,7 @@ import com.jfinal.aop.Before;
 import com.jfinal.core.Controller;
 import com.jfinal.ext.interceptor.GET;
 import com.jfinal.kit.PathKit;
+import com.jfinal.kit.SseEmitter;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -26,125 +27,51 @@ public class YunNanAiController extends Controller {
      *                 http://10.10.21.20:9200/dsBase/ai/compareShiZhou?shiZhouA=文山州&shiZhouB=楚雄州
      */
     @Before({GET.class})
-    public void compareShiZhou(String shiZhouA, String shiZhouB) {
-        // 设置SSE响应头
-        getResponse().setContentType("text/event-stream");
-        getResponse().setCharacterEncoding("UTF-8");
-        getResponse().setHeader("Cache-Control", "no-cache");
-        getResponse().setHeader("Connection", "keep-alive");
-        getResponse().setHeader("Access-Control-Allow-Origin", "*");
-        getResponse().setHeader("Access-Control-Allow-Headers", "Cache-Control");
-        
-        try {
-            PrintWriter writer = getResponse().getWriter();
-            
-            String[] regions = {shiZhouA, shiZhouB};
-            // 第一步：数据获取
-            String dataContent = ym.collectEducationData(regions);
-            String analysisPrompt = ym.createAnalysisPrompt(dataContent, regions);
-            
-            // 生成输出文件名相关信息
-            String timestamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
-            String regionName = String.join("与", regions);
-            String uploadPath = PathKit.getWebRootPath() + "/upload";
-            
-            // 发送开始事件
-            writer.write("data: {\"type\":\"start\",\"message\":\"开始分析数据...\"}\n\n");
-            writer.flush();
-
-            // 第二步：AI分析并生成Word文档
-            CallDeepSeek.callDeepSeekStream(analysisPrompt, new CallDeepSeek.SSEListener() {
-                private StringBuilder fullResponse = new StringBuilder();
-
-                @Override
-                public void onData(String data) {
-                    try {
-                        fullResponse.append(data);
-                        // 发送分析数据
-                        String escapedData = data.replace("\\", "\\\\").replace("\"", "\\\"").replace("\n", "\\n").replace("\r", "\\r");
-                        writer.write("data: {\"type\":\"analysis\",\"content\":\"" + escapedData + "\"}\n\n");
-                        writer.flush();
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-
-                @Override
-                public void onComplete(String response) {
-                    try {
-                        // 发送分析完成事件
-                        writer.write("data: {\"type\":\"analysis_complete\",\"message\":\"分析完成，开始生成文档...\"}\n\n");
-                        writer.flush();
-                        
-                        // 使用完整的分析结果
-                        String analysisResult = fullResponse.toString();
-
-                        // 生成Word文档
-                        String wordOutputPath = uploadPath + "/" + regionName + "_教育分析报告_" + timestamp + ".docx";
-                        String wordFilePath = WordGenerator.generateWordDocument(analysisResult, wordOutputPath, regions);
-                        
-                        // 构建返回的文件信息
-                        Map<String, Object> result = new HashMap<>();
-                        result.put("success", true);
-                        result.put("message", "报告生成完成");
-                        result.put("wordFile", "/upload/" + regionName + "_教育分析报告_" + timestamp + ".docx");
-                        result.put("wordFilePath", wordFilePath);
-                        result.put("timestamp", timestamp);
-                        result.put("regions", regions);
-                        
-                        // 发送完成事件和文件地址
-                        String resultJson = com.jfinal.kit.JsonKit.toJson(result);
-                        writer.write("data: {\"type\":\"complete\",\"result\":" + resultJson + "}\n\n");
-                        writer.flush();
-                        
-                        // 发送结束标记
-                        writer.write("data: [DONE]\n\n");
-                        writer.flush();
-                        
-                        // 最后使用renderJson返回结果（用于非SSE客户端）
-                        renderJson(result);
-                        
-                    } catch (Exception e) {
-                        try {
-                            Map<String, Object> errorResult = new HashMap<>();
-                            errorResult.put("success", false);
-                            errorResult.put("message", "生成文档时出错: " + e.getMessage());
-                            
-                            String errorJson = com.jfinal.kit.JsonKit.toJson(errorResult);
-                            writer.write("data: {\"type\":\"error\",\"result\":" + errorJson + "}\n\n");
-                            writer.flush();
-                            
-                            renderJson(errorResult);
-                        } catch (Exception ex) {
-                            ex.printStackTrace();
-                        }
-                    }
-                }
+    public void compareShiZhou(String shiZhouA, String shiZhouB) throws InterruptedException {
+        //创建sse
+        SseEmitter sseEmitter = new SseEmitter(getResponse());
+        //主线程里拿到数据推送消息
+        String msg = "111 222 333 444 555 666 777";
+        String[] datas = msg.split(" ");
+        for (String data : datas) {
+            //推送
+            sseEmitter.sendMessage(data);
+            Thread.sleep(50);
+        }
+        //sse完成
+        sseEmitter.complete();
+        //结束response
+        renderNull();
+    }
 
-                @Override
-                public void onError(String error) {
+    /**
+     * 异步子线程模拟
+     * 测试本地发送文本打字机
+     *  http://10.10.21.20:9200/dsBase/ai/sse2
+     */
+    public void sse2(){
+        //创建sse
+        final SseEmitter sseEmitter = new SseEmitter(getResponse());
+        String msg = "111 222 333 444 555 666 777";
+        //模拟chatgptapi 异步调用返回
+        new Thread(new Runnable() {
+            public void run() {
+                String[] datas = msg.split("");
+                for(String data:datas){
+                    //推送 异步子线程里推送数据给客户端
+                    sseEmitter.sendMessage(data);
                     try {
-                        Map<String, Object> errorResult = new HashMap<>();
-                        errorResult.put("success", false);
-                        errorResult.put("message", "DeepSeek分析出错: " + error);
-                        
-                        String errorJson = com.jfinal.kit.JsonKit.toJson(errorResult);
-                        writer.write("data: {\"type\":\"error\",\"result\":" + errorJson + "}\n\n");
-                        writer.flush();
-                        
-                        renderJson(errorResult);
-                    } catch (Exception e) {
-                        e.printStackTrace();
+                        Thread.sleep(50);
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
                     }
                 }
-            });
-            
-        } catch (IOException e) {
-            // 如果SSE失败，降级为普通JSON响应
-            Map<String, Object> errorResult = new HashMap<>();
-            errorResult.put("success", false);
-            errorResult.put("message", "SSE连接失败: " + e.getMessage());
-            renderJson(errorResult);
-        }
+                //完成sse 告知主线程已经完成
+                sseEmitter.complete();
+            }
+        }).start();
+        //锁住等待子线程推送完成
+        sseEmitter.waiting(100);
+        renderNull();
     }
 }

src/main/java/com/dsideal/base/Util/CallDeepSeek.java

@@ -39,14 +39,20 @@ public class CallDeepSeek {
         new Thread(() -> {
             StringBuilder fullResponse = new StringBuilder();
             try {
+                System.out.println("开始调用DeepSeek API...");
                 JSONObject jsonPayload = createRequestPayload(prompt);
+                System.out.println("请求载荷: " + jsonPayload.toString());
+                
                 HttpClient client = createHttpClient();
                 java.net.http.HttpRequest request = createHttpRequest(jsonPayload);
+                System.out.println("发送HTTP请求到: " + API_URL);
 
                 CompletableFuture<Void> future = client.sendAsync(request, HttpResponse.BodyHandlers.ofLines())
                         .thenAccept(response -> {
+                            System.out.println("收到响应，状态码: " + response.statusCode());
                             handleStreamResponse(response, fullResponse, listener, outputPath, saveToFile);
                         }).exceptionally(e -> {
+                            System.err.println("请求异常: " + e.getMessage());
                             listener.onError("请求或处理异常: " + e.getMessage());
                             e.printStackTrace();
                             return null;
@@ -54,6 +60,7 @@ public class CallDeepSeek {
                 future.join();
 
             } catch (Exception e) {
+                System.err.println("发生意外错误: " + e.getMessage());
                 listener.onError("发生意外错误: " + e.getMessage());
                 e.printStackTrace();
             }
@@ -107,10 +114,14 @@ public class CallDeepSeek {
                                              SSEListener listener,
                                              String outputPath,
                                              boolean saveToFile) {
+        System.out.println("处理流式响应，状态码: " + response.statusCode());
         if (response.statusCode() == 200) {
+            System.out.println("开始处理SSE数据流...");
             response.body().forEach(line -> {
+                System.out.println("收到SSE行: " + line);
                 if (line.startsWith("data:")) {
                     String data = line.substring(5).trim();
+                    System.out.println("解析SSE数据: " + data);
                     if (!data.equals("[DONE]")) {
                         try {
                             JSONObject jsonData = JSONUtil.parseObj(data);
@@ -120,19 +131,24 @@ public class CallDeepSeek {
                                         .getJSONObject("delta")
                                         .getStr("content", "");
                                 if (content != null && !content.isEmpty()) {
+                                    System.out.println("提取到内容: " + content);
                                     fullResponse.append(content);
                                     listener.onData(content);
                                 }
                             }
                         } catch (Exception e) {
                             System.err.println("解析SSE JSON数据错误: " + data + " \nError: " + e.getMessage());
+                            e.printStackTrace();
                         }
+                    } else {
+                        System.out.println("收到结束标记 [DONE]");
                     }
                 }
             });
 
             // 流结束后的处理
             String responseContent = fullResponse.toString();
+            System.out.println("流处理完成，总内容长度: " + responseContent.length());
             if (saveToFile && outputPath != null) {
                 FileUtil.writeString(responseContent, new File(outputPath), "UTF-8");
                 listener.onComplete("内容已成功保存到" + outputPath);
@@ -140,6 +156,7 @@ public class CallDeepSeek {
                 listener.onComplete(responseContent);
             }
         } else {
+            System.err.println("API请求失败，状态码: " + response.statusCode());
             listener.onError("API请求失败: " + response.statusCode() + " Body: " + response.body().toString());
         }
     }