From c3354c1f644148756eef1dc240cb71fd27b33a91 Mon Sep 17 00:00:00 2001 From: lyun Date: Wed, 4 Nov 2026 00:15:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=BF=AB=E7=85=A7=E5=B9=B6=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=80=89=E6=A1=86=E9=97=AA=E7=83=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 页面快照支持勾选查询条件、指标卡片、趋势、汇总表、不良构成和细分缺陷图,复制PNG或下载;增加取消、分阶段提示和等待超时恢复。 修复公共Select弹层准备帧被opacity覆盖导致的先闪出再展开,并取消查询字段原生label的重复点击转发。 同步已经验收上线的销售订单类型映射、排除筛选及预聚合,以及其线上权限、删除确认配套源码;保留既有公式编辑和名录编码修改。源码范围按发布清单冻结,不纳入本机数据、凭据及未发布工作。 验证:前后端独立源码构建通过;10项前端检查、4项订单分类单元测试通过;实际系统剪贴板粘贴PNG验证通过;线上配置及筛选结果与发布前一致,后端未重启。 --- .../quality/admin/ManagementController.java | 18 +-- .../admin/ManagementMutationController.java | 62 ++++++--- .../quality/admin/TaskActionController.java | 10 +- .../analysis/AnalysisChangesController.java | 2 +- .../quality/analysis/AnalysisController.java | 2 +- .../AnalysisFineDefectsController.java | 2 +- .../analysis/AnalysisFineDefectsService.java | 52 +++++++- .../AnalysisInvestigationController.java | 2 +- .../analysis/AnalysisReportService.java | 2 +- .../analysis/AnalysisReportsController.java | 2 +- .../AnalysisSourceQueryController.java | 2 +- .../analysis/AnalysisToolsController.java | 2 +- .../analysis/AnalysisTurnsController.java | 2 +- .../analysis/AuthorizationFingerprint.java | 4 +- .../analytics/AnalyticsController.java | 8 +- .../analytics/ChecklistsController.java | 10 +- .../ComparisonViewSharingService.java | 4 +- .../analytics/ComparisonViewsController.java | 22 ++-- .../analytics/InspectionController.java | 18 +-- .../quality/analytics/InspectionService.java | 2 +- .../quality/analytics/TargetController.java | 16 +-- .../common/WorkspaceStateController.java | 1 + .../MetricDictionaryController.java | 4 +- .../filters/FilterFieldsController.java | 15 ++- .../quality/filters/QueryFilterFields.java | 36 ++++- .../filters/SalesOrderTypeController.java | 27 ++++ .../filters/SalesOrderTypeService.java | 118 +++++++++++++++++ .../quality/filters/SalesOrderTypes.java | 67 ++++++++++ .../CandidateAcceptanceController.java | 6 +- .../CandidateAcceptanceService.java | 4 +- .../governance/EffectiveAccessController.java | 19 +-- .../governance/GovernanceAccessService.java | 13 ++ .../GovernanceDependencyController.java | 2 +- .../GovernanceIdentityController.java | 10 +- .../GovernanceOperationsController.java | 4 +- .../GovernanceOperationsService.java | 2 +- .../governance/MappingIssueController.java | 6 +- .../governance/RuleRegressionController.java | 2 +- .../SourceGovernanceController.java | 24 ++-- .../quality/governance/TaskRetryService.java | 4 +- .../identity/AdminBootstrapRunner.java | 5 +- .../yunsheng/quality/identity/AppRoles.java | 36 +++++ .../identity/JdbcAppUserDetailsService.java | 4 +- .../ingestion/ImportRunController.java | 2 +- .../ingestion/ImportRunReadController.java | 6 +- .../quality/ingestion/ImportRunService.java | 4 +- .../quality/ingestion/ImportWorker.java | 4 +- .../MasterDataWorkbookController.java | 6 +- .../quality/metrics/MetricsController.java | 4 +- .../quality/metrics/MetricsRollupService.java | 2 + .../quality/metrics/MetricsService.java | 65 +++++---- .../metrics/SalesOrderMetricBackfill.java | 18 +++ .../metrics/SalesOrderMetricRollups.java | 78 +++++++++++ .../quality/options/OptionsController.java | 4 +- .../quality/records/RecordController.java | 15 ++- .../records/RecordsWorkbookExportService.java | 15 ++- .../quality/release/ReleaseController.java | 4 +- .../quality/release/ReleaseService.java | 2 +- .../quality/source/SourceController.java | 6 +- .../source/SourceDeletionController.java | 8 +- .../quality/source/SourceDeletionService.java | 4 +- .../source/SourceUploadController.java | 4 +- .../workflow/DataWorkflowController.java | 18 +-- .../quality/workflow/DataWorkflowService.java | 23 ++-- .../db/migration/V37__user_soft_deletion.sql | 2 + .../db/migration/V38__three_user_roles.sql | 37 ++++++ .../db/migration/V39__sales_order_types.sql | 25 ++++ .../V40__sales_order_fact_indexes.sql | 11 ++ .../V41__sales_order_metric_rollups.sql | 12 ++ .../filters/SalesOrderTypeServiceTest.java | 49 +++++++ .../filters/SalesOrderTypesMySqlTest.java | 100 ++++++++++++++ .../SalesOrderMetricRollupsMySqlTest.java | 96 ++++++++++++++ web/src/AnalyticsCompletion.tsx | 13 +- web/src/CachedWorkspacePages.tsx | 21 ++- web/src/ClassificationRuleEditor.tsx | 4 +- web/src/ExtraQueryFilters.tsx | 37 ++++-- web/src/FilterFieldSettings.tsx | 6 +- web/src/GovernanceCompletion.tsx | 18 +-- web/src/ManagementPages.tsx | 71 +++++----- web/src/NoCodeDataWorkflow.tsx | 24 ++-- web/src/PersonalAccount.tsx | 6 +- web/src/QualityTargetsPanel.tsx | 6 +- web/src/QualityWorkspace.tsx | 6 +- web/src/QueryPage.tsx | 52 +++++--- web/src/QueryPanels.tsx | 8 +- web/src/QuerySnapshotButton.tsx | 80 +++++++++++ web/src/ResultFormulaModal.tsx | 4 +- web/src/RuleSettingsEditor.tsx | 6 +- web/src/SalesOrderTypeSettings.tsx | 45 +++++++ web/src/StageProductPage.tsx | 39 +++--- web/src/StageSourceFilters.tsx | 4 +- web/src/StructuredConfigEditors.tsx | 12 +- web/src/TasksMonitorPage.tsx | 4 +- web/src/api.ts | 18 ++- web/src/management-alignment.css | 2 + web/src/query-motion.css | 3 +- web/src/query-snapshot.css | 11 ++ web/src/querySnapshot.ts | 124 ++++++++++++++++++ web/src/sales-order-types.css | 5 + web/src/salesOrderTypes.ts | 22 ++++ web/src/types.ts | 1 + web/src/useDeleteConfirmation.ts | 31 +++++ web/src/userRoles.ts | 20 +++ web/src/workspace-finish.css | 6 + web/verification/query_snapshot.test.mjs | 35 +++++ web/verification/select_popup_motion.test.mjs | 10 ++ 106 files changed, 1678 insertions(+), 353 deletions(-) create mode 100644 backend/src/main/java/cn/yunsheng/quality/filters/SalesOrderTypeController.java create mode 100644 backend/src/main/java/cn/yunsheng/quality/filters/SalesOrderTypeService.java create mode 100644 backend/src/main/java/cn/yunsheng/quality/filters/SalesOrderTypes.java create mode 100644 backend/src/main/java/cn/yunsheng/quality/identity/AppRoles.java create mode 100644 backend/src/main/java/cn/yunsheng/quality/metrics/SalesOrderMetricBackfill.java create mode 100644 backend/src/main/java/cn/yunsheng/quality/metrics/SalesOrderMetricRollups.java create mode 100644 backend/src/main/resources/db/migration/V37__user_soft_deletion.sql create mode 100644 backend/src/main/resources/db/migration/V38__three_user_roles.sql create mode 100644 backend/src/main/resources/db/migration/V39__sales_order_types.sql create mode 100644 backend/src/main/resources/db/migration/V40__sales_order_fact_indexes.sql create mode 100644 backend/src/main/resources/db/migration/V41__sales_order_metric_rollups.sql create mode 100644 backend/src/test/java/cn/yunsheng/quality/filters/SalesOrderTypeServiceTest.java create mode 100644 backend/src/test/java/cn/yunsheng/quality/filters/SalesOrderTypesMySqlTest.java create mode 100644 backend/src/test/java/cn/yunsheng/quality/metrics/SalesOrderMetricRollupsMySqlTest.java create mode 100644 web/src/QuerySnapshotButton.tsx create mode 100644 web/src/SalesOrderTypeSettings.tsx create mode 100644 web/src/query-snapshot.css create mode 100644 web/src/querySnapshot.ts create mode 100644 web/src/sales-order-types.css create mode 100644 web/src/salesOrderTypes.ts create mode 100644 web/src/useDeleteConfirmation.ts create mode 100644 web/src/userRoles.ts create mode 100644 web/verification/query_snapshot.test.mjs create mode 100644 web/verification/select_popup_motion.test.mjs diff --git a/backend/src/main/java/cn/yunsheng/quality/admin/ManagementController.java b/backend/src/main/java/cn/yunsheng/quality/admin/ManagementController.java index 49d3731..c9c26b2 100644 --- a/backend/src/main/java/cn/yunsheng/quality/admin/ManagementController.java +++ b/backend/src/main/java/cn/yunsheng/quality/admin/ManagementController.java @@ -30,10 +30,10 @@ public class ManagementController { } @GetMapping("/tasks") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','SYSTEM_OPERATOR','DATA_MAINTAINER','DATA_PUBLISHER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map tasks(@RequestParam(defaultValue = "50") int limit,@AuthenticationPrincipal AppUserPrincipal actor) { if (limit < 1 || limit > 200) throw new IllegalArgumentException("limit 必须为 1 到 200"); - boolean all=actor.getRoleCodes().contains("SYSTEM_ADMIN")||actor.getRoleCodes().contains("SYSTEM_OPERATOR"); + boolean all=actor.getRoleCodes().contains("SYSTEM_ADMIN"); List> items = jdbc.query(""" SELECT id, task_type, status, stage, progress, processed, total, payload, result, error_code, error_message, created_at, updated_at,retry_count,max_retries,next_retry_at,retry_parent_id,heartbeat_at @@ -44,10 +44,10 @@ public class ManagementController { /** Read-only summaries; execution endpoints and their permissions remain independent. */ @GetMapping("/tasks/overview") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','SYSTEM_OPERATOR','DATA_MAINTAINER','DATA_PUBLISHER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map taskOverview(@AuthenticationPrincipal AppUserPrincipal actor) { - boolean allTasks=actor.getRoleCodes().contains("SYSTEM_ADMIN")||actor.getRoleCodes().contains("SYSTEM_OPERATOR"); - boolean allWorkflows=actor.getRoleCodes().contains("SYSTEM_ADMIN")||actor.getRoleCodes().contains("DATA_PUBLISHER"); + boolean allTasks=actor.getRoleCodes().contains("SYSTEM_ADMIN"); + boolean allWorkflows=actor.getRoleCodes().contains("SYSTEM_ADMIN")||actor.getRoleCodes().contains("DATA_ADMIN"); String owner=actor.getId().toString(); List> items=new java.util.ArrayList<>(jdbc.query(""" SELECT id,task_type,status,stage,progress,processed,total,payload,error_code,error_message,created_at,updated_at @@ -83,7 +83,7 @@ public class ManagementController { } @GetMapping("/rules") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','RULE_MAINTAINER','QUALITY_VIEWER','BUSINESS_ANALYST','AUDIT_VIEWER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map rules() { List> items = jdbc.query(""" SELECT id, name, status, description, rule_definition, validation, row_version, created_at @@ -104,7 +104,7 @@ public class ManagementController { } @GetMapping("/mappings") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','RULE_MAINTAINER','QUALITY_VIEWER','BUSINESS_ANALYST','AUDIT_VIEWER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") @org.springframework.transaction.annotation.Transactional(readOnly = true) public Map mappings() { List> items = jdbc.query(""" @@ -142,7 +142,7 @@ public class ManagementController { } @GetMapping("/audit") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','AUDIT_VIEWER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN')") public Map audit(@RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "50") int pageSize) { if (page < 1 || pageSize < 1 || pageSize > 200) throw new IllegalArgumentException("分页参数无效"); @@ -171,7 +171,7 @@ public class ManagementController { public Map users() { List users = jdbc.query(""" SELECT id, username, display_name, active, force_password_change, row_version, created_at - FROM app_user ORDER BY username + FROM app_user WHERE deleted_at IS NULL ORDER BY username """, (rs, row) -> new UserRow(UUID.fromString(rs.getString("id")), rs.getString("username"), rs.getString("display_name"), rs.getBoolean("active"), rs.getBoolean("force_password_change"), rs.getLong("row_version"), rs.getTimestamp("created_at").toInstant().toString())); diff --git a/backend/src/main/java/cn/yunsheng/quality/admin/ManagementMutationController.java b/backend/src/main/java/cn/yunsheng/quality/admin/ManagementMutationController.java index 290fa0c..4883dcb 100644 --- a/backend/src/main/java/cn/yunsheng/quality/admin/ManagementMutationController.java +++ b/backend/src/main/java/cn/yunsheng/quality/admin/ManagementMutationController.java @@ -21,6 +21,7 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -31,8 +32,6 @@ import org.springframework.web.server.ResponseStatusException; @RestController @RequestMapping("/api") public class ManagementMutationController { - private static final Set ROLES = Set.of("SYSTEM_ADMIN", "SYSTEM_OPERATOR", "DATA_MAINTAINER", "DATA_PUBLISHER", - "RULE_MAINTAINER", "QUALITY_VIEWER", "BUSINESS_ANALYST", "AUDIT_VIEWER"); private final JdbcTemplate jdbc; private final JsonMapper json; private final PasswordEncoder encoder; @@ -93,7 +92,7 @@ public class ManagementMutationController { if (!targetWillBeAdmin && (activeOtherAdmins == null || activeOtherAdmins == 0)) throw conflict("至少保留一个启用的系统管理员"); int updated = jdbc.update(""" UPDATE app_user SET display_name=?,active=?,force_password_change=?,row_version=row_version+1 - WHERE id=? AND row_version=? + WHERE id=? AND row_version=? AND deleted_at IS NULL """, displayName, request.active(), request.forcePasswordChange(), userId.toString(), request.expectedRowVersion()); if (updated == 0) throw conflict("用户版本已变化,请刷新后重试"); jdbc.update("DELETE FROM app_user_role WHERE user_id=?", userId.toString()); @@ -106,12 +105,45 @@ public class ManagementMutationController { return user(userId.toString()); } + @DeleteMapping("/users/{id}") + @PreAuthorize("hasRole('SYSTEM_ADMIN')") + @Transactional + public Map deleteUser(@PathVariable String id, @RequestBody UserDeleteRequest request, + @AuthenticationPrincipal AppUserPrincipal actor) { + UUID userId = parseId(id); + if (request.expectedRowVersion() == null || request.expectedRowVersion() < 0) throw bad("expectedRowVersion 为必填"); + if (userId.equals(actor.getId())) throw conflict("不能删除当前登录账号"); + // Use the same lock order as account editing so concurrent changes cannot remove all administrators. + jdbc.query(""" + SELECT u.id FROM app_user u JOIN app_user_role r ON r.user_id=u.id + WHERE u.active=TRUE AND r.role_code='SYSTEM_ADMIN' FOR UPDATE + """, (rs, row) -> rs.getString(1)); + List> targets = jdbc.query(""" + SELECT username,row_version FROM app_user WHERE id=? AND deleted_at IS NULL FOR UPDATE + """, (rs, row) -> Map.of("username", rs.getString("username"), "rowVersion", rs.getLong("row_version")), userId.toString()); + if (targets.isEmpty()) throw new ResponseStatusException(HttpStatus.NOT_FOUND, "用户不存在或已删除"); + Map target = targets.getFirst(); + if (((Number) target.get("rowVersion")).longValue() != request.expectedRowVersion()) throw conflict("用户版本已变化,请刷新后重试"); + Integer otherAdmins = jdbc.queryForObject(""" + SELECT COUNT(*) FROM app_user u JOIN app_user_role r ON r.user_id=u.id + WHERE u.active=TRUE AND r.role_code='SYSTEM_ADMIN' AND u.id<>? + """, Integer.class, userId.toString()); + if (otherAdmins == null || otherAdmins == 0) throw conflict("至少保留一个启用的系统管理员"); + jdbc.update(""" + UPDATE app_user SET active=FALSE,deleted_at=CURRENT_TIMESTAMP(6),row_version=row_version+1 + WHERE id=? AND row_version=? AND deleted_at IS NULL + """, userId.toString(), request.expectedRowVersion()); + audit(actor.getId().toString(), "USER_DELETED", "app_user", userId.toString(), + Map.of("username", target.get("username"), "historyRetained", true)); + return Map.of("deleted", true, "id", userId.toString()); + } + @GetMapping("/rules/schema") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','RULE_MAINTAINER','AUDIT_VIEWER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_ADMIN')") public Map ruleSchema(){return cn.yunsheng.quality.ingestion.ConfigurableRuleEngine.schema();} @PostMapping("/rules") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','RULE_MAINTAINER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN')") @Transactional public Map createRule(@RequestBody VersionDraft request, @AuthenticationPrincipal AppUserPrincipal actor) { @@ -125,7 +157,7 @@ public class ManagementMutationController { } @PutMapping("/rules/{id}") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','RULE_MAINTAINER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN')") @Transactional public Map updateRule(@PathVariable String id, @RequestBody VersionDraft request, @AuthenticationPrincipal AppUserPrincipal actor) { @@ -142,7 +174,7 @@ public class ManagementMutationController { } @PostMapping("/rules/{id}/validate") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','RULE_MAINTAINER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN')") @Transactional public Map validateRule(@PathVariable String id, @RequestBody VersionAction request, @AuthenticationPrincipal AppUserPrincipal actor) { @@ -159,7 +191,7 @@ public class ManagementMutationController { } @PostMapping("/rules/{id}/activate") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','RULE_MAINTAINER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN')") @Transactional public Map activateRule(@PathVariable String id, @RequestBody VersionAction request, @AuthenticationPrincipal AppUserPrincipal actor) { @@ -186,7 +218,7 @@ public class ManagementMutationController { } @PostMapping("/mappings") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','RULE_MAINTAINER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") @Transactional public Map createMapping(@RequestBody VersionDraft request, @AuthenticationPrincipal AppUserPrincipal actor) { @@ -201,7 +233,7 @@ public class ManagementMutationController { } @PutMapping("/mappings/{id}") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','RULE_MAINTAINER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") @Transactional public Map updateMapping(@PathVariable String id, @RequestBody VersionDraft request, @AuthenticationPrincipal AppUserPrincipal actor) { @@ -219,7 +251,7 @@ public class ManagementMutationController { } @PostMapping("/mappings/{id}/validate") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','RULE_MAINTAINER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") @Transactional public Map validateMapping(@PathVariable String id, @RequestBody VersionAction request, @AuthenticationPrincipal AppUserPrincipal actor) { @@ -244,7 +276,7 @@ public class ManagementMutationController { } @PostMapping("/mappings/{id}/activate") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','RULE_MAINTAINER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") @Transactional public Map activateMapping(@PathVariable String id, @RequestBody VersionAction request, @AuthenticationPrincipal AppUserPrincipal actor) { @@ -314,10 +346,7 @@ public class ManagementMutationController { } private List validateRoles(List values) { - if (values == null || values.isEmpty()) throw bad("至少选择一个角色"); - List roles = values.stream().distinct().sorted().toList(); - if (!ROLES.containsAll(roles)) throw bad("包含不支持的角色"); - return roles; + return cn.yunsheng.quality.identity.AppRoles.validate(values); } private List normalizeScopes(List values, String kind) { @@ -449,6 +478,7 @@ public class ManagementMutationController { List departments, List groups) {} public record UserUpdateRequest(String displayName, boolean active, boolean forcePasswordChange, List roles, List departments, List groups, Long expectedRowVersion) {} + public record UserDeleteRequest(Long expectedRowVersion) {} public record VersionDraft(String id, String name, String description, Object definition, Long expectedRowVersion) {} public record VersionAction(Long expectedRowVersion,Boolean confirmDifferences,String regressionRunId) { public VersionAction(Long expectedRowVersion){this(expectedRowVersion,false,null);} diff --git a/backend/src/main/java/cn/yunsheng/quality/admin/TaskActionController.java b/backend/src/main/java/cn/yunsheng/quality/admin/TaskActionController.java index 5b3daac..1b777d4 100644 --- a/backend/src/main/java/cn/yunsheng/quality/admin/TaskActionController.java +++ b/backend/src/main/java/cn/yunsheng/quality/admin/TaskActionController.java @@ -40,14 +40,14 @@ public class TaskActionController { } @GetMapping("/{id}") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','SYSTEM_OPERATOR','DATA_MAINTAINER','DATA_PUBLISHER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map get(@PathVariable String id,@AuthenticationPrincipal AppUserPrincipal actor) { authorize(id,actor); return Map.of("task", task(id)); } @GetMapping("/{id}/issues") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','SYSTEM_OPERATOR','DATA_MAINTAINER','DATA_PUBLISHER','AUDIT_VIEWER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map issues(@PathVariable String id,@RequestParam(defaultValue="1") int page,@RequestParam(defaultValue="100") int pageSize,@AuthenticationPrincipal AppUserPrincipal actor) { authorize(id,actor);access.requireDetail(actor);if(page<1||pageSize<1||pageSize>500)throw new IllegalArgumentException("分页参数无效"); Map task = task(id); @@ -72,14 +72,14 @@ public class TaskActionController { } @PostMapping("/{id}/retry") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','SYSTEM_OPERATOR','DATA_MAINTAINER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map retry(@PathVariable String id, @RequestBody RetryRequest request, @AuthenticationPrincipal AppUserPrincipal actor) { return retryService.retry(id,request.idempotencyKey(),request.expectedCurrentReleaseId(),actor); } @PostMapping("/{id}/cancel") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','SYSTEM_OPERATOR','DATA_MAINTAINER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") @Transactional public Map cancel(@PathVariable String id, @RequestBody CancelRequest request, @AuthenticationPrincipal AppUserPrincipal actor) { @@ -123,7 +123,7 @@ public class TaskActionController { if (rows.isEmpty()) throw new ResponseStatusException(HttpStatus.NOT_FOUND, "任务不存在"); return rows.getFirst(); } - private void authorize(String id,AppUserPrincipal actor){String owner=jdbc.queryForObject("SELECT created_by FROM task WHERE id=?",String.class,id);if(!actor.getRoleCodes().contains("SYSTEM_ADMIN")&&!actor.getRoleCodes().contains("SYSTEM_OPERATOR")&&!java.util.Objects.equals(owner,actor.getId().toString()))throw new ResponseStatusException(HttpStatus.FORBIDDEN,"无权访问该任务");} + private void authorize(String id,AppUserPrincipal actor){String owner=jdbc.queryForObject("SELECT created_by FROM task WHERE id=?",String.class,id);if(!actor.getRoleCodes().contains("SYSTEM_ADMIN")&&!java.util.Objects.equals(owner,actor.getId().toString()))throw new ResponseStatusException(HttpStatus.FORBIDDEN,"无权访问该任务");} private Object parse(String value) { if (value == null) return Map.of(); diff --git a/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisChangesController.java b/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisChangesController.java index 5751942..c85d265 100644 --- a/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisChangesController.java +++ b/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisChangesController.java @@ -20,7 +20,7 @@ public class AnalysisChangesController { } @PostMapping("/changes") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map query(@RequestBody Map body, @AuthenticationPrincipal AppUserPrincipal actor) { return changes.query(body, actor); diff --git a/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisController.java b/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisController.java index c4f8c4e..408aaff 100644 --- a/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisController.java +++ b/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisController.java @@ -41,7 +41,7 @@ import tools.jackson.databind.json.JsonMapper; /** AI never computes a KPI or changes data; every tool call uses the shared metric service and current identity. */ @RestController @RequestMapping("/api/analysis") -@PreAuthorize("hasAnyRole('SYSTEM_ADMIN','BUSINESS_ANALYST','QUALITY_VIEWER')") +@PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public class AnalysisController { private final MetricsService metrics; private final AnalysisModelGateway model; diff --git a/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisFineDefectsController.java b/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisFineDefectsController.java index cc075e7..d713eff 100644 --- a/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisFineDefectsController.java +++ b/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisFineDefectsController.java @@ -23,7 +23,7 @@ public class AnalysisFineDefectsController { } @PostMapping - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','BUSINESS_ANALYST','QUALITY_VIEWER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map query(@RequestBody(required = false) Map request, @AuthenticationPrincipal AppUserPrincipal actor) { governance.requireDetail(actor); diff --git a/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisFineDefectsService.java b/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisFineDefectsService.java index 735dab0..25787e6 100644 --- a/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisFineDefectsService.java +++ b/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisFineDefectsService.java @@ -122,6 +122,7 @@ public class AnalysisFineDefectsService { && isAllowed(category.componentCode(), allowed)) componentCodes.add(category.componentCode()); } Aggregator aggregate = new Aggregator(request, visibleFields, categories, componentCodes, json); + Aggregator complement = exclusionComplement(request, input, releaseId, actor, allowed, visibleFields, categories, componentCodes, predicate, args); if (rollups != null && request.dimension().equals("defect") && request.extraFilters().isEmpty() && (!(input.get("columnFilters") instanceof List filters) || filters.isEmpty()) && rollups.read(aggregate, request, allowed, predicate.toString(), args)) { @@ -150,7 +151,43 @@ public class AnalysisFineDefectsService { } return null; }); - return withScope(aggregate.response(request, release), scopeContext); + if (complement != null) complement.subtract(aggregate); + return withScope((complement == null ? aggregate : complement).response(request, release), scopeContext); + } + + /** Exact counters allow subtracting a small excluded set without rescanning all retained raw JSON. */ + private Aggregator exclusionComplement(Request request, Map input, String releaseId, AppUserPrincipal actor, + Set allowed, List fields, List categories, Set components, + StringBuilder predicate, List args) { + String key = cn.yunsheng.quality.filters.SalesOrderTypes.EXCLUDE_KEY; + if (rollups == null || !request.dimension().equals("defect") || !request.extraFilters().keySet().equals(Set.of(key)) + || (input.get("columnFilters") instanceof List filters && !filters.isEmpty())) return null; + var typed = new cn.yunsheng.quality.metrics.SalesOrderMetricRollups(jdbc); + if (!typed.ready(releaseId, request.extraFilters(), false, allowed)) return null; + var baseInput = new LinkedHashMap<>(input); baseInput.remove("extraFilters"); + Request base = parse(baseInput, allowed); + var baseWhere = new StringBuilder(" WHERE rm.release_id = ?"); + var baseArgs = new ArrayList(); baseArgs.add(releaseId); + appendScope(baseWhere, baseArgs, base, baseInput, releaseId, actor); + if (request.productSearch() != null) { baseWhere.append(" AND LOCATE(LOWER(?), LOWER(COALESCE(f.product,''))) > 0"); baseArgs.add(request.productSearch()); } + var countWhere = new StringBuilder(baseWhere); var countArgs = new ArrayList<>(baseArgs); + countWhere.append(" AND f.stage=?"); countArgs.add(request.stage()); + typed.append(countWhere, countArgs, Map.of()); + String countSql = "SELECT COALESCE(SUM(f.source_row_count),0) FROM release_member rm JOIN sales_order_metric_rollup f ON f.build_id=rm.transform_build_id"; + Long total = jdbc.queryForObject(countSql+countWhere, Long.class, countArgs.toArray()); + var retainedWhere = new StringBuilder(countWhere); var retainedArgs = new ArrayList<>(countArgs); + typed.append(retainedWhere, retainedArgs, request.extraFilters()); + Long retained = jdbc.queryForObject(countSql+retainedWhere, Long.class, retainedArgs.toArray()); + if (total == null || retained == null || total-retained > retained) return null; + var all = new Aggregator(request, fields, categories, components, json); + if (!rollups.read(all, request, allowed, baseWhere.toString(), baseArgs)) return null; + var selectedInput = new LinkedHashMap<>(input); + selectedInput.put("extraFilters",Map.of(cn.yunsheng.quality.filters.SalesOrderTypes.KEY,request.extraFilters().get(key))); + Request selected = parse(selectedInput, allowed); + predicate.setLength(0); predicate.append(" WHERE rm.release_id = ?"); args.clear(); args.add(releaseId); + appendScope(predicate, args, selected, selectedInput, releaseId, actor); + if (request.productSearch() != null) { predicate.append(" AND LOCATE(LOWER(?), LOWER(COALESCE(f.product,''))) > 0"); args.add(request.productSearch()); } + return all; } private static boolean hasExtendedScope(Map input) { @@ -502,6 +539,19 @@ public class AnalysisFineDefectsService { } } + void subtract(Aggregator excluded) { + if (excluded.sourceRows > sourceRows) throw new IllegalStateException("排除行数超过来源行数"); + sourceRows -= excluded.sourceRows; + for (var entry : excluded.fieldStats.entrySet()) subtractStats(fieldStats.get(entry.getKey()), entry.getValue()); + for (var entry : excluded.componentStats.entrySet()) subtractStats(componentStats.get(entry.getKey()), entry.getValue()); + excluded.expectedRows.forEach((key,value)->expectedRows.merge(key,-value,Long::sum)); + excluded.expectedWeights.forEach((key,value)->expectedWeights.merge(key,value.negate(),BigDecimal::add)); + } + private static void subtractStats(FieldStats total, FieldStats excluded) { + total.sum=total.sum.subtract(excluded.sum); total.presentRows-=excluded.presentRows; + total.missingRows-=excluded.missingRows; total.invalidRows-=excluded.invalidRows; total.negativeRows-=excluded.negativeRows; + } + Map response(Request request, Map release) { List> rows = new ArrayList<>(request.dimension().equals("defect") ? defectRows() : productRows()); rows.sort(Comparator., BigDecimal>comparing(row -> (BigDecimal) row.get("weight"), diff --git a/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisInvestigationController.java b/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisInvestigationController.java index 4ebca50..2dcbd2c 100644 --- a/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisInvestigationController.java +++ b/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisInvestigationController.java @@ -18,7 +18,7 @@ public class AnalysisInvestigationController { this.access = access; } @PostMapping - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','BUSINESS_ANALYST','QUALITY_VIEWER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map query(@RequestBody Map request, @AuthenticationPrincipal AppUserPrincipal actor) { // Bound service checks can lock their identity row; keep them outside the read-only scan transaction. access.requireBoundAction("QUERY", "query.detail"); diff --git a/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisReportService.java b/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisReportService.java index 1878613..9ed990c 100644 --- a/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisReportService.java +++ b/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisReportService.java @@ -37,7 +37,7 @@ public class AnalysisReportService { private static final int MAX_DUE_PLANS_PER_TICK = 10; private static final int MAX_REPORT_SUBMISSIONS_PER_TICK = 10; private static final long REPORT_LEASE_MINUTES = 5; - private static final Set READER_ROLES = Set.of("SYSTEM_ADMIN", "QUALITY_VIEWER", "BUSINESS_ANALYST"); + private static final Set READER_ROLES = Set.of("SYSTEM_ADMIN", "DATA_ADMIN", "USER"); private final JdbcTemplate jdbc; private final AnalysisTurnService turns; private final JdbcAppUserDetailsService users; diff --git a/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisReportsController.java b/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisReportsController.java index 46fa8c2..572fabb 100644 --- a/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisReportsController.java +++ b/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisReportsController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; /** Periodic reports are exposed alongside the analysis turns they create. */ @RestController @RequestMapping("/api/analysis") -@PreAuthorize("hasAnyRole('SYSTEM_ADMIN','BUSINESS_ANALYST','QUALITY_VIEWER')") +@PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public class AnalysisReportsController { private final AnalysisReportService reports; diff --git a/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisSourceQueryController.java b/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisSourceQueryController.java index 6f5f10e..3b973c7 100644 --- a/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisSourceQueryController.java +++ b/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisSourceQueryController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*; /** Authorized source schema and projected member lists; never accepts SQL. */ @RestController @RequestMapping("/api/analysis/source") -@PreAuthorize("hasAnyRole('SYSTEM_ADMIN','BUSINESS_ANALYST','QUALITY_VIEWER')") +@PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public class AnalysisSourceQueryController { private final SourceColumnQueries columns; private final ReleaseService releases; diff --git a/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisToolsController.java b/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisToolsController.java index e66d8ff..2a0b89b 100644 --- a/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisToolsController.java +++ b/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisToolsController.java @@ -11,7 +11,7 @@ import org.springframework.web.server.ResponseStatusException; @RestController @RequestMapping("/api/analysis/tools") -@PreAuthorize("hasAnyRole('SYSTEM_ADMIN','BUSINESS_ANALYST','QUALITY_VIEWER')") +@PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public class AnalysisToolsController { private final AnalysisExplorationTools tools; public AnalysisToolsController(AnalysisExplorationTools tools) { this.tools = tools; } diff --git a/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisTurnsController.java b/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisTurnsController.java index c402c40..13361de 100644 --- a/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisTurnsController.java +++ b/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisTurnsController.java @@ -17,7 +17,7 @@ import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; /** Durable, cancellable AI turns; model tools are limited to server-side metrics queries. */ @RestController @RequestMapping("/api/analysis") -@PreAuthorize("hasAnyRole('SYSTEM_ADMIN','BUSINESS_ANALYST','QUALITY_VIEWER')") +@PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public class AnalysisTurnsController { private final AnalysisTurnService turns; public AnalysisTurnsController(AnalysisTurnService turns) { this.turns = turns; } diff --git a/backend/src/main/java/cn/yunsheng/quality/analysis/AuthorizationFingerprint.java b/backend/src/main/java/cn/yunsheng/quality/analysis/AuthorizationFingerprint.java index 979c8ef..18f62f7 100644 --- a/backend/src/main/java/cn/yunsheng/quality/analysis/AuthorizationFingerprint.java +++ b/backend/src/main/java/cn/yunsheng/quality/analysis/AuthorizationFingerprint.java @@ -14,8 +14,10 @@ public final class AuthorizationFingerprint { public static String of(AppUserPrincipal user, GovernanceAccessService governance) { Map policy = governance.policy(user.getId().toString()); + List roles = governance.fingerprintRoles(user); + if (roles == null || roles.isEmpty()) roles = user.getRoleCodes(); List values = List.of( - String.join(",", user.getRoleCodes().stream().sorted().toList()), + String.join(",", roles.stream().sorted().toList()), String.join(",", user.getDepartments().stream().sorted().toList()), String.join(",", user.getGroups().stream().sorted().toList()), String.join(",", governance.allowedFields(user).stream().sorted().toList()), diff --git a/backend/src/main/java/cn/yunsheng/quality/analytics/AnalyticsController.java b/backend/src/main/java/cn/yunsheng/quality/analytics/AnalyticsController.java index 3e5c12c..56130b1 100644 --- a/backend/src/main/java/cn/yunsheng/quality/analytics/AnalyticsController.java +++ b/backend/src/main/java/cn/yunsheng/quality/analytics/AnalyticsController.java @@ -71,7 +71,7 @@ public class AnalyticsController { return top(stage, dimension, category, releaseId, year, month, quarter, department, group, product, projectGroup, includeUnassigned, limit, extraFilters, null, actor); } @GetMapping("/top") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map top(@RequestParam String stage, @RequestParam(defaultValue = "category") String dimension, @RequestParam(required = false) String category, @@ -209,7 +209,7 @@ public class AnalyticsController { } @PostMapping("/compare") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map compare(@RequestBody CompareRequest request, @AuthenticationPrincipal AppUserPrincipal actor) { requireQueryDetail(actor); if (request == null || request.current() == null || request.comparison() == null) throw bad("current 与 comparison 两组条件必填"); @@ -284,7 +284,7 @@ public class AnalyticsController { /** Per-object impact for a single stage. Contributions are returned only for a complete, exclusive partition. */ @PostMapping("/impact") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map impact(@RequestBody ImpactRequest request, @AuthenticationPrincipal AppUserPrincipal actor) { requireQueryDetail(actor); if (request == null || request.current() == null || request.comparison() == null) throw bad("current 与 comparison 两组条件必填"); @@ -389,7 +389,7 @@ public class AnalyticsController { } @PostMapping("/structure-decomposition") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map decompose(@RequestBody DecompositionRequest request, @AuthenticationPrincipal AppUserPrincipal actor) { requireQueryDetail(actor); if (request == null || request.current() == null || request.comparison() == null) throw bad("current 与 comparison 两组条件必填"); diff --git a/backend/src/main/java/cn/yunsheng/quality/analytics/ChecklistsController.java b/backend/src/main/java/cn/yunsheng/quality/analytics/ChecklistsController.java index ef94eca..373fa0f 100644 --- a/backend/src/main/java/cn/yunsheng/quality/analytics/ChecklistsController.java +++ b/backend/src/main/java/cn/yunsheng/quality/analytics/ChecklistsController.java @@ -40,7 +40,7 @@ public class ChecklistsController { } @GetMapping - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map list(@AuthenticationPrincipal AppUserPrincipal actor) { requireQueryDetail(actor); List> items = jdbc.query("SELECT id,title,row_version,created_at,updated_at FROM analysis_checklist WHERE owner_user_id=? ORDER BY updated_at DESC", @@ -50,7 +50,7 @@ public class ChecklistsController { } @PostMapping - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map create(@RequestBody CreateRequest request, @AuthenticationPrincipal AppUserPrincipal actor) { requireQueryDetail(actor); if (request == null || request.title() == null || request.title().isBlank() || request.title().length() > 190) throw bad("核查清单名称无效"); @@ -60,7 +60,7 @@ public class ChecklistsController { } @GetMapping("/{id}") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map open(@PathVariable String id, @AuthenticationPrincipal AppUserPrincipal actor) { Checklist checklist = requireOwned(id, actor); requireQueryDetail(actor); @@ -96,7 +96,7 @@ public class ChecklistsController { } @PostMapping("/{id}/items") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map addItem(@PathVariable String id, @RequestBody ItemRequest request, @AuthenticationPrincipal AppUserPrincipal actor) { if (request == null) throw bad("核查项内容必填"); @@ -139,7 +139,7 @@ public class ChecklistsController { } @DeleteMapping("/{id}/items/{itemId}") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map removeItem(@PathVariable String id, @PathVariable String itemId, @AuthenticationPrincipal AppUserPrincipal actor) { requireQueryDetail(actor); diff --git a/backend/src/main/java/cn/yunsheng/quality/analytics/ComparisonViewSharingService.java b/backend/src/main/java/cn/yunsheng/quality/analytics/ComparisonViewSharingService.java index 628923e..6f95e94 100644 --- a/backend/src/main/java/cn/yunsheng/quality/analytics/ComparisonViewSharingService.java +++ b/backend/src/main/java/cn/yunsheng/quality/analytics/ComparisonViewSharingService.java @@ -24,7 +24,7 @@ import org.springframework.web.server.ResponseStatusException; /** Recipient ACLs are valid only while both users retain the authorization captured at grant time. */ @Service public class ComparisonViewSharingService { - private static final Set VIEW_ROLES = Set.of("SYSTEM_ADMIN", "QUALITY_VIEWER", "BUSINESS_ANALYST"); + private static final Set VIEW_ROLES = Set.of("SYSTEM_ADMIN", "DATA_ADMIN", "USER"); private final JdbcTemplate jdbc; private final GovernanceAccessService governance; @@ -49,7 +49,7 @@ public class ComparisonViewSharingService { SELECT DISTINCT u.id, u.username, u.display_name FROM app_user u JOIN app_user_role r ON r.user_id=u.id WHERE u.active=TRUE AND u.id<>? - AND r.role_code IN ('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST') + AND r.role_code IN ('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER') ORDER BY u.display_name, u.id """, (rs, n) -> new Candidate(rs.getString("id"), rs.getString("username"), rs.getString("display_name")), owner.getId().toString()); diff --git a/backend/src/main/java/cn/yunsheng/quality/analytics/ComparisonViewsController.java b/backend/src/main/java/cn/yunsheng/quality/analytics/ComparisonViewsController.java index a4ae66b..027bd3c 100644 --- a/backend/src/main/java/cn/yunsheng/quality/analytics/ComparisonViewsController.java +++ b/backend/src/main/java/cn/yunsheng/quality/analytics/ComparisonViewsController.java @@ -48,7 +48,7 @@ public class ComparisonViewsController { } @GetMapping - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map list(@AuthenticationPrincipal AppUserPrincipal actor) { actor = sharing.currentAuthorized(actor); requireQueryDetail(actor); @@ -64,7 +64,7 @@ public class ComparisonViewsController { } @PostMapping - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map create(@RequestBody ViewRequest request, @AuthenticationPrincipal AppUserPrincipal actor) { actor = sharing.currentAuthorized(actor); requireQueryDetail(actor); @@ -76,7 +76,7 @@ public class ComparisonViewsController { } @GetMapping("/{id}") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map get(@PathVariable String id, @AuthenticationPrincipal AppUserPrincipal actor) { actor = sharing.currentAuthorized(actor); requireQueryDetail(actor); @@ -84,7 +84,7 @@ public class ComparisonViewsController { } @PutMapping("/{id}") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map update(@PathVariable String id, @RequestBody ViewRequest request, @AuthenticationPrincipal AppUserPrincipal actor) { actor = sharing.currentAuthorized(actor); @@ -100,7 +100,7 @@ public class ComparisonViewsController { } @DeleteMapping("/{id}") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map delete(@PathVariable String id, @RequestParam(required = false) Long expectedRowVersion, @AuthenticationPrincipal AppUserPrincipal actor) { actor = sharing.currentAuthorized(actor); @@ -114,7 +114,7 @@ public class ComparisonViewsController { } @PostMapping("/{id}/open") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map open(@PathVariable String id, @AuthenticationPrincipal AppUserPrincipal actor) { actor = sharing.currentAuthorized(actor); requireQueryDetail(actor); @@ -159,25 +159,25 @@ public class ComparisonViewsController { } @GetMapping("/share-candidates") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map shareCandidates(@AuthenticationPrincipal AppUserPrincipal actor) { return Map.of("items", sharing.candidates(actor)); } @GetMapping("/shared") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map sharedViews(@AuthenticationPrincipal AppUserPrincipal actor) { return sharing.sharedViews(actor); } @GetMapping("/{id}/shares") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map shares(@PathVariable String id, @AuthenticationPrincipal AppUserPrincipal actor) { return sharing.sharesForOwner(id, actor); } @PostMapping("/{id}/shares") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map share(@PathVariable String id, @RequestBody ShareRequest request, @AuthenticationPrincipal AppUserPrincipal actor) { return sharing.share(id, request == null ? null : request.recipientUserId(), @@ -185,7 +185,7 @@ public class ComparisonViewsController { } @DeleteMapping("/{id}/shares/{recipientUserId}") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map revokeShare(@PathVariable String id, @PathVariable String recipientUserId, @RequestParam Long expectedRowVersion, @AuthenticationPrincipal AppUserPrincipal actor) { diff --git a/backend/src/main/java/cn/yunsheng/quality/analytics/InspectionController.java b/backend/src/main/java/cn/yunsheng/quality/analytics/InspectionController.java index d2a6e98..6a30d9a 100644 --- a/backend/src/main/java/cn/yunsheng/quality/analytics/InspectionController.java +++ b/backend/src/main/java/cn/yunsheng/quality/analytics/InspectionController.java @@ -25,8 +25,8 @@ import tools.jackson.databind.json.JsonMapper; @RestController @RequestMapping("/api/analytics") public class InspectionController { - private static final List STRATEGY_ROLES = List.of("SYSTEM_ADMIN", "SYSTEM_OPERATOR"); - private static final List RESULT_ROLES = List.of("SYSTEM_ADMIN", "SYSTEM_OPERATOR", "QUALITY_VIEWER", "BUSINESS_ANALYST"); + private static final List STRATEGY_ROLES = List.of("SYSTEM_ADMIN"); + private static final List RESULT_ROLES = List.of("SYSTEM_ADMIN", "DATA_ADMIN", "USER"); private final JdbcTemplate jdbc; private final JsonMapper json; private final InspectionService inspections; @@ -37,11 +37,11 @@ public class InspectionController { } @GetMapping("/inspection-strategies") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','SYSTEM_OPERATOR')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN')") public Map strategies(@AuthenticationPrincipal AppUserPrincipal actor) { return inspections.strategies(actor); } @PostMapping("/inspection-strategies") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','SYSTEM_OPERATOR')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN')") public Map create(@RequestBody StrategyRequest request, @AuthenticationPrincipal AppUserPrincipal actor) { if (request == null || request.name() == null || request.name().isBlank() || request.name().length() > 190) throw bad("巡检策略名称无效"); Map config = validate(request.config()); @@ -52,11 +52,11 @@ public class InspectionController { } @GetMapping("/inspection-strategies/{id}") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','SYSTEM_OPERATOR')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN')") public Map get(@PathVariable String id, @AuthenticationPrincipal AppUserPrincipal actor) { return getStrategy(id, actor); } @PutMapping("/inspection-strategies/{id}") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','SYSTEM_OPERATOR')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN')") public Map update(@PathVariable String id, @RequestBody StrategyRequest request, @AuthenticationPrincipal AppUserPrincipal actor) { if (request == null || request.name() == null || request.name().isBlank() || request.name().length() > 190) throw bad("巡检策略名称无效"); if (request.expectedRowVersion() == null) throw bad("缺少 expectedRowVersion"); @@ -68,7 +68,7 @@ public class InspectionController { } @GetMapping("/inspection-runs") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','SYSTEM_OPERATOR','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map runs(@RequestParam(required = false) String releaseId, @AuthenticationPrincipal AppUserPrincipal actor) { requireResultAccess(actor); @@ -76,7 +76,7 @@ public class InspectionController { } @PostMapping("/inspection-runs/run") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','SYSTEM_OPERATOR','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map run(@RequestBody RunRequest request, @AuthenticationPrincipal AppUserPrincipal actor) { requireResultAccess(actor); if (request == null || request.releaseId() == null || request.releaseId().isBlank()) throw bad("releaseId 必填"); @@ -95,7 +95,7 @@ public class InspectionController { private void requireResultAccess(AppUserPrincipal actor) { if (actor == null || !actor.isEnabled()) throw new ResponseStatusException(HttpStatus.FORBIDDEN, "账号已停用"); governance.requireUserActivePolicy(actor); - if (actor.getRoleCodes().stream().noneMatch(role -> role.equals("QUALITY_VIEWER") || role.equals("BUSINESS_ANALYST"))) + if (actor.getRoleCodes().stream().noneMatch(RESULT_ROLES::contains)) throw new ResponseStatusException(HttpStatus.FORBIDDEN, "巡检结果需要当前业务读取角色"); governance.requireDetail(actor); } diff --git a/backend/src/main/java/cn/yunsheng/quality/analytics/InspectionService.java b/backend/src/main/java/cn/yunsheng/quality/analytics/InspectionService.java index 3851354..44ce907 100644 --- a/backend/src/main/java/cn/yunsheng/quality/analytics/InspectionService.java +++ b/backend/src/main/java/cn/yunsheng/quality/analytics/InspectionService.java @@ -43,7 +43,7 @@ import tools.jackson.databind.json.JsonMapper; /** Deterministic inspection over the trusted metrics service; no row data is sent to a model. */ @Service public class InspectionService { - private static final Set BUSINESS_READ_ROLES = Set.of("QUALITY_VIEWER", "BUSINESS_ANALYST"); + private static final Set BUSINESS_READ_ROLES = Set.of("SYSTEM_ADMIN", "DATA_ADMIN", "USER"); private final JdbcTemplate jdbc; private final JsonMapper json; private final MetricsService metrics; diff --git a/backend/src/main/java/cn/yunsheng/quality/analytics/TargetController.java b/backend/src/main/java/cn/yunsheng/quality/analytics/TargetController.java index 3c04780..4eb13cd 100644 --- a/backend/src/main/java/cn/yunsheng/quality/analytics/TargetController.java +++ b/backend/src/main/java/cn/yunsheng/quality/analytics/TargetController.java @@ -31,7 +31,7 @@ public class TargetController { } @GetMapping("/targets") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map resolve(@RequestParam(required = false) String releaseId, @RequestParam(defaultValue = "COMPOSITE_RATE") String metric, @RequestParam(required = false) Integer year, @@ -55,42 +55,42 @@ public class TargetController { } @GetMapping({"/targets/versions", "/versions"}) - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_PUBLISHER','BUSINESS_ANALYST','QUALITY_VIEWER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map versions() { return targets.listVersions(); } @GetMapping({"/targets/versions/{id}", "/versions/{id}"}) - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_PUBLISHER','RULE_MAINTAINER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map version(@PathVariable String id) { return targets.version(id); } @PostMapping("/targets/versions") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','RULE_MAINTAINER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map create(@RequestBody CreateRequest request, @AuthenticationPrincipal AppUserPrincipal actor) { if (request == null) throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "目标版本名称必填"); return targets.create(request.name(), actor); } @PutMapping({"/targets/versions/{id}", "/versions/{id}"}) - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','RULE_MAINTAINER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map save(@PathVariable String id, @RequestBody TargetVersionService.SaveRequest request) { if (request == null) throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "目标版本内容必填"); return targets.save(id, request); } @PutMapping("/targets/current") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','RULE_MAINTAINER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map saveCurrent(@RequestBody TargetVersionService.SaveRequest request) { return targets.saveCurrent(request); } @PostMapping({"/targets/versions/{id}/validate", "/versions/{id}/validate"}) - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','RULE_MAINTAINER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map validate(@PathVariable String id, @RequestBody VersionAction request) { if (request == null) throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "目标版本行号必填"); return targets.validateVersion(id, request.expectedRowVersion()); } @PostMapping({"/targets/versions/{id}/activate", "/versions/{id}/activate"}) - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_PUBLISHER','RULE_MAINTAINER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map activate(@PathVariable String id, @RequestBody VersionAction request, @AuthenticationPrincipal AppUserPrincipal actor) { if (request == null) throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "目标版本行号必填"); diff --git a/backend/src/main/java/cn/yunsheng/quality/common/WorkspaceStateController.java b/backend/src/main/java/cn/yunsheng/quality/common/WorkspaceStateController.java index b914a4b..d5d6769 100644 --- a/backend/src/main/java/cn/yunsheng/quality/common/WorkspaceStateController.java +++ b/backend/src/main/java/cn/yunsheng/quality/common/WorkspaceStateController.java @@ -39,6 +39,7 @@ public class WorkspaceStateController { 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 * FROM sales_order_type_current ORDER BY dataset_id"), jdbc.queryForList("SELECT id,row_version FROM service_identity ORDER BY id"), jdbc.queryForList("SELECT * FROM service_binding ORDER BY service_type"))); Map result = new LinkedHashMap<>(); diff --git a/backend/src/main/java/cn/yunsheng/quality/dictionary/MetricDictionaryController.java b/backend/src/main/java/cn/yunsheng/quality/dictionary/MetricDictionaryController.java index 107ca81..cd410b1 100644 --- a/backend/src/main/java/cn/yunsheng/quality/dictionary/MetricDictionaryController.java +++ b/backend/src/main/java/cn/yunsheng/quality/dictionary/MetricDictionaryController.java @@ -15,10 +15,10 @@ public class MetricDictionaryController { @PreAuthorize("isAuthenticated()") public Map list() { return service.list(); } @GetMapping("/migration") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','RULE_MAINTAINER','BUSINESS_ANALYST','DATA_PUBLISHER','AUDIT_VIEWER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map migration() { return service.migration(); } @PutMapping("/{code}") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','RULE_MAINTAINER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN')") public Map update(@PathVariable String code, @RequestBody MetricDictionaryService.Edit request, @AuthenticationPrincipal AppUserPrincipal actor) { return service.update(code, request, actor); diff --git a/backend/src/main/java/cn/yunsheng/quality/filters/FilterFieldsController.java b/backend/src/main/java/cn/yunsheng/quality/filters/FilterFieldsController.java index f0cd61b..073a6cc 100644 --- a/backend/src/main/java/cn/yunsheng/quality/filters/FilterFieldsController.java +++ b/backend/src/main/java/cn/yunsheng/quality/filters/FilterFieldsController.java @@ -18,20 +18,20 @@ public class FilterFieldsController { private final ReleaseService releases; public FilterFieldsController(JdbcTemplate jdbc,GovernanceAccessService governance,ReleaseService releases) { this.jdbc=jdbc;this.governance=governance;this.releases=releases; } @GetMapping - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST','DATA_MAINTAINER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public List list(@RequestParam(defaultValue="false") boolean manage,@AuthenticationPrincipal AppUserPrincipal actor) { governance.requireUserActivePolicy(actor); - if(manage && actor.getRoleCodes().stream().anyMatch(r->Set.of("SYSTEM_ADMIN","DATA_MAINTAINER").contains(r)))return new QueryFilterFields(jdbc,governance).all(); + if(manage && actor.getRoleCodes().stream().anyMatch(r->Set.of("SYSTEM_ADMIN", "DATA_ADMIN").contains(r)))return new QueryFilterFields(jdbc,governance).all(); return new QueryFilterFields(jdbc,governance).visible(actor); } @GetMapping("/options") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") - public Map options(@RequestParam String key,@RequestParam(required=false) String search,@AuthenticationPrincipal AppUserPrincipal actor) { + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") + public Map options(@RequestParam String key,@RequestParam(required=false) String search,@RequestParam(required=false) String releaseId,@RequestParam(required=false) String stage,@AuthenticationPrincipal AppUserPrincipal actor) { governance.requireUserActivePolicy(actor);governance.requireBoundAction("QUERY","query.aggregate"); - return new QueryFilterFields(jdbc,governance).options(key,search,releases.resolvePublishedRelease(null),actor); + return new QueryFilterFields(jdbc,governance).options(key,search,releases.resolvePublishedRelease(releaseId),stage,actor); } @GetMapping("/columns") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map> columns(@AuthenticationPrincipal AppUserPrincipal actor) { governance.requireUserActivePolicy(actor); Map> result=new LinkedHashMap<>(); @@ -49,13 +49,14 @@ public class FilterFieldsController { } @PutMapping @Transactional - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public List save(@RequestBody List fields,@AuthenticationPrincipal AppUserPrincipal actor) { governance.requireUserActivePolicy(actor); if(fields==null||fields.size()>20)throw QueryFilterFields.bad("最多配置20个筛选字段"); Set keys=new HashSet<>(),labels=new HashSet<>(); Set allowed=governance.allowedFields(actor); for(var f:fields) { + if(SalesOrderTypes.KEY.equals(f.key())||SalesOrderTypes.EXCLUDE_KEY.equals(f.key()))throw QueryFilterFields.bad("销售订单类型由对应表维护,请勿配置为原始列"); if(f.key()==null||!f.key().matches("[a-zA-Z][a-zA-Z0-9_]{0,63}")||!keys.add(f.key()))throw QueryFilterFields.bad("字段标识无效或重复"); if(f.label()==null||f.label().isBlank()||f.label().length()>80||!labels.add(f.label()))throw QueryFilterFields.bad("名称为空、过长或重复"); for(String column:List.of(f.blackColumn()==null?"":f.blackColumn(),f.brightColumn()==null?"":f.brightColumn())) { diff --git a/backend/src/main/java/cn/yunsheng/quality/filters/QueryFilterFields.java b/backend/src/main/java/cn/yunsheng/quality/filters/QueryFilterFields.java index dcdf2c7..c297342 100644 --- a/backend/src/main/java/cn/yunsheng/quality/filters/QueryFilterFields.java +++ b/backend/src/main/java/cn/yunsheng/quality/filters/QueryFilterFields.java @@ -23,7 +23,10 @@ public class QueryFilterFields { } public List visible(AppUserPrincipal actor) { Set allowed=governance.allowedFields(actor); - return all().stream().filter(Field::enabled).filter(f->allowed.contains("*") || (allowed.contains(f.blackColumn()) && allowed.contains(f.brightColumn()))).toList(); + List fields=new ArrayList<>(all()); + fields.removeIf(f->SalesOrderTypes.KEY.equals(f.key())); + fields.add(new Field(SalesOrderTypes.KEY,SalesOrderTypes.LABEL,"销售订单号","销售订单",true,true,-1)); + return fields.stream().filter(Field::enabled).filter(f->allowed.contains("*") || (allowed.contains(f.blackColumn()) && allowed.contains(f.brightColumn()))).toList(); } public static Map> parse(Object raw) { if(raw==null || "".equals(raw))return Map.of(); @@ -48,8 +51,13 @@ public class QueryFilterFields { if(filters==null || filters.isEmpty())return; Map fields=new HashMap<>(); visible(actor).forEach(f->fields.put(f.key(),f)); for(var entry:filters.entrySet()) { - Field f=fields.get(entry.getKey()); + boolean exclude=SalesOrderTypes.EXCLUDE_KEY.equals(entry.getKey()); + Field f=fields.get(exclude?SalesOrderTypes.KEY:entry.getKey()); if(f==null)throw bad("筛选字段未启用或没有权限:"+entry.getKey()); + if(SalesOrderTypes.KEY.equals(f.key())) { + SalesOrderTypes.append(where,args,stage,entry.getValue(),SalesOrderTypes.version(jdbc),exclude); + continue; + } boolean empty=entry.getValue().contains(EMPTY); if(empty && !f.allowEmpty())throw bad(f.label()+"不允许筛选空值"); String column=stage.equals("black")?f.blackColumn():f.brightColumn(); @@ -69,8 +77,13 @@ public class QueryFilterFields { } } public Map options(String key,String search,String releaseId,AppUserPrincipal actor) { + return options(key,search,releaseId,null,actor); + } + public Map options(String key,String search,String releaseId,String selectedStage,AppUserPrincipal actor) { Field field=visible(actor).stream().filter(f->f.key().equals(key)).findFirst().orElseThrow(()->bad("筛选字段未启用或没有权限")); if(search!=null && search.length()>256)throw bad("搜索文本过长"); + if(selectedStage!=null&&!List.of("black","bright").contains(selectedStage))throw bad("阶段无效"); + if(SalesOrderTypes.KEY.equals(key))return salesOrderOptions(search,releaseId,selectedStage,actor); List args=new ArrayList<>();List selects=new ArrayList<>(); for(String stage:List.of("black","bright")) { String column=stage.equals("black")?field.blackColumn():field.brightColumn(); @@ -85,6 +98,25 @@ public class QueryFilterFields { List found=jdbc.query("SELECT DISTINCT value FROM ("+String.join(" UNION ALL ",selects)+") choices"+predicate+" ORDER BY value LIMIT 201",(rs,n)->rs.getString(1),args.toArray()); return Map.of("values",found.stream().limit(200).toList(),"hasMore",found.size()>200); } + private Map salesOrderOptions(String search,String releaseId,String selectedStage,AppUserPrincipal actor) { + String version=SalesOrderTypes.version(jdbc); + if(releaseId==null||version.isBlank())return Map.of("values",List.of(),"hasMore",false,"versionId",version); + List args=new ArrayList<>();List selects=new ArrayList<>(); + for(String type:SalesOrderTypes.TYPES) { + if(search!=null&&!search.isBlank()&&!type.toLowerCase(Locale.ROOT).contains(search.toLowerCase(Locale.ROOT)))continue; + args.add(type);List exists=new ArrayList<>(); + for(String stage:selectedStage==null?List.of("black","bright"):List.of(selectedStage)) { + StringBuilder scope=new StringBuilder(" WHERE sot.version_id=? AND sot.order_type=? AND rm.release_id=?"); + List scoped=new ArrayList<>(List.of(version,type,releaseId)); + DataScope.append(scope,scoped,actor,"f.department COLLATE utf8mb4_0900_as_cs","f.group_name COLLATE utf8mb4_0900_as_cs"); + exists.add("EXISTS (SELECT 1 FROM sales_order_type_entry sot JOIN fact_"+stage+" f ON f.sales_order_no=sot.order_no JOIN release_member rm ON f.build_id=rm.transform_build_id AND f.source_revision_id=rm.source_revision_id"+scope+")"); + args.addAll(scoped); + } + selects.add("SELECT ? AS value WHERE "+String.join(" OR ",exists)); + } + List values=selects.isEmpty()?List.of():jdbc.query(String.join(" UNION ALL ",selects)+" ORDER BY value",(rs,n)->rs.getString(1),args.toArray()); + return Map.of("values",values,"hasMore",false,"versionId",version); + } public static String path(String column) { return "$."+JSON.writeValueAsString(column); } public static ResponseStatusException bad(String text) { return new ResponseStatusException(HttpStatus.BAD_REQUEST,text); } } diff --git a/backend/src/main/java/cn/yunsheng/quality/filters/SalesOrderTypeController.java b/backend/src/main/java/cn/yunsheng/quality/filters/SalesOrderTypeController.java new file mode 100644 index 0000000..e3f216a --- /dev/null +++ b/backend/src/main/java/cn/yunsheng/quality/filters/SalesOrderTypeController.java @@ -0,0 +1,27 @@ +package cn.yunsheng.quality.filters; + +import cn.yunsheng.quality.governance.GovernanceAccessService; +import cn.yunsheng.quality.identity.AppUserPrincipal; +import java.util.Map; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +@RestController +@RequestMapping("/api/sales-order-types") +@PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") +public class SalesOrderTypeController { + private final SalesOrderTypeService service; + private final GovernanceAccessService governance; + public SalesOrderTypeController(SalesOrderTypeService service,GovernanceAccessService governance) { this.service=service;this.governance=governance; } + private void authorize(AppUserPrincipal actor) { + governance.requireUserActivePolicy(actor); + if(!SalesOrderTypes.allowed(governance.allowedFields(actor)))throw new org.springframework.web.server.ResponseStatusException(org.springframework.http.HttpStatus.FORBIDDEN,"没有销售订单来源字段权限"); + } + @GetMapping public Map status(@AuthenticationPrincipal AppUserPrincipal actor) { authorize(actor);return service.status(); } + @PostMapping("/preview") public Map preview(@RequestParam MultipartFile file,@RequestParam(defaultValue="MERGE") String mode,@AuthenticationPrincipal AppUserPrincipal actor) { authorize(actor);return service.preview(file,mode); } + @PostMapping("/import") public Map importFile(@RequestParam MultipartFile file,@RequestParam String mode,@RequestParam(defaultValue="") String expectedVersion,@RequestParam String sha256,@AuthenticationPrincipal AppUserPrincipal actor) { authorize(actor);return service.importFile(file,mode,expectedVersion,sha256,actor); } + public record Activation(String versionId,String expectedVersion) {} + @PostMapping("/activate") public Map activate(@RequestBody Activation input,@AuthenticationPrincipal AppUserPrincipal actor) { authorize(actor);return service.activate(input.versionId(),input.expectedVersion(),actor); } +} diff --git a/backend/src/main/java/cn/yunsheng/quality/filters/SalesOrderTypeService.java b/backend/src/main/java/cn/yunsheng/quality/filters/SalesOrderTypeService.java new file mode 100644 index 0000000..21630f0 --- /dev/null +++ b/backend/src/main/java/cn/yunsheng/quality/filters/SalesOrderTypeService.java @@ -0,0 +1,118 @@ +package cn.yunsheng.quality.filters; + +import cn.yunsheng.quality.identity.AppUserPrincipal; +import java.io.*; +import java.security.MessageDigest; +import java.util.*; +import org.apache.poi.ss.usermodel.*; +import org.springframework.http.HttpStatus; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.server.ResponseStatusException; + +@Service +public class SalesOrderTypeService { + private final JdbcTemplate jdbc; + public SalesOrderTypeService(JdbcTemplate jdbc) { this.jdbc=jdbc; } + record Input(String filename,String sha256,LinkedHashMap rows) {} + + static Input read(MultipartFile file) { + if(file==null||file.isEmpty())throw QueryFilterFields.bad("请选择销售订单对应表"); + if(file.getSize()>50L*1024*1024)throw QueryFilterFields.bad("销售订单对应表最多50MB"); + try { + byte[] bytes=file.getBytes(); + LinkedHashMap rows=new LinkedHashMap<>(); + try(Workbook workbook=WorkbookFactory.create(new ByteArrayInputStream(bytes))) { + if(workbook.getNumberOfSheets()!=1)throw QueryFilterFields.bad("销售订单对应表请只保留一张工作表"); + Sheet sheet=workbook.getSheetAt(0); Row header=sheet.getRow(0); + if(header==null)throw QueryFilterFields.bad("对应表缺少表头"); + int order=-1,type=-1; + for(Cell cell:header) { + String label=new DataFormatter().formatCellValue(cell).trim(); + if(List.of("销售订单编号","销售订单号","销售订单").contains(label))order=cell.getColumnIndex(); + if("销售订单类型".equals(label))type=cell.getColumnIndex(); + } + if(order<0||type<0)throw QueryFilterFields.bad("对应表需要“销售订单编号”和“销售订单类型”两列"); + if(sheet.getLastRowNum()>500000)throw QueryFilterFields.bad("销售订单对应表最多50万行"); + for(int index=1;index<=sheet.getLastRowNum();index++) { + Row row=sheet.getRow(index);if(row==null)continue; + String key=text(row.getCell(order),index+1),value=text(row.getCell(type),index+1); + if(key.isBlank()&&value.isBlank())continue; + if(key.isBlank()||key.length()>190)throw QueryFilterFields.bad("第"+(index+1)+"行订单号为空或超过190字"); + if(!SalesOrderTypes.TYPES.contains(value))throw QueryFilterFields.bad("第"+(index+1)+"行销售订单类型不属于现有7类:"+value); + String previous=rows.putIfAbsent(key,value); + if(previous!=null&&!previous.equals(value))throw QueryFilterFields.bad("第"+(index+1)+"行订单号对应多个类型:"+key); + } + } + if(rows.isEmpty())throw QueryFilterFields.bad("对应表没有有效订单"); + String filename=java.nio.file.Path.of(Objects.toString(file.getOriginalFilename(),"销售订单对应表.xlsx").replace('\\','/')).getFileName().toString(); + if(filename.length()>255)throw QueryFilterFields.bad("文件名过长"); + return new Input(filename,HexFormat.of().formatHex(MessageDigest.getInstance("SHA-256").digest(bytes)),rows); + } catch(ResponseStatusException failure) { throw failure; } + catch(Exception failure) { throw QueryFilterFields.bad("无法读取对应表,请选择有效的Excel文件"); } + } + private static String text(Cell cell,int row) { + if(cell==null||cell.getCellType()==CellType.BLANK)return ""; + if(cell.getCellType()!=CellType.STRING)throw QueryFilterFields.bad("第"+row+"行请使用文本保存订单号和类型,不使用数值或公式"); + return cell.getStringCellValue().trim(); + } + private String current(boolean lock) { + return jdbc.queryForObject("SELECT COALESCE(version_id,'') FROM sales_order_type_current WHERE dataset_id='quality'"+(lock?" FOR UPDATE":""),String.class); + } + private LinkedHashMap entries(String version) { + LinkedHashMap result=new LinkedHashMap<>(); + if(version!=null&&!version.isBlank())jdbc.query("SELECT order_no,order_type FROM sales_order_type_entry WHERE version_id=? ORDER BY order_no",(org.springframework.jdbc.core.RowCallbackHandler)rs->result.put(rs.getString(1),rs.getString(2)),version); + return result; + } + private static void requireMode(String mode) { + if(!Set.of("MERGE","REPLACE").contains(mode))throw QueryFilterFields.bad("请选择增量更新或整表替换"); + } + static Map summary(Map before,Map incoming,String mode) { + requireMode(mode);int added=0,updated=0,unchanged=0; + for(var row:incoming.entrySet()) { + if(!before.containsKey(row.getKey()))added++; + else if(!before.get(row.getKey()).equals(row.getValue()))updated++; + else unchanged++; + } + long removed="REPLACE".equals(mode)?before.keySet().stream().filter(key->!incoming.containsKey(key)).count():0; + return Map.of("added",added,"updated",updated,"unchanged",unchanged,"removed",removed,"imported",incoming.size(),"total","REPLACE".equals(mode)?incoming.size():before.size()+added); + } + @Transactional(readOnly=true) + public Map preview(MultipartFile file,String mode) { + requireMode(mode);Input input=read(file);String base=current(false); + return Map.of("sourceFile",input.filename(),"sha256",input.sha256(),"expectedVersion",base,"summary",summary(entries(base),input.rows(),mode)); + } + @Transactional + public Map importFile(MultipartFile file,String mode,String expected,String sha256,AppUserPrincipal actor) { + requireMode(mode);Input input=read(file); + if(!input.sha256().equals(sha256))throw QueryFilterFields.bad("文件已变化,请重新预览"); + String base=current(true); + if(!Objects.equals(base,expected))throw new ResponseStatusException(HttpStatus.CONFLICT,"对应关系已更新,请重新预览"); + LinkedHashMap before=entries(base),merged=new LinkedHashMap<>(); + Map changes=summary(before,input.rows(),mode); + if("MERGE".equals(mode))merged.putAll(before);merged.putAll(input.rows()); + String id=UUID.randomUUID().toString(); + jdbc.update("INSERT INTO sales_order_type_version(id,source_file,source_sha256,import_mode,row_count,created_by) VALUES(?,?,?,?,?,?)",id,input.filename(),input.sha256(),mode,merged.size(),actor.getId().toString()); + jdbc.batchUpdate("INSERT INTO sales_order_type_entry(version_id,order_no,order_type) VALUES(?,?,?)",new ArrayList<>(merged.entrySet()),500,(statement,row)->{statement.setString(1,id);statement.setString(2,row.getKey());statement.setString(3,row.getValue());}); + new cn.yunsheng.quality.metrics.SalesOrderMetricRollups(jdbc).prepareCurrentRelease(id); + jdbc.update("UPDATE sales_order_type_current SET version_id=? WHERE dataset_id='quality'",id); + audit(actor,"SALES_ORDER_TYPE_IMPORT",id); + return Map.of("versionId",id,"summary",changes); + } + @Transactional + public Map activate(String id,String expected,AppUserPrincipal actor) { + if(!Objects.equals(current(true),expected))throw new ResponseStatusException(HttpStatus.CONFLICT,"对应关系已更新,请刷新后重试"); + if(jdbc.queryForObject("SELECT COUNT(*) FROM sales_order_type_version WHERE id=?",Integer.class,id)!=1)throw QueryFilterFields.bad("对应关系版本不存在"); + new cn.yunsheng.quality.metrics.SalesOrderMetricRollups(jdbc).prepareCurrentRelease(id); + jdbc.update("UPDATE sales_order_type_current SET version_id=? WHERE dataset_id='quality'",id);audit(actor,"SALES_ORDER_TYPE_RESTORE",id); + return Map.of("versionId",id); + } + public Map status() { + return Map.of("versionId",current(false),"versions",jdbc.queryForList("SELECT id,source_file AS sourceFile,row_count AS rowCount,import_mode AS importMode,created_at AS createdAt FROM sales_order_type_version ORDER BY created_at DESC LIMIT 30"),"types",SalesOrderTypes.TYPES); + } + private void audit(AppUserPrincipal actor,String action,String version) { + jdbc.update("INSERT INTO audit_event(actor_user_id,action_code,target_type,target_id,outcome,details) VALUES(?,?,'sales_order_type_version',?,'SUCCESS',JSON_OBJECT('versionId',?))",actor.getId().toString(),action,version,version); + } +} diff --git a/backend/src/main/java/cn/yunsheng/quality/filters/SalesOrderTypes.java b/backend/src/main/java/cn/yunsheng/quality/filters/SalesOrderTypes.java new file mode 100644 index 0000000..ff151e3 --- /dev/null +++ b/backend/src/main/java/cn/yunsheng/quality/filters/SalesOrderTypes.java @@ -0,0 +1,67 @@ +package cn.yunsheng.quality.filters; + +import java.util.*; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.RequestAttributes; + +/** A reference snapshot, independent of quality-data releases. Never changes raw source values. */ +public final class SalesOrderTypes { + public static final String KEY = "salesOrderType"; + public static final String EXCLUDE_KEY = "salesOrderTypeNotIn"; + public static final String LABEL = "销售订单类型"; + public static final List TYPES = List.of("标准销售订单", "样品销售订单", "国内寄售补货订单", "备料销售订单", "内部研发销售订单", "免费补货订单", "外销寄售补货订单"); + private static final String PIN = SalesOrderTypes.class.getName() + ".version"; + private SalesOrderTypes() {} + + public static boolean allowed(Set fields) { + return fields.contains("*") || fields.containsAll(List.of("销售订单号", "销售订单")); + } + public static String column(String stage) { + return switch(stage) { case "black" -> "销售订单号"; case "bright" -> "销售订单"; default -> throw QueryFilterFields.bad("阶段无效"); }; + } + public static String version(JdbcTemplate jdbc) { + RequestAttributes request = RequestContextHolder.getRequestAttributes(); + if (request != null && request.getAttribute(PIN, RequestAttributes.SCOPE_REQUEST) instanceof String pinned) return pinned; + String version = jdbc.queryForObject("SELECT COALESCE(version_id,'') FROM sales_order_type_current WHERE dataset_id='quality'", String.class); + version = version == null ? "" : version; + if (request != null) request.setAttribute(PIN, version, RequestAttributes.SCOPE_REQUEST); + return version; + } + public static String expression(String stage, String version, List args) { + column(stage);args.add(version); + return "(SELECT sot.order_type FROM sales_order_type_entry sot WHERE sot.version_id=? AND sot.order_no=" + + "f.sales_order_no)"; + } + public static void append(StringBuilder where,List args,String stage,List selected,String version) { + append(where,args,stage,selected,version,false); + } + public static void append(StringBuilder where,List args,String stage,List selected,String version,boolean exclude) { + List types=selected.stream().filter(value->!QueryFilterFields.EMPTY.equals(value)).toList(); + if(types.stream().anyMatch(value->!TYPES.contains(value)))throw QueryFilterFields.bad("销售订单类型无效"); + if(selected.isEmpty())return; + if(exclude) { + column(stage);where.append(" AND ("); + if(!types.isEmpty()) { + args.add(version);where.append("NOT EXISTS (SELECT 1 FROM sales_order_type_entry sot WHERE sot.version_id=? AND sot.order_no=f.sales_order_no AND sot.order_type IN (").append(String.join(",",Collections.nCopies(types.size(),"?"))).append("))"); + args.addAll(types); + } + if(selected.contains(QueryFilterFields.EMPTY)) { + if(!types.isEmpty())where.append(" AND "); + args.add(version);where.append("EXISTS (SELECT 1 FROM sales_order_type_entry sot WHERE sot.version_id=? AND sot.order_no=f.sales_order_no)"); + } + where.append(')');return; + } + where.append(" AND ("); + if(!types.isEmpty()) { + column(stage);args.add(version); + where.append("EXISTS (SELECT 1 FROM sales_order_type_entry sot WHERE sot.version_id=? AND sot.order_no=f.sales_order_no AND sot.order_type IN (").append(String.join(",",Collections.nCopies(types.size(),"?"))).append("))"); + args.addAll(types); + } + if(selected.contains(QueryFilterFields.EMPTY)) { + if(!types.isEmpty())where.append(" OR "); + args.add(version);where.append("NOT EXISTS (SELECT 1 FROM sales_order_type_entry sot WHERE sot.version_id=? AND sot.order_no=f.sales_order_no)"); + } + where.append(')'); + } +} diff --git a/backend/src/main/java/cn/yunsheng/quality/governance/CandidateAcceptanceController.java b/backend/src/main/java/cn/yunsheng/quality/governance/CandidateAcceptanceController.java index 72782c7..25518eb 100644 --- a/backend/src/main/java/cn/yunsheng/quality/governance/CandidateAcceptanceController.java +++ b/backend/src/main/java/cn/yunsheng/quality/governance/CandidateAcceptanceController.java @@ -5,15 +5,15 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/governance") -@PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_PUBLISHER','DATA_MAINTAINER','RULE_MAINTAINER','AUDIT_VIEWER')") +@PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public class CandidateAcceptanceController { private final CandidateAcceptanceService service; public CandidateAcceptanceController(CandidateAcceptanceService service){this.service=service;} @GetMapping("/migration-baseline") public Map baseline(){return service.migrationBaseline();} @GetMapping("/releases/{id}/reconciliations") public Map list(@PathVariable String id,@AuthenticationPrincipal AppUserPrincipal actor){return service.list(id,actor);} @GetMapping("/reconciliations/{id}") public Map detail(@PathVariable String id,@AuthenticationPrincipal AppUserPrincipal actor){return service.detail(id,actor);} - @PostMapping("/releases/{id}/reconciliations") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_PUBLISHER','DATA_MAINTAINER','RULE_MAINTAINER')") + @PostMapping("/releases/{id}/reconciliations") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map create(@PathVariable String id,@RequestBody CandidateAcceptanceService.ReconciliationRequest request,@AuthenticationPrincipal AppUserPrincipal actor){return service.create(id,request,actor);} - @PostMapping("/reconciliations/{id}/confirm") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_PUBLISHER')") + @PostMapping("/reconciliations/{id}/confirm") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map confirm(@PathVariable String id,@RequestBody CandidateAcceptanceService.Confirmation request,@AuthenticationPrincipal AppUserPrincipal actor){return service.confirm(id,request,actor);} } diff --git a/backend/src/main/java/cn/yunsheng/quality/governance/CandidateAcceptanceService.java b/backend/src/main/java/cn/yunsheng/quality/governance/CandidateAcceptanceService.java index d176d6d..ee72a82 100644 --- a/backend/src/main/java/cn/yunsheng/quality/governance/CandidateAcceptanceService.java +++ b/backend/src/main/java/cn/yunsheng/quality/governance/CandidateAcceptanceService.java @@ -32,7 +32,7 @@ public class CandidateAcceptanceService { } } @Transactional public Map create(String releaseId,ReconciliationRequest request,AppUserPrincipal actor){ - if(actor.getRoleCodes().stream().noneMatch(Set.of("SYSTEM_ADMIN","DATA_PUBLISHER","DATA_MAINTAINER","RULE_MAINTAINER")::contains))throw error(HttpStatus.FORBIDDEN,"当前角色不能执行候选验收"); + if(actor.getRoleCodes().stream().noneMatch(Set.of("SYSTEM_ADMIN", "DATA_ADMIN")::contains))throw error(HttpStatus.FORBIDDEN,"当前角色不能执行候选验收"); requireRead(releaseId,actor);Map release=g.one("SELECT id,status,expected_current_release_id,complete,rule_version FROM data_release WHERE id=? FOR UPDATE",releaseId); if(!"CANDIDATE".equals(release.get("status")))throw error(HttpStatus.CONFLICT,"只对候选版本创建基线验收"); String baseline=request.baselineReleaseId()==null?(String)release.get("expectedCurrentReleaseId"):request.baselineReleaseId(); @@ -72,7 +72,7 @@ public class CandidateAcceptanceService { public Map list(String releaseId,AppUserPrincipal actor){requireRead(releaseId,actor);return Map.of("items",g.rows("SELECT id,release_id,baseline_release_id,status,difference_hash,row_version,created_by,confirmed_by,confirmation_reason,created_at,confirmed_at FROM candidate_reconciliation WHERE release_id=? ORDER BY created_at DESC",releaseId),"acceptanceId",Objects.toString(g.jdbc.queryForObject("SELECT acceptance_id FROM data_release WHERE id=?",String.class,releaseId),""));} public Map detail(String id,AppUserPrincipal actor){Map row=g.one("SELECT * FROM candidate_reconciliation WHERE id=?",id);requireRead((String)row.get("releaseId"),actor);if(row.get("baselineReleaseId")!=null)requireRead((String)row.get("baselineReleaseId"),actor);requireTransitionRead(row,actor);row.put("request",decode(row.get("request")));row.put("publishReady",ready(row));return row;} @Transactional public Map confirm(String id,Confirmation request,AppUserPrincipal actor){ - if(!actor.getRoleCodes().contains("SYSTEM_ADMIN")&&!actor.getRoleCodes().contains("DATA_PUBLISHER"))throw error(HttpStatus.FORBIDDEN,"差异确认须由有范围权限的发布者执行"); + if(!actor.getRoleCodes().contains("SYSTEM_ADMIN")&&!actor.getRoleCodes().contains("DATA_ADMIN"))throw error(HttpStatus.FORBIDDEN,"差异确认须由有范围权限的发布者执行"); Map row=g.one("SELECT * FROM candidate_reconciliation WHERE id=? FOR UPDATE",id);requireRead((String)row.get("releaseId"),actor);if(row.get("baselineReleaseId")!=null)requireRead((String)row.get("baselineReleaseId"),actor); if(!"REVIEW_REQUIRED".equals(row.get("status"))||request.expectedRowVersion()==null||((Number)row.get("rowVersion")).longValue()!=request.expectedRowVersion()||!Objects.equals(row.get("differenceHash"),request.expectedDifferenceHash()))throw error(HttpStatus.CONFLICT,"仅可确认当前待审核的确切差异结果"); Map evidence=evidence(row);Object transitionHash=evidence.get("transitionDifferenceHash");if(transitionHash!=null&&!Objects.equals(transitionHash,request.expectedTransitionDifferenceHash()))throw error(HttpStatus.CONFLICT,"必须明确确认实际当前版本至候选的确切变更差异hash"); diff --git a/backend/src/main/java/cn/yunsheng/quality/governance/EffectiveAccessController.java b/backend/src/main/java/cn/yunsheng/quality/governance/EffectiveAccessController.java index 675a81d..90f8e9b 100644 --- a/backend/src/main/java/cn/yunsheng/quality/governance/EffectiveAccessController.java +++ b/backend/src/main/java/cn/yunsheng/quality/governance/EffectiveAccessController.java @@ -14,12 +14,15 @@ public class EffectiveAccessController { Map out=new LinkedHashMap<>();out.put("userId",id);out.put("active",user.isEnabled());out.put("authorizationEffective",effective);out.put("roles",user.getRoleCodes());out.put("allowedActions",effective?actions:Set.of());out.put("departments",user.getRoleCodes().contains("SYSTEM_ADMIN")?List.of("*"):user.getDepartments());out.put("groups",user.getRoleCodes().contains("SYSTEM_ADMIN")?List.of("*"):user.getGroups());out.put("grantedDepartments",g.jdbc.query("SELECT scope_value FROM app_user_scope WHERE user_id=? AND scope_type='DEPARTMENT' ORDER BY scope_value",(rs,n)->rs.getString(1),id));out.put("hierarchySource",g.rows("SELECT c.release_id,r.mapping_version FROM current_release c JOIN data_release r ON r.id=c.release_id WHERE c.dataset_id='quality'"));out.put("fieldPolicy",policy);out.put("validUntil",policy.get("validUntil"));out.put("scopeHash",GovernanceSupport.sha(g.encode(List.of(user.getRoleCodes(),user.getDepartments(),user.getGroups(),policy))));return out;} @GetMapping("/{id}/scope-preview")public Map preview(@PathVariable String id){AppUserPrincipal user=principal(id);Map effective=effective(id);String release=g.jdbc.queryForObject("SELECT release_id FROM current_release WHERE dataset_id='quality'",String.class);List> counts=new ArrayList<>();for(String stage:List.of("black","bright")){String base="SELECT COUNT(*) FROM fact_"+stage+" f WHERE EXISTS(SELECT 1 FROM release_member rm WHERE rm.release_id=? AND rm.transform_build_id=f.build_id)";Long total=g.jdbc.queryForObject(base,Long.class,release);StringBuilder sql=new StringBuilder(base);List args=new ArrayList<>();args.add(release);DataScope.append(sql,args,user,"f.department","f.group_name");if(!Boolean.TRUE.equals(effective.get("authorizationEffective"))||!(effective.get("allowedActions") instanceof Collection actions)||!actions.contains("query.aggregate"))sql.append(" AND 1=0");Long permitted=g.jdbc.queryForObject(sql.toString(),Long.class,args.toArray());counts.add(Map.of("stage",stage,"totalRows",total==null?0:total,"authorizedRows",permitted==null?0:permitted));}Map out=new LinkedHashMap<>(effective);out.put("releaseId",release);out.put("counts",counts);out.put("dataReturned",false);return out;} private AppUserPrincipal principal(String id){String username=String.valueOf(g.one("SELECT username FROM app_user WHERE id=?",id).get("username"));return access.resolvePrincipal((AppUserPrincipal)users.loadUserByUsername(username));} - static Set actions(List roles){Set out=new TreeSet<>();for(String role:roles)switch(role){ - case "SYSTEM_ADMIN"->out.addAll(List.of("query.aggregate","query.detail","analysis.run","source.view","source.manage","source.receive","source.withdraw","source.evidence","source.download","import.run","import.retry","release.build","release.publish","release.rollback","rule.edit","rule.validate","rule.activate","mapping.edit","mapping.validate","mapping.activate","target.manage","cost.edit","task.view","task.retry","task.cancel","monitor.view","backup.manage","restore.isolated","iam.manage","service.manage","audit.view")); - case "QUALITY_VIEWER","BUSINESS_ANALYST"->out.addAll(List.of("query.aggregate","query.detail","analysis.run","source.view","source.evidence","source.download")); - case "DATA_MAINTAINER"->out.addAll(List.of("source.view","source.manage","source.receive","source.withdraw","source.evidence","source.download","import.run","import.retry","mapping.edit","mapping.validate","mapping.activate","cost.edit","task.view","task.retry","task.cancel")); - case "DATA_PUBLISHER"->out.addAll(List.of("source.view","source.evidence","source.download","release.build","release.publish","release.rollback","task.view")); - case "RULE_MAINTAINER"->out.addAll(List.of("rule.edit","rule.validate","rule.activate","mapping.edit","mapping.validate","mapping.activate","target.manage","cost.edit")); - case "SYSTEM_OPERATOR"->out.addAll(List.of("task.view","task.cancel","monitor.view","backup.manage","restore.isolated")); - case "AUDIT_VIEWER"->out.addAll(List.of("audit.view","source.evidence","source.download"));default->{}}if(roles.stream().anyMatch(Set.of("SYSTEM_ADMIN","QUALITY_VIEWER","BUSINESS_ANALYST","AUDIT_VIEWER")::contains))out.addAll(List.of("rule.view","mapping.view","release.view","metric.view"));if(roles.contains("RULE_MAINTAINER"))out.addAll(List.of("rule.view","mapping.view","cost.view","metric.view"));if(roles.contains("DATA_MAINTAINER"))out.addAll(List.of("mapping.view","cost.view","release.view","import.view"));if(roles.contains("DATA_PUBLISHER"))out.addAll(List.of("release.view","import.view"));return out;} + static Set actions(List roles) { + Set out = new TreeSet<>(); + if (roles.size() != 1 || !cn.yunsheng.quality.identity.AppRoles.CODES.contains(roles.getFirst())) return out; + String role = roles.getFirst(); + out.addAll(List.of("query.aggregate", "query.detail", "analysis.run", "source.view", "source.evidence", "source.download", "rule.view", "mapping.view", "release.view", "metric.view", "inspection.run")); + if (Set.of("DATA_ADMIN", "SYSTEM_ADMIN").contains(role)) + out.addAll(List.of("source.manage", "source.receive", "source.withdraw", "import.run", "import.retry", "import.view", "release.build", "release.publish", "release.rollback", "mapping.edit", "mapping.validate", "mapping.activate", "target.manage", "cost.view", "cost.edit", "task.view", "task.retry", "task.cancel")); + if ("SYSTEM_ADMIN".equals(role)) + out.addAll(List.of("rule.edit", "rule.validate", "rule.activate", "monitor.view", "backup.manage", "restore.isolated", "iam.manage", "service.manage", "audit.view", "inspection.manage")); + return out; + } } diff --git a/backend/src/main/java/cn/yunsheng/quality/governance/GovernanceAccessService.java b/backend/src/main/java/cn/yunsheng/quality/governance/GovernanceAccessService.java index ceb4f88..137add0 100644 --- a/backend/src/main/java/cn/yunsheng/quality/governance/GovernanceAccessService.java +++ b/backend/src/main/java/cn/yunsheng/quality/governance/GovernanceAccessService.java @@ -19,6 +19,19 @@ public class GovernanceAccessService { private final JsonMapper json; public GovernanceAccessService(JdbcTemplate jdbc, JsonMapper json) { this.jdbc=jdbc; this.json=json; } + /** 角色改名沿用原指纹中的角色部分;实际角色改变后立即失效,不授予旧角色权限。 */ + public List fingerprintRoles(AppUserPrincipal user) { + List current = user.getRoleCodes(); + if (current.size() != 1 || !cn.yunsheng.quality.identity.AppRoles.CODES.contains(current.getFirst())) return current; + List> anchors = jdbc.query("SELECT assigned_role,previous_roles FROM user_role_migration_anchor WHERE user_id=?", + (rs,n) -> Map.of("role",rs.getString(1),"previous",readList(rs.getString(2))),user.getId().toString()); + if (anchors.isEmpty() || !current.getFirst().equals(anchors.getFirst().get("role"))) return current; + Object raw = anchors.getFirst().get("previous"); + if (!(raw instanceof List values) || values.isEmpty() || values.stream().anyMatch(v -> !(v instanceof String))) return current; + List previous = values.stream().map(String.class::cast).distinct().sorted().toList(); + return current.getFirst().equals(cn.yunsheng.quality.identity.AppRoles.migratedRole(previous)) ? previous : current; + } + public void requireDetail(AppUserPrincipal user) { if (!Boolean.TRUE.equals(policy(user.getId().toString()).get("detailAllowed"))) denied("此身份仅允许汇总查询"); } diff --git a/backend/src/main/java/cn/yunsheng/quality/governance/GovernanceDependencyController.java b/backend/src/main/java/cn/yunsheng/quality/governance/GovernanceDependencyController.java index 05d1a54..81ab2a6 100644 --- a/backend/src/main/java/cn/yunsheng/quality/governance/GovernanceDependencyController.java +++ b/backend/src/main/java/cn/yunsheng/quality/governance/GovernanceDependencyController.java @@ -3,7 +3,7 @@ import java.util.Map; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/governance") -@PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_PUBLISHER','RULE_MAINTAINER','DATA_MAINTAINER','AUDIT_VIEWER')") +@PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public class GovernanceDependencyController { private final GovernanceDependencyService dependencies; private final GovernanceAccessService access; diff --git a/backend/src/main/java/cn/yunsheng/quality/governance/GovernanceIdentityController.java b/backend/src/main/java/cn/yunsheng/quality/governance/GovernanceIdentityController.java index fcc586e..28c8a7d 100644 --- a/backend/src/main/java/cn/yunsheng/quality/governance/GovernanceIdentityController.java +++ b/backend/src/main/java/cn/yunsheng/quality/governance/GovernanceIdentityController.java @@ -18,10 +18,10 @@ public class GovernanceIdentityController { public GovernanceIdentityController(GovernanceSupport g,GovernanceAccessService access){this.g=g;this.access=access;} @GetMapping("/users/{id}/access-policy") @PreAuthorize("hasRole('SYSTEM_ADMIN')") - public Map policy(@PathVariable String id){g.one("SELECT id FROM app_user WHERE id=?",id);return Map.of("policy",access.policy(id));} + public Map policy(@PathVariable String id){g.one("SELECT id FROM app_user WHERE id=? AND deleted_at IS NULL",id);return Map.of("policy",access.policy(id));} @PutMapping("/users/{id}/access-policy") @PreAuthorize("hasRole('SYSTEM_ADMIN')") @Transactional public Map policy(@PathVariable String id,@RequestBody PolicyRequest r,@AuthenticationPrincipal AppUserPrincipal actor){ - g.one("SELECT id FROM app_user WHERE id=? FOR UPDATE",id);g.required(r.reason(),"理由"); + g.one("SELECT id FROM app_user WHERE id=? AND deleted_at IS NULL FOR UPDATE",id);g.required(r.reason(),"理由"); if(r.allowedFields()!=null&&r.allowedFields().stream().anyMatch(Objects::isNull))throw error(HttpStatus.BAD_REQUEST,"字段清单无效"); List fields=r.allowedFields()==null?List.of():r.allowedFields().stream().distinct().sorted().toList(); if(fields.size()>300||fields.stream().anyMatch(f->f==null||f.isBlank()||f.length()>190)||fields.contains("*")&&fields.size()!=1)throw error(HttpStatus.BAD_REQUEST,"字段清单无效"); @@ -33,7 +33,7 @@ public class GovernanceIdentityController { g.jdbc.update("UPDATE user_access_policy SET valid_until=?,inherit_department_children=? WHERE user_id=?",expiry,r.inheritDepartmentChildren(),id); g.audit(actor.getId().toString(),"ACCESS_POLICY_CHANGED","app_user",id,Map.of("before",before,"after",access.policy(id),"reason",r.reason()));return policy(id); } - @GetMapping("/service-identities") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','SYSTEM_OPERATOR','AUDIT_VIEWER')") + @GetMapping("/service-identities") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN')") public Map identities(){return Map.of("items",g.rows("SELECT id,name,service_type,allowed_actions,credential_reference,credential_status,active,row_version,created_at,updated_at FROM service_identity ORDER BY name"),"allowedActions",ACTIONS,"serviceTypes",TYPE_ACTIONS.keySet());} @PostMapping("/service-identities") @PreAuthorize("hasRole('SYSTEM_ADMIN')") @Transactional public Map create(@RequestBody IdentityRequest r,@AuthenticationPrincipal AppUserPrincipal actor){ @@ -54,11 +54,11 @@ public class GovernanceIdentityController { lock(id,r.expectedRowVersion());reference(r.credentialReference(),r.credentialStatus());g.required(r.reason(),"轮换理由"); g.jdbc.update("UPDATE service_identity SET credential_reference=?,credential_status=?,active=IF(?='READY',active,FALSE),row_version=row_version+1 WHERE id=?",r.credentialReference(),r.credentialStatus(),r.credentialStatus(),id);rotation(id,r.credentialReference(),r.credentialStatus(),r.reason(),actor);return Map.of("identity",identity(id)); } - @GetMapping("/service-identities/{id}/rotations") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','AUDIT_VIEWER')") + @GetMapping("/service-identities/{id}/rotations") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN')") public Map rotations(@PathVariable String id){return Map.of("items",g.rows("SELECT id,credential_reference,credential_status,reason,changed_by,created_at FROM service_credential_rotation WHERE service_identity_id=? ORDER BY id DESC",id));} @PostMapping("/service-identities/{id}/authorize") @PreAuthorize("hasRole('SYSTEM_ADMIN')") public Map authorize(@PathVariable String id,@RequestBody Map r){access.requireServiceAction(id,r.get("action"));return Map.of("authorized",true,"identityId",id,"action",r.get("action"));} - @GetMapping("/service-bindings") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','SYSTEM_OPERATOR')") + @GetMapping("/service-bindings") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN')") public Map bindings(){return Map.of("items",g.rows("SELECT service_type,service_identity_id,updated_at FROM service_binding"));} @PutMapping("/service-bindings/{type}") @PreAuthorize("hasRole('SYSTEM_ADMIN')") @Transactional public Map bind(@PathVariable String type,@RequestBody Map r,@AuthenticationPrincipal AppUserPrincipal actor){ diff --git a/backend/src/main/java/cn/yunsheng/quality/governance/GovernanceOperationsController.java b/backend/src/main/java/cn/yunsheng/quality/governance/GovernanceOperationsController.java index c6da5f0..87b298f 100644 --- a/backend/src/main/java/cn/yunsheng/quality/governance/GovernanceOperationsController.java +++ b/backend/src/main/java/cn/yunsheng/quality/governance/GovernanceOperationsController.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import static cn.yunsheng.quality.governance.GovernanceSupport.error; -@RestController @RequestMapping("/api/governance") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','SYSTEM_OPERATOR')") +@RestController @RequestMapping("/api/governance") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN')") public class GovernanceOperationsController { private final GovernanceOperationsService service;private final GovernanceSupport g; public GovernanceOperationsController(GovernanceOperationsService service,GovernanceSupport g){this.service=service;this.g=g;} @@ -24,7 +24,7 @@ public class GovernanceOperationsController { g.jdbc.update("UPDATE monitor_alert_policy SET queue_age_minutes=?,disk_free_bytes=?,backup_age_hours=?,quiet_period_minutes=?,severity_overrides=CAST(? AS JSON),silence_until=?,slow_request_millis=?,row_version=row_version+1,updated_by=? WHERE id='default'",r.queueAgeMinutes(),r.diskFreeBytes(),r.backupAgeHours(),r.quietPeriodMinutes(),g.encode(r.severityOverrides()),silence,slow,actor.getId().toString());g.audit(actor.getId().toString(),"MONITOR_ALERT_POLICY_CHANGED","monitor_alert_policy","default",Map.of("reason",r.reason(),"before",before,"after",service.alertPolicy()));return alertPolicy();} @GetMapping("/backups")public Map backups(){return Map.of("items",service.backups(),"plan",g.one("SELECT * FROM backup_plan WHERE id='default'"),"liveRestoreEnabled",false);} @GetMapping("/backups/latest") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','SYSTEM_OPERATOR','DATA_MAINTAINER','DATA_PUBLISHER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map latestBackup(){ Map latest=service.backups().stream().max(Comparator.comparing(b->String.valueOf(b.get("createdAt")))).orElse(Map.of()); Map safe=new LinkedHashMap<>(); diff --git a/backend/src/main/java/cn/yunsheng/quality/governance/GovernanceOperationsService.java b/backend/src/main/java/cn/yunsheng/quality/governance/GovernanceOperationsService.java index 5cbd254..9a6f854 100644 --- a/backend/src/main/java/cn/yunsheng/quality/governance/GovernanceOperationsService.java +++ b/backend/src/main/java/cn/yunsheng/quality/governance/GovernanceOperationsService.java @@ -77,7 +77,7 @@ public class GovernanceOperationsService { g.jdbc.update("UPDATE task SET status='FAILED',stage='FAILED',error_code=?,error_message=?,result=CAST(? AS JSON),retry_count=retry_count+1,next_retry_at=IF(retry_count runBackup(String type,Map payload)throws Exception{ Path script=root.resolve("scripts/backup.py").toRealPath();if(!script.startsWith(root)||!Files.isRegularFile(script))throw new IllegalStateException("Fixed backup script missing"); List command=new ArrayList<>(List.of("python3",script.toString(),"BACKUP_VERIFY".equals(type)?"verify":"create-and-verify"));Path selected=null; diff --git a/backend/src/main/java/cn/yunsheng/quality/governance/MappingIssueController.java b/backend/src/main/java/cn/yunsheng/quality/governance/MappingIssueController.java index fda010c..27d1a52 100644 --- a/backend/src/main/java/cn/yunsheng/quality/governance/MappingIssueController.java +++ b/backend/src/main/java/cn/yunsheng/quality/governance/MappingIssueController.java @@ -5,7 +5,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/governance/mapping-issues") -@PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_PUBLISHER','DATA_MAINTAINER','RULE_MAINTAINER','AUDIT_VIEWER')") +@PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public class MappingIssueController { private final MappingIssueService service; private final UnclassifiedSourceService unclassified; @@ -19,8 +19,8 @@ public class MappingIssueController { @GetMapping("/unclassified-projects") public Map unclassifiedProjects(@RequestParam(defaultValue="1") int page,@RequestParam(defaultValue="15") int pageSize,@RequestParam(required=false) String customerCode,@RequestParam(required=false) String businessGroup,@RequestParam(required=false) String department,@AuthenticationPrincipal AppUserPrincipal actor){return unclassified.listProjects(page,pageSize,customerCode,businessGroup,department,actor);} @GetMapping public Map list(@RequestParam(required=false) String importRunId,@RequestParam(required=false) String status,@RequestParam(defaultValue="1") int page,@RequestParam(defaultValue="50") int pageSize,@RequestParam(required=false) String mappingType,@RequestParam(required=false) String customerCode,@RequestParam(required=false) String businessGroup,@RequestParam(required=false) String department,@AuthenticationPrincipal AppUserPrincipal actor){return service.list(importRunId,status,page,pageSize,customerCode,businessGroup,department,mappingType,actor);} @GetMapping("/{id}") public Map detail(@PathVariable String id,@AuthenticationPrincipal AppUserPrincipal actor){return service.detail(id,actor);} - @PostMapping("/{id}/resolve") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','RULE_MAINTAINER')") + @PostMapping("/{id}/resolve") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map resolve(@PathVariable String id,@RequestBody MappingIssueService.Resolution request,@AuthenticationPrincipal AppUserPrincipal actor){return service.resolve(id,request,actor);} - @PostMapping("/{id}/revalidate") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','DATA_PUBLISHER')") + @PostMapping("/{id}/revalidate") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map revalidate(@PathVariable String id,@RequestBody MappingIssueService.Revalidation request,@AuthenticationPrincipal AppUserPrincipal actor){return service.revalidate(id,request,actor);} } diff --git a/backend/src/main/java/cn/yunsheng/quality/governance/RuleRegressionController.java b/backend/src/main/java/cn/yunsheng/quality/governance/RuleRegressionController.java index b404c60..9001ccd 100644 --- a/backend/src/main/java/cn/yunsheng/quality/governance/RuleRegressionController.java +++ b/backend/src/main/java/cn/yunsheng/quality/governance/RuleRegressionController.java @@ -5,7 +5,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/governance") -@PreAuthorize("hasAnyRole('SYSTEM_ADMIN','RULE_MAINTAINER','DATA_PUBLISHER','AUDIT_VIEWER')") +@PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public class RuleRegressionController { private final RuleRegressionService service; public RuleRegressionController(RuleRegressionService service){this.service=service;} diff --git a/backend/src/main/java/cn/yunsheng/quality/governance/SourceGovernanceController.java b/backend/src/main/java/cn/yunsheng/quality/governance/SourceGovernanceController.java index e83a23e..7951767 100644 --- a/backend/src/main/java/cn/yunsheng/quality/governance/SourceGovernanceController.java +++ b/backend/src/main/java/cn/yunsheng/quality/governance/SourceGovernanceController.java @@ -16,13 +16,13 @@ import static cn.yunsheng.quality.governance.GovernanceSupport.error; public class SourceGovernanceController { private final SourceGovernanceService service;private final GovernanceSupport g;private final GovernanceAccessService access;private final SourceScanner scanner; public SourceGovernanceController(SourceGovernanceService service,GovernanceSupport g,GovernanceAccessService access,SourceScanner scanner){this.service=service;this.g=g;this.access=access;this.scanner=scanner;} - @GetMapping("/protocols") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','DATA_PUBLISHER','SYSTEM_OPERATOR')") + @GetMapping("/protocols") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map protocols(){return service.protocols();} - @PostMapping("/protocols") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER')") + @PostMapping("/protocols") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map protocol(@RequestBody SourceGovernanceService.ProtocolRequest r,@AuthenticationPrincipal AppUserPrincipal actor){return service.protocol(r,actor);} - @PostMapping("/sources/{id}/resolve") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER')") + @PostMapping("/sources/{id}/resolve") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map resolve(@PathVariable String id,@RequestBody SourceGovernanceService.ResolveRequest r,@AuthenticationPrincipal AppUserPrincipal actor){return service.resolve(id,r,actor);} - @GetMapping("/sources/{id}/identity-preview") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','DATA_PUBLISHER')") + @GetMapping("/sources/{id}/identity-preview") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map identityPreview(@PathVariable String id,@RequestParam(required=false) String protocolId){ Map candidate=g.one("SELECT id,source_file,sha256,file_size,status,protocol_id FROM source_candidate WHERE id=?",id);String selected=protocolId==null?(String)candidate.get("protocolId"):protocolId; if(selected==null)return Map.of("candidate",candidate,"protocol",Map.of(),"overlaps",List.of(),"decisionRequired",true,"allowedDecisions",List.of("RETURN","REPLACE","LEGAL_SHARD")); @@ -30,23 +30,23 @@ public class SourceGovernanceController { List> overlaps=g.rows("SELECT d.id AS source_document_id,d.source_slot,d.source_mode,d.scope_code,r.id AS source_revision_id,r.sha256,r.source_file FROM release_member m JOIN source_document d ON d.id=m.source_document_id JOIN source_revision r ON r.id=m.source_revision_id WHERE m.release_id=(SELECT release_id FROM current_release WHERE dataset_id='quality') AND d.stage=? AND d.source_year=? AND d.source_month=?",protocol.get("stage"),protocol.get("sourceYear"),protocol.get("sourceMonth")).stream().filter(d->SourceIdentity.intersects((String)protocol.get("scopeCode"),(String)d.get("scopeCode"))).toList(); return Map.of("candidate",candidate,"protocol",protocol,"overlaps",overlaps,"decisionRequired",true,"sameContentHint",overlaps.stream().anyMatch(o->Objects.equals(o.get("sha256"),candidate.get("sha256"))),"allowedDecisions","SHARD_SNAPSHOT".equals(protocol.get("sourceMode"))?List.of("RETURN","REPLACE","LEGAL_SHARD"):List.of("RETURN","REPLACE")); } - @GetMapping("/source-documents") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','DATA_PUBLISHER')") + @GetMapping("/source-documents") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map documents(){return Map.of("items",g.rows("SELECT d.id,d.source_slot,d.stage,d.source_year,d.source_month,d.scope_code,d.source_file,d.source_mode,d.applicable,(SELECT COUNT(*) FROM source_revision r WHERE r.source_document_id=d.id) AS revision_count FROM source_document d ORDER BY d.source_year,d.source_month,d.stage"),"revisions",g.rows("SELECT r.id,r.source_document_id,r.sha256,r.source_file,r.file_size,r.status,r.received_at FROM source_revision r ORDER BY r.received_at DESC"));} - @GetMapping("/coverage") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','DATA_PUBLISHER','SYSTEM_OPERATOR')") + @GetMapping("/coverage") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map coverage(@RequestParam(required=false) String releaseId){return service.coverage(releaseId);} - @GetMapping("/source-changes") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','DATA_PUBLISHER')") + @GetMapping("/source-changes") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map changes(){return service.changes();} - @PostMapping("/source-changes") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER')") + @PostMapping("/source-changes") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map request(@RequestBody SourceGovernanceService.ChangeRequest r,@AuthenticationPrincipal AppUserPrincipal actor){return service.request(r,actor);} - @PostMapping("/source-changes/{id}/review") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_PUBLISHER')") + @PostMapping("/source-changes/{id}/review") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map review(@PathVariable String id,@RequestBody SourceGovernanceService.ReviewRequest r,@AuthenticationPrincipal AppUserPrincipal actor){return service.review(id,r,actor);} - @PostMapping("/source-changes/{id}/build") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_PUBLISHER')") + @PostMapping("/source-changes/{id}/build") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map build(@PathVariable String id,@RequestBody SourceGovernanceService.BuildRequest r,@AuthenticationPrincipal AppUserPrincipal actor){return service.build(id,r,actor);} - @GetMapping("/source-revisions/{id}/evidence") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','DATA_PUBLISHER','BUSINESS_ANALYST','QUALITY_VIEWER','AUDIT_VIEWER')") @Transactional + @GetMapping("/source-revisions/{id}/evidence") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") @Transactional public Map evidence(@PathVariable String id,@AuthenticationPrincipal AppUserPrincipal actor){access.requireEvidence(actor);authorizeRevision(id,actor);Map revision=g.one("SELECT id,source_document_id,sha256,source_file,file_size,status,parser_version,received_at FROM source_revision WHERE id=?",id); g.audit(actor.getId().toString(),"SOURCE_EVIDENCE_READ","source_revision",id,Map.of());return Map.of("revision",revision,"builds",g.rows("SELECT id,parser_version,rule_version,mapping_version,status,row_count,rejected_count,component_summary FROM transform_build WHERE source_revision_id=?",id));} - @GetMapping("/source-revisions/{id}/download") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','DATA_PUBLISHER','BUSINESS_ANALYST','QUALITY_VIEWER','AUDIT_VIEWER')") @Transactional + @GetMapping("/source-revisions/{id}/download") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") @Transactional public ResponseEntity download(@PathVariable String id,@AuthenticationPrincipal AppUserPrincipal actor){ access.requireOriginalDownload(actor);authorizeRevision(id,actor);Map row=g.one("SELECT r.source_file,r.archive_path,r.file_size,r.sha256,d.stage FROM source_revision r JOIN source_document d ON d.id=r.source_document_id WHERE r.id=?",id); try{Path path=Path.of(String.valueOf(row.get("archivePath")));if(Files.isSymbolicLink(path)||!Files.isRegularFile(path,LinkOption.NOFOLLOW_LINKS)||!path.toRealPath().startsWith(scanner.archiveRoot()))throw error(HttpStatus.CONFLICT,"归档文件不完整或位置无效"); diff --git a/backend/src/main/java/cn/yunsheng/quality/governance/TaskRetryService.java b/backend/src/main/java/cn/yunsheng/quality/governance/TaskRetryService.java index b6eb4c3..be8c311 100644 --- a/backend/src/main/java/cn/yunsheng/quality/governance/TaskRetryService.java +++ b/backend/src/main/java/cn/yunsheng/quality/governance/TaskRetryService.java @@ -18,9 +18,9 @@ public class TaskRetryService { @SuppressWarnings("unchecked") public Map retry(String taskId,String key,String expectedCurrent,AppUserPrincipal actor){ g.required(key,"幂等键");String runId=tx.execute(status->{Map task=g.one("SELECT * FROM task WHERE id=? FOR UPDATE",taskId); boolean background=Set.of("RELEASE_POST_PUBLISH","BACKUP_CREATE_VERIFY","BACKUP_VERIFY").contains(String.valueOf(task.get("taskType"))); - if(!actor.getRoleCodes().contains("SYSTEM_ADMIN")&&!(background&&actor.getRoleCodes().contains("SYSTEM_OPERATOR"))&&!Objects.equals(task.get("createdBy"),actor.getId().toString()))throw error(HttpStatus.FORBIDDEN,"只能重试本人任务"); + if(!actor.getRoleCodes().contains("SYSTEM_ADMIN")&&!(background&&actor.getRoleCodes().contains("SYSTEM_ADMIN"))&&!Objects.equals(task.get("createdBy"),actor.getId().toString()))throw error(HttpStatus.FORBIDDEN,"只能重试本人任务"); if(background){ - if(actor.getRoleCodes().stream().noneMatch(Set.of("SYSTEM_ADMIN","SYSTEM_OPERATOR")::contains))throw error(HttpStatus.FORBIDDEN,"后台运维任务需要运维授权"); + if(actor.getRoleCodes().stream().noneMatch(Set.of("SYSTEM_ADMIN")::contains))throw error(HttpStatus.FORBIDDEN,"后台运维任务需要运维授权"); String requestKey="BACKGROUND_RETRY:"+GovernanceSupport.sha(key);List> prior=g.rows("SELECT id,retry_parent_id,created_by FROM task WHERE idempotency_key=?",requestKey);if(!prior.isEmpty()){if(!Objects.equals(prior.getFirst().get("retryParentId"),taskId)||!Objects.equals(prior.getFirst().get("createdBy"),actor.getId().toString()))throw error(HttpStatus.CONFLICT,"幂等键已被使用");return "task:"+prior.getFirst().get("id");} if(!"FAILED".equals(task.get("status")))throw error(HttpStatus.CONFLICT,"只有失败任务可以重试"); String rootId=task.get("retryRootId")==null?taskId:String.valueOf(task.get("retryRootId"));Map root=rootId.equals(taskId)?task:g.one("SELECT retry_count,max_retries FROM task WHERE id=? FOR UPDATE",rootId);int count=((Number)root.get("retryCount")).intValue(),max=((Number)root.get("maxRetries")).intValue();if(count>=max)throw error(HttpStatus.CONFLICT,"此后台任务链已达重试上限"); diff --git a/backend/src/main/java/cn/yunsheng/quality/identity/AdminBootstrapRunner.java b/backend/src/main/java/cn/yunsheng/quality/identity/AdminBootstrapRunner.java index 8470442..c3628af 100644 --- a/backend/src/main/java/cn/yunsheng/quality/identity/AdminBootstrapRunner.java +++ b/backend/src/main/java/cn/yunsheng/quality/identity/AdminBootstrapRunner.java @@ -35,10 +35,7 @@ public class AdminBootstrapRunner implements ApplicationRunner { UUID id = UUID.randomUUID(); jdbc.update("INSERT INTO app_user (id, username, display_name, password_hash, active) VALUES (?, ?, ?, ?, TRUE)", id.toString(), username, username, encoder.encode(password)); - for (String role : new String[]{"SYSTEM_ADMIN", "QUALITY_VIEWER", "BUSINESS_ANALYST", "DATA_MAINTAINER", - "RULE_MAINTAINER", "DATA_PUBLISHER", "SYSTEM_OPERATOR", "AUDIT_VIEWER"}) { - jdbc.update("INSERT INTO app_user_role (user_id, role_code) VALUES (?, ?)", id.toString(), role); - } + jdbc.update("INSERT INTO app_user_role (user_id, role_code) VALUES (?, 'SYSTEM_ADMIN')", id.toString()); jdbc.update("INSERT INTO app_user_scope (user_id, scope_type, scope_value) VALUES (?, 'DEPARTMENT', '质量中心')", id.toString()); } } diff --git a/backend/src/main/java/cn/yunsheng/quality/identity/AppRoles.java b/backend/src/main/java/cn/yunsheng/quality/identity/AppRoles.java new file mode 100644 index 0000000..2574bfa --- /dev/null +++ b/backend/src/main/java/cn/yunsheng/quality/identity/AppRoles.java @@ -0,0 +1,36 @@ +package cn.yunsheng.quality.identity; + +import java.util.List; +import java.util.Set; +import org.springframework.http.HttpStatus; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.web.server.ResponseStatusException; + +/** Exactly one assigned role; higher roles inherit lower operation permissions, never data scopes. */ +public final class AppRoles { + public static final Set CODES = Set.of("USER", "DATA_ADMIN", "SYSTEM_ADMIN"); + private AppRoles() {} + + public static String migratedRole(List previous) { + if (previous.contains("SYSTEM_ADMIN")) return "SYSTEM_ADMIN"; + if (previous.stream().anyMatch(Set.of("DATA_ADMIN", "DATA_MAINTAINER", "DATA_PUBLISHER", "RULE_MAINTAINER")::contains)) return "DATA_ADMIN"; + if (previous.stream().anyMatch(Set.of("USER", "QUALITY_VIEWER", "BUSINESS_ANALYST", "SYSTEM_OPERATOR", "AUDIT_VIEWER")::contains)) return "USER"; + return ""; + } + + public static List validate(List roles) { + if (roles == null || roles.size() != 1 || roles.getFirst() == null || !CODES.contains(roles.getFirst())) + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "请选择一个角色:用户、数据管理员或系统管理员"); + return List.copyOf(roles); + } + + public static List authorities(List roles) { + if (roles == null || roles.size() != 1 || roles.getFirst() == null || !CODES.contains(roles.getFirst())) return List.of(); + List inherited = switch (roles.getFirst()) { + case "SYSTEM_ADMIN" -> List.of("SYSTEM_ADMIN", "DATA_ADMIN", "USER"); + case "DATA_ADMIN" -> List.of("DATA_ADMIN", "USER"); + default -> List.of("USER"); + }; + return inherited.stream().map(role -> new SimpleGrantedAuthority("ROLE_" + role)).toList(); + } +} diff --git a/backend/src/main/java/cn/yunsheng/quality/identity/JdbcAppUserDetailsService.java b/backend/src/main/java/cn/yunsheng/quality/identity/JdbcAppUserDetailsService.java index 8482c1f..a68ccab 100644 --- a/backend/src/main/java/cn/yunsheng/quality/identity/JdbcAppUserDetailsService.java +++ b/backend/src/main/java/cn/yunsheng/quality/identity/JdbcAppUserDetailsService.java @@ -1,10 +1,8 @@ package cn.yunsheng.quality.identity; -import java.util.ArrayList; import java.util.List; import java.util.UUID; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; @@ -32,7 +30,7 @@ public class JdbcAppUserDetailsService implements UserDetailsService { (rs, row) -> rs.getString(1), user.id().toString()); List departments = scopeValues(user.id(), "DEPARTMENT"); List groups = scopeValues(user.id(), "GROUP"); - var authorities = roles.stream().map(role -> new SimpleGrantedAuthority("ROLE_" + role)).toList(); + var authorities = AppRoles.authorities(roles); return new AppUserPrincipal(user.id(), user.username(), user.passwordHash(), user.displayName(), user.active(), user.forcePasswordChange(), roles, departments, groups, authorities); } diff --git a/backend/src/main/java/cn/yunsheng/quality/ingestion/ImportRunController.java b/backend/src/main/java/cn/yunsheng/quality/ingestion/ImportRunController.java index dd022ed..694d272 100644 --- a/backend/src/main/java/cn/yunsheng/quality/ingestion/ImportRunController.java +++ b/backend/src/main/java/cn/yunsheng/quality/ingestion/ImportRunController.java @@ -21,7 +21,7 @@ public class ImportRunController { public ImportRunController(ImportRunService service, ImportWorker worker) { this.service = service; this.worker = worker; } @PostMapping - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map create(@Valid @RequestBody ImportRunService.CreateImportRequest request, @AuthenticationPrincipal AppUserPrincipal actor) { try { diff --git a/backend/src/main/java/cn/yunsheng/quality/ingestion/ImportRunReadController.java b/backend/src/main/java/cn/yunsheng/quality/ingestion/ImportRunReadController.java index 5130a22..d36c310 100644 --- a/backend/src/main/java/cn/yunsheng/quality/ingestion/ImportRunReadController.java +++ b/backend/src/main/java/cn/yunsheng/quality/ingestion/ImportRunReadController.java @@ -26,7 +26,7 @@ public class ImportRunReadController { public ImportRunReadController(JdbcTemplate jdbc, JsonMapper json,cn.yunsheng.quality.governance.GovernanceAccessService access) { this.jdbc = jdbc; this.json = json;this.access=access; } @GetMapping("/{id}") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','SYSTEM_OPERATOR','DATA_MAINTAINER','DATA_PUBLISHER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map get(@PathVariable String id,@AuthenticationPrincipal AppUserPrincipal actor) { authorize(id,actor); List> rows = jdbc.query(""" @@ -46,7 +46,7 @@ public class ImportRunReadController { } @GetMapping("/{id}/issues") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','SYSTEM_OPERATOR','DATA_MAINTAINER','DATA_PUBLISHER','AUDIT_VIEWER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map issues(@PathVariable String id, @RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "50") int pageSize,@AuthenticationPrincipal AppUserPrincipal actor) { @@ -70,7 +70,7 @@ public class ImportRunReadController { if(!access.hasFullFields(actor))items=items.stream().map(i->{i.remove("details");if(!access.allowedFields(actor).contains(String.valueOf(i.get("field")))){i.remove("field");i.put("message","字段受限:请联系有权维护者处理");}return i;}).toList(); return Map.of("items", items, "total", total == null ? 0 : total, "page", page, "pageSize", pageSize); } - private void authorize(String id,AppUserPrincipal actor){List owners=jdbc.query("SELECT created_by FROM import_run WHERE id=?",(rs,n)->rs.getString(1),id);if(owners.isEmpty())throw new ResponseStatusException(HttpStatus.NOT_FOUND,"导入任务不存在");if(!actor.getRoleCodes().contains("SYSTEM_ADMIN")&&!actor.getRoleCodes().contains("SYSTEM_OPERATOR")&&!java.util.Objects.equals(owners.getFirst(),actor.getId().toString()))throw new ResponseStatusException(HttpStatus.FORBIDDEN,"无权访问该导入任务");} + private void authorize(String id,AppUserPrincipal actor){List owners=jdbc.query("SELECT created_by FROM import_run WHERE id=?",(rs,n)->rs.getString(1),id);if(owners.isEmpty())throw new ResponseStatusException(HttpStatus.NOT_FOUND,"导入任务不存在");if(!actor.getRoleCodes().contains("SYSTEM_ADMIN")&&!java.util.Objects.equals(owners.getFirst(),actor.getId().toString()))throw new ResponseStatusException(HttpStatus.FORBIDDEN,"无权访问该导入任务");} private Object readJson(String value) { if (value == null) return Map.of(); diff --git a/backend/src/main/java/cn/yunsheng/quality/ingestion/ImportRunService.java b/backend/src/main/java/cn/yunsheng/quality/ingestion/ImportRunService.java index f1d8a2f..ba94cd1 100644 --- a/backend/src/main/java/cn/yunsheng/quality/ingestion/ImportRunService.java +++ b/backend/src/main/java/cn/yunsheng/quality/ingestion/ImportRunService.java @@ -53,7 +53,7 @@ public class ImportRunService { private ImportRunView create(CreateImportRequest request, UUID actorId, int maximumSources) { access.requireBoundAction("IMPORTER","import.run"); - Integer active=jdbc.queryForObject("SELECT COUNT(*) FROM app_user u JOIN app_user_role r ON r.user_id=u.id WHERE u.id=? AND u.active=TRUE AND r.role_code IN('SYSTEM_ADMIN','DATA_MAINTAINER','DATA_PUBLISHER')",Integer.class,actorId.toString()); + Integer active=jdbc.queryForObject("SELECT COUNT(*) FROM app_user u JOIN app_user_role r ON r.user_id=u.id WHERE u.id=? AND u.active=TRUE AND r.role_code IN('SYSTEM_ADMIN', 'DATA_ADMIN')",Integer.class,actorId.toString()); if(active==null||active==0)throw new org.springframework.web.server.ResponseStatusException(org.springframework.http.HttpStatus.FORBIDDEN,"当前身份已不再具有导入/候选构建权限"); if (request.sourceIds() == null || request.sourceIds().isEmpty() || request.sourceIds().size() > maximumSources) { throw new IllegalArgumentException("请选择 1 到 " + maximumSources + " 个数据源"); @@ -137,7 +137,7 @@ public class ImportRunService { List active=jdbc.query("SELECT active FROM app_user WHERE id=? FOR UPDATE",(rs,n)->rs.getBoolean(1),actorId); if(active.isEmpty()||!active.getFirst())throw new org.springframework.web.server.ResponseStatusException(org.springframework.http.HttpStatus.FORBIDDEN,"提交人已停用"); List roles=jdbc.query("SELECT role_code FROM app_user_role WHERE user_id=? FOR UPDATE",(rs,n)->rs.getString(1),actorId); - if(roles.stream().noneMatch(java.util.Set.of("SYSTEM_ADMIN","DATA_MAINTAINER","DATA_PUBLISHER")::contains))throw new org.springframework.web.server.ResponseStatusException(org.springframework.http.HttpStatus.FORBIDDEN,"提交人已无导入权限"); + if(roles.stream().noneMatch(java.util.Set.of("SYSTEM_ADMIN", "DATA_ADMIN")::contains))throw new org.springframework.web.server.ResponseStatusException(org.springframework.http.HttpStatus.FORBIDDEN,"提交人已无导入权限"); List departments=jdbc.query("SELECT scope_value FROM app_user_scope WHERE user_id=? AND scope_type='DEPARTMENT' FOR UPDATE",(rs,n)->rs.getString(1),actorId); List groups=jdbc.query("SELECT scope_value FROM app_user_scope WHERE user_id=? AND scope_type='GROUP' FOR UPDATE",(rs,n)->rs.getString(1),actorId); var actor=new cn.yunsheng.quality.identity.AppUserPrincipal(UUID.fromString(actorId),actorId,"","",true,false,roles,departments,groups,List.of()); diff --git a/backend/src/main/java/cn/yunsheng/quality/ingestion/ImportWorker.java b/backend/src/main/java/cn/yunsheng/quality/ingestion/ImportWorker.java index d371abb..dce818b 100644 --- a/backend/src/main/java/cn/yunsheng/quality/ingestion/ImportWorker.java +++ b/backend/src/main/java/cn/yunsheng/quality/ingestion/ImportWorker.java @@ -67,7 +67,7 @@ public class ImportWorker { if (runs.isEmpty()) throw new IllegalArgumentException("导入任务不存在"); RunRow run = runs.getFirst(); if (List.of("COMPLETED", "FAILED", "CANCELLED").contains(run.status())) return getRun(runId); - Integer authorized=jdbc.queryForObject("SELECT COUNT(*) FROM app_user u JOIN app_user_role r ON r.user_id=u.id WHERE u.id=? AND u.active=TRUE AND r.role_code IN('SYSTEM_ADMIN','DATA_MAINTAINER','DATA_PUBLISHER')",Integer.class,run.createdBy()); + Integer authorized=jdbc.queryForObject("SELECT COUNT(*) FROM app_user u JOIN app_user_role r ON r.user_id=u.id WHERE u.id=? AND u.active=TRUE AND r.role_code IN('SYSTEM_ADMIN', 'DATA_ADMIN')",Integer.class,run.createdBy()); if(authorized==null||authorized==0)return fail(runId,"AUTHORIZATION_REVOKED","提交人已停用或撤回导入权限,请由有效维护者重新提交"); String expectedPointer = run.expectedCurrentReleaseId(); String currentPointer = currentReleaseId(); @@ -455,7 +455,7 @@ public class ImportWorker { } private boolean authorizedToSubmit(String actor,List members){ List enabled=jdbc.query("SELECT active FROM app_user WHERE id=? FOR UPDATE",(rs,n)->rs.getBoolean(1),actor);if(enabled.isEmpty()||!enabled.getFirst())return false; - List roles=jdbc.query("SELECT role_code FROM app_user_role WHERE user_id=? FOR UPDATE",(rs,n)->rs.getString(1),actor);if(roles.stream().noneMatch(Set.of("SYSTEM_ADMIN","DATA_MAINTAINER","DATA_PUBLISHER")::contains))return false; + List roles=jdbc.query("SELECT role_code FROM app_user_role WHERE user_id=? FOR UPDATE",(rs,n)->rs.getString(1),actor);if(roles.stream().noneMatch(Set.of("SYSTEM_ADMIN", "DATA_ADMIN")::contains))return false; List expiry=jdbc.query("SELECT valid_until FROM user_access_policy WHERE user_id=? FOR UPDATE",(rs,n)->rs.getTimestamp(1),actor);if(!expiry.isEmpty()&&expiry.getFirst()!=null&&expiry.getFirst().toInstant().isBefore(Instant.now()))return false; List departments=jdbc.query("SELECT scope_value FROM app_user_scope WHERE user_id=? AND scope_type='DEPARTMENT' FOR UPDATE",(rs,n)->rs.getString(1),actor),groups=jdbc.query("SELECT scope_value FROM app_user_scope WHERE user_id=? AND scope_type='GROUP' FOR UPDATE",(rs,n)->rs.getString(1),actor); cn.yunsheng.quality.identity.AppUserPrincipal user=access.resolvePrincipal(new cn.yunsheng.quality.identity.AppUserPrincipal(UUID.fromString(actor),actor,"","",true,false,roles,departments,groups,List.of())); diff --git a/backend/src/main/java/cn/yunsheng/quality/masterdata/MasterDataWorkbookController.java b/backend/src/main/java/cn/yunsheng/quality/masterdata/MasterDataWorkbookController.java index 6f571b2..7292b71 100644 --- a/backend/src/main/java/cn/yunsheng/quality/masterdata/MasterDataWorkbookController.java +++ b/backend/src/main/java/cn/yunsheng/quality/masterdata/MasterDataWorkbookController.java @@ -9,15 +9,15 @@ import org.springframework.web.multipart.MultipartFile; @RestController @RequestMapping("/api/master-data/workbooks") -@PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','RULE_MAINTAINER')") +@PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public class MasterDataWorkbookController { private final MasterDataWorkbookService service; public MasterDataWorkbookController(MasterDataWorkbookService service) { this.service = service; } @PostMapping("/preview") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','RULE_MAINTAINER','DATA_PUBLISHER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map preview(@RequestPart("file") MultipartFile file, @AuthenticationPrincipal AppUserPrincipal actor) { return service.preview(file, actor); } @PostMapping("/prepare") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','RULE_MAINTAINER','DATA_PUBLISHER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map prepareWorkbook(@RequestBody MasterDataWorkbookService.ImportRequest request, @AuthenticationPrincipal AppUserPrincipal actor) { return service.prepareWorkbook(request, actor); } @PostMapping("/import") public Map importWorkbook(@RequestBody MasterDataWorkbookService.ImportRequest request, @AuthenticationPrincipal AppUserPrincipal actor) { return service.importWorkbook(request, actor); } diff --git a/backend/src/main/java/cn/yunsheng/quality/metrics/MetricsController.java b/backend/src/main/java/cn/yunsheng/quality/metrics/MetricsController.java index 89b795e..4cc7155 100644 --- a/backend/src/main/java/cn/yunsheng/quality/metrics/MetricsController.java +++ b/backend/src/main/java/cn/yunsheng/quality/metrics/MetricsController.java @@ -48,7 +48,7 @@ public class MetricsController { return calculate(year,month,quarter,department,group,product,productSearch,projectGroup,view,includeUnassigned,releaseId,trendGranularity,rowLimit,rowOffset,rowOrder,extraFilters,exclusions,null,actor); } @GetMapping - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public MetricsService.MetricSnapshot calculateHttp(@RequestParam(required = false) Integer year, @RequestParam(required = false) Integer month, @RequestParam(required = false) Integer monthStart, @@ -78,7 +78,7 @@ public class MetricsController { /** 轻量趋势接口:查询参数与正式指标接口一致,但只返回版本、上下文、趋势和覆盖信息。 */ @GetMapping("/trend") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public MetricsService.MetricTrendSnapshot trendHttp(@RequestParam(required = false) Integer year, @RequestParam(required = false) Integer month, @RequestParam(required = false) Integer monthStart, diff --git a/backend/src/main/java/cn/yunsheng/quality/metrics/MetricsRollupService.java b/backend/src/main/java/cn/yunsheng/quality/metrics/MetricsRollupService.java index ef0baef..f1bcba2 100644 --- a/backend/src/main/java/cn/yunsheng/quality/metrics/MetricsRollupService.java +++ b/backend/src/main/java/cn/yunsheng/quality/metrics/MetricsRollupService.java @@ -49,6 +49,7 @@ public class MetricsRollupService { jdbc.update(rollupInsertSql("fact_"+stage).replace("WHERE f.build_id=?","WHERE f.build_id=? AND ("+inserted+")"),insertArgs.toArray()); } fineDefects.refreshGroups(build, keys); + new SalesOrderMetricRollups(jdbc).refreshCurrentBuild(build); } /** Idempotently refreshes a completed build in the caller's transaction. */ @@ -70,6 +71,7 @@ public class MetricsRollupService { (SELECT COUNT(*) FROM fact_bright WHERE build_id=?), CURRENT_TIMESTAMP(6) """, buildId, buildId, buildId); fineDefects.refreshBuild(buildId); + new SalesOrderMetricRollups(jdbc).refreshCurrentBuild(buildId); } static String rollupInsertSql(String table) { diff --git a/backend/src/main/java/cn/yunsheng/quality/metrics/MetricsService.java b/backend/src/main/java/cn/yunsheng/quality/metrics/MetricsService.java index afc483f..b9b7be7 100644 --- a/backend/src/main/java/cn/yunsheng/quality/metrics/MetricsService.java +++ b/backend/src/main/java/cn/yunsheng/quality/metrics/MetricsService.java @@ -111,21 +111,22 @@ public class MetricsService { AppUserPrincipal actor, boolean hasUnrolledBuilds) { Map 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); + boolean salesRollup = salesOrderRollupReady(releaseId, query, actor); + if (!hasSourceFilters || salesRollup) { + aggregateTrendStage(periods, "black", releaseId, query, actor, false, salesRollup); + aggregateTrendStage(periods, "bright", releaseId, query, actor, false, salesRollup); } - if (hasUnrolledBuilds || hasSourceFilters) { - aggregateTrendStage(periods, "black", releaseId, query, actor, true); - aggregateTrendStage(periods, "bright", releaseId, query, actor, true); + if (!salesRollup && (hasUnrolledBuilds || hasSourceFilters)) { + aggregateTrendStage(periods, "black", releaseId, query, actor, true, false); + aggregateTrendStage(periods, "bright", releaseId, query, actor, true, false); } return periods; } private void aggregateTrendStage(Map periods, String stage, String releaseId, - MetricsQuery query, AppUserPrincipal actor, boolean factFallback) { + MetricsQuery query, AppUserPrincipal actor, boolean factFallback, boolean salesRollup) { if (query.stage() != null && !query.stage().equals(stage)) return; - String table = factFallback ? (stage.equals("black") ? "fact_black" : "fact_bright") : "metric_rollup"; + String table = factFallback ? (stage.equals("black") ? "fact_black" : "fact_bright") : (salesRollup ? "sales_order_metric_rollup" : "metric_rollup"); StringBuilder where = new StringBuilder(" WHERE rm.release_id=?"); List args = new ArrayList<>(); args.add(releaseId); @@ -133,6 +134,7 @@ public class MetricsService { 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); } + if (salesRollup) new SalesOrderMetricRollups(jdbc).append(where, args, query.extraFilters()); appendTime(where, args, query); appendDimensions(where, args, query); appendExclusions(where, args, query); @@ -192,7 +194,7 @@ public class MetricsService { if (actor == null) throw new ResponseStatusException(HttpStatus.FORBIDDEN, "对账指标查询必须绑定当前有效用户"); governance.requireUserActivePolicy(actor); governance.requireBoundAction("QUERY", "query.aggregate"); - Set allowedRoles = Set.of("DATA_MAINTAINER", "RULE_MAINTAINER", "DATA_PUBLISHER", "SYSTEM_ADMIN"); + Set allowedRoles = Set.of("DATA_ADMIN", "SYSTEM_ADMIN"); if (actor.getRoleCodes().stream().noneMatch(allowedRoles::contains)) throw new ResponseStatusException(HttpStatus.FORBIDDEN, "当前功能角色不允许执行候选基线对账"); validate(query); @@ -311,6 +313,12 @@ public class MetricsService { return rawRows - (effectiveIncludeUnassigned(query) ? 0 : excludedBlankRows); } + private boolean salesOrderRollupReady(String release, MetricsQuery query, AppUserPrincipal actor) { + if (query.extraFilters().isEmpty() || !query.columnFilters().isEmpty() + || !Set.of(cn.yunsheng.quality.filters.SalesOrderTypes.KEY, cn.yunsheng.quality.filters.SalesOrderTypes.EXCLUDE_KEY).containsAll(query.extraFilters().keySet())) return false; + return new SalesOrderMetricRollups(jdbc).ready(release, query.extraFilters(), false, governance.allowedFields(actor)); + } + private boolean hasUnrolledBuilds(String releaseId) { Integer count = jdbc.queryForObject(""" SELECT COUNT(*) FROM release_member rm @@ -327,20 +335,24 @@ public class MetricsService { private AggregateSet queryAggregates(String releaseId, MetricsQuery query, AppUserPrincipal actor, boolean hasUnrolledBuilds, Map canonicalGroupDepartments) { AggregateSet result = new AggregateSet(); - if ((query.extraFilters().isEmpty() && query.columnFilters().isEmpty())) aggregateStage(result, "black", query.view(), releaseId, query, actor, false, canonicalGroupDepartments); - if ((query.extraFilters().isEmpty() && query.columnFilters().isEmpty())) aggregateStage(result, "bright", query.view(), releaseId, query, actor, false, canonicalGroupDepartments); - if (hasUnrolledBuilds || !(query.extraFilters().isEmpty() && query.columnFilters().isEmpty())) { - aggregateStage(result, "black", query.view(), releaseId, query, actor, true, canonicalGroupDepartments); - aggregateStage(result, "bright", query.view(), releaseId, query, actor, true, canonicalGroupDepartments); + boolean salesRollup = salesOrderRollupReady(releaseId, query, actor); + boolean hasSourceFilters = !query.extraFilters().isEmpty() || !query.columnFilters().isEmpty(); + if (!hasSourceFilters || salesRollup) { + aggregateStage(result, "black", query.view(), releaseId, query, actor, false, salesRollup, canonicalGroupDepartments); + aggregateStage(result, "bright", query.view(), releaseId, query, actor, false, salesRollup, canonicalGroupDepartments); + } + if (!salesRollup && (hasUnrolledBuilds || hasSourceFilters)) { + aggregateStage(result, "black", query.view(), releaseId, query, actor, true, false, canonicalGroupDepartments); + aggregateStage(result, "bright", query.view(), releaseId, query, actor, true, false, canonicalGroupDepartments); } return result; } private void aggregateStage(AggregateSet result, String stage, String view, String releaseId, - MetricsQuery query, AppUserPrincipal actor, boolean factFallback, + MetricsQuery query, AppUserPrincipal actor, boolean factFallback, boolean salesRollup, Map canonicalGroupDepartments) { if(query.stage()!=null&&!query.stage().equals(stage))return; - String table = factFallback ? (stage.equals("black") ? "fact_black" : "fact_bright") : "metric_rollup"; + String table = factFallback ? (stage.equals("black") ? "fact_black" : "fact_bright") : (salesRollup ? "sales_order_metric_rollup" : "metric_rollup"); String dimensionColumn = view.equals("overall") ? null : switch (view) { case "department" -> "f.department"; case "group" -> "f.group_name"; @@ -358,6 +370,7 @@ public class MetricsService { args.add(releaseId); if (factFallback && (query.extraFilters().isEmpty() && query.columnFilters().isEmpty())) 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); } + if (salesRollup) new SalesOrderMetricRollups(jdbc).append(where, args, query.extraFilters()); appendTime(where, args, query); appendDimensions(where, args, query); appendExclusions(where, args, query); @@ -521,11 +534,15 @@ public class MetricsService { Map queryCoverage(String releaseId, MetricsQuery query, AppUserPrincipal actor, boolean hasUnrolledBuilds) { TreeMap months = new TreeMap<>(); - if ((query.extraFilters().isEmpty() && query.columnFilters().isEmpty())) coverageStage(months, "black", releaseId, query, actor, false); - if ((query.extraFilters().isEmpty() && query.columnFilters().isEmpty())) coverageStage(months, "bright", releaseId, query, actor, false); - if (hasUnrolledBuilds || !(query.extraFilters().isEmpty() && query.columnFilters().isEmpty())) { - coverageStage(months, "black", releaseId, query, actor, true); - coverageStage(months, "bright", releaseId, query, actor, true); + boolean salesRollup = salesOrderRollupReady(releaseId, query, actor); + boolean hasSourceFilters = !query.extraFilters().isEmpty() || !query.columnFilters().isEmpty(); + if (!hasSourceFilters || salesRollup) { + coverageStage(months, "black", releaseId, query, actor, false, salesRollup); + coverageStage(months, "bright", releaseId, query, actor, false, salesRollup); + } + if (!salesRollup && (hasUnrolledBuilds || hasSourceFilters)) { + coverageStage(months, "black", releaseId, query, actor, true, false); + coverageStage(months, "bright", releaseId, query, actor, true, false); } long rawRows = 0, excludedBlank = 0, unmapped = 0, projectUnconfigured = 0; List> sourceMonths = new ArrayList<>(); @@ -562,14 +579,15 @@ public class MetricsService { } private void coverageStage(Map months, String stage, String releaseId, - MetricsQuery query, AppUserPrincipal actor, boolean factFallback) { + MetricsQuery query, AppUserPrincipal actor, boolean factFallback, boolean salesRollup) { if(query.stage()!=null&&!query.stage().equals(stage))return; - String table = factFallback ? (stage.equals("black") ? "fact_black" : "fact_bright") : "metric_rollup"; + String table = factFallback ? (stage.equals("black") ? "fact_black" : "fact_bright") : (salesRollup ? "sales_order_metric_rollup" : "metric_rollup"); StringBuilder where = new StringBuilder(" WHERE rm.release_id=?"); List args = new ArrayList<>(); args.add(releaseId); if (factFallback && (query.extraFilters().isEmpty() && query.columnFilters().isEmpty())) 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); } + if (salesRollup) new SalesOrderMetricRollups(jdbc).append(where, args, query.extraFilters()); appendTime(where, args, query); appendDimensions(where, args, query); appendExclusions(where, args, query); @@ -765,6 +783,7 @@ public class MetricsService { result.put("trendGranularity", query.trendGranularity()); result.put("exclusions", query.exclusions()); result.put("extraFilters", query.extraFilters()); + if(query.extraFilters().containsKey(cn.yunsheng.quality.filters.SalesOrderTypes.KEY)||query.extraFilters().containsKey(cn.yunsheng.quality.filters.SalesOrderTypes.EXCLUDE_KEY))result.put("salesOrderTypeVersionId",cn.yunsheng.quality.filters.SalesOrderTypes.version(jdbc)); if(query.stage()!=null)result.put("stage",query.stage()); if(!query.columnFilters().isEmpty())result.put("columnFilters",query.columnFilters()); return result; diff --git a/backend/src/main/java/cn/yunsheng/quality/metrics/SalesOrderMetricBackfill.java b/backend/src/main/java/cn/yunsheng/quality/metrics/SalesOrderMetricBackfill.java new file mode 100644 index 0000000..53acfd6 --- /dev/null +++ b/backend/src/main/java/cn/yunsheng/quality/metrics/SalesOrderMetricBackfill.java @@ -0,0 +1,18 @@ +package cn.yunsheng.quality.metrics; + +import cn.yunsheng.quality.filters.SalesOrderTypes; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +@Component +public class SalesOrderMetricBackfill implements ApplicationRunner { + private final JdbcTemplate jdbc; + public SalesOrderMetricBackfill(JdbcTemplate jdbc) { this.jdbc=jdbc; } + @Override @Transactional + public void run(ApplicationArguments args) { + new SalesOrderMetricRollups(jdbc).prepareCurrentRelease(SalesOrderTypes.version(jdbc)); + } +} diff --git a/backend/src/main/java/cn/yunsheng/quality/metrics/SalesOrderMetricRollups.java b/backend/src/main/java/cn/yunsheng/quality/metrics/SalesOrderMetricRollups.java new file mode 100644 index 0000000..16d064f --- /dev/null +++ b/backend/src/main/java/cn/yunsheng/quality/metrics/SalesOrderMetricRollups.java @@ -0,0 +1,78 @@ +package cn.yunsheng.quality.metrics; + +import cn.yunsheng.quality.filters.QueryFilterFields; +import cn.yunsheng.quality.filters.SalesOrderTypes; +import java.util.*; +import org.springframework.jdbc.core.JdbcTemplate; + +/** Immutable aggregates keyed by both mapping version and source build. Missing snapshots use facts. */ +public final class SalesOrderMetricRollups { + private final JdbcTemplate jdbc; + public SalesOrderMetricRollups(JdbcTemplate jdbc) { this.jdbc = jdbc; } + + public void prepareCurrentRelease(String version) { + if (version == null || version.isBlank()) return; + for (String build : jdbc.queryForList(""" + SELECT DISTINCT rm.transform_build_id FROM current_release cr + JOIN release_member rm ON rm.release_id=cr.release_id + WHERE cr.dataset_id='quality' + """, String.class)) prepareBuild(version, build); + } + + public void refreshCurrentBuild(String build) { + jdbc.update("DELETE FROM sales_order_metric_rollup_build WHERE build_id=?", build); + jdbc.update("DELETE FROM sales_order_metric_rollup WHERE build_id=?", build); + prepareBuild(SalesOrderTypes.version(jdbc), build); + } + + public void prepareBuild(String version, String build) { + if (version == null || version.isBlank()) return; + // The version row serializes preparers, including startup backfill and imports. + jdbc.queryForList("SELECT id FROM sales_order_type_version WHERE id=? FOR UPDATE", String.class, version); + if (Boolean.TRUE.equals(jdbc.queryForObject("SELECT COUNT(*)>0 FROM sales_order_metric_rollup_build WHERE version_id=? AND build_id=?", Boolean.class, version, build))) return; + jdbc.update("DELETE FROM sales_order_metric_rollup WHERE version_id=? AND build_id=?", version, build); + for (String stage : List.of("black", "bright")) { + String table = "fact_" + stage; + String sql = MetricsRollupService.rollupInsertSql(table) + .replace("INSERT INTO metric_rollup (", "INSERT INTO sales_order_metric_rollup (version_id, order_type,") + .replace("SELECT f.build_id, ?", "SELECT ?, COALESCE(sot.order_type,'__EMPTY__'), f.build_id, ?") + .replace("FROM " + table + " f", "FROM " + table + " f LEFT JOIN sales_order_type_entry sot ON sot.version_id=? AND sot.order_no=f.sales_order_no") + .replace("GROUP BY f.build_id,", "GROUP BY sot.order_type, f.build_id,"); + jdbc.update(sql, version, stage, version, build); + } + jdbc.update(""" + INSERT INTO sales_order_metric_rollup_build(version_id,build_id,source_row_count) + SELECT ?,?,COALESCE(SUM(source_row_count),0) FROM sales_order_metric_rollup WHERE version_id=? AND build_id=? + """, version, build, version, build); + } + + public boolean ready(String release, Map> filters, boolean hasColumnFilters, Set allowed) { + if (hasColumnFilters || filters.isEmpty() || !Set.of(SalesOrderTypes.KEY,SalesOrderTypes.EXCLUDE_KEY).containsAll(filters.keySet())) return false; + if (!SalesOrderTypes.allowed(allowed)) throw QueryFilterFields.bad("没有查看销售订单类型的权限"); + validate(filters); + String version = SalesOrderTypes.version(jdbc); + if (version.isBlank()) return false; + Integer missing = jdbc.queryForObject(""" + SELECT COUNT(*) FROM release_member rm LEFT JOIN sales_order_metric_rollup_build rb + ON rb.build_id=rm.transform_build_id AND rb.version_id=? + WHERE rm.release_id=? AND rb.build_id IS NULL + """, Integer.class, version, release); + return missing != null && missing == 0; + } + + static void validate(Map> filters) { + for (var values : filters.values()) for (String value : values) + if (!SalesOrderTypes.TYPES.contains(value) && !QueryFilterFields.EMPTY.equals(value)) throw QueryFilterFields.bad("销售订单类型无效"); + } + + public void append(StringBuilder where, List args, Map> filters) { + validate(filters); + where.append(" AND f.version_id=?"); args.add(SalesOrderTypes.version(jdbc)); + for (var entry : filters.entrySet()) { + if (entry.getValue().isEmpty()) continue; + where.append(" AND f.order_type ").append(SalesOrderTypes.EXCLUDE_KEY.equals(entry.getKey()) ? "NOT IN (" : "IN (") + .append(String.join(",",Collections.nCopies(entry.getValue().size(),"?"))).append(')'); + args.addAll(entry.getValue()); + } + } +} diff --git a/backend/src/main/java/cn/yunsheng/quality/options/OptionsController.java b/backend/src/main/java/cn/yunsheng/quality/options/OptionsController.java index 655e35d..a8876f9 100644 --- a/backend/src/main/java/cn/yunsheng/quality/options/OptionsController.java +++ b/backend/src/main/java/cn/yunsheng/quality/options/OptionsController.java @@ -33,7 +33,7 @@ public class OptionsController { /** Reference names support maintenance without granting aggregate-query or source-detail access. */ @GetMapping("/reference-names") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','RULE_MAINTAINER','QUALITY_VIEWER','BUSINESS_ANALYST','AUDIT_VIEWER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map referenceNames(@AuthenticationPrincipal AppUserPrincipal actor) { Map available = options(null, actor); Map result = new LinkedHashMap<>(); @@ -43,7 +43,7 @@ public class OptionsController { } @GetMapping - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map options(@RequestParam(required = false) String releaseId, @AuthenticationPrincipal AppUserPrincipal actor) { String selected = releases.resolvePublishedRelease(releaseId); diff --git a/backend/src/main/java/cn/yunsheng/quality/records/RecordController.java b/backend/src/main/java/cn/yunsheng/quality/records/RecordController.java index 42f5213..57edf6d 100644 --- a/backend/src/main/java/cn/yunsheng/quality/records/RecordController.java +++ b/backend/src/main/java/cn/yunsheng/quality/records/RecordController.java @@ -3,6 +3,7 @@ package cn.yunsheng.quality.records; import cn.yunsheng.quality.common.DataScope; import cn.yunsheng.quality.common.ImmutableQueryCache; import cn.yunsheng.quality.filters.QueryFilterFields; +import cn.yunsheng.quality.filters.SalesOrderTypes; import cn.yunsheng.quality.common.DepartmentLabels; import cn.yunsheng.quality.common.SelectionValues; import cn.yunsheng.quality.identity.AppUserPrincipal; @@ -92,7 +93,7 @@ public class RecordController { return recordsFiltered(stage,year,month,quarter,department,group,product,productSearch,projectGroup,includeUnassigned,releaseId,page,pageSize,field,search,sort,direction,columns,extraFilters,null,actor); } @GetMapping - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map recordsFiltered(@RequestParam String stage, @RequestParam(required = false) Integer year, @RequestParam(required = false) Integer month, @@ -187,17 +188,20 @@ public class RecordController { } // Field permissions remain current on every request; no authorized row JSON is cached. Set allowedFields = governance.allowedFields(actor); - List rowArgs = new ArrayList<>(args); rowArgs.addAll(ids); + List rowArgs = new ArrayList<>(); + String orderTypeProjection=SalesOrderTypes.allowed(allowedFields) + ? SalesOrderTypes.expression(stage,SalesOrderTypes.version(jdbc),rowArgs) : "NULL"; + rowArgs.addAll(args); rowArgs.addAll(ids); List> fetched = ids.isEmpty() ? List.of() : jdbc.query(""" SELECT f.id, sr.id AS source_revision_id, sr.source_file, f.sheet_name, f.physical_row_no, f.month_key, f.department, f.group_name, f.project_group, f.product, f.qualified_weight, f.scrap_weight, - f.total_weight, f.raw_values, f.components + f.total_weight, f.raw_values, f.components, %s AS sales_order_type FROM release_member rm JOIN source_revision sr ON sr.id = rm.source_revision_id JOIN %s f ON f.build_id = rm.transform_build_id %s AND f.id IN (%s) - """.formatted(fact, predicate, String.join(",", java.util.Collections.nCopies(ids.size(), "?"))), + """.formatted(orderTypeProjection, fact, predicate, String.join(",", java.util.Collections.nCopies(ids.size(), "?"))), (rs, row) -> mapRow(rs, stage, allowedFields, selectedColumns), rowArgs.toArray()); Map> byId = new LinkedHashMap<>(); fetched.forEach(row -> byId.put(String.valueOf(row.get("id")), row)); @@ -210,7 +214,7 @@ public class RecordController { return exportFiltered(year,month,quarter,department,group,product,productSearch,projectGroup,includeUnassigned,releaseId,extraFilters,null,null,actor); } @GetMapping("/export") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public ResponseEntity exportFiltered(@RequestParam(required = false) Integer year, @RequestParam(required = false) Integer month, @RequestParam(required = false) Integer quarter, @@ -280,6 +284,7 @@ public class RecordController { row.put("projectGroup", rs.getString("project_group")); row.put("group", rs.getString("group_name")); row.put("product", rs.getString("product")); + if(SalesOrderTypes.allowed(allowedFields))row.put("salesOrderType",rs.getString("sales_order_type")); Map visibleRaw = filterFields(readJson(rs.getString("raw_values")), allowedFields); if (selectedColumns != null) { Map selectedRaw = new LinkedHashMap<>(); diff --git a/backend/src/main/java/cn/yunsheng/quality/records/RecordsWorkbookExportService.java b/backend/src/main/java/cn/yunsheng/quality/records/RecordsWorkbookExportService.java index 4626cc4..84a2def 100644 --- a/backend/src/main/java/cn/yunsheng/quality/records/RecordsWorkbookExportService.java +++ b/backend/src/main/java/cn/yunsheng/quality/records/RecordsWorkbookExportService.java @@ -2,6 +2,7 @@ package cn.yunsheng.quality.records; import cn.yunsheng.quality.common.DataScope; import cn.yunsheng.quality.filters.QueryFilterFields; +import cn.yunsheng.quality.filters.SalesOrderTypes; import cn.yunsheng.quality.common.DepartmentLabels; import cn.yunsheng.quality.common.SelectionValues; import cn.yunsheng.quality.governance.GovernanceAccessService; @@ -119,10 +120,12 @@ public class RecordsWorkbookExportService { projectGroup, includeUnassigned, "f.raw_values", actor, extraFilters, productSearch,columnFilters); scan(rawScope, rs -> rawFields.addAll(visibleRaw(readJson(rs.getString(1)), allowedFields).keySet())); } - if (rawFields.size() + HEADER_COUNT > MAX_COLUMNS) + boolean showOrderType=SalesOrderTypes.allowed(allowedFields); + if (rawFields.size() + HEADER_COUNT + (showOrderType?1:0) > MAX_COLUMNS) throw new ResponseStatusException(HttpStatus.PAYLOAD_TOO_LARGE, "原始字段数量超过 Excel 单表列数上限"); List headers = new ArrayList<>(FIXED_HEADERS); + if(showOrderType)headers.add(SalesOrderTypes.LABEL); headers.addAll(rawFields); Row header = sheet.createRow(0); for (int index = 0; index < headers.size(); index++) { @@ -140,7 +143,7 @@ public class RecordsWorkbookExportService { "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); int[] rowIndex = {1}; - scan(rowScope, rs -> writeRow(sheet, rowIndex, rs, rawFields, allowedFields)); + scan(rowScope, rs -> writeRow(sheet, rowIndex, rs, rawFields, allowedFields,showOrderType)); } private QueryScope queryScope(String fact, String releaseId, Integer year, Integer month, Integer quarter, @@ -166,6 +169,11 @@ public class RecordsWorkbookExportService { DataScope.append(predicate, args, actor, "f.department COLLATE utf8mb4_0900_as_cs", "f.group_name COLLATE utf8mb4_0900_as_cs"); String columns = select == null ? "f.raw_values" : select; + if(columns.startsWith("sr.source_file")&&SalesOrderTypes.allowed(governance.allowedFields(actor))) { + List projectionArgs=new ArrayList<>(); + columns+=", "+SalesOrderTypes.expression(fact.equals("fact_black")?"black":"bright",SalesOrderTypes.version(jdbc),projectionArgs)+" AS sales_order_type"; + projectionArgs.addAll(args);args=projectionArgs; + } String sql = "SELECT " + columns + " FROM release_member rm " + "JOIN source_revision sr ON sr.id = rm.source_revision_id " + "JOIN " + fact + " f ON f.build_id = rm.transform_build_id " + predicate + @@ -184,7 +192,7 @@ public class RecordsWorkbookExportService { } private void writeRow(Sheet sheet, int[] rowIndex, ResultSet rs, Set rawFields, - Set allowedFields) throws SQLException { + Set allowedFields,boolean showOrderType) throws SQLException { if (rowIndex[0] >= MAX_ROWS) throw new ResponseStatusException(HttpStatus.PAYLOAD_TOO_LARGE, "明细超过 Excel 单工作表行数上限"); Row row = sheet.createRow(rowIndex[0]++); @@ -201,6 +209,7 @@ public class RecordsWorkbookExportService { Map raw = visibleRaw(readJson(rs.getString("raw_values")), allowedFields); int index = HEADER_COUNT; + if(showOrderType)writeText(row,index++,rs.getString("sales_order_type")); for (String field : rawFields) { if (raw.containsKey(field)) writeText(row, index, valueText(raw.get(field))); index++; diff --git a/backend/src/main/java/cn/yunsheng/quality/release/ReleaseController.java b/backend/src/main/java/cn/yunsheng/quality/release/ReleaseController.java index bb7f170..889022f 100644 --- a/backend/src/main/java/cn/yunsheng/quality/release/ReleaseController.java +++ b/backend/src/main/java/cn/yunsheng/quality/release/ReleaseController.java @@ -19,11 +19,11 @@ public class ReleaseController { public ReleaseController(ReleaseService service) { this.service = service; } @GetMapping - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST','DATA_MAINTAINER','DATA_PUBLISHER','AUDIT_VIEWER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map list() { return service.list(); } @PostMapping("/{id}/publish") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_PUBLISHER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map publish(@PathVariable String id, @RequestBody ReleaseService.ReleaseActionRequest request, @AuthenticationPrincipal AppUserPrincipal actor) { return service.transition(id, "publish", request, actor); diff --git a/backend/src/main/java/cn/yunsheng/quality/release/ReleaseService.java b/backend/src/main/java/cn/yunsheng/quality/release/ReleaseService.java index 8c59b8e..35cbc9a 100644 --- a/backend/src/main/java/cn/yunsheng/quality/release/ReleaseService.java +++ b/backend/src/main/java/cn/yunsheng/quality/release/ReleaseService.java @@ -92,7 +92,7 @@ public class ReleaseService { public Map transitionInTestWorkflow(String releaseId, String action, ReleaseActionRequest request, AppUserPrincipal actor, boolean allowEmptyRelease) { if (!testWorkflowMode) throw new ResponseStatusException(HttpStatus.NOT_FOUND, "测试模式便捷工作流未启用"); - if (!actor.getRoleCodes().contains("SYSTEM_ADMIN") && !actor.getRoleCodes().contains("DATA_PUBLISHER")) + if (!actor.getRoleCodes().contains("SYSTEM_ADMIN") && !actor.getRoleCodes().contains("DATA_ADMIN")) throw new ResponseStatusException(HttpStatus.FORBIDDEN, "自动更新报表需要发布者或系统管理员权限"); return transitionInternal(releaseId, action, request, actor, true, allowEmptyRelease); } diff --git a/backend/src/main/java/cn/yunsheng/quality/source/SourceController.java b/backend/src/main/java/cn/yunsheng/quality/source/SourceController.java index 27c2c55..c026780 100644 --- a/backend/src/main/java/cn/yunsheng/quality/source/SourceController.java +++ b/backend/src/main/java/cn/yunsheng/quality/source/SourceController.java @@ -30,13 +30,13 @@ public class SourceController { } @GetMapping - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','QUALITY_VIEWER','BUSINESS_ANALYST','DATA_MAINTAINER','DATA_PUBLISHER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map list() { return Map.of("items", catalog.list()); } @PostMapping("/scan") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map scan() { access.requireBoundAction("RECEIVER","source.receive"); List items = catalog.scan(); @@ -44,7 +44,7 @@ public class SourceController { } @PostMapping("/upload") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map upload(@RequestPart("file") MultipartFile file) { access.requireBoundAction("RECEIVER","source.receive"); if (file.isEmpty()) throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "文件为空"); diff --git a/backend/src/main/java/cn/yunsheng/quality/source/SourceDeletionController.java b/backend/src/main/java/cn/yunsheng/quality/source/SourceDeletionController.java index 384556f..d722024 100644 --- a/backend/src/main/java/cn/yunsheng/quality/source/SourceDeletionController.java +++ b/backend/src/main/java/cn/yunsheng/quality/source/SourceDeletionController.java @@ -14,13 +14,13 @@ import org.springframework.web.server.ResponseStatusException; public class SourceDeletionController { private final SourceDeletionService deletion; public SourceDeletionController(SourceDeletionService deletion){this.deletion=deletion;} - @GetMapping("/{id}/deletion-preview") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','DATA_PUBLISHER')") + @GetMapping("/{id}/deletion-preview") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map preview(@PathVariable String id,@AuthenticationPrincipal AppUserPrincipal actor){return deletion.preview(id,actor);} - @GetMapping("/deleted") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','DATA_PUBLISHER')") + @GetMapping("/deleted") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map deleted(@AuthenticationPrincipal AppUserPrincipal actor){return deletion.deleted(actor);} - @PostMapping("/{id}/delete") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER')") + @PostMapping("/{id}/delete") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map delete(@PathVariable String id,@RequestBody SourceDeletionService.DeleteRequest request,@AuthenticationPrincipal AppUserPrincipal actor){return deletion.delete(id,request,actor);} - @PostMapping("/{id}/restore") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER')") + @PostMapping("/{id}/restore") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map restore(@PathVariable String id,@RequestBody SourceDeletionService.RestoreRequest request,@AuthenticationPrincipal AppUserPrincipal actor){return deletion.restore(id,request,actor);} @ExceptionHandler(ConcurrencyFailureException.class) public org.springframework.http.ProblemDetail concurrent(){return org.springframework.http.ProblemDetail.forStatusAndDetail(HttpStatus.CONFLICT,"来源正在发生并发操作,请刷新预览后重试");} } diff --git a/backend/src/main/java/cn/yunsheng/quality/source/SourceDeletionService.java b/backend/src/main/java/cn/yunsheng/quality/source/SourceDeletionService.java index 339761d..2f1e7c8 100644 --- a/backend/src/main/java/cn/yunsheng/quality/source/SourceDeletionService.java +++ b/backend/src/main/java/cn/yunsheng/quality/source/SourceDeletionService.java @@ -60,7 +60,7 @@ public class SourceDeletionService { g.audit(actor.getId().toString(),"SOURCE_VISIBILITY_RESTORED","source_candidate",id,Map.of("reason",reason,"onlyVisibility",true,"physicalFilesRetained",true));return view(source(id,false),current,actor); } private Map view(Map row,String current,AppUserPrincipal actor){ - Map usage=currentUsage(row,current),change=change(row);boolean hidden=row.get("deletedAt")!=null,busy=busy(row),manage=has(actor,"SYSTEM_ADMIN","DATA_MAINTAINER"),publisher=has(actor,"SYSTEM_ADMIN","DATA_PUBLISHER"),receiver=receiverAllowed(); + Map usage=currentUsage(row,current),change=change(row);boolean hidden=row.get("deletedAt")!=null,busy=busy(row),manage=has(actor,"SYSTEM_ADMIN", "DATA_ADMIN"),publisher=has(actor,"SYSTEM_ADMIN", "DATA_ADMIN"),receiver=receiverAllowed(); boolean buildScope=true;if(publisher&&activeChange(change,usage,current)&&"APPROVED".equals(change.get("status")))try{sourceAccess.requireReleaseSources(current,actor);}catch(ResponseStatusException denied){if(denied.getStatusCode()!=HttpStatus.FORBIDDEN)throw denied;buildScope=false;} boolean active=activeChange(change,usage,current),review=active&&"REQUESTED".equals(change.get("status"))&&publisher&&!busy,build=active&&"APPROVED".equals(change.get("status"))&&publisher&&buildScope&&!busy; boolean canDelete=manage&&receiver&&!hidden&&!busy&&!active,canRestore=manage&&receiver&&hidden&&!busy; @@ -71,7 +71,7 @@ public class SourceDeletionService { Map out=new LinkedHashMap<>();out.put("source",source);out.put("currentReleaseId",current);out.put("currentUsage",usage);out.put("currentUsed",usage!=null);out.put("documentId",usage==null?null:usage.get("documentId"));out.put("revisionId",usage==null?null:usage.get("revisionId"));out.put("mode",usage==null?"HIDE_ONLY":"WITHDRAW_CURRENT");out.put("history",history);out.put("deleteVersion",row.get("deleteVersion"));out.put("hidden",hidden);out.put("changeRequest",change);out.put("nextAction",next);out.put("canDelete",canDelete);out.put("canRestore",canRestore);out.put("canReview",review);out.put("canBuild",build);out.put("actions",Map.of("canRequest",canDelete,"canReview",review,"canBuild",build));out.put("blockedReason",blocked);out.put("physicalFilesRetained",true);out.put("currentReleaseUnchanged",true);return out; } private AppUserPrincipal principal(AppUserPrincipal actor){access.requireUserActivePolicy(actor);return access.resolvePrincipal(actor);} - private void requireManage(AppUserPrincipal actor){if(!has(actor,"SYSTEM_ADMIN","DATA_MAINTAINER"))throw error(HttpStatus.FORBIDDEN,"只有数据维护者可以申请删除或恢复来源");} + private void requireManage(AppUserPrincipal actor){if(!has(actor,"SYSTEM_ADMIN", "DATA_ADMIN"))throw error(HttpStatus.FORBIDDEN,"只有数据维护者可以申请删除或恢复来源");} private boolean has(AppUserPrincipal actor,String...roles){return actor.getRoleCodes().stream().anyMatch(Set.of(roles)::contains);} private void authorize(Map source,AppUserPrincipal actor){ List> revisions=revisions(source);for(var revision:revisions)sourceAccess.requireSource((String)revision.get("sourceDocumentId"),(String)revision.get("id"),actor); diff --git a/backend/src/main/java/cn/yunsheng/quality/source/SourceUploadController.java b/backend/src/main/java/cn/yunsheng/quality/source/SourceUploadController.java index e4e951c..fe79ed5 100644 --- a/backend/src/main/java/cn/yunsheng/quality/source/SourceUploadController.java +++ b/backend/src/main/java/cn/yunsheng/quality/source/SourceUploadController.java @@ -12,11 +12,11 @@ import org.springframework.web.server.ResponseStatusException; @RestController @RequestMapping("/api/sources") -@PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER')") +@PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public class SourceUploadController { private final SourceUploadService uploads; public SourceUploadController(SourceUploadService uploads){this.uploads=uploads;} - @GetMapping("/upload-options") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','DATA_PUBLISHER')") public Map options(@AuthenticationPrincipal AppUserPrincipal actor){return uploads.options(actor);} + @GetMapping("/upload-options") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map options(@AuthenticationPrincipal AppUserPrincipal actor){return uploads.options(actor);} @PostMapping("/workbook-preview") public Map previewUpload(@RequestPart("file") MultipartFile file,@AuthenticationPrincipal AppUserPrincipal actor){try{return uploads.previewUpload(file,actor);}catch(IOException|IllegalArgumentException e){throw new ResponseStatusException(HttpStatus.BAD_REQUEST,e.getMessage());}} @GetMapping("/workbook-preview/{id}") public Map preview(@PathVariable String id,@RequestParam(required=false) String sheetName,@RequestParam(defaultValue="1") int headerRow,@AuthenticationPrincipal AppUserPrincipal actor){try{return uploads.preview(id,sheetName,headerRow,actor);}catch(IOException|IllegalArgumentException e){throw new ResponseStatusException(HttpStatus.BAD_REQUEST,e.getMessage());}} @PostMapping("/configure") public Map configure(@RequestBody SourceUploadService.ConfigureRequest request,@AuthenticationPrincipal AppUserPrincipal actor){try{return uploads.configure(request,actor);}catch(IOException|IllegalArgumentException e){throw new ResponseStatusException(HttpStatus.BAD_REQUEST,e.getMessage());}} diff --git a/backend/src/main/java/cn/yunsheng/quality/workflow/DataWorkflowController.java b/backend/src/main/java/cn/yunsheng/quality/workflow/DataWorkflowController.java index 2891383..e97443a 100644 --- a/backend/src/main/java/cn/yunsheng/quality/workflow/DataWorkflowController.java +++ b/backend/src/main/java/cn/yunsheng/quality/workflow/DataWorkflowController.java @@ -19,61 +19,61 @@ public class DataWorkflowController { public DataWorkflowController(DataWorkflowService service) { this.service = service; } @GetMapping("/status") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','DATA_PUBLISHER','RULE_MAINTAINER','QUALITY_VIEWER','BUSINESS_ANALYST','AUDIT_VIEWER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map status(@AuthenticationPrincipal AppUserPrincipal actor) { return service.status(actor); } @PostMapping("/apply") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','DATA_PUBLISHER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map apply(@RequestBody ApplyRequest request, @AuthenticationPrincipal AppUserPrincipal actor) { return service.apply(request, actor); } @PostMapping("/recalculate") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','DATA_PUBLISHER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map recalculate(@AuthenticationPrincipal AppUserPrincipal actor) { return service.recalculate(actor); } @PostMapping("/import") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','DATA_PUBLISHER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map importSources(@RequestBody ImportRequest request, @AuthenticationPrincipal AppUserPrincipal actor) { return service.importSources(request, actor); } @PostMapping("/publish/{releaseId}") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_PUBLISHER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map publish(@PathVariable String releaseId, @AuthenticationPrincipal AppUserPrincipal actor) { return service.publish(releaseId, actor); } @PostMapping("/sources/{id}/delete") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','DATA_PUBLISHER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map deleteSource(@PathVariable String id, @AuthenticationPrincipal AppUserPrincipal actor) { return service.deleteSource(id, actor); } @PostMapping("/sources/delete-batch") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','DATA_PUBLISHER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map deleteSources(@RequestBody DeleteSourcesRequest request, @AuthenticationPrincipal AppUserPrincipal actor) { return service.deleteSources(request, actor); } @PostMapping("/sources/{id}/restore") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','DATA_PUBLISHER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN')") public Map restoreSource(@PathVariable String id, @AuthenticationPrincipal AppUserPrincipal actor) { return service.restoreSource(id, actor); } @GetMapping("/operations/{id}") - @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','DATA_PUBLISHER','RULE_MAINTAINER','QUALITY_VIEWER','BUSINESS_ANALYST','AUDIT_VIEWER')") + @PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')") public Map operation(@PathVariable String id, @AuthenticationPrincipal AppUserPrincipal actor) { return service.operation(id, actor); diff --git a/backend/src/main/java/cn/yunsheng/quality/workflow/DataWorkflowService.java b/backend/src/main/java/cn/yunsheng/quality/workflow/DataWorkflowService.java index 498e0b8..cbbd47e 100644 --- a/backend/src/main/java/cn/yunsheng/quality/workflow/DataWorkflowService.java +++ b/backend/src/main/java/cn/yunsheng/quality/workflow/DataWorkflowService.java @@ -49,8 +49,8 @@ import tools.jackson.databind.json.JsonMapper; @Service public class DataWorkflowService { private static final String DATASET = "quality"; - private static final Set WRITE_ROLES = Set.of("SYSTEM_ADMIN", "DATA_MAINTAINER", "DATA_PUBLISHER"); - private static final Set PUBLISH_ROLES = Set.of("SYSTEM_ADMIN", "DATA_PUBLISHER"); + private static final Set WRITE_ROLES = Set.of("SYSTEM_ADMIN", "DATA_ADMIN"); + private static final Set PUBLISH_ROLES = Set.of("SYSTEM_ADMIN", "DATA_ADMIN"); private final JdbcTemplate jdbc; private final JsonMapper json; private final ImportRunService imports; @@ -135,10 +135,10 @@ public class DataWorkflowService { } static Map capabilities(boolean testMode, AppUserPrincipal actor) { - boolean publisher = hasRole(actor, "SYSTEM_ADMIN", "DATA_PUBLISHER"); - boolean manager = hasRole(actor, "SYSTEM_ADMIN", "DATA_MAINTAINER"); - boolean mappingEditor = hasRole(actor, "SYSTEM_ADMIN", "DATA_MAINTAINER", "RULE_MAINTAINER"); - boolean ruleEditor = hasRole(actor, "SYSTEM_ADMIN", "RULE_MAINTAINER"); + boolean publisher = hasRole(actor, "SYSTEM_ADMIN", "DATA_ADMIN"); + boolean manager = hasRole(actor, "SYSTEM_ADMIN", "DATA_ADMIN"); + boolean mappingEditor = hasRole(actor, "SYSTEM_ADMIN", "DATA_ADMIN"); + boolean ruleEditor = hasRole(actor, "SYSTEM_ADMIN"); boolean canApplyMapping = testMode && publisher && mappingEditor; boolean canApplyRule = testMode && publisher && ruleEditor; return Map.of( @@ -147,8 +147,7 @@ public class DataWorkflowService { "canApplyMapping", canApplyMapping, "canApplyRule", canApplyRule, "canRecalculate", testMode && publisher, - // Upload preview/configure is restricted to SYSTEM_ADMIN or DATA_MAINTAINER; - // the workflow import additionally requires DATA_PUBLISHER. + // Data administrators can prepare and publish data; global rule changes stay system-only. "canImport", testMode && publisher && manager, "canPublish", testMode && publisher, "canDeleteSource", testMode && manager, @@ -172,6 +171,8 @@ public class DataWorkflowService { requirePublisher(actor); if (request == null || !Set.of("mapping", "rule").contains(request.kind())) throw bad("kind 须为 mapping 或 rule"); + if ("rule".equals(request.kind()) && !hasRole(actor, "SYSTEM_ADMIN")) + throw new ResponseStatusException(HttpStatus.FORBIDDEN, "计算规则仅系统管理员可修改"); String name = configurationName(java.time.Instant.now()); Map definition = asMap(request.definition()); if (definition == null) throw bad("definition 须为 JSON 对象"); @@ -252,7 +253,7 @@ public class DataWorkflowService { public Map operation(String id, AppUserPrincipal actor) { access.requireUserActivePolicy(actor); WorkflowOperation operation = findOperation(required(id, "操作编号不能为空")); - if (!Objects.equals(operation.createdBy(), actor.getId().toString()) && !has(actor, "SYSTEM_ADMIN", "DATA_PUBLISHER")) + if (!Objects.equals(operation.createdBy(), actor.getId().toString()) && !has(actor, "SYSTEM_ADMIN", "DATA_ADMIN")) throw new ResponseStatusException(HttpStatus.NOT_FOUND, "操作不存在"); return operationView(operation); } @@ -936,6 +937,8 @@ public class DataWorkflowService { private void authorizeOperation(WorkflowOperation operation, AppUserPrincipal actor) { requireWrite(actor); + if ("APPLY_RULE".equals(operation.type()) && !hasRole(actor, "SYSTEM_ADMIN")) + throw new ResponseStatusException(HttpStatus.FORBIDDEN, "计算规则仅系统管理员可修改"); if (Set.of("PUBLISH", "APPLY_MAPPING", "APPLY_RULE", "IMPORT", "RECALCULATE", "RESTORE_SOURCE").contains(operation.type())) requirePublisher(actor); if (Set.of("DELETE_SOURCE", "DELETE_SOURCES", "RESTORE_SOURCE").contains(operation.type())) requireManager(actor); if ("DELETE_SOURCES".equals(operation.type())) { @@ -965,7 +968,7 @@ public class DataWorkflowService { private void requireManager(AppUserPrincipal actor) { access.requireUserActivePolicy(actor); - if (!has(actor, "SYSTEM_ADMIN", "DATA_MAINTAINER")) + if (!has(actor, "SYSTEM_ADMIN", "DATA_ADMIN")) throw new ResponseStatusException(HttpStatus.FORBIDDEN, "当前身份没有来源删除或恢复权限"); } diff --git a/backend/src/main/resources/db/migration/V37__user_soft_deletion.sql b/backend/src/main/resources/db/migration/V37__user_soft_deletion.sql new file mode 100644 index 0000000..c97876a --- /dev/null +++ b/backend/src/main/resources/db/migration/V37__user_soft_deletion.sql @@ -0,0 +1,2 @@ +-- Retain user IDs and their historical references when login access is removed. +ALTER TABLE app_user ADD COLUMN deleted_at TIMESTAMP(6) NULL; diff --git a/backend/src/main/resources/db/migration/V38__three_user_roles.sql b/backend/src/main/resources/db/migration/V38__three_user_roles.sql new file mode 100644 index 0000000..f88e336 --- /dev/null +++ b/backend/src/main/resources/db/migration/V38__three_user_roles.sql @@ -0,0 +1,37 @@ +-- Preserve organization, group and field policies. Never promote auditors/operators to system administrators. +CREATE TEMPORARY TABLE user_role_migration AS +SELECT u.id AS user_id, u.active AS was_active, + JSON_ARRAYAGG(r.role_code) AS old_roles, + CASE + WHEN SUM(r.role_code='SYSTEM_ADMIN')>0 THEN 'SYSTEM_ADMIN' + WHEN SUM(r.role_code IN ('DATA_ADMIN','DATA_MAINTAINER','DATA_PUBLISHER','RULE_MAINTAINER'))>0 THEN 'DATA_ADMIN' + ELSE 'USER' + END AS new_role, + SUM(r.role_code IN ('SYSTEM_ADMIN','DATA_ADMIN','USER','DATA_MAINTAINER','DATA_PUBLISHER', + 'RULE_MAINTAINER','QUALITY_VIEWER','BUSINESS_ANALYST','SYSTEM_OPERATOR','AUDIT_VIEWER')) AS recognized_count +FROM app_user u LEFT JOIN app_user_role r ON r.user_id=u.id GROUP BY u.id,u.active; + +-- 只兼容角色改名产生的历史权限指纹,数据范围和访问策略仍逐次核验。 +CREATE TABLE user_role_migration_anchor ( + user_id CHAR(36) NOT NULL PRIMARY KEY, + assigned_role VARCHAR(64) NOT NULL, + previous_roles JSON NOT NULL, + FOREIGN KEY(user_id) REFERENCES app_user(id) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +INSERT INTO user_role_migration_anchor(user_id,assigned_role,previous_roles) +SELECT user_id,new_role,old_roles FROM user_role_migration; + +INSERT INTO audit_event(action_code,target_type,target_id,outcome,details) +SELECT 'USER_ROLE_MODEL_MIGRATED','app_user',user_id,'SUCCESS', + JSON_OBJECT('beforeRoles',old_roles,'afterRole',new_role,'dataScopeChanged',FALSE, + 'reviewRequired',COALESCE(recognized_count,0)=0,'previousActive',was_active) +FROM user_role_migration; + +DELETE FROM app_user_role; +INSERT INTO app_user_role(user_id,role_code) SELECT user_id,new_role FROM user_role_migration; +UPDATE app_user u JOIN user_role_migration m ON m.user_id=u.id +SET u.active=IF(COALESCE(m.recognized_count,0)=0,FALSE,u.active),u.row_version=u.row_version+1; +DROP TEMPORARY TABLE user_role_migration; + +ALTER TABLE app_user_role ADD UNIQUE KEY uq_user_single_role(user_id), + ADD CONSTRAINT ck_user_role_code CHECK(role_code IN ('USER','DATA_ADMIN','SYSTEM_ADMIN')); diff --git a/backend/src/main/resources/db/migration/V39__sales_order_types.sql b/backend/src/main/resources/db/migration/V39__sales_order_types.sql new file mode 100644 index 0000000..d810c86 --- /dev/null +++ b/backend/src/main/resources/db/migration/V39__sales_order_types.sql @@ -0,0 +1,25 @@ +CREATE TABLE sales_order_type_version ( + id CHAR(36) PRIMARY KEY, + source_file VARCHAR(255) NOT NULL, + source_sha256 CHAR(64) NOT NULL, + import_mode VARCHAR(16) NOT NULL, + row_count INT NOT NULL, + created_by CHAR(36) NOT NULL, + created_at TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_as_cs; + +CREATE TABLE sales_order_type_entry ( + version_id CHAR(36) NOT NULL, + order_no VARCHAR(190) NOT NULL, + order_type VARCHAR(80) NOT NULL, + PRIMARY KEY(version_id, order_no), + KEY ix_sales_order_type(version_id, order_type, order_no), + FOREIGN KEY(version_id) REFERENCES sales_order_type_version(id) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_as_cs; + +CREATE TABLE sales_order_type_current ( + dataset_id VARCHAR(64) PRIMARY KEY, + version_id CHAR(36), + FOREIGN KEY(version_id) REFERENCES sales_order_type_version(id) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_as_cs; +INSERT INTO sales_order_type_current(dataset_id) VALUES ('quality'); diff --git a/backend/src/main/resources/db/migration/V40__sales_order_fact_indexes.sql b/backend/src/main/resources/db/migration/V40__sales_order_fact_indexes.sql new file mode 100644 index 0000000..14682fe --- /dev/null +++ b/backend/src/main/resources/db/migration/V40__sales_order_fact_indexes.sql @@ -0,0 +1,11 @@ +ALTER TABLE fact_black + ADD COLUMN sales_order_no VARCHAR(190) COLLATE utf8mb4_0900_as_cs + GENERATED ALWAYS AS (CASE WHEN JSON_TYPE(JSON_EXTRACT(raw_values,'$."销售订单号"'))='NULL' THEN NULL + ELSE NULLIF(TRIM(JSON_UNQUOTE(JSON_EXTRACT(raw_values,'$."销售订单号"'))),'') END) VIRTUAL, + ADD INDEX ix_black_sales_order (sales_order_no,build_id); + +ALTER TABLE fact_bright + ADD COLUMN sales_order_no VARCHAR(190) COLLATE utf8mb4_0900_as_cs + GENERATED ALWAYS AS (CASE WHEN JSON_TYPE(JSON_EXTRACT(raw_values,'$."销售订单"'))='NULL' THEN NULL + ELSE NULLIF(TRIM(JSON_UNQUOTE(JSON_EXTRACT(raw_values,'$."销售订单"'))),'') END) VIRTUAL, + ADD INDEX ix_bright_sales_order (sales_order_no,build_id); diff --git a/backend/src/main/resources/db/migration/V41__sales_order_metric_rollups.sql b/backend/src/main/resources/db/migration/V41__sales_order_metric_rollups.sql new file mode 100644 index 0000000..d3bc1db --- /dev/null +++ b/backend/src/main/resources/db/migration/V41__sales_order_metric_rollups.sql @@ -0,0 +1,12 @@ +CREATE TABLE sales_order_metric_rollup LIKE metric_rollup; +ALTER TABLE sales_order_metric_rollup + ADD COLUMN version_id CHAR(36) NOT NULL, + ADD COLUMN order_type VARCHAR(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL, + ADD KEY ix_sales_metric_version_build (version_id, build_id, stage, order_type, month_key); + +CREATE TABLE sales_order_metric_rollup_build ( + version_id CHAR(36) NOT NULL, + build_id CHAR(36) NOT NULL, + source_row_count BIGINT NOT NULL, + PRIMARY KEY (version_id, build_id) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; diff --git a/backend/src/test/java/cn/yunsheng/quality/filters/SalesOrderTypeServiceTest.java b/backend/src/test/java/cn/yunsheng/quality/filters/SalesOrderTypeServiceTest.java new file mode 100644 index 0000000..c7b5fa1 --- /dev/null +++ b/backend/src/test/java/cn/yunsheng/quality/filters/SalesOrderTypeServiceTest.java @@ -0,0 +1,49 @@ +package cn.yunsheng.quality.filters; + +import static org.junit.jupiter.api.Assertions.*; +import java.io.ByteArrayOutputStream; +import java.util.*; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.junit.jupiter.api.Test; +import org.springframework.mock.web.MockMultipartFile; +import org.springframework.web.server.ResponseStatusException; + +class SalesOrderTypeServiceTest { + static MockMultipartFile workbook(String[]... rows) throws Exception { + try(var book=new XSSFWorkbook();var out=new ByteArrayOutputStream()) { + var sheet=book.createSheet("销售订单");var header=sheet.createRow(0); + header.createCell(0).setCellValue("销售订单编号");header.createCell(1).setCellValue("销售订单类型"); + for(int i=0;iSalesOrderTypeService.read(conflict)); + for(String type:List.of("","0","新品","代工销售订单")) { + var file=workbook(new String[]{"A",type}); + assertThrows(ResponseStatusException.class,()->SalesOrderTypeService.read(file)); + } + } + @Test void mergePreservesUnlistedOrdersAndReplaceReportsRemovals() { + var old=Map.of("A","标准销售订单","B","样品销售订单"); + var incoming=Map.of("A","备料销售订单","C","内部研发销售订单"); + var merge=SalesOrderTypeService.summary(old,incoming,"MERGE"); + assertEquals(1,merge.get("added"));assertEquals(1,merge.get("updated"));assertEquals(3,merge.get("total"));assertEquals(0L,merge.get("removed")); + var replace=SalesOrderTypeService.summary(old,incoming,"REPLACE"); + assertEquals(2,replace.get("total"));assertEquals(1L,replace.get("removed")); + } + @Test void derivedFilterBindsEverythingAndRejectsUnknownTypes() { + var args=new ArrayList();var where=new StringBuilder(); + SalesOrderTypes.append(where,args,"bright",List.of("标准销售订单",QueryFilterFields.EMPTY),"snapshot-a"); + assertFalse(where.toString().contains("标准销售订单")); + assertEquals(List.of("snapshot-a","标准销售订单","snapshot-a"),args); + assertTrue(where.toString().contains("NOT EXISTS")); + assertThrows(ResponseStatusException.class,()->SalesOrderTypes.append(new StringBuilder(),new ArrayList<>(),"black",List.of("unknown"),"v")); + } +} diff --git a/backend/src/test/java/cn/yunsheng/quality/filters/SalesOrderTypesMySqlTest.java b/backend/src/test/java/cn/yunsheng/quality/filters/SalesOrderTypesMySqlTest.java new file mode 100644 index 0000000..3db0636 --- /dev/null +++ b/backend/src/test/java/cn/yunsheng/quality/filters/SalesOrderTypesMySqlTest.java @@ -0,0 +1,100 @@ +package cn.yunsheng.quality.filters; + +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 java.util.*; +import org.junit.jupiter.api.*; +import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; +import org.springframework.core.io.ClassPathResource; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.datasource.DriverManagerDataSource; +import org.springframework.jdbc.datasource.init.ScriptUtils; +import org.springframework.mock.web.MockHttpServletRequest; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.server.ResponseStatusException; + +@EnabledIfEnvironmentVariable(named="QUALITY_SOURCE_COLUMN_TEST_CREATE_DATABASE",matches="true") +class SalesOrderTypesMySqlTest { + JdbcTemplate jdbc,admin;String database; + GovernanceAccessService governance=mock(GovernanceAccessService.class); + AppUserPrincipal actor=mock(AppUserPrincipal.class); + @BeforeEach void setup() throws Exception { + String url=System.getenv("QUALITY_SOURCE_COLUMN_TEST_MYSQL_SERVER_URL"); + assertTrue(url.startsWith("jdbc:mysql://127.0.0.1:")&&url.contains("/?")); + String user=System.getenv("QUALITY_SOURCE_COLUMN_TEST_MYSQL_USER"),password=System.getenv("QUALITY_SOURCE_COLUMN_TEST_MYSQL_PASSWORD"); + admin=new JdbcTemplate(new DriverManagerDataSource(url,user,password));database="quality_sales_type_test_"+UUID.randomUUID().toString().replace("-",""); + admin.execute("CREATE DATABASE "+database+" CHARACTER SET utf8mb4"); + var source=new DriverManagerDataSource(url.replaceFirst("/\\?","/"+database+"?"),user,password);jdbc=new JdbcTemplate(source); + try(var connection=source.getConnection()){ScriptUtils.executeSqlScript(connection,new ClassPathResource("db/migration/V39__sales_order_types.sql"));} + jdbc.execute("CREATE TABLE query_filter_field(field_key VARCHAR(64),label VARCHAR(80),black_column VARCHAR(160),bright_column VARCHAR(160),enabled BOOLEAN,allow_empty BOOLEAN,sort_order INT)"); + jdbc.execute("CREATE TABLE current_release(dataset_id VARCHAR(40),release_id VARCHAR(40))"); + jdbc.execute("CREATE TABLE release_member(release_id VARCHAR(40),transform_build_id VARCHAR(40),source_revision_id VARCHAR(40))"); + for(String stage:List.of("black","bright"))jdbc.execute("CREATE TABLE fact_"+stage+"(id INT,build_id VARCHAR(40),source_revision_id VARCHAR(40),department VARCHAR(190),group_name VARCHAR(190),raw_values JSON)"); + try(var connection=source.getConnection()){ScriptUtils.executeSqlScript(connection,new ClassPathResource("db/migration/V40__sales_order_fact_indexes.sql"));} + jdbc.execute("CREATE TABLE audit_event(actor_user_id VARCHAR(40),action_code VARCHAR(64),target_type VARCHAR(64),target_id VARCHAR(40),outcome VARCHAR(40),details JSON)"); + when(actor.getId()).thenReturn(UUID.randomUUID());when(actor.getDepartments()).thenReturn(List.of("*"));when(actor.getGroups()).thenReturn(List.of()); + when(governance.allowedFields(actor)).thenReturn(Set.of("*")); + jdbc.update("INSERT INTO release_member VALUES('release','black-build','black-rev'),('release','bright-build','bright-rev')"); + jdbc.update("INSERT INTO fact_black(id,build_id,source_revision_id,department,group_name,raw_values) VALUES(1,'black-build','black-rev','部门A','组A',JSON_OBJECT('销售订单号','0001')),(2,'black-build','black-rev','部门A','组A',JSON_OBJECT('销售订单号','absent')),(3,'black-build','black-rev','部门A','组A',JSON_OBJECT('销售订单号',NULL))"); + jdbc.update("INSERT INTO fact_bright(id,build_id,source_revision_id,department,group_name,raw_values) VALUES(4,'bright-build','bright-rev','部门A','组A',JSON_OBJECT('销售订单','0001'))"); + } + @AfterEach void cleanup(){RequestContextHolder.resetRequestAttributes();if(database!=null)admin.execute("DROP DATABASE "+database);} + Map load(String key,String type,String mode) throws Exception { + var service=new SalesOrderTypeService(jdbc);var file=SalesOrderTypeServiceTest.workbook(new String[]{key,type});var preview=service.preview(file,mode); + return service.importFile(file,mode,(String)preview.get("expectedVersion"),(String)preview.get("sha256"),actor); + } + List ids(String stage,List values) { + var args=new ArrayList();var where=new StringBuilder(" WHERE 1=1"); + new QueryFilterFields(jdbc,governance).append(where,args,stage,Map.of(SalesOrderTypes.KEY,values),actor); + return jdbc.queryForList("SELECT f.id FROM fact_"+stage+" f"+where+" ORDER BY f.id",Integer.class,args.toArray()); + } + @Test void matchesBothStageHeadersTreatsMissingAndNullAsUnmatchedAndPreservesCardinality() throws Exception { + load("0001","标准销售订单","MERGE"); + assertEquals(List.of(1),ids("black",List.of("标准销售订单"))); + assertEquals(List.of(4),ids("bright",List.of("标准销售订单"))); + assertEquals(List.of(2,3),ids("black",List.of(QueryFilterFields.EMPTY))); + assertEquals(List.of(1,2,3),ids("black",List.of("标准销售订单",QueryFilterFields.EMPTY))); + assertEquals(List.of("标准销售订单"),new QueryFilterFields(jdbc,governance).options(SalesOrderTypes.KEY,null,"release",actor).get("values")); + when(governance.allowedFields(actor)).thenReturn(Set.of("销售订单号")); + assertThrows(ResponseStatusException.class,()->ids("black",List.of("标准销售订单"))); + assertThrows(ResponseStatusException.class,()->new QueryFilterFields(jdbc,governance).options(SalesOrderTypes.KEY,null,"release",actor)); + } + @Test void pinsSnapshotWithinRequestAndSubsequentRequestsUseNewVersion() throws Exception { + var first=load("0001","标准销售订单","MERGE"); + RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(new MockHttpServletRequest())); + assertEquals(first.get("versionId"),SalesOrderTypes.version(jdbc)); + load("0001","样品销售订单","MERGE"); + assertEquals(List.of(1),ids("black",List.of("标准销售订单"))); + RequestContextHolder.resetRequestAttributes(); + assertEquals(List.of(1),ids("black",List.of("样品销售订单"))); + assertEquals(List.of(),ids("black",List.of("标准销售订单"))); + } + @Test void optionsNeverExposeTypesFromOtherDepartments() throws Exception { + load("0001","标准销售订单","MERGE");load("hidden","内部研发销售订单","MERGE"); + jdbc.update("INSERT INTO fact_black(id,build_id,source_revision_id,department,group_name,raw_values) VALUES(5,'black-build','black-rev','部门B','组B',JSON_OBJECT('销售订单号','hidden'))"); + when(actor.getDepartments()).thenReturn(List.of("部门A")); + assertEquals(List.of("标准销售订单"),new QueryFilterFields(jdbc,governance).options(SalesOrderTypes.KEY,null,"release",actor).get("values")); + } + @Test void exclusionKeepsUnmatchedRowsUnlessTheyAreExplicitlyExcluded() throws Exception { + load("0001","标准销售订单","MERGE"); + for(var selection:List.of(List.of("标准销售订单"),List.of(QueryFilterFields.EMPTY),List.of("标准销售订单",QueryFilterFields.EMPTY))) { + var args=new ArrayList();var where=new StringBuilder(" WHERE 1=1"); + new QueryFilterFields(jdbc,governance).append(where,args,"black",Map.of(SalesOrderTypes.EXCLUDE_KEY,selection),actor); + var found=jdbc.queryForList("SELECT f.id FROM fact_black f"+where+" ORDER BY f.id",Integer.class,args.toArray()); + assertEquals(selection.size()==2?List.of():selection.contains(QueryFilterFields.EMPTY)?List.of(1):List.of(2,3),found); + } + } + @Test void mergeReplaceStalePreviewAndRestoreRetainHistoricalSnapshots() throws Exception { + var first=load("0001","标准销售订单","MERGE");load("0002","样品销售订单","MERGE"); + assertEquals(2,jdbc.queryForObject("SELECT COUNT(*) FROM sales_order_type_entry WHERE version_id=(SELECT version_id FROM sales_order_type_current)",Integer.class)); + var service=new SalesOrderTypeService(jdbc);var file=SalesOrderTypeServiceTest.workbook(new String[]{"0003","备料销售订单"});var stale=service.preview(file,"MERGE"); + var replaced=load("0004","内部研发销售订单","REPLACE"); + assertThrows(ResponseStatusException.class,()->service.importFile(file,"MERGE",(String)stale.get("expectedVersion"),(String)stale.get("sha256"),actor)); + assertEquals(1,jdbc.queryForObject("SELECT COUNT(*) FROM sales_order_type_entry WHERE version_id=(SELECT version_id FROM sales_order_type_current)",Integer.class)); + service.activate((String)first.get("versionId"),(String)replaced.get("versionId"),actor); + assertEquals(List.of(1),ids("black",List.of("标准销售订单"))); + } +} diff --git a/backend/src/test/java/cn/yunsheng/quality/metrics/SalesOrderMetricRollupsMySqlTest.java b/backend/src/test/java/cn/yunsheng/quality/metrics/SalesOrderMetricRollupsMySqlTest.java new file mode 100644 index 0000000..03074dd --- /dev/null +++ b/backend/src/test/java/cn/yunsheng/quality/metrics/SalesOrderMetricRollupsMySqlTest.java @@ -0,0 +1,96 @@ +package cn.yunsheng.quality.metrics; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; +import cn.yunsheng.quality.filters.SalesOrderTypes; +import cn.yunsheng.quality.governance.GovernanceAccessService; +import cn.yunsheng.quality.identity.AppUserPrincipal; +import java.util.*; +import org.junit.jupiter.api.*; +import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; +import org.springframework.core.io.ClassPathResource; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.datasource.DriverManagerDataSource; +import org.springframework.jdbc.datasource.init.ScriptUtils; +import org.springframework.web.server.ResponseStatusException; +import tools.jackson.databind.json.JsonMapper; + +@EnabledIfEnvironmentVariable(named="QUALITY_SOURCE_COLUMN_TEST_CREATE_DATABASE",matches="true") +class SalesOrderMetricRollupsMySqlTest { + JdbcTemplate jdbc,admin; String database; + final String build=UUID.randomUUID().toString(),version=UUID.randomUUID().toString(),release=UUID.randomUUID().toString(); + final GovernanceAccessService governance=mock(GovernanceAccessService.class); + final AppUserPrincipal actor=mock(AppUserPrincipal.class); + final JsonMapper json=JsonMapper.builder().build(); + MetricsService metrics; SalesOrderMetricRollups rollups; + + @BeforeEach void setup() throws Exception { + String url=System.getenv("QUALITY_SOURCE_COLUMN_TEST_MYSQL_SERVER_URL"); + assertTrue(url.startsWith("jdbc:mysql://127.0.0.1:")&&url.contains("/?")); + String user=System.getenv("QUALITY_SOURCE_COLUMN_TEST_MYSQL_USER"),password=System.getenv("QUALITY_SOURCE_COLUMN_TEST_MYSQL_PASSWORD"); + admin=new JdbcTemplate(new DriverManagerDataSource(url,user,password)); + database="quality_sales_metric_test_"+UUID.randomUUID().toString().replace("-",""); + admin.execute("CREATE DATABASE "+database+" CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci"); + var source=new DriverManagerDataSource(url.replaceFirst("/\\?","/"+database+"?"),user,password);jdbc=new JdbcTemplate(source); + jdbc.execute("CREATE TABLE transform_build(id CHAR(36) PRIMARY KEY)"); + jdbc.execute("CREATE TABLE data_release(id CHAR(36),name VARCHAR(100),status VARCHAR(32),rule_version VARCHAR(100))"); + jdbc.execute("CREATE TABLE release_member(release_id CHAR(36),transform_build_id CHAR(36))"); + jdbc.execute("CREATE TABLE current_release(dataset_id VARCHAR(40),release_id CHAR(36))"); + jdbc.execute("CREATE TABLE query_filter_field(field_key VARCHAR(64),label VARCHAR(80),black_column VARCHAR(160),bright_column VARCHAR(160),enabled BOOLEAN,allow_empty BOOLEAN,sort_order INT)"); + for(String stage:List.of("black","bright")) jdbc.execute("CREATE TABLE fact_"+stage+"(id BIGINT AUTO_INCREMENT PRIMARY KEY,build_id CHAR(36),month_key CHAR(7),department VARCHAR(190),group_name VARCHAR(190),project_group VARCHAR(190),product VARCHAR(190),qualified_weight DECIMAL(38,8),scrap_weight DECIMAL(38,8),total_weight DECIMAL(38,8),raw_values JSON,components JSON)"); + for(String migration:List.of("V16__metric_rollups.sql","V39__sales_order_types.sql","V40__sales_order_fact_indexes.sql","V41__sales_order_metric_rollups.sql")) try(var connection=source.getConnection()) { ScriptUtils.executeSqlScript(connection,new ClassPathResource("db/migration/"+migration)); } + jdbc.update("INSERT INTO transform_build VALUES(?)",build); + jdbc.update("INSERT INTO data_release VALUES(?,'test','PUBLISHED',NULL)",release); + jdbc.update("INSERT INTO release_member VALUES(?,?)",release,build); + jdbc.update("INSERT INTO current_release VALUES('quality',?)",release); + jdbc.update("INSERT INTO sales_order_type_version(id,source_file,source_sha256,import_mode,row_count,created_by) VALUES(?,'fixture',?,'REPLACE',7,'test')",version,"0".repeat(64)); + jdbc.update("UPDATE sales_order_type_current SET version_id=?",version); + for(int i=0;i<7;i++) jdbc.update("INSERT INTO sales_order_type_entry VALUES(?,?,?)",version,"order-"+i,SalesOrderTypes.TYPES.get(i)); + for(String stage:List.of("black","bright")) for(int i=0;i<11;i++) { + String order=i<7?"order-"+i:i==7?"absent":i==8?null:"order-0"; + jdbc.update("INSERT INTO fact_"+stage+"(build_id,month_key,department,group_name,project_group,product,qualified_weight,scrap_weight,total_weight,raw_values,components) VALUES(?,?,?,?,?,?,?,?,?,JSON_OBJECT(?,?),CAST(? AS JSON))",build,i%2==0?"2026-01":"2026-02",i==10?"Other":"A",i==9?null:i%3==0?"g":"G",i%2==0?"Project":"project","P"+i%2,i%3==0?null:i-3,i%4==0?null:0,i%5==0?null:10,SalesOrderTypes.column(stage),order,json.writeValueAsString(i%3==0?Map.of("categoryMappingStatus","unmapped"):Map.of("black_responsibility_scrap",i-4,"projectGroupStatus","unmapped"))); + } + when(governance.allowedFields(actor)).thenReturn(Set.of("*"));when(actor.getDepartments()).thenReturn(List.of("*"));when(actor.getGroups()).thenReturn(List.of()); + metrics=new MetricsService(jdbc,governance);rollups=new SalesOrderMetricRollups(jdbc); + } + @AfterEach void cleanup(){if(database!=null)admin.execute("DROP DATABASE "+database);} + Object normalized(Object value){return json.readValue(json.writeValueAsString(value),Object.class);} + MetricsService.MetricsQuery query(String view, boolean blanks, Map> filters){return new MetricsService.MetricsQuery(2026,null,null,null,null,null,null,view,blanks,release,"month",Map.of(),filters);} + + @Test void aggregatesAndCoverageMatchFactsForNullsZerosNegativeWeightsAllTypesAndComplements() { + for(var filterKey:List.of(SalesOrderTypes.KEY,SalesOrderTypes.EXCLUDE_KEY)) for(var type:SalesOrderTypes.TYPES) { + for(String view:List.of("overall","group","product")) { + var query=query(view,false,Map.of(filterKey,List.of(type))); + jdbc.update("DELETE FROM sales_order_metric_rollup_build"); + var raw=metrics.calculate(query,actor);var rawTrend=metrics.calculateTrend(query,actor); + rollups.prepareBuild(version,build); + assertTrue(rollups.ready(release,query.extraFilters(),false,Set.of("*"))); + assertEquals(normalized(raw),normalized(metrics.calculate(query,actor)),filterKey+type+view); + assertEquals(normalized(rawTrend),normalized(metrics.calculateTrend(query,actor))); + } + } + for(var filter:List.of(Map.of(SalesOrderTypes.EXCLUDE_KEY,List.of("__EMPTY__")),Map.of(SalesOrderTypes.KEY,List.of("__EMPTY__","标准销售订单")),Map.of(SalesOrderTypes.KEY,List.of("标准销售订单","样品销售订单"),SalesOrderTypes.EXCLUDE_KEY,List.of("样品销售订单")))) { + var query=query("department",true,filter).withMonthRange(1,1).withStage("black").withProductSearch("P"); + jdbc.update("DELETE FROM sales_order_metric_rollup_build");var raw=metrics.calculate(query,actor); + rollups.prepareBuild(version,build);assertEquals(normalized(raw),normalized(metrics.calculate(query,actor))); + } + } + @Test void permissionsIncompleteSnapshotsVersionChangesAndFutureBuildRefreshStaySafe() { + var query=query("overall",true,Map.of(SalesOrderTypes.EXCLUDE_KEY,List.of("样品销售订单"))); + assertFalse(rollups.ready(release,query.extraFilters(),false,Set.of("*"))); + rollups.prepareCurrentRelease(version); + when(actor.getDepartments()).thenReturn(List.of("A"));var rawFiltered=metrics.calculate(query,actor); + jdbc.update("DELETE FROM sales_order_metric_rollup_build");assertEquals(normalized(rawFiltered),normalized(metrics.calculate(query,actor))); + rollups.prepareBuild(version,build); + when(governance.allowedFields(actor)).thenReturn(Set.of("销售订单号"));assertThrows(ResponseStatusException.class,()->metrics.calculate(query,actor)); + when(governance.allowedFields(actor)).thenReturn(Set.of("*")); + String next=UUID.randomUUID().toString();jdbc.update("INSERT INTO sales_order_type_version SELECT ?,'next',source_sha256,import_mode,row_count,created_by,created_at FROM sales_order_type_version WHERE id=?",next,version); + jdbc.update("INSERT INTO sales_order_type_entry SELECT ?,order_no,'样品销售订单' FROM sales_order_type_entry WHERE version_id=?",next,version); + jdbc.update("UPDATE sales_order_type_current SET version_id=?",next); + assertFalse(rollups.ready(release,query.extraFilters(),false,Set.of("*"))); + var raw=metrics.calculate(query,actor);rollups.prepareCurrentRelease(next);assertEquals(normalized(raw),normalized(metrics.calculate(query,actor))); + jdbc.update("UPDATE fact_black SET total_weight=111 WHERE sales_order_no='order-0'"); + rollups.refreshCurrentBuild(build);assertFalse(rollups.ready(release,query.extraFilters(),true,Set.of("*"))); + assertEquals(0,jdbc.queryForObject("SELECT COUNT(*) FROM sales_order_metric_rollup_build WHERE version_id=?",Integer.class,version)); + } +} diff --git a/web/src/AnalyticsCompletion.tsx b/web/src/AnalyticsCompletion.tsx index 9c41466..ee0e5d6 100644 --- a/web/src/AnalyticsCompletion.tsx +++ b/web/src/AnalyticsCompletion.tsx @@ -1,3 +1,4 @@ +import { useDeleteConfirmation } from './useDeleteConfirmation'; import { useEffect, useMemo, useState } from 'react'; import { Alert, App, Button, Empty, Form, Input, InputNumber, Modal, Popconfirm, @@ -200,6 +201,7 @@ export function M01Insights({ query, onUnauthorized }: { query: QueryParams; onU } export function M02SavedViews({ query, view, onUnauthorized, onApply }: { query: QueryParams; view: ViewKind; onUnauthorized: (error: unknown) => boolean; onApply: (context: Partial) => void }) { + const confirmDelete = useDeleteConfirmation(); const { message } = App.useApp(); const [items, setItems] = useState([]); const [sharedItems, setSharedItems] = useState([]); @@ -293,7 +295,7 @@ export function M02SavedViews({ query, view, onUnauthorized, onApply }: { query: { title: '视图名称', dataIndex: 'name', key: 'name', width: 210 }, { title: '分组维度', key: 'groupBy', width: 140, render: (_, row) => text(record(row.definition).groupBy, '总体') }, { title: '数据范围', key: 'dataScope', width: 180, render: () => '打开时使用当前数据' }, - { title: '操作', key: 'actions', width: 250, render: (_, row) => void remove(row)}> }, + { title: '操作', key: 'actions', width: 250, render: (_, row) => }, ]; const sharedColumns: ColumnsType = [ { title: '视图名称', dataIndex: 'name', key: 'name', width: 230 }, @@ -336,6 +338,7 @@ export function M02SavedViews({ query, view, onUnauthorized, onApply }: { query: } export function ScrapAnalyticsPanel({ query, onUnauthorized }: { query: QueryParams; onUnauthorized: (error: unknown) => boolean }) { + const confirmDelete = useDeleteConfirmation(); const [stage, setStage] = useState('black'); const [dimension, setDimension] = useState('category'); const [limit, setLimit] = useState(10); @@ -493,7 +496,7 @@ export function ScrapAnalyticsPanel({ query, onUnauthorized }: { query: QueryPar { title: '阶段 / 对象', dataIndex: 'subject', key: 'subject', width: 260, render: value => typeof value === 'string' ? value : (() => { const subject = record(value); return `${subject.stage === 'black' ? '黑片' : subject.stage === 'bright' ? '亮片' : '—'} · ${text(subject.label)}`; })() }, { title: '重算综合率', key: 'snapshot', align: 'right', width: 130, render: (_, row) => { const summary = record(record(row.metricSnapshot || row.snapshot).summary); return pct(summary.compositeRate); } }, { title: '证据状态', key: 'evidence', width: 125, render: (_, row) => row.evidenceAvailable === false ? 当前不可见 : 已重新授权 }, - { title: '操作', key: 'remove', width: 90, render: (_, row) => }, + { title: '操作', key: 'remove', width: 90, render: (_, row) => }, ]; const impactRows = list(impactResult?.groups); const impactColumns: ColumnsType = [ @@ -541,6 +544,7 @@ export function ScrapAnalyticsPanel({ query, onUnauthorized }: { query: QueryPar } export function TargetVersionAdmin({ onUnauthorized }: { onUnauthorized: (error: unknown) => boolean }) { + const confirmDelete = useDeleteConfirmation(); const { message } = App.useApp(); const [items, setItems] = useState([]); const [loading, setLoading] = useState(true); @@ -583,10 +587,7 @@ export function TargetVersionAdmin({ onUnauthorized }: { onUnauthorized: (error: ? { ...item, values: { ...record(item.values), [String(year)]: value } } : item)); }; - const removeRow = (row: Row) => { - const key = String(row.editorKey || ''); - setTargetRows(current => current.filter(item => String(item.editorKey || '') !== key)); - }; + const removeRow = (row: Row) => confirmDelete({title:`删除“${dimensionKeys.map(key=>String(row[key]||'')).filter(Boolean).join(' / ') || '总体'}”的目标行?`,description:`将移除当前编辑内容中“${metricOptions.find(item=>item.value===row.metric)?.label || '所选指标'}”及其各年度目标,保存目标后生效。`,onConfirm:()=>{const key=String(row.editorKey || '');setTargetRows(current=>current.filter(item=>String(item.editorKey || '')!==key));}}); const isScopeRow = (row: Row) => row.editorScope === true; const overallRows = targetRows.filter(row => !isScopeRow(row)); const scopeRows = targetRows.filter(isScopeRow); diff --git a/web/src/CachedWorkspacePages.tsx b/web/src/CachedWorkspacePages.tsx index 96712e8..8a450a2 100644 --- a/web/src/CachedWorkspacePages.tsx +++ b/web/src/CachedWorkspacePages.tsx @@ -8,6 +8,7 @@ import { pageUsesResources } from './resourceInvalidation'; import type { AuthUser, QueryParams } from './types'; import type { PageKey } from './QualityWorkspace'; import { PageCacheContext, WORKSPACE_INVALIDATED } from './pageCache'; +import { canAccessWorkspacePage } from './userRoles'; const loadQueryPage = () => import('./QueryPage'); const loadStageProductPage = () => import('./StageProductPage'); @@ -129,10 +130,24 @@ export const CachedWorkspacePages = forwardRef { if (next === 'imports') next = 'sources'; if (next === requested.current && !query && !resultRef) return; + let navigationQuery:Partial|undefined=query; + if(!query&&!resultRef&&QUERY_PAGES.includes(current.current)&&QUERY_PAGES.includes(next)) { + const source=readQueryLocation(entries.current.get(current.current)?.search||location.search); + const destination=readQueryLocation(entries.current.get(next)?.search||''); + const sourceKey=Object.hasOwn(source.extraFilters||{},'salesOrderTypeNotIn')?'salesOrderTypeNotIn':'salesOrderType'; + const destinationKey=Object.hasOwn(destination.extraFilters||{},'salesOrderTypeNotIn')?'salesOrderTypeNotIn':'salesOrderType'; + const selected=source.extraFilters?.[sourceKey]; + if(sourceKey!==destinationKey||JSON.stringify(selected||[])!==JSON.stringify(destination.extraFilters?.[destinationKey]||[])) { + const extraFilters={...destination.extraFilters}; + delete extraFilters.salesOrderType;delete extraFilters.salesOrderTypeNotIn; + if(selected?.length||sourceKey==='salesOrderTypeNotIn')extraFilters[sourceKey]=[...(selected||[])]; + navigationQuery={...destination,extraFilters}; + } + } const params = new URLSearchParams({ page: next }); - if (query) params.set('context', encode({ query, ...(resultRef ? { resultRef } : {}) })); + if (navigationQuery) params.set('context', encode({ query:navigationQuery, ...(resultRef ? { resultRef } : {}) })); const cached = entries.current.get(next); - void enter(next, query || resultRef || !cached ? `?${params}` : cached.search, Boolean(query || resultRef) || !retained(next)); + void enter(next, navigationQuery || resultRef || !cached ? `?${params}` : cached.search, Boolean(navigationQuery || resultRef) || !retained(next)); }; useImperativeHandle(ref, () => ({ navigate, syncLocation: () => { const next = new URLSearchParams(location.search).get('page') as PageKey || 'overall'; @@ -171,7 +186,7 @@ export const CachedWorkspacePages = forwardRef