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 4a302deb..7c1beb5c 100644 --- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java +++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java @@ -26,7 +26,7 @@ public class DataEaseController extends Controller { DataEaseModel dm = new DataEaseModel(); ResourceModel rm = new ResourceModel(); BaseModel bm = new BaseModel(); - + String tempDir = System.getProperty("java.io.tmpdir"); // http://10.10.21.20:9000/dsBase/dataease/route?city_name=昆明市 // http://10.10.21.20:9000/dsBase/dataease/route?city_name=楚雄彝族自治州 // http://10.10.21.20:9000/dsBase/dataease/route?city_name=西双版纳傣族自治州 @@ -141,9 +141,10 @@ public class DataEaseController extends Controller { Record record = dm.getDataSetById(id); String tableName = record.getStr("table_name"); String dataSetName = record.getStr("dataset_name"); - String tempDir = System.getProperty("java.io.tmpdir"); //导出excel - dm.exportExcel(identity_id, tableName, dataSetName, tempDir, area_name); + String excelFileName = dm.exportExcel(identity_id, tableName, dataSetName, tempDir, area_name); + //renderFile + renderFile(excelFileName, "【" + area_name + "】" + dataSetName + "." + "xlsx"); } /** 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 8614bd79..2f4d684a 100644 --- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java +++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java @@ -13,6 +13,7 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import java.util.UUID; public class DataEaseModel { @@ -344,20 +345,17 @@ public class DataEaseModel { * @param area_name * @throws IOException */ - public void exportExcel(int identity_id, String tableName, String dataSetName, String exportPath, String area_name) throws IOException { + public String exportExcel(int identity_id, String tableName, String dataSetName, String exportPath, String area_name) throws IOException { //对此表中的数据进行直接导出EXCEL String sql = "select * from `" + tableName + "`"; if (identity_id > 1) { sql = sql + "where `行政区划`='" + area_name + "'"; } List tableData = Db.use(DataEaseModel.DB_NAME).find(sql); - String excelFileName = "【" + area_name + "】" + dataSetName + ".xlsx"; + String excelFileName = UUID.randomUUID().toString().toUpperCase() + ".xlsx"; String filePath = exportPath + excelFileName; - if (new File(filePath).exists()) { - //删除 - new File(filePath).delete(); - } //导出 ExcelCommonUtil.writeExcel(tableData, filePath, true); + return excelFileName; } }