sonderau/ld-sysinfo-server-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AI fixing the SQL Limit objects on the reporting.
All checks were successful
Build & Deploy Backend / build (push) Successful in 52s
Details
Build & Deploy Backend / deploy (push) Successful in 2s
Details

Browse Source
This commit is contained in:
Bailey Taylor
2025-10-29 11:35:22 +08:00
parent afceca70d9
commit 859fc20ae8
2 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/main/java/com/psg/dlsysinfo/dl_sysinfo_server/repository/ReportingRepository.java
View File

@@ -59,38 +59,38 @@ public interface ReportingRepository extends JpaRepository<com.psg.dlsysinfo.dl_
"WHERE cdv.deviceId IN (SELECT d.deviceId FROM Devices d WHERE d.client.clientId = :clientId)") "WHERE cdv.deviceId IN (SELECT d.deviceId FROM Devices d WHERE d.client.clientId = :clientId)")
LocalDateTime findLastVulnerabilityScanDate(@Param("clientId") Long clientId); LocalDateTime findLastVulnerabilityScanDate(@Param("clientId") Long clientId);
// Top Vulnerabilities Query // Top Vulnerabilities Query - Using native SQL for LIMIT support
@Query("SELECT new com.psg.dlsysinfo.dl_sysinfo_server.dto.TopVulnerabilityDTO(" + @Query(value = "SELECT cdv.cve_id as cveId, " +
"cdv.cveId, " + "cdv.description as title, " +
"cdv.description, " + "cdv.severity as severity, " +
"cdv.severity, " + "cdv.score as score, " +
"cdv.score, " + "COUNT(DISTINCT cdv.device_id) as affectedDevices " +
"COUNT(DISTINCT cdv.deviceId)) " + "FROM cached_device_vulns cdv " +
"FROM CachedDeviceVuln cdv " + "WHERE cdv.device_id IN (SELECT d.device_id FROM devices d WHERE d.client_id = :clientId) " +
"WHERE cdv.deviceId IN (SELECT d.deviceId FROM Devices d WHERE d.client.clientId = :clientId) " + "GROUP BY cdv.cve_id, cdv.description, cdv.severity, cdv.score " +
"GROUP BY cdv.cveId, cdv.description, cdv.severity, cdv.score " +
"ORDER BY " + "ORDER BY " +
"CASE WHEN UPPER(cdv.severity) = 'CRITICAL' THEN 0 " + "CASE WHEN UPPER(cdv.severity) = 'CRITICAL' THEN 0 " +
" WHEN UPPER(cdv.severity) = 'HIGH' THEN 1 " + " WHEN UPPER(cdv.severity) = 'HIGH' THEN 1 " +
" WHEN UPPER(cdv.severity) = 'MEDIUM' THEN 2 " + " WHEN UPPER(cdv.severity) = 'MEDIUM' THEN 2 " +
" WHEN UPPER(cdv.severity) = 'LOW' THEN 3 " + " WHEN UPPER(cdv.severity) = 'LOW' THEN 3 " +
" ELSE 4 END, " + " ELSE 4 END, " +
"COUNT(DISTINCT cdv.deviceId) DESC") "COUNT(DISTINCT cdv.device_id) DESC " +
List<TopVulnerabilityDTO> findTopVulnerabilities(@Param("clientId") Long clientId, "LIMIT 20",
@Param("limit") int limit); nativeQuery = true)
List<Object[]> findTopVulnerabilitiesNative(@Param("clientId") Long clientId);
// Vulnerable Software Query // Vulnerable Software Query - Using native SQL for LIMIT support
@Query("SELECT new com.psg.dlsysinfo.dl_sysinfo_server.dto.VulnerableSoftwareDTO(" + @Query(value = "SELECT cis.software_name as softwareName, " +
"cis.softwareName, " + "COUNT(cis.id) as totalInstances, " +
"COUNT(cis.id), " + "SUM(CASE WHEN cis.total_cves > 0 THEN 1 ELSE 0 END) as vulnerableInstances, " +
"SUM(CASE WHEN cis.totalCves > 0 THEN 1 ELSE 0 END), " + "MAX(COALESCE(cis.total_cves, 0)) as totalCves " +
"MAX(COALESCE(cis.totalCves, 0))) " + "FROM cached_installed_software cis " +
"FROM CachedInstalledSoftware cis " + "WHERE cis.device_id IN (SELECT d.device_id FROM devices d WHERE d.client_id = :clientId) " +
"WHERE cis.deviceId IN (SELECT d.deviceId FROM Devices d WHERE d.client.clientId = :clientId) " + "GROUP BY cis.software_name " +
"GROUP BY cis.softwareName " + "ORDER BY (SUM(CASE WHEN cis.total_cves > 0 THEN 1 ELSE 0 END) * 1.0 / COUNT(cis.id) * MAX(COALESCE(cis.total_cves, 0))) DESC " +
"ORDER BY (SUM(CASE WHEN cis.totalCves > 0 THEN 1 ELSE 0 END) * 1.0 / COUNT(cis.id) * MAX(COALESCE(cis.totalCves, 0))) DESC") "LIMIT 20",
List<VulnerableSoftwareDTO> findVulnerableSoftware(@Param("clientId") Long clientId, nativeQuery = true)
@Param("limit") int limit); List<Object[]> findVulnerableSoftwareNative(@Param("clientId") Long clientId);
} }

26
src/main/java/com/psg/dlsysinfo/dl_sysinfo_server/service/ReportingService.java
View File

@@ -10,8 +10,11 @@ import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
@@ -62,7 +65,17 @@ public class ReportingService {
@Transactional(readOnly = true) @Transactional(readOnly = true)
public List<TopVulnerabilityDTO> getTopVulnerabilities(Long clientId) { public List<TopVulnerabilityDTO> getTopVulnerabilities(Long clientId) {
log.info("Fetching top vulnerabilities for client: {}", clientId); log.info("Fetching top vulnerabilities for client: {}", clientId);
return reportingRepository.findTopVulnerabilities(clientId, 20); List<Object[]> results = reportingRepository.findTopVulnerabilitiesNative(clientId);
return results.stream()
.map(row -> TopVulnerabilityDTO.builder()
.cveId((String) row[0])
.title((String) row[1])
.severity((String) row[2])
.score(row[3] != null ? ((Number) row[3]).doubleValue() : null)
.affectedDevices(row[4] != null ? ((Number) row[4]).longValue() : 0L)
.build())
.collect(Collectors.toList());
} }
/** /**
@@ -73,6 +86,15 @@ public class ReportingService {
@Transactional(readOnly = true) @Transactional(readOnly = true)
public List<VulnerableSoftwareDTO> getVulnerableSoftware(Long clientId) { public List<VulnerableSoftwareDTO> getVulnerableSoftware(Long clientId) {
log.info("Fetching vulnerable software for client: {}", clientId); log.info("Fetching vulnerable software for client: {}", clientId);
return reportingRepository.findVulnerableSoftware(clientId, 20); List<Object[]> results = reportingRepository.findVulnerableSoftwareNative(clientId);
return results.stream()
.map(row -> VulnerableSoftwareDTO.builder()
.softwareName((String) row[0])
.totalInstances(row[1] != null ? ((Number) row[1]).longValue() : 0L)
.vulnerableInstances(row[2] != null ? ((Number) row[2]).longValue() : 0L)
.totalCves(row[3] != null ? ((Number) row[3]).longValue() : 0L)
.build())
.collect(Collectors.toList());
} }
} }