feat(公司tab): 任务看板五个端点按公司筛(一处 resolve 收窄,detail 靠 scope.visible 同宽)
This commit is contained in:
@@ -78,19 +78,33 @@ export interface TaskCenterVariantPage {
|
||||
pageSize: number
|
||||
}
|
||||
|
||||
/** 汇总卡:GET /api/admin/task-center/overview */
|
||||
export async function fetchTaskCenterOverview(): Promise<TaskCenterOverview> {
|
||||
const { data } = await http.get('/api/admin/task-center/overview')
|
||||
/**
|
||||
* 汇总卡:GET /api/admin/task-center/overview
|
||||
* companyId = 公司 tab 选中的公司(超管专用,页面只从 companyTab.requestCompanyId 取);
|
||||
* null/undefined 由这里自己丢掉——不发给后端 = 按会话口径看全部,不是「筛成空」。
|
||||
*/
|
||||
export async function fetchTaskCenterOverview(companyId?: number | null): Promise<TaskCenterOverview> {
|
||||
const query: QueryParams = {}
|
||||
if (companyId != null) query.company_id = companyId
|
||||
const { data } = await http.get('/api/admin/task-center/overview', { params: query })
|
||||
return unwrap<TaskCenterOverview>(data)
|
||||
}
|
||||
|
||||
/** 店铺筛选候选(店铺库内的店铺名,精确匹配):GET /api/admin/task-center/shop-options */
|
||||
export async function fetchTaskCenterShopOptions(): Promise<string[]> {
|
||||
const { data } = await http.get('/api/admin/task-center/shop-options')
|
||||
/**
|
||||
* 店铺筛选候选(店铺库内的店铺名,精确匹配):GET /api/admin/task-center/shop-options
|
||||
* 下拉候选必须跟列表同宽:少了这一支,切 tab 后能选到别家的店铺名(选了又筛不出东西)。
|
||||
*/
|
||||
export async function fetchTaskCenterShopOptions(companyId?: number | null): Promise<string[]> {
|
||||
const query: QueryParams = {}
|
||||
if (companyId != null) query.company_id = companyId
|
||||
const { data } = await http.get('/api/admin/task-center/shop-options', { params: query })
|
||||
return unwrap<string[]>(data)
|
||||
}
|
||||
|
||||
/** 任务分页列表:GET /api/admin/task-center/tasks */
|
||||
/**
|
||||
* 任务分页列表:GET /api/admin/task-center/tasks
|
||||
* params 由 buildTaskQuery 构造(含 company_id,见 task-center-model.ts)。
|
||||
*/
|
||||
export async function fetchTaskCenterTasks(params: QueryParams): Promise<TaskCenterTaskPage> {
|
||||
const { data } = await http.get('/api/admin/task-center/tasks', { params })
|
||||
return unwrap<TaskCenterTaskPage>(data)
|
||||
@@ -98,14 +112,22 @@ export async function fetchTaskCenterTasks(params: QueryParams): Promise<TaskCen
|
||||
|
||||
/** 任务详情(品牌任务 taskNo 形如 brand-1):GET /api/admin/task-center/tasks/detail
|
||||
* 任务不存在或不在可见范围时后端返回 success + data:null,这里归一为 null 供页面提示(unwrap 对 null data 会回传信封)。 */
|
||||
export async function fetchTaskCenterTaskDetail(taskNo: string): Promise<TaskCenterTaskDetail | null> {
|
||||
const { data } = await http.get('/api/admin/task-center/tasks/detail', { params: { taskNo } })
|
||||
export async function fetchTaskCenterTaskDetail(
|
||||
taskNo: string,
|
||||
companyId?: number | null,
|
||||
): Promise<TaskCenterTaskDetail | null> {
|
||||
const query: QueryParams = { taskNo }
|
||||
if (companyId != null) query.company_id = companyId
|
||||
const { data } = await http.get('/api/admin/task-center/tasks/detail', { params: query })
|
||||
const envelope = data as { data?: unknown } | null
|
||||
if (envelope && typeof envelope === 'object' && 'data' in envelope && envelope.data == null) return null
|
||||
return unwrap<TaskCenterTaskDetail>(data)
|
||||
}
|
||||
|
||||
/** 变体采集(代理麦象 console,取当前可见用户集合):GET /api/admin/task-center/variant-tasks */
|
||||
/**
|
||||
* 变体采集(代理麦象 console,取当前可见用户集合):GET /api/admin/task-center/variant-tasks
|
||||
* params 由 buildVariantQuery 构造(含 company_id,见 task-center-model.ts)。
|
||||
*/
|
||||
export async function fetchTaskCenterVariantTasks(params: QueryParams): Promise<TaskCenterVariantPage> {
|
||||
const { data } = await http.get('/api/admin/task-center/variant-tasks', { params })
|
||||
return unwrap<TaskCenterVariantPage>(data)
|
||||
|
||||
@@ -3,9 +3,10 @@
|
||||
* 页签一「客户端任务」= biz_file_task(12 个客户端模块)∪ brand_crawl_tasks;
|
||||
* 页签二「变体采集」= 麦象批量任务(variant-collection),数据口径与列不同故独立页签。
|
||||
* 30s 轮询:页面隐藏暂停、回前台立即刷新、卸载清理;另有手动刷新。 */
|
||||
import { computed, onMounted, onUnmounted, reactive, ref } from 'vue'
|
||||
import { computed, onMounted, onUnmounted, reactive, ref, watch } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import { formatDateTime } from '@/utils/datetime'
|
||||
import {
|
||||
fetchTaskCenterOverview,
|
||||
@@ -44,6 +45,10 @@ import {
|
||||
|
||||
const POLL_INTERVAL_MS = 30_000
|
||||
|
||||
/** 公司 tab 的唯一取值出口:非超管恒 null(store 里 companyIdForRequest 已经把它算成 null),
|
||||
* 所以这里不需要再判一次角色——第二把尺子就是第二个口径。 */
|
||||
const companyTab = useCompanyTabStore()
|
||||
|
||||
type BoardTab = 'tasks' | 'variant'
|
||||
const activeTab = ref<BoardTab>('tasks')
|
||||
|
||||
@@ -96,7 +101,7 @@ function errorText(error: unknown, fallback: string): string {
|
||||
|
||||
async function loadOverview() {
|
||||
try {
|
||||
overview.value = await fetchTaskCenterOverview()
|
||||
overview.value = await fetchTaskCenterOverview(companyTab.requestCompanyId)
|
||||
} catch (error) {
|
||||
ElMessage.error(errorText(error, '汇总数据加载失败'))
|
||||
}
|
||||
@@ -105,7 +110,7 @@ async function loadOverview() {
|
||||
/** 店铺库下拉候选。 */
|
||||
async function loadShopOptions() {
|
||||
try {
|
||||
shopOptions.value = (await fetchTaskCenterShopOptions()) || []
|
||||
shopOptions.value = (await fetchTaskCenterShopOptions(companyTab.requestCompanyId)) || []
|
||||
} catch (error) {
|
||||
ElMessage.error(errorText(error, '店铺候选加载失败'))
|
||||
}
|
||||
@@ -114,7 +119,9 @@ async function loadShopOptions() {
|
||||
async function loadTasks(silent = false) {
|
||||
if (!silent) tasksLoading.value = true
|
||||
try {
|
||||
const result = await fetchTaskCenterTasks(buildTaskQuery(filter, taskPage.value, taskPageSize.value))
|
||||
const result = await fetchTaskCenterTasks(
|
||||
buildTaskQuery(filter, taskPage.value, taskPageSize.value, companyTab.requestCompanyId),
|
||||
)
|
||||
tasks.value = result?.items || []
|
||||
taskTotal.value = Number(result?.total || 0)
|
||||
} catch (error) {
|
||||
@@ -128,7 +135,7 @@ async function loadVariants(silent = false) {
|
||||
if (!silent) variantLoading.value = true
|
||||
try {
|
||||
const result = await fetchTaskCenterVariantTasks(
|
||||
buildVariantQuery(variantFilter, variantPage.value, variantPageSize.value),
|
||||
buildVariantQuery(variantFilter, variantPage.value, variantPageSize.value, companyTab.requestCompanyId),
|
||||
)
|
||||
variantRows.value = result?.items || []
|
||||
variantTotal.value = tabCount(result?.total)
|
||||
@@ -160,6 +167,19 @@ async function loadInactiveTabTotal() {
|
||||
else await loadTasks(true)
|
||||
}
|
||||
|
||||
/** 切公司 = 五个取数点全部重取(汇总卡 / 店铺候选 / 当前页签列表 / 另一页签的徽章数)。
|
||||
* filter.shop 必须一起清掉:上一家选中的店铺名在新一家的候选里根本不存在,留着会把切 tab 后的首屏
|
||||
* 筛成「暂无符合条件的任务」——口径同 ShopManagePage 的 filter.groupId(G1 钉着那条)。
|
||||
* 两个页签的页码也回 1:第 7 页对另一家没有意义。详情不在这条链上重取,它按 taskNo 现点现取,
|
||||
* 带的是切换后的 company_id,越权那一侧由后端 scope.visible() 把关。 */
|
||||
watch(() => companyTab.activeId, () => {
|
||||
filter.shop = ''
|
||||
taskPage.value = 1
|
||||
variantPage.value = 1
|
||||
void refreshAll()
|
||||
void loadInactiveTabTotal()
|
||||
})
|
||||
|
||||
function switchTab(tab: BoardTab) {
|
||||
if (activeTab.value === tab) return
|
||||
activeTab.value = tab
|
||||
@@ -223,7 +243,7 @@ async function openDetail(row: TaskCenterTaskRow) {
|
||||
detailLoading.value = true
|
||||
detail.value = null
|
||||
try {
|
||||
detail.value = await fetchTaskCenterTaskDetail(row.taskNo)
|
||||
detail.value = await fetchTaskCenterTaskDetail(row.taskNo, companyTab.requestCompanyId)
|
||||
if (!detail.value) ElMessage.warning('任务不存在或无权查看')
|
||||
} catch (error) {
|
||||
ElMessage.error(errorText(error, '任务详情加载失败'))
|
||||
|
||||
@@ -213,13 +213,19 @@ function text(value: unknown): string {
|
||||
return typeof value === 'string' ? value.trim() : ''
|
||||
}
|
||||
|
||||
/** 任务列表查询参数:空白项不下传(后端按缺省处理)。 */
|
||||
/**
|
||||
* 任务列表查询参数:空白项不下传(后端按缺省处理)。
|
||||
* companyId = 公司 tab 选中的公司(超管专用,页面从 companyTab.requestCompanyId 取);
|
||||
* 非超管恒 null ⇒ 这一支压根不发 company_id,后端的会话口径不受前端影响。
|
||||
*/
|
||||
export function buildTaskQuery(
|
||||
filter: TaskCenterTaskFilter,
|
||||
page: number,
|
||||
pageSize: number,
|
||||
companyId?: number | null,
|
||||
): TaskCenterQueryParams {
|
||||
const query: TaskCenterQueryParams = { page, pageSize }
|
||||
if (companyId != null) query.company_id = companyId
|
||||
const put = (key: string, value: string | undefined) => {
|
||||
if (value) query[key] = value
|
||||
}
|
||||
@@ -232,12 +238,15 @@ export function buildTaskQuery(
|
||||
return query
|
||||
}
|
||||
|
||||
/** 变体采集查询参数:companyId 的口径与 buildTaskQuery 同一条(null 不发,不发=不筛)。 */
|
||||
export function buildVariantQuery(
|
||||
filter: TaskCenterVariantFilter,
|
||||
page: number,
|
||||
pageSize: number,
|
||||
companyId?: number | null,
|
||||
): TaskCenterQueryParams {
|
||||
const query: TaskCenterQueryParams = { page, pageSize }
|
||||
if (companyId != null) query.company_id = companyId
|
||||
const status = text(filter.status)
|
||||
if (status !== '') query.status = Number(status)
|
||||
return query
|
||||
|
||||
@@ -21,7 +21,8 @@ const read = (p: string) => {
|
||||
* 这正是本批次要杀的那类静默失效,尺子却看不见。
|
||||
* <p>于是每页登记一条"company_id 右侧的根标识符**必须**是该页 api 函数自己的入参"的形状:
|
||||
* `shape` 为 `RegExp` 时,对**剥完注释的源码**求值,不匹配即红并点名文件;`shape` 为 `null` 是
|
||||
* "这一页还没接线"的显式声明(今天 6 页如此,它们本来就在缺口清单里)。
|
||||
* "这一页还没接线"的显式声明(批次 1 的 8 页到 Task 10 全部登记完,今天表里没有 null 项了;
|
||||
* 这一档留着是给将来新页先进清单、后接线的中间状态用的,不是默认分支)。
|
||||
* <p>两道不留缝:① `COMPANY_SCOPED_PAGES` 里每一页都必须在表里有条目,缺条目直接红;
|
||||
* ② 一旦某个文件真的出现了 `company_id` 下传而它的 `shape` 还是 `null`,同样红——
|
||||
* 所以"新页接线时顺手不改登记表"过不去,也**没有**"没登记就退回宽松判据"的默认分支。
|
||||
@@ -47,8 +48,21 @@ const COMPANY_ID_SOURCE_PINS: Readonly<Record<string, readonly CompanyIdPin[]>>
|
||||
},
|
||||
],
|
||||
admin_task_center: [
|
||||
{ file: 'src/api/task-center.ts', shape: null, note: 'Task 10 未接线(已在缺口清单里);谁接线谁把 null 换成本函数真实取值口' },
|
||||
{ file: 'src/pages/task-center/task-center-model.ts', shape: null, note: '同上:这一页有两个取数模块,两个都得登记' },
|
||||
{
|
||||
file: 'src/api/task-center.ts',
|
||||
// 三个自己构造 query 的发送口(overview / shop-options / tasks/detail)都写成
|
||||
// `if (companyId != null) query.company_id = companyId`;另外两支(tasks / variant-tasks)
|
||||
// 是 `params: QueryParams` 直传、没有中间构造对象,公司键由 model 那两个 builder 补。
|
||||
// 所以这一页不许套 Task 8 的 `params.companyId` 形——这一页的 api 根本没有 params.companyId 这个口。
|
||||
shape: /company_id\s*=\s*companyId\b/,
|
||||
note: 'null 由发送口自己丢(不依赖 axios 丢 null);右半边必须是本函数自己的形参 companyId',
|
||||
},
|
||||
{
|
||||
file: 'src/pages/task-center/task-center-model.ts',
|
||||
// buildTaskQuery / buildVariantQuery 的第 4 形参就叫 companyId ⇒ 与 api 侧同一形。
|
||||
shape: /company_id\s*=\s*companyId\b/,
|
||||
note: '这一页有两个取数模块(api + model),两条各钉一处取值口,不许合成一条 alternation',
|
||||
},
|
||||
],
|
||||
admin_user_secret_usage: [
|
||||
{
|
||||
@@ -105,8 +119,8 @@ let strictPinsPassed = 0
|
||||
|
||||
test('正向:声明 companyScoped 的页,其 api 文件必须真的带 company_id,页面组件必须 watch activeId', () => {
|
||||
// 循环里**收集**、循环后一次性断言:Task 8-12 是 5 个任务共用这把尺子,fail-fast 时做完自己那页的同事
|
||||
// 仍然只看到一句指向**别人页**的红(今天只报 src/api/task-center.ts),判断不出本页是否已收敛。
|
||||
// 这条不改变"Task 12 之前必红"的既定性质,只是让尺子可诊断——红消息里 8 页缺口逐页列全。
|
||||
// 仍然只看到一句指向**别人页**的红,判断不出本页是否已收敛。
|
||||
// 这条只是让尺子可诊断——红消息里 8 页缺口逐页列全(批次 1 到 Task 10 已全部接线,今天这支应绿)。
|
||||
const problems: string[] = []
|
||||
for (const page of COMPANY_SCOPED_PAGES) {
|
||||
const gaps: string[] = []
|
||||
@@ -179,7 +193,7 @@ test('正向:声明 companyScoped 的页,其 api 文件必须真的带 company
|
||||
&& COMPANY_ID_SOURCE_PINS.admin_image_video_tasks.some((p) => p.shape !== null),
|
||||
'Task 8 已接线的两页在登记表里的 shape 被改回 null 了:严格判据对这两页不再起作用(正样本归零)')
|
||||
assert.deepEqual(problems, [],
|
||||
`公司 tab 接线缺口(逐页列全;Task 8-12 补齐后这支自动收敛,本轮刻意留红):\n`
|
||||
`公司 tab 接线缺口(逐页列全;批次 1 的 8 页到 Task 10 已全部接线,谁再退回未接线就红在这里):\n`
|
||||
+ problems.map((p) => ` - ${p}`).join('\n'))
|
||||
})
|
||||
|
||||
@@ -196,6 +210,65 @@ test('反向:把 company_id 当查询参数用的取数模块必须被清单
|
||||
}
|
||||
})
|
||||
|
||||
/**
|
||||
* 切公司必须把「上一家选中的分组」一起清掉(TaskList #22,控制方 2026-10-05 点名)。
|
||||
*
|
||||
* <p>为什么单独钉这一处:`filter.groupId` 是**用户选中的值**,不是每次请求重算的。切到另一家公司后,
|
||||
* 上一家选中的 groupId 在新一家的可见集里根本不存在,列表于是被 `groupId=` 筛成空页——症状是
|
||||
* 「tab 一切页面就白」,而请求、后端、权限三处全对。G1 的 pageFiles 只断「watch 了 activeId」,
|
||||
* 看不见 watch 体里到底做了什么,所以体内容必须单独钉。</p>
|
||||
*
|
||||
* <p>判据形状:从 `watch(() => companyTab.activeId, …)` 那**一条语句**取文本(正则在第一个
|
||||
* `}` + `)` 处收口 ⇒ 单层,体内再嵌对象字面量会截早;这一页今天没有那种写法,由下面的取样自检兜着)。
|
||||
* 反向钉与正样本同支(全局约束 15,三条前提不成立就是探针失效、当场红,不许静默空跑):
|
||||
* ① 合规样本必须匹配得出且含两把 token ⇒ 判据不恒红;
|
||||
* ② 删掉 `filter.groupId = null` 的样本必须不含 ⇒ 判据能红(变异自证走的就是这一条);
|
||||
* ③ 把同一串 token 挪到 watch 之外的样本必须不含 ⇒ 钉的是**位置**,不是「文件里出现过」。
|
||||
* 末尾还配了一条同链前提:这一页的两个发送口仍在发 `company_id`,清组才有意义。</p>
|
||||
*/
|
||||
const WATCH_ACTIVE_ID = /watch\(\(\)\s*=>\s*companyTab\.activeId\s*,\s*\(\)\s*=>\s*\{([\s\S]*?)\}\s*\)/
|
||||
|
||||
/** 取「`watch(() => companyTab.activeId, () => { … })`」这一条语句的原文;匹配不出返回 null(由调用方判探针失效)。 */
|
||||
function watchStatement(source: string): string | null {
|
||||
const m = WATCH_ACTIVE_ID.exec(source)
|
||||
return m ? m[0] : null
|
||||
}
|
||||
|
||||
test('切公司的 watch 体:ShopManagePage 体内必须同时出现 companyTab.activeId 与 filter.groupId = null', () => {
|
||||
// ① 正样本(判据不恒红)——逐字就是 ShopManagePage.vue 今天那一行。
|
||||
const positive = watchStatement('watch(() => companyTab.activeId, () => { filter.groupId = null; void loadGroups(); void load() })')
|
||||
assert.ok(positive, '探针失效:合规样本都匹配不出 watch 语句 ⇒ 判据恒红,这条看守等于没写')
|
||||
assert.ok(positive.includes('companyTab.activeId') && positive.includes('filter.groupId = null'),
|
||||
'探针失效:合规样本没同时含两把 token ⇒ 下面两条断言无从判定')
|
||||
|
||||
// ② 负样本 1(判据能红):删掉清组那一句——变异自证注入的就是这一形。
|
||||
const dropped = watchStatement('watch(() => companyTab.activeId, () => { void loadGroups(); void load() })')
|
||||
assert.ok(dropped, '探针失效:负样本 1 匹配不出 watch 语句,无从判定它该红')
|
||||
assert.equal(dropped.includes('filter.groupId = null'), false,
|
||||
'负样本 1 失效:删掉 filter.groupId = null 还判它含 ⇒ 这条看守杀不了变异')
|
||||
|
||||
// ③ 负样本 2(钉位置不钉全文):token 在同一个文件里、但不在 watch 体内。
|
||||
const elsewhere = watchStatement('function resetAll() { filter.groupId = null }\nwatch(() => companyTab.activeId, () => { void load() })')
|
||||
assert.ok(elsewhere, '探针失效:负样本 2 匹配不出 watch 语句,无从判定它该红')
|
||||
assert.equal(elsewhere.includes('filter.groupId = null'), false,
|
||||
'负样本 2 失效:watch 体外的 filter.groupId = null 被算成了体内 ⇒ 判据退化成"文件里出现过就行"')
|
||||
|
||||
const source = stripComments(readSource('src/pages/shop/ShopManagePage.vue'))
|
||||
const matches = source.match(new RegExp(WATCH_ACTIVE_ID.source, 'g')) ?? []
|
||||
assert.equal(matches.length, 1,
|
||||
`ShopManagePage 里匹配到 ${matches.length} 条 watch(() => companyTab.activeId, () => {…}):`
|
||||
+ '0 条 = watch 换了写法(判据失明)或被拆成多条,都得先核对再动判据')
|
||||
assert.ok(matches[0].includes('filter.groupId = null'),
|
||||
'切公司没清掉上一家选中的分组:列表会被一个在新一家根本不存在的 groupId 筛成空页'
|
||||
+ '(tab 看起来"坏了",而请求、后端、权限三处都没错,最难查的那一型)')
|
||||
|
||||
// 同链前提(反向钉不许独自成立):这一页的两个发送口仍然在发 company_id。
|
||||
// 哪天发送口退回不带参,上面这条 watch 看守就变成"清了一个没人用的筛选项"——前提必须一起在场。
|
||||
const api = stripComments(read('src/pages/shop/shop-manage-api.ts'))
|
||||
assert.ok(/company_id\s*=\s*params\.companyId\b/.test(api) && /company_id\s*:\s*companyId\b/.test(api),
|
||||
'店铺管理的两个发送口(列表 + 分组下拉)不再带 company_id:上面那条 watch 看守的前提没了')
|
||||
})
|
||||
|
||||
test('两张清单不许重叠:超管专属页不可能同时是按公司看数据的页', () => {
|
||||
const scoped = new Set(COMPANY_SCOPED_PAGES.map((p) => p.menuKey))
|
||||
for (const key of SUPER_ADMIN_ONLY_MENU_KEYS) assert.equal(scoped.has(key), false)
|
||||
|
||||
+75
-12
@@ -3,6 +3,7 @@ package com.nanri.aiimage.modules.taskcenter.controller;
|
||||
import com.nanri.aiimage.common.api.ApiResponse;
|
||||
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.common.service.DataReadScope;
|
||||
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
|
||||
import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterTaskQuery;
|
||||
import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterOverviewVo;
|
||||
@@ -13,6 +14,7 @@ import com.nanri.aiimage.modules.taskcenter.service.TaskCenterQueryService;
|
||||
import com.nanri.aiimage.modules.taskcenter.service.TaskCenterScopeService;
|
||||
import com.nanri.aiimage.modules.taskcenter.service.TaskCenterVariantService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -29,6 +31,13 @@ import java.util.List;
|
||||
*
|
||||
* <p>仅超管默认可见;管理员需超管在「用户管理 → 菜单权限」授权 {@code admin_task_center}
|
||||
* 后才能访问。数据范围 = 本人 + 本组用户 + 自己管理的成员(超管不裁剪)。</p>
|
||||
*
|
||||
* <p>公司 tab(spec §4):五个端点各收一个可选 {@code company_id},都在 handler 体内过唯一出口
|
||||
* {@link DataReadScope#readScope} 算成员集,再交给 {@code TaskCenterScopeService.resolve} 与既有口径
|
||||
* 求交——一处收窄,五个出口天然同宽(详情走 {@code scope.visible()},用的就是同一条集合)。
|
||||
* 那一行之所以在五个 handler 里各写一遍而不是抽进私有方法:护栏
|
||||
* {@code CompanyIdParamGoesThroughReadScopeTest} 的断言 A/C/D 认的就是「handler 体内」出现过出口、
|
||||
* 结果被接住当实参传出去、且 {@code company_id} 那个值真进了出口实参列表,抽走即三只都红。</p>
|
||||
*/
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@@ -42,20 +51,35 @@ public class AdminTaskCenterController {
|
||||
private final TaskCenterScopeService scopeService;
|
||||
private final TaskCenterQueryService queryService;
|
||||
private final TaskCenterVariantService variantService;
|
||||
private final DataReadScope dataReadScope;
|
||||
|
||||
@GetMapping("/overview")
|
||||
@Operation(summary = "汇总卡", description = "总店铺/在跑店铺数、进行中任务数、今日完成任务数、"
|
||||
+ "疑似卡住数(进行中且 >10 分钟无上报)。")
|
||||
public ApiResponse<TaskCenterOverviewVo> overview(HttpServletRequest request) {
|
||||
TaskCenterScopeService.ScopeContext scope = resolveScope(request);
|
||||
public ApiResponse<TaskCenterOverviewVo> overview(
|
||||
HttpServletRequest request,
|
||||
@Parameter(description = "公司 ID(超管 tab;不传=不筛)")
|
||||
@RequestParam(name = "company_id", required = false) Long companyId) {
|
||||
AdminUserEntity operator = authorizedOperator(request);
|
||||
boolean superAdmin = isSuper(operator);
|
||||
Long operatorId = operator.getId();
|
||||
List<Long> companyUserIds = superAdmin ? dataReadScope.readScope(operator, companyId).userIdsOr(null) : null;
|
||||
TaskCenterScopeService.ScopeContext scope = resolveScope(operatorId, companyUserIds);
|
||||
return ApiResponse.success(queryService.overview(scope));
|
||||
}
|
||||
|
||||
@GetMapping("/shop-options")
|
||||
@Operation(summary = "店铺筛选候选",
|
||||
description = "店铺库(biz_shop_manage)在可见范围内的店铺名,供筛选下拉精确匹配;只出店铺名。")
|
||||
public ApiResponse<List<String>> shopOptions(HttpServletRequest request) {
|
||||
TaskCenterScopeService.ScopeContext scope = resolveScope(request);
|
||||
public ApiResponse<List<String>> shopOptions(
|
||||
HttpServletRequest request,
|
||||
@Parameter(description = "公司 ID(超管 tab;不传=不筛)")
|
||||
@RequestParam(name = "company_id", required = false) Long companyId) {
|
||||
AdminUserEntity operator = authorizedOperator(request);
|
||||
boolean superAdmin = isSuper(operator);
|
||||
Long operatorId = operator.getId();
|
||||
List<Long> companyUserIds = superAdmin ? dataReadScope.readScope(operator, companyId).userIdsOr(null) : null;
|
||||
TaskCenterScopeService.ScopeContext scope = resolveScope(operatorId, companyUserIds);
|
||||
return ApiResponse.success(queryService.shopOptions(scope));
|
||||
}
|
||||
|
||||
@@ -64,8 +88,16 @@ public class AdminTaskCenterController {
|
||||
description = "biz_file_task(12 个客户端模块)∪ brand_crawl_tasks 按创建时间倒序;"
|
||||
+ "店铺按规范化名精确匹配(来源=上架结果文件 + 逐店落行的结果文件名);"
|
||||
+ "进行中且 >10 分钟无上报标记 stuck。")
|
||||
public ApiResponse<TaskCenterTaskPageVo> tasks(HttpServletRequest request, TaskCenterTaskQuery query) {
|
||||
TaskCenterScopeService.ScopeContext scope = resolveScope(request);
|
||||
public ApiResponse<TaskCenterTaskPageVo> tasks(
|
||||
HttpServletRequest request,
|
||||
TaskCenterTaskQuery query,
|
||||
@Parameter(description = "公司 ID(超管 tab;不传=不筛)")
|
||||
@RequestParam(name = "company_id", required = false) Long companyId) {
|
||||
AdminUserEntity operator = authorizedOperator(request);
|
||||
boolean superAdmin = isSuper(operator);
|
||||
Long operatorId = operator.getId();
|
||||
List<Long> companyUserIds = superAdmin ? dataReadScope.readScope(operator, companyId).userIdsOr(null) : null;
|
||||
TaskCenterScopeService.ScopeContext scope = resolveScope(operatorId, companyUserIds);
|
||||
return ApiResponse.success(queryService.tasks(scope, query));
|
||||
}
|
||||
|
||||
@@ -74,8 +106,14 @@ public class AdminTaskCenterController {
|
||||
description = "参数 taskNo(品牌任务为 brand-<id>):基础信息 + 进度快照 + 分组明细 + 错误信息;"
|
||||
+ "任务不存在或不在可见范围时 data 为空。")
|
||||
public ApiResponse<TaskCenterTaskDetailVo> taskDetail(HttpServletRequest request,
|
||||
@RequestParam String taskNo) {
|
||||
TaskCenterScopeService.ScopeContext scope = resolveScope(request);
|
||||
@RequestParam String taskNo,
|
||||
@Parameter(description = "公司 ID(超管 tab;不传=不筛)")
|
||||
@RequestParam(name = "company_id", required = false) Long companyId) {
|
||||
AdminUserEntity operator = authorizedOperator(request);
|
||||
boolean superAdmin = isSuper(operator);
|
||||
Long operatorId = operator.getId();
|
||||
List<Long> companyUserIds = superAdmin ? dataReadScope.readScope(operator, companyId).userIdsOr(null) : null;
|
||||
TaskCenterScopeService.ScopeContext scope = resolveScope(operatorId, companyUserIds);
|
||||
TaskCenterTaskDetailVo detail = queryService.detail(scope, taskNo);
|
||||
if (detail == null) {
|
||||
return ApiResponse.success("任务不存在或无权查看", null);
|
||||
@@ -92,14 +130,39 @@ public class AdminTaskCenterController {
|
||||
@RequestParam(required = false) Integer status,
|
||||
@RequestParam(required = false) String taskType,
|
||||
@RequestParam(required = false) Integer page,
|
||||
@RequestParam(required = false) Integer pageSize) {
|
||||
TaskCenterScopeService.ScopeContext scope = resolveScope(request);
|
||||
@RequestParam(required = false) Integer pageSize,
|
||||
@Parameter(description = "公司 ID(超管 tab;不传=不筛)")
|
||||
@RequestParam(name = "company_id", required = false) Long companyId) {
|
||||
AdminUserEntity operator = authorizedOperator(request);
|
||||
boolean superAdmin = isSuper(operator);
|
||||
Long operatorId = operator.getId();
|
||||
List<Long> companyUserIds = superAdmin ? dataReadScope.readScope(operator, companyId).userIdsOr(null) : null;
|
||||
TaskCenterScopeService.ScopeContext scope = resolveScope(operatorId, companyUserIds);
|
||||
return ApiResponse.success(variantService.variantTasks(scope, status, taskType, page, pageSize));
|
||||
}
|
||||
|
||||
private TaskCenterScopeService.ScopeContext resolveScope(HttpServletRequest request) {
|
||||
/** 会话闸门(登录态 + 菜单权限),五个端点同一把;service 只认算好的 operatorId。 */
|
||||
private AdminUserEntity authorizedOperator(HttpServletRequest request) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
|
||||
permissionMenuService.requireClientTaskCenterAccess(operator);
|
||||
return scopeService.resolve(operator.getId());
|
||||
return operator;
|
||||
}
|
||||
|
||||
/**
|
||||
* 是否站点超管——用的是 {@code AdminAuthSupport.currentRole}(与 {@code DataReadScope} 内部同一把尺子,
|
||||
* 含「role 为空 + isAdmin=1 + createdById 为空」的历史超管推断),不是这里新造的判定。
|
||||
* 只有超管才按公司 tab 收窄:非超管的可见集里含「靠分组可见」的行,给它叠成员集会把那批行
|
||||
* 从每一个 tab 里静默删掉;它的公司维度本来就由会话独家决定(spec §4)。
|
||||
*/
|
||||
private boolean isSuper(AdminUserEntity operator) {
|
||||
return "super_admin".equals(adminAuthSupport.currentRole(operator));
|
||||
}
|
||||
|
||||
/**
|
||||
* 五个端点共用的收窄出口:{@code companyUserIds} 必须是 handler 体内 {@code readScope} 算出来的那个值
|
||||
* ({@code null} = 不收窄),不许在这一层重新取公司值——那样护栏 A/C/D 看见的就不是这条链了。
|
||||
*/
|
||||
private TaskCenterScopeService.ScopeContext resolveScope(Long operatorId, List<Long> companyUserIds) {
|
||||
return scopeService.resolve(operatorId, companyUserIds);
|
||||
}
|
||||
}
|
||||
|
||||
+35
@@ -17,6 +17,9 @@ import java.util.Set;
|
||||
* 客户端任务管理的数据范围:超管看全部,管理员看「本人 + 本组用户 + 自己管理的成员」。
|
||||
* 口径与 {@code DedupeTotalDataService.resolveAccessScope} 一致——范围按任务发起账号
|
||||
* (biz_file_task.user_id)判定,不按设备归属,设备跨组使用也不会串组。
|
||||
*
|
||||
* <p>公司 tab(spec §4)叠在这条既有口径之上:{@link #resolve(Long, List)} 只与上面的集合求交,
|
||||
* 超管选了公司才有收窄,非超管的范围仍由会话独家决定。</p>
|
||||
*/
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
@@ -27,6 +30,38 @@ public class TaskCenterScopeService {
|
||||
private final CompanyScopeSupport companyScopeSupport;
|
||||
|
||||
public ScopeContext resolve(Long operatorId) {
|
||||
return resolve(operatorId, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* 公司 tab 的收窄点:在 {@link #resolveBase(Long)} 的既有可见集上**只叠一层交集**,一律不放大
|
||||
* (spec §4)。客户端任务管理的五个端点共用这一处,所以「列表筛了但按 id 能读」在这一页不存在
|
||||
* ——详情走 {@code scope.visible(userId)},与列表同一条集合。
|
||||
*
|
||||
* <p>{@code companyUserIds} 由 controller 过唯一出口 {@code DataReadScope.readScope} 算好
|
||||
* (本 service 手上只有 operatorId,没有操作者实体之外的会话信息,交不出这个集合)。
|
||||
* <b>{@code null} 与空集不是一回事</b>:{@code null} = 不收窄(非超管、或超管没选公司),
|
||||
* 逐字退回今天的行为;空集 = 选了公司但这家一个账号都没有,必须收窄成恒不命中
|
||||
* ({@link ScopeContext#sqlUserIds()} 的 {@code [-1]} 兜底)。这里要是把空集也当「没选」放过,
|
||||
* 症状是「切到空公司 tab 反而看见全量」——越权,且不报错。</p>
|
||||
*
|
||||
* @param companyUserIds 公司成员账号集;{@code null} 表示不按公司收窄
|
||||
*/
|
||||
public ScopeContext resolve(Long operatorId, List<Long> companyUserIds) {
|
||||
ScopeContext base = resolveBase(operatorId);
|
||||
if (companyUserIds == null) {
|
||||
return base;
|
||||
}
|
||||
LinkedHashSet<Long> visible = new LinkedHashSet<>();
|
||||
addAll(visible, companyUserIds);
|
||||
if (!base.allUsers()) {
|
||||
visible.retainAll(base.visibleUserIds());
|
||||
}
|
||||
return new ScopeContext(false, Set.copyOf(visible));
|
||||
}
|
||||
|
||||
/** 今天的三条腿,逐字保留(超管直通 / 公司超管按会话 / 管理员按分组),不动口径、不换 mapper 方法。 */
|
||||
private ScopeContext resolveBase(Long operatorId) {
|
||||
AdminUserEntity operator = requireOperator(operatorId);
|
||||
if (isSuperAdmin(operator)) {
|
||||
return new ScopeContext(true, Set.of());
|
||||
|
||||
+91
@@ -4,6 +4,8 @@ import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.mapper.AdminUserMapper;
|
||||
import com.nanri.aiimage.common.mapper.ShopManageGroupMapper;
|
||||
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
import com.nanri.aiimage.common.service.CompanyScopeSupport;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.mockito.InjectMocks;
|
||||
@@ -15,6 +17,7 @@ import java.util.Set;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.anyList;
|
||||
@@ -25,12 +28,18 @@ import static org.mockito.Mockito.when;
|
||||
/**
|
||||
* 客户端任务管理的组范围裁剪:超管直通,管理员 = 本人 + 本组用户 + 自己管理的成员。
|
||||
* 口径与 DedupeTotalDataService.resolveAccessScope 一致。
|
||||
*
|
||||
* <p>公司 tab 的收窄走第二个入参 {@code companyUserIds}(controller 已经过 {@code DataReadScope}
|
||||
* 把成员集算好,见 {@code AdminTaskCenterController} 五个 handler),所以本类只喂 List、不 mock
|
||||
* {@code DataReadScope}:{@code null} = 不收窄,空集 = 「选了公司但这家一个账号都没有」,
|
||||
* 两者绝不许混为一谈(后者必须是恒不命中,不是全量)。</p>
|
||||
*/
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
class TaskCenterScopeServiceTest {
|
||||
|
||||
@Mock private AdminUserMapper adminUserMapper;
|
||||
@Mock private ShopManageGroupMapper shopManageGroupMapper;
|
||||
@Mock private CompanyScopeSupport companyScopeSupport;
|
||||
@InjectMocks private TaskCenterScopeService service;
|
||||
|
||||
private AdminUserEntity user(Long id, String role) {
|
||||
@@ -120,4 +129,86 @@ class TaskCenterScopeServiceTest {
|
||||
assertThrows(BusinessException.class, () -> service.resolve(404L));
|
||||
assertThrows(BusinessException.class, () -> service.resolve(null));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("超管选了公司:allUsers 必须翻成 false,否则集合根本不进 SQL,tab 是装饰品")
|
||||
void superAdminWithCompanyStopsBeingUnfiltered() {
|
||||
when(adminUserMapper.selectById(1L)).thenReturn(user(1L, "super_admin"));
|
||||
|
||||
TaskCenterScopeService.ScopeContext scope = service.resolve(1L, List.of(11L, 12L));
|
||||
|
||||
assertFalse(scope.allUsers(), "选了公司还 allUsers=true ⇒ sqlUserIds() 交 null ⇒ SQL 整段条件不渲染");
|
||||
assertEquals(Set.of(11L, 12L), Set.copyOf(scope.sqlUserIds()));
|
||||
assertTrue(scope.visible(11L));
|
||||
assertFalse(scope.visible(13L), "别家账号连 tasks/detail 也进不去(详情走 scope.visible,不走 SQL)");
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("第二参 null(非超管 / 超管没选公司):今天的行为一分不变")
|
||||
void nullCompanyUserIdsKeepsTodayBehavior() {
|
||||
when(adminUserMapper.selectById(1L)).thenReturn(user(1L, "super_admin"));
|
||||
|
||||
TaskCenterScopeService.ScopeContext scope = service.resolve(1L, null);
|
||||
|
||||
assertTrue(scope.allUsers(), "没选公司的超管仍然直通");
|
||||
assertNull(scope.sqlUserIds(), "allUsers=true 时交给 SQL 的是 null = 整段 user_id 条件不加");
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("历史超管(role 为空 + isAdmin=1 + createdById 为空)选了公司,也得跟着窄")
|
||||
void legacySuperAdminIsNotLeftUnfiltered() {
|
||||
AdminUserEntity legacy = new AdminUserEntity();
|
||||
legacy.setId(2L);
|
||||
legacy.setIsAdmin(1);
|
||||
legacy.setCreatedById(null);
|
||||
when(adminUserMapper.selectById(2L)).thenReturn(legacy);
|
||||
|
||||
TaskCenterScopeService.ScopeContext scope = service.resolve(2L, List.of(31L));
|
||||
|
||||
assertFalse(scope.allUsers(), "controller 那侧认这把的是 AdminAuthSupport.currentRole→resolveRole,"
|
||||
+ "与本类的 isSuperAdmin 必须同一条:哪一天单边改了,红的是这条而不是某个历史超管看见全量");
|
||||
assertEquals(Set.of(31L), scope.visibleUserIds());
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("成员集为空时交给 SQL 的是 [-1] 不是空集:IN () 是语法错,兜底在 ScopeContext 里")
|
||||
void emptyMemberSetFallsBackToSentinelNotEmptyList() {
|
||||
when(adminUserMapper.selectById(1L)).thenReturn(user(1L, "super_admin"));
|
||||
|
||||
TaskCenterScopeService.ScopeContext scope = service.resolve(1L, List.of());
|
||||
|
||||
assertTrue(scope.visibleUserIds().isEmpty());
|
||||
assertEquals(List.of(-1L), scope.sqlUserIds(), "本任务不许改 :100 那条兜底");
|
||||
assertFalse(scope.visible(11L), "空公司连详情也不能看见任何人");
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("非超管的既有分组集:公司集只与之求交,一律不放大")
|
||||
void adminIntersectsWithGroupScope() {
|
||||
when(adminUserMapper.selectById(5L)).thenReturn(user(5L, "admin"));
|
||||
when(shopManageGroupMapper.selectAccessibleGroupIds(5L)).thenReturn(List.of(3L));
|
||||
when(shopManageGroupMapper.selectUserIdsByGroupIds(List.of(3L))).thenReturn(List.of(6L));
|
||||
when(shopManageGroupMapper.selectManagedMemberUserIds(5L)).thenReturn(List.of());
|
||||
|
||||
// 分组集 = 本人 5 + 组员 6(:42-48 的既有口径),公司集 = 6、7 ⇒ 只剩 6
|
||||
TaskCenterScopeService.ScopeContext scope = service.resolve(5L, List.of(6L, 7L));
|
||||
|
||||
assertFalse(scope.allUsers());
|
||||
assertEquals(Set.of(6L), scope.visibleUserIds(), "公司集里的 7 不在本组可见集内,不许被放大进来");
|
||||
assertFalse(scope.visible(5L), "连本人都被公司维度筛掉时就是筛掉,不保留全部");
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("第三条腿(公司超管按会话定本公司成员)逐字留在 resolveBase:没选公司时一分不变")
|
||||
void companySuperAdminLegStillDecidedBySession() {
|
||||
AdminUserEntity operator = user(9L, "company_super_admin");
|
||||
operator.setCompanyId(7L);
|
||||
when(adminUserMapper.selectById(9L)).thenReturn(operator);
|
||||
when(companyScopeSupport.memberUserIds(7L)).thenReturn(List.of(41L, 42L));
|
||||
|
||||
TaskCenterScopeService.ScopeContext scope = service.resolve(9L, null);
|
||||
|
||||
assertFalse(scope.allUsers(), "公司超管不是超管,不能直通");
|
||||
assertEquals(Set.of(9L, 41L, 42L), scope.visibleUserIds(), "本人 + 本公司成员(既有口径)");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user