@oj-module/cli 0.2.47 → 0.2.48

package/templates/src/system/api/departments/api.ts

@@ -0,0 +1,142 @@
+import type { OrgDeps } from "#/_platform/_shared/service/domain/org";
+import { respond } from "#/_platform/_shared/respond";
+// 管理域端点组 /api/system/departments —— 组织架构 CRUD 基线（方案 A2）。
+// handler 只编排：assertSystemAdmin 守卫 → org 领域服务 → json 信封；归属权红线在 org.ts（D13）。
+//
+// 列表**返回平表而不是树**：oj 的响应契约不支持递归 schema（contract IR 无 $ref），
+// 树由前端按 parentId 组装。管理员要看全量（含 sync_visible=0 与软删壳），故两个开关全开。
+import {
+	createDepartment,
+	deleteDepartment,
+	listDepartments,
+	memberCounts,
+
+	updateDepartment,
+} from "#/_platform/_shared/service/domain/org";
+import { assertSystemAdmin } from "#/_platform/_shared/service/infra/access";
+
+/** 秒级 epoch（与 sys_oplog / wecom store 同一口径） */
+const orgDeps: OrgDeps = { now: () => Math.floor(Date.now() / 1000) };
+
+// GET /api/system/departments —— 部门平表（含成员计数），管理页树的数据源。
+async function get() {
+	await respond(async () => {
+		await assertSystemAdmin();
+		const [depts, counts] = await Promise.all([
+			listDepartments({ includeDeleted: true, includeHidden: true }),
+			memberCounts(),
+		]);
+		return depts.map(d => ({ ...d, memberCount: counts.get(d.id) ?? 0 }));
+	});
+}
+get.response = {
+	type: "array",
+	items: {
+		type: "object",
+		required: ["id", "origin", "originId", "parentId", "name", "orderNo", "syncVisible", "deleted", "memberCount"],
+		properties: {
+			id: { type: "number" },
+			// 归属权标识：local = 本站可 CRUD；其余 = 对应适配器管辖（D13）
+			origin: { type: "string" },
+			originId: { type: "string" },
+			parentId: { type: ["number", "null"] },
+			name: { type: ["string", "null"] },
+			nameEn: { type: ["string", "null"] },
+			orderNo: { type: "number" },
+			syncVisible: { type: "boolean" },
+			deleted: { type: "boolean" },
+			memberCount: { type: "number" },
+		},
+	},
+};
+
+// POST /api/system/departments —— 建部门（origin 恒 local）。
+async function post() {
+	await respond(async () => {
+		await assertSystemAdmin();
+		const b = (http.body || {}) as { name?: string, parentId?: number | null, nameEn?: string | null, orderNo?: number };
+		return { id: await createDepartment({
+			name: String(b.name ?? ""),
+			parentId: b.parentId ?? null,
+			nameEn: b.nameEn ?? null,
+			orderNo: b.orderNo,
+		}, orgDeps) };
+	});
+}
+post.schema = {
+	body: {
+		type: "object",
+		required: ["name"],
+		properties: {
+			name: { type: "string", minLength: 1 },
+			// 不给 parentId 即建在根下
+			parentId: { type: ["number", "null"] },
+			nameEn: { type: ["string", "null"] },
+			orderNo: { type: "number" },
+		},
+	},
+};
+post.response = {
+	type: "object",
+	required: ["id"],
+	properties: { id: { type: "number" } },
+};
+
+// PUT /api/system/departments?id= —— 改名/排序。部门归属 origin='local' 才放行（D13）。
+async function put() {
+	await respond(async () => {
+		await assertSystemAdmin();
+		const q = http.query as Record<string, unknown>;
+		const b = (http.body || {}) as { name?: string, nameEn?: string | null, orderNo?: number };
+		await updateDepartment(Number(q.id), {
+			name: b.name,
+			nameEn: b.nameEn,
+			orderNo: b.orderNo,
+		}, orgDeps);
+		return { ok: true };
+	});
+}
+put.schema = {
+	query: {
+		type: "object",
+		required: ["id"],
+		properties: { id: { type: "number" } },
+	},
+	body: {
+		type: "object",
+		properties: {
+			name: { type: "string", minLength: 1 },
+			nameEn: { type: ["string", "null"] },
+			orderNo: { type: "number" },
+		},
+	},
+};
+put.response = {
+	type: "object",
+	required: ["ok"],
+	properties: { ok: { type: "boolean" } },
+};
+
+// DELETE /api/system/departments?id= —— 删部门（有子部门即拒；关联成员行一并清）。
+async function del() {
+	await respond(async () => {
+		await assertSystemAdmin();
+		const q = http.query as Record<string, unknown>;
+		await deleteDepartment(Number(q.id));
+		return { ok: true };
+	});
+}
+del.schema = {
+	query: {
+		type: "object",
+		required: ["id"],
+		properties: { id: { type: "number" } },
+	},
+};
+del.response = {
+	type: "object",
+	required: ["ok"],
+	properties: { ok: { type: "boolean" } },
+};
+
+export default { get, post, put, del };

