feat: drill defect trends into detailed rates and preserve query context
This commit is contained in:
@@ -155,6 +155,75 @@ public class AnalysisFineDefectsService {
|
||||
return withScope((complement == null ? aggregate : complement).response(request, release), scopeContext);
|
||||
}
|
||||
|
||||
/** One authorized scan (or rollup query) for every period/object and all visible children. */
|
||||
@Transactional(readOnly = true, isolation = Isolation.REPEATABLE_READ)
|
||||
public Map<String, Object> grouped(Map<String, Object> input, AppUserPrincipal actor, String dimension, String granularity) {
|
||||
Set<String> allowed = governance.allowedFields(actor);
|
||||
Request request = parse(input, allowed, true);
|
||||
String bucket = switch (dimension) {
|
||||
case "period" -> switch (granularity) {
|
||||
case "month" -> "f.month_key";
|
||||
case "quarter" -> "CONCAT(LEFT(f.month_key,4),'-Q',FLOOR((CAST(RIGHT(f.month_key,2) AS UNSIGNED)-1)/3)+1)";
|
||||
case "year" -> "LEFT(f.month_key,4)";
|
||||
default -> throw bad("趋势粒度无效");
|
||||
};
|
||||
case "overall" -> "'overall'";
|
||||
case "department" -> "COALESCE(f.department,'__UNASSIGNED__') COLLATE utf8mb4_0900_as_cs";
|
||||
case "group" -> "COALESCE(f.group_name,'__UNASSIGNED__') COLLATE utf8mb4_0900_as_cs";
|
||||
case "product" -> "COALESCE(f.product,'__UNASSIGNED__') COLLATE utf8mb4_0900_as_cs";
|
||||
case "projectGroup" -> "COALESCE(f.project_group,'__UNASSIGNED__') COLLATE utf8mb4_0900_as_cs";
|
||||
default -> throw bad("细分维度无效");
|
||||
};
|
||||
if (request.category() == null) throw bad("必须指定不良分类");
|
||||
String releaseId = releases.resolvePublishedRelease(request.releaseId());
|
||||
Map<String, Object> release = releaseContext(releaseId);
|
||||
if (hasExtendedScope(input) && sourceColumns == null) throw bad("扩展缺陷查询范围当前不可用");
|
||||
StringBuilder predicate = new StringBuilder(" WHERE rm.release_id = ?");
|
||||
List<Object> args = new ArrayList<>(List.of(releaseId));
|
||||
appendScope(predicate,args,request,input,releaseId,actor);
|
||||
if (request.productSearch() != null) {
|
||||
predicate.append(" AND LOCATE(LOWER(?),LOWER(COALESCE(f.product,'')))>0"); args.add(request.productSearch());
|
||||
}
|
||||
List<DefectField> fields = applicableFields(request,allowed);
|
||||
List<Category> categories = categories(request.stage());
|
||||
Set<String> components = new LinkedHashSet<>();
|
||||
for (Category category : categories) if (fields.stream().anyMatch(f -> f.category().equals(category.name()))
|
||||
&& isAllowed(category.componentCode(),allowed)) components.add(category.componentCode());
|
||||
java.util.function.Supplier<Aggregator> create = () -> new Aggregator(request,fields,categories,components,json);
|
||||
Map<String,Aggregator> groups = new LinkedHashMap<>();
|
||||
if (!fields.isEmpty()) {
|
||||
boolean read = rollups != null && request.extraFilters().isEmpty()
|
||||
&& (!(input.get("columnFilters") instanceof List<?> filters) || filters.isEmpty())
|
||||
&& rollups.readGroups(groups,create,request,allowed,predicate.toString(),args,bucket,dimension);
|
||||
if (!read) {
|
||||
List<String> rawKeys = new ArrayList<>(fields.stream().map(DefectField::key).toList());
|
||||
categories.stream().map(c -> ExpectedSourceDetailPolicy.totalField(c.componentCode()))
|
||||
.filter(java.util.Objects::nonNull).filter(k -> isAllowed(k,allowed)).forEach(rawKeys::add);
|
||||
String sql = "SELECT " + bucket + " AS bucket_key," + jsonObject("f.raw_values",rawKeys)
|
||||
+ " AS raw_fields," + jsonObject("f.components",new ArrayList<>(components))
|
||||
+ " AS formal_components,f.group_name AS business_group FROM release_member rm "
|
||||
+ "JOIN transform_build b ON b.id=rm.transform_build_id AND b.source_revision_id=rm.source_revision_id "
|
||||
+ "JOIN source_revision sr ON sr.id=rm.source_revision_id JOIN fact_" + request.stage()
|
||||
+ " f ON f.build_id=rm.transform_build_id AND f.source_revision_id=rm.source_revision_id " + predicate;
|
||||
jdbc.query(connection -> {
|
||||
var statement=connection.prepareStatement(sql,ResultSet.TYPE_FORWARD_ONLY,ResultSet.CONCUR_READ_ONLY);
|
||||
statement.setFetchSize(Integer.MIN_VALUE); new ArgumentPreparedStatementSetter(args.toArray()).setValues(statement);return statement;
|
||||
},(ResultSetExtractor<Void>) rs -> {
|
||||
while(rs.next()) groups.computeIfAbsent(rs.getString("bucket_key"),key -> create.get())
|
||||
.add(readObject(rs.getString("raw_fields")),readObject(rs.getString("formal_components")),null,rs.getString("business_group"));
|
||||
return null;
|
||||
});
|
||||
}
|
||||
}
|
||||
Map<String,Object> result = new LinkedHashMap<>();
|
||||
groups.forEach((key,value) -> {
|
||||
String responseKey=dimension.equals("department")&&!key.equals("__UNASSIGNED__")&&!key.isBlank()?DepartmentLabels.display(key):key;
|
||||
if(result.containsKey(responseKey))throw bad("产业部名称映射冲突,暂不能计算细分废率");
|
||||
result.put(responseKey,value.response(request,release));
|
||||
});
|
||||
return mapOf("releaseId",releaseId,"fields",fields.stream().map(f -> mapOf("key",f.key(),"label",f.label(),"category",f.category())).toList(),"groups",result);
|
||||
}
|
||||
|
||||
/** Exact counters allow subtracting a small excluded set without rescanning all retained raw JSON. */
|
||||
private Aggregator exclusionComplement(Request request, Map<String,Object> input, String releaseId, AppUserPrincipal actor,
|
||||
Set<String> allowed, List<DefectField> fields, List<Category> categories, Set<String> components,
|
||||
@@ -229,6 +298,10 @@ public class AnalysisFineDefectsService {
|
||||
}
|
||||
|
||||
static Request parse(Map<String, Object> input, Set<String> allowedFields) {
|
||||
return parse(input, allowedFields, false);
|
||||
}
|
||||
|
||||
static Request parse(Map<String, Object> input, Set<String> allowedFields, boolean grouped) {
|
||||
if (input == null) throw bad("请求体不能为空");
|
||||
for (String key : input.keySet()) if (!REQUEST_KEYS.contains(key)) throw bad("未知请求属性:" + key);
|
||||
if (hasExtendedScope(input)) SourceColumnQueries.normalizedScope(input);
|
||||
@@ -243,7 +316,7 @@ public class AnalysisFineDefectsService {
|
||||
if (month != null && (month < 1 || month > 12)) throw bad("月份无效");
|
||||
if (quarter != null && (quarter < 1 || quarter > 4)) throw bad("季度无效");
|
||||
if (month != null && quarter != null) throw bad("月份与季度筛选不可同时指定");
|
||||
if (mode.equals("top") && year == null) throw bad("top 查询必须指定 year");
|
||||
if (mode.equals("top") && year == null && !grouped) throw bad("top 查询必须指定 year");
|
||||
String stage = optionalText(input, "stage");
|
||||
if (stage != null && !Set.of("black", "bright").contains(stage)) throw bad("stage 必须是 black 或 bright");
|
||||
if (mode.equals("top") && stage == null) throw bad("top 查询必须指定 stage");
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
package cn.yunsheng.quality.analysis;
|
||||
|
||||
import cn.yunsheng.quality.governance.GovernanceAccessService;
|
||||
import cn.yunsheng.quality.identity.AppUserPrincipal;
|
||||
import cn.yunsheng.quality.metrics.MetricsResponseAccess;
|
||||
import cn.yunsheng.quality.metrics.MetricsService;
|
||||
import cn.yunsheng.quality.metrics.MetricsService.MetricStage;
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.util.*;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.security.core.annotation.AuthenticationPrincipal;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.server.ResponseStatusException;
|
||||
|
||||
/** Batched source children joined to the official, authorized period/object denominators. */
|
||||
@RestController
|
||||
@RequestMapping("/api/analysis/defects/drilldown")
|
||||
public class DefectDrilldownController {
|
||||
private final AnalysisFineDefectsService fine;
|
||||
private final MetricsService metrics;
|
||||
private final MetricsResponseAccess metricAccess;
|
||||
private final GovernanceAccessService governance;
|
||||
public DefectDrilldownController(AnalysisFineDefectsService fine,MetricsService metrics,MetricsResponseAccess metricAccess,GovernanceAccessService governance){this.fine=fine;this.metrics=metrics;this.metricAccess=metricAccess;this.governance=governance;}
|
||||
|
||||
@PostMapping
|
||||
@PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')")
|
||||
public Map<String,Object> query(@RequestBody Map<String,Object> input,@AuthenticationPrincipal AppUserPrincipal actor) {
|
||||
governance.requireDetail(actor);governance.requireBoundAction("QUERY","query.detail");
|
||||
String dimension=String.valueOf(input.getOrDefault("dimension","period"));
|
||||
String granularity=String.valueOf(input.getOrDefault("trendGranularity","month"));
|
||||
if(!Set.of("period","overall","department","group","product","projectGroup").contains(dimension))throw bad("细分维度无效");
|
||||
if(!Set.of("month","quarter","year").contains(granularity))throw bad("趋势粒度无效");
|
||||
Map<String,Object> scope=new LinkedHashMap<>(input);scope.remove("trendGranularity");scope.remove("view");scope.put("dimension","defect");scope.put("mode","top");scope.put("limit",100);
|
||||
// Reuse the source parser to reject unknown filters and validate the selected category/stage.
|
||||
AnalysisFineDefectsService.Request request=AnalysisFineDefectsService.parse(scope,governance.allowedFields(actor),true);
|
||||
if(request.category()==null)throw bad("必须指定不良分类");
|
||||
var query=new MetricsService.MetricsQuery(number(scope,"year"),number(scope,"month"),number(scope,"quarter"),request.department(),request.group(),request.product(),request.projectGroup(),dimension.equals("period")?"overall":dimension,request.includeUnassigned(),request.releaseId(),granularity,AnalysisExplorationTools.exclusions(scope.get("exclusions")))
|
||||
.withProductSearch(request.productSearch()).withExtraFilters(scope.get("extraFilters")).withColumnFilters(scope.get("columnFilters")).withMonthRange(number(scope,"monthStart"),number(scope,"monthEnd")).withStage(request.stage());
|
||||
var paired=metrics.calculatePairedSnapshot(query,actor,dimension.equals("period"),() -> fine.grouped(scope,actor,dimension,granularity));
|
||||
// Refresh the visible fields after the snapshot; a concurrent policy revocation cannot release old fields.
|
||||
governance.requireDetail(actor);governance.requireBoundAction("QUERY","query.detail");
|
||||
Set<String> currentAllowed=governance.allowedFields(actor);
|
||||
Map<String,MetricStage> formal=new LinkedHashMap<>();
|
||||
if(dimension.equals("period")) {
|
||||
var snapshot=metricAccess.visibleTrend(paired.trend(),actor);
|
||||
if(!Objects.equals(snapshot.release().get("id"),request.releaseId()))throw bad("查询数据版本不一致");
|
||||
snapshot.trend().forEach(row->formal.put(row.period(),request.stage().equals("black")?row.black():row.bright()));
|
||||
} else {
|
||||
var snapshot=metricAccess.visible(paired.metrics(),actor);
|
||||
if(!Objects.equals(snapshot.release().get("id"),request.releaseId()))throw bad("查询数据版本不一致");
|
||||
if(dimension.equals("overall"))formal.put("overall",request.stage().equals("black")?snapshot.summary().black():snapshot.summary().bright());
|
||||
else snapshot.rows().forEach(row->formal.put(normalizeKey(row.key()),request.stage().equals("black")?row.black():row.bright()));
|
||||
}
|
||||
Map<String,Object> raw=paired.source();
|
||||
if(!Objects.equals(raw.get("releaseId"),request.releaseId()))throw bad("查询数据版本不一致");
|
||||
Map<?,?> sourceGroups=(Map<?,?>)raw.get("groups");
|
||||
List<Map<String,Object>> groups=new ArrayList<>();
|
||||
formal.forEach((key,stage)->{
|
||||
Map<?,?> source=sourceGroups.get(key) instanceof Map<?,?> m?m:Map.of();
|
||||
List<?> rows=source.get("rows") instanceof List<?> list?list:List.of();
|
||||
List<Map<String,Object>> children=new ArrayList<>();
|
||||
for(Object item:rows)if(item instanceof Map<?,?> child && (currentAllowed.contains("*")||currentAllowed.contains(String.valueOf(child.get("key"))))) {
|
||||
BigDecimal weight=child.get("weight") instanceof BigDecimal value?value:null;
|
||||
var value=new LinkedHashMap<String,Object>();value.put("key",child.get("key"));value.put("weight",weight);value.put("rate",ratio(weight,stage.totalWeight()));children.add(value);
|
||||
}
|
||||
BigDecimal parentWeight=stage.defects().stream().filter(d->d.name().equals(request.category())).map(MetricsService.DefectRow::weight).filter(Objects::nonNull).findFirst().orElse(null);
|
||||
List<?> reconciliation=source.get("categoryReconciliation") instanceof List<?> list?list:List.of();
|
||||
String status=reconciliation.stream().filter(Map.class::isInstance).map(Map.class::cast).filter(m->request.category().equals(m.get("category"))).map(m->String.valueOf(m.get("reconciliationStatus"))).findFirst().orElse("UNAVAILABLE");
|
||||
Map<String,Object> group=new LinkedHashMap<>();group.put("key",key);group.put("totalWeight",stage.totalWeight());group.put("parentWeight",parentWeight);group.put("parentRate",ratio(parentWeight,stage.totalWeight()));group.put("children",children);group.put("reconciliationStatus",status);groups.add(group);
|
||||
});
|
||||
return Map.of("releaseId",request.releaseId(),"stage",request.stage(),"category",request.category(),"dimension",dimension,"granularity",granularity,"fields",((List<?>)raw.get("fields")).stream().filter(item -> item instanceof Map<?,?> field && (currentAllowed.contains("*")||currentAllowed.contains(String.valueOf(field.get("key"))))).toList(),"groups",groups);
|
||||
}
|
||||
private static String normalizeKey(String key){return key==null?"__UNASSIGNED__":key;}
|
||||
private static Integer number(Map<String,Object> input,String key){Object value=input.get(key);if(value==null)return null;if(!(value instanceof Number n)||n.doubleValue()!=n.intValue())throw bad("期间必须为整数");return n.intValue();}
|
||||
private static BigDecimal ratio(BigDecimal weight,BigDecimal total){return weight==null||total==null||total.signum()<=0?null:weight.divide(total,12,RoundingMode.HALF_UP);}
|
||||
private static ResponseStatusException bad(String message){return new ResponseStatusException(HttpStatus.BAD_REQUEST,message);}
|
||||
}
|
||||
@@ -125,6 +125,20 @@ public class FineDefectRollups {
|
||||
return true;
|
||||
}
|
||||
|
||||
boolean readGroups(Map<String,Aggregator> groups, java.util.function.Supplier<Aggregator> create,
|
||||
Request request, Set<String> allowed, String predicate, List<Object> scopeArgs,
|
||||
String bucket, String dimension) {
|
||||
Integer missing=jdbc.queryForObject("SELECT COUNT(*) FROM release_member rm LEFT JOIN fine_defect_rollup_build rb ON rb.build_id=rm.transform_build_id WHERE rm.release_id=? AND rb.build_id IS NULL",Integer.class,scopeArgs.getFirst());
|
||||
if(missing==null||missing>0)return false;
|
||||
boolean organization=!predicate.contains("f.product")&&!predicate.contains("f.project_group")&&!List.of("product","projectGroup").contains(dimension);
|
||||
List<Object> args=new ArrayList<>(scopeArgs);args.add(request.stage());args.add(organization?"organization":"detail");
|
||||
List<String> selected=new ArrayList<>();
|
||||
for(var stat:create.get().rollupStats()){selected.add("(f.stat_kind=? AND f.field_key=?)");args.add(stat.kind());args.add(stat.key());}
|
||||
String sql="SELECT "+bucket+" AS bucket_key,f.stat_kind,f.field_key,SUM(f.weight_sum) AS weight_sum,SUM(f.present_rows) AS present_rows,SUM(f.missing_rows) AS missing_rows,SUM(f.invalid_rows) AS invalid_rows,SUM(f.negative_rows) AS negative_rows,SUM(f.source_row_count) AS source_row_count FROM release_member rm JOIN transform_build b ON b.id=rm.transform_build_id AND b.source_revision_id=rm.source_revision_id JOIN source_revision sr ON sr.id=rm.source_revision_id JOIN fine_defect_rollup f ON f.build_id=rm.transform_build_id "+predicate+" AND f.stage=? AND f.grain=? AND ("+String.join(" OR ",selected)+") GROUP BY bucket_key,f.stat_kind,f.field_key";
|
||||
jdbc.query(sql,(RowCallbackHandler) rs -> groups.computeIfAbsent(rs.getString("bucket_key"),key -> create.get()).mergeRollup(new Aggregator.RollupStat(rs.getString("stat_kind"),rs.getString("field_key"),rs.getBigDecimal("weight_sum"),rs.getLong("present_rows"),rs.getLong("missing_rows"),rs.getLong("invalid_rows"),rs.getLong("negative_rows"),rs.getLong("source_row_count")),allowed),args.toArray());
|
||||
return true;
|
||||
}
|
||||
|
||||
private Map<GroupKey, Aggregator> aggregate(String build, String stage, String predicate, List<Object> scopeArgs) {
|
||||
Request request = new Request(build, "top", null, null, null, null, null, null, null, null,
|
||||
true, stage, "defect", null, null, 100, Map.of());
|
||||
|
||||
@@ -84,6 +84,23 @@ public class MetricsService {
|
||||
return withConsistentSnapshot(() -> calculateTrendForReleaseSnapshot(query, actor, release));
|
||||
}
|
||||
|
||||
public record PairedSnapshot<T>(MetricSnapshot metrics, MetricTrendSnapshot trend, T source) {}
|
||||
|
||||
/** Authorize before opening the read snapshot, so service-binding locks do not span source scans. */
|
||||
public <T> PairedSnapshot<T> calculatePairedSnapshot(MetricsQuery query, AppUserPrincipal actor,
|
||||
boolean trendOnly, Supplier<T> source) {
|
||||
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)throw new ResponseStatusException(HttpStatus.BAD_REQUEST,"必须绑定正式数据版本");
|
||||
ReleaseInfo release=release(releaseId,actor);
|
||||
return withConsistentSnapshot(() -> trendOnly
|
||||
? new PairedSnapshot<T>(null,calculateTrendForReleaseSnapshot(query,actor,release),source.get())
|
||||
: new PairedSnapshot<T>(calculateForReleaseSnapshot(query,actor,release),null,source.get()));
|
||||
}
|
||||
|
||||
private MetricTrendSnapshot calculateTrendForReleaseSnapshot(MetricsQuery query, AppUserPrincipal actor,
|
||||
ReleaseInfo release) {
|
||||
boolean hasUnrolledBuilds = hasUnrolledBuilds(release.id());
|
||||
|
||||
@@ -92,9 +92,12 @@ public class RecordController {
|
||||
public Map<String,Object> records(String stage,Integer year,Integer month,Integer quarter,String department,String group,String product,String productSearch,String projectGroup,boolean includeUnassigned,String releaseId,int page,int pageSize,String field,String search,String sort,String direction,List<String> columns,String extraFilters,AppUserPrincipal actor) {
|
||||
return recordsFiltered(stage,year,month,quarter,department,group,product,productSearch,projectGroup,includeUnassigned,releaseId,page,pageSize,field,search,sort,direction,columns,extraFilters,null,actor);
|
||||
}
|
||||
public Map<String,Object> recordsFiltered(String stage,Integer year,Integer month,Integer quarter,String department,String group,String product,String productSearch,String projectGroup,boolean includeUnassigned,String releaseId,int page,int pageSize,String field,String search,String sort,String direction,List<String> columns,String extraFilters,String columnFilters,AppUserPrincipal actor) {
|
||||
return recordsRangeFiltered(stage,year,month,quarter,department,group,product,productSearch,projectGroup,includeUnassigned,releaseId,page,pageSize,field,search,sort,direction,columns,extraFilters,columnFilters,null,null,actor);
|
||||
}
|
||||
@GetMapping
|
||||
@PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')")
|
||||
public Map<String, Object> recordsFiltered(@RequestParam String stage,
|
||||
public Map<String, Object> recordsRangeFiltered(@RequestParam String stage,
|
||||
@RequestParam(required = false) Integer year,
|
||||
@RequestParam(required = false) Integer month,
|
||||
@RequestParam(required = false) Integer quarter,
|
||||
@@ -114,11 +117,13 @@ public class RecordController {
|
||||
@RequestParam(required = false) List<String> columns,
|
||||
@RequestParam(required=false) String extraFilters,
|
||||
@RequestParam(required=false) String columnFilters,
|
||||
@RequestParam(required=false) Integer monthStart,
|
||||
@RequestParam(required=false) Integer monthEnd,
|
||||
@AuthenticationPrincipal AppUserPrincipal actor) {
|
||||
governance.requireDetail(actor);
|
||||
governance.requireBoundAction("QUERY", "query.detail");
|
||||
if (!List.of("black", "bright").contains(stage)) throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "stage 必须是 black 或 bright");
|
||||
validatePeriodFilters(year, month, quarter);
|
||||
validatePeriodFilters(year, month, quarter, monthStart, monthEnd);
|
||||
if (page < 1 || pageSize < 1 || pageSize > 200) throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "分页参数无效");
|
||||
if (productSearch != null && productSearch.length() > SelectionValues.MAX_VALUE_LENGTH) throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "产品搜索文本过长");
|
||||
List<String> selectedColumns = validateColumns(columns, actor);
|
||||
@@ -135,7 +140,7 @@ public class RecordController {
|
||||
StringBuilder predicate = new StringBuilder(" WHERE rm.release_id = ?");
|
||||
List<Object> args = new ArrayList<>();
|
||||
args.add(selectedRelease);
|
||||
appendPeriodFilters(predicate, args, year, month, quarter);
|
||||
appendPeriodFilters(predicate, args, year, month, quarter, monthStart, monthEnd);
|
||||
SelectionValues.appendPredicate(predicate, args, "f.department", department, DepartmentLabels::queryValue);
|
||||
SelectionValues.appendPredicate(predicate, args, "f.group_name", group, value -> value);
|
||||
SelectionValues.appendPredicate(predicate, args, "f.product", product, value -> value);
|
||||
@@ -213,9 +218,12 @@ public class RecordController {
|
||||
public ResponseEntity<StreamingResponseBody> export(Integer year,Integer month,Integer quarter,String department,String group,String product,String productSearch,String projectGroup,boolean includeUnassigned,String releaseId,String extraFilters,AppUserPrincipal actor) {
|
||||
return exportFiltered(year,month,quarter,department,group,product,productSearch,projectGroup,includeUnassigned,releaseId,extraFilters,null,null,actor);
|
||||
}
|
||||
public ResponseEntity<StreamingResponseBody> exportFiltered(Integer year,Integer month,Integer quarter,String department,String group,String product,String productSearch,String projectGroup,boolean includeUnassigned,String releaseId,String extraFilters,String stage,String columnFilters,AppUserPrincipal actor) {
|
||||
return exportRangeFiltered(year,month,quarter,department,group,product,productSearch,projectGroup,includeUnassigned,releaseId,extraFilters,stage,columnFilters,null,null,actor);
|
||||
}
|
||||
@GetMapping("/export")
|
||||
@PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')")
|
||||
public ResponseEntity<StreamingResponseBody> exportFiltered(@RequestParam(required = false) Integer year,
|
||||
public ResponseEntity<StreamingResponseBody> exportRangeFiltered(@RequestParam(required = false) Integer year,
|
||||
@RequestParam(required = false) Integer month,
|
||||
@RequestParam(required = false) Integer quarter,
|
||||
@RequestParam(required = false) String department,
|
||||
@@ -228,12 +236,14 @@ public class RecordController {
|
||||
@RequestParam(required=false) String extraFilters,
|
||||
@RequestParam(required=false) String stage,
|
||||
@RequestParam(required=false) String columnFilters,
|
||||
@RequestParam(required=false) Integer monthStart,
|
||||
@RequestParam(required=false) Integer monthEnd,
|
||||
@AuthenticationPrincipal AppUserPrincipal actor) {
|
||||
governance.requireDetail(actor);
|
||||
governance.requireBoundAction("QUERY", "query.detail");
|
||||
if (productSearch != null && productSearch.length() > SelectionValues.MAX_VALUE_LENGTH) throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "产品搜索文本过长");
|
||||
Path file = stage==null&&columnFilters==null ? workbookExport.export(year,month,quarter,department,group,product,projectGroup,includeUnassigned,releaseId,actor,QueryFilterFields.parse(extraFilters),productSearch) : workbookExport.exportFiltered(year, month, quarter, department, group, product, projectGroup,
|
||||
includeUnassigned, releaseId, actor, QueryFilterFields.parse(extraFilters), productSearch,stage,cn.yunsheng.quality.filters.SourceColumnQueries.parse(columnFilters));
|
||||
Path file = workbookExport.exportRangeFiltered(year, month, quarter, department, group, product, projectGroup,
|
||||
includeUnassigned, releaseId, actor, QueryFilterFields.parse(extraFilters), productSearch,stage,cn.yunsheng.quality.filters.SourceColumnQueries.parse(columnFilters),monthStart,monthEnd);
|
||||
StreamingResponseBody body = output -> {
|
||||
try (InputStream input = Files.newInputStream(file)) {
|
||||
input.transferTo(output);
|
||||
@@ -250,7 +260,11 @@ public class RecordController {
|
||||
}
|
||||
|
||||
static void appendPeriodFilters(StringBuilder predicate, List<Object> args, Integer year, Integer month, Integer quarter) {
|
||||
validatePeriodFilters(year, month, quarter);
|
||||
appendPeriodFilters(predicate,args,year,month,quarter,null,null);
|
||||
}
|
||||
|
||||
static void appendPeriodFilters(StringBuilder predicate, List<Object> args, Integer year, Integer month, Integer quarter, Integer monthStart, Integer monthEnd) {
|
||||
validatePeriodFilters(year, month, quarter, monthStart, monthEnd);
|
||||
if (year != null) { predicate.append(" AND f.month_key LIKE ?"); args.add(String.format("%04d-%%", year)); }
|
||||
if (month != null) { predicate.append(" AND RIGHT(f.month_key, 2) = ?"); args.add(String.format("%02d", month)); }
|
||||
if (quarter != null) {
|
||||
@@ -259,13 +273,25 @@ public class RecordController {
|
||||
args.add(firstMonth);
|
||||
args.add(firstMonth + 2);
|
||||
}
|
||||
if (monthStart != null) {
|
||||
predicate.append(" AND CAST(RIGHT(f.month_key, 2) AS UNSIGNED) BETWEEN ? AND ?");
|
||||
args.add(monthStart); args.add(monthEnd);
|
||||
}
|
||||
}
|
||||
|
||||
static void validatePeriodFilters(Integer year, Integer month, Integer quarter) {
|
||||
validatePeriodFilters(year,month,quarter,null,null);
|
||||
}
|
||||
|
||||
static void validatePeriodFilters(Integer year, Integer month, Integer quarter, Integer monthStart, Integer monthEnd) {
|
||||
if (year != null && (year < 2000 || year > 2100)) throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "年份无效");
|
||||
if (month != null && (month < 1 || month > 12)) throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "月份无效");
|
||||
if (quarter != null && (quarter < 1 || quarter > 4)) throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "季度无效");
|
||||
if (month != null && quarter != null) throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "月份与季度筛选不可同时指定");
|
||||
if ((monthStart == null) != (monthEnd == null)) throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "monthStart 和 monthEnd 必须成对提供");
|
||||
if (monthStart != null && (year == null || month != null || quarter != null
|
||||
|| monthStart < 1 || monthStart > 12 || monthEnd < 1 || monthEnd > 12 || monthStart > monthEnd))
|
||||
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "月份范围无效,且不能与 month 或 quarter 并用");
|
||||
}
|
||||
|
||||
private Map<String, Object> mapRow(ResultSet rs, String stage, Set<String> allowedFields, List<String> selectedColumns) throws SQLException {
|
||||
|
||||
+11
-8
@@ -73,10 +73,13 @@ public class RecordsWorkbookExportService {
|
||||
return exportFiltered(year,month,quarter,department,group,product,projectGroup,includeUnassigned,releaseId,actor,extraFilters,productSearch,null,List.of());
|
||||
}
|
||||
public Path exportFiltered(Integer year,Integer month,Integer quarter,String department,String group,String product,String projectGroup,boolean includeUnassigned,String releaseId,AppUserPrincipal actor,Map<String,List<String>> extraFilters,String productSearch,String selectedStage,List<Map<String,Object>> columnFilters) {
|
||||
return exportRangeFiltered(year,month,quarter,department,group,product,projectGroup,includeUnassigned,releaseId,actor,extraFilters,productSearch,selectedStage,columnFilters,null,null);
|
||||
}
|
||||
public Path exportRangeFiltered(Integer year,Integer month,Integer quarter,String department,String group,String product,String projectGroup,boolean includeUnassigned,String releaseId,AppUserPrincipal actor,Map<String,List<String>> extraFilters,String productSearch,String selectedStage,List<Map<String,Object>> columnFilters,Integer monthStart,Integer monthEnd) {
|
||||
if(selectedStage!=null&&!List.of("black","bright").contains(selectedStage))throw new ResponseStatusException(HttpStatus.BAD_REQUEST,"stage 必须是 black 或 bright");
|
||||
columnFilters=cn.yunsheng.quality.filters.SourceColumnQueries.parse(columnFilters);
|
||||
if(selectedStage!=null)for(var rule:columnFilters)if(!List.of(selectedStage).containsAll((List<?>)rule.get("stages")))throw new ResponseStatusException(HttpStatus.BAD_REQUEST,"来源字段筛选必须属于当前阶段");
|
||||
RecordController.validatePeriodFilters(year, month, quarter);
|
||||
RecordController.validatePeriodFilters(year, month, quarter, monthStart, monthEnd);
|
||||
if (productSearch != null && productSearch.length() > SelectionValues.MAX_VALUE_LENGTH)
|
||||
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "产品搜索文本过长");
|
||||
String selectedRelease = releases.resolvePublishedRelease(releaseId);
|
||||
@@ -89,9 +92,9 @@ public class RecordsWorkbookExportService {
|
||||
workbook.setCompressTempFiles(true);
|
||||
CellStyle headerStyle = createHeaderStyle(workbook);
|
||||
if(selectedStage==null||selectedStage.equals("black"))createStageSheet(workbook, headerStyle, "黑片", "fact_black", selectedRelease, year, month, quarter,
|
||||
department, group, product, projectGroup, includeUnassigned, allowedFields, actor, extraFilters, productSearch,columnFilters);
|
||||
department, group, product, projectGroup, includeUnassigned, allowedFields, actor, extraFilters, productSearch,columnFilters,monthStart,monthEnd);
|
||||
if(selectedStage==null||selectedStage.equals("bright"))createStageSheet(workbook, headerStyle, "亮片", "fact_bright", selectedRelease, year, month, quarter,
|
||||
department, group, product, projectGroup, includeUnassigned, allowedFields, actor, extraFilters, productSearch,columnFilters);
|
||||
department, group, product, projectGroup, includeUnassigned, allowedFields, actor, extraFilters, productSearch,columnFilters,monthStart,monthEnd);
|
||||
try (var stream = Files.newOutputStream(output)) {
|
||||
workbook.write(stream);
|
||||
}
|
||||
@@ -112,12 +115,12 @@ public class RecordsWorkbookExportService {
|
||||
String releaseId, Integer year, Integer month, Integer quarter, String department,
|
||||
String group, String product, String projectGroup, boolean includeUnassigned,
|
||||
Set<String> allowedFields, AppUserPrincipal actor, Map<String,List<String>> extraFilters,
|
||||
String productSearch,List<Map<String,Object>> columnFilters) throws IOException {
|
||||
String productSearch,List<Map<String,Object>> columnFilters,Integer monthStart,Integer monthEnd) throws IOException {
|
||||
Sheet sheet = workbook.createSheet(sheetName);
|
||||
LinkedHashSet<String> rawFields = new LinkedHashSet<>();
|
||||
if (releaseId != null) {
|
||||
QueryScope rawScope = queryScope(fact, releaseId, year, month, quarter, department, group, product,
|
||||
projectGroup, includeUnassigned, "f.raw_values", actor, extraFilters, productSearch,columnFilters);
|
||||
projectGroup, includeUnassigned, "f.raw_values", actor, extraFilters, productSearch,columnFilters,monthStart,monthEnd);
|
||||
scan(rawScope, rs -> rawFields.addAll(visibleRaw(readJson(rs.getString(1)), allowedFields).keySet()));
|
||||
}
|
||||
boolean showOrderType=SalesOrderTypes.allowed(allowedFields);
|
||||
@@ -141,7 +144,7 @@ public class RecordsWorkbookExportService {
|
||||
QueryScope rowScope = queryScope(fact, releaseId, year, month, quarter, department, group, product,
|
||||
projectGroup, includeUnassigned,
|
||||
"sr.source_file, f.sheet_name, f.physical_row_no, sr.id AS source_revision_id, f.month_key, " +
|
||||
"f.department, f.group_name, f.project_group, f.product, f.raw_values", actor, extraFilters, productSearch,columnFilters);
|
||||
"f.department, f.group_name, f.project_group, f.product, f.raw_values", actor, extraFilters, productSearch,columnFilters,monthStart,monthEnd);
|
||||
int[] rowIndex = {1};
|
||||
scan(rowScope, rs -> writeRow(sheet, rowIndex, rs, rawFields, allowedFields,showOrderType));
|
||||
}
|
||||
@@ -149,11 +152,11 @@ public class RecordsWorkbookExportService {
|
||||
private QueryScope queryScope(String fact, String releaseId, Integer year, Integer month, Integer quarter,
|
||||
String department, String group, String product, String projectGroup,
|
||||
boolean includeUnassigned, String select, AppUserPrincipal actor, Map<String,List<String>> extraFilters,
|
||||
String productSearch,List<Map<String,Object>> columnFilters) {
|
||||
String productSearch,List<Map<String,Object>> columnFilters,Integer monthStart,Integer monthEnd) {
|
||||
StringBuilder predicate = new StringBuilder(" WHERE rm.release_id = ?");
|
||||
List<Object> args = new ArrayList<>();
|
||||
args.add(releaseId);
|
||||
RecordController.appendPeriodFilters(predicate, args, year, month, quarter);
|
||||
RecordController.appendPeriodFilters(predicate, args, year, month, quarter, monthStart, monthEnd);
|
||||
SelectionValues.appendPredicate(predicate, args, "f.department", department, DepartmentLabels::queryValue);
|
||||
SelectionValues.appendPredicate(predicate, args, "f.group_name", group, value -> value);
|
||||
SelectionValues.appendPredicate(predicate, args, "f.product", product, value -> value);
|
||||
|
||||
@@ -160,7 +160,7 @@ class AnalysisChangesServiceTest {
|
||||
void rejectsOutOfRangeLimitsBeforeQueryingMetrics() {
|
||||
authorize(Set.of("*"));
|
||||
assertThrows(org.springframework.web.server.ResponseStatusException.class,
|
||||
() -> service.query(request("product", "rate_drop", 11), actor));
|
||||
() -> service.query(request("product", "rate_drop", 101), actor));
|
||||
verifyNoInteractions(metrics);
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
package cn.yunsheng.quality.analysis;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
import static org.mockito.Mockito.*;
|
||||
import cn.yunsheng.quality.governance.GovernanceAccessService;
|
||||
import cn.yunsheng.quality.identity.AppUserPrincipal;
|
||||
import cn.yunsheng.quality.metrics.MetricsService;
|
||||
import cn.yunsheng.quality.metrics.MetricsResponseAccess;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.*;
|
||||
import java.util.function.Supplier;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.web.server.ResponseStatusException;
|
||||
|
||||
class DefectDrilldownControllerTest {
|
||||
@Test void policyChangesDuringSnapshotCannotReleaseRemovedSourceFields() {
|
||||
var metrics=mock(MetricsService.class);var fine=mock(AnalysisFineDefectsService.class);var access=mock(GovernanceAccessService.class);
|
||||
var actor=new AppUserPrincipal(UUID.randomUUID(),"test","","测试",true,false,List.of("SYSTEM_ADMIN"),List.of("*"),List.of("*"),List.of());
|
||||
when(access.allowedFields(actor)).thenReturn(Set.of("*"));when(access.policy(actor.getId().toString())).thenReturn(Map.of("detailAllowed",true));
|
||||
var stage=new MetricsService.MetricStage(new BigDecimal("90"),BigDecimal.TEN,new BigDecimal("100"),new BigDecimal(".9"),List.of(new MetricsService.DefectRow("加工废",BigDecimal.TEN,BigDecimal.ONE)),BigDecimal.ZERO,new BigDecimal(".9"));
|
||||
var row=new MetricsService.TrendMetricRow("2026-01","2026-01","1月",null,null,null,null,null,stage,stage,Map.of(),null);
|
||||
var snapshot=new MetricsService.MetricTrendSnapshot(Map.of("id","release"),Map.of(),List.of(row),Map.of());
|
||||
var raw=Map.<String,Object>of("releaseId","release","fields",List.of(Map.of("key","加工缺角重量","label","加工缺角重量")),"groups",Map.of("2026-01",Map.of("rows",List.of(Map.of("key","加工缺角重量","weight",BigDecimal.ONE)))));
|
||||
when(fine.grouped(anyMap(),eq(actor),eq("period"),eq("month"))).thenReturn(raw);
|
||||
when(metrics.calculatePairedSnapshot(any(),eq(actor),eq(true),any())).thenAnswer(call->{
|
||||
Object result=((Supplier<?>)call.getArgument(3)).get();
|
||||
when(access.allowedFields(actor)).thenReturn(Set.of("bright_total_weight","bright_processing_scrap"));
|
||||
return new MetricsService.PairedSnapshot<>(null,snapshot,result);
|
||||
});
|
||||
var controller=new DefectDrilldownController(fine,metrics,new MetricsResponseAccess(access),access);
|
||||
var response=controller.query(Map.of("releaseId","release","stage","bright","category","加工废","dimension","period","year",2026),actor);
|
||||
assertTrue(((List<?>)response.get("fields")).isEmpty());
|
||||
var group=(Map<?,?>)((List<?>)response.get("groups")).getFirst();
|
||||
assertTrue(((List<?>)group.get("children")).isEmpty());assertEquals(new BigDecimal("100"),group.get("totalWeight"));
|
||||
verify(access,times(2)).requireDetail(actor);
|
||||
}
|
||||
@Test void deniedDetailOrInvalidDimensionCannotStartEitherScan() {
|
||||
var metrics=mock(MetricsService.class);var fine=mock(AnalysisFineDefectsService.class);var access=mock(GovernanceAccessService.class);var actor=mock(AppUserPrincipal.class);
|
||||
var controller=new DefectDrilldownController(fine,metrics,new MetricsResponseAccess(access),access);
|
||||
assertThrows(ResponseStatusException.class,()->controller.query(Map.of("dimension","sql-injection"),actor));
|
||||
doThrow(new ResponseStatusException(HttpStatus.FORBIDDEN)).when(access).requireDetail(actor);
|
||||
assertThrows(ResponseStatusException.class,()->controller.query(Map.of(),actor));verifyNoInteractions(metrics,fine);
|
||||
}
|
||||
}
|
||||
@@ -97,6 +97,20 @@ class FineDefectRollupsMySqlTest {
|
||||
verify(jdbc, never()).query(any(PreparedStatementCreator.class), any(ResultSetExtractor.class));
|
||||
}
|
||||
|
||||
@Test void groupedDrilldownMatchesRawAcrossPeriodsObjectsAndRestrictedFieldsWithoutFactScans() {
|
||||
for(String dimension:List.of("period","overall","department","group","product","projectGroup")) {
|
||||
for(String granularity:List.of("month","quarter","year")) {
|
||||
var input=request("black",Map.of("category","责废"));
|
||||
var expected=source.grouped(input,actor,dimension,granularity);clearInvocations(jdbc);
|
||||
assertEquals(canonical(expected),canonical(fast.grouped(input,actor,dimension,granularity)),dimension+granularity);
|
||||
verify(jdbc,never()).query(any(PreparedStatementCreator.class),any(ResultSetExtractor.class));
|
||||
}
|
||||
}
|
||||
when(governance.allowedFields(actor)).thenReturn(Set.of("责废尺寸重量"));
|
||||
var input=request("black",Map.of("category","责废"));input.remove("year");
|
||||
assertEquals(canonical(source.grouped(input,actor,"period","year")),canonical(fast.grouped(input,actor,"period","year")));
|
||||
}
|
||||
|
||||
@Test void exactWeightsCountsReconciliationAndAllStandardScopesMatchTheSourceWithoutScanningFacts() {
|
||||
for (String stage : List.of("black", "bright")) {
|
||||
for (Map<String,Object> scope : List.<Map<String,Object>>of(Map.of(), Map.of("month", 1), Map.of("quarter", 1),
|
||||
|
||||
@@ -284,6 +284,112 @@ class SourceColumnQueriesMySqlTest {
|
||||
}
|
||||
}
|
||||
|
||||
@Test void continuousRangeDetailsAndBothExcelSheetsExcludeOutsideMonthsAndUnauthorizedRows() throws Exception {
|
||||
var releases=mock(cn.yunsheng.quality.release.ReleaseService.class);
|
||||
when(releases.resolvePublishedRelease(RELEASE)).thenReturn(RELEASE);
|
||||
var mapper=JsonMapper.builder().build();
|
||||
for(String stage:List.of("black","bright")) {
|
||||
jdbc.execute("ALTER TABLE fact_"+stage+" ADD qualified_weight DECIMAL(28,10),ADD scrap_weight DECIMAL(28,10),ADD total_weight DECIMAL(28,10),ADD components JSON,ADD sheet_name VARCHAR(80),ADD physical_row_no INT");
|
||||
jdbc.update("UPDATE fact_"+stage+" SET qualified_weight=90,scrap_weight=10,total_weight=100,components=JSON_OBJECT(),sheet_name='fixture',physical_row_no=id");
|
||||
String revision=stage.equals("black")?BLACK_REVISION:BRIGHT_REVISION;
|
||||
for(String month:List.of("2026-03","2026-09","2026-10","2025-03")) {
|
||||
insert(stage,"build-"+stage,revision,"部门A","组A","{\"委托单\":\"range-row\"}");
|
||||
jdbc.update("UPDATE fact_"+stage+" SET month_key=?,components=JSON_OBJECT(),sheet_name='fixture',physical_row_no=id ORDER BY id DESC LIMIT 1",month);
|
||||
insert(stage,"build-"+stage,revision,"部门B","组B","{\"委托单\":\"hidden-range-row\"}");
|
||||
jdbc.update("UPDATE fact_"+stage+" SET month_key=? ORDER BY id DESC LIMIT 1",month);
|
||||
}
|
||||
}
|
||||
var exporter=new cn.yunsheng.quality.records.RecordsWorkbookExportService(jdbc,releases,governance,mapper);
|
||||
var records=new cn.yunsheng.quality.records.RecordController(jdbc,releases,mapper,governance,exporter);
|
||||
for(String stage:List.of("black","bright")) {
|
||||
var detail=records.recordsRangeFiltered(stage,2026,null,null,null,null,"P-1",null,null,true,RELEASE,1,50,null,null,null,"asc",null,null,null,3,9,actor);
|
||||
assertEquals(2L,((Number)detail.get("total")).longValue());
|
||||
var rows=(List<Map<String,Object>>)detail.get("rows");assertEquals(2,rows.size());
|
||||
assertEquals(Set.of("2026-03","2026-09"),rows.stream().map(row->row.get("month")).collect(java.util.stream.Collectors.toSet()));
|
||||
assertTrue(rows.stream().allMatch(row->"部门A".equals(row.get("department"))));
|
||||
}
|
||||
var file=exporter.exportRangeFiltered(2026,null,null,null,null,"P-1",null,true,RELEASE,actor,Map.of(),null,null,List.of(),3,9);
|
||||
try(var book=org.apache.poi.ss.usermodel.WorkbookFactory.create(file.toFile())) {
|
||||
assertEquals(2,book.getNumberOfSheets());
|
||||
for(var sheet:book) {
|
||||
assertEquals(2,sheet.getLastRowNum());
|
||||
var months=new java.util.HashSet<String>();
|
||||
for(int row=1;row<=sheet.getLastRowNum();row++) {
|
||||
months.add(sheet.getRow(row).getCell(4).getStringCellValue());
|
||||
assertEquals("部门A",sheet.getRow(row).getCell(5).getStringCellValue());
|
||||
assertEquals("P-1",sheet.getRow(row).getCell(8).getStringCellValue());
|
||||
}
|
||||
assertEquals(Set.of("2026-03","2026-09"),months);
|
||||
}
|
||||
} finally {java.nio.file.Files.deleteIfExists(file);}
|
||||
}
|
||||
|
||||
@Test void defectDrilldownUsesOfficialDenominatorsAcrossPeriodsObjectsAndCurrentPermissions() throws Exception {
|
||||
when(governance.allowedFields(actor)).thenReturn(Set.of("*"));
|
||||
when(governance.policy(actor.getId().toString())).thenReturn(Map.of("detailAllowed",true));
|
||||
jdbc.execute("CREATE TABLE data_release(id CHAR(36) PRIMARY KEY,name VARCHAR(80),status VARCHAR(24),rule_version VARCHAR(80))");
|
||||
jdbc.update("INSERT INTO data_release VALUES (?, 'fixture','PUBLISHED',NULL)",RELEASE);
|
||||
jdbc.execute("ALTER TABLE data_release ADD published_at TIMESTAMP NULL,ADD mapping_version VARCHAR(100)");
|
||||
jdbc.execute("CREATE TABLE transform_build(id CHAR(36),source_revision_id CHAR(36))");
|
||||
jdbc.update("INSERT INTO transform_build VALUES ('build-bright',?)",BRIGHT_REVISION);
|
||||
jdbc.update("INSERT INTO transform_build VALUES ('build-black',?)",BLACK_REVISION);
|
||||
jdbc.execute("CREATE TABLE metric_rollup_build(build_id CHAR(36))");
|
||||
for(String stage:List.of("black","bright")) {
|
||||
jdbc.execute("DELETE FROM fact_"+stage);
|
||||
jdbc.execute("ALTER TABLE fact_"+stage+" ADD qualified_weight DECIMAL(28,10),ADD scrap_weight DECIMAL(28,10),ADD total_weight DECIMAL(28,10),ADD components JSON,ADD sheet_name VARCHAR(80),ADD physical_row_no INT");
|
||||
}
|
||||
jdbc.execute("CREATE TABLE metric_rollup LIKE fact_black");
|
||||
jdbc.execute("ALTER TABLE metric_rollup ADD stage VARCHAR(10),ADD source_row_count BIGINT,ADD excluded_blank_rows BIGINT,ADD unmapped_rows BIGINT,ADD project_unconfigured_rows BIGINT");
|
||||
String[] months={"2026-01","2026-02","2026-03","2026-04","2025-01"};
|
||||
int[] total={100,200,100,0,100};int[] child={2,6,0,0,7};int[] parent={10,20,5,0,10};
|
||||
for(int i=0;i<months.length;i++) {
|
||||
var raw=new java.util.LinkedHashMap<String,Object>();
|
||||
for(String key:List.of("加工缺角重量","加工磕边重量","加工烂毛重量","加工尺寸超差重量","加工刀丝歪角重量","加工磁化方向错重量","加工隐裂重量","加工错重量","加工其他重量"))raw.put(key,0);
|
||||
raw.put("加工缺角重量",i==2?null:child[i]);raw.put("加工磕边重量",parent[i]-child[i]);
|
||||
insert("bright","build-bright",BRIGHT_REVISION,"部门A","组A",JsonMapper.builder().build().writeValueAsString(raw));
|
||||
jdbc.update("UPDATE fact_bright SET month_key=?,qualified_weight=?,scrap_weight=?,total_weight=?,components=?,sheet_name='fixture',physical_row_no=id ORDER BY id DESC LIMIT 1",months[i],total[i]-parent[i],parent[i],total[i],"{\"bright_processing_scrap\":"+parent[i]+"}");
|
||||
}
|
||||
insert("bright","build-bright",BRIGHT_REVISION,"部门B","组B","{\"加工缺角重量\":999}");
|
||||
jdbc.update("UPDATE fact_bright SET qualified_weight=1,scrap_weight=999,total_weight=1000,components=JSON_OBJECT('bright_processing_scrap',999) ORDER BY id DESC LIMIT 1");
|
||||
var releases=mock(cn.yunsheng.quality.release.ReleaseService.class);when(releases.resolvePublishedRelease(RELEASE)).thenReturn(RELEASE);
|
||||
var mapper=JsonMapper.builder().build();var fine=new cn.yunsheng.quality.analysis.AnalysisFineDefectsService(jdbc,releases,governance,mapper);fine.setSourceColumns(queries);
|
||||
var metrics=new cn.yunsheng.quality.metrics.MetricsService(jdbc,governance);
|
||||
var controller=new cn.yunsheng.quality.analysis.DefectDrilldownController(fine,metrics,new cn.yunsheng.quality.metrics.MetricsResponseAccess(governance),governance);
|
||||
var input=new java.util.LinkedHashMap<String,Object>(Map.of("releaseId",RELEASE,"year",2026,"stage","bright","category","加工废","dimension","period","trendGranularity","month"));
|
||||
var monthly=controller.query(input,actor);var groups=(List<Map<String,Object>>)monthly.get("groups");assertEquals(4,groups.size());
|
||||
java.util.function.Function<Map<String,Object>,Object> rate=g->((List<Map<String,Object>>)g.get("children")).stream().filter(c->c.get("key").equals("加工缺角重量")).findFirst().orElseThrow().get("rate");
|
||||
assertEquals(0,new java.math.BigDecimal("0.02").compareTo((java.math.BigDecimal)rate.apply(groups.get(0))));
|
||||
assertEquals(0,new java.math.BigDecimal("0.03").compareTo((java.math.BigDecimal)rate.apply(groups.get(1))));
|
||||
assertNull(rate.apply(groups.get(2)));assertNull(rate.apply(groups.get(3)));
|
||||
input.put("trendGranularity","quarter");var quarter=(List<Map<String,Object>>)controller.query(input,actor).get("groups");
|
||||
assertEquals(0,new java.math.BigDecimal("0.02").compareTo((java.math.BigDecimal)rate.apply(quarter.get(0)))); // 8 / 400, never average monthly percentages.
|
||||
input.put("dimension","product");var products=(List<Map<String,Object>>)controller.query(input,actor).get("groups");assertEquals(1,products.size());assertEquals("P-1",products.getFirst().get("key"));
|
||||
input.put("dimension","period");input.put("trendGranularity","year");input.remove("year");assertEquals(2,((List<?>)controller.query(input,actor).get("groups")).size());
|
||||
for(String product:new String[]{"",null}) {
|
||||
insert("bright","build-bright",BRIGHT_REVISION,"部门A","组A","{\"加工缺角重量\":4}");
|
||||
jdbc.update("UPDATE fact_bright SET product=?,qualified_weight=?,scrap_weight=4,total_weight=?,components=JSON_OBJECT('bright_processing_scrap',4) ORDER BY id DESC LIMIT 1",product,product==null?396:96,product==null?400:100);
|
||||
}
|
||||
input.put("year",2026);input.put("dimension","product");
|
||||
var unassigned=(List<Map<String,Object>>)controller.query(input,actor).get("groups");
|
||||
var emptyGroup=unassigned.stream().filter(g->"".equals(g.get("key"))).findFirst().orElseThrow();
|
||||
var nullGroup=unassigned.stream().filter(g->"__UNASSIGNED__".equals(g.get("key"))).findFirst().orElseThrow();
|
||||
assertEquals(0,new java.math.BigDecimal("0.04").compareTo((java.math.BigDecimal)rate.apply(emptyGroup)));
|
||||
assertEquals(0,new java.math.BigDecimal("0.01").compareTo((java.math.BigDecimal)rate.apply(nullGroup)));
|
||||
jdbc.update("UPDATE fact_bright SET department='质量管理部' WHERE department='部门A'");
|
||||
var allActor=new AppUserPrincipal(UUID.randomUUID(),"alias-test","","测试",true,false,List.of("SYSTEM_ADMIN"),List.of("*"),List.of("*"),List.of());
|
||||
when(governance.allowedFields(allActor)).thenReturn(Set.of("*"));when(governance.policy(allActor.getId().toString())).thenReturn(Map.of("detailAllowed",true));
|
||||
input.put("dimension","department");
|
||||
var departments=(List<Map<String,Object>>)controller.query(input,allActor).get("groups");
|
||||
var quality=departments.stream().filter(g->"质量中心".equals(g.get("key"))).findFirst().orElseThrow();
|
||||
assertFalse(((List<?>)quality.get("children")).isEmpty());
|
||||
jdbc.update("UPDATE fact_bright SET department='部门A' WHERE department='质量管理部'");
|
||||
input.put("dimension","period");
|
||||
when(governance.allowedFields(actor)).thenReturn(Set.of("加工缺角重量"));
|
||||
var restricted=(List<Map<String,Object>>)controller.query(input,actor).get("groups");assertTrue(restricted.stream().allMatch(g->g.get("totalWeight")==null&&g.get("parentWeight")==null&&rate.apply(g)==null));
|
||||
doThrow(new ResponseStatusException(org.springframework.http.HttpStatus.FORBIDDEN)).when(governance).requireDetail(actor);
|
||||
assertThrows(ResponseStatusException.class,()->controller.query(input,actor));
|
||||
}
|
||||
|
||||
private void schema() {
|
||||
jdbc.execute("CREATE TABLE release_member(release_id CHAR(36),source_document_id CHAR(36),source_revision_id CHAR(36),transform_build_id CHAR(36),PRIMARY KEY(release_id,source_document_id))");
|
||||
jdbc.execute("CREATE TABLE source_revision(id CHAR(36) PRIMARY KEY,source_file VARCHAR(190))");
|
||||
|
||||
@@ -2,6 +2,7 @@ package cn.yunsheng.quality.metrics;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.ArgumentMatchers.contains;
|
||||
@@ -66,6 +67,28 @@ class MetricsServiceSnapshotTest {
|
||||
assertTrue(!TransactionSynchronizationManager.isActualTransactionActive());
|
||||
}
|
||||
|
||||
@Test
|
||||
void pairedFormalAndSourceReadsShareOneSnapshotAndSupplierFailureRollsItBack() {
|
||||
RecordingTransactionManager manager=new RecordingTransactionManager();
|
||||
JdbcTemplate jdbc=mock(JdbcTemplate.class);GovernanceAccessService governance=mock(GovernanceAccessService.class);
|
||||
MetricsService service=new MetricsService(jdbc,governance,manager);
|
||||
when(jdbc.queryForObject(contains("metric_rollup_build"),eq(Integer.class),any(Object[].class))).thenAnswer(call->{assertTrue(TransactionSynchronizationManager.isActualTransactionActive());return 0;});
|
||||
when(jdbc.query(anyString(),any(RowMapper.class),any(Object[].class))).thenAnswer(call->{
|
||||
assertTrue(!TransactionSynchronizationManager.isActualTransactionActive());
|
||||
RowMapper<?> mapper=call.getArgument(1);ResultSet rs=mock(ResultSet.class);
|
||||
when(rs.getString(1)).thenReturn("release-1");when(rs.getString(2)).thenReturn("current");when(rs.getString(3)).thenReturn("ACTIVE");return List.of(mapper.mapRow(rs,0));
|
||||
});
|
||||
doAnswer(call->{assertTrue(TransactionSynchronizationManager.isActualTransactionActive());return null;}).when(jdbc).query(anyString(),any(RowCallbackHandler.class),any(Object[].class));
|
||||
var actor=new AppUserPrincipal(UUID.randomUUID(),"reader","unused","Reader",true,false,List.of("SYSTEM_ADMIN"),List.of("*"),List.of("*"),List.of());
|
||||
var query=new MetricsService.MetricsQuery(Integer.valueOf(2026),null,null,null,null,null,null,"overall",true,"release-1");
|
||||
var paired=service.calculatePairedSnapshot(query,actor,false,()->{
|
||||
assertTrue(TransactionSynchronizationManager.isActualTransactionActive());assertEquals(1,manager.beginCount);return "source";
|
||||
});
|
||||
assertEquals("source",paired.source());assertEquals("release-1",paired.metrics().release().get("id"));assertTrue(!TransactionSynchronizationManager.isActualTransactionActive());
|
||||
assertThrows(IllegalStateException.class,()->service.calculatePairedSnapshot(query,actor,false,()->{assertTrue(TransactionSynchronizationManager.isActualTransactionActive());throw new IllegalStateException("fixture");}));
|
||||
assertEquals(2,manager.beginCount);assertEquals(1,manager.rollbackCount);assertTrue(!TransactionSynchronizationManager.isActualTransactionActive());
|
||||
}
|
||||
|
||||
@Test
|
||||
void governanceSnapshotStartsRepeatableReadOrJoinsTheExistingWriteTransaction() {
|
||||
RecordingTransactionManager transactionManager = new RecordingTransactionManager();
|
||||
@@ -98,6 +121,7 @@ class MetricsServiceSnapshotTest {
|
||||
private int isolationLevel;
|
||||
private int propagationBehavior;
|
||||
private int beginCount;
|
||||
private int rollbackCount;
|
||||
private boolean active;
|
||||
|
||||
@Override protected Object doGetTransaction() { return this; }
|
||||
@@ -113,6 +137,6 @@ class MetricsServiceSnapshotTest {
|
||||
|
||||
@Override protected void doCommit(DefaultTransactionStatus status) { active = false; }
|
||||
|
||||
@Override protected void doRollback(DefaultTransactionStatus status) { active = false; }
|
||||
@Override protected void doRollback(DefaultTransactionStatus status) { active = false; rollbackCount++; }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,81 @@
|
||||
package cn.yunsheng.quality.records;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
import static org.mockito.Mockito.*;
|
||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
|
||||
|
||||
import cn.yunsheng.quality.governance.GovernanceAccessService;
|
||||
import cn.yunsheng.quality.identity.AppUserPrincipal;
|
||||
import cn.yunsheng.quality.release.ReleaseService;
|
||||
import java.sql.PreparedStatement;
|
||||
import java.util.*;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.core.MethodParameter;
|
||||
import org.springframework.jdbc.core.*;
|
||||
import org.springframework.test.web.servlet.MockMvc;
|
||||
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
|
||||
import org.springframework.web.bind.support.WebDataBinderFactory;
|
||||
import org.springframework.web.context.request.NativeWebRequest;
|
||||
import org.springframework.web.method.support.*;
|
||||
import tools.jackson.databind.json.JsonMapper;
|
||||
|
||||
class RecordRangeHttpTest {
|
||||
final JdbcTemplate jdbc=mock(JdbcTemplate.class);
|
||||
final GovernanceAccessService access=mock(GovernanceAccessService.class);
|
||||
final AppUserPrincipal actor=mock(AppUserPrincipal.class);
|
||||
final List<String> queries=new ArrayList<>();
|
||||
final List<List<Object>> bindings=new ArrayList<>();
|
||||
MockMvc mvc;
|
||||
|
||||
@BeforeEach void setup() {
|
||||
var releases=mock(ReleaseService.class);
|
||||
when(releases.resolvePublishedRelease("release")).thenReturn("release");
|
||||
when(actor.getRoleCodes()).thenReturn(List.of("USER"));
|
||||
when(actor.getDepartments()).thenReturn(List.of("部门A"));
|
||||
when(actor.getGroups()).thenReturn(List.of("组A"));
|
||||
when(access.allowedFields(actor)).thenReturn(Set.of("原始字段"));
|
||||
when(jdbc.queryForObject(startsWith("SELECT COUNT(*)"),eq(Long.class),any(Object[].class))).thenAnswer(call->{
|
||||
queries.add(call.getArgument(0));bindings.add(Arrays.asList(Arrays.copyOfRange(call.getArguments(),2,call.getArguments().length)));return 0L;
|
||||
});
|
||||
doAnswer(call->{
|
||||
queries.add(call.getArgument(0));var values=new ArrayList<Object>();
|
||||
PreparedStatement statement=mock(PreparedStatement.class);
|
||||
doAnswer(bind->{values.add(bind.getArgument(1));return null;}).when(statement).setObject(anyInt(),any());
|
||||
((PreparedStatementSetter)call.getArgument(1)).setValues(statement);bindings.add(values);return null;
|
||||
}).when(jdbc).query(anyString(),any(PreparedStatementSetter.class),any(RowCallbackHandler.class));
|
||||
var mapper=JsonMapper.builder().build();
|
||||
var exporter=new RecordsWorkbookExportService(jdbc,releases,access,mapper);
|
||||
var controller=new RecordController(jdbc,releases,mapper,access,exporter);
|
||||
mvc=MockMvcBuilders.standaloneSetup(controller).setCustomArgumentResolvers(new HandlerMethodArgumentResolver(){
|
||||
public boolean supportsParameter(MethodParameter p){return p.getParameterType()==AppUserPrincipal.class;}
|
||||
public Object resolveArgument(MethodParameter p,ModelAndViewContainer m,NativeWebRequest r,WebDataBinderFactory b){return actor;}
|
||||
}).build();
|
||||
}
|
||||
|
||||
@Test void listAndBothExportSheetsApplyTheSameRangeAndLiveDataScope() throws Exception {
|
||||
mvc.perform(get("/api/records").param("stage","black").param("year","2026").param("monthStart","3").param("monthEnd","9").param("product","产品A").param("releaseId","release")).andExpect(status().isOk());
|
||||
var result=mvc.perform(get("/api/records/export").param("year","2026").param("monthStart","3").param("monthEnd","9").param("product","产品A").param("releaseId","release")).andReturn();
|
||||
if(result.getRequest().isAsyncStarted())mvc.perform(org.springframework.test.web.servlet.request.MockMvcRequestBuilders.asyncDispatch(result)).andExpect(status().isOk());
|
||||
assertEquals(5,queries.size());
|
||||
for(int i=0;i<queries.size();i++) {
|
||||
assertTrue(queries.get(i).contains("BETWEEN ? AND ?"),queries.get(i));
|
||||
assertEquals(List.of("release","2026-%",3,9,"产品A","部门A","组A"),bindings.get(i));
|
||||
}
|
||||
verify(access,times(2)).requireDetail(actor);verify(access,times(2)).requireBoundAction("QUERY","query.detail");
|
||||
}
|
||||
|
||||
@Test void malformedRangesAreRejectedByListAndExportBeforeAnyRowsAreRead() throws Exception {
|
||||
for(String endpoint:List.of("/api/records","/api/records/export")) {
|
||||
for(String[] bounds:List.of(new String[]{"3",""},new String[]{"9","3"},new String[]{"0","9"},new String[]{"1","13"})) {
|
||||
var request=get(endpoint).param("stage","black").param("year","2026").param("monthStart",bounds[0]).param("releaseId","release");
|
||||
if(!bounds[1].isEmpty())request.param("monthEnd",bounds[1]);
|
||||
mvc.perform(request).andExpect(status().isBadRequest());
|
||||
}
|
||||
mvc.perform(get(endpoint).param("stage","black").param("monthStart","1").param("monthEnd","9").param("releaseId","release")).andExpect(status().isBadRequest());
|
||||
mvc.perform(get(endpoint).param("stage","black").param("year","2026").param("month","3").param("monthStart","1").param("monthEnd","9").param("releaseId","release")).andExpect(status().isBadRequest());
|
||||
}
|
||||
assertTrue(queries.isEmpty());
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user