Skip to content

Commit ffd044e

Browse files
committed
feat: add compliance report module
1 parent 5518ddc commit ffd044e

2 files changed

Lines changed: 1324 additions & 1221 deletions

File tree

backend/src/main/java/com/park/utmstack/web/rest/chart_builder/UtmVisualizationResource.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.slf4j.LoggerFactory;
2424
import org.springframework.dao.DataIntegrityViolationException;
2525
import org.springframework.data.domain.Page;
26+
import org.springframework.data.domain.PageRequest;
2627
import org.springframework.data.domain.Pageable;
2728
import org.springframework.http.HttpHeaders;
2829
import org.springframework.http.HttpStatus;
@@ -39,6 +40,7 @@
3940
import java.time.ZoneOffset;
4041
import java.util.Collections;
4142
import java.util.List;
43+
import java.util.Objects;
4244
import java.util.Optional;
4345

4446
/**
@@ -281,7 +283,8 @@ public ResponseEntity<Void> bulkDelete(@RequestParam List<Long> ids) {
281283

282284
@PostMapping("/utm-visualizations/run")
283285
public ResponseEntity<List<?>> run(@RequestBody UtmVisualization visualization,
284-
Pageable pageable,
286+
@RequestParam(value = "page", required = false) Integer page,
287+
@RequestParam(value = "size", required = false) Integer size,
285288
@RequestParam(defaultValue = "200") int top) throws UtmChartBuilderException {
286289
final String ctx = CLASSNAME + ".run";
287290
try {
@@ -291,7 +294,12 @@ public ResponseEntity<List<?>> run(@RequestBody UtmVisualization visualization,
291294
return ResponseEntity.ok(Collections.emptyList());
292295

293296
RequestDsl requestQuery = new RequestDsl(visualization);
294-
SearchResponse<ObjectNode> result = elasticsearchService.search(requestQuery.getSearchSourceBuilder(pageable, 200).build(), ObjectNode.class);
297+
SearchResponse<ObjectNode> result;
298+
if(Objects.nonNull(page) && Objects.nonNull(size)){
299+
result = elasticsearchService.search(requestQuery.getSearchSourceBuilder( PageRequest.of(page, size), top).build(), ObjectNode.class);
300+
} else {
301+
result = elasticsearchService.search(requestQuery.getSearchSourceBuilder().build(), ObjectNode.class);
302+
}
295303
ResponseParser<?> responseParser = responseParserFactory.instance(visualization.getChartType());
296304
return ResponseEntity.ok().body(responseParser.parse(visualization, result));
297305
} catch (Exception e) {

0 commit comments

Comments
 (0)