package/templates/src/system/api/departments/detach/api.ts

@@ -0,0 +1,34 @@
+import type { OrgDeps } from "#/_platform/_shared/service/domain/org";
+import { respond } from "#/_platform/_shared/respond";
+import { detachToLocal } from "#/_platform/_shared/service/domain/org";
+// POST /api/system/departments/detach?id= —— 「转为本地维护」（D14 保底出口）。
+//
+// 把一行脱离适配器管辖（origin → local）：此后改名/移动/删除全开，且后续同步轮次
+// 不再改写它。这是「外部源只给了残缺数据（如企微未授权部门名）」时唯一的出路。
+// 反向操作不提供：转回去后下一次同步立刻按源口径改写，语义不可控。
+import { assertSystemAdmin } from "#/_platform/_shared/service/infra/access";
+
+const orgDeps: OrgDeps = { now: () => Math.floor(Date.now() / 1000) };
+
+async function post() {
+	await respond(async () => {
+		await assertSystemAdmin();
+		const q = http.query as Record<string, unknown>;
+		await detachToLocal(Number(q.id), orgDeps);
+		return { ok: true };
+	});
+}
+post.schema = {
+	query: {
+		type: "object",
+		required: ["id"],
+		properties: { id: { type: "number" } },
+	},
+};
+post.response = {
+	type: "object",
+	required: ["ok"],
+	properties: { ok: { type: "boolean" } },
+};
+
+export default { post };

package/templates/src/system/api/departments/members/api.ts

@@ -0,0 +1,142 @@
+import type { OrgDeps } from "#/_platform/_shared/service/domain/org";
+import { respond } from "#/_platform/_shared/respond";
+import {
+	addMember,
+	listMembers,
+
+	removeMember,
+	updateMember,
+} from "#/_platform/_shared/service/domain/org";
+// /api/system/departments/members?id= —— 部门成员的增删查改（方案 A2）。
+//
+// 加人**不看部门的 origin**：「谁在这个部门」本站始终可调，即便部门本身由企微同步而来；
+// 受 D13 限制的只有部门的**结构字段**（名称/层级/删除），两者不是一回事。
+import { assertSystemAdmin } from "#/_platform/_shared/service/infra/access";
+
+const orgDeps: OrgDeps = { now: () => Math.floor(Date.now() / 1000) };
+
+const MEMBER_ITEM = {
+	type: "object",
+	required: ["userId", "deptId", "orderNo", "isLeader", "isMain", "username"],
+	properties: {
+		userId: { type: "number" },
+		deptId: { type: "number" },
+		orderNo: { type: "number" },
+		isLeader: { type: "boolean" },
+		isMain: { type: "boolean" },
+		username: { type: "string" },
+		displayName: { type: ["string", "null"] },
+	},
+} as const;
+
+// GET /api/system/departments/members?id= —— 成员列表（含 users 展示字段）
+async function get() {
+	await respond(async () => {
+		await assertSystemAdmin();
+		return listMembers(Number((http.query as Record<string, unknown>).id));
+	});
+}
+get.schema = {
+	query: {
+		type: "object",
+		required: ["id"],
+		properties: { id: { type: "number" } },
+	},
+};
+get.response = { type: "array", items: MEMBER_ITEM };
+
+// POST /api/system/departments/members?id= —— 加人
+async function post() {
+	await respond(async () => {
+		await assertSystemAdmin();
+		const q = http.query as Record<string, unknown>;
+		const b = (http.body || {}) as { userId?: number, isLeader?: boolean, isMain?: boolean, orderNo?: number };
+		await addMember(Number(q.id), Number(b.userId), {
+			isLeader: b.isLeader,
+			isMain: b.isMain,
+			orderNo: b.orderNo,
+		}, orgDeps);
+		return { ok: true };
+	});
+}
+post.schema = {
+	query: {
+		type: "object",
+		required: ["id"],
+		properties: { id: { type: "number" } },
+	},
+	body: {
+		type: "object",
+		required: ["userId"],
+		properties: {
+			userId: { type: "number" },
+			isLeader: { type: "boolean" },
+			isMain: { type: "boolean" },
+			orderNo: { type: "number" },
+		},
+	},
+};
+post.response = {
+	type: "object",
+	required: ["ok"],
+	properties: { ok: { type: "boolean" } },
+};
+
+// PUT /api/system/departments/members?id=&userId= —— 改成员属性（负责人/主部门/排序）
+async function put() {
+	await respond(async () => {
+		await assertSystemAdmin();
+		const q = http.query as Record<string, unknown>;
+		const b = (http.body || {}) as { isLeader?: boolean, isMain?: boolean, orderNo?: number };
+		await updateMember(Number(q.id), Number(q.userId), {
+			isLeader: b.isLeader,
+			isMain: b.isMain,
+			orderNo: b.orderNo,
+		}, orgDeps);
+		return { ok: true };
+	});
+}
+put.schema = {
+	query: {
+		type: "object",
+		required: ["id", "userId"],
+		properties: { id: { type: "number" }, userId: { type: "number" } },
+	},
+	body: {
+		type: "object",
+		properties: {
+			isLeader: { type: "boolean" },
+			isMain: { type: "boolean" },
+			orderNo: { type: "number" },
+		},
+	},
+};
+put.response = {
+	type: "object",
+	required: ["ok"],
+	properties: { ok: { type: "boolean" } },
+};
+
+// DELETE /api/system/departments/members?id=&userId= —— 移出部门
+async function del() {
+	await respond(async () => {
+		await assertSystemAdmin();
+		const q = http.query as Record<string, unknown>;
+		await removeMember(Number(q.id), Number(q.userId), orgDeps);
+		return { ok: true };
+	});
+}
+del.schema = {
+	query: {
+		type: "object",
+		required: ["id", "userId"],
+		properties: { id: { type: "number" }, userId: { type: "number" } },
+	},
+};
+del.response = {
+	type: "object",
+	required: ["ok"],
+	properties: { ok: { type: "boolean" } },
+};
+
+export default { get, post, put, del };

