统一全系统资源加载、轻量趋势与缓存恢复
This commit is contained in:
@@ -5,6 +5,7 @@ import cn.yunsheng.quality.identity.AppUserPrincipal;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.security.MessageDigest;
|
||||
import java.util.HexFormat;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
@@ -26,14 +27,25 @@ public class WorkspaceStateController {
|
||||
var policy = jdbc.queryForList("SELECT detail_allowed,evidence_allowed,original_download_allowed,CAST(allowed_fields AS CHAR) AS allowed_fields,valid_until,inherit_department_children,row_version FROM user_access_policy WHERE user_id=?", actor.getId().toString());
|
||||
String auth = digest(List.of(actor.getId(), actor.getRoleCodes().stream().sorted().toList(),
|
||||
actor.getDepartments().stream().sorted().toList(), actor.getGroups().stream().sorted().toList(), policy));
|
||||
var currentRelease = jdbc.queryForList("SELECT * FROM current_release ORDER BY dataset_id");
|
||||
String currentReleaseId = currentRelease.stream()
|
||||
.filter(row -> "quality".equals(String.valueOf(row.get("dataset_id"))))
|
||||
.map(row -> row.get("release_id"))
|
||||
.filter(java.util.Objects::nonNull)
|
||||
.map(String::valueOf)
|
||||
.findFirst().orElse(null);
|
||||
String data = digest(List.of(
|
||||
jdbc.queryForList("SELECT * FROM current_release ORDER BY dataset_id"),
|
||||
currentRelease,
|
||||
jdbc.queryForList("SELECT * FROM platform_metadata ORDER BY metadata_key"),
|
||||
jdbc.queryForList("SELECT id,row_version FROM target_version WHERE status='ACTIVE' ORDER BY id"),
|
||||
jdbc.queryForList("SELECT * FROM query_filter_field ORDER BY field_key"),
|
||||
jdbc.queryForList("SELECT id,row_version FROM service_identity ORDER BY id"),
|
||||
jdbc.queryForList("SELECT * FROM service_binding ORDER BY service_type")));
|
||||
return Map.of("authRevision", auth, "dataRevision", data);
|
||||
Map<String, String> result = new LinkedHashMap<>();
|
||||
result.put("authRevision", auth);
|
||||
result.put("dataRevision", data);
|
||||
result.put("currentReleaseId", currentReleaseId);
|
||||
return result;
|
||||
}
|
||||
private static String digest(Object value) {
|
||||
try { return HexFormat.of().formatHex(MessageDigest.getInstance("SHA-256").digest(value.toString().getBytes(StandardCharsets.UTF_8))); }
|
||||
|
||||
@@ -76,6 +76,37 @@ public class MetricsController {
|
||||
extraFilters, exclusions, columnFilters, stage, actor);
|
||||
}
|
||||
|
||||
/** 轻量趋势接口:查询参数与正式指标接口一致,但只返回版本、上下文、趋势和覆盖信息。 */
|
||||
@GetMapping("/trend")
|
||||
@PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')")
|
||||
public MetricsService.MetricTrendSnapshot trendHttp(@RequestParam(required = false) Integer year,
|
||||
@RequestParam(required = false) Integer month,
|
||||
@RequestParam(required = false) Integer monthStart,
|
||||
@RequestParam(required = false) Integer monthEnd,
|
||||
@RequestParam(required = false) String quarter,
|
||||
@RequestParam(required = false) String department,
|
||||
@RequestParam(required = false) String group,
|
||||
@RequestParam(required = false) String product,
|
||||
@RequestParam(required = false) String productSearch,
|
||||
@RequestParam(required = false) String projectGroup,
|
||||
@RequestParam(defaultValue = "overall") String view,
|
||||
@RequestParam(defaultValue = "true") boolean includeUnassigned,
|
||||
@RequestParam(required = false) String releaseId,
|
||||
@RequestParam(defaultValue = "month") String trendGranularity,
|
||||
@RequestParam(required = false) String extraFilters,
|
||||
@RequestParam(required = false) String exclusions,
|
||||
@RequestParam(required = false) String columnFilters,
|
||||
@RequestParam(required = false) String stage,
|
||||
@AuthenticationPrincipal AppUserPrincipal actor) {
|
||||
Integer quarterNumber = parseQuarter(quarter);
|
||||
MetricsService.MetricsQuery query = new MetricsService.MetricsQuery(year, month, quarterNumber, department,
|
||||
group, product, projectGroup, view, includeUnassigned, releaseId, trendGranularity,
|
||||
parseExclusions(exclusions));
|
||||
query = query.withMonthRange(monthStart, monthEnd).withExtraFilters(extraFilters)
|
||||
.withProductSearch(productSearch).withColumnFilters(columnFilters).withStage(stage);
|
||||
return responseAccess.visibleTrend(metrics.calculateTrend(query, actor), actor);
|
||||
}
|
||||
|
||||
/** Existing direct callers retain the pre-range controller signature. */
|
||||
public MetricsService.MetricSnapshot calculate(Integer year, Integer month, String quarter,
|
||||
String department, String group, String product, String productSearch,
|
||||
|
||||
@@ -5,6 +5,7 @@ import cn.yunsheng.quality.identity.AppUserPrincipal;
|
||||
import cn.yunsheng.quality.metrics.MetricsService.DefectRow;
|
||||
import cn.yunsheng.quality.metrics.MetricsService.MetricRow;
|
||||
import cn.yunsheng.quality.metrics.MetricsService.MetricSnapshot;
|
||||
import cn.yunsheng.quality.metrics.MetricsService.MetricTrendSnapshot;
|
||||
import cn.yunsheng.quality.metrics.MetricsService.MetricStage;
|
||||
import cn.yunsheng.quality.metrics.MetricsService.TrendMetricRow;
|
||||
import java.util.List;
|
||||
@@ -30,6 +31,25 @@ public class MetricsResponseAccess {
|
||||
return new MetricSnapshot(filtered.release(), filtered.context(), hideDefects(filtered.summary()), List.of(), List.of(), defects, filtered.coverage());
|
||||
}
|
||||
|
||||
/** 趋势查询沿用明细授权和指标字段可见性边界。 */
|
||||
public MetricTrendSnapshot visibleTrend(MetricTrendSnapshot snapshot, AppUserPrincipal actor) {
|
||||
governance.requireUserActivePolicy(actor);
|
||||
if (!Boolean.TRUE.equals(governance.policy(actor.getId().toString()).get("detailAllowed")))
|
||||
return new MetricTrendSnapshot(snapshot.release(), snapshot.context(), List.of(), snapshot.coverage());
|
||||
governance.requireBoundAction("QUERY", "query.detail");
|
||||
Set<String> allowed = governance.allowedFields(actor);
|
||||
List<TrendMetricRow> trend = allowed.contains("*") ? snapshot.trend()
|
||||
: snapshot.trend().stream().map(row -> restrictTrend(row, allowed)).toList();
|
||||
return new MetricTrendSnapshot(snapshot.release(), snapshot.context(), trend, snapshot.coverage());
|
||||
}
|
||||
|
||||
private TrendMetricRow restrictTrend(TrendMetricRow row, Set<String> allowed) {
|
||||
return new TrendMetricRow(row.month(), row.key(), row.label(), row.department(), row.group(), row.product(),
|
||||
row.projectGroup(), row.compositeRate(), restrictDefects(row.black(), "black", allowed),
|
||||
restrictDefects(row.bright(), "bright", allowed), row.coverage(),
|
||||
row.compositeRateWithoutHeadquartersScrap(), row.period(), row.periodLabel(), row.granularity());
|
||||
}
|
||||
|
||||
private MetricRow hideDefects(MetricRow row) {
|
||||
return new MetricRow(row.key(), row.label(), row.department(), row.group(), row.product(), row.projectGroup(), row.compositeRate(),
|
||||
hideDefects(row.black()), hideDefects(row.bright()), row.coverage(), row.compositeRateWithoutHeadquartersScrap());
|
||||
|
||||
@@ -71,6 +71,113 @@ public class MetricsService {
|
||||
return calculateForRelease(query, actor, release);
|
||||
}
|
||||
|
||||
/** 只按时间桶生成趋势,不构造总体摘要或产品/分组维度行。 */
|
||||
public MetricTrendSnapshot calculateTrend(MetricsQuery query, AppUserPrincipal actor) {
|
||||
if (actor == null) throw new ResponseStatusException(HttpStatus.FORBIDDEN, "指标查询必须绑定当前有效用户");
|
||||
governance.requireUserActivePolicy(actor);
|
||||
governance.requireBoundAction("QUERY", "query.aggregate");
|
||||
validate(query);
|
||||
String releaseId = query.releaseId() == null || query.releaseId().isBlank()
|
||||
? currentReleaseId() : query.releaseId();
|
||||
if (releaseId == null) return emptyTrendSnapshot(query);
|
||||
ReleaseInfo release = release(releaseId, actor);
|
||||
return withConsistentSnapshot(() -> calculateTrendForReleaseSnapshot(query, actor, release));
|
||||
}
|
||||
|
||||
private MetricTrendSnapshot calculateTrendForReleaseSnapshot(MetricsQuery query, AppUserPrincipal actor,
|
||||
ReleaseInfo release) {
|
||||
boolean hasUnrolledBuilds = hasUnrolledBuilds(release.id());
|
||||
Map<String, AggregateStats> periods = queryTrendAggregates(release.id(), query, actor, hasUnrolledBuilds);
|
||||
String ruleVersion = jdbc.queryForObject("SELECT rule_version FROM data_release WHERE id=?", String.class, release.id());
|
||||
ConfigurableRuleEngine rules = rulesForVersion(ruleVersion);
|
||||
List<TrendMetricRow> trend = trendRows(periods, query.trendGranularity()).stream().map(row -> {
|
||||
MetricRow adjusted = rules.applyMetrics(new MetricRow(row.key(), row.label(), row.department(), row.group(),
|
||||
row.product(), row.projectGroup(), row.compositeRate(), row.black(), row.bright(), row.coverage(),
|
||||
row.compositeRateWithoutHeadquartersScrap()));
|
||||
return new TrendMetricRow(row.month(), adjusted.key(), adjusted.label(), adjusted.department(), adjusted.group(),
|
||||
adjusted.product(), adjusted.projectGroup(), adjusted.compositeRate(), adjusted.black(), adjusted.bright(),
|
||||
adjusted.coverage(), adjusted.compositeRateWithoutHeadquartersScrap(), row.period(), row.periodLabel(),
|
||||
row.granularity());
|
||||
}).toList();
|
||||
Map<String, Object> coverage = queryCoverage(release.id(), query, actor, hasUnrolledBuilds);
|
||||
Map<String, Object> context = context(query, query.includeUnassigned());
|
||||
context.put("ruleVersionId", ruleVersion == null ? BusinessRowMapper.RULE_VERSION : ruleVersion);
|
||||
context.put("calculationRules", rules.calculationRules());
|
||||
context.put("metricFormulaDescriptions", rules.formulaDescriptions());
|
||||
return new MetricTrendSnapshot(release.asMap(), context, trend, coverage);
|
||||
}
|
||||
|
||||
private Map<String, AggregateStats> queryTrendAggregates(String releaseId, MetricsQuery query,
|
||||
AppUserPrincipal actor, boolean hasUnrolledBuilds) {
|
||||
Map<String, AggregateStats> periods = new TreeMap<>();
|
||||
boolean hasSourceFilters = !query.extraFilters().isEmpty() || !query.columnFilters().isEmpty();
|
||||
if (!hasSourceFilters) {
|
||||
aggregateTrendStage(periods, "black", releaseId, query, actor, false);
|
||||
aggregateTrendStage(periods, "bright", releaseId, query, actor, false);
|
||||
}
|
||||
if (hasUnrolledBuilds || hasSourceFilters) {
|
||||
aggregateTrendStage(periods, "black", releaseId, query, actor, true);
|
||||
aggregateTrendStage(periods, "bright", releaseId, query, actor, true);
|
||||
}
|
||||
return periods;
|
||||
}
|
||||
|
||||
private void aggregateTrendStage(Map<String, AggregateStats> periods, String stage, String releaseId,
|
||||
MetricsQuery query, AppUserPrincipal actor, boolean factFallback) {
|
||||
if (query.stage() != null && !query.stage().equals(stage)) return;
|
||||
String table = factFallback ? (stage.equals("black") ? "fact_black" : "fact_bright") : "metric_rollup";
|
||||
StringBuilder where = new StringBuilder(" WHERE rm.release_id=?");
|
||||
List<Object> args = new ArrayList<>();
|
||||
args.add(releaseId);
|
||||
boolean hasSourceFilters = !query.extraFilters().isEmpty() || !query.columnFilters().isEmpty();
|
||||
if (factFallback && !hasSourceFilters)
|
||||
where.append(" AND NOT EXISTS (SELECT 1 FROM metric_rollup_build rb WHERE rb.build_id=f.build_id)");
|
||||
else if (!factFallback) { where.append(" AND f.stage=?"); args.add(stage); }
|
||||
appendTime(where, args, query);
|
||||
appendDimensions(where, args, query);
|
||||
appendExclusions(where, args, query);
|
||||
if (factFallback) {
|
||||
new QueryFilterFields(jdbc, governance).append(where, args, stage, query.extraFilters(), actor);
|
||||
if (!query.columnFilters().isEmpty())
|
||||
new SourceColumnQueries(jdbc, governance, JsonMapper.builder().build())
|
||||
.append(where, args, stage, query.columnFilters(), releaseId, actor);
|
||||
}
|
||||
DataScope.append(where, args, actor, "f.department COLLATE utf8mb4_0900_as_cs",
|
||||
"f.group_name COLLATE utf8mb4_0900_as_cs");
|
||||
if (!effectiveIncludeUnassigned(query)) where.append(" AND (f.group_name IS NOT NULL AND f.group_name<>'')");
|
||||
|
||||
String countExpression = factFallback ? "COUNT(*)" : "SUM(f.source_row_count)";
|
||||
String sql = """
|
||||
SELECT %s AS trend_period,
|
||||
SUM(f.qualified_weight) AS qualified_weight,
|
||||
SUM(f.scrap_weight) AS scrap_weight,
|
||||
SUM(f.total_weight) AS total_weight,
|
||||
%s AS black_responsibility_scrap,
|
||||
%s AS black_material_scrap,
|
||||
%s AS black_external_scrap,
|
||||
%s AS bright_headquarters_scrap,
|
||||
%s AS bright_plating_scrap,
|
||||
%s AS bright_material_scrap,
|
||||
%s AS bright_processing_scrap,
|
||||
%s AS bright_diffusion_scrap,
|
||||
%s AS row_count
|
||||
FROM release_member rm JOIN %s f ON f.build_id=rm.transform_build_id
|
||||
%s
|
||||
GROUP BY trend_period
|
||||
ORDER BY trend_period
|
||||
""".formatted(trendBucketExpression(query.trendGranularity()),
|
||||
componentSum("black_responsibility_scrap"), componentSum("black_material_scrap"),
|
||||
componentSum("black_external_scrap"), componentSum("bright_headquarters_scrap"),
|
||||
componentSum("bright_plating_scrap"), componentSum("bright_material_scrap"),
|
||||
componentSum("bright_processing_scrap"), componentSum("bright_diffusion_scrap"),
|
||||
countExpression, table, where);
|
||||
jdbc.query(sql, (RowCallbackHandler) rs -> {
|
||||
String period = rs.getString("trend_period");
|
||||
AggregateStats stats = new AggregateStats().read(rs, stage);
|
||||
periods.computeIfAbsent(period, ignored -> new AggregateStats()).merge(stage, stats);
|
||||
}, args.toArray());
|
||||
}
|
||||
|
||||
/** Candidate and historical release path reserved for the explicit governance reconciliation flow. */
|
||||
public MetricSnapshot calculateCandidateForGovernance(MetricsQuery query, AppUserPrincipal actor) {
|
||||
return withGovernanceSnapshot(() -> calculateForGovernance(query, actor, true));
|
||||
@@ -393,8 +500,12 @@ public class MetricsService {
|
||||
}
|
||||
|
||||
private List<TrendMetricRow> trendRows(AggregateSet aggregates, String granularity) {
|
||||
return trendRows(aggregates.periods(), granularity);
|
||||
}
|
||||
|
||||
private List<TrendMetricRow> trendRows(Map<String, AggregateStats> periods, String granularity) {
|
||||
List<TrendMetricRow> trend = new ArrayList<>();
|
||||
aggregates.periods().forEach((period, stats) -> {
|
||||
periods.forEach((period, stats) -> {
|
||||
String label = switch (granularity) {
|
||||
case "quarter" -> period.replace("-Q", "年第") + "季度";
|
||||
case "year" -> period + "年";
|
||||
@@ -688,6 +799,12 @@ public class MetricsService {
|
||||
Map.of("black", empty.black().defects(), "bright", empty.bright().defects()), coverage);
|
||||
}
|
||||
|
||||
private MetricTrendSnapshot emptyTrendSnapshot(MetricsQuery query) {
|
||||
Map<String, Object> coverage = Map.of("rawRows", 0, "includedRows", 0, "excludedBlankRows", 0,
|
||||
"unmappedRows", 0, "projectGroupUnconfiguredRows", 0, "missingStages", List.of(), "sourceMonths", List.of());
|
||||
return new MetricTrendSnapshot(null, context(query, query.includeUnassigned()), List.of(), coverage);
|
||||
}
|
||||
|
||||
void validate(MetricsQuery query) {
|
||||
if (query.year() != null && (query.year() < 2000 || query.year() > 2100)) throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "年份无效");
|
||||
if (query.month() != null && (query.month() < 1 || query.month() > 12)) throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "月份无效");
|
||||
@@ -831,6 +948,8 @@ public class MetricsService {
|
||||
public record MetricSnapshot(Map<String, Object> release, Map<String, Object> context, MetricRow summary,
|
||||
List<MetricRow> rows, List<TrendMetricRow> trend, Map<String, Object> defects,
|
||||
Map<String, Object> coverage) {}
|
||||
public record MetricTrendSnapshot(Map<String, Object> release, Map<String, Object> context,
|
||||
List<TrendMetricRow> trend, Map<String, Object> coverage) {}
|
||||
public record ComparisonSnapshots(MetricSnapshot current, MetricSnapshot comparison) {}
|
||||
|
||||
private record Fact(String stage, String month, String department, String group, String projectGroup, String product,
|
||||
|
||||
@@ -2,6 +2,13 @@ server:
|
||||
address: 127.0.0.1
|
||||
port: ${PORT:5281}
|
||||
shutdown: graceful
|
||||
# 只压缩较大的 JSON 响应;SSE、表格和压缩包不在类型白名单中。
|
||||
compression:
|
||||
enabled: true
|
||||
min-response-size: 1KB
|
||||
mime-types:
|
||||
- application/json
|
||||
- application/problem+json
|
||||
servlet:
|
||||
session:
|
||||
cookie:
|
||||
|
||||
Reference in New Issue
Block a user