'commit'

src/main/java/UnitTest/getUndertowPath.java

@@ -0,0 +1,16 @@
+package UnitTest;
+
+import com.jfinal.kit.PathKit;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Properties;
+
+public class getUndertowPath {
+
+
+    public static void main(String[] args) throws IOException {
+    }
+}

src/main/java/com/dsideal/QingLong/MaxKB/Controller/MaxKbController.java

@@ -113,16 +113,20 @@ public class MaxKbController extends Controller {
     public void exportExcel(String gather_regionc) {
         List<Record> list = mkm.SchoolClassStudentTeacherList(gather_regionc);
         ExportExcelUtil exporter = new ExportExcelUtil();
-        //获取系统临时目录
-        String tmpDir = System.getProperty("java.io.tmpdir");
+
         //使用guid生成一个临时文件名，然后拼接到tmpDir后面，生成完整的临时文件路径
-        String tmpFile = tmpDir + File.separator + UUID.randomUUID().toString() + ".xlsx";
-        exporter.exportToExcel(tmpFile, list);
-        //提供下载
-        String fileName = "统计报表.xlsx";
-        if(!StrKit.isBlank(gather_regionc)){
-            fileName = gather_regionc + fileName;
+        if (!new File(CommonUtil.webUploadPath).exists()) {
+            //创建目录
+            new File(CommonUtil.webUploadPath).mkdirs();
         }
-        renderFile(new File(tmpFile), fileName);
+        String fileName = UUID.randomUUID() + ".xlsx";
+        String tmpFile = CommonUtil.webUploadPath + fileName;
+        exporter.exportToExcel(tmpFile, list);
+        //提供文件路径
+        Kv kv = Kv.create();
+        kv.set("success", true);
+        kv.set("message", "生成成功！");
+        kv.set("url", "/QingLong/upload/" + fileName);
+        renderJson(kv);
     }
 }

src/main/java/com/dsideal/QingLong/Util/CommonUtil.java

@@ -36,6 +36,9 @@ public class CommonUtil {
 
     public static String WebRoot;
 
+    //文件上传路径
+    public static String webUploadPath = CommonUtil.WebRoot + File.separator + "upload" + File.separator;
+
     /**
      * 功能：将jsonObject转换为Record
      *

src/main/java/com/dsideal/QingLong/YunXiao/Controller/YunXiaoController.java

@@ -3,6 +3,7 @@ package com.dsideal.QingLong.YunXiao.Controller;
 import com.dsideal.QingLong.Interceptor.EmptyInterface;
 import com.dsideal.QingLong.Interceptor.IsLoginInterface;
 import com.dsideal.QingLong.Render.ImageRender;
+import com.dsideal.QingLong.Util.AsposeUtil;
 import com.dsideal.QingLong.Util.CommonUtil;
 import com.dsideal.QingLong.YunXiao.Model.YunXiaoModel;
 import com.dsideal.QingLong.YunXiao.Util.YunXiaoExportExcelUtil;
@@ -11,6 +12,7 @@ import com.jfinal.aop.Before;
 import com.jfinal.core.Controller;
 import com.jfinal.ext.interceptor.GET;
 import com.jfinal.ext.interceptor.POST;
+import com.jfinal.kit.Kv;
 import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.Record;
 
@@ -107,40 +109,55 @@ public class YunXiaoController extends Controller {
      */
     // http://10.10.21.20:9000/QingLong/yx/LessonConstructionExportExcel
     @Before(GET.class)
-    public void LessonConstructionExportExcel() {
+    public void LessonConstructionExportExcel() throws Exception {
         List<Record> list1 = ym.LessonConstructionInfoByStageSubject();
         List<Record> list2 = ym.LessonConstructionInfoByStageSubjectBook();
         List<Record> list3 = ym.previewRank();
 
         YunXiaoExportExcelUtil exporter = new YunXiaoExportExcelUtil();
-        //获取系统临时目录
-        String tmpDir = System.getProperty("java.io.tmpdir");
         //使用guid生成一个临时文件名，然后拼接到tmpDir后面，生成完整的临时文件路径
-        String tmpFile = tmpDir + UUID.randomUUID() + ".xlsx";
+        if (!new File(CommonUtil.webUploadPath).exists()) {
+            //创建目录
+            new File(CommonUtil.webUploadPath).mkdirs();
+        }
+        String fileName = UUID.randomUUID() + ".xlsx";
+        String tmpFile = CommonUtil.webUploadPath + fileName;
         exporter.LessonConstructionExportExcel(tmpFile, list1, list2, list3);
-        //提供下载
-        renderFile(new File(tmpFile), "课程建设情况报表.xlsx");
+
+        //提供文件路径
+        Kv kv = Kv.create();
+        kv.set("success", true);
+        kv.set("message", "生成成功！");
+        kv.set("url", "/QingLong/upload/" + fileName);
+        renderJson(kv);
     }
 
     /**
      * 区域、学校提供课程的统计情况
      */
     // http://10.10.21.20:9000/QingLong/yx/LessonConstructionInfoByXzqhSchool
+    // http://10.10.21.20:9000/QingLong/yx/LessonConstructionInfoByXzqhSchool?type_id=1
     @Before(GET.class)
-    public void LessonConstructionInfoByXzqhSchool() {
+    public void LessonConstructionInfoByXzqhSchool(int type_id) throws Exception {
         List<Record> list1 = ym.LessonConstructionInfoByXzqh();
         List<Record> list2 = ym.LessonConstructionInfoByXzqhStage();
         List<Record> list3 = ym.LessonConstructionInfoByXzqhSchool();
         List<Record> list4 = ym.LessonConstructionInfo();
-
         YunXiaoExportExcelUtil exporter = new YunXiaoExportExcelUtil();
-        //获取系统临时目录
-        String tmpDir = System.getProperty("java.io.tmpdir");
         //使用guid生成一个临时文件名，然后拼接到tmpDir后面，生成完整的临时文件路径
-        String tmpFile = tmpDir + UUID.randomUUID() + ".xlsx";
+        if (!new File(CommonUtil.webUploadPath).exists()) {
+            //创建目录
+            new File(CommonUtil.webUploadPath).mkdirs();
+        }
+        String fileName = UUID.randomUUID() + ".xlsx";
+        String tmpFile = CommonUtil.webUploadPath + fileName;
         exporter.LessonConstructionInfoByXzqhSchool(tmpFile, list1, list2, list3, list4);
-        //提供下载
-        renderFile(new File(tmpFile), "【区域+学校】课程建设情况报表.xlsx");
+        //提供文件路径
+        Kv kv = Kv.create();
+        kv.set("success", true);
+        kv.set("message", "生成成功！");
+        kv.set("url", "/QingLong/upload/" + fileName);
+        renderJson(kv);
     }
 
     /**

src/main/resources/application.properties

@@ -22,9 +22,6 @@ MaxKB_modelName=DeepSeek
 redis_ip=10.10.14.14
 redis_port=18890
 
-# 接入系统的REDIS缓存主键键值
-SYS_JRXT=SYS_JRXT
-
 #TjThread
 TjThread=1