package/templates/src/system/api/departments/move/api.ts

@@ -0,0 +1,39 @@
+import type { OrgDeps } from "#/_platform/_shared/service/domain/org";
+import { respond } from "#/_platform/_shared/respond";
+import { moveDepartment } from "#/_platform/_shared/service/domain/org";
+// PUT /api/system/departments/move?id= —— 改父级（拖拽排序的数据出口）。
+// parentId=null 即移到根下；自挂与「挂到自己的子孙」由领域层判环后 400。
+import { assertSystemAdmin } from "#/_platform/_shared/service/infra/access";
+
+const orgDeps: OrgDeps = { now: () => Math.floor(Date.now() / 1000) };
+
+async function put() {
+	await respond(async () => {
+		await assertSystemAdmin();
+		const q = http.query as Record<string, unknown>;
+		const b = http.body || {};
+		const raw = (b as { parentId?: number | null }).parentId;
+		await moveDepartment(Number(q.id), raw == null ? null : Number(raw), orgDeps);
+		return { ok: true };
+	});
+}
+put.schema = {
+	query: {
+		type: "object",
+		required: ["id"],
+		properties: { id: { type: "number" } },
+	},
+	body: {
+		type: "object",
+		required: ["parentId"],
+		// 显式 null = 提到根；不给这个键按 schema 视为未提供
+		properties: { parentId: { type: ["number", "null"] } },
+	},
+};
+put.response = {
+	type: "object",
+	required: ["ok"],
+	properties: { ok: { type: "boolean" } },
+};
+
+export default { put };

package/templates/src/system/api/users/api.ts

@@ -1,5 +1,5 @@
 import { respond } from "#/_platform/_shared/respond";
-import { createUser, listUsers } from "#/_platform/_shared/service/domain/users";
+import { createUser, deleteUser, listUsers } from "#/_platform/_shared/service/domain/users";
 // 管理域端点组 /api/system/users（AC1-7~10）：handler 只编排——assertSystemAdmin 守卫 → service → json。
 // 保护红线在 service 层硬 enforcement：禁止操作自己、admin 不碰成员资格、最后 superadmin 兜底。
 // 子端点：roles/password/forbidden 各为独立目录（wiki per-endpoint 先例）。
