diff --git a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java index f38c7a22..4a302deb 100644 --- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java +++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java @@ -19,6 +19,7 @@ import io.github.yedaxia.apidocs.ApiDoc; import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import java.io.IOException; import java.util.List; public class DataEaseController extends Controller { @@ -128,7 +129,7 @@ public class DataEaseController extends Controller { @Before(GET.class) @IsLoginInterface({}) @IsNumericInterface({"id"}) - public void downloadExcel(int id) { + public void downloadExcel(int id) throws IOException { //根据当前登录人员的身份,获取对应的数据集名称 int identity_id = Integer.parseInt(CookieUtil.getValue(getRequest(), "identity_id")); String person_id = CookieUtil.getValue(getRequest(), "person_id"); @@ -138,18 +139,11 @@ public class DataEaseController extends Controller { //根据区域码,获取区域名称 String area_name = rm.getAreaName(area_code); Record record = dm.getDataSetById(id); - String table_name = record.getStr("table_name"); + String tableName = record.getStr("table_name"); String dataSetName = record.getStr("dataset_name"); - - switch (identity_id) { - case 1: - break; - case 2: - break; - case 3: - break; - } - + String tempDir = System.getProperty("java.io.tmpdir"); + //导出excel + dm.exportExcel(identity_id, tableName, dataSetName, tempDir, area_name); } /** diff --git a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java index d17590f5..8614bd79 100644 --- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java +++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java @@ -1,6 +1,7 @@ package com.dsideal.base.DataEase.Model; import com.dsideal.base.Util.ExcelCommonUtil; +import com.dsideal.base.Util.FileUtil; import com.jfinal.kit.Kv; import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.Record; @@ -8,6 +9,7 @@ import com.jfinal.plugin.activerecord.SqlPara; import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -334,6 +336,7 @@ public class DataEaseModel { /** * 导出Excel + * * @param identity_id * @param tableName * @param dataSetName @@ -349,6 +352,12 @@ public class DataEaseModel { } List tableData = Db.use(DataEaseModel.DB_NAME).find(sql); String excelFileName = "【" + area_name + "】" + dataSetName + ".xlsx"; - ExcelCommonUtil.writeExcel(tableData, exportPath + "/" + excelFileName, true); + String filePath = exportPath + excelFileName; + if (new File(filePath).exists()) { + //删除 + new File(filePath).delete(); + } + //导出 + ExcelCommonUtil.writeExcel(tableData, filePath, true); } }