From 830958367fefdbdc6ae0b59e17906a887a418153 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Fri, 13 Jun 2025 22:01:33 +0800
Subject: [PATCH] 'commit'

---
 .../AI/Controller/YunNanAiController.java     |  3 +-
 .../dsideal/base/AI/Model/YunNanModel.java    | 34 ++++++++-----------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/dsideal/base/AI/Controller/YunNanAiController.java b/src/main/java/com/dsideal/base/AI/Controller/YunNanAiController.java
index f7cf8c42..f529affa 100644
--- a/src/main/java/com/dsideal/base/AI/Controller/YunNanAiController.java
+++ b/src/main/java/com/dsideal/base/AI/Controller/YunNanAiController.java
@@ -4,6 +4,7 @@ import com.dsideal.base.AI.Model.YunNanModel;
 import com.jfinal.aop.Before;
 import com.jfinal.core.Controller;
 import com.jfinal.ext.interceptor.GET;
+import com.jfinal.kit.PathKit;
 
 public class YunNanAiController extends Controller {
     YunNanModel ym = new YunNanModel();
@@ -22,7 +23,7 @@ public class YunNanAiController extends Controller {
         String analysisPrompt = ym.createAnalysisPrompt(dataContent, regions);
 
         // 第二步：AI分析并生成Word文档
-        ym.generateWordReport(analysisPrompt, regions);
+        ym.generateWordReport(analysisPrompt, regions, PathKit.getWebRootPath()+"/upload");
     }
 
 }
diff --git a/src/main/java/com/dsideal/base/AI/Model/YunNanModel.java b/src/main/java/com/dsideal/base/AI/Model/YunNanModel.java
index 706c3ea4..0bc33893 100644
--- a/src/main/java/com/dsideal/base/AI/Model/YunNanModel.java
+++ b/src/main/java/com/dsideal/base/AI/Model/YunNanModel.java
@@ -2,11 +2,9 @@ package com.dsideal.base.AI.Model;
 
 import cn.hutool.json.JSONUtil;
 import com.dsideal.base.AI.Generator.HtmlGenerator;
-import com.dsideal.base.AI.Generator.PptGenerator;
 import com.dsideal.base.AI.Generator.WordGenerator;
 import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Util.CallDeepSeek;
-import com.dsideal.base.Util.PptAIKit;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
 
@@ -88,7 +86,7 @@ public class YunNanModel {
     /**
      * 生成Word报告
      */
-    public void generateWordReport(String analysisPrompt, String[] regions) {
+    public void generateWordReport(String analysisPrompt, String[] regions, String path) {
         // 生成输出文件名（不包含路径）
         String timestamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
 
@@ -115,25 +113,23 @@ public class YunNanModel {
                     String analysisResult = fullResponse.toString();
 
                     // 生成Word文档
-                    String wordOutputPath = "D:\\dsWork\\YunNanDsBase\\WebRoot\\upload\\" + regionName + "_教育分析报告_" + timestamp + ".docx";
+                    String wordOutputPath = path + "/" + regionName + "_教育分析报告_" + timestamp + ".docx";
                     String wordFilePath = WordGenerator.generateWordDocument(analysisResult, wordOutputPath, regions);
-                    if (wordFilePath != null) {
-                        System.out.println("Word文档生成完成: " + wordFilePath);
-                    }
+                    System.out.println("Word文档生成完成: " + wordFilePath);
 
                     // 生成HTML报告
-                    String htmlOutputPath = "D:\\dsWork\\YunNanDsBase\\WebRoot\\upload\\" + regionName + "_教育分析报告_" + timestamp + ".html";
-                    String htmlFilePath = HtmlGenerator.generateHtmlReport(analysisResult, htmlOutputPath, regionName);
-                    if (htmlFilePath != null) {
-                        System.out.println("HTML报告生成完成: " + htmlFilePath);
-                    }
-
-                    // 生成PPT
-                    String token = PptAIKit.createApiToken("dsideal", 1000);
-                    String pptFilePath = PptGenerator.generatePptPresentation(analysisResult, regions, token);
-                    if (pptFilePath != null) {
-                        System.out.println("PPT演示文稿生成完成: " + pptFilePath);
-                    }
+//                    String htmlOutputPath = path + "/" + regionName + "_教育分析报告_" + timestamp + ".html";
+//                    String htmlFilePath = HtmlGenerator.generateHtmlReport(analysisResult, htmlOutputPath, regionName);
+//                    if (htmlFilePath != null) {
+//                        System.out.println("HTML报告生成完成: " + htmlFilePath);
+//                    }
+
+//                    // 生成PPT
+//                    String token = PptAIKit.createApiToken("dsideal", 1000);
+//                    String pptFilePath = PptGenerator.generatePptPresentation(analysisResult, regions, token);
+//                    if (pptFilePath != null) {
+//                        System.out.println("PPT演示文稿生成完成: " + pptFilePath);
+//                    }
 
                 } catch (Exception e) {
                     System.err.println("保存文件时出错: " + e.getMessage());