@@ -18,12 +18,26 @@ get.response = {
 	type: "array",
 	items: {
 		type: "object",
-		required: ["id", "username", "display_name", "email", "is_forbidden", "must_change", "roles"],
+		required: ["id", "username", "display_name", "email", "position", "departments", "is_forbidden", "must_change", "roles"],
 		properties: {
 			id: { type: "number" },
 			username: { type: "string" },
 			display_name: { type: ["string", "null"] },
 			email: { type: ["string", "null"] },
+			position: { type: ["string", "null"] },
+			// 所属部门（主部门在前）；未加入任何部门即空数组。带 id 供前端按部门筛选
+			departments: {
+				type: "array",
+				items: {
+					type: "object",
+					required: ["id", "name", "isMain"],
+					properties: {
+						id: { type: "number" },
+						name: { type: ["string", "null"] },
+						isMain: { type: "boolean" },
+					},
+				},
+			},
 			// service 已做 Number(x)===1 布尔归一，此处是真 boolean
 			is_forbidden: { type: "boolean" },
 			must_change: { type: "boolean" },
@@ -33,9 +47,13 @@ get.response = {
 };
 
 // POST /api/system/users —— 建号（B6 加固；默认 must_change=1 首登改密）。
+// 必须走 respond 收口：createUser 的业务拒绝是 `fail(400, …)`，不收口会被 oj 一律抹成
+// 500（实测：重名建号返回 500「username exists」，前端拿不到可展示的 400 文案）。
 async function post() {
-	await assertSystemAdmin();
-	json.ok({ id: await createUser(http.body || {}, bcryptDeps) });
+	await respond(async () => {
+		await assertSystemAdmin();
+		return { id: await createUser(http.body || {}, bcryptDeps) };
+	});
 }
 post.schema = {
 	body: {
@@ -55,4 +73,26 @@ post.response = {
 	properties: { id: { type: "number" } },
 };
 
-export default { get, post };
+// DELETE /api/system/users?uid= —— 删号。级联清部门成员/角色/会话，最后 superadmin 拒删。
+async function del() {
+	await respond(async () => {
+		await assertSystemAdmin();
+		const q = http.query as Record<string, unknown>;
+		await deleteUser(Number(http.user?.id), Number(q.uid));
+		return { ok: true };
+	});
+}
+del.schema = {
+	query: {
+		type: "object",
+		required: ["uid"],
+		properties: { uid: { type: "number" } },
+	},
+};
+del.response = {
+	type: "object",
+	required: ["ok"],
+	properties: { ok: { type: "boolean" } },
+};
+
+export default { get, post, del };

package/templates/src/system/api/users/profile/api.ts

@@ -0,0 +1,44 @@
+import { respond } from "#/_platform/_shared/respond";
+import { updateUserProfile } from "#/_platform/_shared/service/domain/users";
+// PUT /api/system/users/profile?uid= —— 改资料（显示名 / 邮箱 / 职务）。
+//
+// 用户名**不在可改之列**：它是外部身份的主键（`wecom:<userid>` 这类），改名会让下一次
+// 登录认错人（B6 命名空间抢占，见 RESERVED_USERNAME_PREFIX）。启停走 users/forbidden、
+// 改密走 users/password——那两者带「级联删 refresh」的副作用，不混进通用改资料。
+import { assertSystemAdmin } from "#/_platform/_shared/service/infra/access";
+
+async function put() {
+	await respond(async () => {
+		await assertSystemAdmin();
+		const q = http.query as Record<string, unknown>;
+		const b = (http.body || {}) as { displayName?: string | null, email?: string | null, position?: string | null };
+		await updateUserProfile(Number(http.user?.id), Number(q.uid), {
+			displayName: b.displayName,
+			email: b.email,
+			position: b.position,
+		});
+		return { ok: true };
+	});
+}
+put.schema = {
+	query: {
+		type: "object",
+		required: ["uid"],
+		properties: { uid: { type: "number" } },
+	},
+	body: {
+		type: "object",
+		properties: {
+			displayName: { type: ["string", "null"] },
+			email: { type: ["string", "null"] },
+			position: { type: ["string", "null"] },
+		},
+	},
+};
+put.response = {
+	type: "object",
+	required: ["ok"],
+	properties: { ok: { type: "boolean" } },
+};
+
+export default { put };

package/templates/src/system/web/__client/api.schemas.ts

@@ -4,6 +4,122 @@
 import { z } from "@oj-module/runtime";
 
 export const schemas = {
+	"systemDepartmentsGet": {
+		data: z.array(z.object({
+	"id": z.number(),
+	"origin": z.string(),
+	"originId": z.string(),
+	"parentId": z.number().nullable(),
+	"name": z.string().nullable(),
+	"nameEn": z.string().nullable().optional(),
+	"orderNo": z.number(),
+	"syncVisible": z.boolean(),
+	"deleted": z.boolean(),
+	"memberCount": z.number()
+})),
+	},
+	"systemDepartmentsPost": {
+		body: z.object({
+	"name": z.string().min(1),
+	"parentId": z.number().nullable().optional(),
+	"nameEn": z.string().nullable().optional(),
+	"orderNo": z.number().optional()
+}),
+		data: z.object({
+	"id": z.number()
+}),
+	},
+	"systemDepartmentsPut": {
+		query: z.object({
+	"id": z.number()
+}),
+		body: z.object({
+	"name": z.string().min(1).optional(),
+	"nameEn": z.string().nullable().optional(),
+	"orderNo": z.number().optional()
+}),
+		data: z.object({
+	"ok": z.boolean()
+}),
+	},
+	"systemDepartmentsDelete": {
+		query: z.object({
+	"id": z.number()
+}),
+		data: z.object({
+	"ok": z.boolean()
+}),
+	},
+	"systemDepartmentsMovePut": {
+		query: z.object({
+	"id": z.number()
+}),
+		body: z.object({
+	"parentId": z.number().nullable()
+}),
+		data: z.object({
+	"ok": z.boolean()
+}),
+	},
+	"systemDepartmentsDetachPost": {
+		query: z.object({
+	"id": z.number()
+}),
+		data: z.object({
+	"ok": z.boolean()
+}),
+	},
+	"systemDepartmentsMembersGet": {
+		query: z.object({
+	"id": z.number()
+}),
+		data: z.array(z.object({
+	"userId": z.number(),
+	"deptId": z.number(),
+	"orderNo": z.number(),
+	"isLeader": z.boolean(),
+	"isMain": z.boolean(),
+	"username": z.string(),
+	"displayName": z.string().nullable().optional()
+})),
+	},
+	"systemDepartmentsMembersPost": {
+		query: z.object({
+	"id": z.number()
+}),
+		body: z.object({
+	"userId": z.number(),
+	"isLeader": z.boolean().optional(),
+	"isMain": z.boolean().optional(),
+	"orderNo": z.number().optional()
+}),
+		data: z.object({
+	"ok": z.boolean()
+}),
+	},
+	"systemDepartmentsMembersPut": {
+		query: z.object({
+	"id": z.number(),
+	"userId": z.number()
+}),
+		body: z.object({
+	"isLeader": z.boolean().optional(),
+	"isMain": z.boolean().optional(),
+	"orderNo": z.number().optional()
+}),
+		data: z.object({
+	"ok": z.boolean()
+}),
+	},
+	"systemDepartmentsMembersDelete": {
+		query: z.object({
+	"id": z.number(),
+	"userId": z.number()
+}),
+		data: z.object({
+	"ok": z.boolean()
+}),
+	},
 	"systemLoginMethodsGet": {
 		data: z.object({
 	"methods": z.array(z.string())
@@ -119,6 +235,12 @@ export const schemas = {
 	"username": z.string(),
 	"display_name": z.string().nullable(),
 	"email": z.string().nullable(),
+	"position": z.string().nullable(),
+	"departments": z.array(z.object({
+	"id": z.number(),
+	"name": z.string().nullable(),
+	"isMain": z.boolean()
+})),
 	"is_forbidden": z.boolean(),
 	"must_change": z.boolean(),
 	"roles": z.array(z.string())
@@ -133,6 +255,27 @@ export const schemas = {
 }),
 		data: z.object({
 	"id": z.number()
+}),
+	},
+	"systemUsersDelete": {
+		query: z.object({
+	"uid": z.number()
+}),
+		data: z.object({
+	"ok": z.boolean()
+}),
+	},
+	"systemUsersProfilePut": {
+		query: z.object({
+	"uid": z.number()
+}),
+		body: z.object({
+	"displayName": z.string().nullable().optional(),
+	"email": z.string().nullable().optional(),
+	"position": z.string().nullable().optional()
+}),
+		data: z.object({
+	"ok": z.boolean()
 }),
 	},
 	"systemUsersForbiddenPut": {