Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Fixed issue that file couldn't be donwloaded on deployment. CSV is zipped now.

Michael Rademaker49d9fa13716b
diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java
index b9133bca4..35b9d5cb1 100644
--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java
@@ -44,12 +44,17 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level;
import java.util.logging.Logger;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
import static org.openremote.model.value.Values.JSON;
@@ -176,19 +181,21 @@ public class AssetDatapointResourceImpl extends ManagerWebResource implements As
try {
exportFile = exportFuture.get();
- response.setContentType(MediaType.APPLICATION_OCTET_STREAM);
- response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + exportFile.getName());
- OutputStream out = response.getOutputStream();
- FileInputStream in = new FileInputStream(exportFile);
- IOUtils.copy(in, out);
- out.close();
- in.close();
+ ZipOutputStream zipOut = new ZipOutputStream(response.getOutputStream());
+ FileInputStream fin = new FileInputStream(exportFile);
+ ZipEntry zipEntry = new ZipEntry(exportFile.getName());
+ zipOut.putNextEntry(zipEntry);
+ IOUtils.copy(fin, zipOut);
+ zipOut.closeEntry();
+ zipOut.close();
+ fin.close();
+
+ response.setContentType("application/zip");
+ response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"dataexport.zip\"");
asyncResponse.resume(
- Response.ok(exportFile)
- .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"dataexport.csv\"" )
- .build()
+ response
);
} catch (Exception ex) {
exportFuture.cancel(true);
diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java
index e96c00be4..de6bc51ef 100644
--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java
+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java
@@ -56,7 +56,7 @@ public class AssetDatapointService extends AbstractDatapointService<AssetDatapoi
public static final String DATA_POINTS_MAX_AGE_DAYS = "DATA_POINTS_MAX_AGE_DAYS";
public static final int DATA_POINTS_MAX_AGE_DAYS_DEFAULT = 31;
public static final String DATA_POINTS_EXPORT_DIR = "DATA_POINTS_EXPORT_DIR";
- public static final String DATA_POINTS_EXPORT_DIR_DEFAULT = "profile/tmp";
+ public static final String DATA_POINTS_EXPORT_DIR_DEFAULT = "/tmp";
private static final Logger LOG = Logger.getLogger(AssetDatapointService.class.getName());
protected int maxDatapointAgeDays;
protected Path exportPath;
diff --git a/model/src/main/java/org/openremote/model/datapoint/AssetDatapointResource.java b/model/src/main/java/org/openremote/model/datapoint/AssetDatapointResource.java
index 9107e43b9..6ef042c4d 100644
--- a/model/src/main/java/org/openremote/model/datapoint/AssetDatapointResource.java
+++ b/model/src/main/java/org/openremote/model/datapoint/AssetDatapointResource.java
@@ -62,7 +62,7 @@ public interface AssetDatapointResource {
@GET
@Path("export")
- @Produces("text/csv")
+ @Produces("application/zip")
@RolesAllowed({Constants.READ_ASSETS_ROLE})
void getDatapointExport(@Suspended AsyncResponse asyncResponse,
@QueryParam("attributeRefs") String attributeRefsString,
diff --git a/ui/app/manager/src/pages/page-export.ts b/ui/app/manager/src/pages/page-export.ts
index 725f4361e..41ae691b0 100644
--- a/ui/app/manager/src/pages/page-export.ts
+++ b/ui/app/manager/src/pages/page-export.ts
@@ -369,7 +369,7 @@ class PageExport<S extends AppStateKeyed> extends Page<S> {
const url = window.URL.createObjectURL(new Blob([response.data]));
const link = document.createElement('a');
link.href = url;
- link.setAttribute("download", "dataexport.csv");
+ link.setAttribute("download", "dataexport.zip");
document.body.appendChild(link);
link.click();
});