Skip to content

Commit 2d0baf9

Browse files
committed
feat: add evaluation rule and rule value to compliance evaluation DTO and service
1 parent 467ebdf commit 2d0baf9

3 files changed

Lines changed: 6 additions & 1 deletion

File tree

backend/src/main/java/com/park/utmstack/service/compliance/config/UtmComplianceControlEvaluationHistoryService.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ private List<UtmComplianceControlEvaluationHistoryDto> enrichQueries(
7373
var cfg = configMap.get(queryEval.getQueryConfigId());
7474
if (cfg != null) {
7575
queryEval.setQueryDescription(cfg.getQueryDescription());
76-
queryEval.setEvaluationRule(cfg.getEvaluationRule().name());
7776
queryEval.setIndexPatternId(cfg.getIndexPattern().getId());
7877
queryEval.setIndexPatternName(cfg.getIndexPattern().getPattern());
7978
}

backend/src/main/java/com/park/utmstack/service/dto/compliance/UtmComplianceQueryEvaluationDto.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public class UtmComplianceQueryEvaluationDto {
1414
private String queryName;
1515
private String queryDescription;
1616
private String evaluationRule;
17+
private Integer ruleValue;
1718
private Long indexPatternId;
1819
private String indexPatternName;
1920
private Integer hits;

backend/src/main/java/com/park/utmstack/service/mapper/compliance/UtmComplianceControlEvaluationHistoryMapper.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ private static UtmComplianceQueryEvaluationDto mapQueryEval(Map<String, Object>
3434

3535
dto.setQueryConfigId(((Number) src.get("queryConfigId")).longValue());
3636
dto.setQueryName((String) src.get("queryName"));
37+
dto.setEvaluationRule((String) src.get("evaluationRule"));
38+
39+
Object raw = src.get("ruleValue");
40+
dto.setRuleValue(raw instanceof Number ? ((Number) raw).intValue() : null);
41+
3742
dto.setHits(((Number) src.get("hits")).intValue());
3843
dto.setStatus((String) src.get("status"));
3944
dto.setEvidence((List<Map<String, Object>>) src.get("evidence"));

0 commit comments

Comments
 (0)