diff --git a/WebRoot/upload/985dbb6c-8b37-4330-a821-589b57475e08.xlsx b/WebRoot/upload/985dbb6c-8b37-4330-a821-589b57475e08.xlsx new file mode 100644 index 00000000..d0fea2a2 Binary files /dev/null and b/WebRoot/upload/985dbb6c-8b37-4330-a821-589b57475e08.xlsx differ diff --git a/src/main/java/UnitTest/getUndertowPath.java b/src/main/java/UnitTest/getUndertowPath.java new file mode 100644 index 00000000..17043716 --- /dev/null +++ b/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 { + } +} diff --git a/src/main/java/com/dsideal/QingLong/MaxKB/Controller/MaxKbController.java b/src/main/java/com/dsideal/QingLong/MaxKB/Controller/MaxKbController.java index 1266cc83..93ece04f 100644 --- a/src/main/java/com/dsideal/QingLong/MaxKB/Controller/MaxKbController.java +++ b/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 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); } } diff --git a/src/main/java/com/dsideal/QingLong/Util/CommonUtil.java b/src/main/java/com/dsideal/QingLong/Util/CommonUtil.java index fe214b2e..049b1463 100644 --- a/src/main/java/com/dsideal/QingLong/Util/CommonUtil.java +++ b/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 * diff --git a/src/main/java/com/dsideal/QingLong/YunXiao/Controller/YunXiaoController.java b/src/main/java/com/dsideal/QingLong/YunXiao/Controller/YunXiaoController.java index 6bd0e520..d911c70a 100644 --- a/src/main/java/com/dsideal/QingLong/YunXiao/Controller/YunXiaoController.java +++ b/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; @@ -86,8 +88,8 @@ public class YunXiaoController extends Controller { */ @Before({POST.class}) @IsLoginInterface({}) - @EmptyInterface({"lesson_id","organization_name","teacher_name"}) - public void saveLessonMatchSchoolName(String lesson_id, String organization_name,String teacher_name) { + @EmptyInterface({"lesson_id", "organization_name", "teacher_name"}) + public void saveLessonMatchSchoolName(String lesson_id, String organization_name, String teacher_name) { //1、获取标准名称的单位，它的单位代码，隶属的区县等信息 Record record = ym.getBzSchoolByName(organization_name); if (record == null) { @@ -97,7 +99,7 @@ public class YunXiaoController extends Controller { String organization_no = record.getStr("organization_no"); String gather_regionc = record.getStr("gather_regionc"); //2、将关系表中，课程id为lesson_id的单位名称修改为organization_name - ym.saveLessonMatchSchoolName(lesson_id, organization_name,teacher_name, organization_no, gather_regionc); + ym.saveLessonMatchSchoolName(lesson_id, organization_name, teacher_name, organization_no, gather_regionc); renderJson(CommonUtil.returnMessageJson(true, "修改成功！")); } @@ -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 list1 = ym.LessonConstructionInfoByStageSubject(); List list2 = ym.LessonConstructionInfoByStageSubjectBook(); List 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 list1 = ym.LessonConstructionInfoByXzqh(); List list2 = ym.LessonConstructionInfoByXzqhStage(); List list3 = ym.LessonConstructionInfoByXzqhSchool(); List 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); } /** diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index fcbe4a14..f63ae536 100644 --- a/src/main/resources/application.properties +++ b/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