feat: update log export

XiaoMi · Jul 3, 2023 · 50b8b8b · 50b8b8b
1 parent 4aac83b
commit 50b8b8b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/...og/log-manager/src/main/java/com/xiaomi/mone/log/manager/controller/EsDataController.java b/...og/log-manager/src/main/java/com/xiaomi/mone/log/manager/controller/EsDataController.java
@@ -44,11 +44,12 @@ public Boolean createIndex(@RequestParam(value = "templateName") String template
 
     @RequestMapping(path = "/log/export", method = "get")
     public void logExport(@RequestParam(value = "logstore") String logstore,
+                          @RequestParam(value = "storeId") Long storeId,
                           @RequestParam(value = "tail") String tail,
                           @RequestParam(value = "startTime") Long startTime,
                           @RequestParam(value = "endTime") Long endTime,
                           @RequestParam(value = "fullTextSearch") String fullTextSearch) throws Exception {
-        LogQuery logQuery = new LogQuery(logstore, tail, startTime, endTime, fullTextSearch, "timestamp");
+        LogQuery logQuery = new LogQuery(logstore, storeId, tail, startTime, endTime, fullTextSearch, "timestamp");
         esDataService.logExport(logQuery);
     }
 
@@ -190,7 +191,7 @@ public void showLogCountCache() throws IOException {
     @RequestMapping(path = "/log/save/list", method = "get")
     public Result<List<SearchSaveDTO>> searchSavelList(@RequestParam(value = "storeId") Long storeId,
                                                        @RequestParam(value = "sort") Integer sort) {
-        return searchSaveService.list(storeId,sort);
+        return searchSaveService.list(storeId, sort);
     }
 
     /**

diff --git a/...-all/hera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/domain/SearchLog.java b/...-all/hera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/domain/SearchLog.java
@@ -290,6 +290,8 @@ public void downLogFile(HSSFWorkbook excel, String fileName) throws IOException
             fos = new FileOutputStream(file);
             excel.write(fos);
             Down.down(fileName);
+        } catch (Exception e) {
+            log.error("downLogFile error,fileName:{}", fileName, e);
         } finally {
             if (excel != null) {
                 excel.close();

diff --git a/...all/hera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/model/vo/LogQuery.java b/...all/hera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/model/vo/LogQuery.java
@@ -25,8 +25,9 @@ public class LogQuery implements Serializable {
     public LogQuery() {
     }
 
-    public LogQuery(String logstore, String tail, Long startTime, Long endTime, String fullTextSearch, String sortKey) {
+    public LogQuery(String logstore, Long storeId, String tail, Long startTime, Long endTime, String fullTextSearch, String sortKey) {
         this.logstore = logstore;
+        this.storeId = storeId;
         this.tail = tail;
         this.startTime = startTime;
         this.endTime = endTime;