Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Alert define export tags combine #1506

Merged
merged 3 commits into from
Jan 21, 2024
Merged

Alert define export tags combine #1506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
430be7d
Alert define export tags combine
yqxxgh Jan 20, 2024
3b26641
Alert define add export and import function web
yqxxgh Jan 20, 2024
afb8f54
Merge branch 'master' into alert-tag-export
a-little-fool Jan 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
144 changes: 54 additions & 90 deletions ...in/java/org/dromara/hertzbeat/alert/service/impl/AlertDefineExcelImExportServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.dromara.hertzbeat.alert.service.impl;

import com.fasterxml.jackson.core.type.TypeReference;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.ss.util.RegionUtil;
import org.dromara.hertzbeat.common.entity.manager.TagItem;
import org.dromara.hertzbeat.common.util.JsonUtil;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

Expand Down Expand Up @@ -61,45 +61,19 @@ public String getFileName() {
List<ExportAlertDefineDTO> parseImport(InputStream is) {
try (Workbook workbook = WorkbookFactory.create(is)) {
Sheet sheet = workbook.getSheetAt(0);

List<ExportAlertDefineDTO> alertDefines = new ArrayList<>();
List<Integer> startRowList = new ArrayList<>();

for (Row row : sheet) {
if (row.getRowNum() == 0) {
continue;
}
String app = getCellValueAsString(row.getCell(0));
if (StringUtils.hasText(app)) {
startRowList.add(row.getRowNum());
AlertDefineDTO alertDefineDTO = extractAlertDefineDataFromRow(row);
ExportAlertDefineDTO exportAlertDefineDTO = new ExportAlertDefineDTO();
exportAlertDefineDTO.setAlertDefine(alertDefineDTO);
alertDefines.add(exportAlertDefineDTO);
}
}

List<List<TagItem>> tagsList = new ArrayList<>();
for (int i = 0; i < startRowList.size(); i++) {
int startRowIndex = startRowList.get(i);
int endRowIndex = (i + 1 < startRowList.size() ? startRowList.get(i + 1) : sheet.getLastRowNum() + 1);
List<TagItem> tags = new ArrayList<>();

for (int j = startRowIndex; j < endRowIndex; j++) {
Row row = sheet.getRow(j);
if (row == null) {
continue;
}
TagItem tagItem = extractTagDataFromRow(row);
if (tagItem != null) {
tags.add(tagItem);
}
}
tagsList.add(tags);
}
for (int i = 0; i < alertDefines.size(); i++) {
alertDefines.get(i).getAlertDefine().setTags(tagsList.get(i));
}
return alertDefines;
} catch (IOException e) {
throw new RuntimeException("Failed to parse alertDefine data", e);
Expand All @@ -117,6 +91,14 @@ private TagItem extractTagDataFromRow(Row row) {
return null;
}

private List<TagItem> extractTagDataFromRow(Cell cell) {
String jsonStr = getCellValueAsString(cell);
if (StringUtils.hasText(jsonStr)) {
return JsonUtil.fromJson(jsonStr, new TypeReference<List<TagItem>>() {});
}
return null;
}


private String getCellValueAsString(Cell cell) {
if (cell == null) {
Expand Down Expand Up @@ -168,18 +150,17 @@ private Byte getCellValueAsByte(Cell cell) {

private AlertDefineDTO extractAlertDefineDataFromRow(Row row) {
AlertDefineDTO alertDefineDTO = new AlertDefineDTO();

alertDefineDTO.setApp(getCellValueAsString(row.getCell(0)));
alertDefineDTO.setMetric(getCellValueAsString(row.getCell(1)));
alertDefineDTO.setField(getCellValueAsString(row.getCell(2)));
alertDefineDTO.setPreset(getCellValueAsBoolean(row.getCell(3)));
alertDefineDTO.setExpr(getCellValueAsString(row.getCell(4)));
alertDefineDTO.setPriority(getCellValueAsByte(row.getCell(5)));
alertDefineDTO.setTimes(getCellValueAsInteger(row.getCell(6)));
alertDefineDTO.setEnable(getCellValueAsBoolean(row.getCell(9)));
alertDefineDTO.setRecoverNotice(getCellValueAsBoolean(row.getCell(10)));
alertDefineDTO.setTemplate(getCellValueAsString(row.getCell(11)));

alertDefineDTO.setTags(extractTagDataFromRow(row.getCell(7)));
alertDefineDTO.setEnable(getCellValueAsBoolean(row.getCell(8)));
alertDefineDTO.setRecoverNotice(getCellValueAsBoolean(row.getCell(9)));
alertDefineDTO.setTemplate(getCellValueAsString(row.getCell(10)));
return alertDefineDTO;
}

Expand Down Expand Up @@ -210,7 +191,7 @@ void writeOs(List<ExportAlertDefineDTO> exportAlertDefineList, OutputStream os)
CellStyle cellStyle = workbook.createCellStyle();
cellStyle.setAlignment(HorizontalAlignment.CENTER);
// 设置表头
String[] headers = {"app", "metric", "field", "preset", "expr", "priority", "times", "name", "value",
String[] headers = {"app", "metric", "field", "preset", "expr", "priority", "times", "tags",
"enable", "recoverNotice", "template"};
Row headerRow = sheet.createRow(0);
for (int i = 0; i < headers.length; i++) {
Expand All @@ -224,64 +205,47 @@ void writeOs(List<ExportAlertDefineDTO> exportAlertDefineList, OutputStream os)
for (ExportAlertDefineDTO alertDefine : exportAlertDefineList) {
// 获取阀值规则信息
AlertDefineDTO alertDefineDTO = alertDefine.getAlertDefine();
// 阀值规则信息一行中
Row row = sheet.createRow(rowIndex++);
// 阀值规则信息只需要写一次
Cell appCell = row.createCell(0);
appCell.setCellValue(alertDefineDTO.getApp());
appCell.setCellStyle(cellStyle);
Cell metricCell = row.createCell(1);
metricCell.setCellValue(alertDefineDTO.getMetric());
metricCell.setCellStyle(cellStyle);
Cell fieldCell = row.createCell(2);
fieldCell.setCellValue(alertDefineDTO.getField());
fieldCell.setCellStyle(cellStyle);
Cell presetCell = row.createCell(3);
presetCell.setCellValue(alertDefineDTO.getPreset() != null
&& alertDefineDTO.getPreset());
presetCell.setCellStyle(cellStyle);
Cell exprCell = row.createCell(4);
exprCell.setCellValue(alertDefineDTO.getExpr());
exprCell.setCellStyle(cellStyle);
Cell priorityCell = row.createCell(5);
priorityCell.setCellValue(alertDefineDTO.getPriority());
priorityCell.setCellStyle(cellStyle);
Cell timesCell = row.createCell(6);
timesCell.setCellValue(alertDefineDTO.getTimes());
Cell tagCell = row.createCell(7);
// 获取标签信息
List<TagItem> tagList = alertDefineDTO.getTags();
int size = tagList == null ? 0 : tagList.size();
// 将阀值规则信息和标签信息合并到一行中
for (int i = 0; i < Math.max(size, 1); i++) {
Row row = sheet.createRow(rowIndex++);
if (i == 0) {
// 阀值规则信息只需要写一次
Cell appCell = row.createCell(0);
appCell.setCellValue(alertDefineDTO.getApp());
appCell.setCellStyle(cellStyle);
Cell metricCell = row.createCell(1);
metricCell.setCellValue(alertDefineDTO.getMetric());
metricCell.setCellStyle(cellStyle);
Cell fieldCell = row.createCell(2);
fieldCell.setCellValue(alertDefineDTO.getField());
fieldCell.setCellStyle(cellStyle);
Cell presetCell = row.createCell(3);
presetCell.setCellValue(alertDefineDTO.getPreset() != null
&& alertDefineDTO.getPreset());
presetCell.setCellStyle(cellStyle);
Cell exprCell = row.createCell(4);
exprCell.setCellValue(alertDefineDTO.getExpr());
exprCell.setCellStyle(cellStyle);
Cell priorityCell = row.createCell(5);
priorityCell.setCellValue(alertDefineDTO.getPriority());
priorityCell.setCellStyle(cellStyle);
Cell timesCell = row.createCell(6);
timesCell.setCellValue(alertDefineDTO.getTimes());
timesCell.setCellStyle(cellStyle);
Cell enableCell = row.createCell(9);
enableCell.setCellValue(alertDefineDTO.getEnable() != null
&& alertDefineDTO.getEnable());
enableCell.setCellStyle(cellStyle);
Cell recoverNoticeCell = row.createCell(10);
recoverNoticeCell.setCellValue(alertDefineDTO.getRecoverNotice() != null
&& alertDefineDTO.getRecoverNotice());
recoverNoticeCell.setCellStyle(cellStyle);
Cell templateCell = row.createCell(11);
templateCell.setCellValue(alertDefineDTO.getTemplate());
recoverNoticeCell.setCellStyle(cellStyle);
}
if (i < size) {
TagItem tagItem = tagList.get(i);
Cell nameCell = row.createCell(7);
nameCell.setCellValue(tagItem.getName());
nameCell.setCellStyle(cellStyle);
Cell valueCell = row.createCell(8);
valueCell.setCellValue(tagItem.getValue());
valueCell.setCellStyle(cellStyle);
}
}
if (null != tagList && !tagList.isEmpty()) {
RegionUtil.setBorderTop(BorderStyle.THICK, new CellRangeAddress(rowIndex - tagList.size(), rowIndex - 1, 0, 10), sheet);
RegionUtil.setBorderBottom(BorderStyle.THICK, new CellRangeAddress(rowIndex - tagList.size(), rowIndex - 1, 0, 10), sheet);
RegionUtil.setBorderLeft(BorderStyle.THICK, new CellRangeAddress(rowIndex - tagList.size(), rowIndex - 1, 0, 10), sheet);
RegionUtil.setBorderRight(BorderStyle.THICK, new CellRangeAddress(rowIndex - tagList.size(), rowIndex - 1, 0, 10), sheet);
}
String tagValue = tagList == null || tagList.size() == 0 ? "" : JsonUtil.toJson(tagList);
tagCell.setCellValue(tagValue);
tagCell.setCellStyle(cellStyle);
Cell enableCell = row.createCell(8);
enableCell.setCellValue(alertDefineDTO.getEnable() != null
&& alertDefineDTO.getEnable());
enableCell.setCellStyle(cellStyle);
Cell recoverNoticeCell = row.createCell(9);
recoverNoticeCell.setCellValue(alertDefineDTO.getRecoverNotice() != null
&& alertDefineDTO.getRecoverNotice());
recoverNoticeCell.setCellStyle(cellStyle);
Cell templateCell = row.createCell(10);
templateCell.setCellValue(alertDefineDTO.getTemplate());
recoverNoticeCell.setCellStyle(cellStyle);
}
workbook.write(os);
os.close();
Expand Down
14 changes: 14 additions & 0 deletions common/src/test/java/org/dromara/hertzbeat/common/util/JsonUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
package org.dromara.hertzbeat.common.util;

import com.fasterxml.jackson.core.type.TypeReference;
import org.dromara.hertzbeat.common.entity.manager.TagItem;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import java.util.ArrayList;
import java.util.List;

/**
* Test case for {@link JsonUtil}
*/
Expand All @@ -14,6 +19,11 @@ void setUp() {

@Test
void toJson() {
List<TagItem> tagList = new ArrayList<>(4);
TagItem proTag = new TagItem("test", "pro");
tagList.add(proTag);
tagList.add(new TagItem("test", "dev"));
System.out.println(JsonUtil.toJson(tagList));
}

@Test
Expand All @@ -22,6 +32,10 @@ void fromJson() {

@Test
void testFromJson() {
String jsonStr = "[{\"name\":\"test\",\"value\":\"pro\"},{\"name\":\"test\",\"value\":\"dev\"}]";
List<TagItem> tagItems = JsonUtil.fromJson(jsonStr, new TypeReference<List<TagItem>>() {
});
System.out.println(tagItems);
}

@Test
Expand Down
Loading